summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-05 14:36:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-05 14:36:21 -0700
commit1c402c8cd1fb4d0524bab184f8609f7e098ccb2e (patch)
tree2497d587ed0fcadafd1b820f2cc47f2a582e2d69 /arch/x86
parent45d866e1a06dba309f79dbb61ad1db964bb8ee8a (diff)
parente6a5652fd156a286faadbf7a4062b5354d4e346e (diff)
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: add io delay quirk for Presario F700
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/io_delay.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
index 1c3a66a67f8..720d2607aac 100644
--- a/arch/x86/kernel/io_delay.c
+++ b/arch/x86/kernel/io_delay.c
@@ -92,6 +92,14 @@ static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
DMI_MATCH(DMI_BOARD_NAME, "30BF")
}
},
+ {
+ .callback = dmi_io_delay_0xed_port,
+ .ident = "Presario F700",
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"),
+ DMI_MATCH(DMI_BOARD_NAME, "30D3")
+ }
+ },
{ }
};