aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/ppc/syslib/mpc52xx_pci.c3
-rw-r--r--include/linux/pci_ids.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/ppc/syslib/mpc52xx_pci.c b/arch/ppc/syslib/mpc52xx_pci.c
index 9ec525f9fe98..5a5a7a9cd248 100644
--- a/arch/ppc/syslib/mpc52xx_pci.c
+++ b/arch/ppc/syslib/mpc52xx_pci.c
@@ -225,7 +225,8 @@ mpc52xx_pci_fixup_resources(struct pci_dev *dev)
225 /* The PCI Host bridge of MPC52xx has a prefetch memory resource 225 /* The PCI Host bridge of MPC52xx has a prefetch memory resource
226 fixed to 1Gb. Doesn't fit in the resource system so we remove it */ 226 fixed to 1Gb. Doesn't fit in the resource system so we remove it */
227 if ( (dev->vendor == PCI_VENDOR_ID_MOTOROLA) && 227 if ( (dev->vendor == PCI_VENDOR_ID_MOTOROLA) &&
228 (dev->device == PCI_DEVICE_ID_MOTOROLA_MPC5200) ) { 228 ( dev->device == PCI_DEVICE_ID_MOTOROLA_MPC5200
229 || dev->device == PCI_DEVICE_ID_MOTOROLA_MPC5200B) ) {
229 struct resource *res = &dev->resource[1]; 230 struct resource *res = &dev->resource[1];
230 res->start = res->end = res->flags = 0; 231 res->start = res->end = res->flags = 0;
231 } 232 }
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 6f080ae59286..72d1b678e0e9 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -772,6 +772,7 @@
772#define PCI_DEVICE_ID_MOTOROLA_HAWK 0x4803 772#define PCI_DEVICE_ID_MOTOROLA_HAWK 0x4803
773#define PCI_DEVICE_ID_MOTOROLA_HARRIER 0x480b 773#define PCI_DEVICE_ID_MOTOROLA_HARRIER 0x480b
774#define PCI_DEVICE_ID_MOTOROLA_MPC5200 0x5803 774#define PCI_DEVICE_ID_MOTOROLA_MPC5200 0x5803
775#define PCI_DEVICE_ID_MOTOROLA_MPC5200B 0x5809
775 776
776#define PCI_VENDOR_ID_PROMISE 0x105a 777#define PCI_VENDOR_ID_PROMISE 0x105a
777#define PCI_DEVICE_ID_PROMISE_20265 0x0d30 778#define PCI_DEVICE_ID_PROMISE_20265 0x0d30