aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/Makefile
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-01-19 18:36:09 +0900
committerBen Dooks <ben-linux@fluff.org>2010-01-19 18:36:09 +0900
commit668dfc7527eb755e1bf194bf19c0c281e9df6deb (patch)
tree2d9ba8e3ebbb7579f1af0493a9783f640ca86546 /arch/arm/plat-samsung/Makefile
parent9e157144afe81052f5abe122c2469e33a30d20a5 (diff)
parent22c810ab3e25d16e6f128384d107b933b6fd8fff (diff)
downloadkernel_samsung_tuna-668dfc7527eb755e1bf194bf19c0c281e9df6deb.zip
kernel_samsung_tuna-668dfc7527eb755e1bf194bf19c0c281e9df6deb.tar.gz
kernel_samsung_tuna-668dfc7527eb755e1bf194bf19c0c281e9df6deb.tar.bz2
ARM: Merge next-samsung-devupdates1
Merge branch 'next-samsung-devupdates1' into next-samsung-try7
Diffstat (limited to 'arch/arm/plat-samsung/Makefile')
-rw-r--r--arch/arm/plat-samsung/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index ee31038..ceac416 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_S3C_DEV_HSMMC2) += dev-hsmmc2.o
obj-y += dev-i2c0.o
obj-$(CONFIG_S3C_DEV_I2C1) += dev-i2c1.o
obj-$(CONFIG_S3C_DEV_FB) += dev-fb.o
+obj-y += dev-uart.o
obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o
obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o
obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o