diff options
| author | Hans-Christian Egtvedt <egtvedt@samfundet.no> | 2013-05-13 22:13:59 +0200 |
|---|---|---|
| committer | Hans-Christian Egtvedt <egtvedt@samfundet.no> | 2013-05-13 22:13:59 +0200 |
| commit | d6ffe1b8ecc59ae23524e408063dc7725f485f96 (patch) | |
| tree | 4fa5c0e3812d9c5372580f8c5997eee1f423c8e3 /arch | |
| parent | Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux (diff) | |
| download | linux-d6ffe1b8ecc59ae23524e408063dc7725f485f96.tar.xz linux-d6ffe1b8ecc59ae23524e408063dc7725f485f96.zip | |
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 <pebolle@tiscali.nl>
Signed-off-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/avr32/Kconfig | 5 | ||||
| -rw-r--r-- | arch/avr32/include/asm/numnodes.h | 7 |
2 files changed, 5 insertions, 7 deletions
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 */ |