aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-05-14 07:19:01 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-05-14 07:19:01 -0400
commitbe35cf01a9889e82da3bbda1d7b161f036424225 (patch)
treecfe3cfbe199115307daf569f48094a2175d09042
parentd0842f40a025521beb48063e02a8cc57ebd075e0 (diff)
[SPARC64]: Update defconfig.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc64/defconfig26
1 files changed, 4 insertions, 22 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 585ef4fb7591..65840a62bb9c 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/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.21 3# Linux kernel version: 2.6.22-rc1
4# Fri May 11 14:31:45 2007 4# Mon May 14 04:17:48 2007
5# 5#
6CONFIG_SPARC=y 6CONFIG_SPARC=y
7CONFIG_SPARC64=y 7CONFIG_SPARC64=y
@@ -508,10 +508,6 @@ CONFIG_ISCSI_TCP=m
508# CONFIG_SCSI_ESP_CORE is not set 508# CONFIG_SCSI_ESP_CORE is not set
509# CONFIG_SCSI_SUNESP is not set 509# CONFIG_SCSI_SUNESP is not set
510# CONFIG_SCSI_SRP is not set 510# CONFIG_SCSI_SRP is not set
511
512#
513# Serial ATA (prod) and Parallel ATA (experimental) drivers
514#
515# CONFIG_ATA is not set 511# CONFIG_ATA is not set
516 512
517# 513#
@@ -568,10 +564,6 @@ CONFIG_DUMMY=m
568# ARCnet devices 564# ARCnet devices
569# 565#
570# CONFIG_ARCNET is not set 566# CONFIG_ARCNET is not set
571
572#
573# PHY device support
574#
575# CONFIG_PHYLIB is not set 567# CONFIG_PHYLIB is not set
576 568
577# 569#
@@ -611,10 +603,7 @@ CONFIG_NET_PCI=y
611# CONFIG_SUNDANCE is not set 603# CONFIG_SUNDANCE is not set
612# CONFIG_VIA_RHINE is not set 604# CONFIG_VIA_RHINE is not set
613# CONFIG_SC92031 is not set 605# CONFIG_SC92031 is not set
614 606CONFIG_NETDEV_1000=y
615#
616# Ethernet (1000 Mbit)
617#
618# CONFIG_ACENIC is not set 607# CONFIG_ACENIC is not set
619# CONFIG_DL2K is not set 608# CONFIG_DL2K is not set
620CONFIG_E1000=m 609CONFIG_E1000=m
@@ -634,10 +623,7 @@ CONFIG_TIGON3=m
634CONFIG_BNX2=m 623CONFIG_BNX2=m
635# CONFIG_QLA3XXX is not set 624# CONFIG_QLA3XXX is not set
636# CONFIG_ATL1 is not set 625# CONFIG_ATL1 is not set
637 626CONFIG_NETDEV_10000=y
638#
639# Ethernet (10000 Mbit)
640#
641# CONFIG_CHELSIO_T1 is not set 627# CONFIG_CHELSIO_T1 is not set
642# CONFIG_CHELSIO_T3 is not set 628# CONFIG_CHELSIO_T3 is not set
643# CONFIG_IXGB is not set 629# CONFIG_IXGB is not set
@@ -667,10 +653,6 @@ CONFIG_MLX4_DEBUG=y
667# CONFIG_USB_RTL8150 is not set 653# CONFIG_USB_RTL8150 is not set
668# CONFIG_USB_USBNET_MII is not set 654# CONFIG_USB_USBNET_MII is not set
669# CONFIG_USB_USBNET is not set 655# CONFIG_USB_USBNET is not set
670
671#
672# Wan interfaces
673#
674# CONFIG_WAN is not set 656# CONFIG_WAN is not set
675# CONFIG_FDDI is not set 657# CONFIG_FDDI is not set
676# CONFIG_HIPPI is not set 658# CONFIG_HIPPI is not set