diff options
| author | Dave Jones <davej@redhat.com> | 2007-02-10 20:36:29 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2007-02-10 20:36:29 -0500 |
| commit | bd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1 (patch) | |
| tree | 64fe15d4db42e0840acea00e4cf7e1855bba9e96 /arch/powerpc/configs/mpc8360emds_defconfig | |
| parent | 348f31ed2bd18391fe5903aa0ad7bfcda6d8ca0b (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/powerpc/configs/mpc8360emds_defconfig')
| -rw-r--r-- | arch/powerpc/configs/mpc8360emds_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/configs/mpc8360emds_defconfig b/arch/powerpc/configs/mpc8360emds_defconfig index 58e6795dbfe5..bbe38ccc3d86 100644 --- a/arch/powerpc/configs/mpc8360emds_defconfig +++ b/arch/powerpc/configs/mpc8360emds_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.20-rc5 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Mon Jan 22 22:24:40 2007 | 4 | # Fri Jan 26 00:19:45 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
| @@ -150,7 +150,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 150 | # CONFIG_PREEMPT is not set | 150 | # CONFIG_PREEMPT is not set |
| 151 | CONFIG_BINFMT_ELF=y | 151 | CONFIG_BINFMT_ELF=y |
| 152 | # CONFIG_BINFMT_MISC is not set | 152 | # CONFIG_BINFMT_MISC is not set |
| 153 | CONFIG_MATH_EMULATION=y | ||
| 154 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 153 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 155 | CONFIG_ARCH_FLATMEM_ENABLE=y | 154 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 156 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 155 | CONFIG_ARCH_POPULATES_NODE_MAP=y |