Skip to content

Commit ebf20dd

Browse files
author
David S. Miller
committed
[SPARC64]: Update defconfig.
1 parent 929958b commit ebf20dd

File tree

1 file changed

+26
-34
lines changed

1 file changed

+26
-34
lines changed

arch/sparc64/defconfig

Lines changed: 26 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,7 @@ CONFIG_BRIDGE_EBT_T_NAT=m
571571
CONFIG_BRIDGE_EBT_802_3=m
572572
CONFIG_BRIDGE_EBT_ARP=m
573573
CONFIG_BRIDGE_EBT_IP=m
574+
CONFIG_BRIDGE_EBT_LIMIT=m
574575
CONFIG_BRIDGE_EBT_MARK=m
575576
CONFIG_BRIDGE_EBT_PKTTYPE=m
576577
CONFIG_BRIDGE_EBT_STP=m
@@ -665,7 +666,7 @@ CONFIG_TUN=m
665666
# Ethernet (10 or 100Mbit)
666667
#
667668
CONFIG_NET_ETHERNET=y
668-
# CONFIG_MII is not set
669+
CONFIG_MII=m
669670
CONFIG_SUNLANCE=y
670671
CONFIG_HAPPYMEAL=y
671672
CONFIG_SUNBMAC=m
@@ -729,15 +730,6 @@ CONFIG_YELLOWFIN=m
729730
CONFIG_R8169=m
730731
# CONFIG_SIS190 is not set
731732
CONFIG_SK98LIN=m
732-
CONFIG_CONFIG_SK98LIN_T1=y
733-
CONFIG_CONFIG_SK98LIN_T2=y
734-
CONFIG_CONFIG_SK98LIN_T3=y
735-
CONFIG_CONFIG_SK98LIN_T4=y
736-
CONFIG_CONFIG_SK98LIN_T5=y
737-
CONFIG_CONFIG_SK98LIN_T6=y
738-
CONFIG_CONFIG_SK98LIN_T7=y
739-
CONFIG_CONFIG_SK98LIN_T8=y
740-
CONFIG_CONFIG_SK98LIN_T9=y
741733
CONFIG_TIGON3=m
742734

743735
#
@@ -894,6 +886,30 @@ CONFIG_IRDA_FAST_RR=y
894886
# CONFIG_TOSHIBA_FIR is not set
895887
# CONFIG_VLSI_FIR is not set
896888

889+
#
890+
# Bluetooth support
891+
#
892+
CONFIG_BT=m
893+
CONFIG_BT_L2CAP=m
894+
CONFIG_BT_SCO=m
895+
CONFIG_BT_RFCOMM=m
896+
CONFIG_BT_RFCOMM_TTY=y
897+
CONFIG_BT_BNEP=m
898+
CONFIG_BT_BNEP_MC_FILTER=y
899+
CONFIG_BT_BNEP_PROTO_FILTER=y
900+
901+
#
902+
# Bluetooth device drivers
903+
#
904+
CONFIG_BT_HCIUSB=m
905+
CONFIG_BT_USB_SCO=y
906+
# CONFIG_BT_USB_ZERO_PACKET is not set
907+
CONFIG_BT_HCIUART=m
908+
CONFIG_BT_HCIUART_H4=y
909+
CONFIG_BT_HCIUART_BCSP=y
910+
CONFIG_BT_HCIUART_BCSP_TXCRC=y
911+
CONFIG_BT_HCIVHCI=m
912+
897913
#
898914
# ISDN subsystem
899915
#
@@ -1516,30 +1532,6 @@ CONFIG_USB_SPEEDTOUCH=m
15161532
CONFIG_USB_TEST=m
15171533
# CONFIG_USB_GADGET is not set
15181534

1519-
#
1520-
# Bluetooth support
1521-
#
1522-
CONFIG_BT=m
1523-
CONFIG_BT_L2CAP=m
1524-
CONFIG_BT_SCO=m
1525-
CONFIG_BT_RFCOMM=m
1526-
CONFIG_BT_RFCOMM_TTY=y
1527-
CONFIG_BT_BNEP=m
1528-
CONFIG_BT_BNEP_MC_FILTER=y
1529-
CONFIG_BT_BNEP_PROTO_FILTER=y
1530-
1531-
#
1532-
# Bluetooth device drivers
1533-
#
1534-
CONFIG_BT_HCIUSB=m
1535-
CONFIG_BT_USB_SCO=y
1536-
# CONFIG_BT_USB_ZERO_PACKET is not set
1537-
CONFIG_BT_HCIUART=m
1538-
CONFIG_BT_HCIUART_H4=y
1539-
CONFIG_BT_HCIUART_BCSP=y
1540-
CONFIG_BT_HCIUART_BCSP_TXCRC=y
1541-
CONFIG_BT_HCIVHCI=m
1542-
15431535
#
15441536
# Watchdog
15451537
#

0 commit comments

Comments
 (0)