aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-21 19:18:05 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-21 19:18:05 -0500
commit0f151e8b214c1df3f571020b849382933f2cdce7 (patch)
tree9ae4bb3361e9d7e286674b1d59b9dc931c74caf1
parente80af3a8dbbbf431b2070cc760699f01c5a6ac69 (diff)
parenta8b87f609d1332216e683b473d33342c86f21ac3 (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] pasemi: Remove warning in mpic_pasemi_msi.c [POWERPC] pasemi: Register i2c devices at boot [POWERPC] cell: fix spurious false return from spu_trap_data_{map,seg} [POWERPC] Fix warning in pseries/power.c [POWERPC] Fix bootwrapper builds with older gcc versions [POWERPC] Fix dt_mem_next_cell() to read the full address [POWERPC] Kill sparse warnings in kprobes [POWERPC] spufs: fix scheduler starvation by idle contexts [POWERPC] 44x: Add multiplatform defconfig [POWERPC] 44x: Fix Kconfig formatting [POWERPC] 4xx: Update defconfigs for 2.6.25 [POWERPC] 4xx: Remove "i2c" and "xxmii-interface" device_types from dts [POWERPC] PPC440EP Interrupt Triggering and Level Settings [POWERPC] net: NEWEMAC: Remove "rgmii-interface" from rgmii matching table
-rw-r--r--arch/powerpc/boot/Makefile8
-rw-r--r--arch/powerpc/boot/dts/bamboo.dts3
-rw-r--r--arch/powerpc/boot/dts/ebony.dts2
-rw-r--r--arch/powerpc/boot/dts/katmai.dts2
-rw-r--r--arch/powerpc/boot/dts/kilauea.dts3
-rw-r--r--arch/powerpc/boot/dts/makalu.dts3
-rw-r--r--arch/powerpc/boot/dts/rainier.dts4
-rw-r--r--arch/powerpc/boot/dts/sequoia.dts4
-rw-r--r--arch/powerpc/boot/dts/taishan.dts4
-rw-r--r--arch/powerpc/configs/bamboo_defconfig81
-rw-r--r--arch/powerpc/configs/ebony_defconfig79
-rw-r--r--arch/powerpc/configs/ep405_defconfig92
-rw-r--r--arch/powerpc/configs/kilauea_defconfig69
-rw-r--r--arch/powerpc/configs/makalu_defconfig69
-rw-r--r--arch/powerpc/configs/ppc44x_defconfig904
-rw-r--r--arch/powerpc/configs/rainier_defconfig82
-rw-r--r--arch/powerpc/configs/sequoia_defconfig77
-rw-r--r--arch/powerpc/configs/taishan_defconfig81
-rw-r--r--arch/powerpc/configs/walnut_defconfig81
-rw-r--r--arch/powerpc/configs/warp_defconfig139
-rw-r--r--arch/powerpc/kernel/kprobes.c9
-rw-r--r--arch/powerpc/kernel/prom.c13
-rw-r--r--arch/powerpc/platforms/44x/Kconfig10
-rw-r--r--arch/powerpc/platforms/cell/spu_base.c12
-rw-r--r--arch/powerpc/platforms/cell/spufs/run.c1
-rw-r--r--arch/powerpc/platforms/cell/spufs/sched.c8
-rw-r--r--arch/powerpc/platforms/cell/spufs/switch.c6
-rw-r--r--arch/powerpc/platforms/pasemi/Makefile2
-rw-r--r--arch/powerpc/platforms/pasemi/misc.c97
-rw-r--r--arch/powerpc/platforms/pseries/power.c2
-rw-r--r--arch/powerpc/sysdev/mpic_pasemi_msi.c5
-rw-r--r--arch/ppc/platforms/4xx/ibm440ep.c6
-rw-r--r--drivers/net/ibm_newemac/rgmii.c1
-rw-r--r--include/asm-powerpc/spu.h3
34 files changed, 1605 insertions, 357 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 63d07ccbb9db..e3993a607584 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -35,10 +35,10 @@ endif
35 35
36BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj) -I$(srctree)/$(src)/libfdt 36BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj) -I$(srctree)/$(src)/libfdt
37 37
38$(obj)/4xx.o: BOOTCFLAGS += -mcpu=440 38$(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
39$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440 39$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
40$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440 40$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
41$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440 41$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
42$(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 42$(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
43 43
44 44
diff --git a/arch/powerpc/boot/dts/bamboo.dts b/arch/powerpc/boot/dts/bamboo.dts
index 29f1a6f3e373..7dc37c9a7446 100644
--- a/arch/powerpc/boot/dts/bamboo.dts
+++ b/arch/powerpc/boot/dts/bamboo.dts
@@ -185,7 +185,6 @@
185 }; 185 };
186 186
187 IIC0: i2c@ef600700 { 187 IIC0: i2c@ef600700 {
188 device_type = "i2c";
189 compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; 188 compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
190 reg = <ef600700 14>; 189 reg = <ef600700 14>;
191 interrupt-parent = <&UIC0>; 190 interrupt-parent = <&UIC0>;
@@ -193,7 +192,6 @@
193 }; 192 };
194 193
195 IIC1: i2c@ef600800 { 194 IIC1: i2c@ef600800 {
196 device_type = "i2c";
197 compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; 195 compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
198 reg = <ef600800 14>; 196 reg = <ef600800 14>;
199 interrupt-parent = <&UIC0>; 197 interrupt-parent = <&UIC0>;
@@ -201,7 +199,6 @@
201 }; 199 };
202 200
203 ZMII0: emac-zmii@ef600d00 { 201 ZMII0: emac-zmii@ef600d00 {
204 device_type = "zmii-interface";
205 compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii"; 202 compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii";
206 reg = <ef600d00 c>; 203 reg = <ef600d00 c>;
207 }; 204 };
diff --git a/arch/powerpc/boot/dts/ebony.dts b/arch/powerpc/boot/dts/ebony.dts
index 7aad135a44b0..0b000cb7ed8b 100644
--- a/arch/powerpc/boot/dts/ebony.dts
+++ b/arch/powerpc/boot/dts/ebony.dts
@@ -216,7 +216,6 @@
216 216
217 IIC0: i2c@40000400 { 217 IIC0: i2c@40000400 {
218 /* FIXME */ 218 /* FIXME */
219 device_type = "i2c";
220 compatible = "ibm,iic-440gp", "ibm,iic"; 219 compatible = "ibm,iic-440gp", "ibm,iic";
221 reg = <40000400 14>; 220 reg = <40000400 14>;
222 interrupt-parent = <&UIC0>; 221 interrupt-parent = <&UIC0>;
@@ -224,7 +223,6 @@
224 }; 223 };
225 IIC1: i2c@40000500 { 224 IIC1: i2c@40000500 {
226 /* FIXME */ 225 /* FIXME */
227 device_type = "i2c";
228 compatible = "ibm,iic-440gp", "ibm,iic"; 226 compatible = "ibm,iic-440gp", "ibm,iic";
229 reg = <40000500 14>; 227 reg = <40000500 14>;
230 interrupt-parent = <&UIC0>; 228 interrupt-parent = <&UIC0>;
diff --git a/arch/powerpc/boot/dts/katmai.dts b/arch/powerpc/boot/dts/katmai.dts
index 9bdfc0ff3c24..bc32ac7250ec 100644
--- a/arch/powerpc/boot/dts/katmai.dts
+++ b/arch/powerpc/boot/dts/katmai.dts
@@ -187,7 +187,6 @@
187 }; 187 };
188 188
189 IIC0: i2c@10000400 { 189 IIC0: i2c@10000400 {
190 device_type = "i2c";
191 compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic"; 190 compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic";
192 reg = <10000400 14>; 191 reg = <10000400 14>;
193 interrupt-parent = <&UIC0>; 192 interrupt-parent = <&UIC0>;
@@ -195,7 +194,6 @@
195 }; 194 };
196 195
197 IIC1: i2c@10000500 { 196 IIC1: i2c@10000500 {
198 device_type = "i2c";
199 compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic"; 197 compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic";
200 reg = <10000500 14>; 198 reg = <10000500 14>;
201 interrupt-parent = <&UIC0>; 199 interrupt-parent = <&UIC0>;
diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts
index 67c7ea179a07..8baef61f31cd 100644
--- a/arch/powerpc/boot/dts/kilauea.dts
+++ b/arch/powerpc/boot/dts/kilauea.dts
@@ -182,7 +182,6 @@
182 }; 182 };
183 183
184 IIC0: i2c@ef600400 { 184 IIC0: i2c@ef600400 {
185 device_type = "i2c";
186 compatible = "ibm,iic-405ex", "ibm,iic"; 185 compatible = "ibm,iic-405ex", "ibm,iic";
187 reg = <ef600400 14>; 186 reg = <ef600400 14>;
188 interrupt-parent = <&UIC0>; 187 interrupt-parent = <&UIC0>;
@@ -190,7 +189,6 @@
190 }; 189 };
191 190
192 IIC1: i2c@ef600500 { 191 IIC1: i2c@ef600500 {
193 device_type = "i2c";
194 compatible = "ibm,iic-405ex", "ibm,iic"; 192 compatible = "ibm,iic-405ex", "ibm,iic";
195 reg = <ef600500 14>; 193 reg = <ef600500 14>;
196 interrupt-parent = <&UIC0>; 194 interrupt-parent = <&UIC0>;
@@ -199,7 +197,6 @@
199 197
200 198
201 RGMII0: emac-rgmii@ef600b00 { 199 RGMII0: emac-rgmii@ef600b00 {
202 device_type = "rgmii-interface";
203 compatible = "ibm,rgmii-405ex", "ibm,rgmii"; 200 compatible = "ibm,rgmii-405ex", "ibm,rgmii";
204 reg = <ef600b00 104>; 201 reg = <ef600b00 104>;
205 has-mdio; 202 has-mdio;
diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts
index bdd70e4596ae..710c01168179 100644
--- a/arch/powerpc/boot/dts/makalu.dts
+++ b/arch/powerpc/boot/dts/makalu.dts
@@ -182,7 +182,6 @@
182 }; 182 };
183 183
184 IIC0: i2c@ef600400 { 184 IIC0: i2c@ef600400 {
185 device_type = "i2c";
186 compatible = "ibm,iic-405ex", "ibm,iic"; 185 compatible = "ibm,iic-405ex", "ibm,iic";
187 reg = <ef600400 14>; 186 reg = <ef600400 14>;
188 interrupt-parent = <&UIC0>; 187 interrupt-parent = <&UIC0>;
@@ -190,7 +189,6 @@
190 }; 189 };
191 190
192 IIC1: i2c@ef600500 { 191 IIC1: i2c@ef600500 {
193 device_type = "i2c";
194 compatible = "ibm,iic-405ex", "ibm,iic"; 192 compatible = "ibm,iic-405ex", "ibm,iic";
195 reg = <ef600500 14>; 193 reg = <ef600500 14>;
196 interrupt-parent = <&UIC0>; 194 interrupt-parent = <&UIC0>;
@@ -199,7 +197,6 @@
199 197
200 198
201 RGMII0: emac-rgmii@ef600b00 { 199 RGMII0: emac-rgmii@ef600b00 {
202 device_type = "rgmii-interface";
203 compatible = "ibm,rgmii-405ex", "ibm,rgmii"; 200 compatible = "ibm,rgmii-405ex", "ibm,rgmii";
204 reg = <ef600b00 104>; 201 reg = <ef600b00 104>;
205 has-mdio; 202 has-mdio;
diff --git a/arch/powerpc/boot/dts/rainier.dts b/arch/powerpc/boot/dts/rainier.dts
index d3c2ac394ce9..f947c75a2e94 100644
--- a/arch/powerpc/boot/dts/rainier.dts
+++ b/arch/powerpc/boot/dts/rainier.dts
@@ -229,7 +229,6 @@
229 }; 229 };
230 230
231 IIC0: i2c@ef600700 { 231 IIC0: i2c@ef600700 {
232 device_type = "i2c";
233 compatible = "ibm,iic-440grx", "ibm,iic"; 232 compatible = "ibm,iic-440grx", "ibm,iic";
234 reg = <ef600700 14>; 233 reg = <ef600700 14>;
235 interrupt-parent = <&UIC0>; 234 interrupt-parent = <&UIC0>;
@@ -237,7 +236,6 @@
237 }; 236 };
238 237
239 IIC1: i2c@ef600800 { 238 IIC1: i2c@ef600800 {
240 device_type = "i2c";
241 compatible = "ibm,iic-440grx", "ibm,iic"; 239 compatible = "ibm,iic-440grx", "ibm,iic";
242 reg = <ef600800 14>; 240 reg = <ef600800 14>;
243 interrupt-parent = <&UIC0>; 241 interrupt-parent = <&UIC0>;
@@ -245,13 +243,11 @@
245 }; 243 };
246 244
247 ZMII0: emac-zmii@ef600d00 { 245 ZMII0: emac-zmii@ef600d00 {
248 device_type = "zmii-interface";
249 compatible = "ibm,zmii-440grx", "ibm,zmii"; 246 compatible = "ibm,zmii-440grx", "ibm,zmii";
250 reg = <ef600d00 c>; 247 reg = <ef600d00 c>;
251 }; 248 };
252 249
253 RGMII0: emac-rgmii@ef601000 { 250 RGMII0: emac-rgmii@ef601000 {
254 device_type = "rgmii-interface";
255 compatible = "ibm,rgmii-440grx", "ibm,rgmii"; 251 compatible = "ibm,rgmii-440grx", "ibm,rgmii";
256 reg = <ef601000 8>; 252 reg = <ef601000 8>;
257 has-mdio; 253 has-mdio;
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts
index 5c13d46f441d..8db9515d7dc3 100644
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -244,7 +244,6 @@
244 }; 244 };
245 245
246 IIC0: i2c@ef600700 { 246 IIC0: i2c@ef600700 {
247 device_type = "i2c";
248 compatible = "ibm,iic-440epx", "ibm,iic"; 247 compatible = "ibm,iic-440epx", "ibm,iic";
249 reg = <ef600700 14>; 248 reg = <ef600700 14>;
250 interrupt-parent = <&UIC0>; 249 interrupt-parent = <&UIC0>;
@@ -252,7 +251,6 @@
252 }; 251 };
253 252
254 IIC1: i2c@ef600800 { 253 IIC1: i2c@ef600800 {
255 device_type = "i2c";
256 compatible = "ibm,iic-440epx", "ibm,iic"; 254 compatible = "ibm,iic-440epx", "ibm,iic";
257 reg = <ef600800 14>; 255 reg = <ef600800 14>;
258 interrupt-parent = <&UIC0>; 256 interrupt-parent = <&UIC0>;
@@ -260,13 +258,11 @@
260 }; 258 };
261 259
262 ZMII0: emac-zmii@ef600d00 { 260 ZMII0: emac-zmii@ef600d00 {
263 device_type = "zmii-interface";
264 compatible = "ibm,zmii-440epx", "ibm,zmii"; 261 compatible = "ibm,zmii-440epx", "ibm,zmii";
265 reg = <ef600d00 c>; 262 reg = <ef600d00 c>;
266 }; 263 };
267 264
268 RGMII0: emac-rgmii@ef601000 { 265 RGMII0: emac-rgmii@ef601000 {
269 device_type = "rgmii-interface";
270 compatible = "ibm,rgmii-440epx", "ibm,rgmii"; 266 compatible = "ibm,rgmii-440epx", "ibm,rgmii";
271 reg = <ef601000 8>; 267 reg = <ef601000 8>;
272 has-mdio; 268 has-mdio;
diff --git a/arch/powerpc/boot/dts/taishan.dts b/arch/powerpc/boot/dts/taishan.dts
index 0706a4a13b9f..8278068c802c 100644
--- a/arch/powerpc/boot/dts/taishan.dts
+++ b/arch/powerpc/boot/dts/taishan.dts
@@ -203,7 +203,6 @@
203 203
204 IIC0: i2c@40000400 { 204 IIC0: i2c@40000400 {
205 /* FIXME */ 205 /* FIXME */
206 device_type = "i2c";
207 compatible = "ibm,iic-440gp", "ibm,iic"; 206 compatible = "ibm,iic-440gp", "ibm,iic";
208 reg = <40000400 14>; 207 reg = <40000400 14>;
209 interrupt-parent = <&UIC0>; 208 interrupt-parent = <&UIC0>;
@@ -211,7 +210,6 @@
211 }; 210 };
212 IIC1: i2c@40000500 { 211 IIC1: i2c@40000500 {
213 /* FIXME */ 212 /* FIXME */
214 device_type = "i2c";
215 compatible = "ibm,iic-440gp", "ibm,iic"; 213 compatible = "ibm,iic-440gp", "ibm,iic";
216 reg = <40000500 14>; 214 reg = <40000500 14>;
217 interrupt-parent = <&UIC0>; 215 interrupt-parent = <&UIC0>;
@@ -225,13 +223,11 @@
225 }; 223 };
226 224
227 ZMII0: emac-zmii@40000780 { 225 ZMII0: emac-zmii@40000780 {
228 device_type = "zgmii-interface";
229 compatible = "ibm,zmii-440gx", "ibm,zmii"; 226 compatible = "ibm,zmii-440gx", "ibm,zmii";
230 reg = <40000780 c>; 227 reg = <40000780 c>;
231 }; 228 };
232 229
233 RGMII0: emac-rgmii@40000790 { 230 RGMII0: emac-rgmii@40000790 {
234 device_type = "rgmii-interface";
235 compatible = "ibm,rgmii"; 231 compatible = "ibm,rgmii";
236 reg = <40000790 8>; 232 reg = <40000790 8>;
237 }; 233 };
diff --git a/arch/powerpc/configs/bamboo_defconfig b/arch/powerpc/configs/bamboo_defconfig
index 1ed9afc9b281..c44db554cdc6 100644
--- a/arch/powerpc/configs/bamboo_defconfig
+++ b/arch/powerpc/configs/bamboo_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc6 3# Linux kernel version: 2.6.25-rc2
4# Mon Dec 24 10:49:50 2007 4# Fri Feb 15 21:36:39 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -30,6 +30,7 @@ CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y 30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y 31CONFIG_GENERIC_CLOCKEVENTS=y
32CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
34CONFIG_RWSEM_XCHGADD_ALGORITHM=y 35CONFIG_RWSEM_XCHGADD_ALGORITHM=y
35CONFIG_ARCH_HAS_ILOG2_U32=y 36CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -68,17 +69,18 @@ CONFIG_SYSVIPC_SYSCTL=y
68CONFIG_POSIX_MQUEUE=y 69CONFIG_POSIX_MQUEUE=y
69# CONFIG_BSD_PROCESS_ACCT is not set 70# CONFIG_BSD_PROCESS_ACCT is not set
70# CONFIG_TASKSTATS is not set 71# CONFIG_TASKSTATS is not set
71# CONFIG_USER_NS is not set
72# CONFIG_PID_NS is not set
73# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
74# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
75CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
76# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
76CONFIG_GROUP_SCHED=y
77CONFIG_FAIR_GROUP_SCHED=y 77CONFIG_FAIR_GROUP_SCHED=y
78CONFIG_FAIR_USER_SCHED=y 78# CONFIG_RT_GROUP_SCHED is not set
79# CONFIG_FAIR_CGROUP_SCHED is not set 79CONFIG_USER_SCHED=y
80# CONFIG_CGROUP_SCHED is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
83# CONFIG_NAMESPACES is not set
82CONFIG_BLK_DEV_INITRD=y 84CONFIG_BLK_DEV_INITRD=y
83CONFIG_INITRAMFS_SOURCE="" 85CONFIG_INITRAMFS_SOURCE=""
84# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -92,11 +94,13 @@ CONFIG_HOTPLUG=y
92CONFIG_PRINTK=y 94CONFIG_PRINTK=y
93CONFIG_BUG=y 95CONFIG_BUG=y
94CONFIG_ELF_CORE=y 96CONFIG_ELF_CORE=y
97CONFIG_COMPAT_BRK=y
95CONFIG_BASE_FULL=y 98CONFIG_BASE_FULL=y
96CONFIG_FUTEX=y 99CONFIG_FUTEX=y
97CONFIG_ANON_INODES=y 100CONFIG_ANON_INODES=y
98CONFIG_EPOLL=y 101CONFIG_EPOLL=y
99CONFIG_SIGNALFD=y 102CONFIG_SIGNALFD=y
103CONFIG_TIMERFD=y
100CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
101CONFIG_SHMEM=y 105CONFIG_SHMEM=y
102CONFIG_VM_EVENT_COUNTERS=y 106CONFIG_VM_EVENT_COUNTERS=y
@@ -104,6 +108,13 @@ CONFIG_SLUB_DEBUG=y
104# CONFIG_SLAB is not set 108# CONFIG_SLAB is not set
105CONFIG_SLUB=y 109CONFIG_SLUB=y
106# CONFIG_SLOB is not set 110# CONFIG_SLOB is not set
111# CONFIG_PROFILING is not set
112# CONFIG_MARKERS is not set
113CONFIG_HAVE_OPROFILE=y
114# CONFIG_KPROBES is not set
115CONFIG_HAVE_KPROBES=y
116CONFIG_PROC_PAGE_MONITOR=y
117CONFIG_SLABINFO=y
107CONFIG_RT_MUTEXES=y 118CONFIG_RT_MUTEXES=y
108# CONFIG_TINY_SHMEM is not set 119# CONFIG_TINY_SHMEM is not set
109CONFIG_BASE_SMALL=0 120CONFIG_BASE_SMALL=0
@@ -131,13 +142,15 @@ CONFIG_DEFAULT_AS=y
131# CONFIG_DEFAULT_CFQ is not set 142# CONFIG_DEFAULT_CFQ is not set
132# CONFIG_DEFAULT_NOOP is not set 143# CONFIG_DEFAULT_NOOP is not set
133CONFIG_DEFAULT_IOSCHED="anticipatory" 144CONFIG_DEFAULT_IOSCHED="anticipatory"
145CONFIG_CLASSIC_RCU=y
146# CONFIG_PREEMPT_RCU is not set
134# CONFIG_PPC4xx_PCI_EXPRESS is not set 147# CONFIG_PPC4xx_PCI_EXPRESS is not set
135 148
136# 149#
137# Platform support 150# Platform support
138# 151#
139# CONFIG_PPC_MPC52xx is not set 152# CONFIG_PPC_MPC512x is not set
140# CONFIG_PPC_MPC5200 is not set 153# CONFIG_PPC_MPC5121 is not set
141# CONFIG_PPC_CELL is not set 154# CONFIG_PPC_CELL is not set
142# CONFIG_PPC_CELL_NATIVE is not set 155# CONFIG_PPC_CELL_NATIVE is not set
143# CONFIG_PQ2ADS is not set 156# CONFIG_PQ2ADS is not set
@@ -147,8 +160,10 @@ CONFIG_BAMBOO=y
147# CONFIG_TAISHAN is not set 160# CONFIG_TAISHAN is not set
148# CONFIG_KATMAI is not set 161# CONFIG_KATMAI is not set
149# CONFIG_RAINIER is not set 162# CONFIG_RAINIER is not set
163# CONFIG_WARP is not set
150CONFIG_440EP=y 164CONFIG_440EP=y
151CONFIG_IBM440EP_ERR42=y 165CONFIG_IBM440EP_ERR42=y
166# CONFIG_IPIC is not set
152# CONFIG_MPIC is not set 167# CONFIG_MPIC is not set
153# CONFIG_MPIC_WEIRD is not set 168# CONFIG_MPIC_WEIRD is not set
154# CONFIG_PPC_I8259 is not set 169# CONFIG_PPC_I8259 is not set
@@ -159,7 +174,6 @@ CONFIG_IBM440EP_ERR42=y
159# CONFIG_PPC_INDIRECT_IO is not set 174# CONFIG_PPC_INDIRECT_IO is not set
160# CONFIG_GENERIC_IOMAP is not set 175# CONFIG_GENERIC_IOMAP is not set
161# CONFIG_CPU_FREQ is not set 176# CONFIG_CPU_FREQ is not set
162# CONFIG_CPM2 is not set
163# CONFIG_FSL_ULI1575 is not set 177# CONFIG_FSL_ULI1575 is not set
164 178
165# 179#
@@ -175,13 +189,18 @@ CONFIG_HZ_250=y
175# CONFIG_HZ_300 is not set 189# CONFIG_HZ_300 is not set
176# CONFIG_HZ_1000 is not set 190# CONFIG_HZ_1000 is not set
177CONFIG_HZ=250 191CONFIG_HZ=250
192# CONFIG_SCHED_HRTICK is not set
178CONFIG_PREEMPT_NONE=y 193CONFIG_PREEMPT_NONE=y
179# CONFIG_PREEMPT_VOLUNTARY is not set 194# CONFIG_PREEMPT_VOLUNTARY is not set
180# CONFIG_PREEMPT is not set 195# CONFIG_PREEMPT is not set
196CONFIG_RCU_TRACE=y
181CONFIG_BINFMT_ELF=y 197CONFIG_BINFMT_ELF=y
182# CONFIG_BINFMT_MISC is not set 198# CONFIG_BINFMT_MISC is not set
183# CONFIG_MATH_EMULATION is not set 199# CONFIG_MATH_EMULATION is not set
200# CONFIG_IOMMU_HELPER is not set
184CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 201CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
202CONFIG_ARCH_HAS_WALK_MEMORY=y
203CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
185CONFIG_ARCH_FLATMEM_ENABLE=y 204CONFIG_ARCH_FLATMEM_ENABLE=y
186CONFIG_ARCH_POPULATES_NODE_MAP=y 205CONFIG_ARCH_POPULATES_NODE_MAP=y
187CONFIG_SELECT_MEMORY_MODEL=y 206CONFIG_SELECT_MEMORY_MODEL=y
@@ -201,8 +220,6 @@ CONFIG_PROC_DEVICETREE=y
201CONFIG_CMDLINE_BOOL=y 220CONFIG_CMDLINE_BOOL=y
202CONFIG_CMDLINE="" 221CONFIG_CMDLINE=""
203CONFIG_SECCOMP=y 222CONFIG_SECCOMP=y
204CONFIG_WANT_DEVICE_TREE=y
205CONFIG_DEVICE_TREE="bamboo.dts"
206CONFIG_ISA_DMA_API=y 223CONFIG_ISA_DMA_API=y
207 224
208# 225#
@@ -302,6 +319,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
302# 319#
303# CONFIG_NET_PKTGEN is not set 320# CONFIG_NET_PKTGEN is not set
304# CONFIG_HAMRADIO is not set 321# CONFIG_HAMRADIO is not set
322# CONFIG_CAN is not set
305# CONFIG_IRDA is not set 323# CONFIG_IRDA is not set
306# CONFIG_BT is not set 324# CONFIG_BT is not set
307# CONFIG_AF_RXRPC is not set 325# CONFIG_AF_RXRPC is not set
@@ -348,7 +366,7 @@ CONFIG_BLK_DEV=y
348CONFIG_BLK_DEV_RAM=y 366CONFIG_BLK_DEV_RAM=y
349CONFIG_BLK_DEV_RAM_COUNT=16 367CONFIG_BLK_DEV_RAM_COUNT=16
350CONFIG_BLK_DEV_RAM_SIZE=35000 368CONFIG_BLK_DEV_RAM_SIZE=35000
351CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 369# CONFIG_BLK_DEV_XIP is not set
352# CONFIG_CDROM_PKTCDVD is not set 370# CONFIG_CDROM_PKTCDVD is not set
353# CONFIG_ATA_OVER_ETH is not set 371# CONFIG_ATA_OVER_ETH is not set
354# CONFIG_XILINX_SYSACE is not set 372# CONFIG_XILINX_SYSACE is not set
@@ -357,6 +375,8 @@ CONFIG_MISC_DEVICES=y
357# CONFIG_EEPROM_93CX6 is not set 375# CONFIG_EEPROM_93CX6 is not set
358# CONFIG_SGI_IOC4 is not set 376# CONFIG_SGI_IOC4 is not set
359# CONFIG_TIFM_CORE is not set 377# CONFIG_TIFM_CORE is not set
378# CONFIG_ENCLOSURE_SERVICES is not set
379CONFIG_HAVE_IDE=y
360# CONFIG_IDE is not set 380# CONFIG_IDE is not set
361 381
362# 382#
@@ -385,7 +405,6 @@ CONFIG_NETDEVICES=y
385# CONFIG_EQUALIZER is not set 405# CONFIG_EQUALIZER is not set
386# CONFIG_TUN is not set 406# CONFIG_TUN is not set
387# CONFIG_VETH is not set 407# CONFIG_VETH is not set
388# CONFIG_IP1000 is not set
389# CONFIG_ARCNET is not set 408# CONFIG_ARCNET is not set
390# CONFIG_PHYLIB is not set 409# CONFIG_PHYLIB is not set
391CONFIG_NET_ETHERNET=y 410CONFIG_NET_ETHERNET=y
@@ -414,6 +433,9 @@ CONFIG_NETDEV_1000=y
414# CONFIG_DL2K is not set 433# CONFIG_DL2K is not set
415# CONFIG_E1000 is not set 434# CONFIG_E1000 is not set
416# CONFIG_E1000E is not set 435# CONFIG_E1000E is not set
436# CONFIG_E1000E_ENABLED is not set
437# CONFIG_IP1000 is not set
438# CONFIG_IGB is not set
417# CONFIG_NS83820 is not set 439# CONFIG_NS83820 is not set
418# CONFIG_HAMACHI is not set 440# CONFIG_HAMACHI is not set
419# CONFIG_YELLOWFIN is not set 441# CONFIG_YELLOWFIN is not set
@@ -438,6 +460,7 @@ CONFIG_NETDEV_10000=y
438# CONFIG_NIU is not set 460# CONFIG_NIU is not set
439# CONFIG_MLX4_CORE is not set 461# CONFIG_MLX4_CORE is not set
440# CONFIG_TEHUTI is not set 462# CONFIG_TEHUTI is not set
463# CONFIG_BNX2X is not set
441# CONFIG_TR is not set 464# CONFIG_TR is not set
442 465
443# 466#
@@ -450,7 +473,6 @@ CONFIG_NETDEV_10000=y
450# CONFIG_HIPPI is not set 473# CONFIG_HIPPI is not set
451# CONFIG_PPP is not set 474# CONFIG_PPP is not set
452# CONFIG_SLIP is not set 475# CONFIG_SLIP is not set
453# CONFIG_SHAPER is not set
454# CONFIG_NETCONSOLE is not set 476# CONFIG_NETCONSOLE is not set
455# CONFIG_NETPOLL is not set 477# CONFIG_NETPOLL is not set
456# CONFIG_NET_POLL_CONTROLLER is not set 478# CONFIG_NET_POLL_CONTROLLER is not set
@@ -473,6 +495,7 @@ CONFIG_NETDEV_10000=y
473# 495#
474# CONFIG_VT is not set 496# CONFIG_VT is not set
475# CONFIG_SERIAL_NONSTANDARD is not set 497# CONFIG_SERIAL_NONSTANDARD is not set
498# CONFIG_NOZOMI is not set
476 499
477# 500#
478# Serial drivers 501# Serial drivers
@@ -518,6 +541,7 @@ CONFIG_DEVPORT=y
518# CONFIG_W1 is not set 541# CONFIG_W1 is not set
519# CONFIG_POWER_SUPPLY is not set 542# CONFIG_POWER_SUPPLY is not set
520# CONFIG_HWMON is not set 543# CONFIG_HWMON is not set
544CONFIG_THERMAL=y
521# CONFIG_WATCHDOG is not set 545# CONFIG_WATCHDOG is not set
522 546
523# 547#
@@ -566,12 +590,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
566# 590#
567# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 591# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
568# 592#
569
570#
571# USB Gadget Support
572#
573# CONFIG_USB_GADGET is not set 593# CONFIG_USB_GADGET is not set
574# CONFIG_MMC is not set 594# CONFIG_MMC is not set
595# CONFIG_MEMSTICK is not set
575# CONFIG_NEW_LEDS is not set 596# CONFIG_NEW_LEDS is not set
576# CONFIG_INFINIBAND is not set 597# CONFIG_INFINIBAND is not set
577# CONFIG_EDAC is not set 598# CONFIG_EDAC is not set
@@ -596,12 +617,10 @@ CONFIG_EXT2_FS=y
596# CONFIG_XFS_FS is not set 617# CONFIG_XFS_FS is not set
597# CONFIG_GFS2_FS is not set 618# CONFIG_GFS2_FS is not set
598# CONFIG_OCFS2_FS is not set 619# CONFIG_OCFS2_FS is not set
599# CONFIG_MINIX_FS is not set 620CONFIG_DNOTIFY=y
600# CONFIG_ROMFS_FS is not set
601CONFIG_INOTIFY=y 621CONFIG_INOTIFY=y
602CONFIG_INOTIFY_USER=y 622CONFIG_INOTIFY_USER=y
603# CONFIG_QUOTA is not set 623# CONFIG_QUOTA is not set
604CONFIG_DNOTIFY=y
605# CONFIG_AUTOFS_FS is not set 624# CONFIG_AUTOFS_FS is not set
606# CONFIG_AUTOFS4_FS is not set 625# CONFIG_AUTOFS4_FS is not set
607# CONFIG_FUSE_FS is not set 626# CONFIG_FUSE_FS is not set
@@ -643,8 +662,10 @@ CONFIG_TMPFS=y
643# CONFIG_EFS_FS is not set 662# CONFIG_EFS_FS is not set
644CONFIG_CRAMFS=y 663CONFIG_CRAMFS=y
645# CONFIG_VXFS_FS is not set 664# CONFIG_VXFS_FS is not set
665# CONFIG_MINIX_FS is not set
646# CONFIG_HPFS_FS is not set 666# CONFIG_HPFS_FS is not set
647# CONFIG_QNX4FS_FS is not set 667# CONFIG_QNX4FS_FS is not set
668# CONFIG_ROMFS_FS is not set
648# CONFIG_SYSV_FS is not set 669# CONFIG_SYSV_FS is not set
649# CONFIG_UFS_FS is not set 670# CONFIG_UFS_FS is not set
650CONFIG_NETWORK_FILESYSTEMS=y 671CONFIG_NETWORK_FILESYSTEMS=y
@@ -675,7 +696,6 @@ CONFIG_SUNRPC=y
675CONFIG_MSDOS_PARTITION=y 696CONFIG_MSDOS_PARTITION=y
676# CONFIG_NLS is not set 697# CONFIG_NLS is not set
677# CONFIG_DLM is not set 698# CONFIG_DLM is not set
678# CONFIG_UCC_SLOW is not set
679 699
680# 700#
681# Library routines 701# Library routines
@@ -692,10 +712,6 @@ CONFIG_PLIST=y
692CONFIG_HAS_IOMEM=y 712CONFIG_HAS_IOMEM=y
693CONFIG_HAS_IOPORT=y 713CONFIG_HAS_IOPORT=y
694CONFIG_HAS_DMA=y 714CONFIG_HAS_DMA=y
695CONFIG_INSTRUMENTATION=y
696# CONFIG_PROFILING is not set
697# CONFIG_KPROBES is not set
698# CONFIG_MARKERS is not set
699 715
700# 716#
701# Kernel hacking 717# Kernel hacking
@@ -705,7 +721,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
705CONFIG_ENABLE_MUST_CHECK=y 721CONFIG_ENABLE_MUST_CHECK=y
706CONFIG_MAGIC_SYSRQ=y 722CONFIG_MAGIC_SYSRQ=y
707# CONFIG_UNUSED_SYMBOLS is not set 723# CONFIG_UNUSED_SYMBOLS is not set
708# CONFIG_DEBUG_FS is not set 724CONFIG_DEBUG_FS=y
709# CONFIG_HEADERS_CHECK is not set 725# CONFIG_HEADERS_CHECK is not set
710CONFIG_DEBUG_KERNEL=y 726CONFIG_DEBUG_KERNEL=y
711# CONFIG_DEBUG_SHIRQ is not set 727# CONFIG_DEBUG_SHIRQ is not set
@@ -714,6 +730,7 @@ CONFIG_SCHED_DEBUG=y
714# CONFIG_SCHEDSTATS is not set 730# CONFIG_SCHEDSTATS is not set
715# CONFIG_TIMER_STATS is not set 731# CONFIG_TIMER_STATS is not set
716# CONFIG_SLUB_DEBUG_ON is not set 732# CONFIG_SLUB_DEBUG_ON is not set
733# CONFIG_SLUB_STATS is not set
717# CONFIG_DEBUG_RT_MUTEXES is not set 734# CONFIG_DEBUG_RT_MUTEXES is not set
718# CONFIG_RT_MUTEX_TESTER is not set 735# CONFIG_RT_MUTEX_TESTER is not set
719# CONFIG_DEBUG_SPINLOCK is not set 736# CONFIG_DEBUG_SPINLOCK is not set
@@ -726,9 +743,9 @@ CONFIG_SCHED_DEBUG=y
726# CONFIG_DEBUG_VM is not set 743# CONFIG_DEBUG_VM is not set
727# CONFIG_DEBUG_LIST is not set 744# CONFIG_DEBUG_LIST is not set
728# CONFIG_DEBUG_SG is not set 745# CONFIG_DEBUG_SG is not set
729CONFIG_FORCED_INLINING=y
730# CONFIG_BOOT_PRINTK_DELAY is not set 746# CONFIG_BOOT_PRINTK_DELAY is not set
731# CONFIG_RCU_TORTURE_TEST is not set 747# CONFIG_RCU_TORTURE_TEST is not set
748# CONFIG_BACKTRACE_SELF_TEST is not set
732# CONFIG_FAULT_INJECTION is not set 749# CONFIG_FAULT_INJECTION is not set
733# CONFIG_SAMPLES is not set 750# CONFIG_SAMPLES is not set
734# CONFIG_DEBUG_STACKOVERFLOW is not set 751# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -737,6 +754,7 @@ CONFIG_FORCED_INLINING=y
737CONFIG_DEBUGGER=y 754CONFIG_DEBUGGER=y
738# CONFIG_KGDB is not set 755# CONFIG_KGDB is not set
739# CONFIG_XMON is not set 756# CONFIG_XMON is not set
757# CONFIG_VIRQ_DEBUG is not set
740# CONFIG_BDI_SWITCH is not set 758# CONFIG_BDI_SWITCH is not set
741# CONFIG_PPC_EARLY_DEBUG is not set 759# CONFIG_PPC_EARLY_DEBUG is not set
742 760
@@ -749,6 +767,7 @@ CONFIG_DEBUGGER=y
749CONFIG_CRYPTO=y 767CONFIG_CRYPTO=y
750CONFIG_CRYPTO_ALGAPI=y 768CONFIG_CRYPTO_ALGAPI=y
751CONFIG_CRYPTO_BLKCIPHER=y 769CONFIG_CRYPTO_BLKCIPHER=y
770# CONFIG_CRYPTO_SEQIV is not set
752CONFIG_CRYPTO_MANAGER=y 771CONFIG_CRYPTO_MANAGER=y
753# CONFIG_CRYPTO_HMAC is not set 772# CONFIG_CRYPTO_HMAC is not set
754# CONFIG_CRYPTO_XCBC is not set 773# CONFIG_CRYPTO_XCBC is not set
@@ -766,6 +785,9 @@ CONFIG_CRYPTO_CBC=y
766CONFIG_CRYPTO_PCBC=y 785CONFIG_CRYPTO_PCBC=y
767# CONFIG_CRYPTO_LRW is not set 786# CONFIG_CRYPTO_LRW is not set
768# CONFIG_CRYPTO_XTS is not set 787# CONFIG_CRYPTO_XTS is not set
788# CONFIG_CRYPTO_CTR is not set
789# CONFIG_CRYPTO_GCM is not set
790# CONFIG_CRYPTO_CCM is not set
769# CONFIG_CRYPTO_CRYPTD is not set 791# CONFIG_CRYPTO_CRYPTD is not set
770CONFIG_CRYPTO_DES=y 792CONFIG_CRYPTO_DES=y
771# CONFIG_CRYPTO_FCRYPT is not set 793# CONFIG_CRYPTO_FCRYPT is not set
@@ -780,11 +802,14 @@ CONFIG_CRYPTO_DES=y
780# CONFIG_CRYPTO_KHAZAD is not set 802# CONFIG_CRYPTO_KHAZAD is not set
781# CONFIG_CRYPTO_ANUBIS is not set 803# CONFIG_CRYPTO_ANUBIS is not set
782# CONFIG_CRYPTO_SEED is not set 804# CONFIG_CRYPTO_SEED is not set
805# CONFIG_CRYPTO_SALSA20 is not set
783# CONFIG_CRYPTO_DEFLATE is not set 806# CONFIG_CRYPTO_DEFLATE is not set
784# CONFIG_CRYPTO_MICHAEL_MIC is not set 807# CONFIG_CRYPTO_MICHAEL_MIC is not set
785# CONFIG_CRYPTO_CRC32C is not set 808# CONFIG_CRYPTO_CRC32C is not set
786# CONFIG_CRYPTO_CAMELLIA is not set 809# CONFIG_CRYPTO_CAMELLIA is not set
787# CONFIG_CRYPTO_TEST is not set 810# CONFIG_CRYPTO_TEST is not set
788# CONFIG_CRYPTO_AUTHENC is not set 811# CONFIG_CRYPTO_AUTHENC is not set
812# CONFIG_CRYPTO_LZO is not set
789CONFIG_CRYPTO_HW=y 813CONFIG_CRYPTO_HW=y
814# CONFIG_CRYPTO_DEV_HIFN_795X is not set
790# CONFIG_PPC_CLOCK is not set 815# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/ebony_defconfig b/arch/powerpc/configs/ebony_defconfig
index cf860f166659..07c8d4ce175a 100644
--- a/arch/powerpc/configs/ebony_defconfig
+++ b/arch/powerpc/configs/ebony_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc6 3# Linux kernel version: 2.6.25-rc2
4# Mon Dec 24 11:16:26 2007 4# Fri Feb 15 21:50:44 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -29,6 +29,7 @@ CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y 29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y 30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
32CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
33CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
34CONFIG_ARCH_HAS_ILOG2_U32=y 35CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -67,17 +68,18 @@ CONFIG_SYSVIPC_SYSCTL=y
67CONFIG_POSIX_MQUEUE=y 68CONFIG_POSIX_MQUEUE=y
68# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
69# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
72# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set 74# CONFIG_CGROUPS is not set
75CONFIG_GROUP_SCHED=y
76CONFIG_FAIR_GROUP_SCHED=y 76CONFIG_FAIR_GROUP_SCHED=y
77CONFIG_FAIR_USER_SCHED=y 77# CONFIG_RT_GROUP_SCHED is not set
78# CONFIG_FAIR_CGROUP_SCHED is not set 78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set
79CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
80# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
81CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
82CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -91,11 +93,13 @@ CONFIG_HOTPLUG=y
91CONFIG_PRINTK=y 93CONFIG_PRINTK=y
92CONFIG_BUG=y 94CONFIG_BUG=y
93CONFIG_ELF_CORE=y 95CONFIG_ELF_CORE=y
96CONFIG_COMPAT_BRK=y
94CONFIG_BASE_FULL=y 97CONFIG_BASE_FULL=y
95CONFIG_FUTEX=y 98CONFIG_FUTEX=y
96CONFIG_ANON_INODES=y 99CONFIG_ANON_INODES=y
97CONFIG_EPOLL=y 100CONFIG_EPOLL=y
98CONFIG_SIGNALFD=y 101CONFIG_SIGNALFD=y
102CONFIG_TIMERFD=y
99CONFIG_EVENTFD=y 103CONFIG_EVENTFD=y
100CONFIG_SHMEM=y 104CONFIG_SHMEM=y
101CONFIG_VM_EVENT_COUNTERS=y 105CONFIG_VM_EVENT_COUNTERS=y
@@ -103,6 +107,13 @@ CONFIG_SLUB_DEBUG=y
103# CONFIG_SLAB is not set 107# CONFIG_SLAB is not set
104CONFIG_SLUB=y 108CONFIG_SLUB=y
105# CONFIG_SLOB is not set 109# CONFIG_SLOB is not set
110# CONFIG_PROFILING is not set
111# CONFIG_MARKERS is not set
112CONFIG_HAVE_OPROFILE=y
113# CONFIG_KPROBES is not set
114CONFIG_HAVE_KPROBES=y
115CONFIG_PROC_PAGE_MONITOR=y
116CONFIG_SLABINFO=y
106CONFIG_RT_MUTEXES=y 117CONFIG_RT_MUTEXES=y
107# CONFIG_TINY_SHMEM is not set 118# CONFIG_TINY_SHMEM is not set
108CONFIG_BASE_SMALL=0 119CONFIG_BASE_SMALL=0
@@ -130,13 +141,15 @@ CONFIG_DEFAULT_AS=y
130# CONFIG_DEFAULT_CFQ is not set 141# CONFIG_DEFAULT_CFQ is not set
131# CONFIG_DEFAULT_NOOP is not set 142# CONFIG_DEFAULT_NOOP is not set
132CONFIG_DEFAULT_IOSCHED="anticipatory" 143CONFIG_DEFAULT_IOSCHED="anticipatory"
144CONFIG_CLASSIC_RCU=y
145# CONFIG_PREEMPT_RCU is not set
133# CONFIG_PPC4xx_PCI_EXPRESS is not set 146# CONFIG_PPC4xx_PCI_EXPRESS is not set
134 147
135# 148#
136# Platform support 149# Platform support
137# 150#
138# CONFIG_PPC_MPC52xx is not set 151# CONFIG_PPC_MPC512x is not set
139# CONFIG_PPC_MPC5200 is not set 152# CONFIG_PPC_MPC5121 is not set
140# CONFIG_PPC_CELL is not set 153# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set 154# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set 155# CONFIG_PQ2ADS is not set
@@ -146,7 +159,9 @@ CONFIG_EBONY=y
146# CONFIG_TAISHAN is not set 159# CONFIG_TAISHAN is not set
147# CONFIG_KATMAI is not set 160# CONFIG_KATMAI is not set
148# CONFIG_RAINIER is not set 161# CONFIG_RAINIER is not set
162# CONFIG_WARP is not set
149CONFIG_440GP=y 163CONFIG_440GP=y
164# CONFIG_IPIC is not set
150# CONFIG_MPIC is not set 165# CONFIG_MPIC is not set
151# CONFIG_MPIC_WEIRD is not set 166# CONFIG_MPIC_WEIRD is not set
152# CONFIG_PPC_I8259 is not set 167# CONFIG_PPC_I8259 is not set
@@ -157,8 +172,8 @@ CONFIG_440GP=y
157# CONFIG_PPC_INDIRECT_IO is not set 172# CONFIG_PPC_INDIRECT_IO is not set
158# CONFIG_GENERIC_IOMAP is not set 173# CONFIG_GENERIC_IOMAP is not set
159# CONFIG_CPU_FREQ is not set 174# CONFIG_CPU_FREQ is not set
160# CONFIG_CPM2 is not set
161# CONFIG_FSL_ULI1575 is not set 175# CONFIG_FSL_ULI1575 is not set
176CONFIG_OF_RTC=y
162 177
163# 178#
164# Kernel options 179# Kernel options
@@ -173,13 +188,18 @@ CONFIG_HZ_250=y
173# CONFIG_HZ_300 is not set 188# CONFIG_HZ_300 is not set
174# CONFIG_HZ_1000 is not set 189# CONFIG_HZ_1000 is not set
175CONFIG_HZ=250 190CONFIG_HZ=250
191# CONFIG_SCHED_HRTICK is not set
176CONFIG_PREEMPT_NONE=y 192CONFIG_PREEMPT_NONE=y
177# CONFIG_PREEMPT_VOLUNTARY is not set 193# CONFIG_PREEMPT_VOLUNTARY is not set
178# CONFIG_PREEMPT is not set 194# CONFIG_PREEMPT is not set
195CONFIG_RCU_TRACE=y
179CONFIG_BINFMT_ELF=y 196CONFIG_BINFMT_ELF=y
180# CONFIG_BINFMT_MISC is not set 197# CONFIG_BINFMT_MISC is not set
181CONFIG_MATH_EMULATION=y 198CONFIG_MATH_EMULATION=y
199# CONFIG_IOMMU_HELPER is not set
182CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 200CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
201CONFIG_ARCH_HAS_WALK_MEMORY=y
202CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
183CONFIG_ARCH_FLATMEM_ENABLE=y 203CONFIG_ARCH_FLATMEM_ENABLE=y
184CONFIG_ARCH_POPULATES_NODE_MAP=y 204CONFIG_ARCH_POPULATES_NODE_MAP=y
185CONFIG_SELECT_MEMORY_MODEL=y 205CONFIG_SELECT_MEMORY_MODEL=y
@@ -198,8 +218,6 @@ CONFIG_VIRT_TO_BUS=y
198CONFIG_PROC_DEVICETREE=y 218CONFIG_PROC_DEVICETREE=y
199# CONFIG_CMDLINE_BOOL is not set 219# CONFIG_CMDLINE_BOOL is not set
200CONFIG_SECCOMP=y 220CONFIG_SECCOMP=y
201CONFIG_WANT_DEVICE_TREE=y
202CONFIG_DEVICE_TREE="ebony.dts"
203CONFIG_ISA_DMA_API=y 221CONFIG_ISA_DMA_API=y
204 222
205# 223#
@@ -299,6 +317,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
299# 317#
300# CONFIG_NET_PKTGEN is not set 318# CONFIG_NET_PKTGEN is not set
301# CONFIG_HAMRADIO is not set 319# CONFIG_HAMRADIO is not set
320# CONFIG_CAN is not set
302# CONFIG_IRDA is not set 321# CONFIG_IRDA is not set
303# CONFIG_BT is not set 322# CONFIG_BT is not set
304# CONFIG_AF_RXRPC is not set 323# CONFIG_AF_RXRPC is not set
@@ -335,6 +354,7 @@ CONFIG_MTD=y
335CONFIG_MTD_PARTITIONS=y 354CONFIG_MTD_PARTITIONS=y
336# CONFIG_MTD_REDBOOT_PARTS is not set 355# CONFIG_MTD_REDBOOT_PARTS is not set
337# CONFIG_MTD_CMDLINE_PARTS is not set 356# CONFIG_MTD_CMDLINE_PARTS is not set
357CONFIG_MTD_OF_PARTS=y
338 358
339# 359#
340# User Modules And Translation Layers 360# User Modules And Translation Layers
@@ -420,7 +440,7 @@ CONFIG_BLK_DEV=y
420CONFIG_BLK_DEV_RAM=y 440CONFIG_BLK_DEV_RAM=y
421CONFIG_BLK_DEV_RAM_COUNT=16 441CONFIG_BLK_DEV_RAM_COUNT=16
422CONFIG_BLK_DEV_RAM_SIZE=35000 442CONFIG_BLK_DEV_RAM_SIZE=35000
423CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 443# CONFIG_BLK_DEV_XIP is not set
424# CONFIG_CDROM_PKTCDVD is not set 444# CONFIG_CDROM_PKTCDVD is not set
425# CONFIG_ATA_OVER_ETH is not set 445# CONFIG_ATA_OVER_ETH is not set
426# CONFIG_XILINX_SYSACE is not set 446# CONFIG_XILINX_SYSACE is not set
@@ -429,6 +449,8 @@ CONFIG_MISC_DEVICES=y
429# CONFIG_EEPROM_93CX6 is not set 449# CONFIG_EEPROM_93CX6 is not set
430# CONFIG_SGI_IOC4 is not set 450# CONFIG_SGI_IOC4 is not set
431# CONFIG_TIFM_CORE is not set 451# CONFIG_TIFM_CORE is not set
452# CONFIG_ENCLOSURE_SERVICES is not set
453CONFIG_HAVE_IDE=y
432# CONFIG_IDE is not set 454# CONFIG_IDE is not set
433 455
434# 456#
@@ -457,7 +479,6 @@ CONFIG_NETDEVICES=y
457# CONFIG_EQUALIZER is not set 479# CONFIG_EQUALIZER is not set
458# CONFIG_TUN is not set 480# CONFIG_TUN is not set
459# CONFIG_VETH is not set 481# CONFIG_VETH is not set
460# CONFIG_IP1000 is not set
461# CONFIG_ARCNET is not set 482# CONFIG_ARCNET is not set
462# CONFIG_PHYLIB is not set 483# CONFIG_PHYLIB is not set
463CONFIG_NET_ETHERNET=y 484CONFIG_NET_ETHERNET=y
@@ -486,6 +507,9 @@ CONFIG_NETDEV_1000=y
486# CONFIG_DL2K is not set 507# CONFIG_DL2K is not set
487# CONFIG_E1000 is not set 508# CONFIG_E1000 is not set
488# CONFIG_E1000E is not set 509# CONFIG_E1000E is not set
510# CONFIG_E1000E_ENABLED is not set
511# CONFIG_IP1000 is not set
512# CONFIG_IGB is not set
489# CONFIG_NS83820 is not set 513# CONFIG_NS83820 is not set
490# CONFIG_HAMACHI is not set 514# CONFIG_HAMACHI is not set
491# CONFIG_YELLOWFIN is not set 515# CONFIG_YELLOWFIN is not set
@@ -510,6 +534,7 @@ CONFIG_NETDEV_10000=y
510# CONFIG_NIU is not set 534# CONFIG_NIU is not set
511# CONFIG_MLX4_CORE is not set 535# CONFIG_MLX4_CORE is not set
512# CONFIG_TEHUTI is not set 536# CONFIG_TEHUTI is not set
537# CONFIG_BNX2X is not set
513# CONFIG_TR is not set 538# CONFIG_TR is not set
514 539
515# 540#
@@ -522,7 +547,6 @@ CONFIG_NETDEV_10000=y
522# CONFIG_HIPPI is not set 547# CONFIG_HIPPI is not set
523# CONFIG_PPP is not set 548# CONFIG_PPP is not set
524# CONFIG_SLIP is not set 549# CONFIG_SLIP is not set
525# CONFIG_SHAPER is not set
526# CONFIG_NETCONSOLE is not set 550# CONFIG_NETCONSOLE is not set
527# CONFIG_NETPOLL is not set 551# CONFIG_NETPOLL is not set
528# CONFIG_NET_POLL_CONTROLLER is not set 552# CONFIG_NET_POLL_CONTROLLER is not set
@@ -545,6 +569,7 @@ CONFIG_NETDEV_10000=y
545# 569#
546# CONFIG_VT is not set 570# CONFIG_VT is not set
547# CONFIG_SERIAL_NONSTANDARD is not set 571# CONFIG_SERIAL_NONSTANDARD is not set
572# CONFIG_NOZOMI is not set
548 573
549# 574#
550# Serial drivers 575# Serial drivers
@@ -590,6 +615,7 @@ CONFIG_DEVPORT=y
590# CONFIG_W1 is not set 615# CONFIG_W1 is not set
591# CONFIG_POWER_SUPPLY is not set 616# CONFIG_POWER_SUPPLY is not set
592# CONFIG_HWMON is not set 617# CONFIG_HWMON is not set
618CONFIG_THERMAL=y
593# CONFIG_WATCHDOG is not set 619# CONFIG_WATCHDOG is not set
594 620
595# 621#
@@ -638,12 +664,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
638# 664#
639# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 665# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
640# 666#
641
642#
643# USB Gadget Support
644#
645# CONFIG_USB_GADGET is not set 667# CONFIG_USB_GADGET is not set
646# CONFIG_MMC is not set 668# CONFIG_MMC is not set
669# CONFIG_MEMSTICK is not set
647# CONFIG_NEW_LEDS is not set 670# CONFIG_NEW_LEDS is not set
648# CONFIG_INFINIBAND is not set 671# CONFIG_INFINIBAND is not set
649# CONFIG_EDAC is not set 672# CONFIG_EDAC is not set
@@ -668,12 +691,10 @@ CONFIG_EXT2_FS=y
668# CONFIG_XFS_FS is not set 691# CONFIG_XFS_FS is not set
669# CONFIG_GFS2_FS is not set 692# CONFIG_GFS2_FS is not set
670# CONFIG_OCFS2_FS is not set 693# CONFIG_OCFS2_FS is not set
671# CONFIG_MINIX_FS is not set 694CONFIG_DNOTIFY=y
672# CONFIG_ROMFS_FS is not set
673CONFIG_INOTIFY=y 695CONFIG_INOTIFY=y
674CONFIG_INOTIFY_USER=y 696CONFIG_INOTIFY_USER=y
675# CONFIG_QUOTA is not set 697# CONFIG_QUOTA is not set
676CONFIG_DNOTIFY=y
677# CONFIG_AUTOFS_FS is not set 698# CONFIG_AUTOFS_FS is not set
678# CONFIG_AUTOFS4_FS is not set 699# CONFIG_AUTOFS4_FS is not set
679# CONFIG_FUSE_FS is not set 700# CONFIG_FUSE_FS is not set
@@ -726,8 +747,10 @@ CONFIG_JFFS2_RTIME=y
726# CONFIG_JFFS2_RUBIN is not set 747# CONFIG_JFFS2_RUBIN is not set
727CONFIG_CRAMFS=y 748CONFIG_CRAMFS=y
728# CONFIG_VXFS_FS is not set 749# CONFIG_VXFS_FS is not set
750# CONFIG_MINIX_FS is not set
729# CONFIG_HPFS_FS is not set 751# CONFIG_HPFS_FS is not set
730# CONFIG_QNX4FS_FS is not set 752# CONFIG_QNX4FS_FS is not set
753# CONFIG_ROMFS_FS is not set
731# CONFIG_SYSV_FS is not set 754# CONFIG_SYSV_FS is not set
732# CONFIG_UFS_FS is not set 755# CONFIG_UFS_FS is not set
733CONFIG_NETWORK_FILESYSTEMS=y 756CONFIG_NETWORK_FILESYSTEMS=y
@@ -758,7 +781,6 @@ CONFIG_SUNRPC=y
758CONFIG_MSDOS_PARTITION=y 781CONFIG_MSDOS_PARTITION=y
759# CONFIG_NLS is not set 782# CONFIG_NLS is not set
760# CONFIG_DLM is not set 783# CONFIG_DLM is not set
761# CONFIG_UCC_SLOW is not set
762 784
763# 785#
764# Library routines 786# Library routines
@@ -776,7 +798,6 @@ CONFIG_PLIST=y
776CONFIG_HAS_IOMEM=y 798CONFIG_HAS_IOMEM=y
777CONFIG_HAS_IOPORT=y 799CONFIG_HAS_IOPORT=y
778CONFIG_HAS_DMA=y 800CONFIG_HAS_DMA=y
779# CONFIG_INSTRUMENTATION is not set
780 801
781# 802#
782# Kernel hacking 803# Kernel hacking
@@ -786,7 +807,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
786CONFIG_ENABLE_MUST_CHECK=y 807CONFIG_ENABLE_MUST_CHECK=y
787CONFIG_MAGIC_SYSRQ=y 808CONFIG_MAGIC_SYSRQ=y
788# CONFIG_UNUSED_SYMBOLS is not set 809# CONFIG_UNUSED_SYMBOLS is not set
789# CONFIG_DEBUG_FS is not set 810CONFIG_DEBUG_FS=y
790# CONFIG_HEADERS_CHECK is not set 811# CONFIG_HEADERS_CHECK is not set
791CONFIG_DEBUG_KERNEL=y 812CONFIG_DEBUG_KERNEL=y
792# CONFIG_DEBUG_SHIRQ is not set 813# CONFIG_DEBUG_SHIRQ is not set
@@ -795,6 +816,7 @@ CONFIG_SCHED_DEBUG=y
795# CONFIG_SCHEDSTATS is not set 816# CONFIG_SCHEDSTATS is not set
796# CONFIG_TIMER_STATS is not set 817# CONFIG_TIMER_STATS is not set
797# CONFIG_SLUB_DEBUG_ON is not set 818# CONFIG_SLUB_DEBUG_ON is not set
819# CONFIG_SLUB_STATS is not set
798# CONFIG_DEBUG_RT_MUTEXES is not set 820# CONFIG_DEBUG_RT_MUTEXES is not set
799# CONFIG_RT_MUTEX_TESTER is not set 821# CONFIG_RT_MUTEX_TESTER is not set
800# CONFIG_DEBUG_SPINLOCK is not set 822# CONFIG_DEBUG_SPINLOCK is not set
@@ -807,15 +829,16 @@ CONFIG_DEBUG_BUGVERBOSE=y
807# CONFIG_DEBUG_VM is not set 829# CONFIG_DEBUG_VM is not set
808# CONFIG_DEBUG_LIST is not set 830# CONFIG_DEBUG_LIST is not set
809# CONFIG_DEBUG_SG is not set 831# CONFIG_DEBUG_SG is not set
810CONFIG_FORCED_INLINING=y
811# CONFIG_BOOT_PRINTK_DELAY is not set 832# CONFIG_BOOT_PRINTK_DELAY is not set
812# CONFIG_RCU_TORTURE_TEST is not set 833# CONFIG_RCU_TORTURE_TEST is not set
834# CONFIG_BACKTRACE_SELF_TEST is not set
813# CONFIG_FAULT_INJECTION is not set 835# CONFIG_FAULT_INJECTION is not set
814# CONFIG_SAMPLES is not set 836# CONFIG_SAMPLES is not set
815# CONFIG_DEBUG_STACKOVERFLOW is not set 837# CONFIG_DEBUG_STACKOVERFLOW is not set
816# CONFIG_DEBUG_STACK_USAGE is not set 838# CONFIG_DEBUG_STACK_USAGE is not set
817# CONFIG_DEBUG_PAGEALLOC is not set 839# CONFIG_DEBUG_PAGEALLOC is not set
818# CONFIG_DEBUGGER is not set 840# CONFIG_DEBUGGER is not set
841# CONFIG_VIRQ_DEBUG is not set
819# CONFIG_BDI_SWITCH is not set 842# CONFIG_BDI_SWITCH is not set
820# CONFIG_PPC_EARLY_DEBUG is not set 843# CONFIG_PPC_EARLY_DEBUG is not set
821 844
@@ -828,6 +851,7 @@ CONFIG_FORCED_INLINING=y
828CONFIG_CRYPTO=y 851CONFIG_CRYPTO=y
829CONFIG_CRYPTO_ALGAPI=y 852CONFIG_CRYPTO_ALGAPI=y
830CONFIG_CRYPTO_BLKCIPHER=y 853CONFIG_CRYPTO_BLKCIPHER=y
854# CONFIG_CRYPTO_SEQIV is not set
831CONFIG_CRYPTO_MANAGER=y 855CONFIG_CRYPTO_MANAGER=y
832# CONFIG_CRYPTO_HMAC is not set 856# CONFIG_CRYPTO_HMAC is not set
833# CONFIG_CRYPTO_XCBC is not set 857# CONFIG_CRYPTO_XCBC is not set
@@ -845,6 +869,9 @@ CONFIG_CRYPTO_CBC=y
845CONFIG_CRYPTO_PCBC=y 869CONFIG_CRYPTO_PCBC=y
846# CONFIG_CRYPTO_LRW is not set 870# CONFIG_CRYPTO_LRW is not set
847# CONFIG_CRYPTO_XTS is not set 871# CONFIG_CRYPTO_XTS is not set
872# CONFIG_CRYPTO_CTR is not set
873# CONFIG_CRYPTO_GCM is not set
874# CONFIG_CRYPTO_CCM is not set
848# CONFIG_CRYPTO_CRYPTD is not set 875# CONFIG_CRYPTO_CRYPTD is not set
849CONFIG_CRYPTO_DES=y 876CONFIG_CRYPTO_DES=y
850# CONFIG_CRYPTO_FCRYPT is not set 877# CONFIG_CRYPTO_FCRYPT is not set
@@ -859,11 +886,13 @@ CONFIG_CRYPTO_DES=y
859# CONFIG_CRYPTO_KHAZAD is not set 886# CONFIG_CRYPTO_KHAZAD is not set
860# CONFIG_CRYPTO_ANUBIS is not set 887# CONFIG_CRYPTO_ANUBIS is not set
861# CONFIG_CRYPTO_SEED is not set 888# CONFIG_CRYPTO_SEED is not set
889# CONFIG_CRYPTO_SALSA20 is not set
862# CONFIG_CRYPTO_DEFLATE is not set 890# CONFIG_CRYPTO_DEFLATE is not set
863# CONFIG_CRYPTO_MICHAEL_MIC is not set 891# CONFIG_CRYPTO_MICHAEL_MIC is not set
864# CONFIG_CRYPTO_CRC32C is not set 892# CONFIG_CRYPTO_CRC32C is not set
865# CONFIG_CRYPTO_CAMELLIA is not set 893# CONFIG_CRYPTO_CAMELLIA is not set
866# CONFIG_CRYPTO_TEST is not set 894# CONFIG_CRYPTO_TEST is not set
867# CONFIG_CRYPTO_AUTHENC is not set 895# CONFIG_CRYPTO_AUTHENC is not set
896# CONFIG_CRYPTO_LZO is not set
868# CONFIG_CRYPTO_HW is not set 897# CONFIG_CRYPTO_HW is not set
869# CONFIG_PPC_CLOCK is not set 898# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/ep405_defconfig b/arch/powerpc/configs/ep405_defconfig
index 3829c9166256..e24240a9a047 100644
--- a/arch/powerpc/configs/ep405_defconfig
+++ b/arch/powerpc/configs/ep405_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc6 3# Linux kernel version: 2.6.25-rc2
4# Mon Dec 24 11:17:13 2007 4# Fri Feb 15 21:50:09 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -26,6 +26,7 @@ CONFIG_GENERIC_TIME=y
26CONFIG_GENERIC_TIME_VSYSCALL=y 26CONFIG_GENERIC_TIME_VSYSCALL=y
27CONFIG_GENERIC_CLOCKEVENTS=y 27CONFIG_GENERIC_CLOCKEVENTS=y
28CONFIG_GENERIC_HARDIRQS=y 28CONFIG_GENERIC_HARDIRQS=y
29# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
29CONFIG_IRQ_PER_CPU=y 30CONFIG_IRQ_PER_CPU=y
30CONFIG_RWSEM_XCHGADD_ALGORITHM=y 31CONFIG_RWSEM_XCHGADD_ALGORITHM=y
31CONFIG_ARCH_HAS_ILOG2_U32=y 32CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -64,17 +65,18 @@ CONFIG_SYSVIPC_SYSCTL=y
64CONFIG_POSIX_MQUEUE=y 65CONFIG_POSIX_MQUEUE=y
65# CONFIG_BSD_PROCESS_ACCT is not set 66# CONFIG_BSD_PROCESS_ACCT is not set
66# CONFIG_TASKSTATS is not set 67# CONFIG_TASKSTATS is not set
67# CONFIG_USER_NS is not set
68# CONFIG_PID_NS is not set
69# CONFIG_AUDIT is not set 68# CONFIG_AUDIT is not set
70# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
72# CONFIG_CGROUPS is not set 71# CONFIG_CGROUPS is not set
72CONFIG_GROUP_SCHED=y
73CONFIG_FAIR_GROUP_SCHED=y 73CONFIG_FAIR_GROUP_SCHED=y
74CONFIG_FAIR_USER_SCHED=y 74# CONFIG_RT_GROUP_SCHED is not set
75# CONFIG_FAIR_CGROUP_SCHED is not set 75CONFIG_USER_SCHED=y
76# CONFIG_CGROUP_SCHED is not set
76CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
77# CONFIG_RELAY is not set 78# CONFIG_RELAY is not set
79# CONFIG_NAMESPACES is not set
78CONFIG_BLK_DEV_INITRD=y 80CONFIG_BLK_DEV_INITRD=y
79CONFIG_INITRAMFS_SOURCE="" 81CONFIG_INITRAMFS_SOURCE=""
80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -88,11 +90,13 @@ CONFIG_HOTPLUG=y
88CONFIG_PRINTK=y 90CONFIG_PRINTK=y
89CONFIG_BUG=y 91CONFIG_BUG=y
90CONFIG_ELF_CORE=y 92CONFIG_ELF_CORE=y
93CONFIG_COMPAT_BRK=y
91CONFIG_BASE_FULL=y 94CONFIG_BASE_FULL=y
92CONFIG_FUTEX=y 95CONFIG_FUTEX=y
93CONFIG_ANON_INODES=y 96CONFIG_ANON_INODES=y
94CONFIG_EPOLL=y 97CONFIG_EPOLL=y
95CONFIG_SIGNALFD=y 98CONFIG_SIGNALFD=y
99CONFIG_TIMERFD=y
96CONFIG_EVENTFD=y 100CONFIG_EVENTFD=y
97CONFIG_SHMEM=y 101CONFIG_SHMEM=y
98CONFIG_VM_EVENT_COUNTERS=y 102CONFIG_VM_EVENT_COUNTERS=y
@@ -100,6 +104,13 @@ CONFIG_SLUB_DEBUG=y
100# CONFIG_SLAB is not set 104# CONFIG_SLAB is not set
101CONFIG_SLUB=y 105CONFIG_SLUB=y
102# CONFIG_SLOB is not set 106# CONFIG_SLOB is not set
107# CONFIG_PROFILING is not set
108# CONFIG_MARKERS is not set
109CONFIG_HAVE_OPROFILE=y
110# CONFIG_KPROBES is not set
111CONFIG_HAVE_KPROBES=y
112CONFIG_PROC_PAGE_MONITOR=y
113CONFIG_SLABINFO=y
103CONFIG_RT_MUTEXES=y 114CONFIG_RT_MUTEXES=y
104# CONFIG_TINY_SHMEM is not set 115# CONFIG_TINY_SHMEM is not set
105CONFIG_BASE_SMALL=0 116CONFIG_BASE_SMALL=0
@@ -127,13 +138,15 @@ CONFIG_DEFAULT_AS=y
127# CONFIG_DEFAULT_CFQ is not set 138# CONFIG_DEFAULT_CFQ is not set
128# CONFIG_DEFAULT_NOOP is not set 139# CONFIG_DEFAULT_NOOP is not set
129CONFIG_DEFAULT_IOSCHED="anticipatory" 140CONFIG_DEFAULT_IOSCHED="anticipatory"
141CONFIG_CLASSIC_RCU=y
142# CONFIG_PREEMPT_RCU is not set
130# CONFIG_PPC4xx_PCI_EXPRESS is not set 143# CONFIG_PPC4xx_PCI_EXPRESS is not set
131 144
132# 145#
133# Platform support 146# Platform support
134# 147#
135# CONFIG_PPC_MPC52xx is not set 148# CONFIG_PPC_MPC512x is not set
136# CONFIG_PPC_MPC5200 is not set 149# CONFIG_PPC_MPC5121 is not set
137# CONFIG_PPC_CELL is not set 150# CONFIG_PPC_CELL is not set
138# CONFIG_PPC_CELL_NATIVE is not set 151# CONFIG_PPC_CELL_NATIVE is not set
139# CONFIG_PQ2ADS is not set 152# CONFIG_PQ2ADS is not set
@@ -145,6 +158,7 @@ CONFIG_EP405=y
145CONFIG_405GP=y 158CONFIG_405GP=y
146CONFIG_IBM405_ERR77=y 159CONFIG_IBM405_ERR77=y
147CONFIG_IBM405_ERR51=y 160CONFIG_IBM405_ERR51=y
161# CONFIG_IPIC is not set
148# CONFIG_MPIC is not set 162# CONFIG_MPIC is not set
149# CONFIG_MPIC_WEIRD is not set 163# CONFIG_MPIC_WEIRD is not set
150# CONFIG_PPC_I8259 is not set 164# CONFIG_PPC_I8259 is not set
@@ -155,7 +169,6 @@ CONFIG_IBM405_ERR51=y
155# CONFIG_PPC_INDIRECT_IO is not set 169# CONFIG_PPC_INDIRECT_IO is not set
156# CONFIG_GENERIC_IOMAP is not set 170# CONFIG_GENERIC_IOMAP is not set
157# CONFIG_CPU_FREQ is not set 171# CONFIG_CPU_FREQ is not set
158# CONFIG_CPM2 is not set
159# CONFIG_FSL_ULI1575 is not set 172# CONFIG_FSL_ULI1575 is not set
160 173
161# 174#
@@ -171,13 +184,18 @@ CONFIG_HZ_250=y
171# CONFIG_HZ_300 is not set 184# CONFIG_HZ_300 is not set
172# CONFIG_HZ_1000 is not set 185# CONFIG_HZ_1000 is not set
173CONFIG_HZ=250 186CONFIG_HZ=250
187# CONFIG_SCHED_HRTICK is not set
174CONFIG_PREEMPT_NONE=y 188CONFIG_PREEMPT_NONE=y
175# CONFIG_PREEMPT_VOLUNTARY is not set 189# CONFIG_PREEMPT_VOLUNTARY is not set
176# CONFIG_PREEMPT is not set 190# CONFIG_PREEMPT is not set
191CONFIG_RCU_TRACE=y
177CONFIG_BINFMT_ELF=y 192CONFIG_BINFMT_ELF=y
178# CONFIG_BINFMT_MISC is not set 193# CONFIG_BINFMT_MISC is not set
179# CONFIG_MATH_EMULATION is not set 194# CONFIG_MATH_EMULATION is not set
195# CONFIG_IOMMU_HELPER is not set
180CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 196CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
197CONFIG_ARCH_HAS_WALK_MEMORY=y
198CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
181CONFIG_ARCH_FLATMEM_ENABLE=y 199CONFIG_ARCH_FLATMEM_ENABLE=y
182CONFIG_ARCH_POPULATES_NODE_MAP=y 200CONFIG_ARCH_POPULATES_NODE_MAP=y
183CONFIG_SELECT_MEMORY_MODEL=y 201CONFIG_SELECT_MEMORY_MODEL=y
@@ -196,11 +214,7 @@ CONFIG_VIRT_TO_BUS=y
196CONFIG_PROC_DEVICETREE=y 214CONFIG_PROC_DEVICETREE=y
197# CONFIG_CMDLINE_BOOL is not set 215# CONFIG_CMDLINE_BOOL is not set
198# CONFIG_PM is not set 216# CONFIG_PM is not set
199CONFIG_SUSPEND_UP_POSSIBLE=y
200CONFIG_HIBERNATION_UP_POSSIBLE=y
201CONFIG_SECCOMP=y 217CONFIG_SECCOMP=y
202CONFIG_WANT_DEVICE_TREE=y
203CONFIG_DEVICE_TREE="ep405.dts"
204CONFIG_ISA_DMA_API=y 218CONFIG_ISA_DMA_API=y
205 219
206# 220#
@@ -300,6 +314,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
300# 314#
301# CONFIG_NET_PKTGEN is not set 315# CONFIG_NET_PKTGEN is not set
302# CONFIG_HAMRADIO is not set 316# CONFIG_HAMRADIO is not set
317# CONFIG_CAN is not set
303# CONFIG_IRDA is not set 318# CONFIG_IRDA is not set
304# CONFIG_BT is not set 319# CONFIG_BT is not set
305# CONFIG_AF_RXRPC is not set 320# CONFIG_AF_RXRPC is not set
@@ -336,6 +351,7 @@ CONFIG_MTD=y
336CONFIG_MTD_PARTITIONS=y 351CONFIG_MTD_PARTITIONS=y
337# CONFIG_MTD_REDBOOT_PARTS is not set 352# CONFIG_MTD_REDBOOT_PARTS is not set
338CONFIG_MTD_CMDLINE_PARTS=y 353CONFIG_MTD_CMDLINE_PARTS=y
354CONFIG_MTD_OF_PARTS=y
339 355
340# 356#
341# User Modules And Translation Layers 357# User Modules And Translation Layers
@@ -423,7 +439,7 @@ CONFIG_BLK_DEV=y
423CONFIG_BLK_DEV_RAM=y 439CONFIG_BLK_DEV_RAM=y
424CONFIG_BLK_DEV_RAM_COUNT=16 440CONFIG_BLK_DEV_RAM_COUNT=16
425CONFIG_BLK_DEV_RAM_SIZE=35000 441CONFIG_BLK_DEV_RAM_SIZE=35000
426CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 442# CONFIG_BLK_DEV_XIP is not set
427# CONFIG_CDROM_PKTCDVD is not set 443# CONFIG_CDROM_PKTCDVD is not set
428# CONFIG_ATA_OVER_ETH is not set 444# CONFIG_ATA_OVER_ETH is not set
429# CONFIG_XILINX_SYSACE is not set 445# CONFIG_XILINX_SYSACE is not set
@@ -432,6 +448,8 @@ CONFIG_MISC_DEVICES=y
432# CONFIG_EEPROM_93CX6 is not set 448# CONFIG_EEPROM_93CX6 is not set
433# CONFIG_SGI_IOC4 is not set 449# CONFIG_SGI_IOC4 is not set
434# CONFIG_TIFM_CORE is not set 450# CONFIG_TIFM_CORE is not set
451# CONFIG_ENCLOSURE_SERVICES is not set
452CONFIG_HAVE_IDE=y
435# CONFIG_IDE is not set 453# CONFIG_IDE is not set
436 454
437# 455#
@@ -460,7 +478,6 @@ CONFIG_NETDEVICES=y
460# CONFIG_EQUALIZER is not set 478# CONFIG_EQUALIZER is not set
461# CONFIG_TUN is not set 479# CONFIG_TUN is not set
462# CONFIG_VETH is not set 480# CONFIG_VETH is not set
463# CONFIG_IP1000 is not set
464# CONFIG_ARCNET is not set 481# CONFIG_ARCNET is not set
465# CONFIG_PHYLIB is not set 482# CONFIG_PHYLIB is not set
466CONFIG_NET_ETHERNET=y 483CONFIG_NET_ETHERNET=y
@@ -489,6 +506,9 @@ CONFIG_NETDEV_1000=y
489# CONFIG_DL2K is not set 506# CONFIG_DL2K is not set
490# CONFIG_E1000 is not set 507# CONFIG_E1000 is not set
491# CONFIG_E1000E is not set 508# CONFIG_E1000E is not set
509# CONFIG_E1000E_ENABLED is not set
510# CONFIG_IP1000 is not set
511# CONFIG_IGB is not set
492# CONFIG_NS83820 is not set 512# CONFIG_NS83820 is not set
493# CONFIG_HAMACHI is not set 513# CONFIG_HAMACHI is not set
494# CONFIG_YELLOWFIN is not set 514# CONFIG_YELLOWFIN is not set
@@ -513,6 +533,7 @@ CONFIG_NETDEV_10000=y
513# CONFIG_NIU is not set 533# CONFIG_NIU is not set
514# CONFIG_MLX4_CORE is not set 534# CONFIG_MLX4_CORE is not set
515# CONFIG_TEHUTI is not set 535# CONFIG_TEHUTI is not set
536# CONFIG_BNX2X is not set
516# CONFIG_TR is not set 537# CONFIG_TR is not set
517 538
518# 539#
@@ -534,7 +555,6 @@ CONFIG_NETDEV_10000=y
534# CONFIG_HIPPI is not set 555# CONFIG_HIPPI is not set
535# CONFIG_PPP is not set 556# CONFIG_PPP is not set
536# CONFIG_SLIP is not set 557# CONFIG_SLIP is not set
537# CONFIG_SHAPER is not set
538# CONFIG_NETCONSOLE is not set 558# CONFIG_NETCONSOLE is not set
539# CONFIG_NETPOLL is not set 559# CONFIG_NETPOLL is not set
540# CONFIG_NET_POLL_CONTROLLER is not set 560# CONFIG_NET_POLL_CONTROLLER is not set
@@ -557,6 +577,7 @@ CONFIG_NETDEV_10000=y
557# 577#
558# CONFIG_VT is not set 578# CONFIG_VT is not set
559# CONFIG_SERIAL_NONSTANDARD is not set 579# CONFIG_SERIAL_NONSTANDARD is not set
580# CONFIG_NOZOMI is not set
560 581
561# 582#
562# Serial drivers 583# Serial drivers
@@ -602,6 +623,7 @@ CONFIG_DEVPORT=y
602# CONFIG_W1 is not set 623# CONFIG_W1 is not set
603# CONFIG_POWER_SUPPLY is not set 624# CONFIG_POWER_SUPPLY is not set
604# CONFIG_HWMON is not set 625# CONFIG_HWMON is not set
626CONFIG_THERMAL=y
605# CONFIG_WATCHDOG is not set 627# CONFIG_WATCHDOG is not set
606 628
607# 629#
@@ -647,6 +669,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
647CONFIG_USB_ARCH_HAS_EHCI=y 669CONFIG_USB_ARCH_HAS_EHCI=y
648CONFIG_USB=y 670CONFIG_USB=y
649# CONFIG_USB_DEBUG is not set 671# CONFIG_USB_DEBUG is not set
672# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
650 673
651# 674#
652# Miscellaneous USB options 675# Miscellaneous USB options
@@ -697,10 +720,6 @@ CONFIG_USB_MON=y
697# 720#
698# USB port drivers 721# USB port drivers
699# 722#
700
701#
702# USB Serial Converter support
703#
704# CONFIG_USB_SERIAL is not set 723# CONFIG_USB_SERIAL is not set
705 724
706# 725#
@@ -725,16 +744,9 @@ CONFIG_USB_MON=y
725# CONFIG_USB_TRANCEVIBRATOR is not set 744# CONFIG_USB_TRANCEVIBRATOR is not set
726# CONFIG_USB_IOWARRIOR is not set 745# CONFIG_USB_IOWARRIOR is not set
727# CONFIG_USB_TEST is not set 746# CONFIG_USB_TEST is not set
728
729#
730# USB DSL modem support
731#
732
733#
734# USB Gadget Support
735#
736# CONFIG_USB_GADGET is not set 747# CONFIG_USB_GADGET is not set
737# CONFIG_MMC is not set 748# CONFIG_MMC is not set
749# CONFIG_MEMSTICK is not set
738# CONFIG_NEW_LEDS is not set 750# CONFIG_NEW_LEDS is not set
739# CONFIG_INFINIBAND is not set 751# CONFIG_INFINIBAND is not set
740# CONFIG_EDAC is not set 752# CONFIG_EDAC is not set
@@ -759,12 +771,10 @@ CONFIG_EXT2_FS=y
759# CONFIG_XFS_FS is not set 771# CONFIG_XFS_FS is not set
760# CONFIG_GFS2_FS is not set 772# CONFIG_GFS2_FS is not set
761# CONFIG_OCFS2_FS is not set 773# CONFIG_OCFS2_FS is not set
762# CONFIG_MINIX_FS is not set 774CONFIG_DNOTIFY=y
763# CONFIG_ROMFS_FS is not set
764CONFIG_INOTIFY=y 775CONFIG_INOTIFY=y
765CONFIG_INOTIFY_USER=y 776CONFIG_INOTIFY_USER=y
766# CONFIG_QUOTA is not set 777# CONFIG_QUOTA is not set
767CONFIG_DNOTIFY=y
768# CONFIG_AUTOFS_FS is not set 778# CONFIG_AUTOFS_FS is not set
769# CONFIG_AUTOFS4_FS is not set 779# CONFIG_AUTOFS4_FS is not set
770# CONFIG_FUSE_FS is not set 780# CONFIG_FUSE_FS is not set
@@ -807,8 +817,10 @@ CONFIG_TMPFS=y
807# CONFIG_JFFS2_FS is not set 817# CONFIG_JFFS2_FS is not set
808CONFIG_CRAMFS=y 818CONFIG_CRAMFS=y
809# CONFIG_VXFS_FS is not set 819# CONFIG_VXFS_FS is not set
820# CONFIG_MINIX_FS is not set
810# CONFIG_HPFS_FS is not set 821# CONFIG_HPFS_FS is not set
811# CONFIG_QNX4FS_FS is not set 822# CONFIG_QNX4FS_FS is not set
823# CONFIG_ROMFS_FS is not set
812# CONFIG_SYSV_FS is not set 824# CONFIG_SYSV_FS is not set
813# CONFIG_UFS_FS is not set 825# CONFIG_UFS_FS is not set
814CONFIG_NETWORK_FILESYSTEMS=y 826CONFIG_NETWORK_FILESYSTEMS=y
@@ -839,7 +851,6 @@ CONFIG_SUNRPC=y
839CONFIG_MSDOS_PARTITION=y 851CONFIG_MSDOS_PARTITION=y
840# CONFIG_NLS is not set 852# CONFIG_NLS is not set
841# CONFIG_DLM is not set 853# CONFIG_DLM is not set
842# CONFIG_UCC_SLOW is not set
843 854
844# 855#
845# Library routines 856# Library routines
@@ -856,10 +867,6 @@ CONFIG_PLIST=y
856CONFIG_HAS_IOMEM=y 867CONFIG_HAS_IOMEM=y
857CONFIG_HAS_IOPORT=y 868CONFIG_HAS_IOPORT=y
858CONFIG_HAS_DMA=y 869CONFIG_HAS_DMA=y
859CONFIG_INSTRUMENTATION=y
860# CONFIG_PROFILING is not set
861# CONFIG_KPROBES is not set
862# CONFIG_MARKERS is not set
863 870
864# 871#
865# Kernel hacking 872# Kernel hacking
@@ -869,7 +876,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
869CONFIG_ENABLE_MUST_CHECK=y 876CONFIG_ENABLE_MUST_CHECK=y
870CONFIG_MAGIC_SYSRQ=y 877CONFIG_MAGIC_SYSRQ=y
871# CONFIG_UNUSED_SYMBOLS is not set 878# CONFIG_UNUSED_SYMBOLS is not set
872# CONFIG_DEBUG_FS is not set 879CONFIG_DEBUG_FS=y
873# CONFIG_HEADERS_CHECK is not set 880# CONFIG_HEADERS_CHECK is not set
874CONFIG_DEBUG_KERNEL=y 881CONFIG_DEBUG_KERNEL=y
875# CONFIG_DEBUG_SHIRQ is not set 882# CONFIG_DEBUG_SHIRQ is not set
@@ -878,6 +885,7 @@ CONFIG_SCHED_DEBUG=y
878# CONFIG_SCHEDSTATS is not set 885# CONFIG_SCHEDSTATS is not set
879# CONFIG_TIMER_STATS is not set 886# CONFIG_TIMER_STATS is not set
880# CONFIG_SLUB_DEBUG_ON is not set 887# CONFIG_SLUB_DEBUG_ON is not set
888# CONFIG_SLUB_STATS is not set
881# CONFIG_DEBUG_RT_MUTEXES is not set 889# CONFIG_DEBUG_RT_MUTEXES is not set
882# CONFIG_RT_MUTEX_TESTER is not set 890# CONFIG_RT_MUTEX_TESTER is not set
883# CONFIG_DEBUG_SPINLOCK is not set 891# CONFIG_DEBUG_SPINLOCK is not set
@@ -890,15 +898,16 @@ CONFIG_DEBUG_BUGVERBOSE=y
890# CONFIG_DEBUG_VM is not set 898# CONFIG_DEBUG_VM is not set
891# CONFIG_DEBUG_LIST is not set 899# CONFIG_DEBUG_LIST is not set
892# CONFIG_DEBUG_SG is not set 900# CONFIG_DEBUG_SG is not set
893CONFIG_FORCED_INLINING=y
894# CONFIG_BOOT_PRINTK_DELAY is not set 901# CONFIG_BOOT_PRINTK_DELAY is not set
895# CONFIG_RCU_TORTURE_TEST is not set 902# CONFIG_RCU_TORTURE_TEST is not set
903# CONFIG_BACKTRACE_SELF_TEST is not set
896# CONFIG_FAULT_INJECTION is not set 904# CONFIG_FAULT_INJECTION is not set
897# CONFIG_SAMPLES is not set 905# CONFIG_SAMPLES is not set
898# CONFIG_DEBUG_STACKOVERFLOW is not set 906# CONFIG_DEBUG_STACKOVERFLOW is not set
899# CONFIG_DEBUG_STACK_USAGE is not set 907# CONFIG_DEBUG_STACK_USAGE is not set
900# CONFIG_DEBUG_PAGEALLOC is not set 908# CONFIG_DEBUG_PAGEALLOC is not set
901# CONFIG_DEBUGGER is not set 909# CONFIG_DEBUGGER is not set
910# CONFIG_VIRQ_DEBUG is not set
902# CONFIG_BDI_SWITCH is not set 911# CONFIG_BDI_SWITCH is not set
903# CONFIG_PPC_EARLY_DEBUG is not set 912# CONFIG_PPC_EARLY_DEBUG is not set
904 913
@@ -911,6 +920,7 @@ CONFIG_FORCED_INLINING=y
911CONFIG_CRYPTO=y 920CONFIG_CRYPTO=y
912CONFIG_CRYPTO_ALGAPI=y 921CONFIG_CRYPTO_ALGAPI=y
913CONFIG_CRYPTO_BLKCIPHER=y 922CONFIG_CRYPTO_BLKCIPHER=y
923# CONFIG_CRYPTO_SEQIV is not set
914CONFIG_CRYPTO_MANAGER=y 924CONFIG_CRYPTO_MANAGER=y
915# CONFIG_CRYPTO_HMAC is not set 925# CONFIG_CRYPTO_HMAC is not set
916# CONFIG_CRYPTO_XCBC is not set 926# CONFIG_CRYPTO_XCBC is not set
@@ -928,6 +938,9 @@ CONFIG_CRYPTO_CBC=y
928CONFIG_CRYPTO_PCBC=y 938CONFIG_CRYPTO_PCBC=y
929# CONFIG_CRYPTO_LRW is not set 939# CONFIG_CRYPTO_LRW is not set
930# CONFIG_CRYPTO_XTS is not set 940# CONFIG_CRYPTO_XTS is not set
941# CONFIG_CRYPTO_CTR is not set
942# CONFIG_CRYPTO_GCM is not set
943# CONFIG_CRYPTO_CCM is not set
931# CONFIG_CRYPTO_CRYPTD is not set 944# CONFIG_CRYPTO_CRYPTD is not set
932CONFIG_CRYPTO_DES=y 945CONFIG_CRYPTO_DES=y
933# CONFIG_CRYPTO_FCRYPT is not set 946# CONFIG_CRYPTO_FCRYPT is not set
@@ -942,11 +955,14 @@ CONFIG_CRYPTO_DES=y
942# CONFIG_CRYPTO_KHAZAD is not set 955# CONFIG_CRYPTO_KHAZAD is not set
943# CONFIG_CRYPTO_ANUBIS is not set 956# CONFIG_CRYPTO_ANUBIS is not set
944# CONFIG_CRYPTO_SEED is not set 957# CONFIG_CRYPTO_SEED is not set
958# CONFIG_CRYPTO_SALSA20 is not set
945# CONFIG_CRYPTO_DEFLATE is not set 959# CONFIG_CRYPTO_DEFLATE is not set
946# CONFIG_CRYPTO_MICHAEL_MIC is not set 960# CONFIG_CRYPTO_MICHAEL_MIC is not set
947# CONFIG_CRYPTO_CRC32C is not set 961# CONFIG_CRYPTO_CRC32C is not set
948# CONFIG_CRYPTO_CAMELLIA is not set 962# CONFIG_CRYPTO_CAMELLIA is not set
949# CONFIG_CRYPTO_TEST is not set 963# CONFIG_CRYPTO_TEST is not set
950# CONFIG_CRYPTO_AUTHENC is not set 964# CONFIG_CRYPTO_AUTHENC is not set
965# CONFIG_CRYPTO_LZO is not set
951CONFIG_CRYPTO_HW=y 966CONFIG_CRYPTO_HW=y
967# CONFIG_CRYPTO_DEV_HIFN_795X is not set
952# CONFIG_PPC_CLOCK is not set 968# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/kilauea_defconfig b/arch/powerpc/configs/kilauea_defconfig
index 8dca3d451c0e..2f475391f1d1 100644
--- a/arch/powerpc/configs/kilauea_defconfig
+++ b/arch/powerpc/configs/kilauea_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc6 3# Linux kernel version: 2.6.25-rc2
4# Thu Jan 3 14:21:31 2008 4# Fri Feb 15 21:51:43 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -26,6 +26,7 @@ CONFIG_GENERIC_TIME=y
26CONFIG_GENERIC_TIME_VSYSCALL=y 26CONFIG_GENERIC_TIME_VSYSCALL=y
27CONFIG_GENERIC_CLOCKEVENTS=y 27CONFIG_GENERIC_CLOCKEVENTS=y
28CONFIG_GENERIC_HARDIRQS=y 28CONFIG_GENERIC_HARDIRQS=y
29# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
29CONFIG_IRQ_PER_CPU=y 30CONFIG_IRQ_PER_CPU=y
30CONFIG_RWSEM_XCHGADD_ALGORITHM=y 31CONFIG_RWSEM_XCHGADD_ALGORITHM=y
31CONFIG_ARCH_HAS_ILOG2_U32=y 32CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -64,15 +65,18 @@ CONFIG_SYSVIPC_SYSCTL=y
64CONFIG_POSIX_MQUEUE=y 65CONFIG_POSIX_MQUEUE=y
65# CONFIG_BSD_PROCESS_ACCT is not set 66# CONFIG_BSD_PROCESS_ACCT is not set
66# CONFIG_TASKSTATS is not set 67# CONFIG_TASKSTATS is not set
67# CONFIG_USER_NS is not set
68# CONFIG_PID_NS is not set
69# CONFIG_AUDIT is not set 68# CONFIG_AUDIT is not set
70# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
72# CONFIG_CGROUPS is not set 71# CONFIG_CGROUPS is not set
72CONFIG_GROUP_SCHED=y
73# CONFIG_FAIR_GROUP_SCHED is not set 73# CONFIG_FAIR_GROUP_SCHED is not set
74# CONFIG_RT_GROUP_SCHED is not set
75CONFIG_USER_SCHED=y
76# CONFIG_CGROUP_SCHED is not set
74CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
75# CONFIG_RELAY is not set 78# CONFIG_RELAY is not set
79# CONFIG_NAMESPACES is not set
76CONFIG_BLK_DEV_INITRD=y 80CONFIG_BLK_DEV_INITRD=y
77CONFIG_INITRAMFS_SOURCE="" 81CONFIG_INITRAMFS_SOURCE=""
78# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -86,11 +90,13 @@ CONFIG_HOTPLUG=y
86CONFIG_PRINTK=y 90CONFIG_PRINTK=y
87CONFIG_BUG=y 91CONFIG_BUG=y
88CONFIG_ELF_CORE=y 92CONFIG_ELF_CORE=y
93CONFIG_COMPAT_BRK=y
89CONFIG_BASE_FULL=y 94CONFIG_BASE_FULL=y
90CONFIG_FUTEX=y 95CONFIG_FUTEX=y
91CONFIG_ANON_INODES=y 96CONFIG_ANON_INODES=y
92CONFIG_EPOLL=y 97CONFIG_EPOLL=y
93CONFIG_SIGNALFD=y 98CONFIG_SIGNALFD=y
99CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y 100CONFIG_EVENTFD=y
95CONFIG_SHMEM=y 101CONFIG_SHMEM=y
96CONFIG_VM_EVENT_COUNTERS=y 102CONFIG_VM_EVENT_COUNTERS=y
@@ -98,6 +104,13 @@ CONFIG_SLUB_DEBUG=y
98# CONFIG_SLAB is not set 104# CONFIG_SLAB is not set
99CONFIG_SLUB=y 105CONFIG_SLUB=y
100# CONFIG_SLOB is not set 106# CONFIG_SLOB is not set
107# CONFIG_PROFILING is not set
108# CONFIG_MARKERS is not set
109CONFIG_HAVE_OPROFILE=y
110# CONFIG_KPROBES is not set
111CONFIG_HAVE_KPROBES=y
112CONFIG_PROC_PAGE_MONITOR=y
113CONFIG_SLABINFO=y
101CONFIG_RT_MUTEXES=y 114CONFIG_RT_MUTEXES=y
102# CONFIG_TINY_SHMEM is not set 115# CONFIG_TINY_SHMEM is not set
103CONFIG_BASE_SMALL=0 116CONFIG_BASE_SMALL=0
@@ -125,13 +138,15 @@ CONFIG_DEFAULT_AS=y
125# CONFIG_DEFAULT_CFQ is not set 138# CONFIG_DEFAULT_CFQ is not set
126# CONFIG_DEFAULT_NOOP is not set 139# CONFIG_DEFAULT_NOOP is not set
127CONFIG_DEFAULT_IOSCHED="anticipatory" 140CONFIG_DEFAULT_IOSCHED="anticipatory"
141CONFIG_CLASSIC_RCU=y
142# CONFIG_PREEMPT_RCU is not set
128CONFIG_PPC4xx_PCI_EXPRESS=y 143CONFIG_PPC4xx_PCI_EXPRESS=y
129 144
130# 145#
131# Platform support 146# Platform support
132# 147#
133# CONFIG_PPC_MPC52xx is not set 148# CONFIG_PPC_MPC512x is not set
134# CONFIG_PPC_MPC5200 is not set 149# CONFIG_PPC_MPC5121 is not set
135# CONFIG_PPC_CELL is not set 150# CONFIG_PPC_CELL is not set
136# CONFIG_PPC_CELL_NATIVE is not set 151# CONFIG_PPC_CELL_NATIVE is not set
137# CONFIG_PQ2ADS is not set 152# CONFIG_PQ2ADS is not set
@@ -141,6 +156,7 @@ CONFIG_KILAUEA=y
141# CONFIG_WALNUT is not set 156# CONFIG_WALNUT is not set
142# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set 157# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
143CONFIG_405EX=y 158CONFIG_405EX=y
159# CONFIG_IPIC is not set
144# CONFIG_MPIC is not set 160# CONFIG_MPIC is not set
145# CONFIG_MPIC_WEIRD is not set 161# CONFIG_MPIC_WEIRD is not set
146# CONFIG_PPC_I8259 is not set 162# CONFIG_PPC_I8259 is not set
@@ -151,7 +167,6 @@ CONFIG_405EX=y
151# CONFIG_PPC_INDIRECT_IO is not set 167# CONFIG_PPC_INDIRECT_IO is not set
152# CONFIG_GENERIC_IOMAP is not set 168# CONFIG_GENERIC_IOMAP is not set
153# CONFIG_CPU_FREQ is not set 169# CONFIG_CPU_FREQ is not set
154# CONFIG_CPM2 is not set
155# CONFIG_FSL_ULI1575 is not set 170# CONFIG_FSL_ULI1575 is not set
156 171
157# 172#
@@ -167,13 +182,18 @@ CONFIG_HZ_250=y
167# CONFIG_HZ_300 is not set 182# CONFIG_HZ_300 is not set
168# CONFIG_HZ_1000 is not set 183# CONFIG_HZ_1000 is not set
169CONFIG_HZ=250 184CONFIG_HZ=250
185# CONFIG_SCHED_HRTICK is not set
170CONFIG_PREEMPT_NONE=y 186CONFIG_PREEMPT_NONE=y
171# CONFIG_PREEMPT_VOLUNTARY is not set 187# CONFIG_PREEMPT_VOLUNTARY is not set
172# CONFIG_PREEMPT is not set 188# CONFIG_PREEMPT is not set
189CONFIG_RCU_TRACE=y
173CONFIG_BINFMT_ELF=y 190CONFIG_BINFMT_ELF=y
174# CONFIG_BINFMT_MISC is not set 191# CONFIG_BINFMT_MISC is not set
175# CONFIG_MATH_EMULATION is not set 192# CONFIG_MATH_EMULATION is not set
193# CONFIG_IOMMU_HELPER is not set
176CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 194CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
195CONFIG_ARCH_HAS_WALK_MEMORY=y
196CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
177CONFIG_ARCH_FLATMEM_ENABLE=y 197CONFIG_ARCH_FLATMEM_ENABLE=y
178CONFIG_ARCH_POPULATES_NODE_MAP=y 198CONFIG_ARCH_POPULATES_NODE_MAP=y
179CONFIG_SELECT_MEMORY_MODEL=y 199CONFIG_SELECT_MEMORY_MODEL=y
@@ -192,11 +212,7 @@ CONFIG_VIRT_TO_BUS=y
192CONFIG_PROC_DEVICETREE=y 212CONFIG_PROC_DEVICETREE=y
193# CONFIG_CMDLINE_BOOL is not set 213# CONFIG_CMDLINE_BOOL is not set
194# CONFIG_PM is not set 214# CONFIG_PM is not set
195CONFIG_SUSPEND_UP_POSSIBLE=y
196CONFIG_HIBERNATION_UP_POSSIBLE=y
197CONFIG_SECCOMP=y 215CONFIG_SECCOMP=y
198CONFIG_WANT_DEVICE_TREE=y
199CONFIG_DEVICE_TREE="kilauea.dts"
200CONFIG_ISA_DMA_API=y 216CONFIG_ISA_DMA_API=y
201 217
202# 218#
@@ -296,6 +312,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
296# 312#
297# CONFIG_NET_PKTGEN is not set 313# CONFIG_NET_PKTGEN is not set
298# CONFIG_HAMRADIO is not set 314# CONFIG_HAMRADIO is not set
315# CONFIG_CAN is not set
299# CONFIG_IRDA is not set 316# CONFIG_IRDA is not set
300# CONFIG_BT is not set 317# CONFIG_BT is not set
301# CONFIG_AF_RXRPC is not set 318# CONFIG_AF_RXRPC is not set
@@ -332,6 +349,7 @@ CONFIG_MTD=y
332CONFIG_MTD_PARTITIONS=y 349CONFIG_MTD_PARTITIONS=y
333# CONFIG_MTD_REDBOOT_PARTS is not set 350# CONFIG_MTD_REDBOOT_PARTS is not set
334CONFIG_MTD_CMDLINE_PARTS=y 351CONFIG_MTD_CMDLINE_PARTS=y
352CONFIG_MTD_OF_PARTS=y
335 353
336# 354#
337# User Modules And Translation Layers 355# User Modules And Translation Layers
@@ -418,11 +436,12 @@ CONFIG_BLK_DEV=y
418CONFIG_BLK_DEV_RAM=y 436CONFIG_BLK_DEV_RAM=y
419CONFIG_BLK_DEV_RAM_COUNT=16 437CONFIG_BLK_DEV_RAM_COUNT=16
420CONFIG_BLK_DEV_RAM_SIZE=35000 438CONFIG_BLK_DEV_RAM_SIZE=35000
421CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 439# CONFIG_BLK_DEV_XIP is not set
422# CONFIG_CDROM_PKTCDVD is not set 440# CONFIG_CDROM_PKTCDVD is not set
423# CONFIG_ATA_OVER_ETH is not set 441# CONFIG_ATA_OVER_ETH is not set
424# CONFIG_XILINX_SYSACE is not set 442# CONFIG_XILINX_SYSACE is not set
425# CONFIG_MISC_DEVICES is not set 443# CONFIG_MISC_DEVICES is not set
444CONFIG_HAVE_IDE=y
426# CONFIG_IDE is not set 445# CONFIG_IDE is not set
427 446
428# 447#
@@ -451,7 +470,6 @@ CONFIG_NETDEVICES=y
451# CONFIG_EQUALIZER is not set 470# CONFIG_EQUALIZER is not set
452# CONFIG_TUN is not set 471# CONFIG_TUN is not set
453# CONFIG_VETH is not set 472# CONFIG_VETH is not set
454# CONFIG_IP1000 is not set
455# CONFIG_ARCNET is not set 473# CONFIG_ARCNET is not set
456# CONFIG_PHYLIB is not set 474# CONFIG_PHYLIB is not set
457CONFIG_NET_ETHERNET=y 475CONFIG_NET_ETHERNET=y
@@ -489,7 +507,6 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y
489# CONFIG_HIPPI is not set 507# CONFIG_HIPPI is not set
490# CONFIG_PPP is not set 508# CONFIG_PPP is not set
491# CONFIG_SLIP is not set 509# CONFIG_SLIP is not set
492# CONFIG_SHAPER is not set
493# CONFIG_NETCONSOLE is not set 510# CONFIG_NETCONSOLE is not set
494# CONFIG_NETPOLL is not set 511# CONFIG_NETPOLL is not set
495# CONFIG_NET_POLL_CONTROLLER is not set 512# CONFIG_NET_POLL_CONTROLLER is not set
@@ -512,6 +529,7 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y
512# 529#
513# CONFIG_VT is not set 530# CONFIG_VT is not set
514# CONFIG_SERIAL_NONSTANDARD is not set 531# CONFIG_SERIAL_NONSTANDARD is not set
532# CONFIG_NOZOMI is not set
515 533
516# 534#
517# Serial drivers 535# Serial drivers
@@ -557,6 +575,7 @@ CONFIG_DEVPORT=y
557# CONFIG_W1 is not set 575# CONFIG_W1 is not set
558# CONFIG_POWER_SUPPLY is not set 576# CONFIG_POWER_SUPPLY is not set
559# CONFIG_HWMON is not set 577# CONFIG_HWMON is not set
578CONFIG_THERMAL=y
560# CONFIG_WATCHDOG is not set 579# CONFIG_WATCHDOG is not set
561 580
562# 581#
@@ -598,6 +617,7 @@ CONFIG_SSB_POSSIBLE=y
598# CONFIG_SOUND is not set 617# CONFIG_SOUND is not set
599# CONFIG_USB_SUPPORT is not set 618# CONFIG_USB_SUPPORT is not set
600# CONFIG_MMC is not set 619# CONFIG_MMC is not set
620# CONFIG_MEMSTICK is not set
601# CONFIG_NEW_LEDS is not set 621# CONFIG_NEW_LEDS is not set
602# CONFIG_INFINIBAND is not set 622# CONFIG_INFINIBAND is not set
603# CONFIG_EDAC is not set 623# CONFIG_EDAC is not set
@@ -622,12 +642,10 @@ CONFIG_EXT2_FS=y
622# CONFIG_XFS_FS is not set 642# CONFIG_XFS_FS is not set
623# CONFIG_GFS2_FS is not set 643# CONFIG_GFS2_FS is not set
624# CONFIG_OCFS2_FS is not set 644# CONFIG_OCFS2_FS is not set
625# CONFIG_MINIX_FS is not set 645CONFIG_DNOTIFY=y
626# CONFIG_ROMFS_FS is not set
627CONFIG_INOTIFY=y 646CONFIG_INOTIFY=y
628CONFIG_INOTIFY_USER=y 647CONFIG_INOTIFY_USER=y
629# CONFIG_QUOTA is not set 648# CONFIG_QUOTA is not set
630CONFIG_DNOTIFY=y
631# CONFIG_AUTOFS_FS is not set 649# CONFIG_AUTOFS_FS is not set
632# CONFIG_AUTOFS4_FS is not set 650# CONFIG_AUTOFS4_FS is not set
633# CONFIG_FUSE_FS is not set 651# CONFIG_FUSE_FS is not set
@@ -670,8 +688,10 @@ CONFIG_TMPFS=y
670# CONFIG_JFFS2_FS is not set 688# CONFIG_JFFS2_FS is not set
671CONFIG_CRAMFS=y 689CONFIG_CRAMFS=y
672# CONFIG_VXFS_FS is not set 690# CONFIG_VXFS_FS is not set
691# CONFIG_MINIX_FS is not set
673# CONFIG_HPFS_FS is not set 692# CONFIG_HPFS_FS is not set
674# CONFIG_QNX4FS_FS is not set 693# CONFIG_QNX4FS_FS is not set
694# CONFIG_ROMFS_FS is not set
675# CONFIG_SYSV_FS is not set 695# CONFIG_SYSV_FS is not set
676# CONFIG_UFS_FS is not set 696# CONFIG_UFS_FS is not set
677CONFIG_NETWORK_FILESYSTEMS=y 697CONFIG_NETWORK_FILESYSTEMS=y
@@ -702,7 +722,6 @@ CONFIG_SUNRPC=y
702CONFIG_MSDOS_PARTITION=y 722CONFIG_MSDOS_PARTITION=y
703# CONFIG_NLS is not set 723# CONFIG_NLS is not set
704# CONFIG_DLM is not set 724# CONFIG_DLM is not set
705# CONFIG_UCC_SLOW is not set
706 725
707# 726#
708# Library routines 727# Library routines
@@ -719,7 +738,6 @@ CONFIG_PLIST=y
719CONFIG_HAS_IOMEM=y 738CONFIG_HAS_IOMEM=y
720CONFIG_HAS_IOPORT=y 739CONFIG_HAS_IOPORT=y
721CONFIG_HAS_DMA=y 740CONFIG_HAS_DMA=y
722# CONFIG_INSTRUMENTATION is not set
723 741
724# 742#
725# Kernel hacking 743# Kernel hacking
@@ -729,7 +747,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
729CONFIG_ENABLE_MUST_CHECK=y 747CONFIG_ENABLE_MUST_CHECK=y
730CONFIG_MAGIC_SYSRQ=y 748CONFIG_MAGIC_SYSRQ=y
731# CONFIG_UNUSED_SYMBOLS is not set 749# CONFIG_UNUSED_SYMBOLS is not set
732# CONFIG_DEBUG_FS is not set 750CONFIG_DEBUG_FS=y
733# CONFIG_HEADERS_CHECK is not set 751# CONFIG_HEADERS_CHECK is not set
734CONFIG_DEBUG_KERNEL=y 752CONFIG_DEBUG_KERNEL=y
735# CONFIG_DEBUG_SHIRQ is not set 753# CONFIG_DEBUG_SHIRQ is not set
@@ -738,6 +756,7 @@ CONFIG_SCHED_DEBUG=y
738# CONFIG_SCHEDSTATS is not set 756# CONFIG_SCHEDSTATS is not set
739# CONFIG_TIMER_STATS is not set 757# CONFIG_TIMER_STATS is not set
740# CONFIG_SLUB_DEBUG_ON is not set 758# CONFIG_SLUB_DEBUG_ON is not set
759# CONFIG_SLUB_STATS is not set
741# CONFIG_DEBUG_RT_MUTEXES is not set 760# CONFIG_DEBUG_RT_MUTEXES is not set
742# CONFIG_RT_MUTEX_TESTER is not set 761# CONFIG_RT_MUTEX_TESTER is not set
743# CONFIG_DEBUG_SPINLOCK is not set 762# CONFIG_DEBUG_SPINLOCK is not set
@@ -750,15 +769,16 @@ CONFIG_DEBUG_BUGVERBOSE=y
750# CONFIG_DEBUG_VM is not set 769# CONFIG_DEBUG_VM is not set
751# CONFIG_DEBUG_LIST is not set 770# CONFIG_DEBUG_LIST is not set
752# CONFIG_DEBUG_SG is not set 771# CONFIG_DEBUG_SG is not set
753CONFIG_FORCED_INLINING=y
754# CONFIG_BOOT_PRINTK_DELAY is not set 772# CONFIG_BOOT_PRINTK_DELAY is not set
755# CONFIG_RCU_TORTURE_TEST is not set 773# CONFIG_RCU_TORTURE_TEST is not set
774# CONFIG_BACKTRACE_SELF_TEST is not set
756# CONFIG_FAULT_INJECTION is not set 775# CONFIG_FAULT_INJECTION is not set
757# CONFIG_SAMPLES is not set 776# CONFIG_SAMPLES is not set
758# CONFIG_DEBUG_STACKOVERFLOW is not set 777# CONFIG_DEBUG_STACKOVERFLOW is not set
759# CONFIG_DEBUG_STACK_USAGE is not set 778# CONFIG_DEBUG_STACK_USAGE is not set
760# CONFIG_DEBUG_PAGEALLOC is not set 779# CONFIG_DEBUG_PAGEALLOC is not set
761# CONFIG_DEBUGGER is not set 780# CONFIG_DEBUGGER is not set
781# CONFIG_VIRQ_DEBUG is not set
762# CONFIG_BDI_SWITCH is not set 782# CONFIG_BDI_SWITCH is not set
763# CONFIG_PPC_EARLY_DEBUG is not set 783# CONFIG_PPC_EARLY_DEBUG is not set
764 784
@@ -771,6 +791,7 @@ CONFIG_FORCED_INLINING=y
771CONFIG_CRYPTO=y 791CONFIG_CRYPTO=y
772CONFIG_CRYPTO_ALGAPI=y 792CONFIG_CRYPTO_ALGAPI=y
773CONFIG_CRYPTO_BLKCIPHER=y 793CONFIG_CRYPTO_BLKCIPHER=y
794# CONFIG_CRYPTO_SEQIV is not set
774CONFIG_CRYPTO_MANAGER=y 795CONFIG_CRYPTO_MANAGER=y
775# CONFIG_CRYPTO_HMAC is not set 796# CONFIG_CRYPTO_HMAC is not set
776# CONFIG_CRYPTO_XCBC is not set 797# CONFIG_CRYPTO_XCBC is not set
@@ -788,6 +809,9 @@ CONFIG_CRYPTO_CBC=y
788CONFIG_CRYPTO_PCBC=y 809CONFIG_CRYPTO_PCBC=y
789# CONFIG_CRYPTO_LRW is not set 810# CONFIG_CRYPTO_LRW is not set
790# CONFIG_CRYPTO_XTS is not set 811# CONFIG_CRYPTO_XTS is not set
812# CONFIG_CRYPTO_CTR is not set
813# CONFIG_CRYPTO_GCM is not set
814# CONFIG_CRYPTO_CCM is not set
791# CONFIG_CRYPTO_CRYPTD is not set 815# CONFIG_CRYPTO_CRYPTD is not set
792CONFIG_CRYPTO_DES=y 816CONFIG_CRYPTO_DES=y
793# CONFIG_CRYPTO_FCRYPT is not set 817# CONFIG_CRYPTO_FCRYPT is not set
@@ -802,11 +826,14 @@ CONFIG_CRYPTO_DES=y
802# CONFIG_CRYPTO_KHAZAD is not set 826# CONFIG_CRYPTO_KHAZAD is not set
803# CONFIG_CRYPTO_ANUBIS is not set 827# CONFIG_CRYPTO_ANUBIS is not set
804# CONFIG_CRYPTO_SEED is not set 828# CONFIG_CRYPTO_SEED is not set
829# CONFIG_CRYPTO_SALSA20 is not set
805# CONFIG_CRYPTO_DEFLATE is not set 830# CONFIG_CRYPTO_DEFLATE is not set
806# CONFIG_CRYPTO_MICHAEL_MIC is not set 831# CONFIG_CRYPTO_MICHAEL_MIC is not set
807# CONFIG_CRYPTO_CRC32C is not set 832# CONFIG_CRYPTO_CRC32C is not set
808# CONFIG_CRYPTO_CAMELLIA is not set 833# CONFIG_CRYPTO_CAMELLIA is not set
809# CONFIG_CRYPTO_TEST is not set 834# CONFIG_CRYPTO_TEST is not set
810# CONFIG_CRYPTO_AUTHENC is not set 835# CONFIG_CRYPTO_AUTHENC is not set
836# CONFIG_CRYPTO_LZO is not set
811CONFIG_CRYPTO_HW=y 837CONFIG_CRYPTO_HW=y
838# CONFIG_CRYPTO_DEV_HIFN_795X is not set
812# CONFIG_PPC_CLOCK is not set 839# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/makalu_defconfig b/arch/powerpc/configs/makalu_defconfig
index c5db0265e5d8..9ef4d8a312c8 100644
--- a/arch/powerpc/configs/makalu_defconfig
+++ b/arch/powerpc/configs/makalu_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc6 3# Linux kernel version: 2.6.25-rc2
4# Mon Dec 24 11:18:32 2007 4# Fri Feb 15 21:52:30 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -26,6 +26,7 @@ CONFIG_GENERIC_TIME=y
26CONFIG_GENERIC_TIME_VSYSCALL=y 26CONFIG_GENERIC_TIME_VSYSCALL=y
27CONFIG_GENERIC_CLOCKEVENTS=y 27CONFIG_GENERIC_CLOCKEVENTS=y
28CONFIG_GENERIC_HARDIRQS=y 28CONFIG_GENERIC_HARDIRQS=y
29# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
29CONFIG_IRQ_PER_CPU=y 30CONFIG_IRQ_PER_CPU=y
30CONFIG_RWSEM_XCHGADD_ALGORITHM=y 31CONFIG_RWSEM_XCHGADD_ALGORITHM=y
31CONFIG_ARCH_HAS_ILOG2_U32=y 32CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -64,15 +65,18 @@ CONFIG_SYSVIPC_SYSCTL=y
64CONFIG_POSIX_MQUEUE=y 65CONFIG_POSIX_MQUEUE=y
65# CONFIG_BSD_PROCESS_ACCT is not set 66# CONFIG_BSD_PROCESS_ACCT is not set
66# CONFIG_TASKSTATS is not set 67# CONFIG_TASKSTATS is not set
67# CONFIG_USER_NS is not set
68# CONFIG_PID_NS is not set
69# CONFIG_AUDIT is not set 68# CONFIG_AUDIT is not set
70# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
72# CONFIG_CGROUPS is not set 71# CONFIG_CGROUPS is not set
72CONFIG_GROUP_SCHED=y
73# CONFIG_FAIR_GROUP_SCHED is not set 73# CONFIG_FAIR_GROUP_SCHED is not set
74# CONFIG_RT_GROUP_SCHED is not set
75CONFIG_USER_SCHED=y
76# CONFIG_CGROUP_SCHED is not set
74CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
75# CONFIG_RELAY is not set 78# CONFIG_RELAY is not set
79# CONFIG_NAMESPACES is not set
76CONFIG_BLK_DEV_INITRD=y 80CONFIG_BLK_DEV_INITRD=y
77CONFIG_INITRAMFS_SOURCE="" 81CONFIG_INITRAMFS_SOURCE=""
78# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -86,11 +90,13 @@ CONFIG_HOTPLUG=y
86CONFIG_PRINTK=y 90CONFIG_PRINTK=y
87CONFIG_BUG=y 91CONFIG_BUG=y
88CONFIG_ELF_CORE=y 92CONFIG_ELF_CORE=y
93CONFIG_COMPAT_BRK=y
89CONFIG_BASE_FULL=y 94CONFIG_BASE_FULL=y
90CONFIG_FUTEX=y 95CONFIG_FUTEX=y
91CONFIG_ANON_INODES=y 96CONFIG_ANON_INODES=y
92CONFIG_EPOLL=y 97CONFIG_EPOLL=y
93CONFIG_SIGNALFD=y 98CONFIG_SIGNALFD=y
99CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y 100CONFIG_EVENTFD=y
95CONFIG_SHMEM=y 101CONFIG_SHMEM=y
96CONFIG_VM_EVENT_COUNTERS=y 102CONFIG_VM_EVENT_COUNTERS=y
@@ -98,6 +104,13 @@ CONFIG_SLUB_DEBUG=y
98# CONFIG_SLAB is not set 104# CONFIG_SLAB is not set
99CONFIG_SLUB=y 105CONFIG_SLUB=y
100# CONFIG_SLOB is not set 106# CONFIG_SLOB is not set
107# CONFIG_PROFILING is not set
108# CONFIG_MARKERS is not set
109CONFIG_HAVE_OPROFILE=y
110# CONFIG_KPROBES is not set
111CONFIG_HAVE_KPROBES=y
112CONFIG_PROC_PAGE_MONITOR=y
113CONFIG_SLABINFO=y
101CONFIG_RT_MUTEXES=y 114CONFIG_RT_MUTEXES=y
102# CONFIG_TINY_SHMEM is not set 115# CONFIG_TINY_SHMEM is not set
103CONFIG_BASE_SMALL=0 116CONFIG_BASE_SMALL=0
@@ -125,13 +138,15 @@ CONFIG_DEFAULT_AS=y
125# CONFIG_DEFAULT_CFQ is not set 138# CONFIG_DEFAULT_CFQ is not set
126# CONFIG_DEFAULT_NOOP is not set 139# CONFIG_DEFAULT_NOOP is not set
127CONFIG_DEFAULT_IOSCHED="anticipatory" 140CONFIG_DEFAULT_IOSCHED="anticipatory"
141CONFIG_CLASSIC_RCU=y
142# CONFIG_PREEMPT_RCU is not set
128CONFIG_PPC4xx_PCI_EXPRESS=y 143CONFIG_PPC4xx_PCI_EXPRESS=y
129 144
130# 145#
131# Platform support 146# Platform support
132# 147#
133# CONFIG_PPC_MPC52xx is not set 148# CONFIG_PPC_MPC512x is not set
134# CONFIG_PPC_MPC5200 is not set 149# CONFIG_PPC_MPC5121 is not set
135# CONFIG_PPC_CELL is not set 150# CONFIG_PPC_CELL is not set
136# CONFIG_PPC_CELL_NATIVE is not set 151# CONFIG_PPC_CELL_NATIVE is not set
137# CONFIG_PQ2ADS is not set 152# CONFIG_PQ2ADS is not set
@@ -141,6 +156,7 @@ CONFIG_MAKALU=y
141# CONFIG_WALNUT is not set 156# CONFIG_WALNUT is not set
142# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set 157# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
143CONFIG_405EX=y 158CONFIG_405EX=y
159# CONFIG_IPIC is not set
144# CONFIG_MPIC is not set 160# CONFIG_MPIC is not set
145# CONFIG_MPIC_WEIRD is not set 161# CONFIG_MPIC_WEIRD is not set
146# CONFIG_PPC_I8259 is not set 162# CONFIG_PPC_I8259 is not set
@@ -151,7 +167,6 @@ CONFIG_405EX=y
151# CONFIG_PPC_INDIRECT_IO is not set 167# CONFIG_PPC_INDIRECT_IO is not set
152# CONFIG_GENERIC_IOMAP is not set 168# CONFIG_GENERIC_IOMAP is not set
153# CONFIG_CPU_FREQ is not set 169# CONFIG_CPU_FREQ is not set
154# CONFIG_CPM2 is not set
155# CONFIG_FSL_ULI1575 is not set 170# CONFIG_FSL_ULI1575 is not set
156 171
157# 172#
@@ -167,13 +182,18 @@ CONFIG_HZ_250=y
167# CONFIG_HZ_300 is not set 182# CONFIG_HZ_300 is not set
168# CONFIG_HZ_1000 is not set 183# CONFIG_HZ_1000 is not set
169CONFIG_HZ=250 184CONFIG_HZ=250
185# CONFIG_SCHED_HRTICK is not set
170CONFIG_PREEMPT_NONE=y 186CONFIG_PREEMPT_NONE=y
171# CONFIG_PREEMPT_VOLUNTARY is not set 187# CONFIG_PREEMPT_VOLUNTARY is not set
172# CONFIG_PREEMPT is not set 188# CONFIG_PREEMPT is not set
189CONFIG_RCU_TRACE=y
173CONFIG_BINFMT_ELF=y 190CONFIG_BINFMT_ELF=y
174# CONFIG_BINFMT_MISC is not set 191# CONFIG_BINFMT_MISC is not set
175# CONFIG_MATH_EMULATION is not set 192# CONFIG_MATH_EMULATION is not set
193# CONFIG_IOMMU_HELPER is not set
176CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 194CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
195CONFIG_ARCH_HAS_WALK_MEMORY=y
196CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
177CONFIG_ARCH_FLATMEM_ENABLE=y 197CONFIG_ARCH_FLATMEM_ENABLE=y
178CONFIG_ARCH_POPULATES_NODE_MAP=y 198CONFIG_ARCH_POPULATES_NODE_MAP=y
179CONFIG_SELECT_MEMORY_MODEL=y 199CONFIG_SELECT_MEMORY_MODEL=y
@@ -192,11 +212,7 @@ CONFIG_VIRT_TO_BUS=y
192CONFIG_PROC_DEVICETREE=y 212CONFIG_PROC_DEVICETREE=y
193# CONFIG_CMDLINE_BOOL is not set 213# CONFIG_CMDLINE_BOOL is not set
194# CONFIG_PM is not set 214# CONFIG_PM is not set
195CONFIG_SUSPEND_UP_POSSIBLE=y
196CONFIG_HIBERNATION_UP_POSSIBLE=y
197CONFIG_SECCOMP=y 215CONFIG_SECCOMP=y
198CONFIG_WANT_DEVICE_TREE=y
199CONFIG_DEVICE_TREE="kilauea.dts"
200CONFIG_ISA_DMA_API=y 216CONFIG_ISA_DMA_API=y
201 217
202# 218#
@@ -296,6 +312,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
296# 312#
297# CONFIG_NET_PKTGEN is not set 313# CONFIG_NET_PKTGEN is not set
298# CONFIG_HAMRADIO is not set 314# CONFIG_HAMRADIO is not set
315# CONFIG_CAN is not set
299# CONFIG_IRDA is not set 316# CONFIG_IRDA is not set
300# CONFIG_BT is not set 317# CONFIG_BT is not set
301# CONFIG_AF_RXRPC is not set 318# CONFIG_AF_RXRPC is not set
@@ -332,6 +349,7 @@ CONFIG_MTD=y
332CONFIG_MTD_PARTITIONS=y 349CONFIG_MTD_PARTITIONS=y
333# CONFIG_MTD_REDBOOT_PARTS is not set 350# CONFIG_MTD_REDBOOT_PARTS is not set
334CONFIG_MTD_CMDLINE_PARTS=y 351CONFIG_MTD_CMDLINE_PARTS=y
352CONFIG_MTD_OF_PARTS=y
335 353
336# 354#
337# User Modules And Translation Layers 355# User Modules And Translation Layers
@@ -418,11 +436,12 @@ CONFIG_BLK_DEV=y
418CONFIG_BLK_DEV_RAM=y 436CONFIG_BLK_DEV_RAM=y
419CONFIG_BLK_DEV_RAM_COUNT=16 437CONFIG_BLK_DEV_RAM_COUNT=16
420CONFIG_BLK_DEV_RAM_SIZE=35000 438CONFIG_BLK_DEV_RAM_SIZE=35000
421CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 439# CONFIG_BLK_DEV_XIP is not set
422# CONFIG_CDROM_PKTCDVD is not set 440# CONFIG_CDROM_PKTCDVD is not set
423# CONFIG_ATA_OVER_ETH is not set 441# CONFIG_ATA_OVER_ETH is not set
424# CONFIG_XILINX_SYSACE is not set 442# CONFIG_XILINX_SYSACE is not set
425# CONFIG_MISC_DEVICES is not set 443# CONFIG_MISC_DEVICES is not set
444CONFIG_HAVE_IDE=y
426# CONFIG_IDE is not set 445# CONFIG_IDE is not set
427 446
428# 447#
@@ -451,7 +470,6 @@ CONFIG_NETDEVICES=y
451# CONFIG_EQUALIZER is not set 470# CONFIG_EQUALIZER is not set
452# CONFIG_TUN is not set 471# CONFIG_TUN is not set
453# CONFIG_VETH is not set 472# CONFIG_VETH is not set
454# CONFIG_IP1000 is not set
455# CONFIG_ARCNET is not set 473# CONFIG_ARCNET is not set
456# CONFIG_PHYLIB is not set 474# CONFIG_PHYLIB is not set
457CONFIG_NET_ETHERNET=y 475CONFIG_NET_ETHERNET=y
@@ -489,7 +507,6 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y
489# CONFIG_HIPPI is not set 507# CONFIG_HIPPI is not set
490# CONFIG_PPP is not set 508# CONFIG_PPP is not set
491# CONFIG_SLIP is not set 509# CONFIG_SLIP is not set
492# CONFIG_SHAPER is not set
493# CONFIG_NETCONSOLE is not set 510# CONFIG_NETCONSOLE is not set
494# CONFIG_NETPOLL is not set 511# CONFIG_NETPOLL is not set
495# CONFIG_NET_POLL_CONTROLLER is not set 512# CONFIG_NET_POLL_CONTROLLER is not set
@@ -512,6 +529,7 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y
512# 529#
513# CONFIG_VT is not set 530# CONFIG_VT is not set
514# CONFIG_SERIAL_NONSTANDARD is not set 531# CONFIG_SERIAL_NONSTANDARD is not set
532# CONFIG_NOZOMI is not set
515 533
516# 534#
517# Serial drivers 535# Serial drivers
@@ -557,6 +575,7 @@ CONFIG_DEVPORT=y
557# CONFIG_W1 is not set 575# CONFIG_W1 is not set
558# CONFIG_POWER_SUPPLY is not set 576# CONFIG_POWER_SUPPLY is not set
559# CONFIG_HWMON is not set 577# CONFIG_HWMON is not set
578CONFIG_THERMAL=y
560# CONFIG_WATCHDOG is not set 579# CONFIG_WATCHDOG is not set
561 580
562# 581#
@@ -598,6 +617,7 @@ CONFIG_SSB_POSSIBLE=y
598# CONFIG_SOUND is not set 617# CONFIG_SOUND is not set
599# CONFIG_USB_SUPPORT is not set 618# CONFIG_USB_SUPPORT is not set
600# CONFIG_MMC is not set 619# CONFIG_MMC is not set
620# CONFIG_MEMSTICK is not set
601# CONFIG_NEW_LEDS is not set 621# CONFIG_NEW_LEDS is not set
602# CONFIG_INFINIBAND is not set 622# CONFIG_INFINIBAND is not set
603# CONFIG_EDAC is not set 623# CONFIG_EDAC is not set
@@ -622,12 +642,10 @@ CONFIG_EXT2_FS=y
622# CONFIG_XFS_FS is not set 642# CONFIG_XFS_FS is not set
623# CONFIG_GFS2_FS is not set 643# CONFIG_GFS2_FS is not set
624# CONFIG_OCFS2_FS is not set 644# CONFIG_OCFS2_FS is not set
625# CONFIG_MINIX_FS is not set 645CONFIG_DNOTIFY=y
626# CONFIG_ROMFS_FS is not set
627CONFIG_INOTIFY=y 646CONFIG_INOTIFY=y
628CONFIG_INOTIFY_USER=y 647CONFIG_INOTIFY_USER=y
629# CONFIG_QUOTA is not set 648# CONFIG_QUOTA is not set
630CONFIG_DNOTIFY=y
631# CONFIG_AUTOFS_FS is not set 649# CONFIG_AUTOFS_FS is not set
632# CONFIG_AUTOFS4_FS is not set 650# CONFIG_AUTOFS4_FS is not set
633# CONFIG_FUSE_FS is not set 651# CONFIG_FUSE_FS is not set
@@ -670,8 +688,10 @@ CONFIG_TMPFS=y
670# CONFIG_JFFS2_FS is not set 688# CONFIG_JFFS2_FS is not set
671CONFIG_CRAMFS=y 689CONFIG_CRAMFS=y
672# CONFIG_VXFS_FS is not set 690# CONFIG_VXFS_FS is not set
691# CONFIG_MINIX_FS is not set
673# CONFIG_HPFS_FS is not set 692# CONFIG_HPFS_FS is not set
674# CONFIG_QNX4FS_FS is not set 693# CONFIG_QNX4FS_FS is not set
694# CONFIG_ROMFS_FS is not set
675# CONFIG_SYSV_FS is not set 695# CONFIG_SYSV_FS is not set
676# CONFIG_UFS_FS is not set 696# CONFIG_UFS_FS is not set
677CONFIG_NETWORK_FILESYSTEMS=y 697CONFIG_NETWORK_FILESYSTEMS=y
@@ -702,7 +722,6 @@ CONFIG_SUNRPC=y
702CONFIG_MSDOS_PARTITION=y 722CONFIG_MSDOS_PARTITION=y
703# CONFIG_NLS is not set 723# CONFIG_NLS is not set
704# CONFIG_DLM is not set 724# CONFIG_DLM is not set
705# CONFIG_UCC_SLOW is not set
706 725
707# 726#
708# Library routines 727# Library routines
@@ -719,7 +738,6 @@ CONFIG_PLIST=y
719CONFIG_HAS_IOMEM=y 738CONFIG_HAS_IOMEM=y
720CONFIG_HAS_IOPORT=y 739CONFIG_HAS_IOPORT=y
721CONFIG_HAS_DMA=y 740CONFIG_HAS_DMA=y
722# CONFIG_INSTRUMENTATION is not set
723 741
724# 742#
725# Kernel hacking 743# Kernel hacking
@@ -729,7 +747,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
729CONFIG_ENABLE_MUST_CHECK=y 747CONFIG_ENABLE_MUST_CHECK=y
730CONFIG_MAGIC_SYSRQ=y 748CONFIG_MAGIC_SYSRQ=y
731# CONFIG_UNUSED_SYMBOLS is not set 749# CONFIG_UNUSED_SYMBOLS is not set
732# CONFIG_DEBUG_FS is not set 750CONFIG_DEBUG_FS=y
733# CONFIG_HEADERS_CHECK is not set 751# CONFIG_HEADERS_CHECK is not set
734CONFIG_DEBUG_KERNEL=y 752CONFIG_DEBUG_KERNEL=y
735# CONFIG_DEBUG_SHIRQ is not set 753# CONFIG_DEBUG_SHIRQ is not set
@@ -738,6 +756,7 @@ CONFIG_SCHED_DEBUG=y
738# CONFIG_SCHEDSTATS is not set 756# CONFIG_SCHEDSTATS is not set
739# CONFIG_TIMER_STATS is not set 757# CONFIG_TIMER_STATS is not set
740# CONFIG_SLUB_DEBUG_ON is not set 758# CONFIG_SLUB_DEBUG_ON is not set
759# CONFIG_SLUB_STATS is not set
741# CONFIG_DEBUG_RT_MUTEXES is not set 760# CONFIG_DEBUG_RT_MUTEXES is not set
742# CONFIG_RT_MUTEX_TESTER is not set 761# CONFIG_RT_MUTEX_TESTER is not set
743# CONFIG_DEBUG_SPINLOCK is not set 762# CONFIG_DEBUG_SPINLOCK is not set
@@ -750,15 +769,16 @@ CONFIG_DEBUG_BUGVERBOSE=y
750# CONFIG_DEBUG_VM is not set 769# CONFIG_DEBUG_VM is not set
751# CONFIG_DEBUG_LIST is not set 770# CONFIG_DEBUG_LIST is not set
752# CONFIG_DEBUG_SG is not set 771# CONFIG_DEBUG_SG is not set
753CONFIG_FORCED_INLINING=y
754# CONFIG_BOOT_PRINTK_DELAY is not set 772# CONFIG_BOOT_PRINTK_DELAY is not set
755# CONFIG_RCU_TORTURE_TEST is not set 773# CONFIG_RCU_TORTURE_TEST is not set
774# CONFIG_BACKTRACE_SELF_TEST is not set
756# CONFIG_FAULT_INJECTION is not set 775# CONFIG_FAULT_INJECTION is not set
757# CONFIG_SAMPLES is not set 776# CONFIG_SAMPLES is not set
758# CONFIG_DEBUG_STACKOVERFLOW is not set 777# CONFIG_DEBUG_STACKOVERFLOW is not set
759# CONFIG_DEBUG_STACK_USAGE is not set 778# CONFIG_DEBUG_STACK_USAGE is not set
760# CONFIG_DEBUG_PAGEALLOC is not set 779# CONFIG_DEBUG_PAGEALLOC is not set
761# CONFIG_DEBUGGER is not set 780# CONFIG_DEBUGGER is not set
781# CONFIG_VIRQ_DEBUG is not set
762# CONFIG_BDI_SWITCH is not set 782# CONFIG_BDI_SWITCH is not set
763# CONFIG_PPC_EARLY_DEBUG is not set 783# CONFIG_PPC_EARLY_DEBUG is not set
764 784
@@ -771,6 +791,7 @@ CONFIG_FORCED_INLINING=y
771CONFIG_CRYPTO=y 791CONFIG_CRYPTO=y
772CONFIG_CRYPTO_ALGAPI=y 792CONFIG_CRYPTO_ALGAPI=y
773CONFIG_CRYPTO_BLKCIPHER=y 793CONFIG_CRYPTO_BLKCIPHER=y
794# CONFIG_CRYPTO_SEQIV is not set
774CONFIG_CRYPTO_MANAGER=y 795CONFIG_CRYPTO_MANAGER=y
775# CONFIG_CRYPTO_HMAC is not set 796# CONFIG_CRYPTO_HMAC is not set
776# CONFIG_CRYPTO_XCBC is not set 797# CONFIG_CRYPTO_XCBC is not set
@@ -788,6 +809,9 @@ CONFIG_CRYPTO_CBC=y
788CONFIG_CRYPTO_PCBC=y 809CONFIG_CRYPTO_PCBC=y
789# CONFIG_CRYPTO_LRW is not set 810# CONFIG_CRYPTO_LRW is not set
790# CONFIG_CRYPTO_XTS is not set 811# CONFIG_CRYPTO_XTS is not set
812# CONFIG_CRYPTO_CTR is not set
813# CONFIG_CRYPTO_GCM is not set
814# CONFIG_CRYPTO_CCM is not set
791# CONFIG_CRYPTO_CRYPTD is not set 815# CONFIG_CRYPTO_CRYPTD is not set
792CONFIG_CRYPTO_DES=y 816CONFIG_CRYPTO_DES=y
793# CONFIG_CRYPTO_FCRYPT is not set 817# CONFIG_CRYPTO_FCRYPT is not set
@@ -802,11 +826,14 @@ CONFIG_CRYPTO_DES=y
802# CONFIG_CRYPTO_KHAZAD is not set 826# CONFIG_CRYPTO_KHAZAD is not set
803# CONFIG_CRYPTO_ANUBIS is not set 827# CONFIG_CRYPTO_ANUBIS is not set
804# CONFIG_CRYPTO_SEED is not set 828# CONFIG_CRYPTO_SEED is not set
829# CONFIG_CRYPTO_SALSA20 is not set
805# CONFIG_CRYPTO_DEFLATE is not set 830# CONFIG_CRYPTO_DEFLATE is not set
806# CONFIG_CRYPTO_MICHAEL_MIC is not set 831# CONFIG_CRYPTO_MICHAEL_MIC is not set
807# CONFIG_CRYPTO_CRC32C is not set 832# CONFIG_CRYPTO_CRC32C is not set
808# CONFIG_CRYPTO_CAMELLIA is not set 833# CONFIG_CRYPTO_CAMELLIA is not set
809# CONFIG_CRYPTO_TEST is not set 834# CONFIG_CRYPTO_TEST is not set
810# CONFIG_CRYPTO_AUTHENC is not set 835# CONFIG_CRYPTO_AUTHENC is not set
836# CONFIG_CRYPTO_LZO is not set
811CONFIG_CRYPTO_HW=y 837CONFIG_CRYPTO_HW=y
838# CONFIG_CRYPTO_DEV_HIFN_795X is not set
812# CONFIG_PPC_CLOCK is not set 839# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig
new file mode 100644
index 000000000000..57bd775ef777
--- /dev/null
+++ b/arch/powerpc/configs/ppc44x_defconfig
@@ -0,0 +1,904 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.25-rc2
4# Fri Feb 15 21:57:35 2008
5#
6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11# CONFIG_6xx is not set
12# CONFIG_PPC_85xx is not set
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15CONFIG_44x=y
16# CONFIG_E200 is not set
17CONFIG_PPC_FPU=y
18CONFIG_4xx=y
19CONFIG_BOOKE=y
20CONFIG_PTE_64BIT=y
21CONFIG_PHYS_64BIT=y
22# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y
27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
32CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
34CONFIG_IRQ_PER_CPU=y
35CONFIG_RWSEM_XCHGADD_ALGORITHM=y
36CONFIG_ARCH_HAS_ILOG2_U32=y
37CONFIG_GENERIC_HWEIGHT=y
38CONFIG_GENERIC_CALIBRATE_DELAY=y
39CONFIG_GENERIC_FIND_NEXT_BIT=y
40# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
41CONFIG_PPC=y
42CONFIG_EARLY_PRINTK=y
43CONFIG_GENERIC_NVRAM=y
44CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
46CONFIG_PPC_OF=y
47CONFIG_OF=y
48CONFIG_PPC_UDBG_16550=y
49# CONFIG_GENERIC_TBSYNC is not set
50CONFIG_AUDIT_ARCH=y
51CONFIG_GENERIC_BUG=y
52# CONFIG_DEFAULT_UIMAGE is not set
53CONFIG_PPC_DCR_NATIVE=y
54# CONFIG_PPC_DCR_MMIO is not set
55CONFIG_PPC_DCR=y
56CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
57
58#
59# General setup
60#
61CONFIG_EXPERIMENTAL=y
62CONFIG_BROKEN_ON_SMP=y
63CONFIG_INIT_ENV_ARG_LIMIT=32
64CONFIG_LOCALVERSION=""
65CONFIG_LOCALVERSION_AUTO=y
66CONFIG_SWAP=y
67CONFIG_SYSVIPC=y
68CONFIG_SYSVIPC_SYSCTL=y
69CONFIG_POSIX_MQUEUE=y
70# CONFIG_BSD_PROCESS_ACCT is not set
71# CONFIG_TASKSTATS is not set
72# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set
76CONFIG_GROUP_SCHED=y
77CONFIG_FAIR_GROUP_SCHED=y
78# CONFIG_RT_GROUP_SCHED is not set
79CONFIG_USER_SCHED=y
80# CONFIG_CGROUP_SCHED is not set
81CONFIG_SYSFS_DEPRECATED=y
82# CONFIG_RELAY is not set
83# CONFIG_NAMESPACES is not set
84CONFIG_BLK_DEV_INITRD=y
85CONFIG_INITRAMFS_SOURCE=""
86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
87CONFIG_SYSCTL=y
88CONFIG_EMBEDDED=y
89CONFIG_SYSCTL_SYSCALL=y
90CONFIG_KALLSYMS=y
91CONFIG_KALLSYMS_ALL=y
92CONFIG_KALLSYMS_EXTRA_PASS=y
93CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y
95CONFIG_BUG=y
96CONFIG_ELF_CORE=y
97CONFIG_COMPAT_BRK=y
98CONFIG_BASE_FULL=y
99CONFIG_FUTEX=y
100CONFIG_ANON_INODES=y
101CONFIG_EPOLL=y
102CONFIG_SIGNALFD=y
103CONFIG_TIMERFD=y
104CONFIG_EVENTFD=y
105CONFIG_SHMEM=y
106CONFIG_VM_EVENT_COUNTERS=y
107CONFIG_SLUB_DEBUG=y
108# CONFIG_SLAB is not set
109CONFIG_SLUB=y
110# CONFIG_SLOB is not set
111# CONFIG_PROFILING is not set
112# CONFIG_MARKERS is not set
113CONFIG_HAVE_OPROFILE=y
114# CONFIG_KPROBES is not set
115CONFIG_HAVE_KPROBES=y
116CONFIG_PROC_PAGE_MONITOR=y
117CONFIG_SLABINFO=y
118CONFIG_RT_MUTEXES=y
119# CONFIG_TINY_SHMEM is not set
120CONFIG_BASE_SMALL=0
121CONFIG_MODULES=y
122CONFIG_MODULE_UNLOAD=y
123# CONFIG_MODULE_FORCE_UNLOAD is not set
124# CONFIG_MODVERSIONS is not set
125# CONFIG_MODULE_SRCVERSION_ALL is not set
126CONFIG_KMOD=y
127CONFIG_BLOCK=y
128CONFIG_LBD=y
129# CONFIG_BLK_DEV_IO_TRACE is not set
130# CONFIG_LSF is not set
131# CONFIG_BLK_DEV_BSG is not set
132
133#
134# IO Schedulers
135#
136CONFIG_IOSCHED_NOOP=y
137CONFIG_IOSCHED_AS=y
138CONFIG_IOSCHED_DEADLINE=y
139CONFIG_IOSCHED_CFQ=y
140CONFIG_DEFAULT_AS=y
141# CONFIG_DEFAULT_DEADLINE is not set
142# CONFIG_DEFAULT_CFQ is not set
143# CONFIG_DEFAULT_NOOP is not set
144CONFIG_DEFAULT_IOSCHED="anticipatory"
145CONFIG_CLASSIC_RCU=y
146# CONFIG_PREEMPT_RCU is not set
147CONFIG_PPC4xx_PCI_EXPRESS=y
148
149#
150# Platform support
151#
152# CONFIG_PPC_MPC512x is not set
153# CONFIG_PPC_MPC5121 is not set
154# CONFIG_PPC_CELL is not set
155# CONFIG_PPC_CELL_NATIVE is not set
156# CONFIG_PQ2ADS is not set
157CONFIG_BAMBOO=y
158CONFIG_EBONY=y
159CONFIG_SEQUOIA=y
160CONFIG_TAISHAN=y
161CONFIG_KATMAI=y
162CONFIG_RAINIER=y
163CONFIG_WARP=y
164CONFIG_440EP=y
165CONFIG_440EPX=y
166CONFIG_440GRX=y
167CONFIG_440GP=y
168CONFIG_440GX=y
169CONFIG_440SPe=y
170CONFIG_IBM440EP_ERR42=y
171# CONFIG_IPIC is not set
172# CONFIG_MPIC is not set
173# CONFIG_MPIC_WEIRD is not set
174# CONFIG_PPC_I8259 is not set
175# CONFIG_PPC_RTAS is not set
176# CONFIG_MMIO_NVRAM is not set
177# CONFIG_PPC_MPC106 is not set
178# CONFIG_PPC_970_NAP is not set
179# CONFIG_PPC_INDIRECT_IO is not set
180# CONFIG_GENERIC_IOMAP is not set
181# CONFIG_CPU_FREQ is not set
182# CONFIG_FSL_ULI1575 is not set
183CONFIG_OF_RTC=y
184
185#
186# Kernel options
187#
188# CONFIG_HIGHMEM is not set
189# CONFIG_TICK_ONESHOT is not set
190# CONFIG_NO_HZ is not set
191# CONFIG_HIGH_RES_TIMERS is not set
192CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
193# CONFIG_HZ_100 is not set
194CONFIG_HZ_250=y
195# CONFIG_HZ_300 is not set
196# CONFIG_HZ_1000 is not set
197CONFIG_HZ=250
198# CONFIG_SCHED_HRTICK is not set
199CONFIG_PREEMPT_NONE=y
200# CONFIG_PREEMPT_VOLUNTARY is not set
201# CONFIG_PREEMPT is not set
202# CONFIG_RCU_TRACE is not set
203CONFIG_BINFMT_ELF=y
204# CONFIG_BINFMT_MISC is not set
205CONFIG_MATH_EMULATION=y
206# CONFIG_IOMMU_HELPER is not set
207CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
208CONFIG_ARCH_HAS_WALK_MEMORY=y
209CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
210CONFIG_ARCH_FLATMEM_ENABLE=y
211CONFIG_ARCH_POPULATES_NODE_MAP=y
212CONFIG_SELECT_MEMORY_MODEL=y
213CONFIG_FLATMEM_MANUAL=y
214# CONFIG_DISCONTIGMEM_MANUAL is not set
215# CONFIG_SPARSEMEM_MANUAL is not set
216CONFIG_FLATMEM=y
217CONFIG_FLAT_NODE_MEM_MAP=y
218# CONFIG_SPARSEMEM_STATIC is not set
219# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
220CONFIG_SPLIT_PTLOCK_CPUS=4
221CONFIG_RESOURCES_64BIT=y
222CONFIG_ZONE_DMA_FLAG=1
223CONFIG_BOUNCE=y
224CONFIG_VIRT_TO_BUS=y
225CONFIG_PROC_DEVICETREE=y
226# CONFIG_CMDLINE_BOOL is not set
227CONFIG_SECCOMP=y
228CONFIG_ISA_DMA_API=y
229
230#
231# Bus options
232#
233CONFIG_ZONE_DMA=y
234CONFIG_PPC_INDIRECT_PCI=y
235CONFIG_PCI=y
236CONFIG_PCI_DOMAINS=y
237CONFIG_PCI_SYSCALL=y
238# CONFIG_PCIEPORTBUS is not set
239CONFIG_ARCH_SUPPORTS_MSI=y
240# CONFIG_PCI_MSI is not set
241CONFIG_PCI_LEGACY=y
242# CONFIG_PCI_DEBUG is not set
243# CONFIG_PCCARD is not set
244# CONFIG_HOTPLUG_PCI is not set
245
246#
247# Advanced setup
248#
249# CONFIG_ADVANCED_OPTIONS is not set
250
251#
252# Default settings for advanced configuration options are used
253#
254CONFIG_HIGHMEM_START=0xfe000000
255CONFIG_LOWMEM_SIZE=0x30000000
256CONFIG_KERNEL_START=0xc0000000
257CONFIG_TASK_SIZE=0xc0000000
258CONFIG_CONSISTENT_START=0xff100000
259CONFIG_CONSISTENT_SIZE=0x00200000
260CONFIG_BOOT_LOAD=0x01000000
261
262#
263# Networking
264#
265CONFIG_NET=y
266
267#
268# Networking options
269#
270CONFIG_PACKET=y
271# CONFIG_PACKET_MMAP is not set
272CONFIG_UNIX=y
273# CONFIG_NET_KEY is not set
274CONFIG_INET=y
275# CONFIG_IP_MULTICAST is not set
276# CONFIG_IP_ADVANCED_ROUTER is not set
277CONFIG_IP_FIB_HASH=y
278CONFIG_IP_PNP=y
279CONFIG_IP_PNP_DHCP=y
280CONFIG_IP_PNP_BOOTP=y
281# CONFIG_IP_PNP_RARP is not set
282# CONFIG_NET_IPIP is not set
283# CONFIG_NET_IPGRE is not set
284# CONFIG_ARPD is not set
285# CONFIG_SYN_COOKIES is not set
286# CONFIG_INET_AH is not set
287# CONFIG_INET_ESP is not set
288# CONFIG_INET_IPCOMP is not set
289# CONFIG_INET_XFRM_TUNNEL is not set
290# CONFIG_INET_TUNNEL is not set
291# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
292# CONFIG_INET_XFRM_MODE_TUNNEL is not set
293# CONFIG_INET_XFRM_MODE_BEET is not set
294# CONFIG_INET_LRO is not set
295CONFIG_INET_DIAG=y
296CONFIG_INET_TCP_DIAG=y
297# CONFIG_TCP_CONG_ADVANCED is not set
298CONFIG_TCP_CONG_CUBIC=y
299CONFIG_DEFAULT_TCP_CONG="cubic"
300# CONFIG_TCP_MD5SIG is not set
301# CONFIG_IPV6 is not set
302# CONFIG_INET6_XFRM_TUNNEL is not set
303# CONFIG_INET6_TUNNEL is not set
304# CONFIG_NETWORK_SECMARK is not set
305# CONFIG_NETFILTER is not set
306# CONFIG_IP_DCCP is not set
307# CONFIG_IP_SCTP is not set
308# CONFIG_TIPC is not set
309# CONFIG_ATM is not set
310# CONFIG_BRIDGE is not set
311# CONFIG_VLAN_8021Q is not set
312# CONFIG_DECNET is not set
313# CONFIG_LLC2 is not set
314# CONFIG_IPX is not set
315# CONFIG_ATALK is not set
316# CONFIG_X25 is not set
317# CONFIG_LAPB is not set
318# CONFIG_ECONET is not set
319# CONFIG_WAN_ROUTER is not set
320# CONFIG_NET_SCHED is not set
321
322#
323# Network testing
324#
325# CONFIG_NET_PKTGEN is not set
326# CONFIG_HAMRADIO is not set
327# CONFIG_CAN is not set
328# CONFIG_IRDA is not set
329# CONFIG_BT is not set
330# CONFIG_AF_RXRPC is not set
331
332#
333# Wireless
334#
335# CONFIG_CFG80211 is not set
336# CONFIG_WIRELESS_EXT is not set
337# CONFIG_MAC80211 is not set
338# CONFIG_IEEE80211 is not set
339# CONFIG_RFKILL is not set
340# CONFIG_NET_9P is not set
341
342#
343# Device Drivers
344#
345
346#
347# Generic Driver Options
348#
349CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
350CONFIG_STANDALONE=y
351CONFIG_PREVENT_FIRMWARE_BUILD=y
352CONFIG_FW_LOADER=y
353# CONFIG_DEBUG_DRIVER is not set
354# CONFIG_DEBUG_DEVRES is not set
355# CONFIG_SYS_HYPERVISOR is not set
356CONFIG_CONNECTOR=y
357CONFIG_PROC_EVENTS=y
358CONFIG_MTD=y
359# CONFIG_MTD_DEBUG is not set
360# CONFIG_MTD_CONCAT is not set
361CONFIG_MTD_PARTITIONS=y
362# CONFIG_MTD_REDBOOT_PARTS is not set
363# CONFIG_MTD_CMDLINE_PARTS is not set
364CONFIG_MTD_OF_PARTS=y
365
366#
367# User Modules And Translation Layers
368#
369CONFIG_MTD_CHAR=y
370CONFIG_MTD_BLKDEVS=y
371CONFIG_MTD_BLOCK=y
372# CONFIG_FTL is not set
373# CONFIG_NFTL is not set
374# CONFIG_INFTL is not set
375# CONFIG_RFD_FTL is not set
376# CONFIG_SSFDC is not set
377# CONFIG_MTD_OOPS is not set
378
379#
380# RAM/ROM/Flash chip drivers
381#
382CONFIG_MTD_CFI=y
383CONFIG_MTD_JEDECPROBE=y
384CONFIG_MTD_GEN_PROBE=y
385# CONFIG_MTD_CFI_ADV_OPTIONS is not set
386CONFIG_MTD_MAP_BANK_WIDTH_1=y
387CONFIG_MTD_MAP_BANK_WIDTH_2=y
388CONFIG_MTD_MAP_BANK_WIDTH_4=y
389# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
390# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
391# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
392CONFIG_MTD_CFI_I1=y
393CONFIG_MTD_CFI_I2=y
394# CONFIG_MTD_CFI_I4 is not set
395# CONFIG_MTD_CFI_I8 is not set
396# CONFIG_MTD_CFI_INTELEXT is not set
397CONFIG_MTD_CFI_AMDSTD=y
398# CONFIG_MTD_CFI_STAA is not set
399CONFIG_MTD_CFI_UTIL=y
400# CONFIG_MTD_RAM is not set
401# CONFIG_MTD_ROM is not set
402# CONFIG_MTD_ABSENT is not set
403
404#
405# Mapping drivers for chip access
406#
407# CONFIG_MTD_COMPLEX_MAPPINGS is not set
408# CONFIG_MTD_PHYSMAP is not set
409CONFIG_MTD_PHYSMAP_OF=y
410# CONFIG_MTD_INTEL_VR_NOR is not set
411# CONFIG_MTD_PLATRAM is not set
412
413#
414# Self-contained MTD device drivers
415#
416# CONFIG_MTD_PMC551 is not set
417# CONFIG_MTD_SLRAM is not set
418# CONFIG_MTD_PHRAM is not set
419# CONFIG_MTD_MTDRAM is not set
420# CONFIG_MTD_BLOCK2MTD is not set
421
422#
423# Disk-On-Chip Device Drivers
424#
425# CONFIG_MTD_DOC2000 is not set
426# CONFIG_MTD_DOC2001 is not set
427# CONFIG_MTD_DOC2001PLUS is not set
428# CONFIG_MTD_NAND is not set
429# CONFIG_MTD_ONENAND is not set
430
431#
432# UBI - Unsorted block images
433#
434# CONFIG_MTD_UBI is not set
435CONFIG_OF_DEVICE=y
436# CONFIG_PARPORT is not set
437CONFIG_BLK_DEV=y
438# CONFIG_BLK_DEV_FD is not set
439# CONFIG_BLK_CPQ_DA is not set
440# CONFIG_BLK_CPQ_CISS_DA is not set
441# CONFIG_BLK_DEV_DAC960 is not set
442# CONFIG_BLK_DEV_UMEM is not set
443# CONFIG_BLK_DEV_COW_COMMON is not set
444# CONFIG_BLK_DEV_LOOP is not set
445# CONFIG_BLK_DEV_NBD is not set
446# CONFIG_BLK_DEV_SX8 is not set
447CONFIG_BLK_DEV_RAM=y
448CONFIG_BLK_DEV_RAM_COUNT=16
449CONFIG_BLK_DEV_RAM_SIZE=35000
450# CONFIG_BLK_DEV_XIP is not set
451# CONFIG_CDROM_PKTCDVD is not set
452# CONFIG_ATA_OVER_ETH is not set
453# CONFIG_XILINX_SYSACE is not set
454CONFIG_MISC_DEVICES=y
455# CONFIG_PHANTOM is not set
456# CONFIG_EEPROM_93CX6 is not set
457# CONFIG_SGI_IOC4 is not set
458# CONFIG_TIFM_CORE is not set
459# CONFIG_ENCLOSURE_SERVICES is not set
460CONFIG_HAVE_IDE=y
461# CONFIG_IDE is not set
462
463#
464# SCSI device support
465#
466# CONFIG_RAID_ATTRS is not set
467# CONFIG_SCSI is not set
468# CONFIG_SCSI_DMA is not set
469# CONFIG_SCSI_NETLINK is not set
470# CONFIG_ATA is not set
471# CONFIG_MD is not set
472# CONFIG_FUSION is not set
473
474#
475# IEEE 1394 (FireWire) support
476#
477# CONFIG_FIREWIRE is not set
478# CONFIG_IEEE1394 is not set
479# CONFIG_I2O is not set
480# CONFIG_MACINTOSH_DRIVERS is not set
481CONFIG_NETDEVICES=y
482# CONFIG_NETDEVICES_MULTIQUEUE is not set
483# CONFIG_DUMMY is not set
484# CONFIG_BONDING is not set
485# CONFIG_MACVLAN is not set
486# CONFIG_EQUALIZER is not set
487# CONFIG_TUN is not set
488# CONFIG_VETH is not set
489# CONFIG_ARCNET is not set
490# CONFIG_PHYLIB is not set
491CONFIG_NET_ETHERNET=y
492# CONFIG_MII is not set
493# CONFIG_HAPPYMEAL is not set
494# CONFIG_SUNGEM is not set
495# CONFIG_CASSINI is not set
496# CONFIG_NET_VENDOR_3COM is not set
497# CONFIG_NET_TULIP is not set
498# CONFIG_HP100 is not set
499CONFIG_IBM_NEW_EMAC=y
500CONFIG_IBM_NEW_EMAC_RXB=128
501CONFIG_IBM_NEW_EMAC_TXB=64
502CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
503CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
504CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
505# CONFIG_IBM_NEW_EMAC_DEBUG is not set
506CONFIG_IBM_NEW_EMAC_ZMII=y
507CONFIG_IBM_NEW_EMAC_RGMII=y
508CONFIG_IBM_NEW_EMAC_TAH=y
509CONFIG_IBM_NEW_EMAC_EMAC4=y
510# CONFIG_NET_PCI is not set
511# CONFIG_B44 is not set
512CONFIG_NETDEV_1000=y
513# CONFIG_ACENIC is not set
514# CONFIG_DL2K is not set
515# CONFIG_E1000 is not set
516# CONFIG_E1000E is not set
517# CONFIG_E1000E_ENABLED is not set
518# CONFIG_IP1000 is not set
519# CONFIG_IGB is not set
520# CONFIG_NS83820 is not set
521# CONFIG_HAMACHI is not set
522# CONFIG_YELLOWFIN is not set
523# CONFIG_R8169 is not set
524# CONFIG_SIS190 is not set
525# CONFIG_SKGE is not set
526# CONFIG_SKY2 is not set
527# CONFIG_SK98LIN is not set
528# CONFIG_VIA_VELOCITY is not set
529# CONFIG_TIGON3 is not set
530# CONFIG_BNX2 is not set
531# CONFIG_QLA3XXX is not set
532# CONFIG_ATL1 is not set
533CONFIG_NETDEV_10000=y
534# CONFIG_CHELSIO_T1 is not set
535# CONFIG_CHELSIO_T3 is not set
536# CONFIG_IXGBE is not set
537# CONFIG_IXGB is not set
538# CONFIG_S2IO is not set
539# CONFIG_MYRI10GE is not set
540# CONFIG_NETXEN_NIC is not set
541# CONFIG_NIU is not set
542# CONFIG_MLX4_CORE is not set
543# CONFIG_TEHUTI is not set
544# CONFIG_BNX2X is not set
545# CONFIG_TR is not set
546
547#
548# Wireless LAN
549#
550# CONFIG_WLAN_PRE80211 is not set
551# CONFIG_WLAN_80211 is not set
552# CONFIG_WAN is not set
553# CONFIG_FDDI is not set
554# CONFIG_HIPPI is not set
555# CONFIG_PPP is not set
556# CONFIG_SLIP is not set
557# CONFIG_NETCONSOLE is not set
558# CONFIG_NETPOLL is not set
559# CONFIG_NET_POLL_CONTROLLER is not set
560# CONFIG_ISDN is not set
561# CONFIG_PHONE is not set
562
563#
564# Input device support
565#
566# CONFIG_INPUT is not set
567
568#
569# Hardware I/O ports
570#
571# CONFIG_SERIO is not set
572# CONFIG_GAMEPORT is not set
573
574#
575# Character devices
576#
577# CONFIG_VT is not set
578# CONFIG_SERIAL_NONSTANDARD is not set
579# CONFIG_NOZOMI is not set
580
581#
582# Serial drivers
583#
584CONFIG_SERIAL_8250=y
585CONFIG_SERIAL_8250_CONSOLE=y
586# CONFIG_SERIAL_8250_PCI is not set
587CONFIG_SERIAL_8250_NR_UARTS=4
588CONFIG_SERIAL_8250_RUNTIME_UARTS=4
589CONFIG_SERIAL_8250_EXTENDED=y
590# CONFIG_SERIAL_8250_MANY_PORTS is not set
591CONFIG_SERIAL_8250_SHARE_IRQ=y
592# CONFIG_SERIAL_8250_DETECT_IRQ is not set
593# CONFIG_SERIAL_8250_RSA is not set
594
595#
596# Non-8250 serial port support
597#
598# CONFIG_SERIAL_UARTLITE is not set
599CONFIG_SERIAL_CORE=y
600CONFIG_SERIAL_CORE_CONSOLE=y
601# CONFIG_SERIAL_JSM is not set
602CONFIG_SERIAL_OF_PLATFORM=y
603CONFIG_UNIX98_PTYS=y
604CONFIG_LEGACY_PTYS=y
605CONFIG_LEGACY_PTY_COUNT=256
606# CONFIG_IPMI_HANDLER is not set
607# CONFIG_HW_RANDOM is not set
608# CONFIG_NVRAM is not set
609# CONFIG_GEN_RTC is not set
610# CONFIG_R3964 is not set
611# CONFIG_APPLICOM is not set
612# CONFIG_RAW_DRIVER is not set
613# CONFIG_TCG_TPM is not set
614CONFIG_DEVPORT=y
615# CONFIG_I2C is not set
616
617#
618# SPI support
619#
620# CONFIG_SPI is not set
621# CONFIG_SPI_MASTER is not set
622# CONFIG_W1 is not set
623# CONFIG_POWER_SUPPLY is not set
624# CONFIG_HWMON is not set
625# CONFIG_THERMAL is not set
626# CONFIG_WATCHDOG is not set
627
628#
629# Sonics Silicon Backplane
630#
631CONFIG_SSB_POSSIBLE=y
632# CONFIG_SSB is not set
633
634#
635# Multifunction device drivers
636#
637# CONFIG_MFD_SM501 is not set
638
639#
640# Multimedia devices
641#
642# CONFIG_VIDEO_DEV is not set
643# CONFIG_DVB_CORE is not set
644# CONFIG_DAB is not set
645
646#
647# Graphics support
648#
649# CONFIG_AGP is not set
650# CONFIG_DRM is not set
651# CONFIG_VGASTATE is not set
652# CONFIG_VIDEO_OUTPUT_CONTROL is not set
653# CONFIG_FB is not set
654# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
655
656#
657# Display device support
658#
659# CONFIG_DISPLAY_SUPPORT is not set
660
661#
662# Sound
663#
664# CONFIG_SOUND is not set
665CONFIG_USB_SUPPORT=y
666CONFIG_USB_ARCH_HAS_HCD=y
667CONFIG_USB_ARCH_HAS_OHCI=y
668CONFIG_USB_ARCH_HAS_EHCI=y
669# CONFIG_USB is not set
670
671#
672# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
673#
674# CONFIG_USB_GADGET is not set
675# CONFIG_MMC is not set
676# CONFIG_MEMSTICK is not set
677# CONFIG_NEW_LEDS is not set
678# CONFIG_INFINIBAND is not set
679# CONFIG_EDAC is not set
680# CONFIG_RTC_CLASS is not set
681
682#
683# Userspace I/O
684#
685# CONFIG_UIO is not set
686
687#
688# File systems
689#
690CONFIG_EXT2_FS=y
691# CONFIG_EXT2_FS_XATTR is not set
692# CONFIG_EXT2_FS_XIP is not set
693# CONFIG_EXT3_FS is not set
694# CONFIG_EXT4DEV_FS is not set
695# CONFIG_REISERFS_FS is not set
696# CONFIG_JFS_FS is not set
697# CONFIG_FS_POSIX_ACL is not set
698# CONFIG_XFS_FS is not set
699# CONFIG_GFS2_FS is not set
700# CONFIG_OCFS2_FS is not set
701CONFIG_DNOTIFY=y
702CONFIG_INOTIFY=y
703CONFIG_INOTIFY_USER=y
704# CONFIG_QUOTA is not set
705# CONFIG_AUTOFS_FS is not set
706# CONFIG_AUTOFS4_FS is not set
707# CONFIG_FUSE_FS is not set
708
709#
710# CD-ROM/DVD Filesystems
711#
712# CONFIG_ISO9660_FS is not set
713# CONFIG_UDF_FS is not set
714
715#
716# DOS/FAT/NT Filesystems
717#
718# CONFIG_MSDOS_FS is not set
719# CONFIG_VFAT_FS is not set
720# CONFIG_NTFS_FS is not set
721
722#
723# Pseudo filesystems
724#
725CONFIG_PROC_FS=y
726CONFIG_PROC_KCORE=y
727CONFIG_PROC_SYSCTL=y
728CONFIG_SYSFS=y
729CONFIG_TMPFS=y
730# CONFIG_TMPFS_POSIX_ACL is not set
731# CONFIG_HUGETLB_PAGE is not set
732# CONFIG_CONFIGFS_FS is not set
733
734#
735# Miscellaneous filesystems
736#
737# CONFIG_ADFS_FS is not set
738# CONFIG_AFFS_FS is not set
739# CONFIG_HFS_FS is not set
740# CONFIG_HFSPLUS_FS is not set
741# CONFIG_BEFS_FS is not set
742# CONFIG_BFS_FS is not set
743# CONFIG_EFS_FS is not set
744CONFIG_JFFS2_FS=y
745CONFIG_JFFS2_FS_DEBUG=0
746CONFIG_JFFS2_FS_WRITEBUFFER=y
747# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
748# CONFIG_JFFS2_SUMMARY is not set
749# CONFIG_JFFS2_FS_XATTR is not set
750# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
751CONFIG_JFFS2_ZLIB=y
752# CONFIG_JFFS2_LZO is not set
753CONFIG_JFFS2_RTIME=y
754# CONFIG_JFFS2_RUBIN is not set
755CONFIG_CRAMFS=y
756# CONFIG_VXFS_FS is not set
757# CONFIG_MINIX_FS is not set
758# CONFIG_HPFS_FS is not set
759# CONFIG_QNX4FS_FS is not set
760# CONFIG_ROMFS_FS is not set
761# CONFIG_SYSV_FS is not set
762# CONFIG_UFS_FS is not set
763CONFIG_NETWORK_FILESYSTEMS=y
764CONFIG_NFS_FS=y
765CONFIG_NFS_V3=y
766# CONFIG_NFS_V3_ACL is not set
767# CONFIG_NFS_V4 is not set
768# CONFIG_NFS_DIRECTIO is not set
769# CONFIG_NFSD is not set
770CONFIG_ROOT_NFS=y
771CONFIG_LOCKD=y
772CONFIG_LOCKD_V4=y
773CONFIG_NFS_COMMON=y
774CONFIG_SUNRPC=y
775# CONFIG_SUNRPC_BIND34 is not set
776# CONFIG_RPCSEC_GSS_KRB5 is not set
777# CONFIG_RPCSEC_GSS_SPKM3 is not set
778# CONFIG_SMB_FS is not set
779# CONFIG_CIFS is not set
780# CONFIG_NCP_FS is not set
781# CONFIG_CODA_FS is not set
782# CONFIG_AFS_FS is not set
783
784#
785# Partition Types
786#
787# CONFIG_PARTITION_ADVANCED is not set
788CONFIG_MSDOS_PARTITION=y
789# CONFIG_NLS is not set
790# CONFIG_DLM is not set
791
792#
793# Library routines
794#
795CONFIG_BITREVERSE=y
796# CONFIG_CRC_CCITT is not set
797# CONFIG_CRC16 is not set
798# CONFIG_CRC_ITU_T is not set
799CONFIG_CRC32=y
800# CONFIG_CRC7 is not set
801# CONFIG_LIBCRC32C is not set
802CONFIG_ZLIB_INFLATE=y
803CONFIG_ZLIB_DEFLATE=y
804CONFIG_PLIST=y
805CONFIG_HAS_IOMEM=y
806CONFIG_HAS_IOPORT=y
807CONFIG_HAS_DMA=y
808
809#
810# Kernel hacking
811#
812# CONFIG_PRINTK_TIME is not set
813CONFIG_ENABLE_WARN_DEPRECATED=y
814CONFIG_ENABLE_MUST_CHECK=y
815CONFIG_MAGIC_SYSRQ=y
816# CONFIG_UNUSED_SYMBOLS is not set
817# CONFIG_DEBUG_FS is not set
818# CONFIG_HEADERS_CHECK is not set
819CONFIG_DEBUG_KERNEL=y
820# CONFIG_DEBUG_SHIRQ is not set
821CONFIG_DETECT_SOFTLOCKUP=y
822CONFIG_SCHED_DEBUG=y
823# CONFIG_SCHEDSTATS is not set
824# CONFIG_TIMER_STATS is not set
825# CONFIG_SLUB_DEBUG_ON is not set
826# CONFIG_SLUB_STATS is not set
827# CONFIG_DEBUG_RT_MUTEXES is not set
828# CONFIG_RT_MUTEX_TESTER is not set
829# CONFIG_DEBUG_SPINLOCK is not set
830# CONFIG_DEBUG_MUTEXES is not set
831# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
832# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
833# CONFIG_DEBUG_KOBJECT is not set
834CONFIG_DEBUG_BUGVERBOSE=y
835# CONFIG_DEBUG_INFO is not set
836# CONFIG_DEBUG_VM is not set
837# CONFIG_DEBUG_LIST is not set
838# CONFIG_DEBUG_SG is not set
839# CONFIG_BOOT_PRINTK_DELAY is not set
840# CONFIG_RCU_TORTURE_TEST is not set
841# CONFIG_BACKTRACE_SELF_TEST is not set
842# CONFIG_FAULT_INJECTION is not set
843# CONFIG_SAMPLES is not set
844# CONFIG_DEBUG_STACKOVERFLOW is not set
845# CONFIG_DEBUG_STACK_USAGE is not set
846# CONFIG_DEBUG_PAGEALLOC is not set
847# CONFIG_DEBUGGER is not set
848# CONFIG_BDI_SWITCH is not set
849# CONFIG_PPC_EARLY_DEBUG is not set
850
851#
852# Security options
853#
854# CONFIG_KEYS is not set
855# CONFIG_SECURITY is not set
856# CONFIG_SECURITY_FILE_CAPABILITIES is not set
857CONFIG_CRYPTO=y
858CONFIG_CRYPTO_ALGAPI=y
859CONFIG_CRYPTO_BLKCIPHER=y
860# CONFIG_CRYPTO_SEQIV is not set
861CONFIG_CRYPTO_MANAGER=y
862# CONFIG_CRYPTO_HMAC is not set
863# CONFIG_CRYPTO_XCBC is not set
864# CONFIG_CRYPTO_NULL is not set
865# CONFIG_CRYPTO_MD4 is not set
866CONFIG_CRYPTO_MD5=y
867# CONFIG_CRYPTO_SHA1 is not set
868# CONFIG_CRYPTO_SHA256 is not set
869# CONFIG_CRYPTO_SHA512 is not set
870# CONFIG_CRYPTO_WP512 is not set
871# CONFIG_CRYPTO_TGR192 is not set
872# CONFIG_CRYPTO_GF128MUL is not set
873CONFIG_CRYPTO_ECB=y
874CONFIG_CRYPTO_CBC=y
875CONFIG_CRYPTO_PCBC=y
876# CONFIG_CRYPTO_LRW is not set
877# CONFIG_CRYPTO_XTS is not set
878# CONFIG_CRYPTO_CTR is not set
879# CONFIG_CRYPTO_GCM is not set
880# CONFIG_CRYPTO_CCM is not set
881# CONFIG_CRYPTO_CRYPTD is not set
882CONFIG_CRYPTO_DES=y
883# CONFIG_CRYPTO_FCRYPT is not set
884# CONFIG_CRYPTO_BLOWFISH is not set
885# CONFIG_CRYPTO_TWOFISH is not set
886# CONFIG_CRYPTO_SERPENT is not set
887# CONFIG_CRYPTO_AES is not set
888# CONFIG_CRYPTO_CAST5 is not set
889# CONFIG_CRYPTO_CAST6 is not set
890# CONFIG_CRYPTO_TEA is not set
891# CONFIG_CRYPTO_ARC4 is not set
892# CONFIG_CRYPTO_KHAZAD is not set
893# CONFIG_CRYPTO_ANUBIS is not set
894# CONFIG_CRYPTO_SEED is not set
895# CONFIG_CRYPTO_SALSA20 is not set
896# CONFIG_CRYPTO_DEFLATE is not set
897# CONFIG_CRYPTO_MICHAEL_MIC is not set
898# CONFIG_CRYPTO_CRC32C is not set
899# CONFIG_CRYPTO_CAMELLIA is not set
900# CONFIG_CRYPTO_TEST is not set
901# CONFIG_CRYPTO_AUTHENC is not set
902# CONFIG_CRYPTO_LZO is not set
903# CONFIG_CRYPTO_HW is not set
904# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/rainier_defconfig b/arch/powerpc/configs/rainier_defconfig
index 7b95001a22a8..dec18ca73519 100644
--- a/arch/powerpc/configs/rainier_defconfig
+++ b/arch/powerpc/configs/rainier_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc6 3# Linux kernel version: 2.6.25-rc2
4# Mon Dec 24 11:22:40 2007 4# Fri Feb 15 21:53:10 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -29,6 +29,7 @@ CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y 29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y 30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
32CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
33CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
34CONFIG_ARCH_HAS_ILOG2_U32=y 35CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -67,17 +68,18 @@ CONFIG_SYSVIPC_SYSCTL=y
67CONFIG_POSIX_MQUEUE=y 68CONFIG_POSIX_MQUEUE=y
68# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
69# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
72# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set 74# CONFIG_CGROUPS is not set
75CONFIG_GROUP_SCHED=y
76CONFIG_FAIR_GROUP_SCHED=y 76CONFIG_FAIR_GROUP_SCHED=y
77CONFIG_FAIR_USER_SCHED=y 77# CONFIG_RT_GROUP_SCHED is not set
78# CONFIG_FAIR_CGROUP_SCHED is not set 78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set
79CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
80# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
81CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
82CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -91,11 +93,13 @@ CONFIG_HOTPLUG=y
91CONFIG_PRINTK=y 93CONFIG_PRINTK=y
92CONFIG_BUG=y 94CONFIG_BUG=y
93CONFIG_ELF_CORE=y 95CONFIG_ELF_CORE=y
96CONFIG_COMPAT_BRK=y
94CONFIG_BASE_FULL=y 97CONFIG_BASE_FULL=y
95CONFIG_FUTEX=y 98CONFIG_FUTEX=y
96CONFIG_ANON_INODES=y 99CONFIG_ANON_INODES=y
97CONFIG_EPOLL=y 100CONFIG_EPOLL=y
98CONFIG_SIGNALFD=y 101CONFIG_SIGNALFD=y
102CONFIG_TIMERFD=y
99CONFIG_EVENTFD=y 103CONFIG_EVENTFD=y
100CONFIG_SHMEM=y 104CONFIG_SHMEM=y
101CONFIG_VM_EVENT_COUNTERS=y 105CONFIG_VM_EVENT_COUNTERS=y
@@ -103,6 +107,13 @@ CONFIG_SLUB_DEBUG=y
103# CONFIG_SLAB is not set 107# CONFIG_SLAB is not set
104CONFIG_SLUB=y 108CONFIG_SLUB=y
105# CONFIG_SLOB is not set 109# CONFIG_SLOB is not set
110# CONFIG_PROFILING is not set
111# CONFIG_MARKERS is not set
112CONFIG_HAVE_OPROFILE=y
113# CONFIG_KPROBES is not set
114CONFIG_HAVE_KPROBES=y
115CONFIG_PROC_PAGE_MONITOR=y
116CONFIG_SLABINFO=y
106CONFIG_RT_MUTEXES=y 117CONFIG_RT_MUTEXES=y
107# CONFIG_TINY_SHMEM is not set 118# CONFIG_TINY_SHMEM is not set
108CONFIG_BASE_SMALL=0 119CONFIG_BASE_SMALL=0
@@ -130,13 +141,15 @@ CONFIG_DEFAULT_AS=y
130# CONFIG_DEFAULT_CFQ is not set 141# CONFIG_DEFAULT_CFQ is not set
131# CONFIG_DEFAULT_NOOP is not set 142# CONFIG_DEFAULT_NOOP is not set
132CONFIG_DEFAULT_IOSCHED="anticipatory" 143CONFIG_DEFAULT_IOSCHED="anticipatory"
144CONFIG_CLASSIC_RCU=y
145# CONFIG_PREEMPT_RCU is not set
133# CONFIG_PPC4xx_PCI_EXPRESS is not set 146# CONFIG_PPC4xx_PCI_EXPRESS is not set
134 147
135# 148#
136# Platform support 149# Platform support
137# 150#
138# CONFIG_PPC_MPC52xx is not set 151# CONFIG_PPC_MPC512x is not set
139# CONFIG_PPC_MPC5200 is not set 152# CONFIG_PPC_MPC5121 is not set
140# CONFIG_PPC_CELL is not set 153# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set 154# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set 155# CONFIG_PQ2ADS is not set
@@ -146,7 +159,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
146# CONFIG_TAISHAN is not set 159# CONFIG_TAISHAN is not set
147# CONFIG_KATMAI is not set 160# CONFIG_KATMAI is not set
148CONFIG_RAINIER=y 161CONFIG_RAINIER=y
162# CONFIG_WARP is not set
149CONFIG_440GRX=y 163CONFIG_440GRX=y
164# CONFIG_IPIC is not set
150# CONFIG_MPIC is not set 165# CONFIG_MPIC is not set
151# CONFIG_MPIC_WEIRD is not set 166# CONFIG_MPIC_WEIRD is not set
152# CONFIG_PPC_I8259 is not set 167# CONFIG_PPC_I8259 is not set
@@ -157,7 +172,6 @@ CONFIG_440GRX=y
157# CONFIG_PPC_INDIRECT_IO is not set 172# CONFIG_PPC_INDIRECT_IO is not set
158# CONFIG_GENERIC_IOMAP is not set 173# CONFIG_GENERIC_IOMAP is not set
159# CONFIG_CPU_FREQ is not set 174# CONFIG_CPU_FREQ is not set
160# CONFIG_CPM2 is not set
161# CONFIG_FSL_ULI1575 is not set 175# CONFIG_FSL_ULI1575 is not set
162 176
163# 177#
@@ -173,13 +187,18 @@ CONFIG_HZ_250=y
173# CONFIG_HZ_300 is not set 187# CONFIG_HZ_300 is not set
174# CONFIG_HZ_1000 is not set 188# CONFIG_HZ_1000 is not set
175CONFIG_HZ=250 189CONFIG_HZ=250
190# CONFIG_SCHED_HRTICK is not set
176CONFIG_PREEMPT_NONE=y 191CONFIG_PREEMPT_NONE=y
177# CONFIG_PREEMPT_VOLUNTARY is not set 192# CONFIG_PREEMPT_VOLUNTARY is not set
178# CONFIG_PREEMPT is not set 193# CONFIG_PREEMPT is not set
194CONFIG_RCU_TRACE=y
179CONFIG_BINFMT_ELF=y 195CONFIG_BINFMT_ELF=y
180# CONFIG_BINFMT_MISC is not set 196# CONFIG_BINFMT_MISC is not set
181CONFIG_MATH_EMULATION=y 197CONFIG_MATH_EMULATION=y
198# CONFIG_IOMMU_HELPER is not set
182CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 199CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
200CONFIG_ARCH_HAS_WALK_MEMORY=y
201CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
183CONFIG_ARCH_FLATMEM_ENABLE=y 202CONFIG_ARCH_FLATMEM_ENABLE=y
184CONFIG_ARCH_POPULATES_NODE_MAP=y 203CONFIG_ARCH_POPULATES_NODE_MAP=y
185CONFIG_SELECT_MEMORY_MODEL=y 204CONFIG_SELECT_MEMORY_MODEL=y
@@ -199,8 +218,6 @@ CONFIG_PROC_DEVICETREE=y
199CONFIG_CMDLINE_BOOL=y 218CONFIG_CMDLINE_BOOL=y
200CONFIG_CMDLINE="" 219CONFIG_CMDLINE=""
201CONFIG_SECCOMP=y 220CONFIG_SECCOMP=y
202CONFIG_WANT_DEVICE_TREE=y
203CONFIG_DEVICE_TREE="rainier.dts"
204CONFIG_ISA_DMA_API=y 221CONFIG_ISA_DMA_API=y
205 222
206# 223#
@@ -300,6 +317,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
300# 317#
301# CONFIG_NET_PKTGEN is not set 318# CONFIG_NET_PKTGEN is not set
302# CONFIG_HAMRADIO is not set 319# CONFIG_HAMRADIO is not set
320# CONFIG_CAN is not set
303# CONFIG_IRDA is not set 321# CONFIG_IRDA is not set
304# CONFIG_BT is not set 322# CONFIG_BT is not set
305# CONFIG_AF_RXRPC is not set 323# CONFIG_AF_RXRPC is not set
@@ -336,6 +354,7 @@ CONFIG_MTD=y
336CONFIG_MTD_PARTITIONS=y 354CONFIG_MTD_PARTITIONS=y
337# CONFIG_MTD_REDBOOT_PARTS is not set 355# CONFIG_MTD_REDBOOT_PARTS is not set
338CONFIG_MTD_CMDLINE_PARTS=y 356CONFIG_MTD_CMDLINE_PARTS=y
357CONFIG_MTD_OF_PARTS=y
339 358
340# 359#
341# User Modules And Translation Layers 360# User Modules And Translation Layers
@@ -422,7 +441,7 @@ CONFIG_BLK_DEV=y
422CONFIG_BLK_DEV_RAM=y 441CONFIG_BLK_DEV_RAM=y
423CONFIG_BLK_DEV_RAM_COUNT=16 442CONFIG_BLK_DEV_RAM_COUNT=16
424CONFIG_BLK_DEV_RAM_SIZE=35000 443CONFIG_BLK_DEV_RAM_SIZE=35000
425CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 444# CONFIG_BLK_DEV_XIP is not set
426# CONFIG_CDROM_PKTCDVD is not set 445# CONFIG_CDROM_PKTCDVD is not set
427# CONFIG_ATA_OVER_ETH is not set 446# CONFIG_ATA_OVER_ETH is not set
428# CONFIG_XILINX_SYSACE is not set 447# CONFIG_XILINX_SYSACE is not set
@@ -431,6 +450,8 @@ CONFIG_MISC_DEVICES=y
431# CONFIG_EEPROM_93CX6 is not set 450# CONFIG_EEPROM_93CX6 is not set
432# CONFIG_SGI_IOC4 is not set 451# CONFIG_SGI_IOC4 is not set
433# CONFIG_TIFM_CORE is not set 452# CONFIG_TIFM_CORE is not set
453# CONFIG_ENCLOSURE_SERVICES is not set
454CONFIG_HAVE_IDE=y
434# CONFIG_IDE is not set 455# CONFIG_IDE is not set
435 456
436# 457#
@@ -461,7 +482,6 @@ CONFIG_NETDEVICES=y
461# CONFIG_EQUALIZER is not set 482# CONFIG_EQUALIZER is not set
462# CONFIG_TUN is not set 483# CONFIG_TUN is not set
463# CONFIG_VETH is not set 484# CONFIG_VETH is not set
464# CONFIG_IP1000 is not set
465# CONFIG_ARCNET is not set 485# CONFIG_ARCNET is not set
466# CONFIG_NET_ETHERNET is not set 486# CONFIG_NET_ETHERNET is not set
467CONFIG_IBM_NEW_EMAC_ZMII=y 487CONFIG_IBM_NEW_EMAC_ZMII=y
@@ -472,6 +492,9 @@ CONFIG_NETDEV_1000=y
472# CONFIG_DL2K is not set 492# CONFIG_DL2K is not set
473# CONFIG_E1000 is not set 493# CONFIG_E1000 is not set
474# CONFIG_E1000E is not set 494# CONFIG_E1000E is not set
495# CONFIG_E1000E_ENABLED is not set
496# CONFIG_IP1000 is not set
497# CONFIG_IGB is not set
475# CONFIG_NS83820 is not set 498# CONFIG_NS83820 is not set
476# CONFIG_HAMACHI is not set 499# CONFIG_HAMACHI is not set
477# CONFIG_YELLOWFIN is not set 500# CONFIG_YELLOWFIN is not set
@@ -496,6 +519,7 @@ CONFIG_NETDEV_10000=y
496# CONFIG_NIU is not set 519# CONFIG_NIU is not set
497# CONFIG_MLX4_CORE is not set 520# CONFIG_MLX4_CORE is not set
498# CONFIG_TEHUTI is not set 521# CONFIG_TEHUTI is not set
522# CONFIG_BNX2X is not set
499# CONFIG_TR is not set 523# CONFIG_TR is not set
500 524
501# 525#
@@ -508,7 +532,6 @@ CONFIG_NETDEV_10000=y
508# CONFIG_HIPPI is not set 532# CONFIG_HIPPI is not set
509# CONFIG_PPP is not set 533# CONFIG_PPP is not set
510# CONFIG_SLIP is not set 534# CONFIG_SLIP is not set
511# CONFIG_SHAPER is not set
512# CONFIG_NETCONSOLE is not set 535# CONFIG_NETCONSOLE is not set
513# CONFIG_NETPOLL is not set 536# CONFIG_NETPOLL is not set
514# CONFIG_NET_POLL_CONTROLLER is not set 537# CONFIG_NET_POLL_CONTROLLER is not set
@@ -531,6 +554,7 @@ CONFIG_NETDEV_10000=y
531# 554#
532# CONFIG_VT is not set 555# CONFIG_VT is not set
533# CONFIG_SERIAL_NONSTANDARD is not set 556# CONFIG_SERIAL_NONSTANDARD is not set
557# CONFIG_NOZOMI is not set
534 558
535# 559#
536# Serial drivers 560# Serial drivers
@@ -576,6 +600,7 @@ CONFIG_DEVPORT=y
576# CONFIG_W1 is not set 600# CONFIG_W1 is not set
577# CONFIG_POWER_SUPPLY is not set 601# CONFIG_POWER_SUPPLY is not set
578# CONFIG_HWMON is not set 602# CONFIG_HWMON is not set
603CONFIG_THERMAL=y
579# CONFIG_WATCHDOG is not set 604# CONFIG_WATCHDOG is not set
580 605
581# 606#
@@ -624,12 +649,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
624# 649#
625# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 650# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
626# 651#
627
628#
629# USB Gadget Support
630#
631# CONFIG_USB_GADGET is not set 652# CONFIG_USB_GADGET is not set
632# CONFIG_MMC is not set 653# CONFIG_MMC is not set
654# CONFIG_MEMSTICK is not set
633# CONFIG_NEW_LEDS is not set 655# CONFIG_NEW_LEDS is not set
634# CONFIG_INFINIBAND is not set 656# CONFIG_INFINIBAND is not set
635# CONFIG_EDAC is not set 657# CONFIG_EDAC is not set
@@ -654,12 +676,10 @@ CONFIG_EXT2_FS=y
654# CONFIG_XFS_FS is not set 676# CONFIG_XFS_FS is not set
655# CONFIG_GFS2_FS is not set 677# CONFIG_GFS2_FS is not set
656# CONFIG_OCFS2_FS is not set 678# CONFIG_OCFS2_FS is not set
657# CONFIG_MINIX_FS is not set 679CONFIG_DNOTIFY=y
658# CONFIG_ROMFS_FS is not set
659CONFIG_INOTIFY=y 680CONFIG_INOTIFY=y
660CONFIG_INOTIFY_USER=y 681CONFIG_INOTIFY_USER=y
661# CONFIG_QUOTA is not set 682# CONFIG_QUOTA is not set
662CONFIG_DNOTIFY=y
663# CONFIG_AUTOFS_FS is not set 683# CONFIG_AUTOFS_FS is not set
664# CONFIG_AUTOFS4_FS is not set 684# CONFIG_AUTOFS4_FS is not set
665# CONFIG_FUSE_FS is not set 685# CONFIG_FUSE_FS is not set
@@ -712,8 +732,10 @@ CONFIG_JFFS2_RTIME=y
712# CONFIG_JFFS2_RUBIN is not set 732# CONFIG_JFFS2_RUBIN is not set
713CONFIG_CRAMFS=y 733CONFIG_CRAMFS=y
714# CONFIG_VXFS_FS is not set 734# CONFIG_VXFS_FS is not set
735# CONFIG_MINIX_FS is not set
715# CONFIG_HPFS_FS is not set 736# CONFIG_HPFS_FS is not set
716# CONFIG_QNX4FS_FS is not set 737# CONFIG_QNX4FS_FS is not set
738# CONFIG_ROMFS_FS is not set
717# CONFIG_SYSV_FS is not set 739# CONFIG_SYSV_FS is not set
718# CONFIG_UFS_FS is not set 740# CONFIG_UFS_FS is not set
719CONFIG_NETWORK_FILESYSTEMS=y 741CONFIG_NETWORK_FILESYSTEMS=y
@@ -744,7 +766,6 @@ CONFIG_SUNRPC=y
744CONFIG_MSDOS_PARTITION=y 766CONFIG_MSDOS_PARTITION=y
745# CONFIG_NLS is not set 767# CONFIG_NLS is not set
746# CONFIG_DLM is not set 768# CONFIG_DLM is not set
747# CONFIG_UCC_SLOW is not set
748 769
749# 770#
750# Library routines 771# Library routines
@@ -762,10 +783,6 @@ CONFIG_PLIST=y
762CONFIG_HAS_IOMEM=y 783CONFIG_HAS_IOMEM=y
763CONFIG_HAS_IOPORT=y 784CONFIG_HAS_IOPORT=y
764CONFIG_HAS_DMA=y 785CONFIG_HAS_DMA=y
765CONFIG_INSTRUMENTATION=y
766# CONFIG_PROFILING is not set
767# CONFIG_KPROBES is not set
768# CONFIG_MARKERS is not set
769 786
770# 787#
771# Kernel hacking 788# Kernel hacking
@@ -775,7 +792,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
775CONFIG_ENABLE_MUST_CHECK=y 792CONFIG_ENABLE_MUST_CHECK=y
776CONFIG_MAGIC_SYSRQ=y 793CONFIG_MAGIC_SYSRQ=y
777# CONFIG_UNUSED_SYMBOLS is not set 794# CONFIG_UNUSED_SYMBOLS is not set
778# CONFIG_DEBUG_FS is not set 795CONFIG_DEBUG_FS=y
779# CONFIG_HEADERS_CHECK is not set 796# CONFIG_HEADERS_CHECK is not set
780CONFIG_DEBUG_KERNEL=y 797CONFIG_DEBUG_KERNEL=y
781# CONFIG_DEBUG_SHIRQ is not set 798# CONFIG_DEBUG_SHIRQ is not set
@@ -784,6 +801,7 @@ CONFIG_SCHED_DEBUG=y
784# CONFIG_SCHEDSTATS is not set 801# CONFIG_SCHEDSTATS is not set
785# CONFIG_TIMER_STATS is not set 802# CONFIG_TIMER_STATS is not set
786# CONFIG_SLUB_DEBUG_ON is not set 803# CONFIG_SLUB_DEBUG_ON is not set
804# CONFIG_SLUB_STATS is not set
787# CONFIG_DEBUG_RT_MUTEXES is not set 805# CONFIG_DEBUG_RT_MUTEXES is not set
788# CONFIG_RT_MUTEX_TESTER is not set 806# CONFIG_RT_MUTEX_TESTER is not set
789# CONFIG_DEBUG_SPINLOCK is not set 807# CONFIG_DEBUG_SPINLOCK is not set
@@ -796,9 +814,9 @@ CONFIG_SCHED_DEBUG=y
796# CONFIG_DEBUG_VM is not set 814# CONFIG_DEBUG_VM is not set
797# CONFIG_DEBUG_LIST is not set 815# CONFIG_DEBUG_LIST is not set
798# CONFIG_DEBUG_SG is not set 816# CONFIG_DEBUG_SG is not set
799CONFIG_FORCED_INLINING=y
800# CONFIG_BOOT_PRINTK_DELAY is not set 817# CONFIG_BOOT_PRINTK_DELAY is not set
801# CONFIG_RCU_TORTURE_TEST is not set 818# CONFIG_RCU_TORTURE_TEST is not set
819# CONFIG_BACKTRACE_SELF_TEST is not set
802# CONFIG_FAULT_INJECTION is not set 820# CONFIG_FAULT_INJECTION is not set
803# CONFIG_SAMPLES is not set 821# CONFIG_SAMPLES is not set
804# CONFIG_DEBUG_STACKOVERFLOW is not set 822# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -807,6 +825,7 @@ CONFIG_FORCED_INLINING=y
807CONFIG_DEBUGGER=y 825CONFIG_DEBUGGER=y
808# CONFIG_KGDB is not set 826# CONFIG_KGDB is not set
809# CONFIG_XMON is not set 827# CONFIG_XMON is not set
828# CONFIG_VIRQ_DEBUG is not set
810# CONFIG_BDI_SWITCH is not set 829# CONFIG_BDI_SWITCH is not set
811CONFIG_PPC_EARLY_DEBUG=y 830CONFIG_PPC_EARLY_DEBUG=y
812# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 831# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
@@ -832,6 +851,7 @@ CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
832CONFIG_CRYPTO=y 851CONFIG_CRYPTO=y
833CONFIG_CRYPTO_ALGAPI=y 852CONFIG_CRYPTO_ALGAPI=y
834CONFIG_CRYPTO_BLKCIPHER=y 853CONFIG_CRYPTO_BLKCIPHER=y
854# CONFIG_CRYPTO_SEQIV is not set
835CONFIG_CRYPTO_MANAGER=y 855CONFIG_CRYPTO_MANAGER=y
836# CONFIG_CRYPTO_HMAC is not set 856# CONFIG_CRYPTO_HMAC is not set
837# CONFIG_CRYPTO_XCBC is not set 857# CONFIG_CRYPTO_XCBC is not set
@@ -849,6 +869,9 @@ CONFIG_CRYPTO_CBC=y
849CONFIG_CRYPTO_PCBC=y 869CONFIG_CRYPTO_PCBC=y
850# CONFIG_CRYPTO_LRW is not set 870# CONFIG_CRYPTO_LRW is not set
851# CONFIG_CRYPTO_XTS is not set 871# CONFIG_CRYPTO_XTS is not set
872# CONFIG_CRYPTO_CTR is not set
873# CONFIG_CRYPTO_GCM is not set
874# CONFIG_CRYPTO_CCM is not set
852# CONFIG_CRYPTO_CRYPTD is not set 875# CONFIG_CRYPTO_CRYPTD is not set
853CONFIG_CRYPTO_DES=y 876CONFIG_CRYPTO_DES=y
854# CONFIG_CRYPTO_FCRYPT is not set 877# CONFIG_CRYPTO_FCRYPT is not set
@@ -863,11 +886,14 @@ CONFIG_CRYPTO_DES=y
863# CONFIG_CRYPTO_KHAZAD is not set 886# CONFIG_CRYPTO_KHAZAD is not set
864# CONFIG_CRYPTO_ANUBIS is not set 887# CONFIG_CRYPTO_ANUBIS is not set
865# CONFIG_CRYPTO_SEED is not set 888# CONFIG_CRYPTO_SEED is not set
889# CONFIG_CRYPTO_SALSA20 is not set
866# CONFIG_CRYPTO_DEFLATE is not set 890# CONFIG_CRYPTO_DEFLATE is not set
867# CONFIG_CRYPTO_MICHAEL_MIC is not set 891# CONFIG_CRYPTO_MICHAEL_MIC is not set
868# CONFIG_CRYPTO_CRC32C is not set 892# CONFIG_CRYPTO_CRC32C is not set
869# CONFIG_CRYPTO_CAMELLIA is not set 893# CONFIG_CRYPTO_CAMELLIA is not set
870# CONFIG_CRYPTO_TEST is not set 894# CONFIG_CRYPTO_TEST is not set
871# CONFIG_CRYPTO_AUTHENC is not set 895# CONFIG_CRYPTO_AUTHENC is not set
896# CONFIG_CRYPTO_LZO is not set
872CONFIG_CRYPTO_HW=y 897CONFIG_CRYPTO_HW=y
898# CONFIG_CRYPTO_DEV_HIFN_795X is not set
873# CONFIG_PPC_CLOCK is not set 899# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/sequoia_defconfig b/arch/powerpc/configs/sequoia_defconfig
index abbfed6582e1..dd5d6303c396 100644
--- a/arch/powerpc/configs/sequoia_defconfig
+++ b/arch/powerpc/configs/sequoia_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc6 3# Linux kernel version: 2.6.25-rc2
4# Mon Dec 24 11:23:22 2007 4# Fri Feb 15 21:53:46 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -30,6 +30,7 @@ CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y 30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y 31CONFIG_GENERIC_CLOCKEVENTS=y
32CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
34CONFIG_RWSEM_XCHGADD_ALGORITHM=y 35CONFIG_RWSEM_XCHGADD_ALGORITHM=y
35CONFIG_ARCH_HAS_ILOG2_U32=y 36CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -68,15 +69,18 @@ CONFIG_SYSVIPC_SYSCTL=y
68CONFIG_POSIX_MQUEUE=y 69CONFIG_POSIX_MQUEUE=y
69# CONFIG_BSD_PROCESS_ACCT is not set 70# CONFIG_BSD_PROCESS_ACCT is not set
70# CONFIG_TASKSTATS is not set 71# CONFIG_TASKSTATS is not set
71# CONFIG_USER_NS is not set
72# CONFIG_PID_NS is not set
73# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
74# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
75CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
76# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
76CONFIG_GROUP_SCHED=y
77# CONFIG_FAIR_GROUP_SCHED is not set 77# CONFIG_FAIR_GROUP_SCHED is not set
78# CONFIG_RT_GROUP_SCHED is not set
79CONFIG_USER_SCHED=y
80# CONFIG_CGROUP_SCHED is not set
78CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
79# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
83# CONFIG_NAMESPACES is not set
80CONFIG_BLK_DEV_INITRD=y 84CONFIG_BLK_DEV_INITRD=y
81CONFIG_INITRAMFS_SOURCE="" 85CONFIG_INITRAMFS_SOURCE=""
82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -90,11 +94,13 @@ CONFIG_HOTPLUG=y
90CONFIG_PRINTK=y 94CONFIG_PRINTK=y
91CONFIG_BUG=y 95CONFIG_BUG=y
92CONFIG_ELF_CORE=y 96CONFIG_ELF_CORE=y
97CONFIG_COMPAT_BRK=y
93CONFIG_BASE_FULL=y 98CONFIG_BASE_FULL=y
94CONFIG_FUTEX=y 99CONFIG_FUTEX=y
95CONFIG_ANON_INODES=y 100CONFIG_ANON_INODES=y
96CONFIG_EPOLL=y 101CONFIG_EPOLL=y
97CONFIG_SIGNALFD=y 102CONFIG_SIGNALFD=y
103CONFIG_TIMERFD=y
98CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
99CONFIG_SHMEM=y 105CONFIG_SHMEM=y
100CONFIG_VM_EVENT_COUNTERS=y 106CONFIG_VM_EVENT_COUNTERS=y
@@ -102,6 +108,13 @@ CONFIG_SLUB_DEBUG=y
102# CONFIG_SLAB is not set 108# CONFIG_SLAB is not set
103CONFIG_SLUB=y 109CONFIG_SLUB=y
104# CONFIG_SLOB is not set 110# CONFIG_SLOB is not set
111# CONFIG_PROFILING is not set
112# CONFIG_MARKERS is not set
113CONFIG_HAVE_OPROFILE=y
114# CONFIG_KPROBES is not set
115CONFIG_HAVE_KPROBES=y
116CONFIG_PROC_PAGE_MONITOR=y
117CONFIG_SLABINFO=y
105CONFIG_RT_MUTEXES=y 118CONFIG_RT_MUTEXES=y
106# CONFIG_TINY_SHMEM is not set 119# CONFIG_TINY_SHMEM is not set
107CONFIG_BASE_SMALL=0 120CONFIG_BASE_SMALL=0
@@ -129,13 +142,15 @@ CONFIG_DEFAULT_AS=y
129# CONFIG_DEFAULT_CFQ is not set 142# CONFIG_DEFAULT_CFQ is not set
130# CONFIG_DEFAULT_NOOP is not set 143# CONFIG_DEFAULT_NOOP is not set
131CONFIG_DEFAULT_IOSCHED="anticipatory" 144CONFIG_DEFAULT_IOSCHED="anticipatory"
145CONFIG_CLASSIC_RCU=y
146# CONFIG_PREEMPT_RCU is not set
132# CONFIG_PPC4xx_PCI_EXPRESS is not set 147# CONFIG_PPC4xx_PCI_EXPRESS is not set
133 148
134# 149#
135# Platform support 150# Platform support
136# 151#
137# CONFIG_PPC_MPC52xx is not set 152# CONFIG_PPC_MPC512x is not set
138# CONFIG_PPC_MPC5200 is not set 153# CONFIG_PPC_MPC5121 is not set
139# CONFIG_PPC_CELL is not set 154# CONFIG_PPC_CELL is not set
140# CONFIG_PPC_CELL_NATIVE is not set 155# CONFIG_PPC_CELL_NATIVE is not set
141# CONFIG_PQ2ADS is not set 156# CONFIG_PQ2ADS is not set
@@ -145,7 +160,9 @@ CONFIG_SEQUOIA=y
145# CONFIG_TAISHAN is not set 160# CONFIG_TAISHAN is not set
146# CONFIG_KATMAI is not set 161# CONFIG_KATMAI is not set
147# CONFIG_RAINIER is not set 162# CONFIG_RAINIER is not set
163# CONFIG_WARP is not set
148CONFIG_440EPX=y 164CONFIG_440EPX=y
165# CONFIG_IPIC is not set
149# CONFIG_MPIC is not set 166# CONFIG_MPIC is not set
150# CONFIG_MPIC_WEIRD is not set 167# CONFIG_MPIC_WEIRD is not set
151# CONFIG_PPC_I8259 is not set 168# CONFIG_PPC_I8259 is not set
@@ -156,7 +173,6 @@ CONFIG_440EPX=y
156# CONFIG_PPC_INDIRECT_IO is not set 173# CONFIG_PPC_INDIRECT_IO is not set
157# CONFIG_GENERIC_IOMAP is not set 174# CONFIG_GENERIC_IOMAP is not set
158# CONFIG_CPU_FREQ is not set 175# CONFIG_CPU_FREQ is not set
159# CONFIG_CPM2 is not set
160# CONFIG_FSL_ULI1575 is not set 176# CONFIG_FSL_ULI1575 is not set
161 177
162# 178#
@@ -172,13 +188,18 @@ CONFIG_HZ_250=y
172# CONFIG_HZ_300 is not set 188# CONFIG_HZ_300 is not set
173# CONFIG_HZ_1000 is not set 189# CONFIG_HZ_1000 is not set
174CONFIG_HZ=250 190CONFIG_HZ=250
191# CONFIG_SCHED_HRTICK is not set
175CONFIG_PREEMPT_NONE=y 192CONFIG_PREEMPT_NONE=y
176# CONFIG_PREEMPT_VOLUNTARY is not set 193# CONFIG_PREEMPT_VOLUNTARY is not set
177# CONFIG_PREEMPT is not set 194# CONFIG_PREEMPT is not set
195CONFIG_RCU_TRACE=y
178CONFIG_BINFMT_ELF=y 196CONFIG_BINFMT_ELF=y
179# CONFIG_BINFMT_MISC is not set 197# CONFIG_BINFMT_MISC is not set
180# CONFIG_MATH_EMULATION is not set 198# CONFIG_MATH_EMULATION is not set
199# CONFIG_IOMMU_HELPER is not set
181CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 200CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
201CONFIG_ARCH_HAS_WALK_MEMORY=y
202CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
182CONFIG_ARCH_FLATMEM_ENABLE=y 203CONFIG_ARCH_FLATMEM_ENABLE=y
183CONFIG_ARCH_POPULATES_NODE_MAP=y 204CONFIG_ARCH_POPULATES_NODE_MAP=y
184CONFIG_SELECT_MEMORY_MODEL=y 205CONFIG_SELECT_MEMORY_MODEL=y
@@ -198,8 +219,6 @@ CONFIG_PROC_DEVICETREE=y
198CONFIG_CMDLINE_BOOL=y 219CONFIG_CMDLINE_BOOL=y
199CONFIG_CMDLINE="" 220CONFIG_CMDLINE=""
200CONFIG_SECCOMP=y 221CONFIG_SECCOMP=y
201CONFIG_WANT_DEVICE_TREE=y
202CONFIG_DEVICE_TREE="sequoia.dts"
203CONFIG_ISA_DMA_API=y 222CONFIG_ISA_DMA_API=y
204 223
205# 224#
@@ -299,6 +318,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
299# 318#
300# CONFIG_NET_PKTGEN is not set 319# CONFIG_NET_PKTGEN is not set
301# CONFIG_HAMRADIO is not set 320# CONFIG_HAMRADIO is not set
321# CONFIG_CAN is not set
302# CONFIG_IRDA is not set 322# CONFIG_IRDA is not set
303# CONFIG_BT is not set 323# CONFIG_BT is not set
304# CONFIG_AF_RXRPC is not set 324# CONFIG_AF_RXRPC is not set
@@ -335,6 +355,7 @@ CONFIG_MTD=y
335CONFIG_MTD_PARTITIONS=y 355CONFIG_MTD_PARTITIONS=y
336# CONFIG_MTD_REDBOOT_PARTS is not set 356# CONFIG_MTD_REDBOOT_PARTS is not set
337CONFIG_MTD_CMDLINE_PARTS=y 357CONFIG_MTD_CMDLINE_PARTS=y
358CONFIG_MTD_OF_PARTS=y
338 359
339# 360#
340# User Modules And Translation Layers 361# User Modules And Translation Layers
@@ -421,7 +442,7 @@ CONFIG_BLK_DEV=y
421CONFIG_BLK_DEV_RAM=y 442CONFIG_BLK_DEV_RAM=y
422CONFIG_BLK_DEV_RAM_COUNT=16 443CONFIG_BLK_DEV_RAM_COUNT=16
423CONFIG_BLK_DEV_RAM_SIZE=35000 444CONFIG_BLK_DEV_RAM_SIZE=35000
424CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 445# CONFIG_BLK_DEV_XIP is not set
425# CONFIG_CDROM_PKTCDVD is not set 446# CONFIG_CDROM_PKTCDVD is not set
426# CONFIG_ATA_OVER_ETH is not set 447# CONFIG_ATA_OVER_ETH is not set
427# CONFIG_XILINX_SYSACE is not set 448# CONFIG_XILINX_SYSACE is not set
@@ -430,6 +451,8 @@ CONFIG_MISC_DEVICES=y
430# CONFIG_EEPROM_93CX6 is not set 451# CONFIG_EEPROM_93CX6 is not set
431# CONFIG_SGI_IOC4 is not set 452# CONFIG_SGI_IOC4 is not set
432# CONFIG_TIFM_CORE is not set 453# CONFIG_TIFM_CORE is not set
454# CONFIG_ENCLOSURE_SERVICES is not set
455CONFIG_HAVE_IDE=y
433# CONFIG_IDE is not set 456# CONFIG_IDE is not set
434 457
435# 458#
@@ -458,7 +481,6 @@ CONFIG_NETDEVICES=y
458# CONFIG_EQUALIZER is not set 481# CONFIG_EQUALIZER is not set
459# CONFIG_TUN is not set 482# CONFIG_TUN is not set
460# CONFIG_VETH is not set 483# CONFIG_VETH is not set
461# CONFIG_IP1000 is not set
462# CONFIG_ARCNET is not set 484# CONFIG_ARCNET is not set
463# CONFIG_PHYLIB is not set 485# CONFIG_PHYLIB is not set
464CONFIG_NET_ETHERNET=y 486CONFIG_NET_ETHERNET=y
@@ -487,6 +509,9 @@ CONFIG_NETDEV_1000=y
487# CONFIG_DL2K is not set 509# CONFIG_DL2K is not set
488# CONFIG_E1000 is not set 510# CONFIG_E1000 is not set
489# CONFIG_E1000E is not set 511# CONFIG_E1000E is not set
512# CONFIG_E1000E_ENABLED is not set
513# CONFIG_IP1000 is not set
514# CONFIG_IGB is not set
490# CONFIG_NS83820 is not set 515# CONFIG_NS83820 is not set
491# CONFIG_HAMACHI is not set 516# CONFIG_HAMACHI is not set
492# CONFIG_YELLOWFIN is not set 517# CONFIG_YELLOWFIN is not set
@@ -511,6 +536,7 @@ CONFIG_NETDEV_10000=y
511# CONFIG_NIU is not set 536# CONFIG_NIU is not set
512# CONFIG_MLX4_CORE is not set 537# CONFIG_MLX4_CORE is not set
513# CONFIG_TEHUTI is not set 538# CONFIG_TEHUTI is not set
539# CONFIG_BNX2X is not set
514# CONFIG_TR is not set 540# CONFIG_TR is not set
515 541
516# 542#
@@ -523,7 +549,6 @@ CONFIG_NETDEV_10000=y
523# CONFIG_HIPPI is not set 549# CONFIG_HIPPI is not set
524# CONFIG_PPP is not set 550# CONFIG_PPP is not set
525# CONFIG_SLIP is not set 551# CONFIG_SLIP is not set
526# CONFIG_SHAPER is not set
527# CONFIG_NETCONSOLE is not set 552# CONFIG_NETCONSOLE is not set
528# CONFIG_NETPOLL is not set 553# CONFIG_NETPOLL is not set
529# CONFIG_NET_POLL_CONTROLLER is not set 554# CONFIG_NET_POLL_CONTROLLER is not set
@@ -546,6 +571,7 @@ CONFIG_NETDEV_10000=y
546# 571#
547# CONFIG_VT is not set 572# CONFIG_VT is not set
548# CONFIG_SERIAL_NONSTANDARD is not set 573# CONFIG_SERIAL_NONSTANDARD is not set
574# CONFIG_NOZOMI is not set
549 575
550# 576#
551# Serial drivers 577# Serial drivers
@@ -591,6 +617,7 @@ CONFIG_DEVPORT=y
591# CONFIG_W1 is not set 617# CONFIG_W1 is not set
592# CONFIG_POWER_SUPPLY is not set 618# CONFIG_POWER_SUPPLY is not set
593# CONFIG_HWMON is not set 619# CONFIG_HWMON is not set
620CONFIG_THERMAL=y
594# CONFIG_WATCHDOG is not set 621# CONFIG_WATCHDOG is not set
595 622
596# 623#
@@ -639,12 +666,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
639# 666#
640# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 667# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
641# 668#
642
643#
644# USB Gadget Support
645#
646# CONFIG_USB_GADGET is not set 669# CONFIG_USB_GADGET is not set
647# CONFIG_MMC is not set 670# CONFIG_MMC is not set
671# CONFIG_MEMSTICK is not set
648# CONFIG_NEW_LEDS is not set 672# CONFIG_NEW_LEDS is not set
649# CONFIG_INFINIBAND is not set 673# CONFIG_INFINIBAND is not set
650# CONFIG_EDAC is not set 674# CONFIG_EDAC is not set
@@ -669,12 +693,10 @@ CONFIG_EXT2_FS=y
669# CONFIG_XFS_FS is not set 693# CONFIG_XFS_FS is not set
670# CONFIG_GFS2_FS is not set 694# CONFIG_GFS2_FS is not set
671# CONFIG_OCFS2_FS is not set 695# CONFIG_OCFS2_FS is not set
672# CONFIG_MINIX_FS is not set 696CONFIG_DNOTIFY=y
673# CONFIG_ROMFS_FS is not set
674CONFIG_INOTIFY=y 697CONFIG_INOTIFY=y
675CONFIG_INOTIFY_USER=y 698CONFIG_INOTIFY_USER=y
676# CONFIG_QUOTA is not set 699# CONFIG_QUOTA is not set
677CONFIG_DNOTIFY=y
678# CONFIG_AUTOFS_FS is not set 700# CONFIG_AUTOFS_FS is not set
679# CONFIG_AUTOFS4_FS is not set 701# CONFIG_AUTOFS4_FS is not set
680# CONFIG_FUSE_FS is not set 702# CONFIG_FUSE_FS is not set
@@ -727,8 +749,10 @@ CONFIG_JFFS2_RTIME=y
727# CONFIG_JFFS2_RUBIN is not set 749# CONFIG_JFFS2_RUBIN is not set
728CONFIG_CRAMFS=y 750CONFIG_CRAMFS=y
729# CONFIG_VXFS_FS is not set 751# CONFIG_VXFS_FS is not set
752# CONFIG_MINIX_FS is not set
730# CONFIG_HPFS_FS is not set 753# CONFIG_HPFS_FS is not set
731# CONFIG_QNX4FS_FS is not set 754# CONFIG_QNX4FS_FS is not set
755# CONFIG_ROMFS_FS is not set
732# CONFIG_SYSV_FS is not set 756# CONFIG_SYSV_FS is not set
733# CONFIG_UFS_FS is not set 757# CONFIG_UFS_FS is not set
734CONFIG_NETWORK_FILESYSTEMS=y 758CONFIG_NETWORK_FILESYSTEMS=y
@@ -759,7 +783,6 @@ CONFIG_SUNRPC=y
759CONFIG_MSDOS_PARTITION=y 783CONFIG_MSDOS_PARTITION=y
760# CONFIG_NLS is not set 784# CONFIG_NLS is not set
761# CONFIG_DLM is not set 785# CONFIG_DLM is not set
762# CONFIG_UCC_SLOW is not set
763 786
764# 787#
765# Library routines 788# Library routines
@@ -777,7 +800,6 @@ CONFIG_PLIST=y
777CONFIG_HAS_IOMEM=y 800CONFIG_HAS_IOMEM=y
778CONFIG_HAS_IOPORT=y 801CONFIG_HAS_IOPORT=y
779CONFIG_HAS_DMA=y 802CONFIG_HAS_DMA=y
780# CONFIG_INSTRUMENTATION is not set
781 803
782# 804#
783# Kernel hacking 805# Kernel hacking
@@ -787,7 +809,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
787CONFIG_ENABLE_MUST_CHECK=y 809CONFIG_ENABLE_MUST_CHECK=y
788CONFIG_MAGIC_SYSRQ=y 810CONFIG_MAGIC_SYSRQ=y
789# CONFIG_UNUSED_SYMBOLS is not set 811# CONFIG_UNUSED_SYMBOLS is not set
790# CONFIG_DEBUG_FS is not set 812CONFIG_DEBUG_FS=y
791# CONFIG_HEADERS_CHECK is not set 813# CONFIG_HEADERS_CHECK is not set
792CONFIG_DEBUG_KERNEL=y 814CONFIG_DEBUG_KERNEL=y
793# CONFIG_DEBUG_SHIRQ is not set 815# CONFIG_DEBUG_SHIRQ is not set
@@ -796,6 +818,7 @@ CONFIG_SCHED_DEBUG=y
796# CONFIG_SCHEDSTATS is not set 818# CONFIG_SCHEDSTATS is not set
797# CONFIG_TIMER_STATS is not set 819# CONFIG_TIMER_STATS is not set
798# CONFIG_SLUB_DEBUG_ON is not set 820# CONFIG_SLUB_DEBUG_ON is not set
821# CONFIG_SLUB_STATS is not set
799# CONFIG_DEBUG_RT_MUTEXES is not set 822# CONFIG_DEBUG_RT_MUTEXES is not set
800# CONFIG_RT_MUTEX_TESTER is not set 823# CONFIG_RT_MUTEX_TESTER is not set
801# CONFIG_DEBUG_SPINLOCK is not set 824# CONFIG_DEBUG_SPINLOCK is not set
@@ -808,9 +831,9 @@ CONFIG_SCHED_DEBUG=y
808# CONFIG_DEBUG_VM is not set 831# CONFIG_DEBUG_VM is not set
809# CONFIG_DEBUG_LIST is not set 832# CONFIG_DEBUG_LIST is not set
810# CONFIG_DEBUG_SG is not set 833# CONFIG_DEBUG_SG is not set
811CONFIG_FORCED_INLINING=y
812# CONFIG_BOOT_PRINTK_DELAY is not set 834# CONFIG_BOOT_PRINTK_DELAY is not set
813# CONFIG_RCU_TORTURE_TEST is not set 835# CONFIG_RCU_TORTURE_TEST is not set
836# CONFIG_BACKTRACE_SELF_TEST is not set
814# CONFIG_FAULT_INJECTION is not set 837# CONFIG_FAULT_INJECTION is not set
815# CONFIG_SAMPLES is not set 838# CONFIG_SAMPLES is not set
816# CONFIG_DEBUG_STACKOVERFLOW is not set 839# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -819,6 +842,7 @@ CONFIG_FORCED_INLINING=y
819CONFIG_DEBUGGER=y 842CONFIG_DEBUGGER=y
820# CONFIG_KGDB is not set 843# CONFIG_KGDB is not set
821# CONFIG_XMON is not set 844# CONFIG_XMON is not set
845# CONFIG_VIRQ_DEBUG is not set
822# CONFIG_BDI_SWITCH is not set 846# CONFIG_BDI_SWITCH is not set
823CONFIG_PPC_EARLY_DEBUG=y 847CONFIG_PPC_EARLY_DEBUG=y
824# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 848# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
@@ -844,6 +868,7 @@ CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
844CONFIG_CRYPTO=y 868CONFIG_CRYPTO=y
845CONFIG_CRYPTO_ALGAPI=y 869CONFIG_CRYPTO_ALGAPI=y
846CONFIG_CRYPTO_BLKCIPHER=y 870CONFIG_CRYPTO_BLKCIPHER=y
871# CONFIG_CRYPTO_SEQIV is not set
847CONFIG_CRYPTO_MANAGER=y 872CONFIG_CRYPTO_MANAGER=y
848# CONFIG_CRYPTO_HMAC is not set 873# CONFIG_CRYPTO_HMAC is not set
849# CONFIG_CRYPTO_XCBC is not set 874# CONFIG_CRYPTO_XCBC is not set
@@ -861,6 +886,9 @@ CONFIG_CRYPTO_CBC=y
861CONFIG_CRYPTO_PCBC=y 886CONFIG_CRYPTO_PCBC=y
862# CONFIG_CRYPTO_LRW is not set 887# CONFIG_CRYPTO_LRW is not set
863# CONFIG_CRYPTO_XTS is not set 888# CONFIG_CRYPTO_XTS is not set
889# CONFIG_CRYPTO_CTR is not set
890# CONFIG_CRYPTO_GCM is not set
891# CONFIG_CRYPTO_CCM is not set
864# CONFIG_CRYPTO_CRYPTD is not set 892# CONFIG_CRYPTO_CRYPTD is not set
865CONFIG_CRYPTO_DES=y 893CONFIG_CRYPTO_DES=y
866# CONFIG_CRYPTO_FCRYPT is not set 894# CONFIG_CRYPTO_FCRYPT is not set
@@ -875,11 +903,14 @@ CONFIG_CRYPTO_DES=y
875# CONFIG_CRYPTO_KHAZAD is not set 903# CONFIG_CRYPTO_KHAZAD is not set
876# CONFIG_CRYPTO_ANUBIS is not set 904# CONFIG_CRYPTO_ANUBIS is not set
877# CONFIG_CRYPTO_SEED is not set 905# CONFIG_CRYPTO_SEED is not set
906# CONFIG_CRYPTO_SALSA20 is not set
878# CONFIG_CRYPTO_DEFLATE is not set 907# CONFIG_CRYPTO_DEFLATE is not set
879# CONFIG_CRYPTO_MICHAEL_MIC is not set 908# CONFIG_CRYPTO_MICHAEL_MIC is not set
880# CONFIG_CRYPTO_CRC32C is not set 909# CONFIG_CRYPTO_CRC32C is not set
881# CONFIG_CRYPTO_CAMELLIA is not set 910# CONFIG_CRYPTO_CAMELLIA is not set
882# CONFIG_CRYPTO_TEST is not set 911# CONFIG_CRYPTO_TEST is not set
883# CONFIG_CRYPTO_AUTHENC is not set 912# CONFIG_CRYPTO_AUTHENC is not set
913# CONFIG_CRYPTO_LZO is not set
884CONFIG_CRYPTO_HW=y 914CONFIG_CRYPTO_HW=y
915# CONFIG_CRYPTO_DEV_HIFN_795X is not set
885# CONFIG_PPC_CLOCK is not set 916# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/taishan_defconfig b/arch/powerpc/configs/taishan_defconfig
index ade84b92877e..087aedce1338 100644
--- a/arch/powerpc/configs/taishan_defconfig
+++ b/arch/powerpc/configs/taishan_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc6 3# Linux kernel version: 2.6.25-rc2
4# Mon Dec 24 11:23:39 2007 4# Fri Feb 15 21:40:44 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -29,6 +29,7 @@ CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y 29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y 30CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
32CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
33CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
34CONFIG_ARCH_HAS_ILOG2_U32=y 35CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -67,17 +68,18 @@ CONFIG_SYSVIPC_SYSCTL=y
67CONFIG_POSIX_MQUEUE=y 68CONFIG_POSIX_MQUEUE=y
68# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
69# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
72# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set 74# CONFIG_CGROUPS is not set
75CONFIG_GROUP_SCHED=y
76CONFIG_FAIR_GROUP_SCHED=y 76CONFIG_FAIR_GROUP_SCHED=y
77CONFIG_FAIR_USER_SCHED=y 77# CONFIG_RT_GROUP_SCHED is not set
78# CONFIG_FAIR_CGROUP_SCHED is not set 78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set
79CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
80# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
81CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
82CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -91,11 +93,13 @@ CONFIG_HOTPLUG=y
91CONFIG_PRINTK=y 93CONFIG_PRINTK=y
92CONFIG_BUG=y 94CONFIG_BUG=y
93CONFIG_ELF_CORE=y 95CONFIG_ELF_CORE=y
96CONFIG_COMPAT_BRK=y
94CONFIG_BASE_FULL=y 97CONFIG_BASE_FULL=y
95CONFIG_FUTEX=y 98CONFIG_FUTEX=y
96CONFIG_ANON_INODES=y 99CONFIG_ANON_INODES=y
97CONFIG_EPOLL=y 100CONFIG_EPOLL=y
98CONFIG_SIGNALFD=y 101CONFIG_SIGNALFD=y
102CONFIG_TIMERFD=y
99CONFIG_EVENTFD=y 103CONFIG_EVENTFD=y
100CONFIG_SHMEM=y 104CONFIG_SHMEM=y
101CONFIG_VM_EVENT_COUNTERS=y 105CONFIG_VM_EVENT_COUNTERS=y
@@ -103,6 +107,13 @@ CONFIG_SLUB_DEBUG=y
103# CONFIG_SLAB is not set 107# CONFIG_SLAB is not set
104CONFIG_SLUB=y 108CONFIG_SLUB=y
105# CONFIG_SLOB is not set 109# CONFIG_SLOB is not set
110# CONFIG_PROFILING is not set
111# CONFIG_MARKERS is not set
112CONFIG_HAVE_OPROFILE=y
113# CONFIG_KPROBES is not set
114CONFIG_HAVE_KPROBES=y
115CONFIG_PROC_PAGE_MONITOR=y
116CONFIG_SLABINFO=y
106CONFIG_RT_MUTEXES=y 117CONFIG_RT_MUTEXES=y
107# CONFIG_TINY_SHMEM is not set 118# CONFIG_TINY_SHMEM is not set
108CONFIG_BASE_SMALL=0 119CONFIG_BASE_SMALL=0
@@ -130,13 +141,15 @@ CONFIG_DEFAULT_AS=y
130# CONFIG_DEFAULT_CFQ is not set 141# CONFIG_DEFAULT_CFQ is not set
131# CONFIG_DEFAULT_NOOP is not set 142# CONFIG_DEFAULT_NOOP is not set
132CONFIG_DEFAULT_IOSCHED="anticipatory" 143CONFIG_DEFAULT_IOSCHED="anticipatory"
144CONFIG_CLASSIC_RCU=y
145# CONFIG_PREEMPT_RCU is not set
133# CONFIG_PPC4xx_PCI_EXPRESS is not set 146# CONFIG_PPC4xx_PCI_EXPRESS is not set
134 147
135# 148#
136# Platform support 149# Platform support
137# 150#
138# CONFIG_PPC_MPC52xx is not set 151# CONFIG_PPC_MPC512x is not set
139# CONFIG_PPC_MPC5200 is not set 152# CONFIG_PPC_MPC5121 is not set
140# CONFIG_PPC_CELL is not set 153# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set 154# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set 155# CONFIG_PQ2ADS is not set
@@ -146,7 +159,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
146CONFIG_TAISHAN=y 159CONFIG_TAISHAN=y
147# CONFIG_KATMAI is not set 160# CONFIG_KATMAI is not set
148# CONFIG_RAINIER is not set 161# CONFIG_RAINIER is not set
162# CONFIG_WARP is not set
149CONFIG_440GX=y 163CONFIG_440GX=y
164# CONFIG_IPIC is not set
150# CONFIG_MPIC is not set 165# CONFIG_MPIC is not set
151# CONFIG_MPIC_WEIRD is not set 166# CONFIG_MPIC_WEIRD is not set
152# CONFIG_PPC_I8259 is not set 167# CONFIG_PPC_I8259 is not set
@@ -157,7 +172,6 @@ CONFIG_440GX=y
157# CONFIG_PPC_INDIRECT_IO is not set 172# CONFIG_PPC_INDIRECT_IO is not set
158# CONFIG_GENERIC_IOMAP is not set 173# CONFIG_GENERIC_IOMAP is not set
159# CONFIG_CPU_FREQ is not set 174# CONFIG_CPU_FREQ is not set
160# CONFIG_CPM2 is not set
161# CONFIG_FSL_ULI1575 is not set 175# CONFIG_FSL_ULI1575 is not set
162 176
163# 177#
@@ -173,13 +187,18 @@ CONFIG_HZ_250=y
173# CONFIG_HZ_300 is not set 187# CONFIG_HZ_300 is not set
174# CONFIG_HZ_1000 is not set 188# CONFIG_HZ_1000 is not set
175CONFIG_HZ=250 189CONFIG_HZ=250
190# CONFIG_SCHED_HRTICK is not set
176CONFIG_PREEMPT_NONE=y 191CONFIG_PREEMPT_NONE=y
177# CONFIG_PREEMPT_VOLUNTARY is not set 192# CONFIG_PREEMPT_VOLUNTARY is not set
178# CONFIG_PREEMPT is not set 193# CONFIG_PREEMPT is not set
194CONFIG_RCU_TRACE=y
179CONFIG_BINFMT_ELF=y 195CONFIG_BINFMT_ELF=y
180# CONFIG_BINFMT_MISC is not set 196# CONFIG_BINFMT_MISC is not set
181# CONFIG_MATH_EMULATION is not set 197# CONFIG_MATH_EMULATION is not set
198# CONFIG_IOMMU_HELPER is not set
182CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 199CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
200CONFIG_ARCH_HAS_WALK_MEMORY=y
201CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
183CONFIG_ARCH_FLATMEM_ENABLE=y 202CONFIG_ARCH_FLATMEM_ENABLE=y
184CONFIG_ARCH_POPULATES_NODE_MAP=y 203CONFIG_ARCH_POPULATES_NODE_MAP=y
185CONFIG_SELECT_MEMORY_MODEL=y 204CONFIG_SELECT_MEMORY_MODEL=y
@@ -199,8 +218,6 @@ CONFIG_PROC_DEVICETREE=y
199CONFIG_CMDLINE_BOOL=y 218CONFIG_CMDLINE_BOOL=y
200CONFIG_CMDLINE="" 219CONFIG_CMDLINE=""
201CONFIG_SECCOMP=y 220CONFIG_SECCOMP=y
202CONFIG_WANT_DEVICE_TREE=y
203CONFIG_DEVICE_TREE="taishan.dts"
204CONFIG_ISA_DMA_API=y 221CONFIG_ISA_DMA_API=y
205 222
206# 223#
@@ -300,6 +317,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
300# 317#
301# CONFIG_NET_PKTGEN is not set 318# CONFIG_NET_PKTGEN is not set
302# CONFIG_HAMRADIO is not set 319# CONFIG_HAMRADIO is not set
320# CONFIG_CAN is not set
303# CONFIG_IRDA is not set 321# CONFIG_IRDA is not set
304# CONFIG_BT is not set 322# CONFIG_BT is not set
305# CONFIG_AF_RXRPC is not set 323# CONFIG_AF_RXRPC is not set
@@ -346,7 +364,7 @@ CONFIG_BLK_DEV=y
346CONFIG_BLK_DEV_RAM=y 364CONFIG_BLK_DEV_RAM=y
347CONFIG_BLK_DEV_RAM_COUNT=16 365CONFIG_BLK_DEV_RAM_COUNT=16
348CONFIG_BLK_DEV_RAM_SIZE=35000 366CONFIG_BLK_DEV_RAM_SIZE=35000
349CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 367# CONFIG_BLK_DEV_XIP is not set
350# CONFIG_CDROM_PKTCDVD is not set 368# CONFIG_CDROM_PKTCDVD is not set
351# CONFIG_ATA_OVER_ETH is not set 369# CONFIG_ATA_OVER_ETH is not set
352# CONFIG_XILINX_SYSACE is not set 370# CONFIG_XILINX_SYSACE is not set
@@ -355,6 +373,8 @@ CONFIG_MISC_DEVICES=y
355# CONFIG_EEPROM_93CX6 is not set 373# CONFIG_EEPROM_93CX6 is not set
356# CONFIG_SGI_IOC4 is not set 374# CONFIG_SGI_IOC4 is not set
357# CONFIG_TIFM_CORE is not set 375# CONFIG_TIFM_CORE is not set
376# CONFIG_ENCLOSURE_SERVICES is not set
377CONFIG_HAVE_IDE=y
358# CONFIG_IDE is not set 378# CONFIG_IDE is not set
359 379
360# 380#
@@ -385,7 +405,6 @@ CONFIG_NETDEVICES=y
385# CONFIG_EQUALIZER is not set 405# CONFIG_EQUALIZER is not set
386# CONFIG_TUN is not set 406# CONFIG_TUN is not set
387# CONFIG_VETH is not set 407# CONFIG_VETH is not set
388# CONFIG_IP1000 is not set
389# CONFIG_ARCNET is not set 408# CONFIG_ARCNET is not set
390# CONFIG_PHYLIB is not set 409# CONFIG_PHYLIB is not set
391CONFIG_NET_ETHERNET=y 410CONFIG_NET_ETHERNET=y
@@ -414,6 +433,9 @@ CONFIG_NETDEV_1000=y
414# CONFIG_DL2K is not set 433# CONFIG_DL2K is not set
415# CONFIG_E1000 is not set 434# CONFIG_E1000 is not set
416# CONFIG_E1000E is not set 435# CONFIG_E1000E is not set
436# CONFIG_E1000E_ENABLED is not set
437# CONFIG_IP1000 is not set
438# CONFIG_IGB is not set
417# CONFIG_NS83820 is not set 439# CONFIG_NS83820 is not set
418# CONFIG_HAMACHI is not set 440# CONFIG_HAMACHI is not set
419# CONFIG_YELLOWFIN is not set 441# CONFIG_YELLOWFIN is not set
@@ -438,6 +460,7 @@ CONFIG_NETDEV_10000=y
438# CONFIG_NIU is not set 460# CONFIG_NIU is not set
439# CONFIG_MLX4_CORE is not set 461# CONFIG_MLX4_CORE is not set
440# CONFIG_TEHUTI is not set 462# CONFIG_TEHUTI is not set
463# CONFIG_BNX2X is not set
441# CONFIG_TR is not set 464# CONFIG_TR is not set
442 465
443# 466#
@@ -450,7 +473,6 @@ CONFIG_NETDEV_10000=y
450# CONFIG_HIPPI is not set 473# CONFIG_HIPPI is not set
451# CONFIG_PPP is not set 474# CONFIG_PPP is not set
452# CONFIG_SLIP is not set 475# CONFIG_SLIP is not set
453# CONFIG_SHAPER is not set
454# CONFIG_NETCONSOLE is not set 476# CONFIG_NETCONSOLE is not set
455# CONFIG_NETPOLL is not set 477# CONFIG_NETPOLL is not set
456# CONFIG_NET_POLL_CONTROLLER is not set 478# CONFIG_NET_POLL_CONTROLLER is not set
@@ -473,6 +495,7 @@ CONFIG_NETDEV_10000=y
473# 495#
474# CONFIG_VT is not set 496# CONFIG_VT is not set
475# CONFIG_SERIAL_NONSTANDARD is not set 497# CONFIG_SERIAL_NONSTANDARD is not set
498# CONFIG_NOZOMI is not set
476 499
477# 500#
478# Serial drivers 501# Serial drivers
@@ -518,6 +541,7 @@ CONFIG_DEVPORT=y
518# CONFIG_W1 is not set 541# CONFIG_W1 is not set
519# CONFIG_POWER_SUPPLY is not set 542# CONFIG_POWER_SUPPLY is not set
520# CONFIG_HWMON is not set 543# CONFIG_HWMON is not set
544CONFIG_THERMAL=y
521# CONFIG_WATCHDOG is not set 545# CONFIG_WATCHDOG is not set
522 546
523# 547#
@@ -566,12 +590,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
566# 590#
567# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 591# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
568# 592#
569
570#
571# USB Gadget Support
572#
573# CONFIG_USB_GADGET is not set 593# CONFIG_USB_GADGET is not set
574# CONFIG_MMC is not set 594# CONFIG_MMC is not set
595# CONFIG_MEMSTICK is not set
575# CONFIG_NEW_LEDS is not set 596# CONFIG_NEW_LEDS is not set
576# CONFIG_INFINIBAND is not set 597# CONFIG_INFINIBAND is not set
577# CONFIG_EDAC is not set 598# CONFIG_EDAC is not set
@@ -596,12 +617,10 @@ CONFIG_EXT2_FS=y
596# CONFIG_XFS_FS is not set 617# CONFIG_XFS_FS is not set
597# CONFIG_GFS2_FS is not set 618# CONFIG_GFS2_FS is not set
598# CONFIG_OCFS2_FS is not set 619# CONFIG_OCFS2_FS is not set
599# CONFIG_MINIX_FS is not set 620CONFIG_DNOTIFY=y
600# CONFIG_ROMFS_FS is not set
601CONFIG_INOTIFY=y 621CONFIG_INOTIFY=y
602CONFIG_INOTIFY_USER=y 622CONFIG_INOTIFY_USER=y
603# CONFIG_QUOTA is not set 623# CONFIG_QUOTA is not set
604CONFIG_DNOTIFY=y
605# CONFIG_AUTOFS_FS is not set 624# CONFIG_AUTOFS_FS is not set
606# CONFIG_AUTOFS4_FS is not set 625# CONFIG_AUTOFS4_FS is not set
607# CONFIG_FUSE_FS is not set 626# CONFIG_FUSE_FS is not set
@@ -643,8 +662,10 @@ CONFIG_TMPFS=y
643# CONFIG_EFS_FS is not set 662# CONFIG_EFS_FS is not set
644CONFIG_CRAMFS=y 663CONFIG_CRAMFS=y
645# CONFIG_VXFS_FS is not set 664# CONFIG_VXFS_FS is not set
665# CONFIG_MINIX_FS is not set
646# CONFIG_HPFS_FS is not set 666# CONFIG_HPFS_FS is not set
647# CONFIG_QNX4FS_FS is not set 667# CONFIG_QNX4FS_FS is not set
668# CONFIG_ROMFS_FS is not set
648# CONFIG_SYSV_FS is not set 669# CONFIG_SYSV_FS is not set
649# CONFIG_UFS_FS is not set 670# CONFIG_UFS_FS is not set
650CONFIG_NETWORK_FILESYSTEMS=y 671CONFIG_NETWORK_FILESYSTEMS=y
@@ -675,7 +696,6 @@ CONFIG_SUNRPC=y
675CONFIG_MSDOS_PARTITION=y 696CONFIG_MSDOS_PARTITION=y
676# CONFIG_NLS is not set 697# CONFIG_NLS is not set
677# CONFIG_DLM is not set 698# CONFIG_DLM is not set
678# CONFIG_UCC_SLOW is not set
679 699
680# 700#
681# Library routines 701# Library routines
@@ -692,10 +712,6 @@ CONFIG_PLIST=y
692CONFIG_HAS_IOMEM=y 712CONFIG_HAS_IOMEM=y
693CONFIG_HAS_IOPORT=y 713CONFIG_HAS_IOPORT=y
694CONFIG_HAS_DMA=y 714CONFIG_HAS_DMA=y
695CONFIG_INSTRUMENTATION=y
696# CONFIG_PROFILING is not set
697# CONFIG_KPROBES is not set
698# CONFIG_MARKERS is not set
699 715
700# 716#
701# Kernel hacking 717# Kernel hacking
@@ -705,7 +721,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
705CONFIG_ENABLE_MUST_CHECK=y 721CONFIG_ENABLE_MUST_CHECK=y
706CONFIG_MAGIC_SYSRQ=y 722CONFIG_MAGIC_SYSRQ=y
707# CONFIG_UNUSED_SYMBOLS is not set 723# CONFIG_UNUSED_SYMBOLS is not set
708# CONFIG_DEBUG_FS is not set 724CONFIG_DEBUG_FS=y
709# CONFIG_HEADERS_CHECK is not set 725# CONFIG_HEADERS_CHECK is not set
710CONFIG_DEBUG_KERNEL=y 726CONFIG_DEBUG_KERNEL=y
711# CONFIG_DEBUG_SHIRQ is not set 727# CONFIG_DEBUG_SHIRQ is not set
@@ -714,6 +730,7 @@ CONFIG_SCHED_DEBUG=y
714# CONFIG_SCHEDSTATS is not set 730# CONFIG_SCHEDSTATS is not set
715# CONFIG_TIMER_STATS is not set 731# CONFIG_TIMER_STATS is not set
716# CONFIG_SLUB_DEBUG_ON is not set 732# CONFIG_SLUB_DEBUG_ON is not set
733# CONFIG_SLUB_STATS is not set
717# CONFIG_DEBUG_RT_MUTEXES is not set 734# CONFIG_DEBUG_RT_MUTEXES is not set
718# CONFIG_RT_MUTEX_TESTER is not set 735# CONFIG_RT_MUTEX_TESTER is not set
719# CONFIG_DEBUG_SPINLOCK is not set 736# CONFIG_DEBUG_SPINLOCK is not set
@@ -726,9 +743,9 @@ CONFIG_SCHED_DEBUG=y
726# CONFIG_DEBUG_VM is not set 743# CONFIG_DEBUG_VM is not set
727# CONFIG_DEBUG_LIST is not set 744# CONFIG_DEBUG_LIST is not set
728# CONFIG_DEBUG_SG is not set 745# CONFIG_DEBUG_SG is not set
729CONFIG_FORCED_INLINING=y
730# CONFIG_BOOT_PRINTK_DELAY is not set 746# CONFIG_BOOT_PRINTK_DELAY is not set
731# CONFIG_RCU_TORTURE_TEST is not set 747# CONFIG_RCU_TORTURE_TEST is not set
748# CONFIG_BACKTRACE_SELF_TEST is not set
732# CONFIG_FAULT_INJECTION is not set 749# CONFIG_FAULT_INJECTION is not set
733# CONFIG_SAMPLES is not set 750# CONFIG_SAMPLES is not set
734# CONFIG_DEBUG_STACKOVERFLOW is not set 751# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -737,6 +754,7 @@ CONFIG_FORCED_INLINING=y
737CONFIG_DEBUGGER=y 754CONFIG_DEBUGGER=y
738# CONFIG_KGDB is not set 755# CONFIG_KGDB is not set
739# CONFIG_XMON is not set 756# CONFIG_XMON is not set
757# CONFIG_VIRQ_DEBUG is not set
740# CONFIG_BDI_SWITCH is not set 758# CONFIG_BDI_SWITCH is not set
741# CONFIG_PPC_EARLY_DEBUG is not set 759# CONFIG_PPC_EARLY_DEBUG is not set
742 760
@@ -749,6 +767,7 @@ CONFIG_DEBUGGER=y
749CONFIG_CRYPTO=y 767CONFIG_CRYPTO=y
750CONFIG_CRYPTO_ALGAPI=y 768CONFIG_CRYPTO_ALGAPI=y
751CONFIG_CRYPTO_BLKCIPHER=y 769CONFIG_CRYPTO_BLKCIPHER=y
770# CONFIG_CRYPTO_SEQIV is not set
752CONFIG_CRYPTO_MANAGER=y 771CONFIG_CRYPTO_MANAGER=y
753# CONFIG_CRYPTO_HMAC is not set 772# CONFIG_CRYPTO_HMAC is not set
754# CONFIG_CRYPTO_XCBC is not set 773# CONFIG_CRYPTO_XCBC is not set
@@ -766,6 +785,9 @@ CONFIG_CRYPTO_CBC=y
766CONFIG_CRYPTO_PCBC=y 785CONFIG_CRYPTO_PCBC=y
767# CONFIG_CRYPTO_LRW is not set 786# CONFIG_CRYPTO_LRW is not set
768# CONFIG_CRYPTO_XTS is not set 787# CONFIG_CRYPTO_XTS is not set
788# CONFIG_CRYPTO_CTR is not set
789# CONFIG_CRYPTO_GCM is not set
790# CONFIG_CRYPTO_CCM is not set
769# CONFIG_CRYPTO_CRYPTD is not set 791# CONFIG_CRYPTO_CRYPTD is not set
770CONFIG_CRYPTO_DES=y 792CONFIG_CRYPTO_DES=y
771# CONFIG_CRYPTO_FCRYPT is not set 793# CONFIG_CRYPTO_FCRYPT is not set
@@ -780,11 +802,14 @@ CONFIG_CRYPTO_DES=y
780# CONFIG_CRYPTO_KHAZAD is not set 802# CONFIG_CRYPTO_KHAZAD is not set
781# CONFIG_CRYPTO_ANUBIS is not set 803# CONFIG_CRYPTO_ANUBIS is not set
782# CONFIG_CRYPTO_SEED is not set 804# CONFIG_CRYPTO_SEED is not set
805# CONFIG_CRYPTO_SALSA20 is not set
783# CONFIG_CRYPTO_DEFLATE is not set 806# CONFIG_CRYPTO_DEFLATE is not set
784# CONFIG_CRYPTO_MICHAEL_MIC is not set 807# CONFIG_CRYPTO_MICHAEL_MIC is not set
785# CONFIG_CRYPTO_CRC32C is not set 808# CONFIG_CRYPTO_CRC32C is not set
786# CONFIG_CRYPTO_CAMELLIA is not set 809# CONFIG_CRYPTO_CAMELLIA is not set
787# CONFIG_CRYPTO_TEST is not set 810# CONFIG_CRYPTO_TEST is not set
788# CONFIG_CRYPTO_AUTHENC is not set 811# CONFIG_CRYPTO_AUTHENC is not set
812# CONFIG_CRYPTO_LZO is not set
789CONFIG_CRYPTO_HW=y 813CONFIG_CRYPTO_HW=y
814# CONFIG_CRYPTO_DEV_HIFN_795X is not set
790# CONFIG_PPC_CLOCK is not set 815# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/walnut_defconfig b/arch/powerpc/configs/walnut_defconfig
index e431128e8e9e..3b2689e5002a 100644
--- a/arch/powerpc/configs/walnut_defconfig
+++ b/arch/powerpc/configs/walnut_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc6 3# Linux kernel version: 2.6.25-rc2
4# Mon Dec 24 11:23:58 2007 4# Fri Feb 15 21:54:12 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -26,6 +26,7 @@ CONFIG_GENERIC_TIME=y
26CONFIG_GENERIC_TIME_VSYSCALL=y 26CONFIG_GENERIC_TIME_VSYSCALL=y
27CONFIG_GENERIC_CLOCKEVENTS=y 27CONFIG_GENERIC_CLOCKEVENTS=y
28CONFIG_GENERIC_HARDIRQS=y 28CONFIG_GENERIC_HARDIRQS=y
29# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
29CONFIG_IRQ_PER_CPU=y 30CONFIG_IRQ_PER_CPU=y
30CONFIG_RWSEM_XCHGADD_ALGORITHM=y 31CONFIG_RWSEM_XCHGADD_ALGORITHM=y
31CONFIG_ARCH_HAS_ILOG2_U32=y 32CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -64,17 +65,18 @@ CONFIG_SYSVIPC_SYSCTL=y
64CONFIG_POSIX_MQUEUE=y 65CONFIG_POSIX_MQUEUE=y
65# CONFIG_BSD_PROCESS_ACCT is not set 66# CONFIG_BSD_PROCESS_ACCT is not set
66# CONFIG_TASKSTATS is not set 67# CONFIG_TASKSTATS is not set
67# CONFIG_USER_NS is not set
68# CONFIG_PID_NS is not set
69# CONFIG_AUDIT is not set 68# CONFIG_AUDIT is not set
70# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
72# CONFIG_CGROUPS is not set 71# CONFIG_CGROUPS is not set
72CONFIG_GROUP_SCHED=y
73CONFIG_FAIR_GROUP_SCHED=y 73CONFIG_FAIR_GROUP_SCHED=y
74CONFIG_FAIR_USER_SCHED=y 74# CONFIG_RT_GROUP_SCHED is not set
75# CONFIG_FAIR_CGROUP_SCHED is not set 75CONFIG_USER_SCHED=y
76# CONFIG_CGROUP_SCHED is not set
76CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
77# CONFIG_RELAY is not set 78# CONFIG_RELAY is not set
79# CONFIG_NAMESPACES is not set
78CONFIG_BLK_DEV_INITRD=y 80CONFIG_BLK_DEV_INITRD=y
79CONFIG_INITRAMFS_SOURCE="" 81CONFIG_INITRAMFS_SOURCE=""
80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -88,11 +90,13 @@ CONFIG_HOTPLUG=y
88CONFIG_PRINTK=y 90CONFIG_PRINTK=y
89CONFIG_BUG=y 91CONFIG_BUG=y
90CONFIG_ELF_CORE=y 92CONFIG_ELF_CORE=y
93CONFIG_COMPAT_BRK=y
91CONFIG_BASE_FULL=y 94CONFIG_BASE_FULL=y
92CONFIG_FUTEX=y 95CONFIG_FUTEX=y
93CONFIG_ANON_INODES=y 96CONFIG_ANON_INODES=y
94CONFIG_EPOLL=y 97CONFIG_EPOLL=y
95CONFIG_SIGNALFD=y 98CONFIG_SIGNALFD=y
99CONFIG_TIMERFD=y
96CONFIG_EVENTFD=y 100CONFIG_EVENTFD=y
97CONFIG_SHMEM=y 101CONFIG_SHMEM=y
98CONFIG_VM_EVENT_COUNTERS=y 102CONFIG_VM_EVENT_COUNTERS=y
@@ -100,6 +104,13 @@ CONFIG_SLUB_DEBUG=y
100# CONFIG_SLAB is not set 104# CONFIG_SLAB is not set
101CONFIG_SLUB=y 105CONFIG_SLUB=y
102# CONFIG_SLOB is not set 106# CONFIG_SLOB is not set
107# CONFIG_PROFILING is not set
108# CONFIG_MARKERS is not set
109CONFIG_HAVE_OPROFILE=y
110# CONFIG_KPROBES is not set
111CONFIG_HAVE_KPROBES=y
112CONFIG_PROC_PAGE_MONITOR=y
113CONFIG_SLABINFO=y
103CONFIG_RT_MUTEXES=y 114CONFIG_RT_MUTEXES=y
104# CONFIG_TINY_SHMEM is not set 115# CONFIG_TINY_SHMEM is not set
105CONFIG_BASE_SMALL=0 116CONFIG_BASE_SMALL=0
@@ -127,13 +138,15 @@ CONFIG_DEFAULT_AS=y
127# CONFIG_DEFAULT_CFQ is not set 138# CONFIG_DEFAULT_CFQ is not set
128# CONFIG_DEFAULT_NOOP is not set 139# CONFIG_DEFAULT_NOOP is not set
129CONFIG_DEFAULT_IOSCHED="anticipatory" 140CONFIG_DEFAULT_IOSCHED="anticipatory"
141CONFIG_CLASSIC_RCU=y
142# CONFIG_PREEMPT_RCU is not set
130# CONFIG_PPC4xx_PCI_EXPRESS is not set 143# CONFIG_PPC4xx_PCI_EXPRESS is not set
131 144
132# 145#
133# Platform support 146# Platform support
134# 147#
135# CONFIG_PPC_MPC52xx is not set 148# CONFIG_PPC_MPC512x is not set
136# CONFIG_PPC_MPC5200 is not set 149# CONFIG_PPC_MPC5121 is not set
137# CONFIG_PPC_CELL is not set 150# CONFIG_PPC_CELL is not set
138# CONFIG_PPC_CELL_NATIVE is not set 151# CONFIG_PPC_CELL_NATIVE is not set
139# CONFIG_PQ2ADS is not set 152# CONFIG_PQ2ADS is not set
@@ -145,6 +158,7 @@ CONFIG_WALNUT=y
145CONFIG_405GP=y 158CONFIG_405GP=y
146CONFIG_IBM405_ERR77=y 159CONFIG_IBM405_ERR77=y
147CONFIG_IBM405_ERR51=y 160CONFIG_IBM405_ERR51=y
161# CONFIG_IPIC is not set
148# CONFIG_MPIC is not set 162# CONFIG_MPIC is not set
149# CONFIG_MPIC_WEIRD is not set 163# CONFIG_MPIC_WEIRD is not set
150# CONFIG_PPC_I8259 is not set 164# CONFIG_PPC_I8259 is not set
@@ -155,8 +169,8 @@ CONFIG_IBM405_ERR51=y
155# CONFIG_PPC_INDIRECT_IO is not set 169# CONFIG_PPC_INDIRECT_IO is not set
156# CONFIG_GENERIC_IOMAP is not set 170# CONFIG_GENERIC_IOMAP is not set
157# CONFIG_CPU_FREQ is not set 171# CONFIG_CPU_FREQ is not set
158# CONFIG_CPM2 is not set
159# CONFIG_FSL_ULI1575 is not set 172# CONFIG_FSL_ULI1575 is not set
173CONFIG_OF_RTC=y
160 174
161# 175#
162# Kernel options 176# Kernel options
@@ -171,13 +185,18 @@ CONFIG_HZ_250=y
171# CONFIG_HZ_300 is not set 185# CONFIG_HZ_300 is not set
172# CONFIG_HZ_1000 is not set 186# CONFIG_HZ_1000 is not set
173CONFIG_HZ=250 187CONFIG_HZ=250
188# CONFIG_SCHED_HRTICK is not set
174CONFIG_PREEMPT_NONE=y 189CONFIG_PREEMPT_NONE=y
175# CONFIG_PREEMPT_VOLUNTARY is not set 190# CONFIG_PREEMPT_VOLUNTARY is not set
176# CONFIG_PREEMPT is not set 191# CONFIG_PREEMPT is not set
192CONFIG_RCU_TRACE=y
177CONFIG_BINFMT_ELF=y 193CONFIG_BINFMT_ELF=y
178# CONFIG_BINFMT_MISC is not set 194# CONFIG_BINFMT_MISC is not set
179# CONFIG_MATH_EMULATION is not set 195# CONFIG_MATH_EMULATION is not set
196# CONFIG_IOMMU_HELPER is not set
180CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 197CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
198CONFIG_ARCH_HAS_WALK_MEMORY=y
199CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
181CONFIG_ARCH_FLATMEM_ENABLE=y 200CONFIG_ARCH_FLATMEM_ENABLE=y
182CONFIG_ARCH_POPULATES_NODE_MAP=y 201CONFIG_ARCH_POPULATES_NODE_MAP=y
183CONFIG_SELECT_MEMORY_MODEL=y 202CONFIG_SELECT_MEMORY_MODEL=y
@@ -196,11 +215,7 @@ CONFIG_VIRT_TO_BUS=y
196CONFIG_PROC_DEVICETREE=y 215CONFIG_PROC_DEVICETREE=y
197# CONFIG_CMDLINE_BOOL is not set 216# CONFIG_CMDLINE_BOOL is not set
198# CONFIG_PM is not set 217# CONFIG_PM is not set
199CONFIG_SUSPEND_UP_POSSIBLE=y
200CONFIG_HIBERNATION_UP_POSSIBLE=y
201CONFIG_SECCOMP=y 218CONFIG_SECCOMP=y
202CONFIG_WANT_DEVICE_TREE=y
203CONFIG_DEVICE_TREE="walnut.dts"
204CONFIG_ISA_DMA_API=y 219CONFIG_ISA_DMA_API=y
205 220
206# 221#
@@ -300,6 +315,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
300# 315#
301# CONFIG_NET_PKTGEN is not set 316# CONFIG_NET_PKTGEN is not set
302# CONFIG_HAMRADIO is not set 317# CONFIG_HAMRADIO is not set
318# CONFIG_CAN is not set
303# CONFIG_IRDA is not set 319# CONFIG_IRDA is not set
304# CONFIG_BT is not set 320# CONFIG_BT is not set
305# CONFIG_AF_RXRPC is not set 321# CONFIG_AF_RXRPC is not set
@@ -336,6 +352,7 @@ CONFIG_MTD=y
336CONFIG_MTD_PARTITIONS=y 352CONFIG_MTD_PARTITIONS=y
337# CONFIG_MTD_REDBOOT_PARTS is not set 353# CONFIG_MTD_REDBOOT_PARTS is not set
338CONFIG_MTD_CMDLINE_PARTS=y 354CONFIG_MTD_CMDLINE_PARTS=y
355CONFIG_MTD_OF_PARTS=y
339 356
340# 357#
341# User Modules And Translation Layers 358# User Modules And Translation Layers
@@ -422,7 +439,7 @@ CONFIG_BLK_DEV=y
422CONFIG_BLK_DEV_RAM=y 439CONFIG_BLK_DEV_RAM=y
423CONFIG_BLK_DEV_RAM_COUNT=16 440CONFIG_BLK_DEV_RAM_COUNT=16
424CONFIG_BLK_DEV_RAM_SIZE=35000 441CONFIG_BLK_DEV_RAM_SIZE=35000
425CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 442# CONFIG_BLK_DEV_XIP is not set
426# CONFIG_CDROM_PKTCDVD is not set 443# CONFIG_CDROM_PKTCDVD is not set
427# CONFIG_ATA_OVER_ETH is not set 444# CONFIG_ATA_OVER_ETH is not set
428# CONFIG_XILINX_SYSACE is not set 445# CONFIG_XILINX_SYSACE is not set
@@ -431,6 +448,8 @@ CONFIG_MISC_DEVICES=y
431# CONFIG_EEPROM_93CX6 is not set 448# CONFIG_EEPROM_93CX6 is not set
432# CONFIG_SGI_IOC4 is not set 449# CONFIG_SGI_IOC4 is not set
433# CONFIG_TIFM_CORE is not set 450# CONFIG_TIFM_CORE is not set
451# CONFIG_ENCLOSURE_SERVICES is not set
452CONFIG_HAVE_IDE=y
434# CONFIG_IDE is not set 453# CONFIG_IDE is not set
435 454
436# 455#
@@ -459,7 +478,6 @@ CONFIG_NETDEVICES=y
459# CONFIG_EQUALIZER is not set 478# CONFIG_EQUALIZER is not set
460# CONFIG_TUN is not set 479# CONFIG_TUN is not set
461# CONFIG_VETH is not set 480# CONFIG_VETH is not set
462# CONFIG_IP1000 is not set
463# CONFIG_ARCNET is not set 481# CONFIG_ARCNET is not set
464# CONFIG_PHYLIB is not set 482# CONFIG_PHYLIB is not set
465CONFIG_NET_ETHERNET=y 483CONFIG_NET_ETHERNET=y
@@ -488,6 +506,9 @@ CONFIG_NETDEV_1000=y
488# CONFIG_DL2K is not set 506# CONFIG_DL2K is not set
489# CONFIG_E1000 is not set 507# CONFIG_E1000 is not set
490# CONFIG_E1000E is not set 508# CONFIG_E1000E is not set
509# CONFIG_E1000E_ENABLED is not set
510# CONFIG_IP1000 is not set
511# CONFIG_IGB is not set
491# CONFIG_NS83820 is not set 512# CONFIG_NS83820 is not set
492# CONFIG_HAMACHI is not set 513# CONFIG_HAMACHI is not set
493# CONFIG_YELLOWFIN is not set 514# CONFIG_YELLOWFIN is not set
@@ -512,6 +533,7 @@ CONFIG_NETDEV_10000=y
512# CONFIG_NIU is not set 533# CONFIG_NIU is not set
513# CONFIG_MLX4_CORE is not set 534# CONFIG_MLX4_CORE is not set
514# CONFIG_TEHUTI is not set 535# CONFIG_TEHUTI is not set
536# CONFIG_BNX2X is not set
515# CONFIG_TR is not set 537# CONFIG_TR is not set
516 538
517# 539#
@@ -524,7 +546,6 @@ CONFIG_NETDEV_10000=y
524# CONFIG_HIPPI is not set 546# CONFIG_HIPPI is not set
525# CONFIG_PPP is not set 547# CONFIG_PPP is not set
526# CONFIG_SLIP is not set 548# CONFIG_SLIP is not set
527# CONFIG_SHAPER is not set
528# CONFIG_NETCONSOLE is not set 549# CONFIG_NETCONSOLE is not set
529# CONFIG_NETPOLL is not set 550# CONFIG_NETPOLL is not set
530# CONFIG_NET_POLL_CONTROLLER is not set 551# CONFIG_NET_POLL_CONTROLLER is not set
@@ -547,6 +568,7 @@ CONFIG_NETDEV_10000=y
547# 568#
548# CONFIG_VT is not set 569# CONFIG_VT is not set
549# CONFIG_SERIAL_NONSTANDARD is not set 570# CONFIG_SERIAL_NONSTANDARD is not set
571# CONFIG_NOZOMI is not set
550 572
551# 573#
552# Serial drivers 574# Serial drivers
@@ -592,6 +614,7 @@ CONFIG_DEVPORT=y
592# CONFIG_W1 is not set 614# CONFIG_W1 is not set
593# CONFIG_POWER_SUPPLY is not set 615# CONFIG_POWER_SUPPLY is not set
594# CONFIG_HWMON is not set 616# CONFIG_HWMON is not set
617CONFIG_THERMAL=y
595# CONFIG_WATCHDOG is not set 618# CONFIG_WATCHDOG is not set
596 619
597# 620#
@@ -640,12 +663,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
640# 663#
641# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 664# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
642# 665#
643
644#
645# USB Gadget Support
646#
647# CONFIG_USB_GADGET is not set 666# CONFIG_USB_GADGET is not set
648# CONFIG_MMC is not set 667# CONFIG_MMC is not set
668# CONFIG_MEMSTICK is not set
649# CONFIG_NEW_LEDS is not set 669# CONFIG_NEW_LEDS is not set
650# CONFIG_INFINIBAND is not set 670# CONFIG_INFINIBAND is not set
651# CONFIG_EDAC is not set 671# CONFIG_EDAC is not set
@@ -670,12 +690,10 @@ CONFIG_EXT2_FS=y
670# CONFIG_XFS_FS is not set 690# CONFIG_XFS_FS is not set
671# CONFIG_GFS2_FS is not set 691# CONFIG_GFS2_FS is not set
672# CONFIG_OCFS2_FS is not set 692# CONFIG_OCFS2_FS is not set
673# CONFIG_MINIX_FS is not set 693CONFIG_DNOTIFY=y
674# CONFIG_ROMFS_FS is not set
675CONFIG_INOTIFY=y 694CONFIG_INOTIFY=y
676CONFIG_INOTIFY_USER=y 695CONFIG_INOTIFY_USER=y
677# CONFIG_QUOTA is not set 696# CONFIG_QUOTA is not set
678CONFIG_DNOTIFY=y
679# CONFIG_AUTOFS_FS is not set 697# CONFIG_AUTOFS_FS is not set
680# CONFIG_AUTOFS4_FS is not set 698# CONFIG_AUTOFS4_FS is not set
681# CONFIG_FUSE_FS is not set 699# CONFIG_FUSE_FS is not set
@@ -718,8 +736,10 @@ CONFIG_TMPFS=y
718# CONFIG_JFFS2_FS is not set 736# CONFIG_JFFS2_FS is not set
719CONFIG_CRAMFS=y 737CONFIG_CRAMFS=y
720# CONFIG_VXFS_FS is not set 738# CONFIG_VXFS_FS is not set
739# CONFIG_MINIX_FS is not set
721# CONFIG_HPFS_FS is not set 740# CONFIG_HPFS_FS is not set
722# CONFIG_QNX4FS_FS is not set 741# CONFIG_QNX4FS_FS is not set
742# CONFIG_ROMFS_FS is not set
723# CONFIG_SYSV_FS is not set 743# CONFIG_SYSV_FS is not set
724# CONFIG_UFS_FS is not set 744# CONFIG_UFS_FS is not set
725CONFIG_NETWORK_FILESYSTEMS=y 745CONFIG_NETWORK_FILESYSTEMS=y
@@ -750,7 +770,6 @@ CONFIG_SUNRPC=y
750CONFIG_MSDOS_PARTITION=y 770CONFIG_MSDOS_PARTITION=y
751# CONFIG_NLS is not set 771# CONFIG_NLS is not set
752# CONFIG_DLM is not set 772# CONFIG_DLM is not set
753# CONFIG_UCC_SLOW is not set
754 773
755# 774#
756# Library routines 775# Library routines
@@ -767,7 +786,6 @@ CONFIG_PLIST=y
767CONFIG_HAS_IOMEM=y 786CONFIG_HAS_IOMEM=y
768CONFIG_HAS_IOPORT=y 787CONFIG_HAS_IOPORT=y
769CONFIG_HAS_DMA=y 788CONFIG_HAS_DMA=y
770# CONFIG_INSTRUMENTATION is not set
771 789
772# 790#
773# Kernel hacking 791# Kernel hacking
@@ -777,7 +795,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
777CONFIG_ENABLE_MUST_CHECK=y 795CONFIG_ENABLE_MUST_CHECK=y
778CONFIG_MAGIC_SYSRQ=y 796CONFIG_MAGIC_SYSRQ=y
779# CONFIG_UNUSED_SYMBOLS is not set 797# CONFIG_UNUSED_SYMBOLS is not set
780# CONFIG_DEBUG_FS is not set 798CONFIG_DEBUG_FS=y
781# CONFIG_HEADERS_CHECK is not set 799# CONFIG_HEADERS_CHECK is not set
782CONFIG_DEBUG_KERNEL=y 800CONFIG_DEBUG_KERNEL=y
783# CONFIG_DEBUG_SHIRQ is not set 801# CONFIG_DEBUG_SHIRQ is not set
@@ -786,6 +804,7 @@ CONFIG_SCHED_DEBUG=y
786# CONFIG_SCHEDSTATS is not set 804# CONFIG_SCHEDSTATS is not set
787# CONFIG_TIMER_STATS is not set 805# CONFIG_TIMER_STATS is not set
788# CONFIG_SLUB_DEBUG_ON is not set 806# CONFIG_SLUB_DEBUG_ON is not set
807# CONFIG_SLUB_STATS is not set
789# CONFIG_DEBUG_RT_MUTEXES is not set 808# CONFIG_DEBUG_RT_MUTEXES is not set
790# CONFIG_RT_MUTEX_TESTER is not set 809# CONFIG_RT_MUTEX_TESTER is not set
791# CONFIG_DEBUG_SPINLOCK is not set 810# CONFIG_DEBUG_SPINLOCK is not set
@@ -798,15 +817,16 @@ CONFIG_DEBUG_BUGVERBOSE=y
798# CONFIG_DEBUG_VM is not set 817# CONFIG_DEBUG_VM is not set
799# CONFIG_DEBUG_LIST is not set 818# CONFIG_DEBUG_LIST is not set
800# CONFIG_DEBUG_SG is not set 819# CONFIG_DEBUG_SG is not set
801CONFIG_FORCED_INLINING=y
802# CONFIG_BOOT_PRINTK_DELAY is not set 820# CONFIG_BOOT_PRINTK_DELAY is not set
803# CONFIG_RCU_TORTURE_TEST is not set 821# CONFIG_RCU_TORTURE_TEST is not set
822# CONFIG_BACKTRACE_SELF_TEST is not set
804# CONFIG_FAULT_INJECTION is not set 823# CONFIG_FAULT_INJECTION is not set
805# CONFIG_SAMPLES is not set 824# CONFIG_SAMPLES is not set
806# CONFIG_DEBUG_STACKOVERFLOW is not set 825# CONFIG_DEBUG_STACKOVERFLOW is not set
807# CONFIG_DEBUG_STACK_USAGE is not set 826# CONFIG_DEBUG_STACK_USAGE is not set
808# CONFIG_DEBUG_PAGEALLOC is not set 827# CONFIG_DEBUG_PAGEALLOC is not set
809# CONFIG_DEBUGGER is not set 828# CONFIG_DEBUGGER is not set
829# CONFIG_VIRQ_DEBUG is not set
810# CONFIG_BDI_SWITCH is not set 830# CONFIG_BDI_SWITCH is not set
811# CONFIG_PPC_EARLY_DEBUG is not set 831# CONFIG_PPC_EARLY_DEBUG is not set
812 832
@@ -819,6 +839,7 @@ CONFIG_FORCED_INLINING=y
819CONFIG_CRYPTO=y 839CONFIG_CRYPTO=y
820CONFIG_CRYPTO_ALGAPI=y 840CONFIG_CRYPTO_ALGAPI=y
821CONFIG_CRYPTO_BLKCIPHER=y 841CONFIG_CRYPTO_BLKCIPHER=y
842# CONFIG_CRYPTO_SEQIV is not set
822CONFIG_CRYPTO_MANAGER=y 843CONFIG_CRYPTO_MANAGER=y
823# CONFIG_CRYPTO_HMAC is not set 844# CONFIG_CRYPTO_HMAC is not set
824# CONFIG_CRYPTO_XCBC is not set 845# CONFIG_CRYPTO_XCBC is not set
@@ -836,6 +857,9 @@ CONFIG_CRYPTO_CBC=y
836CONFIG_CRYPTO_PCBC=y 857CONFIG_CRYPTO_PCBC=y
837# CONFIG_CRYPTO_LRW is not set 858# CONFIG_CRYPTO_LRW is not set
838# CONFIG_CRYPTO_XTS is not set 859# CONFIG_CRYPTO_XTS is not set
860# CONFIG_CRYPTO_CTR is not set
861# CONFIG_CRYPTO_GCM is not set
862# CONFIG_CRYPTO_CCM is not set
839# CONFIG_CRYPTO_CRYPTD is not set 863# CONFIG_CRYPTO_CRYPTD is not set
840CONFIG_CRYPTO_DES=y 864CONFIG_CRYPTO_DES=y
841# CONFIG_CRYPTO_FCRYPT is not set 865# CONFIG_CRYPTO_FCRYPT is not set
@@ -850,11 +874,14 @@ CONFIG_CRYPTO_DES=y
850# CONFIG_CRYPTO_KHAZAD is not set 874# CONFIG_CRYPTO_KHAZAD is not set
851# CONFIG_CRYPTO_ANUBIS is not set 875# CONFIG_CRYPTO_ANUBIS is not set
852# CONFIG_CRYPTO_SEED is not set 876# CONFIG_CRYPTO_SEED is not set
877# CONFIG_CRYPTO_SALSA20 is not set
853# CONFIG_CRYPTO_DEFLATE is not set 878# CONFIG_CRYPTO_DEFLATE is not set
854# CONFIG_CRYPTO_MICHAEL_MIC is not set 879# CONFIG_CRYPTO_MICHAEL_MIC is not set
855# CONFIG_CRYPTO_CRC32C is not set 880# CONFIG_CRYPTO_CRC32C is not set
856# CONFIG_CRYPTO_CAMELLIA is not set 881# CONFIG_CRYPTO_CAMELLIA is not set
857# CONFIG_CRYPTO_TEST is not set 882# CONFIG_CRYPTO_TEST is not set
858# CONFIG_CRYPTO_AUTHENC is not set 883# CONFIG_CRYPTO_AUTHENC is not set
884# CONFIG_CRYPTO_LZO is not set
859CONFIG_CRYPTO_HW=y 885CONFIG_CRYPTO_HW=y
886# CONFIG_CRYPTO_DEV_HIFN_795X is not set
860# CONFIG_PPC_CLOCK is not set 887# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/warp_defconfig b/arch/powerpc/configs/warp_defconfig
index 312557b5df53..2313c3e8ef61 100644
--- a/arch/powerpc/configs/warp_defconfig
+++ b/arch/powerpc/configs/warp_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc6 3# Linux kernel version: 2.6.25-rc2
4# Tue Jan 8 12:23:23 2008 4# Fri Feb 15 21:54:43 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -30,6 +30,7 @@ CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y 30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y 31CONFIG_GENERIC_CLOCKEVENTS=y
32CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
33CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
34CONFIG_RWSEM_XCHGADD_ALGORITHM=y 35CONFIG_RWSEM_XCHGADD_ALGORITHM=y
35CONFIG_ARCH_HAS_ILOG2_U32=y 36CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -68,17 +69,18 @@ CONFIG_SYSVIPC_SYSCTL=y
68# CONFIG_POSIX_MQUEUE is not set 69# CONFIG_POSIX_MQUEUE is not set
69# CONFIG_BSD_PROCESS_ACCT is not set 70# CONFIG_BSD_PROCESS_ACCT is not set
70# CONFIG_TASKSTATS is not set 71# CONFIG_TASKSTATS is not set
71# CONFIG_USER_NS is not set
72# CONFIG_PID_NS is not set
73# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
74# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
75CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
76# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
76CONFIG_GROUP_SCHED=y
77CONFIG_FAIR_GROUP_SCHED=y 77CONFIG_FAIR_GROUP_SCHED=y
78CONFIG_FAIR_USER_SCHED=y 78# CONFIG_RT_GROUP_SCHED is not set
79# CONFIG_FAIR_CGROUP_SCHED is not set 79CONFIG_USER_SCHED=y
80# CONFIG_CGROUP_SCHED is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
83# CONFIG_NAMESPACES is not set
82CONFIG_BLK_DEV_INITRD=y 84CONFIG_BLK_DEV_INITRD=y
83CONFIG_INITRAMFS_SOURCE="" 85CONFIG_INITRAMFS_SOURCE=""
84# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -92,17 +94,26 @@ CONFIG_KALLSYMS=y
92CONFIG_PRINTK=y 94CONFIG_PRINTK=y
93CONFIG_BUG=y 95CONFIG_BUG=y
94CONFIG_ELF_CORE=y 96CONFIG_ELF_CORE=y
97CONFIG_COMPAT_BRK=y
95CONFIG_BASE_FULL=y 98CONFIG_BASE_FULL=y
96CONFIG_FUTEX=y 99CONFIG_FUTEX=y
97CONFIG_ANON_INODES=y 100CONFIG_ANON_INODES=y
98CONFIG_EPOLL=y 101CONFIG_EPOLL=y
99CONFIG_SIGNALFD=y 102CONFIG_SIGNALFD=y
103CONFIG_TIMERFD=y
100CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
101CONFIG_SHMEM=y 105CONFIG_SHMEM=y
102CONFIG_VM_EVENT_COUNTERS=y 106CONFIG_VM_EVENT_COUNTERS=y
103CONFIG_SLAB=y 107CONFIG_SLAB=y
104# CONFIG_SLUB is not set 108# CONFIG_SLUB is not set
105# CONFIG_SLOB is not set 109# CONFIG_SLOB is not set
110# CONFIG_PROFILING is not set
111# CONFIG_MARKERS is not set
112CONFIG_HAVE_OPROFILE=y
113# CONFIG_KPROBES is not set
114CONFIG_HAVE_KPROBES=y
115CONFIG_PROC_PAGE_MONITOR=y
116CONFIG_SLABINFO=y
106CONFIG_RT_MUTEXES=y 117CONFIG_RT_MUTEXES=y
107# CONFIG_TINY_SHMEM is not set 118# CONFIG_TINY_SHMEM is not set
108CONFIG_BASE_SMALL=0 119CONFIG_BASE_SMALL=0
@@ -130,12 +141,14 @@ CONFIG_DEFAULT_AS=y
130# CONFIG_DEFAULT_CFQ is not set 141# CONFIG_DEFAULT_CFQ is not set
131# CONFIG_DEFAULT_NOOP is not set 142# CONFIG_DEFAULT_NOOP is not set
132CONFIG_DEFAULT_IOSCHED="anticipatory" 143CONFIG_DEFAULT_IOSCHED="anticipatory"
144CONFIG_CLASSIC_RCU=y
145# CONFIG_PREEMPT_RCU is not set
133 146
134# 147#
135# Platform support 148# Platform support
136# 149#
137# CONFIG_PPC_MPC52xx is not set 150# CONFIG_PPC_MPC512x is not set
138# CONFIG_PPC_MPC5200 is not set 151# CONFIG_PPC_MPC5121 is not set
139# CONFIG_PPC_CELL is not set 152# CONFIG_PPC_CELL is not set
140# CONFIG_PPC_CELL_NATIVE is not set 153# CONFIG_PPC_CELL_NATIVE is not set
141# CONFIG_PQ2ADS is not set 154# CONFIG_PQ2ADS is not set
@@ -148,6 +161,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
148CONFIG_WARP=y 161CONFIG_WARP=y
149CONFIG_440EP=y 162CONFIG_440EP=y
150CONFIG_IBM440EP_ERR42=y 163CONFIG_IBM440EP_ERR42=y
164# CONFIG_IPIC is not set
151# CONFIG_MPIC is not set 165# CONFIG_MPIC is not set
152# CONFIG_MPIC_WEIRD is not set 166# CONFIG_MPIC_WEIRD is not set
153# CONFIG_PPC_I8259 is not set 167# CONFIG_PPC_I8259 is not set
@@ -158,7 +172,6 @@ CONFIG_IBM440EP_ERR42=y
158# CONFIG_PPC_INDIRECT_IO is not set 172# CONFIG_PPC_INDIRECT_IO is not set
159# CONFIG_GENERIC_IOMAP is not set 173# CONFIG_GENERIC_IOMAP is not set
160# CONFIG_CPU_FREQ is not set 174# CONFIG_CPU_FREQ is not set
161# CONFIG_CPM2 is not set
162# CONFIG_FSL_ULI1575 is not set 175# CONFIG_FSL_ULI1575 is not set
163 176
164# 177#
@@ -174,13 +187,18 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
174# CONFIG_HZ_300 is not set 187# CONFIG_HZ_300 is not set
175CONFIG_HZ_1000=y 188CONFIG_HZ_1000=y
176CONFIG_HZ=1000 189CONFIG_HZ=1000
190# CONFIG_SCHED_HRTICK is not set
177CONFIG_PREEMPT_NONE=y 191CONFIG_PREEMPT_NONE=y
178# CONFIG_PREEMPT_VOLUNTARY is not set 192# CONFIG_PREEMPT_VOLUNTARY is not set
179# CONFIG_PREEMPT is not set 193# CONFIG_PREEMPT is not set
194CONFIG_RCU_TRACE=y
180CONFIG_BINFMT_ELF=y 195CONFIG_BINFMT_ELF=y
181# CONFIG_BINFMT_MISC is not set 196# CONFIG_BINFMT_MISC is not set
182# CONFIG_MATH_EMULATION is not set 197# CONFIG_MATH_EMULATION is not set
198# CONFIG_IOMMU_HELPER is not set
183CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 199CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
200CONFIG_ARCH_HAS_WALK_MEMORY=y
201CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
184CONFIG_ARCH_FLATMEM_ENABLE=y 202CONFIG_ARCH_FLATMEM_ENABLE=y
185CONFIG_ARCH_POPULATES_NODE_MAP=y 203CONFIG_ARCH_POPULATES_NODE_MAP=y
186CONFIG_SELECT_MEMORY_MODEL=y 204CONFIG_SELECT_MEMORY_MODEL=y
@@ -200,8 +218,6 @@ CONFIG_PROC_DEVICETREE=y
200CONFIG_CMDLINE_BOOL=y 218CONFIG_CMDLINE_BOOL=y
201CONFIG_CMDLINE="ip=on" 219CONFIG_CMDLINE="ip=on"
202CONFIG_SECCOMP=y 220CONFIG_SECCOMP=y
203CONFIG_WANT_DEVICE_TREE=y
204CONFIG_DEVICE_TREE="warp.dts"
205CONFIG_ISA_DMA_API=y 221CONFIG_ISA_DMA_API=y
206 222
207# 223#
@@ -244,6 +260,7 @@ CONFIG_XFRM=y
244# CONFIG_XFRM_USER is not set 260# CONFIG_XFRM_USER is not set
245# CONFIG_XFRM_SUB_POLICY is not set 261# CONFIG_XFRM_SUB_POLICY is not set
246# CONFIG_XFRM_MIGRATE is not set 262# CONFIG_XFRM_MIGRATE is not set
263# CONFIG_XFRM_STATISTICS is not set
247# CONFIG_NET_KEY is not set 264# CONFIG_NET_KEY is not set
248CONFIG_INET=y 265CONFIG_INET=y
249# CONFIG_IP_MULTICAST is not set 266# CONFIG_IP_MULTICAST is not set
@@ -279,12 +296,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
279# CONFIG_NETWORK_SECMARK is not set 296# CONFIG_NETWORK_SECMARK is not set
280CONFIG_NETFILTER=y 297CONFIG_NETFILTER=y
281# CONFIG_NETFILTER_DEBUG is not set 298# CONFIG_NETFILTER_DEBUG is not set
299CONFIG_NETFILTER_ADVANCED=y
282 300
283# 301#
284# Core Netfilter Configuration 302# Core Netfilter Configuration
285# 303#
286# CONFIG_NETFILTER_NETLINK is not set 304# CONFIG_NETFILTER_NETLINK_QUEUE is not set
287# CONFIG_NF_CONNTRACK_ENABLED is not set 305# CONFIG_NETFILTER_NETLINK_LOG is not set
288# CONFIG_NF_CONNTRACK is not set 306# CONFIG_NF_CONNTRACK is not set
289# CONFIG_NETFILTER_XTABLES is not set 307# CONFIG_NETFILTER_XTABLES is not set
290 308
@@ -315,6 +333,7 @@ CONFIG_VLAN_8021Q=y
315# 333#
316# CONFIG_NET_PKTGEN is not set 334# CONFIG_NET_PKTGEN is not set
317# CONFIG_HAMRADIO is not set 335# CONFIG_HAMRADIO is not set
336# CONFIG_CAN is not set
318# CONFIG_IRDA is not set 337# CONFIG_IRDA is not set
319# CONFIG_BT is not set 338# CONFIG_BT is not set
320# CONFIG_AF_RXRPC is not set 339# CONFIG_AF_RXRPC is not set
@@ -348,6 +367,7 @@ CONFIG_MTD=y
348CONFIG_MTD_PARTITIONS=y 367CONFIG_MTD_PARTITIONS=y
349# CONFIG_MTD_REDBOOT_PARTS is not set 368# CONFIG_MTD_REDBOOT_PARTS is not set
350# CONFIG_MTD_CMDLINE_PARTS is not set 369# CONFIG_MTD_CMDLINE_PARTS is not set
370CONFIG_MTD_OF_PARTS=y
351 371
352# 372#
353# User Modules And Translation Layers 373# User Modules And Translation Layers
@@ -414,11 +434,11 @@ CONFIG_MTD_NAND=y
414CONFIG_MTD_NAND_ECC_SMC=y 434CONFIG_MTD_NAND_ECC_SMC=y
415# CONFIG_MTD_NAND_MUSEUM_IDS is not set 435# CONFIG_MTD_NAND_MUSEUM_IDS is not set
416CONFIG_MTD_NAND_IDS=y 436CONFIG_MTD_NAND_IDS=y
417CONFIG_MTD_NAND_NDFC=y
418# CONFIG_MTD_NAND_DISKONCHIP is not set 437# CONFIG_MTD_NAND_DISKONCHIP is not set
419# CONFIG_MTD_NAND_NANDSIM is not set 438# CONFIG_MTD_NAND_NANDSIM is not set
420# CONFIG_MTD_NAND_PLATFORM is not set 439# CONFIG_MTD_NAND_PLATFORM is not set
421# CONFIG_MTD_ALAUDA is not set 440# CONFIG_MTD_ALAUDA is not set
441# CONFIG_MTD_NAND_FSL_ELBC is not set
422# CONFIG_MTD_ONENAND is not set 442# CONFIG_MTD_ONENAND is not set
423 443
424# 444#
@@ -436,12 +456,14 @@ CONFIG_BLK_DEV=y
436CONFIG_BLK_DEV_RAM=y 456CONFIG_BLK_DEV_RAM=y
437CONFIG_BLK_DEV_RAM_COUNT=16 457CONFIG_BLK_DEV_RAM_COUNT=16
438CONFIG_BLK_DEV_RAM_SIZE=4096 458CONFIG_BLK_DEV_RAM_SIZE=4096
439CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 459# CONFIG_BLK_DEV_XIP is not set
440# CONFIG_CDROM_PKTCDVD is not set 460# CONFIG_CDROM_PKTCDVD is not set
441# CONFIG_ATA_OVER_ETH is not set 461# CONFIG_ATA_OVER_ETH is not set
442# CONFIG_XILINX_SYSACE is not set 462# CONFIG_XILINX_SYSACE is not set
443CONFIG_MISC_DEVICES=y 463CONFIG_MISC_DEVICES=y
444# CONFIG_EEPROM_93CX6 is not set 464# CONFIG_EEPROM_93CX6 is not set
465# CONFIG_ENCLOSURE_SERVICES is not set
466CONFIG_HAVE_IDE=y
445# CONFIG_IDE is not set 467# CONFIG_IDE is not set
446 468
447# 469#
@@ -471,7 +493,7 @@ CONFIG_BLK_DEV_SD=y
471# CONFIG_SCSI_CONSTANTS is not set 493# CONFIG_SCSI_CONSTANTS is not set
472# CONFIG_SCSI_LOGGING is not set 494# CONFIG_SCSI_LOGGING is not set
473# CONFIG_SCSI_SCAN_ASYNC is not set 495# CONFIG_SCSI_SCAN_ASYNC is not set
474# CONFIG_SCSI_WAIT_SCAN is not set 496CONFIG_SCSI_WAIT_SCAN=m
475 497
476# 498#
477# SCSI Transports 499# SCSI Transports
@@ -528,7 +550,6 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
528# CONFIG_WAN is not set 550# CONFIG_WAN is not set
529# CONFIG_PPP is not set 551# CONFIG_PPP is not set
530# CONFIG_SLIP is not set 552# CONFIG_SLIP is not set
531# CONFIG_SHAPER is not set
532# CONFIG_NETCONSOLE is not set 553# CONFIG_NETCONSOLE is not set
533# CONFIG_NETPOLL is not set 554# CONFIG_NETPOLL is not set
534# CONFIG_NET_POLL_CONTROLLER is not set 555# CONFIG_NET_POLL_CONTROLLER is not set
@@ -596,7 +617,6 @@ CONFIG_I2C_BOARDINFO=y
596# 617#
597# I2C Hardware Bus support 618# I2C Hardware Bus support
598# 619#
599CONFIG_I2C_IBM_IIC=y
600# CONFIG_I2C_MPC is not set 620# CONFIG_I2C_MPC is not set
601# CONFIG_I2C_OCORES is not set 621# CONFIG_I2C_OCORES is not set
602# CONFIG_I2C_PARPORT_LIGHT is not set 622# CONFIG_I2C_PARPORT_LIGHT is not set
@@ -608,14 +628,12 @@ CONFIG_I2C_IBM_IIC=y
608# 628#
609# Miscellaneous I2C Chip support 629# Miscellaneous I2C Chip support
610# 630#
611# CONFIG_SENSORS_DS1337 is not set
612# CONFIG_SENSORS_DS1374 is not set
613# CONFIG_DS1682 is not set 631# CONFIG_DS1682 is not set
614CONFIG_SENSORS_EEPROM=y 632CONFIG_SENSORS_EEPROM=y
615# CONFIG_SENSORS_PCF8574 is not set 633# CONFIG_SENSORS_PCF8574 is not set
616# CONFIG_SENSORS_PCA9539 is not set 634# CONFIG_PCF8575 is not set
617# CONFIG_SENSORS_PCF8591 is not set 635# CONFIG_SENSORS_PCF8591 is not set
618# CONFIG_SENSORS_M41T00 is not set 636# CONFIG_TPS65010 is not set
619# CONFIG_SENSORS_MAX6875 is not set 637# CONFIG_SENSORS_MAX6875 is not set
620# CONFIG_SENSORS_TSL2550 is not set 638# CONFIG_SENSORS_TSL2550 is not set
621# CONFIG_I2C_DEBUG_CORE is not set 639# CONFIG_I2C_DEBUG_CORE is not set
@@ -632,7 +650,6 @@ CONFIG_SENSORS_EEPROM=y
632# CONFIG_POWER_SUPPLY is not set 650# CONFIG_POWER_SUPPLY is not set
633CONFIG_HWMON=y 651CONFIG_HWMON=y
634# CONFIG_HWMON_VID is not set 652# CONFIG_HWMON_VID is not set
635CONFIG_SENSORS_AD7414=y
636# CONFIG_SENSORS_AD7418 is not set 653# CONFIG_SENSORS_AD7418 is not set
637# CONFIG_SENSORS_ADM1021 is not set 654# CONFIG_SENSORS_ADM1021 is not set
638# CONFIG_SENSORS_ADM1025 is not set 655# CONFIG_SENSORS_ADM1025 is not set
@@ -668,6 +685,7 @@ CONFIG_SENSORS_AD7414=y
668# CONFIG_SENSORS_SMSC47M1 is not set 685# CONFIG_SENSORS_SMSC47M1 is not set
669# CONFIG_SENSORS_SMSC47M192 is not set 686# CONFIG_SENSORS_SMSC47M192 is not set
670# CONFIG_SENSORS_SMSC47B397 is not set 687# CONFIG_SENSORS_SMSC47B397 is not set
688# CONFIG_SENSORS_ADS7828 is not set
671# CONFIG_SENSORS_THMC50 is not set 689# CONFIG_SENSORS_THMC50 is not set
672# CONFIG_SENSORS_VT1211 is not set 690# CONFIG_SENSORS_VT1211 is not set
673# CONFIG_SENSORS_W83781D is not set 691# CONFIG_SENSORS_W83781D is not set
@@ -675,9 +693,11 @@ CONFIG_SENSORS_AD7414=y
675# CONFIG_SENSORS_W83792D is not set 693# CONFIG_SENSORS_W83792D is not set
676# CONFIG_SENSORS_W83793 is not set 694# CONFIG_SENSORS_W83793 is not set
677# CONFIG_SENSORS_W83L785TS is not set 695# CONFIG_SENSORS_W83L785TS is not set
696# CONFIG_SENSORS_W83L786NG is not set
678# CONFIG_SENSORS_W83627HF is not set 697# CONFIG_SENSORS_W83627HF is not set
679# CONFIG_SENSORS_W83627EHF is not set 698# CONFIG_SENSORS_W83627EHF is not set
680# CONFIG_HWMON_DEBUG_CHIP is not set 699# CONFIG_HWMON_DEBUG_CHIP is not set
700CONFIG_THERMAL=y
681# CONFIG_WATCHDOG is not set 701# CONFIG_WATCHDOG is not set
682 702
683# 703#
@@ -721,6 +741,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
721# CONFIG_USB_ARCH_HAS_EHCI is not set 741# CONFIG_USB_ARCH_HAS_EHCI is not set
722CONFIG_USB=y 742CONFIG_USB=y
723# CONFIG_USB_DEBUG is not set 743# CONFIG_USB_DEBUG is not set
744# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
724 745
725# 746#
726# Miscellaneous USB options 747# Miscellaneous USB options
@@ -781,10 +802,6 @@ CONFIG_USB_MON=y
781# 802#
782# USB port drivers 803# USB port drivers
783# 804#
784
785#
786# USB Serial Converter support
787#
788# CONFIG_USB_SERIAL is not set 805# CONFIG_USB_SERIAL is not set
789 806
790# 807#
@@ -808,14 +825,6 @@ CONFIG_USB_MON=y
808# CONFIG_USB_LD is not set 825# CONFIG_USB_LD is not set
809# CONFIG_USB_TRANCEVIBRATOR is not set 826# CONFIG_USB_TRANCEVIBRATOR is not set
810# CONFIG_USB_IOWARRIOR is not set 827# CONFIG_USB_IOWARRIOR is not set
811
812#
813# USB DSL modem support
814#
815
816#
817# USB Gadget Support
818#
819# CONFIG_USB_GADGET is not set 828# CONFIG_USB_GADGET is not set
820CONFIG_MMC=m 829CONFIG_MMC=m
821# CONFIG_MMC_DEBUG is not set 830# CONFIG_MMC_DEBUG is not set
@@ -832,6 +841,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
832# MMC/SD Host Controller Drivers 841# MMC/SD Host Controller Drivers
833# 842#
834# CONFIG_MMC_WBSD is not set 843# CONFIG_MMC_WBSD is not set
844# CONFIG_MEMSTICK is not set
835# CONFIG_NEW_LEDS is not set 845# CONFIG_NEW_LEDS is not set
836# CONFIG_EDAC is not set 846# CONFIG_EDAC is not set
837# CONFIG_RTC_CLASS is not set 847# CONFIG_RTC_CLASS is not set
@@ -855,12 +865,10 @@ CONFIG_EXT2_FS=y
855# CONFIG_XFS_FS is not set 865# CONFIG_XFS_FS is not set
856# CONFIG_GFS2_FS is not set 866# CONFIG_GFS2_FS is not set
857# CONFIG_OCFS2_FS is not set 867# CONFIG_OCFS2_FS is not set
858# CONFIG_MINIX_FS is not set 868CONFIG_DNOTIFY=y
859# CONFIG_ROMFS_FS is not set
860CONFIG_INOTIFY=y 869CONFIG_INOTIFY=y
861CONFIG_INOTIFY_USER=y 870CONFIG_INOTIFY_USER=y
862# CONFIG_QUOTA is not set 871# CONFIG_QUOTA is not set
863CONFIG_DNOTIFY=y
864# CONFIG_AUTOFS_FS is not set 872# CONFIG_AUTOFS_FS is not set
865# CONFIG_AUTOFS4_FS is not set 873# CONFIG_AUTOFS4_FS is not set
866# CONFIG_FUSE_FS is not set 874# CONFIG_FUSE_FS is not set
@@ -915,8 +923,10 @@ CONFIG_JFFS2_RTIME=y
915# CONFIG_JFFS2_RUBIN is not set 923# CONFIG_JFFS2_RUBIN is not set
916CONFIG_CRAMFS=y 924CONFIG_CRAMFS=y
917# CONFIG_VXFS_FS is not set 925# CONFIG_VXFS_FS is not set
926# CONFIG_MINIX_FS is not set
918# CONFIG_HPFS_FS is not set 927# CONFIG_HPFS_FS is not set
919# CONFIG_QNX4FS_FS is not set 928# CONFIG_QNX4FS_FS is not set
929# CONFIG_ROMFS_FS is not set
920# CONFIG_SYSV_FS is not set 930# CONFIG_SYSV_FS is not set
921# CONFIG_UFS_FS is not set 931# CONFIG_UFS_FS is not set
922CONFIG_NETWORK_FILESYSTEMS=y 932CONFIG_NETWORK_FILESYSTEMS=y
@@ -986,7 +996,6 @@ CONFIG_NLS_ISO8859_15=y
986# CONFIG_NLS_KOI8_U is not set 996# CONFIG_NLS_KOI8_U is not set
987CONFIG_NLS_UTF8=y 997CONFIG_NLS_UTF8=y
988# CONFIG_DLM is not set 998# CONFIG_DLM is not set
989# CONFIG_UCC_SLOW is not set
990 999
991# 1000#
992# Library routines 1001# Library routines
@@ -1004,7 +1013,6 @@ CONFIG_PLIST=y
1004CONFIG_HAS_IOMEM=y 1013CONFIG_HAS_IOMEM=y
1005CONFIG_HAS_IOPORT=y 1014CONFIG_HAS_IOPORT=y
1006CONFIG_HAS_DMA=y 1015CONFIG_HAS_DMA=y
1007# CONFIG_INSTRUMENTATION is not set
1008 1016
1009# 1017#
1010# Kernel hacking 1018# Kernel hacking
@@ -1014,7 +1022,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1014CONFIG_ENABLE_MUST_CHECK=y 1022CONFIG_ENABLE_MUST_CHECK=y
1015CONFIG_MAGIC_SYSRQ=y 1023CONFIG_MAGIC_SYSRQ=y
1016# CONFIG_UNUSED_SYMBOLS is not set 1024# CONFIG_UNUSED_SYMBOLS is not set
1017# CONFIG_DEBUG_FS is not set 1025CONFIG_DEBUG_FS=y
1018# CONFIG_HEADERS_CHECK is not set 1026# CONFIG_HEADERS_CHECK is not set
1019CONFIG_DEBUG_KERNEL=y 1027CONFIG_DEBUG_KERNEL=y
1020# CONFIG_DEBUG_SHIRQ is not set 1028# CONFIG_DEBUG_SHIRQ is not set
@@ -1035,15 +1043,16 @@ CONFIG_DEBUG_INFO=y
1035# CONFIG_DEBUG_VM is not set 1043# CONFIG_DEBUG_VM is not set
1036# CONFIG_DEBUG_LIST is not set 1044# CONFIG_DEBUG_LIST is not set
1037# CONFIG_DEBUG_SG is not set 1045# CONFIG_DEBUG_SG is not set
1038CONFIG_FORCED_INLINING=y
1039# CONFIG_BOOT_PRINTK_DELAY is not set 1046# CONFIG_BOOT_PRINTK_DELAY is not set
1040# CONFIG_RCU_TORTURE_TEST is not set 1047# CONFIG_RCU_TORTURE_TEST is not set
1048# CONFIG_BACKTRACE_SELF_TEST is not set
1041# CONFIG_FAULT_INJECTION is not set 1049# CONFIG_FAULT_INJECTION is not set
1042# CONFIG_SAMPLES is not set 1050# CONFIG_SAMPLES is not set
1043# CONFIG_DEBUG_STACKOVERFLOW is not set 1051# CONFIG_DEBUG_STACKOVERFLOW is not set
1044# CONFIG_DEBUG_STACK_USAGE is not set 1052# CONFIG_DEBUG_STACK_USAGE is not set
1045# CONFIG_DEBUG_PAGEALLOC is not set 1053# CONFIG_DEBUG_PAGEALLOC is not set
1046# CONFIG_DEBUGGER is not set 1054# CONFIG_DEBUGGER is not set
1055# CONFIG_VIRQ_DEBUG is not set
1047CONFIG_BDI_SWITCH=y 1056CONFIG_BDI_SWITCH=y
1048# CONFIG_PPC_EARLY_DEBUG is not set 1057# CONFIG_PPC_EARLY_DEBUG is not set
1049 1058
@@ -1053,5 +1062,49 @@ CONFIG_BDI_SWITCH=y
1053# CONFIG_KEYS is not set 1062# CONFIG_KEYS is not set
1054# CONFIG_SECURITY is not set 1063# CONFIG_SECURITY is not set
1055# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1064# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1056# CONFIG_CRYPTO is not set 1065CONFIG_CRYPTO=y
1066# CONFIG_CRYPTO_SEQIV is not set
1067# CONFIG_CRYPTO_MANAGER is not set
1068# CONFIG_CRYPTO_HMAC is not set
1069# CONFIG_CRYPTO_XCBC is not set
1070# CONFIG_CRYPTO_NULL is not set
1071# CONFIG_CRYPTO_MD4 is not set
1072# CONFIG_CRYPTO_MD5 is not set
1073# CONFIG_CRYPTO_SHA1 is not set
1074# CONFIG_CRYPTO_SHA256 is not set
1075# CONFIG_CRYPTO_SHA512 is not set
1076# CONFIG_CRYPTO_WP512 is not set
1077# CONFIG_CRYPTO_TGR192 is not set
1078# CONFIG_CRYPTO_GF128MUL is not set
1079# CONFIG_CRYPTO_ECB is not set
1080# CONFIG_CRYPTO_CBC is not set
1081# CONFIG_CRYPTO_PCBC is not set
1082# CONFIG_CRYPTO_LRW is not set
1083# CONFIG_CRYPTO_XTS is not set
1084# CONFIG_CRYPTO_CTR is not set
1085# CONFIG_CRYPTO_GCM is not set
1086# CONFIG_CRYPTO_CCM is not set
1087# CONFIG_CRYPTO_CRYPTD is not set
1088# CONFIG_CRYPTO_DES is not set
1089# CONFIG_CRYPTO_FCRYPT is not set
1090# CONFIG_CRYPTO_BLOWFISH is not set
1091# CONFIG_CRYPTO_TWOFISH is not set
1092# CONFIG_CRYPTO_SERPENT is not set
1093# CONFIG_CRYPTO_AES is not set
1094# CONFIG_CRYPTO_CAST5 is not set
1095# CONFIG_CRYPTO_CAST6 is not set
1096# CONFIG_CRYPTO_TEA is not set
1097# CONFIG_CRYPTO_ARC4 is not set
1098# CONFIG_CRYPTO_KHAZAD is not set
1099# CONFIG_CRYPTO_ANUBIS is not set
1100# CONFIG_CRYPTO_SEED is not set
1101# CONFIG_CRYPTO_SALSA20 is not set
1102# CONFIG_CRYPTO_DEFLATE is not set
1103# CONFIG_CRYPTO_MICHAEL_MIC is not set
1104# CONFIG_CRYPTO_CRC32C is not set
1105# CONFIG_CRYPTO_CAMELLIA is not set
1106# CONFIG_CRYPTO_TEST is not set
1107# CONFIG_CRYPTO_AUTHENC is not set
1108# CONFIG_CRYPTO_LZO is not set
1109CONFIG_CRYPTO_HW=y
1057# CONFIG_PPC_CLOCK is not set 1110# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index 5338e4855712..c176c513566b 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -274,7 +274,7 @@ no_kprobe:
274 * - When the probed function returns, this probe 274 * - When the probed function returns, this probe
275 * causes the handlers to fire 275 * causes the handlers to fire
276 */ 276 */
277void kretprobe_trampoline_holder(void) 277static void __used kretprobe_trampoline_holder(void)
278{ 278{
279 asm volatile(".global kretprobe_trampoline\n" 279 asm volatile(".global kretprobe_trampoline\n"
280 "kretprobe_trampoline:\n" 280 "kretprobe_trampoline:\n"
@@ -284,7 +284,8 @@ void kretprobe_trampoline_holder(void)
284/* 284/*
285 * Called when the probe at kretprobe trampoline is hit 285 * Called when the probe at kretprobe trampoline is hit
286 */ 286 */
287int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) 287static int __kprobes trampoline_probe_handler(struct kprobe *p,
288 struct pt_regs *regs)
288{ 289{
289 struct kretprobe_instance *ri = NULL; 290 struct kretprobe_instance *ri = NULL;
290 struct hlist_head *head, empty_rp; 291 struct hlist_head *head, empty_rp;
@@ -517,12 +518,12 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
517 return 1; 518 return 1;
518} 519}
519 520
520void __kprobes jprobe_return(void) 521void __used __kprobes jprobe_return(void)
521{ 522{
522 asm volatile("trap" ::: "memory"); 523 asm volatile("trap" ::: "memory");
523} 524}
524 525
525void __kprobes jprobe_return_end(void) 526static void __used __kprobes jprobe_return_end(void)
526{ 527{
527}; 528};
528 529
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 8b5efbce8d90..eac97f48b9b8 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -865,12 +865,12 @@ static int __init early_init_dt_scan_root(unsigned long node,
865 return 1; 865 return 1;
866} 866}
867 867
868static unsigned long __init dt_mem_next_cell(int s, cell_t **cellp) 868static u64 __init dt_mem_next_cell(int s, cell_t **cellp)
869{ 869{
870 cell_t *p = *cellp; 870 cell_t *p = *cellp;
871 871
872 *cellp = p + s; 872 *cellp = p + s;
873 return of_read_ulong(p, s); 873 return of_read_number(p, s);
874} 874}
875 875
876#ifdef CONFIG_PPC_PSERIES 876#ifdef CONFIG_PPC_PSERIES
@@ -883,8 +883,8 @@ static unsigned long __init dt_mem_next_cell(int s, cell_t **cellp)
883static int __init early_init_dt_scan_drconf_memory(unsigned long node) 883static int __init early_init_dt_scan_drconf_memory(unsigned long node)
884{ 884{
885 cell_t *dm, *ls; 885 cell_t *dm, *ls;
886 unsigned long l, n; 886 unsigned long l, n, flags;
887 unsigned long base, size, lmb_size, flags; 887 u64 base, size, lmb_size;
888 888
889 ls = (cell_t *)of_get_flat_dt_prop(node, "ibm,lmb-size", &l); 889 ls = (cell_t *)of_get_flat_dt_prop(node, "ibm,lmb-size", &l);
890 if (ls == NULL || l < dt_root_size_cells * sizeof(cell_t)) 890 if (ls == NULL || l < dt_root_size_cells * sizeof(cell_t))
@@ -959,14 +959,15 @@ static int __init early_init_dt_scan_memory(unsigned long node,
959 uname, l, reg[0], reg[1], reg[2], reg[3]); 959 uname, l, reg[0], reg[1], reg[2], reg[3]);
960 960
961 while ((endp - reg) >= (dt_root_addr_cells + dt_root_size_cells)) { 961 while ((endp - reg) >= (dt_root_addr_cells + dt_root_size_cells)) {
962 unsigned long base, size; 962 u64 base, size;
963 963
964 base = dt_mem_next_cell(dt_root_addr_cells, &reg); 964 base = dt_mem_next_cell(dt_root_addr_cells, &reg);
965 size = dt_mem_next_cell(dt_root_size_cells, &reg); 965 size = dt_mem_next_cell(dt_root_size_cells, &reg);
966 966
967 if (size == 0) 967 if (size == 0)
968 continue; 968 continue;
969 DBG(" - %lx , %lx\n", base, size); 969 DBG(" - %llx , %llx\n", (unsigned long long)base,
970 (unsigned long long)size);
970#ifdef CONFIG_PPC64 971#ifdef CONFIG_PPC64
971 if (iommu_is_off) { 972 if (iommu_is_off) {
972 if (base >= 0x80000000ul) 973 if (base >= 0x80000000ul)
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index c062c4cbbed5..1bfb2191010a 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -61,7 +61,7 @@ config WARP
61 select 440EP 61 select 440EP
62 help 62 help
63 This option enables support for the PIKA Warp(tm) Appliance. The Warp 63 This option enables support for the PIKA Warp(tm) Appliance. The Warp
64 is a small computer replacement with up to 9 ports of FXO/FXS plus VOIP 64 is a small computer replacement with up to 9 ports of FXO/FXS plus VOIP
65 stations and trunks. 65 stations and trunks.
66 66
67 See http://www.pikatechnologies.com/ and follow the "PIKA for Computer 67 See http://www.pikatechnologies.com/ and follow the "PIKA for Computer
@@ -110,17 +110,17 @@ config 440GP
110 110
111config 440GX 111config 440GX
112 bool 112 bool
113 select IBM_NEW_EMAC_EMAC4 113 select IBM_NEW_EMAC_EMAC4
114 select IBM_NEW_EMAC_RGMII 114 select IBM_NEW_EMAC_RGMII
115 select IBM_NEW_EMAC_ZMII #test only 115 select IBM_NEW_EMAC_ZMII #test only
116 select IBM_NEW_EMAC_TAH #test only 116 select IBM_NEW_EMAC_TAH #test only
117 117
118config 440SP 118config 440SP
119 bool 119 bool
120 120
121config 440SPe 121config 440SPe
122 select IBM_NEW_EMAC_EMAC4
123 bool 122 bool
123 select IBM_NEW_EMAC_EMAC4
124 124
125# 44x errata/workaround config symbols, selected by the CPU models above 125# 44x errata/workaround config symbols, selected by the CPU models above
126config IBM440EP_ERR42 126config IBM440EP_ERR42
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index e45cfa84911f..87eb07f94c5f 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -160,13 +160,6 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea)
160 160
161 pr_debug("%s\n", __FUNCTION__); 161 pr_debug("%s\n", __FUNCTION__);
162 162
163 if (test_bit(SPU_CONTEXT_SWITCH_ACTIVE, &spu->flags)) {
164 /* SLBs are pre-loaded for context switch, so
165 * we should never get here!
166 */
167 printk("%s: invalid access during switch!\n", __func__);
168 return 1;
169 }
170 slb.esid = (ea & ESID_MASK) | SLB_ESID_V; 163 slb.esid = (ea & ESID_MASK) | SLB_ESID_V;
171 164
172 switch(REGION_ID(ea)) { 165 switch(REGION_ID(ea)) {
@@ -226,11 +219,6 @@ static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr)
226 return 0; 219 return 0;
227 } 220 }
228 221
229 if (test_bit(SPU_CONTEXT_SWITCH_ACTIVE, &spu->flags)) {
230 printk("%s: invalid access during switch!\n", __func__);
231 return 1;
232 }
233
234 spu->class_0_pending = 0; 222 spu->class_0_pending = 0;
235 spu->dar = ea; 223 spu->dar = ea;
236 spu->dsisr = dsisr; 224 spu->dsisr = dsisr;
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c
index fca22e18069a..6221968c2a3c 100644
--- a/arch/powerpc/platforms/cell/spufs/run.c
+++ b/arch/powerpc/platforms/cell/spufs/run.c
@@ -234,6 +234,7 @@ static int spu_run_fini(struct spu_context *ctx, u32 *npc,
234 *npc = ctx->ops->npc_read(ctx); 234 *npc = ctx->ops->npc_read(ctx);
235 235
236 spuctx_switch_state(ctx, SPU_UTIL_IDLE_LOADED); 236 spuctx_switch_state(ctx, SPU_UTIL_IDLE_LOADED);
237 ctx->policy = SCHED_IDLE;
237 spu_release(ctx); 238 spu_release(ctx);
238 239
239 if (signal_pending(current)) 240 if (signal_pending(current))
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 5915343e2599..3a5972117de7 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -856,21 +856,18 @@ static noinline void spusched_tick(struct spu_context *ctx)
856{ 856{
857 struct spu_context *new = NULL; 857 struct spu_context *new = NULL;
858 struct spu *spu = NULL; 858 struct spu *spu = NULL;
859 u32 status;
860 859
861 if (spu_acquire(ctx)) 860 if (spu_acquire(ctx))
862 BUG(); /* a kernel thread never has signals pending */ 861 BUG(); /* a kernel thread never has signals pending */
863 862
864 if (ctx->state != SPU_STATE_RUNNABLE) 863 if (ctx->state != SPU_STATE_RUNNABLE)
865 goto out; 864 goto out;
866 if (spu_stopped(ctx, &status))
867 goto out;
868 if (ctx->flags & SPU_CREATE_NOSCHED) 865 if (ctx->flags & SPU_CREATE_NOSCHED)
869 goto out; 866 goto out;
870 if (ctx->policy == SCHED_FIFO) 867 if (ctx->policy == SCHED_FIFO)
871 goto out; 868 goto out;
872 869
873 if (--ctx->time_slice) 870 if (--ctx->time_slice && ctx->policy != SCHED_IDLE)
874 goto out; 871 goto out;
875 872
876 spu = ctx->spu; 873 spu = ctx->spu;
@@ -880,7 +877,8 @@ static noinline void spusched_tick(struct spu_context *ctx)
880 new = grab_runnable_context(ctx->prio + 1, spu->node); 877 new = grab_runnable_context(ctx->prio + 1, spu->node);
881 if (new) { 878 if (new) {
882 spu_unschedule(spu, ctx); 879 spu_unschedule(spu, ctx);
883 spu_add_to_rq(ctx); 880 if (ctx->policy != SCHED_IDLE)
881 spu_add_to_rq(ctx);
884 } else { 882 } else {
885 spu_context_nospu_trace(spusched_tick__newslice, ctx); 883 spu_context_nospu_trace(spusched_tick__newslice, ctx);
886 ctx->time_slice++; 884 ctx->time_slice++;
diff --git a/arch/powerpc/platforms/cell/spufs/switch.c b/arch/powerpc/platforms/cell/spufs/switch.c
index 6063c88c26d2..6f5886c7b1f9 100644
--- a/arch/powerpc/platforms/cell/spufs/switch.c
+++ b/arch/powerpc/platforms/cell/spufs/switch.c
@@ -720,8 +720,9 @@ static inline void set_switch_active(struct spu_state *csa, struct spu *spu)
720 * Restore, Step 23. 720 * Restore, Step 23.
721 * Change the software context switch pending flag 721 * Change the software context switch pending flag
722 * to context switch active. 722 * to context switch active.
723 *
724 * This implementation does not uses a switch active flag.
723 */ 725 */
724 set_bit(SPU_CONTEXT_SWITCH_ACTIVE, &spu->flags);
725 clear_bit(SPU_CONTEXT_SWITCH_PENDING, &spu->flags); 726 clear_bit(SPU_CONTEXT_SWITCH_PENDING, &spu->flags);
726 mb(); 727 mb();
727} 728}
@@ -1739,9 +1740,8 @@ static inline void reset_switch_active(struct spu_state *csa, struct spu *spu)
1739{ 1740{
1740 /* Restore, Step 74: 1741 /* Restore, Step 74:
1741 * Reset the "context switch active" flag. 1742 * Reset the "context switch active" flag.
1743 * Not performed by this implementation.
1742 */ 1744 */
1743 clear_bit(SPU_CONTEXT_SWITCH_ACTIVE, &spu->flags);
1744 mb();
1745} 1745}
1746 1746
1747static inline void reenable_interrupts(struct spu_state *csa, struct spu *spu) 1747static inline void reenable_interrupts(struct spu_state *csa, struct spu *spu)
diff --git a/arch/powerpc/platforms/pasemi/Makefile b/arch/powerpc/platforms/pasemi/Makefile
index 8f52d7515793..ce6d789e0741 100644
--- a/arch/powerpc/platforms/pasemi/Makefile
+++ b/arch/powerpc/platforms/pasemi/Makefile
@@ -1,3 +1,3 @@
1obj-y += setup.o pci.o time.o idle.o powersave.o iommu.o dma_lib.o 1obj-y += setup.o pci.o time.o idle.o powersave.o iommu.o dma_lib.o misc.o
2obj-$(CONFIG_PPC_PASEMI_MDIO) += gpio_mdio.o 2obj-$(CONFIG_PPC_PASEMI_MDIO) += gpio_mdio.o
3obj-$(CONFIG_PPC_PASEMI_CPUFREQ) += cpufreq.o 3obj-$(CONFIG_PPC_PASEMI_CPUFREQ) += cpufreq.o
diff --git a/arch/powerpc/platforms/pasemi/misc.c b/arch/powerpc/platforms/pasemi/misc.c
new file mode 100644
index 000000000000..ded7d152d00c
--- /dev/null
+++ b/arch/powerpc/platforms/pasemi/misc.c
@@ -0,0 +1,97 @@
1/*
2 * Copyright (C) 2007 PA Semi, Inc
3 *
4 * Parts based on arch/powerpc/sysdev/fsl_soc.c:
5 *
6 * 2006 (c) MontaVista Software, Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version.
12 */
13
14#include <linux/errno.h>
15#include <linux/kernel.h>
16#include <linux/pci.h>
17#include <linux/of.h>
18#include <linux/i2c.h>
19
20#ifdef CONFIG_I2C_BOARDINFO
21/* The below is from fsl_soc.c. It's copied because since there are no
22 * official bus bindings at this time it doesn't make sense to share across
23 * the platforms, even though they happen to be common.
24 */
25struct i2c_driver_device {
26 char *of_device;
27 char *i2c_driver;
28 char *i2c_type;
29};
30
31static struct i2c_driver_device i2c_devices[] __initdata = {
32 {"dallas,ds1338", "rtc-ds1307", "ds1338"},
33};
34
35static int __init find_i2c_driver(struct device_node *node,
36 struct i2c_board_info *info)
37{
38 int i;
39
40 for (i = 0; i < ARRAY_SIZE(i2c_devices); i++) {
41 if (!of_device_is_compatible(node, i2c_devices[i].of_device))
42 continue;
43 if (strlcpy(info->driver_name, i2c_devices[i].i2c_driver,
44 KOBJ_NAME_LEN) >= KOBJ_NAME_LEN ||
45 strlcpy(info->type, i2c_devices[i].i2c_type,
46 I2C_NAME_SIZE) >= I2C_NAME_SIZE)
47 return -ENOMEM;
48 return 0;
49 }
50 return -ENODEV;
51}
52
53static int __init pasemi_register_i2c_devices(void)
54{
55 struct pci_dev *pdev;
56 struct device_node *adap_node;
57 struct device_node *node;
58
59 pdev = NULL;
60 while ((pdev = pci_get_device(PCI_VENDOR_ID_PASEMI, 0xa003, pdev))) {
61 adap_node = pci_device_to_OF_node(pdev);
62
63 if (!adap_node)
64 continue;
65
66 node = NULL;
67 while ((node = of_get_next_child(adap_node, node))) {
68 struct i2c_board_info info = {};
69 const u32 *addr;
70 int len;
71
72 addr = of_get_property(node, "reg", &len);
73 if (!addr || len < sizeof(int) ||
74 *addr > (1 << 10) - 1) {
75 printk(KERN_WARNING
76 "pasemi_register_i2c_devices: "
77 "invalid i2c device entry\n");
78 continue;
79 }
80
81 info.irq = irq_of_parse_and_map(node, 0);
82 if (info.irq == NO_IRQ)
83 info.irq = -1;
84
85 if (find_i2c_driver(node, &info) < 0)
86 continue;
87
88 info.addr = *addr;
89
90 i2c_register_board_info(PCI_FUNC(pdev->devfn), &info,
91 1);
92 }
93 }
94 return 0;
95}
96device_initcall(pasemi_register_i2c_devices);
97#endif
diff --git a/arch/powerpc/platforms/pseries/power.c b/arch/powerpc/platforms/pseries/power.c
index e95fc1594c84..6d6266236446 100644
--- a/arch/powerpc/platforms/pseries/power.c
+++ b/arch/powerpc/platforms/pseries/power.c
@@ -75,7 +75,7 @@ core_initcall(pm_init);
75#else 75#else
76static int __init apo_pm_init(void) 76static int __init apo_pm_init(void)
77{ 77{
78 return (sysfs_create_file(power_kobj, &auto_poweron_attr)); 78 return (sysfs_create_file(power_kobj, &auto_poweron_attr.attr));
79} 79}
80__initcall(apo_pm_init); 80__initcall(apo_pm_init);
81#endif 81#endif
diff --git a/arch/powerpc/sysdev/mpic_pasemi_msi.c b/arch/powerpc/sysdev/mpic_pasemi_msi.c
index d6bfda30ac87..33cbfb22ce3e 100644
--- a/arch/powerpc/sysdev/mpic_pasemi_msi.c
+++ b/arch/powerpc/sysdev/mpic_pasemi_msi.c
@@ -95,7 +95,6 @@ static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
95 unsigned int virq; 95 unsigned int virq;
96 struct msi_desc *entry; 96 struct msi_desc *entry;
97 struct msi_msg msg; 97 struct msi_msg msg;
98 u64 addr;
99 98
100 pr_debug("pasemi_msi_setup_msi_irqs, pdev %p nvec %d type %d\n", 99 pr_debug("pasemi_msi_setup_msi_irqs, pdev %p nvec %d type %d\n",
101 pdev, nvec, type); 100 pdev, nvec, type);
@@ -132,8 +131,8 @@ static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
132 set_irq_chip(virq, &mpic_pasemi_msi_chip); 131 set_irq_chip(virq, &mpic_pasemi_msi_chip);
133 set_irq_type(virq, IRQ_TYPE_EDGE_RISING); 132 set_irq_type(virq, IRQ_TYPE_EDGE_RISING);
134 133
135 pr_debug("pasemi_msi: allocated virq 0x%x (hw 0x%lx) addr 0x%lx\n", 134 pr_debug("pasemi_msi: allocated virq 0x%x (hw 0x%lx) addr 0x%x\n",
136 virq, hwirq, addr); 135 virq, hwirq, msg.address_lo);
137 136
138 /* Likewise, the device writes [0...511] into the target 137 /* Likewise, the device writes [0...511] into the target
139 * register to generate MSI [512...1023] 138 * register to generate MSI [512...1023]
diff --git a/arch/ppc/platforms/4xx/ibm440ep.c b/arch/ppc/platforms/4xx/ibm440ep.c
index 1fed6638c81f..0de91532aabb 100644
--- a/arch/ppc/platforms/4xx/ibm440ep.c
+++ b/arch/ppc/platforms/4xx/ibm440ep.c
@@ -172,11 +172,11 @@ struct ocp_def core_ocp[] = {
172/* Polarity and triggering settings for internal interrupt sources */ 172/* Polarity and triggering settings for internal interrupt sources */
173struct ppc4xx_uic_settings ppc4xx_core_uic_cfg[] __initdata = { 173struct ppc4xx_uic_settings ppc4xx_core_uic_cfg[] __initdata = {
174 { .polarity = 0xffbffe03, 174 { .polarity = 0xffbffe03,
175 .triggering = 0xfffffe00, 175 .triggering = 0x00000000,
176 .ext_irq_mask = 0x000001fc, /* IRQ0 - IRQ6 */ 176 .ext_irq_mask = 0x000001fc, /* IRQ0 - IRQ6 */
177 }, 177 },
178 { .polarity = 0xffffc6ef, 178 { .polarity = 0xffffc6af,
179 .triggering = 0xffffc7ff, 179 .triggering = 0x06000140,
180 .ext_irq_mask = 0x00003800, /* IRQ7 - IRQ9 */ 180 .ext_irq_mask = 0x00003800, /* IRQ7 - IRQ9 */
181 }, 181 },
182}; 182};
diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ibm_newemac/rgmii.c
index 9bc1132fa788..5757788227be 100644
--- a/drivers/net/ibm_newemac/rgmii.c
+++ b/drivers/net/ibm_newemac/rgmii.c
@@ -302,7 +302,6 @@ static int __devexit rgmii_remove(struct of_device *ofdev)
302static struct of_device_id rgmii_match[] = 302static struct of_device_id rgmii_match[] =
303{ 303{
304 { 304 {
305 .type = "rgmii-interface",
306 .compatible = "ibm,rgmii", 305 .compatible = "ibm,rgmii",
307 }, 306 },
308 { 307 {
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h
index f07c99ba5d13..e3c845b0f764 100644
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@ -98,9 +98,8 @@
98#define MFC_PRIV_ATTN_EVENT 0x00000800 98#define MFC_PRIV_ATTN_EVENT 0x00000800
99#define MFC_MULTI_SRC_EVENT 0x00001000 99#define MFC_MULTI_SRC_EVENT 0x00001000
100 100
101/* Flags indicating progress during context switch. */ 101/* Flag indicating progress during context switch. */
102#define SPU_CONTEXT_SWITCH_PENDING 0UL 102#define SPU_CONTEXT_SWITCH_PENDING 0UL
103#define SPU_CONTEXT_SWITCH_ACTIVE 1UL
104 103
105struct spu_context; 104struct spu_context;
106struct spu_runqueue; 105struct spu_runqueue;