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/ppc64_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/ppc64_defconfig')
| -rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 340376a47001..debac66e8258 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_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-rc3 | 3 | # Linux kernel version: 2.6.20-rc5 |
| 4 | # Tue Jan 2 15:32:44 2007 | 4 | # Mon Jan 22 22:28:58 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
| @@ -246,7 +246,6 @@ CONFIG_PPC_I8259=y | |||
| 246 | CONFIG_PCI=y | 246 | CONFIG_PCI=y |
| 247 | CONFIG_PCI_DOMAINS=y | 247 | CONFIG_PCI_DOMAINS=y |
| 248 | # CONFIG_PCIEPORTBUS is not set | 248 | # CONFIG_PCIEPORTBUS is not set |
| 249 | # CONFIG_PCI_MULTITHREAD_PROBE is not set | ||
| 250 | # CONFIG_PCI_DEBUG is not set | 249 | # CONFIG_PCI_DEBUG is not set |
| 251 | 250 | ||
| 252 | # | 251 | # |