+CONFIG_AUTODETECT_RAID=y

+CONFIG_RTNETLINK=y
+CONFIG_NETLINK=y

Changed files:
    kernel-sparc-smp.config -> 1.6
    kernel-sparc.config -> 1.6

diff --git a/kernel-sparc-smp.config b/kernel-sparc-smp.config
index 35d10d8b4466f94c393a57b25af0a2c06ee20a74..e5d4201324647acaeacc0e325d577166e9a2433a 100644 (file)
--- a/kernel-sparc-smp.config
+++ b/kernel-sparc-smp.config
@@ -80,10 +80,13 @@ CONFIG_SUNOS_EMUL=y
 #
 CONFIG_BLK_DEV_FD=y
 CONFIG_BLK_DEV_MD=y
+CONFIG_AUTODETECT_RAID=y
 CONFIG_MD_LINEAR=m
 CONFIG_MD_STRIPED=m
 CONFIG_MD_MIRRORING=m
 CONFIG_MD_RAID5=m
+# CONFIG_MD_TRANSLUCENT is not set
+# CONFIG_MD_HSM is not set
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_NBD=m
@@ -103,6 +106,8 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_RTNETLINK=y
+CONFIG_NETLINK=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_TOS=y
@@ -112,8 +117,8 @@ CONFIG_IP_ROUTE_NAT=y
 # CONFIG_IP_PNP is not set
 CONFIG_IP_FIREWALL=y
 CONFIG_IP_FIREWALL_NETLINK=y
-CONFIG_IP_ROUTE_FWMARK=y
 CONFIG_NETLINK_DEV=y
+CONFIG_IP_ROUTE_FWMARK=y
 CONFIG_IP_TRANSPARENT_PROXY=y
 CONFIG_IP_MASQUERADE=y
 CONFIG_IP_MASQUERADE_ICMP=y
@@ -155,16 +160,6 @@ CONFIG_WAN_ROUTER=m
 # CONFIG_NET_FASTROUTE is not set
 # CONFIG_NET_HW_FLOWCONTROL is not set
 # CONFIG_CPU_IS_SLOW is not set
-CONFIG_IPSEC=m
-CONFIG_IPSEC_IPIP=y
-CONFIG_IPSEC_PFKEYv2=y
-CONFIG_IPSEC_ICMP=y
-CONFIG_IPSEC_AH=y
-CONFIG_IPSEC_AUTH_HMAC_MD5=y
-CONFIG_IPSEC_AUTH_HMAC_SHA1=y
-CONFIG_IPSEC_ESP=y
-CONFIG_IPSEC_ENC_3DES=y
-DEBUG_IPSEC=y
 
 #
 # QoS and/or fair queueing
@@ -190,6 +185,21 @@ CONFIG_NET_CLS_U32=m
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_POLICE=y
+CONFIG_IPSEC=m
+CONFIG_IPSEC_IPIP=y
+CONFIG_IPSEC_PFKEYv2=y
+CONFIG_IPSEC_ICMP=y
+CONFIG_IPSEC_AH=y
+CONFIG_IPSEC_AUTH_HMAC_MD5=y
+CONFIG_IPSEC_AUTH_HMAC_SHA1=y
+CONFIG_IPSEC_ESP=y
+CONFIG_IPSEC_ENC_3DES=y
+DEBUG_IPSEC=y
+
+#
+# Amateur Radio support
+#
+# CONFIG_HAMRADIO is not set
 
 #
 # Crypto options
@@ -244,6 +254,7 @@ CONFIG_SCSI_FCAL=m
 #
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=m
+# CONFIG_BONDING is not set
 CONFIG_PPP=m
 CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y

diff --git a/kernel-sparc.config b/kernel-sparc.config
index f2b25109c7909cc13b07ab96591c51869bb05db2..b253969e20aee8f335bbb04a5304ad52232a3669 100644 (file)
--- a/kernel-sparc.config
+++ b/kernel-sparc.config
@@ -80,10 +80,13 @@ CONFIG_SUNOS_EMUL=y
 #
 CONFIG_BLK_DEV_FD=y
 CONFIG_BLK_DEV_MD=y
+CONFIG_AUTODETECT_RAID=y
 CONFIG_MD_LINEAR=m
 CONFIG_MD_STRIPED=m
 CONFIG_MD_MIRRORING=m
 CONFIG_MD_RAID5=m
+# CONFIG_MD_TRANSLUCENT is not set
+# CONFIG_MD_HSM is not set
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_NBD=m
@@ -103,6 +106,8 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_RTNETLINK=y
+CONFIG_NETLINK=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_TOS=y
@@ -112,8 +117,8 @@ CONFIG_IP_ROUTE_NAT=y
 # CONFIG_IP_PNP is not set
 CONFIG_IP_FIREWALL=y
 CONFIG_IP_FIREWALL_NETLINK=y
-CONFIG_IP_ROUTE_FWMARK=y
 CONFIG_NETLINK_DEV=y
+CONFIG_IP_ROUTE_FWMARK=y
 CONFIG_IP_TRANSPARENT_PROXY=y
 CONFIG_IP_MASQUERADE=y
 CONFIG_IP_MASQUERADE_ICMP=y
@@ -155,16 +160,6 @@ CONFIG_WAN_ROUTER=m
 # CONFIG_NET_FASTROUTE is not set
 # CONFIG_NET_HW_FLOWCONTROL is not set
 # CONFIG_CPU_IS_SLOW is not set
-CONFIG_IPSEC=m
-CONFIG_IPSEC_IPIP=y
-CONFIG_IPSEC_PFKEYv2=y
-CONFIG_IPSEC_ICMP=y
-CONFIG_IPSEC_AH=y
-CONFIG_IPSEC_AUTH_HMAC_MD5=y
-CONFIG_IPSEC_AUTH_HMAC_SHA1=y
-CONFIG_IPSEC_ESP=y
-CONFIG_IPSEC_ENC_3DES=y
-DEBUG_IPSEC=y
 
 #
 # QoS and/or fair queueing
@@ -190,6 +185,21 @@ CONFIG_NET_CLS_U32=m
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_POLICE=y
+CONFIG_IPSEC=m
+CONFIG_IPSEC_IPIP=y
+CONFIG_IPSEC_PFKEYv2=y
+CONFIG_IPSEC_ICMP=y
+CONFIG_IPSEC_AH=y
+CONFIG_IPSEC_AUTH_HMAC_MD5=y
+CONFIG_IPSEC_AUTH_HMAC_SHA1=y
+CONFIG_IPSEC_ESP=y
+CONFIG_IPSEC_ENC_3DES=y
+DEBUG_IPSEC=y
+
+#
+# Amateur Radio support
+#
+# CONFIG_HAMRADIO is not set
 
 #
 # Crypto options
@@ -244,6 +254,7 @@ CONFIG_SCSI_FCAL=m
 #
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=m
+# CONFIG_BONDING is not set
 CONFIG_PPP=m
 CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y