diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-17 23:26:44 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-17 23:26:44 +0100 |
commit | 6bf6d1af86e7dec914f7916f2a00910650a73469 (patch) | |
tree | 7fb14c7fce10a9f3e5c48f49941b8642562017ec /arch/arm/mach-mxs/Kconfig | |
parent | 45a690f6bcd5506d9988d0d069811ac9380750ad (diff) | |
parent | 63f49dce39e5d6a19e5f1f9004eb48e73ba259e8 (diff) | |
download | op-kernel-dev-6bf6d1af86e7dec914f7916f2a00910650a73469.zip op-kernel-dev-6bf6d1af86e7dec914f7916f2a00910650a73469.tar.gz |
Merge remote-tracking branch 'asoc/topic/blackfin' into for-3.7
Diffstat (limited to 'arch/arm/mach-mxs/Kconfig')
-rw-r--r-- | arch/arm/mach-mxs/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig index ccdf83b..9a8bbda 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" |