diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
| commit | f0006314d37639714da9658cf4ff3f1f9f420764 (patch) | |
| tree | b8a18e014a40f2f8fd5148aab09c869dfaabd7a9 /arch/arm/plat-mxc/Kconfig | |
| parent | a177ba3b7a08beef3f0fe74efa0f90701891945a (diff) | |
| parent | 1bd55a436f1f90de0e7f476e514e01bd67497b88 (diff) | |
Merge branch 'imx' into devel
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/plat-mxc/Kconfig')
| -rw-r--r-- | arch/arm/plat-mxc/Kconfig | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index bb6e12738fb3..e14eaad11dd5 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig | |||
| @@ -3,9 +3,14 @@ if ARCH_MXC | |||
| 3 | menu "Freescale MXC Implementations" | 3 | menu "Freescale MXC Implementations" |
| 4 | 4 | ||
| 5 | choice | 5 | choice |
| 6 | prompt "MXC/iMX System Type" | 6 | prompt "MXC/iMX Base Type" |
| 7 | default ARCH_MX3 | 7 | default ARCH_MX3 |
| 8 | 8 | ||
| 9 | config ARCH_MX2 | ||
| 10 | bool "MX2-based" | ||
| 11 | help | ||
| 12 | This enables support for systems based on the Freescale i.MX2 family | ||
| 13 | |||
| 9 | config ARCH_MX3 | 14 | config ARCH_MX3 |
| 10 | bool "MX3-based" | 15 | bool "MX3-based" |
| 11 | help | 16 | help |
| @@ -13,6 +18,7 @@ config ARCH_MX3 | |||
| 13 | 18 | ||
| 14 | endchoice | 19 | endchoice |
| 15 | 20 | ||
| 21 | source "arch/arm/mach-mx2/Kconfig" | ||
| 16 | source "arch/arm/mach-mx3/Kconfig" | 22 | source "arch/arm/mach-mx3/Kconfig" |
| 17 | 23 | ||
| 18 | endmenu | 24 | endmenu |