diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 04:36:09 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 04:36:09 -0500 |
| commit | 668dfc7527eb755e1bf194bf19c0c281e9df6deb (patch) | |
| tree | 2d9ba8e3ebbb7579f1af0493a9783f640ca86546 /arch/arm/plat-samsung/Makefile | |
| parent | 9e157144afe81052f5abe122c2469e33a30d20a5 (diff) | |
| parent | 22c810ab3e25d16e6f128384d107b933b6fd8fff (diff) | |
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/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index ee310384b90f..ceac416d80b8 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 | |||
| 32 | obj-y += dev-i2c0.o | 32 | obj-y += dev-i2c0.o |
| 33 | obj-$(CONFIG_S3C_DEV_I2C1) += dev-i2c1.o | 33 | obj-$(CONFIG_S3C_DEV_I2C1) += dev-i2c1.o |
| 34 | obj-$(CONFIG_S3C_DEV_FB) += dev-fb.o | 34 | obj-$(CONFIG_S3C_DEV_FB) += dev-fb.o |
| 35 | obj-y += dev-uart.o | ||
| 35 | obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o | 36 | obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o |
| 36 | obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o | 37 | obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o |
| 37 | obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o | 38 | obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o |