diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /arch/arm/configs/kb9202_defconfig | |
parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
parent | a8b3485287731978899ced11f24628c927890e78 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/configs/kb9202_defconfig')
-rw-r--r-- | arch/arm/configs/kb9202_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/configs/kb9202_defconfig b/arch/arm/configs/kb9202_defconfig index b4cd4b414836..c16537d9d67a 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 | ||
@@ -753,7 +753,6 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
753 | # CONFIG_DEBUG_FS is not set | 753 | # CONFIG_DEBUG_FS is not set |
754 | CONFIG_FRAME_POINTER=y | 754 | CONFIG_FRAME_POINTER=y |
755 | CONFIG_DEBUG_USER=y | 755 | CONFIG_DEBUG_USER=y |
756 | # CONFIG_DEBUG_WAITQ is not set | ||
757 | CONFIG_DEBUG_ERRORS=y | 756 | CONFIG_DEBUG_ERRORS=y |
758 | CONFIG_DEBUG_LL=y | 757 | CONFIG_DEBUG_LL=y |
759 | # CONFIG_DEBUG_ICEDCC is not set | 758 | # CONFIG_DEBUG_ICEDCC is not set |