Merge branch 'devel-stable' into devel

[sfrench/cifs-2.6.git] / arch / arm / mach-clps711x / include / mach / hardware.h

diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h
index b3ebe9e4871fe938585e5cad55eb7390424d25b3..d0b7d870be9c82d0febc7e76a2c90d107c789340 100644 (file)
--- a/arch/arm/mach-clps711x/include/mach/hardware.h
+++ b/arch/arm/mach-clps711x/include/mach/hardware.h
@@ -69,13 +69,6 @@
 #define SYSPLD_VIRT_BASE       0xfe000000
 #define SYSPLD_BASE            SYSPLD_VIRT_BASE
 
-#ifndef __ASSEMBLER__
-
-#define PCIO_BASE              IO_BASE
-
-#endif
-
-
 #if  defined (CONFIG_ARCH_AUTCPU12)
 
 #define  CS89712_VIRT_BASE     CLPS7111_VIRT_BASE