X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=arch%2Fsparc64%2FKconfig;h=4263e5e2a38d57683acf83ac243b5d2391b4ca1b;hb=b498e42498ba707bf18fd91ab0485f22b5c22a26;hp=3b96e70b467033f43f6dc4b099bbf4e47c14a975;hpb=20ebc0073b0fb63ce4a27ca761418ecfdecaadb7;p=linux-2.6-omap-h63xx.git

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 3b96e70b467..4263e5e2a38 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -250,8 +250,6 @@ config HUGETLB_PAGE_SIZE_64K
 
 endchoice
 
-endmenu
-
 config NUMA
 	bool "NUMA support"
 	depends on SMP
@@ -285,6 +283,46 @@ config ARCH_SPARSEMEM_DEFAULT
 
 source "mm/Kconfig"
 
+config SCHED_SMT
+	bool "SMT (Hyperthreading) scheduler support"
+	depends on SMP
+	default y
+	help
+	  SMT scheduler support improves the CPU scheduler's decision making
+	  when dealing with SPARC cpus at a cost of slightly increased overhead
+	  in some places. If unsure say N here.
+
+config SCHED_MC
+	bool "Multi-core scheduler support"
+	depends on SMP
+	default y
+	help
+	  Multi-core scheduler support improves the CPU scheduler's decision
+	  making when dealing with multi-core CPU chips at a cost of slightly
+	  increased overhead in some places. If unsure say N here.
+
+source "kernel/Kconfig.preempt"
+
+config CMDLINE_BOOL
+	bool "Default bootloader kernel arguments"
+
+config CMDLINE
+	string "Initial kernel command string"
+	depends on CMDLINE_BOOL
+	default "console=ttyS0,9600 root=/dev/sda1"
+	help
+	  Say Y here if you want to be able to pass default arguments to
+	  the kernel. This will be overridden by the bootloader, if you
+	  use one (such as SILO). This is most useful if you want to boot
+	  a kernel from TFTP, and want default options to be available
+	  with having them passed on the command line.
+
+	  NOTE: This option WILL override the PROM bootargs setting!
+
+endmenu
+
+menu "Bus options (PCI etc.)"
+
 config ISA
 	bool
 
@@ -364,6 +402,8 @@ config SUN_OPENPROMFS
 	  To compile the /proc/openprom support as a module, choose M here: the
 	  module will be called openpromfs.  If unsure, choose M.
 
+endmenu
+
 menu "Executable file formats"
 
 source "fs/Kconfig.binfmt"
@@ -380,42 +420,6 @@ config SYSVIPC_COMPAT
 
 endmenu
 
-config SCHED_SMT
-	bool "SMT (Hyperthreading) scheduler support"
-	depends on SMP
-	default y
-	help
-	  SMT scheduler support improves the CPU scheduler's decision making
-	  when dealing with SPARC cpus at a cost of slightly increased overhead
-	  in some places. If unsure say N here.
-
-config SCHED_MC
-	bool "Multi-core scheduler support"
-	depends on SMP
-	default y
-	help
-	  Multi-core scheduler support improves the CPU scheduler's decision
-	  making when dealing with multi-core CPU chips at a cost of slightly
-	  increased overhead in some places. If unsure say N here.
-
-source "kernel/Kconfig.preempt"
-
-config CMDLINE_BOOL
-	bool "Default bootloader kernel arguments"
-
-config CMDLINE
-	string "Initial kernel command string"
-	depends on CMDLINE_BOOL
-	default "console=ttyS0,9600 root=/dev/sda1"
-	help
-	  Say Y here if you want to be able to pass default arguments to
-	  the kernel. This will be overridden by the bootloader, if you
-	  use one (such as SILO). This is most useful if you want to boot
-	  a kernel from TFTP, and want default options to be available
-	  with having them passed on the command line.
-
-	  NOTE: This option WILL override the PROM bootargs setting!
-
 source "net/Kconfig"
 
 source "drivers/Kconfig"
@@ -424,7 +428,7 @@ source "drivers/sbus/char/Kconfig"
 
 source "fs/Kconfig"
 
-source "arch/sparc64/Kconfig.debug"
+source "arch/sparc/Kconfig.debug"
 
 source "security/Kconfig"