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/g5_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/g5_defconfig')
-rw-r--r-- | arch/ppc64/configs/g5_defconfig | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/ppc64/configs/g5_defconfig b/arch/ppc64/configs/g5_defconfig index 9e0abe8392f..ab567741e80 100644 --- a/arch/ppc64/configs/g5_defconfig +++ b/arch/ppc64/configs/g5_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:40:34 2005 | 4 | # Mon Aug 8 14:16:59 2005 |
5 | # | 5 | # |
6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -267,8 +267,6 @@ CONFIG_NET_CLS_ROUTE=y | |||
267 | # Network testing | 267 | # Network testing |
268 | # | 268 | # |
269 | # CONFIG_NET_PKTGEN is not set | 269 | # CONFIG_NET_PKTGEN is not set |
270 | # CONFIG_NETPOLL is not set | ||
271 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
272 | # CONFIG_HAMRADIO is not set | 270 | # CONFIG_HAMRADIO is not set |
273 | # CONFIG_IRDA is not set | 271 | # CONFIG_IRDA is not set |
274 | # CONFIG_BT is not set | 272 | # CONFIG_BT is not set |
@@ -468,6 +466,7 @@ CONFIG_SCSI_QLA2XXX=y | |||
468 | # CONFIG_SCSI_QLA2300 is not set | 466 | # CONFIG_SCSI_QLA2300 is not set |
469 | # CONFIG_SCSI_QLA2322 is not set | 467 | # CONFIG_SCSI_QLA2322 is not set |
470 | # CONFIG_SCSI_QLA6312 is not set | 468 | # CONFIG_SCSI_QLA6312 is not set |
469 | # CONFIG_SCSI_QLA24XX is not set | ||
471 | # CONFIG_SCSI_LPFC is not set | 470 | # CONFIG_SCSI_LPFC is not set |
472 | # CONFIG_SCSI_DC395x is not set | 471 | # CONFIG_SCSI_DC395x is not set |
473 | # CONFIG_SCSI_DC390T is not set | 472 | # CONFIG_SCSI_DC390T is not set |
@@ -539,11 +538,9 @@ CONFIG_IEEE1394_RAWIO=y | |||
539 | # | 538 | # |
540 | # Macintosh device drivers | 539 | # Macintosh device drivers |
541 | # | 540 | # |
542 | CONFIG_ADB=y | ||
543 | CONFIG_ADB_PMU=y | 541 | CONFIG_ADB_PMU=y |
544 | CONFIG_PMAC_SMU=y | 542 | CONFIG_PMAC_SMU=y |
545 | # CONFIG_PMAC_BACKLIGHT is not set | 543 | # CONFIG_PMAC_BACKLIGHT is not set |
546 | # CONFIG_INPUT_ADBHID is not set | ||
547 | CONFIG_THERM_PM72=y | 544 | CONFIG_THERM_PM72=y |
548 | 545 | ||
549 | # | 546 | # |
@@ -631,6 +628,8 @@ CONFIG_PPPOE=m | |||
631 | # CONFIG_NET_FC is not set | 628 | # CONFIG_NET_FC is not set |
632 | # CONFIG_SHAPER is not set | 629 | # CONFIG_SHAPER is not set |
633 | # CONFIG_NETCONSOLE is not set | 630 | # CONFIG_NETCONSOLE is not set |
631 | # CONFIG_NETPOLL is not set | ||
632 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
634 | 633 | ||
635 | # | 634 | # |
636 | # ISDN subsystem | 635 | # ISDN subsystem |
@@ -718,7 +717,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
718 | # | 717 | # |
719 | # CONFIG_WATCHDOG is not set | 718 | # CONFIG_WATCHDOG is not set |
720 | # CONFIG_RTC is not set | 719 | # CONFIG_RTC is not set |
721 | # CONFIG_GEN_RTC is not set | ||
722 | # CONFIG_DTLK is not set | 720 | # CONFIG_DTLK is not set |
723 | # CONFIG_R3964 is not set | 721 | # CONFIG_R3964 is not set |
724 | # CONFIG_APPLICOM is not set | 722 | # CONFIG_APPLICOM is not set |