Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[mv-sheeva.git] / include / asm-arm / arch-ixp4xx / ixdp425.h

diff --git a/include/asm-arm/arch-ixp4xx/ixdp425.h b/include/asm-arm/arch-ixp4xx/ixdp425.h
index 7d21bf941379033c288dc7fc2eba0c4c9c7e26d6..3d3820d7ba09f71847bb9256aac2c6a7bb71b1ea 100644 (file)
--- a/include/asm-arm/arch-ixp4xx/ixdp425.h
+++ b/include/asm-arm/arch-ixp4xx/ixdp425.h
@@ -16,9 +16,6 @@
 #error "Do not include this directly, instead #include <asm/hardware.h>"
 #endif
 
-#define        IXDP425_FLASH_BASE      IXP4XX_EXP_BUS_CS0_BASE_PHYS
-#define        IXDP425_FLASH_SIZE      IXP4XX_EXP_BUS_CSX_REGION_SIZE
-
 #define        IXDP425_SDA_PIN         7
 #define        IXDP425_SCL_PIN         6