diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 11:50:52 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 11:50:52 +0100 |
| commit | 701038144945ef98c5817f43079952fa38c35999 (patch) | |
| tree | 88782f6ac8e4df1f7f8f738659adedd7108e8cae /arch/arm/Kconfig | |
| parent | 4abf27add86e5b7c37dca1fb4dd9a740b4332a84 (diff) | |
| parent | c2b455474e4c6bc8bab6506e2a08dbd5ad50d74d (diff) | |
| download | blackbird-op-linux-701038144945ef98c5817f43079952fa38c35999.tar.gz blackbird-op-linux-701038144945ef98c5817f43079952fa38c35999.zip | |
Merge branch 'nomadik' into devel-stable
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5f6d977bd3df..7a96ad317dcd 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -338,6 +338,20 @@ config ARCH_H720X help This enables support for systems based on the Hynix HMS720x +config ARCH_NOMADIK + bool "STMicroelectronics Nomadik" + select ARM_AMBA + select ARM_VIC + select CPU_ARM926T + select HAVE_CLK + select COMMON_CLKDEV + select GENERIC_TIME + select GENERIC_CLOCKEVENTS + select GENERIC_GPIO + select ARCH_REQUIRE_GPIOLIB + help + Support for the Nomadik platform by ST-Ericsson + config ARCH_IOP13XX bool "IOP13xx-based" depends on MMU @@ -745,6 +759,8 @@ source "arch/arm/mach-at91/Kconfig" source "arch/arm/plat-mxc/Kconfig" +source "arch/arm/mach-nomadik/Kconfig" + source "arch/arm/mach-netx/Kconfig" source "arch/arm/mach-ns9xxx/Kconfig" |
