diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
| commit | 2935411dea8ed1b76e0e42a8f1988ba127c3dc02 (patch) | |
| tree | 3bec81536dd9e88257b061b00a765198dd787c2e /arch/arm/mach-samsung/Makefile | |
| parent | 88107f6e121a3a1835aa261a39a0a284e06457ce (diff) | |
| parent | 15d989e83d84ba13c100fbfe60980d22bf807fea (diff) | |
| download | barebox-2935411dea8ed1b76e0e42a8f1988ba127c3dc02.tar.gz barebox-2935411dea8ed1b76e0e42a8f1988ba127c3dc02.tar.xz | |
Merge branch 'for-next/reset-source'
Diffstat (limited to 'arch/arm/mach-samsung/Makefile')
| -rw-r--r-- | arch/arm/mach-samsung/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-samsung/Makefile b/arch/arm/mach-samsung/Makefile index 6020587747..f7db1f7d05 100644 --- a/arch/arm/mach-samsung/Makefile +++ b/arch/arm/mach-samsung/Makefile @@ -1,4 +1,5 @@ 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 |