diff options
author | Paul Mackerras <paulus@samba.org> | 2005-08-08 00:16:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-08 14:46:24 -0400 |
commit | 0f0767c67a497173294bdf6725a3d85f7f29e397 (patch) | |
tree | 08c11f2a68489598bbd3e6b755b8c2b0a366322c /arch/ppc64/configs/pSeries_defconfig | |
parent | 2c875bbda9303b359af94f671d25639840ce2a59 (diff) |
[PATCH] ppc64: update defconfigs
Update the default/example configs for ppc64. Pretty boring...
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc64/configs/pSeries_defconfig')
-rw-r--r-- | arch/ppc64/configs/pSeries_defconfig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/ppc64/configs/pSeries_defconfig b/arch/ppc64/configs/pSeries_defconfig index 5112edf18181..297fd5229487 100644 --- a/arch/ppc64/configs/pSeries_defconfig +++ b/arch/ppc64/configs/pSeries_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:47:54 2005 | 4 | # Mon Aug 8 14:17:07 2005 |
5 | # | 5 | # |
6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -287,10 +287,6 @@ CONFIG_NET_CLS_ROUTE=y | |||
287 | # Network testing | 287 | # Network testing |
288 | # | 288 | # |
289 | # CONFIG_NET_PKTGEN is not set | 289 | # CONFIG_NET_PKTGEN is not set |
290 | CONFIG_NETPOLL=y | ||
291 | CONFIG_NETPOLL_RX=y | ||
292 | CONFIG_NETPOLL_TRAP=y | ||
293 | CONFIG_NET_POLL_CONTROLLER=y | ||
294 | # CONFIG_HAMRADIO is not set | 290 | # CONFIG_HAMRADIO is not set |
295 | # CONFIG_IRDA is not set | 291 | # CONFIG_IRDA is not set |
296 | # CONFIG_BT is not set | 292 | # CONFIG_BT is not set |
@@ -488,6 +484,7 @@ CONFIG_SCSI_QLA22XX=m | |||
488 | CONFIG_SCSI_QLA2300=m | 484 | CONFIG_SCSI_QLA2300=m |
489 | CONFIG_SCSI_QLA2322=m | 485 | CONFIG_SCSI_QLA2322=m |
490 | CONFIG_SCSI_QLA6312=m | 486 | CONFIG_SCSI_QLA6312=m |
487 | CONFIG_SCSI_QLA24XX=m | ||
491 | CONFIG_SCSI_LPFC=m | 488 | CONFIG_SCSI_LPFC=m |
492 | # CONFIG_SCSI_DC395x is not set | 489 | # CONFIG_SCSI_DC395x is not set |
493 | # CONFIG_SCSI_DC390T is not set | 490 | # CONFIG_SCSI_DC390T is not set |
@@ -645,6 +642,10 @@ CONFIG_PPPOE=m | |||
645 | # CONFIG_NET_FC is not set | 642 | # CONFIG_NET_FC is not set |
646 | # CONFIG_SHAPER is not set | 643 | # CONFIG_SHAPER is not set |
647 | CONFIG_NETCONSOLE=y | 644 | CONFIG_NETCONSOLE=y |
645 | CONFIG_NETPOLL=y | ||
646 | CONFIG_NETPOLL_RX=y | ||
647 | CONFIG_NETPOLL_TRAP=y | ||
648 | CONFIG_NET_POLL_CONTROLLER=y | ||
648 | 649 | ||
649 | # | 650 | # |
650 | # ISDN subsystem | 651 | # ISDN subsystem |
@@ -746,7 +747,6 @@ CONFIG_HVCS=m | |||
746 | # | 747 | # |
747 | # CONFIG_WATCHDOG is not set | 748 | # CONFIG_WATCHDOG is not set |
748 | # CONFIG_RTC is not set | 749 | # CONFIG_RTC is not set |
749 | # CONFIG_GEN_RTC is not set | ||
750 | # CONFIG_DTLK is not set | 750 | # CONFIG_DTLK is not set |
751 | # CONFIG_R3964 is not set | 751 | # CONFIG_R3964 is not set |
752 | # CONFIG_APPLICOM is not set | 752 | # CONFIG_APPLICOM is not set |