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/mach-aaec2000/Kconfig | |
| parent | 16d8775700f1815076f879719ce14b33f50a3171 (diff) | |
| parent | 21bd6d37cf23e643020bf28b41844ff0040c9393 (diff) | |
| download | talos-obmc-linux-63a93699c6a58795b854ff573542a08367684dae.tar.gz talos-obmc-linux-63a93699c6a58795b854ff573542a08367684dae.zip | |
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/mach-aaec2000/Kconfig')
| -rw-r--r-- | arch/arm/mach-aaec2000/Kconfig | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-aaec2000/Kconfig b/arch/arm/mach-aaec2000/Kconfig deleted file mode 100644 index 5e4bef93754c..000000000000 --- a/arch/arm/mach-aaec2000/Kconfig +++ /dev/null @@ -1,11 +0,0 @@ -if ARCH_AAEC2000 - -menu "Agilent AAEC-2000 Implementations" - -config MACH_AAED2000 - bool "Agilent AAED-2000 Development Platform" - select CPU_ARM920T - -endmenu - -endif |
