diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 19:05:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 19:05:40 -0700 |
commit | 63a93699c6a58795b854ff573542a08367684dae (patch) | |
tree | 057ab4cbde66862c51867dde030be69a2fa7073f /arch/arm/include | |
parent | 16d8775700f1815076f879719ce14b33f50a3171 (diff) | |
parent | 21bd6d37cf23e643020bf28b41844ff0040c9393 (diff) | |
download | kernel_samsung_smdk4412-63a93699c6a58795b854ff573542a08367684dae.zip kernel_samsung_smdk4412-63a93699c6a58795b854ff573542a08367684dae.tar.gz kernel_samsung_smdk4412-63a93699c6a58795b854ff573542a08367684dae.tar.bz2 |
Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6629/2: aaec2000: remove support for mach-aaec2000
ARM: lh7a40x: remove unmaintained platform support
Fix up trivial conflicts in
- arch/arm/mach-{aaec2000,lh7a40x}/include/mach/memory.h (removed)
- drivers/usb/gadget/Kconfig (USB_[GADGET_]LH7A40X removed, others added)
Diffstat (limited to 'arch/arm/include')
-rw-r--r-- | arch/arm/include/asm/setup.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h index f1e5a9b..da8b52e 100644 --- a/arch/arm/include/asm/setup.h +++ b/arch/arm/include/asm/setup.h @@ -192,11 +192,7 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn } /* * Memory map description */ -#ifdef CONFIG_ARCH_LH7A40X -# define NR_BANKS 16 -#else -# define NR_BANKS 8 -#endif +#define NR_BANKS 8 struct membank { unsigned long start; |