3 files changed, 2 insertions, 10 deletions
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/pci/detect_host_bridge.c b/c/src/lib/libbsp/powerpc/mvme5500/pci/detect_host_bridge.c
index 7ff1e168c2..6d75b65ed3 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/pci/detect_host_bridge.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/pci/detect_host_bridge.c
@@ -21,8 +21,6 @@
 
 #define PCI_DEBUG 0
 
-#define PCI_INVALID_VENDORDEVICEID	0xffffffff
-#define PCI_MULTI_FUNCTION		0x80
 #define HOSTBRIDGET_ERROR               0xf0000000
 
 unsigned long _BSP_clear_hostbridge_errors(int enableMCP, int quiet)
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c b/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c
index 6c7b2fd6a9..912e66e409 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c
@@ -54,8 +54,6 @@
 #define PCI1_CONFIG_DATA	        0xc7c
 #endif
 
-#define PCI_INVALID_VENDORDEVICEID	0xffffffff
-#define PCI_MULTI_FUNCTION		0x80
 #define HOSTBRIDGET_ERROR               0xf0000000
 
 #define GT64x60_PCI_CONFIG_ADDR         GT64x60_REG_BASE + PCI_CONFIG_ADDR
@@ -367,7 +365,7 @@ int pci_initialize(void)
 			  0,
 			  PCI_CACHE_LINE_SIZE,
 			  &ulHeader);
-      if ((ulHeader>>16)&PCI_MULTI_FUNCTION)
+      if ((ulHeader>>16)&PCI_HEADER_TYPE_MULTI_FUNCTION)
          ucNumFuncs=PCI_MAX_FUNCTIONS;
       else
          ucNumFuncs=1;
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/pci/pcifinddevice.c b/c/src/lib/libbsp/powerpc/mvme5500/pci/pcifinddevice.c
index 54abdf8791..ac2f050de7 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/pci/pcifinddevice.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/pci/pcifinddevice.c
@@ -10,10 +10,6 @@
  *
  */
 
-#define PCI_INVALID_VENDORDEVICEID	0xffffffff
-#define PCI_MULTI_FUNCTION			0x80
-
-
 #include <bsp/pci.h>
 #include <rtems/bspIo.h>
 #include <bsp.h>
@@ -42,7 +38,7 @@ int pci_find_device( unsigned short vendorid, unsigned short deviceid,
   for (bus=0; bus<BSP_MAX_PCI_BUS;  bus++) {
       for (dev=0; dev<PCI_MAX_DEVICES; dev++) {
 	  pci_read_config_byte(bus, dev, 0, PCI_HEADER_TYPE, &hd);
-	  hd = (hd & PCI_MULTI_FUNCTION ? PCI_MAX_FUNCTIONS : 1);
+	  hd = (hd & PCI_HEADER_TYPE_MULTI_FUNCTION ? PCI_MAX_FUNCTIONS : 1);
      	  for (fun=0; fun<hd; fun++) {
 	      /*
 	       * The last devfn id/slot is special; must skip it