summaryrefslogtreecommitdiff
path: root/drivers/serial/Makefile
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-02-19 07:15:01 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-02-19 07:15:01 +0100
commita87a0ce7028d5371c81d77ba72c1ba43a1ca77bc (patch)
tree98bff4a88314611dc6f7afea5f88953309940a51 /drivers/serial/Makefile
parentc4d376fd1c2bce8d64cec0431dd3f24957b6dec4 (diff)
parentf8d1086851409ee16344932ef367b8a05c365b09 (diff)
downloadu-boot-imx-a87a0ce7028d5371c81d77ba72c1ba43a1ca77bc.zip
u-boot-imx-a87a0ce7028d5371c81d77ba72c1ba43a1ca77bc.tar.gz
u-boot-imx-a87a0ce7028d5371c81d77ba72c1ba43a1ca77bc.tar.bz2
Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/serial/Makefile')
-rw-r--r--drivers/serial/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 5eb4601..571c18f 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -18,7 +18,6 @@ obj-$(CONFIG_SYS_NS16550) += ns16550.o
obj-$(CONFIG_S5P) += serial_s5p.o
obj-$(CONFIG_SYS_NS16550_SERIAL) += serial_ns16550.o
obj-$(CONFIG_IMX_SERIAL) += serial_imx.o
-obj-$(CONFIG_IXP_SERIAL) += serial_ixp.o
obj-$(CONFIG_KS8695_SERIAL) += serial_ks8695.o
obj-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
obj-$(CONFIG_MXC_UART) += serial_mxc.o