diff options
Diffstat (limited to 'arch/arm/mm')
-rw-r--r-- | arch/arm/mm/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mm/init.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 3696f4fe45de..746cbb7c8e95 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -359,7 +359,7 @@ config CPU_XSC3 | |||
359 | # Feroceon | 359 | # Feroceon |
360 | config CPU_FEROCEON | 360 | config CPU_FEROCEON |
361 | bool | 361 | bool |
362 | depends on ARCH_ORION | 362 | depends on ARCH_ORION5X |
363 | default y | 363 | default y |
364 | select CPU_32v5 | 364 | select CPU_32v5 |
365 | select CPU_ABRT_EV5T | 365 | select CPU_ABRT_EV5T |
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index ec00f26bffa4..b657f1719af0 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
@@ -48,8 +48,6 @@ void show_mem(void) | |||
48 | 48 | ||
49 | printk("Mem-info:\n"); | 49 | printk("Mem-info:\n"); |
50 | show_free_areas(); | 50 | show_free_areas(); |
51 | printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); | ||
52 | |||
53 | for_each_online_node(node) { | 51 | for_each_online_node(node) { |
54 | pg_data_t *n = NODE_DATA(node); | 52 | pg_data_t *n = NODE_DATA(node); |
55 | struct page *map = n->node_mem_map - n->node_start_pfn; | 53 | struct page *map = n->node_mem_map - n->node_start_pfn; |