diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-07 11:10:05 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-07 11:10:05 +1100 |
commit | 4f9460c83e39da2532b64c8fd79e88e9e7c1698d (patch) | |
tree | d2197b143cdd2566b995c8459146ed2cb6571afa /arch/arm/plat-mxc/Kconfig | |
parent | aabccf74c0dfe2746d4d517edd3d78c6f92b60a8 (diff) | |
parent | bddc1e2cab5e29e11e42c15da7ae72225c39db8b (diff) |
Merge remote branch 'i.MX/for-next'
Diffstat (limited to 'arch/arm/plat-mxc/Kconfig')
-rw-r--r-- | arch/arm/plat-mxc/Kconfig | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index 64e3a64520e0..389f21795015 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig @@ -21,10 +21,6 @@ config ARCH_MX2 config ARCH_MX25 bool "MX25-based" - select CPU_ARM926T - select ARCH_MXC_IOMUX_V3 - select HAVE_FB_IMX - select ARCH_MXC_AUDMUX_V2 help This enables support for systems based on the Freescale i.MX25 family @@ -51,7 +47,6 @@ endchoice source "arch/arm/mach-imx/Kconfig" source "arch/arm/mach-mx3/Kconfig" -source "arch/arm/mach-mx25/Kconfig" source "arch/arm/mach-mxc91231/Kconfig" source "arch/arm/mach-mx5/Kconfig" @@ -68,12 +63,10 @@ config MXC_IRQ_PRIOR Say N here, unless you have a specialized requirement. config MXC_TZIC - bool "Enable TrustZone Interrupt Controller" - depends on ARCH_MX51 - help - This will be automatically selected for all processors - containing this interrupt controller. - Say N here only if you are really sure. + bool + +config MXC_AVIC + bool config MXC_PWM tristate "Enable PWM driver" |