Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
9cc17134
Commit
9cc17134
authored
Mar 31, 2004
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge evo:v2.6/linux into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents
204e9011
415dd276
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
drivers/acpi/osl.c
drivers/acpi/osl.c
+5
-5
drivers/acpi/utilities/utglobal.c
drivers/acpi/utilities/utglobal.c
+0
-1
No files found.
drivers/acpi/osl.c
View file @
9cc17134
...
...
@@ -1057,15 +1057,15 @@ __setup("acpi_serialize", acpi_serialize_setup);
* Run-time events on the same GPE this flag is available
* to tell Linux to keep the wake-time GPEs enabled at run-time.
*/
int
__init
acpi_
wake_gpes_always_on
_setup
(
char
*
str
)
static
int
__init
acpi_
leave_gpes_disabled
_setup
(
char
*
str
)
{
printk
(
KERN_INFO
PREFIX
"
wake GPEs not
disabled
\n
"
);
printk
(
KERN_INFO
PREFIX
"
leave wake GPEs
disabled
\n
"
);
acpi_gbl_leave_wake_gpes_disabled
=
FALS
E
;
acpi_gbl_leave_wake_gpes_disabled
=
TRU
E
;
return
1
;
}
__setup
(
"acpi_
wake_gpes_always_on"
,
acpi_wake_gpes_always_on
_setup
);
__setup
(
"acpi_
leave_gpes_disabled"
,
acpi_leave_gpes_disabled
_setup
);
drivers/acpi/utilities/utglobal.c
View file @
9cc17134
...
...
@@ -787,7 +787,6 @@ acpi_ut_init_globals (
acpi_gbl_create_osi_method
=
TRUE
;
acpi_gbl_all_methods_serialized
=
FALSE
;
acpi_gbl_leave_wake_gpes_disabled
=
TRUE
;
/* Memory allocation and cache lists */
...
...
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