Index: kernel/kernel.config
===================================================================
--- kernel/kernel.config	(revision ccb0cbc16c5693f21db6f0a461d981ada016aad6)
+++ kernel/kernel.config	(revision eb353b329c894c5ded8001e6ea95db6513159021)
@@ -86,4 +86,20 @@
 ! [ARCH=ppc32] CONFIG_POWEROFF (n/y)
 
+# Use VHPT
+! [ARCH=ia64] CONFIG_VHPT (n/y)
+
+# Use TSB
+! [ARCH=sparc64] CONFIG_TSB (y/n)
+
+# Support for Z8530 serial port
+! [ARCH=sparc64] CONFIG_Z8530 (y/n)
+
+# Support for NS16550 serial port
+! [ARCH=sparc64] CONFIG_NS16550 (y/n)
+
+# Virtually indexed cache support
+! [ARCH=sparc64] CONFIG_VIRT_IDX_SUPPORT (n/y)
+
+
 ## Debugging configuration directives
 
@@ -100,15 +116,4 @@
 ! [CONFIG_DEBUG=y&(ARCH=amd64|ARCH=mips32|ARCH=ia32|ARCH=ia32xen)] CONFIG_DEBUG_ALLREGS (y/n)
 
-# Use VHPT
-! [ARCH=ia64] CONFIG_VHPT (n/y)
-
-# Use TSB
-! [ARCH=sparc64] CONFIG_TSB (y/n)
-
-# Support for Z8530 serial port
-! [ARCH=sparc64] CONFIG_Z8530 (y/n)
-
-# Support for NS16550 serial port
-! [ARCH=sparc64] CONFIG_NS16550 (y/n)
 
 ## Run-time configuration directives