git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
configs
/
csb637_defconfig
diff --git
a/arch/arm/configs/csb637_defconfig
b/arch/arm/configs/csb637_defconfig
index
1519124
..
94908c1
100644
(file)
--- a/
arch/arm/configs/csb637_defconfig
+++ b/
arch/arm/configs/csb637_defconfig
@@
-103,6
+103,7
@@
CONFIG_DEFAULT_IOSCHED="anticipatory"
# CONFIG_ARCH_IMX is not set
# CONFIG_ARCH_H720X is not set
# CONFIG_ARCH_AAEC2000 is not set
# CONFIG_ARCH_IMX is not set
# CONFIG_ARCH_H720X is not set
# CONFIG_ARCH_AAEC2000 is not set
+CONFIG_ARCH_AT91=y
CONFIG_ARCH_AT91RM9200=y
#
CONFIG_ARCH_AT91RM9200=y
#
@@
-590,9
+591,9
@@
CONFIG_HW_CONSOLE=y
#
# Non-8250 serial port support
#
#
# Non-8250 serial port support
#
-CONFIG_SERIAL_AT
91
=y
-CONFIG_SERIAL_AT
91
_CONSOLE=y
-# CONFIG_SERIAL_AT
91
_TTYAT is not set
+CONFIG_SERIAL_AT
MEL
=y
+CONFIG_SERIAL_AT
MEL
_CONSOLE=y
+# CONFIG_SERIAL_AT
MEL
_TTYAT is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
@@
-614,7
+615,7
@@
CONFIG_WATCHDOG_NOWAYOUT=y
# Watchdog Device Drivers
#
# CONFIG_SOFT_WATCHDOG is not set
# Watchdog Device Drivers
#
# CONFIG_SOFT_WATCHDOG is not set
-CONFIG_AT91_WATCHDOG=y
+CONFIG_AT91
RM9200
_WATCHDOG=y
#
# USB-based Watchdog Cards
#
# USB-based Watchdog Cards
@@
-622,7
+623,7
@@
CONFIG_AT91_WATCHDOG=y
# CONFIG_USBPCWATCHDOG is not set
# CONFIG_NVRAM is not set
CONFIG_RTC=y
# CONFIG_USBPCWATCHDOG is not set
# CONFIG_NVRAM is not set
CONFIG_RTC=y
-# CONFIG_AT91_RTC is not set
+# CONFIG_AT91
RM9200
_RTC is not set
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
@@
-1061,7
+1062,6
@@
CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_FRAME_POINTER=y
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_DEBUG_USER=y
CONFIG_FRAME_POINTER=y
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
# CONFIG_DEBUG_ERRORS is not set
CONFIG_DEBUG_LL=y
# CONFIG_DEBUG_ICEDCC is not set
# CONFIG_DEBUG_ERRORS is not set
CONFIG_DEBUG_LL=y
# CONFIG_DEBUG_ICEDCC is not set