diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-10-30 07:35:11 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-10-30 07:35:11 -0400 |
| commit | 67577927e8d7a1f4b09b4992df640eadc6aacb36 (patch) | |
| tree | 2e9efe6b5745965faf0dcc084d4613d9356263f9 /arch/arm/plat-s5p/Makefile | |
| parent | 6fe4c590313133ebd5dadb769031489ff178ece1 (diff) | |
| parent | 51f00a471ce8f359627dd99aeac322947a0e491b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
drivers/mtd/mtd_blkdevs.c
Merge Grant's device-tree bits so that we can apply the subsequent fixes.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'arch/arm/plat-s5p/Makefile')
| -rw-r--r-- | arch/arm/plat-s5p/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile index b2e029673950..f3e917e27da8 100644 --- a/arch/arm/plat-s5p/Makefile +++ b/arch/arm/plat-s5p/Makefile | |||
| @@ -24,3 +24,4 @@ obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o | |||
| 24 | obj-$(CONFIG_S5P_DEV_FIMC0) += dev-fimc0.o | 24 | obj-$(CONFIG_S5P_DEV_FIMC0) += dev-fimc0.o |
| 25 | obj-$(CONFIG_S5P_DEV_FIMC1) += dev-fimc1.o | 25 | obj-$(CONFIG_S5P_DEV_FIMC1) += dev-fimc1.o |
| 26 | obj-$(CONFIG_S5P_DEV_FIMC2) += dev-fimc2.o | 26 | obj-$(CONFIG_S5P_DEV_FIMC2) += dev-fimc2.o |
| 27 | obj-$(CONFIG_S5P_DEV_ONENAND) += dev-onenand.o | ||