aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Kconfig11
-rw-r--r--arch/alpha/Kconfig4
-rw-r--r--arch/arm/Kconfig7
-rw-r--r--arch/avr32/Kconfig7
-rw-r--r--arch/blackfin/Kconfig7
-rw-r--r--arch/cris/Kconfig7
-rw-r--r--arch/frv/Kconfig6
-rw-r--r--arch/h8300/Kconfig7
-rw-r--r--arch/ia64/Kconfig7
-rw-r--r--arch/m32r/Kconfig7
-rw-r--r--arch/m68k/Kconfig6
-rw-r--r--arch/m68knommu/Kconfig7
-rw-r--r--arch/microblaze/Kconfig5
-rw-r--r--arch/mips/Kconfig2
-rw-r--r--arch/mn10300/Kconfig9
-rw-r--r--arch/parisc/Kconfig7
-rw-r--r--arch/powerpc/Kconfig6
-rw-r--r--arch/s390/Kconfig7
-rw-r--r--arch/score/Kconfig5
-rw-r--r--arch/sh/Kconfig7
-rw-r--r--arch/sparc/Kconfig6
-rw-r--r--arch/um/Kconfig.common2
-rw-r--r--arch/x86/Kconfig3
-rw-r--r--arch/xtensa/Kconfig5
-rw-r--r--scripts/kconfig/Makefile2
25 files changed, 12 insertions, 137 deletions
diff --git a/Kconfig b/Kconfig
new file mode 100644
index 000000000000..c13f48d65898
--- /dev/null
+++ b/Kconfig
@@ -0,0 +1,11 @@
1#
2# For a description of the syntax of this configuration file,
3# see Documentation/kbuild/kconfig-language.txt.
4#
5mainmenu "Linux/$ARCH $KERNELVERSION Kernel Configuration"
6
7config SRCARCH
8 string
9 option env="SRCARCH"
10
11source "arch/$SRCARCH/Kconfig"
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 3e2e540a0f2a..95808c13b277 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -1,7 +1,3 @@
1#
2# For a description of the syntax of this configuration file,
3# see Documentation/kbuild/kconfig-language.txt.
4#
5config ALPHA 1config ALPHA
6 bool 2 bool
7 default y 3 default y
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 98922f7d2d12..c3f4fd96051e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1,10 +1,3 @@
1#
2# For a description of the syntax of this configuration file,
3# see Documentation/kbuild/kconfig-language.txt.
4#
5
6mainmenu "Linux Kernel Configuration"
7
8config ARM 1config ARM
9 bool 2 bool
10 default y 3 default y
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index f2b319333184..ead727e7f4df 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -1,10 +1,3 @@
1#
2# For a description of the syntax of this configuration file,
3# see Documentation/kbuild/kconfig-language.txt.
4#
5
6mainmenu "Linux Kernel Configuration"
7
8config AVR32 1config AVR32
9 def_bool y 2 def_bool y
10 # With EMBEDDED=n, we get lots of stuff automatically selected 3 # With EMBEDDED=n, we get lots of stuff automatically selected
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index f66294b4f9d2..7051c4ce9b93 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -1,10 +1,3 @@
1#
2# For a description of the syntax of this configuration file,
3# see Documentation/kbuild/kconfig-language.txt.
4#
5
6mainmenu "Blackfin Kernel Configuration"
7
8config SYMBOL_PREFIX 1config SYMBOL_PREFIX
9 string 2 string
10 default "_" 3 default "_"
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index e25bf4440b51..af8e9821adc5 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -1,10 +1,3 @@
1#
2# For a description of the syntax of this configuration file,
3# see the Configure script.
4#
5
6mainmenu "Linux/CRIS Kernel Configuration"
7
8config MMU 1config MMU
9 bool 2 bool
10 default y 3 default y
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 4b5830bcbe2e..06256796200a 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -1,7 +1,3 @@
1#
2# For a description of the syntax of this configuration file,
3# see Documentation/kbuild/kconfig-language.txt.
4#
5config FRV 1config FRV
6 bool 2 bool
7 default y 3 default y
@@ -64,8 +60,6 @@ config HZ
64 int 60 int
65 default 1000 61 default 1000
66 62
67mainmenu "Fujitsu FR-V Kernel Configuration"
68
69source "init/Kconfig" 63source "init/Kconfig"
70 64
71source "kernel/Kconfig.freezer" 65source "kernel/Kconfig.freezer"
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 53cc669e6d59..3fe4d5adf9a2 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -1,10 +1,3 @@
1#
2# For a description of the syntax of this configuration file,
3# see Documentation/kbuild/kconfig-language.txt.
4#
5
6mainmenu "uClinux/h8300 (w/o MMU) Kernel Configuration"
7
8config H8300 1config H8300
9 bool 2 bool
10 default y 3 default y
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 95610820041e..09ce2ab792e1 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -1,10 +1,3 @@
1#
2# For a description of the syntax of this configuration file,
3# see Documentation/kbuild/kconfig-language.txt.
4#
5
6mainmenu "IA-64 Linux Kernel Configuration"
7
8source "init/Kconfig" 1source "init/Kconfig"
9 2
10source "kernel/Kconfig.freezer" 3source "kernel/Kconfig.freezer"
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 3a9319f93e89..190270ea7393 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -1,10 +1,3 @@
1#
2# For a description of the syntax of this configuration file,
3# see Documentation/kbuild/kconfig-language.txt.
4#
5
6mainmenu "Linux/M32R Kernel Configuration"
7
8config M32R 1config M32R
9 bool 2 bool
10 default y 3 default y
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 2e3737b92ffc..1812aa048171 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -1,7 +1,3 @@
1#
2# For a description of the syntax of this configuration file,
3# see Documentation/kbuild/kconfig-language.txt.
4#
5config M68K 1config M68K
6 bool 2 bool
7 default y 3 default y
@@ -65,8 +61,6 @@ config GENERIC_TIME
65config ARCH_USES_GETTIMEOFFSET 61config ARCH_USES_GETTIMEOFFSET
66 def_bool y 62 def_bool y
67 63
68mainmenu "Linux/68k Kernel Configuration"
69
70source "init/Kconfig" 64source "init/Kconfig"
71 65
72source "kernel/Kconfig.freezer" 66source "kernel/Kconfig.freezer"
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index efeb6033fc17..e86842dc740a 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -1,10 +1,3 @@
1#
2# For a description of the syntax of this configuration file,
3# see Documentation/kbuild/kconfig-language.txt.
4#
5
6mainmenu "uClinux/68k (w/o MMU) Kernel Configuration"
7
8config M68K 1config M68K
9 bool 2 bool
10 default y 3 default y
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 505a08592423..0c5f43728a71 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -1,8 +1,3 @@
1# For a description of the syntax of this configuration file,
2# see Documentation/kbuild/kconfig-language.txt.
3
4mainmenu "Linux/Microblaze Kernel Configuration"
5
6config MICROBLAZE 1config MICROBLAZE
7 def_bool y 2 def_bool y
8 select HAVE_MEMBLOCK 3 select HAVE_MEMBLOCK
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index cdaae942623d..33771676957d 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -12,8 +12,6 @@ config MIPS
12 select HAVE_FUNCTION_GRAPH_TRACER 12 select HAVE_FUNCTION_GRAPH_TRACER
13 select RTC_LIB if !MACH_LOONGSON 13 select RTC_LIB if !MACH_LOONGSON
14 14
15mainmenu "Linux/MIPS Kernel Configuration"
16
17menu "Machine selection" 15menu "Machine selection"
18 16
19config ZONE_DMA 17config ZONE_DMA
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 1c4565a9102b..7bd617c94dfe 100644
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -1,10 +1,3 @@
1#
2# For a description of the syntax of this configuration file,
3# see Documentation/kbuild/kconfig-language.txt.
4#
5
6mainmenu "Linux Kernel Configuration"
7
8config MN10300 1config MN10300
9 def_bool y 2 def_bool y
10 select HAVE_OPROFILE 3 select HAVE_OPROFILE
@@ -69,8 +62,6 @@ config HZ
69 int 62 int
70 default 1000 63 default 1000
71 64
72mainmenu "Matsushita MN10300/AM33 Kernel Configuration"
73
74source "init/Kconfig" 65source "init/Kconfig"
75 66
76source "kernel/Kconfig.freezer" 67source "kernel/Kconfig.freezer"
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 05a366a5c4d5..82cec342bd30 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -1,10 +1,3 @@
1#
2# For a description of the syntax of this configuration file,
3# see Documentation/kbuild/kconfig-language.txt.
4#
5
6mainmenu "Linux/PA-RISC Kernel Configuration"
7
8config PARISC 1config PARISC
9 def_bool y 2 def_bool y
10 select HAVE_IDE 3 select HAVE_IDE
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 2031a2846865..182743b46e0a 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -1,9 +1,3 @@
1# For a description of the syntax of this configuration file,
2# see Documentation/kbuild/kconfig-language.txt.
3#
4
5mainmenu "Linux/PowerPC Kernel Configuration"
6
7source "arch/powerpc/platforms/Kconfig.cputype" 1source "arch/powerpc/platforms/Kconfig.cputype"
8 2
9config PPC32 3config PPC32
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index bee1c0f794cf..3c4d4e69025d 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -1,8 +1,3 @@
1#
2# For a description of the syntax of this configuration file,
3# see Documentation/kbuild/kconfig-language.txt.
4#
5
6config SCHED_MC 1config SCHED_MC
7 def_bool y 2 def_bool y
8 depends on SMP 3 depends on SMP
@@ -78,8 +73,6 @@ config VIRT_CPU_ACCOUNTING
78config ARCH_SUPPORTS_DEBUG_PAGEALLOC 73config ARCH_SUPPORTS_DEBUG_PAGEALLOC
79 def_bool y 74 def_bool y
80 75
81mainmenu "Linux Kernel Configuration"
82
83config S390 76config S390
84 def_bool y 77 def_bool y
85 select USE_GENERIC_SMP_HELPERS if SMP 78 select USE_GENERIC_SMP_HELPERS if SMP
diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index 55d413e6dcf2..5cbc148addfe 100644
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -1,8 +1,3 @@
1# For a description of the syntax of this configuration file,
2# see Documentation/kbuild/kconfig-language.txt.
3
4mainmenu "Linux/SCORE Kernel Configuration"
5
6menu "Machine selection" 1menu "Machine selection"
7 2
8choice 3choice
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 82868fee21fd..8ada4757fc9b 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -1,10 +1,3 @@
1#
2# For a description of the syntax of this configuration file,
3# see Documentation/kbuild/kconfig-language.txt.
4#
5
6mainmenu "Linux/SuperH Kernel Configuration"
7
8config SUPERH 1config SUPERH
9 def_bool y 2 def_bool y
10 select EMBEDDED 3 select EMBEDDED
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index c0015db247ba..19aa7b253d78 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -1,9 +1,3 @@
1# For a description of the syntax of this configuration file,
2# see Documentation/kbuild/kconfig-language.txt.
3#
4
5mainmenu "Linux/SPARC Kernel Configuration"
6
7config 64BIT 1config 64BIT
8 bool "64-bit kernel" if ARCH = "sparc" 2 bool "64-bit kernel" if ARCH = "sparc"
9 default ARCH = "sparc64" 3 default ARCH = "sparc64"
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index 0d207e73a758..e90ca8609e31 100644
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -19,8 +19,6 @@ config MMU
19config NO_IOMEM 19config NO_IOMEM
20 def_bool y 20 def_bool y
21 21
22mainmenu "Linux/Usermode Kernel Configuration"
23
24config ISA 22config ISA
25 bool 23 bool
26 24
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index dcb0593b4a66..6c30b9e93d8c 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1,6 +1,3 @@
1# x86 configuration
2mainmenu "Linux Kernel Configuration for x86"
3
4# Select 32 or 64 bit 1# Select 32 or 64 bit
5config 64BIT 2config 64BIT
6 bool "64-bit kernel" if ARCH = "x86" 3 bool "64-bit kernel" if ARCH = "x86"
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index ebe228d02b08..9e4ef660c9a5 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -1,8 +1,3 @@
1# For a description of the syntax of this configuration file,
2# see Documentation/kbuild/kconfig-language.txt.
3
4mainmenu "Linux/Xtensa Kernel Configuration"
5
6config FRAME_POINTER 1config FRAME_POINTER
7 def_bool n 2 def_bool n
8 3
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index cef3f75e1c2b..52c34b914fc7 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -8,7 +8,7 @@ PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-c
8ifdef KBUILD_KCONFIG 8ifdef KBUILD_KCONFIG
9Kconfig := $(KBUILD_KCONFIG) 9Kconfig := $(KBUILD_KCONFIG)
10else 10else
11Kconfig := arch/$(SRCARCH)/Kconfig 11Kconfig := Kconfig
12endif 12endif
13 13
14xconfig: $(obj)/qconf 14xconfig: $(obj)/qconf