diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-22 12:24:26 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-22 12:41:48 -0500 |
| commit | 695884fb8acd9857e0e7120ccb2150e30f4b8fef (patch) | |
| tree | 49aa424c1a021ce432e9fa5ea29d37a23e4e30cc /arch/arm/plat-s5p/Makefile | |
| parent | 5df91509d324d44cfb11e55d9cb02fe18b53b045 (diff) | |
| parent | 04bea68b2f0eeebb089ecc67b618795925268b4a (diff) | |
Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86/platform
Reason: x86 devicetree support for ce4100 depends on those device tree
changes scheduled for .39.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/plat-s5p/Makefile')
| -rw-r--r-- | arch/arm/plat-s5p/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile index de65238a7aef..92efe1adcfd6 100644 --- a/arch/arm/plat-s5p/Makefile +++ b/arch/arm/plat-s5p/Makefile | |||
| @@ -28,3 +28,6 @@ obj-$(CONFIG_S5P_DEV_FIMC0) += dev-fimc0.o | |||
| 28 | obj-$(CONFIG_S5P_DEV_FIMC1) += dev-fimc1.o | 28 | obj-$(CONFIG_S5P_DEV_FIMC1) += dev-fimc1.o |
| 29 | obj-$(CONFIG_S5P_DEV_FIMC2) += dev-fimc2.o | 29 | obj-$(CONFIG_S5P_DEV_FIMC2) += dev-fimc2.o |
| 30 | obj-$(CONFIG_S5P_DEV_ONENAND) += dev-onenand.o | 30 | obj-$(CONFIG_S5P_DEV_ONENAND) += dev-onenand.o |
| 31 | obj-$(CONFIG_S5P_DEV_CSIS0) += dev-csis0.o | ||
| 32 | obj-$(CONFIG_S5P_DEV_CSIS1) += dev-csis1.o | ||
| 33 | obj-$(CONFIG_S5P_SYSMMU) += sysmmu.o | ||