[SPARC64]: Update defconfig.

1 files changed, 33 insertions, 34 deletions

diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index e9cc2d964404..17b75884b698 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -1,13 +1,15 @@
 #
 # Automatically generated make config: don't edit
 #
+CONFIG_64BIT=y
 CONFIG_MMU=y
 
 #
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_STANDALONE=y
 
 #
 # General setup
@@ -17,6 +19,7 @@ CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
 CONFIG_LOG_BUF_SHIFT=15
+# CONFIG_IKCONFIG is not set
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 CONFIG_FUTEX=y
@@ -51,6 +54,10 @@ CONFIG_CPU_FREQ_TABLE=y
 CONFIG_US3_FREQ=m
 CONFIG_US2E_FREQ=m
 CONFIG_CPU_FREQ_PROC_INTF=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
 # CONFIG_CPU_FREQ_24_API is not set
 CONFIG_SPARC64=y
@@ -67,7 +74,6 @@ CONFIG_RTC=y
 # CONFIG_PCI_LEGACY_PROC is not set
 # CONFIG_PCI_NAMES is not set
 CONFIG_SUN_OPENPROMFS=m
-CONFIG_KCORE_ELF=y
 CONFIG_SPARC32_COMPAT=y
 CONFIG_COMPAT=y
 CONFIG_BINFMT_ELF32=y
@@ -102,8 +108,6 @@ CONFIG_FW_LOADER=m
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_BW2 is not set
@@ -119,7 +123,6 @@ CONFIG_FB_CG6=y
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_PM3 is not set
 CONFIG_FB_SBUS=y
 CONFIG_FB_FFB=y
 # CONFIG_FB_TCX is not set
@@ -274,6 +277,7 @@ CONFIG_IDEDMA_AUTO=y
 # SCSI device support
 #
 CONFIG_SCSI=y
+CONFIG_SCSI_PROC_FS=y
 
 #
 # SCSI support type (disk, tape, CD-ROM)
@@ -309,7 +313,6 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000
 # CONFIG_AIC79XX_DEBUG_ENABLE is not set
 CONFIG_AIC79XX_DEBUG_MASK=0
 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-# CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_MEGARAID is not set
 # CONFIG_SCSI_BUSLOGIC is not set
@@ -319,7 +322,7 @@ CONFIG_SCSI_DMX3191D=m
 CONFIG_SCSI_EATA_PIO=m
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_INITIO is not set
+CONFIG_SCSI_IPS=m
 CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_PPA=m
 CONFIG_SCSI_IMM=m
@@ -330,15 +333,12 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
-# CONFIG_SCSI_PCI2000 is not set
-# CONFIG_SCSI_PCI2220I is not set
 CONFIG_SCSI_QLOGIC_ISP=m
 CONFIG_SCSI_QLOGIC_FC=y
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 # CONFIG_SCSI_QLOGIC_1280 is not set
 CONFIG_SCSI_QLOGICPTI=m
 CONFIG_SCSI_DC395x=m
-# CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_NSP32 is not set
 CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_SUNESP=y
@@ -474,6 +474,7 @@ CONFIG_DECNET_ROUTE_FWMARK=y
 CONFIG_BRIDGE=m
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
 
 #
 # IP: Netfilter Configuration
@@ -486,6 +487,7 @@ CONFIG_IP_NF_AMANDA=m
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
 CONFIG_IP_NF_MATCH_MAC=m
 CONFIG_IP_NF_MATCH_PKTTYPE=m
 CONFIG_IP_NF_MATCH_MARK=m
@@ -501,16 +503,16 @@ CONFIG_IP_NF_MATCH_TCPMSS=m
 CONFIG_IP_NF_MATCH_HELPER=m
 CONFIG_IP_NF_MATCH_STATE=m
 CONFIG_IP_NF_MATCH_CONNTRACK=m
-CONFIG_IP_NF_MATCH_UNCLEAN=m
 CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_PHYSDEV=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_MIRROR=m
 CONFIG_IP_NF_NAT=m
 CONFIG_IP_NF_NAT_NEEDED=y
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_NAT_LOCAL=y
 CONFIG_IP_NF_NAT_SNMP_BASIC=m
 CONFIG_IP_NF_NAT_IRC=m
@@ -522,6 +524,7 @@ CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_DSCP=m
 CONFIG_IP_NF_TARGET_MARK=m
+CONFIG_IP_NF_TARGET_CLASSIFY=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_IP_NF_TARGET_TCPMSS=m
@@ -558,21 +561,27 @@ CONFIG_IP6_NF_TARGET_MARK=m
 # DECnet: Netfilter Configuration
 #
 CONFIG_DECNET_NF_GRABULATOR=m
+
+#
+# Bridge: Netfilter Configuration
+#
 CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
 CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_802_3=m
 CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_IP=m
 CONFIG_BRIDGE_EBT_MARK=m
 CONFIG_BRIDGE_EBT_PKTTYPE=m
 CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
 CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
 
@@ -781,7 +790,6 @@ CONFIG_NET_WIRELESS=y
 # Token Ring devices (depends on LLC=y)
 #
 CONFIG_NET_FC=y
-# CONFIG_IPHASE5526 is not set
 # CONFIG_RCPCI is not set
 CONFIG_SHAPER=m
 
@@ -830,8 +838,6 @@ CONFIG_ROSE=m
 #
 # AX.25 network device drivers
 #
-# CONFIG_MKISS is not set
-# CONFIG_6PACK is not set
 # CONFIG_BPQETHER is not set
 # CONFIG_BAYCOM_SER_FDX is not set
 # CONFIG_BAYCOM_SER_HDX is not set
@@ -875,7 +881,6 @@ CONFIG_IRDA_FAST_RR=y
 #
 # Old SIR device drivers
 #
-# CONFIG_IRTTY_OLD is not set
 # CONFIG_IRPORT_SIR is not set
 
 #
@@ -886,7 +891,6 @@ CONFIG_IRDA_FAST_RR=y
 # FIR device drivers
 #
 # CONFIG_USB_IRDA is not set
-# CONFIG_TOSHIBA_OLD is not set
 # CONFIG_TOSHIBA_FIR is not set
 # CONFIG_VLSI_FIR is not set
 
@@ -896,11 +900,6 @@ CONFIG_IRDA_FAST_RR=y
 CONFIG_ISDN_BOOL=y
 
 #
-# Old ISDN4Linux
-#
-# CONFIG_ISDN is not set
-
-#
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
@@ -1000,7 +999,6 @@ CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_PHILIPSPAR=m
 CONFIG_SCx200_ACB=m
 CONFIG_I2C_ALGOPCF=m
-# CONFIG_I2C_ELEKTOR is not set
 CONFIG_I2C_CHARDEV=m
 
 #
@@ -1198,7 +1196,6 @@ CONFIG_VIDEO_DEV=y
 #
 # Video For Linux
 #
-CONFIG_VIDEO_PROC_FS=y
 
 #
 # Video Adapters
@@ -1214,7 +1211,6 @@ CONFIG_VIDEO_SAA5249=m
 CONFIG_TUNER_3036=m
 # CONFIG_VIDEO_STRADIS is not set
 # CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIDEO_ZR36120 is not set
 CONFIG_VIDEO_SAA7134=m
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_DPC=m
@@ -1247,7 +1243,6 @@ CONFIG_DVB_GRUNDIG_29504_491=m
 CONFIG_DVB_GRUNDIG_29504_401=m
 CONFIG_DVB_MT312=m
 CONFIG_DVB_VES1820=m
-# CONFIG_DVB_TDA1004X is not set
 
 #
 # Supported SAA7146 based PCI Adapters
@@ -1262,7 +1257,6 @@ CONFIG_DVB_BUDGET_PATCH=m
 # Supported USB Adapters
 #
 # CONFIG_DVB_TTUSB_BUDGET is not set
-# CONFIG_DVB_TTUSB_DEC is not set
 
 #
 # Supported FlexCopII (B2C2) Adapters
@@ -1430,7 +1424,7 @@ CONFIG_USB_HPUSBSCSI=m
 #
 # USB Network adaptors
 #
-CONFIG_USB_AX8817X=m
+CONFIG_USB_AX8817X_STANDALONE=m
 CONFIG_USB_CATC=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
@@ -1455,6 +1449,11 @@ CONFIG_USB_ZAURUS=y
 CONFIG_USB_CDCETHER=y
 
 #
+# USB Network Adapters
+#
+CONFIG_USB_AX8817X=y
+
+#
 # USB port drivers
 #
 CONFIG_USB_USS720=m