diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /arch/arm/configs/at91sam9260ek_defconfig | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'arch/arm/configs/at91sam9260ek_defconfig')
| -rw-r--r-- | arch/arm/configs/at91sam9260ek_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig index f659c938473f..2011adfa6758 100644 --- a/arch/arm/configs/at91sam9260ek_defconfig +++ b/arch/arm/configs/at91sam9260ek_defconfig | |||
| @@ -220,7 +220,6 @@ CONFIG_CPU_CP15_MMU=y | |||
| 220 | # | 220 | # |
| 221 | # CONFIG_TICK_ONESHOT is not set | 221 | # CONFIG_TICK_ONESHOT is not set |
| 222 | # CONFIG_PREEMPT is not set | 222 | # CONFIG_PREEMPT is not set |
| 223 | # CONFIG_NO_IDLE_HZ is not set | ||
| 224 | CONFIG_HZ=100 | 223 | CONFIG_HZ=100 |
| 225 | # CONFIG_AEABI is not set | 224 | # CONFIG_AEABI is not set |
| 226 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 225 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |