Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[pandora-kernel.git] / arch / arm / mach-ep93xx / include / mach / ts72xx.h

diff --git a/arch/arm/mach-ep93xx/include/mach/ts72xx.h b/arch/arm/mach-ep93xx/include/mach/ts72xx.h
index 30b318a..4117344 100644 (file)
--- a/arch/arm/mach-ep93xx/include/mach/ts72xx.h
+++ b/arch/arm/mach-ep93xx/include/mach/ts72xx.h
@@ -41,9 +41,6 @@
 #define TS72XX_OPTIONS2_TS9420_BOOT    0x02
 
 
-#define TS72XX_NOR_PHYS_BASE           0x60000000
-#define TS72XX_NOR2_PHYS_BASE          0x62000000
-
 #define TS72XX_NAND1_DATA_PHYS_BASE    0x60000000
 #define TS72XX_NAND2_DATA_PHYS_BASE    0x70000000
 #define TS72XX_NAND_DATA_VIRT_BASE     0xfebfc000
@@ -70,7 +67,7 @@
 
 
 #ifndef __ASSEMBLY__
-#include <asm/io.h>
+#include <linux/io.h>
 
 static inline int board_is_ts7200(void)
 {