diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
| commit | 3bb5da3837cc1aa17736b05139c9a22c3794851a (patch) | |
| tree | c92d5684a866542b1cb20641607ac1643ce03a47 /drivers/acpi/pci_irq.c | |
| parent | 7feb49c82a74bc7c091b8ab2a3f96baa33d08ece (diff) | |
| parent | 9597362d354f8655ece324b01d0c640a0e99c077 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-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"}, |