Skip to content

L
linux
Commit 2d678419 authored by Russell King's avatar Russell King
Browse files
Options

[ARM] Cleanup Ceiva merge.

parent d5096010
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 9 deletions
arch/arm/mach-clps711x/ceiva.c
View file @ 2d678419
...@@ -45,7 +45,7 @@ static struct map_desc ceiva_io_desc[] __initdata = { ...@@ -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(); clps711x_map_io();
iotable_init(ceiva_io_desc, ARRAY_SIZE(ceiva_io_desc)); iotable_init(ceiva_io_desc, ARRAY_SIZE(ceiva_io_desc));
......
include/asm-arm/arch-clps711x/hardware.h
View file @ 2d678419
...@@ -65,13 +65,6 @@ ...@@ -65,13 +65,6 @@
#define EP7212_BASE CLPS7111_VIRT_BASE #define EP7212_BASE CLPS7111_VIRT_BASE
#include <asm/hardware/ep7212.h> #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 #endif
#define SYSPLD_VIRT_BASE 0xfe000000 #define SYSPLD_VIRT_BASE 0xfe000000
...@@ -243,4 +236,3 @@ ...@@ -243,4 +236,3 @@
#endif // #if defined (CONFIG_ARCH_CEIVA) #endif // #if defined (CONFIG_ARCH_CEIVA)
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7