diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 02:05:40 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 02:05:40 (GMT) |
commit | 63a93699c6a58795b854ff573542a08367684dae (patch) | |
tree | 057ab4cbde66862c51867dde030be69a2fa7073f /drivers/tty/serial/Makefile | |
parent | 16d8775700f1815076f879719ce14b33f50a3171 (diff) | |
parent | 21bd6d37cf23e643020bf28b41844ff0040c9393 (diff) | |
download | linux-fsl-qoriq-63a93699c6a58795b854ff573542a08367684dae.tar.xz |
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 'drivers/tty/serial/Makefile')
-rw-r--r-- | drivers/tty/serial/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile index d94dc00..31e868c 100644 --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile @@ -54,7 +54,6 @@ obj-$(CONFIG_SERIAL_68328) += 68328serial.o obj-$(CONFIG_SERIAL_68360) += 68360serial.o obj-$(CONFIG_SERIAL_MCF) += mcf.o obj-$(CONFIG_SERIAL_PMACZILOG) += pmac_zilog.o -obj-$(CONFIG_SERIAL_LH7A40X) += serial_lh7a40x.o obj-$(CONFIG_SERIAL_DZ) += dz.o obj-$(CONFIG_SERIAL_ZS) += zs.o obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o |