diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:50:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:50:18 +0200 |
| commit | a934d16a2aa402f9f417f8a533ea80abcf1d2771 (patch) | |
| tree | 3ad455d393a0ef35b44ea2d6aa2ade676801250e /arch/arm/mach-samsung/Makefile | |
| parent | 33838de7a241242c40f23fa3f95939d29c78544d (diff) | |
| parent | d65926656c9e51419ec491a48f71017e3c9759cd (diff) | |
| download | barebox-a934d16a2aa402f9f417f8a533ea80abcf1d2771.tar.gz barebox-a934d16a2aa402f9f417f8a533ea80abcf1d2771.tar.xz | |
Merge branch 'for-next/samsung'
Conflicts:
arch/arm/Makefile
arch/arm/mach-samsung/Makefile
arch/arm/mach-samsung/include/mach/s5pcxx-iomap.h
Diffstat (limited to 'arch/arm/mach-samsung/Makefile')
| -rw-r--r-- | arch/arm/mach-samsung/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-samsung/Makefile b/arch/arm/mach-samsung/Makefile index f7db1f7d05..39aa26957b 100644 --- a/arch/arm/mach-samsung/Makefile +++ b/arch/arm/mach-samsung/Makefile @@ -2,6 +2,7 @@ obj-y += s3c-timer.o generic.o obj-$(CONFIG_RESET_SOURCE) += reset_source.o obj-lowlevel-$(CONFIG_ARCH_S3C24xx) += lowlevel-s3c24x0.o obj-lowlevel-$(CONFIG_ARCH_S5PCxx) += lowlevel-s5pcxx.o -obj-$(CONFIG_ARCH_S3C24xx) += gpio-s3c24x0.o s3c24xx-clocks.o mem-s3c24x0.o +obj-$(CONFIG_ARCH_S3C24xx) += gpio-s3c24x0.o clocks-s3c24xx.o mem-s3c24x0.o +obj-$(CONFIG_ARCH_S3C64xx) += gpio-s3c64xx.o clocks-s3c64xx.o mem-s3c64xx.o obj-$(CONFIG_ARCH_S5PCxx) += gpio-s5pcxx.o clocks-s5pcxx.o mem-s5pcxx.o obj-$(CONFIG_S3C_LOWLEVEL_INIT) += $(obj-lowlevel-y) |