Sparc config updates for 2.6.17-rc3.

svn path=/dists/trunk/linux-2.6/; revision=6513

3 files changed, 8 insertions, 5 deletions

diff --git a/debian/arch/sparc/config.sparc32 b/debian/arch/sparc/config.sparc32
index f6a5a3034ff4..c6662838d112 100644
--- a/debian/arch/sparc/config.sparc32
+++ b/debian/arch/sparc/config.sparc32
@@ -11,7 +11,6 @@ CONFIG_GENERIC_ISA_DMA=y
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 
@@ -41,10 +40,6 @@ CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
 CONFIG_SLAB=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
@@ -81,6 +76,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # General machine setup
 #
+# CONFIG_SMP is not set
 CONFIG_SPARC=y
 CONFIG_SPARC32=y
 CONFIG_SBUS=y
diff --git a/debian/arch/sparc/config.sparc64 b/debian/arch/sparc/config.sparc64
index 4621272cd46f..d2a54c0169e4 100644
--- a/debian/arch/sparc/config.sparc64
+++ b/debian/arch/sparc/config.sparc64
@@ -390,3 +390,6 @@ CONFIG_USB_SISUSBVGA=m
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_SERIAL_SUNHV=y
+# CONFIG_USB_W9968CF is not set
diff --git a/debian/arch/sparc/config.sparc64-smp b/debian/arch/sparc/config.sparc64-smp
index 1d8dfa18ad3f..ee1d79aa8033 100644
--- a/debian/arch/sparc/config.sparc64-smp
+++ b/debian/arch/sparc/config.sparc64-smp
@@ -395,3 +395,7 @@ CONFIG_LOG_BUF_SHIFT=15
 CONFIG_HAVE_DEC_LOCK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_SCHED_SMT=y
+CONFIG_SERIAL_SUNHV=y
+# CONFIG_USB_W9968CF is not set