diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-03-05 05:00:46 +0100 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-03-05 05:00:46 +0100 |
| commit | d50673ed97a7ce609cf62bcd40c57517ada31806 (patch) | |
| tree | de1464fe1a4126be6b34762015afb8ad8a90a2f0 /arch/arm/Kconfig | |
| parent | Merge branch 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlin... (diff) | |
| parent | Merge branch 'at91-3.4-base2+cleanup' of git://github.com/at91linux/linux-at9... (diff) | |
| download | linux-d50673ed97a7ce609cf62bcd40c57517ada31806.tar.xz linux-d50673ed97a7ce609cf62bcd40c57517ada31806.zip | |
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 7d809b7e0504..f2574fef1e41 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" |