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 /drivers/acpi/pci_irq.c | |
| parent | a8f75ea70c58546205fb7673be41455b9da5d9a7 (diff) | |
| parent | 120dd64cacd4fb796bca0acba3665553f1d9ecaa (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/acpi/pci_irq.c')
| -rw-r--r-- | drivers/acpi/pci_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index 7af414a3c63e..89022a74faee 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c | |||
| @@ -131,8 +131,8 @@ struct prt_quirk { | |||
| 131 | */ | 131 | */ |
| 132 | static struct prt_quirk prt_quirks[] = { | 132 | static struct prt_quirk prt_quirks[] = { |
| 133 | { medion_md9580, 0, 0, 9, 'A', | 133 | { medion_md9580, 0, 0, 9, 'A', |
| 134 | "\\_SB_.PCI0.ISA.LNKA", | 134 | "\\_SB_.PCI0.ISA_.LNKA", |
| 135 | "\\_SB_.PCI0.ISA.LNKB"}, | 135 | "\\_SB_.PCI0.ISA_.LNKB"}, |
| 136 | { dell_optiplex, 0, 0, 0xd, 'A', | 136 | { dell_optiplex, 0, 0, 0xd, 'A', |
| 137 | "\\_SB_.LNKB", | 137 | "\\_SB_.LNKB", |
| 138 | "\\_SB_.LNKA"}, | 138 | "\\_SB_.LNKA"}, |