Index: packages/hal/powerpc/ppc40x/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/powerpc/ppc40x/current/ChangeLog,v
retrieving revision 1.15
diff -u -r1.15 ChangeLog
--- packages/hal/powerpc/ppc40x/current/ChangeLog	16 Sep 2004 21:50:47 -0000	1.15
+++ packages/hal/powerpc/ppc40x/current/ChangeLog	4 May 2005 10:11:16 -0000
@@ -1,3 +1,8 @@
+2005-05-04  Peter Korsgaard  <jacmet@sunsite.dk>
+
+	* include/var_io.h: Only define PCI macros if 405GP PCI support is
+	enabled.
+
 2004-09-16  Gary Thomas  <gary@mlbassoc.com>
 
 	* src/hal_diag.c: Assert RTS/DTR modem signals.
Index: packages/hal/powerpc/ppc40x/current/include/var_io.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/powerpc/ppc40x/current/include/var_io.h,v
retrieving revision 1.1
diff -u -r1.1 var_io.h
--- packages/hal/powerpc/ppc40x/current/include/var_io.h	19 Sep 2003 17:11:29 -0000	1.1
+++ packages/hal/powerpc/ppc40x/current/include/var_io.h	4 May 2005 10:11:16 -0000
@@ -60,7 +60,7 @@
 
 #include CYGBLD_HAL_PLF_IO_H
 
-#ifdef CYGPKG_IO_PCI
+#ifdef CYGHWR_HAL_POWERPC_PPC405_PCI
 // These must be defined by the platform
 #if !defined(CYG_PCI_MAX_BUS)
 #error "Missing CYG_PCI_MAX_BUS platform definition"
@@ -128,7 +128,7 @@
 externC void hal_ppc405_pci_cfg_write_uint32(int bus, int dev, int offset, cyg_uint32 val);
 #define HAL_PCI_CFG_WRITE_UINT32( __bus, __devfn, __offset, __val ) \
   hal_ppc405_pci_cfg_write_uint32(__bus, __devfn, __offset, __val)
-#endif // CYGPKG_IO_PCI
+#endif // CYGHWR_HAL_POWERPC_PPC405_PCI
 
 static __inline__ unsigned long
 _le32(unsigned long val)