diff options
author | Rob Herring <rob.herring@calxeda.com> | 2012-03-04 22:00:46 -0600 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2012-03-04 22:00:46 -0600 |
commit | d50673ed97a7ce609cf62bcd40c57517ada31806 (patch) | |
tree | de1464fe1a4126be6b34762015afb8ad8a90a2f0 /arch/arm/Kconfig | |
parent | ab15e0e80c02b8b9f3392a6173b9109348eed1c3 (diff) | |
parent | 7eca30aef7961e68ad74c0ef920546c2be7f6579 (diff) | |
download | op-kernel-dev-d50673ed97a7ce609cf62bcd40c57517ada31806.zip op-kernel-dev-d50673ed97a7ce609cf62bcd40c57517ada31806.tar.gz |
Merge remote-tracking branch 'arm-soc/at91/base2+cleanup' into cleanup-base
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7d809b7..f2574fe 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -327,7 +327,7 @@ config ARCH_AT91 select CLKDEV_LOOKUP help This enables support for systems based on the Atmel AT91RM9200, - AT91SAM9 and AT91CAP9 processors. + AT91SAM9 processors. config ARCH_BCMRING bool "Broadcom BCMRING" |