[ARM] Cleanup Ceiva merge.

arch/arm/mach-clps711x/ceiva.c

@@ -45,7 +45,7 @@ static struct map_desc ceiva_io_desc[] __initdata = {
 };
 
 
-void __init ceiva_map_io(void)
+static void __init ceiva_map_io(void)
 {
         clps711x_map_io();
         iotable_init(ceiva_io_desc, ARRAY_SIZE(ceiva_io_desc));

include/asm-arm/arch-clps711x/hardware.h

@@ -65,13 +65,6 @@
 #define EP7212_BASE		CLPS7111_VIRT_BASE
 #include <asm/hardware/ep7212.h>
 
-#elif define (CONFIG_ARCH_CEIVA)
-#define EP7212_VIRT_BASE	CLPS7111_VIRT_BASE
-#define EP7212_BASE		CLPS7111_VIRT_BASE
-
-#include <asm/hardware/clps7111.h>
-#include <asm/hardware/ep7212.h>
-
 #endif
 
 #define SYSPLD_VIRT_BASE	0xfe000000
@@ -243,4 +236,3 @@
 #endif // #if defined (CONFIG_ARCH_CEIVA)
 
 #endif
-