diff options
Diffstat (limited to 'arch/ppc64/configs/maple_defconfig')
-rw-r--r-- | arch/ppc64/configs/maple_defconfig | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/ppc64/configs/maple_defconfig b/arch/ppc64/configs/maple_defconfig index cda8e8cb6d1d..2033fe663dbe 100644 --- a/arch/ppc64/configs/maple_defconfig +++ b/arch/ppc64/configs/maple_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.13-rc3 | 3 | # Linux kernel version: 2.6.13-rc6 |
4 | # Wed Jul 13 14:46:18 2005 | 4 | # Mon Aug 8 14:17:04 2005 |
5 | # | 5 | # |
6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -193,8 +193,6 @@ CONFIG_TCP_CONG_BIC=y | |||
193 | # Network testing | 193 | # Network testing |
194 | # | 194 | # |
195 | # CONFIG_NET_PKTGEN is not set | 195 | # CONFIG_NET_PKTGEN is not set |
196 | # CONFIG_NETPOLL is not set | ||
197 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
198 | # CONFIG_HAMRADIO is not set | 196 | # CONFIG_HAMRADIO is not set |
199 | # CONFIG_IRDA is not set | 197 | # CONFIG_IRDA is not set |
200 | # CONFIG_BT is not set | 198 | # CONFIG_BT is not set |
@@ -433,6 +431,8 @@ CONFIG_E1000=y | |||
433 | # CONFIG_SLIP is not set | 431 | # CONFIG_SLIP is not set |
434 | # CONFIG_SHAPER is not set | 432 | # CONFIG_SHAPER is not set |
435 | # CONFIG_NETCONSOLE is not set | 433 | # CONFIG_NETCONSOLE is not set |
434 | # CONFIG_NETPOLL is not set | ||
435 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
436 | 436 | ||
437 | # | 437 | # |
438 | # ISDN subsystem | 438 | # ISDN subsystem |
@@ -512,7 +512,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
512 | # | 512 | # |
513 | # CONFIG_WATCHDOG is not set | 513 | # CONFIG_WATCHDOG is not set |
514 | # CONFIG_RTC is not set | 514 | # CONFIG_RTC is not set |
515 | # CONFIG_GEN_RTC is not set | ||
516 | # CONFIG_DTLK is not set | 515 | # CONFIG_DTLK is not set |
517 | # CONFIG_R3964 is not set | 516 | # CONFIG_R3964 is not set |
518 | # CONFIG_APPLICOM is not set | 517 | # CONFIG_APPLICOM is not set |