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/lpd7a404_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/lpd7a404_defconfig')
| -rw-r--r-- | arch/arm/configs/lpd7a404_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/lpd7a404_defconfig b/arch/arm/configs/lpd7a404_defconfig index 46a0f7fe1fa5..7a2e932da1c6 100644 --- a/arch/arm/configs/lpd7a404_defconfig +++ b/arch/arm/configs/lpd7a404_defconfig | |||
| @@ -148,7 +148,6 @@ CONFIG_ARM_AMBA=y | |||
| 148 | # Kernel Features | 148 | # Kernel Features |
| 149 | # | 149 | # |
| 150 | CONFIG_PREEMPT=y | 150 | CONFIG_PREEMPT=y |
| 151 | # CONFIG_NO_IDLE_HZ is not set | ||
| 152 | # CONFIG_AEABI is not set | 151 | # CONFIG_AEABI is not set |
| 153 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | 152 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y |
| 154 | CONFIG_SELECT_MEMORY_MODEL=y | 153 | CONFIG_SELECT_MEMORY_MODEL=y |