Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
d59733c1
Commit
d59733c1
authored
Oct 15, 2009
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'misc' into release
parents
4697fd6f
2c907b72
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
3 deletions
+7
-3
drivers/acpi/Kconfig
drivers/acpi/Kconfig
+2
-2
drivers/acpi/ac.c
drivers/acpi/ac.c
+1
-0
drivers/acpi/button.c
drivers/acpi/button.c
+3
-0
drivers/platform/x86/fujitsu-laptop.c
drivers/platform/x86/fujitsu-laptop.c
+1
-1
No files found.
drivers/acpi/Kconfig
View file @
d59733c1
...
...
@@ -218,10 +218,10 @@ config ACPI_PROCESSOR_AGGREGATOR
depends on X86
help
ACPI 4.0 defines processor Aggregator, which enables OS to perform
specfic processor configuration and control that applies to all
spec
i
fic processor configuration and control that applies to all
processors in the platform. Currently only logical processor idling
is defined, which is to reduce power consumption. This driver
support the new device.
support
s
the new device.
config ACPI_THERMAL
tristate "Thermal Zone"
...
...
drivers/acpi/ac.c
View file @
d59733c1
...
...
@@ -245,6 +245,7 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)
acpi_bus_generate_netlink_event
(
device
->
pnp
.
device_class
,
dev_name
(
&
device
->
dev
),
event
,
(
u32
)
ac
->
state
);
acpi_notifier_call_chain
(
device
,
event
,
(
u32
)
ac
->
state
);
#ifdef CONFIG_ACPI_SYSFS_POWER
kobject_uevent
(
&
ac
->
charger
.
dev
->
kobj
,
KOBJ_CHANGE
);
#endif
...
...
drivers/acpi/button.c
View file @
d59733c1
...
...
@@ -251,6 +251,9 @@ int acpi_lid_open(void)
acpi_status
status
;
unsigned
long
long
state
;
if
(
!
lid_device
)
return
-
ENODEV
;
status
=
acpi_evaluate_integer
(
lid_device
->
handle
,
"_LID"
,
NULL
,
&
state
);
if
(
ACPI_FAILURE
(
status
))
...
...
drivers/platform/x86/fujitsu-laptop.c
View file @
d59733c1
...
...
@@ -944,7 +944,7 @@ static int acpi_fujitsu_hotkey_remove(struct acpi_device *device, int type)
struct
fujitsu_hotkey_t
*
fujitsu_hotkey
=
acpi_driver_data
(
device
);
struct
input_dev
*
input
=
fujitsu_hotkey
->
input
;
#if
def CONFIG_LEDS_CLASS
#if
defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
if
(
fujitsu_hotkey
->
logolamp_registered
)
led_classdev_unregister
(
&
logolamp_led
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment