- updated

Changed files:
    kernel-sparc64-smp.config -> 1.48.2.46
    kernel-sparc64.config -> 1.48.2.34

diff --git a/kernel-sparc64-smp.config b/kernel-sparc64-smp.config
index 128935d37af493beb7fd7f12d629f5a7abd7d1b7..81f8fa1e3ba1484864d8ceaaadc2aa083395ee1d 100644 (file)
--- a/kernel-sparc64-smp.config
+++ b/kernel-sparc64-smp.config
@@ -841,6 +841,7 @@ CONFIG_VIA_RHINE=m
 #
 # Ethernet (1000 Mbit)
 #
+CONFIG_GIGE=m
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_DL2K=m

diff --git a/kernel-sparc64.config b/kernel-sparc64.config
index 1245f348c06813ec7961bfe1fe2c5171f85068df..ae56c8f42b4ec49683f3d13b07d0963007c68c49 100644 (file)
--- a/kernel-sparc64.config
+++ b/kernel-sparc64.config
@@ -1748,7 +1748,15 @@ CONFIG_HAVE_DEC_LOCK=y
 #
 # Security options
 #
-# CONFIG_SECURITY is not set
+CONFIG_SECURITY=y
+# CONFIG_SECURITY_NETWORK is not set
+CONFIG_SECURITY_CAPABILITIES=m
+CONFIG_SECURITY_ROOTPLUG=m
+CONFIG_SECURITY_SELINUX=y
+# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+# CONFIG_SECURITY_SELINUX_MLS is not set
 
 #
 # Cryptographic options