diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 05:23:38 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 05:23:38 -0500 |
| commit | 1051b9f0f9eab8091fe3bf98320741adf36b4cfa (patch) | |
| tree | 68ea1c8f9c446d6ebd96caf3ba4ec73f1fa5ace6 /arch/arm/Kconfig | |
| parent | cde9efef401563943d5a58eb9b7274bfdc08ca9b (diff) | |
| parent | a58154d1c3535f451a409abbd0bda6770b2d9380 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4d1c3093a133..fac58916adec 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -352,6 +352,14 @@ config ARCH_MXC | |||
| 352 | help | 352 | help |
| 353 | Support for Freescale MXC/iMX-based family of processors | 353 | Support for Freescale MXC/iMX-based family of processors |
| 354 | 354 | ||
| 355 | config ARCH_MXS | ||
| 356 | bool "Freescale MXS-based" | ||
| 357 | select GENERIC_CLOCKEVENTS | ||
| 358 | select ARCH_REQUIRE_GPIOLIB | ||
| 359 | select COMMON_CLKDEV | ||
| 360 | help | ||
| 361 | Support for Freescale MXS-based family of processors | ||
| 362 | |||
| 355 | config ARCH_STMP3XXX | 363 | config ARCH_STMP3XXX |
| 356 | bool "Freescale STMP3xxx" | 364 | bool "Freescale STMP3xxx" |
| 357 | select CPU_ARM926T | 365 | select CPU_ARM926T |
| @@ -904,6 +912,8 @@ source "arch/arm/mach-mv78xx0/Kconfig" | |||
| 904 | 912 | ||
| 905 | source "arch/arm/plat-mxc/Kconfig" | 913 | source "arch/arm/plat-mxc/Kconfig" |
| 906 | 914 | ||
| 915 | source "arch/arm/mach-mxs/Kconfig" | ||
| 916 | |||
| 907 | source "arch/arm/mach-netx/Kconfig" | 917 | source "arch/arm/mach-netx/Kconfig" |
| 908 | 918 | ||
| 909 | source "arch/arm/mach-nomadik/Kconfig" | 919 | source "arch/arm/mach-nomadik/Kconfig" |