diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-14 07:11:02 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-14 07:11:02 -0400 |
| commit | ac7c5353b189e10cf5dd27399f64f7b013abffc6 (patch) | |
| tree | 8222d92b774c256d6ec4399c716d76b3f05ddc4b /arch/x86/kernel/io_delay.c | |
| parent | a8f75ea70c58546205fb7673be41455b9da5d9a7 (diff) | |
| parent | 120dd64cacd4fb796bca0acba3665553f1d9ecaa (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/x86/kernel/io_delay.c')
| -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 c706a3061553..5921e5f0a640 100644 --- a/arch/x86/kernel/io_delay.c +++ b/arch/x86/kernel/io_delay.c | |||
| @@ -78,6 +78,14 @@ static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = { | |||
| 78 | }, | 78 | }, |
| 79 | { | 79 | { |
| 80 | .callback = dmi_io_delay_0xed_port, | 80 | .callback = dmi_io_delay_0xed_port, |
| 81 | .ident = "HP Pavilion dv6000", | ||
| 82 | .matches = { | ||
| 83 | DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"), | ||
| 84 | DMI_MATCH(DMI_BOARD_NAME, "30B8") | ||
| 85 | } | ||
| 86 | }, | ||
| 87 | { | ||
| 88 | .callback = dmi_io_delay_0xed_port, | ||
| 81 | .ident = "HP Pavilion tx1000", | 89 | .ident = "HP Pavilion tx1000", |
| 82 | .matches = { | 90 | .matches = { |
| 83 | DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"), | 91 | DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"), |