diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-07-30 15:06:14 +0200 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-08-04 22:52:23 +0800 |
| commit | 6eec0152c4aa43636e180b21d5c71743f25d1220 (patch) | |
| tree | da812cc4fc08764c04d575db5565c8d8fc8fa9b6 /arch/arm | |
| parent | 3bed491c8d28329e34f8a31e3fe64d03f3a350f1 (diff) | |
| download | linux-stable-6eec0152c4aa43636e180b21d5c71743f25d1220.tar.gz linux-stable-6eec0152c4aa43636e180b21d5c71743f25d1220.tar.bz2 linux-stable-6eec0152c4aa43636e180b21d5c71743f25d1220.zip | |
ARM: mxs: always build ocotp
With this patch ocotp support will always be build into the kernel on mxs.
Otherwise a DT-only kernel fails to link with:
arch/arm/mach-mxs/mach-mxs.c:169: undefined reference to `mxs_get_ocotp'
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-mxs/Kconfig | 6 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/Makefile | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig index ccdf83b17cf1..9a8bbda195b2 100644 --- a/arch/arm/mach-mxs/Kconfig +++ b/arch/arm/mach-mxs/Kconfig @@ -2,9 +2,6 @@ if ARCH_MXS source "arch/arm/mach-mxs/devices/Kconfig" -config MXS_OCOTP - bool - config SOC_IMX23 bool select ARM_AMBA @@ -66,7 +63,6 @@ config MACH_MX28EVK select MXS_HAVE_PLATFORM_MXS_SAIF select MXS_HAVE_PLATFORM_MXS_I2C select MXS_HAVE_PLATFORM_RTC_STMP3XXX - select MXS_OCOTP help Include support for MX28EVK platform. This includes specific configurations for the board and its peripherals. @@ -94,7 +90,6 @@ config MODULE_M28 select MXS_HAVE_PLATFORM_MXS_I2C select MXS_HAVE_PLATFORM_MXS_MMC select MXS_HAVE_PLATFORM_MXSFB - select MXS_OCOTP config MODULE_APX4 bool @@ -106,7 +101,6 @@ config MODULE_APX4 select MXS_HAVE_PLATFORM_MXS_I2C select MXS_HAVE_PLATFORM_MXS_MMC select MXS_HAVE_PLATFORM_MXS_SAIF - select MXS_OCOTP config MACH_TX28 bool "Ka-Ro TX28 module" diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile index e41590ccb437..fed3695a1339 100644 --- a/arch/arm/mach-mxs/Makefile +++ b/arch/arm/mach-mxs/Makefile @@ -1,7 +1,6 @@ # Common support -obj-y := devices.o icoll.o iomux.o system.o timer.o mm.o +obj-y := devices.o icoll.o iomux.o ocotp.o system.o timer.o mm.o -obj-$(CONFIG_MXS_OCOTP) += ocotp.o obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_MACH_MXS_DT) += mach-mxs.o |