diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-08-09 23:20:49 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-08-09 23:20:49 +0200 |
| commit | 471417c9cfb4c2574e2c03bf2273fe12f5388a8e (patch) | |
| tree | ac026ba976bc253fc87a5cdec8f33d24d03e1c9c /arch/ppc64/configs/maple_defconfig | |
| parent | [SCSI] iscsi: fix 64 bit compile warning (diff) | |
| parent | [PATCH] i2o: remove new configuration API (diff) | |
| download | linux-471417c9cfb4c2574e2c03bf2273fe12f5388a8e.tar.xz linux-471417c9cfb4c2574e2c03bf2273fe12f5388a8e.zip | |
Merge ../linux-2.6
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 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.13-rc3 -# Wed Jul 13 14:46:18 2005 +# Linux kernel version: 2.6.13-rc6 +# Mon Aug 8 14:17:04 2005 # CONFIG_64BIT=y CONFIG_MMU=y @@ -193,8 +193,6 @@ CONFIG_TCP_CONG_BIC=y # Network testing # # CONFIG_NET_PKTGEN is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set # CONFIG_BT is not set @@ -433,6 +431,8 @@ CONFIG_E1000=y # CONFIG_SLIP is not set # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set # # ISDN subsystem @@ -512,7 +512,6 @@ CONFIG_LEGACY_PTY_COUNT=256 # # CONFIG_WATCHDOG is not set # CONFIG_RTC is not set -# CONFIG_GEN_RTC is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set |