Merge branch 'linux-2.6'

author: Paul Mackerras <paulus@samba.org> 2007-12-09 23:41:22 -0500
committer: Paul Mackerras <paulus@samba.org> 2007-12-09 23:41:22 -0500
commit: b242a60206881559bb3102110048762422e6b74e (patch)
tree: 86459efa47b9c3f69d865b4495beede9c4184003 /arch/avr32/Kconfig
parent: e1fd18656c2963e383d67b7006c0e06c9c1d9c79 (diff)
parent: 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff)
1 files changed, 28 insertions, 37 deletions
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 4f402c924504..b77abce10c7a 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -6,8 +6,7 @@
 mainmenu "Linux Kernel Configuration"
 config AVR32
-        bool
+        def_bool y
-        default y
        # With EMBEDDED=n, we get lots of stuff automatically selected
        # that we usually don't need on AVR32.
        select EMBEDDED
@@ -20,51 +19,49 @@ config AVR32
          http://avr32linux.org/.
 config GENERIC_GPIO
-        bool
+        def_bool y
-        default y
 config GENERIC_HARDIRQS
-        bool
+        def_bool y
-        default y
+config STACKTRACE_SUPPORT
+        def_bool y
+config LOCKDEP_SUPPORT
+        def_bool y
+config TRACE_IRQFLAGS_SUPPORT
+        def_bool y
 config HARDIRQS_SW_RESEND
-        bool
+        def_bool y
-        default y
 config GENERIC_IRQ_PROBE
-        bool
+        def_bool y
-        default y
 config RWSEM_GENERIC_SPINLOCK
-        bool
+        def_bool y
-        default y
 config GENERIC_TIME
-        bool
+        def_bool y
-        default y
 config RWSEM_XCHGADD_ALGORITHM
-        bool
+        def_bool n
 config ARCH_HAS_ILOG2_U32
-        bool
+        def_bool n
-        default n
 config ARCH_HAS_ILOG2_U64
-        bool
+        def_bool n
-        default n
 config GENERIC_HWEIGHT
-        bool
+        def_bool y
-        default y
 config GENERIC_CALIBRATE_DELAY
-        bool
+        def_bool y
-        default y
 config GENERIC_BUG
-        bool
+        def_bool y
-        default y
        depends on BUG
 source "init/Kconfig"
@@ -139,28 +136,22 @@ config PHYS_OFFSET
 source "kernel/Kconfig.preempt"
 config HAVE_ARCH_BOOTMEM_NODE
-        bool
+        def_bool n
-        default n
 config ARCH_HAVE_MEMORY_PRESENT
-        bool
+        def_bool n
-        default n
 config NEED_NODE_MEMMAP_SIZE
-        bool
+        def_bool n
-        default n
 config ARCH_FLATMEM_ENABLE
-        bool
+        def_bool y
-        default y
 config ARCH_DISCONTIGMEM_ENABLE
-        bool
+        def_bool n
-        default n
 config ARCH_SPARSEMEM_ENABLE
-        bool
+        def_bool n
-        default n
 source "mm/Kconfig"
author	Paul Mackerras <paulus@samba.org>	2007-12-09 23:41:22 -0500
committer	Paul Mackerras <paulus@samba.org>	2007-12-09 23:41:22 -0500
commit	b242a60206881559bb3102110048762422e6b74e (patch)
tree	86459efa47b9c3f69d865b4495beede9c4184003 /arch/avr32/Kconfig
parent	e1fd18656c2963e383d67b7006c0e06c9c1d9c79 (diff)
parent	94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff)

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index 4f402c924504..b77abce10c7a 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig
@@ -6,8 +6,7 @@
6	mainmenu "Linux Kernel Configuration"	6	mainmenu "Linux Kernel Configuration"
7		7
8	config AVR32	8	config AVR32
9	bool	9	def_bool y
10	default y
11	# With EMBEDDED=n, we get lots of stuff automatically selected	10	# With EMBEDDED=n, we get lots of stuff automatically selected
12	# that we usually don't need on AVR32.	11	# that we usually don't need on AVR32.
13	select EMBEDDED	12	select EMBEDDED
@@ -20,51 +19,49 @@ config AVR32
20	http://avr32linux.org/.	19	http://avr32linux.org/.
21		20
22	config GENERIC_GPIO	21	config GENERIC_GPIO
23	bool	22	def_bool y
24	default y
25		23
26	config GENERIC_HARDIRQS	24	config GENERIC_HARDIRQS
27	bool	25	def_bool y
28	default y	26
		27	config STACKTRACE_SUPPORT
		28	def_bool y
		29
		30	config LOCKDEP_SUPPORT
		31	def_bool y
		32
		33	config TRACE_IRQFLAGS_SUPPORT
		34	def_bool y
29		35
30	config HARDIRQS_SW_RESEND	36	config HARDIRQS_SW_RESEND
31	bool	37	def_bool y
32	default y
33		38
34	config GENERIC_IRQ_PROBE	39	config GENERIC_IRQ_PROBE
35	bool	40	def_bool y
36	default y
37		41
38	config RWSEM_GENERIC_SPINLOCK	42	config RWSEM_GENERIC_SPINLOCK
39	bool	43	def_bool y
40	default y
41		44
42	config GENERIC_TIME	45	config GENERIC_TIME
43	bool	46	def_bool y
44	default y
45		47
46	config RWSEM_XCHGADD_ALGORITHM	48	config RWSEM_XCHGADD_ALGORITHM
47	bool	49	def_bool n
48		50
49	config ARCH_HAS_ILOG2_U32	51	config ARCH_HAS_ILOG2_U32
50	bool	52	def_bool n
51	default n
52		53
53	config ARCH_HAS_ILOG2_U64	54	config ARCH_HAS_ILOG2_U64
54	bool	55	def_bool n
55	default n
56		56
57	config GENERIC_HWEIGHT	57	config GENERIC_HWEIGHT
58	bool	58	def_bool y
59	default y
60		59
61	config GENERIC_CALIBRATE_DELAY	60	config GENERIC_CALIBRATE_DELAY
62	bool	61	def_bool y
63	default y
64		62
65	config GENERIC_BUG	63	config GENERIC_BUG
66	bool	64	def_bool y
67	default y
68	depends on BUG	65	depends on BUG
69		66
70	source "init/Kconfig"	67	source "init/Kconfig"
@@ -139,28 +136,22 @@ config PHYS_OFFSET
139	source "kernel/Kconfig.preempt"	136	source "kernel/Kconfig.preempt"
140		137
141	config HAVE_ARCH_BOOTMEM_NODE	138	config HAVE_ARCH_BOOTMEM_NODE
142	bool	139	def_bool n
143	default n
144		140
145	config ARCH_HAVE_MEMORY_PRESENT	141	config ARCH_HAVE_MEMORY_PRESENT
146	bool	142	def_bool n
147	default n
148		143
149	config NEED_NODE_MEMMAP_SIZE	144	config NEED_NODE_MEMMAP_SIZE
150	bool	145	def_bool n
151	default n
152		146
153	config ARCH_FLATMEM_ENABLE	147	config ARCH_FLATMEM_ENABLE
154	bool	148	def_bool y
155	default y
156		149
157	config ARCH_DISCONTIGMEM_ENABLE	150	config ARCH_DISCONTIGMEM_ENABLE
158	bool	151	def_bool n
159	default n
160		152
161	config ARCH_SPARSEMEM_ENABLE	153	config ARCH_SPARSEMEM_ENABLE
162	bool	154	def_bool n
163	default n
164		155
165	source "mm/Kconfig"	156	source "mm/Kconfig"
166		157