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/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/defconfig')
-rw-r--r-- | arch/ppc64/defconfig | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/ppc64/defconfig b/arch/ppc64/defconfig index fbf1f427ad35..c361e7727b7a 100644 --- a/arch/ppc64/defconfig +++ b/arch/ppc64/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:37:07 2005 | 4 | # Mon Aug 8 14:16:54 2005 |
5 | # | 5 | # |
6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -289,10 +289,6 @@ CONFIG_NET_CLS_ROUTE=y | |||
289 | # Network testing | 289 | # Network testing |
290 | # | 290 | # |
291 | # CONFIG_NET_PKTGEN is not set | 291 | # CONFIG_NET_PKTGEN is not set |
292 | CONFIG_NETPOLL=y | ||
293 | CONFIG_NETPOLL_RX=y | ||
294 | CONFIG_NETPOLL_TRAP=y | ||
295 | CONFIG_NET_POLL_CONTROLLER=y | ||
296 | # CONFIG_HAMRADIO is not set | 292 | # CONFIG_HAMRADIO is not set |
297 | # CONFIG_IRDA is not set | 293 | # CONFIG_IRDA is not set |
298 | # CONFIG_BT is not set | 294 | # CONFIG_BT is not set |
@@ -506,6 +502,7 @@ CONFIG_SCSI_QLA22XX=m | |||
506 | CONFIG_SCSI_QLA2300=m | 502 | CONFIG_SCSI_QLA2300=m |
507 | CONFIG_SCSI_QLA2322=m | 503 | CONFIG_SCSI_QLA2322=m |
508 | CONFIG_SCSI_QLA6312=m | 504 | CONFIG_SCSI_QLA6312=m |
505 | CONFIG_SCSI_QLA24XX=m | ||
509 | CONFIG_SCSI_LPFC=m | 506 | CONFIG_SCSI_LPFC=m |
510 | # CONFIG_SCSI_DC395x is not set | 507 | # CONFIG_SCSI_DC395x is not set |
511 | # CONFIG_SCSI_DC390T is not set | 508 | # CONFIG_SCSI_DC390T is not set |
@@ -579,11 +576,9 @@ CONFIG_IEEE1394_AMDTP=m | |||
579 | # | 576 | # |
580 | # Macintosh device drivers | 577 | # Macintosh device drivers |
581 | # | 578 | # |
582 | CONFIG_ADB=y | ||
583 | CONFIG_ADB_PMU=y | 579 | CONFIG_ADB_PMU=y |
584 | CONFIG_PMAC_SMU=y | 580 | CONFIG_PMAC_SMU=y |
585 | # CONFIG_PMAC_BACKLIGHT is not set | 581 | # CONFIG_PMAC_BACKLIGHT is not set |
586 | # CONFIG_INPUT_ADBHID is not set | ||
587 | CONFIG_THERM_PM72=y | 582 | CONFIG_THERM_PM72=y |
588 | 583 | ||
589 | # | 584 | # |
@@ -694,6 +689,10 @@ CONFIG_PPPOE=m | |||
694 | # CONFIG_NET_FC is not set | 689 | # CONFIG_NET_FC is not set |
695 | # CONFIG_SHAPER is not set | 690 | # CONFIG_SHAPER is not set |
696 | CONFIG_NETCONSOLE=y | 691 | CONFIG_NETCONSOLE=y |
692 | CONFIG_NETPOLL=y | ||
693 | CONFIG_NETPOLL_RX=y | ||
694 | CONFIG_NETPOLL_TRAP=y | ||
695 | CONFIG_NET_POLL_CONTROLLER=y | ||
697 | 696 | ||
698 | # | 697 | # |
699 | # ISDN subsystem | 698 | # ISDN subsystem |
@@ -797,7 +796,6 @@ CONFIG_HVCS=m | |||
797 | # | 796 | # |
798 | # CONFIG_WATCHDOG is not set | 797 | # CONFIG_WATCHDOG is not set |
799 | # CONFIG_RTC is not set | 798 | # CONFIG_RTC is not set |
800 | # CONFIG_GEN_RTC is not set | ||
801 | # CONFIG_DTLK is not set | 799 | # CONFIG_DTLK is not set |
802 | # CONFIG_R3964 is not set | 800 | # CONFIG_R3964 is not set |
803 | # CONFIG_APPLICOM is not set | 801 | # CONFIG_APPLICOM is not set |