sparc64: added more config options to the menus

[linux-2.6-omap-h63xx.git] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 824f6122e1a51f4e8b5c1d9e2028cb46f353fbf8..4263e5e2a38d57683acf83ac243b5d2391b4ca1b 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -11,7 +11,6 @@ config SPARC
 config SPARC64
        bool
        default y
-       select HAVE_DYNAMIC_FTRACE
        select HAVE_FUNCTION_TRACER
        select HAVE_IDE
        select HAVE_LMB
@@ -251,8 +250,6 @@ config HUGETLB_PAGE_SIZE_64K
 
 endchoice
 
-endmenu
-
 config NUMA
        bool "NUMA support"
        depends on SMP
@@ -286,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
 
@@ -365,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"
@@ -381,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"
@@ -425,7 +428,7 @@ source "drivers/sbus/char/Kconfig"
 
 source "fs/Kconfig"
 
-source "arch/sparc64/Kconfig.debug"
+source "arch/sparc/Kconfig.debug"
 
 source "security/Kconfig"