From d6ffe1b8ecc59ae23524e408063dc7725f485f96 Mon Sep 17 00:00:00 2001 From: Hans-Christian Egtvedt Date: Mon, 13 May 2013 22:13:59 +0200 Subject: [PATCH] avr32: move NODES_SHIFT into Kconfig and delete numnodes.h This patch moves the NODES_SHIFT symbol into Kconfig to synchronize AVR32 architecture with the current kernel. The global header files do longer use the value from numnodes.h. See commit c80d79d746cc48bd94b0ce4f6d4f3c90cd403aaf for details. Signed-off-by: Paul Bolle Signed-off-by: Hans-Christian Egtvedt --- arch/avr32/Kconfig | 5 +++++ arch/avr32/include/asm/numnodes.h | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 arch/avr32/include/asm/numnodes.h diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index 22c40308360b..ba4d40569f9e 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig @@ -208,6 +208,11 @@ config ARCH_DISCONTIGMEM_ENABLE config ARCH_SPARSEMEM_ENABLE def_bool n +config NODES_SHIFT + int + default "2" + depends on NEED_MULTIPLE_NODES + source "mm/Kconfig" config OWNERSHIP_TRACE diff --git a/arch/avr32/include/asm/numnodes.h b/arch/avr32/include/asm/numnodes.h deleted file mode 100644 index 0b864d7ce330..000000000000 --- a/arch/avr32/include/asm/numnodes.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_AVR32_NUMNODES_H -#define __ASM_AVR32_NUMNODES_H - -/* Max 4 nodes */ -#define NODES_SHIFT 2 - -#endif /* __ASM_AVR32_NUMNODES_H */ -- 2.30.2