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 | |
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')
-rw-r--r-- | arch/ppc64/configs/g5_defconfig | 12 | ||||
-rw-r--r-- | arch/ppc64/configs/iSeries_defconfig | 14 | ||||
-rw-r--r-- | arch/ppc64/configs/maple_defconfig | 9 | ||||
-rw-r--r-- | arch/ppc64/configs/pSeries_defconfig | 14 |
4 files changed, 23 insertions, 26 deletions
diff --git a/arch/ppc64/configs/g5_defconfig b/arch/ppc64/configs/g5_defconfig index 9e0abe8392fc..ab567741e80e 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 |
diff --git a/arch/ppc64/configs/iSeries_defconfig b/arch/ppc64/configs/iSeries_defconfig index dbd54d188c2b..394ba18b58c7 100644 --- a/arch/ppc64/configs/iSeries_defconfig +++ b/arch/ppc64/configs/iSeries_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:43:39 2005 | 4 | # Mon Aug 8 14:17:02 2005 |
5 | # | 5 | # |
6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -257,10 +257,6 @@ CONFIG_NET_CLS_ROUTE=y | |||
257 | # Network testing | 257 | # Network testing |
258 | # | 258 | # |
259 | # CONFIG_NET_PKTGEN is not set | 259 | # CONFIG_NET_PKTGEN is not set |
260 | CONFIG_NETPOLL=y | ||
261 | CONFIG_NETPOLL_RX=y | ||
262 | CONFIG_NETPOLL_TRAP=y | ||
263 | CONFIG_NET_POLL_CONTROLLER=y | ||
264 | # CONFIG_HAMRADIO is not set | 260 | # CONFIG_HAMRADIO is not set |
265 | # CONFIG_IRDA is not set | 261 | # CONFIG_IRDA is not set |
266 | # CONFIG_BT is not set | 262 | # CONFIG_BT is not set |
@@ -388,6 +384,7 @@ CONFIG_SCSI_QLA2XXX=y | |||
388 | # CONFIG_SCSI_QLA2300 is not set | 384 | # CONFIG_SCSI_QLA2300 is not set |
389 | # CONFIG_SCSI_QLA2322 is not set | 385 | # CONFIG_SCSI_QLA2322 is not set |
390 | # CONFIG_SCSI_QLA6312 is not set | 386 | # CONFIG_SCSI_QLA6312 is not set |
387 | # CONFIG_SCSI_QLA24XX is not set | ||
391 | # CONFIG_SCSI_LPFC is not set | 388 | # CONFIG_SCSI_LPFC is not set |
392 | # CONFIG_SCSI_DC395x is not set | 389 | # CONFIG_SCSI_DC395x is not set |
393 | # CONFIG_SCSI_DC390T is not set | 390 | # CONFIG_SCSI_DC390T is not set |
@@ -537,6 +534,10 @@ CONFIG_PPPOE=m | |||
537 | # CONFIG_NET_FC is not set | 534 | # CONFIG_NET_FC is not set |
538 | # CONFIG_SHAPER is not set | 535 | # CONFIG_SHAPER is not set |
539 | CONFIG_NETCONSOLE=y | 536 | CONFIG_NETCONSOLE=y |
537 | CONFIG_NETPOLL=y | ||
538 | CONFIG_NETPOLL_RX=y | ||
539 | CONFIG_NETPOLL_TRAP=y | ||
540 | CONFIG_NET_POLL_CONTROLLER=y | ||
540 | 541 | ||
541 | # | 542 | # |
542 | # ISDN subsystem | 543 | # ISDN subsystem |
@@ -610,7 +611,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
610 | # | 611 | # |
611 | # CONFIG_WATCHDOG is not set | 612 | # CONFIG_WATCHDOG is not set |
612 | # CONFIG_RTC is not set | 613 | # CONFIG_RTC is not set |
613 | # CONFIG_GEN_RTC is not set | ||
614 | # CONFIG_DTLK is not set | 614 | # CONFIG_DTLK is not set |
615 | # CONFIG_R3964 is not set | 615 | # CONFIG_R3964 is not set |
616 | # CONFIG_APPLICOM is not set | 616 | # CONFIG_APPLICOM is not set |
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 |
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 |