diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-27 23:21:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-27 23:26:01 -0400 |
| commit | 82268da1b130f763d22d04f7d016bbf6fc8815c2 (patch) | |
| tree | 9803f361556d10708313e980428e63a18162e667 /drivers/ssb/b43_pci_bridge.c | |
| parent | 6e15cf04860074ad032e88c306bea656bbdd0f22 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'linus' into percpu-cpumask-x86-for-linus-2
Conflicts:
arch/sparc/kernel/time_64.c
drivers/gpu/drm/drm_proc.c
Manual merge to resolve build warning due to phys_addr_t type change
on x86:
drivers/gpu/drm/drm_info.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/ssb/b43_pci_bridge.c')
| -rw-r--r-- | drivers/ssb/b43_pci_bridge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ssb/b43_pci_bridge.c b/drivers/ssb/b43_pci_bridge.c index 27a677584a4c..ef9c6a04ad8f 100644 --- a/drivers/ssb/b43_pci_bridge.c +++ b/drivers/ssb/b43_pci_bridge.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | static const struct pci_device_id b43_pci_bridge_tbl[] = { | 19 | static const struct pci_device_id b43_pci_bridge_tbl[] = { |
| 20 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4301) }, | 20 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4301) }, |
| 21 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4306) }, | ||
| 21 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4307) }, | 22 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4307) }, |
| 22 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4311) }, | 23 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4311) }, |
| 23 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4312) }, | 24 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4312) }, |