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
Kirill Smelkov
linux
Commits
5fa167bc
Commit
5fa167bc
authored
Feb 23, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make ACPI dmi fixup properly depend on CONFIG_ACPI_SLEEP
parent
1ceb967f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
arch/i386/kernel/dmi_scan.c
arch/i386/kernel/dmi_scan.c
+4
-0
No files found.
arch/i386/kernel/dmi_scan.c
View file @
5fa167bc
...
@@ -470,6 +470,7 @@ static __init int init_ints_after_s1(struct dmi_blacklist *d)
...
@@ -470,6 +470,7 @@ static __init int init_ints_after_s1(struct dmi_blacklist *d)
return
0
;
return
0
;
}
}
#ifdef CONFIG_ACPI_SLEEP
static
__init
int
reset_videomode_after_s3
(
struct
dmi_blacklist
*
d
)
static
__init
int
reset_videomode_after_s3
(
struct
dmi_blacklist
*
d
)
{
{
/* See acpi_wakeup.S */
/* See acpi_wakeup.S */
...
@@ -484,6 +485,7 @@ static __init int reset_videobios_after_s3(struct dmi_blacklist *d)
...
@@ -484,6 +485,7 @@ static __init int reset_videobios_after_s3(struct dmi_blacklist *d)
acpi_video_flags
|=
1
;
acpi_video_flags
|=
1
;
return
0
;
return
0
;
}
}
#endif
/*
/*
* Some Bioses enable the PS/2 mouse (touchpad) at resume, even if it was
* Some Bioses enable the PS/2 mouse (touchpad) at resume, even if it was
...
@@ -758,10 +760,12 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={
...
@@ -758,10 +760,12 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={
MATCH
(
DMI_PRODUCT_NAME
,
"S4030CDT/4.3"
),
MATCH
(
DMI_PRODUCT_NAME
,
"S4030CDT/4.3"
),
NO_MATCH
,
NO_MATCH
,
NO_MATCH
NO_MATCH
,
NO_MATCH
,
NO_MATCH
}
},
}
},
#ifdef CONFIG_ACPI_SLEEP
{
reset_videomode_after_s3
,
"Toshiba Satellite 4030cdt"
,
{
/* Reset video mode after returning from ACPI S3 sleep */
{
reset_videomode_after_s3
,
"Toshiba Satellite 4030cdt"
,
{
/* Reset video mode after returning from ACPI S3 sleep */
MATCH
(
DMI_PRODUCT_NAME
,
"S4030CDT/4.3"
),
MATCH
(
DMI_PRODUCT_NAME
,
"S4030CDT/4.3"
),
NO_MATCH
,
NO_MATCH
,
NO_MATCH
NO_MATCH
,
NO_MATCH
,
NO_MATCH
}
},
}
},
#endif
{
print_if_true
,
KERN_WARNING
"IBM T23 - BIOS 1.03b+ and controller firmware 1.02+ may be needed for Linux APM."
,
{
{
print_if_true
,
KERN_WARNING
"IBM T23 - BIOS 1.03b+ and controller firmware 1.02+ may be needed for Linux APM."
,
{
MATCH
(
DMI_SYS_VENDOR
,
"IBM"
),
MATCH
(
DMI_SYS_VENDOR
,
"IBM"
),
...
...
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