diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-22 18:06:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-22 18:06:57 -0700 |
| commit | 101b82f56d50a445bb5281f834c86e106732070f (patch) | |
| tree | 951e204487494557ca0f231e7fd8457bc58dddd2 /arch/avr32/Kconfig | |
| parent | 3cb7a59fd8c816af6765f3712cd233d83984edf2 (diff) | |
| parent | 0c9b5a317b8ae7201fed07ec66d642b2ad7ea1b0 (diff) | |
| download | linux-101b82f56d50a445bb5281f834c86e106732070f.tar.gz linux-101b82f56d50a445bb5281f834c86e106732070f.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 update from Hans-Christian Egtvedt:
"wow, it has gone 10 releases since my last request :("
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
avr32: fix building warnings caused by redefinitions of HZ
avr32: fix relocation check for signed 18-bit offset
avr32: move NODES_SHIFT into Kconfig and delete numnodes.h
Diffstat (limited to 'arch/avr32/Kconfig')
| -rw-r--r-- | arch/avr32/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index bdc35589277f..549903cfc2cb 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig @@ -205,6 +205,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 |