Commit 63a93699c6a58795b854ff573542a08367684dae
Exists in
master
and in
20 other branches
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)
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 76 changed files Side-by-side Diff
- Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen
- Documentation/arm/Sharp-LH/CompactFlash
- Documentation/arm/Sharp-LH/IOBarrier
- Documentation/arm/Sharp-LH/KEV7A400
- Documentation/arm/Sharp-LH/LCDPanels
- Documentation/arm/Sharp-LH/LPD7A400
- Documentation/arm/Sharp-LH/LPD7A40X
- Documentation/arm/Sharp-LH/SDRAM
- Documentation/arm/Sharp-LH/VectoredInterruptController
- arch/arm/Kconfig
- arch/arm/Makefile
- arch/arm/configs/lpd7a400_defconfig
- arch/arm/configs/lpd7a404_defconfig
- arch/arm/include/asm/setup.h
- arch/arm/mach-aaec2000/Kconfig
- arch/arm/mach-aaec2000/Makefile
- arch/arm/mach-aaec2000/Makefile.boot
- arch/arm/mach-aaec2000/aaed2000.c
- arch/arm/mach-aaec2000/core.c
- arch/arm/mach-aaec2000/core.h
- arch/arm/mach-aaec2000/include/mach/aaec2000.h
- arch/arm/mach-aaec2000/include/mach/aaed2000.h
- arch/arm/mach-aaec2000/include/mach/debug-macro.S
- arch/arm/mach-aaec2000/include/mach/entry-macro.S
- arch/arm/mach-aaec2000/include/mach/hardware.h
- arch/arm/mach-aaec2000/include/mach/io.h
- arch/arm/mach-aaec2000/include/mach/irqs.h
- arch/arm/mach-aaec2000/include/mach/memory.h
- arch/arm/mach-aaec2000/include/mach/system.h
- arch/arm/mach-aaec2000/include/mach/timex.h
- arch/arm/mach-aaec2000/include/mach/uncompress.h
- arch/arm/mach-aaec2000/include/mach/vmalloc.h
- arch/arm/mach-lh7a40x/Kconfig
- arch/arm/mach-lh7a40x/Makefile
- arch/arm/mach-lh7a40x/Makefile.boot
- arch/arm/mach-lh7a40x/arch-kev7a400.c
- arch/arm/mach-lh7a40x/arch-lpd7a40x.c
- arch/arm/mach-lh7a40x/clcd.c
- arch/arm/mach-lh7a40x/clocks.c
- arch/arm/mach-lh7a40x/common.h
- arch/arm/mach-lh7a40x/include/mach/clocks.h
- arch/arm/mach-lh7a40x/include/mach/constants.h
- arch/arm/mach-lh7a40x/include/mach/debug-macro.S
- arch/arm/mach-lh7a40x/include/mach/dma.h
- arch/arm/mach-lh7a40x/include/mach/entry-macro.S
- arch/arm/mach-lh7a40x/include/mach/hardware.h
- arch/arm/mach-lh7a40x/include/mach/io.h
- arch/arm/mach-lh7a40x/include/mach/irqs.h
- arch/arm/mach-lh7a40x/include/mach/memory.h
- arch/arm/mach-lh7a40x/include/mach/registers.h
- arch/arm/mach-lh7a40x/include/mach/ssp.h
- arch/arm/mach-lh7a40x/include/mach/system.h
- arch/arm/mach-lh7a40x/include/mach/timex.h
- arch/arm/mach-lh7a40x/include/mach/uncompress.h
- arch/arm/mach-lh7a40x/include/mach/vmalloc.h
- arch/arm/mach-lh7a40x/irq-kev7a400.c
- arch/arm/mach-lh7a40x/irq-lh7a400.c
- arch/arm/mach-lh7a40x/irq-lh7a404.c
- arch/arm/mach-lh7a40x/irq-lpd7a40x.c
- arch/arm/mach-lh7a40x/lcd-panel.h
- arch/arm/mach-lh7a40x/ssp-cpld.c
- arch/arm/mach-lh7a40x/time.c
- drivers/net/smc91x.h
- drivers/tty/serial/Kconfig
- drivers/tty/serial/Makefile
- drivers/tty/serial/serial_lh7a40x.c
- drivers/usb/Kconfig
- drivers/usb/gadget/Kconfig
- drivers/usb/gadget/Makefile
- drivers/usb/gadget/gadget_chips.h
- drivers/usb/gadget/lh7a40x_udc.c
- drivers/usb/gadget/lh7a40x_udc.h
- drivers/usb/host/ohci-hcd.c
- drivers/usb/host/ohci-lh7a404.c
- drivers/usb/host/ohci.h
- drivers/video/Kconfig