Merge branch 'testing' into working

[platform/kernel/u-boot.git] / drivers / cs8900.h

diff --git a/drivers/cs8900.h b/drivers/cs8900.h
index dbfda3c..f886d10 100644 (file)
--- a/drivers/cs8900.h
+++ b/drivers/cs8900.h
@@ -47,7 +47,7 @@
   #define CS8900_OFF 0x02
   #define CS8900_BUS16_0  *(volatile u8 *)(CS8900_BASE+0x00)
   #define CS8900_BUS16_1  *(volatile u8 *)(CS8900_BASE+0x01)
-#elif  CS8900_BUS32
+#elif  defined(CS8900_BUS32)
   /* 32 bit aligned registers, 16 bit wide (we ignore upper 16 bits) */
   #define CS8900_REG u32
   #define CS8900_OFF 0x04
@@ -253,6 +253,6 @@
 #define EEPROM_ERASE_CMD       0x0300
 
 extern int cs8900_e2prom_read(uchar, ushort *);
-extern void cs8900_e2prom_write(uchar, ushort);
+extern int cs8900_e2prom_write(uchar, ushort);
 
 #endif /* CONFIG_DRIVER_CS8900 */