diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-05 17:36:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-05 17:36:21 -0400 |
| commit | 1c402c8cd1fb4d0524bab184f8609f7e098ccb2e (patch) | |
| tree | 2497d587ed0fcadafd1b820f2cc47f2a582e2d69 /arch | |
| parent | 45d866e1a06dba309f79dbb61ad1db964bb8ee8a (diff) | |
| parent | e6a5652fd156a286faadbf7a4062b5354d4e346e (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')
| -rw-r--r-- | arch/x86/kernel/io_delay.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c index 1c3a66a67f83..720d2607aacb 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[] = { | |||
| 92 | DMI_MATCH(DMI_BOARD_NAME, "30BF") | 92 | DMI_MATCH(DMI_BOARD_NAME, "30BF") |
| 93 | } | 93 | } |
| 94 | }, | 94 | }, |
| 95 | { | ||
| 96 | .callback = dmi_io_delay_0xed_port, | ||
| 97 | .ident = "Presario F700", | ||
| 98 | .matches = { | ||
| 99 | DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"), | ||
| 100 | DMI_MATCH(DMI_BOARD_NAME, "30D3") | ||
| 101 | } | ||
| 102 | }, | ||
| 95 | { } | 103 | { } |
| 96 | }; | 104 | }; |
| 97 | 105 | ||