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-imx/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-imx/Makefile')
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 89a89466ba..2ff537ab89 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -1,4 +1,5 @@ obj-y += clocksource.o gpio.o +obj-$(CONFIG_RESET_SOURCE) += reset_source.o obj-$(CONFIG_ARCH_IMX1) += speed-imx1.o imx1.o iomux-v1.o obj-$(CONFIG_ARCH_IMX25) += speed-imx25.o imx25.o iomux-v3.o obj-$(CONFIG_ARCH_IMX21) += speed-imx21.o imx21.o iomux-v1.o |