diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-13 20:07:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-13 20:07:28 -0400 |
commit | 45d447406a19cbfd42720f066f156f4eb9d68801 (patch) | |
tree | 57a2224dea60dfcc6ff58130230f2ffa48bbe01a /arch/xtensa/configs/s6105_defconfig | |
parent | 210af919c949a7d6bd330916ef376cec2907d81e (diff) | |
parent | 78f3cdfa2ac0aa2b72b3ee7e4b3c3e550230179f (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
xtensa: Fix linker script to include .literal sections
xtensa: update s6105_defconfig for ccount calibration
xtensa: implement ccount calibration for s6000
xtensa: fix wrong extern declaration renamed in code using it
xtensa: register gpio chip before use
xtensa: always use correct stack pointer for stack traces
xtensa: Fix checksum header file
xtensa: Fix architecture specific Kconfig
Diffstat (limited to 'arch/xtensa/configs/s6105_defconfig')
-rw-r--r-- | arch/xtensa/configs/s6105_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig index 6e1deff4159..768bee00603 100644 --- a/arch/xtensa/configs/s6105_defconfig +++ b/arch/xtensa/configs/s6105_defconfig | |||
@@ -115,7 +115,7 @@ CONFIG_XTENSA_VARIANT_S6000=y | |||
115 | CONFIG_PREEMPT=y | 115 | CONFIG_PREEMPT=y |
116 | # CONFIG_MATH_EMULATION is not set | 116 | # CONFIG_MATH_EMULATION is not set |
117 | # CONFIG_HIGHMEM is not set | 117 | # CONFIG_HIGHMEM is not set |
118 | # CONFIG_XTENSA_CALIBRATE_CCOUNT is not set | 118 | CONFIG_XTENSA_CALIBRATE_CCOUNT=y |
119 | CONFIG_SERIAL_CONSOLE=y | 119 | CONFIG_SERIAL_CONSOLE=y |
120 | # CONFIG_XTENSA_ISS_NETWORK is not set | 120 | # CONFIG_XTENSA_ISS_NETWORK is not set |
121 | 121 | ||
@@ -131,7 +131,6 @@ CONFIG_SERIAL_CONSOLE=y | |||
131 | # CONFIG_XTENSA_PLATFORM_ISS is not set | 131 | # CONFIG_XTENSA_PLATFORM_ISS is not set |
132 | # CONFIG_XTENSA_PLATFORM_XT2000 is not set | 132 | # CONFIG_XTENSA_PLATFORM_XT2000 is not set |
133 | CONFIG_XTENSA_PLATFORM_S6105=y | 133 | CONFIG_XTENSA_PLATFORM_S6105=y |
134 | CONFIG_XTENSA_CPU_CLOCK=300 | ||
135 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 134 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
136 | CONFIG_CMDLINE_BOOL=y | 135 | CONFIG_CMDLINE_BOOL=y |
137 | CONFIG_CMDLINE="console=ttyS1,38400 debug bootmem_debug loglevel=7" | 136 | CONFIG_CMDLINE="console=ttyS1,38400 debug bootmem_debug loglevel=7" |