aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/dmi_scan.c
diff options
context:
space:
mode:
authorAndrey Panin <pazke@donpac.ru>2005-06-25 17:54:45 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 19:24:28 -0400
commit0f8133a8db81ff824a4abbe5bb0f15bf034d31c3 (patch)
treef3cfec2713a84e5bf040e947dbe299232991f9ea /arch/i386/kernel/dmi_scan.c
parentaea00143a8db8c0b31dca85bff3c325444d93f0f (diff)
[PATCH] dmi: move ACPI sleep quirk
This patch moves ACPI sleep quirk out of dmi_scan.c Signed-off-by: Andrey Panin <pazke@donpac.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel/dmi_scan.c')
-rw-r--r--arch/i386/kernel/dmi_scan.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c
index b4bae60f5065..065c30a73c13 100644
--- a/arch/i386/kernel/dmi_scan.c
+++ b/arch/i386/kernel/dmi_scan.c
@@ -177,16 +177,6 @@ static __init int broken_toshiba_keyboard(struct dmi_blacklist *d)
177} 177}
178 178
179 179
180#ifdef CONFIG_ACPI_SLEEP
181static __init int reset_videomode_after_s3(struct dmi_blacklist *d)
182{
183 /* See acpi_wakeup.S */
184 extern long acpi_video_flags;
185 acpi_video_flags |= 2;
186 return 0;
187}
188#endif
189
190 180
191/* 181/*
192 * Process the DMI blacklists 182 * Process the DMI blacklists
@@ -204,12 +194,6 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={
204 MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"), 194 MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"),
205 NO_MATCH, NO_MATCH, NO_MATCH 195 NO_MATCH, NO_MATCH, NO_MATCH
206 } }, 196 } },
207#ifdef CONFIG_ACPI_SLEEP
208 { reset_videomode_after_s3, "Toshiba Satellite 4030cdt", { /* Reset video mode after returning from ACPI S3 sleep */
209 MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"),
210 NO_MATCH, NO_MATCH, NO_MATCH
211 } },
212#endif
213 197
214 { NULL, } 198 { NULL, }
215}; 199};