diff options
author | Andrew Victor <andrew@sanpeople.com> | 2006-12-01 08:51:13 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-12-01 11:56:43 -0500 |
commit | 58a0cd7887cd689ae42540dd12b3b3131abfbe6c (patch) | |
tree | 3ede7aef3e67bc9fee868129f8eac18a4d7378e1 /arch/arm/configs | |
parent | 022cbd7376fcdf030fe821636f1c910c45a9356a (diff) |
[ARM] 3963/1: AT91: Update configuration files
A number of configuration file changes.
These are mainly to replace references to ARCH_AT91RM9200 and
ARCH_AT91SAM9261 with the common/generic ARCH_AT91. That way we don't
need to mention every specific AT91 processor explicitly.
Also adds the configuration option for AT91SAM9260-EK and AT91SAM9261-EK
boards.
Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/csb637_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/kb9202_defconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/csb637_defconfig b/arch/arm/configs/csb637_defconfig index df8595ac031f..abf33520b709 100644 --- a/arch/arm/configs/csb637_defconfig +++ b/arch/arm/configs/csb637_defconfig | |||
@@ -623,7 +623,7 @@ CONFIG_AT91RM9200_WATCHDOG=y | |||
623 | # CONFIG_USBPCWATCHDOG is not set | 623 | # CONFIG_USBPCWATCHDOG is not set |
624 | # CONFIG_NVRAM is not set | 624 | # CONFIG_NVRAM is not set |
625 | CONFIG_RTC=y | 625 | CONFIG_RTC=y |
626 | # CONFIG_AT91_RTC is not set | 626 | # CONFIG_AT91RM9200_RTC is not set |
627 | # CONFIG_DTLK is not set | 627 | # CONFIG_DTLK is not set |
628 | # CONFIG_R3964 is not set | 628 | # CONFIG_R3964 is not set |
629 | 629 | ||
diff --git a/arch/arm/configs/kb9202_defconfig b/arch/arm/configs/kb9202_defconfig index b4cd4b414836..9ab0e0a66fd5 100644 --- a/arch/arm/configs/kb9202_defconfig +++ b/arch/arm/configs/kb9202_defconfig | |||
@@ -437,7 +437,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
437 | # CONFIG_WATCHDOG is not set | 437 | # CONFIG_WATCHDOG is not set |
438 | # CONFIG_NVRAM is not set | 438 | # CONFIG_NVRAM is not set |
439 | # CONFIG_RTC is not set | 439 | # CONFIG_RTC is not set |
440 | # CONFIG_AT91_RTC is not set | 440 | # CONFIG_AT91RM9200_RTC is not set |
441 | # CONFIG_DTLK is not set | 441 | # CONFIG_DTLK is not set |
442 | # CONFIG_R3964 is not set | 442 | # CONFIG_R3964 is not set |
443 | 443 | ||