diff options
author | Paul Mackerras <paulus@samba.org> | 2007-01-22 06:39:24 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-01-22 06:39:24 -0500 |
commit | e89debcd18a3ef74b27894e479d6b9e658fc6de6 (patch) | |
tree | 53696791ee6c1183ecc67f5965427cdac6ad39ea /arch/powerpc/configs/cell_defconfig | |
parent | 434f98c48fc1d2a1f562a28a1562a7b53e940957 (diff) |
[POWERPC] Update defconfigs
Mostly took the defaults, except tried to get the netfilter options
more or less as they were before.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/configs/cell_defconfig')
-rw-r--r-- | arch/powerpc/configs/cell_defconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig index d1d25152f74f..e956548da00c 100644 --- a/arch/powerpc/configs/cell_defconfig +++ b/arch/powerpc/configs/cell_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-rc1 | 3 | # Linux kernel version: 2.6.20-rc5 |
4 | # Tue Dec 19 14:59:53 2006 | 4 | # Mon Jan 22 22:12:56 2007 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
@@ -245,7 +245,6 @@ CONFIG_GENERIC_ISA_DMA=y | |||
245 | CONFIG_PCI=y | 245 | CONFIG_PCI=y |
246 | CONFIG_PCI_DOMAINS=y | 246 | CONFIG_PCI_DOMAINS=y |
247 | CONFIG_PCIEPORTBUS=y | 247 | CONFIG_PCIEPORTBUS=y |
248 | # CONFIG_PCI_MULTITHREAD_PROBE is not set | ||
249 | # CONFIG_PCI_DEBUG is not set | 248 | # CONFIG_PCI_DEBUG is not set |
250 | 249 | ||
251 | # | 250 | # |
@@ -854,7 +853,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
854 | CONFIG_SERIAL_CORE=y | 853 | CONFIG_SERIAL_CORE=y |
855 | CONFIG_SERIAL_CORE_CONSOLE=y | 854 | CONFIG_SERIAL_CORE_CONSOLE=y |
856 | # CONFIG_SERIAL_JSM is not set | 855 | # CONFIG_SERIAL_JSM is not set |
857 | CONFIG_SERIAL_OF_PLATFORM=y | ||
858 | CONFIG_UNIX98_PTYS=y | 856 | CONFIG_UNIX98_PTYS=y |
859 | # CONFIG_LEGACY_PTYS is not set | 857 | # CONFIG_LEGACY_PTYS is not set |
860 | CONFIG_HVC_DRIVER=y | 858 | CONFIG_HVC_DRIVER=y |