aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/kernel/signal.c4
-rw-r--r--arch/arm/mach-iop32x/glantank.c12
-rw-r--r--arch/arm/mach-omap1/time.c12
-rw-r--r--arch/arm/mm/proc-xscale.S4
-rw-r--r--arch/arm/plat-omap/Kconfig1
-rw-r--r--arch/arm/plat-omap/Makefile5
-rw-r--r--arch/arm/plat-omap/dma.c9
-rw-r--r--arch/arm/plat-omap/gpio.c3
-rw-r--r--arch/powerpc/boot/Makefile4
-rw-r--r--arch/powerpc/boot/dts/lite5200b.dts2
-rwxr-xr-xarch/powerpc/boot/wrapper4
-rw-r--r--arch/powerpc/configs/cell_defconfig141
-rw-r--r--arch/powerpc/configs/celleb_defconfig117
-rw-r--r--arch/powerpc/configs/chrp32_defconfig165
-rw-r--r--arch/powerpc/configs/ep8248e_defconfig74
-rw-r--r--arch/powerpc/configs/ep88xc_defconfig56
-rw-r--r--arch/powerpc/configs/g5_defconfig137
-rw-r--r--arch/powerpc/configs/iseries_defconfig99
-rw-r--r--arch/powerpc/configs/linkstation_defconfig131
-rw-r--r--arch/powerpc/configs/mpc7448_hpc2_defconfig119
-rw-r--r--arch/powerpc/configs/mpc8272_ads_defconfig75
-rw-r--r--arch/powerpc/configs/mpc8313_rdb_defconfig114
-rw-r--r--arch/powerpc/configs/mpc8315_rdb_defconfig110
-rw-r--r--arch/powerpc/configs/mpc832x_mds_defconfig101
-rw-r--r--arch/powerpc/configs/mpc832x_rdb_defconfig106
-rw-r--r--arch/powerpc/configs/mpc834x_itx_defconfig111
-rw-r--r--arch/powerpc/configs/mpc834x_itxgp_defconfig109
-rw-r--r--arch/powerpc/configs/mpc834x_mds_defconfig104
-rw-r--r--arch/powerpc/configs/mpc836x_mds_defconfig102
-rw-r--r--arch/powerpc/configs/mpc837x_mds_defconfig197
-rw-r--r--arch/powerpc/configs/mpc837x_rdb_defconfig83
-rw-r--r--arch/powerpc/configs/mpc83xx_defconfig88
-rw-r--r--arch/powerpc/configs/mpc8540_ads_defconfig121
-rw-r--r--arch/powerpc/configs/mpc8544_ds_defconfig127
-rw-r--r--arch/powerpc/configs/mpc8560_ads_defconfig126
-rw-r--r--arch/powerpc/configs/mpc8568mds_defconfig106
-rw-r--r--arch/powerpc/configs/mpc8572_ds_defconfig127
-rw-r--r--arch/powerpc/configs/mpc85xx_cds_defconfig131
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig111
-rw-r--r--arch/powerpc/configs/mpc8610_hpcd_defconfig131
-rw-r--r--arch/powerpc/configs/mpc8641_hpcn_defconfig115
-rw-r--r--arch/powerpc/configs/mpc866_ads_defconfig112
-rw-r--r--arch/powerpc/configs/mpc885_ads_defconfig56
-rw-r--r--arch/powerpc/configs/pmac32_defconfig195
-rw-r--r--arch/powerpc/configs/ppc64_defconfig169
-rw-r--r--arch/powerpc/configs/pq2fads_defconfig89
-rw-r--r--arch/powerpc/configs/prpmc2800_defconfig160
-rw-r--r--arch/powerpc/configs/ps3_defconfig103
-rw-r--r--arch/powerpc/configs/pseries_defconfig136
-rw-r--r--arch/powerpc/configs/sbc834x_defconfig78
-rw-r--r--arch/powerpc/configs/sbc8548_defconfig115
-rw-r--r--arch/powerpc/configs/sbc8560_defconfig124
-rw-r--r--arch/powerpc/configs/storcenter_defconfig102
-rw-r--r--arch/powerpc/configs/stx_gp3_defconfig154
-rw-r--r--arch/powerpc/configs/tqm8540_defconfig133
-rw-r--r--arch/powerpc/configs/tqm8541_defconfig133
-rw-r--r--arch/powerpc/configs/tqm8555_defconfig133
-rw-r--r--arch/powerpc/configs/tqm8560_defconfig133
-rw-r--r--arch/powerpc/kernel/process.c6
-rw-r--r--arch/powerpc/kernel/ptrace.c10
-rw-r--r--arch/powerpc/mm/hash_utils_64.c11
-rw-r--r--arch/powerpc/mm/slb.c6
-rw-r--r--arch/powerpc/platforms/cell/iommu.c41
-rw-r--r--arch/powerpc/platforms/cell/setup.c36
-rw-r--r--arch/powerpc/sysdev/bestcomm/bestcomm.c8
-rw-r--r--arch/powerpc/sysdev/ipic.c2
-rw-r--r--arch/s390/lib/uaccess_pt.c2
-rw-r--r--arch/sh/Kconfig1
-rw-r--r--arch/sh/Makefile8
-rw-r--r--arch/sh/boot/Makefile4
-rw-r--r--arch/sh/kernel/cpu/sh2/entry.S1
-rw-r--r--arch/sh/kernel/smp.c2
-rw-r--r--arch/sparc64/defconfig12
-rw-r--r--arch/sparc64/kernel/cpu.c10
-rw-r--r--arch/sparc64/kernel/ds.c3
-rw-r--r--arch/sparc64/kernel/entry.S30
-rw-r--r--arch/sparc64/kernel/entry.h196
-rw-r--r--arch/sparc64/kernel/head.S8
-rw-r--r--arch/sparc64/kernel/iommu.c8
-rw-r--r--arch/sparc64/kernel/irq.c21
-rw-r--r--arch/sparc64/kernel/process.c3
-rw-r--r--arch/sparc64/kernel/ptrace.c20
-rw-r--r--arch/sparc64/kernel/setup.c5
-rw-r--r--arch/sparc64/kernel/signal.c3
-rw-r--r--arch/sparc64/kernel/smp.c20
-rw-r--r--arch/sparc64/kernel/stacktrace.c4
-rw-r--r--arch/sparc64/kernel/sys_sparc.c14
-rw-r--r--arch/sparc64/kernel/sys_sparc32.c3
-rw-r--r--arch/sparc64/kernel/systbls.h53
-rw-r--r--arch/sparc64/kernel/time.c66
-rw-r--r--arch/sparc64/kernel/trampoline.S188
-rw-r--r--arch/sparc64/kernel/traps.c49
-rw-r--r--arch/sparc64/mm/init.c43
-rw-r--r--arch/sparc64/mm/tlb.c3
-rw-r--r--arch/x86/kernel/aperture_64.c3
-rw-r--r--arch/x86/kernel/cpu/cpufreq/speedstep-smi.c39
-rw-r--r--arch/x86/kernel/cpu/mtrr/generic.c42
-rw-r--r--arch/x86/kernel/cpu/mtrr/main.c3
-rw-r--r--arch/x86/kernel/e820_32.c26
-rw-r--r--arch/x86/kernel/e820_64.c27
-rw-r--r--arch/x86/kernel/head_32.S2
-rw-r--r--arch/x86/kernel/io_delay.c8
-rw-r--r--arch/x86/kernel/mfgpt_32.c1
-rw-r--r--arch/x86/kernel/pci-dma_64.c5
-rw-r--r--arch/x86/kernel/quirks.c2
-rw-r--r--arch/x86/kernel/reboot.c18
-rw-r--r--arch/x86/kernel/setup64.c14
-rw-r--r--arch/x86/kernel/setup_32.c9
-rw-r--r--arch/x86/kernel/setup_64.c2
-rw-r--r--arch/x86/kvm/mmu.c18
-rw-r--r--arch/x86/kvm/vmx.c7
-rw-r--r--arch/x86/mach-visws/traps.c5
-rw-r--r--arch/x86/mm/discontig_32.c1
-rw-r--r--arch/x86/mm/ioremap.c12
-rw-r--r--arch/x86/mm/numa_64.c3
-rw-r--r--arch/x86/mm/pageattr.c2
117 files changed, 4587 insertions, 2182 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 955fc53c1c01..4039a133006e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -469,6 +469,7 @@ config ARCH_OMAP
469 bool "TI OMAP" 469 bool "TI OMAP"
470 select GENERIC_GPIO 470 select GENERIC_GPIO
471 select GENERIC_TIME 471 select GENERIC_TIME
472 select GENERIC_CLOCKEVENTS
472 help 473 help
473 Support for TI's OMAP platform (OMAP1 and OMAP2). 474 Support for TI's OMAP platform (OMAP1 and OMAP2).
474 475
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 54cdf1aeefc3..ef2f86a5e78a 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -26,8 +26,8 @@
26/* 26/*
27 * For ARM syscalls, we encode the syscall number into the instruction. 27 * For ARM syscalls, we encode the syscall number into the instruction.
28 */ 28 */
29#define SWI_SYS_SIGRETURN (0xef000000|(__NR_sigreturn)) 29#define SWI_SYS_SIGRETURN (0xef000000|(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE))
30#define SWI_SYS_RT_SIGRETURN (0xef000000|(__NR_rt_sigreturn)) 30#define SWI_SYS_RT_SIGRETURN (0xef000000|(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE))
31 31
32/* 32/*
33 * With EABI, the syscall number has to be loaded into r7. 33 * With EABI, the syscall number has to be loaded into r7.
diff --git a/arch/arm/mach-iop32x/glantank.c b/arch/arm/mach-iop32x/glantank.c
index 74c65ce221de..d2a7b04f1cb0 100644
--- a/arch/arm/mach-iop32x/glantank.c
+++ b/arch/arm/mach-iop32x/glantank.c
@@ -14,8 +14,10 @@
14 14
15#include <linux/mm.h> 15#include <linux/mm.h>
16#include <linux/init.h> 16#include <linux/init.h>
17#include <linux/f75375s.h>
17#include <linux/kernel.h> 18#include <linux/kernel.h>
18#include <linux/pci.h> 19#include <linux/pci.h>
20#include <linux/pm.h>
19#include <linux/string.h> 21#include <linux/string.h>
20#include <linux/slab.h> 22#include <linux/slab.h>
21#include <linux/serial_core.h> 23#include <linux/serial_core.h>
@@ -167,11 +169,21 @@ static struct platform_device glantank_serial_device = {
167 .resource = &glantank_uart_resource, 169 .resource = &glantank_uart_resource,
168}; 170};
169 171
172static struct f75375s_platform_data glantank_f75375s = {
173 .pwm = { 255, 255 },
174 .pwm_enable = { 0, 0 },
175};
176
170static struct i2c_board_info __initdata glantank_i2c_devices[] = { 177static struct i2c_board_info __initdata glantank_i2c_devices[] = {
171 { 178 {
172 I2C_BOARD_INFO("rtc-rs5c372", 0x32), 179 I2C_BOARD_INFO("rtc-rs5c372", 0x32),
173 .type = "rs5c372a", 180 .type = "rs5c372a",
174 }, 181 },
182 {
183 I2C_BOARD_INFO("f75375", 0x2e),
184 .type = "f75375",
185 .platform_data = &glantank_f75375s,
186 },
175}; 187};
176 188
177static void glantank_power_off(void) 189static void glantank_power_off(void)
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c
index 237651ebae5d..a4f8b2055437 100644
--- a/arch/arm/mach-omap1/time.c
+++ b/arch/arm/mach-omap1/time.c
@@ -132,13 +132,20 @@ static inline void omap_mpu_timer_start(int nr, unsigned long load_val,
132 timer->cntl = timerflags; 132 timer->cntl = timerflags;
133} 133}
134 134
135static inline void omap_mpu_timer_stop(int nr)
136{
137 volatile omap_mpu_timer_regs_t* timer = omap_mpu_timer_base(nr);
138
139 timer->cntl &= ~MPU_TIMER_ST;
140}
141
135/* 142/*
136 * --------------------------------------------------------------------------- 143 * ---------------------------------------------------------------------------
137 * MPU timer 1 ... count down to zero, interrupt, reload 144 * MPU timer 1 ... count down to zero, interrupt, reload
138 * --------------------------------------------------------------------------- 145 * ---------------------------------------------------------------------------
139 */ 146 */
140static int omap_mpu_set_next_event(unsigned long cycles, 147static int omap_mpu_set_next_event(unsigned long cycles,
141 struct clock_event_device *evt) 148 struct clock_event_device *evt)
142{ 149{
143 omap_mpu_timer_start(0, cycles, 0); 150 omap_mpu_timer_start(0, cycles, 0);
144 return 0; 151 return 0;
@@ -152,6 +159,7 @@ static void omap_mpu_set_mode(enum clock_event_mode mode,
152 omap_mpu_set_autoreset(0); 159 omap_mpu_set_autoreset(0);
153 break; 160 break;
154 case CLOCK_EVT_MODE_ONESHOT: 161 case CLOCK_EVT_MODE_ONESHOT:
162 omap_mpu_timer_stop(0);
155 omap_mpu_remove_autoreset(0); 163 omap_mpu_remove_autoreset(0);
156 break; 164 break;
157 case CLOCK_EVT_MODE_UNUSED: 165 case CLOCK_EVT_MODE_UNUSED:
@@ -163,7 +171,7 @@ static void omap_mpu_set_mode(enum clock_event_mode mode,
163 171
164static struct clock_event_device clockevent_mpu_timer1 = { 172static struct clock_event_device clockevent_mpu_timer1 = {
165 .name = "mpu_timer1", 173 .name = "mpu_timer1",
166 .features = CLOCK_EVT_FEAT_PERIODIC, CLOCK_EVT_FEAT_ONESHOT, 174 .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
167 .shift = 32, 175 .shift = 32,
168 .set_next_event = omap_mpu_set_next_event, 176 .set_next_event = omap_mpu_set_next_event,
169 .set_mode = omap_mpu_set_mode, 177 .set_mode = omap_mpu_set_mode,
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
index c156ddab9a2d..016690b9d564 100644
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@ -114,6 +114,10 @@ clean_addr: .word CLEAN_ADDR
114 * Nothing too exciting at the moment 114 * Nothing too exciting at the moment
115 */ 115 */
116ENTRY(cpu_xscale_proc_init) 116ENTRY(cpu_xscale_proc_init)
117 @ enable write buffer coalescing. Some bootloader disable it
118 mrc p15, 0, r1, c1, c0, 1
119 bic r1, r1, #1
120 mcr p15, 0, r1, c1, c0, 1
117 mov pc, lr 121 mov pc, lr
118 122
119/* 123/*
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index c1f7e5a819a3..b917206ee906 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -11,7 +11,6 @@ choice
11 11
12config ARCH_OMAP1 12config ARCH_OMAP1
13 bool "TI OMAP1" 13 bool "TI OMAP1"
14 select GENERIC_CLOCKEVENTS
15 14
16config ARCH_OMAP2 15config ARCH_OMAP2
17 bool "TI OMAP2" 16 bool "TI OMAP2"
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index ce17df31b845..8f56c255d1ee 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -14,9 +14,14 @@ obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o
14# OCPI interconnect support for 1710, 1610 and 5912 14# OCPI interconnect support for 1710, 1610 and 5912
15obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o 15obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o
16 16
17obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
17 18
18obj-$(CONFIG_CPU_FREQ) += cpu-omap.o 19obj-$(CONFIG_CPU_FREQ) += cpu-omap.o
19obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o 20obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
20obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o 21obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
21obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o 22obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o
22obj-$(CONFIG_I2C_OMAP) += i2c.o 23obj-$(CONFIG_I2C_OMAP) += i2c.o
24
25# OMAP mailbox framework
26obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o
27
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 91004a3c4794..793740686be2 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -1020,12 +1020,12 @@ static void create_dma_lch_chain(int lch_head, int lch_queue)
1020 } 1020 }
1021 1021
1022 w = OMAP_DMA_CLNK_CTRL_REG(lch_head); 1022 w = OMAP_DMA_CLNK_CTRL_REG(lch_head);
1023 w &= ~(0x0f); 1023 w &= ~(0x1f);
1024 w |= lch_queue; 1024 w |= lch_queue;
1025 OMAP_DMA_CLNK_CTRL_REG(lch_head) = w; 1025 OMAP_DMA_CLNK_CTRL_REG(lch_head) = w;
1026 1026
1027 w = OMAP_DMA_CLNK_CTRL_REG(lch_queue); 1027 w = OMAP_DMA_CLNK_CTRL_REG(lch_queue);
1028 w &= ~(0x0f); 1028 w &= ~(0x1f);
1029 w |= (dma_chan[lch_queue].next_linked_ch); 1029 w |= (dma_chan[lch_queue].next_linked_ch);
1030 OMAP_DMA_CLNK_CTRL_REG(lch_queue) = w; 1030 OMAP_DMA_CLNK_CTRL_REG(lch_queue) = w;
1031} 1031}
@@ -1248,7 +1248,7 @@ EXPORT_SYMBOL(omap_dma_chain_status);
1248 * @param frame_count 1248 * @param frame_count
1249 * @param callbk_data - channel callback parameter data. 1249 * @param callbk_data - channel callback parameter data.
1250 * 1250 *
1251 * @return - Success : start_dma status 1251 * @return - Success : 0
1252 * Failure: -EINVAL/-EBUSY 1252 * Failure: -EINVAL/-EBUSY
1253 */ 1253 */
1254int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start, 1254int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start,
@@ -1367,7 +1367,7 @@ int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start,
1367 dma_chan[lch].flags |= OMAP_DMA_ACTIVE; 1367 dma_chan[lch].flags |= OMAP_DMA_ACTIVE;
1368 } 1368 }
1369 } 1369 }
1370 return start_dma; 1370 return 0;
1371} 1371}
1372EXPORT_SYMBOL(omap_dma_chain_a_transfer); 1372EXPORT_SYMBOL(omap_dma_chain_a_transfer);
1373 1373
@@ -1663,6 +1663,7 @@ static int omap2_dma_handle_ch(int ch)
1663 if (!status) { 1663 if (!status) {
1664 if (printk_ratelimit()) 1664 if (printk_ratelimit())
1665 printk(KERN_WARNING "Spurious DMA IRQ for lch %d\n", ch); 1665 printk(KERN_WARNING "Spurious DMA IRQ for lch %d\n", ch);
1666 omap_writel(1 << ch, OMAP_DMA4_IRQSTATUS_L0);
1666 return 0; 1667 return 0;
1667 } 1668 }
1668 if (unlikely(dma_chan[ch].dev_id == -1)) { 1669 if (unlikely(dma_chan[ch].dev_id == -1)) {
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 66a1455595f4..8c78e4e57b5c 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -1134,10 +1134,9 @@ static void gpio_mask_irq(unsigned int irq)
1134static void gpio_unmask_irq(unsigned int irq) 1134static void gpio_unmask_irq(unsigned int irq)
1135{ 1135{
1136 unsigned int gpio = irq - IH_GPIO_BASE; 1136 unsigned int gpio = irq - IH_GPIO_BASE;
1137 unsigned int gpio_idx = get_gpio_index(gpio);
1138 struct gpio_bank *bank = get_irq_chip_data(irq); 1137 struct gpio_bank *bank = get_irq_chip_data(irq);
1139 1138
1140 _set_gpio_irqenable(bank, gpio_idx, 1); 1139 _set_gpio_irqenable(bank, gpio, 1);
1141} 1140}
1142 1141
1143static struct irq_chip gpio_irq_chip = { 1142static struct irq_chip gpio_irq_chip = {
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 4974d9e56ead..1aded8f759d0 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -253,8 +253,8 @@ image-$(CONFIG_TQM8540) += cuImage.tqm8540
253image-$(CONFIG_TQM8541) += cuImage.tqm8541 253image-$(CONFIG_TQM8541) += cuImage.tqm8541
254image-$(CONFIG_TQM8555) += cuImage.tqm8555 254image-$(CONFIG_TQM8555) += cuImage.tqm8555
255image-$(CONFIG_TQM8560) += cuImage.tqm8560 255image-$(CONFIG_TQM8560) += cuImage.tqm8560
256image-$(CONFIG_SBC8548) += cuImage.tqm8548 256image-$(CONFIG_SBC8548) += cuImage.sbc8548
257image-$(CONFIG_SBC8560) += cuImage.tqm8560 257image-$(CONFIG_SBC8560) += cuImage.sbc8560
258 258
259# Board ports in arch/powerpc/platform/embedded6xx/Kconfig 259# Board ports in arch/powerpc/platform/embedded6xx/Kconfig
260image-$(CONFIG_STORCENTER) += cuImage.storcenter 260image-$(CONFIG_STORCENTER) += cuImage.storcenter
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index 571ba02accac..2e9bc397ae9a 100644
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -270,7 +270,7 @@
270 mdio@3000 { 270 mdio@3000 {
271 #address-cells = <1>; 271 #address-cells = <1>;
272 #size-cells = <0>; 272 #size-cells = <0>;
273 compatible = "fsl,mpc5200b-mdio"; 273 compatible = "fsl,mpc5200b-mdio", "fsl,mpc5200-mdio";
274 reg = <3000 400>; // fec range, since we need to setup fec interrupts 274 reg = <3000 400>; // fec range, since we need to setup fec interrupts
275 interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co. 275 interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co.
276 interrupt-parent = <&mpc5200_pic>; 276 interrupt-parent = <&mpc5200_pic>;
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index d50e498a072b..8f8b8494d62f 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -174,10 +174,10 @@ cuboot*)
174 *-mpc83*) 174 *-mpc83*)
175 platformo=$object/cuboot-83xx.o 175 platformo=$object/cuboot-83xx.o
176 ;; 176 ;;
177 *-tqm8541|*-mpc8560*|*-tqm8560|*-tqm8555*) 177 *-tqm8541|*-mpc8560*|*-tqm8560|*-tqm8555)
178 platformo=$object/cuboot-85xx-cpm2.o 178 platformo=$object/cuboot-85xx-cpm2.o
179 ;; 179 ;;
180 *-mpc85*) 180 *-mpc85*|*-tqm8540|*-sbc85*)
181 platformo=$object/cuboot-85xx.o 181 platformo=$object/cuboot-85xx.o
182 ;; 182 ;;
183 esac 183 esac
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index f3bde8c6c8c6..c420e47426f8 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:05 2007 4# Thu Mar 20 10:31:04 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -28,6 +28,7 @@ CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y 28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y 29CONFIG_GENERIC_CLOCKEVENTS=y
30CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
31CONFIG_HAVE_SETUP_PER_CPU_AREA=y
31CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
32CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
33CONFIG_ARCH_HAS_ILOG2_U32=y 34CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -69,8 +70,6 @@ CONFIG_SYSVIPC_SYSCTL=y
69# CONFIG_POSIX_MQUEUE is not set 70# CONFIG_POSIX_MQUEUE is not set
70# CONFIG_BSD_PROCESS_ACCT is not set 71# CONFIG_BSD_PROCESS_ACCT is not set
71# CONFIG_TASKSTATS is not set 72# CONFIG_TASKSTATS is not set
72# CONFIG_USER_NS is not set
73# CONFIG_PID_NS is not set
74# CONFIG_AUDIT is not set 73# CONFIG_AUDIT is not set
75CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
76CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
@@ -79,13 +78,20 @@ CONFIG_CGROUPS=y
79# CONFIG_CGROUP_DEBUG is not set 78# CONFIG_CGROUP_DEBUG is not set
80# CONFIG_CGROUP_NS is not set 79# CONFIG_CGROUP_NS is not set
81CONFIG_CPUSETS=y 80CONFIG_CPUSETS=y
82CONFIG_FAIR_GROUP_SCHED=y 81# CONFIG_GROUP_SCHED is not set
83CONFIG_FAIR_USER_SCHED=y 82# CONFIG_USER_SCHED is not set
84# CONFIG_FAIR_CGROUP_SCHED is not set 83# CONFIG_CGROUP_SCHED is not set
85# CONFIG_CGROUP_CPUACCT is not set 84# CONFIG_CGROUP_CPUACCT is not set
85# CONFIG_RESOURCE_COUNTERS is not set
86CONFIG_SYSFS_DEPRECATED=y 86CONFIG_SYSFS_DEPRECATED=y
87CONFIG_SYSFS_DEPRECATED_V2=y
87CONFIG_PROC_PID_CPUSET=y 88CONFIG_PROC_PID_CPUSET=y
88# CONFIG_RELAY is not set 89# CONFIG_RELAY is not set
90CONFIG_NAMESPACES=y
91# CONFIG_UTS_NS is not set
92# CONFIG_IPC_NS is not set
93# CONFIG_USER_NS is not set
94# CONFIG_PID_NS is not set
89CONFIG_BLK_DEV_INITRD=y 95CONFIG_BLK_DEV_INITRD=y
90CONFIG_INITRAMFS_SOURCE="" 96CONFIG_INITRAMFS_SOURCE=""
91CONFIG_CC_OPTIMIZE_FOR_SIZE=y 97CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -99,11 +105,13 @@ CONFIG_HOTPLUG=y
99CONFIG_PRINTK=y 105CONFIG_PRINTK=y
100CONFIG_BUG=y 106CONFIG_BUG=y
101CONFIG_ELF_CORE=y 107CONFIG_ELF_CORE=y
108# CONFIG_COMPAT_BRK is not set
102CONFIG_BASE_FULL=y 109CONFIG_BASE_FULL=y
103CONFIG_FUTEX=y 110CONFIG_FUTEX=y
104CONFIG_ANON_INODES=y 111CONFIG_ANON_INODES=y
105CONFIG_EPOLL=y 112CONFIG_EPOLL=y
106CONFIG_SIGNALFD=y 113CONFIG_SIGNALFD=y
114CONFIG_TIMERFD=y
107CONFIG_EVENTFD=y 115CONFIG_EVENTFD=y
108CONFIG_SHMEM=y 116CONFIG_SHMEM=y
109CONFIG_VM_EVENT_COUNTERS=y 117CONFIG_VM_EVENT_COUNTERS=y
@@ -111,6 +119,15 @@ CONFIG_SLUB_DEBUG=y
111# CONFIG_SLAB is not set 119# CONFIG_SLAB is not set
112CONFIG_SLUB=y 120CONFIG_SLUB=y
113# CONFIG_SLOB is not set 121# CONFIG_SLOB is not set
122CONFIG_PROFILING=y
123# CONFIG_MARKERS is not set
124CONFIG_OPROFILE=m
125CONFIG_HAVE_OPROFILE=y
126# CONFIG_KPROBES is not set
127CONFIG_HAVE_KPROBES=y
128CONFIG_HAVE_KRETPROBES=y
129CONFIG_PROC_PAGE_MONITOR=y
130CONFIG_SLABINFO=y
114CONFIG_RT_MUTEXES=y 131CONFIG_RT_MUTEXES=y
115# CONFIG_TINY_SHMEM is not set 132# CONFIG_TINY_SHMEM is not set
116CONFIG_BASE_SMALL=0 133CONFIG_BASE_SMALL=0
@@ -138,6 +155,7 @@ CONFIG_DEFAULT_AS=y
138# CONFIG_DEFAULT_CFQ is not set 155# CONFIG_DEFAULT_CFQ is not set
139# CONFIG_DEFAULT_NOOP is not set 156# CONFIG_DEFAULT_NOOP is not set
140CONFIG_DEFAULT_IOSCHED="anticipatory" 157CONFIG_DEFAULT_IOSCHED="anticipatory"
158CONFIG_CLASSIC_RCU=y
141 159
142# 160#
143# Platform support 161# Platform support
@@ -148,8 +166,8 @@ CONFIG_PPC_MULTIPLATFORM=y
148# CONFIG_PPC_86xx is not set 166# CONFIG_PPC_86xx is not set
149# CONFIG_PPC_PSERIES is not set 167# CONFIG_PPC_PSERIES is not set
150# CONFIG_PPC_ISERIES is not set 168# CONFIG_PPC_ISERIES is not set
151# CONFIG_PPC_MPC52xx is not set 169# CONFIG_PPC_MPC512x is not set
152# CONFIG_PPC_MPC5200 is not set 170# CONFIG_PPC_MPC5121 is not set
153# CONFIG_PPC_PMAC is not set 171# CONFIG_PPC_PMAC is not set
154# CONFIG_PPC_MAPLE is not set 172# CONFIG_PPC_MAPLE is not set
155# CONFIG_PPC_PASEMI is not set 173# CONFIG_PPC_PASEMI is not set
@@ -162,14 +180,14 @@ CONFIG_PPC_PS3=y
162# CONFIG_PS3_ADVANCED is not set 180# CONFIG_PS3_ADVANCED is not set
163CONFIG_PS3_HTAB_SIZE=20 181CONFIG_PS3_HTAB_SIZE=20
164# CONFIG_PS3_DYNAMIC_DMA is not set 182# CONFIG_PS3_DYNAMIC_DMA is not set
165CONFIG_PS3_USE_LPAR_ADDR=y
166CONFIG_PS3_VUART=y 183CONFIG_PS3_VUART=y
167CONFIG_PS3_PS3AV=y 184CONFIG_PS3_PS3AV=y
168CONFIG_PS3_SYS_MANAGER=m 185CONFIG_PS3_SYS_MANAGER=y
169CONFIG_PS3_STORAGE=y 186CONFIG_PS3_STORAGE=y
170CONFIG_PS3_DISK=y 187CONFIG_PS3_DISK=y
171CONFIG_PS3_ROM=m 188CONFIG_PS3_ROM=m
172CONFIG_PS3_FLASH=m 189CONFIG_PS3_FLASH=m
190CONFIG_PS3_LPM=m
173CONFIG_PPC_CELL=y 191CONFIG_PPC_CELL=y
174CONFIG_PPC_CELL_NATIVE=y 192CONFIG_PPC_CELL_NATIVE=y
175CONFIG_PPC_IBM_CELL_BLADE=y 193CONFIG_PPC_IBM_CELL_BLADE=y
@@ -183,10 +201,12 @@ CONFIG_CBE_RAS=y
183CONFIG_CBE_THERM=m 201CONFIG_CBE_THERM=m
184CONFIG_CBE_CPUFREQ=m 202CONFIG_CBE_CPUFREQ=m
185CONFIG_CBE_CPUFREQ_PMI=m 203CONFIG_CBE_CPUFREQ_PMI=m
204CONFIG_OPROFILE_CELL=y
186# CONFIG_PQ2ADS is not set 205# CONFIG_PQ2ADS is not set
187CONFIG_PPC_NATIVE=y 206CONFIG_PPC_NATIVE=y
188CONFIG_UDBG_RTAS_CONSOLE=y 207CONFIG_UDBG_RTAS_CONSOLE=y
189CONFIG_PPC_UDBG_BEAT=y 208CONFIG_PPC_UDBG_BEAT=y
209# CONFIG_IPIC is not set
190CONFIG_MPIC=y 210CONFIG_MPIC=y
191# CONFIG_MPIC_WEIRD is not set 211# CONFIG_MPIC_WEIRD is not set
192# CONFIG_PPC_I8259 is not set 212# CONFIG_PPC_I8259 is not set
@@ -219,7 +239,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
219# 239#
220# CPU Frequency drivers 240# CPU Frequency drivers
221# 241#
222# CONFIG_CPM2 is not set
223CONFIG_AXON_RAM=m 242CONFIG_AXON_RAM=m
224# CONFIG_FSL_ULI1575 is not set 243# CONFIG_FSL_ULI1575 is not set
225 244
@@ -235,16 +254,20 @@ CONFIG_HZ_250=y
235# CONFIG_HZ_300 is not set 254# CONFIG_HZ_300 is not set
236# CONFIG_HZ_1000 is not set 255# CONFIG_HZ_1000 is not set
237CONFIG_HZ=250 256CONFIG_HZ=250
257# CONFIG_SCHED_HRTICK is not set
238CONFIG_PREEMPT_NONE=y 258CONFIG_PREEMPT_NONE=y
239# CONFIG_PREEMPT_VOLUNTARY is not set 259# CONFIG_PREEMPT_VOLUNTARY is not set
240# CONFIG_PREEMPT is not set 260# CONFIG_PREEMPT is not set
241CONFIG_PREEMPT_BKL=y
242CONFIG_BINFMT_ELF=y 261CONFIG_BINFMT_ELF=y
262CONFIG_COMPAT_BINFMT_ELF=y
243CONFIG_BINFMT_MISC=m 263CONFIG_BINFMT_MISC=m
244CONFIG_FORCE_MAX_ZONEORDER=9 264CONFIG_FORCE_MAX_ZONEORDER=9
245CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y 265CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
246# CONFIG_IOMMU_VMERGE is not set 266# CONFIG_IOMMU_VMERGE is not set
267CONFIG_IOMMU_HELPER=y
247CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 268CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
269CONFIG_ARCH_HAS_WALK_MEMORY=y
270CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
248# CONFIG_KEXEC is not set 271# CONFIG_KEXEC is not set
249# CONFIG_CRASH_DUMP is not set 272# CONFIG_CRASH_DUMP is not set
250CONFIG_IRQ_ALL_CPUS=y 273CONFIG_IRQ_ALL_CPUS=y
@@ -267,6 +290,7 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
267CONFIG_SPARSEMEM_VMEMMAP=y 290CONFIG_SPARSEMEM_VMEMMAP=y
268CONFIG_MEMORY_HOTPLUG=y 291CONFIG_MEMORY_HOTPLUG=y
269CONFIG_MEMORY_HOTPLUG_SPARSE=y 292CONFIG_MEMORY_HOTPLUG_SPARSE=y
293CONFIG_MEMORY_HOTREMOVE=y
270CONFIG_SPLIT_PTLOCK_CPUS=4 294CONFIG_SPLIT_PTLOCK_CPUS=4
271CONFIG_MIGRATION=y 295CONFIG_MIGRATION=y
272CONFIG_RESOURCES_64BIT=y 296CONFIG_RESOURCES_64BIT=y
@@ -276,12 +300,12 @@ CONFIG_ARCH_MEMORY_PROBE=y
276CONFIG_NODES_SPAN_OTHER_NODES=y 300CONFIG_NODES_SPAN_OTHER_NODES=y
277CONFIG_PPC_HAS_HASH_64K=y 301CONFIG_PPC_HAS_HASH_64K=y
278CONFIG_PPC_64K_PAGES=y 302CONFIG_PPC_64K_PAGES=y
303# CONFIG_PPC_SUBPAGE_PROT is not set
279CONFIG_SCHED_SMT=y 304CONFIG_SCHED_SMT=y
280CONFIG_PROC_DEVICETREE=y 305CONFIG_PROC_DEVICETREE=y
281# CONFIG_CMDLINE_BOOL is not set 306# CONFIG_CMDLINE_BOOL is not set
282# CONFIG_PM is not set 307# CONFIG_PM is not set
283CONFIG_SECCOMP=y 308CONFIG_SECCOMP=y
284# CONFIG_WANT_DEVICE_TREE is not set
285CONFIG_ISA_DMA_API=y 309CONFIG_ISA_DMA_API=y
286 310
287# 311#
@@ -318,6 +342,7 @@ CONFIG_XFRM=y
318# CONFIG_XFRM_USER is not set 342# CONFIG_XFRM_USER is not set
319# CONFIG_XFRM_SUB_POLICY is not set 343# CONFIG_XFRM_SUB_POLICY is not set
320# CONFIG_XFRM_MIGRATE is not set 344# CONFIG_XFRM_MIGRATE is not set
345# CONFIG_XFRM_STATISTICS is not set
321# CONFIG_NET_KEY is not set 346# CONFIG_NET_KEY is not set
322CONFIG_INET=y 347CONFIG_INET=y
323CONFIG_IP_MULTICAST=y 348CONFIG_IP_MULTICAST=y
@@ -368,6 +393,7 @@ CONFIG_IPV6_TUNNEL=m
368# CONFIG_NETWORK_SECMARK is not set 393# CONFIG_NETWORK_SECMARK is not set
369CONFIG_NETFILTER=y 394CONFIG_NETFILTER=y
370# CONFIG_NETFILTER_DEBUG is not set 395# CONFIG_NETFILTER_DEBUG is not set
396CONFIG_NETFILTER_ADVANCED=y
371 397
372# 398#
373# Core Netfilter Configuration 399# Core Netfilter Configuration
@@ -375,7 +401,6 @@ CONFIG_NETFILTER=y
375CONFIG_NETFILTER_NETLINK=m 401CONFIG_NETFILTER_NETLINK=m
376CONFIG_NETFILTER_NETLINK_QUEUE=m 402CONFIG_NETFILTER_NETLINK_QUEUE=m
377CONFIG_NETFILTER_NETLINK_LOG=m 403CONFIG_NETFILTER_NETLINK_LOG=m
378# CONFIG_NF_CONNTRACK_ENABLED is not set
379# CONFIG_NF_CONNTRACK is not set 404# CONFIG_NF_CONNTRACK is not set
380CONFIG_NETFILTER_XTABLES=m 405CONFIG_NETFILTER_XTABLES=m
381CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 406CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -383,20 +408,25 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
383CONFIG_NETFILTER_XT_TARGET_MARK=m 408CONFIG_NETFILTER_XT_TARGET_MARK=m
384CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 409CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
385CONFIG_NETFILTER_XT_TARGET_NFLOG=m 410CONFIG_NETFILTER_XT_TARGET_NFLOG=m
411CONFIG_NETFILTER_XT_TARGET_RATEEST=m
386# CONFIG_NETFILTER_XT_TARGET_TRACE is not set 412# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
387CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 413CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
414CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
388CONFIG_NETFILTER_XT_MATCH_COMMENT=m 415CONFIG_NETFILTER_XT_MATCH_COMMENT=m
389CONFIG_NETFILTER_XT_MATCH_DCCP=m 416CONFIG_NETFILTER_XT_MATCH_DCCP=m
390CONFIG_NETFILTER_XT_MATCH_DSCP=m 417CONFIG_NETFILTER_XT_MATCH_DSCP=m
391CONFIG_NETFILTER_XT_MATCH_ESP=m 418CONFIG_NETFILTER_XT_MATCH_ESP=m
419CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
392CONFIG_NETFILTER_XT_MATCH_LENGTH=m 420CONFIG_NETFILTER_XT_MATCH_LENGTH=m
393CONFIG_NETFILTER_XT_MATCH_LIMIT=m 421CONFIG_NETFILTER_XT_MATCH_LIMIT=m
394CONFIG_NETFILTER_XT_MATCH_MAC=m 422CONFIG_NETFILTER_XT_MATCH_MAC=m
395CONFIG_NETFILTER_XT_MATCH_MARK=m 423CONFIG_NETFILTER_XT_MATCH_MARK=m
424CONFIG_NETFILTER_XT_MATCH_OWNER=m
396CONFIG_NETFILTER_XT_MATCH_POLICY=m 425CONFIG_NETFILTER_XT_MATCH_POLICY=m
397CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 426CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
398CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 427CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
399CONFIG_NETFILTER_XT_MATCH_QUOTA=m 428CONFIG_NETFILTER_XT_MATCH_QUOTA=m
429CONFIG_NETFILTER_XT_MATCH_RATEEST=m
400CONFIG_NETFILTER_XT_MATCH_REALM=m 430CONFIG_NETFILTER_XT_MATCH_REALM=m
401CONFIG_NETFILTER_XT_MATCH_SCTP=m 431CONFIG_NETFILTER_XT_MATCH_SCTP=m
402CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 432CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -411,20 +441,16 @@ CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
411# 441#
412CONFIG_IP_NF_QUEUE=m 442CONFIG_IP_NF_QUEUE=m
413CONFIG_IP_NF_IPTABLES=m 443CONFIG_IP_NF_IPTABLES=m
414CONFIG_IP_NF_MATCH_IPRANGE=m
415CONFIG_IP_NF_MATCH_TOS=m
416CONFIG_IP_NF_MATCH_RECENT=m 444CONFIG_IP_NF_MATCH_RECENT=m
417CONFIG_IP_NF_MATCH_ECN=m 445CONFIG_IP_NF_MATCH_ECN=m
418CONFIG_IP_NF_MATCH_AH=m 446CONFIG_IP_NF_MATCH_AH=m
419CONFIG_IP_NF_MATCH_TTL=m 447CONFIG_IP_NF_MATCH_TTL=m
420CONFIG_IP_NF_MATCH_OWNER=m
421CONFIG_IP_NF_MATCH_ADDRTYPE=m 448CONFIG_IP_NF_MATCH_ADDRTYPE=m
422CONFIG_IP_NF_FILTER=m 449CONFIG_IP_NF_FILTER=m
423CONFIG_IP_NF_TARGET_REJECT=m 450CONFIG_IP_NF_TARGET_REJECT=m
424CONFIG_IP_NF_TARGET_LOG=m 451CONFIG_IP_NF_TARGET_LOG=m
425CONFIG_IP_NF_TARGET_ULOG=m 452CONFIG_IP_NF_TARGET_ULOG=m
426CONFIG_IP_NF_MANGLE=m 453CONFIG_IP_NF_MANGLE=m
427CONFIG_IP_NF_TARGET_TOS=m
428CONFIG_IP_NF_TARGET_ECN=m 454CONFIG_IP_NF_TARGET_ECN=m
429CONFIG_IP_NF_TARGET_TTL=m 455CONFIG_IP_NF_TARGET_TTL=m
430CONFIG_IP_NF_RAW=m 456CONFIG_IP_NF_RAW=m
@@ -433,7 +459,7 @@ CONFIG_IP_NF_ARPFILTER=m
433CONFIG_IP_NF_ARP_MANGLE=m 459CONFIG_IP_NF_ARP_MANGLE=m
434 460
435# 461#
436# IPv6: Netfilter Configuration (EXPERIMENTAL) 462# IPv6: Netfilter Configuration
437# 463#
438# CONFIG_IP6_NF_QUEUE is not set 464# CONFIG_IP6_NF_QUEUE is not set
439# CONFIG_IP6_NF_IPTABLES is not set 465# CONFIG_IP6_NF_IPTABLES is not set
@@ -459,6 +485,7 @@ CONFIG_NET_CLS_ROUTE=y
459# 485#
460# CONFIG_NET_PKTGEN is not set 486# CONFIG_NET_PKTGEN is not set
461# CONFIG_HAMRADIO is not set 487# CONFIG_HAMRADIO is not set
488# CONFIG_CAN is not set
462# CONFIG_IRDA is not set 489# CONFIG_IRDA is not set
463# CONFIG_BT is not set 490# CONFIG_BT is not set
464# CONFIG_AF_RXRPC is not set 491# CONFIG_AF_RXRPC is not set
@@ -467,7 +494,7 @@ CONFIG_NET_CLS_ROUTE=y
467# Wireless 494# Wireless
468# 495#
469# CONFIG_CFG80211 is not set 496# CONFIG_CFG80211 is not set
470# CONFIG_WIRELESS_EXT is not set 497CONFIG_WIRELESS_EXT=y
471# CONFIG_MAC80211 is not set 498# CONFIG_MAC80211 is not set
472# CONFIG_IEEE80211 is not set 499# CONFIG_IEEE80211 is not set
473# CONFIG_RFKILL is not set 500# CONFIG_RFKILL is not set
@@ -505,7 +532,7 @@ CONFIG_BLK_DEV_LOOP=y
505CONFIG_BLK_DEV_RAM=y 532CONFIG_BLK_DEV_RAM=y
506CONFIG_BLK_DEV_RAM_COUNT=16 533CONFIG_BLK_DEV_RAM_COUNT=16
507CONFIG_BLK_DEV_RAM_SIZE=131072 534CONFIG_BLK_DEV_RAM_SIZE=131072
508CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 535# CONFIG_BLK_DEV_XIP is not set
509# CONFIG_CDROM_PKTCDVD is not set 536# CONFIG_CDROM_PKTCDVD is not set
510# CONFIG_ATA_OVER_ETH is not set 537# CONFIG_ATA_OVER_ETH is not set
511CONFIG_MISC_DEVICES=y 538CONFIG_MISC_DEVICES=y
@@ -513,11 +540,13 @@ CONFIG_MISC_DEVICES=y
513# CONFIG_EEPROM_93CX6 is not set 540# CONFIG_EEPROM_93CX6 is not set
514# CONFIG_SGI_IOC4 is not set 541# CONFIG_SGI_IOC4 is not set
515# CONFIG_TIFM_CORE is not set 542# CONFIG_TIFM_CORE is not set
543# CONFIG_ENCLOSURE_SERVICES is not set
544CONFIG_HAVE_IDE=y
516CONFIG_IDE=y 545CONFIG_IDE=y
517CONFIG_BLK_DEV_IDE=y 546CONFIG_BLK_DEV_IDE=y
518 547
519# 548#
520# Please see Documentation/ide.txt for help/info on IDE drives 549# Please see Documentation/ide/ide.txt for help/info on IDE drives
521# 550#
522# CONFIG_BLK_DEV_IDE_SATA is not set 551# CONFIG_BLK_DEV_IDE_SATA is not set
523CONFIG_BLK_DEV_IDEDISK=y 552CONFIG_BLK_DEV_IDEDISK=y
@@ -534,12 +563,12 @@ CONFIG_IDE_PROC_FS=y
534# 563#
535CONFIG_IDE_GENERIC=y 564CONFIG_IDE_GENERIC=y
536# CONFIG_BLK_DEV_PLATFORM is not set 565# CONFIG_BLK_DEV_PLATFORM is not set
566CONFIG_BLK_DEV_IDEDMA_SFF=y
537 567
538# 568#
539# PCI IDE chipsets support 569# PCI IDE chipsets support
540# 570#
541CONFIG_BLK_DEV_IDEPCI=y 571CONFIG_BLK_DEV_IDEPCI=y
542CONFIG_IDEPCI_SHARE_IRQ=y
543CONFIG_IDEPCI_PCIBUS_ORDER=y 572CONFIG_IDEPCI_PCIBUS_ORDER=y
544# CONFIG_BLK_DEV_OFFBOARD is not set 573# CONFIG_BLK_DEV_OFFBOARD is not set
545CONFIG_BLK_DEV_GENERIC=y 574CONFIG_BLK_DEV_GENERIC=y
@@ -571,7 +600,6 @@ CONFIG_BLK_DEV_SIIMAGE=y
571# CONFIG_BLK_DEV_VIA82CXXX is not set 600# CONFIG_BLK_DEV_VIA82CXXX is not set
572# CONFIG_BLK_DEV_TC86C001 is not set 601# CONFIG_BLK_DEV_TC86C001 is not set
573CONFIG_BLK_DEV_CELLEB=y 602CONFIG_BLK_DEV_CELLEB=y
574# CONFIG_IDE_ARM is not set
575CONFIG_BLK_DEV_IDEDMA=y 603CONFIG_BLK_DEV_IDEDMA=y
576CONFIG_IDE_ARCH_OBSOLETE_INIT=y 604CONFIG_IDE_ARCH_OBSOLETE_INIT=y
577# CONFIG_BLK_DEV_HD is not set 605# CONFIG_BLK_DEV_HD is not set
@@ -637,6 +665,7 @@ CONFIG_SCSI_LOWLEVEL=y
637# CONFIG_SCSI_IPS is not set 665# CONFIG_SCSI_IPS is not set
638# CONFIG_SCSI_INITIO is not set 666# CONFIG_SCSI_INITIO is not set
639# CONFIG_SCSI_INIA100 is not set 667# CONFIG_SCSI_INIA100 is not set
668# CONFIG_SCSI_MVSAS is not set
640# CONFIG_SCSI_STEX is not set 669# CONFIG_SCSI_STEX is not set
641# CONFIG_SCSI_SYM53C8XX_2 is not set 670# CONFIG_SCSI_SYM53C8XX_2 is not set
642# CONFIG_SCSI_IPR is not set 671# CONFIG_SCSI_IPR is not set
@@ -689,6 +718,7 @@ CONFIG_SATA_PROMISE=y
689# CONFIG_PATA_MPIIX is not set 718# CONFIG_PATA_MPIIX is not set
690# CONFIG_PATA_OLDPIIX is not set 719# CONFIG_PATA_OLDPIIX is not set
691# CONFIG_PATA_NETCELL is not set 720# CONFIG_PATA_NETCELL is not set
721# CONFIG_PATA_NINJA32 is not set
692# CONFIG_PATA_NS87410 is not set 722# CONFIG_PATA_NS87410 is not set
693# CONFIG_PATA_NS87415 is not set 723# CONFIG_PATA_NS87415 is not set
694# CONFIG_PATA_OPTI is not set 724# CONFIG_PATA_OPTI is not set
@@ -703,6 +733,7 @@ CONFIG_PATA_PDC2027X=m
703# CONFIG_PATA_SIS is not set 733# CONFIG_PATA_SIS is not set
704# CONFIG_PATA_VIA is not set 734# CONFIG_PATA_VIA is not set
705# CONFIG_PATA_WINBOND is not set 735# CONFIG_PATA_WINBOND is not set
736# CONFIG_PATA_PLATFORM is not set
706# CONFIG_PATA_SCC is not set 737# CONFIG_PATA_SCC is not set
707CONFIG_MD=y 738CONFIG_MD=y
708CONFIG_BLK_DEV_MD=m 739CONFIG_BLK_DEV_MD=m
@@ -748,7 +779,6 @@ CONFIG_MACVLAN=m
748# CONFIG_EQUALIZER is not set 779# CONFIG_EQUALIZER is not set
749CONFIG_TUN=y 780CONFIG_TUN=y
750# CONFIG_VETH is not set 781# CONFIG_VETH is not set
751# CONFIG_IP1000 is not set
752# CONFIG_ARCNET is not set 782# CONFIG_ARCNET is not set
753# CONFIG_PHYLIB is not set 783# CONFIG_PHYLIB is not set
754CONFIG_NET_ETHERNET=y 784CONFIG_NET_ETHERNET=y
@@ -773,6 +803,9 @@ CONFIG_E1000=m
773CONFIG_E1000_NAPI=y 803CONFIG_E1000_NAPI=y
774# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 804# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
775# CONFIG_E1000E is not set 805# CONFIG_E1000E is not set
806# CONFIG_E1000E_ENABLED is not set
807# CONFIG_IP1000 is not set
808# CONFIG_IGB is not set
776# CONFIG_NS83820 is not set 809# CONFIG_NS83820 is not set
777# CONFIG_HAMACHI is not set 810# CONFIG_HAMACHI is not set
778# CONFIG_YELLOWFIN is not set 811# CONFIG_YELLOWFIN is not set
@@ -788,6 +821,7 @@ CONFIG_TIGON3=y
788# CONFIG_BNX2 is not set 821# CONFIG_BNX2 is not set
789CONFIG_SPIDER_NET=y 822CONFIG_SPIDER_NET=y
790CONFIG_GELIC_NET=m 823CONFIG_GELIC_NET=m
824CONFIG_GELIC_WIRELESS=y
791# CONFIG_QLA3XXX is not set 825# CONFIG_QLA3XXX is not set
792# CONFIG_ATL1 is not set 826# CONFIG_ATL1 is not set
793CONFIG_NETDEV_10000=y 827CONFIG_NETDEV_10000=y
@@ -802,6 +836,7 @@ CONFIG_NETDEV_10000=y
802# CONFIG_PASEMI_MAC is not set 836# CONFIG_PASEMI_MAC is not set
803# CONFIG_MLX4_CORE is not set 837# CONFIG_MLX4_CORE is not set
804# CONFIG_TEHUTI is not set 838# CONFIG_TEHUTI is not set
839# CONFIG_BNX2X is not set
805# CONFIG_TR is not set 840# CONFIG_TR is not set
806 841
807# 842#
@@ -824,7 +859,6 @@ CONFIG_NETDEV_10000=y
824# CONFIG_PPP is not set 859# CONFIG_PPP is not set
825# CONFIG_SLIP is not set 860# CONFIG_SLIP is not set
826# CONFIG_NET_FC is not set 861# CONFIG_NET_FC is not set
827# CONFIG_SHAPER is not set
828# CONFIG_NETCONSOLE is not set 862# CONFIG_NETCONSOLE is not set
829# CONFIG_NETPOLL is not set 863# CONFIG_NETPOLL is not set
830# CONFIG_NET_POLL_CONTROLLER is not set 864# CONFIG_NET_POLL_CONTROLLER is not set
@@ -883,16 +917,17 @@ CONFIG_SERIAL_NONSTANDARD=y
883# CONFIG_DIGIEPCA is not set 917# CONFIG_DIGIEPCA is not set
884# CONFIG_MOXA_INTELLIO is not set 918# CONFIG_MOXA_INTELLIO is not set
885# CONFIG_MOXA_SMARTIO is not set 919# CONFIG_MOXA_SMARTIO is not set
886# CONFIG_MOXA_SMARTIO_NEW is not set
887# CONFIG_ISI is not set 920# CONFIG_ISI is not set
888# CONFIG_SYNCLINK is not set 921# CONFIG_SYNCLINK is not set
889# CONFIG_SYNCLINKMP is not set 922# CONFIG_SYNCLINKMP is not set
890# CONFIG_SYNCLINK_GT is not set 923# CONFIG_SYNCLINK_GT is not set
891# CONFIG_N_HDLC is not set 924# CONFIG_N_HDLC is not set
925# CONFIG_RISCOM8 is not set
892# CONFIG_SPECIALIX is not set 926# CONFIG_SPECIALIX is not set
893# CONFIG_SX is not set 927# CONFIG_SX is not set
894# CONFIG_RIO is not set 928# CONFIG_RIO is not set
895# CONFIG_STALDRV is not set 929# CONFIG_STALDRV is not set
930# CONFIG_NOZOMI is not set
896 931
897# 932#
898# Serial drivers 933# Serial drivers
@@ -976,13 +1011,12 @@ CONFIG_I2C_ALGOBIT=y
976# 1011#
977# Miscellaneous I2C Chip support 1012# Miscellaneous I2C Chip support
978# 1013#
979# CONFIG_SENSORS_DS1337 is not set
980# CONFIG_SENSORS_DS1374 is not set
981# CONFIG_DS1682 is not set 1014# CONFIG_DS1682 is not set
982# CONFIG_SENSORS_EEPROM is not set 1015# CONFIG_SENSORS_EEPROM is not set
983# CONFIG_SENSORS_PCF8574 is not set 1016# CONFIG_SENSORS_PCF8574 is not set
984# CONFIG_SENSORS_PCA9539 is not set 1017# CONFIG_PCF8575 is not set
985# CONFIG_SENSORS_PCF8591 is not set 1018# CONFIG_SENSORS_PCF8591 is not set
1019# CONFIG_TPS65010 is not set
986# CONFIG_SENSORS_MAX6875 is not set 1020# CONFIG_SENSORS_MAX6875 is not set
987# CONFIG_SENSORS_TSL2550 is not set 1021# CONFIG_SENSORS_TSL2550 is not set
988# CONFIG_I2C_DEBUG_CORE is not set 1022# CONFIG_I2C_DEBUG_CORE is not set
@@ -998,6 +1032,7 @@ CONFIG_I2C_ALGOBIT=y
998# CONFIG_W1 is not set 1032# CONFIG_W1 is not set
999# CONFIG_POWER_SUPPLY is not set 1033# CONFIG_POWER_SUPPLY is not set
1000# CONFIG_HWMON is not set 1034# CONFIG_HWMON is not set
1035# CONFIG_THERMAL is not set
1001CONFIG_WATCHDOG=y 1036CONFIG_WATCHDOG=y
1002# CONFIG_WATCHDOG_NOWAYOUT is not set 1037# CONFIG_WATCHDOG_NOWAYOUT is not set
1003 1038
@@ -1082,6 +1117,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
1082CONFIG_USB_ARCH_HAS_EHCI=y 1117CONFIG_USB_ARCH_HAS_EHCI=y
1083CONFIG_USB=m 1118CONFIG_USB=m
1084# CONFIG_USB_DEBUG is not set 1119# CONFIG_USB_DEBUG is not set
1120# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1085 1121
1086# 1122#
1087# Miscellaneous USB options 1123# Miscellaneous USB options
@@ -1095,10 +1131,10 @@ CONFIG_USB_DEVICE_CLASS=y
1095# USB Host Controller Drivers 1131# USB Host Controller Drivers
1096# 1132#
1097CONFIG_USB_EHCI_HCD=m 1133CONFIG_USB_EHCI_HCD=m
1098# CONFIG_USB_EHCI_SPLIT_ISO is not set
1099# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1134# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1100# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1135# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1101CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y 1136CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
1137# CONFIG_USB_EHCI_HCD_PPC_OF is not set
1102# CONFIG_USB_ISP116X_HCD is not set 1138# CONFIG_USB_ISP116X_HCD is not set
1103CONFIG_USB_OHCI_HCD=m 1139CONFIG_USB_OHCI_HCD=m
1104CONFIG_USB_OHCI_HCD_PPC_OF=y 1140CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -1149,10 +1185,6 @@ CONFIG_USB_MON=y
1149# 1185#
1150# USB port drivers 1186# USB port drivers
1151# 1187#
1152
1153#
1154# USB Serial Converter support
1155#
1156# CONFIG_USB_SERIAL is not set 1188# CONFIG_USB_SERIAL is not set
1157 1189
1158# 1190#
@@ -1178,16 +1210,9 @@ CONFIG_USB_MON=y
1178# CONFIG_USB_TRANCEVIBRATOR is not set 1210# CONFIG_USB_TRANCEVIBRATOR is not set
1179# CONFIG_USB_IOWARRIOR is not set 1211# CONFIG_USB_IOWARRIOR is not set
1180# CONFIG_USB_TEST is not set 1212# CONFIG_USB_TEST is not set
1181
1182#
1183# USB DSL modem support
1184#
1185
1186#
1187# USB Gadget Support
1188#
1189# CONFIG_USB_GADGET is not set 1213# CONFIG_USB_GADGET is not set
1190# CONFIG_MMC is not set 1214# CONFIG_MMC is not set
1215# CONFIG_MEMSTICK is not set
1191# CONFIG_NEW_LEDS is not set 1216# CONFIG_NEW_LEDS is not set
1192CONFIG_INFINIBAND=m 1217CONFIG_INFINIBAND=m
1193CONFIG_INFINIBAND_USER_MAD=m 1218CONFIG_INFINIBAND_USER_MAD=m
@@ -1198,6 +1223,7 @@ CONFIG_INFINIBAND_MTHCA=m
1198CONFIG_INFINIBAND_MTHCA_DEBUG=y 1223CONFIG_INFINIBAND_MTHCA_DEBUG=y
1199# CONFIG_INFINIBAND_AMSO1100 is not set 1224# CONFIG_INFINIBAND_AMSO1100 is not set
1200# CONFIG_MLX4_INFINIBAND is not set 1225# CONFIG_MLX4_INFINIBAND is not set
1226# CONFIG_INFINIBAND_NES is not set
1201CONFIG_INFINIBAND_IPOIB=m 1227CONFIG_INFINIBAND_IPOIB=m
1202# CONFIG_INFINIBAND_IPOIB_CM is not set 1228# CONFIG_INFINIBAND_IPOIB_CM is not set
1203CONFIG_INFINIBAND_IPOIB_DEBUG=y 1229CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -1211,7 +1237,9 @@ CONFIG_EDAC=y
1211# 1237#
1212# CONFIG_EDAC_DEBUG is not set 1238# CONFIG_EDAC_DEBUG is not set
1213CONFIG_EDAC_MM_EDAC=y 1239CONFIG_EDAC_MM_EDAC=y
1240CONFIG_EDAC_CELL=y
1214# CONFIG_RTC_CLASS is not set 1241# CONFIG_RTC_CLASS is not set
1242# CONFIG_DMADEVICES is not set
1215 1243
1216# 1244#
1217# Userspace I/O 1245# Userspace I/O
@@ -1239,12 +1267,10 @@ CONFIG_FS_POSIX_ACL=y
1239# CONFIG_XFS_FS is not set 1267# CONFIG_XFS_FS is not set
1240# CONFIG_GFS2_FS is not set 1268# CONFIG_GFS2_FS is not set
1241# CONFIG_OCFS2_FS is not set 1269# CONFIG_OCFS2_FS is not set
1242# CONFIG_MINIX_FS is not set 1270CONFIG_DNOTIFY=y
1243# CONFIG_ROMFS_FS is not set
1244CONFIG_INOTIFY=y 1271CONFIG_INOTIFY=y
1245CONFIG_INOTIFY_USER=y 1272CONFIG_INOTIFY_USER=y
1246# CONFIG_QUOTA is not set 1273# CONFIG_QUOTA is not set
1247CONFIG_DNOTIFY=y
1248# CONFIG_AUTOFS_FS is not set 1274# CONFIG_AUTOFS_FS is not set
1249CONFIG_AUTOFS4_FS=m 1275CONFIG_AUTOFS4_FS=m
1250# CONFIG_FUSE_FS is not set 1276# CONFIG_FUSE_FS is not set
@@ -1293,8 +1319,10 @@ CONFIG_HUGETLB_PAGE=y
1293# CONFIG_EFS_FS is not set 1319# CONFIG_EFS_FS is not set
1294# CONFIG_CRAMFS is not set 1320# CONFIG_CRAMFS is not set
1295# CONFIG_VXFS_FS is not set 1321# CONFIG_VXFS_FS is not set
1322# CONFIG_MINIX_FS is not set
1296# CONFIG_HPFS_FS is not set 1323# CONFIG_HPFS_FS is not set
1297# CONFIG_QNX4FS_FS is not set 1324# CONFIG_QNX4FS_FS is not set
1325# CONFIG_ROMFS_FS is not set
1298# CONFIG_SYSV_FS is not set 1326# CONFIG_SYSV_FS is not set
1299# CONFIG_UFS_FS is not set 1327# CONFIG_UFS_FS is not set
1300CONFIG_NETWORK_FILESYSTEMS=y 1328CONFIG_NETWORK_FILESYSTEMS=y
@@ -1382,7 +1410,6 @@ CONFIG_NLS_ISO8859_15=m
1382# CONFIG_NLS_KOI8_U is not set 1410# CONFIG_NLS_KOI8_U is not set
1383# CONFIG_NLS_UTF8 is not set 1411# CONFIG_NLS_UTF8 is not set
1384# CONFIG_DLM is not set 1412# CONFIG_DLM is not set
1385# CONFIG_UCC_SLOW is not set
1386 1413
1387# 1414#
1388# Library routines 1415# Library routines
@@ -1404,11 +1431,6 @@ CONFIG_PLIST=y
1404CONFIG_HAS_IOMEM=y 1431CONFIG_HAS_IOMEM=y
1405CONFIG_HAS_IOPORT=y 1432CONFIG_HAS_IOPORT=y
1406CONFIG_HAS_DMA=y 1433CONFIG_HAS_DMA=y
1407CONFIG_INSTRUMENTATION=y
1408CONFIG_PROFILING=y
1409CONFIG_OPROFILE=m
1410# CONFIG_KPROBES is not set
1411# CONFIG_MARKERS is not set
1412 1434
1413# 1435#
1414# Kernel hacking 1436# Kernel hacking
@@ -1427,6 +1449,7 @@ CONFIG_SCHED_DEBUG=y
1427# CONFIG_SCHEDSTATS is not set 1449# CONFIG_SCHEDSTATS is not set
1428# CONFIG_TIMER_STATS is not set 1450# CONFIG_TIMER_STATS is not set
1429# CONFIG_SLUB_DEBUG_ON is not set 1451# CONFIG_SLUB_DEBUG_ON is not set
1452# CONFIG_SLUB_STATS is not set
1430# CONFIG_DEBUG_RT_MUTEXES is not set 1453# CONFIG_DEBUG_RT_MUTEXES is not set
1431# CONFIG_RT_MUTEX_TESTER is not set 1454# CONFIG_RT_MUTEX_TESTER is not set
1432# CONFIG_DEBUG_SPINLOCK is not set 1455# CONFIG_DEBUG_SPINLOCK is not set
@@ -1439,9 +1462,9 @@ CONFIG_DEBUG_BUGVERBOSE=y
1439# CONFIG_DEBUG_VM is not set 1462# CONFIG_DEBUG_VM is not set
1440# CONFIG_DEBUG_LIST is not set 1463# CONFIG_DEBUG_LIST is not set
1441# CONFIG_DEBUG_SG is not set 1464# CONFIG_DEBUG_SG is not set
1442# CONFIG_FORCED_INLINING is not set
1443# CONFIG_BOOT_PRINTK_DELAY is not set 1465# CONFIG_BOOT_PRINTK_DELAY is not set
1444# CONFIG_RCU_TORTURE_TEST is not set 1466# CONFIG_RCU_TORTURE_TEST is not set
1467# CONFIG_BACKTRACE_SELF_TEST is not set
1445# CONFIG_FAULT_INJECTION is not set 1468# CONFIG_FAULT_INJECTION is not set
1446# CONFIG_SAMPLES is not set 1469# CONFIG_SAMPLES is not set
1447# CONFIG_DEBUG_STACKOVERFLOW is not set 1470# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1464,7 +1487,9 @@ CONFIG_IRQSTACKS=y
1464# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1487# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1465CONFIG_CRYPTO=y 1488CONFIG_CRYPTO=y
1466CONFIG_CRYPTO_ALGAPI=y 1489CONFIG_CRYPTO_ALGAPI=y
1490CONFIG_CRYPTO_AEAD=m
1467CONFIG_CRYPTO_BLKCIPHER=m 1491CONFIG_CRYPTO_BLKCIPHER=m
1492# CONFIG_CRYPTO_SEQIV is not set
1468CONFIG_CRYPTO_HASH=y 1493CONFIG_CRYPTO_HASH=y
1469CONFIG_CRYPTO_MANAGER=y 1494CONFIG_CRYPTO_MANAGER=y
1470CONFIG_CRYPTO_HMAC=y 1495CONFIG_CRYPTO_HMAC=y
@@ -1483,6 +1508,9 @@ CONFIG_CRYPTO_CBC=m
1483CONFIG_CRYPTO_PCBC=m 1508CONFIG_CRYPTO_PCBC=m
1484# CONFIG_CRYPTO_LRW is not set 1509# CONFIG_CRYPTO_LRW is not set
1485# CONFIG_CRYPTO_XTS is not set 1510# CONFIG_CRYPTO_XTS is not set
1511# CONFIG_CRYPTO_CTR is not set
1512# CONFIG_CRYPTO_GCM is not set
1513# CONFIG_CRYPTO_CCM is not set
1486# CONFIG_CRYPTO_CRYPTD is not set 1514# CONFIG_CRYPTO_CRYPTD is not set
1487CONFIG_CRYPTO_DES=m 1515CONFIG_CRYPTO_DES=m
1488# CONFIG_CRYPTO_FCRYPT is not set 1516# CONFIG_CRYPTO_FCRYPT is not set
@@ -1497,11 +1525,14 @@ CONFIG_CRYPTO_DES=m
1497# CONFIG_CRYPTO_KHAZAD is not set 1525# CONFIG_CRYPTO_KHAZAD is not set
1498# CONFIG_CRYPTO_ANUBIS is not set 1526# CONFIG_CRYPTO_ANUBIS is not set
1499# CONFIG_CRYPTO_SEED is not set 1527# CONFIG_CRYPTO_SEED is not set
1528# CONFIG_CRYPTO_SALSA20 is not set
1500CONFIG_CRYPTO_DEFLATE=m 1529CONFIG_CRYPTO_DEFLATE=m
1501# CONFIG_CRYPTO_MICHAEL_MIC is not set 1530# CONFIG_CRYPTO_MICHAEL_MIC is not set
1502# CONFIG_CRYPTO_CRC32C is not set 1531# CONFIG_CRYPTO_CRC32C is not set
1503# CONFIG_CRYPTO_CAMELLIA is not set 1532# CONFIG_CRYPTO_CAMELLIA is not set
1504# CONFIG_CRYPTO_TEST is not set 1533# CONFIG_CRYPTO_TEST is not set
1505# CONFIG_CRYPTO_AUTHENC is not set 1534CONFIG_CRYPTO_AUTHENC=m
1535# CONFIG_CRYPTO_LZO is not set
1506CONFIG_CRYPTO_HW=y 1536CONFIG_CRYPTO_HW=y
1537# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1507# CONFIG_PPC_CLOCK is not set 1538# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/celleb_defconfig b/arch/powerpc/configs/celleb_defconfig
index 9ed2e098f96f..9ba3c6fc2fef 100644
--- a/arch/powerpc/configs/celleb_defconfig
+++ b/arch/powerpc/configs/celleb_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:07 2007 4# Thu Mar 20 10:32:45 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -28,6 +28,7 @@ CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y 28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y 29CONFIG_GENERIC_CLOCKEVENTS=y
30CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
31CONFIG_HAVE_SETUP_PER_CPU_AREA=y
31CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
32CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
33CONFIG_ARCH_HAS_ILOG2_U32=y 34CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -69,16 +70,22 @@ CONFIG_SYSVIPC_SYSCTL=y
69# CONFIG_POSIX_MQUEUE is not set 70# CONFIG_POSIX_MQUEUE is not set
70# CONFIG_BSD_PROCESS_ACCT is not set 71# CONFIG_BSD_PROCESS_ACCT is not set
71# CONFIG_TASKSTATS is not set 72# CONFIG_TASKSTATS is not set
72# CONFIG_USER_NS is not set
73# CONFIG_PID_NS is not set
74# CONFIG_AUDIT is not set 73# CONFIG_AUDIT is not set
75CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
76CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
77CONFIG_LOG_BUF_SHIFT=15 76CONFIG_LOG_BUF_SHIFT=15
78# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
79# CONFIG_FAIR_GROUP_SCHED is not set 78# CONFIG_GROUP_SCHED is not set
79# CONFIG_USER_SCHED is not set
80# CONFIG_CGROUP_SCHED is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
82CONFIG_SYSFS_DEPRECATED_V2=y
81# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
84CONFIG_NAMESPACES=y
85# CONFIG_UTS_NS is not set
86# CONFIG_IPC_NS is not set
87# CONFIG_USER_NS is not set
88# CONFIG_PID_NS is not set
82CONFIG_BLK_DEV_INITRD=y 89CONFIG_BLK_DEV_INITRD=y
83CONFIG_INITRAMFS_SOURCE="" 90CONFIG_INITRAMFS_SOURCE=""
84CONFIG_CC_OPTIMIZE_FOR_SIZE=y 91CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -92,11 +99,13 @@ CONFIG_HOTPLUG=y
92CONFIG_PRINTK=y 99CONFIG_PRINTK=y
93CONFIG_BUG=y 100CONFIG_BUG=y
94CONFIG_ELF_CORE=y 101CONFIG_ELF_CORE=y
102# CONFIG_COMPAT_BRK is not set
95CONFIG_BASE_FULL=y 103CONFIG_BASE_FULL=y
96CONFIG_FUTEX=y 104CONFIG_FUTEX=y
97CONFIG_ANON_INODES=y 105CONFIG_ANON_INODES=y
98CONFIG_EPOLL=y 106CONFIG_EPOLL=y
99CONFIG_SIGNALFD=y 107CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y
100CONFIG_EVENTFD=y 109CONFIG_EVENTFD=y
101CONFIG_SHMEM=y 110CONFIG_SHMEM=y
102CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
@@ -104,6 +113,14 @@ CONFIG_SLUB_DEBUG=y
104# CONFIG_SLAB is not set 113# CONFIG_SLAB is not set
105CONFIG_SLUB=y 114CONFIG_SLUB=y
106# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
116# CONFIG_PROFILING is not set
117# CONFIG_MARKERS is not set
118CONFIG_HAVE_OPROFILE=y
119# CONFIG_KPROBES is not set
120CONFIG_HAVE_KPROBES=y
121CONFIG_HAVE_KRETPROBES=y
122CONFIG_PROC_PAGE_MONITOR=y
123CONFIG_SLABINFO=y
107CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
108# CONFIG_TINY_SHMEM is not set 125# CONFIG_TINY_SHMEM is not set
109CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
@@ -131,6 +148,7 @@ CONFIG_DEFAULT_AS=y
131# CONFIG_DEFAULT_CFQ is not set 148# CONFIG_DEFAULT_CFQ is not set
132# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
133CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
151CONFIG_CLASSIC_RCU=y
134 152
135# 153#
136# Platform support 154# Platform support
@@ -141,8 +159,8 @@ CONFIG_PPC_MULTIPLATFORM=y
141# CONFIG_PPC_86xx is not set 159# CONFIG_PPC_86xx is not set
142# CONFIG_PPC_PSERIES is not set 160# CONFIG_PPC_PSERIES is not set
143# CONFIG_PPC_ISERIES is not set 161# CONFIG_PPC_ISERIES is not set
144# CONFIG_PPC_MPC52xx is not set 162# CONFIG_PPC_MPC512x is not set
145# CONFIG_PPC_MPC5200 is not set 163# CONFIG_PPC_MPC5121 is not set
146# CONFIG_PPC_PMAC is not set 164# CONFIG_PPC_PMAC is not set
147# CONFIG_PPC_MAPLE is not set 165# CONFIG_PPC_MAPLE is not set
148# CONFIG_PPC_PASEMI is not set 166# CONFIG_PPC_PASEMI is not set
@@ -164,6 +182,7 @@ CONFIG_CBE_RAS=y
164CONFIG_PPC_NATIVE=y 182CONFIG_PPC_NATIVE=y
165CONFIG_UDBG_RTAS_CONSOLE=y 183CONFIG_UDBG_RTAS_CONSOLE=y
166CONFIG_PPC_UDBG_BEAT=y 184CONFIG_PPC_UDBG_BEAT=y
185# CONFIG_IPIC is not set
167CONFIG_MPIC=y 186CONFIG_MPIC=y
168# CONFIG_MPIC_WEIRD is not set 187# CONFIG_MPIC_WEIRD is not set
169# CONFIG_PPC_I8259 is not set 188# CONFIG_PPC_I8259 is not set
@@ -177,7 +196,6 @@ CONFIG_PPC_RTAS=y
177CONFIG_PPC_INDIRECT_IO=y 196CONFIG_PPC_INDIRECT_IO=y
178CONFIG_GENERIC_IOMAP=y 197CONFIG_GENERIC_IOMAP=y
179# CONFIG_CPU_FREQ is not set 198# CONFIG_CPU_FREQ is not set
180# CONFIG_CPM2 is not set
181# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
182 200
183# 201#
@@ -192,16 +210,20 @@ CONFIG_HZ_250=y
192# CONFIG_HZ_300 is not set 210# CONFIG_HZ_300 is not set
193# CONFIG_HZ_1000 is not set 211# CONFIG_HZ_1000 is not set
194CONFIG_HZ=250 212CONFIG_HZ=250
213# CONFIG_SCHED_HRTICK is not set
195CONFIG_PREEMPT_NONE=y 214CONFIG_PREEMPT_NONE=y
196# CONFIG_PREEMPT_VOLUNTARY is not set 215# CONFIG_PREEMPT_VOLUNTARY is not set
197# CONFIG_PREEMPT is not set 216# CONFIG_PREEMPT is not set
198CONFIG_PREEMPT_BKL=y
199CONFIG_BINFMT_ELF=y 217CONFIG_BINFMT_ELF=y
218CONFIG_COMPAT_BINFMT_ELF=y
200CONFIG_BINFMT_MISC=m 219CONFIG_BINFMT_MISC=m
201CONFIG_FORCE_MAX_ZONEORDER=13 220CONFIG_FORCE_MAX_ZONEORDER=13
202CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y 221CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
203# CONFIG_IOMMU_VMERGE is not set 222# CONFIG_IOMMU_VMERGE is not set
223CONFIG_IOMMU_HELPER=y
204CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
205CONFIG_KEXEC=y 227CONFIG_KEXEC=y
206# CONFIG_CRASH_DUMP is not set 228# CONFIG_CRASH_DUMP is not set
207# CONFIG_IRQ_ALL_CPUS is not set 229# CONFIG_IRQ_ALL_CPUS is not set
@@ -223,6 +245,7 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
223CONFIG_SPARSEMEM_VMEMMAP=y 245CONFIG_SPARSEMEM_VMEMMAP=y
224CONFIG_MEMORY_HOTPLUG=y 246CONFIG_MEMORY_HOTPLUG=y
225CONFIG_MEMORY_HOTPLUG_SPARSE=y 247CONFIG_MEMORY_HOTPLUG_SPARSE=y
248# CONFIG_MEMORY_HOTREMOVE is not set
226CONFIG_SPLIT_PTLOCK_CPUS=4 249CONFIG_SPLIT_PTLOCK_CPUS=4
227CONFIG_MIGRATION=y 250CONFIG_MIGRATION=y
228CONFIG_RESOURCES_64BIT=y 251CONFIG_RESOURCES_64BIT=y
@@ -237,7 +260,6 @@ CONFIG_PROC_DEVICETREE=y
237# CONFIG_CMDLINE_BOOL is not set 260# CONFIG_CMDLINE_BOOL is not set
238# CONFIG_PM is not set 261# CONFIG_PM is not set
239CONFIG_SECCOMP=y 262CONFIG_SECCOMP=y
240# CONFIG_WANT_DEVICE_TREE is not set
241CONFIG_ISA_DMA_API=y 263CONFIG_ISA_DMA_API=y
242 264
243# 265#
@@ -273,6 +295,7 @@ CONFIG_XFRM=y
273# CONFIG_XFRM_USER is not set 295# CONFIG_XFRM_USER is not set
274# CONFIG_XFRM_SUB_POLICY is not set 296# CONFIG_XFRM_SUB_POLICY is not set
275# CONFIG_XFRM_MIGRATE is not set 297# CONFIG_XFRM_MIGRATE is not set
298# CONFIG_XFRM_STATISTICS is not set
276# CONFIG_NET_KEY is not set 299# CONFIG_NET_KEY is not set
277CONFIG_INET=y 300CONFIG_INET=y
278CONFIG_IP_MULTICAST=y 301CONFIG_IP_MULTICAST=y
@@ -320,12 +343,13 @@ CONFIG_IPV6_TUNNEL=m
320# CONFIG_NETWORK_SECMARK is not set 343# CONFIG_NETWORK_SECMARK is not set
321CONFIG_NETFILTER=y 344CONFIG_NETFILTER=y
322# CONFIG_NETFILTER_DEBUG is not set 345# CONFIG_NETFILTER_DEBUG is not set
346CONFIG_NETFILTER_ADVANCED=y
323 347
324# 348#
325# Core Netfilter Configuration 349# Core Netfilter Configuration
326# 350#
327# CONFIG_NETFILTER_NETLINK is not set 351# CONFIG_NETFILTER_NETLINK_QUEUE is not set
328# CONFIG_NF_CONNTRACK_ENABLED is not set 352# CONFIG_NETFILTER_NETLINK_LOG is not set
329# CONFIG_NF_CONNTRACK is not set 353# CONFIG_NF_CONNTRACK is not set
330# CONFIG_NETFILTER_XTABLES is not set 354# CONFIG_NETFILTER_XTABLES is not set
331 355
@@ -337,7 +361,7 @@ CONFIG_IP_NF_QUEUE=m
337# CONFIG_IP_NF_ARPTABLES is not set 361# CONFIG_IP_NF_ARPTABLES is not set
338 362
339# 363#
340# IPv6: Netfilter Configuration (EXPERIMENTAL) 364# IPv6: Netfilter Configuration
341# 365#
342# CONFIG_IP6_NF_QUEUE is not set 366# CONFIG_IP6_NF_QUEUE is not set
343# CONFIG_IP6_NF_IPTABLES is not set 367# CONFIG_IP6_NF_IPTABLES is not set
@@ -362,6 +386,7 @@ CONFIG_IP_NF_QUEUE=m
362# 386#
363# CONFIG_NET_PKTGEN is not set 387# CONFIG_NET_PKTGEN is not set
364# CONFIG_HAMRADIO is not set 388# CONFIG_HAMRADIO is not set
389# CONFIG_CAN is not set
365# CONFIG_IRDA is not set 390# CONFIG_IRDA is not set
366# CONFIG_BT is not set 391# CONFIG_BT is not set
367# CONFIG_AF_RXRPC is not set 392# CONFIG_AF_RXRPC is not set
@@ -408,7 +433,7 @@ CONFIG_BLK_DEV_LOOP=y
408CONFIG_BLK_DEV_RAM=y 433CONFIG_BLK_DEV_RAM=y
409CONFIG_BLK_DEV_RAM_COUNT=16 434CONFIG_BLK_DEV_RAM_COUNT=16
410CONFIG_BLK_DEV_RAM_SIZE=131072 435CONFIG_BLK_DEV_RAM_SIZE=131072
411CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 436# CONFIG_BLK_DEV_XIP is not set
412# CONFIG_CDROM_PKTCDVD is not set 437# CONFIG_CDROM_PKTCDVD is not set
413# CONFIG_ATA_OVER_ETH is not set 438# CONFIG_ATA_OVER_ETH is not set
414CONFIG_MISC_DEVICES=y 439CONFIG_MISC_DEVICES=y
@@ -416,16 +441,19 @@ CONFIG_MISC_DEVICES=y
416# CONFIG_EEPROM_93CX6 is not set 441# CONFIG_EEPROM_93CX6 is not set
417# CONFIG_SGI_IOC4 is not set 442# CONFIG_SGI_IOC4 is not set
418# CONFIG_TIFM_CORE is not set 443# CONFIG_TIFM_CORE is not set
444# CONFIG_ENCLOSURE_SERVICES is not set
445CONFIG_HAVE_IDE=y
419CONFIG_IDE=y 446CONFIG_IDE=y
420CONFIG_BLK_DEV_IDE=y 447CONFIG_BLK_DEV_IDE=y
421 448
422# 449#
423# Please see Documentation/ide.txt for help/info on IDE drives 450# Please see Documentation/ide/ide.txt for help/info on IDE drives
424# 451#
425# CONFIG_BLK_DEV_IDE_SATA is not set 452# CONFIG_BLK_DEV_IDE_SATA is not set
426CONFIG_BLK_DEV_IDEDISK=y 453CONFIG_BLK_DEV_IDEDISK=y
427CONFIG_IDEDISK_MULTI_MODE=y 454CONFIG_IDEDISK_MULTI_MODE=y
428CONFIG_BLK_DEV_IDECD=m 455CONFIG_BLK_DEV_IDECD=m
456CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
429# CONFIG_BLK_DEV_IDETAPE is not set 457# CONFIG_BLK_DEV_IDETAPE is not set
430# CONFIG_BLK_DEV_IDEFLOPPY is not set 458# CONFIG_BLK_DEV_IDEFLOPPY is not set
431# CONFIG_BLK_DEV_IDESCSI is not set 459# CONFIG_BLK_DEV_IDESCSI is not set
@@ -437,12 +465,12 @@ CONFIG_IDE_PROC_FS=y
437# 465#
438CONFIG_IDE_GENERIC=y 466CONFIG_IDE_GENERIC=y
439# CONFIG_BLK_DEV_PLATFORM is not set 467# CONFIG_BLK_DEV_PLATFORM is not set
468CONFIG_BLK_DEV_IDEDMA_SFF=y
440 469
441# 470#
442# PCI IDE chipsets support 471# PCI IDE chipsets support
443# 472#
444CONFIG_BLK_DEV_IDEPCI=y 473CONFIG_BLK_DEV_IDEPCI=y
445CONFIG_IDEPCI_SHARE_IRQ=y
446CONFIG_IDEPCI_PCIBUS_ORDER=y 474CONFIG_IDEPCI_PCIBUS_ORDER=y
447# CONFIG_BLK_DEV_OFFBOARD is not set 475# CONFIG_BLK_DEV_OFFBOARD is not set
448CONFIG_BLK_DEV_GENERIC=y 476CONFIG_BLK_DEV_GENERIC=y
@@ -474,7 +502,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
474# CONFIG_BLK_DEV_VIA82CXXX is not set 502# CONFIG_BLK_DEV_VIA82CXXX is not set
475# CONFIG_BLK_DEV_TC86C001 is not set 503# CONFIG_BLK_DEV_TC86C001 is not set
476CONFIG_BLK_DEV_CELLEB=y 504CONFIG_BLK_DEV_CELLEB=y
477# CONFIG_IDE_ARM is not set
478CONFIG_BLK_DEV_IDEDMA=y 505CONFIG_BLK_DEV_IDEDMA=y
479CONFIG_IDE_ARCH_OBSOLETE_INIT=y 506CONFIG_IDE_ARCH_OBSOLETE_INIT=y
480# CONFIG_BLK_DEV_HD is not set 507# CONFIG_BLK_DEV_HD is not set
@@ -540,6 +567,7 @@ CONFIG_SCSI_LOWLEVEL=y
540# CONFIG_SCSI_IPS is not set 567# CONFIG_SCSI_IPS is not set
541# CONFIG_SCSI_INITIO is not set 568# CONFIG_SCSI_INITIO is not set
542# CONFIG_SCSI_INIA100 is not set 569# CONFIG_SCSI_INIA100 is not set
570# CONFIG_SCSI_MVSAS is not set
543# CONFIG_SCSI_STEX is not set 571# CONFIG_SCSI_STEX is not set
544# CONFIG_SCSI_SYM53C8XX_2 is not set 572# CONFIG_SCSI_SYM53C8XX_2 is not set
545# CONFIG_SCSI_QLOGIC_1280 is not set 573# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -589,7 +617,6 @@ CONFIG_NETDEVICES=y
589# CONFIG_EQUALIZER is not set 617# CONFIG_EQUALIZER is not set
590# CONFIG_TUN is not set 618# CONFIG_TUN is not set
591# CONFIG_VETH is not set 619# CONFIG_VETH is not set
592# CONFIG_IP1000 is not set
593# CONFIG_ARCNET is not set 620# CONFIG_ARCNET is not set
594# CONFIG_PHYLIB is not set 621# CONFIG_PHYLIB is not set
595CONFIG_NET_ETHERNET=y 622CONFIG_NET_ETHERNET=y
@@ -612,6 +639,9 @@ CONFIG_NETDEV_1000=y
612# CONFIG_DL2K is not set 639# CONFIG_DL2K is not set
613# CONFIG_E1000 is not set 640# CONFIG_E1000 is not set
614# CONFIG_E1000E is not set 641# CONFIG_E1000E is not set
642# CONFIG_E1000E_ENABLED is not set
643# CONFIG_IP1000 is not set
644# CONFIG_IGB is not set
615# CONFIG_NS83820 is not set 645# CONFIG_NS83820 is not set
616# CONFIG_HAMACHI is not set 646# CONFIG_HAMACHI is not set
617# CONFIG_YELLOWFIN is not set 647# CONFIG_YELLOWFIN is not set
@@ -638,6 +668,7 @@ CONFIG_NETDEV_10000=y
638# CONFIG_PASEMI_MAC is not set 668# CONFIG_PASEMI_MAC is not set
639# CONFIG_MLX4_CORE is not set 669# CONFIG_MLX4_CORE is not set
640# CONFIG_TEHUTI is not set 670# CONFIG_TEHUTI is not set
671# CONFIG_BNX2X is not set
641# CONFIG_TR is not set 672# CONFIG_TR is not set
642 673
643# 674#
@@ -660,7 +691,6 @@ CONFIG_NETDEV_10000=y
660# CONFIG_PPP is not set 691# CONFIG_PPP is not set
661# CONFIG_SLIP is not set 692# CONFIG_SLIP is not set
662# CONFIG_NET_FC is not set 693# CONFIG_NET_FC is not set
663# CONFIG_SHAPER is not set
664# CONFIG_NETCONSOLE is not set 694# CONFIG_NETCONSOLE is not set
665# CONFIG_NETPOLL is not set 695# CONFIG_NETPOLL is not set
666# CONFIG_NET_POLL_CONTROLLER is not set 696# CONFIG_NET_POLL_CONTROLLER is not set
@@ -719,16 +749,17 @@ CONFIG_SERIAL_NONSTANDARD=y
719# CONFIG_DIGIEPCA is not set 749# CONFIG_DIGIEPCA is not set
720# CONFIG_MOXA_INTELLIO is not set 750# CONFIG_MOXA_INTELLIO is not set
721# CONFIG_MOXA_SMARTIO is not set 751# CONFIG_MOXA_SMARTIO is not set
722# CONFIG_MOXA_SMARTIO_NEW is not set
723# CONFIG_ISI is not set 752# CONFIG_ISI is not set
724# CONFIG_SYNCLINK is not set 753# CONFIG_SYNCLINK is not set
725# CONFIG_SYNCLINKMP is not set 754# CONFIG_SYNCLINKMP is not set
726# CONFIG_SYNCLINK_GT is not set 755# CONFIG_SYNCLINK_GT is not set
727# CONFIG_N_HDLC is not set 756# CONFIG_N_HDLC is not set
757# CONFIG_RISCOM8 is not set
728# CONFIG_SPECIALIX is not set 758# CONFIG_SPECIALIX is not set
729# CONFIG_SX is not set 759# CONFIG_SX is not set
730# CONFIG_RIO is not set 760# CONFIG_RIO is not set
731# CONFIG_STALDRV is not set 761# CONFIG_STALDRV is not set
762# CONFIG_NOZOMI is not set
732 763
733# 764#
734# Serial drivers 765# Serial drivers
@@ -802,13 +833,12 @@ CONFIG_I2C_ALGOBIT=y
802# 833#
803# Miscellaneous I2C Chip support 834# Miscellaneous I2C Chip support
804# 835#
805# CONFIG_SENSORS_DS1337 is not set
806# CONFIG_SENSORS_DS1374 is not set
807# CONFIG_DS1682 is not set 836# CONFIG_DS1682 is not set
808# CONFIG_SENSORS_EEPROM is not set 837# CONFIG_SENSORS_EEPROM is not set
809# CONFIG_SENSORS_PCF8574 is not set 838# CONFIG_SENSORS_PCF8574 is not set
810# CONFIG_SENSORS_PCA9539 is not set 839# CONFIG_PCF8575 is not set
811# CONFIG_SENSORS_PCF8591 is not set 840# CONFIG_SENSORS_PCF8591 is not set
841# CONFIG_TPS65010 is not set
812# CONFIG_SENSORS_MAX6875 is not set 842# CONFIG_SENSORS_MAX6875 is not set
813# CONFIG_SENSORS_TSL2550 is not set 843# CONFIG_SENSORS_TSL2550 is not set
814# CONFIG_I2C_DEBUG_CORE is not set 844# CONFIG_I2C_DEBUG_CORE is not set
@@ -824,6 +854,7 @@ CONFIG_I2C_ALGOBIT=y
824# CONFIG_W1 is not set 854# CONFIG_W1 is not set
825# CONFIG_POWER_SUPPLY is not set 855# CONFIG_POWER_SUPPLY is not set
826# CONFIG_HWMON is not set 856# CONFIG_HWMON is not set
857# CONFIG_THERMAL is not set
827CONFIG_WATCHDOG=y 858CONFIG_WATCHDOG=y
828# CONFIG_WATCHDOG_NOWAYOUT is not set 859# CONFIG_WATCHDOG_NOWAYOUT is not set
829 860
@@ -905,6 +936,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
905CONFIG_USB_ARCH_HAS_EHCI=y 936CONFIG_USB_ARCH_HAS_EHCI=y
906CONFIG_USB=y 937CONFIG_USB=y
907# CONFIG_USB_DEBUG is not set 938# CONFIG_USB_DEBUG is not set
939# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
908 940
909# 941#
910# Miscellaneous USB options 942# Miscellaneous USB options
@@ -918,10 +950,10 @@ CONFIG_USB_DEVICEFS=y
918# USB Host Controller Drivers 950# USB Host Controller Drivers
919# 951#
920CONFIG_USB_EHCI_HCD=m 952CONFIG_USB_EHCI_HCD=m
921# CONFIG_USB_EHCI_SPLIT_ISO is not set
922# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 953# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
923# CONFIG_USB_EHCI_TT_NEWSCHED is not set 954# CONFIG_USB_EHCI_TT_NEWSCHED is not set
924CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y 955CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
956# CONFIG_USB_EHCI_HCD_PPC_OF is not set
925# CONFIG_USB_ISP116X_HCD is not set 957# CONFIG_USB_ISP116X_HCD is not set
926CONFIG_USB_OHCI_HCD=m 958CONFIG_USB_OHCI_HCD=m
927# CONFIG_USB_OHCI_HCD_PPC_OF is not set 959# CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -969,10 +1001,6 @@ CONFIG_USB_MON=y
969# 1001#
970# USB port drivers 1002# USB port drivers
971# 1003#
972
973#
974# USB Serial Converter support
975#
976# CONFIG_USB_SERIAL is not set 1004# CONFIG_USB_SERIAL is not set
977 1005
978# 1006#
@@ -998,20 +1026,14 @@ CONFIG_USB_MON=y
998# CONFIG_USB_TRANCEVIBRATOR is not set 1026# CONFIG_USB_TRANCEVIBRATOR is not set
999# CONFIG_USB_IOWARRIOR is not set 1027# CONFIG_USB_IOWARRIOR is not set
1000# CONFIG_USB_TEST is not set 1028# CONFIG_USB_TEST is not set
1001
1002#
1003# USB DSL modem support
1004#
1005
1006#
1007# USB Gadget Support
1008#
1009# CONFIG_USB_GADGET is not set 1029# CONFIG_USB_GADGET is not set
1010# CONFIG_MMC is not set 1030# CONFIG_MMC is not set
1031# CONFIG_MEMSTICK is not set
1011# CONFIG_NEW_LEDS is not set 1032# CONFIG_NEW_LEDS is not set
1012# CONFIG_INFINIBAND is not set 1033# CONFIG_INFINIBAND is not set
1013# CONFIG_EDAC is not set 1034# CONFIG_EDAC is not set
1014# CONFIG_RTC_CLASS is not set 1035# CONFIG_RTC_CLASS is not set
1036# CONFIG_DMADEVICES is not set
1015 1037
1016# 1038#
1017# Userspace I/O 1039# Userspace I/O
@@ -1041,12 +1063,10 @@ CONFIG_FS_POSIX_ACL=y
1041# CONFIG_XFS_FS is not set 1063# CONFIG_XFS_FS is not set
1042# CONFIG_GFS2_FS is not set 1064# CONFIG_GFS2_FS is not set
1043# CONFIG_OCFS2_FS is not set 1065# CONFIG_OCFS2_FS is not set
1044# CONFIG_MINIX_FS is not set 1066CONFIG_DNOTIFY=y
1045# CONFIG_ROMFS_FS is not set
1046CONFIG_INOTIFY=y 1067CONFIG_INOTIFY=y
1047CONFIG_INOTIFY_USER=y 1068CONFIG_INOTIFY_USER=y
1048# CONFIG_QUOTA is not set 1069# CONFIG_QUOTA is not set
1049CONFIG_DNOTIFY=y
1050# CONFIG_AUTOFS_FS is not set 1070# CONFIG_AUTOFS_FS is not set
1051# CONFIG_AUTOFS4_FS is not set 1071# CONFIG_AUTOFS4_FS is not set
1052# CONFIG_FUSE_FS is not set 1072# CONFIG_FUSE_FS is not set
@@ -1095,8 +1115,10 @@ CONFIG_HUGETLB_PAGE=y
1095# CONFIG_EFS_FS is not set 1115# CONFIG_EFS_FS is not set
1096# CONFIG_CRAMFS is not set 1116# CONFIG_CRAMFS is not set
1097# CONFIG_VXFS_FS is not set 1117# CONFIG_VXFS_FS is not set
1118# CONFIG_MINIX_FS is not set
1098# CONFIG_HPFS_FS is not set 1119# CONFIG_HPFS_FS is not set
1099# CONFIG_QNX4FS_FS is not set 1120# CONFIG_QNX4FS_FS is not set
1121# CONFIG_ROMFS_FS is not set
1100# CONFIG_SYSV_FS is not set 1122# CONFIG_SYSV_FS is not set
1101# CONFIG_UFS_FS is not set 1123# CONFIG_UFS_FS is not set
1102CONFIG_NETWORK_FILESYSTEMS=y 1124CONFIG_NETWORK_FILESYSTEMS=y
@@ -1188,7 +1210,6 @@ CONFIG_NLS_ISO8859_15=m
1188# CONFIG_NLS_KOI8_U is not set 1210# CONFIG_NLS_KOI8_U is not set
1189# CONFIG_NLS_UTF8 is not set 1211# CONFIG_NLS_UTF8 is not set
1190# CONFIG_DLM is not set 1212# CONFIG_DLM is not set
1191# CONFIG_UCC_SLOW is not set
1192 1213
1193# 1214#
1194# Library routines 1215# Library routines
@@ -1206,10 +1227,6 @@ CONFIG_PLIST=y
1206CONFIG_HAS_IOMEM=y 1227CONFIG_HAS_IOMEM=y
1207CONFIG_HAS_IOPORT=y 1228CONFIG_HAS_IOPORT=y
1208CONFIG_HAS_DMA=y 1229CONFIG_HAS_DMA=y
1209CONFIG_INSTRUMENTATION=y
1210# CONFIG_PROFILING is not set
1211# CONFIG_KPROBES is not set
1212# CONFIG_MARKERS is not set
1213 1230
1214# 1231#
1215# Kernel hacking 1232# Kernel hacking
@@ -1228,6 +1245,7 @@ CONFIG_SCHED_DEBUG=y
1228# CONFIG_SCHEDSTATS is not set 1245# CONFIG_SCHEDSTATS is not set
1229# CONFIG_TIMER_STATS is not set 1246# CONFIG_TIMER_STATS is not set
1230# CONFIG_SLUB_DEBUG_ON is not set 1247# CONFIG_SLUB_DEBUG_ON is not set
1248# CONFIG_SLUB_STATS is not set
1231# CONFIG_DEBUG_RT_MUTEXES is not set 1249# CONFIG_DEBUG_RT_MUTEXES is not set
1232# CONFIG_RT_MUTEX_TESTER is not set 1250# CONFIG_RT_MUTEX_TESTER is not set
1233# CONFIG_DEBUG_SPINLOCK is not set 1251# CONFIG_DEBUG_SPINLOCK is not set
@@ -1240,9 +1258,9 @@ CONFIG_DEBUG_BUGVERBOSE=y
1240# CONFIG_DEBUG_VM is not set 1258# CONFIG_DEBUG_VM is not set
1241# CONFIG_DEBUG_LIST is not set 1259# CONFIG_DEBUG_LIST is not set
1242# CONFIG_DEBUG_SG is not set 1260# CONFIG_DEBUG_SG is not set
1243# CONFIG_FORCED_INLINING is not set
1244# CONFIG_BOOT_PRINTK_DELAY is not set 1261# CONFIG_BOOT_PRINTK_DELAY is not set
1245# CONFIG_RCU_TORTURE_TEST is not set 1262# CONFIG_RCU_TORTURE_TEST is not set
1263# CONFIG_BACKTRACE_SELF_TEST is not set
1246# CONFIG_FAULT_INJECTION is not set 1264# CONFIG_FAULT_INJECTION is not set
1247# CONFIG_SAMPLES is not set 1265# CONFIG_SAMPLES is not set
1248# CONFIG_DEBUG_STACKOVERFLOW is not set 1266# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1265,7 +1283,9 @@ CONFIG_IRQSTACKS=y
1265# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1283# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1266CONFIG_CRYPTO=y 1284CONFIG_CRYPTO=y
1267CONFIG_CRYPTO_ALGAPI=y 1285CONFIG_CRYPTO_ALGAPI=y
1286CONFIG_CRYPTO_AEAD=m
1268CONFIG_CRYPTO_BLKCIPHER=m 1287CONFIG_CRYPTO_BLKCIPHER=m
1288# CONFIG_CRYPTO_SEQIV is not set
1269CONFIG_CRYPTO_HASH=y 1289CONFIG_CRYPTO_HASH=y
1270CONFIG_CRYPTO_MANAGER=y 1290CONFIG_CRYPTO_MANAGER=y
1271CONFIG_CRYPTO_HMAC=y 1291CONFIG_CRYPTO_HMAC=y
@@ -1284,6 +1304,9 @@ CONFIG_CRYPTO_CBC=m
1284CONFIG_CRYPTO_PCBC=m 1304CONFIG_CRYPTO_PCBC=m
1285# CONFIG_CRYPTO_LRW is not set 1305# CONFIG_CRYPTO_LRW is not set
1286# CONFIG_CRYPTO_XTS is not set 1306# CONFIG_CRYPTO_XTS is not set
1307# CONFIG_CRYPTO_CTR is not set
1308# CONFIG_CRYPTO_GCM is not set
1309# CONFIG_CRYPTO_CCM is not set
1287# CONFIG_CRYPTO_CRYPTD is not set 1310# CONFIG_CRYPTO_CRYPTD is not set
1288CONFIG_CRYPTO_DES=m 1311CONFIG_CRYPTO_DES=m
1289# CONFIG_CRYPTO_FCRYPT is not set 1312# CONFIG_CRYPTO_FCRYPT is not set
@@ -1299,11 +1322,13 @@ CONFIG_CRYPTO_ARC4=m
1299CONFIG_CRYPTO_KHAZAD=m 1322CONFIG_CRYPTO_KHAZAD=m
1300CONFIG_CRYPTO_ANUBIS=m 1323CONFIG_CRYPTO_ANUBIS=m
1301# CONFIG_CRYPTO_SEED is not set 1324# CONFIG_CRYPTO_SEED is not set
1325# CONFIG_CRYPTO_SALSA20 is not set
1302CONFIG_CRYPTO_DEFLATE=m 1326CONFIG_CRYPTO_DEFLATE=m
1303CONFIG_CRYPTO_MICHAEL_MIC=m 1327CONFIG_CRYPTO_MICHAEL_MIC=m
1304CONFIG_CRYPTO_CRC32C=m 1328CONFIG_CRYPTO_CRC32C=m
1305# CONFIG_CRYPTO_CAMELLIA is not set 1329# CONFIG_CRYPTO_CAMELLIA is not set
1306CONFIG_CRYPTO_TEST=m 1330CONFIG_CRYPTO_TEST=m
1307# CONFIG_CRYPTO_AUTHENC is not set 1331CONFIG_CRYPTO_AUTHENC=m
1332# CONFIG_CRYPTO_LZO is not set
1308# CONFIG_CRYPTO_HW is not set 1333# CONFIG_CRYPTO_HW is not set
1309# CONFIG_PPC_CLOCK is not set 1334# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index 5989b5d2277e..38b85b211c38 100644
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:09 2007 4# Thu Mar 20 10:33:36 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
@@ -67,16 +68,22 @@ 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
73CONFIG_IKCONFIG=y 72CONFIG_IKCONFIG=y
74CONFIG_IKCONFIG_PROC=y 73CONFIG_IKCONFIG_PROC=y
75CONFIG_LOG_BUF_SHIFT=15 74CONFIG_LOG_BUF_SHIFT=15
76# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
77# CONFIG_FAIR_GROUP_SCHED is not set 76# CONFIG_GROUP_SCHED is not set
77# CONFIG_USER_SCHED is not set
78# CONFIG_CGROUP_SCHED is not set
78CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
79# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82CONFIG_NAMESPACES=y
83# CONFIG_UTS_NS is not set
84# CONFIG_IPC_NS is not set
85# CONFIG_USER_NS is not set
86# CONFIG_PID_NS is not set
80CONFIG_BLK_DEV_INITRD=y 87CONFIG_BLK_DEV_INITRD=y
81CONFIG_INITRAMFS_SOURCE="" 88CONFIG_INITRAMFS_SOURCE=""
82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 89# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -90,11 +97,13 @@ CONFIG_HOTPLUG=y
90CONFIG_PRINTK=y 97CONFIG_PRINTK=y
91CONFIG_BUG=y 98CONFIG_BUG=y
92CONFIG_ELF_CORE=y 99CONFIG_ELF_CORE=y
100# CONFIG_COMPAT_BRK is not set
93CONFIG_BASE_FULL=y 101CONFIG_BASE_FULL=y
94CONFIG_FUTEX=y 102CONFIG_FUTEX=y
95CONFIG_ANON_INODES=y 103CONFIG_ANON_INODES=y
96CONFIG_EPOLL=y 104CONFIG_EPOLL=y
97CONFIG_SIGNALFD=y 105CONFIG_SIGNALFD=y
106CONFIG_TIMERFD=y
98CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
99CONFIG_SHMEM=y 108CONFIG_SHMEM=y
100CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
@@ -102,6 +111,14 @@ CONFIG_SLUB_DEBUG=y
102# CONFIG_SLAB is not set 111# CONFIG_SLAB is not set
103CONFIG_SLUB=y 112CONFIG_SLUB=y
104# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
114# CONFIG_PROFILING is not set
115# CONFIG_MARKERS is not set
116CONFIG_HAVE_OPROFILE=y
117# CONFIG_KPROBES is not set
118CONFIG_HAVE_KPROBES=y
119CONFIG_HAVE_KRETPROBES=y
120CONFIG_PROC_PAGE_MONITOR=y
121CONFIG_SLABINFO=y
105CONFIG_RT_MUTEXES=y 122CONFIG_RT_MUTEXES=y
106# CONFIG_TINY_SHMEM is not set 123# CONFIG_TINY_SHMEM is not set
107CONFIG_BASE_SMALL=0 124CONFIG_BASE_SMALL=0
@@ -130,6 +147,7 @@ CONFIG_DEFAULT_AS=y
130# CONFIG_DEFAULT_CFQ is not set 147# CONFIG_DEFAULT_CFQ is not set
131# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
132CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
150CONFIG_CLASSIC_RCU=y
133 151
134# 152#
135# Platform support 153# Platform support
@@ -140,16 +158,17 @@ CONFIG_PPC_MULTIPLATFORM=y
140# CONFIG_PPC_86xx is not set 158# CONFIG_PPC_86xx is not set
141CONFIG_CLASSIC32=y 159CONFIG_CLASSIC32=y
142CONFIG_PPC_CHRP=y 160CONFIG_PPC_CHRP=y
161# CONFIG_PPC_MPC512x is not set
162# CONFIG_PPC_MPC5121 is not set
163# CONFIG_MPC5121_ADS is not set
143# CONFIG_PPC_MPC52xx is not set 164# CONFIG_PPC_MPC52xx is not set
144# CONFIG_PPC_MPC5200 is not set
145# CONFIG_PPC_EFIKA is not set
146# CONFIG_PPC_LITE5200 is not set
147# CONFIG_PPC_PMAC is not set 165# CONFIG_PPC_PMAC is not set
148# CONFIG_PPC_CELL is not set 166# CONFIG_PPC_CELL is not set
149# CONFIG_PPC_CELL_NATIVE is not set 167# CONFIG_PPC_CELL_NATIVE is not set
150# CONFIG_PQ2ADS is not set 168# CONFIG_PQ2ADS is not set
151CONFIG_PPC_NATIVE=y 169CONFIG_PPC_NATIVE=y
152# CONFIG_UDBG_RTAS_CONSOLE is not set 170# CONFIG_UDBG_RTAS_CONSOLE is not set
171# CONFIG_IPIC is not set
153CONFIG_MPIC=y 172CONFIG_MPIC=y
154# CONFIG_MPIC_WEIRD is not set 173# CONFIG_MPIC_WEIRD is not set
155CONFIG_PPC_I8259=y 174CONFIG_PPC_I8259=y
@@ -163,7 +182,6 @@ CONFIG_PPC_MPC106=y
163# CONFIG_GENERIC_IOMAP is not set 182# CONFIG_GENERIC_IOMAP is not set
164# CONFIG_CPU_FREQ is not set 183# CONFIG_CPU_FREQ is not set
165# CONFIG_TAU is not set 184# CONFIG_TAU is not set
166# CONFIG_CPM2 is not set
167# CONFIG_FSL_ULI1575 is not set 185# CONFIG_FSL_ULI1575 is not set
168 186
169# 187#
@@ -179,13 +197,16 @@ CONFIG_HZ_250=y
179# CONFIG_HZ_300 is not set 197# CONFIG_HZ_300 is not set
180# CONFIG_HZ_1000 is not set 198# CONFIG_HZ_1000 is not set
181CONFIG_HZ=250 199CONFIG_HZ=250
200# CONFIG_SCHED_HRTICK is not set
182CONFIG_PREEMPT_NONE=y 201CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 202# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 203# CONFIG_PREEMPT is not set
185CONFIG_PREEMPT_BKL=y
186CONFIG_BINFMT_ELF=y 204CONFIG_BINFMT_ELF=y
187CONFIG_BINFMT_MISC=y 205CONFIG_BINFMT_MISC=y
206# CONFIG_IOMMU_HELPER is not set
188CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 207CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
208CONFIG_ARCH_HAS_WALK_MEMORY=y
209CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
189# CONFIG_KEXEC is not set 210# CONFIG_KEXEC is not set
190CONFIG_IRQ_ALL_CPUS=y 211CONFIG_IRQ_ALL_CPUS=y
191CONFIG_ARCH_FLATMEM_ENABLE=y 212CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -207,7 +228,6 @@ CONFIG_PROC_DEVICETREE=y
207# CONFIG_CMDLINE_BOOL is not set 228# CONFIG_CMDLINE_BOOL is not set
208# CONFIG_PM is not set 229# CONFIG_PM is not set
209CONFIG_SECCOMP=y 230CONFIG_SECCOMP=y
210# CONFIG_WANT_DEVICE_TREE is not set
211CONFIG_ISA_DMA_API=y 231CONFIG_ISA_DMA_API=y
212 232
213# 233#
@@ -286,74 +306,32 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
286# CONFIG_NETWORK_SECMARK is not set 306# CONFIG_NETWORK_SECMARK is not set
287CONFIG_NETFILTER=y 307CONFIG_NETFILTER=y
288# CONFIG_NETFILTER_DEBUG is not set 308# CONFIG_NETFILTER_DEBUG is not set
309# CONFIG_NETFILTER_ADVANCED is not set
289 310
290# 311#
291# Core Netfilter Configuration 312# Core Netfilter Configuration
292# 313#
293# CONFIG_NETFILTER_NETLINK is not set 314CONFIG_NETFILTER_NETLINK=m
294CONFIG_NF_CONNTRACK_ENABLED=m 315CONFIG_NETFILTER_NETLINK_LOG=m
295CONFIG_NF_CONNTRACK=m 316CONFIG_NF_CONNTRACK=m
296# CONFIG_NF_CT_ACCT is not set
297# CONFIG_NF_CONNTRACK_MARK is not set
298# CONFIG_NF_CONNTRACK_EVENTS is not set
299# CONFIG_NF_CT_PROTO_SCTP is not set
300# CONFIG_NF_CT_PROTO_UDPLITE is not set
301# CONFIG_NF_CONNTRACK_AMANDA is not set
302CONFIG_NF_CONNTRACK_FTP=m 317CONFIG_NF_CONNTRACK_FTP=m
303# CONFIG_NF_CONNTRACK_H323 is not set
304CONFIG_NF_CONNTRACK_IRC=m 318CONFIG_NF_CONNTRACK_IRC=m
305# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
306# CONFIG_NF_CONNTRACK_PPTP is not set
307# CONFIG_NF_CONNTRACK_SANE is not set
308CONFIG_NF_CONNTRACK_SIP=m 319CONFIG_NF_CONNTRACK_SIP=m
309CONFIG_NF_CONNTRACK_TFTP=m 320CONFIG_NF_CT_NETLINK=m
310CONFIG_NETFILTER_XTABLES=m 321CONFIG_NETFILTER_XTABLES=m
311# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
312# CONFIG_NETFILTER_XT_TARGET_MARK is not set 322# CONFIG_NETFILTER_XT_TARGET_MARK is not set
313# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
314# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 323# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
315# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 324# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
316# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
317# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
318# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
319# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
320# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set 325# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
321# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
322# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
323# CONFIG_NETFILTER_XT_MATCH_ESP is not set
324# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
325# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
326# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
327# CONFIG_NETFILTER_XT_MATCH_MAC is not set
328# CONFIG_NETFILTER_XT_MATCH_MARK is not set 326# CONFIG_NETFILTER_XT_MATCH_MARK is not set
329# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
330# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
331# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
332# CONFIG_NETFILTER_XT_MATCH_REALM is not set
333# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
334# CONFIG_NETFILTER_XT_MATCH_STATE is not set 327# CONFIG_NETFILTER_XT_MATCH_STATE is not set
335# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
336# CONFIG_NETFILTER_XT_MATCH_STRING is not set
337# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
338# CONFIG_NETFILTER_XT_MATCH_TIME is not set
339# CONFIG_NETFILTER_XT_MATCH_U32 is not set
340# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
341 328
342# 329#
343# IP: Netfilter Configuration 330# IP: Netfilter Configuration
344# 331#
345CONFIG_NF_CONNTRACK_IPV4=m 332CONFIG_NF_CONNTRACK_IPV4=m
346CONFIG_NF_CONNTRACK_PROC_COMPAT=y 333CONFIG_NF_CONNTRACK_PROC_COMPAT=y
347# CONFIG_IP_NF_QUEUE is not set
348CONFIG_IP_NF_IPTABLES=m 334CONFIG_IP_NF_IPTABLES=m
349# CONFIG_IP_NF_MATCH_IPRANGE is not set
350# CONFIG_IP_NF_MATCH_TOS is not set
351# CONFIG_IP_NF_MATCH_RECENT is not set
352# CONFIG_IP_NF_MATCH_ECN is not set
353# CONFIG_IP_NF_MATCH_AH is not set
354# CONFIG_IP_NF_MATCH_TTL is not set
355# CONFIG_IP_NF_MATCH_OWNER is not set
356# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
357CONFIG_IP_NF_FILTER=m 335CONFIG_IP_NF_FILTER=m
358CONFIG_IP_NF_TARGET_REJECT=m 336CONFIG_IP_NF_TARGET_REJECT=m
359CONFIG_IP_NF_TARGET_LOG=m 337CONFIG_IP_NF_TARGET_LOG=m
@@ -361,20 +339,14 @@ CONFIG_IP_NF_TARGET_LOG=m
361CONFIG_NF_NAT=m 339CONFIG_NF_NAT=m
362CONFIG_NF_NAT_NEEDED=y 340CONFIG_NF_NAT_NEEDED=y
363CONFIG_IP_NF_TARGET_MASQUERADE=m 341CONFIG_IP_NF_TARGET_MASQUERADE=m
364CONFIG_IP_NF_TARGET_REDIRECT=m
365# CONFIG_IP_NF_TARGET_NETMAP is not set
366# CONFIG_IP_NF_TARGET_SAME is not set
367# CONFIG_NF_NAT_SNMP_BASIC is not set
368CONFIG_NF_NAT_FTP=m 342CONFIG_NF_NAT_FTP=m
369CONFIG_NF_NAT_IRC=m 343CONFIG_NF_NAT_IRC=m
370CONFIG_NF_NAT_TFTP=m 344# CONFIG_NF_NAT_TFTP is not set
371# CONFIG_NF_NAT_AMANDA is not set 345# CONFIG_NF_NAT_AMANDA is not set
372# CONFIG_NF_NAT_PPTP is not set 346# CONFIG_NF_NAT_PPTP is not set
373# CONFIG_NF_NAT_H323 is not set 347# CONFIG_NF_NAT_H323 is not set
374CONFIG_NF_NAT_SIP=m 348CONFIG_NF_NAT_SIP=m
375# CONFIG_IP_NF_MANGLE is not set 349# CONFIG_IP_NF_MANGLE is not set
376# CONFIG_IP_NF_RAW is not set
377# CONFIG_IP_NF_ARPTABLES is not set
378# CONFIG_IP_DCCP is not set 350# CONFIG_IP_DCCP is not set
379# CONFIG_IP_SCTP is not set 351# CONFIG_IP_SCTP is not set
380# CONFIG_TIPC is not set 352# CONFIG_TIPC is not set
@@ -396,6 +368,7 @@ CONFIG_NF_NAT_SIP=m
396# 368#
397# CONFIG_NET_PKTGEN is not set 369# CONFIG_NET_PKTGEN is not set
398# CONFIG_HAMRADIO is not set 370# CONFIG_HAMRADIO is not set
371# CONFIG_CAN is not set
399# CONFIG_IRDA is not set 372# CONFIG_IRDA is not set
400# CONFIG_BT is not set 373# CONFIG_BT is not set
401# CONFIG_AF_RXRPC is not set 374# CONFIG_AF_RXRPC is not set
@@ -445,7 +418,7 @@ CONFIG_BLK_DEV_LOOP=y
445CONFIG_BLK_DEV_RAM=y 418CONFIG_BLK_DEV_RAM=y
446CONFIG_BLK_DEV_RAM_COUNT=16 419CONFIG_BLK_DEV_RAM_COUNT=16
447CONFIG_BLK_DEV_RAM_SIZE=4096 420CONFIG_BLK_DEV_RAM_SIZE=4096
448CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 421# CONFIG_BLK_DEV_XIP is not set
449# CONFIG_CDROM_PKTCDVD is not set 422# CONFIG_CDROM_PKTCDVD is not set
450# CONFIG_ATA_OVER_ETH is not set 423# CONFIG_ATA_OVER_ETH is not set
451CONFIG_MISC_DEVICES=y 424CONFIG_MISC_DEVICES=y
@@ -453,16 +426,19 @@ CONFIG_MISC_DEVICES=y
453# CONFIG_EEPROM_93CX6 is not set 426# CONFIG_EEPROM_93CX6 is not set
454# CONFIG_SGI_IOC4 is not set 427# CONFIG_SGI_IOC4 is not set
455# CONFIG_TIFM_CORE is not set 428# CONFIG_TIFM_CORE is not set
429# CONFIG_ENCLOSURE_SERVICES is not set
430CONFIG_HAVE_IDE=y
456CONFIG_IDE=y 431CONFIG_IDE=y
457CONFIG_BLK_DEV_IDE=y 432CONFIG_BLK_DEV_IDE=y
458 433
459# 434#
460# Please see Documentation/ide.txt for help/info on IDE drives 435# Please see Documentation/ide/ide.txt for help/info on IDE drives
461# 436#
462# CONFIG_BLK_DEV_IDE_SATA is not set 437# CONFIG_BLK_DEV_IDE_SATA is not set
463CONFIG_BLK_DEV_IDEDISK=y 438CONFIG_BLK_DEV_IDEDISK=y
464CONFIG_IDEDISK_MULTI_MODE=y 439CONFIG_IDEDISK_MULTI_MODE=y
465CONFIG_BLK_DEV_IDECD=y 440CONFIG_BLK_DEV_IDECD=y
441CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
466# CONFIG_BLK_DEV_IDETAPE is not set 442# CONFIG_BLK_DEV_IDETAPE is not set
467# CONFIG_BLK_DEV_IDEFLOPPY is not set 443# CONFIG_BLK_DEV_IDEFLOPPY is not set
468# CONFIG_BLK_DEV_IDESCSI is not set 444# CONFIG_BLK_DEV_IDESCSI is not set
@@ -474,12 +450,12 @@ CONFIG_IDE_PROC_FS=y
474# 450#
475CONFIG_IDE_GENERIC=y 451CONFIG_IDE_GENERIC=y
476# CONFIG_BLK_DEV_PLATFORM is not set 452# CONFIG_BLK_DEV_PLATFORM is not set
453CONFIG_BLK_DEV_IDEDMA_SFF=y
477 454
478# 455#
479# PCI IDE chipsets support 456# PCI IDE chipsets support
480# 457#
481CONFIG_BLK_DEV_IDEPCI=y 458CONFIG_BLK_DEV_IDEPCI=y
482CONFIG_IDEPCI_SHARE_IRQ=y
483CONFIG_IDEPCI_PCIBUS_ORDER=y 459CONFIG_IDEPCI_PCIBUS_ORDER=y
484# CONFIG_BLK_DEV_OFFBOARD is not set 460# CONFIG_BLK_DEV_OFFBOARD is not set
485CONFIG_BLK_DEV_GENERIC=y 461CONFIG_BLK_DEV_GENERIC=y
@@ -510,7 +486,6 @@ CONFIG_BLK_DEV_SL82C105=y
510# CONFIG_BLK_DEV_TRM290 is not set 486# CONFIG_BLK_DEV_TRM290 is not set
511CONFIG_BLK_DEV_VIA82CXXX=y 487CONFIG_BLK_DEV_VIA82CXXX=y
512# CONFIG_BLK_DEV_TC86C001 is not set 488# CONFIG_BLK_DEV_TC86C001 is not set
513# CONFIG_IDE_ARM is not set
514 489
515# 490#
516# Other IDE chipsets support 491# Other IDE chipsets support
@@ -599,6 +574,7 @@ CONFIG_SCSI_LOWLEVEL=y
599# CONFIG_SCSI_IPS is not set 574# CONFIG_SCSI_IPS is not set
600# CONFIG_SCSI_INITIO is not set 575# CONFIG_SCSI_INITIO is not set
601# CONFIG_SCSI_INIA100 is not set 576# CONFIG_SCSI_INIA100 is not set
577# CONFIG_SCSI_MVSAS is not set
602# CONFIG_SCSI_NCR53C406A is not set 578# CONFIG_SCSI_NCR53C406A is not set
603# CONFIG_SCSI_STEX is not set 579# CONFIG_SCSI_STEX is not set
604CONFIG_SCSI_SYM53C8XX_2=y 580CONFIG_SCSI_SYM53C8XX_2=y
@@ -607,7 +583,6 @@ CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
607CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 583CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
608CONFIG_SCSI_SYM53C8XX_MMIO=y 584CONFIG_SCSI_SYM53C8XX_MMIO=y
609# CONFIG_SCSI_PAS16 is not set 585# CONFIG_SCSI_PAS16 is not set
610# CONFIG_SCSI_PSI240I is not set
611# CONFIG_SCSI_QLOGIC_FAS is not set 586# CONFIG_SCSI_QLOGIC_FAS is not set
612# CONFIG_SCSI_QLOGIC_1280 is not set 587# CONFIG_SCSI_QLOGIC_1280 is not set
613# CONFIG_SCSI_QLA_FC is not set 588# CONFIG_SCSI_QLA_FC is not set
@@ -640,7 +615,6 @@ CONFIG_NETDEVICES=y
640# CONFIG_EQUALIZER is not set 615# CONFIG_EQUALIZER is not set
641# CONFIG_TUN is not set 616# CONFIG_TUN is not set
642# CONFIG_VETH is not set 617# CONFIG_VETH is not set
643# CONFIG_IP1000 is not set
644# CONFIG_ARCNET is not set 618# CONFIG_ARCNET is not set
645# CONFIG_PHYLIB is not set 619# CONFIG_PHYLIB is not set
646CONFIG_NET_ETHERNET=y 620CONFIG_NET_ETHERNET=y
@@ -688,6 +662,7 @@ CONFIG_8139TOO=y
688# CONFIG_8139TOO_TUNE_TWISTER is not set 662# CONFIG_8139TOO_TUNE_TWISTER is not set
689# CONFIG_8139TOO_8129 is not set 663# CONFIG_8139TOO_8129 is not set
690# CONFIG_8139_OLD_RX_RESET is not set 664# CONFIG_8139_OLD_RX_RESET is not set
665# CONFIG_R6040 is not set
691# CONFIG_SIS900 is not set 666# CONFIG_SIS900 is not set
692# CONFIG_EPIC100 is not set 667# CONFIG_EPIC100 is not set
693# CONFIG_SUNDANCE is not set 668# CONFIG_SUNDANCE is not set
@@ -701,6 +676,9 @@ CONFIG_NETDEV_1000=y
701# CONFIG_DL2K is not set 676# CONFIG_DL2K is not set
702# CONFIG_E1000 is not set 677# CONFIG_E1000 is not set
703# CONFIG_E1000E is not set 678# CONFIG_E1000E is not set
679# CONFIG_E1000E_ENABLED is not set
680# CONFIG_IP1000 is not set
681# CONFIG_IGB is not set
704# CONFIG_NS83820 is not set 682# CONFIG_NS83820 is not set
705# CONFIG_HAMACHI is not set 683# CONFIG_HAMACHI is not set
706# CONFIG_YELLOWFIN is not set 684# CONFIG_YELLOWFIN is not set
@@ -726,6 +704,7 @@ CONFIG_NETDEV_10000=y
726# CONFIG_NIU is not set 704# CONFIG_NIU is not set
727# CONFIG_MLX4_CORE is not set 705# CONFIG_MLX4_CORE is not set
728# CONFIG_TEHUTI is not set 706# CONFIG_TEHUTI is not set
707# CONFIG_BNX2X is not set
729# CONFIG_TR is not set 708# CONFIG_TR is not set
730 709
731# 710#
@@ -758,7 +737,6 @@ CONFIG_PPPOE=m
758# CONFIG_SLIP is not set 737# CONFIG_SLIP is not set
759CONFIG_SLHC=m 738CONFIG_SLHC=m
760# CONFIG_NET_FC is not set 739# CONFIG_NET_FC is not set
761# CONFIG_SHAPER is not set
762# CONFIG_NETCONSOLE is not set 740# CONFIG_NETCONSOLE is not set
763# CONFIG_NETPOLL is not set 741# CONFIG_NETPOLL is not set
764# CONFIG_NET_POLL_CONTROLLER is not set 742# CONFIG_NET_POLL_CONTROLLER is not set
@@ -838,6 +816,7 @@ CONFIG_VT_CONSOLE=y
838CONFIG_HW_CONSOLE=y 816CONFIG_HW_CONSOLE=y
839# CONFIG_VT_HW_CONSOLE_BINDING is not set 817# CONFIG_VT_HW_CONSOLE_BINDING is not set
840# CONFIG_SERIAL_NONSTANDARD is not set 818# CONFIG_SERIAL_NONSTANDARD is not set
819# CONFIG_NOZOMI is not set
841 820
842# 821#
843# Serial drivers 822# Serial drivers
@@ -917,14 +896,12 @@ CONFIG_I2C_ALGOBIT=y
917# 896#
918# Miscellaneous I2C Chip support 897# Miscellaneous I2C Chip support
919# 898#
920# CONFIG_SENSORS_DS1337 is not set
921# CONFIG_SENSORS_DS1374 is not set
922# CONFIG_DS1682 is not set 899# CONFIG_DS1682 is not set
923# CONFIG_SENSORS_EEPROM is not set 900# CONFIG_SENSORS_EEPROM is not set
924# CONFIG_SENSORS_PCF8574 is not set 901# CONFIG_SENSORS_PCF8574 is not set
925# CONFIG_SENSORS_PCA9539 is not set 902# CONFIG_PCF8575 is not set
926# CONFIG_SENSORS_PCF8591 is not set 903# CONFIG_SENSORS_PCF8591 is not set
927# CONFIG_SENSORS_M41T00 is not set 904# CONFIG_TPS65010 is not set
928# CONFIG_SENSORS_MAX6875 is not set 905# CONFIG_SENSORS_MAX6875 is not set
929# CONFIG_SENSORS_TSL2550 is not set 906# CONFIG_SENSORS_TSL2550 is not set
930# CONFIG_I2C_DEBUG_CORE is not set 907# CONFIG_I2C_DEBUG_CORE is not set
@@ -940,6 +917,7 @@ CONFIG_I2C_ALGOBIT=y
940# CONFIG_W1 is not set 917# CONFIG_W1 is not set
941# CONFIG_POWER_SUPPLY is not set 918# CONFIG_POWER_SUPPLY is not set
942# CONFIG_HWMON is not set 919# CONFIG_HWMON is not set
920# CONFIG_THERMAL is not set
943# CONFIG_WATCHDOG is not set 921# CONFIG_WATCHDOG is not set
944 922
945# 923#
@@ -1083,6 +1061,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
1083CONFIG_USB_ARCH_HAS_EHCI=y 1061CONFIG_USB_ARCH_HAS_EHCI=y
1084CONFIG_USB=y 1062CONFIG_USB=y
1085# CONFIG_USB_DEBUG is not set 1063# CONFIG_USB_DEBUG is not set
1064# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1086 1065
1087# 1066#
1088# Miscellaneous USB options 1067# Miscellaneous USB options
@@ -1096,9 +1075,9 @@ CONFIG_USB_DEVICE_CLASS=y
1096# USB Host Controller Drivers 1075# USB Host Controller Drivers
1097# 1076#
1098CONFIG_USB_EHCI_HCD=m 1077CONFIG_USB_EHCI_HCD=m
1099# CONFIG_USB_EHCI_SPLIT_ISO is not set
1100# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1078# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1101# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1079# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1080# CONFIG_USB_EHCI_HCD_PPC_OF is not set
1102# CONFIG_USB_ISP116X_HCD is not set 1081# CONFIG_USB_ISP116X_HCD is not set
1103CONFIG_USB_OHCI_HCD=y 1082CONFIG_USB_OHCI_HCD=y
1104# CONFIG_USB_OHCI_HCD_PPC_OF is not set 1083# CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -1147,10 +1126,6 @@ CONFIG_USB_MON=y
1147# 1126#
1148# USB port drivers 1127# USB port drivers
1149# 1128#
1150
1151#
1152# USB Serial Converter support
1153#
1154# CONFIG_USB_SERIAL is not set 1129# CONFIG_USB_SERIAL is not set
1155 1130
1156# 1131#
@@ -1176,20 +1151,14 @@ CONFIG_USB_MON=y
1176# CONFIG_USB_TRANCEVIBRATOR is not set 1151# CONFIG_USB_TRANCEVIBRATOR is not set
1177# CONFIG_USB_IOWARRIOR is not set 1152# CONFIG_USB_IOWARRIOR is not set
1178# CONFIG_USB_TEST is not set 1153# CONFIG_USB_TEST is not set
1179
1180#
1181# USB DSL modem support
1182#
1183
1184#
1185# USB Gadget Support
1186#
1187# CONFIG_USB_GADGET is not set 1154# CONFIG_USB_GADGET is not set
1188# CONFIG_MMC is not set 1155# CONFIG_MMC is not set
1156# CONFIG_MEMSTICK is not set
1189# CONFIG_NEW_LEDS is not set 1157# CONFIG_NEW_LEDS is not set
1190# CONFIG_INFINIBAND is not set 1158# CONFIG_INFINIBAND is not set
1191# CONFIG_EDAC is not set 1159# CONFIG_EDAC is not set
1192# CONFIG_RTC_CLASS is not set 1160# CONFIG_RTC_CLASS is not set
1161# CONFIG_DMADEVICES is not set
1193 1162
1194# 1163#
1195# Userspace I/O 1164# Userspace I/O
@@ -1215,12 +1184,10 @@ CONFIG_FS_MBCACHE=y
1215# CONFIG_XFS_FS is not set 1184# CONFIG_XFS_FS is not set
1216# CONFIG_GFS2_FS is not set 1185# CONFIG_GFS2_FS is not set
1217# CONFIG_OCFS2_FS is not set 1186# CONFIG_OCFS2_FS is not set
1218# CONFIG_MINIX_FS is not set 1187CONFIG_DNOTIFY=y
1219# CONFIG_ROMFS_FS is not set
1220CONFIG_INOTIFY=y 1188CONFIG_INOTIFY=y
1221CONFIG_INOTIFY_USER=y 1189CONFIG_INOTIFY_USER=y
1222# CONFIG_QUOTA is not set 1190# CONFIG_QUOTA is not set
1223CONFIG_DNOTIFY=y
1224# CONFIG_AUTOFS_FS is not set 1191# CONFIG_AUTOFS_FS is not set
1225# CONFIG_AUTOFS4_FS is not set 1192# CONFIG_AUTOFS4_FS is not set
1226# CONFIG_FUSE_FS is not set 1193# CONFIG_FUSE_FS is not set
@@ -1267,8 +1234,10 @@ CONFIG_TMPFS=y
1267# CONFIG_EFS_FS is not set 1234# CONFIG_EFS_FS is not set
1268# CONFIG_CRAMFS is not set 1235# CONFIG_CRAMFS is not set
1269# CONFIG_VXFS_FS is not set 1236# CONFIG_VXFS_FS is not set
1237# CONFIG_MINIX_FS is not set
1270# CONFIG_HPFS_FS is not set 1238# CONFIG_HPFS_FS is not set
1271# CONFIG_QNX4FS_FS is not set 1239# CONFIG_QNX4FS_FS is not set
1240# CONFIG_ROMFS_FS is not set
1272# CONFIG_SYSV_FS is not set 1241# CONFIG_SYSV_FS is not set
1273# CONFIG_UFS_FS is not set 1242# CONFIG_UFS_FS is not set
1274CONFIG_NETWORK_FILESYSTEMS=y 1243CONFIG_NETWORK_FILESYSTEMS=y
@@ -1342,7 +1311,6 @@ CONFIG_NLS_ISO8859_1=m
1342# CONFIG_NLS_KOI8_U is not set 1311# CONFIG_NLS_KOI8_U is not set
1343# CONFIG_NLS_UTF8 is not set 1312# CONFIG_NLS_UTF8 is not set
1344# CONFIG_DLM is not set 1313# CONFIG_DLM is not set
1345# CONFIG_UCC_SLOW is not set
1346 1314
1347# 1315#
1348# Library routines 1316# Library routines
@@ -1360,10 +1328,6 @@ CONFIG_PLIST=y
1360CONFIG_HAS_IOMEM=y 1328CONFIG_HAS_IOMEM=y
1361CONFIG_HAS_IOPORT=y 1329CONFIG_HAS_IOPORT=y
1362CONFIG_HAS_DMA=y 1330CONFIG_HAS_DMA=y
1363CONFIG_INSTRUMENTATION=y
1364# CONFIG_PROFILING is not set
1365# CONFIG_KPROBES is not set
1366# CONFIG_MARKERS is not set
1367 1331
1368# 1332#
1369# Kernel hacking 1333# Kernel hacking
@@ -1382,6 +1346,7 @@ CONFIG_SCHED_DEBUG=y
1382# CONFIG_SCHEDSTATS is not set 1346# CONFIG_SCHEDSTATS is not set
1383# CONFIG_TIMER_STATS is not set 1347# CONFIG_TIMER_STATS is not set
1384# CONFIG_SLUB_DEBUG_ON is not set 1348# CONFIG_SLUB_DEBUG_ON is not set
1349# CONFIG_SLUB_STATS is not set
1385# CONFIG_DEBUG_RT_MUTEXES is not set 1350# CONFIG_DEBUG_RT_MUTEXES is not set
1386# CONFIG_RT_MUTEX_TESTER is not set 1351# CONFIG_RT_MUTEX_TESTER is not set
1387# CONFIG_DEBUG_SPINLOCK is not set 1352# CONFIG_DEBUG_SPINLOCK is not set
@@ -1395,9 +1360,9 @@ CONFIG_DEBUG_BUGVERBOSE=y
1395# CONFIG_DEBUG_VM is not set 1360# CONFIG_DEBUG_VM is not set
1396# CONFIG_DEBUG_LIST is not set 1361# CONFIG_DEBUG_LIST is not set
1397# CONFIG_DEBUG_SG is not set 1362# CONFIG_DEBUG_SG is not set
1398CONFIG_FORCED_INLINING=y
1399# CONFIG_BOOT_PRINTK_DELAY is not set 1363# CONFIG_BOOT_PRINTK_DELAY is not set
1400# CONFIG_RCU_TORTURE_TEST is not set 1364# CONFIG_RCU_TORTURE_TEST is not set
1365# CONFIG_BACKTRACE_SELF_TEST is not set
1401# CONFIG_FAULT_INJECTION is not set 1366# CONFIG_FAULT_INJECTION is not set
1402# CONFIG_SAMPLES is not set 1367# CONFIG_SAMPLES is not set
1403# CONFIG_DEBUG_STACKOVERFLOW is not set 1368# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1420,6 +1385,7 @@ CONFIG_XMON_DISASSEMBLY=y
1420CONFIG_CRYPTO=y 1385CONFIG_CRYPTO=y
1421CONFIG_CRYPTO_ALGAPI=m 1386CONFIG_CRYPTO_ALGAPI=m
1422CONFIG_CRYPTO_BLKCIPHER=m 1387CONFIG_CRYPTO_BLKCIPHER=m
1388# CONFIG_CRYPTO_SEQIV is not set
1423CONFIG_CRYPTO_MANAGER=m 1389CONFIG_CRYPTO_MANAGER=m
1424# CONFIG_CRYPTO_HMAC is not set 1390# CONFIG_CRYPTO_HMAC is not set
1425# CONFIG_CRYPTO_XCBC is not set 1391# CONFIG_CRYPTO_XCBC is not set
@@ -1437,6 +1403,9 @@ CONFIG_CRYPTO_CBC=m
1437CONFIG_CRYPTO_PCBC=m 1403CONFIG_CRYPTO_PCBC=m
1438# CONFIG_CRYPTO_LRW is not set 1404# CONFIG_CRYPTO_LRW is not set
1439# CONFIG_CRYPTO_XTS is not set 1405# CONFIG_CRYPTO_XTS is not set
1406# CONFIG_CRYPTO_CTR is not set
1407# CONFIG_CRYPTO_GCM is not set
1408# CONFIG_CRYPTO_CCM is not set
1440# CONFIG_CRYPTO_CRYPTD is not set 1409# CONFIG_CRYPTO_CRYPTD is not set
1441# CONFIG_CRYPTO_DES is not set 1410# CONFIG_CRYPTO_DES is not set
1442# CONFIG_CRYPTO_FCRYPT is not set 1411# CONFIG_CRYPTO_FCRYPT is not set
@@ -1451,11 +1420,13 @@ CONFIG_CRYPTO_ARC4=m
1451# CONFIG_CRYPTO_KHAZAD is not set 1420# CONFIG_CRYPTO_KHAZAD is not set
1452# CONFIG_CRYPTO_ANUBIS is not set 1421# CONFIG_CRYPTO_ANUBIS is not set
1453# CONFIG_CRYPTO_SEED is not set 1422# CONFIG_CRYPTO_SEED is not set
1423# CONFIG_CRYPTO_SALSA20 is not set
1454# CONFIG_CRYPTO_DEFLATE is not set 1424# CONFIG_CRYPTO_DEFLATE is not set
1455# CONFIG_CRYPTO_MICHAEL_MIC is not set 1425# CONFIG_CRYPTO_MICHAEL_MIC is not set
1456# CONFIG_CRYPTO_CRC32C is not set 1426# CONFIG_CRYPTO_CRC32C is not set
1457# CONFIG_CRYPTO_CAMELLIA is not set 1427# CONFIG_CRYPTO_CAMELLIA is not set
1458# CONFIG_CRYPTO_TEST is not set 1428# CONFIG_CRYPTO_TEST is not set
1459# CONFIG_CRYPTO_AUTHENC is not set 1429# CONFIG_CRYPTO_AUTHENC is not set
1430# CONFIG_CRYPTO_LZO is not set
1460# CONFIG_CRYPTO_HW is not set 1431# CONFIG_CRYPTO_HW is not set
1461# CONFIG_PPC_CLOCK is not set 1432# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig
index 01ad5951ade9..2b1504e0a111 100644
--- a/arch/powerpc/configs/ep8248e_defconfig
+++ b/arch/powerpc/configs/ep8248e_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-rc6
4# Fri Jan 11 14:02:06 2008 4# Mon Mar 24 08:48:09 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -28,6 +28,7 @@ CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y 28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y 29CONFIG_GENERIC_CLOCKEVENTS=y
30CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
31# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
31CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
32CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
33CONFIG_ARCH_HAS_ILOG2_U32=y 34CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -69,11 +70,14 @@ CONFIG_IKCONFIG=y
69CONFIG_IKCONFIG_PROC=y 70CONFIG_IKCONFIG_PROC=y
70CONFIG_LOG_BUF_SHIFT=14 71CONFIG_LOG_BUF_SHIFT=14
71# CONFIG_CGROUPS is not set 72# CONFIG_CGROUPS is not set
73CONFIG_GROUP_SCHED=y
72CONFIG_FAIR_GROUP_SCHED=y 74CONFIG_FAIR_GROUP_SCHED=y
73CONFIG_FAIR_USER_SCHED=y 75CONFIG_USER_SCHED=y
74# CONFIG_FAIR_CGROUP_SCHED is not set 76# CONFIG_CGROUP_SCHED is not set
75CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
78CONFIG_SYSFS_DEPRECATED_V2=y
76# CONFIG_RELAY is not set 79# CONFIG_RELAY is not set
80# CONFIG_NAMESPACES is not set
77# CONFIG_BLK_DEV_INITRD is not set 81# CONFIG_BLK_DEV_INITRD is not set
78CONFIG_SYSCTL=y 82CONFIG_SYSCTL=y
79CONFIG_EMBEDDED=y 83CONFIG_EMBEDDED=y
@@ -85,17 +89,26 @@ CONFIG_HOTPLUG=y
85CONFIG_PRINTK=y 89CONFIG_PRINTK=y
86CONFIG_BUG=y 90CONFIG_BUG=y
87CONFIG_ELF_CORE=y 91CONFIG_ELF_CORE=y
92CONFIG_COMPAT_BRK=y
88CONFIG_BASE_FULL=y 93CONFIG_BASE_FULL=y
89CONFIG_FUTEX=y 94CONFIG_FUTEX=y
90CONFIG_ANON_INODES=y 95CONFIG_ANON_INODES=y
91CONFIG_EPOLL=y 96CONFIG_EPOLL=y
92CONFIG_SIGNALFD=y 97CONFIG_SIGNALFD=y
98CONFIG_TIMERFD=y
93CONFIG_EVENTFD=y 99CONFIG_EVENTFD=y
94CONFIG_SHMEM=y 100CONFIG_SHMEM=y
95CONFIG_VM_EVENT_COUNTERS=y 101CONFIG_VM_EVENT_COUNTERS=y
96CONFIG_SLAB=y 102CONFIG_SLAB=y
97# CONFIG_SLUB is not set 103# CONFIG_SLUB is not set
98# CONFIG_SLOB is not set 104# CONFIG_SLOB is not set
105# CONFIG_PROFILING is not set
106# CONFIG_MARKERS is not set
107CONFIG_HAVE_OPROFILE=y
108CONFIG_HAVE_KPROBES=y
109CONFIG_HAVE_KRETPROBES=y
110CONFIG_PROC_PAGE_MONITOR=y
111CONFIG_SLABINFO=y
99CONFIG_RT_MUTEXES=y 112CONFIG_RT_MUTEXES=y
100# CONFIG_TINY_SHMEM is not set 113# CONFIG_TINY_SHMEM is not set
101CONFIG_BASE_SMALL=0 114CONFIG_BASE_SMALL=0
@@ -117,6 +130,7 @@ CONFIG_DEFAULT_DEADLINE=y
117# CONFIG_DEFAULT_CFQ is not set 130# CONFIG_DEFAULT_CFQ is not set
118# CONFIG_DEFAULT_NOOP is not set 131# CONFIG_DEFAULT_NOOP is not set
119CONFIG_DEFAULT_IOSCHED="deadline" 132CONFIG_DEFAULT_IOSCHED="deadline"
133CONFIG_CLASSIC_RCU=y
120 134
121# 135#
122# Platform support 136# Platform support
@@ -125,8 +139,8 @@ CONFIG_DEFAULT_IOSCHED="deadline"
125CONFIG_PPC_82xx=y 139CONFIG_PPC_82xx=y
126# CONFIG_PPC_83xx is not set 140# CONFIG_PPC_83xx is not set
127# CONFIG_PPC_86xx is not set 141# CONFIG_PPC_86xx is not set
128# CONFIG_PPC_MPC52xx is not set 142# CONFIG_PPC_MPC512x is not set
129# CONFIG_PPC_MPC5200 is not set 143# CONFIG_PPC_MPC5121 is not set
130# CONFIG_PPC_CELL is not set 144# CONFIG_PPC_CELL is not set
131# CONFIG_PPC_CELL_NATIVE is not set 145# CONFIG_PPC_CELL_NATIVE is not set
132# CONFIG_MPC8272_ADS is not set 146# CONFIG_MPC8272_ADS is not set
@@ -135,6 +149,7 @@ CONFIG_EP8248E=y
135# CONFIG_PQ2ADS is not set 149# CONFIG_PQ2ADS is not set
136CONFIG_8260=y 150CONFIG_8260=y
137CONFIG_8272=y 151CONFIG_8272=y
152# CONFIG_IPIC is not set
138# CONFIG_MPIC is not set 153# CONFIG_MPIC is not set
139# CONFIG_MPIC_WEIRD is not set 154# CONFIG_MPIC_WEIRD is not set
140# CONFIG_PPC_I8259 is not set 155# CONFIG_PPC_I8259 is not set
@@ -163,12 +178,16 @@ CONFIG_HZ_250=y
163# CONFIG_HZ_300 is not set 178# CONFIG_HZ_300 is not set
164# CONFIG_HZ_1000 is not set 179# CONFIG_HZ_1000 is not set
165CONFIG_HZ=250 180CONFIG_HZ=250
181# CONFIG_SCHED_HRTICK is not set
166CONFIG_PREEMPT_NONE=y 182CONFIG_PREEMPT_NONE=y
167# CONFIG_PREEMPT_VOLUNTARY is not set 183# CONFIG_PREEMPT_VOLUNTARY is not set
168# CONFIG_PREEMPT is not set 184# CONFIG_PREEMPT is not set
169CONFIG_BINFMT_ELF=y 185CONFIG_BINFMT_ELF=y
170CONFIG_BINFMT_MISC=y 186CONFIG_BINFMT_MISC=y
187# CONFIG_IOMMU_HELPER is not set
171CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 188CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
189CONFIG_ARCH_HAS_WALK_MEMORY=y
190CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
172CONFIG_ARCH_FLATMEM_ENABLE=y 191CONFIG_ARCH_FLATMEM_ENABLE=y
173CONFIG_ARCH_POPULATES_NODE_MAP=y 192CONFIG_ARCH_POPULATES_NODE_MAP=y
174CONFIG_FLATMEM=y 193CONFIG_FLATMEM=y
@@ -183,11 +202,7 @@ CONFIG_VIRT_TO_BUS=y
183CONFIG_PROC_DEVICETREE=y 202CONFIG_PROC_DEVICETREE=y
184# CONFIG_CMDLINE_BOOL is not set 203# CONFIG_CMDLINE_BOOL is not set
185# CONFIG_PM is not set 204# CONFIG_PM is not set
186CONFIG_SUSPEND_UP_POSSIBLE=y
187CONFIG_HIBERNATION_UP_POSSIBLE=y
188# CONFIG_SECCOMP is not set 205# CONFIG_SECCOMP is not set
189CONFIG_WANT_DEVICE_TREE=y
190CONFIG_DEVICE_TREE="ep8248e.dts"
191CONFIG_ISA_DMA_API=y 206CONFIG_ISA_DMA_API=y
192 207
193# 208#
@@ -272,12 +287,13 @@ CONFIG_IPV6_SIT=y
272# CONFIG_NETWORK_SECMARK is not set 287# CONFIG_NETWORK_SECMARK is not set
273CONFIG_NETFILTER=y 288CONFIG_NETFILTER=y
274# CONFIG_NETFILTER_DEBUG is not set 289# CONFIG_NETFILTER_DEBUG is not set
290CONFIG_NETFILTER_ADVANCED=y
275 291
276# 292#
277# Core Netfilter Configuration 293# Core Netfilter Configuration
278# 294#
279# CONFIG_NETFILTER_NETLINK is not set 295# CONFIG_NETFILTER_NETLINK_QUEUE is not set
280# CONFIG_NF_CONNTRACK_ENABLED is not set 296# CONFIG_NETFILTER_NETLINK_LOG is not set
281# CONFIG_NF_CONNTRACK is not set 297# CONFIG_NF_CONNTRACK is not set
282# CONFIG_NETFILTER_XTABLES is not set 298# CONFIG_NETFILTER_XTABLES is not set
283 299
@@ -287,6 +303,13 @@ CONFIG_NETFILTER=y
287# CONFIG_IP_NF_QUEUE is not set 303# CONFIG_IP_NF_QUEUE is not set
288# CONFIG_IP_NF_IPTABLES is not set 304# CONFIG_IP_NF_IPTABLES is not set
289# CONFIG_IP_NF_ARPTABLES is not set 305# CONFIG_IP_NF_ARPTABLES is not set
306
307#
308# IPv6: Netfilter Configuration
309#
310# CONFIG_IP6_NF_QUEUE is not set
311# CONFIG_IP6_NF_IPTABLES is not set
312# CONFIG_ATM is not set
290# CONFIG_BRIDGE is not set 313# CONFIG_BRIDGE is not set
291# CONFIG_VLAN_8021Q is not set 314# CONFIG_VLAN_8021Q is not set
292# CONFIG_DECNET is not set 315# CONFIG_DECNET is not set
@@ -300,6 +323,7 @@ CONFIG_NETFILTER=y
300# 323#
301# CONFIG_NET_PKTGEN is not set 324# CONFIG_NET_PKTGEN is not set
302# CONFIG_HAMRADIO is not set 325# CONFIG_HAMRADIO is not set
326# CONFIG_CAN is not set
303# CONFIG_IRDA is not set 327# CONFIG_IRDA is not set
304# CONFIG_BT is not set 328# CONFIG_BT is not set
305 329
@@ -308,6 +332,7 @@ CONFIG_NETFILTER=y
308# 332#
309# CONFIG_CFG80211 is not set 333# CONFIG_CFG80211 is not set
310# CONFIG_WIRELESS_EXT is not set 334# CONFIG_WIRELESS_EXT is not set
335# CONFIG_MAC80211 is not set
311# CONFIG_IEEE80211 is not set 336# CONFIG_IEEE80211 is not set
312# CONFIG_RFKILL is not set 337# CONFIG_RFKILL is not set
313 338
@@ -415,6 +440,7 @@ CONFIG_BLK_DEV_LOOP=y
415# CONFIG_CDROM_PKTCDVD is not set 440# CONFIG_CDROM_PKTCDVD is not set
416# CONFIG_ATA_OVER_ETH is not set 441# CONFIG_ATA_OVER_ETH is not set
417# CONFIG_MISC_DEVICES is not set 442# CONFIG_MISC_DEVICES is not set
443CONFIG_HAVE_IDE=y
418# CONFIG_IDE is not set 444# CONFIG_IDE is not set
419 445
420# 446#
@@ -448,6 +474,7 @@ CONFIG_DAVICOM_PHY=y
448# CONFIG_SMSC_PHY is not set 474# CONFIG_SMSC_PHY is not set
449# CONFIG_BROADCOM_PHY is not set 475# CONFIG_BROADCOM_PHY is not set
450# CONFIG_ICPLUS_PHY is not set 476# CONFIG_ICPLUS_PHY is not set
477# CONFIG_REALTEK_PHY is not set
451# CONFIG_FIXED_PHY is not set 478# CONFIG_FIXED_PHY is not set
452CONFIG_MDIO_BITBANG=y 479CONFIG_MDIO_BITBANG=y
453CONFIG_NET_ETHERNET=y 480CONFIG_NET_ETHERNET=y
@@ -462,6 +489,8 @@ CONFIG_FS_ENET=y
462CONFIG_FS_ENET_HAS_FCC=y 489CONFIG_FS_ENET_HAS_FCC=y
463# CONFIG_FS_ENET_MDIO_FCC is not set 490# CONFIG_FS_ENET_MDIO_FCC is not set
464CONFIG_NETDEV_1000=y 491CONFIG_NETDEV_1000=y
492# CONFIG_E1000E_ENABLED is not set
493# CONFIG_GIANFAR is not set
465CONFIG_NETDEV_10000=y 494CONFIG_NETDEV_10000=y
466 495
467# 496#
@@ -532,6 +561,7 @@ CONFIG_HW_RANDOM=y
532# CONFIG_W1 is not set 561# CONFIG_W1 is not set
533# CONFIG_POWER_SUPPLY is not set 562# CONFIG_POWER_SUPPLY is not set
534# CONFIG_HWMON is not set 563# CONFIG_HWMON is not set
564# CONFIG_THERMAL is not set
535# CONFIG_WATCHDOG is not set 565# CONFIG_WATCHDOG is not set
536 566
537# 567#
@@ -571,8 +601,10 @@ CONFIG_DAB=y
571# CONFIG_SOUND is not set 601# CONFIG_SOUND is not set
572# CONFIG_USB_SUPPORT is not set 602# CONFIG_USB_SUPPORT is not set
573# CONFIG_MMC is not set 603# CONFIG_MMC is not set
604# CONFIG_MEMSTICK is not set
574# CONFIG_NEW_LEDS is not set 605# CONFIG_NEW_LEDS is not set
575# CONFIG_RTC_CLASS is not set 606# CONFIG_RTC_CLASS is not set
607# CONFIG_DMADEVICES is not set
576 608
577# 609#
578# Userspace I/O 610# Userspace I/O
@@ -593,12 +625,10 @@ CONFIG_JBD=y
593# CONFIG_FS_POSIX_ACL is not set 625# CONFIG_FS_POSIX_ACL is not set
594# CONFIG_XFS_FS is not set 626# CONFIG_XFS_FS is not set
595# CONFIG_OCFS2_FS is not set 627# CONFIG_OCFS2_FS is not set
596# CONFIG_MINIX_FS is not set 628CONFIG_DNOTIFY=y
597# CONFIG_ROMFS_FS is not set
598CONFIG_INOTIFY=y 629CONFIG_INOTIFY=y
599CONFIG_INOTIFY_USER=y 630CONFIG_INOTIFY_USER=y
600# CONFIG_QUOTA is not set 631# CONFIG_QUOTA is not set
601CONFIG_DNOTIFY=y
602# CONFIG_AUTOFS_FS is not set 632# CONFIG_AUTOFS_FS is not set
603CONFIG_AUTOFS4_FS=y 633CONFIG_AUTOFS4_FS=y
604# CONFIG_FUSE_FS is not set 634# CONFIG_FUSE_FS is not set
@@ -626,6 +656,7 @@ CONFIG_SYSFS=y
626CONFIG_TMPFS=y 656CONFIG_TMPFS=y
627# CONFIG_TMPFS_POSIX_ACL is not set 657# CONFIG_TMPFS_POSIX_ACL is not set
628# CONFIG_HUGETLB_PAGE is not set 658# CONFIG_HUGETLB_PAGE is not set
659# CONFIG_CONFIGFS_FS is not set
629 660
630# 661#
631# Miscellaneous filesystems 662# Miscellaneous filesystems
@@ -634,8 +665,10 @@ CONFIG_TMPFS=y
634# CONFIG_JFFS2_FS is not set 665# CONFIG_JFFS2_FS is not set
635CONFIG_CRAMFS=y 666CONFIG_CRAMFS=y
636# CONFIG_VXFS_FS is not set 667# CONFIG_VXFS_FS is not set
668# CONFIG_MINIX_FS is not set
637# CONFIG_HPFS_FS is not set 669# CONFIG_HPFS_FS is not set
638# CONFIG_QNX4FS_FS is not set 670# CONFIG_QNX4FS_FS is not set
671# CONFIG_ROMFS_FS is not set
639# CONFIG_SYSV_FS is not set 672# CONFIG_SYSV_FS is not set
640# CONFIG_UFS_FS is not set 673# CONFIG_UFS_FS is not set
641CONFIG_NETWORK_FILESYSTEMS=y 674CONFIG_NETWORK_FILESYSTEMS=y
@@ -715,7 +748,6 @@ CONFIG_NLS_ISO8859_1=y
715# CONFIG_NLS_KOI8_R is not set 748# CONFIG_NLS_KOI8_R is not set
716# CONFIG_NLS_KOI8_U is not set 749# CONFIG_NLS_KOI8_U is not set
717CONFIG_NLS_UTF8=y 750CONFIG_NLS_UTF8=y
718# CONFIG_UCC_SLOW is not set
719 751
720# 752#
721# Library routines 753# Library routines
@@ -731,9 +763,6 @@ CONFIG_PLIST=y
731CONFIG_HAS_IOMEM=y 763CONFIG_HAS_IOMEM=y
732CONFIG_HAS_IOPORT=y 764CONFIG_HAS_IOPORT=y
733CONFIG_HAS_DMA=y 765CONFIG_HAS_DMA=y
734CONFIG_INSTRUMENTATION=y
735# CONFIG_PROFILING is not set
736# CONFIG_MARKERS is not set
737 766
738# 767#
739# Kernel hacking 768# Kernel hacking
@@ -764,8 +793,8 @@ CONFIG_DEBUG_INFO=y
764# CONFIG_DEBUG_VM is not set 793# CONFIG_DEBUG_VM is not set
765# CONFIG_DEBUG_LIST is not set 794# CONFIG_DEBUG_LIST is not set
766# CONFIG_DEBUG_SG is not set 795# CONFIG_DEBUG_SG is not set
767CONFIG_FORCED_INLINING=y
768# CONFIG_BOOT_PRINTK_DELAY is not set 796# CONFIG_BOOT_PRINTK_DELAY is not set
797# CONFIG_BACKTRACE_SELF_TEST is not set
769# CONFIG_FAULT_INJECTION is not set 798# CONFIG_FAULT_INJECTION is not set
770# CONFIG_SAMPLES is not set 799# CONFIG_SAMPLES is not set
771# CONFIG_DEBUG_STACKOVERFLOW is not set 800# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -784,6 +813,7 @@ CONFIG_BDI_SWITCH=y
784CONFIG_CRYPTO=y 813CONFIG_CRYPTO=y
785CONFIG_CRYPTO_ALGAPI=y 814CONFIG_CRYPTO_ALGAPI=y
786CONFIG_CRYPTO_BLKCIPHER=y 815CONFIG_CRYPTO_BLKCIPHER=y
816# CONFIG_CRYPTO_SEQIV is not set
787CONFIG_CRYPTO_MANAGER=y 817CONFIG_CRYPTO_MANAGER=y
788# CONFIG_CRYPTO_HMAC is not set 818# CONFIG_CRYPTO_HMAC is not set
789# CONFIG_CRYPTO_NULL is not set 819# CONFIG_CRYPTO_NULL is not set
@@ -797,6 +827,9 @@ CONFIG_CRYPTO_MD5=y
797CONFIG_CRYPTO_ECB=y 827CONFIG_CRYPTO_ECB=y
798CONFIG_CRYPTO_CBC=y 828CONFIG_CRYPTO_CBC=y
799CONFIG_CRYPTO_PCBC=y 829CONFIG_CRYPTO_PCBC=y
830# CONFIG_CRYPTO_CTR is not set
831# CONFIG_CRYPTO_GCM is not set
832# CONFIG_CRYPTO_CCM is not set
800# CONFIG_CRYPTO_CRYPTD is not set 833# CONFIG_CRYPTO_CRYPTD is not set
801CONFIG_CRYPTO_DES=y 834CONFIG_CRYPTO_DES=y
802# CONFIG_CRYPTO_FCRYPT is not set 835# CONFIG_CRYPTO_FCRYPT is not set
@@ -816,6 +849,7 @@ CONFIG_CRYPTO_DES=y
816# CONFIG_CRYPTO_CRC32C is not set 849# CONFIG_CRYPTO_CRC32C is not set
817# CONFIG_CRYPTO_CAMELLIA is not set 850# CONFIG_CRYPTO_CAMELLIA is not set
818# CONFIG_CRYPTO_AUTHENC is not set 851# CONFIG_CRYPTO_AUTHENC is not set
852# CONFIG_CRYPTO_LZO is not set
819# CONFIG_CRYPTO_HW is not set 853# CONFIG_CRYPTO_HW is not set
820# CONFIG_PPC_CLOCK is not set 854# CONFIG_PPC_CLOCK is not set
821CONFIG_PPC_LIB_RHEAP=y 855CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig
index a1f98200d9e3..125b4764aadd 100644
--- a/arch/powerpc/configs/ep88xc_defconfig
+++ b/arch/powerpc/configs/ep88xc_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:13 2007 4# Mon Mar 24 08:48:10 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
@@ -63,15 +64,19 @@ CONFIG_SYSVIPC_SYSCTL=y
63# CONFIG_POSIX_MQUEUE is not set 64# CONFIG_POSIX_MQUEUE is not set
64# CONFIG_BSD_PROCESS_ACCT is not set 65# CONFIG_BSD_PROCESS_ACCT is not set
65# CONFIG_TASKSTATS is not set 66# CONFIG_TASKSTATS is not set
66# CONFIG_USER_NS is not set
67# CONFIG_PID_NS is not set
68# CONFIG_AUDIT is not set 67# CONFIG_AUDIT is not set
69# CONFIG_IKCONFIG is not set 68# CONFIG_IKCONFIG is not set
70CONFIG_LOG_BUF_SHIFT=14 69CONFIG_LOG_BUF_SHIFT=14
71# CONFIG_CGROUPS is not set 70# CONFIG_CGROUPS is not set
71CONFIG_GROUP_SCHED=y
72# CONFIG_FAIR_GROUP_SCHED is not set 72# CONFIG_FAIR_GROUP_SCHED is not set
73# CONFIG_RT_GROUP_SCHED is not set
74CONFIG_USER_SCHED=y
75# CONFIG_CGROUP_SCHED is not set
73CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
77CONFIG_SYSFS_DEPRECATED_V2=y
74# CONFIG_RELAY is not set 78# CONFIG_RELAY is not set
79# CONFIG_NAMESPACES is not set
75# CONFIG_BLK_DEV_INITRD is not set 80# CONFIG_BLK_DEV_INITRD is not set
76# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 81# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
77CONFIG_SYSCTL=y 82CONFIG_SYSCTL=y
@@ -84,11 +89,13 @@ CONFIG_HOTPLUG=y
84CONFIG_PRINTK=y 89CONFIG_PRINTK=y
85CONFIG_BUG=y 90CONFIG_BUG=y
86# CONFIG_ELF_CORE is not set 91# CONFIG_ELF_CORE is not set
92CONFIG_COMPAT_BRK=y
87# CONFIG_BASE_FULL is not set 93# CONFIG_BASE_FULL is not set
88# CONFIG_FUTEX is not set 94# CONFIG_FUTEX is not set
89CONFIG_ANON_INODES=y 95CONFIG_ANON_INODES=y
90CONFIG_EPOLL=y 96CONFIG_EPOLL=y
91CONFIG_SIGNALFD=y 97CONFIG_SIGNALFD=y
98CONFIG_TIMERFD=y
92CONFIG_EVENTFD=y 99CONFIG_EVENTFD=y
93CONFIG_SHMEM=y 100CONFIG_SHMEM=y
94# CONFIG_VM_EVENT_COUNTERS is not set 101# CONFIG_VM_EVENT_COUNTERS is not set
@@ -96,6 +103,13 @@ CONFIG_SLUB_DEBUG=y
96# CONFIG_SLAB is not set 103# CONFIG_SLAB is not set
97CONFIG_SLUB=y 104CONFIG_SLUB=y
98# CONFIG_SLOB is not set 105# CONFIG_SLOB is not set
106# CONFIG_PROFILING is not set
107# CONFIG_MARKERS is not set
108CONFIG_HAVE_OPROFILE=y
109CONFIG_HAVE_KPROBES=y
110CONFIG_HAVE_KRETPROBES=y
111CONFIG_PROC_PAGE_MONITOR=y
112CONFIG_SLABINFO=y
99# CONFIG_TINY_SHMEM is not set 113# CONFIG_TINY_SHMEM is not set
100CONFIG_BASE_SMALL=1 114CONFIG_BASE_SMALL=1
101# CONFIG_MODULES is not set 115# CONFIG_MODULES is not set
@@ -117,12 +131,13 @@ CONFIG_DEFAULT_DEADLINE=y
117# CONFIG_DEFAULT_CFQ is not set 131# CONFIG_DEFAULT_CFQ is not set
118# CONFIG_DEFAULT_NOOP is not set 132# CONFIG_DEFAULT_NOOP is not set
119CONFIG_DEFAULT_IOSCHED="deadline" 133CONFIG_DEFAULT_IOSCHED="deadline"
134CONFIG_CLASSIC_RCU=y
120 135
121# 136#
122# Platform support 137# Platform support
123# 138#
124# CONFIG_PPC_MPC52xx is not set 139# CONFIG_PPC_MPC512x is not set
125# CONFIG_PPC_MPC5200 is not set 140# CONFIG_PPC_MPC5121 is not set
126# CONFIG_PPC_CELL is not set 141# CONFIG_PPC_CELL is not set
127# CONFIG_PPC_CELL_NATIVE is not set 142# CONFIG_PPC_CELL_NATIVE is not set
128CONFIG_CPM1=y 143CONFIG_CPM1=y
@@ -130,6 +145,7 @@ CONFIG_CPM1=y
130# CONFIG_MPC86XADS is not set 145# CONFIG_MPC86XADS is not set
131# CONFIG_MPC885ADS is not set 146# CONFIG_MPC885ADS is not set
132CONFIG_PPC_EP88XC=y 147CONFIG_PPC_EP88XC=y
148# CONFIG_PPC_ADDER875 is not set
133 149
134# 150#
135# MPC8xx CPM Options 151# MPC8xx CPM Options
@@ -146,6 +162,7 @@ CONFIG_NO_UCODE_PATCH=y
146# CONFIG_I2C_SPI_UCODE_PATCH is not set 162# CONFIG_I2C_SPI_UCODE_PATCH is not set
147# CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set 163# CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set
148# CONFIG_PQ2ADS is not set 164# CONFIG_PQ2ADS is not set
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_NO_UCODE_PATCH=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
160CONFIG_PPC_CPM_NEW_BINDING=y 176CONFIG_PPC_CPM_NEW_BINDING=y
161# CONFIG_FSL_ULI1575 is not set 177# CONFIG_FSL_ULI1575 is not set
162CONFIG_CPM=y 178CONFIG_CPM=y
@@ -174,6 +190,7 @@ CONFIG_HZ_100=y
174# CONFIG_HZ_300 is not set 190# CONFIG_HZ_300 is not set
175# CONFIG_HZ_1000 is not set 191# CONFIG_HZ_1000 is not set
176CONFIG_HZ=100 192CONFIG_HZ=100
193# CONFIG_SCHED_HRTICK is not set
177CONFIG_PREEMPT_NONE=y 194CONFIG_PREEMPT_NONE=y
178# CONFIG_PREEMPT_VOLUNTARY is not set 195# CONFIG_PREEMPT_VOLUNTARY is not set
179# CONFIG_PREEMPT is not set 196# CONFIG_PREEMPT is not set
@@ -181,7 +198,10 @@ CONFIG_BINFMT_ELF=y
181# CONFIG_BINFMT_MISC is not set 198# CONFIG_BINFMT_MISC is not set
182# CONFIG_MATH_EMULATION is not set 199# CONFIG_MATH_EMULATION is not set
183CONFIG_8XX_MINIMAL_FPEMU=y 200CONFIG_8XX_MINIMAL_FPEMU=y
201# CONFIG_IOMMU_HELPER is not set
184CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 202CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
203CONFIG_ARCH_HAS_WALK_MEMORY=y
204CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
185CONFIG_ARCH_FLATMEM_ENABLE=y 205CONFIG_ARCH_FLATMEM_ENABLE=y
186CONFIG_ARCH_POPULATES_NODE_MAP=y 206CONFIG_ARCH_POPULATES_NODE_MAP=y
187CONFIG_SELECT_MEMORY_MODEL=y 207CONFIG_SELECT_MEMORY_MODEL=y
@@ -200,11 +220,7 @@ CONFIG_VIRT_TO_BUS=y
200CONFIG_PROC_DEVICETREE=y 220CONFIG_PROC_DEVICETREE=y
201# CONFIG_CMDLINE_BOOL is not set 221# CONFIG_CMDLINE_BOOL is not set
202# CONFIG_PM is not set 222# CONFIG_PM is not set
203CONFIG_SUSPEND_UP_POSSIBLE=y
204CONFIG_HIBERNATION_UP_POSSIBLE=y
205# CONFIG_SECCOMP is not set 223# CONFIG_SECCOMP is not set
206CONFIG_WANT_DEVICE_TREE=y
207CONFIG_DEVICE_TREE="ep88xc.dts"
208CONFIG_ISA_DMA_API=y 224CONFIG_ISA_DMA_API=y
209 225
210# 226#
@@ -301,6 +317,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
301# 317#
302# CONFIG_NET_PKTGEN is not set 318# CONFIG_NET_PKTGEN is not set
303# CONFIG_HAMRADIO is not set 319# CONFIG_HAMRADIO is not set
320# CONFIG_CAN is not set
304# CONFIG_IRDA is not set 321# CONFIG_IRDA is not set
305# CONFIG_BT is not set 322# CONFIG_BT is not set
306# CONFIG_AF_RXRPC is not set 323# CONFIG_AF_RXRPC is not set
@@ -407,6 +424,7 @@ CONFIG_OF_DEVICE=y
407# CONFIG_PARPORT is not set 424# CONFIG_PARPORT is not set
408# CONFIG_BLK_DEV is not set 425# CONFIG_BLK_DEV is not set
409# CONFIG_MISC_DEVICES is not set 426# CONFIG_MISC_DEVICES is not set
427CONFIG_HAVE_IDE=y
410# CONFIG_IDE is not set 428# CONFIG_IDE is not set
411 429
412# 430#
@@ -441,6 +459,7 @@ CONFIG_LXT_PHY=y
441# CONFIG_SMSC_PHY is not set 459# CONFIG_SMSC_PHY is not set
442# CONFIG_BROADCOM_PHY is not set 460# CONFIG_BROADCOM_PHY is not set
443# CONFIG_ICPLUS_PHY is not set 461# CONFIG_ICPLUS_PHY is not set
462# CONFIG_REALTEK_PHY is not set
444# CONFIG_FIXED_PHY is not set 463# CONFIG_FIXED_PHY is not set
445# CONFIG_MDIO_BITBANG is not set 464# CONFIG_MDIO_BITBANG is not set
446CONFIG_NET_ETHERNET=y 465CONFIG_NET_ETHERNET=y
@@ -465,7 +484,6 @@ CONFIG_FS_ENET_MDIO_FEC=y
465# CONFIG_WAN is not set 484# CONFIG_WAN is not set
466# CONFIG_PPP is not set 485# CONFIG_PPP is not set
467# CONFIG_SLIP is not set 486# CONFIG_SLIP is not set
468# CONFIG_SHAPER is not set
469# CONFIG_NETCONSOLE is not set 487# CONFIG_NETCONSOLE is not set
470# CONFIG_NETPOLL is not set 488# CONFIG_NETPOLL is not set
471# CONFIG_NET_POLL_CONTROLLER is not set 489# CONFIG_NET_POLL_CONTROLLER is not set
@@ -528,6 +546,7 @@ CONFIG_GEN_RTC=y
528# CONFIG_W1 is not set 546# CONFIG_W1 is not set
529# CONFIG_POWER_SUPPLY is not set 547# CONFIG_POWER_SUPPLY is not set
530# CONFIG_HWMON is not set 548# CONFIG_HWMON is not set
549# CONFIG_THERMAL is not set
531# CONFIG_WATCHDOG is not set 550# CONFIG_WATCHDOG is not set
532 551
533# 552#
@@ -567,9 +586,11 @@ CONFIG_DAB=y
567# CONFIG_SOUND is not set 586# CONFIG_SOUND is not set
568# CONFIG_USB_SUPPORT is not set 587# CONFIG_USB_SUPPORT is not set
569# CONFIG_MMC is not set 588# CONFIG_MMC is not set
589# CONFIG_MEMSTICK is not set
570# CONFIG_NEW_LEDS is not set 590# CONFIG_NEW_LEDS is not set
571# CONFIG_EDAC is not set 591# CONFIG_EDAC is not set
572# CONFIG_RTC_CLASS is not set 592# CONFIG_RTC_CLASS is not set
593# CONFIG_DMADEVICES is not set
573 594
574# 595#
575# Userspace I/O 596# Userspace I/O
@@ -588,11 +609,9 @@ CONFIG_DAB=y
588# CONFIG_XFS_FS is not set 609# CONFIG_XFS_FS is not set
589# CONFIG_GFS2_FS is not set 610# CONFIG_GFS2_FS is not set
590# CONFIG_OCFS2_FS is not set 611# CONFIG_OCFS2_FS is not set
591# CONFIG_MINIX_FS is not set 612# CONFIG_DNOTIFY is not set
592# CONFIG_ROMFS_FS is not set
593# CONFIG_INOTIFY is not set 613# CONFIG_INOTIFY is not set
594# CONFIG_QUOTA is not set 614# CONFIG_QUOTA is not set
595# CONFIG_DNOTIFY is not set
596# CONFIG_AUTOFS_FS is not set 615# CONFIG_AUTOFS_FS is not set
597# CONFIG_AUTOFS4_FS is not set 616# CONFIG_AUTOFS4_FS is not set
598# CONFIG_FUSE_FS is not set 617# CONFIG_FUSE_FS is not set
@@ -635,8 +654,10 @@ CONFIG_TMPFS=y
635# CONFIG_JFFS2_FS is not set 654# CONFIG_JFFS2_FS is not set
636CONFIG_CRAMFS=y 655CONFIG_CRAMFS=y
637# CONFIG_VXFS_FS is not set 656# CONFIG_VXFS_FS is not set
657# CONFIG_MINIX_FS is not set
638# CONFIG_HPFS_FS is not set 658# CONFIG_HPFS_FS is not set
639# CONFIG_QNX4FS_FS is not set 659# CONFIG_QNX4FS_FS is not set
660# CONFIG_ROMFS_FS is not set
640# CONFIG_SYSV_FS is not set 661# CONFIG_SYSV_FS is not set
641# CONFIG_UFS_FS is not set 662# CONFIG_UFS_FS is not set
642CONFIG_NETWORK_FILESYSTEMS=y 663CONFIG_NETWORK_FILESYSTEMS=y
@@ -683,7 +704,6 @@ CONFIG_MSDOS_PARTITION=y
683# CONFIG_SYSV68_PARTITION is not set 704# CONFIG_SYSV68_PARTITION is not set
684# CONFIG_NLS is not set 705# CONFIG_NLS is not set
685# CONFIG_DLM is not set 706# CONFIG_DLM is not set
686# CONFIG_UCC_SLOW is not set
687 707
688# 708#
689# Library routines 709# Library routines
@@ -698,7 +718,6 @@ CONFIG_ZLIB_INFLATE=y
698CONFIG_HAS_IOMEM=y 718CONFIG_HAS_IOMEM=y
699CONFIG_HAS_IOPORT=y 719CONFIG_HAS_IOPORT=y
700CONFIG_HAS_DMA=y 720CONFIG_HAS_DMA=y
701# CONFIG_INSTRUMENTATION is not set
702 721
703# 722#
704# Kernel hacking 723# Kernel hacking
@@ -717,6 +736,7 @@ CONFIG_SCHED_DEBUG=y
717# CONFIG_SCHEDSTATS is not set 736# CONFIG_SCHEDSTATS is not set
718# CONFIG_TIMER_STATS is not set 737# CONFIG_TIMER_STATS is not set
719# CONFIG_SLUB_DEBUG_ON is not set 738# CONFIG_SLUB_DEBUG_ON is not set
739# CONFIG_SLUB_STATS is not set
720# CONFIG_DEBUG_SPINLOCK is not set 740# CONFIG_DEBUG_SPINLOCK is not set
721# CONFIG_DEBUG_MUTEXES is not set 741# CONFIG_DEBUG_MUTEXES is not set
722# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 742# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
@@ -727,8 +747,8 @@ CONFIG_DEBUG_INFO=y
727# CONFIG_DEBUG_VM is not set 747# CONFIG_DEBUG_VM is not set
728# CONFIG_DEBUG_LIST is not set 748# CONFIG_DEBUG_LIST is not set
729# CONFIG_DEBUG_SG is not set 749# CONFIG_DEBUG_SG is not set
730CONFIG_FORCED_INLINING=y
731# CONFIG_BOOT_PRINTK_DELAY is not set 750# CONFIG_BOOT_PRINTK_DELAY is not set
751# CONFIG_BACKTRACE_SELF_TEST is not set
732# CONFIG_FAULT_INJECTION is not set 752# CONFIG_FAULT_INJECTION is not set
733# CONFIG_SAMPLES is not set 753# CONFIG_SAMPLES is not set
734# CONFIG_DEBUG_STACKOVERFLOW is not set 754# CONFIG_DEBUG_STACKOVERFLOW is not set
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index 3673dd23120c..0f82f66a60f8 100644
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:15 2007 4# Thu Mar 20 10:36:41 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -27,6 +27,7 @@ CONFIG_GENERIC_TIME=y
27CONFIG_GENERIC_TIME_VSYSCALL=y 27CONFIG_GENERIC_TIME_VSYSCALL=y
28CONFIG_GENERIC_CLOCKEVENTS=y 28CONFIG_GENERIC_CLOCKEVENTS=y
29CONFIG_GENERIC_HARDIRQS=y 29CONFIG_GENERIC_HARDIRQS=y
30CONFIG_HAVE_SETUP_PER_CPU_AREA=y
30CONFIG_IRQ_PER_CPU=y 31CONFIG_IRQ_PER_CPU=y
31CONFIG_RWSEM_XCHGADD_ALGORITHM=y 32CONFIG_RWSEM_XCHGADD_ALGORITHM=y
32CONFIG_ARCH_HAS_ILOG2_U32=y 33CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -48,7 +49,9 @@ CONFIG_GENERIC_TBSYNC=y
48CONFIG_AUDIT_ARCH=y 49CONFIG_AUDIT_ARCH=y
49CONFIG_GENERIC_BUG=y 50CONFIG_GENERIC_BUG=y
50# CONFIG_DEFAULT_UIMAGE is not set 51# CONFIG_DEFAULT_UIMAGE is not set
51CONFIG_PPC64_SWSUSP=y 52CONFIG_HIBERNATE_64=y
53CONFIG_ARCH_HIBERNATION_POSSIBLE=y
54CONFIG_ARCH_SUSPEND_POSSIBLE=y
52# CONFIG_PPC_DCR_NATIVE is not set 55# CONFIG_PPC_DCR_NATIVE is not set
53# CONFIG_PPC_DCR_MMIO is not set 56# CONFIG_PPC_DCR_MMIO is not set
54# CONFIG_PPC_OF_PLATFORM_PCI is not set 57# CONFIG_PPC_OF_PLATFORM_PCI is not set
@@ -68,18 +71,22 @@ CONFIG_SYSVIPC_SYSCTL=y
68CONFIG_POSIX_MQUEUE=y 71CONFIG_POSIX_MQUEUE=y
69# CONFIG_BSD_PROCESS_ACCT is not set 72# CONFIG_BSD_PROCESS_ACCT is not set
70# CONFIG_TASKSTATS is not set 73# 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 74# CONFIG_AUDIT is not set
74CONFIG_IKCONFIG=y 75CONFIG_IKCONFIG=y
75CONFIG_IKCONFIG_PROC=y 76CONFIG_IKCONFIG_PROC=y
76CONFIG_LOG_BUF_SHIFT=17 77CONFIG_LOG_BUF_SHIFT=17
77# CONFIG_CGROUPS is not set 78# CONFIG_CGROUPS is not set
78CONFIG_FAIR_GROUP_SCHED=y 79# CONFIG_GROUP_SCHED is not set
79CONFIG_FAIR_USER_SCHED=y 80# CONFIG_USER_SCHED is not set
80# CONFIG_FAIR_CGROUP_SCHED is not set 81# CONFIG_CGROUP_SCHED is not set
81CONFIG_SYSFS_DEPRECATED=y 82CONFIG_SYSFS_DEPRECATED=y
83CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 84# CONFIG_RELAY is not set
85CONFIG_NAMESPACES=y
86# CONFIG_UTS_NS is not set
87# CONFIG_IPC_NS is not set
88# CONFIG_USER_NS is not set
89# CONFIG_PID_NS is not set
83CONFIG_BLK_DEV_INITRD=y 90CONFIG_BLK_DEV_INITRD=y
84CONFIG_INITRAMFS_SOURCE="" 91CONFIG_INITRAMFS_SOURCE=""
85CONFIG_CC_OPTIMIZE_FOR_SIZE=y 92CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -93,11 +100,13 @@ CONFIG_HOTPLUG=y
93CONFIG_PRINTK=y 100CONFIG_PRINTK=y
94CONFIG_BUG=y 101CONFIG_BUG=y
95CONFIG_ELF_CORE=y 102CONFIG_ELF_CORE=y
103# CONFIG_COMPAT_BRK is not set
96CONFIG_BASE_FULL=y 104CONFIG_BASE_FULL=y
97CONFIG_FUTEX=y 105CONFIG_FUTEX=y
98CONFIG_ANON_INODES=y 106CONFIG_ANON_INODES=y
99CONFIG_EPOLL=y 107CONFIG_EPOLL=y
100CONFIG_SIGNALFD=y 108CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y
101CONFIG_EVENTFD=y 110CONFIG_EVENTFD=y
102CONFIG_SHMEM=y 111CONFIG_SHMEM=y
103CONFIG_VM_EVENT_COUNTERS=y 112CONFIG_VM_EVENT_COUNTERS=y
@@ -105,6 +114,15 @@ CONFIG_SLUB_DEBUG=y
105# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
106CONFIG_SLUB=y 115CONFIG_SLUB=y
107# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
117CONFIG_PROFILING=y
118# CONFIG_MARKERS is not set
119CONFIG_OPROFILE=y
120CONFIG_HAVE_OPROFILE=y
121# CONFIG_KPROBES is not set
122CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y
124CONFIG_PROC_PAGE_MONITOR=y
125CONFIG_SLABINFO=y
108CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
109# CONFIG_TINY_SHMEM is not set 127# CONFIG_TINY_SHMEM is not set
110CONFIG_BASE_SMALL=0 128CONFIG_BASE_SMALL=0
@@ -132,6 +150,7 @@ CONFIG_DEFAULT_AS=y
132# CONFIG_DEFAULT_CFQ is not set 150# CONFIG_DEFAULT_CFQ is not set
133# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
134CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y
135 154
136# 155#
137# Platform support 156# Platform support
@@ -142,8 +161,8 @@ CONFIG_PPC_MULTIPLATFORM=y
142# CONFIG_PPC_86xx is not set 161# CONFIG_PPC_86xx is not set
143# CONFIG_PPC_PSERIES is not set 162# CONFIG_PPC_PSERIES is not set
144# CONFIG_PPC_ISERIES is not set 163# CONFIG_PPC_ISERIES is not set
145# CONFIG_PPC_MPC52xx is not set 164# CONFIG_PPC_MPC512x is not set
146# CONFIG_PPC_MPC5200 is not set 165# CONFIG_PPC_MPC5121 is not set
147CONFIG_PPC_PMAC=y 166CONFIG_PPC_PMAC=y
148CONFIG_PPC_PMAC64=y 167CONFIG_PPC_PMAC64=y
149# CONFIG_PPC_MAPLE is not set 168# CONFIG_PPC_MAPLE is not set
@@ -155,6 +174,7 @@ CONFIG_PPC_PMAC64=y
155# CONFIG_PPC_IBM_CELL_BLADE is not set 174# CONFIG_PPC_IBM_CELL_BLADE is not set
156# CONFIG_PQ2ADS is not set 175# CONFIG_PQ2ADS is not set
157CONFIG_PPC_NATIVE=y 176CONFIG_PPC_NATIVE=y
177# CONFIG_IPIC is not set
158CONFIG_MPIC=y 178CONFIG_MPIC=y
159# CONFIG_MPIC_WEIRD is not set 179# CONFIG_MPIC_WEIRD is not set
160# CONFIG_PPC_I8259 is not set 180# CONFIG_PPC_I8259 is not set
@@ -185,7 +205,6 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
185# CPU Frequency drivers 205# CPU Frequency drivers
186# 206#
187CONFIG_CPU_FREQ_PMAC64=y 207CONFIG_CPU_FREQ_PMAC64=y
188# CONFIG_CPM2 is not set
189# CONFIG_FSL_ULI1575 is not set 208# CONFIG_FSL_ULI1575 is not set
190 209
191# 210#
@@ -200,17 +219,21 @@ CONFIG_HZ_250=y
200# CONFIG_HZ_300 is not set 219# CONFIG_HZ_300 is not set
201# CONFIG_HZ_1000 is not set 220# CONFIG_HZ_1000 is not set
202CONFIG_HZ=250 221CONFIG_HZ=250
222# CONFIG_SCHED_HRTICK is not set
203CONFIG_PREEMPT_NONE=y 223CONFIG_PREEMPT_NONE=y
204# CONFIG_PREEMPT_VOLUNTARY is not set 224# CONFIG_PREEMPT_VOLUNTARY is not set
205# CONFIG_PREEMPT is not set 225# CONFIG_PREEMPT is not set
206# CONFIG_PREEMPT_BKL is not set
207CONFIG_BINFMT_ELF=y 226CONFIG_BINFMT_ELF=y
227CONFIG_COMPAT_BINFMT_ELF=y
208# CONFIG_BINFMT_MISC is not set 228# CONFIG_BINFMT_MISC is not set
209CONFIG_FORCE_MAX_ZONEORDER=13 229CONFIG_FORCE_MAX_ZONEORDER=13
210CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y 230CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
211CONFIG_IOMMU_VMERGE=y 231CONFIG_IOMMU_VMERGE=y
232CONFIG_IOMMU_HELPER=y
212# CONFIG_HOTPLUG_CPU is not set 233# CONFIG_HOTPLUG_CPU is not set
213CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 234CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
235CONFIG_ARCH_HAS_WALK_MEMORY=y
236CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
214CONFIG_KEXEC=y 237CONFIG_KEXEC=y
215# CONFIG_CRASH_DUMP is not set 238# CONFIG_CRASH_DUMP is not set
216CONFIG_IRQ_ALL_CPUS=y 239CONFIG_IRQ_ALL_CPUS=y
@@ -236,11 +259,9 @@ CONFIG_BOUNCE=y
236# CONFIG_SCHED_SMT is not set 259# CONFIG_SCHED_SMT is not set
237CONFIG_PROC_DEVICETREE=y 260CONFIG_PROC_DEVICETREE=y
238# CONFIG_CMDLINE_BOOL is not set 261# CONFIG_CMDLINE_BOOL is not set
262CONFIG_ARCH_WANTS_FREEZER_CONTROL=y
239# CONFIG_PM is not set 263# CONFIG_PM is not set
240CONFIG_SUSPEND_SMP_POSSIBLE=y
241CONFIG_HIBERNATION_SMP_POSSIBLE=y
242CONFIG_SECCOMP=y 264CONFIG_SECCOMP=y
243# CONFIG_WANT_DEVICE_TREE is not set
244CONFIG_ISA_DMA_API=y 265CONFIG_ISA_DMA_API=y
245 266
246# 267#
@@ -276,6 +297,7 @@ CONFIG_XFRM=y
276CONFIG_XFRM_USER=m 297CONFIG_XFRM_USER=m
277# CONFIG_XFRM_SUB_POLICY is not set 298# CONFIG_XFRM_SUB_POLICY is not set
278# CONFIG_XFRM_MIGRATE is not set 299# CONFIG_XFRM_MIGRATE is not set
300# CONFIG_XFRM_STATISTICS is not set
279CONFIG_NET_KEY=m 301CONFIG_NET_KEY=m
280# CONFIG_NET_KEY_MIGRATE is not set 302# CONFIG_NET_KEY_MIGRATE is not set
281CONFIG_INET=y 303CONFIG_INET=y
@@ -310,12 +332,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
310# CONFIG_NETWORK_SECMARK is not set 332# CONFIG_NETWORK_SECMARK is not set
311CONFIG_NETFILTER=y 333CONFIG_NETFILTER=y
312# CONFIG_NETFILTER_DEBUG is not set 334# CONFIG_NETFILTER_DEBUG is not set
335CONFIG_NETFILTER_ADVANCED=y
313 336
314# 337#
315# Core Netfilter Configuration 338# Core Netfilter Configuration
316# 339#
317# CONFIG_NETFILTER_NETLINK is not set 340CONFIG_NETFILTER_NETLINK=m
318CONFIG_NF_CONNTRACK_ENABLED=m 341CONFIG_NETFILTER_NETLINK_QUEUE=m
342CONFIG_NETFILTER_NETLINK_LOG=m
319CONFIG_NF_CONNTRACK=m 343CONFIG_NF_CONNTRACK=m
320# CONFIG_NF_CT_ACCT is not set 344# CONFIG_NF_CT_ACCT is not set
321CONFIG_NF_CONNTRACK_MARK=y 345CONFIG_NF_CONNTRACK_MARK=y
@@ -331,6 +355,7 @@ CONFIG_NF_CONNTRACK_IRC=m
331# CONFIG_NF_CONNTRACK_SANE is not set 355# CONFIG_NF_CONNTRACK_SANE is not set
332# CONFIG_NF_CONNTRACK_SIP is not set 356# CONFIG_NF_CONNTRACK_SIP is not set
333CONFIG_NF_CONNTRACK_TFTP=m 357CONFIG_NF_CONNTRACK_TFTP=m
358CONFIG_NF_CT_NETLINK=m
334# CONFIG_NETFILTER_XTABLES is not set 359# CONFIG_NETFILTER_XTABLES is not set
335 360
336# 361#
@@ -363,6 +388,7 @@ CONFIG_LLC=y
363# 388#
364# CONFIG_NET_PKTGEN is not set 389# CONFIG_NET_PKTGEN is not set
365# CONFIG_HAMRADIO is not set 390# CONFIG_HAMRADIO is not set
391# CONFIG_CAN is not set
366# CONFIG_IRDA is not set 392# CONFIG_IRDA is not set
367# CONFIG_BT is not set 393# CONFIG_BT is not set
368# CONFIG_AF_RXRPC is not set 394# CONFIG_AF_RXRPC is not set
@@ -409,7 +435,7 @@ CONFIG_BLK_DEV_NBD=m
409CONFIG_BLK_DEV_RAM=y 435CONFIG_BLK_DEV_RAM=y
410CONFIG_BLK_DEV_RAM_COUNT=16 436CONFIG_BLK_DEV_RAM_COUNT=16
411CONFIG_BLK_DEV_RAM_SIZE=65536 437CONFIG_BLK_DEV_RAM_SIZE=65536
412CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 438# CONFIG_BLK_DEV_XIP is not set
413CONFIG_CDROM_PKTCDVD=m 439CONFIG_CDROM_PKTCDVD=m
414CONFIG_CDROM_PKTCDVD_BUFFERS=8 440CONFIG_CDROM_PKTCDVD_BUFFERS=8
415# CONFIG_CDROM_PKTCDVD_WCACHE is not set 441# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -419,16 +445,19 @@ CONFIG_MISC_DEVICES=y
419# CONFIG_EEPROM_93CX6 is not set 445# CONFIG_EEPROM_93CX6 is not set
420# CONFIG_SGI_IOC4 is not set 446# CONFIG_SGI_IOC4 is not set
421# CONFIG_TIFM_CORE is not set 447# CONFIG_TIFM_CORE is not set
448# CONFIG_ENCLOSURE_SERVICES is not set
449CONFIG_HAVE_IDE=y
422CONFIG_IDE=y 450CONFIG_IDE=y
423CONFIG_BLK_DEV_IDE=y 451CONFIG_BLK_DEV_IDE=y
424 452
425# 453#
426# Please see Documentation/ide.txt for help/info on IDE drives 454# Please see Documentation/ide/ide.txt for help/info on IDE drives
427# 455#
428# CONFIG_BLK_DEV_IDE_SATA is not set 456# CONFIG_BLK_DEV_IDE_SATA is not set
429CONFIG_BLK_DEV_IDEDISK=y 457CONFIG_BLK_DEV_IDEDISK=y
430# CONFIG_IDEDISK_MULTI_MODE is not set 458# CONFIG_IDEDISK_MULTI_MODE is not set
431CONFIG_BLK_DEV_IDECD=y 459CONFIG_BLK_DEV_IDECD=y
460CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
432# CONFIG_BLK_DEV_IDETAPE is not set 461# CONFIG_BLK_DEV_IDETAPE is not set
433# CONFIG_BLK_DEV_IDEFLOPPY is not set 462# CONFIG_BLK_DEV_IDEFLOPPY is not set
434# CONFIG_BLK_DEV_IDESCSI is not set 463# CONFIG_BLK_DEV_IDESCSI is not set
@@ -440,12 +469,12 @@ CONFIG_IDE_PROC_FS=y
440# 469#
441CONFIG_IDE_GENERIC=y 470CONFIG_IDE_GENERIC=y
442# CONFIG_BLK_DEV_PLATFORM is not set 471# CONFIG_BLK_DEV_PLATFORM is not set
472CONFIG_BLK_DEV_IDEDMA_SFF=y
443 473
444# 474#
445# PCI IDE chipsets support 475# PCI IDE chipsets support
446# 476#
447CONFIG_BLK_DEV_IDEPCI=y 477CONFIG_BLK_DEV_IDEPCI=y
448# CONFIG_IDEPCI_SHARE_IRQ is not set
449CONFIG_IDEPCI_PCIBUS_ORDER=y 478CONFIG_IDEPCI_PCIBUS_ORDER=y
450# CONFIG_BLK_DEV_GENERIC is not set 479# CONFIG_BLK_DEV_GENERIC is not set
451# CONFIG_BLK_DEV_OPTI621 is not set 480# CONFIG_BLK_DEV_OPTI621 is not set
@@ -478,7 +507,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
478CONFIG_BLK_DEV_IDE_PMAC=y 507CONFIG_BLK_DEV_IDE_PMAC=y
479CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y 508CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
480CONFIG_BLK_DEV_IDEDMA_PMAC=y 509CONFIG_BLK_DEV_IDEDMA_PMAC=y
481# CONFIG_IDE_ARM is not set
482CONFIG_BLK_DEV_IDEDMA=y 510CONFIG_BLK_DEV_IDEDMA=y
483CONFIG_IDE_ARCH_OBSOLETE_INIT=y 511CONFIG_IDE_ARCH_OBSOLETE_INIT=y
484# CONFIG_BLK_DEV_HD is not set 512# CONFIG_BLK_DEV_HD is not set
@@ -544,6 +572,7 @@ CONFIG_SCSI_LOWLEVEL=y
544# CONFIG_SCSI_IPS is not set 572# CONFIG_SCSI_IPS is not set
545# CONFIG_SCSI_INITIO is not set 573# CONFIG_SCSI_INITIO is not set
546# CONFIG_SCSI_INIA100 is not set 574# CONFIG_SCSI_INIA100 is not set
575# CONFIG_SCSI_MVSAS is not set
547# CONFIG_SCSI_STEX is not set 576# CONFIG_SCSI_STEX is not set
548# CONFIG_SCSI_SYM53C8XX_2 is not set 577# CONFIG_SCSI_SYM53C8XX_2 is not set
549# CONFIG_SCSI_IPR is not set 578# CONFIG_SCSI_IPR is not set
@@ -596,6 +625,7 @@ CONFIG_SATA_SVW=y
596# CONFIG_PATA_MPIIX is not set 625# CONFIG_PATA_MPIIX is not set
597# CONFIG_PATA_OLDPIIX is not set 626# CONFIG_PATA_OLDPIIX is not set
598# CONFIG_PATA_NETCELL is not set 627# CONFIG_PATA_NETCELL is not set
628# CONFIG_PATA_NINJA32 is not set
599# CONFIG_PATA_NS87410 is not set 629# CONFIG_PATA_NS87410 is not set
600# CONFIG_PATA_NS87415 is not set 630# CONFIG_PATA_NS87415 is not set
601# CONFIG_PATA_OPTI is not set 631# CONFIG_PATA_OPTI is not set
@@ -610,6 +640,7 @@ CONFIG_SATA_SVW=y
610# CONFIG_PATA_SIS is not set 640# CONFIG_PATA_SIS is not set
611# CONFIG_PATA_VIA is not set 641# CONFIG_PATA_VIA is not set
612# CONFIG_PATA_WINBOND is not set 642# CONFIG_PATA_WINBOND is not set
643# CONFIG_PATA_PLATFORM is not set
613CONFIG_MD=y 644CONFIG_MD=y
614CONFIG_BLK_DEV_MD=y 645CONFIG_BLK_DEV_MD=y
615CONFIG_MD_LINEAR=y 646CONFIG_MD_LINEAR=y
@@ -676,7 +707,6 @@ CONFIG_BONDING=m
676# CONFIG_EQUALIZER is not set 707# CONFIG_EQUALIZER is not set
677CONFIG_TUN=m 708CONFIG_TUN=m
678# CONFIG_VETH is not set 709# CONFIG_VETH is not set
679# CONFIG_IP1000 is not set
680# CONFIG_ARCNET is not set 710# CONFIG_ARCNET is not set
681# CONFIG_PHYLIB is not set 711# CONFIG_PHYLIB is not set
682CONFIG_NET_ETHERNET=y 712CONFIG_NET_ETHERNET=y
@@ -701,6 +731,9 @@ CONFIG_E1000=y
701# CONFIG_E1000_NAPI is not set 731# CONFIG_E1000_NAPI is not set
702# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 732# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
703# CONFIG_E1000E is not set 733# CONFIG_E1000E is not set
734# CONFIG_E1000E_ENABLED is not set
735# CONFIG_IP1000 is not set
736# CONFIG_IGB is not set
704# CONFIG_NS83820 is not set 737# CONFIG_NS83820 is not set
705# CONFIG_HAMACHI is not set 738# CONFIG_HAMACHI is not set
706# CONFIG_YELLOWFIN is not set 739# CONFIG_YELLOWFIN is not set
@@ -726,6 +759,7 @@ CONFIG_NETDEV_10000=y
726# CONFIG_PASEMI_MAC is not set 759# CONFIG_PASEMI_MAC is not set
727# CONFIG_MLX4_CORE is not set 760# CONFIG_MLX4_CORE is not set
728# CONFIG_TEHUTI is not set 761# CONFIG_TEHUTI is not set
762# CONFIG_BNX2X is not set
729CONFIG_TR=y 763CONFIG_TR=y
730CONFIG_IBMOL=y 764CONFIG_IBMOL=y
731# CONFIG_3C359 is not set 765# CONFIG_3C359 is not set
@@ -771,7 +805,6 @@ CONFIG_PPPOE=m
771# CONFIG_SLIP is not set 805# CONFIG_SLIP is not set
772CONFIG_SLHC=m 806CONFIG_SLHC=m
773# CONFIG_NET_FC is not set 807# CONFIG_NET_FC is not set
774# CONFIG_SHAPER is not set
775# CONFIG_NETCONSOLE is not set 808# CONFIG_NETCONSOLE is not set
776# CONFIG_NETPOLL is not set 809# CONFIG_NETPOLL is not set
777# CONFIG_NET_POLL_CONTROLLER is not set 810# CONFIG_NET_POLL_CONTROLLER is not set
@@ -834,6 +867,7 @@ CONFIG_VT_CONSOLE=y
834CONFIG_HW_CONSOLE=y 867CONFIG_HW_CONSOLE=y
835# CONFIG_VT_HW_CONSOLE_BINDING is not set 868# CONFIG_VT_HW_CONSOLE_BINDING is not set
836# CONFIG_SERIAL_NONSTANDARD is not set 869# CONFIG_SERIAL_NONSTANDARD is not set
870# CONFIG_NOZOMI is not set
837 871
838# 872#
839# Serial drivers 873# Serial drivers
@@ -901,13 +935,12 @@ CONFIG_I2C_POWERMAC=y
901# 935#
902# Miscellaneous I2C Chip support 936# Miscellaneous I2C Chip support
903# 937#
904# CONFIG_SENSORS_DS1337 is not set
905# CONFIG_SENSORS_DS1374 is not set
906# CONFIG_DS1682 is not set 938# CONFIG_DS1682 is not set
907# CONFIG_SENSORS_EEPROM is not set 939# CONFIG_SENSORS_EEPROM is not set
908# CONFIG_SENSORS_PCF8574 is not set 940# CONFIG_SENSORS_PCF8574 is not set
909# CONFIG_SENSORS_PCA9539 is not set 941# CONFIG_PCF8575 is not set
910# CONFIG_SENSORS_PCF8591 is not set 942# CONFIG_SENSORS_PCF8591 is not set
943# CONFIG_TPS65010 is not set
911# CONFIG_SENSORS_MAX6875 is not set 944# CONFIG_SENSORS_MAX6875 is not set
912# CONFIG_SENSORS_TSL2550 is not set 945# CONFIG_SENSORS_TSL2550 is not set
913# CONFIG_I2C_DEBUG_CORE is not set 946# CONFIG_I2C_DEBUG_CORE is not set
@@ -923,6 +956,7 @@ CONFIG_I2C_POWERMAC=y
923# CONFIG_W1 is not set 956# CONFIG_W1 is not set
924# CONFIG_POWER_SUPPLY is not set 957# CONFIG_POWER_SUPPLY is not set
925# CONFIG_HWMON is not set 958# CONFIG_HWMON is not set
959# CONFIG_THERMAL is not set
926# CONFIG_WATCHDOG is not set 960# CONFIG_WATCHDOG is not set
927 961
928# 962#
@@ -1083,6 +1117,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
1083# CONFIG_SND_BT87X is not set 1117# CONFIG_SND_BT87X is not set
1084# CONFIG_SND_CA0106 is not set 1118# CONFIG_SND_CA0106 is not set
1085# CONFIG_SND_CMIPCI is not set 1119# CONFIG_SND_CMIPCI is not set
1120# CONFIG_SND_OXYGEN is not set
1086# CONFIG_SND_CS4281 is not set 1121# CONFIG_SND_CS4281 is not set
1087# CONFIG_SND_CS46XX is not set 1122# CONFIG_SND_CS46XX is not set
1088# CONFIG_SND_CS5530 is not set 1123# CONFIG_SND_CS5530 is not set
@@ -1108,6 +1143,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
1108# CONFIG_SND_HDA_INTEL is not set 1143# CONFIG_SND_HDA_INTEL is not set
1109# CONFIG_SND_HDSP is not set 1144# CONFIG_SND_HDSP is not set
1110# CONFIG_SND_HDSPM is not set 1145# CONFIG_SND_HDSPM is not set
1146# CONFIG_SND_HIFIER is not set
1111# CONFIG_SND_ICE1712 is not set 1147# CONFIG_SND_ICE1712 is not set
1112# CONFIG_SND_ICE1724 is not set 1148# CONFIG_SND_ICE1724 is not set
1113# CONFIG_SND_INTEL8X0 is not set 1149# CONFIG_SND_INTEL8X0 is not set
@@ -1125,6 +1161,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
1125# CONFIG_SND_TRIDENT is not set 1161# CONFIG_SND_TRIDENT is not set
1126# CONFIG_SND_VIA82XX is not set 1162# CONFIG_SND_VIA82XX is not set
1127# CONFIG_SND_VIA82XX_MODEM is not set 1163# CONFIG_SND_VIA82XX_MODEM is not set
1164# CONFIG_SND_VIRTUOSO is not set
1128# CONFIG_SND_VX222 is not set 1165# CONFIG_SND_VX222 is not set
1129# CONFIG_SND_YMFPCI is not set 1166# CONFIG_SND_YMFPCI is not set
1130 1167
@@ -1166,6 +1203,10 @@ CONFIG_SND_USB_AUDIO=m
1166# 1203#
1167 1204
1168# 1205#
1206# ALSA SoC audio for Freescale SOCs
1207#
1208
1209#
1169# Open Sound System 1210# Open Sound System
1170# 1211#
1171# CONFIG_SOUND_PRIME is not set 1212# CONFIG_SOUND_PRIME is not set
@@ -1192,6 +1233,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
1192CONFIG_USB_ARCH_HAS_EHCI=y 1233CONFIG_USB_ARCH_HAS_EHCI=y
1193CONFIG_USB=y 1234CONFIG_USB=y
1194# CONFIG_USB_DEBUG is not set 1235# CONFIG_USB_DEBUG is not set
1236# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1195 1237
1196# 1238#
1197# Miscellaneous USB options 1239# Miscellaneous USB options
@@ -1205,9 +1247,9 @@ CONFIG_USB_DEVICE_CLASS=y
1205# USB Host Controller Drivers 1247# USB Host Controller Drivers
1206# 1248#
1207CONFIG_USB_EHCI_HCD=y 1249CONFIG_USB_EHCI_HCD=y
1208# CONFIG_USB_EHCI_SPLIT_ISO is not set
1209# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1250# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1210# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1251# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1252# CONFIG_USB_EHCI_HCD_PPC_OF is not set
1211# CONFIG_USB_ISP116X_HCD is not set 1253# CONFIG_USB_ISP116X_HCD is not set
1212CONFIG_USB_OHCI_HCD=y 1254CONFIG_USB_OHCI_HCD=y
1213CONFIG_USB_OHCI_HCD_PPC_OF=y 1255CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -1259,11 +1301,8 @@ CONFIG_USB_MON=y
1259# 1301#
1260# USB port drivers 1302# USB port drivers
1261# 1303#
1262
1263#
1264# USB Serial Converter support
1265#
1266CONFIG_USB_SERIAL=m 1304CONFIG_USB_SERIAL=m
1305CONFIG_USB_EZUSB=y
1267CONFIG_USB_SERIAL_GENERIC=y 1306CONFIG_USB_SERIAL_GENERIC=y
1268# CONFIG_USB_SERIAL_AIRCABLE is not set 1307# CONFIG_USB_SERIAL_AIRCABLE is not set
1269# CONFIG_USB_SERIAL_AIRPRIME is not set 1308# CONFIG_USB_SERIAL_AIRPRIME is not set
@@ -1284,6 +1323,7 @@ CONFIG_USB_SERIAL_EDGEPORT=m
1284CONFIG_USB_SERIAL_EDGEPORT_TI=m 1323CONFIG_USB_SERIAL_EDGEPORT_TI=m
1285CONFIG_USB_SERIAL_GARMIN=m 1324CONFIG_USB_SERIAL_GARMIN=m
1286CONFIG_USB_SERIAL_IPW=m 1325CONFIG_USB_SERIAL_IPW=m
1326# CONFIG_USB_SERIAL_IUU is not set
1287CONFIG_USB_SERIAL_KEYSPAN_PDA=m 1327CONFIG_USB_SERIAL_KEYSPAN_PDA=m
1288CONFIG_USB_SERIAL_KEYSPAN=m 1328CONFIG_USB_SERIAL_KEYSPAN=m
1289CONFIG_USB_SERIAL_KEYSPAN_MPR=y 1329CONFIG_USB_SERIAL_KEYSPAN_MPR=y
@@ -1316,7 +1356,6 @@ CONFIG_USB_SERIAL_XIRCOM=m
1316# CONFIG_USB_SERIAL_OPTION is not set 1356# CONFIG_USB_SERIAL_OPTION is not set
1317CONFIG_USB_SERIAL_OMNINET=m 1357CONFIG_USB_SERIAL_OMNINET=m
1318# CONFIG_USB_SERIAL_DEBUG is not set 1358# CONFIG_USB_SERIAL_DEBUG is not set
1319CONFIG_USB_EZUSB=y
1320 1359
1321# 1360#
1322# USB Miscellaneous drivers 1361# USB Miscellaneous drivers
@@ -1341,20 +1380,14 @@ CONFIG_USB_APPLEDISPLAY=m
1341# CONFIG_USB_TRANCEVIBRATOR is not set 1380# CONFIG_USB_TRANCEVIBRATOR is not set
1342# CONFIG_USB_IOWARRIOR is not set 1381# CONFIG_USB_IOWARRIOR is not set
1343# CONFIG_USB_TEST is not set 1382# CONFIG_USB_TEST is not set
1344
1345#
1346# USB DSL modem support
1347#
1348
1349#
1350# USB Gadget Support
1351#
1352# CONFIG_USB_GADGET is not set 1383# CONFIG_USB_GADGET is not set
1353# CONFIG_MMC is not set 1384# CONFIG_MMC is not set
1385# CONFIG_MEMSTICK is not set
1354# CONFIG_NEW_LEDS is not set 1386# CONFIG_NEW_LEDS is not set
1355# CONFIG_INFINIBAND is not set 1387# CONFIG_INFINIBAND is not set
1356# CONFIG_EDAC is not set 1388# CONFIG_EDAC is not set
1357# CONFIG_RTC_CLASS is not set 1389# CONFIG_RTC_CLASS is not set
1390# CONFIG_DMADEVICES is not set
1358 1391
1359# 1392#
1360# Userspace I/O 1393# Userspace I/O
@@ -1393,12 +1426,10 @@ CONFIG_XFS_POSIX_ACL=y
1393# CONFIG_XFS_RT is not set 1426# CONFIG_XFS_RT is not set
1394# CONFIG_GFS2_FS is not set 1427# CONFIG_GFS2_FS is not set
1395# CONFIG_OCFS2_FS is not set 1428# CONFIG_OCFS2_FS is not set
1396# CONFIG_MINIX_FS is not set 1429CONFIG_DNOTIFY=y
1397# CONFIG_ROMFS_FS is not set
1398CONFIG_INOTIFY=y 1430CONFIG_INOTIFY=y
1399CONFIG_INOTIFY_USER=y 1431CONFIG_INOTIFY_USER=y
1400# CONFIG_QUOTA is not set 1432# CONFIG_QUOTA is not set
1401CONFIG_DNOTIFY=y
1402CONFIG_AUTOFS_FS=m 1433CONFIG_AUTOFS_FS=m
1403# CONFIG_AUTOFS4_FS is not set 1434# CONFIG_AUTOFS4_FS is not set
1404# CONFIG_FUSE_FS is not set 1435# CONFIG_FUSE_FS is not set
@@ -1447,8 +1478,10 @@ CONFIG_HFSPLUS_FS=m
1447# CONFIG_EFS_FS is not set 1478# CONFIG_EFS_FS is not set
1448CONFIG_CRAMFS=y 1479CONFIG_CRAMFS=y
1449# CONFIG_VXFS_FS is not set 1480# CONFIG_VXFS_FS is not set
1481# CONFIG_MINIX_FS is not set
1450# CONFIG_HPFS_FS is not set 1482# CONFIG_HPFS_FS is not set
1451# CONFIG_QNX4FS_FS is not set 1483# CONFIG_QNX4FS_FS is not set
1484# CONFIG_ROMFS_FS is not set
1452# CONFIG_SYSV_FS is not set 1485# CONFIG_SYSV_FS is not set
1453# CONFIG_UFS_FS is not set 1486# CONFIG_UFS_FS is not set
1454CONFIG_NETWORK_FILESYSTEMS=y 1487CONFIG_NETWORK_FILESYSTEMS=y
@@ -1546,7 +1579,6 @@ CONFIG_NLS_ISO8859_15=y
1546# CONFIG_NLS_KOI8_U is not set 1579# CONFIG_NLS_KOI8_U is not set
1547CONFIG_NLS_UTF8=y 1580CONFIG_NLS_UTF8=y
1548# CONFIG_DLM is not set 1581# CONFIG_DLM is not set
1549# CONFIG_UCC_SLOW is not set
1550 1582
1551# 1583#
1552# Library routines 1584# Library routines
@@ -1564,11 +1596,6 @@ CONFIG_PLIST=y
1564CONFIG_HAS_IOMEM=y 1596CONFIG_HAS_IOMEM=y
1565CONFIG_HAS_IOPORT=y 1597CONFIG_HAS_IOPORT=y
1566CONFIG_HAS_DMA=y 1598CONFIG_HAS_DMA=y
1567CONFIG_INSTRUMENTATION=y
1568CONFIG_PROFILING=y
1569CONFIG_OPROFILE=y
1570# CONFIG_KPROBES is not set
1571# CONFIG_MARKERS is not set
1572 1599
1573# 1600#
1574# Kernel hacking 1601# Kernel hacking
@@ -1587,6 +1614,7 @@ CONFIG_SCHED_DEBUG=y
1587# CONFIG_SCHEDSTATS is not set 1614# CONFIG_SCHEDSTATS is not set
1588# CONFIG_TIMER_STATS is not set 1615# CONFIG_TIMER_STATS is not set
1589# CONFIG_SLUB_DEBUG_ON is not set 1616# CONFIG_SLUB_DEBUG_ON is not set
1617# CONFIG_SLUB_STATS is not set
1590# CONFIG_DEBUG_RT_MUTEXES is not set 1618# CONFIG_DEBUG_RT_MUTEXES is not set
1591# CONFIG_RT_MUTEX_TESTER is not set 1619# CONFIG_RT_MUTEX_TESTER is not set
1592# CONFIG_DEBUG_SPINLOCK is not set 1620# CONFIG_DEBUG_SPINLOCK is not set
@@ -1599,9 +1627,9 @@ CONFIG_DEBUG_BUGVERBOSE=y
1599# CONFIG_DEBUG_VM is not set 1627# CONFIG_DEBUG_VM is not set
1600# CONFIG_DEBUG_LIST is not set 1628# CONFIG_DEBUG_LIST is not set
1601# CONFIG_DEBUG_SG is not set 1629# CONFIG_DEBUG_SG is not set
1602CONFIG_FORCED_INLINING=y
1603# CONFIG_BOOT_PRINTK_DELAY is not set 1630# CONFIG_BOOT_PRINTK_DELAY is not set
1604# CONFIG_RCU_TORTURE_TEST is not set 1631# CONFIG_RCU_TORTURE_TEST is not set
1632# CONFIG_BACKTRACE_SELF_TEST is not set
1605# CONFIG_FAULT_INJECTION is not set 1633# CONFIG_FAULT_INJECTION is not set
1606# CONFIG_SAMPLES is not set 1634# CONFIG_SAMPLES is not set
1607# CONFIG_DEBUG_STACKOVERFLOW is not set 1635# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1621,7 +1649,9 @@ CONFIG_BOOTX_TEXT=y
1621# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1649# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1622CONFIG_CRYPTO=y 1650CONFIG_CRYPTO=y
1623CONFIG_CRYPTO_ALGAPI=y 1651CONFIG_CRYPTO_ALGAPI=y
1652CONFIG_CRYPTO_AEAD=m
1624CONFIG_CRYPTO_BLKCIPHER=y 1653CONFIG_CRYPTO_BLKCIPHER=y
1654# CONFIG_CRYPTO_SEQIV is not set
1625CONFIG_CRYPTO_HASH=y 1655CONFIG_CRYPTO_HASH=y
1626CONFIG_CRYPTO_MANAGER=y 1656CONFIG_CRYPTO_MANAGER=y
1627CONFIG_CRYPTO_HMAC=y 1657CONFIG_CRYPTO_HMAC=y
@@ -1640,6 +1670,9 @@ CONFIG_CRYPTO_CBC=y
1640CONFIG_CRYPTO_PCBC=m 1670CONFIG_CRYPTO_PCBC=m
1641# CONFIG_CRYPTO_LRW is not set 1671# CONFIG_CRYPTO_LRW is not set
1642# CONFIG_CRYPTO_XTS is not set 1672# CONFIG_CRYPTO_XTS is not set
1673# CONFIG_CRYPTO_CTR is not set
1674# CONFIG_CRYPTO_GCM is not set
1675# CONFIG_CRYPTO_CCM is not set
1643# CONFIG_CRYPTO_CRYPTD is not set 1676# CONFIG_CRYPTO_CRYPTD is not set
1644CONFIG_CRYPTO_DES=y 1677CONFIG_CRYPTO_DES=y
1645# CONFIG_CRYPTO_FCRYPT is not set 1678# CONFIG_CRYPTO_FCRYPT is not set
@@ -1655,11 +1688,13 @@ CONFIG_CRYPTO_ARC4=m
1655CONFIG_CRYPTO_KHAZAD=m 1688CONFIG_CRYPTO_KHAZAD=m
1656CONFIG_CRYPTO_ANUBIS=m 1689CONFIG_CRYPTO_ANUBIS=m
1657# CONFIG_CRYPTO_SEED is not set 1690# CONFIG_CRYPTO_SEED is not set
1691# CONFIG_CRYPTO_SALSA20 is not set
1658CONFIG_CRYPTO_DEFLATE=m 1692CONFIG_CRYPTO_DEFLATE=m
1659CONFIG_CRYPTO_MICHAEL_MIC=m 1693CONFIG_CRYPTO_MICHAEL_MIC=m
1660CONFIG_CRYPTO_CRC32C=m 1694CONFIG_CRYPTO_CRC32C=m
1661# CONFIG_CRYPTO_CAMELLIA is not set 1695# CONFIG_CRYPTO_CAMELLIA is not set
1662CONFIG_CRYPTO_TEST=m 1696CONFIG_CRYPTO_TEST=m
1663# CONFIG_CRYPTO_AUTHENC is not set 1697CONFIG_CRYPTO_AUTHENC=m
1698# CONFIG_CRYPTO_LZO is not set
1664# CONFIG_CRYPTO_HW is not set 1699# CONFIG_CRYPTO_HW is not set
1665# CONFIG_PPC_CLOCK is not set 1700# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index 4a87745c7803..8d9a84f50157 100644
--- a/arch/powerpc/configs/iseries_defconfig
+++ b/arch/powerpc/configs/iseries_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-rc3 3# Linux kernel version: 2.6.25-rc6
4# Wed Nov 21 11:19:59 2007 4# Thu Mar 20 10:43:46 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -28,6 +28,7 @@ CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y 28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y 29CONFIG_GENERIC_CLOCKEVENTS=y
30CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
31CONFIG_HAVE_SETUP_PER_CPU_AREA=y
31CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
32CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
33CONFIG_ARCH_HAS_ILOG2_U32=y 34CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -68,8 +69,6 @@ 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
73CONFIG_AUDIT=y 72CONFIG_AUDIT=y
74CONFIG_AUDITSYSCALL=y 73CONFIG_AUDITSYSCALL=y
75CONFIG_AUDIT_TREE=y 74CONFIG_AUDIT_TREE=y
@@ -77,11 +76,17 @@ CONFIG_IKCONFIG=y
77CONFIG_IKCONFIG_PROC=y 76CONFIG_IKCONFIG_PROC=y
78CONFIG_LOG_BUF_SHIFT=17 77CONFIG_LOG_BUF_SHIFT=17
79# CONFIG_CGROUPS is not set 78# CONFIG_CGROUPS is not set
80CONFIG_FAIR_GROUP_SCHED=y 79# CONFIG_GROUP_SCHED is not set
81CONFIG_FAIR_USER_SCHED=y 80# CONFIG_USER_SCHED is not set
82# CONFIG_FAIR_CGROUP_SCHED is not set 81# CONFIG_CGROUP_SCHED is not set
83CONFIG_SYSFS_DEPRECATED=y 82CONFIG_SYSFS_DEPRECATED=y
83CONFIG_SYSFS_DEPRECATED_V2=y
84# CONFIG_RELAY is not set 84# CONFIG_RELAY is not set
85CONFIG_NAMESPACES=y
86# CONFIG_UTS_NS is not set
87# CONFIG_IPC_NS is not set
88# CONFIG_USER_NS is not set
89# CONFIG_PID_NS is not set
85CONFIG_BLK_DEV_INITRD=y 90CONFIG_BLK_DEV_INITRD=y
86CONFIG_INITRAMFS_SOURCE="" 91CONFIG_INITRAMFS_SOURCE=""
87CONFIG_CC_OPTIMIZE_FOR_SIZE=y 92CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -95,11 +100,13 @@ CONFIG_HOTPLUG=y
95CONFIG_PRINTK=y 100CONFIG_PRINTK=y
96CONFIG_BUG=y 101CONFIG_BUG=y
97CONFIG_ELF_CORE=y 102CONFIG_ELF_CORE=y
103# CONFIG_COMPAT_BRK is not set
98CONFIG_BASE_FULL=y 104CONFIG_BASE_FULL=y
99CONFIG_FUTEX=y 105CONFIG_FUTEX=y
100CONFIG_ANON_INODES=y 106CONFIG_ANON_INODES=y
101CONFIG_EPOLL=y 107CONFIG_EPOLL=y
102CONFIG_SIGNALFD=y 108CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y
103CONFIG_EVENTFD=y 110CONFIG_EVENTFD=y
104CONFIG_SHMEM=y 111CONFIG_SHMEM=y
105CONFIG_VM_EVENT_COUNTERS=y 112CONFIG_VM_EVENT_COUNTERS=y
@@ -107,6 +114,14 @@ CONFIG_SLUB_DEBUG=y
107# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
108CONFIG_SLUB=y 115CONFIG_SLUB=y
109# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set
118# CONFIG_MARKERS is not set
119CONFIG_HAVE_OPROFILE=y
120# CONFIG_KPROBES is not set
121CONFIG_HAVE_KPROBES=y
122CONFIG_HAVE_KRETPROBES=y
123CONFIG_PROC_PAGE_MONITOR=y
124CONFIG_SLABINFO=y
110CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
111# CONFIG_TINY_SHMEM is not set 126# CONFIG_TINY_SHMEM is not set
112CONFIG_BASE_SMALL=0 127CONFIG_BASE_SMALL=0
@@ -134,6 +149,7 @@ CONFIG_DEFAULT_AS=y
134# CONFIG_DEFAULT_CFQ is not set 149# CONFIG_DEFAULT_CFQ is not set
135# CONFIG_DEFAULT_NOOP is not set 150# CONFIG_DEFAULT_NOOP is not set
136CONFIG_DEFAULT_IOSCHED="anticipatory" 151CONFIG_DEFAULT_IOSCHED="anticipatory"
152CONFIG_CLASSIC_RCU=y
137 153
138# 154#
139# Platform support 155# Platform support
@@ -153,8 +169,8 @@ CONFIG_VIODASD=y
153CONFIG_VIOCD=m 169CONFIG_VIOCD=m
154CONFIG_VIOTAPE=m 170CONFIG_VIOTAPE=m
155CONFIG_VIOPATH=y 171CONFIG_VIOPATH=y
156# CONFIG_PPC_MPC52xx is not set 172# CONFIG_PPC_MPC512x is not set
157# CONFIG_PPC_MPC5200 is not set 173# CONFIG_PPC_MPC5121 is not set
158# CONFIG_PPC_PMAC is not set 174# CONFIG_PPC_PMAC is not set
159# CONFIG_PPC_MAPLE is not set 175# CONFIG_PPC_MAPLE is not set
160# CONFIG_PPC_PASEMI is not set 176# CONFIG_PPC_PASEMI is not set
@@ -164,6 +180,7 @@ CONFIG_VIOPATH=y
164# CONFIG_PPC_CELL_NATIVE is not set 180# CONFIG_PPC_CELL_NATIVE is not set
165# CONFIG_PPC_IBM_CELL_BLADE is not set 181# CONFIG_PPC_IBM_CELL_BLADE is not set
166# CONFIG_PQ2ADS is not set 182# CONFIG_PQ2ADS is not set
183# CONFIG_IPIC is not set
167# CONFIG_MPIC is not set 184# CONFIG_MPIC is not set
168# CONFIG_MPIC_WEIRD is not set 185# CONFIG_MPIC_WEIRD is not set
169# CONFIG_PPC_I8259 is not set 186# CONFIG_PPC_I8259 is not set
@@ -176,7 +193,6 @@ CONFIG_IBMVIO=y
176CONFIG_PPC_INDIRECT_IO=y 193CONFIG_PPC_INDIRECT_IO=y
177CONFIG_GENERIC_IOMAP=y 194CONFIG_GENERIC_IOMAP=y
178# CONFIG_CPU_FREQ is not set 195# CONFIG_CPU_FREQ is not set
179# CONFIG_CPM2 is not set
180# CONFIG_FSL_ULI1575 is not set 196# CONFIG_FSL_ULI1575 is not set
181 197
182# 198#
@@ -191,15 +207,19 @@ CONFIG_HZ_250=y
191# CONFIG_HZ_300 is not set 207# CONFIG_HZ_300 is not set
192# CONFIG_HZ_1000 is not set 208# CONFIG_HZ_1000 is not set
193CONFIG_HZ=250 209CONFIG_HZ=250
210# CONFIG_SCHED_HRTICK is not set
194CONFIG_PREEMPT_NONE=y 211CONFIG_PREEMPT_NONE=y
195# CONFIG_PREEMPT_VOLUNTARY is not set 212# CONFIG_PREEMPT_VOLUNTARY is not set
196# CONFIG_PREEMPT is not set 213# CONFIG_PREEMPT is not set
197# CONFIG_PREEMPT_BKL is not set
198CONFIG_BINFMT_ELF=y 214CONFIG_BINFMT_ELF=y
215CONFIG_COMPAT_BINFMT_ELF=y
199# CONFIG_BINFMT_MISC is not set 216# CONFIG_BINFMT_MISC is not set
200CONFIG_FORCE_MAX_ZONEORDER=13 217CONFIG_FORCE_MAX_ZONEORDER=13
201CONFIG_IOMMU_VMERGE=y 218CONFIG_IOMMU_VMERGE=y
219CONFIG_IOMMU_HELPER=y
202CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 220CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
221CONFIG_ARCH_HAS_WALK_MEMORY=y
222CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
203# CONFIG_KEXEC is not set 223# CONFIG_KEXEC is not set
204# CONFIG_CRASH_DUMP is not set 224# CONFIG_CRASH_DUMP is not set
205CONFIG_IRQ_ALL_CPUS=y 225CONFIG_IRQ_ALL_CPUS=y
@@ -227,7 +247,6 @@ CONFIG_PROC_DEVICETREE=y
227# CONFIG_CMDLINE_BOOL is not set 247# CONFIG_CMDLINE_BOOL is not set
228# CONFIG_PM is not set 248# CONFIG_PM is not set
229CONFIG_SECCOMP=y 249CONFIG_SECCOMP=y
230# CONFIG_WANT_DEVICE_TREE is not set
231CONFIG_ISA_DMA_API=y 250CONFIG_ISA_DMA_API=y
232 251
233# 252#
@@ -263,6 +282,7 @@ CONFIG_XFRM=y
263CONFIG_XFRM_USER=m 282CONFIG_XFRM_USER=m
264CONFIG_XFRM_SUB_POLICY=y 283CONFIG_XFRM_SUB_POLICY=y
265# CONFIG_XFRM_MIGRATE is not set 284# CONFIG_XFRM_MIGRATE is not set
285# CONFIG_XFRM_STATISTICS is not set
266CONFIG_NET_KEY=m 286CONFIG_NET_KEY=m
267# CONFIG_NET_KEY_MIGRATE is not set 287# CONFIG_NET_KEY_MIGRATE is not set
268CONFIG_INET=y 288CONFIG_INET=y
@@ -297,12 +317,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
297# CONFIG_NETWORK_SECMARK is not set 317# CONFIG_NETWORK_SECMARK is not set
298CONFIG_NETFILTER=y 318CONFIG_NETFILTER=y
299# CONFIG_NETFILTER_DEBUG is not set 319# CONFIG_NETFILTER_DEBUG is not set
320CONFIG_NETFILTER_ADVANCED=y
300 321
301# 322#
302# Core Netfilter Configuration 323# Core Netfilter Configuration
303# 324#
304# CONFIG_NETFILTER_NETLINK is not set 325CONFIG_NETFILTER_NETLINK=m
305CONFIG_NF_CONNTRACK_ENABLED=m 326CONFIG_NETFILTER_NETLINK_QUEUE=m
327CONFIG_NETFILTER_NETLINK_LOG=m
306CONFIG_NF_CONNTRACK=m 328CONFIG_NF_CONNTRACK=m
307# CONFIG_NF_CT_ACCT is not set 329# CONFIG_NF_CT_ACCT is not set
308CONFIG_NF_CONNTRACK_MARK=y 330CONFIG_NF_CONNTRACK_MARK=y
@@ -318,6 +340,7 @@ CONFIG_NF_CONNTRACK_IRC=m
318# CONFIG_NF_CONNTRACK_SANE is not set 340# CONFIG_NF_CONNTRACK_SANE is not set
319# CONFIG_NF_CONNTRACK_SIP is not set 341# CONFIG_NF_CONNTRACK_SIP is not set
320CONFIG_NF_CONNTRACK_TFTP=m 342CONFIG_NF_CONNTRACK_TFTP=m
343CONFIG_NF_CT_NETLINK=m
321CONFIG_NETFILTER_XTABLES=m 344CONFIG_NETFILTER_XTABLES=m
322CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 345CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
323CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 346CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -326,8 +349,10 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
326CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 349CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
327# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 350# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
328# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set 351# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
352CONFIG_NETFILTER_XT_TARGET_RATEEST=m
329# CONFIG_NETFILTER_XT_TARGET_TRACE is not set 353# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
330# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 354# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
355CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
331CONFIG_NETFILTER_XT_MATCH_COMMENT=m 356CONFIG_NETFILTER_XT_MATCH_COMMENT=m
332# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set 357# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
333# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set 358# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
@@ -337,14 +362,17 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
337CONFIG_NETFILTER_XT_MATCH_DSCP=m 362CONFIG_NETFILTER_XT_MATCH_DSCP=m
338# CONFIG_NETFILTER_XT_MATCH_ESP is not set 363# CONFIG_NETFILTER_XT_MATCH_ESP is not set
339# CONFIG_NETFILTER_XT_MATCH_HELPER is not set 364# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
365CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
340CONFIG_NETFILTER_XT_MATCH_LENGTH=m 366CONFIG_NETFILTER_XT_MATCH_LENGTH=m
341CONFIG_NETFILTER_XT_MATCH_LIMIT=m 367CONFIG_NETFILTER_XT_MATCH_LIMIT=m
342CONFIG_NETFILTER_XT_MATCH_MAC=m 368CONFIG_NETFILTER_XT_MATCH_MAC=m
343CONFIG_NETFILTER_XT_MATCH_MARK=m 369CONFIG_NETFILTER_XT_MATCH_MARK=m
370CONFIG_NETFILTER_XT_MATCH_OWNER=m
344# CONFIG_NETFILTER_XT_MATCH_POLICY is not set 371# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
345# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set 372# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
346CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 373CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
347# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 374# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
375CONFIG_NETFILTER_XT_MATCH_RATEEST=m
348CONFIG_NETFILTER_XT_MATCH_REALM=m 376CONFIG_NETFILTER_XT_MATCH_REALM=m
349CONFIG_NETFILTER_XT_MATCH_SCTP=m 377CONFIG_NETFILTER_XT_MATCH_SCTP=m
350# CONFIG_NETFILTER_XT_MATCH_STATE is not set 378# CONFIG_NETFILTER_XT_MATCH_STATE is not set
@@ -362,13 +390,10 @@ CONFIG_NF_CONNTRACK_IPV4=m
362CONFIG_NF_CONNTRACK_PROC_COMPAT=y 390CONFIG_NF_CONNTRACK_PROC_COMPAT=y
363CONFIG_IP_NF_QUEUE=m 391CONFIG_IP_NF_QUEUE=m
364CONFIG_IP_NF_IPTABLES=m 392CONFIG_IP_NF_IPTABLES=m
365CONFIG_IP_NF_MATCH_IPRANGE=m
366CONFIG_IP_NF_MATCH_TOS=m
367CONFIG_IP_NF_MATCH_RECENT=m 393CONFIG_IP_NF_MATCH_RECENT=m
368CONFIG_IP_NF_MATCH_ECN=m 394CONFIG_IP_NF_MATCH_ECN=m
369# CONFIG_IP_NF_MATCH_AH is not set 395# CONFIG_IP_NF_MATCH_AH is not set
370CONFIG_IP_NF_MATCH_TTL=m 396CONFIG_IP_NF_MATCH_TTL=m
371CONFIG_IP_NF_MATCH_OWNER=m
372CONFIG_IP_NF_MATCH_ADDRTYPE=m 397CONFIG_IP_NF_MATCH_ADDRTYPE=m
373CONFIG_IP_NF_FILTER=m 398CONFIG_IP_NF_FILTER=m
374CONFIG_IP_NF_TARGET_REJECT=m 399CONFIG_IP_NF_TARGET_REJECT=m
@@ -379,7 +404,6 @@ CONFIG_NF_NAT_NEEDED=y
379CONFIG_IP_NF_TARGET_MASQUERADE=m 404CONFIG_IP_NF_TARGET_MASQUERADE=m
380CONFIG_IP_NF_TARGET_REDIRECT=m 405CONFIG_IP_NF_TARGET_REDIRECT=m
381CONFIG_IP_NF_TARGET_NETMAP=m 406CONFIG_IP_NF_TARGET_NETMAP=m
382CONFIG_IP_NF_TARGET_SAME=m
383# CONFIG_NF_NAT_SNMP_BASIC is not set 407# CONFIG_NF_NAT_SNMP_BASIC is not set
384CONFIG_NF_NAT_FTP=m 408CONFIG_NF_NAT_FTP=m
385CONFIG_NF_NAT_IRC=m 409CONFIG_NF_NAT_IRC=m
@@ -389,7 +413,6 @@ CONFIG_NF_NAT_TFTP=m
389# CONFIG_NF_NAT_H323 is not set 413# CONFIG_NF_NAT_H323 is not set
390# CONFIG_NF_NAT_SIP is not set 414# CONFIG_NF_NAT_SIP is not set
391CONFIG_IP_NF_MANGLE=m 415CONFIG_IP_NF_MANGLE=m
392CONFIG_IP_NF_TARGET_TOS=m
393CONFIG_IP_NF_TARGET_ECN=m 416CONFIG_IP_NF_TARGET_ECN=m
394CONFIG_IP_NF_TARGET_TTL=m 417CONFIG_IP_NF_TARGET_TTL=m
395CONFIG_IP_NF_TARGET_CLUSTERIP=m 418CONFIG_IP_NF_TARGET_CLUSTERIP=m
@@ -425,6 +448,7 @@ CONFIG_NET_CLS_ROUTE=y
425# 448#
426# CONFIG_NET_PKTGEN is not set 449# CONFIG_NET_PKTGEN is not set
427# CONFIG_HAMRADIO is not set 450# CONFIG_HAMRADIO is not set
451# CONFIG_CAN is not set
428# CONFIG_IRDA is not set 452# CONFIG_IRDA is not set
429# CONFIG_BT is not set 453# CONFIG_BT is not set
430# CONFIG_AF_RXRPC is not set 454# CONFIG_AF_RXRPC is not set
@@ -470,7 +494,7 @@ CONFIG_BLK_DEV_NBD=m
470CONFIG_BLK_DEV_RAM=y 494CONFIG_BLK_DEV_RAM=y
471CONFIG_BLK_DEV_RAM_COUNT=16 495CONFIG_BLK_DEV_RAM_COUNT=16
472CONFIG_BLK_DEV_RAM_SIZE=65536 496CONFIG_BLK_DEV_RAM_SIZE=65536
473CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 497# CONFIG_BLK_DEV_XIP is not set
474# CONFIG_CDROM_PKTCDVD is not set 498# CONFIG_CDROM_PKTCDVD is not set
475# CONFIG_ATA_OVER_ETH is not set 499# CONFIG_ATA_OVER_ETH is not set
476CONFIG_MISC_DEVICES=y 500CONFIG_MISC_DEVICES=y
@@ -478,6 +502,8 @@ CONFIG_MISC_DEVICES=y
478# CONFIG_EEPROM_93CX6 is not set 502# CONFIG_EEPROM_93CX6 is not set
479# CONFIG_SGI_IOC4 is not set 503# CONFIG_SGI_IOC4 is not set
480# CONFIG_TIFM_CORE is not set 504# CONFIG_TIFM_CORE is not set
505# CONFIG_ENCLOSURE_SERVICES is not set
506CONFIG_HAVE_IDE=y
481# CONFIG_IDE is not set 507# CONFIG_IDE is not set
482 508
483# 509#
@@ -518,6 +544,7 @@ CONFIG_SCSI_FC_ATTRS=y
518# CONFIG_SCSI_ISCSI_ATTRS is not set 544# CONFIG_SCSI_ISCSI_ATTRS is not set
519CONFIG_SCSI_SAS_ATTRS=m 545CONFIG_SCSI_SAS_ATTRS=m
520CONFIG_SCSI_SAS_LIBSAS=m 546CONFIG_SCSI_SAS_LIBSAS=m
547CONFIG_SCSI_SAS_HOST_SMP=y
521CONFIG_SCSI_SAS_LIBSAS_DEBUG=y 548CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
522CONFIG_SCSI_SRP_ATTRS=m 549CONFIG_SCSI_SRP_ATTRS=m
523CONFIG_SCSI_LOWLEVEL=y 550CONFIG_SCSI_LOWLEVEL=y
@@ -543,6 +570,7 @@ CONFIG_SCSI_LOWLEVEL=y
543CONFIG_SCSI_IBMVSCSI=m 570CONFIG_SCSI_IBMVSCSI=m
544# CONFIG_SCSI_INITIO is not set 571# CONFIG_SCSI_INITIO is not set
545# CONFIG_SCSI_INIA100 is not set 572# CONFIG_SCSI_INIA100 is not set
573# CONFIG_SCSI_MVSAS is not set
546# CONFIG_SCSI_STEX is not set 574# CONFIG_SCSI_STEX is not set
547# CONFIG_SCSI_SYM53C8XX_2 is not set 575# CONFIG_SCSI_SYM53C8XX_2 is not set
548# CONFIG_SCSI_QLOGIC_1280 is not set 576# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -589,7 +617,6 @@ CONFIG_BONDING=m
589# CONFIG_EQUALIZER is not set 617# CONFIG_EQUALIZER is not set
590CONFIG_TUN=m 618CONFIG_TUN=m
591# CONFIG_VETH is not set 619# CONFIG_VETH is not set
592# CONFIG_IP1000 is not set
593# CONFIG_ARCNET is not set 620# CONFIG_ARCNET is not set
594# CONFIG_PHYLIB is not set 621# CONFIG_PHYLIB is not set
595CONFIG_NET_ETHERNET=y 622CONFIG_NET_ETHERNET=y
@@ -618,6 +645,7 @@ CONFIG_E100=y
618# CONFIG_NE2K_PCI is not set 645# CONFIG_NE2K_PCI is not set
619# CONFIG_8139CP is not set 646# CONFIG_8139CP is not set
620# CONFIG_8139TOO is not set 647# CONFIG_8139TOO is not set
648# CONFIG_R6040 is not set
621# CONFIG_SIS900 is not set 649# CONFIG_SIS900 is not set
622# CONFIG_EPIC100 is not set 650# CONFIG_EPIC100 is not set
623# CONFIG_SUNDANCE is not set 651# CONFIG_SUNDANCE is not set
@@ -631,6 +659,9 @@ CONFIG_E1000=m
631# CONFIG_E1000_NAPI is not set 659# CONFIG_E1000_NAPI is not set
632# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 660# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
633# CONFIG_E1000E is not set 661# CONFIG_E1000E is not set
662# CONFIG_E1000E_ENABLED is not set
663# CONFIG_IP1000 is not set
664# CONFIG_IGB is not set
634# CONFIG_NS83820 is not set 665# CONFIG_NS83820 is not set
635# CONFIG_HAMACHI is not set 666# CONFIG_HAMACHI is not set
636# CONFIG_YELLOWFIN is not set 667# CONFIG_YELLOWFIN is not set
@@ -656,6 +687,7 @@ CONFIG_NETDEV_10000=y
656# CONFIG_PASEMI_MAC is not set 687# CONFIG_PASEMI_MAC is not set
657# CONFIG_MLX4_CORE is not set 688# CONFIG_MLX4_CORE is not set
658# CONFIG_TEHUTI is not set 689# CONFIG_TEHUTI is not set
690# CONFIG_BNX2X is not set
659CONFIG_TR=y 691CONFIG_TR=y
660CONFIG_IBMOL=y 692CONFIG_IBMOL=y
661# CONFIG_3C359 is not set 693# CONFIG_3C359 is not set
@@ -683,7 +715,6 @@ CONFIG_PPPOE=m
683# CONFIG_SLIP is not set 715# CONFIG_SLIP is not set
684CONFIG_SLHC=m 716CONFIG_SLHC=m
685# CONFIG_NET_FC is not set 717# CONFIG_NET_FC is not set
686# CONFIG_SHAPER is not set
687CONFIG_NETCONSOLE=y 718CONFIG_NETCONSOLE=y
688# CONFIG_NETCONSOLE_DYNAMIC is not set 719# CONFIG_NETCONSOLE_DYNAMIC is not set
689CONFIG_NETPOLL=y 720CONFIG_NETPOLL=y
@@ -734,6 +765,7 @@ CONFIG_VT_CONSOLE=y
734CONFIG_HW_CONSOLE=y 765CONFIG_HW_CONSOLE=y
735# CONFIG_VT_HW_CONSOLE_BINDING is not set 766# CONFIG_VT_HW_CONSOLE_BINDING is not set
736# CONFIG_SERIAL_NONSTANDARD is not set 767# CONFIG_SERIAL_NONSTANDARD is not set
768# CONFIG_NOZOMI is not set
737 769
738# 770#
739# Serial drivers 771# Serial drivers
@@ -772,6 +804,7 @@ CONFIG_DEVPORT=y
772# CONFIG_W1 is not set 804# CONFIG_W1 is not set
773# CONFIG_POWER_SUPPLY is not set 805# CONFIG_POWER_SUPPLY is not set
774# CONFIG_HWMON is not set 806# CONFIG_HWMON is not set
807# CONFIG_THERMAL is not set
775# CONFIG_WATCHDOG is not set 808# CONFIG_WATCHDOG is not set
776 809
777# 810#
@@ -821,10 +854,12 @@ CONFIG_DUMMY_CONSOLE=y
821# CONFIG_HID_SUPPORT is not set 854# CONFIG_HID_SUPPORT is not set
822# CONFIG_USB_SUPPORT is not set 855# CONFIG_USB_SUPPORT is not set
823# CONFIG_MMC is not set 856# CONFIG_MMC is not set
857# CONFIG_MEMSTICK is not set
824# CONFIG_NEW_LEDS is not set 858# CONFIG_NEW_LEDS is not set
825# CONFIG_INFINIBAND is not set 859# CONFIG_INFINIBAND is not set
826# CONFIG_EDAC is not set 860# CONFIG_EDAC is not set
827# CONFIG_RTC_CLASS is not set 861# CONFIG_RTC_CLASS is not set
862# CONFIG_DMADEVICES is not set
828 863
829# 864#
830# Userspace I/O 865# Userspace I/O
@@ -869,12 +904,10 @@ CONFIG_GFS2_FS=m
869CONFIG_GFS2_FS_LOCKING_NOLOCK=m 904CONFIG_GFS2_FS_LOCKING_NOLOCK=m
870CONFIG_GFS2_FS_LOCKING_DLM=m 905CONFIG_GFS2_FS_LOCKING_DLM=m
871# CONFIG_OCFS2_FS is not set 906# CONFIG_OCFS2_FS is not set
872# CONFIG_MINIX_FS is not set 907CONFIG_DNOTIFY=y
873# CONFIG_ROMFS_FS is not set
874CONFIG_INOTIFY=y 908CONFIG_INOTIFY=y
875CONFIG_INOTIFY_USER=y 909CONFIG_INOTIFY_USER=y
876# CONFIG_QUOTA is not set 910# CONFIG_QUOTA is not set
877CONFIG_DNOTIFY=y
878CONFIG_AUTOFS_FS=m 911CONFIG_AUTOFS_FS=m
879# CONFIG_AUTOFS4_FS is not set 912# CONFIG_AUTOFS4_FS is not set
880# CONFIG_FUSE_FS is not set 913# CONFIG_FUSE_FS is not set
@@ -924,8 +957,10 @@ CONFIG_CONFIGFS_FS=m
924# CONFIG_EFS_FS is not set 957# CONFIG_EFS_FS is not set
925CONFIG_CRAMFS=y 958CONFIG_CRAMFS=y
926# CONFIG_VXFS_FS is not set 959# CONFIG_VXFS_FS is not set
960# CONFIG_MINIX_FS is not set
927# CONFIG_HPFS_FS is not set 961# CONFIG_HPFS_FS is not set
928# CONFIG_QNX4FS_FS is not set 962# CONFIG_QNX4FS_FS is not set
963# CONFIG_ROMFS_FS is not set
929# CONFIG_SYSV_FS is not set 964# CONFIG_SYSV_FS is not set
930# CONFIG_UFS_FS is not set 965# CONFIG_UFS_FS is not set
931CONFIG_NETWORK_FILESYSTEMS=y 966CONFIG_NETWORK_FILESYSTEMS=y
@@ -1009,7 +1044,6 @@ CONFIG_NLS_ISO8859_1=y
1009# CONFIG_NLS_UTF8 is not set 1044# CONFIG_NLS_UTF8 is not set
1010CONFIG_DLM=m 1045CONFIG_DLM=m
1011# CONFIG_DLM_DEBUG is not set 1046# CONFIG_DLM_DEBUG is not set
1012# CONFIG_UCC_SLOW is not set
1013 1047
1014# 1048#
1015# Library routines 1049# Library routines
@@ -1031,10 +1065,6 @@ CONFIG_PLIST=y
1031CONFIG_HAS_IOMEM=y 1065CONFIG_HAS_IOMEM=y
1032CONFIG_HAS_IOPORT=y 1066CONFIG_HAS_IOPORT=y
1033CONFIG_HAS_DMA=y 1067CONFIG_HAS_DMA=y
1034CONFIG_INSTRUMENTATION=y
1035# CONFIG_PROFILING is not set
1036# CONFIG_KPROBES is not set
1037# CONFIG_MARKERS is not set
1038 1068
1039# 1069#
1040# Kernel hacking 1070# Kernel hacking
@@ -1053,6 +1083,7 @@ CONFIG_SCHED_DEBUG=y
1053# CONFIG_SCHEDSTATS is not set 1083# CONFIG_SCHEDSTATS is not set
1054# CONFIG_TIMER_STATS is not set 1084# CONFIG_TIMER_STATS is not set
1055# CONFIG_SLUB_DEBUG_ON is not set 1085# CONFIG_SLUB_DEBUG_ON is not set
1086# CONFIG_SLUB_STATS is not set
1056# CONFIG_DEBUG_RT_MUTEXES is not set 1087# CONFIG_DEBUG_RT_MUTEXES is not set
1057# CONFIG_RT_MUTEX_TESTER is not set 1088# CONFIG_RT_MUTEX_TESTER is not set
1058# CONFIG_DEBUG_SPINLOCK is not set 1089# CONFIG_DEBUG_SPINLOCK is not set
@@ -1065,9 +1096,9 @@ CONFIG_DEBUG_BUGVERBOSE=y
1065# CONFIG_DEBUG_VM is not set 1096# CONFIG_DEBUG_VM is not set
1066# CONFIG_DEBUG_LIST is not set 1097# CONFIG_DEBUG_LIST is not set
1067# CONFIG_DEBUG_SG is not set 1098# CONFIG_DEBUG_SG is not set
1068# CONFIG_FORCED_INLINING is not set
1069# CONFIG_BOOT_PRINTK_DELAY is not set 1099# CONFIG_BOOT_PRINTK_DELAY is not set
1070# CONFIG_RCU_TORTURE_TEST is not set 1100# CONFIG_RCU_TORTURE_TEST is not set
1101# CONFIG_BACKTRACE_SELF_TEST is not set
1071# CONFIG_FAULT_INJECTION is not set 1102# CONFIG_FAULT_INJECTION is not set
1072# CONFIG_SAMPLES is not set 1103# CONFIG_SAMPLES is not set
1073CONFIG_DEBUG_STACKOVERFLOW=y 1104CONFIG_DEBUG_STACKOVERFLOW=y
@@ -1089,6 +1120,7 @@ CONFIG_CRYPTO=y
1089CONFIG_CRYPTO_ALGAPI=y 1120CONFIG_CRYPTO_ALGAPI=y
1090CONFIG_CRYPTO_AEAD=m 1121CONFIG_CRYPTO_AEAD=m
1091CONFIG_CRYPTO_BLKCIPHER=y 1122CONFIG_CRYPTO_BLKCIPHER=y
1123# CONFIG_CRYPTO_SEQIV is not set
1092CONFIG_CRYPTO_HASH=y 1124CONFIG_CRYPTO_HASH=y
1093CONFIG_CRYPTO_MANAGER=y 1125CONFIG_CRYPTO_MANAGER=y
1094CONFIG_CRYPTO_HMAC=y 1126CONFIG_CRYPTO_HMAC=y
@@ -1107,6 +1139,9 @@ CONFIG_CRYPTO_CBC=y
1107CONFIG_CRYPTO_PCBC=m 1139CONFIG_CRYPTO_PCBC=m
1108# CONFIG_CRYPTO_LRW is not set 1140# CONFIG_CRYPTO_LRW is not set
1109# CONFIG_CRYPTO_XTS is not set 1141# CONFIG_CRYPTO_XTS is not set
1142# CONFIG_CRYPTO_CTR is not set
1143# CONFIG_CRYPTO_GCM is not set
1144# CONFIG_CRYPTO_CCM is not set
1110# CONFIG_CRYPTO_CRYPTD is not set 1145# CONFIG_CRYPTO_CRYPTD is not set
1111CONFIG_CRYPTO_DES=y 1146CONFIG_CRYPTO_DES=y
1112# CONFIG_CRYPTO_FCRYPT is not set 1147# CONFIG_CRYPTO_FCRYPT is not set
@@ -1122,11 +1157,13 @@ CONFIG_CRYPTO_ARC4=m
1122CONFIG_CRYPTO_KHAZAD=m 1157CONFIG_CRYPTO_KHAZAD=m
1123CONFIG_CRYPTO_ANUBIS=m 1158CONFIG_CRYPTO_ANUBIS=m
1124CONFIG_CRYPTO_SEED=m 1159CONFIG_CRYPTO_SEED=m
1160# CONFIG_CRYPTO_SALSA20 is not set
1125CONFIG_CRYPTO_DEFLATE=m 1161CONFIG_CRYPTO_DEFLATE=m
1126CONFIG_CRYPTO_MICHAEL_MIC=m 1162CONFIG_CRYPTO_MICHAEL_MIC=m
1127CONFIG_CRYPTO_CRC32C=m 1163CONFIG_CRYPTO_CRC32C=m
1128# CONFIG_CRYPTO_CAMELLIA is not set 1164# CONFIG_CRYPTO_CAMELLIA is not set
1129CONFIG_CRYPTO_TEST=m 1165CONFIG_CRYPTO_TEST=m
1130CONFIG_CRYPTO_AUTHENC=m 1166CONFIG_CRYPTO_AUTHENC=m
1167# CONFIG_CRYPTO_LZO is not set
1131# CONFIG_CRYPTO_HW is not set 1168# CONFIG_CRYPTO_HW is not set
1132# CONFIG_PPC_CLOCK is not set 1169# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index 7b4280811fb9..22a943afc3c0 100644
--- a/arch/powerpc/configs/linkstation_defconfig
+++ b/arch/powerpc/configs/linkstation_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:22 2007 4# Mon Mar 24 08:48: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
@@ -66,16 +67,24 @@ CONFIG_SYSVIPC_SYSCTL=y
66CONFIG_POSIX_MQUEUE=y 67CONFIG_POSIX_MQUEUE=y
67# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
72CONFIG_IKCONFIG=y 71CONFIG_IKCONFIG=y
73CONFIG_IKCONFIG_PROC=y 72CONFIG_IKCONFIG_PROC=y
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
76# CONFIG_FAIR_GROUP_SCHED is not set 76# CONFIG_FAIR_GROUP_SCHED is not set
77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set
77CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y
78# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
83CONFIG_NAMESPACES=y
84# CONFIG_UTS_NS is not set
85# CONFIG_IPC_NS is not set
86# CONFIG_USER_NS is not set
87# CONFIG_PID_NS is not set
79CONFIG_BLK_DEV_INITRD=y 88CONFIG_BLK_DEV_INITRD=y
80CONFIG_INITRAMFS_SOURCE="" 89CONFIG_INITRAMFS_SOURCE=""
81# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 90# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -89,11 +98,13 @@ CONFIG_HOTPLUG=y
89CONFIG_PRINTK=y 98CONFIG_PRINTK=y
90CONFIG_BUG=y 99CONFIG_BUG=y
91CONFIG_ELF_CORE=y 100CONFIG_ELF_CORE=y
101CONFIG_COMPAT_BRK=y
92CONFIG_BASE_FULL=y 102CONFIG_BASE_FULL=y
93CONFIG_FUTEX=y 103CONFIG_FUTEX=y
94CONFIG_ANON_INODES=y 104CONFIG_ANON_INODES=y
95CONFIG_EPOLL=y 105CONFIG_EPOLL=y
96CONFIG_SIGNALFD=y 106CONFIG_SIGNALFD=y
107CONFIG_TIMERFD=y
97CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
98CONFIG_SHMEM=y 109CONFIG_SHMEM=y
99CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
@@ -101,6 +112,14 @@ CONFIG_SLUB_DEBUG=y
101# CONFIG_SLAB is not set 112# CONFIG_SLAB is not set
102CONFIG_SLUB=y 113CONFIG_SLUB=y
103# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y
118# CONFIG_KPROBES is not set
119CONFIG_HAVE_KPROBES=y
120CONFIG_HAVE_KRETPROBES=y
121CONFIG_PROC_PAGE_MONITOR=y
122CONFIG_SLABINFO=y
104CONFIG_RT_MUTEXES=y 123CONFIG_RT_MUTEXES=y
105# CONFIG_TINY_SHMEM is not set 124# CONFIG_TINY_SHMEM is not set
106CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
@@ -128,6 +147,7 @@ CONFIG_DEFAULT_AS=y
128# CONFIG_DEFAULT_CFQ is not set 147# CONFIG_DEFAULT_CFQ is not set
129# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
130CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
150CONFIG_CLASSIC_RCU=y
131 151
132# 152#
133# Platform support 153# Platform support
@@ -138,22 +158,24 @@ CONFIG_PPC_MULTIPLATFORM=y
138# CONFIG_PPC_86xx is not set 158# CONFIG_PPC_86xx is not set
139CONFIG_CLASSIC32=y 159CONFIG_CLASSIC32=y
140# CONFIG_PPC_CHRP is not set 160# CONFIG_PPC_CHRP is not set
161# CONFIG_PPC_MPC512x is not set
162# CONFIG_PPC_MPC5121 is not set
163# CONFIG_MPC5121_ADS is not set
141# CONFIG_PPC_MPC52xx is not set 164# CONFIG_PPC_MPC52xx is not set
142# CONFIG_PPC_MPC5200 is not set
143# CONFIG_PPC_EFIKA is not set
144# CONFIG_PPC_LITE5200 is not set
145# CONFIG_PPC_PMAC is not set 165# CONFIG_PPC_PMAC is not set
146# CONFIG_PPC_CELL is not set 166# CONFIG_PPC_CELL is not set
147# CONFIG_PPC_CELL_NATIVE is not set 167# CONFIG_PPC_CELL_NATIVE is not set
148# CONFIG_PQ2ADS is not set 168# CONFIG_PQ2ADS is not set
149CONFIG_EMBEDDED6xx=y 169CONFIG_EMBEDDED6xx=y
150CONFIG_LINKSTATION=y 170CONFIG_LINKSTATION=y
171# CONFIG_STORCENTER is not set
151# CONFIG_MPC7448HPC2 is not set 172# CONFIG_MPC7448HPC2 is not set
152# CONFIG_PPC_HOLLY is not set 173# CONFIG_PPC_HOLLY is not set
153# CONFIG_PPC_PRPMC2800 is not set 174# CONFIG_PPC_PRPMC2800 is not set
154CONFIG_MPC10X_BRIDGE=y 175CONFIG_MPC10X_BRIDGE=y
155CONFIG_MPC10X_OPENPIC=y 176CONFIG_MPC10X_OPENPIC=y
156# CONFIG_MPC10X_STORE_GATHERING is not set 177# CONFIG_MPC10X_STORE_GATHERING is not set
178# CONFIG_IPIC is not set
157CONFIG_MPIC=y 179CONFIG_MPIC=y
158# CONFIG_MPIC_WEIRD is not set 180# CONFIG_MPIC_WEIRD is not set
159# CONFIG_PPC_I8259 is not set 181# CONFIG_PPC_I8259 is not set
@@ -165,7 +187,6 @@ CONFIG_MPIC=y
165# CONFIG_GENERIC_IOMAP is not set 187# CONFIG_GENERIC_IOMAP is not set
166# CONFIG_CPU_FREQ is not set 188# CONFIG_CPU_FREQ is not set
167# CONFIG_TAU is not set 189# CONFIG_TAU is not set
168# CONFIG_CPM2 is not set
169# CONFIG_FSL_ULI1575 is not set 190# CONFIG_FSL_ULI1575 is not set
170 191
171# 192#
@@ -181,12 +202,16 @@ CONFIG_HZ_100=y
181# CONFIG_HZ_300 is not set 202# CONFIG_HZ_300 is not set
182# CONFIG_HZ_1000 is not set 203# CONFIG_HZ_1000 is not set
183CONFIG_HZ=100 204CONFIG_HZ=100
205# CONFIG_SCHED_HRTICK is not set
184CONFIG_PREEMPT_NONE=y 206CONFIG_PREEMPT_NONE=y
185# CONFIG_PREEMPT_VOLUNTARY is not set 207# CONFIG_PREEMPT_VOLUNTARY is not set
186# CONFIG_PREEMPT is not set 208# CONFIG_PREEMPT is not set
187CONFIG_BINFMT_ELF=y 209CONFIG_BINFMT_ELF=y
188# CONFIG_BINFMT_MISC is not set 210# CONFIG_BINFMT_MISC is not set
211# CONFIG_IOMMU_HELPER is not set
189CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 212CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
213CONFIG_ARCH_HAS_WALK_MEMORY=y
214CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
190# CONFIG_KEXEC is not set 215# CONFIG_KEXEC is not set
191CONFIG_ARCH_FLATMEM_ENABLE=y 216CONFIG_ARCH_FLATMEM_ENABLE=y
192CONFIG_ARCH_POPULATES_NODE_MAP=y 217CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -206,10 +231,7 @@ CONFIG_VIRT_TO_BUS=y
206CONFIG_PROC_DEVICETREE=y 231CONFIG_PROC_DEVICETREE=y
207# CONFIG_CMDLINE_BOOL is not set 232# CONFIG_CMDLINE_BOOL is not set
208# CONFIG_PM is not set 233# CONFIG_PM is not set
209CONFIG_SUSPEND_UP_POSSIBLE=y
210CONFIG_HIBERNATION_UP_POSSIBLE=y
211CONFIG_SECCOMP=y 234CONFIG_SECCOMP=y
212# CONFIG_WANT_DEVICE_TREE is not set
213CONFIG_ISA_DMA_API=y 235CONFIG_ISA_DMA_API=y
214 236
215# 237#
@@ -259,6 +281,7 @@ CONFIG_XFRM=y
259# CONFIG_XFRM_USER is not set 281# CONFIG_XFRM_USER is not set
260# CONFIG_XFRM_SUB_POLICY is not set 282# CONFIG_XFRM_SUB_POLICY is not set
261# CONFIG_XFRM_MIGRATE is not set 283# CONFIG_XFRM_MIGRATE is not set
284# CONFIG_XFRM_STATISTICS is not set
262# CONFIG_NET_KEY is not set 285# CONFIG_NET_KEY is not set
263CONFIG_INET=y 286CONFIG_INET=y
264CONFIG_IP_MULTICAST=y 287CONFIG_IP_MULTICAST=y
@@ -295,12 +318,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
295# CONFIG_NETWORK_SECMARK is not set 318# CONFIG_NETWORK_SECMARK is not set
296CONFIG_NETFILTER=y 319CONFIG_NETFILTER=y
297# CONFIG_NETFILTER_DEBUG is not set 320# CONFIG_NETFILTER_DEBUG is not set
321CONFIG_NETFILTER_ADVANCED=y
298 322
299# 323#
300# Core Netfilter Configuration 324# Core Netfilter Configuration
301# 325#
302# CONFIG_NETFILTER_NETLINK is not set 326# CONFIG_NETFILTER_NETLINK_QUEUE is not set
303CONFIG_NF_CONNTRACK_ENABLED=m 327# CONFIG_NETFILTER_NETLINK_LOG is not set
304CONFIG_NF_CONNTRACK=m 328CONFIG_NF_CONNTRACK=m
305# CONFIG_NF_CT_ACCT is not set 329# CONFIG_NF_CT_ACCT is not set
306# CONFIG_NF_CONNTRACK_MARK is not set 330# CONFIG_NF_CONNTRACK_MARK is not set
@@ -317,6 +341,7 @@ CONFIG_NF_CONNTRACK_PPTP=m
317# CONFIG_NF_CONNTRACK_SANE is not set 341# CONFIG_NF_CONNTRACK_SANE is not set
318CONFIG_NF_CONNTRACK_SIP=m 342CONFIG_NF_CONNTRACK_SIP=m
319CONFIG_NF_CONNTRACK_TFTP=m 343CONFIG_NF_CONNTRACK_TFTP=m
344# CONFIG_NF_CT_NETLINK is not set
320CONFIG_NETFILTER_XTABLES=m 345CONFIG_NETFILTER_XTABLES=m
321# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set 346# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
322# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set 347# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
@@ -325,8 +350,10 @@ CONFIG_NETFILTER_XTABLES=m
325# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set 350# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
326# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 351# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
327# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set 352# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
353# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
328# CONFIG_NETFILTER_XT_TARGET_TRACE is not set 354# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
329# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 355# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
356# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
330# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set 357# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
331# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set 358# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
332# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set 359# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
@@ -336,14 +363,17 @@ CONFIG_NETFILTER_XTABLES=m
336# CONFIG_NETFILTER_XT_MATCH_DSCP is not set 363# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
337# CONFIG_NETFILTER_XT_MATCH_ESP is not set 364# CONFIG_NETFILTER_XT_MATCH_ESP is not set
338# CONFIG_NETFILTER_XT_MATCH_HELPER is not set 365# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
366# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
339# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set 367# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
340# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set 368# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
341CONFIG_NETFILTER_XT_MATCH_MAC=m 369CONFIG_NETFILTER_XT_MATCH_MAC=m
342# CONFIG_NETFILTER_XT_MATCH_MARK is not set 370# CONFIG_NETFILTER_XT_MATCH_MARK is not set
371# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
343# CONFIG_NETFILTER_XT_MATCH_POLICY is not set 372# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
344# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set 373# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
345CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 374CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
346# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 375# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
376# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
347# CONFIG_NETFILTER_XT_MATCH_REALM is not set 377# CONFIG_NETFILTER_XT_MATCH_REALM is not set
348# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 378# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
349CONFIG_NETFILTER_XT_MATCH_STATE=m 379CONFIG_NETFILTER_XT_MATCH_STATE=m
@@ -361,13 +391,10 @@ CONFIG_NF_CONNTRACK_IPV4=m
361CONFIG_NF_CONNTRACK_PROC_COMPAT=y 391CONFIG_NF_CONNTRACK_PROC_COMPAT=y
362# CONFIG_IP_NF_QUEUE is not set 392# CONFIG_IP_NF_QUEUE is not set
363CONFIG_IP_NF_IPTABLES=m 393CONFIG_IP_NF_IPTABLES=m
364CONFIG_IP_NF_MATCH_IPRANGE=m
365# CONFIG_IP_NF_MATCH_TOS is not set
366CONFIG_IP_NF_MATCH_RECENT=m 394CONFIG_IP_NF_MATCH_RECENT=m
367# CONFIG_IP_NF_MATCH_ECN is not set 395# CONFIG_IP_NF_MATCH_ECN is not set
368# CONFIG_IP_NF_MATCH_AH is not set 396# CONFIG_IP_NF_MATCH_AH is not set
369# CONFIG_IP_NF_MATCH_TTL is not set 397# CONFIG_IP_NF_MATCH_TTL is not set
370CONFIG_IP_NF_MATCH_OWNER=m
371CONFIG_IP_NF_MATCH_ADDRTYPE=m 398CONFIG_IP_NF_MATCH_ADDRTYPE=m
372CONFIG_IP_NF_FILTER=m 399CONFIG_IP_NF_FILTER=m
373CONFIG_IP_NF_TARGET_REJECT=m 400CONFIG_IP_NF_TARGET_REJECT=m
@@ -378,7 +405,6 @@ CONFIG_NF_NAT_NEEDED=y
378CONFIG_IP_NF_TARGET_MASQUERADE=m 405CONFIG_IP_NF_TARGET_MASQUERADE=m
379CONFIG_IP_NF_TARGET_REDIRECT=m 406CONFIG_IP_NF_TARGET_REDIRECT=m
380# CONFIG_IP_NF_TARGET_NETMAP is not set 407# CONFIG_IP_NF_TARGET_NETMAP is not set
381# CONFIG_IP_NF_TARGET_SAME is not set
382# CONFIG_NF_NAT_SNMP_BASIC is not set 408# CONFIG_NF_NAT_SNMP_BASIC is not set
383CONFIG_NF_NAT_PROTO_GRE=m 409CONFIG_NF_NAT_PROTO_GRE=m
384CONFIG_NF_NAT_FTP=m 410CONFIG_NF_NAT_FTP=m
@@ -389,7 +415,6 @@ CONFIG_NF_NAT_PPTP=m
389CONFIG_NF_NAT_H323=m 415CONFIG_NF_NAT_H323=m
390CONFIG_NF_NAT_SIP=m 416CONFIG_NF_NAT_SIP=m
391CONFIG_IP_NF_MANGLE=m 417CONFIG_IP_NF_MANGLE=m
392CONFIG_IP_NF_TARGET_TOS=m
393CONFIG_IP_NF_TARGET_ECN=m 418CONFIG_IP_NF_TARGET_ECN=m
394CONFIG_IP_NF_TARGET_TTL=m 419CONFIG_IP_NF_TARGET_TTL=m
395# CONFIG_IP_NF_TARGET_CLUSTERIP is not set 420# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
@@ -418,6 +443,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
418# 443#
419# CONFIG_NET_PKTGEN is not set 444# CONFIG_NET_PKTGEN is not set
420# CONFIG_HAMRADIO is not set 445# CONFIG_HAMRADIO is not set
446# CONFIG_CAN is not set
421# CONFIG_IRDA is not set 447# CONFIG_IRDA is not set
422# CONFIG_BT is not set 448# CONFIG_BT is not set
423# CONFIG_AF_RXRPC is not set 449# CONFIG_AF_RXRPC is not set
@@ -459,6 +485,7 @@ CONFIG_MTD_CONCAT=y
459CONFIG_MTD_PARTITIONS=y 485CONFIG_MTD_PARTITIONS=y
460# CONFIG_MTD_REDBOOT_PARTS is not set 486# CONFIG_MTD_REDBOOT_PARTS is not set
461# CONFIG_MTD_CMDLINE_PARTS is not set 487# CONFIG_MTD_CMDLINE_PARTS is not set
488# CONFIG_MTD_OF_PARTS is not set
462 489
463# 490#
464# User Modules And Translation Layers 491# User Modules And Translation Layers
@@ -554,7 +581,7 @@ CONFIG_BLK_DEV_LOOP=y
554CONFIG_BLK_DEV_RAM=y 581CONFIG_BLK_DEV_RAM=y
555CONFIG_BLK_DEV_RAM_COUNT=2 582CONFIG_BLK_DEV_RAM_COUNT=2
556CONFIG_BLK_DEV_RAM_SIZE=8192 583CONFIG_BLK_DEV_RAM_SIZE=8192
557CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 584# CONFIG_BLK_DEV_XIP is not set
558# CONFIG_CDROM_PKTCDVD is not set 585# CONFIG_CDROM_PKTCDVD is not set
559# CONFIG_ATA_OVER_ETH is not set 586# CONFIG_ATA_OVER_ETH is not set
560CONFIG_MISC_DEVICES=y 587CONFIG_MISC_DEVICES=y
@@ -562,6 +589,8 @@ CONFIG_MISC_DEVICES=y
562# CONFIG_EEPROM_93CX6 is not set 589# CONFIG_EEPROM_93CX6 is not set
563# CONFIG_SGI_IOC4 is not set 590# CONFIG_SGI_IOC4 is not set
564# CONFIG_TIFM_CORE is not set 591# CONFIG_TIFM_CORE is not set
592# CONFIG_ENCLOSURE_SERVICES is not set
593CONFIG_HAVE_IDE=y
565# CONFIG_IDE is not set 594# CONFIG_IDE is not set
566 595
567# 596#
@@ -626,6 +655,7 @@ CONFIG_SCSI_LOWLEVEL=y
626# CONFIG_SCSI_IPS is not set 655# CONFIG_SCSI_IPS is not set
627# CONFIG_SCSI_INITIO is not set 656# CONFIG_SCSI_INITIO is not set
628# CONFIG_SCSI_INIA100 is not set 657# CONFIG_SCSI_INIA100 is not set
658# CONFIG_SCSI_MVSAS is not set
629# CONFIG_SCSI_STEX is not set 659# CONFIG_SCSI_STEX is not set
630# CONFIG_SCSI_SYM53C8XX_2 is not set 660# CONFIG_SCSI_SYM53C8XX_2 is not set
631# CONFIG_SCSI_IPR is not set 661# CONFIG_SCSI_IPR is not set
@@ -656,6 +686,7 @@ CONFIG_ATA=y
656# CONFIG_SATA_VIA is not set 686# CONFIG_SATA_VIA is not set
657# CONFIG_SATA_VITESSE is not set 687# CONFIG_SATA_VITESSE is not set
658# CONFIG_SATA_INIC162X is not set 688# CONFIG_SATA_INIC162X is not set
689# CONFIG_SATA_FSL is not set
659# CONFIG_PATA_ALI is not set 690# CONFIG_PATA_ALI is not set
660# CONFIG_PATA_AMD is not set 691# CONFIG_PATA_AMD is not set
661# CONFIG_PATA_ARTOP is not set 692# CONFIG_PATA_ARTOP is not set
@@ -679,6 +710,7 @@ CONFIG_PATA_IT821X=y
679# CONFIG_PATA_MPIIX is not set 710# CONFIG_PATA_MPIIX is not set
680# CONFIG_PATA_OLDPIIX is not set 711# CONFIG_PATA_OLDPIIX is not set
681# CONFIG_PATA_NETCELL is not set 712# CONFIG_PATA_NETCELL is not set
713# CONFIG_PATA_NINJA32 is not set
682# CONFIG_PATA_NS87410 is not set 714# CONFIG_PATA_NS87410 is not set
683# CONFIG_PATA_NS87415 is not set 715# CONFIG_PATA_NS87415 is not set
684# CONFIG_PATA_OPTI is not set 716# CONFIG_PATA_OPTI is not set
@@ -693,6 +725,7 @@ CONFIG_PATA_SIL680=y
693# CONFIG_PATA_SIS is not set 725# CONFIG_PATA_SIS is not set
694# CONFIG_PATA_VIA is not set 726# CONFIG_PATA_VIA is not set
695# CONFIG_PATA_WINBOND is not set 727# CONFIG_PATA_WINBOND is not set
728# CONFIG_PATA_PLATFORM is not set
696# CONFIG_MD is not set 729# CONFIG_MD is not set
697# CONFIG_FUSION is not set 730# CONFIG_FUSION is not set
698 731
@@ -711,7 +744,6 @@ CONFIG_NETDEVICES=y
711# CONFIG_EQUALIZER is not set 744# CONFIG_EQUALIZER is not set
712CONFIG_TUN=m 745CONFIG_TUN=m
713# CONFIG_VETH is not set 746# CONFIG_VETH is not set
714# CONFIG_IP1000 is not set
715# CONFIG_ARCNET is not set 747# CONFIG_ARCNET is not set
716# CONFIG_PHYLIB is not set 748# CONFIG_PHYLIB is not set
717CONFIG_NET_ETHERNET=y 749CONFIG_NET_ETHERNET=y
@@ -742,6 +774,9 @@ CONFIG_NETDEV_1000=y
742# CONFIG_DL2K is not set 774# CONFIG_DL2K is not set
743# CONFIG_E1000 is not set 775# CONFIG_E1000 is not set
744# CONFIG_E1000E is not set 776# CONFIG_E1000E is not set
777# CONFIG_E1000E_ENABLED is not set
778# CONFIG_IP1000 is not set
779# CONFIG_IGB is not set
745# CONFIG_NS83820 is not set 780# CONFIG_NS83820 is not set
746# CONFIG_HAMACHI is not set 781# CONFIG_HAMACHI is not set
747# CONFIG_YELLOWFIN is not set 782# CONFIG_YELLOWFIN is not set
@@ -754,6 +789,7 @@ CONFIG_R8169=y
754# CONFIG_VIA_VELOCITY is not set 789# CONFIG_VIA_VELOCITY is not set
755# CONFIG_TIGON3 is not set 790# CONFIG_TIGON3 is not set
756# CONFIG_BNX2 is not set 791# CONFIG_BNX2 is not set
792# CONFIG_GIANFAR is not set
757# CONFIG_MV643XX_ETH is not set 793# CONFIG_MV643XX_ETH is not set
758# CONFIG_QLA3XXX is not set 794# CONFIG_QLA3XXX is not set
759# CONFIG_ATL1 is not set 795# CONFIG_ATL1 is not set
@@ -768,6 +804,7 @@ CONFIG_NETDEV_10000=y
768# CONFIG_NIU is not set 804# CONFIG_NIU is not set
769# CONFIG_MLX4_CORE is not set 805# CONFIG_MLX4_CORE is not set
770# CONFIG_TEHUTI is not set 806# CONFIG_TEHUTI is not set
807# CONFIG_BNX2X is not set
771# CONFIG_TR is not set 808# CONFIG_TR is not set
772 809
773# 810#
@@ -790,7 +827,6 @@ CONFIG_NETDEV_10000=y
790# CONFIG_PPP is not set 827# CONFIG_PPP is not set
791# CONFIG_SLIP is not set 828# CONFIG_SLIP is not set
792# CONFIG_NET_FC is not set 829# CONFIG_NET_FC is not set
793# CONFIG_SHAPER is not set
794CONFIG_NETCONSOLE=y 830CONFIG_NETCONSOLE=y
795# CONFIG_NETCONSOLE_DYNAMIC is not set 831# CONFIG_NETCONSOLE_DYNAMIC is not set
796CONFIG_NETPOLL=y 832CONFIG_NETPOLL=y
@@ -851,6 +887,7 @@ CONFIG_VT_CONSOLE=y
851CONFIG_HW_CONSOLE=y 887CONFIG_HW_CONSOLE=y
852# CONFIG_VT_HW_CONSOLE_BINDING is not set 888# CONFIG_VT_HW_CONSOLE_BINDING is not set
853# CONFIG_SERIAL_NONSTANDARD is not set 889# CONFIG_SERIAL_NONSTANDARD is not set
890# CONFIG_NOZOMI is not set
854 891
855# 892#
856# Serial drivers 893# Serial drivers
@@ -924,14 +961,12 @@ CONFIG_I2C_MPC=y
924# 961#
925# Miscellaneous I2C Chip support 962# Miscellaneous I2C Chip support
926# 963#
927# CONFIG_SENSORS_DS1337 is not set
928# CONFIG_SENSORS_DS1374 is not set
929# CONFIG_DS1682 is not set 964# CONFIG_DS1682 is not set
930CONFIG_SENSORS_EEPROM=m 965CONFIG_SENSORS_EEPROM=m
931# CONFIG_SENSORS_PCF8574 is not set 966# CONFIG_SENSORS_PCF8574 is not set
932# CONFIG_SENSORS_PCA9539 is not set 967# CONFIG_PCF8575 is not set
933# CONFIG_SENSORS_PCF8591 is not set 968# CONFIG_SENSORS_PCF8591 is not set
934# CONFIG_SENSORS_M41T00 is not set 969# CONFIG_TPS65010 is not set
935# CONFIG_SENSORS_MAX6875 is not set 970# CONFIG_SENSORS_MAX6875 is not set
936# CONFIG_SENSORS_TSL2550 is not set 971# CONFIG_SENSORS_TSL2550 is not set
937# CONFIG_I2C_DEBUG_CORE is not set 972# CONFIG_I2C_DEBUG_CORE is not set
@@ -956,6 +991,7 @@ CONFIG_HWMON=y
956# CONFIG_SENSORS_ADM1031 is not set 991# CONFIG_SENSORS_ADM1031 is not set
957# CONFIG_SENSORS_ADM9240 is not set 992# CONFIG_SENSORS_ADM9240 is not set
958# CONFIG_SENSORS_ADT7470 is not set 993# CONFIG_SENSORS_ADT7470 is not set
994# CONFIG_SENSORS_ADT7473 is not set
959# CONFIG_SENSORS_ATXP1 is not set 995# CONFIG_SENSORS_ATXP1 is not set
960# CONFIG_SENSORS_DS1621 is not set 996# CONFIG_SENSORS_DS1621 is not set
961# CONFIG_SENSORS_I5K_AMB is not set 997# CONFIG_SENSORS_I5K_AMB is not set
@@ -985,6 +1021,7 @@ CONFIG_HWMON=y
985# CONFIG_SENSORS_SMSC47M1 is not set 1021# CONFIG_SENSORS_SMSC47M1 is not set
986# CONFIG_SENSORS_SMSC47M192 is not set 1022# CONFIG_SENSORS_SMSC47M192 is not set
987# CONFIG_SENSORS_SMSC47B397 is not set 1023# CONFIG_SENSORS_SMSC47B397 is not set
1024# CONFIG_SENSORS_ADS7828 is not set
988# CONFIG_SENSORS_THMC50 is not set 1025# CONFIG_SENSORS_THMC50 is not set
989# CONFIG_SENSORS_VIA686A is not set 1026# CONFIG_SENSORS_VIA686A is not set
990# CONFIG_SENSORS_VT1211 is not set 1027# CONFIG_SENSORS_VT1211 is not set
@@ -994,9 +1031,11 @@ CONFIG_HWMON=y
994# CONFIG_SENSORS_W83792D is not set 1031# CONFIG_SENSORS_W83792D is not set
995# CONFIG_SENSORS_W83793 is not set 1032# CONFIG_SENSORS_W83793 is not set
996# CONFIG_SENSORS_W83L785TS is not set 1033# CONFIG_SENSORS_W83L785TS is not set
1034# CONFIG_SENSORS_W83L786NG is not set
997# CONFIG_SENSORS_W83627HF is not set 1035# CONFIG_SENSORS_W83627HF is not set
998# CONFIG_SENSORS_W83627EHF is not set 1036# CONFIG_SENSORS_W83627EHF is not set
999# CONFIG_HWMON_DEBUG_CHIP is not set 1037# CONFIG_HWMON_DEBUG_CHIP is not set
1038# CONFIG_THERMAL is not set
1000# CONFIG_WATCHDOG is not set 1039# CONFIG_WATCHDOG is not set
1001 1040
1002# 1041#
@@ -1063,6 +1102,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
1063CONFIG_USB_ARCH_HAS_EHCI=y 1102CONFIG_USB_ARCH_HAS_EHCI=y
1064CONFIG_USB=y 1103CONFIG_USB=y
1065# CONFIG_USB_DEBUG is not set 1104# CONFIG_USB_DEBUG is not set
1105# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1066 1106
1067# 1107#
1068# Miscellaneous USB options 1108# Miscellaneous USB options
@@ -1076,9 +1116,10 @@ CONFIG_USB_DEVICE_CLASS=y
1076# USB Host Controller Drivers 1116# USB Host Controller Drivers
1077# 1117#
1078CONFIG_USB_EHCI_HCD=y 1118CONFIG_USB_EHCI_HCD=y
1079# CONFIG_USB_EHCI_SPLIT_ISO is not set
1080# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1119# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1081# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1120# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1121# CONFIG_USB_EHCI_FSL is not set
1122CONFIG_USB_EHCI_HCD_PPC_OF=y
1082# CONFIG_USB_ISP116X_HCD is not set 1123# CONFIG_USB_ISP116X_HCD is not set
1083CONFIG_USB_OHCI_HCD=y 1124CONFIG_USB_OHCI_HCD=y
1084CONFIG_USB_OHCI_HCD_PPC_OF=y 1125CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -1130,12 +1171,9 @@ CONFIG_USB_MON=y
1130# 1171#
1131# USB port drivers 1172# USB port drivers
1132# 1173#
1133
1134#
1135# USB Serial Converter support
1136#
1137CONFIG_USB_SERIAL=y 1174CONFIG_USB_SERIAL=y
1138CONFIG_USB_SERIAL_CONSOLE=y 1175CONFIG_USB_SERIAL_CONSOLE=y
1176# CONFIG_USB_EZUSB is not set
1139# CONFIG_USB_SERIAL_GENERIC is not set 1177# CONFIG_USB_SERIAL_GENERIC is not set
1140# CONFIG_USB_SERIAL_AIRCABLE is not set 1178# CONFIG_USB_SERIAL_AIRCABLE is not set
1141# CONFIG_USB_SERIAL_AIRPRIME is not set 1179# CONFIG_USB_SERIAL_AIRPRIME is not set
@@ -1156,6 +1194,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
1156# CONFIG_USB_SERIAL_EDGEPORT_TI is not set 1194# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
1157# CONFIG_USB_SERIAL_GARMIN is not set 1195# CONFIG_USB_SERIAL_GARMIN is not set
1158# CONFIG_USB_SERIAL_IPW is not set 1196# CONFIG_USB_SERIAL_IPW is not set
1197# CONFIG_USB_SERIAL_IUU is not set
1159# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set 1198# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
1160# CONFIG_USB_SERIAL_KEYSPAN is not set 1199# CONFIG_USB_SERIAL_KEYSPAN is not set
1161# CONFIG_USB_SERIAL_KLSI is not set 1200# CONFIG_USB_SERIAL_KLSI is not set
@@ -1199,16 +1238,9 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
1199# CONFIG_USB_TRANCEVIBRATOR is not set 1238# CONFIG_USB_TRANCEVIBRATOR is not set
1200# CONFIG_USB_IOWARRIOR is not set 1239# CONFIG_USB_IOWARRIOR is not set
1201# CONFIG_USB_TEST is not set 1240# CONFIG_USB_TEST is not set
1202
1203#
1204# USB DSL modem support
1205#
1206
1207#
1208# USB Gadget Support
1209#
1210# CONFIG_USB_GADGET is not set 1241# CONFIG_USB_GADGET is not set
1211# CONFIG_MMC is not set 1242# CONFIG_MMC is not set
1243# CONFIG_MEMSTICK is not set
1212# CONFIG_NEW_LEDS is not set 1244# CONFIG_NEW_LEDS is not set
1213# CONFIG_INFINIBAND is not set 1245# CONFIG_INFINIBAND is not set
1214# CONFIG_EDAC is not set 1246# CONFIG_EDAC is not set
@@ -1240,6 +1272,7 @@ CONFIG_RTC_DRV_RS5C372=y
1240# CONFIG_RTC_DRV_PCF8563 is not set 1272# CONFIG_RTC_DRV_PCF8563 is not set
1241# CONFIG_RTC_DRV_PCF8583 is not set 1273# CONFIG_RTC_DRV_PCF8583 is not set
1242# CONFIG_RTC_DRV_M41T80 is not set 1274# CONFIG_RTC_DRV_M41T80 is not set
1275# CONFIG_RTC_DRV_S35390A is not set
1243 1276
1244# 1277#
1245# SPI RTC drivers 1278# SPI RTC drivers
@@ -1249,9 +1282,10 @@ CONFIG_RTC_DRV_RS5C372=y
1249# Platform RTC drivers 1282# Platform RTC drivers
1250# 1283#
1251# CONFIG_RTC_DRV_CMOS is not set 1284# CONFIG_RTC_DRV_CMOS is not set
1285# CONFIG_RTC_DRV_DS1511 is not set
1252# CONFIG_RTC_DRV_DS1553 is not set 1286# CONFIG_RTC_DRV_DS1553 is not set
1253# CONFIG_RTC_DRV_STK17TA8 is not set
1254# CONFIG_RTC_DRV_DS1742 is not set 1287# CONFIG_RTC_DRV_DS1742 is not set
1288# CONFIG_RTC_DRV_STK17TA8 is not set
1255# CONFIG_RTC_DRV_M48T86 is not set 1289# CONFIG_RTC_DRV_M48T86 is not set
1256# CONFIG_RTC_DRV_M48T59 is not set 1290# CONFIG_RTC_DRV_M48T59 is not set
1257# CONFIG_RTC_DRV_V3020 is not set 1291# CONFIG_RTC_DRV_V3020 is not set
@@ -1259,6 +1293,7 @@ CONFIG_RTC_DRV_RS5C372=y
1259# 1293#
1260# on-CPU RTC drivers 1294# on-CPU RTC drivers
1261# 1295#
1296# CONFIG_DMADEVICES is not set
1262 1297
1263# 1298#
1264# Userspace I/O 1299# Userspace I/O
@@ -1288,12 +1323,10 @@ CONFIG_XFS_FS=m
1288# CONFIG_XFS_RT is not set 1323# CONFIG_XFS_RT is not set
1289# CONFIG_GFS2_FS is not set 1324# CONFIG_GFS2_FS is not set
1290# CONFIG_OCFS2_FS is not set 1325# CONFIG_OCFS2_FS is not set
1291# CONFIG_MINIX_FS is not set 1326CONFIG_DNOTIFY=y
1292# CONFIG_ROMFS_FS is not set
1293CONFIG_INOTIFY=y 1327CONFIG_INOTIFY=y
1294CONFIG_INOTIFY_USER=y 1328CONFIG_INOTIFY_USER=y
1295# CONFIG_QUOTA is not set 1329# CONFIG_QUOTA is not set
1296CONFIG_DNOTIFY=y
1297# CONFIG_AUTOFS_FS is not set 1330# CONFIG_AUTOFS_FS is not set
1298# CONFIG_AUTOFS4_FS is not set 1331# CONFIG_AUTOFS4_FS is not set
1299# CONFIG_FUSE_FS is not set 1332# CONFIG_FUSE_FS is not set
@@ -1344,8 +1377,10 @@ CONFIG_TMPFS=y
1344# CONFIG_JFFS2_FS is not set 1377# CONFIG_JFFS2_FS is not set
1345# CONFIG_CRAMFS is not set 1378# CONFIG_CRAMFS is not set
1346# CONFIG_VXFS_FS is not set 1379# CONFIG_VXFS_FS is not set
1380# CONFIG_MINIX_FS is not set
1347# CONFIG_HPFS_FS is not set 1381# CONFIG_HPFS_FS is not set
1348# CONFIG_QNX4FS_FS is not set 1382# CONFIG_QNX4FS_FS is not set
1383# CONFIG_ROMFS_FS is not set
1349# CONFIG_SYSV_FS is not set 1384# CONFIG_SYSV_FS is not set
1350# CONFIG_UFS_FS is not set 1385# CONFIG_UFS_FS is not set
1351CONFIG_NETWORK_FILESYSTEMS=y 1386CONFIG_NETWORK_FILESYSTEMS=y
@@ -1427,7 +1462,6 @@ CONFIG_NLS_ISO8859_1=m
1427# CONFIG_NLS_KOI8_U is not set 1462# CONFIG_NLS_KOI8_U is not set
1428CONFIG_NLS_UTF8=m 1463CONFIG_NLS_UTF8=m
1429# CONFIG_DLM is not set 1464# CONFIG_DLM is not set
1430# CONFIG_UCC_SLOW is not set
1431 1465
1432# 1466#
1433# Library routines 1467# Library routines
@@ -1447,7 +1481,6 @@ CONFIG_PLIST=y
1447CONFIG_HAS_IOMEM=y 1481CONFIG_HAS_IOMEM=y
1448CONFIG_HAS_IOPORT=y 1482CONFIG_HAS_IOPORT=y
1449CONFIG_HAS_DMA=y 1483CONFIG_HAS_DMA=y
1450# CONFIG_INSTRUMENTATION is not set
1451 1484
1452# 1485#
1453# Kernel hacking 1486# Kernel hacking
@@ -1466,6 +1499,7 @@ CONFIG_SCHED_DEBUG=y
1466# CONFIG_SCHEDSTATS is not set 1499# CONFIG_SCHEDSTATS is not set
1467# CONFIG_TIMER_STATS is not set 1500# CONFIG_TIMER_STATS is not set
1468# CONFIG_SLUB_DEBUG_ON is not set 1501# CONFIG_SLUB_DEBUG_ON is not set
1502# CONFIG_SLUB_STATS is not set
1469# CONFIG_DEBUG_RT_MUTEXES is not set 1503# CONFIG_DEBUG_RT_MUTEXES is not set
1470# CONFIG_RT_MUTEX_TESTER is not set 1504# CONFIG_RT_MUTEX_TESTER is not set
1471# CONFIG_DEBUG_SPINLOCK is not set 1505# CONFIG_DEBUG_SPINLOCK is not set
@@ -1478,9 +1512,9 @@ CONFIG_DEBUG_BUGVERBOSE=y
1478# CONFIG_DEBUG_VM is not set 1512# CONFIG_DEBUG_VM is not set
1479# CONFIG_DEBUG_LIST is not set 1513# CONFIG_DEBUG_LIST is not set
1480# CONFIG_DEBUG_SG is not set 1514# CONFIG_DEBUG_SG is not set
1481CONFIG_FORCED_INLINING=y
1482# CONFIG_BOOT_PRINTK_DELAY is not set 1515# CONFIG_BOOT_PRINTK_DELAY is not set
1483# CONFIG_RCU_TORTURE_TEST is not set 1516# CONFIG_RCU_TORTURE_TEST is not set
1517# CONFIG_BACKTRACE_SELF_TEST is not set
1484# CONFIG_FAULT_INJECTION is not set 1518# CONFIG_FAULT_INJECTION is not set
1485# CONFIG_SAMPLES is not set 1519# CONFIG_SAMPLES is not set
1486# CONFIG_DEBUG_STACKOVERFLOW is not set 1520# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1500,6 +1534,7 @@ CONFIG_FORCED_INLINING=y
1500CONFIG_CRYPTO=y 1534CONFIG_CRYPTO=y
1501CONFIG_CRYPTO_ALGAPI=y 1535CONFIG_CRYPTO_ALGAPI=y
1502CONFIG_CRYPTO_BLKCIPHER=y 1536CONFIG_CRYPTO_BLKCIPHER=y
1537# CONFIG_CRYPTO_SEQIV is not set
1503CONFIG_CRYPTO_MANAGER=y 1538CONFIG_CRYPTO_MANAGER=y
1504# CONFIG_CRYPTO_HMAC is not set 1539# CONFIG_CRYPTO_HMAC is not set
1505# CONFIG_CRYPTO_XCBC is not set 1540# CONFIG_CRYPTO_XCBC is not set
@@ -1517,6 +1552,9 @@ CONFIG_CRYPTO_CBC=y
1517CONFIG_CRYPTO_PCBC=m 1552CONFIG_CRYPTO_PCBC=m
1518# CONFIG_CRYPTO_LRW is not set 1553# CONFIG_CRYPTO_LRW is not set
1519# CONFIG_CRYPTO_XTS is not set 1554# CONFIG_CRYPTO_XTS is not set
1555# CONFIG_CRYPTO_CTR is not set
1556# CONFIG_CRYPTO_GCM is not set
1557# CONFIG_CRYPTO_CCM is not set
1520# CONFIG_CRYPTO_CRYPTD is not set 1558# CONFIG_CRYPTO_CRYPTD is not set
1521CONFIG_CRYPTO_DES=y 1559CONFIG_CRYPTO_DES=y
1522# CONFIG_CRYPTO_FCRYPT is not set 1560# CONFIG_CRYPTO_FCRYPT is not set
@@ -1532,11 +1570,14 @@ CONFIG_CRYPTO_ARC4=m
1532# CONFIG_CRYPTO_KHAZAD is not set 1570# CONFIG_CRYPTO_KHAZAD is not set
1533# CONFIG_CRYPTO_ANUBIS is not set 1571# CONFIG_CRYPTO_ANUBIS is not set
1534# CONFIG_CRYPTO_SEED is not set 1572# CONFIG_CRYPTO_SEED is not set
1573# CONFIG_CRYPTO_SALSA20 is not set
1535CONFIG_CRYPTO_DEFLATE=m 1574CONFIG_CRYPTO_DEFLATE=m
1536CONFIG_CRYPTO_MICHAEL_MIC=m 1575CONFIG_CRYPTO_MICHAEL_MIC=m
1537CONFIG_CRYPTO_CRC32C=m 1576CONFIG_CRYPTO_CRC32C=m
1538# CONFIG_CRYPTO_CAMELLIA is not set 1577# CONFIG_CRYPTO_CAMELLIA is not set
1539# CONFIG_CRYPTO_TEST is not set 1578# CONFIG_CRYPTO_TEST is not set
1540# CONFIG_CRYPTO_AUTHENC is not set 1579# CONFIG_CRYPTO_AUTHENC is not set
1580# CONFIG_CRYPTO_LZO is not set
1541CONFIG_CRYPTO_HW=y 1581CONFIG_CRYPTO_HW=y
1582# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1542# CONFIG_PPC_CLOCK is not set 1583# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index b0266de48491..a3d52e3f2ded 100644
--- a/arch/powerpc/configs/mpc7448_hpc2_defconfig
+++ b/arch/powerpc/configs/mpc7448_hpc2_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:28 2007 4# Mon Mar 24 08:48:11 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
@@ -66,15 +67,19 @@ CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set 73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y
75# CONFIG_FAIR_GROUP_SCHED is not set 75# CONFIG_FAIR_GROUP_SCHED is not set
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
76CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
77# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
78CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
79CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -87,11 +92,13 @@ CONFIG_HOTPLUG=y
87CONFIG_PRINTK=y 92CONFIG_PRINTK=y
88CONFIG_BUG=y 93CONFIG_BUG=y
89CONFIG_ELF_CORE=y 94CONFIG_ELF_CORE=y
95CONFIG_COMPAT_BRK=y
90CONFIG_BASE_FULL=y 96CONFIG_BASE_FULL=y
91CONFIG_FUTEX=y 97CONFIG_FUTEX=y
92CONFIG_ANON_INODES=y 98CONFIG_ANON_INODES=y
93CONFIG_EPOLL=y 99CONFIG_EPOLL=y
94CONFIG_SIGNALFD=y 100CONFIG_SIGNALFD=y
101CONFIG_TIMERFD=y
95CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
96CONFIG_SHMEM=y 103CONFIG_SHMEM=y
97CONFIG_VM_EVENT_COUNTERS=y 104CONFIG_VM_EVENT_COUNTERS=y
@@ -99,6 +106,13 @@ CONFIG_SLUB_DEBUG=y
99# CONFIG_SLAB is not set 106# CONFIG_SLAB is not set
100CONFIG_SLUB=y 107CONFIG_SLUB=y
101# CONFIG_SLOB is not set 108# CONFIG_SLOB is not set
109# CONFIG_PROFILING is not set
110# CONFIG_MARKERS is not set
111CONFIG_HAVE_OPROFILE=y
112CONFIG_HAVE_KPROBES=y
113CONFIG_HAVE_KRETPROBES=y
114CONFIG_PROC_PAGE_MONITOR=y
115CONFIG_SLABINFO=y
102CONFIG_RT_MUTEXES=y 116CONFIG_RT_MUTEXES=y
103# CONFIG_TINY_SHMEM is not set 117# CONFIG_TINY_SHMEM is not set
104CONFIG_BASE_SMALL=0 118CONFIG_BASE_SMALL=0
@@ -121,6 +135,7 @@ CONFIG_DEFAULT_AS=y
121# CONFIG_DEFAULT_CFQ is not set 135# CONFIG_DEFAULT_CFQ is not set
122# CONFIG_DEFAULT_NOOP is not set 136# CONFIG_DEFAULT_NOOP is not set
123CONFIG_DEFAULT_IOSCHED="anticipatory" 137CONFIG_DEFAULT_IOSCHED="anticipatory"
138CONFIG_CLASSIC_RCU=y
124 139
125# 140#
126# Platform support 141# Platform support
@@ -131,20 +146,22 @@ CONFIG_PPC_MULTIPLATFORM=y
131# CONFIG_PPC_86xx is not set 146# CONFIG_PPC_86xx is not set
132CONFIG_CLASSIC32=y 147CONFIG_CLASSIC32=y
133# CONFIG_PPC_CHRP is not set 148# CONFIG_PPC_CHRP is not set
149# CONFIG_PPC_MPC512x is not set
150# CONFIG_PPC_MPC5121 is not set
151# CONFIG_MPC5121_ADS is not set
134# CONFIG_PPC_MPC52xx is not set 152# CONFIG_PPC_MPC52xx is not set
135# CONFIG_PPC_MPC5200 is not set
136# CONFIG_PPC_EFIKA is not set
137# CONFIG_PPC_LITE5200 is not set
138# CONFIG_PPC_PMAC is not set 153# CONFIG_PPC_PMAC 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
142CONFIG_EMBEDDED6xx=y 157CONFIG_EMBEDDED6xx=y
143# CONFIG_LINKSTATION is not set 158# CONFIG_LINKSTATION is not set
159# CONFIG_STORCENTER is not set
144CONFIG_MPC7448HPC2=y 160CONFIG_MPC7448HPC2=y
145# CONFIG_PPC_HOLLY is not set 161# CONFIG_PPC_HOLLY is not set
146# CONFIG_PPC_PRPMC2800 is not set 162# CONFIG_PPC_PRPMC2800 is not set
147CONFIG_TSI108_BRIDGE=y 163CONFIG_TSI108_BRIDGE=y
164# CONFIG_IPIC is not set
148CONFIG_MPIC=y 165CONFIG_MPIC=y
149CONFIG_MPIC_WEIRD=y 166CONFIG_MPIC_WEIRD=y
150# CONFIG_PPC_I8259 is not set 167# CONFIG_PPC_I8259 is not set
@@ -156,7 +173,6 @@ CONFIG_MPIC_WEIRD=y
156# CONFIG_GENERIC_IOMAP is not set 173# CONFIG_GENERIC_IOMAP is not set
157# CONFIG_CPU_FREQ is not set 174# CONFIG_CPU_FREQ is not set
158# CONFIG_TAU is not set 175# CONFIG_TAU 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,12 +188,16 @@ 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
178CONFIG_BINFMT_ELF=y 195CONFIG_BINFMT_ELF=y
179CONFIG_BINFMT_MISC=y 196CONFIG_BINFMT_MISC=y
197# CONFIG_IOMMU_HELPER is not set
180CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 198CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
199CONFIG_ARCH_HAS_WALK_MEMORY=y
200CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
181# CONFIG_KEXEC is not set 201# CONFIG_KEXEC is not set
182CONFIG_ARCH_FLATMEM_ENABLE=y 202CONFIG_ARCH_FLATMEM_ENABLE=y
183CONFIG_ARCH_POPULATES_NODE_MAP=y 203CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -197,11 +217,7 @@ CONFIG_VIRT_TO_BUS=y
197CONFIG_PROC_DEVICETREE=y 217CONFIG_PROC_DEVICETREE=y
198# CONFIG_CMDLINE_BOOL is not set 218# CONFIG_CMDLINE_BOOL is not set
199# CONFIG_PM is not set 219# CONFIG_PM is not set
200CONFIG_SUSPEND_UP_POSSIBLE=y
201CONFIG_HIBERNATION_UP_POSSIBLE=y
202# CONFIG_SECCOMP is not set 220# CONFIG_SECCOMP is not set
203CONFIG_WANT_DEVICE_TREE=y
204CONFIG_DEVICE_TREE=""
205CONFIG_ISA_DMA_API=y 221CONFIG_ISA_DMA_API=y
206 222
207# 223#
@@ -249,6 +265,7 @@ CONFIG_XFRM=y
249CONFIG_XFRM_USER=y 265CONFIG_XFRM_USER=y
250# CONFIG_XFRM_SUB_POLICY is not set 266# CONFIG_XFRM_SUB_POLICY is not set
251# CONFIG_XFRM_MIGRATE is not set 267# CONFIG_XFRM_MIGRATE is not set
268# CONFIG_XFRM_STATISTICS is not set
252# CONFIG_NET_KEY is not set 269# CONFIG_NET_KEY is not set
253CONFIG_INET=y 270CONFIG_INET=y
254CONFIG_IP_MULTICAST=y 271CONFIG_IP_MULTICAST=y
@@ -304,6 +321,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
304# 321#
305# CONFIG_NET_PKTGEN is not set 322# CONFIG_NET_PKTGEN is not set
306# CONFIG_HAMRADIO is not set 323# CONFIG_HAMRADIO is not set
324# CONFIG_CAN is not set
307# CONFIG_IRDA is not set 325# CONFIG_IRDA is not set
308# CONFIG_BT is not set 326# CONFIG_BT is not set
309# CONFIG_AF_RXRPC is not set 327# CONFIG_AF_RXRPC is not set
@@ -348,7 +366,7 @@ CONFIG_BLK_DEV_LOOP=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=131072 368CONFIG_BLK_DEV_RAM_SIZE=131072
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
354CONFIG_MISC_DEVICES=y 372CONFIG_MISC_DEVICES=y
@@ -356,6 +374,8 @@ CONFIG_MISC_DEVICES=y
356# CONFIG_EEPROM_93CX6 is not set 374# CONFIG_EEPROM_93CX6 is not set
357# CONFIG_SGI_IOC4 is not set 375# CONFIG_SGI_IOC4 is not set
358# CONFIG_TIFM_CORE is not set 376# CONFIG_TIFM_CORE is not set
377# CONFIG_ENCLOSURE_SERVICES is not set
378CONFIG_HAVE_IDE=y
359# CONFIG_IDE is not set 379# CONFIG_IDE is not set
360 380
361# 381#
@@ -419,6 +439,7 @@ CONFIG_SCSI_LOWLEVEL=y
419# CONFIG_SCSI_IPS is not set 439# CONFIG_SCSI_IPS is not set
420# CONFIG_SCSI_INITIO is not set 440# CONFIG_SCSI_INITIO is not set
421# CONFIG_SCSI_INIA100 is not set 441# CONFIG_SCSI_INIA100 is not set
442# CONFIG_SCSI_MVSAS is not set
422# CONFIG_SCSI_STEX is not set 443# CONFIG_SCSI_STEX is not set
423# CONFIG_SCSI_SYM53C8XX_2 is not set 444# CONFIG_SCSI_SYM53C8XX_2 is not set
424# CONFIG_SCSI_IPR is not set 445# CONFIG_SCSI_IPR is not set
@@ -472,6 +493,7 @@ CONFIG_SATA_MV=y
472# CONFIG_PATA_MPIIX is not set 493# CONFIG_PATA_MPIIX is not set
473# CONFIG_PATA_OLDPIIX is not set 494# CONFIG_PATA_OLDPIIX is not set
474# CONFIG_PATA_NETCELL is not set 495# CONFIG_PATA_NETCELL is not set
496# CONFIG_PATA_NINJA32 is not set
475# CONFIG_PATA_NS87410 is not set 497# CONFIG_PATA_NS87410 is not set
476# CONFIG_PATA_NS87415 is not set 498# CONFIG_PATA_NS87415 is not set
477# CONFIG_PATA_OPTI is not set 499# CONFIG_PATA_OPTI is not set
@@ -505,7 +527,6 @@ CONFIG_NETDEVICES=y
505# CONFIG_EQUALIZER is not set 527# CONFIG_EQUALIZER is not set
506# CONFIG_TUN is not set 528# CONFIG_TUN is not set
507# CONFIG_VETH is not set 529# CONFIG_VETH is not set
508# CONFIG_IP1000 is not set
509# CONFIG_ARCNET is not set 530# CONFIG_ARCNET is not set
510CONFIG_PHYLIB=y 531CONFIG_PHYLIB=y
511 532
@@ -521,6 +542,7 @@ CONFIG_PHYLIB=y
521# CONFIG_SMSC_PHY is not set 542# CONFIG_SMSC_PHY is not set
522# CONFIG_BROADCOM_PHY is not set 543# CONFIG_BROADCOM_PHY is not set
523# CONFIG_ICPLUS_PHY is not set 544# CONFIG_ICPLUS_PHY is not set
545# CONFIG_REALTEK_PHY is not set
524# CONFIG_FIXED_PHY is not set 546# CONFIG_FIXED_PHY is not set
525# CONFIG_MDIO_BITBANG is not set 547# CONFIG_MDIO_BITBANG is not set
526CONFIG_NET_ETHERNET=y 548CONFIG_NET_ETHERNET=y
@@ -552,6 +574,7 @@ CONFIG_8139TOO=y
552# CONFIG_8139TOO_TUNE_TWISTER is not set 574# CONFIG_8139TOO_TUNE_TWISTER is not set
553# CONFIG_8139TOO_8129 is not set 575# CONFIG_8139TOO_8129 is not set
554# CONFIG_8139_OLD_RX_RESET is not set 576# CONFIG_8139_OLD_RX_RESET is not set
577# CONFIG_R6040 is not set
555# CONFIG_SIS900 is not set 578# CONFIG_SIS900 is not set
556# CONFIG_EPIC100 is not set 579# CONFIG_EPIC100 is not set
557# CONFIG_SUNDANCE is not set 580# CONFIG_SUNDANCE is not set
@@ -563,6 +586,9 @@ CONFIG_NETDEV_1000=y
563# CONFIG_DL2K is not set 586# CONFIG_DL2K is not set
564# CONFIG_E1000 is not set 587# CONFIG_E1000 is not set
565# CONFIG_E1000E is not set 588# CONFIG_E1000E is not set
589# CONFIG_E1000E_ENABLED is not set
590# CONFIG_IP1000 is not set
591# CONFIG_IGB is not set
566# CONFIG_NS83820 is not set 592# CONFIG_NS83820 is not set
567# CONFIG_HAMACHI is not set 593# CONFIG_HAMACHI is not set
568# CONFIG_YELLOWFIN is not set 594# CONFIG_YELLOWFIN is not set
@@ -589,6 +615,7 @@ CONFIG_NETDEV_10000=y
589# CONFIG_NIU is not set 615# CONFIG_NIU is not set
590# CONFIG_MLX4_CORE is not set 616# CONFIG_MLX4_CORE is not set
591# CONFIG_TEHUTI is not set 617# CONFIG_TEHUTI is not set
618# CONFIG_BNX2X is not set
592# CONFIG_TR is not set 619# CONFIG_TR is not set
593 620
594# 621#
@@ -602,7 +629,6 @@ CONFIG_NETDEV_10000=y
602# CONFIG_PPP is not set 629# CONFIG_PPP is not set
603# CONFIG_SLIP is not set 630# CONFIG_SLIP is not set
604# CONFIG_NET_FC is not set 631# CONFIG_NET_FC is not set
605# CONFIG_SHAPER is not set
606# CONFIG_NETCONSOLE is not set 632# CONFIG_NETCONSOLE is not set
607# CONFIG_NETPOLL is not set 633# CONFIG_NETPOLL is not set
608# CONFIG_NET_POLL_CONTROLLER is not set 634# CONFIG_NET_POLL_CONTROLLER is not set
@@ -645,6 +671,7 @@ CONFIG_INPUT=y
645# 671#
646# CONFIG_VT is not set 672# CONFIG_VT is not set
647# CONFIG_SERIAL_NONSTANDARD is not set 673# CONFIG_SERIAL_NONSTANDARD is not set
674# CONFIG_NOZOMI is not set
648 675
649# 676#
650# Serial drivers 677# Serial drivers
@@ -703,6 +730,7 @@ CONFIG_HWMON=y
703# CONFIG_SENSORS_W83627HF is not set 730# CONFIG_SENSORS_W83627HF is not set
704# CONFIG_SENSORS_W83627EHF is not set 731# CONFIG_SENSORS_W83627EHF is not set
705# CONFIG_HWMON_DEBUG_CHIP is not set 732# CONFIG_HWMON_DEBUG_CHIP is not set
733# CONFIG_THERMAL is not set
706# CONFIG_WATCHDOG is not set 734# CONFIG_WATCHDOG is not set
707 735
708# 736#
@@ -755,16 +783,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
755# 783#
756# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 784# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
757# 785#
758
759#
760# USB Gadget Support
761#
762# CONFIG_USB_GADGET is not set 786# CONFIG_USB_GADGET is not set
763# CONFIG_MMC is not set 787# CONFIG_MMC is not set
788# CONFIG_MEMSTICK is not set
764# CONFIG_NEW_LEDS is not set 789# CONFIG_NEW_LEDS is not set
765# CONFIG_INFINIBAND is not set 790# CONFIG_INFINIBAND is not set
766# CONFIG_EDAC is not set 791# CONFIG_EDAC is not set
767# CONFIG_RTC_CLASS is not set 792# CONFIG_RTC_CLASS is not set
793# CONFIG_DMADEVICES is not set
768 794
769# 795#
770# Userspace I/O 796# Userspace I/O
@@ -790,12 +816,10 @@ CONFIG_FS_MBCACHE=y
790# CONFIG_XFS_FS is not set 816# CONFIG_XFS_FS is not set
791# CONFIG_GFS2_FS is not set 817# CONFIG_GFS2_FS is not set
792# CONFIG_OCFS2_FS is not set 818# CONFIG_OCFS2_FS is not set
793# CONFIG_MINIX_FS is not set 819CONFIG_DNOTIFY=y
794# CONFIG_ROMFS_FS is not set
795CONFIG_INOTIFY=y 820CONFIG_INOTIFY=y
796CONFIG_INOTIFY_USER=y 821CONFIG_INOTIFY_USER=y
797# CONFIG_QUOTA is not set 822# CONFIG_QUOTA is not set
798CONFIG_DNOTIFY=y
799# CONFIG_AUTOFS_FS is not set 823# CONFIG_AUTOFS_FS is not set
800# CONFIG_AUTOFS4_FS is not set 824# CONFIG_AUTOFS4_FS is not set
801# CONFIG_FUSE_FS is not set 825# CONFIG_FUSE_FS is not set
@@ -837,8 +861,10 @@ CONFIG_TMPFS=y
837# CONFIG_EFS_FS is not set 861# CONFIG_EFS_FS is not set
838# CONFIG_CRAMFS is not set 862# CONFIG_CRAMFS is not set
839# CONFIG_VXFS_FS is not set 863# CONFIG_VXFS_FS is not set
864# CONFIG_MINIX_FS is not set
840# CONFIG_HPFS_FS is not set 865# CONFIG_HPFS_FS is not set
841# CONFIG_QNX4FS_FS is not set 866# CONFIG_QNX4FS_FS is not set
867# CONFIG_ROMFS_FS is not set
842# CONFIG_SYSV_FS is not set 868# CONFIG_SYSV_FS is not set
843# CONFIG_UFS_FS is not set 869# CONFIG_UFS_FS is not set
844CONFIG_NETWORK_FILESYSTEMS=y 870CONFIG_NETWORK_FILESYSTEMS=y
@@ -883,7 +909,6 @@ CONFIG_MSDOS_PARTITION=y
883# CONFIG_SYSV68_PARTITION is not set 909# CONFIG_SYSV68_PARTITION is not set
884# CONFIG_NLS is not set 910# CONFIG_NLS is not set
885# CONFIG_DLM is not set 911# CONFIG_DLM is not set
886# CONFIG_UCC_SLOW is not set
887 912
888# 913#
889# Library routines 914# Library routines
@@ -899,7 +924,6 @@ CONFIG_PLIST=y
899CONFIG_HAS_IOMEM=y 924CONFIG_HAS_IOMEM=y
900CONFIG_HAS_IOPORT=y 925CONFIG_HAS_IOPORT=y
901CONFIG_HAS_DMA=y 926CONFIG_HAS_DMA=y
902# CONFIG_INSTRUMENTATION is not set
903 927
904# 928#
905# Kernel hacking 929# Kernel hacking
@@ -913,6 +937,7 @@ CONFIG_ENABLE_MUST_CHECK=y
913# CONFIG_HEADERS_CHECK is not set 937# CONFIG_HEADERS_CHECK is not set
914# CONFIG_DEBUG_KERNEL is not set 938# CONFIG_DEBUG_KERNEL is not set
915# CONFIG_SLUB_DEBUG_ON is not set 939# CONFIG_SLUB_DEBUG_ON is not set
940# CONFIG_SLUB_STATS is not set
916# CONFIG_DEBUG_BUGVERBOSE is not set 941# CONFIG_DEBUG_BUGVERBOSE is not set
917# CONFIG_SAMPLES is not set 942# CONFIG_SAMPLES is not set
918# CONFIG_BOOTX_TEXT is not set 943# CONFIG_BOOTX_TEXT is not set
@@ -924,5 +949,49 @@ CONFIG_ENABLE_MUST_CHECK=y
924# CONFIG_KEYS is not set 949# CONFIG_KEYS is not set
925# CONFIG_SECURITY is not set 950# CONFIG_SECURITY is not set
926# CONFIG_SECURITY_FILE_CAPABILITIES is not set 951# CONFIG_SECURITY_FILE_CAPABILITIES is not set
927# CONFIG_CRYPTO is not set 952CONFIG_CRYPTO=y
953# CONFIG_CRYPTO_SEQIV is not set
954# CONFIG_CRYPTO_MANAGER is not set
955# CONFIG_CRYPTO_HMAC is not set
956# CONFIG_CRYPTO_XCBC is not set
957# CONFIG_CRYPTO_NULL is not set
958# CONFIG_CRYPTO_MD4 is not set
959# CONFIG_CRYPTO_MD5 is not set
960# CONFIG_CRYPTO_SHA1 is not set
961# CONFIG_CRYPTO_SHA256 is not set
962# CONFIG_CRYPTO_SHA512 is not set
963# CONFIG_CRYPTO_WP512 is not set
964# CONFIG_CRYPTO_TGR192 is not set
965# CONFIG_CRYPTO_GF128MUL is not set
966# CONFIG_CRYPTO_ECB is not set
967# CONFIG_CRYPTO_CBC is not set
968# CONFIG_CRYPTO_PCBC is not set
969# CONFIG_CRYPTO_LRW is not set
970# CONFIG_CRYPTO_XTS is not set
971# CONFIG_CRYPTO_CTR is not set
972# CONFIG_CRYPTO_GCM is not set
973# CONFIG_CRYPTO_CCM is not set
974# CONFIG_CRYPTO_CRYPTD is not set
975# CONFIG_CRYPTO_DES is not set
976# CONFIG_CRYPTO_FCRYPT is not set
977# CONFIG_CRYPTO_BLOWFISH is not set
978# CONFIG_CRYPTO_TWOFISH is not set
979# CONFIG_CRYPTO_SERPENT is not set
980# CONFIG_CRYPTO_AES is not set
981# CONFIG_CRYPTO_CAST5 is not set
982# CONFIG_CRYPTO_CAST6 is not set
983# CONFIG_CRYPTO_TEA is not set
984# CONFIG_CRYPTO_ARC4 is not set
985# CONFIG_CRYPTO_KHAZAD is not set
986# CONFIG_CRYPTO_ANUBIS is not set
987# CONFIG_CRYPTO_SEED is not set
988# CONFIG_CRYPTO_SALSA20 is not set
989# CONFIG_CRYPTO_DEFLATE is not set
990# CONFIG_CRYPTO_MICHAEL_MIC is not set
991# CONFIG_CRYPTO_CRC32C is not set
992# CONFIG_CRYPTO_CAMELLIA is not set
993# CONFIG_CRYPTO_AUTHENC is not set
994# CONFIG_CRYPTO_LZO is not set
995CONFIG_CRYPTO_HW=y
996# CONFIG_CRYPTO_DEV_HIFN_795X is not set
928# CONFIG_PPC_CLOCK is not set 997# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig
index 5eae305215dc..0264c5757f78 100644
--- a/arch/powerpc/configs/mpc8272_ads_defconfig
+++ b/arch/powerpc/configs/mpc8272_ads_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-rc5 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 13 22:40:57 2007 4# Mon Mar 24 08:48:13 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -28,6 +28,7 @@ CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y 28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y 29CONFIG_GENERIC_CLOCKEVENTS=y
30CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
31# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
31CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
32CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
33CONFIG_ARCH_HAS_ILOG2_U32=y 34CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -69,9 +70,14 @@ CONFIG_IKCONFIG=y
69CONFIG_IKCONFIG_PROC=y 70CONFIG_IKCONFIG_PROC=y
70CONFIG_LOG_BUF_SHIFT=14 71CONFIG_LOG_BUF_SHIFT=14
71# CONFIG_CGROUPS is not set 72# CONFIG_CGROUPS is not set
73CONFIG_GROUP_SCHED=y
72# CONFIG_FAIR_GROUP_SCHED is not set 74# CONFIG_FAIR_GROUP_SCHED is not set
75CONFIG_USER_SCHED=y
76# CONFIG_CGROUP_SCHED is not set
73CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
78CONFIG_SYSFS_DEPRECATED_V2=y
74# CONFIG_RELAY is not set 79# CONFIG_RELAY is not set
80# CONFIG_NAMESPACES is not set
75# CONFIG_BLK_DEV_INITRD is not set 81# CONFIG_BLK_DEV_INITRD is not set
76CONFIG_SYSCTL=y 82CONFIG_SYSCTL=y
77CONFIG_EMBEDDED=y 83CONFIG_EMBEDDED=y
@@ -83,11 +89,13 @@ CONFIG_HOTPLUG=y
83CONFIG_PRINTK=y 89CONFIG_PRINTK=y
84CONFIG_BUG=y 90CONFIG_BUG=y
85CONFIG_ELF_CORE=y 91CONFIG_ELF_CORE=y
92CONFIG_COMPAT_BRK=y
86CONFIG_BASE_FULL=y 93CONFIG_BASE_FULL=y
87CONFIG_FUTEX=y 94CONFIG_FUTEX=y
88CONFIG_ANON_INODES=y 95CONFIG_ANON_INODES=y
89CONFIG_EPOLL=y 96CONFIG_EPOLL=y
90CONFIG_SIGNALFD=y 97CONFIG_SIGNALFD=y
98CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 99CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 100CONFIG_SHMEM=y
93CONFIG_VM_EVENT_COUNTERS=y 101CONFIG_VM_EVENT_COUNTERS=y
@@ -95,6 +103,13 @@ CONFIG_SLUB_DEBUG=y
95# CONFIG_SLAB is not set 103# CONFIG_SLAB is not set
96CONFIG_SLUB=y 104CONFIG_SLUB=y
97# CONFIG_SLOB is not set 105# CONFIG_SLOB is not set
106# CONFIG_PROFILING is not set
107# CONFIG_MARKERS is not set
108CONFIG_HAVE_OPROFILE=y
109CONFIG_HAVE_KPROBES=y
110CONFIG_HAVE_KRETPROBES=y
111CONFIG_PROC_PAGE_MONITOR=y
112CONFIG_SLABINFO=y
98CONFIG_RT_MUTEXES=y 113CONFIG_RT_MUTEXES=y
99# CONFIG_TINY_SHMEM is not set 114# CONFIG_TINY_SHMEM is not set
100CONFIG_BASE_SMALL=0 115CONFIG_BASE_SMALL=0
@@ -116,6 +131,7 @@ CONFIG_DEFAULT_AS=y
116# CONFIG_DEFAULT_CFQ is not set 131# CONFIG_DEFAULT_CFQ is not set
117# CONFIG_DEFAULT_NOOP is not set 132# CONFIG_DEFAULT_NOOP is not set
118CONFIG_DEFAULT_IOSCHED="anticipatory" 133CONFIG_DEFAULT_IOSCHED="anticipatory"
134CONFIG_CLASSIC_RCU=y
119 135
120# 136#
121# Platform support 137# Platform support
@@ -124,16 +140,18 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
124CONFIG_PPC_82xx=y 140CONFIG_PPC_82xx=y
125# CONFIG_PPC_83xx is not set 141# CONFIG_PPC_83xx is not set
126# CONFIG_PPC_86xx is not set 142# CONFIG_PPC_86xx is not set
127# CONFIG_PPC_MPC52xx is not set 143# CONFIG_PPC_MPC512x is not set
128# CONFIG_PPC_MPC5200 is not set 144# CONFIG_PPC_MPC5121 is not set
129# CONFIG_PPC_CELL is not set 145# CONFIG_PPC_CELL is not set
130# CONFIG_PPC_CELL_NATIVE is not set 146# CONFIG_PPC_CELL_NATIVE is not set
131CONFIG_MPC8272_ADS=y 147CONFIG_MPC8272_ADS=y
132# CONFIG_PQ2FADS is not set 148# CONFIG_PQ2FADS is not set
149# CONFIG_EP8248E is not set
133CONFIG_PQ2ADS=y 150CONFIG_PQ2ADS=y
134CONFIG_8260=y 151CONFIG_8260=y
135CONFIG_8272=y 152CONFIG_8272=y
136CONFIG_PQ2_ADS_PCI_PIC=y 153CONFIG_PQ2_ADS_PCI_PIC=y
154# CONFIG_IPIC is not set
137# CONFIG_MPIC is not set 155# CONFIG_MPIC is not set
138# CONFIG_MPIC_WEIRD is not set 156# CONFIG_MPIC_WEIRD is not set
139# CONFIG_PPC_I8259 is not set 157# CONFIG_PPC_I8259 is not set
@@ -162,12 +180,16 @@ CONFIG_HZ_250=y
162# CONFIG_HZ_300 is not set 180# CONFIG_HZ_300 is not set
163# CONFIG_HZ_1000 is not set 181# CONFIG_HZ_1000 is not set
164CONFIG_HZ=250 182CONFIG_HZ=250
183# CONFIG_SCHED_HRTICK is not set
165CONFIG_PREEMPT_NONE=y 184CONFIG_PREEMPT_NONE=y
166# CONFIG_PREEMPT_VOLUNTARY is not set 185# CONFIG_PREEMPT_VOLUNTARY is not set
167# CONFIG_PREEMPT is not set 186# CONFIG_PREEMPT is not set
168CONFIG_BINFMT_ELF=y 187CONFIG_BINFMT_ELF=y
169CONFIG_BINFMT_MISC=y 188CONFIG_BINFMT_MISC=y
189# CONFIG_IOMMU_HELPER is not set
170CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 190CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
191CONFIG_ARCH_HAS_WALK_MEMORY=y
192CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
171CONFIG_ARCH_FLATMEM_ENABLE=y 193CONFIG_ARCH_FLATMEM_ENABLE=y
172CONFIG_ARCH_POPULATES_NODE_MAP=y 194CONFIG_ARCH_POPULATES_NODE_MAP=y
173CONFIG_FLATMEM=y 195CONFIG_FLATMEM=y
@@ -182,11 +204,7 @@ CONFIG_VIRT_TO_BUS=y
182CONFIG_PROC_DEVICETREE=y 204CONFIG_PROC_DEVICETREE=y
183# CONFIG_CMDLINE_BOOL is not set 205# CONFIG_CMDLINE_BOOL is not set
184# CONFIG_PM is not set 206# CONFIG_PM is not set
185CONFIG_SUSPEND_UP_POSSIBLE=y
186CONFIG_HIBERNATION_UP_POSSIBLE=y
187CONFIG_SECCOMP=y 207CONFIG_SECCOMP=y
188CONFIG_WANT_DEVICE_TREE=y
189CONFIG_DEVICE_TREE="mpc8272ads.dts"
190CONFIG_ISA_DMA_API=y 208CONFIG_ISA_DMA_API=y
191 209
192# 210#
@@ -205,6 +223,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
205CONFIG_PCI_LEGACY=y 223CONFIG_PCI_LEGACY=y
206# CONFIG_PCI_DEBUG is not set 224# CONFIG_PCI_DEBUG is not set
207# CONFIG_PCCARD is not set 225# CONFIG_PCCARD is not set
226# CONFIG_HOTPLUG_PCI is not set
208 227
209# 228#
210# Advanced setup 229# Advanced setup
@@ -277,12 +296,13 @@ CONFIG_IPV6_SIT=y
277# CONFIG_NETWORK_SECMARK is not set 296# CONFIG_NETWORK_SECMARK is not set
278CONFIG_NETFILTER=y 297CONFIG_NETFILTER=y
279# CONFIG_NETFILTER_DEBUG is not set 298# CONFIG_NETFILTER_DEBUG is not set
299CONFIG_NETFILTER_ADVANCED=y
280 300
281# 301#
282# Core Netfilter Configuration 302# Core Netfilter Configuration
283# 303#
284# CONFIG_NETFILTER_NETLINK is not set 304# CONFIG_NETFILTER_NETLINK_QUEUE is not set
285# CONFIG_NF_CONNTRACK_ENABLED is not set 305# CONFIG_NETFILTER_NETLINK_LOG is not set
286# CONFIG_NF_CONNTRACK is not set 306# CONFIG_NF_CONNTRACK is not set
287# CONFIG_NETFILTER_XTABLES is not set 307# CONFIG_NETFILTER_XTABLES is not set
288 308
@@ -292,6 +312,13 @@ CONFIG_NETFILTER=y
292# CONFIG_IP_NF_QUEUE is not set 312# CONFIG_IP_NF_QUEUE is not set
293# CONFIG_IP_NF_IPTABLES is not set 313# CONFIG_IP_NF_IPTABLES is not set
294# CONFIG_IP_NF_ARPTABLES is not set 314# CONFIG_IP_NF_ARPTABLES is not set
315
316#
317# IPv6: Netfilter Configuration
318#
319# CONFIG_IP6_NF_QUEUE is not set
320# CONFIG_IP6_NF_IPTABLES is not set
321# CONFIG_ATM is not set
295# CONFIG_BRIDGE is not set 322# CONFIG_BRIDGE is not set
296# CONFIG_VLAN_8021Q is not set 323# CONFIG_VLAN_8021Q is not set
297# CONFIG_DECNET is not set 324# CONFIG_DECNET is not set
@@ -305,6 +332,7 @@ CONFIG_NETFILTER=y
305# 332#
306# CONFIG_NET_PKTGEN is not set 333# CONFIG_NET_PKTGEN is not set
307# CONFIG_HAMRADIO is not set 334# CONFIG_HAMRADIO is not set
335# CONFIG_CAN is not set
308# CONFIG_IRDA is not set 336# CONFIG_IRDA is not set
309# CONFIG_BT is not set 337# CONFIG_BT is not set
310 338
@@ -313,6 +341,7 @@ CONFIG_NETFILTER=y
313# 341#
314# CONFIG_CFG80211 is not set 342# CONFIG_CFG80211 is not set
315# CONFIG_WIRELESS_EXT is not set 343# CONFIG_WIRELESS_EXT is not set
344# CONFIG_MAC80211 is not set
316# CONFIG_IEEE80211 is not set 345# CONFIG_IEEE80211 is not set
317# CONFIG_RFKILL is not set 346# CONFIG_RFKILL is not set
318 347
@@ -427,6 +456,7 @@ CONFIG_BLK_DEV_LOOP=y
427# CONFIG_CDROM_PKTCDVD is not set 456# CONFIG_CDROM_PKTCDVD is not set
428# CONFIG_ATA_OVER_ETH is not set 457# CONFIG_ATA_OVER_ETH is not set
429# CONFIG_MISC_DEVICES is not set 458# CONFIG_MISC_DEVICES is not set
459CONFIG_HAVE_IDE=y
430# CONFIG_IDE is not set 460# CONFIG_IDE is not set
431 461
432# 462#
@@ -472,6 +502,7 @@ CONFIG_DAVICOM_PHY=y
472# CONFIG_SMSC_PHY is not set 502# CONFIG_SMSC_PHY is not set
473# CONFIG_BROADCOM_PHY is not set 503# CONFIG_BROADCOM_PHY is not set
474# CONFIG_ICPLUS_PHY is not set 504# CONFIG_ICPLUS_PHY is not set
505# CONFIG_REALTEK_PHY is not set
475# CONFIG_FIXED_PHY is not set 506# CONFIG_FIXED_PHY is not set
476CONFIG_MDIO_BITBANG=y 507CONFIG_MDIO_BITBANG=y
477CONFIG_NET_ETHERNET=y 508CONFIG_NET_ETHERNET=y
@@ -497,6 +528,8 @@ CONFIG_NETDEV_1000=y
497# CONFIG_DL2K is not set 528# CONFIG_DL2K is not set
498# CONFIG_E1000 is not set 529# CONFIG_E1000 is not set
499# CONFIG_E1000E is not set 530# CONFIG_E1000E is not set
531# CONFIG_E1000E_ENABLED is not set
532# CONFIG_IGB is not set
500# CONFIG_NS83820 is not set 533# CONFIG_NS83820 is not set
501# CONFIG_HAMACHI is not set 534# CONFIG_HAMACHI is not set
502# CONFIG_R8169 is not set 535# CONFIG_R8169 is not set
@@ -507,6 +540,7 @@ CONFIG_NETDEV_1000=y
507# CONFIG_VIA_VELOCITY is not set 540# CONFIG_VIA_VELOCITY is not set
508# CONFIG_TIGON3 is not set 541# CONFIG_TIGON3 is not set
509# CONFIG_BNX2 is not set 542# CONFIG_BNX2 is not set
543# CONFIG_GIANFAR is not set
510# CONFIG_QLA3XXX is not set 544# CONFIG_QLA3XXX is not set
511CONFIG_NETDEV_10000=y 545CONFIG_NETDEV_10000=y
512# CONFIG_CHELSIO_T1 is not set 546# CONFIG_CHELSIO_T1 is not set
@@ -519,6 +553,7 @@ CONFIG_NETDEV_10000=y
519# CONFIG_NIU is not set 553# CONFIG_NIU is not set
520# CONFIG_MLX4_CORE is not set 554# CONFIG_MLX4_CORE is not set
521# CONFIG_TEHUTI is not set 555# CONFIG_TEHUTI is not set
556# CONFIG_BNX2X is not set
522# CONFIG_TR is not set 557# CONFIG_TR is not set
523 558
524# 559#
@@ -642,6 +677,7 @@ CONFIG_DEVPORT=y
642# CONFIG_W1 is not set 677# CONFIG_W1 is not set
643# CONFIG_POWER_SUPPLY is not set 678# CONFIG_POWER_SUPPLY is not set
644# CONFIG_HWMON is not set 679# CONFIG_HWMON is not set
680# CONFIG_THERMAL is not set
645# CONFIG_WATCHDOG is not set 681# CONFIG_WATCHDOG is not set
646 682
647# 683#
@@ -684,9 +720,11 @@ CONFIG_DAB=y
684# CONFIG_HID_SUPPORT is not set 720# CONFIG_HID_SUPPORT is not set
685# CONFIG_USB_SUPPORT is not set 721# CONFIG_USB_SUPPORT is not set
686# CONFIG_MMC is not set 722# CONFIG_MMC is not set
723# CONFIG_MEMSTICK is not set
687# CONFIG_NEW_LEDS is not set 724# CONFIG_NEW_LEDS is not set
688# CONFIG_INFINIBAND is not set 725# CONFIG_INFINIBAND is not set
689# CONFIG_RTC_CLASS is not set 726# CONFIG_RTC_CLASS is not set
727# CONFIG_DMADEVICES is not set
690 728
691# 729#
692# Userspace I/O 730# Userspace I/O
@@ -710,12 +748,10 @@ CONFIG_FS_MBCACHE=y
710CONFIG_FS_POSIX_ACL=y 748CONFIG_FS_POSIX_ACL=y
711# CONFIG_XFS_FS is not set 749# CONFIG_XFS_FS is not set
712# CONFIG_OCFS2_FS is not set 750# CONFIG_OCFS2_FS is not set
713# CONFIG_MINIX_FS is not set 751CONFIG_DNOTIFY=y
714# CONFIG_ROMFS_FS is not set
715CONFIG_INOTIFY=y 752CONFIG_INOTIFY=y
716CONFIG_INOTIFY_USER=y 753CONFIG_INOTIFY_USER=y
717# CONFIG_QUOTA is not set 754# CONFIG_QUOTA is not set
718CONFIG_DNOTIFY=y
719# CONFIG_AUTOFS_FS is not set 755# CONFIG_AUTOFS_FS is not set
720CONFIG_AUTOFS4_FS=y 756CONFIG_AUTOFS4_FS=y
721# CONFIG_FUSE_FS is not set 757# CONFIG_FUSE_FS is not set
@@ -743,6 +779,7 @@ CONFIG_SYSFS=y
743CONFIG_TMPFS=y 779CONFIG_TMPFS=y
744# CONFIG_TMPFS_POSIX_ACL is not set 780# CONFIG_TMPFS_POSIX_ACL is not set
745# CONFIG_HUGETLB_PAGE is not set 781# CONFIG_HUGETLB_PAGE is not set
782# CONFIG_CONFIGFS_FS is not set
746 783
747# 784#
748# Miscellaneous filesystems 785# Miscellaneous filesystems
@@ -751,8 +788,10 @@ CONFIG_TMPFS=y
751# CONFIG_JFFS2_FS is not set 788# CONFIG_JFFS2_FS is not set
752CONFIG_CRAMFS=y 789CONFIG_CRAMFS=y
753# CONFIG_VXFS_FS is not set 790# CONFIG_VXFS_FS is not set
791# CONFIG_MINIX_FS is not set
754# CONFIG_HPFS_FS is not set 792# CONFIG_HPFS_FS is not set
755# CONFIG_QNX4FS_FS is not set 793# CONFIG_QNX4FS_FS is not set
794# CONFIG_ROMFS_FS is not set
756# CONFIG_SYSV_FS is not set 795# CONFIG_SYSV_FS is not set
757# CONFIG_UFS_FS is not set 796# CONFIG_UFS_FS is not set
758CONFIG_NETWORK_FILESYSTEMS=y 797CONFIG_NETWORK_FILESYSTEMS=y
@@ -833,7 +872,6 @@ CONFIG_NLS_ISO8859_1=y
833# CONFIG_NLS_KOI8_R is not set 872# CONFIG_NLS_KOI8_R is not set
834# CONFIG_NLS_KOI8_U is not set 873# CONFIG_NLS_KOI8_U is not set
835CONFIG_NLS_UTF8=y 874CONFIG_NLS_UTF8=y
836# CONFIG_UCC_SLOW is not set
837 875
838# 876#
839# Library routines 877# Library routines
@@ -851,7 +889,6 @@ CONFIG_PLIST=y
851CONFIG_HAS_IOMEM=y 889CONFIG_HAS_IOMEM=y
852CONFIG_HAS_IOPORT=y 890CONFIG_HAS_IOPORT=y
853CONFIG_HAS_DMA=y 891CONFIG_HAS_DMA=y
854# CONFIG_INSTRUMENTATION is not set
855 892
856# 893#
857# Kernel hacking 894# Kernel hacking
@@ -870,6 +907,7 @@ CONFIG_SCHED_DEBUG=y
870# CONFIG_SCHEDSTATS is not set 907# CONFIG_SCHEDSTATS is not set
871# CONFIG_TIMER_STATS is not set 908# CONFIG_TIMER_STATS is not set
872# CONFIG_SLUB_DEBUG_ON is not set 909# CONFIG_SLUB_DEBUG_ON is not set
910# CONFIG_SLUB_STATS is not set
873# CONFIG_DEBUG_RT_MUTEXES is not set 911# CONFIG_DEBUG_RT_MUTEXES is not set
874# CONFIG_RT_MUTEX_TESTER is not set 912# CONFIG_RT_MUTEX_TESTER is not set
875# CONFIG_DEBUG_SPINLOCK is not set 913# CONFIG_DEBUG_SPINLOCK is not set
@@ -882,8 +920,8 @@ CONFIG_DEBUG_INFO=y
882# CONFIG_DEBUG_VM is not set 920# CONFIG_DEBUG_VM is not set
883# CONFIG_DEBUG_LIST is not set 921# CONFIG_DEBUG_LIST is not set
884# CONFIG_DEBUG_SG is not set 922# CONFIG_DEBUG_SG is not set
885CONFIG_FORCED_INLINING=y
886# CONFIG_BOOT_PRINTK_DELAY is not set 923# CONFIG_BOOT_PRINTK_DELAY is not set
924# CONFIG_BACKTRACE_SELF_TEST is not set
887# CONFIG_FAULT_INJECTION is not set 925# CONFIG_FAULT_INJECTION is not set
888# CONFIG_SAMPLES is not set 926# CONFIG_SAMPLES is not set
889# CONFIG_DEBUG_STACKOVERFLOW is not set 927# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -902,6 +940,7 @@ CONFIG_BDI_SWITCH=y
902CONFIG_CRYPTO=y 940CONFIG_CRYPTO=y
903CONFIG_CRYPTO_ALGAPI=y 941CONFIG_CRYPTO_ALGAPI=y
904CONFIG_CRYPTO_BLKCIPHER=y 942CONFIG_CRYPTO_BLKCIPHER=y
943# CONFIG_CRYPTO_SEQIV is not set
905CONFIG_CRYPTO_MANAGER=y 944CONFIG_CRYPTO_MANAGER=y
906# CONFIG_CRYPTO_HMAC is not set 945# CONFIG_CRYPTO_HMAC is not set
907# CONFIG_CRYPTO_NULL is not set 946# CONFIG_CRYPTO_NULL is not set
@@ -915,6 +954,9 @@ CONFIG_CRYPTO_MD5=y
915CONFIG_CRYPTO_ECB=y 954CONFIG_CRYPTO_ECB=y
916CONFIG_CRYPTO_CBC=y 955CONFIG_CRYPTO_CBC=y
917CONFIG_CRYPTO_PCBC=y 956CONFIG_CRYPTO_PCBC=y
957# CONFIG_CRYPTO_CTR is not set
958# CONFIG_CRYPTO_GCM is not set
959# CONFIG_CRYPTO_CCM is not set
918# CONFIG_CRYPTO_CRYPTD is not set 960# CONFIG_CRYPTO_CRYPTD is not set
919CONFIG_CRYPTO_DES=y 961CONFIG_CRYPTO_DES=y
920# CONFIG_CRYPTO_FCRYPT is not set 962# CONFIG_CRYPTO_FCRYPT is not set
@@ -934,6 +976,7 @@ CONFIG_CRYPTO_DES=y
934# CONFIG_CRYPTO_CRC32C is not set 976# CONFIG_CRYPTO_CRC32C is not set
935# CONFIG_CRYPTO_CAMELLIA is not set 977# CONFIG_CRYPTO_CAMELLIA is not set
936# CONFIG_CRYPTO_AUTHENC is not set 978# CONFIG_CRYPTO_AUTHENC is not set
979# CONFIG_CRYPTO_LZO is not set
937# CONFIG_CRYPTO_HW is not set 980# CONFIG_CRYPTO_HW is not set
938# CONFIG_PPC_CLOCK is not set 981# CONFIG_PPC_CLOCK is not set
939CONFIG_PPC_LIB_RHEAP=y 982CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc8313_rdb_defconfig b/arch/powerpc/configs/mpc8313_rdb_defconfig
index 3b29ac53844e..7a862a6e3be8 100644
--- a/arch/powerpc/configs/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/mpc8313_rdb_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-rc6
4# Thu Jan 17 16:35:55 2008 4# Mon Mar 24 08:48:14 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,8 +14,8 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_83xx=y
18CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
18# CONFIG_FSL_EMB_PERFMON is not set
19CONFIG_PPC_STD_MMU=y 19CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y 20CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -66,15 +67,19 @@ CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set 73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y
75# CONFIG_FAIR_GROUP_SCHED is not set 75# CONFIG_FAIR_GROUP_SCHED is not set
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
76CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
77# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
78CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
79CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -86,11 +91,13 @@ CONFIG_HOTPLUG=y
86CONFIG_PRINTK=y 91CONFIG_PRINTK=y
87CONFIG_BUG=y 92CONFIG_BUG=y
88CONFIG_ELF_CORE=y 93CONFIG_ELF_CORE=y
94CONFIG_COMPAT_BRK=y
89CONFIG_BASE_FULL=y 95CONFIG_BASE_FULL=y
90CONFIG_FUTEX=y 96CONFIG_FUTEX=y
91CONFIG_ANON_INODES=y 97CONFIG_ANON_INODES=y
92# CONFIG_EPOLL is not set 98# CONFIG_EPOLL is not set
93CONFIG_SIGNALFD=y 99CONFIG_SIGNALFD=y
100CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
95CONFIG_SHMEM=y 102CONFIG_SHMEM=y
96CONFIG_VM_EVENT_COUNTERS=y 103CONFIG_VM_EVENT_COUNTERS=y
@@ -98,6 +105,13 @@ CONFIG_SLUB_DEBUG=y
98# CONFIG_SLAB is not set 105# CONFIG_SLAB is not set
99CONFIG_SLUB=y 106CONFIG_SLUB=y
100# CONFIG_SLOB is not set 107# CONFIG_SLOB is not set
108# CONFIG_PROFILING is not set
109# CONFIG_MARKERS is not set
110CONFIG_HAVE_OPROFILE=y
111CONFIG_HAVE_KPROBES=y
112CONFIG_HAVE_KRETPROBES=y
113CONFIG_PROC_PAGE_MONITOR=y
114CONFIG_SLABINFO=y
101CONFIG_RT_MUTEXES=y 115CONFIG_RT_MUTEXES=y
102# CONFIG_TINY_SHMEM is not set 116# CONFIG_TINY_SHMEM is not set
103CONFIG_BASE_SMALL=0 117CONFIG_BASE_SMALL=0
@@ -125,6 +139,7 @@ CONFIG_DEFAULT_AS=y
125# CONFIG_DEFAULT_CFQ is not set 139# CONFIG_DEFAULT_CFQ is not set
126# CONFIG_DEFAULT_NOOP is not set 140# CONFIG_DEFAULT_NOOP is not set
127CONFIG_DEFAULT_IOSCHED="anticipatory" 141CONFIG_DEFAULT_IOSCHED="anticipatory"
142CONFIG_CLASSIC_RCU=y
128 143
129# 144#
130# Platform support 145# Platform support
@@ -133,11 +148,12 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
133# CONFIG_PPC_82xx is not set 148# CONFIG_PPC_82xx is not set
134CONFIG_PPC_83xx=y 149CONFIG_PPC_83xx=y
135# CONFIG_PPC_86xx is not set 150# CONFIG_PPC_86xx is not set
136# CONFIG_PPC_MPC52xx is not set 151# CONFIG_PPC_MPC512x is not set
137# CONFIG_PPC_MPC5200 is not set 152# CONFIG_PPC_MPC5121 is not set
138# CONFIG_PPC_CELL is not set 153# CONFIG_PPC_CELL is not set
139# CONFIG_PPC_CELL_NATIVE is not set 154# CONFIG_PPC_CELL_NATIVE is not set
140# CONFIG_PQ2ADS is not set 155# CONFIG_PQ2ADS is not set
156CONFIG_MPC83xx=y
141CONFIG_MPC831x_RDB=y 157CONFIG_MPC831x_RDB=y
142# CONFIG_MPC832x_MDS is not set 158# CONFIG_MPC832x_MDS is not set
143# CONFIG_MPC832x_RDB is not set 159# CONFIG_MPC832x_RDB is not set
@@ -145,7 +161,10 @@ CONFIG_MPC831x_RDB=y
145# CONFIG_MPC834x_ITX is not set 161# CONFIG_MPC834x_ITX is not set
146# CONFIG_MPC836x_MDS is not set 162# CONFIG_MPC836x_MDS is not set
147# CONFIG_MPC837x_MDS is not set 163# CONFIG_MPC837x_MDS is not set
164# CONFIG_MPC837x_RDB is not set
165# CONFIG_SBC834x is not set
148CONFIG_PPC_MPC831x=y 166CONFIG_PPC_MPC831x=y
167CONFIG_IPIC=y
149# CONFIG_MPIC is not set 168# CONFIG_MPIC is not set
150# CONFIG_MPIC_WEIRD is not set 169# CONFIG_MPIC_WEIRD is not set
151# CONFIG_PPC_I8259 is not set 170# CONFIG_PPC_I8259 is not set
@@ -156,7 +175,6 @@ CONFIG_PPC_MPC831x=y
156# CONFIG_PPC_INDIRECT_IO is not set 175# CONFIG_PPC_INDIRECT_IO is not set
157# CONFIG_GENERIC_IOMAP is not set 176# CONFIG_GENERIC_IOMAP is not set
158# CONFIG_CPU_FREQ is not set 177# CONFIG_CPU_FREQ is not set
159# CONFIG_CPM2 is not set
160# CONFIG_FSL_ULI1575 is not set 178# CONFIG_FSL_ULI1575 is not set
161 179
162# 180#
@@ -172,12 +190,16 @@ CONFIG_HZ_250=y
172# CONFIG_HZ_300 is not set 190# CONFIG_HZ_300 is not set
173# CONFIG_HZ_1000 is not set 191# CONFIG_HZ_1000 is not set
174CONFIG_HZ=250 192CONFIG_HZ=250
193# CONFIG_SCHED_HRTICK is not set
175CONFIG_PREEMPT_NONE=y 194CONFIG_PREEMPT_NONE=y
176# CONFIG_PREEMPT_VOLUNTARY is not set 195# CONFIG_PREEMPT_VOLUNTARY is not set
177# CONFIG_PREEMPT is not set 196# CONFIG_PREEMPT is not set
178CONFIG_BINFMT_ELF=y 197CONFIG_BINFMT_ELF=y
179# CONFIG_BINFMT_MISC is not set 198# CONFIG_BINFMT_MISC is not set
199# CONFIG_IOMMU_HELPER is not set
180CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 200CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
201CONFIG_ARCH_HAS_WALK_MEMORY=y
202CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
181CONFIG_ARCH_FLATMEM_ENABLE=y 203CONFIG_ARCH_FLATMEM_ENABLE=y
182CONFIG_ARCH_POPULATES_NODE_MAP=y 204CONFIG_ARCH_POPULATES_NODE_MAP=y
183CONFIG_SELECT_MEMORY_MODEL=y 205CONFIG_SELECT_MEMORY_MODEL=y
@@ -196,11 +218,7 @@ CONFIG_VIRT_TO_BUS=y
196CONFIG_PROC_DEVICETREE=y 218CONFIG_PROC_DEVICETREE=y
197# CONFIG_CMDLINE_BOOL is not set 219# CONFIG_CMDLINE_BOOL is not set
198# CONFIG_PM is not set 220# CONFIG_PM is not set
199CONFIG_SUSPEND_UP_POSSIBLE=y
200CONFIG_HIBERNATION_UP_POSSIBLE=y
201CONFIG_SECCOMP=y 221CONFIG_SECCOMP=y
202CONFIG_WANT_DEVICE_TREE=y
203CONFIG_DEVICE_TREE=""
204CONFIG_ISA_DMA_API=y 222CONFIG_ISA_DMA_API=y
205 223
206# 224#
@@ -250,6 +268,7 @@ CONFIG_XFRM=y
250# CONFIG_XFRM_USER is not set 268# CONFIG_XFRM_USER is not set
251# CONFIG_XFRM_SUB_POLICY is not set 269# CONFIG_XFRM_SUB_POLICY is not set
252# CONFIG_XFRM_MIGRATE is not set 270# CONFIG_XFRM_MIGRATE is not set
271# CONFIG_XFRM_STATISTICS is not set
253# CONFIG_NET_KEY is not set 272# CONFIG_NET_KEY is not set
254CONFIG_INET=y 273CONFIG_INET=y
255CONFIG_IP_MULTICAST=y 274CONFIG_IP_MULTICAST=y
@@ -305,6 +324,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
305# 324#
306# CONFIG_NET_PKTGEN is not set 325# CONFIG_NET_PKTGEN is not set
307# CONFIG_HAMRADIO is not set 326# CONFIG_HAMRADIO is not set
327# CONFIG_CAN is not set
308# CONFIG_IRDA is not set 328# CONFIG_IRDA is not set
309# CONFIG_BT is not set 329# CONFIG_BT is not set
310# CONFIG_AF_RXRPC is not set 330# CONFIG_AF_RXRPC is not set
@@ -340,6 +360,7 @@ CONFIG_MTD=y
340CONFIG_MTD_PARTITIONS=y 360CONFIG_MTD_PARTITIONS=y
341# CONFIG_MTD_REDBOOT_PARTS is not set 361# CONFIG_MTD_REDBOOT_PARTS is not set
342# CONFIG_MTD_CMDLINE_PARTS is not set 362# CONFIG_MTD_CMDLINE_PARTS is not set
363# CONFIG_MTD_OF_PARTS is not set
343 364
344# 365#
345# User Modules And Translation Layers 366# User Modules And Translation Layers
@@ -415,6 +436,7 @@ CONFIG_MTD_NAND_IDS=y
415# CONFIG_MTD_NAND_NANDSIM is not set 436# CONFIG_MTD_NAND_NANDSIM is not set
416# CONFIG_MTD_NAND_PLATFORM is not set 437# CONFIG_MTD_NAND_PLATFORM is not set
417# CONFIG_MTD_ALAUDA is not set 438# CONFIG_MTD_ALAUDA is not set
439# CONFIG_MTD_NAND_FSL_ELBC is not set
418# CONFIG_MTD_ONENAND is not set 440# CONFIG_MTD_ONENAND is not set
419 441
420# 442#
@@ -438,7 +460,7 @@ CONFIG_BLK_DEV_LOOP=y
438CONFIG_BLK_DEV_RAM=y 460CONFIG_BLK_DEV_RAM=y
439CONFIG_BLK_DEV_RAM_COUNT=16 461CONFIG_BLK_DEV_RAM_COUNT=16
440CONFIG_BLK_DEV_RAM_SIZE=32768 462CONFIG_BLK_DEV_RAM_SIZE=32768
441CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 463# CONFIG_BLK_DEV_XIP is not set
442# CONFIG_CDROM_PKTCDVD is not set 464# CONFIG_CDROM_PKTCDVD is not set
443# CONFIG_ATA_OVER_ETH is not set 465# CONFIG_ATA_OVER_ETH is not set
444CONFIG_MISC_DEVICES=y 466CONFIG_MISC_DEVICES=y
@@ -446,6 +468,8 @@ CONFIG_MISC_DEVICES=y
446# CONFIG_EEPROM_93CX6 is not set 468# CONFIG_EEPROM_93CX6 is not set
447# CONFIG_SGI_IOC4 is not set 469# CONFIG_SGI_IOC4 is not set
448# CONFIG_TIFM_CORE is not set 470# CONFIG_TIFM_CORE is not set
471# CONFIG_ENCLOSURE_SERVICES is not set
472CONFIG_HAVE_IDE=y
449# CONFIG_IDE is not set 473# CONFIG_IDE is not set
450 474
451# 475#
@@ -510,6 +534,7 @@ CONFIG_SCSI_LOWLEVEL=y
510# CONFIG_SCSI_IPS is not set 534# CONFIG_SCSI_IPS is not set
511# CONFIG_SCSI_INITIO is not set 535# CONFIG_SCSI_INITIO is not set
512# CONFIG_SCSI_INIA100 is not set 536# CONFIG_SCSI_INIA100 is not set
537# CONFIG_SCSI_MVSAS is not set
513# CONFIG_SCSI_STEX is not set 538# CONFIG_SCSI_STEX is not set
514# CONFIG_SCSI_SYM53C8XX_2 is not set 539# CONFIG_SCSI_SYM53C8XX_2 is not set
515# CONFIG_SCSI_QLOGIC_1280 is not set 540# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -549,7 +574,6 @@ CONFIG_NETDEVICES=y
549# CONFIG_EQUALIZER is not set 574# CONFIG_EQUALIZER is not set
550# CONFIG_TUN is not set 575# CONFIG_TUN is not set
551# CONFIG_VETH is not set 576# CONFIG_VETH is not set
552# CONFIG_IP1000 is not set
553# CONFIG_ARCNET is not set 577# CONFIG_ARCNET is not set
554CONFIG_PHYLIB=y 578CONFIG_PHYLIB=y
555 579
@@ -565,6 +589,7 @@ CONFIG_CICADA_PHY=y
565# CONFIG_SMSC_PHY is not set 589# CONFIG_SMSC_PHY is not set
566# CONFIG_BROADCOM_PHY is not set 590# CONFIG_BROADCOM_PHY is not set
567# CONFIG_ICPLUS_PHY is not set 591# CONFIG_ICPLUS_PHY is not set
592# CONFIG_REALTEK_PHY is not set
568# CONFIG_FIXED_PHY is not set 593# CONFIG_FIXED_PHY is not set
569# CONFIG_MDIO_BITBANG is not set 594# CONFIG_MDIO_BITBANG is not set
570CONFIG_NET_ETHERNET=y 595CONFIG_NET_ETHERNET=y
@@ -573,6 +598,7 @@ CONFIG_MII=y
573# CONFIG_SUNGEM is not set 598# CONFIG_SUNGEM is not set
574# CONFIG_CASSINI is not set 599# CONFIG_CASSINI is not set
575# CONFIG_NET_VENDOR_3COM is not set 600# CONFIG_NET_VENDOR_3COM is not set
601# CONFIG_ENC28J60 is not set
576# CONFIG_NET_TULIP is not set 602# CONFIG_NET_TULIP is not set
577# CONFIG_HP100 is not set 603# CONFIG_HP100 is not set
578# CONFIG_IBM_NEW_EMAC_ZMII is not set 604# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -592,6 +618,7 @@ CONFIG_E100=y
592# CONFIG_NE2K_PCI is not set 618# CONFIG_NE2K_PCI is not set
593# CONFIG_8139CP is not set 619# CONFIG_8139CP is not set
594# CONFIG_8139TOO is not set 620# CONFIG_8139TOO is not set
621# CONFIG_R6040 is not set
595# CONFIG_SIS900 is not set 622# CONFIG_SIS900 is not set
596# CONFIG_EPIC100 is not set 623# CONFIG_EPIC100 is not set
597# CONFIG_SUNDANCE is not set 624# CONFIG_SUNDANCE is not set
@@ -603,6 +630,9 @@ CONFIG_NETDEV_1000=y
603# CONFIG_DL2K is not set 630# CONFIG_DL2K is not set
604# CONFIG_E1000 is not set 631# CONFIG_E1000 is not set
605# CONFIG_E1000E is not set 632# CONFIG_E1000E is not set
633# CONFIG_E1000E_ENABLED is not set
634# CONFIG_IP1000 is not set
635# CONFIG_IGB is not set
606# CONFIG_NS83820 is not set 636# CONFIG_NS83820 is not set
607# CONFIG_HAMACHI is not set 637# CONFIG_HAMACHI is not set
608# CONFIG_YELLOWFIN is not set 638# CONFIG_YELLOWFIN is not set
@@ -629,6 +659,7 @@ CONFIG_NETDEV_10000=y
629# CONFIG_NIU is not set 659# CONFIG_NIU is not set
630# CONFIG_MLX4_CORE is not set 660# CONFIG_MLX4_CORE is not set
631# CONFIG_TEHUTI is not set 661# CONFIG_TEHUTI is not set
662# CONFIG_BNX2X is not set
632# CONFIG_TR is not set 663# CONFIG_TR is not set
633 664
634# 665#
@@ -651,7 +682,6 @@ CONFIG_NETDEV_10000=y
651# CONFIG_PPP is not set 682# CONFIG_PPP is not set
652# CONFIG_SLIP is not set 683# CONFIG_SLIP is not set
653# CONFIG_NET_FC is not set 684# CONFIG_NET_FC is not set
654# CONFIG_SHAPER is not set
655# CONFIG_NETCONSOLE is not set 685# CONFIG_NETCONSOLE is not set
656# CONFIG_NETPOLL is not set 686# CONFIG_NETPOLL is not set
657# CONFIG_NET_POLL_CONTROLLER is not set 687# CONFIG_NET_POLL_CONTROLLER is not set
@@ -694,6 +724,7 @@ CONFIG_INPUT=y
694# 724#
695# CONFIG_VT is not set 725# CONFIG_VT is not set
696# CONFIG_SERIAL_NONSTANDARD is not set 726# CONFIG_SERIAL_NONSTANDARD is not set
727# CONFIG_NOZOMI is not set
697 728
698# 729#
699# Serial drivers 730# Serial drivers
@@ -767,14 +798,12 @@ CONFIG_I2C_MPC=y
767# 798#
768# Miscellaneous I2C Chip support 799# Miscellaneous I2C Chip support
769# 800#
770# CONFIG_SENSORS_DS1337 is not set
771# CONFIG_SENSORS_DS1374 is not set
772# CONFIG_DS1682 is not set 801# CONFIG_DS1682 is not set
773# CONFIG_SENSORS_EEPROM is not set 802# CONFIG_SENSORS_EEPROM is not set
774# CONFIG_SENSORS_PCF8574 is not set 803# CONFIG_SENSORS_PCF8574 is not set
775# CONFIG_SENSORS_PCA9539 is not set 804# CONFIG_PCF8575 is not set
776# CONFIG_SENSORS_PCF8591 is not set 805# CONFIG_SENSORS_PCF8591 is not set
777# CONFIG_SENSORS_M41T00 is not set 806# CONFIG_TPS65010 is not set
778# CONFIG_SENSORS_MAX6875 is not set 807# CONFIG_SENSORS_MAX6875 is not set
779# CONFIG_SENSORS_TSL2550 is not set 808# CONFIG_SENSORS_TSL2550 is not set
780# CONFIG_I2C_DEBUG_CORE is not set 809# CONFIG_I2C_DEBUG_CORE is not set
@@ -813,6 +842,7 @@ CONFIG_HWMON=y
813# CONFIG_SENSORS_ADM1031 is not set 842# CONFIG_SENSORS_ADM1031 is not set
814# CONFIG_SENSORS_ADM9240 is not set 843# CONFIG_SENSORS_ADM9240 is not set
815# CONFIG_SENSORS_ADT7470 is not set 844# CONFIG_SENSORS_ADT7470 is not set
845# CONFIG_SENSORS_ADT7473 is not set
816# CONFIG_SENSORS_ATXP1 is not set 846# CONFIG_SENSORS_ATXP1 is not set
817# CONFIG_SENSORS_DS1621 is not set 847# CONFIG_SENSORS_DS1621 is not set
818# CONFIG_SENSORS_I5K_AMB is not set 848# CONFIG_SENSORS_I5K_AMB is not set
@@ -843,6 +873,7 @@ CONFIG_HWMON=y
843# CONFIG_SENSORS_SMSC47M1 is not set 873# CONFIG_SENSORS_SMSC47M1 is not set
844# CONFIG_SENSORS_SMSC47M192 is not set 874# CONFIG_SENSORS_SMSC47M192 is not set
845# CONFIG_SENSORS_SMSC47B397 is not set 875# CONFIG_SENSORS_SMSC47B397 is not set
876# CONFIG_SENSORS_ADS7828 is not set
846# CONFIG_SENSORS_THMC50 is not set 877# CONFIG_SENSORS_THMC50 is not set
847# CONFIG_SENSORS_VIA686A is not set 878# CONFIG_SENSORS_VIA686A is not set
848# CONFIG_SENSORS_VT1211 is not set 879# CONFIG_SENSORS_VT1211 is not set
@@ -852,9 +883,11 @@ CONFIG_HWMON=y
852# CONFIG_SENSORS_W83792D is not set 883# CONFIG_SENSORS_W83792D is not set
853# CONFIG_SENSORS_W83793 is not set 884# CONFIG_SENSORS_W83793 is not set
854# CONFIG_SENSORS_W83L785TS is not set 885# CONFIG_SENSORS_W83L785TS is not set
886# CONFIG_SENSORS_W83L786NG is not set
855# CONFIG_SENSORS_W83627HF is not set 887# CONFIG_SENSORS_W83627HF is not set
856# CONFIG_SENSORS_W83627EHF is not set 888# CONFIG_SENSORS_W83627EHF is not set
857# CONFIG_HWMON_DEBUG_CHIP is not set 889# CONFIG_HWMON_DEBUG_CHIP is not set
890# CONFIG_THERMAL is not set
858CONFIG_WATCHDOG=y 891CONFIG_WATCHDOG=y
859# CONFIG_WATCHDOG_NOWAYOUT is not set 892# CONFIG_WATCHDOG_NOWAYOUT is not set
860 893
@@ -934,6 +967,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
934CONFIG_USB_ARCH_HAS_EHCI=y 967CONFIG_USB_ARCH_HAS_EHCI=y
935CONFIG_USB=y 968CONFIG_USB=y
936# CONFIG_USB_DEBUG is not set 969# CONFIG_USB_DEBUG is not set
970# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
937 971
938# 972#
939# Miscellaneous USB options 973# Miscellaneous USB options
@@ -947,10 +981,10 @@ CONFIG_USB_DEVICE_CLASS=y
947# USB Host Controller Drivers 981# USB Host Controller Drivers
948# 982#
949CONFIG_USB_EHCI_HCD=y 983CONFIG_USB_EHCI_HCD=y
950# CONFIG_USB_EHCI_SPLIT_ISO is not set
951CONFIG_USB_EHCI_ROOT_HUB_TT=y 984CONFIG_USB_EHCI_ROOT_HUB_TT=y
952# CONFIG_USB_EHCI_TT_NEWSCHED is not set 985# CONFIG_USB_EHCI_TT_NEWSCHED is not set
953CONFIG_USB_EHCI_FSL=y 986CONFIG_USB_EHCI_FSL=y
987CONFIG_USB_EHCI_HCD_PPC_OF=y
954# CONFIG_USB_ISP116X_HCD is not set 988# CONFIG_USB_ISP116X_HCD is not set
955CONFIG_USB_OHCI_HCD=y 989CONFIG_USB_OHCI_HCD=y
956CONFIG_USB_OHCI_HCD_PPC_OF=y 990CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -1001,10 +1035,6 @@ CONFIG_USB_MON=y
1001# 1035#
1002# USB port drivers 1036# USB port drivers
1003# 1037#
1004
1005#
1006# USB Serial Converter support
1007#
1008# CONFIG_USB_SERIAL is not set 1038# CONFIG_USB_SERIAL is not set
1009 1039
1010# 1040#
@@ -1030,14 +1060,6 @@ CONFIG_USB_MON=y
1030# CONFIG_USB_TRANCEVIBRATOR is not set 1060# CONFIG_USB_TRANCEVIBRATOR is not set
1031# CONFIG_USB_IOWARRIOR is not set 1061# CONFIG_USB_IOWARRIOR is not set
1032# CONFIG_USB_TEST is not set 1062# CONFIG_USB_TEST is not set
1033
1034#
1035# USB DSL modem support
1036#
1037
1038#
1039# USB Gadget Support
1040#
1041CONFIG_USB_GADGET=y 1063CONFIG_USB_GADGET=y
1042# CONFIG_USB_GADGET_DEBUG is not set 1064# CONFIG_USB_GADGET_DEBUG is not set
1043# CONFIG_USB_GADGET_DEBUG_FILES is not set 1065# CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -1063,7 +1085,9 @@ CONFIG_USB_ETH_RNDIS=y
1063# CONFIG_USB_FILE_STORAGE is not set 1085# CONFIG_USB_FILE_STORAGE is not set
1064# CONFIG_USB_G_SERIAL is not set 1086# CONFIG_USB_G_SERIAL is not set
1065# CONFIG_USB_MIDI_GADGET is not set 1087# CONFIG_USB_MIDI_GADGET is not set
1088# CONFIG_USB_G_PRINTER is not set
1066# CONFIG_MMC is not set 1089# CONFIG_MMC is not set
1090# CONFIG_MEMSTICK is not set
1067# CONFIG_NEW_LEDS is not set 1091# CONFIG_NEW_LEDS is not set
1068# CONFIG_INFINIBAND is not set 1092# CONFIG_INFINIBAND is not set
1069# CONFIG_EDAC is not set 1093# CONFIG_EDAC is not set
@@ -1095,20 +1119,23 @@ CONFIG_RTC_DRV_DS1307=y
1095# CONFIG_RTC_DRV_PCF8563 is not set 1119# CONFIG_RTC_DRV_PCF8563 is not set
1096# CONFIG_RTC_DRV_PCF8583 is not set 1120# CONFIG_RTC_DRV_PCF8583 is not set
1097# CONFIG_RTC_DRV_M41T80 is not set 1121# CONFIG_RTC_DRV_M41T80 is not set
1122# CONFIG_RTC_DRV_S35390A is not set
1098 1123
1099# 1124#
1100# SPI RTC drivers 1125# SPI RTC drivers
1101# 1126#
1102# CONFIG_RTC_DRV_RS5C348 is not set
1103# CONFIG_RTC_DRV_MAX6902 is not set 1127# CONFIG_RTC_DRV_MAX6902 is not set
1128# CONFIG_RTC_DRV_R9701 is not set
1129# CONFIG_RTC_DRV_RS5C348 is not set
1104 1130
1105# 1131#
1106# Platform RTC drivers 1132# Platform RTC drivers
1107# 1133#
1108# CONFIG_RTC_DRV_CMOS is not set 1134# CONFIG_RTC_DRV_CMOS is not set
1135# CONFIG_RTC_DRV_DS1511 is not set
1109# CONFIG_RTC_DRV_DS1553 is not set 1136# CONFIG_RTC_DRV_DS1553 is not set
1110# CONFIG_RTC_DRV_STK17TA8 is not set
1111# CONFIG_RTC_DRV_DS1742 is not set 1137# CONFIG_RTC_DRV_DS1742 is not set
1138# CONFIG_RTC_DRV_STK17TA8 is not set
1112# CONFIG_RTC_DRV_M48T86 is not set 1139# CONFIG_RTC_DRV_M48T86 is not set
1113# CONFIG_RTC_DRV_M48T59 is not set 1140# CONFIG_RTC_DRV_M48T59 is not set
1114# CONFIG_RTC_DRV_V3020 is not set 1141# CONFIG_RTC_DRV_V3020 is not set
@@ -1116,6 +1143,7 @@ CONFIG_RTC_DRV_DS1307=y
1116# 1143#
1117# on-CPU RTC drivers 1144# on-CPU RTC drivers
1118# 1145#
1146# CONFIG_DMADEVICES is not set
1119 1147
1120# 1148#
1121# Userspace I/O 1149# Userspace I/O
@@ -1141,12 +1169,10 @@ CONFIG_FS_MBCACHE=y
1141# CONFIG_XFS_FS is not set 1169# CONFIG_XFS_FS is not set
1142# CONFIG_GFS2_FS is not set 1170# CONFIG_GFS2_FS is not set
1143# CONFIG_OCFS2_FS is not set 1171# CONFIG_OCFS2_FS is not set
1144# CONFIG_MINIX_FS is not set 1172CONFIG_DNOTIFY=y
1145# CONFIG_ROMFS_FS is not set
1146CONFIG_INOTIFY=y 1173CONFIG_INOTIFY=y
1147CONFIG_INOTIFY_USER=y 1174CONFIG_INOTIFY_USER=y
1148# CONFIG_QUOTA is not set 1175# CONFIG_QUOTA is not set
1149CONFIG_DNOTIFY=y
1150# CONFIG_AUTOFS_FS is not set 1176# CONFIG_AUTOFS_FS is not set
1151# CONFIG_AUTOFS4_FS is not set 1177# CONFIG_AUTOFS4_FS is not set
1152# CONFIG_FUSE_FS is not set 1178# CONFIG_FUSE_FS is not set
@@ -1199,8 +1225,10 @@ CONFIG_JFFS2_RTIME=y
1199# CONFIG_JFFS2_RUBIN is not set 1225# CONFIG_JFFS2_RUBIN is not set
1200# CONFIG_CRAMFS is not set 1226# CONFIG_CRAMFS is not set
1201# CONFIG_VXFS_FS is not set 1227# CONFIG_VXFS_FS is not set
1228# CONFIG_MINIX_FS is not set
1202# CONFIG_HPFS_FS is not set 1229# CONFIG_HPFS_FS is not set
1203# CONFIG_QNX4FS_FS is not set 1230# CONFIG_QNX4FS_FS is not set
1231# CONFIG_ROMFS_FS is not set
1204# CONFIG_SYSV_FS is not set 1232# CONFIG_SYSV_FS is not set
1205# CONFIG_UFS_FS is not set 1233# CONFIG_UFS_FS is not set
1206CONFIG_NETWORK_FILESYSTEMS=y 1234CONFIG_NETWORK_FILESYSTEMS=y
@@ -1248,7 +1276,6 @@ CONFIG_MSDOS_PARTITION=y
1248# CONFIG_SYSV68_PARTITION is not set 1276# CONFIG_SYSV68_PARTITION is not set
1249# CONFIG_NLS is not set 1277# CONFIG_NLS is not set
1250# CONFIG_DLM is not set 1278# CONFIG_DLM is not set
1251# CONFIG_UCC_SLOW is not set
1252 1279
1253# 1280#
1254# Library routines 1281# Library routines
@@ -1266,7 +1293,6 @@ CONFIG_PLIST=y
1266CONFIG_HAS_IOMEM=y 1293CONFIG_HAS_IOMEM=y
1267CONFIG_HAS_IOPORT=y 1294CONFIG_HAS_IOPORT=y
1268CONFIG_HAS_DMA=y 1295CONFIG_HAS_DMA=y
1269# CONFIG_INSTRUMENTATION is not set
1270 1296
1271# 1297#
1272# Kernel hacking 1298# Kernel hacking
@@ -1285,6 +1311,7 @@ CONFIG_SCHED_DEBUG=y
1285# CONFIG_SCHEDSTATS is not set 1311# CONFIG_SCHEDSTATS is not set
1286# CONFIG_TIMER_STATS is not set 1312# CONFIG_TIMER_STATS is not set
1287# CONFIG_SLUB_DEBUG_ON is not set 1313# CONFIG_SLUB_DEBUG_ON is not set
1314# CONFIG_SLUB_STATS is not set
1288# CONFIG_DEBUG_RT_MUTEXES is not set 1315# CONFIG_DEBUG_RT_MUTEXES is not set
1289# CONFIG_RT_MUTEX_TESTER is not set 1316# CONFIG_RT_MUTEX_TESTER is not set
1290# CONFIG_DEBUG_SPINLOCK is not set 1317# CONFIG_DEBUG_SPINLOCK is not set
@@ -1297,9 +1324,9 @@ CONFIG_SCHED_DEBUG=y
1297# CONFIG_DEBUG_VM is not set 1324# CONFIG_DEBUG_VM is not set
1298# CONFIG_DEBUG_LIST is not set 1325# CONFIG_DEBUG_LIST is not set
1299# CONFIG_DEBUG_SG is not set 1326# CONFIG_DEBUG_SG is not set
1300CONFIG_FORCED_INLINING=y
1301# CONFIG_BOOT_PRINTK_DELAY is not set 1327# CONFIG_BOOT_PRINTK_DELAY is not set
1302# CONFIG_RCU_TORTURE_TEST is not set 1328# CONFIG_RCU_TORTURE_TEST is not set
1329# CONFIG_BACKTRACE_SELF_TEST is not set
1303# CONFIG_FAULT_INJECTION is not set 1330# CONFIG_FAULT_INJECTION is not set
1304# CONFIG_SAMPLES is not set 1331# CONFIG_SAMPLES is not set
1305# CONFIG_DEBUG_STACKOVERFLOW is not set 1332# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1318,6 +1345,7 @@ CONFIG_FORCED_INLINING=y
1318CONFIG_CRYPTO=y 1345CONFIG_CRYPTO=y
1319CONFIG_CRYPTO_ALGAPI=y 1346CONFIG_CRYPTO_ALGAPI=y
1320CONFIG_CRYPTO_BLKCIPHER=y 1347CONFIG_CRYPTO_BLKCIPHER=y
1348# CONFIG_CRYPTO_SEQIV is not set
1321CONFIG_CRYPTO_MANAGER=y 1349CONFIG_CRYPTO_MANAGER=y
1322# CONFIG_CRYPTO_HMAC is not set 1350# CONFIG_CRYPTO_HMAC is not set
1323# CONFIG_CRYPTO_XCBC is not set 1351# CONFIG_CRYPTO_XCBC is not set
@@ -1335,6 +1363,9 @@ CONFIG_CRYPTO_CBC=y
1335CONFIG_CRYPTO_PCBC=m 1363CONFIG_CRYPTO_PCBC=m
1336# CONFIG_CRYPTO_LRW is not set 1364# CONFIG_CRYPTO_LRW is not set
1337# CONFIG_CRYPTO_XTS is not set 1365# CONFIG_CRYPTO_XTS is not set
1366# CONFIG_CRYPTO_CTR is not set
1367# CONFIG_CRYPTO_GCM is not set
1368# CONFIG_CRYPTO_CCM is not set
1338# CONFIG_CRYPTO_CRYPTD is not set 1369# CONFIG_CRYPTO_CRYPTD is not set
1339CONFIG_CRYPTO_DES=y 1370CONFIG_CRYPTO_DES=y
1340# CONFIG_CRYPTO_FCRYPT is not set 1371# CONFIG_CRYPTO_FCRYPT is not set
@@ -1349,11 +1380,14 @@ CONFIG_CRYPTO_DES=y
1349# CONFIG_CRYPTO_KHAZAD is not set 1380# CONFIG_CRYPTO_KHAZAD is not set
1350# CONFIG_CRYPTO_ANUBIS is not set 1381# CONFIG_CRYPTO_ANUBIS is not set
1351# CONFIG_CRYPTO_SEED is not set 1382# CONFIG_CRYPTO_SEED is not set
1383# CONFIG_CRYPTO_SALSA20 is not set
1352# CONFIG_CRYPTO_DEFLATE is not set 1384# CONFIG_CRYPTO_DEFLATE is not set
1353# CONFIG_CRYPTO_MICHAEL_MIC is not set 1385# CONFIG_CRYPTO_MICHAEL_MIC is not set
1354# CONFIG_CRYPTO_CRC32C is not set 1386# CONFIG_CRYPTO_CRC32C is not set
1355# CONFIG_CRYPTO_CAMELLIA is not set 1387# CONFIG_CRYPTO_CAMELLIA is not set
1356# CONFIG_CRYPTO_TEST is not set 1388# CONFIG_CRYPTO_TEST is not set
1357# CONFIG_CRYPTO_AUTHENC is not set 1389# CONFIG_CRYPTO_AUTHENC is not set
1390# CONFIG_CRYPTO_LZO is not set
1358CONFIG_CRYPTO_HW=y 1391CONFIG_CRYPTO_HW=y
1392# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1359# CONFIG_PPC_CLOCK is not set 1393# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc8315_rdb_defconfig b/arch/powerpc/configs/mpc8315_rdb_defconfig
index 9adf7f98f675..1f57456dd81e 100644
--- a/arch/powerpc/configs/mpc8315_rdb_defconfig
+++ b/arch/powerpc/configs/mpc8315_rdb_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-rc8 3# Linux kernel version: 2.6.25-rc6
4# Wed Jan 23 20:02:25 2008 4# Mon Mar 24 08:48:15 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,8 +14,8 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_83xx=y
18CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
18# CONFIG_FSL_EMB_PERFMON is not set
19CONFIG_PPC_STD_MMU=y 19CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y 20CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -66,15 +67,19 @@ CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set 73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y
75# CONFIG_FAIR_GROUP_SCHED is not set 75# CONFIG_FAIR_GROUP_SCHED is not set
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
76CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
77# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
78CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
79CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -86,11 +91,13 @@ CONFIG_HOTPLUG=y
86CONFIG_PRINTK=y 91CONFIG_PRINTK=y
87CONFIG_BUG=y 92CONFIG_BUG=y
88CONFIG_ELF_CORE=y 93CONFIG_ELF_CORE=y
94CONFIG_COMPAT_BRK=y
89CONFIG_BASE_FULL=y 95CONFIG_BASE_FULL=y
90CONFIG_FUTEX=y 96CONFIG_FUTEX=y
91CONFIG_ANON_INODES=y 97CONFIG_ANON_INODES=y
92# CONFIG_EPOLL is not set 98# CONFIG_EPOLL is not set
93CONFIG_SIGNALFD=y 99CONFIG_SIGNALFD=y
100CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
95CONFIG_SHMEM=y 102CONFIG_SHMEM=y
96CONFIG_VM_EVENT_COUNTERS=y 103CONFIG_VM_EVENT_COUNTERS=y
@@ -98,6 +105,12 @@ CONFIG_SLUB_DEBUG=y
98# CONFIG_SLAB is not set 105# CONFIG_SLAB is not set
99CONFIG_SLUB=y 106CONFIG_SLUB=y
100# CONFIG_SLOB is not set 107# CONFIG_SLOB is not set
108# CONFIG_PROFILING is not set
109# CONFIG_MARKERS is not set
110CONFIG_HAVE_OPROFILE=y
111CONFIG_HAVE_KPROBES=y
112CONFIG_HAVE_KRETPROBES=y
113CONFIG_PROC_PAGE_MONITOR=y
101CONFIG_SLABINFO=y 114CONFIG_SLABINFO=y
102CONFIG_RT_MUTEXES=y 115CONFIG_RT_MUTEXES=y
103# CONFIG_TINY_SHMEM is not set 116# CONFIG_TINY_SHMEM is not set
@@ -126,6 +139,7 @@ CONFIG_DEFAULT_AS=y
126# CONFIG_DEFAULT_CFQ is not set 139# CONFIG_DEFAULT_CFQ is not set
127# CONFIG_DEFAULT_NOOP is not set 140# CONFIG_DEFAULT_NOOP is not set
128CONFIG_DEFAULT_IOSCHED="anticipatory" 141CONFIG_DEFAULT_IOSCHED="anticipatory"
142CONFIG_CLASSIC_RCU=y
129 143
130# 144#
131# Platform support 145# Platform support
@@ -134,11 +148,12 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
134# CONFIG_PPC_82xx is not set 148# CONFIG_PPC_82xx is not set
135CONFIG_PPC_83xx=y 149CONFIG_PPC_83xx=y
136# CONFIG_PPC_86xx is not set 150# CONFIG_PPC_86xx is not set
137# CONFIG_PPC_MPC52xx is not set 151# CONFIG_PPC_MPC512x is not set
138# CONFIG_PPC_MPC5200 is not set 152# CONFIG_PPC_MPC5121 is not set
139# CONFIG_PPC_CELL is not set 153# CONFIG_PPC_CELL is not set
140# CONFIG_PPC_CELL_NATIVE is not set 154# CONFIG_PPC_CELL_NATIVE is not set
141# CONFIG_PQ2ADS is not set 155# CONFIG_PQ2ADS is not set
156CONFIG_MPC83xx=y
142CONFIG_MPC831x_RDB=y 157CONFIG_MPC831x_RDB=y
143# CONFIG_MPC832x_MDS is not set 158# CONFIG_MPC832x_MDS is not set
144# CONFIG_MPC832x_RDB is not set 159# CONFIG_MPC832x_RDB is not set
@@ -146,6 +161,8 @@ CONFIG_MPC831x_RDB=y
146# CONFIG_MPC834x_ITX is not set 161# CONFIG_MPC834x_ITX is not set
147# CONFIG_MPC836x_MDS is not set 162# CONFIG_MPC836x_MDS is not set
148# CONFIG_MPC837x_MDS is not set 163# CONFIG_MPC837x_MDS is not set
164# CONFIG_MPC837x_RDB is not set
165# CONFIG_SBC834x is not set
149CONFIG_PPC_MPC831x=y 166CONFIG_PPC_MPC831x=y
150CONFIG_IPIC=y 167CONFIG_IPIC=y
151# CONFIG_MPIC is not set 168# CONFIG_MPIC is not set
@@ -158,7 +175,6 @@ CONFIG_IPIC=y
158# CONFIG_PPC_INDIRECT_IO is not set 175# CONFIG_PPC_INDIRECT_IO is not set
159# CONFIG_GENERIC_IOMAP is not set 176# CONFIG_GENERIC_IOMAP is not set
160# CONFIG_CPU_FREQ is not set 177# CONFIG_CPU_FREQ is not set
161# CONFIG_CPM2 is not set
162# CONFIG_FSL_ULI1575 is not set 178# CONFIG_FSL_ULI1575 is not set
163 179
164# 180#
@@ -174,12 +190,16 @@ CONFIG_HZ_250=y
174# CONFIG_HZ_300 is not set 190# CONFIG_HZ_300 is not set
175# CONFIG_HZ_1000 is not set 191# CONFIG_HZ_1000 is not set
176CONFIG_HZ=250 192CONFIG_HZ=250
193# CONFIG_SCHED_HRTICK is not set
177CONFIG_PREEMPT_NONE=y 194CONFIG_PREEMPT_NONE=y
178# CONFIG_PREEMPT_VOLUNTARY is not set 195# CONFIG_PREEMPT_VOLUNTARY is not set
179# CONFIG_PREEMPT is not set 196# CONFIG_PREEMPT is not set
180CONFIG_BINFMT_ELF=y 197CONFIG_BINFMT_ELF=y
181# CONFIG_BINFMT_MISC is not set 198# CONFIG_BINFMT_MISC is not set
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,11 +218,7 @@ 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
200# CONFIG_PM is not set 220# CONFIG_PM is not set
201CONFIG_SUSPEND_UP_POSSIBLE=y
202CONFIG_HIBERNATION_UP_POSSIBLE=y
203CONFIG_SECCOMP=y 221CONFIG_SECCOMP=y
204CONFIG_WANT_DEVICE_TREE=y
205CONFIG_DEVICE_TREE=""
206CONFIG_ISA_DMA_API=y 222CONFIG_ISA_DMA_API=y
207 223
208# 224#
@@ -252,6 +268,7 @@ CONFIG_XFRM=y
252# CONFIG_XFRM_USER is not set 268# CONFIG_XFRM_USER is not set
253# CONFIG_XFRM_SUB_POLICY is not set 269# CONFIG_XFRM_SUB_POLICY is not set
254# CONFIG_XFRM_MIGRATE is not set 270# CONFIG_XFRM_MIGRATE is not set
271# CONFIG_XFRM_STATISTICS is not set
255# CONFIG_NET_KEY is not set 272# CONFIG_NET_KEY is not set
256CONFIG_INET=y 273CONFIG_INET=y
257CONFIG_IP_MULTICAST=y 274CONFIG_IP_MULTICAST=y
@@ -307,6 +324,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
307# 324#
308# CONFIG_NET_PKTGEN is not set 325# CONFIG_NET_PKTGEN is not set
309# CONFIG_HAMRADIO is not set 326# CONFIG_HAMRADIO is not set
327# CONFIG_CAN is not set
310# CONFIG_IRDA is not set 328# CONFIG_IRDA is not set
311# CONFIG_BT is not set 329# CONFIG_BT is not set
312# CONFIG_AF_RXRPC is not set 330# CONFIG_AF_RXRPC is not set
@@ -342,6 +360,7 @@ CONFIG_MTD=y
342CONFIG_MTD_PARTITIONS=y 360CONFIG_MTD_PARTITIONS=y
343# CONFIG_MTD_REDBOOT_PARTS is not set 361# CONFIG_MTD_REDBOOT_PARTS is not set
344# CONFIG_MTD_CMDLINE_PARTS is not set 362# CONFIG_MTD_CMDLINE_PARTS is not set
363# CONFIG_MTD_OF_PARTS is not set
345 364
346# 365#
347# User Modules And Translation Layers 366# User Modules And Translation Layers
@@ -417,6 +436,7 @@ CONFIG_MTD_NAND_IDS=y
417# CONFIG_MTD_NAND_NANDSIM is not set 436# CONFIG_MTD_NAND_NANDSIM is not set
418# CONFIG_MTD_NAND_PLATFORM is not set 437# CONFIG_MTD_NAND_PLATFORM is not set
419# CONFIG_MTD_ALAUDA is not set 438# CONFIG_MTD_ALAUDA is not set
439# CONFIG_MTD_NAND_FSL_ELBC is not set
420# CONFIG_MTD_ONENAND is not set 440# CONFIG_MTD_ONENAND is not set
421 441
422# 442#
@@ -440,7 +460,7 @@ CONFIG_BLK_DEV_LOOP=y
440CONFIG_BLK_DEV_RAM=y 460CONFIG_BLK_DEV_RAM=y
441CONFIG_BLK_DEV_RAM_COUNT=16 461CONFIG_BLK_DEV_RAM_COUNT=16
442CONFIG_BLK_DEV_RAM_SIZE=32768 462CONFIG_BLK_DEV_RAM_SIZE=32768
443CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 463# CONFIG_BLK_DEV_XIP is not set
444# CONFIG_CDROM_PKTCDVD is not set 464# CONFIG_CDROM_PKTCDVD is not set
445# CONFIG_ATA_OVER_ETH is not set 465# CONFIG_ATA_OVER_ETH is not set
446CONFIG_MISC_DEVICES=y 466CONFIG_MISC_DEVICES=y
@@ -448,6 +468,8 @@ CONFIG_MISC_DEVICES=y
448# CONFIG_EEPROM_93CX6 is not set 468# CONFIG_EEPROM_93CX6 is not set
449# CONFIG_SGI_IOC4 is not set 469# CONFIG_SGI_IOC4 is not set
450# CONFIG_TIFM_CORE is not set 470# CONFIG_TIFM_CORE is not set
471# CONFIG_ENCLOSURE_SERVICES is not set
472CONFIG_HAVE_IDE=y
451# CONFIG_IDE is not set 473# CONFIG_IDE is not set
452 474
453# 475#
@@ -512,6 +534,7 @@ CONFIG_SCSI_LOWLEVEL=y
512# CONFIG_SCSI_IPS is not set 534# CONFIG_SCSI_IPS is not set
513# CONFIG_SCSI_INITIO is not set 535# CONFIG_SCSI_INITIO is not set
514# CONFIG_SCSI_INIA100 is not set 536# CONFIG_SCSI_INIA100 is not set
537# CONFIG_SCSI_MVSAS is not set
515# CONFIG_SCSI_STEX is not set 538# CONFIG_SCSI_STEX is not set
516# CONFIG_SCSI_SYM53C8XX_2 is not set 539# CONFIG_SCSI_SYM53C8XX_2 is not set
517# CONFIG_SCSI_IPR is not set 540# CONFIG_SCSI_IPR is not set
@@ -566,6 +589,7 @@ CONFIG_SATA_FSL=y
566# CONFIG_PATA_MPIIX is not set 589# CONFIG_PATA_MPIIX is not set
567# CONFIG_PATA_OLDPIIX is not set 590# CONFIG_PATA_OLDPIIX is not set
568# CONFIG_PATA_NETCELL is not set 591# CONFIG_PATA_NETCELL is not set
592# CONFIG_PATA_NINJA32 is not set
569# CONFIG_PATA_NS87410 is not set 593# CONFIG_PATA_NS87410 is not set
570# CONFIG_PATA_NS87415 is not set 594# CONFIG_PATA_NS87415 is not set
571# CONFIG_PATA_OPTI is not set 595# CONFIG_PATA_OPTI is not set
@@ -623,6 +647,7 @@ CONFIG_PHYLIB=y
623# CONFIG_SMSC_PHY is not set 647# CONFIG_SMSC_PHY is not set
624# CONFIG_BROADCOM_PHY is not set 648# CONFIG_BROADCOM_PHY is not set
625# CONFIG_ICPLUS_PHY is not set 649# CONFIG_ICPLUS_PHY is not set
650# CONFIG_REALTEK_PHY is not set
626# CONFIG_FIXED_PHY is not set 651# CONFIG_FIXED_PHY is not set
627# CONFIG_MDIO_BITBANG is not set 652# CONFIG_MDIO_BITBANG is not set
628CONFIG_NET_ETHERNET=y 653CONFIG_NET_ETHERNET=y
@@ -631,6 +656,7 @@ CONFIG_MII=y
631# CONFIG_SUNGEM is not set 656# CONFIG_SUNGEM is not set
632# CONFIG_CASSINI is not set 657# CONFIG_CASSINI is not set
633# CONFIG_NET_VENDOR_3COM is not set 658# CONFIG_NET_VENDOR_3COM is not set
659# CONFIG_ENC28J60 is not set
634# CONFIG_NET_TULIP is not set 660# CONFIG_NET_TULIP is not set
635# CONFIG_HP100 is not set 661# CONFIG_HP100 is not set
636# CONFIG_IBM_NEW_EMAC_ZMII is not set 662# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -650,6 +676,7 @@ CONFIG_E100=y
650# CONFIG_NE2K_PCI is not set 676# CONFIG_NE2K_PCI is not set
651# CONFIG_8139CP is not set 677# CONFIG_8139CP is not set
652# CONFIG_8139TOO is not set 678# CONFIG_8139TOO is not set
679# CONFIG_R6040 is not set
653# CONFIG_SIS900 is not set 680# CONFIG_SIS900 is not set
654# CONFIG_EPIC100 is not set 681# CONFIG_EPIC100 is not set
655# CONFIG_SUNDANCE is not set 682# CONFIG_SUNDANCE is not set
@@ -661,7 +688,9 @@ CONFIG_NETDEV_1000=y
661# CONFIG_DL2K is not set 688# CONFIG_DL2K is not set
662# CONFIG_E1000 is not set 689# CONFIG_E1000 is not set
663# CONFIG_E1000E is not set 690# CONFIG_E1000E is not set
691# CONFIG_E1000E_ENABLED is not set
664# CONFIG_IP1000 is not set 692# CONFIG_IP1000 is not set
693# CONFIG_IGB is not set
665# CONFIG_NS83820 is not set 694# CONFIG_NS83820 is not set
666# CONFIG_HAMACHI is not set 695# CONFIG_HAMACHI is not set
667# CONFIG_YELLOWFIN is not set 696# CONFIG_YELLOWFIN is not set
@@ -688,6 +717,7 @@ CONFIG_NETDEV_10000=y
688# CONFIG_NIU is not set 717# CONFIG_NIU is not set
689# CONFIG_MLX4_CORE is not set 718# CONFIG_MLX4_CORE is not set
690# CONFIG_TEHUTI is not set 719# CONFIG_TEHUTI is not set
720# CONFIG_BNX2X is not set
691# CONFIG_TR is not set 721# CONFIG_TR is not set
692 722
693# 723#
@@ -710,7 +740,6 @@ CONFIG_NETDEV_10000=y
710# CONFIG_PPP is not set 740# CONFIG_PPP is not set
711# CONFIG_SLIP is not set 741# CONFIG_SLIP is not set
712# CONFIG_NET_FC is not set 742# CONFIG_NET_FC is not set
713# CONFIG_SHAPER is not set
714# CONFIG_NETCONSOLE is not set 743# CONFIG_NETCONSOLE is not set
715# CONFIG_NETPOLL is not set 744# CONFIG_NETPOLL is not set
716# CONFIG_NET_POLL_CONTROLLER is not set 745# CONFIG_NET_POLL_CONTROLLER is not set
@@ -753,6 +782,7 @@ CONFIG_INPUT=y
753# 782#
754# CONFIG_VT is not set 783# CONFIG_VT is not set
755# CONFIG_SERIAL_NONSTANDARD is not set 784# CONFIG_SERIAL_NONSTANDARD is not set
785# CONFIG_NOZOMI is not set
756 786
757# 787#
758# Serial drivers 788# Serial drivers
@@ -826,14 +856,12 @@ CONFIG_I2C_MPC=y
826# 856#
827# Miscellaneous I2C Chip support 857# Miscellaneous I2C Chip support
828# 858#
829# CONFIG_SENSORS_DS1337 is not set
830# CONFIG_SENSORS_DS1374 is not set
831# CONFIG_DS1682 is not set 859# CONFIG_DS1682 is not set
832# CONFIG_SENSORS_EEPROM is not set 860# CONFIG_SENSORS_EEPROM is not set
833# CONFIG_SENSORS_PCF8574 is not set 861# CONFIG_SENSORS_PCF8574 is not set
834# CONFIG_SENSORS_PCA9539 is not set 862# CONFIG_PCF8575 is not set
835# CONFIG_SENSORS_PCF8591 is not set 863# CONFIG_SENSORS_PCF8591 is not set
836# CONFIG_SENSORS_M41T00 is not set 864# CONFIG_TPS65010 is not set
837# CONFIG_SENSORS_MAX6875 is not set 865# CONFIG_SENSORS_MAX6875 is not set
838# CONFIG_SENSORS_TSL2550 is not set 866# CONFIG_SENSORS_TSL2550 is not set
839# CONFIG_I2C_DEBUG_CORE is not set 867# CONFIG_I2C_DEBUG_CORE is not set
@@ -872,6 +900,7 @@ CONFIG_HWMON=y
872# CONFIG_SENSORS_ADM1031 is not set 900# CONFIG_SENSORS_ADM1031 is not set
873# CONFIG_SENSORS_ADM9240 is not set 901# CONFIG_SENSORS_ADM9240 is not set
874# CONFIG_SENSORS_ADT7470 is not set 902# CONFIG_SENSORS_ADT7470 is not set
903# CONFIG_SENSORS_ADT7473 is not set
875# CONFIG_SENSORS_ATXP1 is not set 904# CONFIG_SENSORS_ATXP1 is not set
876# CONFIG_SENSORS_DS1621 is not set 905# CONFIG_SENSORS_DS1621 is not set
877# CONFIG_SENSORS_I5K_AMB is not set 906# CONFIG_SENSORS_I5K_AMB is not set
@@ -902,6 +931,7 @@ CONFIG_HWMON=y
902# CONFIG_SENSORS_SMSC47M1 is not set 931# CONFIG_SENSORS_SMSC47M1 is not set
903# CONFIG_SENSORS_SMSC47M192 is not set 932# CONFIG_SENSORS_SMSC47M192 is not set
904# CONFIG_SENSORS_SMSC47B397 is not set 933# CONFIG_SENSORS_SMSC47B397 is not set
934# CONFIG_SENSORS_ADS7828 is not set
905# CONFIG_SENSORS_THMC50 is not set 935# CONFIG_SENSORS_THMC50 is not set
906# CONFIG_SENSORS_VIA686A is not set 936# CONFIG_SENSORS_VIA686A is not set
907# CONFIG_SENSORS_VT1211 is not set 937# CONFIG_SENSORS_VT1211 is not set
@@ -911,9 +941,11 @@ CONFIG_HWMON=y
911# CONFIG_SENSORS_W83792D is not set 941# CONFIG_SENSORS_W83792D is not set
912# CONFIG_SENSORS_W83793 is not set 942# CONFIG_SENSORS_W83793 is not set
913# CONFIG_SENSORS_W83L785TS is not set 943# CONFIG_SENSORS_W83L785TS is not set
944# CONFIG_SENSORS_W83L786NG is not set
914# CONFIG_SENSORS_W83627HF is not set 945# CONFIG_SENSORS_W83627HF is not set
915# CONFIG_SENSORS_W83627EHF is not set 946# CONFIG_SENSORS_W83627EHF is not set
916# CONFIG_HWMON_DEBUG_CHIP is not set 947# CONFIG_HWMON_DEBUG_CHIP is not set
948# CONFIG_THERMAL is not set
917CONFIG_WATCHDOG=y 949CONFIG_WATCHDOG=y
918# CONFIG_WATCHDOG_NOWAYOUT is not set 950# CONFIG_WATCHDOG_NOWAYOUT is not set
919 951
@@ -993,6 +1025,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
993CONFIG_USB_ARCH_HAS_EHCI=y 1025CONFIG_USB_ARCH_HAS_EHCI=y
994CONFIG_USB=y 1026CONFIG_USB=y
995# CONFIG_USB_DEBUG is not set 1027# CONFIG_USB_DEBUG is not set
1028# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
996 1029
997# 1030#
998# Miscellaneous USB options 1031# Miscellaneous USB options
@@ -1006,10 +1039,10 @@ CONFIG_USB_DEVICE_CLASS=y
1006# USB Host Controller Drivers 1039# USB Host Controller Drivers
1007# 1040#
1008CONFIG_USB_EHCI_HCD=y 1041CONFIG_USB_EHCI_HCD=y
1009# CONFIG_USB_EHCI_SPLIT_ISO is not set
1010CONFIG_USB_EHCI_ROOT_HUB_TT=y 1042CONFIG_USB_EHCI_ROOT_HUB_TT=y
1011# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1043# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1012CONFIG_USB_EHCI_FSL=y 1044CONFIG_USB_EHCI_FSL=y
1045CONFIG_USB_EHCI_HCD_PPC_OF=y
1013# CONFIG_USB_ISP116X_HCD is not set 1046# CONFIG_USB_ISP116X_HCD is not set
1014CONFIG_USB_OHCI_HCD=y 1047CONFIG_USB_OHCI_HCD=y
1015CONFIG_USB_OHCI_HCD_PPC_OF=y 1048CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -1060,10 +1093,6 @@ CONFIG_USB_MON=y
1060# 1093#
1061# USB port drivers 1094# USB port drivers
1062# 1095#
1063
1064#
1065# USB Serial Converter support
1066#
1067# CONFIG_USB_SERIAL is not set 1096# CONFIG_USB_SERIAL is not set
1068 1097
1069# 1098#
@@ -1089,14 +1118,6 @@ CONFIG_USB_MON=y
1089# CONFIG_USB_TRANCEVIBRATOR is not set 1118# CONFIG_USB_TRANCEVIBRATOR is not set
1090# CONFIG_USB_IOWARRIOR is not set 1119# CONFIG_USB_IOWARRIOR is not set
1091# CONFIG_USB_TEST is not set 1120# CONFIG_USB_TEST is not set
1092
1093#
1094# USB DSL modem support
1095#
1096
1097#
1098# USB Gadget Support
1099#
1100CONFIG_USB_GADGET=y 1121CONFIG_USB_GADGET=y
1101# CONFIG_USB_GADGET_DEBUG is not set 1122# CONFIG_USB_GADGET_DEBUG is not set
1102# CONFIG_USB_GADGET_DEBUG_FILES is not set 1123# CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -1122,7 +1143,9 @@ CONFIG_USB_ETH_RNDIS=y
1122# CONFIG_USB_FILE_STORAGE is not set 1143# CONFIG_USB_FILE_STORAGE is not set
1123# CONFIG_USB_G_SERIAL is not set 1144# CONFIG_USB_G_SERIAL is not set
1124# CONFIG_USB_MIDI_GADGET is not set 1145# CONFIG_USB_MIDI_GADGET is not set
1146# CONFIG_USB_G_PRINTER is not set
1125# CONFIG_MMC is not set 1147# CONFIG_MMC is not set
1148# CONFIG_MEMSTICK is not set
1126# CONFIG_NEW_LEDS is not set 1149# CONFIG_NEW_LEDS is not set
1127# CONFIG_INFINIBAND is not set 1150# CONFIG_INFINIBAND is not set
1128# CONFIG_EDAC is not set 1151# CONFIG_EDAC is not set
@@ -1154,20 +1177,23 @@ CONFIG_RTC_DRV_DS1307=y
1154# CONFIG_RTC_DRV_PCF8563 is not set 1177# CONFIG_RTC_DRV_PCF8563 is not set
1155# CONFIG_RTC_DRV_PCF8583 is not set 1178# CONFIG_RTC_DRV_PCF8583 is not set
1156# CONFIG_RTC_DRV_M41T80 is not set 1179# CONFIG_RTC_DRV_M41T80 is not set
1180# CONFIG_RTC_DRV_S35390A is not set
1157 1181
1158# 1182#
1159# SPI RTC drivers 1183# SPI RTC drivers
1160# 1184#
1161# CONFIG_RTC_DRV_RS5C348 is not set
1162# CONFIG_RTC_DRV_MAX6902 is not set 1185# CONFIG_RTC_DRV_MAX6902 is not set
1186# CONFIG_RTC_DRV_R9701 is not set
1187# CONFIG_RTC_DRV_RS5C348 is not set
1163 1188
1164# 1189#
1165# Platform RTC drivers 1190# Platform RTC drivers
1166# 1191#
1167# CONFIG_RTC_DRV_CMOS is not set 1192# CONFIG_RTC_DRV_CMOS is not set
1193# CONFIG_RTC_DRV_DS1511 is not set
1168# CONFIG_RTC_DRV_DS1553 is not set 1194# CONFIG_RTC_DRV_DS1553 is not set
1169# CONFIG_RTC_DRV_STK17TA8 is not set
1170# CONFIG_RTC_DRV_DS1742 is not set 1195# CONFIG_RTC_DRV_DS1742 is not set
1196# CONFIG_RTC_DRV_STK17TA8 is not set
1171# CONFIG_RTC_DRV_M48T86 is not set 1197# CONFIG_RTC_DRV_M48T86 is not set
1172# CONFIG_RTC_DRV_M48T59 is not set 1198# CONFIG_RTC_DRV_M48T59 is not set
1173# CONFIG_RTC_DRV_V3020 is not set 1199# CONFIG_RTC_DRV_V3020 is not set
@@ -1175,6 +1201,7 @@ CONFIG_RTC_DRV_DS1307=y
1175# 1201#
1176# on-CPU RTC drivers 1202# on-CPU RTC drivers
1177# 1203#
1204# CONFIG_DMADEVICES is not set
1178 1205
1179# 1206#
1180# Userspace I/O 1207# Userspace I/O
@@ -1200,12 +1227,10 @@ CONFIG_FS_MBCACHE=y
1200# CONFIG_XFS_FS is not set 1227# CONFIG_XFS_FS is not set
1201# CONFIG_GFS2_FS is not set 1228# CONFIG_GFS2_FS is not set
1202# CONFIG_OCFS2_FS is not set 1229# CONFIG_OCFS2_FS is not set
1203# CONFIG_MINIX_FS is not set 1230CONFIG_DNOTIFY=y
1204# CONFIG_ROMFS_FS is not set
1205CONFIG_INOTIFY=y 1231CONFIG_INOTIFY=y
1206CONFIG_INOTIFY_USER=y 1232CONFIG_INOTIFY_USER=y
1207# CONFIG_QUOTA is not set 1233# CONFIG_QUOTA is not set
1208CONFIG_DNOTIFY=y
1209# CONFIG_AUTOFS_FS is not set 1234# CONFIG_AUTOFS_FS is not set
1210# CONFIG_AUTOFS4_FS is not set 1235# CONFIG_AUTOFS4_FS is not set
1211# CONFIG_FUSE_FS is not set 1236# CONFIG_FUSE_FS is not set
@@ -1258,8 +1283,10 @@ CONFIG_JFFS2_RTIME=y
1258# CONFIG_JFFS2_RUBIN is not set 1283# CONFIG_JFFS2_RUBIN is not set
1259# CONFIG_CRAMFS is not set 1284# CONFIG_CRAMFS is not set
1260# CONFIG_VXFS_FS is not set 1285# CONFIG_VXFS_FS is not set
1286# CONFIG_MINIX_FS is not set
1261# CONFIG_HPFS_FS is not set 1287# CONFIG_HPFS_FS is not set
1262# CONFIG_QNX4FS_FS is not set 1288# CONFIG_QNX4FS_FS is not set
1289# CONFIG_ROMFS_FS is not set
1263# CONFIG_SYSV_FS is not set 1290# CONFIG_SYSV_FS is not set
1264# CONFIG_UFS_FS is not set 1291# CONFIG_UFS_FS is not set
1265CONFIG_NETWORK_FILESYSTEMS=y 1292CONFIG_NETWORK_FILESYSTEMS=y
@@ -1324,7 +1351,6 @@ CONFIG_PLIST=y
1324CONFIG_HAS_IOMEM=y 1351CONFIG_HAS_IOMEM=y
1325CONFIG_HAS_IOPORT=y 1352CONFIG_HAS_IOPORT=y
1326CONFIG_HAS_DMA=y 1353CONFIG_HAS_DMA=y
1327# CONFIG_INSTRUMENTATION is not set
1328 1354
1329# 1355#
1330# Kernel hacking 1356# Kernel hacking
@@ -1343,6 +1369,7 @@ CONFIG_SCHED_DEBUG=y
1343# CONFIG_SCHEDSTATS is not set 1369# CONFIG_SCHEDSTATS is not set
1344# CONFIG_TIMER_STATS is not set 1370# CONFIG_TIMER_STATS is not set
1345# CONFIG_SLUB_DEBUG_ON is not set 1371# CONFIG_SLUB_DEBUG_ON is not set
1372# CONFIG_SLUB_STATS is not set
1346# CONFIG_DEBUG_RT_MUTEXES is not set 1373# CONFIG_DEBUG_RT_MUTEXES is not set
1347# CONFIG_RT_MUTEX_TESTER is not set 1374# CONFIG_RT_MUTEX_TESTER is not set
1348# CONFIG_DEBUG_SPINLOCK is not set 1375# CONFIG_DEBUG_SPINLOCK is not set
@@ -1355,9 +1382,9 @@ CONFIG_SCHED_DEBUG=y
1355# CONFIG_DEBUG_VM is not set 1382# CONFIG_DEBUG_VM is not set
1356# CONFIG_DEBUG_LIST is not set 1383# CONFIG_DEBUG_LIST is not set
1357# CONFIG_DEBUG_SG is not set 1384# CONFIG_DEBUG_SG is not set
1358CONFIG_FORCED_INLINING=y
1359# CONFIG_BOOT_PRINTK_DELAY is not set 1385# CONFIG_BOOT_PRINTK_DELAY is not set
1360# CONFIG_RCU_TORTURE_TEST is not set 1386# CONFIG_RCU_TORTURE_TEST is not set
1387# CONFIG_BACKTRACE_SELF_TEST is not set
1361# CONFIG_FAULT_INJECTION is not set 1388# CONFIG_FAULT_INJECTION is not set
1362# CONFIG_SAMPLES is not set 1389# CONFIG_SAMPLES is not set
1363# CONFIG_DEBUG_STACKOVERFLOW is not set 1390# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1376,6 +1403,7 @@ CONFIG_FORCED_INLINING=y
1376CONFIG_CRYPTO=y 1403CONFIG_CRYPTO=y
1377CONFIG_CRYPTO_ALGAPI=y 1404CONFIG_CRYPTO_ALGAPI=y
1378CONFIG_CRYPTO_BLKCIPHER=y 1405CONFIG_CRYPTO_BLKCIPHER=y
1406# CONFIG_CRYPTO_SEQIV is not set
1379CONFIG_CRYPTO_MANAGER=y 1407CONFIG_CRYPTO_MANAGER=y
1380# CONFIG_CRYPTO_HMAC is not set 1408# CONFIG_CRYPTO_HMAC is not set
1381# CONFIG_CRYPTO_XCBC is not set 1409# CONFIG_CRYPTO_XCBC is not set
@@ -1393,6 +1421,9 @@ CONFIG_CRYPTO_CBC=y
1393CONFIG_CRYPTO_PCBC=m 1421CONFIG_CRYPTO_PCBC=m
1394# CONFIG_CRYPTO_LRW is not set 1422# CONFIG_CRYPTO_LRW is not set
1395# CONFIG_CRYPTO_XTS is not set 1423# CONFIG_CRYPTO_XTS is not set
1424# CONFIG_CRYPTO_CTR is not set
1425# CONFIG_CRYPTO_GCM is not set
1426# CONFIG_CRYPTO_CCM is not set
1396# CONFIG_CRYPTO_CRYPTD is not set 1427# CONFIG_CRYPTO_CRYPTD is not set
1397CONFIG_CRYPTO_DES=y 1428CONFIG_CRYPTO_DES=y
1398# CONFIG_CRYPTO_FCRYPT is not set 1429# CONFIG_CRYPTO_FCRYPT is not set
@@ -1407,11 +1438,14 @@ CONFIG_CRYPTO_DES=y
1407# CONFIG_CRYPTO_KHAZAD is not set 1438# CONFIG_CRYPTO_KHAZAD is not set
1408# CONFIG_CRYPTO_ANUBIS is not set 1439# CONFIG_CRYPTO_ANUBIS is not set
1409# CONFIG_CRYPTO_SEED is not set 1440# CONFIG_CRYPTO_SEED is not set
1441# CONFIG_CRYPTO_SALSA20 is not set
1410# CONFIG_CRYPTO_DEFLATE is not set 1442# CONFIG_CRYPTO_DEFLATE is not set
1411# CONFIG_CRYPTO_MICHAEL_MIC is not set 1443# CONFIG_CRYPTO_MICHAEL_MIC is not set
1412# CONFIG_CRYPTO_CRC32C is not set 1444# CONFIG_CRYPTO_CRC32C is not set
1413# CONFIG_CRYPTO_CAMELLIA is not set 1445# CONFIG_CRYPTO_CAMELLIA is not set
1414# CONFIG_CRYPTO_TEST is not set 1446# CONFIG_CRYPTO_TEST is not set
1415# CONFIG_CRYPTO_AUTHENC is not set 1447# CONFIG_CRYPTO_AUTHENC is not set
1448# CONFIG_CRYPTO_LZO is not set
1416CONFIG_CRYPTO_HW=y 1449CONFIG_CRYPTO_HW=y
1450# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1417# CONFIG_PPC_CLOCK is not set 1451# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc832x_mds_defconfig b/arch/powerpc/configs/mpc832x_mds_defconfig
index 2d8951b1096e..79d228f84c5a 100644
--- a/arch/powerpc/configs/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/mpc832x_mds_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:33 2007 4# Mon Mar 24 08:48:16 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,8 +14,8 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_83xx=y
18CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
18# CONFIG_FSL_EMB_PERFMON is not set
19CONFIG_PPC_STD_MMU=y 19CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y 20CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -66,15 +67,19 @@ CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set 73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y
75# CONFIG_FAIR_GROUP_SCHED is not set 75# CONFIG_FAIR_GROUP_SCHED is not set
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
76CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
77# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
78CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
79CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -86,11 +91,13 @@ CONFIG_HOTPLUG=y
86CONFIG_PRINTK=y 91CONFIG_PRINTK=y
87CONFIG_BUG=y 92CONFIG_BUG=y
88CONFIG_ELF_CORE=y 93CONFIG_ELF_CORE=y
94CONFIG_COMPAT_BRK=y
89CONFIG_BASE_FULL=y 95CONFIG_BASE_FULL=y
90CONFIG_FUTEX=y 96CONFIG_FUTEX=y
91CONFIG_ANON_INODES=y 97CONFIG_ANON_INODES=y
92# CONFIG_EPOLL is not set 98# CONFIG_EPOLL is not set
93CONFIG_SIGNALFD=y 99CONFIG_SIGNALFD=y
100CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
95CONFIG_SHMEM=y 102CONFIG_SHMEM=y
96CONFIG_VM_EVENT_COUNTERS=y 103CONFIG_VM_EVENT_COUNTERS=y
@@ -98,6 +105,13 @@ CONFIG_SLUB_DEBUG=y
98# CONFIG_SLAB is not set 105# CONFIG_SLAB is not set
99CONFIG_SLUB=y 106CONFIG_SLUB=y
100# CONFIG_SLOB is not set 107# CONFIG_SLOB is not set
108# CONFIG_PROFILING is not set
109# CONFIG_MARKERS is not set
110CONFIG_HAVE_OPROFILE=y
111CONFIG_HAVE_KPROBES=y
112CONFIG_HAVE_KRETPROBES=y
113CONFIG_PROC_PAGE_MONITOR=y
114CONFIG_SLABINFO=y
101CONFIG_RT_MUTEXES=y 115CONFIG_RT_MUTEXES=y
102# CONFIG_TINY_SHMEM is not set 116# CONFIG_TINY_SHMEM is not set
103CONFIG_BASE_SMALL=0 117CONFIG_BASE_SMALL=0
@@ -125,6 +139,7 @@ CONFIG_DEFAULT_AS=y
125# CONFIG_DEFAULT_CFQ is not set 139# CONFIG_DEFAULT_CFQ is not set
126# CONFIG_DEFAULT_NOOP is not set 140# CONFIG_DEFAULT_NOOP is not set
127CONFIG_DEFAULT_IOSCHED="anticipatory" 141CONFIG_DEFAULT_IOSCHED="anticipatory"
142CONFIG_CLASSIC_RCU=y
128 143
129# 144#
130# Platform support 145# Platform support
@@ -133,18 +148,23 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
133# CONFIG_PPC_82xx is not set 148# CONFIG_PPC_82xx is not set
134CONFIG_PPC_83xx=y 149CONFIG_PPC_83xx=y
135# CONFIG_PPC_86xx is not set 150# CONFIG_PPC_86xx is not set
136# CONFIG_PPC_MPC52xx is not set 151# CONFIG_PPC_MPC512x is not set
137# CONFIG_PPC_MPC5200 is not set 152# CONFIG_PPC_MPC5121 is not set
138# CONFIG_PPC_CELL is not set 153# CONFIG_PPC_CELL is not set
139# CONFIG_PPC_CELL_NATIVE is not set 154# CONFIG_PPC_CELL_NATIVE is not set
140# CONFIG_PQ2ADS is not set 155# CONFIG_PQ2ADS is not set
141# CONFIG_MPC8313_RDB is not set 156CONFIG_MPC83xx=y
157# CONFIG_MPC831x_RDB is not set
142CONFIG_MPC832x_MDS=y 158CONFIG_MPC832x_MDS=y
143# CONFIG_MPC832x_RDB is not set 159# CONFIG_MPC832x_RDB is not set
144# CONFIG_MPC834x_MDS is not set 160# CONFIG_MPC834x_MDS is not set
145# CONFIG_MPC834x_ITX is not set 161# CONFIG_MPC834x_ITX is not set
146# CONFIG_MPC836x_MDS is not set 162# CONFIG_MPC836x_MDS is not set
163# CONFIG_MPC837x_MDS is not set
164# CONFIG_MPC837x_RDB is not set
165# CONFIG_SBC834x is not set
147CONFIG_PPC_MPC832x=y 166CONFIG_PPC_MPC832x=y
167CONFIG_IPIC=y
148# CONFIG_MPIC is not set 168# CONFIG_MPIC is not set
149# CONFIG_MPIC_WEIRD is not set 169# CONFIG_MPIC_WEIRD is not set
150# CONFIG_PPC_I8259 is not set 170# CONFIG_PPC_I8259 is not set
@@ -156,7 +176,6 @@ CONFIG_PPC_MPC832x=y
156# CONFIG_GENERIC_IOMAP is not set 176# CONFIG_GENERIC_IOMAP is not set
157# CONFIG_CPU_FREQ is not set 177# CONFIG_CPU_FREQ is not set
158CONFIG_QUICC_ENGINE=y 178CONFIG_QUICC_ENGINE=y
159# CONFIG_CPM2 is not set
160# CONFIG_FSL_ULI1575 is not set 179# CONFIG_FSL_ULI1575 is not set
161 180
162# 181#
@@ -172,13 +191,17 @@ CONFIG_HZ_250=y
172# CONFIG_HZ_300 is not set 191# CONFIG_HZ_300 is not set
173# CONFIG_HZ_1000 is not set 192# CONFIG_HZ_1000 is not set
174CONFIG_HZ=250 193CONFIG_HZ=250
194# CONFIG_SCHED_HRTICK is not set
175CONFIG_PREEMPT_NONE=y 195CONFIG_PREEMPT_NONE=y
176# CONFIG_PREEMPT_VOLUNTARY is not set 196# CONFIG_PREEMPT_VOLUNTARY is not set
177# CONFIG_PREEMPT is not set 197# CONFIG_PREEMPT is not set
178CONFIG_BINFMT_ELF=y 198CONFIG_BINFMT_ELF=y
179# CONFIG_BINFMT_MISC is not set 199# CONFIG_BINFMT_MISC is not set
180CONFIG_MATH_EMULATION=y 200CONFIG_MATH_EMULATION=y
201# CONFIG_IOMMU_HELPER is not set
181CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 202CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
203CONFIG_ARCH_HAS_WALK_MEMORY=y
204CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
182CONFIG_ARCH_FLATMEM_ENABLE=y 205CONFIG_ARCH_FLATMEM_ENABLE=y
183CONFIG_ARCH_POPULATES_NODE_MAP=y 206CONFIG_ARCH_POPULATES_NODE_MAP=y
184CONFIG_SELECT_MEMORY_MODEL=y 207CONFIG_SELECT_MEMORY_MODEL=y
@@ -197,11 +220,7 @@ CONFIG_VIRT_TO_BUS=y
197CONFIG_PROC_DEVICETREE=y 220CONFIG_PROC_DEVICETREE=y
198# CONFIG_CMDLINE_BOOL is not set 221# CONFIG_CMDLINE_BOOL is not set
199# CONFIG_PM is not set 222# CONFIG_PM is not set
200CONFIG_SUSPEND_UP_POSSIBLE=y
201CONFIG_HIBERNATION_UP_POSSIBLE=y
202CONFIG_SECCOMP=y 223CONFIG_SECCOMP=y
203CONFIG_WANT_DEVICE_TREE=y
204CONFIG_DEVICE_TREE=""
205CONFIG_ISA_DMA_API=y 224CONFIG_ISA_DMA_API=y
206 225
207# 226#
@@ -250,6 +269,7 @@ CONFIG_XFRM=y
250# CONFIG_XFRM_USER is not set 269# CONFIG_XFRM_USER is not set
251# CONFIG_XFRM_SUB_POLICY is not set 270# CONFIG_XFRM_SUB_POLICY is not set
252# CONFIG_XFRM_MIGRATE is not set 271# CONFIG_XFRM_MIGRATE is not set
272# CONFIG_XFRM_STATISTICS is not set
253# CONFIG_NET_KEY is not set 273# CONFIG_NET_KEY is not set
254CONFIG_INET=y 274CONFIG_INET=y
255CONFIG_IP_MULTICAST=y 275CONFIG_IP_MULTICAST=y
@@ -305,6 +325,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
305# 325#
306# CONFIG_NET_PKTGEN is not set 326# CONFIG_NET_PKTGEN is not set
307# CONFIG_HAMRADIO is not set 327# CONFIG_HAMRADIO is not set
328# CONFIG_CAN is not set
308# CONFIG_IRDA is not set 329# CONFIG_IRDA is not set
309# CONFIG_BT is not set 330# CONFIG_BT is not set
310# CONFIG_AF_RXRPC is not set 331# CONFIG_AF_RXRPC is not set
@@ -349,7 +370,7 @@ CONFIG_BLK_DEV_LOOP=y
349CONFIG_BLK_DEV_RAM=y 370CONFIG_BLK_DEV_RAM=y
350CONFIG_BLK_DEV_RAM_COUNT=16 371CONFIG_BLK_DEV_RAM_COUNT=16
351CONFIG_BLK_DEV_RAM_SIZE=32768 372CONFIG_BLK_DEV_RAM_SIZE=32768
352CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 373# CONFIG_BLK_DEV_XIP is not set
353# CONFIG_CDROM_PKTCDVD is not set 374# CONFIG_CDROM_PKTCDVD is not set
354# CONFIG_ATA_OVER_ETH is not set 375# CONFIG_ATA_OVER_ETH is not set
355CONFIG_MISC_DEVICES=y 376CONFIG_MISC_DEVICES=y
@@ -357,6 +378,8 @@ CONFIG_MISC_DEVICES=y
357# CONFIG_EEPROM_93CX6 is not set 378# CONFIG_EEPROM_93CX6 is not set
358# CONFIG_SGI_IOC4 is not set 379# CONFIG_SGI_IOC4 is not set
359# CONFIG_TIFM_CORE is not set 380# CONFIG_TIFM_CORE is not set
381# CONFIG_ENCLOSURE_SERVICES is not set
382CONFIG_HAVE_IDE=y
360# CONFIG_IDE is not set 383# CONFIG_IDE is not set
361 384
362# 385#
@@ -421,6 +444,7 @@ CONFIG_SCSI_LOWLEVEL=y
421# CONFIG_SCSI_IPS is not set 444# CONFIG_SCSI_IPS is not set
422# CONFIG_SCSI_INITIO is not set 445# CONFIG_SCSI_INITIO is not set
423# CONFIG_SCSI_INIA100 is not set 446# CONFIG_SCSI_INIA100 is not set
447# CONFIG_SCSI_MVSAS is not set
424# CONFIG_SCSI_STEX is not set 448# CONFIG_SCSI_STEX is not set
425# CONFIG_SCSI_SYM53C8XX_2 is not set 449# CONFIG_SCSI_SYM53C8XX_2 is not set
426# CONFIG_SCSI_QLOGIC_1280 is not set 450# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -451,7 +475,6 @@ CONFIG_NETDEVICES=y
451# CONFIG_EQUALIZER is not set 475# CONFIG_EQUALIZER is not set
452# CONFIG_TUN is not set 476# CONFIG_TUN is not set
453# CONFIG_VETH is not set 477# CONFIG_VETH is not set
454# CONFIG_IP1000 is not set
455# CONFIG_ARCNET is not set 478# CONFIG_ARCNET is not set
456CONFIG_PHYLIB=y 479CONFIG_PHYLIB=y
457 480
@@ -467,6 +490,7 @@ CONFIG_DAVICOM_PHY=y
467# CONFIG_SMSC_PHY is not set 490# CONFIG_SMSC_PHY is not set
468# CONFIG_BROADCOM_PHY is not set 491# CONFIG_BROADCOM_PHY is not set
469# CONFIG_ICPLUS_PHY is not set 492# CONFIG_ICPLUS_PHY is not set
493# CONFIG_REALTEK_PHY is not set
470# CONFIG_FIXED_PHY is not set 494# CONFIG_FIXED_PHY is not set
471# CONFIG_MDIO_BITBANG is not set 495# CONFIG_MDIO_BITBANG is not set
472CONFIG_NET_ETHERNET=y 496CONFIG_NET_ETHERNET=y
@@ -488,6 +512,9 @@ CONFIG_NETDEV_1000=y
488# CONFIG_DL2K is not set 512# CONFIG_DL2K is not set
489# CONFIG_E1000 is not set 513# CONFIG_E1000 is not set
490# CONFIG_E1000E is not set 514# CONFIG_E1000E is not set
515# CONFIG_E1000E_ENABLED is not set
516# CONFIG_IP1000 is not set
517# CONFIG_IGB is not set
491# CONFIG_NS83820 is not set 518# CONFIG_NS83820 is not set
492# CONFIG_HAMACHI is not set 519# CONFIG_HAMACHI is not set
493# CONFIG_YELLOWFIN is not set 520# CONFIG_YELLOWFIN is not set
@@ -518,6 +545,7 @@ CONFIG_NETDEV_10000=y
518# CONFIG_NIU is not set 545# CONFIG_NIU is not set
519# CONFIG_MLX4_CORE is not set 546# CONFIG_MLX4_CORE is not set
520# CONFIG_TEHUTI is not set 547# CONFIG_TEHUTI is not set
548# CONFIG_BNX2X is not set
521# CONFIG_TR is not set 549# CONFIG_TR is not set
522 550
523# 551#
@@ -531,7 +559,6 @@ CONFIG_NETDEV_10000=y
531# CONFIG_PPP is not set 559# CONFIG_PPP is not set
532# CONFIG_SLIP is not set 560# CONFIG_SLIP is not set
533# CONFIG_NET_FC is not set 561# CONFIG_NET_FC is not set
534# CONFIG_SHAPER is not set
535# CONFIG_NETCONSOLE is not set 562# CONFIG_NETCONSOLE is not set
536# CONFIG_NETPOLL is not set 563# CONFIG_NETPOLL is not set
537# CONFIG_NET_POLL_CONTROLLER is not set 564# CONFIG_NET_POLL_CONTROLLER is not set
@@ -574,6 +601,7 @@ CONFIG_INPUT=y
574# 601#
575# CONFIG_VT is not set 602# CONFIG_VT is not set
576# CONFIG_SERIAL_NONSTANDARD is not set 603# CONFIG_SERIAL_NONSTANDARD is not set
604# CONFIG_NOZOMI is not set
577 605
578# 606#
579# Serial drivers 607# Serial drivers
@@ -593,6 +621,7 @@ CONFIG_SERIAL_CORE=y
593CONFIG_SERIAL_CORE_CONSOLE=y 621CONFIG_SERIAL_CORE_CONSOLE=y
594# CONFIG_SERIAL_JSM is not set 622# CONFIG_SERIAL_JSM is not set
595# CONFIG_SERIAL_OF_PLATFORM is not set 623# CONFIG_SERIAL_OF_PLATFORM is not set
624# CONFIG_SERIAL_QE is not set
596CONFIG_UNIX98_PTYS=y 625CONFIG_UNIX98_PTYS=y
597CONFIG_LEGACY_PTYS=y 626CONFIG_LEGACY_PTYS=y
598CONFIG_LEGACY_PTY_COUNT=256 627CONFIG_LEGACY_PTY_COUNT=256
@@ -647,14 +676,12 @@ CONFIG_I2C_MPC=y
647# 676#
648# Miscellaneous I2C Chip support 677# Miscellaneous I2C Chip support
649# 678#
650# CONFIG_SENSORS_DS1337 is not set
651# CONFIG_SENSORS_DS1374 is not set
652# CONFIG_DS1682 is not set 679# CONFIG_DS1682 is not set
653# CONFIG_SENSORS_EEPROM is not set 680# CONFIG_SENSORS_EEPROM is not set
654# CONFIG_SENSORS_PCF8574 is not set 681# CONFIG_SENSORS_PCF8574 is not set
655# CONFIG_SENSORS_PCA9539 is not set 682# CONFIG_PCF8575 is not set
656# CONFIG_SENSORS_PCF8591 is not set 683# CONFIG_SENSORS_PCF8591 is not set
657# CONFIG_SENSORS_M41T00 is not set 684# CONFIG_TPS65010 is not set
658# CONFIG_SENSORS_MAX6875 is not set 685# CONFIG_SENSORS_MAX6875 is not set
659# CONFIG_SENSORS_TSL2550 is not set 686# CONFIG_SENSORS_TSL2550 is not set
660# CONFIG_I2C_DEBUG_CORE is not set 687# CONFIG_I2C_DEBUG_CORE is not set
@@ -679,6 +706,7 @@ CONFIG_HWMON=y
679# CONFIG_SENSORS_ADM1031 is not set 706# CONFIG_SENSORS_ADM1031 is not set
680# CONFIG_SENSORS_ADM9240 is not set 707# CONFIG_SENSORS_ADM9240 is not set
681# CONFIG_SENSORS_ADT7470 is not set 708# CONFIG_SENSORS_ADT7470 is not set
709# CONFIG_SENSORS_ADT7473 is not set
682# CONFIG_SENSORS_ATXP1 is not set 710# CONFIG_SENSORS_ATXP1 is not set
683# CONFIG_SENSORS_DS1621 is not set 711# CONFIG_SENSORS_DS1621 is not set
684# CONFIG_SENSORS_I5K_AMB is not set 712# CONFIG_SENSORS_I5K_AMB is not set
@@ -708,6 +736,7 @@ CONFIG_HWMON=y
708# CONFIG_SENSORS_SMSC47M1 is not set 736# CONFIG_SENSORS_SMSC47M1 is not set
709# CONFIG_SENSORS_SMSC47M192 is not set 737# CONFIG_SENSORS_SMSC47M192 is not set
710# CONFIG_SENSORS_SMSC47B397 is not set 738# CONFIG_SENSORS_SMSC47B397 is not set
739# CONFIG_SENSORS_ADS7828 is not set
711# CONFIG_SENSORS_THMC50 is not set 740# CONFIG_SENSORS_THMC50 is not set
712# CONFIG_SENSORS_VIA686A is not set 741# CONFIG_SENSORS_VIA686A is not set
713# CONFIG_SENSORS_VT1211 is not set 742# CONFIG_SENSORS_VT1211 is not set
@@ -717,9 +746,11 @@ CONFIG_HWMON=y
717# CONFIG_SENSORS_W83792D is not set 746# CONFIG_SENSORS_W83792D is not set
718# CONFIG_SENSORS_W83793 is not set 747# CONFIG_SENSORS_W83793 is not set
719# CONFIG_SENSORS_W83L785TS is not set 748# CONFIG_SENSORS_W83L785TS is not set
749# CONFIG_SENSORS_W83L786NG is not set
720# CONFIG_SENSORS_W83627HF is not set 750# CONFIG_SENSORS_W83627HF is not set
721# CONFIG_SENSORS_W83627EHF is not set 751# CONFIG_SENSORS_W83627EHF is not set
722# CONFIG_HWMON_DEBUG_CHIP is not set 752# CONFIG_HWMON_DEBUG_CHIP is not set
753# CONFIG_THERMAL is not set
723CONFIG_WATCHDOG=y 754CONFIG_WATCHDOG=y
724# CONFIG_WATCHDOG_NOWAYOUT is not set 755# CONFIG_WATCHDOG_NOWAYOUT is not set
725 756
@@ -785,17 +816,18 @@ CONFIG_USB_ARCH_HAS_EHCI=y
785# 816#
786# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 817# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
787# 818#
788
789#
790# USB Gadget Support
791#
792# CONFIG_USB_GADGET is not set 819# CONFIG_USB_GADGET is not set
793# CONFIG_MMC is not set 820# CONFIG_MMC is not set
821# CONFIG_MEMSTICK is not set
794# CONFIG_NEW_LEDS is not set 822# CONFIG_NEW_LEDS is not set
795# CONFIG_INFINIBAND is not set 823# CONFIG_INFINIBAND is not set
796# CONFIG_EDAC is not set 824# CONFIG_EDAC is not set
797CONFIG_RTC_LIB=y 825CONFIG_RTC_LIB=y
798CONFIG_RTC_CLASS=y 826CONFIG_RTC_CLASS=y
827
828#
829# Conflicting RTC option has been selected, check GEN_RTC and RTC
830#
799CONFIG_RTC_HCTOSYS=y 831CONFIG_RTC_HCTOSYS=y
800CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 832CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
801# CONFIG_RTC_DEBUG is not set 833# CONFIG_RTC_DEBUG is not set
@@ -822,6 +854,7 @@ CONFIG_RTC_DRV_DS1374=y
822# CONFIG_RTC_DRV_PCF8563 is not set 854# CONFIG_RTC_DRV_PCF8563 is not set
823# CONFIG_RTC_DRV_PCF8583 is not set 855# CONFIG_RTC_DRV_PCF8583 is not set
824# CONFIG_RTC_DRV_M41T80 is not set 856# CONFIG_RTC_DRV_M41T80 is not set
857# CONFIG_RTC_DRV_S35390A is not set
825 858
826# 859#
827# SPI RTC drivers 860# SPI RTC drivers
@@ -831,9 +864,10 @@ CONFIG_RTC_DRV_DS1374=y
831# Platform RTC drivers 864# Platform RTC drivers
832# 865#
833# CONFIG_RTC_DRV_CMOS is not set 866# CONFIG_RTC_DRV_CMOS is not set
867# CONFIG_RTC_DRV_DS1511 is not set
834# CONFIG_RTC_DRV_DS1553 is not set 868# CONFIG_RTC_DRV_DS1553 is not set
835# CONFIG_RTC_DRV_STK17TA8 is not set
836# CONFIG_RTC_DRV_DS1742 is not set 869# CONFIG_RTC_DRV_DS1742 is not set
870# CONFIG_RTC_DRV_STK17TA8 is not set
837# CONFIG_RTC_DRV_M48T86 is not set 871# CONFIG_RTC_DRV_M48T86 is not set
838# CONFIG_RTC_DRV_M48T59 is not set 872# CONFIG_RTC_DRV_M48T59 is not set
839# CONFIG_RTC_DRV_V3020 is not set 873# CONFIG_RTC_DRV_V3020 is not set
@@ -841,6 +875,7 @@ CONFIG_RTC_DRV_DS1374=y
841# 875#
842# on-CPU RTC drivers 876# on-CPU RTC drivers
843# 877#
878# CONFIG_DMADEVICES is not set
844 879
845# 880#
846# Userspace I/O 881# Userspace I/O
@@ -866,12 +901,10 @@ CONFIG_FS_MBCACHE=y
866# CONFIG_XFS_FS is not set 901# CONFIG_XFS_FS is not set
867# CONFIG_GFS2_FS is not set 902# CONFIG_GFS2_FS is not set
868# CONFIG_OCFS2_FS is not set 903# CONFIG_OCFS2_FS is not set
869# CONFIG_MINIX_FS is not set 904CONFIG_DNOTIFY=y
870# CONFIG_ROMFS_FS is not set
871CONFIG_INOTIFY=y 905CONFIG_INOTIFY=y
872CONFIG_INOTIFY_USER=y 906CONFIG_INOTIFY_USER=y
873# CONFIG_QUOTA is not set 907# CONFIG_QUOTA is not set
874CONFIG_DNOTIFY=y
875# CONFIG_AUTOFS_FS is not set 908# CONFIG_AUTOFS_FS is not set
876# CONFIG_AUTOFS4_FS is not set 909# CONFIG_AUTOFS4_FS is not set
877# CONFIG_FUSE_FS is not set 910# CONFIG_FUSE_FS is not set
@@ -913,8 +946,10 @@ CONFIG_TMPFS=y
913# CONFIG_EFS_FS is not set 946# CONFIG_EFS_FS is not set
914# CONFIG_CRAMFS is not set 947# CONFIG_CRAMFS is not set
915# CONFIG_VXFS_FS is not set 948# CONFIG_VXFS_FS is not set
949# CONFIG_MINIX_FS is not set
916# CONFIG_HPFS_FS is not set 950# CONFIG_HPFS_FS is not set
917# CONFIG_QNX4FS_FS is not set 951# CONFIG_QNX4FS_FS is not set
952# CONFIG_ROMFS_FS is not set
918# CONFIG_SYSV_FS is not set 953# CONFIG_SYSV_FS is not set
919# CONFIG_UFS_FS is not set 954# CONFIG_UFS_FS is not set
920CONFIG_NETWORK_FILESYSTEMS=y 955CONFIG_NETWORK_FILESYSTEMS=y
@@ -958,7 +993,6 @@ CONFIG_PARTITION_ADVANCED=y
958# CONFIG_SYSV68_PARTITION is not set 993# CONFIG_SYSV68_PARTITION is not set
959# CONFIG_NLS is not set 994# CONFIG_NLS is not set
960# CONFIG_DLM is not set 995# CONFIG_DLM is not set
961# CONFIG_UCC_SLOW is not set
962CONFIG_UCC_FAST=y 996CONFIG_UCC_FAST=y
963CONFIG_UCC=y 997CONFIG_UCC=y
964 998
@@ -976,7 +1010,6 @@ CONFIG_PLIST=y
976CONFIG_HAS_IOMEM=y 1010CONFIG_HAS_IOMEM=y
977CONFIG_HAS_IOPORT=y 1011CONFIG_HAS_IOPORT=y
978CONFIG_HAS_DMA=y 1012CONFIG_HAS_DMA=y
979# CONFIG_INSTRUMENTATION is not set
980 1013
981# 1014#
982# Kernel hacking 1015# Kernel hacking
@@ -990,6 +1023,7 @@ CONFIG_ENABLE_MUST_CHECK=y
990# CONFIG_HEADERS_CHECK is not set 1023# CONFIG_HEADERS_CHECK is not set
991# CONFIG_DEBUG_KERNEL is not set 1024# CONFIG_DEBUG_KERNEL is not set
992# CONFIG_SLUB_DEBUG_ON is not set 1025# CONFIG_SLUB_DEBUG_ON is not set
1026# CONFIG_SLUB_STATS is not set
993# CONFIG_DEBUG_BUGVERBOSE is not set 1027# CONFIG_DEBUG_BUGVERBOSE is not set
994# CONFIG_SAMPLES is not set 1028# CONFIG_SAMPLES is not set
995# CONFIG_PPC_EARLY_DEBUG is not set 1029# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1003,6 +1037,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1003CONFIG_CRYPTO=y 1037CONFIG_CRYPTO=y
1004CONFIG_CRYPTO_ALGAPI=y 1038CONFIG_CRYPTO_ALGAPI=y
1005CONFIG_CRYPTO_BLKCIPHER=y 1039CONFIG_CRYPTO_BLKCIPHER=y
1040# CONFIG_CRYPTO_SEQIV is not set
1006CONFIG_CRYPTO_MANAGER=y 1041CONFIG_CRYPTO_MANAGER=y
1007# CONFIG_CRYPTO_HMAC is not set 1042# CONFIG_CRYPTO_HMAC is not set
1008# CONFIG_CRYPTO_XCBC is not set 1043# CONFIG_CRYPTO_XCBC is not set
@@ -1020,6 +1055,9 @@ CONFIG_CRYPTO_CBC=y
1020CONFIG_CRYPTO_PCBC=m 1055CONFIG_CRYPTO_PCBC=m
1021# CONFIG_CRYPTO_LRW is not set 1056# CONFIG_CRYPTO_LRW is not set
1022# CONFIG_CRYPTO_XTS is not set 1057# CONFIG_CRYPTO_XTS is not set
1058# CONFIG_CRYPTO_CTR is not set
1059# CONFIG_CRYPTO_GCM is not set
1060# CONFIG_CRYPTO_CCM is not set
1023# CONFIG_CRYPTO_CRYPTD is not set 1061# CONFIG_CRYPTO_CRYPTD is not set
1024CONFIG_CRYPTO_DES=y 1062CONFIG_CRYPTO_DES=y
1025# CONFIG_CRYPTO_FCRYPT is not set 1063# CONFIG_CRYPTO_FCRYPT is not set
@@ -1034,12 +1072,15 @@ CONFIG_CRYPTO_DES=y
1034# CONFIG_CRYPTO_KHAZAD is not set 1072# CONFIG_CRYPTO_KHAZAD is not set
1035# CONFIG_CRYPTO_ANUBIS is not set 1073# CONFIG_CRYPTO_ANUBIS is not set
1036# CONFIG_CRYPTO_SEED is not set 1074# CONFIG_CRYPTO_SEED is not set
1075# CONFIG_CRYPTO_SALSA20 is not set
1037# CONFIG_CRYPTO_DEFLATE is not set 1076# CONFIG_CRYPTO_DEFLATE is not set
1038# CONFIG_CRYPTO_MICHAEL_MIC is not set 1077# CONFIG_CRYPTO_MICHAEL_MIC is not set
1039# CONFIG_CRYPTO_CRC32C is not set 1078# CONFIG_CRYPTO_CRC32C is not set
1040# CONFIG_CRYPTO_CAMELLIA is not set 1079# CONFIG_CRYPTO_CAMELLIA is not set
1041# CONFIG_CRYPTO_TEST is not set 1080# CONFIG_CRYPTO_TEST is not set
1042# CONFIG_CRYPTO_AUTHENC is not set 1081# CONFIG_CRYPTO_AUTHENC is not set
1082# CONFIG_CRYPTO_LZO is not set
1043CONFIG_CRYPTO_HW=y 1083CONFIG_CRYPTO_HW=y
1084# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1044# CONFIG_PPC_CLOCK is not set 1085# CONFIG_PPC_CLOCK is not set
1045CONFIG_PPC_LIB_RHEAP=y 1086CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc832x_rdb_defconfig b/arch/powerpc/configs/mpc832x_rdb_defconfig
index 761718a63b7c..ac913025713e 100644
--- a/arch/powerpc/configs/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/mpc832x_rdb_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:35 2007 4# Mon Mar 24 08:48:16 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,8 +14,8 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_83xx=y
18CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
18# CONFIG_FSL_EMB_PERFMON is not set
19CONFIG_PPC_STD_MMU=y 19CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y 20CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -66,15 +67,19 @@ CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set 73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y
75# CONFIG_FAIR_GROUP_SCHED is not set 75# CONFIG_FAIR_GROUP_SCHED is not set
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
76CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
77# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
78CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
79CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -86,11 +91,13 @@ CONFIG_HOTPLUG=y
86CONFIG_PRINTK=y 91CONFIG_PRINTK=y
87CONFIG_BUG=y 92CONFIG_BUG=y
88CONFIG_ELF_CORE=y 93CONFIG_ELF_CORE=y
94CONFIG_COMPAT_BRK=y
89CONFIG_BASE_FULL=y 95CONFIG_BASE_FULL=y
90CONFIG_FUTEX=y 96CONFIG_FUTEX=y
91CONFIG_ANON_INODES=y 97CONFIG_ANON_INODES=y
92# CONFIG_EPOLL is not set 98# CONFIG_EPOLL is not set
93CONFIG_SIGNALFD=y 99CONFIG_SIGNALFD=y
100CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
95CONFIG_SHMEM=y 102CONFIG_SHMEM=y
96CONFIG_VM_EVENT_COUNTERS=y 103CONFIG_VM_EVENT_COUNTERS=y
@@ -98,6 +105,13 @@ CONFIG_SLUB_DEBUG=y
98# CONFIG_SLAB is not set 105# CONFIG_SLAB is not set
99CONFIG_SLUB=y 106CONFIG_SLUB=y
100# CONFIG_SLOB is not set 107# CONFIG_SLOB is not set
108# CONFIG_PROFILING is not set
109# CONFIG_MARKERS is not set
110CONFIG_HAVE_OPROFILE=y
111CONFIG_HAVE_KPROBES=y
112CONFIG_HAVE_KRETPROBES=y
113CONFIG_PROC_PAGE_MONITOR=y
114CONFIG_SLABINFO=y
101CONFIG_RT_MUTEXES=y 115CONFIG_RT_MUTEXES=y
102# CONFIG_TINY_SHMEM is not set 116# CONFIG_TINY_SHMEM is not set
103CONFIG_BASE_SMALL=0 117CONFIG_BASE_SMALL=0
@@ -125,6 +139,7 @@ CONFIG_DEFAULT_AS=y
125# CONFIG_DEFAULT_CFQ is not set 139# CONFIG_DEFAULT_CFQ is not set
126# CONFIG_DEFAULT_NOOP is not set 140# CONFIG_DEFAULT_NOOP is not set
127CONFIG_DEFAULT_IOSCHED="anticipatory" 141CONFIG_DEFAULT_IOSCHED="anticipatory"
142CONFIG_CLASSIC_RCU=y
128 143
129# 144#
130# Platform support 145# Platform support
@@ -133,18 +148,23 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
133# CONFIG_PPC_82xx is not set 148# CONFIG_PPC_82xx is not set
134CONFIG_PPC_83xx=y 149CONFIG_PPC_83xx=y
135# CONFIG_PPC_86xx is not set 150# CONFIG_PPC_86xx is not set
136# CONFIG_PPC_MPC52xx is not set 151# CONFIG_PPC_MPC512x is not set
137# CONFIG_PPC_MPC5200 is not set 152# CONFIG_PPC_MPC5121 is not set
138# CONFIG_PPC_CELL is not set 153# CONFIG_PPC_CELL is not set
139# CONFIG_PPC_CELL_NATIVE is not set 154# CONFIG_PPC_CELL_NATIVE is not set
140# CONFIG_PQ2ADS is not set 155# CONFIG_PQ2ADS is not set
141# CONFIG_MPC8313_RDB is not set 156CONFIG_MPC83xx=y
157# CONFIG_MPC831x_RDB is not set
142# CONFIG_MPC832x_MDS is not set 158# CONFIG_MPC832x_MDS is not set
143CONFIG_MPC832x_RDB=y 159CONFIG_MPC832x_RDB=y
144# CONFIG_MPC834x_MDS is not set 160# CONFIG_MPC834x_MDS is not set
145# CONFIG_MPC834x_ITX is not set 161# CONFIG_MPC834x_ITX is not set
146# CONFIG_MPC836x_MDS is not set 162# CONFIG_MPC836x_MDS is not set
163# CONFIG_MPC837x_MDS is not set
164# CONFIG_MPC837x_RDB is not set
165# CONFIG_SBC834x is not set
147CONFIG_PPC_MPC832x=y 166CONFIG_PPC_MPC832x=y
167CONFIG_IPIC=y
148# CONFIG_MPIC is not set 168# CONFIG_MPIC is not set
149# CONFIG_MPIC_WEIRD is not set 169# CONFIG_MPIC_WEIRD is not set
150# CONFIG_PPC_I8259 is not set 170# CONFIG_PPC_I8259 is not set
@@ -156,7 +176,6 @@ CONFIG_PPC_MPC832x=y
156# CONFIG_GENERIC_IOMAP is not set 176# CONFIG_GENERIC_IOMAP is not set
157# CONFIG_CPU_FREQ is not set 177# CONFIG_CPU_FREQ is not set
158CONFIG_QUICC_ENGINE=y 178CONFIG_QUICC_ENGINE=y
159# CONFIG_CPM2 is not set
160# CONFIG_FSL_ULI1575 is not set 179# CONFIG_FSL_ULI1575 is not set
161 180
162# 181#
@@ -172,13 +191,17 @@ CONFIG_HZ_250=y
172# CONFIG_HZ_300 is not set 191# CONFIG_HZ_300 is not set
173# CONFIG_HZ_1000 is not set 192# CONFIG_HZ_1000 is not set
174CONFIG_HZ=250 193CONFIG_HZ=250
194# CONFIG_SCHED_HRTICK is not set
175CONFIG_PREEMPT_NONE=y 195CONFIG_PREEMPT_NONE=y
176# CONFIG_PREEMPT_VOLUNTARY is not set 196# CONFIG_PREEMPT_VOLUNTARY is not set
177# CONFIG_PREEMPT is not set 197# CONFIG_PREEMPT is not set
178CONFIG_BINFMT_ELF=y 198CONFIG_BINFMT_ELF=y
179# CONFIG_BINFMT_MISC is not set 199# CONFIG_BINFMT_MISC is not set
180CONFIG_MATH_EMULATION=y 200CONFIG_MATH_EMULATION=y
201# CONFIG_IOMMU_HELPER is not set
181CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 202CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
203CONFIG_ARCH_HAS_WALK_MEMORY=y
204CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
182CONFIG_ARCH_FLATMEM_ENABLE=y 205CONFIG_ARCH_FLATMEM_ENABLE=y
183CONFIG_ARCH_POPULATES_NODE_MAP=y 206CONFIG_ARCH_POPULATES_NODE_MAP=y
184CONFIG_SELECT_MEMORY_MODEL=y 207CONFIG_SELECT_MEMORY_MODEL=y
@@ -197,11 +220,7 @@ CONFIG_VIRT_TO_BUS=y
197CONFIG_PROC_DEVICETREE=y 220CONFIG_PROC_DEVICETREE=y
198# CONFIG_CMDLINE_BOOL is not set 221# CONFIG_CMDLINE_BOOL is not set
199# CONFIG_PM is not set 222# CONFIG_PM is not set
200CONFIG_SUSPEND_UP_POSSIBLE=y
201CONFIG_HIBERNATION_UP_POSSIBLE=y
202CONFIG_SECCOMP=y 223CONFIG_SECCOMP=y
203CONFIG_WANT_DEVICE_TREE=y
204CONFIG_DEVICE_TREE=""
205CONFIG_ISA_DMA_API=y 224CONFIG_ISA_DMA_API=y
206 225
207# 226#
@@ -250,6 +269,7 @@ CONFIG_XFRM=y
250# CONFIG_XFRM_USER is not set 269# CONFIG_XFRM_USER is not set
251# CONFIG_XFRM_SUB_POLICY is not set 270# CONFIG_XFRM_SUB_POLICY is not set
252# CONFIG_XFRM_MIGRATE is not set 271# CONFIG_XFRM_MIGRATE is not set
272# CONFIG_XFRM_STATISTICS is not set
253# CONFIG_NET_KEY is not set 273# CONFIG_NET_KEY is not set
254CONFIG_INET=y 274CONFIG_INET=y
255CONFIG_IP_MULTICAST=y 275CONFIG_IP_MULTICAST=y
@@ -305,6 +325,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
305# 325#
306# CONFIG_NET_PKTGEN is not set 326# CONFIG_NET_PKTGEN is not set
307# CONFIG_HAMRADIO is not set 327# CONFIG_HAMRADIO is not set
328# CONFIG_CAN is not set
308# CONFIG_IRDA is not set 329# CONFIG_IRDA is not set
309# CONFIG_BT is not set 330# CONFIG_BT is not set
310# CONFIG_AF_RXRPC is not set 331# CONFIG_AF_RXRPC is not set
@@ -350,7 +371,7 @@ CONFIG_BLK_DEV_LOOP=y
350CONFIG_BLK_DEV_RAM=y 371CONFIG_BLK_DEV_RAM=y
351CONFIG_BLK_DEV_RAM_COUNT=16 372CONFIG_BLK_DEV_RAM_COUNT=16
352CONFIG_BLK_DEV_RAM_SIZE=32768 373CONFIG_BLK_DEV_RAM_SIZE=32768
353CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 374# CONFIG_BLK_DEV_XIP is not set
354# CONFIG_CDROM_PKTCDVD is not set 375# CONFIG_CDROM_PKTCDVD is not set
355# CONFIG_ATA_OVER_ETH is not set 376# CONFIG_ATA_OVER_ETH is not set
356CONFIG_MISC_DEVICES=y 377CONFIG_MISC_DEVICES=y
@@ -358,6 +379,8 @@ CONFIG_MISC_DEVICES=y
358# CONFIG_EEPROM_93CX6 is not set 379# CONFIG_EEPROM_93CX6 is not set
359# CONFIG_SGI_IOC4 is not set 380# CONFIG_SGI_IOC4 is not set
360# CONFIG_TIFM_CORE is not set 381# CONFIG_TIFM_CORE is not set
382# CONFIG_ENCLOSURE_SERVICES is not set
383CONFIG_HAVE_IDE=y
361# CONFIG_IDE is not set 384# CONFIG_IDE is not set
362 385
363# 386#
@@ -422,6 +445,7 @@ CONFIG_SCSI_LOWLEVEL=y
422# CONFIG_SCSI_IPS is not set 445# CONFIG_SCSI_IPS is not set
423# CONFIG_SCSI_INITIO is not set 446# CONFIG_SCSI_INITIO is not set
424# CONFIG_SCSI_INIA100 is not set 447# CONFIG_SCSI_INIA100 is not set
448# CONFIG_SCSI_MVSAS is not set
425# CONFIG_SCSI_STEX is not set 449# CONFIG_SCSI_STEX is not set
426# CONFIG_SCSI_SYM53C8XX_2 is not set 450# CONFIG_SCSI_SYM53C8XX_2 is not set
427# CONFIG_SCSI_QLOGIC_1280 is not set 451# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -452,7 +476,6 @@ CONFIG_NETDEVICES=y
452# CONFIG_EQUALIZER is not set 476# CONFIG_EQUALIZER is not set
453# CONFIG_TUN is not set 477# CONFIG_TUN is not set
454# CONFIG_VETH is not set 478# CONFIG_VETH is not set
455# CONFIG_IP1000 is not set
456# CONFIG_ARCNET is not set 479# CONFIG_ARCNET is not set
457CONFIG_PHYLIB=y 480CONFIG_PHYLIB=y
458 481
@@ -468,6 +491,7 @@ CONFIG_PHYLIB=y
468# CONFIG_SMSC_PHY is not set 491# CONFIG_SMSC_PHY is not set
469# CONFIG_BROADCOM_PHY is not set 492# CONFIG_BROADCOM_PHY is not set
470CONFIG_ICPLUS_PHY=y 493CONFIG_ICPLUS_PHY=y
494# CONFIG_REALTEK_PHY is not set
471# CONFIG_FIXED_PHY is not set 495# CONFIG_FIXED_PHY is not set
472# CONFIG_MDIO_BITBANG is not set 496# CONFIG_MDIO_BITBANG is not set
473CONFIG_NET_ETHERNET=y 497CONFIG_NET_ETHERNET=y
@@ -476,6 +500,7 @@ CONFIG_MII=y
476# CONFIG_SUNGEM is not set 500# CONFIG_SUNGEM is not set
477# CONFIG_CASSINI is not set 501# CONFIG_CASSINI is not set
478# CONFIG_NET_VENDOR_3COM is not set 502# CONFIG_NET_VENDOR_3COM is not set
503# CONFIG_ENC28J60 is not set
479# CONFIG_NET_TULIP is not set 504# CONFIG_NET_TULIP is not set
480# CONFIG_HP100 is not set 505# CONFIG_HP100 is not set
481# CONFIG_IBM_NEW_EMAC_ZMII is not set 506# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -491,6 +516,9 @@ CONFIG_E1000=y
491# CONFIG_E1000_NAPI is not set 516# CONFIG_E1000_NAPI is not set
492# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 517# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
493# CONFIG_E1000E is not set 518# CONFIG_E1000E is not set
519# CONFIG_E1000E_ENABLED is not set
520# CONFIG_IP1000 is not set
521# CONFIG_IGB is not set
494# CONFIG_NS83820 is not set 522# CONFIG_NS83820 is not set
495# CONFIG_HAMACHI is not set 523# CONFIG_HAMACHI is not set
496# CONFIG_YELLOWFIN is not set 524# CONFIG_YELLOWFIN is not set
@@ -521,6 +549,7 @@ CONFIG_NETDEV_10000=y
521# CONFIG_NIU is not set 549# CONFIG_NIU is not set
522# CONFIG_MLX4_CORE is not set 550# CONFIG_MLX4_CORE is not set
523# CONFIG_TEHUTI is not set 551# CONFIG_TEHUTI is not set
552# CONFIG_BNX2X is not set
524# CONFIG_TR is not set 553# CONFIG_TR is not set
525 554
526# 555#
@@ -543,7 +572,6 @@ CONFIG_NETDEV_10000=y
543# CONFIG_PPP is not set 572# CONFIG_PPP is not set
544# CONFIG_SLIP is not set 573# CONFIG_SLIP is not set
545# CONFIG_NET_FC is not set 574# CONFIG_NET_FC is not set
546# CONFIG_SHAPER is not set
547# CONFIG_NETCONSOLE is not set 575# CONFIG_NETCONSOLE is not set
548# CONFIG_NETPOLL is not set 576# CONFIG_NETPOLL is not set
549# CONFIG_NET_POLL_CONTROLLER is not set 577# CONFIG_NET_POLL_CONTROLLER is not set
@@ -586,6 +614,7 @@ CONFIG_INPUT=y
586# 614#
587# CONFIG_VT is not set 615# CONFIG_VT is not set
588# CONFIG_SERIAL_NONSTANDARD is not set 616# CONFIG_SERIAL_NONSTANDARD is not set
617# CONFIG_NOZOMI is not set
589 618
590# 619#
591# Serial drivers 620# Serial drivers
@@ -605,6 +634,7 @@ CONFIG_SERIAL_CORE=y
605CONFIG_SERIAL_CORE_CONSOLE=y 634CONFIG_SERIAL_CORE_CONSOLE=y
606# CONFIG_SERIAL_JSM is not set 635# CONFIG_SERIAL_JSM is not set
607# CONFIG_SERIAL_OF_PLATFORM is not set 636# CONFIG_SERIAL_OF_PLATFORM is not set
637# CONFIG_SERIAL_QE is not set
608CONFIG_UNIX98_PTYS=y 638CONFIG_UNIX98_PTYS=y
609CONFIG_LEGACY_PTYS=y 639CONFIG_LEGACY_PTYS=y
610CONFIG_LEGACY_PTY_COUNT=256 640CONFIG_LEGACY_PTY_COUNT=256
@@ -660,14 +690,12 @@ CONFIG_I2C_MPC=y
660# 690#
661# Miscellaneous I2C Chip support 691# Miscellaneous I2C Chip support
662# 692#
663# CONFIG_SENSORS_DS1337 is not set
664# CONFIG_SENSORS_DS1374 is not set
665# CONFIG_DS1682 is not set 693# CONFIG_DS1682 is not set
666# CONFIG_SENSORS_EEPROM is not set 694# CONFIG_SENSORS_EEPROM is not set
667# CONFIG_SENSORS_PCF8574 is not set 695# CONFIG_SENSORS_PCF8574 is not set
668# CONFIG_SENSORS_PCA9539 is not set 696# CONFIG_PCF8575 is not set
669# CONFIG_SENSORS_PCF8591 is not set 697# CONFIG_SENSORS_PCF8591 is not set
670# CONFIG_SENSORS_M41T00 is not set 698# CONFIG_TPS65010 is not set
671# CONFIG_SENSORS_MAX6875 is not set 699# CONFIG_SENSORS_MAX6875 is not set
672# CONFIG_SENSORS_TSL2550 is not set 700# CONFIG_SENSORS_TSL2550 is not set
673# CONFIG_I2C_DEBUG_CORE is not set 701# CONFIG_I2C_DEBUG_CORE is not set
@@ -705,6 +733,7 @@ CONFIG_HWMON=y
705# CONFIG_SENSORS_ADM1031 is not set 733# CONFIG_SENSORS_ADM1031 is not set
706# CONFIG_SENSORS_ADM9240 is not set 734# CONFIG_SENSORS_ADM9240 is not set
707# CONFIG_SENSORS_ADT7470 is not set 735# CONFIG_SENSORS_ADT7470 is not set
736# CONFIG_SENSORS_ADT7473 is not set
708# CONFIG_SENSORS_ATXP1 is not set 737# CONFIG_SENSORS_ATXP1 is not set
709# CONFIG_SENSORS_DS1621 is not set 738# CONFIG_SENSORS_DS1621 is not set
710# CONFIG_SENSORS_I5K_AMB is not set 739# CONFIG_SENSORS_I5K_AMB is not set
@@ -735,6 +764,7 @@ CONFIG_HWMON=y
735# CONFIG_SENSORS_SMSC47M1 is not set 764# CONFIG_SENSORS_SMSC47M1 is not set
736# CONFIG_SENSORS_SMSC47M192 is not set 765# CONFIG_SENSORS_SMSC47M192 is not set
737# CONFIG_SENSORS_SMSC47B397 is not set 766# CONFIG_SENSORS_SMSC47B397 is not set
767# CONFIG_SENSORS_ADS7828 is not set
738# CONFIG_SENSORS_THMC50 is not set 768# CONFIG_SENSORS_THMC50 is not set
739# CONFIG_SENSORS_VIA686A is not set 769# CONFIG_SENSORS_VIA686A is not set
740# CONFIG_SENSORS_VT1211 is not set 770# CONFIG_SENSORS_VT1211 is not set
@@ -744,9 +774,11 @@ CONFIG_HWMON=y
744# CONFIG_SENSORS_W83792D is not set 774# CONFIG_SENSORS_W83792D is not set
745# CONFIG_SENSORS_W83793 is not set 775# CONFIG_SENSORS_W83793 is not set
746# CONFIG_SENSORS_W83L785TS is not set 776# CONFIG_SENSORS_W83L785TS is not set
777# CONFIG_SENSORS_W83L786NG is not set
747# CONFIG_SENSORS_W83627HF is not set 778# CONFIG_SENSORS_W83627HF is not set
748# CONFIG_SENSORS_W83627EHF is not set 779# CONFIG_SENSORS_W83627EHF is not set
749# CONFIG_HWMON_DEBUG_CHIP is not set 780# CONFIG_HWMON_DEBUG_CHIP is not set
781# CONFIG_THERMAL is not set
750CONFIG_WATCHDOG=y 782CONFIG_WATCHDOG=y
751# CONFIG_WATCHDOG_NOWAYOUT is not set 783# CONFIG_WATCHDOG_NOWAYOUT is not set
752 784
@@ -826,6 +858,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
826CONFIG_USB_ARCH_HAS_EHCI=y 858CONFIG_USB_ARCH_HAS_EHCI=y
827CONFIG_USB=y 859CONFIG_USB=y
828# CONFIG_USB_DEBUG is not set 860# CONFIG_USB_DEBUG is not set
861# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
829 862
830# 863#
831# Miscellaneous USB options 864# Miscellaneous USB options
@@ -839,9 +872,10 @@ CONFIG_USB_DEVICE_CLASS=y
839# USB Host Controller Drivers 872# USB Host Controller Drivers
840# 873#
841CONFIG_USB_EHCI_HCD=y 874CONFIG_USB_EHCI_HCD=y
842# CONFIG_USB_EHCI_SPLIT_ISO is not set
843# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 875# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
844# CONFIG_USB_EHCI_TT_NEWSCHED is not set 876# CONFIG_USB_EHCI_TT_NEWSCHED is not set
877# CONFIG_USB_EHCI_FSL is not set
878CONFIG_USB_EHCI_HCD_PPC_OF=y
845# CONFIG_USB_ISP116X_HCD is not set 879# CONFIG_USB_ISP116X_HCD is not set
846CONFIG_USB_OHCI_HCD=y 880CONFIG_USB_OHCI_HCD=y
847CONFIG_USB_OHCI_HCD_PPC_OF=y 881CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -892,10 +926,6 @@ CONFIG_USB_MON=y
892# 926#
893# USB port drivers 927# USB port drivers
894# 928#
895
896#
897# USB Serial Converter support
898#
899# CONFIG_USB_SERIAL is not set 929# CONFIG_USB_SERIAL is not set
900 930
901# 931#
@@ -921,14 +951,6 @@ CONFIG_USB_MON=y
921# CONFIG_USB_TRANCEVIBRATOR is not set 951# CONFIG_USB_TRANCEVIBRATOR is not set
922# CONFIG_USB_IOWARRIOR is not set 952# CONFIG_USB_IOWARRIOR is not set
923# CONFIG_USB_TEST is not set 953# CONFIG_USB_TEST is not set
924
925#
926# USB DSL modem support
927#
928
929#
930# USB Gadget Support
931#
932# CONFIG_USB_GADGET is not set 954# CONFIG_USB_GADGET is not set
933CONFIG_MMC=y 955CONFIG_MMC=y
934# CONFIG_MMC_DEBUG is not set 956# CONFIG_MMC_DEBUG is not set
@@ -948,10 +970,12 @@ CONFIG_MMC_BLOCK_BOUNCE=y
948# CONFIG_MMC_WBSD is not set 970# CONFIG_MMC_WBSD is not set
949# CONFIG_MMC_TIFM_SD is not set 971# CONFIG_MMC_TIFM_SD is not set
950CONFIG_MMC_SPI=y 972CONFIG_MMC_SPI=y
973# CONFIG_MEMSTICK is not set
951# CONFIG_NEW_LEDS is not set 974# CONFIG_NEW_LEDS is not set
952# CONFIG_INFINIBAND is not set 975# CONFIG_INFINIBAND is not set
953# CONFIG_EDAC is not set 976# CONFIG_EDAC is not set
954# CONFIG_RTC_CLASS is not set 977# CONFIG_RTC_CLASS is not set
978# CONFIG_DMADEVICES is not set
955 979
956# 980#
957# Userspace I/O 981# Userspace I/O
@@ -977,12 +1001,10 @@ CONFIG_FS_MBCACHE=y
977# CONFIG_XFS_FS is not set 1001# CONFIG_XFS_FS is not set
978# CONFIG_GFS2_FS is not set 1002# CONFIG_GFS2_FS is not set
979# CONFIG_OCFS2_FS is not set 1003# CONFIG_OCFS2_FS is not set
980# CONFIG_MINIX_FS is not set 1004CONFIG_DNOTIFY=y
981# CONFIG_ROMFS_FS is not set
982CONFIG_INOTIFY=y 1005CONFIG_INOTIFY=y
983CONFIG_INOTIFY_USER=y 1006CONFIG_INOTIFY_USER=y
984# CONFIG_QUOTA is not set 1007# CONFIG_QUOTA is not set
985CONFIG_DNOTIFY=y
986# CONFIG_AUTOFS_FS is not set 1008# CONFIG_AUTOFS_FS is not set
987# CONFIG_AUTOFS4_FS is not set 1009# CONFIG_AUTOFS4_FS is not set
988# CONFIG_FUSE_FS is not set 1010# CONFIG_FUSE_FS is not set
@@ -1027,8 +1049,10 @@ CONFIG_TMPFS=y
1027# CONFIG_EFS_FS is not set 1049# CONFIG_EFS_FS is not set
1028# CONFIG_CRAMFS is not set 1050# CONFIG_CRAMFS is not set
1029# CONFIG_VXFS_FS is not set 1051# CONFIG_VXFS_FS is not set
1052# CONFIG_MINIX_FS is not set
1030# CONFIG_HPFS_FS is not set 1053# CONFIG_HPFS_FS is not set
1031# CONFIG_QNX4FS_FS is not set 1054# CONFIG_QNX4FS_FS is not set
1055# CONFIG_ROMFS_FS is not set
1032# CONFIG_SYSV_FS is not set 1056# CONFIG_SYSV_FS is not set
1033# CONFIG_UFS_FS is not set 1057# CONFIG_UFS_FS is not set
1034CONFIG_NETWORK_FILESYSTEMS=y 1058CONFIG_NETWORK_FILESYSTEMS=y
@@ -1116,7 +1140,6 @@ CONFIG_NLS_ISO8859_1=y
1116# CONFIG_NLS_KOI8_U is not set 1140# CONFIG_NLS_KOI8_U is not set
1117# CONFIG_NLS_UTF8 is not set 1141# CONFIG_NLS_UTF8 is not set
1118# CONFIG_DLM is not set 1142# CONFIG_DLM is not set
1119# CONFIG_UCC_SLOW is not set
1120CONFIG_UCC_FAST=y 1143CONFIG_UCC_FAST=y
1121CONFIG_UCC=y 1144CONFIG_UCC=y
1122 1145
@@ -1134,7 +1157,6 @@ CONFIG_PLIST=y
1134CONFIG_HAS_IOMEM=y 1157CONFIG_HAS_IOMEM=y
1135CONFIG_HAS_IOPORT=y 1158CONFIG_HAS_IOPORT=y
1136CONFIG_HAS_DMA=y 1159CONFIG_HAS_DMA=y
1137# CONFIG_INSTRUMENTATION is not set
1138 1160
1139# 1161#
1140# Kernel hacking 1162# Kernel hacking
@@ -1148,6 +1170,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1148# CONFIG_HEADERS_CHECK is not set 1170# CONFIG_HEADERS_CHECK is not set
1149# CONFIG_DEBUG_KERNEL is not set 1171# CONFIG_DEBUG_KERNEL is not set
1150# CONFIG_SLUB_DEBUG_ON is not set 1172# CONFIG_SLUB_DEBUG_ON is not set
1173# CONFIG_SLUB_STATS is not set
1151# CONFIG_DEBUG_BUGVERBOSE is not set 1174# CONFIG_DEBUG_BUGVERBOSE is not set
1152# CONFIG_SAMPLES is not set 1175# CONFIG_SAMPLES is not set
1153# CONFIG_PPC_EARLY_DEBUG is not set 1176# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1161,6 +1184,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1161CONFIG_CRYPTO=y 1184CONFIG_CRYPTO=y
1162CONFIG_CRYPTO_ALGAPI=y 1185CONFIG_CRYPTO_ALGAPI=y
1163CONFIG_CRYPTO_BLKCIPHER=y 1186CONFIG_CRYPTO_BLKCIPHER=y
1187# CONFIG_CRYPTO_SEQIV is not set
1164CONFIG_CRYPTO_MANAGER=y 1188CONFIG_CRYPTO_MANAGER=y
1165# CONFIG_CRYPTO_HMAC is not set 1189# CONFIG_CRYPTO_HMAC is not set
1166# CONFIG_CRYPTO_XCBC is not set 1190# CONFIG_CRYPTO_XCBC is not set
@@ -1178,6 +1202,9 @@ CONFIG_CRYPTO_CBC=y
1178CONFIG_CRYPTO_PCBC=m 1202CONFIG_CRYPTO_PCBC=m
1179# CONFIG_CRYPTO_LRW is not set 1203# CONFIG_CRYPTO_LRW is not set
1180# CONFIG_CRYPTO_XTS is not set 1204# CONFIG_CRYPTO_XTS is not set
1205# CONFIG_CRYPTO_CTR is not set
1206# CONFIG_CRYPTO_GCM is not set
1207# CONFIG_CRYPTO_CCM is not set
1181# CONFIG_CRYPTO_CRYPTD is not set 1208# CONFIG_CRYPTO_CRYPTD is not set
1182CONFIG_CRYPTO_DES=y 1209CONFIG_CRYPTO_DES=y
1183# CONFIG_CRYPTO_FCRYPT is not set 1210# CONFIG_CRYPTO_FCRYPT is not set
@@ -1192,12 +1219,15 @@ CONFIG_CRYPTO_DES=y
1192# CONFIG_CRYPTO_KHAZAD is not set 1219# CONFIG_CRYPTO_KHAZAD is not set
1193# CONFIG_CRYPTO_ANUBIS is not set 1220# CONFIG_CRYPTO_ANUBIS is not set
1194# CONFIG_CRYPTO_SEED is not set 1221# CONFIG_CRYPTO_SEED is not set
1222# CONFIG_CRYPTO_SALSA20 is not set
1195# CONFIG_CRYPTO_DEFLATE is not set 1223# CONFIG_CRYPTO_DEFLATE is not set
1196# CONFIG_CRYPTO_MICHAEL_MIC is not set 1224# CONFIG_CRYPTO_MICHAEL_MIC is not set
1197# CONFIG_CRYPTO_CRC32C is not set 1225# CONFIG_CRYPTO_CRC32C is not set
1198# CONFIG_CRYPTO_CAMELLIA is not set 1226# CONFIG_CRYPTO_CAMELLIA is not set
1199# CONFIG_CRYPTO_TEST is not set 1227# CONFIG_CRYPTO_TEST is not set
1200# CONFIG_CRYPTO_AUTHENC is not set 1228# CONFIG_CRYPTO_AUTHENC is not set
1229# CONFIG_CRYPTO_LZO is not set
1201CONFIG_CRYPTO_HW=y 1230CONFIG_CRYPTO_HW=y
1231# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1202# CONFIG_PPC_CLOCK is not set 1232# CONFIG_PPC_CLOCK is not set
1203CONFIG_PPC_LIB_RHEAP=y 1233CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig
index 2fbe4e5344f7..e1de399a7bdd 100644
--- a/arch/powerpc/configs/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/mpc834x_itx_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:37 2007 4# Mon Mar 24 08:48:17 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,8 +14,8 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_83xx=y
18CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
18# CONFIG_FSL_EMB_PERFMON is not set
19CONFIG_PPC_STD_MMU=y 19CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y 20CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -66,15 +67,19 @@ CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set 73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y
75# CONFIG_FAIR_GROUP_SCHED is not set 75# CONFIG_FAIR_GROUP_SCHED is not set
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
76CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
77# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
78CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
79CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -86,11 +91,13 @@ CONFIG_HOTPLUG=y
86CONFIG_PRINTK=y 91CONFIG_PRINTK=y
87CONFIG_BUG=y 92CONFIG_BUG=y
88CONFIG_ELF_CORE=y 93CONFIG_ELF_CORE=y
94CONFIG_COMPAT_BRK=y
89CONFIG_BASE_FULL=y 95CONFIG_BASE_FULL=y
90CONFIG_FUTEX=y 96CONFIG_FUTEX=y
91CONFIG_ANON_INODES=y 97CONFIG_ANON_INODES=y
92# CONFIG_EPOLL is not set 98# CONFIG_EPOLL is not set
93CONFIG_SIGNALFD=y 99CONFIG_SIGNALFD=y
100CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
95CONFIG_SHMEM=y 102CONFIG_SHMEM=y
96CONFIG_VM_EVENT_COUNTERS=y 103CONFIG_VM_EVENT_COUNTERS=y
@@ -98,6 +105,13 @@ CONFIG_SLUB_DEBUG=y
98# CONFIG_SLAB is not set 105# CONFIG_SLAB is not set
99CONFIG_SLUB=y 106CONFIG_SLUB=y
100# CONFIG_SLOB is not set 107# CONFIG_SLOB is not set
108# CONFIG_PROFILING is not set
109# CONFIG_MARKERS is not set
110CONFIG_HAVE_OPROFILE=y
111CONFIG_HAVE_KPROBES=y
112CONFIG_HAVE_KRETPROBES=y
113CONFIG_PROC_PAGE_MONITOR=y
114CONFIG_SLABINFO=y
101CONFIG_RT_MUTEXES=y 115CONFIG_RT_MUTEXES=y
102# CONFIG_TINY_SHMEM is not set 116# CONFIG_TINY_SHMEM is not set
103CONFIG_BASE_SMALL=0 117CONFIG_BASE_SMALL=0
@@ -125,6 +139,7 @@ CONFIG_DEFAULT_AS=y
125# CONFIG_DEFAULT_CFQ is not set 139# CONFIG_DEFAULT_CFQ is not set
126# CONFIG_DEFAULT_NOOP is not set 140# CONFIG_DEFAULT_NOOP is not set
127CONFIG_DEFAULT_IOSCHED="anticipatory" 141CONFIG_DEFAULT_IOSCHED="anticipatory"
142CONFIG_CLASSIC_RCU=y
128 143
129# 144#
130# Platform support 145# Platform support
@@ -133,18 +148,23 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
133# CONFIG_PPC_82xx is not set 148# CONFIG_PPC_82xx is not set
134CONFIG_PPC_83xx=y 149CONFIG_PPC_83xx=y
135# CONFIG_PPC_86xx is not set 150# CONFIG_PPC_86xx is not set
136# CONFIG_PPC_MPC52xx is not set 151# CONFIG_PPC_MPC512x is not set
137# CONFIG_PPC_MPC5200 is not set 152# CONFIG_PPC_MPC5121 is not set
138# CONFIG_PPC_CELL is not set 153# CONFIG_PPC_CELL is not set
139# CONFIG_PPC_CELL_NATIVE is not set 154# CONFIG_PPC_CELL_NATIVE is not set
140# CONFIG_PQ2ADS is not set 155# CONFIG_PQ2ADS is not set
141# CONFIG_MPC8313_RDB is not set 156CONFIG_MPC83xx=y
157# CONFIG_MPC831x_RDB is not set
142# CONFIG_MPC832x_MDS is not set 158# CONFIG_MPC832x_MDS is not set
143# CONFIG_MPC832x_RDB is not set 159# CONFIG_MPC832x_RDB is not set
144# CONFIG_MPC834x_MDS is not set 160# CONFIG_MPC834x_MDS is not set
145CONFIG_MPC834x_ITX=y 161CONFIG_MPC834x_ITX=y
146# CONFIG_MPC836x_MDS is not set 162# CONFIG_MPC836x_MDS is not set
147CONFIG_MPC834x=y 163# CONFIG_MPC837x_MDS is not set
164# CONFIG_MPC837x_RDB is not set
165# CONFIG_SBC834x is not set
166CONFIG_PPC_MPC834x=y
167CONFIG_IPIC=y
148# CONFIG_MPIC is not set 168# CONFIG_MPIC is not set
149# CONFIG_MPIC_WEIRD is not set 169# CONFIG_MPIC_WEIRD is not set
150# CONFIG_PPC_I8259 is not set 170# CONFIG_PPC_I8259 is not set
@@ -155,7 +175,6 @@ CONFIG_MPC834x=y
155# CONFIG_PPC_INDIRECT_IO is not set 175# CONFIG_PPC_INDIRECT_IO is not set
156# CONFIG_GENERIC_IOMAP is not set 176# CONFIG_GENERIC_IOMAP is not set
157# CONFIG_CPU_FREQ is not set 177# CONFIG_CPU_FREQ is not set
158# CONFIG_CPM2 is not set
159# CONFIG_FSL_ULI1575 is not set 178# CONFIG_FSL_ULI1575 is not set
160 179
161# 180#
@@ -171,12 +190,16 @@ CONFIG_HZ_250=y
171# CONFIG_HZ_300 is not set 190# CONFIG_HZ_300 is not set
172# CONFIG_HZ_1000 is not set 191# CONFIG_HZ_1000 is not set
173CONFIG_HZ=250 192CONFIG_HZ=250
193# CONFIG_SCHED_HRTICK is not set
174CONFIG_PREEMPT_NONE=y 194CONFIG_PREEMPT_NONE=y
175# CONFIG_PREEMPT_VOLUNTARY is not set 195# CONFIG_PREEMPT_VOLUNTARY is not set
176# CONFIG_PREEMPT is not set 196# CONFIG_PREEMPT is not set
177CONFIG_BINFMT_ELF=y 197CONFIG_BINFMT_ELF=y
178# CONFIG_BINFMT_MISC is not set 198# CONFIG_BINFMT_MISC is not set
199# CONFIG_IOMMU_HELPER is not set
179CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 200CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
201CONFIG_ARCH_HAS_WALK_MEMORY=y
202CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
180CONFIG_ARCH_FLATMEM_ENABLE=y 203CONFIG_ARCH_FLATMEM_ENABLE=y
181CONFIG_ARCH_POPULATES_NODE_MAP=y 204CONFIG_ARCH_POPULATES_NODE_MAP=y
182CONFIG_SELECT_MEMORY_MODEL=y 205CONFIG_SELECT_MEMORY_MODEL=y
@@ -195,11 +218,7 @@ CONFIG_VIRT_TO_BUS=y
195CONFIG_PROC_DEVICETREE=y 218CONFIG_PROC_DEVICETREE=y
196# CONFIG_CMDLINE_BOOL is not set 219# CONFIG_CMDLINE_BOOL is not set
197# CONFIG_PM is not set 220# CONFIG_PM is not set
198CONFIG_SUSPEND_UP_POSSIBLE=y
199CONFIG_HIBERNATION_UP_POSSIBLE=y
200CONFIG_SECCOMP=y 221CONFIG_SECCOMP=y
201CONFIG_WANT_DEVICE_TREE=y
202CONFIG_DEVICE_TREE=""
203CONFIG_ISA_DMA_API=y 222CONFIG_ISA_DMA_API=y
204 223
205# 224#
@@ -248,6 +267,7 @@ CONFIG_XFRM=y
248# CONFIG_XFRM_USER is not set 267# CONFIG_XFRM_USER is not set
249# CONFIG_XFRM_SUB_POLICY is not set 268# CONFIG_XFRM_SUB_POLICY is not set
250# CONFIG_XFRM_MIGRATE is not set 269# CONFIG_XFRM_MIGRATE is not set
270# CONFIG_XFRM_STATISTICS is not set
251# CONFIG_NET_KEY is not set 271# CONFIG_NET_KEY is not set
252CONFIG_INET=y 272CONFIG_INET=y
253CONFIG_IP_MULTICAST=y 273CONFIG_IP_MULTICAST=y
@@ -303,6 +323,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
303# 323#
304# CONFIG_NET_PKTGEN is not set 324# CONFIG_NET_PKTGEN is not set
305# CONFIG_HAMRADIO is not set 325# CONFIG_HAMRADIO is not set
326# CONFIG_CAN is not set
306# CONFIG_IRDA is not set 327# CONFIG_IRDA is not set
307# CONFIG_BT is not set 328# CONFIG_BT is not set
308# CONFIG_AF_RXRPC is not set 329# CONFIG_AF_RXRPC is not set
@@ -427,7 +448,7 @@ CONFIG_BLK_DEV_LOOP=y
427CONFIG_BLK_DEV_RAM=y 448CONFIG_BLK_DEV_RAM=y
428CONFIG_BLK_DEV_RAM_COUNT=16 449CONFIG_BLK_DEV_RAM_COUNT=16
429CONFIG_BLK_DEV_RAM_SIZE=32768 450CONFIG_BLK_DEV_RAM_SIZE=32768
430CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 451# CONFIG_BLK_DEV_XIP is not set
431# CONFIG_CDROM_PKTCDVD is not set 452# CONFIG_CDROM_PKTCDVD is not set
432# CONFIG_ATA_OVER_ETH is not set 453# CONFIG_ATA_OVER_ETH is not set
433CONFIG_MISC_DEVICES=y 454CONFIG_MISC_DEVICES=y
@@ -435,6 +456,8 @@ CONFIG_MISC_DEVICES=y
435# CONFIG_EEPROM_93CX6 is not set 456# CONFIG_EEPROM_93CX6 is not set
436# CONFIG_SGI_IOC4 is not set 457# CONFIG_SGI_IOC4 is not set
437# CONFIG_TIFM_CORE is not set 458# CONFIG_TIFM_CORE is not set
459# CONFIG_ENCLOSURE_SERVICES is not set
460CONFIG_HAVE_IDE=y
438CONFIG_IDE=y 461CONFIG_IDE=y
439CONFIG_IDE_MAX_HWIFS=4 462CONFIG_IDE_MAX_HWIFS=4
440# CONFIG_BLK_DEV_IDE is not set 463# CONFIG_BLK_DEV_IDE is not set
@@ -503,6 +526,7 @@ CONFIG_SCSI_LOWLEVEL=y
503# CONFIG_SCSI_IPS is not set 526# CONFIG_SCSI_IPS is not set
504# CONFIG_SCSI_INITIO is not set 527# CONFIG_SCSI_INITIO is not set
505# CONFIG_SCSI_INIA100 is not set 528# CONFIG_SCSI_INIA100 is not set
529# CONFIG_SCSI_MVSAS is not set
506# CONFIG_SCSI_STEX is not set 530# CONFIG_SCSI_STEX is not set
507# CONFIG_SCSI_SYM53C8XX_2 is not set 531# CONFIG_SCSI_SYM53C8XX_2 is not set
508# CONFIG_SCSI_IPR is not set 532# CONFIG_SCSI_IPR is not set
@@ -533,6 +557,7 @@ CONFIG_SATA_SIL=y
533# CONFIG_SATA_VIA is not set 557# CONFIG_SATA_VIA is not set
534# CONFIG_SATA_VITESSE is not set 558# CONFIG_SATA_VITESSE is not set
535# CONFIG_SATA_INIC162X is not set 559# CONFIG_SATA_INIC162X is not set
560# CONFIG_SATA_FSL is not set
536# CONFIG_PATA_ALI is not set 561# CONFIG_PATA_ALI is not set
537# CONFIG_PATA_AMD is not set 562# CONFIG_PATA_AMD is not set
538# CONFIG_PATA_ARTOP is not set 563# CONFIG_PATA_ARTOP is not set
@@ -556,6 +581,7 @@ CONFIG_SATA_SIL=y
556# CONFIG_PATA_MPIIX is not set 581# CONFIG_PATA_MPIIX is not set
557# CONFIG_PATA_OLDPIIX is not set 582# CONFIG_PATA_OLDPIIX is not set
558# CONFIG_PATA_NETCELL is not set 583# CONFIG_PATA_NETCELL is not set
584# CONFIG_PATA_NINJA32 is not set
559# CONFIG_PATA_NS87410 is not set 585# CONFIG_PATA_NS87410 is not set
560# CONFIG_PATA_NS87415 is not set 586# CONFIG_PATA_NS87415 is not set
561# CONFIG_PATA_OPTI is not set 587# CONFIG_PATA_OPTI is not set
@@ -599,7 +625,6 @@ CONFIG_NETDEVICES=y
599# CONFIG_EQUALIZER is not set 625# CONFIG_EQUALIZER is not set
600# CONFIG_TUN is not set 626# CONFIG_TUN is not set
601# CONFIG_VETH is not set 627# CONFIG_VETH is not set
602# CONFIG_IP1000 is not set
603# CONFIG_ARCNET is not set 628# CONFIG_ARCNET is not set
604CONFIG_PHYLIB=y 629CONFIG_PHYLIB=y
605 630
@@ -615,6 +640,7 @@ CONFIG_CICADA_PHY=y
615# CONFIG_SMSC_PHY is not set 640# CONFIG_SMSC_PHY is not set
616# CONFIG_BROADCOM_PHY is not set 641# CONFIG_BROADCOM_PHY is not set
617# CONFIG_ICPLUS_PHY is not set 642# CONFIG_ICPLUS_PHY is not set
643# CONFIG_REALTEK_PHY is not set
618# CONFIG_FIXED_PHY is not set 644# CONFIG_FIXED_PHY is not set
619# CONFIG_MDIO_BITBANG is not set 645# CONFIG_MDIO_BITBANG is not set
620# CONFIG_NET_ETHERNET is not set 646# CONFIG_NET_ETHERNET is not set
@@ -623,6 +649,9 @@ CONFIG_NETDEV_1000=y
623# CONFIG_DL2K is not set 649# CONFIG_DL2K is not set
624# CONFIG_E1000 is not set 650# CONFIG_E1000 is not set
625# CONFIG_E1000E is not set 651# CONFIG_E1000E is not set
652# CONFIG_E1000E_ENABLED is not set
653# CONFIG_IP1000 is not set
654# CONFIG_IGB is not set
626# CONFIG_NS83820 is not set 655# CONFIG_NS83820 is not set
627# CONFIG_HAMACHI is not set 656# CONFIG_HAMACHI is not set
628# CONFIG_YELLOWFIN is not set 657# CONFIG_YELLOWFIN is not set
@@ -649,6 +678,7 @@ CONFIG_NETDEV_10000=y
649# CONFIG_NIU is not set 678# CONFIG_NIU is not set
650# CONFIG_MLX4_CORE is not set 679# CONFIG_MLX4_CORE is not set
651# CONFIG_TEHUTI is not set 680# CONFIG_TEHUTI is not set
681# CONFIG_BNX2X is not set
652# CONFIG_TR is not set 682# CONFIG_TR is not set
653 683
654# 684#
@@ -671,7 +701,6 @@ CONFIG_NETDEV_10000=y
671# CONFIG_PPP is not set 701# CONFIG_PPP is not set
672# CONFIG_SLIP is not set 702# CONFIG_SLIP is not set
673# CONFIG_NET_FC is not set 703# CONFIG_NET_FC is not set
674# CONFIG_SHAPER is not set
675# CONFIG_NETCONSOLE is not set 704# CONFIG_NETCONSOLE is not set
676# CONFIG_NETPOLL is not set 705# CONFIG_NETPOLL is not set
677# CONFIG_NET_POLL_CONTROLLER is not set 706# CONFIG_NET_POLL_CONTROLLER is not set
@@ -694,6 +723,7 @@ CONFIG_NETDEV_10000=y
694# 723#
695# CONFIG_VT is not set 724# CONFIG_VT is not set
696# CONFIG_SERIAL_NONSTANDARD is not set 725# CONFIG_SERIAL_NONSTANDARD is not set
726# CONFIG_NOZOMI is not set
697 727
698# 728#
699# Serial drivers 729# Serial drivers
@@ -767,14 +797,12 @@ CONFIG_I2C_MPC=y
767# 797#
768# Miscellaneous I2C Chip support 798# Miscellaneous I2C Chip support
769# 799#
770# CONFIG_SENSORS_DS1337 is not set
771# CONFIG_SENSORS_DS1374 is not set
772# CONFIG_DS1682 is not set 800# CONFIG_DS1682 is not set
773# CONFIG_SENSORS_EEPROM is not set 801# CONFIG_SENSORS_EEPROM is not set
774CONFIG_SENSORS_PCF8574=y 802CONFIG_SENSORS_PCF8574=y
775# CONFIG_SENSORS_PCA9539 is not set 803# CONFIG_PCF8575 is not set
776# CONFIG_SENSORS_PCF8591 is not set 804# CONFIG_SENSORS_PCF8591 is not set
777# CONFIG_SENSORS_M41T00 is not set 805# CONFIG_TPS65010 is not set
778# CONFIG_SENSORS_MAX6875 is not set 806# CONFIG_SENSORS_MAX6875 is not set
779# CONFIG_SENSORS_TSL2550 is not set 807# CONFIG_SENSORS_TSL2550 is not set
780# CONFIG_I2C_DEBUG_CORE is not set 808# CONFIG_I2C_DEBUG_CORE is not set
@@ -803,6 +831,7 @@ CONFIG_SPI_MPC83xx=y
803# CONFIG_W1 is not set 831# CONFIG_W1 is not set
804# CONFIG_POWER_SUPPLY is not set 832# CONFIG_POWER_SUPPLY is not set
805# CONFIG_HWMON is not set 833# CONFIG_HWMON is not set
834# CONFIG_THERMAL is not set
806CONFIG_WATCHDOG=y 835CONFIG_WATCHDOG=y
807# CONFIG_WATCHDOG_NOWAYOUT is not set 836# CONFIG_WATCHDOG_NOWAYOUT is not set
808 837
@@ -867,6 +896,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
867CONFIG_USB_ARCH_HAS_EHCI=y 896CONFIG_USB_ARCH_HAS_EHCI=y
868CONFIG_USB=y 897CONFIG_USB=y
869# CONFIG_USB_DEBUG is not set 898# CONFIG_USB_DEBUG is not set
899# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
870 900
871# 901#
872# Miscellaneous USB options 902# Miscellaneous USB options
@@ -880,10 +910,10 @@ CONFIG_USB_DEVICE_CLASS=y
880# USB Host Controller Drivers 910# USB Host Controller Drivers
881# 911#
882CONFIG_USB_EHCI_HCD=y 912CONFIG_USB_EHCI_HCD=y
883# CONFIG_USB_EHCI_SPLIT_ISO is not set
884CONFIG_USB_EHCI_ROOT_HUB_TT=y 913CONFIG_USB_EHCI_ROOT_HUB_TT=y
885# CONFIG_USB_EHCI_TT_NEWSCHED is not set 914# CONFIG_USB_EHCI_TT_NEWSCHED is not set
886CONFIG_USB_EHCI_FSL=y 915CONFIG_USB_EHCI_FSL=y
916CONFIG_USB_EHCI_HCD_PPC_OF=y
887# CONFIG_USB_ISP116X_HCD is not set 917# CONFIG_USB_ISP116X_HCD is not set
888# CONFIG_USB_OHCI_HCD is not set 918# CONFIG_USB_OHCI_HCD is not set
889CONFIG_USB_UHCI_HCD=y 919CONFIG_USB_UHCI_HCD=y
@@ -927,10 +957,6 @@ CONFIG_USB_MON=y
927# 957#
928# USB port drivers 958# USB port drivers
929# 959#
930
931#
932# USB Serial Converter support
933#
934# CONFIG_USB_SERIAL is not set 960# CONFIG_USB_SERIAL is not set
935 961
936# 962#
@@ -956,16 +982,9 @@ CONFIG_USB_MON=y
956# CONFIG_USB_TRANCEVIBRATOR is not set 982# CONFIG_USB_TRANCEVIBRATOR is not set
957# CONFIG_USB_IOWARRIOR is not set 983# CONFIG_USB_IOWARRIOR is not set
958# CONFIG_USB_TEST is not set 984# CONFIG_USB_TEST is not set
959
960#
961# USB DSL modem support
962#
963
964#
965# USB Gadget Support
966#
967# CONFIG_USB_GADGET is not set 985# CONFIG_USB_GADGET is not set
968# CONFIG_MMC is not set 986# CONFIG_MMC is not set
987# CONFIG_MEMSTICK is not set
969# CONFIG_NEW_LEDS is not set 988# CONFIG_NEW_LEDS is not set
970# CONFIG_INFINIBAND is not set 989# CONFIG_INFINIBAND is not set
971# CONFIG_EDAC is not set 990# CONFIG_EDAC is not set
@@ -997,20 +1016,23 @@ CONFIG_RTC_DRV_DS1307=y
997# CONFIG_RTC_DRV_PCF8563 is not set 1016# CONFIG_RTC_DRV_PCF8563 is not set
998# CONFIG_RTC_DRV_PCF8583 is not set 1017# CONFIG_RTC_DRV_PCF8583 is not set
999# CONFIG_RTC_DRV_M41T80 is not set 1018# CONFIG_RTC_DRV_M41T80 is not set
1019# CONFIG_RTC_DRV_S35390A is not set
1000 1020
1001# 1021#
1002# SPI RTC drivers 1022# SPI RTC drivers
1003# 1023#
1004# CONFIG_RTC_DRV_RS5C348 is not set
1005# CONFIG_RTC_DRV_MAX6902 is not set 1024# CONFIG_RTC_DRV_MAX6902 is not set
1025# CONFIG_RTC_DRV_R9701 is not set
1026# CONFIG_RTC_DRV_RS5C348 is not set
1006 1027
1007# 1028#
1008# Platform RTC drivers 1029# Platform RTC drivers
1009# 1030#
1010# CONFIG_RTC_DRV_CMOS is not set 1031# CONFIG_RTC_DRV_CMOS is not set
1032# CONFIG_RTC_DRV_DS1511 is not set
1011# CONFIG_RTC_DRV_DS1553 is not set 1033# CONFIG_RTC_DRV_DS1553 is not set
1012# CONFIG_RTC_DRV_STK17TA8 is not set
1013# CONFIG_RTC_DRV_DS1742 is not set 1034# CONFIG_RTC_DRV_DS1742 is not set
1035# CONFIG_RTC_DRV_STK17TA8 is not set
1014# CONFIG_RTC_DRV_M48T86 is not set 1036# CONFIG_RTC_DRV_M48T86 is not set
1015# CONFIG_RTC_DRV_M48T59 is not set 1037# CONFIG_RTC_DRV_M48T59 is not set
1016# CONFIG_RTC_DRV_V3020 is not set 1038# CONFIG_RTC_DRV_V3020 is not set
@@ -1018,6 +1040,7 @@ CONFIG_RTC_DRV_DS1307=y
1018# 1040#
1019# on-CPU RTC drivers 1041# on-CPU RTC drivers
1020# 1042#
1043# CONFIG_DMADEVICES is not set
1021 1044
1022# 1045#
1023# Userspace I/O 1046# Userspace I/O
@@ -1043,12 +1066,10 @@ CONFIG_FS_MBCACHE=y
1043# CONFIG_XFS_FS is not set 1066# CONFIG_XFS_FS is not set
1044# CONFIG_GFS2_FS is not set 1067# CONFIG_GFS2_FS is not set
1045# CONFIG_OCFS2_FS is not set 1068# CONFIG_OCFS2_FS is not set
1046# CONFIG_MINIX_FS is not set 1069CONFIG_DNOTIFY=y
1047# CONFIG_ROMFS_FS is not set
1048CONFIG_INOTIFY=y 1070CONFIG_INOTIFY=y
1049CONFIG_INOTIFY_USER=y 1071CONFIG_INOTIFY_USER=y
1050# CONFIG_QUOTA is not set 1072# CONFIG_QUOTA is not set
1051CONFIG_DNOTIFY=y
1052# CONFIG_AUTOFS_FS is not set 1073# CONFIG_AUTOFS_FS is not set
1053# CONFIG_AUTOFS4_FS is not set 1074# CONFIG_AUTOFS4_FS is not set
1054# CONFIG_FUSE_FS is not set 1075# CONFIG_FUSE_FS is not set
@@ -1094,8 +1115,10 @@ CONFIG_TMPFS=y
1094# CONFIG_JFFS2_FS is not set 1115# CONFIG_JFFS2_FS is not set
1095# CONFIG_CRAMFS is not set 1116# CONFIG_CRAMFS is not set
1096# CONFIG_VXFS_FS is not set 1117# CONFIG_VXFS_FS is not set
1118# CONFIG_MINIX_FS is not set
1097# CONFIG_HPFS_FS is not set 1119# CONFIG_HPFS_FS is not set
1098# CONFIG_QNX4FS_FS is not set 1120# CONFIG_QNX4FS_FS is not set
1121# CONFIG_ROMFS_FS is not set
1099# CONFIG_SYSV_FS is not set 1122# CONFIG_SYSV_FS is not set
1100# CONFIG_UFS_FS is not set 1123# CONFIG_UFS_FS is not set
1101CONFIG_NETWORK_FILESYSTEMS=y 1124CONFIG_NETWORK_FILESYSTEMS=y
@@ -1182,7 +1205,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1182# CONFIG_NLS_KOI8_U is not set 1205# CONFIG_NLS_KOI8_U is not set
1183# CONFIG_NLS_UTF8 is not set 1206# CONFIG_NLS_UTF8 is not set
1184# CONFIG_DLM is not set 1207# CONFIG_DLM is not set
1185# CONFIG_UCC_SLOW is not set
1186 1208
1187# 1209#
1188# Library routines 1210# Library routines
@@ -1198,7 +1220,6 @@ CONFIG_PLIST=y
1198CONFIG_HAS_IOMEM=y 1220CONFIG_HAS_IOMEM=y
1199CONFIG_HAS_IOPORT=y 1221CONFIG_HAS_IOPORT=y
1200CONFIG_HAS_DMA=y 1222CONFIG_HAS_DMA=y
1201# CONFIG_INSTRUMENTATION is not set
1202 1223
1203# 1224#
1204# Kernel hacking 1225# Kernel hacking
@@ -1212,6 +1233,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1212# CONFIG_HEADERS_CHECK is not set 1233# CONFIG_HEADERS_CHECK is not set
1213# CONFIG_DEBUG_KERNEL is not set 1234# CONFIG_DEBUG_KERNEL is not set
1214# CONFIG_SLUB_DEBUG_ON is not set 1235# CONFIG_SLUB_DEBUG_ON is not set
1236# CONFIG_SLUB_STATS is not set
1215# CONFIG_DEBUG_BUGVERBOSE is not set 1237# CONFIG_DEBUG_BUGVERBOSE is not set
1216# CONFIG_SAMPLES is not set 1238# CONFIG_SAMPLES is not set
1217# CONFIG_PPC_EARLY_DEBUG is not set 1239# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1225,6 +1247,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1225CONFIG_CRYPTO=y 1247CONFIG_CRYPTO=y
1226CONFIG_CRYPTO_ALGAPI=y 1248CONFIG_CRYPTO_ALGAPI=y
1227CONFIG_CRYPTO_BLKCIPHER=y 1249CONFIG_CRYPTO_BLKCIPHER=y
1250# CONFIG_CRYPTO_SEQIV is not set
1228CONFIG_CRYPTO_MANAGER=y 1251CONFIG_CRYPTO_MANAGER=y
1229# CONFIG_CRYPTO_HMAC is not set 1252# CONFIG_CRYPTO_HMAC is not set
1230# CONFIG_CRYPTO_XCBC is not set 1253# CONFIG_CRYPTO_XCBC is not set
@@ -1242,6 +1265,9 @@ CONFIG_CRYPTO_CBC=y
1242CONFIG_CRYPTO_PCBC=m 1265CONFIG_CRYPTO_PCBC=m
1243# CONFIG_CRYPTO_LRW is not set 1266# CONFIG_CRYPTO_LRW is not set
1244# CONFIG_CRYPTO_XTS is not set 1267# CONFIG_CRYPTO_XTS is not set
1268# CONFIG_CRYPTO_CTR is not set
1269# CONFIG_CRYPTO_GCM is not set
1270# CONFIG_CRYPTO_CCM is not set
1245# CONFIG_CRYPTO_CRYPTD is not set 1271# CONFIG_CRYPTO_CRYPTD is not set
1246CONFIG_CRYPTO_DES=y 1272CONFIG_CRYPTO_DES=y
1247# CONFIG_CRYPTO_FCRYPT is not set 1273# CONFIG_CRYPTO_FCRYPT is not set
@@ -1256,11 +1282,14 @@ CONFIG_CRYPTO_DES=y
1256# CONFIG_CRYPTO_KHAZAD is not set 1282# CONFIG_CRYPTO_KHAZAD is not set
1257# CONFIG_CRYPTO_ANUBIS is not set 1283# CONFIG_CRYPTO_ANUBIS is not set
1258# CONFIG_CRYPTO_SEED is not set 1284# CONFIG_CRYPTO_SEED is not set
1285# CONFIG_CRYPTO_SALSA20 is not set
1259# CONFIG_CRYPTO_DEFLATE is not set 1286# CONFIG_CRYPTO_DEFLATE is not set
1260# CONFIG_CRYPTO_MICHAEL_MIC is not set 1287# CONFIG_CRYPTO_MICHAEL_MIC is not set
1261# CONFIG_CRYPTO_CRC32C is not set 1288# CONFIG_CRYPTO_CRC32C is not set
1262# CONFIG_CRYPTO_CAMELLIA is not set 1289# CONFIG_CRYPTO_CAMELLIA is not set
1263# CONFIG_CRYPTO_TEST is not set 1290# CONFIG_CRYPTO_TEST is not set
1264# CONFIG_CRYPTO_AUTHENC is not set 1291# CONFIG_CRYPTO_AUTHENC is not set
1292# CONFIG_CRYPTO_LZO is not set
1265CONFIG_CRYPTO_HW=y 1293CONFIG_CRYPTO_HW=y
1294# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1266# CONFIG_PPC_CLOCK is not set 1295# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc834x_itxgp_defconfig b/arch/powerpc/configs/mpc834x_itxgp_defconfig
index 67cb09cc3ace..b4e39cf82a8c 100644
--- a/arch/powerpc/configs/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/mpc834x_itxgp_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:39 2007 4# Mon Mar 24 08:48:18 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,8 +14,8 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_83xx=y
18CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
18# CONFIG_FSL_EMB_PERFMON is not set
19CONFIG_PPC_STD_MMU=y 19CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y 20CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -66,15 +67,19 @@ CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set 73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y
75# CONFIG_FAIR_GROUP_SCHED is not set 75# CONFIG_FAIR_GROUP_SCHED is not set
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
76CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
77# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
78CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
79CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -86,11 +91,13 @@ CONFIG_HOTPLUG=y
86CONFIG_PRINTK=y 91CONFIG_PRINTK=y
87CONFIG_BUG=y 92CONFIG_BUG=y
88CONFIG_ELF_CORE=y 93CONFIG_ELF_CORE=y
94CONFIG_COMPAT_BRK=y
89CONFIG_BASE_FULL=y 95CONFIG_BASE_FULL=y
90CONFIG_FUTEX=y 96CONFIG_FUTEX=y
91CONFIG_ANON_INODES=y 97CONFIG_ANON_INODES=y
92# CONFIG_EPOLL is not set 98# CONFIG_EPOLL is not set
93CONFIG_SIGNALFD=y 99CONFIG_SIGNALFD=y
100CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
95CONFIG_SHMEM=y 102CONFIG_SHMEM=y
96CONFIG_VM_EVENT_COUNTERS=y 103CONFIG_VM_EVENT_COUNTERS=y
@@ -98,6 +105,13 @@ CONFIG_SLUB_DEBUG=y
98# CONFIG_SLAB is not set 105# CONFIG_SLAB is not set
99CONFIG_SLUB=y 106CONFIG_SLUB=y
100# CONFIG_SLOB is not set 107# CONFIG_SLOB is not set
108# CONFIG_PROFILING is not set
109# CONFIG_MARKERS is not set
110CONFIG_HAVE_OPROFILE=y
111CONFIG_HAVE_KPROBES=y
112CONFIG_HAVE_KRETPROBES=y
113CONFIG_PROC_PAGE_MONITOR=y
114CONFIG_SLABINFO=y
101CONFIG_RT_MUTEXES=y 115CONFIG_RT_MUTEXES=y
102# CONFIG_TINY_SHMEM is not set 116# CONFIG_TINY_SHMEM is not set
103CONFIG_BASE_SMALL=0 117CONFIG_BASE_SMALL=0
@@ -125,6 +139,7 @@ CONFIG_DEFAULT_AS=y
125# CONFIG_DEFAULT_CFQ is not set 139# CONFIG_DEFAULT_CFQ is not set
126# CONFIG_DEFAULT_NOOP is not set 140# CONFIG_DEFAULT_NOOP is not set
127CONFIG_DEFAULT_IOSCHED="anticipatory" 141CONFIG_DEFAULT_IOSCHED="anticipatory"
142CONFIG_CLASSIC_RCU=y
128 143
129# 144#
130# Platform support 145# Platform support
@@ -133,18 +148,23 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
133# CONFIG_PPC_82xx is not set 148# CONFIG_PPC_82xx is not set
134CONFIG_PPC_83xx=y 149CONFIG_PPC_83xx=y
135# CONFIG_PPC_86xx is not set 150# CONFIG_PPC_86xx is not set
136# CONFIG_PPC_MPC52xx is not set 151# CONFIG_PPC_MPC512x is not set
137# CONFIG_PPC_MPC5200 is not set 152# CONFIG_PPC_MPC5121 is not set
138# CONFIG_PPC_CELL is not set 153# CONFIG_PPC_CELL is not set
139# CONFIG_PPC_CELL_NATIVE is not set 154# CONFIG_PPC_CELL_NATIVE is not set
140# CONFIG_PQ2ADS is not set 155# CONFIG_PQ2ADS is not set
141# CONFIG_MPC8313_RDB is not set 156CONFIG_MPC83xx=y
157# CONFIG_MPC831x_RDB is not set
142# CONFIG_MPC832x_MDS is not set 158# CONFIG_MPC832x_MDS is not set
143# CONFIG_MPC832x_RDB is not set 159# CONFIG_MPC832x_RDB is not set
144# CONFIG_MPC834x_MDS is not set 160# CONFIG_MPC834x_MDS is not set
145CONFIG_MPC834x_ITX=y 161CONFIG_MPC834x_ITX=y
146# CONFIG_MPC836x_MDS is not set 162# CONFIG_MPC836x_MDS is not set
147CONFIG_MPC834x=y 163# CONFIG_MPC837x_MDS is not set
164# CONFIG_MPC837x_RDB is not set
165# CONFIG_SBC834x is not set
166CONFIG_PPC_MPC834x=y
167CONFIG_IPIC=y
148# CONFIG_MPIC is not set 168# CONFIG_MPIC is not set
149# CONFIG_MPIC_WEIRD is not set 169# CONFIG_MPIC_WEIRD is not set
150# CONFIG_PPC_I8259 is not set 170# CONFIG_PPC_I8259 is not set
@@ -155,7 +175,6 @@ CONFIG_MPC834x=y
155# CONFIG_PPC_INDIRECT_IO is not set 175# CONFIG_PPC_INDIRECT_IO is not set
156# CONFIG_GENERIC_IOMAP is not set 176# CONFIG_GENERIC_IOMAP is not set
157# CONFIG_CPU_FREQ is not set 177# CONFIG_CPU_FREQ is not set
158# CONFIG_CPM2 is not set
159# CONFIG_FSL_ULI1575 is not set 178# CONFIG_FSL_ULI1575 is not set
160 179
161# 180#
@@ -171,12 +190,16 @@ CONFIG_HZ_250=y
171# CONFIG_HZ_300 is not set 190# CONFIG_HZ_300 is not set
172# CONFIG_HZ_1000 is not set 191# CONFIG_HZ_1000 is not set
173CONFIG_HZ=250 192CONFIG_HZ=250
193# CONFIG_SCHED_HRTICK is not set
174CONFIG_PREEMPT_NONE=y 194CONFIG_PREEMPT_NONE=y
175# CONFIG_PREEMPT_VOLUNTARY is not set 195# CONFIG_PREEMPT_VOLUNTARY is not set
176# CONFIG_PREEMPT is not set 196# CONFIG_PREEMPT is not set
177CONFIG_BINFMT_ELF=y 197CONFIG_BINFMT_ELF=y
178# CONFIG_BINFMT_MISC is not set 198# CONFIG_BINFMT_MISC is not set
199# CONFIG_IOMMU_HELPER is not set
179CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 200CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
201CONFIG_ARCH_HAS_WALK_MEMORY=y
202CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
180CONFIG_ARCH_FLATMEM_ENABLE=y 203CONFIG_ARCH_FLATMEM_ENABLE=y
181CONFIG_ARCH_POPULATES_NODE_MAP=y 204CONFIG_ARCH_POPULATES_NODE_MAP=y
182CONFIG_SELECT_MEMORY_MODEL=y 205CONFIG_SELECT_MEMORY_MODEL=y
@@ -195,11 +218,7 @@ CONFIG_VIRT_TO_BUS=y
195CONFIG_PROC_DEVICETREE=y 218CONFIG_PROC_DEVICETREE=y
196# CONFIG_CMDLINE_BOOL is not set 219# CONFIG_CMDLINE_BOOL is not set
197# CONFIG_PM is not set 220# CONFIG_PM is not set
198CONFIG_SUSPEND_UP_POSSIBLE=y
199CONFIG_HIBERNATION_UP_POSSIBLE=y
200CONFIG_SECCOMP=y 221CONFIG_SECCOMP=y
201CONFIG_WANT_DEVICE_TREE=y
202CONFIG_DEVICE_TREE=""
203CONFIG_ISA_DMA_API=y 222CONFIG_ISA_DMA_API=y
204 223
205# 224#
@@ -248,6 +267,7 @@ CONFIG_XFRM=y
248# CONFIG_XFRM_USER is not set 267# CONFIG_XFRM_USER is not set
249# CONFIG_XFRM_SUB_POLICY is not set 268# CONFIG_XFRM_SUB_POLICY is not set
250# CONFIG_XFRM_MIGRATE is not set 269# CONFIG_XFRM_MIGRATE is not set
270# CONFIG_XFRM_STATISTICS is not set
251# CONFIG_NET_KEY is not set 271# CONFIG_NET_KEY is not set
252CONFIG_INET=y 272CONFIG_INET=y
253CONFIG_IP_MULTICAST=y 273CONFIG_IP_MULTICAST=y
@@ -303,6 +323,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
303# 323#
304# CONFIG_NET_PKTGEN is not set 324# CONFIG_NET_PKTGEN is not set
305# CONFIG_HAMRADIO is not set 325# CONFIG_HAMRADIO is not set
326# CONFIG_CAN is not set
306# CONFIG_IRDA is not set 327# CONFIG_IRDA is not set
307# CONFIG_BT is not set 328# CONFIG_BT is not set
308# CONFIG_AF_RXRPC is not set 329# CONFIG_AF_RXRPC is not set
@@ -427,7 +448,7 @@ CONFIG_BLK_DEV_LOOP=y
427CONFIG_BLK_DEV_RAM=y 448CONFIG_BLK_DEV_RAM=y
428CONFIG_BLK_DEV_RAM_COUNT=16 449CONFIG_BLK_DEV_RAM_COUNT=16
429CONFIG_BLK_DEV_RAM_SIZE=32768 450CONFIG_BLK_DEV_RAM_SIZE=32768
430CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 451# CONFIG_BLK_DEV_XIP is not set
431# CONFIG_CDROM_PKTCDVD is not set 452# CONFIG_CDROM_PKTCDVD is not set
432# CONFIG_ATA_OVER_ETH is not set 453# CONFIG_ATA_OVER_ETH is not set
433CONFIG_MISC_DEVICES=y 454CONFIG_MISC_DEVICES=y
@@ -435,6 +456,8 @@ CONFIG_MISC_DEVICES=y
435# CONFIG_EEPROM_93CX6 is not set 456# CONFIG_EEPROM_93CX6 is not set
436# CONFIG_SGI_IOC4 is not set 457# CONFIG_SGI_IOC4 is not set
437# CONFIG_TIFM_CORE is not set 458# CONFIG_TIFM_CORE is not set
459# CONFIG_ENCLOSURE_SERVICES is not set
460CONFIG_HAVE_IDE=y
438# CONFIG_IDE is not set 461# CONFIG_IDE is not set
439 462
440# 463#
@@ -499,6 +522,7 @@ CONFIG_SCSI_LOWLEVEL=y
499# CONFIG_SCSI_IPS is not set 522# CONFIG_SCSI_IPS is not set
500# CONFIG_SCSI_INITIO is not set 523# CONFIG_SCSI_INITIO is not set
501# CONFIG_SCSI_INIA100 is not set 524# CONFIG_SCSI_INIA100 is not set
525# CONFIG_SCSI_MVSAS is not set
502# CONFIG_SCSI_STEX is not set 526# CONFIG_SCSI_STEX is not set
503# CONFIG_SCSI_SYM53C8XX_2 is not set 527# CONFIG_SCSI_SYM53C8XX_2 is not set
504# CONFIG_SCSI_QLOGIC_1280 is not set 528# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -529,7 +553,6 @@ CONFIG_NETDEVICES=y
529# CONFIG_EQUALIZER is not set 553# CONFIG_EQUALIZER is not set
530# CONFIG_TUN is not set 554# CONFIG_TUN is not set
531# CONFIG_VETH is not set 555# CONFIG_VETH is not set
532# CONFIG_IP1000 is not set
533# CONFIG_ARCNET is not set 556# CONFIG_ARCNET is not set
534CONFIG_PHYLIB=y 557CONFIG_PHYLIB=y
535 558
@@ -545,6 +568,7 @@ CONFIG_CICADA_PHY=y
545# CONFIG_SMSC_PHY is not set 568# CONFIG_SMSC_PHY is not set
546# CONFIG_BROADCOM_PHY is not set 569# CONFIG_BROADCOM_PHY is not set
547# CONFIG_ICPLUS_PHY is not set 570# CONFIG_ICPLUS_PHY is not set
571# CONFIG_REALTEK_PHY is not set
548# CONFIG_FIXED_PHY is not set 572# CONFIG_FIXED_PHY is not set
549# CONFIG_MDIO_BITBANG is not set 573# CONFIG_MDIO_BITBANG is not set
550# CONFIG_NET_ETHERNET is not set 574# CONFIG_NET_ETHERNET is not set
@@ -553,6 +577,9 @@ CONFIG_NETDEV_1000=y
553# CONFIG_DL2K is not set 577# CONFIG_DL2K is not set
554# CONFIG_E1000 is not set 578# CONFIG_E1000 is not set
555# CONFIG_E1000E is not set 579# CONFIG_E1000E is not set
580# CONFIG_E1000E_ENABLED is not set
581# CONFIG_IP1000 is not set
582# CONFIG_IGB is not set
556# CONFIG_NS83820 is not set 583# CONFIG_NS83820 is not set
557# CONFIG_HAMACHI is not set 584# CONFIG_HAMACHI is not set
558# CONFIG_YELLOWFIN is not set 585# CONFIG_YELLOWFIN is not set
@@ -579,6 +606,7 @@ CONFIG_NETDEV_10000=y
579# CONFIG_NIU is not set 606# CONFIG_NIU is not set
580# CONFIG_MLX4_CORE is not set 607# CONFIG_MLX4_CORE is not set
581# CONFIG_TEHUTI is not set 608# CONFIG_TEHUTI is not set
609# CONFIG_BNX2X is not set
582# CONFIG_TR is not set 610# CONFIG_TR is not set
583 611
584# 612#
@@ -601,7 +629,6 @@ CONFIG_NETDEV_10000=y
601# CONFIG_PPP is not set 629# CONFIG_PPP is not set
602# CONFIG_SLIP is not set 630# CONFIG_SLIP is not set
603# CONFIG_NET_FC is not set 631# CONFIG_NET_FC is not set
604# CONFIG_SHAPER is not set
605# CONFIG_NETCONSOLE is not set 632# CONFIG_NETCONSOLE is not set
606# CONFIG_NETPOLL is not set 633# CONFIG_NETPOLL is not set
607# CONFIG_NET_POLL_CONTROLLER is not set 634# CONFIG_NET_POLL_CONTROLLER is not set
@@ -624,6 +651,7 @@ CONFIG_NETDEV_10000=y
624# 651#
625# CONFIG_VT is not set 652# CONFIG_VT is not set
626# CONFIG_SERIAL_NONSTANDARD is not set 653# CONFIG_SERIAL_NONSTANDARD is not set
654# CONFIG_NOZOMI is not set
627 655
628# 656#
629# Serial drivers 657# Serial drivers
@@ -697,14 +725,12 @@ CONFIG_I2C_MPC=y
697# 725#
698# Miscellaneous I2C Chip support 726# Miscellaneous I2C Chip support
699# 727#
700# CONFIG_SENSORS_DS1337 is not set
701# CONFIG_SENSORS_DS1374 is not set
702# CONFIG_DS1682 is not set 728# CONFIG_DS1682 is not set
703# CONFIG_SENSORS_EEPROM is not set 729# CONFIG_SENSORS_EEPROM is not set
704CONFIG_SENSORS_PCF8574=y 730CONFIG_SENSORS_PCF8574=y
705# CONFIG_SENSORS_PCA9539 is not set 731# CONFIG_PCF8575 is not set
706# CONFIG_SENSORS_PCF8591 is not set 732# CONFIG_SENSORS_PCF8591 is not set
707# CONFIG_SENSORS_M41T00 is not set 733# CONFIG_TPS65010 is not set
708# CONFIG_SENSORS_MAX6875 is not set 734# CONFIG_SENSORS_MAX6875 is not set
709# CONFIG_SENSORS_TSL2550 is not set 735# CONFIG_SENSORS_TSL2550 is not set
710# CONFIG_I2C_DEBUG_CORE is not set 736# CONFIG_I2C_DEBUG_CORE is not set
@@ -733,6 +759,7 @@ CONFIG_SPI_MPC83xx=y
733# CONFIG_W1 is not set 759# CONFIG_W1 is not set
734# CONFIG_POWER_SUPPLY is not set 760# CONFIG_POWER_SUPPLY is not set
735# CONFIG_HWMON is not set 761# CONFIG_HWMON is not set
762# CONFIG_THERMAL is not set
736CONFIG_WATCHDOG=y 763CONFIG_WATCHDOG=y
737# CONFIG_WATCHDOG_NOWAYOUT is not set 764# CONFIG_WATCHDOG_NOWAYOUT is not set
738 765
@@ -797,6 +824,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
797CONFIG_USB_ARCH_HAS_EHCI=y 824CONFIG_USB_ARCH_HAS_EHCI=y
798CONFIG_USB=y 825CONFIG_USB=y
799# CONFIG_USB_DEBUG is not set 826# CONFIG_USB_DEBUG is not set
827# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
800 828
801# 829#
802# Miscellaneous USB options 830# Miscellaneous USB options
@@ -810,10 +838,10 @@ CONFIG_USB_DEVICE_CLASS=y
810# USB Host Controller Drivers 838# USB Host Controller Drivers
811# 839#
812CONFIG_USB_EHCI_HCD=y 840CONFIG_USB_EHCI_HCD=y
813# CONFIG_USB_EHCI_SPLIT_ISO is not set
814CONFIG_USB_EHCI_ROOT_HUB_TT=y 841CONFIG_USB_EHCI_ROOT_HUB_TT=y
815# CONFIG_USB_EHCI_TT_NEWSCHED is not set 842# CONFIG_USB_EHCI_TT_NEWSCHED is not set
816CONFIG_USB_EHCI_FSL=y 843CONFIG_USB_EHCI_FSL=y
844CONFIG_USB_EHCI_HCD_PPC_OF=y
817# CONFIG_USB_ISP116X_HCD is not set 845# CONFIG_USB_ISP116X_HCD is not set
818# CONFIG_USB_OHCI_HCD is not set 846# CONFIG_USB_OHCI_HCD is not set
819CONFIG_USB_UHCI_HCD=y 847CONFIG_USB_UHCI_HCD=y
@@ -857,10 +885,6 @@ CONFIG_USB_MON=y
857# 885#
858# USB port drivers 886# USB port drivers
859# 887#
860
861#
862# USB Serial Converter support
863#
864# CONFIG_USB_SERIAL is not set 888# CONFIG_USB_SERIAL is not set
865 889
866# 890#
@@ -885,16 +909,9 @@ CONFIG_USB_MON=y
885# CONFIG_USB_LD is not set 909# CONFIG_USB_LD is not set
886# CONFIG_USB_TRANCEVIBRATOR is not set 910# CONFIG_USB_TRANCEVIBRATOR is not set
887# CONFIG_USB_IOWARRIOR is not set 911# CONFIG_USB_IOWARRIOR is not set
888
889#
890# USB DSL modem support
891#
892
893#
894# USB Gadget Support
895#
896# CONFIG_USB_GADGET is not set 912# CONFIG_USB_GADGET is not set
897# CONFIG_MMC is not set 913# CONFIG_MMC is not set
914# CONFIG_MEMSTICK is not set
898# CONFIG_NEW_LEDS is not set 915# CONFIG_NEW_LEDS is not set
899# CONFIG_INFINIBAND is not set 916# CONFIG_INFINIBAND is not set
900# CONFIG_EDAC is not set 917# CONFIG_EDAC is not set
@@ -926,20 +943,23 @@ CONFIG_RTC_DRV_DS1307=y
926# CONFIG_RTC_DRV_PCF8563 is not set 943# CONFIG_RTC_DRV_PCF8563 is not set
927# CONFIG_RTC_DRV_PCF8583 is not set 944# CONFIG_RTC_DRV_PCF8583 is not set
928# CONFIG_RTC_DRV_M41T80 is not set 945# CONFIG_RTC_DRV_M41T80 is not set
946# CONFIG_RTC_DRV_S35390A is not set
929 947
930# 948#
931# SPI RTC drivers 949# SPI RTC drivers
932# 950#
933# CONFIG_RTC_DRV_RS5C348 is not set
934# CONFIG_RTC_DRV_MAX6902 is not set 951# CONFIG_RTC_DRV_MAX6902 is not set
952# CONFIG_RTC_DRV_R9701 is not set
953# CONFIG_RTC_DRV_RS5C348 is not set
935 954
936# 955#
937# Platform RTC drivers 956# Platform RTC drivers
938# 957#
939# CONFIG_RTC_DRV_CMOS is not set 958# CONFIG_RTC_DRV_CMOS is not set
959# CONFIG_RTC_DRV_DS1511 is not set
940# CONFIG_RTC_DRV_DS1553 is not set 960# CONFIG_RTC_DRV_DS1553 is not set
941# CONFIG_RTC_DRV_STK17TA8 is not set
942# CONFIG_RTC_DRV_DS1742 is not set 961# CONFIG_RTC_DRV_DS1742 is not set
962# CONFIG_RTC_DRV_STK17TA8 is not set
943# CONFIG_RTC_DRV_M48T86 is not set 963# CONFIG_RTC_DRV_M48T86 is not set
944# CONFIG_RTC_DRV_M48T59 is not set 964# CONFIG_RTC_DRV_M48T59 is not set
945# CONFIG_RTC_DRV_V3020 is not set 965# CONFIG_RTC_DRV_V3020 is not set
@@ -947,6 +967,7 @@ CONFIG_RTC_DRV_DS1307=y
947# 967#
948# on-CPU RTC drivers 968# on-CPU RTC drivers
949# 969#
970# CONFIG_DMADEVICES is not set
950 971
951# 972#
952# Userspace I/O 973# Userspace I/O
@@ -972,12 +993,10 @@ CONFIG_FS_MBCACHE=y
972# CONFIG_XFS_FS is not set 993# CONFIG_XFS_FS is not set
973# CONFIG_GFS2_FS is not set 994# CONFIG_GFS2_FS is not set
974# CONFIG_OCFS2_FS is not set 995# CONFIG_OCFS2_FS is not set
975# CONFIG_MINIX_FS is not set 996CONFIG_DNOTIFY=y
976# CONFIG_ROMFS_FS is not set
977CONFIG_INOTIFY=y 997CONFIG_INOTIFY=y
978CONFIG_INOTIFY_USER=y 998CONFIG_INOTIFY_USER=y
979# CONFIG_QUOTA is not set 999# CONFIG_QUOTA is not set
980CONFIG_DNOTIFY=y
981# CONFIG_AUTOFS_FS is not set 1000# CONFIG_AUTOFS_FS is not set
982# CONFIG_AUTOFS4_FS is not set 1001# CONFIG_AUTOFS4_FS is not set
983# CONFIG_FUSE_FS is not set 1002# CONFIG_FUSE_FS is not set
@@ -1023,8 +1042,10 @@ CONFIG_TMPFS=y
1023# CONFIG_JFFS2_FS is not set 1042# CONFIG_JFFS2_FS is not set
1024# CONFIG_CRAMFS is not set 1043# CONFIG_CRAMFS is not set
1025# CONFIG_VXFS_FS is not set 1044# CONFIG_VXFS_FS is not set
1045# CONFIG_MINIX_FS is not set
1026# CONFIG_HPFS_FS is not set 1046# CONFIG_HPFS_FS is not set
1027# CONFIG_QNX4FS_FS is not set 1047# CONFIG_QNX4FS_FS is not set
1048# CONFIG_ROMFS_FS is not set
1028# CONFIG_SYSV_FS is not set 1049# CONFIG_SYSV_FS is not set
1029# CONFIG_UFS_FS is not set 1050# CONFIG_UFS_FS is not set
1030CONFIG_NETWORK_FILESYSTEMS=y 1051CONFIG_NETWORK_FILESYSTEMS=y
@@ -1111,7 +1132,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1111# CONFIG_NLS_KOI8_U is not set 1132# CONFIG_NLS_KOI8_U is not set
1112# CONFIG_NLS_UTF8 is not set 1133# CONFIG_NLS_UTF8 is not set
1113# CONFIG_DLM is not set 1134# CONFIG_DLM is not set
1114# CONFIG_UCC_SLOW is not set
1115 1135
1116# 1136#
1117# Library routines 1137# Library routines
@@ -1127,7 +1147,6 @@ CONFIG_PLIST=y
1127CONFIG_HAS_IOMEM=y 1147CONFIG_HAS_IOMEM=y
1128CONFIG_HAS_IOPORT=y 1148CONFIG_HAS_IOPORT=y
1129CONFIG_HAS_DMA=y 1149CONFIG_HAS_DMA=y
1130# CONFIG_INSTRUMENTATION is not set
1131 1150
1132# 1151#
1133# Kernel hacking 1152# Kernel hacking
@@ -1141,6 +1160,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1141# CONFIG_HEADERS_CHECK is not set 1160# CONFIG_HEADERS_CHECK is not set
1142# CONFIG_DEBUG_KERNEL is not set 1161# CONFIG_DEBUG_KERNEL is not set
1143# CONFIG_SLUB_DEBUG_ON is not set 1162# CONFIG_SLUB_DEBUG_ON is not set
1163# CONFIG_SLUB_STATS is not set
1144# CONFIG_DEBUG_BUGVERBOSE is not set 1164# CONFIG_DEBUG_BUGVERBOSE is not set
1145# CONFIG_SAMPLES is not set 1165# CONFIG_SAMPLES is not set
1146# CONFIG_PPC_EARLY_DEBUG is not set 1166# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1154,6 +1174,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1154CONFIG_CRYPTO=y 1174CONFIG_CRYPTO=y
1155CONFIG_CRYPTO_ALGAPI=y 1175CONFIG_CRYPTO_ALGAPI=y
1156CONFIG_CRYPTO_BLKCIPHER=y 1176CONFIG_CRYPTO_BLKCIPHER=y
1177# CONFIG_CRYPTO_SEQIV is not set
1157CONFIG_CRYPTO_MANAGER=y 1178CONFIG_CRYPTO_MANAGER=y
1158# CONFIG_CRYPTO_HMAC is not set 1179# CONFIG_CRYPTO_HMAC is not set
1159# CONFIG_CRYPTO_XCBC is not set 1180# CONFIG_CRYPTO_XCBC is not set
@@ -1171,6 +1192,9 @@ CONFIG_CRYPTO_CBC=y
1171CONFIG_CRYPTO_PCBC=m 1192CONFIG_CRYPTO_PCBC=m
1172# CONFIG_CRYPTO_LRW is not set 1193# CONFIG_CRYPTO_LRW is not set
1173# CONFIG_CRYPTO_XTS is not set 1194# CONFIG_CRYPTO_XTS is not set
1195# CONFIG_CRYPTO_CTR is not set
1196# CONFIG_CRYPTO_GCM is not set
1197# CONFIG_CRYPTO_CCM is not set
1174# CONFIG_CRYPTO_CRYPTD is not set 1198# CONFIG_CRYPTO_CRYPTD is not set
1175CONFIG_CRYPTO_DES=y 1199CONFIG_CRYPTO_DES=y
1176# CONFIG_CRYPTO_FCRYPT is not set 1200# CONFIG_CRYPTO_FCRYPT is not set
@@ -1185,11 +1209,14 @@ CONFIG_CRYPTO_DES=y
1185# CONFIG_CRYPTO_KHAZAD is not set 1209# CONFIG_CRYPTO_KHAZAD is not set
1186# CONFIG_CRYPTO_ANUBIS is not set 1210# CONFIG_CRYPTO_ANUBIS is not set
1187# CONFIG_CRYPTO_SEED is not set 1211# CONFIG_CRYPTO_SEED is not set
1212# CONFIG_CRYPTO_SALSA20 is not set
1188# CONFIG_CRYPTO_DEFLATE is not set 1213# CONFIG_CRYPTO_DEFLATE is not set
1189# CONFIG_CRYPTO_MICHAEL_MIC is not set 1214# CONFIG_CRYPTO_MICHAEL_MIC is not set
1190# CONFIG_CRYPTO_CRC32C is not set 1215# CONFIG_CRYPTO_CRC32C is not set
1191# CONFIG_CRYPTO_CAMELLIA is not set 1216# CONFIG_CRYPTO_CAMELLIA is not set
1192# CONFIG_CRYPTO_TEST is not set 1217# CONFIG_CRYPTO_TEST is not set
1193# CONFIG_CRYPTO_AUTHENC is not set 1218# CONFIG_CRYPTO_AUTHENC is not set
1219# CONFIG_CRYPTO_LZO is not set
1194CONFIG_CRYPTO_HW=y 1220CONFIG_CRYPTO_HW=y
1221# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1195# CONFIG_PPC_CLOCK is not set 1222# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig
index 217539f3ecef..9360144942f1 100644
--- a/arch/powerpc/configs/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/mpc834x_mds_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:41 2007 4# Mon Mar 24 08:48:20 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,8 +14,8 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_83xx=y
18CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
18# CONFIG_FSL_EMB_PERFMON is not set
19CONFIG_PPC_STD_MMU=y 19CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y 20CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -66,15 +67,19 @@ CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set 73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y
75# CONFIG_FAIR_GROUP_SCHED is not set 75# CONFIG_FAIR_GROUP_SCHED is not set
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
76CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
77# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
78CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
79CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -86,11 +91,13 @@ CONFIG_HOTPLUG=y
86CONFIG_PRINTK=y 91CONFIG_PRINTK=y
87CONFIG_BUG=y 92CONFIG_BUG=y
88CONFIG_ELF_CORE=y 93CONFIG_ELF_CORE=y
94CONFIG_COMPAT_BRK=y
89CONFIG_BASE_FULL=y 95CONFIG_BASE_FULL=y
90CONFIG_FUTEX=y 96CONFIG_FUTEX=y
91CONFIG_ANON_INODES=y 97CONFIG_ANON_INODES=y
92# CONFIG_EPOLL is not set 98# CONFIG_EPOLL is not set
93CONFIG_SIGNALFD=y 99CONFIG_SIGNALFD=y
100CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
95CONFIG_SHMEM=y 102CONFIG_SHMEM=y
96CONFIG_VM_EVENT_COUNTERS=y 103CONFIG_VM_EVENT_COUNTERS=y
@@ -98,6 +105,13 @@ CONFIG_SLUB_DEBUG=y
98# CONFIG_SLAB is not set 105# CONFIG_SLAB is not set
99CONFIG_SLUB=y 106CONFIG_SLUB=y
100# CONFIG_SLOB is not set 107# CONFIG_SLOB is not set
108# CONFIG_PROFILING is not set
109# CONFIG_MARKERS is not set
110CONFIG_HAVE_OPROFILE=y
111CONFIG_HAVE_KPROBES=y
112CONFIG_HAVE_KRETPROBES=y
113CONFIG_PROC_PAGE_MONITOR=y
114CONFIG_SLABINFO=y
101CONFIG_RT_MUTEXES=y 115CONFIG_RT_MUTEXES=y
102# CONFIG_TINY_SHMEM is not set 116# CONFIG_TINY_SHMEM is not set
103CONFIG_BASE_SMALL=0 117CONFIG_BASE_SMALL=0
@@ -125,6 +139,7 @@ CONFIG_DEFAULT_AS=y
125# CONFIG_DEFAULT_CFQ is not set 139# CONFIG_DEFAULT_CFQ is not set
126# CONFIG_DEFAULT_NOOP is not set 140# CONFIG_DEFAULT_NOOP is not set
127CONFIG_DEFAULT_IOSCHED="anticipatory" 141CONFIG_DEFAULT_IOSCHED="anticipatory"
142CONFIG_CLASSIC_RCU=y
128 143
129# 144#
130# Platform support 145# Platform support
@@ -133,18 +148,23 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
133# CONFIG_PPC_82xx is not set 148# CONFIG_PPC_82xx is not set
134CONFIG_PPC_83xx=y 149CONFIG_PPC_83xx=y
135# CONFIG_PPC_86xx is not set 150# CONFIG_PPC_86xx is not set
136# CONFIG_PPC_MPC52xx is not set 151# CONFIG_PPC_MPC512x is not set
137# CONFIG_PPC_MPC5200 is not set 152# CONFIG_PPC_MPC5121 is not set
138# CONFIG_PPC_CELL is not set 153# CONFIG_PPC_CELL is not set
139# CONFIG_PPC_CELL_NATIVE is not set 154# CONFIG_PPC_CELL_NATIVE is not set
140# CONFIG_PQ2ADS is not set 155# CONFIG_PQ2ADS is not set
141# CONFIG_MPC8313_RDB is not set 156CONFIG_MPC83xx=y
157# CONFIG_MPC831x_RDB is not set
142# CONFIG_MPC832x_MDS is not set 158# CONFIG_MPC832x_MDS is not set
143# CONFIG_MPC832x_RDB is not set 159# CONFIG_MPC832x_RDB is not set
144CONFIG_MPC834x_MDS=y 160CONFIG_MPC834x_MDS=y
145# CONFIG_MPC834x_ITX is not set 161# CONFIG_MPC834x_ITX is not set
146# CONFIG_MPC836x_MDS is not set 162# CONFIG_MPC836x_MDS is not set
147CONFIG_MPC834x=y 163# CONFIG_MPC837x_MDS is not set
164# CONFIG_MPC837x_RDB is not set
165# CONFIG_SBC834x is not set
166CONFIG_PPC_MPC834x=y
167CONFIG_IPIC=y
148# CONFIG_MPIC is not set 168# CONFIG_MPIC is not set
149# CONFIG_MPIC_WEIRD is not set 169# CONFIG_MPIC_WEIRD is not set
150# CONFIG_PPC_I8259 is not set 170# CONFIG_PPC_I8259 is not set
@@ -155,7 +175,6 @@ CONFIG_MPC834x=y
155# CONFIG_PPC_INDIRECT_IO is not set 175# CONFIG_PPC_INDIRECT_IO is not set
156# CONFIG_GENERIC_IOMAP is not set 176# CONFIG_GENERIC_IOMAP is not set
157# CONFIG_CPU_FREQ is not set 177# CONFIG_CPU_FREQ is not set
158# CONFIG_CPM2 is not set
159# CONFIG_FSL_ULI1575 is not set 178# CONFIG_FSL_ULI1575 is not set
160 179
161# 180#
@@ -171,12 +190,16 @@ CONFIG_HZ_250=y
171# CONFIG_HZ_300 is not set 190# CONFIG_HZ_300 is not set
172# CONFIG_HZ_1000 is not set 191# CONFIG_HZ_1000 is not set
173CONFIG_HZ=250 192CONFIG_HZ=250
193# CONFIG_SCHED_HRTICK is not set
174CONFIG_PREEMPT_NONE=y 194CONFIG_PREEMPT_NONE=y
175# CONFIG_PREEMPT_VOLUNTARY is not set 195# CONFIG_PREEMPT_VOLUNTARY is not set
176# CONFIG_PREEMPT is not set 196# CONFIG_PREEMPT is not set
177CONFIG_BINFMT_ELF=y 197CONFIG_BINFMT_ELF=y
178# CONFIG_BINFMT_MISC is not set 198# CONFIG_BINFMT_MISC is not set
199# CONFIG_IOMMU_HELPER is not set
179CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 200CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
201CONFIG_ARCH_HAS_WALK_MEMORY=y
202CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
180CONFIG_ARCH_FLATMEM_ENABLE=y 203CONFIG_ARCH_FLATMEM_ENABLE=y
181CONFIG_ARCH_POPULATES_NODE_MAP=y 204CONFIG_ARCH_POPULATES_NODE_MAP=y
182CONFIG_SELECT_MEMORY_MODEL=y 205CONFIG_SELECT_MEMORY_MODEL=y
@@ -195,11 +218,7 @@ CONFIG_VIRT_TO_BUS=y
195CONFIG_PROC_DEVICETREE=y 218CONFIG_PROC_DEVICETREE=y
196# CONFIG_CMDLINE_BOOL is not set 219# CONFIG_CMDLINE_BOOL is not set
197# CONFIG_PM is not set 220# CONFIG_PM is not set
198CONFIG_SUSPEND_UP_POSSIBLE=y
199CONFIG_HIBERNATION_UP_POSSIBLE=y
200CONFIG_SECCOMP=y 221CONFIG_SECCOMP=y
201CONFIG_WANT_DEVICE_TREE=y
202CONFIG_DEVICE_TREE=""
203CONFIG_ISA_DMA_API=y 222CONFIG_ISA_DMA_API=y
204 223
205# 224#
@@ -248,6 +267,7 @@ CONFIG_XFRM=y
248CONFIG_XFRM_USER=m 267CONFIG_XFRM_USER=m
249# CONFIG_XFRM_SUB_POLICY is not set 268# CONFIG_XFRM_SUB_POLICY is not set
250# CONFIG_XFRM_MIGRATE is not set 269# CONFIG_XFRM_MIGRATE is not set
270# CONFIG_XFRM_STATISTICS is not set
251# CONFIG_NET_KEY is not set 271# CONFIG_NET_KEY is not set
252CONFIG_INET=y 272CONFIG_INET=y
253CONFIG_IP_MULTICAST=y 273CONFIG_IP_MULTICAST=y
@@ -303,6 +323,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
303# 323#
304# CONFIG_NET_PKTGEN is not set 324# CONFIG_NET_PKTGEN is not set
305# CONFIG_HAMRADIO is not set 325# CONFIG_HAMRADIO is not set
326# CONFIG_CAN is not set
306# CONFIG_IRDA is not set 327# CONFIG_IRDA is not set
307# CONFIG_BT is not set 328# CONFIG_BT is not set
308# CONFIG_AF_RXRPC is not set 329# CONFIG_AF_RXRPC is not set
@@ -347,7 +368,7 @@ CONFIG_BLK_DEV_LOOP=y
347CONFIG_BLK_DEV_RAM=y 368CONFIG_BLK_DEV_RAM=y
348CONFIG_BLK_DEV_RAM_COUNT=16 369CONFIG_BLK_DEV_RAM_COUNT=16
349CONFIG_BLK_DEV_RAM_SIZE=32768 370CONFIG_BLK_DEV_RAM_SIZE=32768
350CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 371# CONFIG_BLK_DEV_XIP is not set
351# CONFIG_CDROM_PKTCDVD is not set 372# CONFIG_CDROM_PKTCDVD is not set
352# CONFIG_ATA_OVER_ETH is not set 373# CONFIG_ATA_OVER_ETH is not set
353CONFIG_MISC_DEVICES=y 374CONFIG_MISC_DEVICES=y
@@ -355,6 +376,8 @@ CONFIG_MISC_DEVICES=y
355# CONFIG_EEPROM_93CX6 is not set 376# CONFIG_EEPROM_93CX6 is not set
356# CONFIG_SGI_IOC4 is not set 377# CONFIG_SGI_IOC4 is not set
357# CONFIG_TIFM_CORE is not set 378# CONFIG_TIFM_CORE is not set
379# CONFIG_ENCLOSURE_SERVICES is not set
380CONFIG_HAVE_IDE=y
358# CONFIG_IDE is not set 381# CONFIG_IDE is not set
359 382
360# 383#
@@ -383,7 +406,6 @@ CONFIG_NETDEVICES=y
383# CONFIG_EQUALIZER is not set 406# CONFIG_EQUALIZER is not set
384# CONFIG_TUN is not set 407# CONFIG_TUN is not set
385# CONFIG_VETH is not set 408# CONFIG_VETH is not set
386# CONFIG_IP1000 is not set
387# CONFIG_ARCNET is not set 409# CONFIG_ARCNET is not set
388CONFIG_PHYLIB=y 410CONFIG_PHYLIB=y
389 411
@@ -399,6 +421,7 @@ CONFIG_MARVELL_PHY=y
399# CONFIG_SMSC_PHY is not set 421# CONFIG_SMSC_PHY is not set
400# CONFIG_BROADCOM_PHY is not set 422# CONFIG_BROADCOM_PHY is not set
401# CONFIG_ICPLUS_PHY is not set 423# CONFIG_ICPLUS_PHY is not set
424# CONFIG_REALTEK_PHY is not set
402# CONFIG_FIXED_PHY is not set 425# CONFIG_FIXED_PHY is not set
403# CONFIG_MDIO_BITBANG is not set 426# CONFIG_MDIO_BITBANG is not set
404CONFIG_NET_ETHERNET=y 427CONFIG_NET_ETHERNET=y
@@ -426,6 +449,7 @@ CONFIG_E100=y
426# CONFIG_NE2K_PCI is not set 449# CONFIG_NE2K_PCI is not set
427# CONFIG_8139CP is not set 450# CONFIG_8139CP is not set
428# CONFIG_8139TOO is not set 451# CONFIG_8139TOO is not set
452# CONFIG_R6040 is not set
429# CONFIG_SIS900 is not set 453# CONFIG_SIS900 is not set
430# CONFIG_EPIC100 is not set 454# CONFIG_EPIC100 is not set
431# CONFIG_SUNDANCE is not set 455# CONFIG_SUNDANCE is not set
@@ -437,6 +461,9 @@ CONFIG_NETDEV_1000=y
437# CONFIG_DL2K is not set 461# CONFIG_DL2K is not set
438# CONFIG_E1000 is not set 462# CONFIG_E1000 is not set
439# CONFIG_E1000E is not set 463# CONFIG_E1000E is not set
464# CONFIG_E1000E_ENABLED is not set
465# CONFIG_IP1000 is not set
466# CONFIG_IGB is not set
440# CONFIG_NS83820 is not set 467# CONFIG_NS83820 is not set
441# CONFIG_HAMACHI is not set 468# CONFIG_HAMACHI is not set
442# CONFIG_YELLOWFIN is not set 469# CONFIG_YELLOWFIN is not set
@@ -463,6 +490,7 @@ CONFIG_NETDEV_10000=y
463# CONFIG_NIU is not set 490# CONFIG_NIU is not set
464# CONFIG_MLX4_CORE is not set 491# CONFIG_MLX4_CORE is not set
465# CONFIG_TEHUTI is not set 492# CONFIG_TEHUTI is not set
493# CONFIG_BNX2X is not set
466# CONFIG_TR is not set 494# CONFIG_TR is not set
467 495
468# 496#
@@ -475,7 +503,6 @@ CONFIG_NETDEV_10000=y
475# CONFIG_HIPPI is not set 503# CONFIG_HIPPI is not set
476# CONFIG_PPP is not set 504# CONFIG_PPP is not set
477# CONFIG_SLIP is not set 505# CONFIG_SLIP is not set
478# CONFIG_SHAPER is not set
479# CONFIG_NETCONSOLE is not set 506# CONFIG_NETCONSOLE is not set
480# CONFIG_NETPOLL is not set 507# CONFIG_NETPOLL is not set
481# CONFIG_NET_POLL_CONTROLLER is not set 508# CONFIG_NET_POLL_CONTROLLER is not set
@@ -518,6 +545,7 @@ CONFIG_INPUT=y
518# 545#
519# CONFIG_VT is not set 546# CONFIG_VT is not set
520# CONFIG_SERIAL_NONSTANDARD is not set 547# CONFIG_SERIAL_NONSTANDARD is not set
548# CONFIG_NOZOMI is not set
521 549
522# 550#
523# Serial drivers 551# Serial drivers
@@ -591,14 +619,12 @@ CONFIG_I2C_MPC=y
591# 619#
592# Miscellaneous I2C Chip support 620# Miscellaneous I2C Chip support
593# 621#
594# CONFIG_SENSORS_DS1337 is not set
595# CONFIG_SENSORS_DS1374 is not set
596# CONFIG_DS1682 is not set 622# CONFIG_DS1682 is not set
597# CONFIG_SENSORS_EEPROM is not set 623# CONFIG_SENSORS_EEPROM is not set
598# CONFIG_SENSORS_PCF8574 is not set 624# CONFIG_SENSORS_PCF8574 is not set
599# CONFIG_SENSORS_PCA9539 is not set 625# CONFIG_PCF8575 is not set
600# CONFIG_SENSORS_PCF8591 is not set 626# CONFIG_SENSORS_PCF8591 is not set
601# CONFIG_SENSORS_M41T00 is not set 627# CONFIG_TPS65010 is not set
602# CONFIG_SENSORS_MAX6875 is not set 628# CONFIG_SENSORS_MAX6875 is not set
603# CONFIG_SENSORS_TSL2550 is not set 629# CONFIG_SENSORS_TSL2550 is not set
604# CONFIG_I2C_DEBUG_CORE is not set 630# CONFIG_I2C_DEBUG_CORE is not set
@@ -623,6 +649,7 @@ CONFIG_HWMON=y
623# CONFIG_SENSORS_ADM1031 is not set 649# CONFIG_SENSORS_ADM1031 is not set
624# CONFIG_SENSORS_ADM9240 is not set 650# CONFIG_SENSORS_ADM9240 is not set
625# CONFIG_SENSORS_ADT7470 is not set 651# CONFIG_SENSORS_ADT7470 is not set
652# CONFIG_SENSORS_ADT7473 is not set
626# CONFIG_SENSORS_ATXP1 is not set 653# CONFIG_SENSORS_ATXP1 is not set
627# CONFIG_SENSORS_DS1621 is not set 654# CONFIG_SENSORS_DS1621 is not set
628# CONFIG_SENSORS_I5K_AMB is not set 655# CONFIG_SENSORS_I5K_AMB is not set
@@ -652,6 +679,7 @@ CONFIG_HWMON=y
652# CONFIG_SENSORS_SMSC47M1 is not set 679# CONFIG_SENSORS_SMSC47M1 is not set
653# CONFIG_SENSORS_SMSC47M192 is not set 680# CONFIG_SENSORS_SMSC47M192 is not set
654# CONFIG_SENSORS_SMSC47B397 is not set 681# CONFIG_SENSORS_SMSC47B397 is not set
682# CONFIG_SENSORS_ADS7828 is not set
655# CONFIG_SENSORS_THMC50 is not set 683# CONFIG_SENSORS_THMC50 is not set
656# CONFIG_SENSORS_VIA686A is not set 684# CONFIG_SENSORS_VIA686A is not set
657# CONFIG_SENSORS_VT1211 is not set 685# CONFIG_SENSORS_VT1211 is not set
@@ -661,9 +689,11 @@ CONFIG_HWMON=y
661# CONFIG_SENSORS_W83792D is not set 689# CONFIG_SENSORS_W83792D is not set
662# CONFIG_SENSORS_W83793 is not set 690# CONFIG_SENSORS_W83793 is not set
663# CONFIG_SENSORS_W83L785TS is not set 691# CONFIG_SENSORS_W83L785TS is not set
692# CONFIG_SENSORS_W83L786NG is not set
664# CONFIG_SENSORS_W83627HF is not set 693# CONFIG_SENSORS_W83627HF is not set
665# CONFIG_SENSORS_W83627EHF is not set 694# CONFIG_SENSORS_W83627EHF is not set
666# CONFIG_HWMON_DEBUG_CHIP is not set 695# CONFIG_HWMON_DEBUG_CHIP is not set
696# CONFIG_THERMAL is not set
667CONFIG_WATCHDOG=y 697CONFIG_WATCHDOG=y
668# CONFIG_WATCHDOG_NOWAYOUT is not set 698# CONFIG_WATCHDOG_NOWAYOUT is not set
669 699
@@ -725,23 +755,22 @@ CONFIG_USB_ARCH_HAS_HCD=y
725CONFIG_USB_ARCH_HAS_OHCI=y 755CONFIG_USB_ARCH_HAS_OHCI=y
726CONFIG_USB_ARCH_HAS_EHCI=y 756CONFIG_USB_ARCH_HAS_EHCI=y
727# CONFIG_USB is not set 757# CONFIG_USB is not set
728CONFIG_USB_EHCI_ROOT_HUB_TT=y
729CONFIG_USB_EHCI_FSL=y
730 758
731# 759#
732# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 760# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
733# 761#
734
735#
736# USB Gadget Support
737#
738# CONFIG_USB_GADGET is not set 762# CONFIG_USB_GADGET is not set
739# CONFIG_MMC is not set 763# CONFIG_MMC is not set
764# CONFIG_MEMSTICK is not set
740# CONFIG_NEW_LEDS is not set 765# CONFIG_NEW_LEDS is not set
741# CONFIG_INFINIBAND is not set 766# CONFIG_INFINIBAND is not set
742# CONFIG_EDAC is not set 767# CONFIG_EDAC is not set
743CONFIG_RTC_LIB=y 768CONFIG_RTC_LIB=y
744CONFIG_RTC_CLASS=y 769CONFIG_RTC_CLASS=y
770
771#
772# Conflicting RTC option has been selected, check GEN_RTC and RTC
773#
745CONFIG_RTC_HCTOSYS=y 774CONFIG_RTC_HCTOSYS=y
746CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 775CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
747# CONFIG_RTC_DEBUG is not set 776# CONFIG_RTC_DEBUG is not set
@@ -768,6 +797,7 @@ CONFIG_RTC_DRV_DS1374=y
768# CONFIG_RTC_DRV_PCF8563 is not set 797# CONFIG_RTC_DRV_PCF8563 is not set
769# CONFIG_RTC_DRV_PCF8583 is not set 798# CONFIG_RTC_DRV_PCF8583 is not set
770# CONFIG_RTC_DRV_M41T80 is not set 799# CONFIG_RTC_DRV_M41T80 is not set
800# CONFIG_RTC_DRV_S35390A is not set
771 801
772# 802#
773# SPI RTC drivers 803# SPI RTC drivers
@@ -777,9 +807,10 @@ CONFIG_RTC_DRV_DS1374=y
777# Platform RTC drivers 807# Platform RTC drivers
778# 808#
779# CONFIG_RTC_DRV_CMOS is not set 809# CONFIG_RTC_DRV_CMOS is not set
810# CONFIG_RTC_DRV_DS1511 is not set
780# CONFIG_RTC_DRV_DS1553 is not set 811# CONFIG_RTC_DRV_DS1553 is not set
781# CONFIG_RTC_DRV_STK17TA8 is not set
782# CONFIG_RTC_DRV_DS1742 is not set 812# CONFIG_RTC_DRV_DS1742 is not set
813# CONFIG_RTC_DRV_STK17TA8 is not set
783# CONFIG_RTC_DRV_M48T86 is not set 814# CONFIG_RTC_DRV_M48T86 is not set
784# CONFIG_RTC_DRV_M48T59 is not set 815# CONFIG_RTC_DRV_M48T59 is not set
785# CONFIG_RTC_DRV_V3020 is not set 816# CONFIG_RTC_DRV_V3020 is not set
@@ -787,6 +818,7 @@ CONFIG_RTC_DRV_DS1374=y
787# 818#
788# on-CPU RTC drivers 819# on-CPU RTC drivers
789# 820#
821# CONFIG_DMADEVICES is not set
790 822
791# 823#
792# Userspace I/O 824# Userspace I/O
@@ -812,12 +844,10 @@ CONFIG_FS_MBCACHE=y
812# CONFIG_XFS_FS is not set 844# CONFIG_XFS_FS is not set
813# CONFIG_GFS2_FS is not set 845# CONFIG_GFS2_FS is not set
814# CONFIG_OCFS2_FS is not set 846# CONFIG_OCFS2_FS is not set
815# CONFIG_MINIX_FS is not set 847CONFIG_DNOTIFY=y
816# CONFIG_ROMFS_FS is not set
817CONFIG_INOTIFY=y 848CONFIG_INOTIFY=y
818CONFIG_INOTIFY_USER=y 849CONFIG_INOTIFY_USER=y
819# CONFIG_QUOTA is not set 850# CONFIG_QUOTA is not set
820CONFIG_DNOTIFY=y
821# CONFIG_AUTOFS_FS is not set 851# CONFIG_AUTOFS_FS is not set
822# CONFIG_AUTOFS4_FS is not set 852# CONFIG_AUTOFS4_FS is not set
823# CONFIG_FUSE_FS is not set 853# CONFIG_FUSE_FS is not set
@@ -859,8 +889,10 @@ CONFIG_TMPFS=y
859# CONFIG_EFS_FS is not set 889# CONFIG_EFS_FS is not set
860# CONFIG_CRAMFS is not set 890# CONFIG_CRAMFS is not set
861# CONFIG_VXFS_FS is not set 891# CONFIG_VXFS_FS is not set
892# CONFIG_MINIX_FS is not set
862# CONFIG_HPFS_FS is not set 893# CONFIG_HPFS_FS is not set
863# CONFIG_QNX4FS_FS is not set 894# CONFIG_QNX4FS_FS is not set
895# CONFIG_ROMFS_FS is not set
864# CONFIG_SYSV_FS is not set 896# CONFIG_SYSV_FS is not set
865# CONFIG_UFS_FS is not set 897# CONFIG_UFS_FS is not set
866CONFIG_NETWORK_FILESYSTEMS=y 898CONFIG_NETWORK_FILESYSTEMS=y
@@ -904,7 +936,6 @@ CONFIG_PARTITION_ADVANCED=y
904# CONFIG_SYSV68_PARTITION is not set 936# CONFIG_SYSV68_PARTITION is not set
905# CONFIG_NLS is not set 937# CONFIG_NLS is not set
906# CONFIG_DLM is not set 938# CONFIG_DLM is not set
907# CONFIG_UCC_SLOW is not set
908 939
909# 940#
910# Library routines 941# Library routines
@@ -920,7 +951,6 @@ CONFIG_PLIST=y
920CONFIG_HAS_IOMEM=y 951CONFIG_HAS_IOMEM=y
921CONFIG_HAS_IOPORT=y 952CONFIG_HAS_IOPORT=y
922CONFIG_HAS_DMA=y 953CONFIG_HAS_DMA=y
923# CONFIG_INSTRUMENTATION is not set
924 954
925# 955#
926# Kernel hacking 956# Kernel hacking
@@ -934,6 +964,7 @@ CONFIG_ENABLE_MUST_CHECK=y
934# CONFIG_HEADERS_CHECK is not set 964# CONFIG_HEADERS_CHECK is not set
935# CONFIG_DEBUG_KERNEL is not set 965# CONFIG_DEBUG_KERNEL is not set
936# CONFIG_SLUB_DEBUG_ON is not set 966# CONFIG_SLUB_DEBUG_ON is not set
967# CONFIG_SLUB_STATS is not set
937# CONFIG_DEBUG_BUGVERBOSE is not set 968# CONFIG_DEBUG_BUGVERBOSE is not set
938# CONFIG_SAMPLES is not set 969# CONFIG_SAMPLES is not set
939# CONFIG_PPC_EARLY_DEBUG is not set 970# CONFIG_PPC_EARLY_DEBUG is not set
@@ -947,6 +978,7 @@ CONFIG_ENABLE_MUST_CHECK=y
947CONFIG_CRYPTO=y 978CONFIG_CRYPTO=y
948CONFIG_CRYPTO_ALGAPI=y 979CONFIG_CRYPTO_ALGAPI=y
949CONFIG_CRYPTO_BLKCIPHER=y 980CONFIG_CRYPTO_BLKCIPHER=y
981# CONFIG_CRYPTO_SEQIV is not set
950CONFIG_CRYPTO_MANAGER=y 982CONFIG_CRYPTO_MANAGER=y
951# CONFIG_CRYPTO_HMAC is not set 983# CONFIG_CRYPTO_HMAC is not set
952# CONFIG_CRYPTO_XCBC is not set 984# CONFIG_CRYPTO_XCBC is not set
@@ -964,6 +996,9 @@ CONFIG_CRYPTO_CBC=y
964CONFIG_CRYPTO_PCBC=m 996CONFIG_CRYPTO_PCBC=m
965# CONFIG_CRYPTO_LRW is not set 997# CONFIG_CRYPTO_LRW is not set
966# CONFIG_CRYPTO_XTS is not set 998# CONFIG_CRYPTO_XTS is not set
999# CONFIG_CRYPTO_CTR is not set
1000# CONFIG_CRYPTO_GCM is not set
1001# CONFIG_CRYPTO_CCM is not set
967# CONFIG_CRYPTO_CRYPTD is not set 1002# CONFIG_CRYPTO_CRYPTD is not set
968CONFIG_CRYPTO_DES=y 1003CONFIG_CRYPTO_DES=y
969# CONFIG_CRYPTO_FCRYPT is not set 1004# CONFIG_CRYPTO_FCRYPT is not set
@@ -978,11 +1013,14 @@ CONFIG_CRYPTO_DES=y
978# CONFIG_CRYPTO_KHAZAD is not set 1013# CONFIG_CRYPTO_KHAZAD is not set
979# CONFIG_CRYPTO_ANUBIS is not set 1014# CONFIG_CRYPTO_ANUBIS is not set
980# CONFIG_CRYPTO_SEED is not set 1015# CONFIG_CRYPTO_SEED is not set
1016# CONFIG_CRYPTO_SALSA20 is not set
981# CONFIG_CRYPTO_DEFLATE is not set 1017# CONFIG_CRYPTO_DEFLATE is not set
982# CONFIG_CRYPTO_MICHAEL_MIC is not set 1018# CONFIG_CRYPTO_MICHAEL_MIC is not set
983# CONFIG_CRYPTO_CRC32C is not set 1019# CONFIG_CRYPTO_CRC32C is not set
984# CONFIG_CRYPTO_CAMELLIA is not set 1020# CONFIG_CRYPTO_CAMELLIA is not set
985# CONFIG_CRYPTO_TEST is not set 1021# CONFIG_CRYPTO_TEST is not set
986# CONFIG_CRYPTO_AUTHENC is not set 1022# CONFIG_CRYPTO_AUTHENC is not set
1023# CONFIG_CRYPTO_LZO is not set
987CONFIG_CRYPTO_HW=y 1024CONFIG_CRYPTO_HW=y
1025# CONFIG_CRYPTO_DEV_HIFN_795X is not set
988# CONFIG_PPC_CLOCK is not set 1026# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc836x_mds_defconfig b/arch/powerpc/configs/mpc836x_mds_defconfig
index c44fc56263e2..7c8b06046d5d 100644
--- a/arch/powerpc/configs/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/mpc836x_mds_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:43 2007 4# Mon Mar 24 08:48:21 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,8 +14,8 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_83xx=y
18CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
18# CONFIG_FSL_EMB_PERFMON is not set
19CONFIG_PPC_STD_MMU=y 19CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y 20CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -66,15 +67,19 @@ CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set 73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y
75# CONFIG_FAIR_GROUP_SCHED is not set 75# CONFIG_FAIR_GROUP_SCHED is not set
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
76CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
77# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
78CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
79CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -86,11 +91,13 @@ CONFIG_HOTPLUG=y
86CONFIG_PRINTK=y 91CONFIG_PRINTK=y
87CONFIG_BUG=y 92CONFIG_BUG=y
88CONFIG_ELF_CORE=y 93CONFIG_ELF_CORE=y
94CONFIG_COMPAT_BRK=y
89CONFIG_BASE_FULL=y 95CONFIG_BASE_FULL=y
90CONFIG_FUTEX=y 96CONFIG_FUTEX=y
91CONFIG_ANON_INODES=y 97CONFIG_ANON_INODES=y
92# CONFIG_EPOLL is not set 98# CONFIG_EPOLL is not set
93CONFIG_SIGNALFD=y 99CONFIG_SIGNALFD=y
100CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
95CONFIG_SHMEM=y 102CONFIG_SHMEM=y
96CONFIG_VM_EVENT_COUNTERS=y 103CONFIG_VM_EVENT_COUNTERS=y
@@ -98,6 +105,13 @@ CONFIG_SLUB_DEBUG=y
98# CONFIG_SLAB is not set 105# CONFIG_SLAB is not set
99CONFIG_SLUB=y 106CONFIG_SLUB=y
100# CONFIG_SLOB is not set 107# CONFIG_SLOB is not set
108# CONFIG_PROFILING is not set
109# CONFIG_MARKERS is not set
110CONFIG_HAVE_OPROFILE=y
111CONFIG_HAVE_KPROBES=y
112CONFIG_HAVE_KRETPROBES=y
113CONFIG_PROC_PAGE_MONITOR=y
114CONFIG_SLABINFO=y
101CONFIG_RT_MUTEXES=y 115CONFIG_RT_MUTEXES=y
102# CONFIG_TINY_SHMEM is not set 116# CONFIG_TINY_SHMEM is not set
103CONFIG_BASE_SMALL=0 117CONFIG_BASE_SMALL=0
@@ -125,6 +139,7 @@ CONFIG_DEFAULT_AS=y
125# CONFIG_DEFAULT_CFQ is not set 139# CONFIG_DEFAULT_CFQ is not set
126# CONFIG_DEFAULT_NOOP is not set 140# CONFIG_DEFAULT_NOOP is not set
127CONFIG_DEFAULT_IOSCHED="anticipatory" 141CONFIG_DEFAULT_IOSCHED="anticipatory"
142CONFIG_CLASSIC_RCU=y
128 143
129# 144#
130# Platform support 145# Platform support
@@ -133,18 +148,22 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
133# CONFIG_PPC_82xx is not set 148# CONFIG_PPC_82xx is not set
134CONFIG_PPC_83xx=y 149CONFIG_PPC_83xx=y
135# CONFIG_PPC_86xx is not set 150# CONFIG_PPC_86xx is not set
136# CONFIG_PPC_MPC52xx is not set 151# CONFIG_PPC_MPC512x is not set
137# CONFIG_PPC_MPC5200 is not set 152# CONFIG_PPC_MPC5121 is not set
138# CONFIG_PPC_CELL is not set 153# CONFIG_PPC_CELL is not set
139# CONFIG_PPC_CELL_NATIVE is not set 154# CONFIG_PPC_CELL_NATIVE is not set
140# CONFIG_PQ2ADS is not set 155# CONFIG_PQ2ADS is not set
141# CONFIG_MPC8313_RDB is not set 156CONFIG_MPC83xx=y
157# CONFIG_MPC831x_RDB is not set
142# CONFIG_MPC832x_MDS is not set 158# CONFIG_MPC832x_MDS is not set
143# CONFIG_MPC832x_RDB is not set 159# CONFIG_MPC832x_RDB is not set
144# CONFIG_MPC834x_MDS is not set 160# CONFIG_MPC834x_MDS is not set
145# CONFIG_MPC834x_ITX is not set 161# CONFIG_MPC834x_ITX is not set
146CONFIG_MPC836x_MDS=y 162CONFIG_MPC836x_MDS=y
147CONFIG_PPC_MPC836x=y 163# CONFIG_MPC837x_MDS is not set
164# CONFIG_MPC837x_RDB is not set
165# CONFIG_SBC834x is not set
166CONFIG_IPIC=y
148# CONFIG_MPIC is not set 167# CONFIG_MPIC is not set
149# CONFIG_MPIC_WEIRD is not set 168# CONFIG_MPIC_WEIRD is not set
150# CONFIG_PPC_I8259 is not set 169# CONFIG_PPC_I8259 is not set
@@ -156,7 +175,6 @@ CONFIG_PPC_MPC836x=y
156# CONFIG_GENERIC_IOMAP is not set 175# CONFIG_GENERIC_IOMAP is not set
157# CONFIG_CPU_FREQ is not set 176# CONFIG_CPU_FREQ is not set
158CONFIG_QUICC_ENGINE=y 177CONFIG_QUICC_ENGINE=y
159# CONFIG_CPM2 is not set
160# CONFIG_FSL_ULI1575 is not set 178# CONFIG_FSL_ULI1575 is not set
161 179
162# 180#
@@ -172,12 +190,16 @@ CONFIG_HZ_250=y
172# CONFIG_HZ_300 is not set 190# CONFIG_HZ_300 is not set
173# CONFIG_HZ_1000 is not set 191# CONFIG_HZ_1000 is not set
174CONFIG_HZ=250 192CONFIG_HZ=250
193# CONFIG_SCHED_HRTICK is not set
175CONFIG_PREEMPT_NONE=y 194CONFIG_PREEMPT_NONE=y
176# CONFIG_PREEMPT_VOLUNTARY is not set 195# CONFIG_PREEMPT_VOLUNTARY is not set
177# CONFIG_PREEMPT is not set 196# CONFIG_PREEMPT is not set
178CONFIG_BINFMT_ELF=y 197CONFIG_BINFMT_ELF=y
179# CONFIG_BINFMT_MISC is not set 198# CONFIG_BINFMT_MISC is not set
199# CONFIG_IOMMU_HELPER is not set
180CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 200CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
201CONFIG_ARCH_HAS_WALK_MEMORY=y
202CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
181CONFIG_ARCH_FLATMEM_ENABLE=y 203CONFIG_ARCH_FLATMEM_ENABLE=y
182CONFIG_ARCH_POPULATES_NODE_MAP=y 204CONFIG_ARCH_POPULATES_NODE_MAP=y
183CONFIG_SELECT_MEMORY_MODEL=y 205CONFIG_SELECT_MEMORY_MODEL=y
@@ -196,11 +218,7 @@ CONFIG_VIRT_TO_BUS=y
196CONFIG_PROC_DEVICETREE=y 218CONFIG_PROC_DEVICETREE=y
197# CONFIG_CMDLINE_BOOL is not set 219# CONFIG_CMDLINE_BOOL is not set
198# CONFIG_PM is not set 220# CONFIG_PM is not set
199CONFIG_SUSPEND_UP_POSSIBLE=y
200CONFIG_HIBERNATION_UP_POSSIBLE=y
201CONFIG_SECCOMP=y 221CONFIG_SECCOMP=y
202CONFIG_WANT_DEVICE_TREE=y
203CONFIG_DEVICE_TREE=""
204CONFIG_ISA_DMA_API=y 222CONFIG_ISA_DMA_API=y
205 223
206# 224#
@@ -249,6 +267,7 @@ CONFIG_XFRM=y
249# CONFIG_XFRM_USER is not set 267# CONFIG_XFRM_USER is not set
250# CONFIG_XFRM_SUB_POLICY is not set 268# CONFIG_XFRM_SUB_POLICY is not set
251# CONFIG_XFRM_MIGRATE is not set 269# CONFIG_XFRM_MIGRATE is not set
270# CONFIG_XFRM_STATISTICS is not set
252# CONFIG_NET_KEY is not set 271# CONFIG_NET_KEY is not set
253CONFIG_INET=y 272CONFIG_INET=y
254CONFIG_IP_MULTICAST=y 273CONFIG_IP_MULTICAST=y
@@ -304,6 +323,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
304# 323#
305# CONFIG_NET_PKTGEN is not set 324# CONFIG_NET_PKTGEN is not set
306# CONFIG_HAMRADIO is not set 325# CONFIG_HAMRADIO is not set
326# CONFIG_CAN is not set
307# CONFIG_IRDA is not set 327# CONFIG_IRDA is not set
308# CONFIG_BT is not set 328# CONFIG_BT is not set
309# CONFIG_AF_RXRPC is not set 329# CONFIG_AF_RXRPC is not set
@@ -348,7 +368,7 @@ CONFIG_BLK_DEV_LOOP=y
348CONFIG_BLK_DEV_RAM=y 368CONFIG_BLK_DEV_RAM=y
349CONFIG_BLK_DEV_RAM_COUNT=16 369CONFIG_BLK_DEV_RAM_COUNT=16
350CONFIG_BLK_DEV_RAM_SIZE=32768 370CONFIG_BLK_DEV_RAM_SIZE=32768
351CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 371# CONFIG_BLK_DEV_XIP is not set
352# CONFIG_CDROM_PKTCDVD is not set 372# CONFIG_CDROM_PKTCDVD is not set
353# CONFIG_ATA_OVER_ETH is not set 373# CONFIG_ATA_OVER_ETH is not set
354CONFIG_MISC_DEVICES=y 374CONFIG_MISC_DEVICES=y
@@ -356,6 +376,8 @@ CONFIG_MISC_DEVICES=y
356# CONFIG_EEPROM_93CX6 is not set 376# CONFIG_EEPROM_93CX6 is not set
357# CONFIG_SGI_IOC4 is not set 377# CONFIG_SGI_IOC4 is not set
358# CONFIG_TIFM_CORE is not set 378# CONFIG_TIFM_CORE is not set
379# CONFIG_ENCLOSURE_SERVICES is not set
380CONFIG_HAVE_IDE=y
359# CONFIG_IDE is not set 381# CONFIG_IDE is not set
360 382
361# 383#
@@ -420,6 +442,7 @@ CONFIG_SCSI_LOWLEVEL=y
420# CONFIG_SCSI_IPS is not set 442# CONFIG_SCSI_IPS is not set
421# CONFIG_SCSI_INITIO is not set 443# CONFIG_SCSI_INITIO is not set
422# CONFIG_SCSI_INIA100 is not set 444# CONFIG_SCSI_INIA100 is not set
445# CONFIG_SCSI_MVSAS is not set
423# CONFIG_SCSI_STEX is not set 446# CONFIG_SCSI_STEX is not set
424# CONFIG_SCSI_SYM53C8XX_2 is not set 447# CONFIG_SCSI_SYM53C8XX_2 is not set
425# CONFIG_SCSI_QLOGIC_1280 is not set 448# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -450,7 +473,6 @@ CONFIG_NETDEVICES=y
450# CONFIG_EQUALIZER is not set 473# CONFIG_EQUALIZER is not set
451# CONFIG_TUN is not set 474# CONFIG_TUN is not set
452# CONFIG_VETH is not set 475# CONFIG_VETH is not set
453# CONFIG_IP1000 is not set
454# CONFIG_ARCNET is not set 476# CONFIG_ARCNET is not set
455CONFIG_PHYLIB=y 477CONFIG_PHYLIB=y
456 478
@@ -466,6 +488,7 @@ CONFIG_MARVELL_PHY=y
466# CONFIG_SMSC_PHY is not set 488# CONFIG_SMSC_PHY is not set
467# CONFIG_BROADCOM_PHY is not set 489# CONFIG_BROADCOM_PHY is not set
468# CONFIG_ICPLUS_PHY is not set 490# CONFIG_ICPLUS_PHY is not set
491# CONFIG_REALTEK_PHY is not set
469# CONFIG_FIXED_PHY is not set 492# CONFIG_FIXED_PHY is not set
470# CONFIG_MDIO_BITBANG is not set 493# CONFIG_MDIO_BITBANG is not set
471CONFIG_NET_ETHERNET=y 494CONFIG_NET_ETHERNET=y
@@ -487,6 +510,9 @@ CONFIG_NETDEV_1000=y
487# CONFIG_DL2K is not set 510# CONFIG_DL2K is not set
488# CONFIG_E1000 is not set 511# CONFIG_E1000 is not set
489# CONFIG_E1000E is not set 512# CONFIG_E1000E is not set
513# CONFIG_E1000E_ENABLED is not set
514# CONFIG_IP1000 is not set
515# CONFIG_IGB is not set
490# CONFIG_NS83820 is not set 516# CONFIG_NS83820 is not set
491# CONFIG_HAMACHI is not set 517# CONFIG_HAMACHI is not set
492# CONFIG_YELLOWFIN is not set 518# CONFIG_YELLOWFIN is not set
@@ -517,6 +543,7 @@ CONFIG_NETDEV_10000=y
517# CONFIG_NIU is not set 543# CONFIG_NIU is not set
518# CONFIG_MLX4_CORE is not set 544# CONFIG_MLX4_CORE is not set
519# CONFIG_TEHUTI is not set 545# CONFIG_TEHUTI is not set
546# CONFIG_BNX2X is not set
520# CONFIG_TR is not set 547# CONFIG_TR is not set
521 548
522# 549#
@@ -530,7 +557,6 @@ CONFIG_NETDEV_10000=y
530# CONFIG_PPP is not set 557# CONFIG_PPP is not set
531# CONFIG_SLIP is not set 558# CONFIG_SLIP is not set
532# CONFIG_NET_FC is not set 559# CONFIG_NET_FC is not set
533# CONFIG_SHAPER is not set
534# CONFIG_NETCONSOLE is not set 560# CONFIG_NETCONSOLE is not set
535# CONFIG_NETPOLL is not set 561# CONFIG_NETPOLL is not set
536# CONFIG_NET_POLL_CONTROLLER is not set 562# CONFIG_NET_POLL_CONTROLLER is not set
@@ -573,6 +599,7 @@ CONFIG_INPUT=y
573# 599#
574# CONFIG_VT is not set 600# CONFIG_VT is not set
575# CONFIG_SERIAL_NONSTANDARD is not set 601# CONFIG_SERIAL_NONSTANDARD is not set
602# CONFIG_NOZOMI is not set
576 603
577# 604#
578# Serial drivers 605# Serial drivers
@@ -592,6 +619,7 @@ CONFIG_SERIAL_CORE=y
592CONFIG_SERIAL_CORE_CONSOLE=y 619CONFIG_SERIAL_CORE_CONSOLE=y
593# CONFIG_SERIAL_JSM is not set 620# CONFIG_SERIAL_JSM is not set
594# CONFIG_SERIAL_OF_PLATFORM is not set 621# CONFIG_SERIAL_OF_PLATFORM is not set
622# CONFIG_SERIAL_QE is not set
595CONFIG_UNIX98_PTYS=y 623CONFIG_UNIX98_PTYS=y
596CONFIG_LEGACY_PTYS=y 624CONFIG_LEGACY_PTYS=y
597CONFIG_LEGACY_PTY_COUNT=256 625CONFIG_LEGACY_PTY_COUNT=256
@@ -646,14 +674,12 @@ CONFIG_I2C_MPC=y
646# 674#
647# Miscellaneous I2C Chip support 675# Miscellaneous I2C Chip support
648# 676#
649# CONFIG_SENSORS_DS1337 is not set
650# CONFIG_SENSORS_DS1374 is not set
651# CONFIG_DS1682 is not set 677# CONFIG_DS1682 is not set
652# CONFIG_SENSORS_EEPROM is not set 678# CONFIG_SENSORS_EEPROM is not set
653# CONFIG_SENSORS_PCF8574 is not set 679# CONFIG_SENSORS_PCF8574 is not set
654# CONFIG_SENSORS_PCA9539 is not set 680# CONFIG_PCF8575 is not set
655# CONFIG_SENSORS_PCF8591 is not set 681# CONFIG_SENSORS_PCF8591 is not set
656# CONFIG_SENSORS_M41T00 is not set 682# CONFIG_TPS65010 is not set
657# CONFIG_SENSORS_MAX6875 is not set 683# CONFIG_SENSORS_MAX6875 is not set
658# CONFIG_SENSORS_TSL2550 is not set 684# CONFIG_SENSORS_TSL2550 is not set
659# CONFIG_I2C_DEBUG_CORE is not set 685# CONFIG_I2C_DEBUG_CORE is not set
@@ -678,6 +704,7 @@ CONFIG_HWMON=y
678# CONFIG_SENSORS_ADM1031 is not set 704# CONFIG_SENSORS_ADM1031 is not set
679# CONFIG_SENSORS_ADM9240 is not set 705# CONFIG_SENSORS_ADM9240 is not set
680# CONFIG_SENSORS_ADT7470 is not set 706# CONFIG_SENSORS_ADT7470 is not set
707# CONFIG_SENSORS_ADT7473 is not set
681# CONFIG_SENSORS_ATXP1 is not set 708# CONFIG_SENSORS_ATXP1 is not set
682# CONFIG_SENSORS_DS1621 is not set 709# CONFIG_SENSORS_DS1621 is not set
683# CONFIG_SENSORS_I5K_AMB is not set 710# CONFIG_SENSORS_I5K_AMB is not set
@@ -707,6 +734,7 @@ CONFIG_HWMON=y
707# CONFIG_SENSORS_SMSC47M1 is not set 734# CONFIG_SENSORS_SMSC47M1 is not set
708# CONFIG_SENSORS_SMSC47M192 is not set 735# CONFIG_SENSORS_SMSC47M192 is not set
709# CONFIG_SENSORS_SMSC47B397 is not set 736# CONFIG_SENSORS_SMSC47B397 is not set
737# CONFIG_SENSORS_ADS7828 is not set
710# CONFIG_SENSORS_THMC50 is not set 738# CONFIG_SENSORS_THMC50 is not set
711# CONFIG_SENSORS_VIA686A is not set 739# CONFIG_SENSORS_VIA686A is not set
712# CONFIG_SENSORS_VT1211 is not set 740# CONFIG_SENSORS_VT1211 is not set
@@ -716,9 +744,11 @@ CONFIG_HWMON=y
716# CONFIG_SENSORS_W83792D is not set 744# CONFIG_SENSORS_W83792D is not set
717# CONFIG_SENSORS_W83793 is not set 745# CONFIG_SENSORS_W83793 is not set
718# CONFIG_SENSORS_W83L785TS is not set 746# CONFIG_SENSORS_W83L785TS is not set
747# CONFIG_SENSORS_W83L786NG is not set
719# CONFIG_SENSORS_W83627HF is not set 748# CONFIG_SENSORS_W83627HF is not set
720# CONFIG_SENSORS_W83627EHF is not set 749# CONFIG_SENSORS_W83627EHF is not set
721# CONFIG_HWMON_DEBUG_CHIP is not set 750# CONFIG_HWMON_DEBUG_CHIP is not set
751# CONFIG_THERMAL is not set
722CONFIG_WATCHDOG=y 752CONFIG_WATCHDOG=y
723# CONFIG_WATCHDOG_NOWAYOUT is not set 753# CONFIG_WATCHDOG_NOWAYOUT is not set
724 754
@@ -784,17 +814,18 @@ CONFIG_USB_ARCH_HAS_EHCI=y
784# 814#
785# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 815# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
786# 816#
787
788#
789# USB Gadget Support
790#
791# CONFIG_USB_GADGET is not set 817# CONFIG_USB_GADGET is not set
792# CONFIG_MMC is not set 818# CONFIG_MMC is not set
819# CONFIG_MEMSTICK is not set
793# CONFIG_NEW_LEDS is not set 820# CONFIG_NEW_LEDS is not set
794# CONFIG_INFINIBAND is not set 821# CONFIG_INFINIBAND is not set
795# CONFIG_EDAC is not set 822# CONFIG_EDAC is not set
796CONFIG_RTC_LIB=y 823CONFIG_RTC_LIB=y
797CONFIG_RTC_CLASS=y 824CONFIG_RTC_CLASS=y
825
826#
827# Conflicting RTC option has been selected, check GEN_RTC and RTC
828#
798CONFIG_RTC_HCTOSYS=y 829CONFIG_RTC_HCTOSYS=y
799CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 830CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
800# CONFIG_RTC_DEBUG is not set 831# CONFIG_RTC_DEBUG is not set
@@ -821,6 +852,7 @@ CONFIG_RTC_DRV_DS1374=y
821# CONFIG_RTC_DRV_PCF8563 is not set 852# CONFIG_RTC_DRV_PCF8563 is not set
822# CONFIG_RTC_DRV_PCF8583 is not set 853# CONFIG_RTC_DRV_PCF8583 is not set
823# CONFIG_RTC_DRV_M41T80 is not set 854# CONFIG_RTC_DRV_M41T80 is not set
855# CONFIG_RTC_DRV_S35390A is not set
824 856
825# 857#
826# SPI RTC drivers 858# SPI RTC drivers
@@ -830,9 +862,10 @@ CONFIG_RTC_DRV_DS1374=y
830# Platform RTC drivers 862# Platform RTC drivers
831# 863#
832# CONFIG_RTC_DRV_CMOS is not set 864# CONFIG_RTC_DRV_CMOS is not set
865# CONFIG_RTC_DRV_DS1511 is not set
833# CONFIG_RTC_DRV_DS1553 is not set 866# CONFIG_RTC_DRV_DS1553 is not set
834# CONFIG_RTC_DRV_STK17TA8 is not set
835# CONFIG_RTC_DRV_DS1742 is not set 867# CONFIG_RTC_DRV_DS1742 is not set
868# CONFIG_RTC_DRV_STK17TA8 is not set
836# CONFIG_RTC_DRV_M48T86 is not set 869# CONFIG_RTC_DRV_M48T86 is not set
837# CONFIG_RTC_DRV_M48T59 is not set 870# CONFIG_RTC_DRV_M48T59 is not set
838# CONFIG_RTC_DRV_V3020 is not set 871# CONFIG_RTC_DRV_V3020 is not set
@@ -840,6 +873,7 @@ CONFIG_RTC_DRV_DS1374=y
840# 873#
841# on-CPU RTC drivers 874# on-CPU RTC drivers
842# 875#
876# CONFIG_DMADEVICES is not set
843 877
844# 878#
845# Userspace I/O 879# Userspace I/O
@@ -865,12 +899,10 @@ CONFIG_FS_MBCACHE=y
865# CONFIG_XFS_FS is not set 899# CONFIG_XFS_FS is not set
866# CONFIG_GFS2_FS is not set 900# CONFIG_GFS2_FS is not set
867# CONFIG_OCFS2_FS is not set 901# CONFIG_OCFS2_FS is not set
868# CONFIG_MINIX_FS is not set 902CONFIG_DNOTIFY=y
869# CONFIG_ROMFS_FS is not set
870CONFIG_INOTIFY=y 903CONFIG_INOTIFY=y
871CONFIG_INOTIFY_USER=y 904CONFIG_INOTIFY_USER=y
872# CONFIG_QUOTA is not set 905# CONFIG_QUOTA is not set
873CONFIG_DNOTIFY=y
874# CONFIG_AUTOFS_FS is not set 906# CONFIG_AUTOFS_FS is not set
875# CONFIG_AUTOFS4_FS is not set 907# CONFIG_AUTOFS4_FS is not set
876# CONFIG_FUSE_FS is not set 908# CONFIG_FUSE_FS is not set
@@ -912,8 +944,10 @@ CONFIG_TMPFS=y
912# CONFIG_EFS_FS is not set 944# CONFIG_EFS_FS is not set
913# CONFIG_CRAMFS is not set 945# CONFIG_CRAMFS is not set
914# CONFIG_VXFS_FS is not set 946# CONFIG_VXFS_FS is not set
947# CONFIG_MINIX_FS is not set
915# CONFIG_HPFS_FS is not set 948# CONFIG_HPFS_FS is not set
916# CONFIG_QNX4FS_FS is not set 949# CONFIG_QNX4FS_FS is not set
950# CONFIG_ROMFS_FS is not set
917# CONFIG_SYSV_FS is not set 951# CONFIG_SYSV_FS is not set
918# CONFIG_UFS_FS is not set 952# CONFIG_UFS_FS is not set
919CONFIG_NETWORK_FILESYSTEMS=y 953CONFIG_NETWORK_FILESYSTEMS=y
@@ -957,7 +991,6 @@ CONFIG_PARTITION_ADVANCED=y
957# CONFIG_SYSV68_PARTITION is not set 991# CONFIG_SYSV68_PARTITION is not set
958# CONFIG_NLS is not set 992# CONFIG_NLS is not set
959# CONFIG_DLM is not set 993# CONFIG_DLM is not set
960# CONFIG_UCC_SLOW is not set
961CONFIG_UCC_FAST=y 994CONFIG_UCC_FAST=y
962CONFIG_UCC=y 995CONFIG_UCC=y
963 996
@@ -975,7 +1008,6 @@ CONFIG_PLIST=y
975CONFIG_HAS_IOMEM=y 1008CONFIG_HAS_IOMEM=y
976CONFIG_HAS_IOPORT=y 1009CONFIG_HAS_IOPORT=y
977CONFIG_HAS_DMA=y 1010CONFIG_HAS_DMA=y
978# CONFIG_INSTRUMENTATION is not set
979 1011
980# 1012#
981# Kernel hacking 1013# Kernel hacking
@@ -989,6 +1021,7 @@ CONFIG_ENABLE_MUST_CHECK=y
989# CONFIG_HEADERS_CHECK is not set 1021# CONFIG_HEADERS_CHECK is not set
990# CONFIG_DEBUG_KERNEL is not set 1022# CONFIG_DEBUG_KERNEL is not set
991# CONFIG_SLUB_DEBUG_ON is not set 1023# CONFIG_SLUB_DEBUG_ON is not set
1024# CONFIG_SLUB_STATS is not set
992# CONFIG_DEBUG_BUGVERBOSE is not set 1025# CONFIG_DEBUG_BUGVERBOSE is not set
993# CONFIG_SAMPLES is not set 1026# CONFIG_SAMPLES is not set
994# CONFIG_PPC_EARLY_DEBUG is not set 1027# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1002,6 +1035,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1002CONFIG_CRYPTO=y 1035CONFIG_CRYPTO=y
1003CONFIG_CRYPTO_ALGAPI=y 1036CONFIG_CRYPTO_ALGAPI=y
1004CONFIG_CRYPTO_BLKCIPHER=y 1037CONFIG_CRYPTO_BLKCIPHER=y
1038# CONFIG_CRYPTO_SEQIV is not set
1005CONFIG_CRYPTO_MANAGER=y 1039CONFIG_CRYPTO_MANAGER=y
1006# CONFIG_CRYPTO_HMAC is not set 1040# CONFIG_CRYPTO_HMAC is not set
1007# CONFIG_CRYPTO_XCBC is not set 1041# CONFIG_CRYPTO_XCBC is not set
@@ -1019,6 +1053,9 @@ CONFIG_CRYPTO_CBC=y
1019CONFIG_CRYPTO_PCBC=m 1053CONFIG_CRYPTO_PCBC=m
1020# CONFIG_CRYPTO_LRW is not set 1054# CONFIG_CRYPTO_LRW is not set
1021# CONFIG_CRYPTO_XTS is not set 1055# CONFIG_CRYPTO_XTS is not set
1056# CONFIG_CRYPTO_CTR is not set
1057# CONFIG_CRYPTO_GCM is not set
1058# CONFIG_CRYPTO_CCM is not set
1022# CONFIG_CRYPTO_CRYPTD is not set 1059# CONFIG_CRYPTO_CRYPTD is not set
1023CONFIG_CRYPTO_DES=y 1060CONFIG_CRYPTO_DES=y
1024# CONFIG_CRYPTO_FCRYPT is not set 1061# CONFIG_CRYPTO_FCRYPT is not set
@@ -1033,12 +1070,15 @@ CONFIG_CRYPTO_DES=y
1033# CONFIG_CRYPTO_KHAZAD is not set 1070# CONFIG_CRYPTO_KHAZAD is not set
1034# CONFIG_CRYPTO_ANUBIS is not set 1071# CONFIG_CRYPTO_ANUBIS is not set
1035# CONFIG_CRYPTO_SEED is not set 1072# CONFIG_CRYPTO_SEED is not set
1073# CONFIG_CRYPTO_SALSA20 is not set
1036# CONFIG_CRYPTO_DEFLATE is not set 1074# CONFIG_CRYPTO_DEFLATE is not set
1037# CONFIG_CRYPTO_MICHAEL_MIC is not set 1075# CONFIG_CRYPTO_MICHAEL_MIC is not set
1038# CONFIG_CRYPTO_CRC32C is not set 1076# CONFIG_CRYPTO_CRC32C is not set
1039# CONFIG_CRYPTO_CAMELLIA is not set 1077# CONFIG_CRYPTO_CAMELLIA is not set
1040# CONFIG_CRYPTO_TEST is not set 1078# CONFIG_CRYPTO_TEST is not set
1041# CONFIG_CRYPTO_AUTHENC is not set 1079# CONFIG_CRYPTO_AUTHENC is not set
1080# CONFIG_CRYPTO_LZO is not set
1042CONFIG_CRYPTO_HW=y 1081CONFIG_CRYPTO_HW=y
1082# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1043# CONFIG_PPC_CLOCK is not set 1083# CONFIG_PPC_CLOCK is not set
1044CONFIG_PPC_LIB_RHEAP=y 1084CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc837x_mds_defconfig b/arch/powerpc/configs/mpc837x_mds_defconfig
index 4f49aee5da66..f377cde785b0 100644
--- a/arch/powerpc/configs/mpc837x_mds_defconfig
+++ b/arch/powerpc/configs/mpc837x_mds_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.23 3# Linux kernel version: 2.6.25-rc6
4# Wed Oct 10 16:31:39 2007 4# Mon Mar 24 08:48:23 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,16 +14,22 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_83xx=y
18CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
18# CONFIG_FSL_EMB_PERFMON is not set
19CONFIG_PPC_STD_MMU=y 19CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y 20CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
24CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
25CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
26CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
27CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
28CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
29CONFIG_ARCH_HAS_ILOG2_U32=y 35CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -61,12 +67,19 @@ CONFIG_SYSVIPC_SYSCTL=y
61# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
62# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
64# CONFIG_USER_NS is not set
65# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
67CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y
75CONFIG_FAIR_GROUP_SCHED=y
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
68CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
69# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
70CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
71CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
72# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -79,17 +92,27 @@ CONFIG_HOTPLUG=y
79CONFIG_PRINTK=y 92CONFIG_PRINTK=y
80CONFIG_BUG=y 93CONFIG_BUG=y
81CONFIG_ELF_CORE=y 94CONFIG_ELF_CORE=y
95CONFIG_COMPAT_BRK=y
82CONFIG_BASE_FULL=y 96CONFIG_BASE_FULL=y
83CONFIG_FUTEX=y 97CONFIG_FUTEX=y
84CONFIG_ANON_INODES=y 98CONFIG_ANON_INODES=y
85# CONFIG_EPOLL is not set 99# CONFIG_EPOLL is not set
86CONFIG_SIGNALFD=y 100CONFIG_SIGNALFD=y
101CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 103CONFIG_SHMEM=y
89CONFIG_VM_EVENT_COUNTERS=y 104CONFIG_VM_EVENT_COUNTERS=y
90CONFIG_SLAB=y 105CONFIG_SLAB=y
91# CONFIG_SLUB is not set 106# CONFIG_SLUB is not set
92# CONFIG_SLOB is not set 107# CONFIG_SLOB is not set
108# CONFIG_PROFILING is not set
109# CONFIG_MARKERS is not set
110CONFIG_HAVE_OPROFILE=y
111# CONFIG_KPROBES is not set
112CONFIG_HAVE_KPROBES=y
113CONFIG_HAVE_KRETPROBES=y
114CONFIG_PROC_PAGE_MONITOR=y
115CONFIG_SLABINFO=y
93CONFIG_RT_MUTEXES=y 116CONFIG_RT_MUTEXES=y
94# CONFIG_TINY_SHMEM is not set 117# CONFIG_TINY_SHMEM is not set
95CONFIG_BASE_SMALL=0 118CONFIG_BASE_SMALL=0
@@ -117,28 +140,32 @@ CONFIG_DEFAULT_AS=y
117# CONFIG_DEFAULT_CFQ is not set 140# CONFIG_DEFAULT_CFQ is not set
118# CONFIG_DEFAULT_NOOP is not set 141# CONFIG_DEFAULT_NOOP is not set
119CONFIG_DEFAULT_IOSCHED="anticipatory" 142CONFIG_DEFAULT_IOSCHED="anticipatory"
143CONFIG_CLASSIC_RCU=y
120 144
121# 145#
122# Platform support 146# Platform support
123# 147#
124# CONFIG_PPC_MULTIPLATFORM is not set 148# CONFIG_PPC_MULTIPLATFORM is not set
125# CONFIG_EMBEDDED6xx is not set
126# CONFIG_PPC_82xx is not set 149# CONFIG_PPC_82xx is not set
127CONFIG_PPC_83xx=y 150CONFIG_PPC_83xx=y
128# CONFIG_PPC_86xx is not set 151# CONFIG_PPC_86xx is not set
129# CONFIG_PPC_MPC52xx is not set 152# CONFIG_PPC_MPC512x is not set
130# CONFIG_PPC_MPC5200 is not set 153# CONFIG_PPC_MPC5121 is not set
131# CONFIG_PPC_CELL is not set 154# CONFIG_PPC_CELL is not set
132# CONFIG_PPC_CELL_NATIVE is not set 155# CONFIG_PPC_CELL_NATIVE is not set
133# CONFIG_PQ2ADS is not set 156# CONFIG_PQ2ADS is not set
134# CONFIG_MPC8313_RDB is not set 157CONFIG_MPC83xx=y
158# CONFIG_MPC831x_RDB is not set
135# CONFIG_MPC832x_MDS is not set 159# CONFIG_MPC832x_MDS is not set
136# CONFIG_MPC832x_RDB is not set 160# CONFIG_MPC832x_RDB is not set
137# CONFIG_MPC834x_MDS is not set 161# CONFIG_MPC834x_MDS is not set
138# CONFIG_MPC834x_ITX is not set 162# CONFIG_MPC834x_ITX is not set
139# CONFIG_MPC836x_MDS is not set 163# CONFIG_MPC836x_MDS is not set
140CONFIG_MPC837x_MDS=y 164CONFIG_MPC837x_MDS=y
165# CONFIG_MPC837x_RDB is not set
166# CONFIG_SBC834x is not set
141CONFIG_PPC_MPC837x=y 167CONFIG_PPC_MPC837x=y
168CONFIG_IPIC=y
142# CONFIG_MPIC is not set 169# CONFIG_MPIC is not set
143# CONFIG_MPIC_WEIRD is not set 170# CONFIG_MPIC_WEIRD is not set
144# CONFIG_PPC_I8259 is not set 171# CONFIG_PPC_I8259 is not set
@@ -149,25 +176,31 @@ CONFIG_PPC_MPC837x=y
149# CONFIG_PPC_INDIRECT_IO is not set 176# CONFIG_PPC_INDIRECT_IO is not set
150# CONFIG_GENERIC_IOMAP is not set 177# CONFIG_GENERIC_IOMAP is not set
151# CONFIG_CPU_FREQ is not set 178# CONFIG_CPU_FREQ is not set
152# CONFIG_CPM2 is not set
153# CONFIG_FSL_ULI1575 is not set 179# CONFIG_FSL_ULI1575 is not set
154CONFIG_FSL_SERDES=y
155 180
156# 181#
157# Kernel options 182# Kernel options
158# 183#
159# CONFIG_HIGHMEM is not set 184# CONFIG_HIGHMEM is not set
185# CONFIG_TICK_ONESHOT is not set
186# CONFIG_NO_HZ is not set
187# CONFIG_HIGH_RES_TIMERS is not set
188CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
160# CONFIG_HZ_100 is not set 189# CONFIG_HZ_100 is not set
161CONFIG_HZ_250=y 190CONFIG_HZ_250=y
162# CONFIG_HZ_300 is not set 191# CONFIG_HZ_300 is not set
163# CONFIG_HZ_1000 is not set 192# CONFIG_HZ_1000 is not set
164CONFIG_HZ=250 193CONFIG_HZ=250
194# CONFIG_SCHED_HRTICK is not set
165CONFIG_PREEMPT_NONE=y 195CONFIG_PREEMPT_NONE=y
166# CONFIG_PREEMPT_VOLUNTARY is not set 196# CONFIG_PREEMPT_VOLUNTARY is not set
167# CONFIG_PREEMPT is not set 197# CONFIG_PREEMPT is not set
168CONFIG_BINFMT_ELF=y 198CONFIG_BINFMT_ELF=y
169# CONFIG_BINFMT_MISC is not set 199# CONFIG_BINFMT_MISC is not set
200# CONFIG_IOMMU_HELPER is not set
170CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 201CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
202CONFIG_ARCH_HAS_WALK_MEMORY=y
203CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
171CONFIG_ARCH_FLATMEM_ENABLE=y 204CONFIG_ARCH_FLATMEM_ENABLE=y
172CONFIG_ARCH_POPULATES_NODE_MAP=y 205CONFIG_ARCH_POPULATES_NODE_MAP=y
173CONFIG_SELECT_MEMORY_MODEL=y 206CONFIG_SELECT_MEMORY_MODEL=y
@@ -177,6 +210,7 @@ CONFIG_FLATMEM_MANUAL=y
177CONFIG_FLATMEM=y 210CONFIG_FLATMEM=y
178CONFIG_FLAT_NODE_MEM_MAP=y 211CONFIG_FLAT_NODE_MEM_MAP=y
179# CONFIG_SPARSEMEM_STATIC is not set 212# CONFIG_SPARSEMEM_STATIC is not set
213# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
180CONFIG_SPLIT_PTLOCK_CPUS=4 214CONFIG_SPLIT_PTLOCK_CPUS=4
181# CONFIG_RESOURCES_64BIT is not set 215# CONFIG_RESOURCES_64BIT is not set
182CONFIG_ZONE_DMA_FLAG=1 216CONFIG_ZONE_DMA_FLAG=1
@@ -185,11 +219,7 @@ CONFIG_VIRT_TO_BUS=y
185CONFIG_PROC_DEVICETREE=y 219CONFIG_PROC_DEVICETREE=y
186# CONFIG_CMDLINE_BOOL is not set 220# CONFIG_CMDLINE_BOOL is not set
187# CONFIG_PM is not set 221# CONFIG_PM is not set
188CONFIG_SUSPEND_UP_POSSIBLE=y
189CONFIG_HIBERNATION_UP_POSSIBLE=y
190CONFIG_SECCOMP=y 222CONFIG_SECCOMP=y
191CONFIG_WANT_DEVICE_TREE=y
192CONFIG_DEVICE_TREE=""
193CONFIG_ISA_DMA_API=y 223CONFIG_ISA_DMA_API=y
194 224
195# 225#
@@ -203,10 +233,6 @@ CONFIG_FSL_SOC=y
203# CONFIG_PCI_DOMAINS is not set 233# CONFIG_PCI_DOMAINS is not set
204# CONFIG_PCI_SYSCALL is not set 234# CONFIG_PCI_SYSCALL is not set
205# CONFIG_ARCH_SUPPORTS_MSI is not set 235# CONFIG_ARCH_SUPPORTS_MSI is not set
206
207#
208# PCCARD (PCMCIA/CardBus) support
209#
210# CONFIG_PCCARD is not set 236# CONFIG_PCCARD is not set
211 237
212# 238#
@@ -220,7 +246,7 @@ CONFIG_FSL_SOC=y
220CONFIG_HIGHMEM_START=0xfe000000 246CONFIG_HIGHMEM_START=0xfe000000
221CONFIG_LOWMEM_SIZE=0x30000000 247CONFIG_LOWMEM_SIZE=0x30000000
222CONFIG_KERNEL_START=0xc0000000 248CONFIG_KERNEL_START=0xc0000000
223CONFIG_TASK_SIZE=0x80000000 249CONFIG_TASK_SIZE=0xc0000000
224CONFIG_BOOT_LOAD=0x00800000 250CONFIG_BOOT_LOAD=0x00800000
225 251
226# 252#
@@ -238,6 +264,7 @@ CONFIG_XFRM=y
238CONFIG_XFRM_USER=m 264CONFIG_XFRM_USER=m
239# CONFIG_XFRM_SUB_POLICY is not set 265# CONFIG_XFRM_SUB_POLICY is not set
240# CONFIG_XFRM_MIGRATE is not set 266# CONFIG_XFRM_MIGRATE is not set
267# CONFIG_XFRM_STATISTICS is not set
241# CONFIG_NET_KEY is not set 268# CONFIG_NET_KEY is not set
242CONFIG_INET=y 269CONFIG_INET=y
243CONFIG_IP_MULTICAST=y 270CONFIG_IP_MULTICAST=y
@@ -260,6 +287,7 @@ CONFIG_SYN_COOKIES=y
260CONFIG_INET_XFRM_MODE_TRANSPORT=y 287CONFIG_INET_XFRM_MODE_TRANSPORT=y
261CONFIG_INET_XFRM_MODE_TUNNEL=y 288CONFIG_INET_XFRM_MODE_TUNNEL=y
262CONFIG_INET_XFRM_MODE_BEET=y 289CONFIG_INET_XFRM_MODE_BEET=y
290# CONFIG_INET_LRO is not set
263CONFIG_INET_DIAG=y 291CONFIG_INET_DIAG=y
264CONFIG_INET_TCP_DIAG=y 292CONFIG_INET_TCP_DIAG=y
265# CONFIG_TCP_CONG_ADVANCED is not set 293# CONFIG_TCP_CONG_ADVANCED is not set
@@ -285,10 +313,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
285# CONFIG_LAPB is not set 313# CONFIG_LAPB is not set
286# CONFIG_ECONET is not set 314# CONFIG_ECONET is not set
287# CONFIG_WAN_ROUTER is not set 315# CONFIG_WAN_ROUTER is not set
288
289#
290# QoS and/or fair queueing
291#
292# CONFIG_NET_SCHED is not set 316# CONFIG_NET_SCHED is not set
293 317
294# 318#
@@ -296,6 +320,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
296# 320#
297# CONFIG_NET_PKTGEN is not set 321# CONFIG_NET_PKTGEN is not set
298# CONFIG_HAMRADIO is not set 322# CONFIG_HAMRADIO is not set
323# CONFIG_CAN is not set
299# CONFIG_IRDA is not set 324# CONFIG_IRDA is not set
300# CONFIG_BT is not set 325# CONFIG_BT is not set
301# CONFIG_AF_RXRPC is not set 326# CONFIG_AF_RXRPC is not set
@@ -317,6 +342,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
317# 342#
318# Generic Driver Options 343# Generic Driver Options
319# 344#
345CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
320CONFIG_STANDALONE=y 346CONFIG_STANDALONE=y
321CONFIG_PREVENT_FIRMWARE_BUILD=y 347CONFIG_PREVENT_FIRMWARE_BUILD=y
322# CONFIG_FW_LOADER is not set 348# CONFIG_FW_LOADER is not set
@@ -334,11 +360,13 @@ CONFIG_BLK_DEV_LOOP=y
334CONFIG_BLK_DEV_RAM=y 360CONFIG_BLK_DEV_RAM=y
335CONFIG_BLK_DEV_RAM_COUNT=16 361CONFIG_BLK_DEV_RAM_COUNT=16
336CONFIG_BLK_DEV_RAM_SIZE=32768 362CONFIG_BLK_DEV_RAM_SIZE=32768
337CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 363# CONFIG_BLK_DEV_XIP is not set
338# CONFIG_CDROM_PKTCDVD is not set 364# CONFIG_CDROM_PKTCDVD is not set
339# CONFIG_ATA_OVER_ETH is not set 365# CONFIG_ATA_OVER_ETH is not set
340CONFIG_MISC_DEVICES=y 366CONFIG_MISC_DEVICES=y
341# CONFIG_EEPROM_93CX6 is not set 367# CONFIG_EEPROM_93CX6 is not set
368# CONFIG_ENCLOSURE_SERVICES is not set
369CONFIG_HAVE_IDE=y
342# CONFIG_IDE is not set 370# CONFIG_IDE is not set
343 371
344# 372#
@@ -377,11 +405,13 @@ CONFIG_SCSI_WAIT_SCAN=m
377# CONFIG_SCSI_FC_ATTRS is not set 405# CONFIG_SCSI_FC_ATTRS is not set
378# CONFIG_SCSI_ISCSI_ATTRS is not set 406# CONFIG_SCSI_ISCSI_ATTRS is not set
379# CONFIG_SCSI_SAS_LIBSAS is not set 407# CONFIG_SCSI_SAS_LIBSAS is not set
408# CONFIG_SCSI_SRP_ATTRS is not set
380CONFIG_SCSI_LOWLEVEL=y 409CONFIG_SCSI_LOWLEVEL=y
381# CONFIG_ISCSI_TCP is not set 410# CONFIG_ISCSI_TCP is not set
382# CONFIG_SCSI_DEBUG is not set 411# CONFIG_SCSI_DEBUG is not set
383CONFIG_ATA=y 412CONFIG_ATA=y
384# CONFIG_ATA_NONSTANDARD is not set 413# CONFIG_ATA_NONSTANDARD is not set
414# CONFIG_SATA_MV is not set
385CONFIG_SATA_FSL=y 415CONFIG_SATA_FSL=y
386# CONFIG_PATA_PLATFORM is not set 416# CONFIG_PATA_PLATFORM is not set
387# CONFIG_MD is not set 417# CONFIG_MD is not set
@@ -393,6 +423,7 @@ CONFIG_NETDEVICES=y
393# CONFIG_MACVLAN is not set 423# CONFIG_MACVLAN is not set
394# CONFIG_EQUALIZER is not set 424# CONFIG_EQUALIZER is not set
395# CONFIG_TUN is not set 425# CONFIG_TUN is not set
426# CONFIG_VETH is not set
396CONFIG_PHYLIB=y 427CONFIG_PHYLIB=y
397 428
398# 429#
@@ -407,10 +438,18 @@ CONFIG_MARVELL_PHY=y
407# CONFIG_SMSC_PHY is not set 438# CONFIG_SMSC_PHY is not set
408# CONFIG_BROADCOM_PHY is not set 439# CONFIG_BROADCOM_PHY is not set
409# CONFIG_ICPLUS_PHY is not set 440# CONFIG_ICPLUS_PHY is not set
441# CONFIG_REALTEK_PHY is not set
410# CONFIG_FIXED_PHY is not set 442# CONFIG_FIXED_PHY is not set
443# CONFIG_MDIO_BITBANG is not set
411CONFIG_NET_ETHERNET=y 444CONFIG_NET_ETHERNET=y
412CONFIG_MII=y 445CONFIG_MII=y
446# CONFIG_IBM_NEW_EMAC_ZMII is not set
447# CONFIG_IBM_NEW_EMAC_RGMII is not set
448# CONFIG_IBM_NEW_EMAC_TAH is not set
449# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
450# CONFIG_B44 is not set
413CONFIG_NETDEV_1000=y 451CONFIG_NETDEV_1000=y
452# CONFIG_E1000E_ENABLED is not set
414CONFIG_GIANFAR=y 453CONFIG_GIANFAR=y
415# CONFIG_GFAR_NAPI is not set 454# CONFIG_GFAR_NAPI is not set
416CONFIG_NETDEV_10000=y 455CONFIG_NETDEV_10000=y
@@ -423,7 +462,6 @@ CONFIG_NETDEV_10000=y
423# CONFIG_WAN is not set 462# CONFIG_WAN is not set
424# CONFIG_PPP is not set 463# CONFIG_PPP is not set
425# CONFIG_SLIP is not set 464# CONFIG_SLIP is not set
426# CONFIG_SHAPER is not set
427# CONFIG_NETCONSOLE is not set 465# CONFIG_NETCONSOLE is not set
428# CONFIG_NETPOLL is not set 466# CONFIG_NETPOLL is not set
429# CONFIG_NET_POLL_CONTROLLER is not set 467# CONFIG_NET_POLL_CONTROLLER is not set
@@ -442,7 +480,6 @@ CONFIG_INPUT=y
442# 480#
443# CONFIG_INPUT_MOUSEDEV is not set 481# CONFIG_INPUT_MOUSEDEV is not set
444# CONFIG_INPUT_JOYDEV is not set 482# CONFIG_INPUT_JOYDEV is not set
445# CONFIG_INPUT_TSDEV is not set
446# CONFIG_INPUT_EVDEV is not set 483# CONFIG_INPUT_EVDEV is not set
447# CONFIG_INPUT_EVBUG is not set 484# CONFIG_INPUT_EVBUG is not set
448 485
@@ -488,14 +525,6 @@ CONFIG_UNIX98_PTYS=y
488CONFIG_LEGACY_PTYS=y 525CONFIG_LEGACY_PTYS=y
489CONFIG_LEGACY_PTY_COUNT=256 526CONFIG_LEGACY_PTY_COUNT=256
490# CONFIG_IPMI_HANDLER is not set 527# CONFIG_IPMI_HANDLER is not set
491CONFIG_WATCHDOG=y
492# CONFIG_WATCHDOG_NOWAYOUT is not set
493
494#
495# Watchdog Device Drivers
496#
497# CONFIG_SOFT_WATCHDOG is not set
498CONFIG_83xx_WDT=y
499# CONFIG_HW_RANDOM is not set 528# CONFIG_HW_RANDOM is not set
500# CONFIG_NVRAM is not set 529# CONFIG_NVRAM is not set
501CONFIG_GEN_RTC=y 530CONFIG_GEN_RTC=y
@@ -527,14 +556,12 @@ CONFIG_I2C_MPC=y
527# 556#
528# Miscellaneous I2C Chip support 557# Miscellaneous I2C Chip support
529# 558#
530# CONFIG_SENSORS_DS1337 is not set
531# CONFIG_SENSORS_DS1374 is not set
532# CONFIG_DS1682 is not set 559# CONFIG_DS1682 is not set
533# CONFIG_SENSORS_EEPROM is not set 560# CONFIG_SENSORS_EEPROM is not set
534# CONFIG_SENSORS_PCF8574 is not set 561# CONFIG_SENSORS_PCF8574 is not set
535# CONFIG_SENSORS_PCA9539 is not set 562# CONFIG_PCF8575 is not set
536# CONFIG_SENSORS_PCF8591 is not set 563# CONFIG_SENSORS_PCF8591 is not set
537# CONFIG_SENSORS_M41T00 is not set 564# CONFIG_TPS65010 is not set
538# CONFIG_SENSORS_MAX6875 is not set 565# CONFIG_SENSORS_MAX6875 is not set
539# CONFIG_SENSORS_TSL2550 is not set 566# CONFIG_SENSORS_TSL2550 is not set
540# CONFIG_I2C_DEBUG_CORE is not set 567# CONFIG_I2C_DEBUG_CORE is not set
@@ -551,8 +578,6 @@ CONFIG_I2C_MPC=y
551# CONFIG_POWER_SUPPLY is not set 578# CONFIG_POWER_SUPPLY is not set
552CONFIG_HWMON=y 579CONFIG_HWMON=y
553# CONFIG_HWMON_VID is not set 580# CONFIG_HWMON_VID is not set
554# CONFIG_SENSORS_ABITUGURU is not set
555# CONFIG_SENSORS_ABITUGURU3 is not set
556# CONFIG_SENSORS_AD7418 is not set 581# CONFIG_SENSORS_AD7418 is not set
557# CONFIG_SENSORS_ADM1021 is not set 582# CONFIG_SENSORS_ADM1021 is not set
558# CONFIG_SENSORS_ADM1025 is not set 583# CONFIG_SENSORS_ADM1025 is not set
@@ -560,12 +585,13 @@ CONFIG_HWMON=y
560# CONFIG_SENSORS_ADM1029 is not set 585# CONFIG_SENSORS_ADM1029 is not set
561# CONFIG_SENSORS_ADM1031 is not set 586# CONFIG_SENSORS_ADM1031 is not set
562# CONFIG_SENSORS_ADM9240 is not set 587# CONFIG_SENSORS_ADM9240 is not set
563# CONFIG_SENSORS_ASB100 is not set 588# CONFIG_SENSORS_ADT7470 is not set
589# CONFIG_SENSORS_ADT7473 is not set
564# CONFIG_SENSORS_ATXP1 is not set 590# CONFIG_SENSORS_ATXP1 is not set
565# CONFIG_SENSORS_DS1621 is not set 591# CONFIG_SENSORS_DS1621 is not set
566# CONFIG_SENSORS_F71805F is not set 592# CONFIG_SENSORS_F71805F is not set
567# CONFIG_SENSORS_FSCHER is not set 593# CONFIG_SENSORS_F71882FG is not set
568# CONFIG_SENSORS_FSCPOS is not set 594# CONFIG_SENSORS_F75375S is not set
569# CONFIG_SENSORS_GL518SM is not set 595# CONFIG_SENSORS_GL518SM is not set
570# CONFIG_SENSORS_GL520SM is not set 596# CONFIG_SENSORS_GL520SM is not set
571# CONFIG_SENSORS_IT87 is not set 597# CONFIG_SENSORS_IT87 is not set
@@ -588,6 +614,7 @@ CONFIG_HWMON=y
588# CONFIG_SENSORS_SMSC47M1 is not set 614# CONFIG_SENSORS_SMSC47M1 is not set
589# CONFIG_SENSORS_SMSC47M192 is not set 615# CONFIG_SENSORS_SMSC47M192 is not set
590# CONFIG_SENSORS_SMSC47B397 is not set 616# CONFIG_SENSORS_SMSC47B397 is not set
617# CONFIG_SENSORS_ADS7828 is not set
591# CONFIG_SENSORS_THMC50 is not set 618# CONFIG_SENSORS_THMC50 is not set
592# CONFIG_SENSORS_VT1211 is not set 619# CONFIG_SENSORS_VT1211 is not set
593# CONFIG_SENSORS_W83781D is not set 620# CONFIG_SENSORS_W83781D is not set
@@ -595,9 +622,25 @@ CONFIG_HWMON=y
595# CONFIG_SENSORS_W83792D is not set 622# CONFIG_SENSORS_W83792D is not set
596# CONFIG_SENSORS_W83793 is not set 623# CONFIG_SENSORS_W83793 is not set
597# CONFIG_SENSORS_W83L785TS is not set 624# CONFIG_SENSORS_W83L785TS is not set
625# CONFIG_SENSORS_W83L786NG is not set
598# CONFIG_SENSORS_W83627HF is not set 626# CONFIG_SENSORS_W83627HF is not set
599# CONFIG_SENSORS_W83627EHF is not set 627# CONFIG_SENSORS_W83627EHF is not set
600# CONFIG_HWMON_DEBUG_CHIP is not set 628# CONFIG_HWMON_DEBUG_CHIP is not set
629# CONFIG_THERMAL is not set
630CONFIG_WATCHDOG=y
631# CONFIG_WATCHDOG_NOWAYOUT is not set
632
633#
634# Watchdog Device Drivers
635#
636# CONFIG_SOFT_WATCHDOG is not set
637CONFIG_83xx_WDT=y
638
639#
640# Sonics Silicon Backplane
641#
642CONFIG_SSB_POSSIBLE=y
643# CONFIG_SSB is not set
601 644
602# 645#
603# Multifunction device drivers 646# Multifunction device drivers
@@ -614,16 +657,15 @@ CONFIG_DAB=y
614# 657#
615# Graphics support 658# Graphics support
616# 659#
660# CONFIG_VGASTATE is not set
661CONFIG_VIDEO_OUTPUT_CONTROL=m
662# CONFIG_FB is not set
617# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 663# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
618 664
619# 665#
620# Display device support 666# Display device support
621# 667#
622# CONFIG_DISPLAY_SUPPORT is not set 668# CONFIG_DISPLAY_SUPPORT is not set
623# CONFIG_VGASTATE is not set
624CONFIG_VIDEO_OUTPUT_CONTROL=m
625# CONFIG_FB is not set
626# CONFIG_FB_IBM_GXT4500 is not set
627 669
628# 670#
629# Sound 671# Sound
@@ -632,6 +674,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
632CONFIG_HID_SUPPORT=y 674CONFIG_HID_SUPPORT=y
633CONFIG_HID=y 675CONFIG_HID=y
634# CONFIG_HID_DEBUG is not set 676# CONFIG_HID_DEBUG is not set
677# CONFIG_HIDRAW is not set
635CONFIG_USB_SUPPORT=y 678CONFIG_USB_SUPPORT=y
636CONFIG_USB_ARCH_HAS_HCD=y 679CONFIG_USB_ARCH_HAS_HCD=y
637# CONFIG_USB_ARCH_HAS_OHCI is not set 680# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -641,28 +684,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
641# 684#
642# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 685# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
643# 686#
644
645#
646# USB Gadget Support
647#
648# CONFIG_USB_GADGET is not set 687# CONFIG_USB_GADGET is not set
649# CONFIG_MMC is not set 688# CONFIG_MMC is not set
689# CONFIG_MEMSTICK is not set
650# CONFIG_NEW_LEDS is not set 690# CONFIG_NEW_LEDS is not set
651# CONFIG_EDAC is not set 691# CONFIG_EDAC is not set
652# CONFIG_RTC_CLASS is not set 692# CONFIG_RTC_CLASS is not set
653 693# CONFIG_DMADEVICES is not set
654#
655# DMA Engine support
656#
657# CONFIG_DMA_ENGINE is not set
658
659#
660# DMA Clients
661#
662
663#
664# DMA Devices
665#
666 694
667# 695#
668# Userspace I/O 696# Userspace I/O
@@ -681,7 +709,6 @@ CONFIG_EXT3_FS_XATTR=y
681# CONFIG_EXT3_FS_SECURITY is not set 709# CONFIG_EXT3_FS_SECURITY is not set
682# CONFIG_EXT4DEV_FS is not set 710# CONFIG_EXT4DEV_FS is not set
683CONFIG_JBD=y 711CONFIG_JBD=y
684# CONFIG_JBD_DEBUG is not set
685CONFIG_FS_MBCACHE=y 712CONFIG_FS_MBCACHE=y
686# CONFIG_REISERFS_FS is not set 713# CONFIG_REISERFS_FS is not set
687# CONFIG_JFS_FS is not set 714# CONFIG_JFS_FS is not set
@@ -689,12 +716,10 @@ CONFIG_FS_MBCACHE=y
689# CONFIG_XFS_FS is not set 716# CONFIG_XFS_FS is not set
690# CONFIG_GFS2_FS is not set 717# CONFIG_GFS2_FS is not set
691# CONFIG_OCFS2_FS is not set 718# CONFIG_OCFS2_FS is not set
692# CONFIG_MINIX_FS is not set 719CONFIG_DNOTIFY=y
693# CONFIG_ROMFS_FS is not set
694CONFIG_INOTIFY=y 720CONFIG_INOTIFY=y
695CONFIG_INOTIFY_USER=y 721CONFIG_INOTIFY_USER=y
696# CONFIG_QUOTA is not set 722# CONFIG_QUOTA is not set
697CONFIG_DNOTIFY=y
698# CONFIG_AUTOFS_FS is not set 723# CONFIG_AUTOFS_FS is not set
699# CONFIG_AUTOFS4_FS is not set 724# CONFIG_AUTOFS4_FS is not set
700# CONFIG_FUSE_FS is not set 725# CONFIG_FUSE_FS is not set
@@ -722,7 +747,6 @@ CONFIG_SYSFS=y
722CONFIG_TMPFS=y 747CONFIG_TMPFS=y
723# CONFIG_TMPFS_POSIX_ACL is not set 748# CONFIG_TMPFS_POSIX_ACL is not set
724# CONFIG_HUGETLB_PAGE is not set 749# CONFIG_HUGETLB_PAGE is not set
725CONFIG_RAMFS=y
726# CONFIG_CONFIGFS_FS is not set 750# CONFIG_CONFIGFS_FS is not set
727 751
728# 752#
@@ -737,14 +761,13 @@ CONFIG_RAMFS=y
737# CONFIG_EFS_FS is not set 761# CONFIG_EFS_FS is not set
738# CONFIG_CRAMFS is not set 762# CONFIG_CRAMFS is not set
739# CONFIG_VXFS_FS is not set 763# CONFIG_VXFS_FS is not set
764# CONFIG_MINIX_FS is not set
740# CONFIG_HPFS_FS is not set 765# CONFIG_HPFS_FS is not set
741# CONFIG_QNX4FS_FS is not set 766# CONFIG_QNX4FS_FS is not set
767# CONFIG_ROMFS_FS is not set
742# CONFIG_SYSV_FS is not set 768# CONFIG_SYSV_FS is not set
743# CONFIG_UFS_FS is not set 769# CONFIG_UFS_FS is not set
744 770CONFIG_NETWORK_FILESYSTEMS=y
745#
746# Network File Systems
747#
748CONFIG_NFS_FS=y 771CONFIG_NFS_FS=y
749CONFIG_NFS_V3=y 772CONFIG_NFS_V3=y
750# CONFIG_NFS_V3_ACL is not set 773# CONFIG_NFS_V3_ACL is not set
@@ -787,17 +810,8 @@ CONFIG_MSDOS_PARTITION=y
787# CONFIG_KARMA_PARTITION is not set 810# CONFIG_KARMA_PARTITION is not set
788# CONFIG_EFI_PARTITION is not set 811# CONFIG_EFI_PARTITION is not set
789# CONFIG_SYSV68_PARTITION is not set 812# CONFIG_SYSV68_PARTITION is not set
790
791#
792# Native Language Support
793#
794# CONFIG_NLS is not set 813# CONFIG_NLS is not set
795
796#
797# Distributed Lock Manager
798#
799# CONFIG_DLM is not set 814# CONFIG_DLM is not set
800# CONFIG_UCC_SLOW is not set
801 815
802# 816#
803# Library routines 817# Library routines
@@ -815,15 +829,10 @@ CONFIG_HAS_IOPORT=y
815CONFIG_HAS_DMA=y 829CONFIG_HAS_DMA=y
816 830
817# 831#
818# Instrumentation Support
819#
820# CONFIG_PROFILING is not set
821# CONFIG_KPROBES is not set
822
823#
824# Kernel hacking 832# Kernel hacking
825# 833#
826# CONFIG_PRINTK_TIME is not set 834# CONFIG_PRINTK_TIME is not set
835CONFIG_ENABLE_WARN_DEPRECATED=y
827CONFIG_ENABLE_MUST_CHECK=y 836CONFIG_ENABLE_MUST_CHECK=y
828# CONFIG_MAGIC_SYSRQ is not set 837# CONFIG_MAGIC_SYSRQ is not set
829# CONFIG_UNUSED_SYMBOLS is not set 838# CONFIG_UNUSED_SYMBOLS is not set
@@ -831,6 +840,7 @@ CONFIG_ENABLE_MUST_CHECK=y
831# CONFIG_HEADERS_CHECK is not set 840# CONFIG_HEADERS_CHECK is not set
832# CONFIG_DEBUG_KERNEL is not set 841# CONFIG_DEBUG_KERNEL is not set
833# CONFIG_DEBUG_BUGVERBOSE is not set 842# CONFIG_DEBUG_BUGVERBOSE is not set
843# CONFIG_SAMPLES is not set
834# CONFIG_PPC_EARLY_DEBUG is not set 844# CONFIG_PPC_EARLY_DEBUG is not set
835 845
836# 846#
@@ -838,9 +848,11 @@ CONFIG_ENABLE_MUST_CHECK=y
838# 848#
839# CONFIG_KEYS is not set 849# CONFIG_KEYS is not set
840# CONFIG_SECURITY is not set 850# CONFIG_SECURITY is not set
851# CONFIG_SECURITY_FILE_CAPABILITIES is not set
841CONFIG_CRYPTO=y 852CONFIG_CRYPTO=y
842CONFIG_CRYPTO_ALGAPI=y 853CONFIG_CRYPTO_ALGAPI=y
843CONFIG_CRYPTO_BLKCIPHER=y 854CONFIG_CRYPTO_BLKCIPHER=y
855# CONFIG_CRYPTO_SEQIV is not set
844CONFIG_CRYPTO_MANAGER=y 856CONFIG_CRYPTO_MANAGER=y
845# CONFIG_CRYPTO_HMAC is not set 857# CONFIG_CRYPTO_HMAC is not set
846# CONFIG_CRYPTO_XCBC is not set 858# CONFIG_CRYPTO_XCBC is not set
@@ -857,6 +869,10 @@ CONFIG_CRYPTO_ECB=m
857CONFIG_CRYPTO_CBC=y 869CONFIG_CRYPTO_CBC=y
858CONFIG_CRYPTO_PCBC=m 870CONFIG_CRYPTO_PCBC=m
859# CONFIG_CRYPTO_LRW is not set 871# CONFIG_CRYPTO_LRW is not set
872# CONFIG_CRYPTO_XTS is not set
873# CONFIG_CRYPTO_CTR is not set
874# CONFIG_CRYPTO_GCM is not set
875# CONFIG_CRYPTO_CCM is not set
860# CONFIG_CRYPTO_CRYPTD is not set 876# CONFIG_CRYPTO_CRYPTD is not set
861CONFIG_CRYPTO_DES=y 877CONFIG_CRYPTO_DES=y
862# CONFIG_CRYPTO_FCRYPT is not set 878# CONFIG_CRYPTO_FCRYPT is not set
@@ -870,9 +886,14 @@ CONFIG_CRYPTO_DES=y
870# CONFIG_CRYPTO_ARC4 is not set 886# CONFIG_CRYPTO_ARC4 is not set
871# CONFIG_CRYPTO_KHAZAD is not set 887# CONFIG_CRYPTO_KHAZAD is not set
872# CONFIG_CRYPTO_ANUBIS is not set 888# CONFIG_CRYPTO_ANUBIS is not set
889# CONFIG_CRYPTO_SEED is not set
890# CONFIG_CRYPTO_SALSA20 is not set
873# CONFIG_CRYPTO_DEFLATE is not set 891# CONFIG_CRYPTO_DEFLATE is not set
874# CONFIG_CRYPTO_MICHAEL_MIC is not set 892# CONFIG_CRYPTO_MICHAEL_MIC is not set
875# CONFIG_CRYPTO_CRC32C is not set 893# CONFIG_CRYPTO_CRC32C is not set
876# CONFIG_CRYPTO_CAMELLIA is not set 894# CONFIG_CRYPTO_CAMELLIA is not set
877# CONFIG_CRYPTO_TEST is not set 895# CONFIG_CRYPTO_TEST is not set
896# CONFIG_CRYPTO_AUTHENC is not set
897# CONFIG_CRYPTO_LZO is not set
878CONFIG_CRYPTO_HW=y 898CONFIG_CRYPTO_HW=y
899# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc837x_rdb_defconfig b/arch/powerpc/configs/mpc837x_rdb_defconfig
index 91d291e3ee3a..44093a0eaf88 100644
--- a/arch/powerpc/configs/mpc837x_rdb_defconfig
+++ b/arch/powerpc/configs/mpc837x_rdb_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-rc8 3# Linux kernel version: 2.6.25-rc6
4# Thu Jan 24 20:04:39 2008 4# Mon Mar 24 08:48:24 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,8 +14,8 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_83xx=y
18CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
18# CONFIG_FSL_EMB_PERFMON is not set
19CONFIG_PPC_STD_MMU=y 19CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y 20CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -66,17 +67,19 @@ CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set 73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y
75CONFIG_FAIR_GROUP_SCHED=y 75CONFIG_FAIR_GROUP_SCHED=y
76CONFIG_FAIR_USER_SCHED=y 76# CONFIG_RT_GROUP_SCHED is not set
77# CONFIG_FAIR_CGROUP_SCHED is not set 77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
78CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
79# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
80CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
81CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -89,17 +92,26 @@ CONFIG_HOTPLUG=y
89CONFIG_PRINTK=y 92CONFIG_PRINTK=y
90CONFIG_BUG=y 93CONFIG_BUG=y
91CONFIG_ELF_CORE=y 94CONFIG_ELF_CORE=y
95CONFIG_COMPAT_BRK=y
92CONFIG_BASE_FULL=y 96CONFIG_BASE_FULL=y
93CONFIG_FUTEX=y 97CONFIG_FUTEX=y
94CONFIG_ANON_INODES=y 98CONFIG_ANON_INODES=y
95# CONFIG_EPOLL is not set 99# CONFIG_EPOLL is not set
96CONFIG_SIGNALFD=y 100CONFIG_SIGNALFD=y
101CONFIG_TIMERFD=y
97CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
98CONFIG_SHMEM=y 103CONFIG_SHMEM=y
99CONFIG_VM_EVENT_COUNTERS=y 104CONFIG_VM_EVENT_COUNTERS=y
100CONFIG_SLAB=y 105CONFIG_SLAB=y
101# CONFIG_SLUB is not set 106# CONFIG_SLUB is not set
102# CONFIG_SLOB is not set 107# CONFIG_SLOB is not set
108# CONFIG_PROFILING is not set
109# CONFIG_MARKERS is not set
110CONFIG_HAVE_OPROFILE=y
111# CONFIG_KPROBES is not set
112CONFIG_HAVE_KPROBES=y
113CONFIG_HAVE_KRETPROBES=y
114CONFIG_PROC_PAGE_MONITOR=y
103CONFIG_SLABINFO=y 115CONFIG_SLABINFO=y
104CONFIG_RT_MUTEXES=y 116CONFIG_RT_MUTEXES=y
105# CONFIG_TINY_SHMEM is not set 117# CONFIG_TINY_SHMEM is not set
@@ -128,6 +140,7 @@ CONFIG_DEFAULT_AS=y
128# CONFIG_DEFAULT_CFQ is not set 140# CONFIG_DEFAULT_CFQ is not set
129# CONFIG_DEFAULT_NOOP is not set 141# CONFIG_DEFAULT_NOOP is not set
130CONFIG_DEFAULT_IOSCHED="anticipatory" 142CONFIG_DEFAULT_IOSCHED="anticipatory"
143CONFIG_CLASSIC_RCU=y
131 144
132# 145#
133# Platform support 146# Platform support
@@ -136,11 +149,12 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
136# CONFIG_PPC_82xx is not set 149# CONFIG_PPC_82xx is not set
137CONFIG_PPC_83xx=y 150CONFIG_PPC_83xx=y
138# CONFIG_PPC_86xx is not set 151# CONFIG_PPC_86xx is not set
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
157CONFIG_MPC83xx=y
144# CONFIG_MPC831x_RDB is not set 158# CONFIG_MPC831x_RDB is not set
145# CONFIG_MPC832x_MDS is not set 159# CONFIG_MPC832x_MDS is not set
146# CONFIG_MPC832x_RDB is not set 160# CONFIG_MPC832x_RDB is not set
@@ -149,6 +163,7 @@ CONFIG_PPC_83xx=y
149# CONFIG_MPC836x_MDS is not set 163# CONFIG_MPC836x_MDS is not set
150# CONFIG_MPC837x_MDS is not set 164# CONFIG_MPC837x_MDS is not set
151CONFIG_MPC837x_RDB=y 165CONFIG_MPC837x_RDB=y
166# CONFIG_SBC834x is not set
152CONFIG_PPC_MPC837x=y 167CONFIG_PPC_MPC837x=y
153CONFIG_IPIC=y 168CONFIG_IPIC=y
154# CONFIG_MPIC is not set 169# CONFIG_MPIC is not set
@@ -161,7 +176,6 @@ CONFIG_IPIC=y
161# CONFIG_PPC_INDIRECT_IO is not set 176# CONFIG_PPC_INDIRECT_IO is not set
162# CONFIG_GENERIC_IOMAP is not set 177# CONFIG_GENERIC_IOMAP is not set
163# CONFIG_CPU_FREQ is not set 178# CONFIG_CPU_FREQ is not set
164# CONFIG_CPM2 is not set
165# CONFIG_FSL_ULI1575 is not set 179# CONFIG_FSL_ULI1575 is not set
166 180
167# 181#
@@ -177,12 +191,16 @@ CONFIG_HZ_250=y
177# CONFIG_HZ_300 is not set 191# CONFIG_HZ_300 is not set
178# CONFIG_HZ_1000 is not set 192# CONFIG_HZ_1000 is not set
179CONFIG_HZ=250 193CONFIG_HZ=250
194# CONFIG_SCHED_HRTICK is not set
180CONFIG_PREEMPT_NONE=y 195CONFIG_PREEMPT_NONE=y
181# CONFIG_PREEMPT_VOLUNTARY is not set 196# CONFIG_PREEMPT_VOLUNTARY is not set
182# CONFIG_PREEMPT is not set 197# CONFIG_PREEMPT is not set
183CONFIG_BINFMT_ELF=y 198CONFIG_BINFMT_ELF=y
184# CONFIG_BINFMT_MISC is not set 199# CONFIG_BINFMT_MISC is not set
200# CONFIG_IOMMU_HELPER is not set
185CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 201CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
202CONFIG_ARCH_HAS_WALK_MEMORY=y
203CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
186CONFIG_ARCH_FLATMEM_ENABLE=y 204CONFIG_ARCH_FLATMEM_ENABLE=y
187CONFIG_ARCH_POPULATES_NODE_MAP=y 205CONFIG_ARCH_POPULATES_NODE_MAP=y
188CONFIG_SELECT_MEMORY_MODEL=y 206CONFIG_SELECT_MEMORY_MODEL=y
@@ -201,11 +219,7 @@ CONFIG_VIRT_TO_BUS=y
201CONFIG_PROC_DEVICETREE=y 219CONFIG_PROC_DEVICETREE=y
202# CONFIG_CMDLINE_BOOL is not set 220# CONFIG_CMDLINE_BOOL is not set
203# CONFIG_PM is not set 221# CONFIG_PM is not set
204CONFIG_SUSPEND_UP_POSSIBLE=y
205CONFIG_HIBERNATION_UP_POSSIBLE=y
206CONFIG_SECCOMP=y 222CONFIG_SECCOMP=y
207CONFIG_WANT_DEVICE_TREE=y
208CONFIG_DEVICE_TREE=""
209CONFIG_ISA_DMA_API=y 223CONFIG_ISA_DMA_API=y
210 224
211# 225#
@@ -301,6 +315,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
301# 315#
302# CONFIG_NET_PKTGEN is not set 316# CONFIG_NET_PKTGEN is not set
303# CONFIG_HAMRADIO is not set 317# CONFIG_HAMRADIO is not set
318# CONFIG_CAN is not set
304# CONFIG_IRDA is not set 319# CONFIG_IRDA is not set
305# CONFIG_BT is not set 320# CONFIG_BT is not set
306# CONFIG_AF_RXRPC is not set 321# CONFIG_AF_RXRPC is not set
@@ -340,11 +355,13 @@ CONFIG_BLK_DEV_LOOP=y
340CONFIG_BLK_DEV_RAM=y 355CONFIG_BLK_DEV_RAM=y
341CONFIG_BLK_DEV_RAM_COUNT=16 356CONFIG_BLK_DEV_RAM_COUNT=16
342CONFIG_BLK_DEV_RAM_SIZE=32768 357CONFIG_BLK_DEV_RAM_SIZE=32768
343CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 358# CONFIG_BLK_DEV_XIP is not set
344# CONFIG_CDROM_PKTCDVD is not set 359# CONFIG_CDROM_PKTCDVD is not set
345# CONFIG_ATA_OVER_ETH is not set 360# CONFIG_ATA_OVER_ETH is not set
346CONFIG_MISC_DEVICES=y 361CONFIG_MISC_DEVICES=y
347# CONFIG_EEPROM_93CX6 is not set 362# CONFIG_EEPROM_93CX6 is not set
363# CONFIG_ENCLOSURE_SERVICES is not set
364CONFIG_HAVE_IDE=y
348# CONFIG_IDE is not set 365# CONFIG_IDE is not set
349 366
350# 367#
@@ -389,6 +406,7 @@ CONFIG_SCSI_LOWLEVEL=y
389# CONFIG_SCSI_DEBUG is not set 406# CONFIG_SCSI_DEBUG is not set
390CONFIG_ATA=y 407CONFIG_ATA=y
391# CONFIG_ATA_NONSTANDARD is not set 408# CONFIG_ATA_NONSTANDARD is not set
409# CONFIG_SATA_MV is not set
392CONFIG_SATA_FSL=y 410CONFIG_SATA_FSL=y
393# CONFIG_PATA_PLATFORM is not set 411# CONFIG_PATA_PLATFORM is not set
394CONFIG_MD=y 412CONFIG_MD=y
@@ -425,6 +443,7 @@ CONFIG_MARVELL_PHY=y
425# CONFIG_SMSC_PHY is not set 443# CONFIG_SMSC_PHY is not set
426# CONFIG_BROADCOM_PHY is not set 444# CONFIG_BROADCOM_PHY is not set
427# CONFIG_ICPLUS_PHY is not set 445# CONFIG_ICPLUS_PHY is not set
446# CONFIG_REALTEK_PHY is not set
428# CONFIG_FIXED_PHY is not set 447# CONFIG_FIXED_PHY is not set
429# CONFIG_MDIO_BITBANG is not set 448# CONFIG_MDIO_BITBANG is not set
430CONFIG_NET_ETHERNET=y 449CONFIG_NET_ETHERNET=y
@@ -435,6 +454,7 @@ CONFIG_MII=y
435# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 454# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
436# CONFIG_B44 is not set 455# CONFIG_B44 is not set
437CONFIG_NETDEV_1000=y 456CONFIG_NETDEV_1000=y
457# CONFIG_E1000E_ENABLED is not set
438CONFIG_GIANFAR=y 458CONFIG_GIANFAR=y
439CONFIG_GFAR_NAPI=y 459CONFIG_GFAR_NAPI=y
440# CONFIG_NETDEV_10000 is not set 460# CONFIG_NETDEV_10000 is not set
@@ -447,7 +467,6 @@ CONFIG_GFAR_NAPI=y
447# CONFIG_WAN is not set 467# CONFIG_WAN is not set
448# CONFIG_PPP is not set 468# CONFIG_PPP is not set
449# CONFIG_SLIP is not set 469# CONFIG_SLIP is not set
450# CONFIG_SHAPER is not set
451# CONFIG_NETCONSOLE is not set 470# CONFIG_NETCONSOLE is not set
452# CONFIG_NETPOLL is not set 471# CONFIG_NETPOLL is not set
453# CONFIG_NET_POLL_CONTROLLER is not set 472# CONFIG_NET_POLL_CONTROLLER is not set
@@ -542,14 +561,12 @@ CONFIG_I2C_MPC=y
542# 561#
543# Miscellaneous I2C Chip support 562# Miscellaneous I2C Chip support
544# 563#
545# CONFIG_SENSORS_DS1337 is not set
546# CONFIG_SENSORS_DS1374 is not set
547# CONFIG_DS1682 is not set 564# CONFIG_DS1682 is not set
548# CONFIG_SENSORS_EEPROM is not set 565# CONFIG_SENSORS_EEPROM is not set
549# CONFIG_SENSORS_PCF8574 is not set 566# CONFIG_SENSORS_PCF8574 is not set
550# CONFIG_SENSORS_PCA9539 is not set 567# CONFIG_PCF8575 is not set
551# CONFIG_SENSORS_PCF8591 is not set 568# CONFIG_SENSORS_PCF8591 is not set
552# CONFIG_SENSORS_M41T00 is not set 569# CONFIG_TPS65010 is not set
553# CONFIG_SENSORS_MAX6875 is not set 570# CONFIG_SENSORS_MAX6875 is not set
554# CONFIG_SENSORS_TSL2550 is not set 571# CONFIG_SENSORS_TSL2550 is not set
555# CONFIG_I2C_DEBUG_CORE is not set 572# CONFIG_I2C_DEBUG_CORE is not set
@@ -574,6 +591,7 @@ CONFIG_HWMON=y
574# CONFIG_SENSORS_ADM1031 is not set 591# CONFIG_SENSORS_ADM1031 is not set
575# CONFIG_SENSORS_ADM9240 is not set 592# CONFIG_SENSORS_ADM9240 is not set
576# CONFIG_SENSORS_ADT7470 is not set 593# CONFIG_SENSORS_ADT7470 is not set
594# CONFIG_SENSORS_ADT7473 is not set
577# CONFIG_SENSORS_ATXP1 is not set 595# CONFIG_SENSORS_ATXP1 is not set
578# CONFIG_SENSORS_DS1621 is not set 596# CONFIG_SENSORS_DS1621 is not set
579# CONFIG_SENSORS_F71805F is not set 597# CONFIG_SENSORS_F71805F is not set
@@ -601,6 +619,7 @@ CONFIG_HWMON=y
601# CONFIG_SENSORS_SMSC47M1 is not set 619# CONFIG_SENSORS_SMSC47M1 is not set
602# CONFIG_SENSORS_SMSC47M192 is not set 620# CONFIG_SENSORS_SMSC47M192 is not set
603# CONFIG_SENSORS_SMSC47B397 is not set 621# CONFIG_SENSORS_SMSC47B397 is not set
622# CONFIG_SENSORS_ADS7828 is not set
604# CONFIG_SENSORS_THMC50 is not set 623# CONFIG_SENSORS_THMC50 is not set
605# CONFIG_SENSORS_VT1211 is not set 624# CONFIG_SENSORS_VT1211 is not set
606# CONFIG_SENSORS_W83781D is not set 625# CONFIG_SENSORS_W83781D is not set
@@ -608,9 +627,11 @@ CONFIG_HWMON=y
608# CONFIG_SENSORS_W83792D is not set 627# CONFIG_SENSORS_W83792D is not set
609# CONFIG_SENSORS_W83793 is not set 628# CONFIG_SENSORS_W83793 is not set
610# CONFIG_SENSORS_W83L785TS is not set 629# CONFIG_SENSORS_W83L785TS is not set
630# CONFIG_SENSORS_W83L786NG is not set
611# CONFIG_SENSORS_W83627HF is not set 631# CONFIG_SENSORS_W83627HF is not set
612# CONFIG_SENSORS_W83627EHF is not set 632# CONFIG_SENSORS_W83627EHF is not set
613# CONFIG_HWMON_DEBUG_CHIP is not set 633# CONFIG_HWMON_DEBUG_CHIP is not set
634# CONFIG_THERMAL is not set
614CONFIG_WATCHDOG=y 635CONFIG_WATCHDOG=y
615# CONFIG_WATCHDOG_NOWAYOUT is not set 636# CONFIG_WATCHDOG_NOWAYOUT is not set
616 637
@@ -668,15 +689,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
668# 689#
669# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 690# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
670# 691#
671
672#
673# USB Gadget Support
674#
675# CONFIG_USB_GADGET is not set 692# CONFIG_USB_GADGET is not set
676# CONFIG_MMC is not set 693# CONFIG_MMC is not set
694# CONFIG_MEMSTICK is not set
677# CONFIG_NEW_LEDS is not set 695# CONFIG_NEW_LEDS is not set
678# CONFIG_EDAC is not set 696# CONFIG_EDAC is not set
679# CONFIG_RTC_CLASS is not set 697# CONFIG_RTC_CLASS is not set
698# CONFIG_DMADEVICES is not set
680 699
681# 700#
682# Userspace I/O 701# Userspace I/O
@@ -702,12 +721,10 @@ CONFIG_FS_MBCACHE=y
702# CONFIG_XFS_FS is not set 721# CONFIG_XFS_FS is not set
703# CONFIG_GFS2_FS is not set 722# CONFIG_GFS2_FS is not set
704# CONFIG_OCFS2_FS is not set 723# CONFIG_OCFS2_FS is not set
705# CONFIG_MINIX_FS is not set 724CONFIG_DNOTIFY=y
706# CONFIG_ROMFS_FS is not set
707CONFIG_INOTIFY=y 725CONFIG_INOTIFY=y
708CONFIG_INOTIFY_USER=y 726CONFIG_INOTIFY_USER=y
709# CONFIG_QUOTA is not set 727# CONFIG_QUOTA is not set
710CONFIG_DNOTIFY=y
711# CONFIG_AUTOFS_FS is not set 728# CONFIG_AUTOFS_FS is not set
712# CONFIG_AUTOFS4_FS is not set 729# CONFIG_AUTOFS4_FS is not set
713# CONFIG_FUSE_FS is not set 730# CONFIG_FUSE_FS is not set
@@ -749,8 +766,10 @@ CONFIG_TMPFS=y
749# CONFIG_EFS_FS is not set 766# CONFIG_EFS_FS is not set
750# CONFIG_CRAMFS is not set 767# CONFIG_CRAMFS is not set
751# CONFIG_VXFS_FS is not set 768# CONFIG_VXFS_FS is not set
769# CONFIG_MINIX_FS is not set
752# CONFIG_HPFS_FS is not set 770# CONFIG_HPFS_FS is not set
753# CONFIG_QNX4FS_FS is not set 771# CONFIG_QNX4FS_FS is not set
772# CONFIG_ROMFS_FS is not set
754# CONFIG_SYSV_FS is not set 773# CONFIG_SYSV_FS is not set
755# CONFIG_UFS_FS is not set 774# CONFIG_UFS_FS is not set
756CONFIG_NETWORK_FILESYSTEMS=y 775CONFIG_NETWORK_FILESYSTEMS=y
@@ -813,10 +832,6 @@ CONFIG_PLIST=y
813CONFIG_HAS_IOMEM=y 832CONFIG_HAS_IOMEM=y
814CONFIG_HAS_IOPORT=y 833CONFIG_HAS_IOPORT=y
815CONFIG_HAS_DMA=y 834CONFIG_HAS_DMA=y
816CONFIG_INSTRUMENTATION=y
817# CONFIG_PROFILING is not set
818# CONFIG_KPROBES is not set
819# CONFIG_MARKERS is not set
820 835
821# 836#
822# Kernel hacking 837# Kernel hacking
@@ -846,6 +861,7 @@ CONFIG_ASYNC_XOR=y
846CONFIG_CRYPTO=y 861CONFIG_CRYPTO=y
847CONFIG_CRYPTO_ALGAPI=y 862CONFIG_CRYPTO_ALGAPI=y
848CONFIG_CRYPTO_BLKCIPHER=y 863CONFIG_CRYPTO_BLKCIPHER=y
864# CONFIG_CRYPTO_SEQIV is not set
849CONFIG_CRYPTO_MANAGER=y 865CONFIG_CRYPTO_MANAGER=y
850# CONFIG_CRYPTO_HMAC is not set 866# CONFIG_CRYPTO_HMAC is not set
851# CONFIG_CRYPTO_XCBC is not set 867# CONFIG_CRYPTO_XCBC is not set
@@ -863,6 +879,9 @@ CONFIG_CRYPTO_CBC=y
863CONFIG_CRYPTO_PCBC=m 879CONFIG_CRYPTO_PCBC=m
864# CONFIG_CRYPTO_LRW is not set 880# CONFIG_CRYPTO_LRW is not set
865# CONFIG_CRYPTO_XTS is not set 881# CONFIG_CRYPTO_XTS is not set
882# CONFIG_CRYPTO_CTR is not set
883# CONFIG_CRYPTO_GCM is not set
884# CONFIG_CRYPTO_CCM is not set
866# CONFIG_CRYPTO_CRYPTD is not set 885# CONFIG_CRYPTO_CRYPTD is not set
867CONFIG_CRYPTO_DES=y 886CONFIG_CRYPTO_DES=y
868# CONFIG_CRYPTO_FCRYPT is not set 887# CONFIG_CRYPTO_FCRYPT is not set
@@ -877,11 +896,13 @@ CONFIG_CRYPTO_DES=y
877# CONFIG_CRYPTO_KHAZAD is not set 896# CONFIG_CRYPTO_KHAZAD is not set
878# CONFIG_CRYPTO_ANUBIS is not set 897# CONFIG_CRYPTO_ANUBIS is not set
879# CONFIG_CRYPTO_SEED is not set 898# CONFIG_CRYPTO_SEED is not set
899# CONFIG_CRYPTO_SALSA20 is not set
880# CONFIG_CRYPTO_DEFLATE is not set 900# CONFIG_CRYPTO_DEFLATE is not set
881# CONFIG_CRYPTO_MICHAEL_MIC is not set 901# CONFIG_CRYPTO_MICHAEL_MIC is not set
882# CONFIG_CRYPTO_CRC32C is not set 902# CONFIG_CRYPTO_CRC32C is not set
883# CONFIG_CRYPTO_CAMELLIA is not set 903# CONFIG_CRYPTO_CAMELLIA is not set
884# CONFIG_CRYPTO_TEST is not set 904# CONFIG_CRYPTO_TEST is not set
885# CONFIG_CRYPTO_AUTHENC is not set 905# CONFIG_CRYPTO_AUTHENC is not set
906# CONFIG_CRYPTO_LZO is not set
886CONFIG_CRYPTO_HW=y 907CONFIG_CRYPTO_HW=y
887# CONFIG_PPC_CLOCK is not set 908# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index a9807f083bc4..1f6cf68e89f8 100644
--- a/arch/powerpc/configs/mpc83xx_defconfig
+++ b/arch/powerpc/configs/mpc83xx_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-rc8 3# Linux kernel version: 2.6.25-rc6
4# Mon Jan 28 13:14:19 2008 4# Mon Mar 24 08:48:25 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_6xx=y
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
18# CONFIG_FSL_EMB_PERFMON is not set
18CONFIG_PPC_STD_MMU=y 19CONFIG_PPC_STD_MMU=y
19CONFIG_PPC_STD_MMU_32=y 20CONFIG_PPC_STD_MMU_32=y
20# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
@@ -28,6 +29,7 @@ CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y 29CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y 30CONFIG_GENERIC_CLOCKEVENTS=y
30CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
31CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
32CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
33CONFIG_ARCH_HAS_ILOG2_U32=y 35CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -65,17 +67,19 @@ CONFIG_SYSVIPC_SYSCTL=y
65# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
66# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
67# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
68# CONFIG_USER_NS is not set
69# CONFIG_PID_NS is not set
70# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
71# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
72CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
73# CONFIG_CGROUPS is not set 73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y
74CONFIG_FAIR_GROUP_SCHED=y 75CONFIG_FAIR_GROUP_SCHED=y
75CONFIG_FAIR_USER_SCHED=y 76# CONFIG_RT_GROUP_SCHED is not set
76# CONFIG_FAIR_CGROUP_SCHED is not set 77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
77CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
78# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
79CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
80CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
81# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -88,17 +92,26 @@ CONFIG_HOTPLUG=y
88CONFIG_PRINTK=y 92CONFIG_PRINTK=y
89CONFIG_BUG=y 93CONFIG_BUG=y
90CONFIG_ELF_CORE=y 94CONFIG_ELF_CORE=y
95CONFIG_COMPAT_BRK=y
91CONFIG_BASE_FULL=y 96CONFIG_BASE_FULL=y
92CONFIG_FUTEX=y 97CONFIG_FUTEX=y
93CONFIG_ANON_INODES=y 98CONFIG_ANON_INODES=y
94# CONFIG_EPOLL is not set 99# CONFIG_EPOLL is not set
95CONFIG_SIGNALFD=y 100CONFIG_SIGNALFD=y
101CONFIG_TIMERFD=y
96CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
97CONFIG_SHMEM=y 103CONFIG_SHMEM=y
98CONFIG_VM_EVENT_COUNTERS=y 104CONFIG_VM_EVENT_COUNTERS=y
99CONFIG_SLAB=y 105CONFIG_SLAB=y
100# CONFIG_SLUB is not set 106# CONFIG_SLUB is not set
101# CONFIG_SLOB is not set 107# CONFIG_SLOB is not set
108# CONFIG_PROFILING is not set
109# CONFIG_MARKERS is not set
110CONFIG_HAVE_OPROFILE=y
111# CONFIG_KPROBES is not set
112CONFIG_HAVE_KPROBES=y
113CONFIG_HAVE_KRETPROBES=y
114CONFIG_PROC_PAGE_MONITOR=y
102CONFIG_SLABINFO=y 115CONFIG_SLABINFO=y
103CONFIG_RT_MUTEXES=y 116CONFIG_RT_MUTEXES=y
104# CONFIG_TINY_SHMEM is not set 117# CONFIG_TINY_SHMEM is not set
@@ -127,6 +140,7 @@ CONFIG_DEFAULT_AS=y
127# CONFIG_DEFAULT_CFQ is not set 140# CONFIG_DEFAULT_CFQ is not set
128# CONFIG_DEFAULT_NOOP is not set 141# CONFIG_DEFAULT_NOOP is not set
129CONFIG_DEFAULT_IOSCHED="anticipatory" 142CONFIG_DEFAULT_IOSCHED="anticipatory"
143CONFIG_CLASSIC_RCU=y
130 144
131# 145#
132# Platform support 146# Platform support
@@ -135,8 +149,8 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
135# CONFIG_PPC_82xx is not set 149# CONFIG_PPC_82xx is not set
136CONFIG_PPC_83xx=y 150CONFIG_PPC_83xx=y
137# CONFIG_PPC_86xx is not set 151# CONFIG_PPC_86xx is not set
138# CONFIG_PPC_MPC52xx is not set 152# CONFIG_PPC_MPC512x is not set
139# CONFIG_PPC_MPC5200 is not set 153# CONFIG_PPC_MPC5121 is not set
140# CONFIG_PPC_CELL is not set 154# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set 155# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set 156# CONFIG_PQ2ADS is not set
@@ -181,13 +195,17 @@ CONFIG_HZ_250=y
181# CONFIG_HZ_300 is not set 195# CONFIG_HZ_300 is not set
182# CONFIG_HZ_1000 is not set 196# CONFIG_HZ_1000 is not set
183CONFIG_HZ=250 197CONFIG_HZ=250
198# CONFIG_SCHED_HRTICK is not set
184CONFIG_PREEMPT_NONE=y 199CONFIG_PREEMPT_NONE=y
185# CONFIG_PREEMPT_VOLUNTARY is not set 200# CONFIG_PREEMPT_VOLUNTARY is not set
186# CONFIG_PREEMPT is not set 201# CONFIG_PREEMPT is not set
187CONFIG_BINFMT_ELF=y 202CONFIG_BINFMT_ELF=y
188# CONFIG_BINFMT_MISC is not set 203# CONFIG_BINFMT_MISC is not set
189CONFIG_MATH_EMULATION=y 204CONFIG_MATH_EMULATION=y
205# CONFIG_IOMMU_HELPER is not set
190CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 206CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
207CONFIG_ARCH_HAS_WALK_MEMORY=y
208CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
191CONFIG_ARCH_FLATMEM_ENABLE=y 209CONFIG_ARCH_FLATMEM_ENABLE=y
192CONFIG_ARCH_POPULATES_NODE_MAP=y 210CONFIG_ARCH_POPULATES_NODE_MAP=y
193CONFIG_SELECT_MEMORY_MODEL=y 211CONFIG_SELECT_MEMORY_MODEL=y
@@ -206,11 +224,7 @@ CONFIG_VIRT_TO_BUS=y
206CONFIG_PROC_DEVICETREE=y 224CONFIG_PROC_DEVICETREE=y
207# CONFIG_CMDLINE_BOOL is not set 225# CONFIG_CMDLINE_BOOL is not set
208# CONFIG_PM is not set 226# CONFIG_PM is not set
209CONFIG_SUSPEND_UP_POSSIBLE=y
210CONFIG_HIBERNATION_UP_POSSIBLE=y
211CONFIG_SECCOMP=y 227CONFIG_SECCOMP=y
212CONFIG_WANT_DEVICE_TREE=y
213CONFIG_DEVICE_TREE=""
214CONFIG_ISA_DMA_API=y 228CONFIG_ISA_DMA_API=y
215 229
216# 230#
@@ -255,6 +269,7 @@ CONFIG_XFRM=y
255CONFIG_XFRM_USER=m 269CONFIG_XFRM_USER=m
256# CONFIG_XFRM_SUB_POLICY is not set 270# CONFIG_XFRM_SUB_POLICY is not set
257# CONFIG_XFRM_MIGRATE is not set 271# CONFIG_XFRM_MIGRATE is not set
272# CONFIG_XFRM_STATISTICS is not set
258# CONFIG_NET_KEY is not set 273# CONFIG_NET_KEY is not set
259CONFIG_INET=y 274CONFIG_INET=y
260CONFIG_IP_MULTICAST=y 275CONFIG_IP_MULTICAST=y
@@ -310,6 +325,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
310# 325#
311# CONFIG_NET_PKTGEN is not set 326# CONFIG_NET_PKTGEN is not set
312# CONFIG_HAMRADIO is not set 327# CONFIG_HAMRADIO is not set
328# CONFIG_CAN is not set
313# CONFIG_IRDA is not set 329# CONFIG_IRDA is not set
314# CONFIG_BT is not set 330# CONFIG_BT is not set
315# CONFIG_AF_RXRPC is not set 331# CONFIG_AF_RXRPC is not set
@@ -349,11 +365,13 @@ CONFIG_BLK_DEV_LOOP=y
349CONFIG_BLK_DEV_RAM=y 365CONFIG_BLK_DEV_RAM=y
350CONFIG_BLK_DEV_RAM_COUNT=16 366CONFIG_BLK_DEV_RAM_COUNT=16
351CONFIG_BLK_DEV_RAM_SIZE=32768 367CONFIG_BLK_DEV_RAM_SIZE=32768
352CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 368# CONFIG_BLK_DEV_XIP is not set
353# CONFIG_CDROM_PKTCDVD is not set 369# CONFIG_CDROM_PKTCDVD is not set
354# CONFIG_ATA_OVER_ETH is not set 370# CONFIG_ATA_OVER_ETH is not set
355CONFIG_MISC_DEVICES=y 371CONFIG_MISC_DEVICES=y
356# CONFIG_EEPROM_93CX6 is not set 372# CONFIG_EEPROM_93CX6 is not set
373# CONFIG_ENCLOSURE_SERVICES is not set
374CONFIG_HAVE_IDE=y
357# CONFIG_IDE is not set 375# CONFIG_IDE is not set
358 376
359# 377#
@@ -398,6 +416,7 @@ CONFIG_SCSI_LOWLEVEL=y
398# CONFIG_SCSI_DEBUG is not set 416# CONFIG_SCSI_DEBUG is not set
399CONFIG_ATA=y 417CONFIG_ATA=y
400# CONFIG_ATA_NONSTANDARD is not set 418# CONFIG_ATA_NONSTANDARD is not set
419# CONFIG_SATA_MV is not set
401CONFIG_SATA_FSL=y 420CONFIG_SATA_FSL=y
402# CONFIG_PATA_PLATFORM is not set 421# CONFIG_PATA_PLATFORM is not set
403# CONFIG_MD is not set 422# CONFIG_MD is not set
@@ -424,6 +443,7 @@ CONFIG_VITESSE_PHY=y
424# CONFIG_SMSC_PHY is not set 443# CONFIG_SMSC_PHY is not set
425# CONFIG_BROADCOM_PHY is not set 444# CONFIG_BROADCOM_PHY is not set
426CONFIG_ICPLUS_PHY=y 445CONFIG_ICPLUS_PHY=y
446# CONFIG_REALTEK_PHY is not set
427# CONFIG_FIXED_PHY is not set 447# CONFIG_FIXED_PHY is not set
428# CONFIG_MDIO_BITBANG is not set 448# CONFIG_MDIO_BITBANG is not set
429CONFIG_NET_ETHERNET=y 449CONFIG_NET_ETHERNET=y
@@ -434,9 +454,14 @@ CONFIG_MII=y
434# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 454# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
435# CONFIG_B44 is not set 455# CONFIG_B44 is not set
436CONFIG_NETDEV_1000=y 456CONFIG_NETDEV_1000=y
457# CONFIG_E1000E_ENABLED is not set
437CONFIG_GIANFAR=y 458CONFIG_GIANFAR=y
438# CONFIG_GFAR_NAPI is not set 459# CONFIG_GFAR_NAPI is not set
439CONFIG_UCC_GETH=y 460CONFIG_UCC_GETH=y
461# CONFIG_UGETH_NAPI is not set
462# CONFIG_UGETH_MAGIC_PACKET is not set
463# CONFIG_UGETH_FILTERING is not set
464# CONFIG_UGETH_TX_ON_DEMAND is not set
440CONFIG_NETDEV_10000=y 465CONFIG_NETDEV_10000=y
441 466
442# 467#
@@ -447,7 +472,6 @@ CONFIG_NETDEV_10000=y
447# CONFIG_WAN is not set 472# CONFIG_WAN is not set
448# CONFIG_PPP is not set 473# CONFIG_PPP is not set
449# CONFIG_SLIP is not set 474# CONFIG_SLIP is not set
450# CONFIG_SHAPER is not set
451# CONFIG_NETCONSOLE is not set 475# CONFIG_NETCONSOLE is not set
452# CONFIG_NETPOLL is not set 476# CONFIG_NETPOLL is not set
453# CONFIG_NET_POLL_CONTROLLER is not set 477# CONFIG_NET_POLL_CONTROLLER is not set
@@ -543,14 +567,12 @@ CONFIG_I2C_MPC=y
543# 567#
544# Miscellaneous I2C Chip support 568# Miscellaneous I2C Chip support
545# 569#
546# CONFIG_SENSORS_DS1337 is not set
547# CONFIG_SENSORS_DS1374 is not set
548# CONFIG_DS1682 is not set 570# CONFIG_DS1682 is not set
549# CONFIG_SENSORS_EEPROM is not set 571# CONFIG_SENSORS_EEPROM is not set
550# CONFIG_SENSORS_PCF8574 is not set 572# CONFIG_SENSORS_PCF8574 is not set
551# CONFIG_SENSORS_PCA9539 is not set 573# CONFIG_PCF8575 is not set
552# CONFIG_SENSORS_PCF8591 is not set 574# CONFIG_SENSORS_PCF8591 is not set
553# CONFIG_SENSORS_M41T00 is not set 575# CONFIG_TPS65010 is not set
554# CONFIG_SENSORS_MAX6875 is not set 576# CONFIG_SENSORS_MAX6875 is not set
555# CONFIG_SENSORS_TSL2550 is not set 577# CONFIG_SENSORS_TSL2550 is not set
556# CONFIG_I2C_DEBUG_CORE is not set 578# CONFIG_I2C_DEBUG_CORE is not set
@@ -575,6 +597,7 @@ CONFIG_HWMON=y
575# CONFIG_SENSORS_ADM1031 is not set 597# CONFIG_SENSORS_ADM1031 is not set
576# CONFIG_SENSORS_ADM9240 is not set 598# CONFIG_SENSORS_ADM9240 is not set
577# CONFIG_SENSORS_ADT7470 is not set 599# CONFIG_SENSORS_ADT7470 is not set
600# CONFIG_SENSORS_ADT7473 is not set
578# CONFIG_SENSORS_ATXP1 is not set 601# CONFIG_SENSORS_ATXP1 is not set
579# CONFIG_SENSORS_DS1621 is not set 602# CONFIG_SENSORS_DS1621 is not set
580# CONFIG_SENSORS_F71805F is not set 603# CONFIG_SENSORS_F71805F is not set
@@ -602,6 +625,7 @@ CONFIG_HWMON=y
602# CONFIG_SENSORS_SMSC47M1 is not set 625# CONFIG_SENSORS_SMSC47M1 is not set
603# CONFIG_SENSORS_SMSC47M192 is not set 626# CONFIG_SENSORS_SMSC47M192 is not set
604# CONFIG_SENSORS_SMSC47B397 is not set 627# CONFIG_SENSORS_SMSC47B397 is not set
628# CONFIG_SENSORS_ADS7828 is not set
605# CONFIG_SENSORS_THMC50 is not set 629# CONFIG_SENSORS_THMC50 is not set
606# CONFIG_SENSORS_VT1211 is not set 630# CONFIG_SENSORS_VT1211 is not set
607# CONFIG_SENSORS_W83781D is not set 631# CONFIG_SENSORS_W83781D is not set
@@ -609,9 +633,11 @@ CONFIG_HWMON=y
609# CONFIG_SENSORS_W83792D is not set 633# CONFIG_SENSORS_W83792D is not set
610# CONFIG_SENSORS_W83793 is not set 634# CONFIG_SENSORS_W83793 is not set
611# CONFIG_SENSORS_W83L785TS is not set 635# CONFIG_SENSORS_W83L785TS is not set
636# CONFIG_SENSORS_W83L786NG is not set
612# CONFIG_SENSORS_W83627HF is not set 637# CONFIG_SENSORS_W83627HF is not set
613# CONFIG_SENSORS_W83627EHF is not set 638# CONFIG_SENSORS_W83627EHF is not set
614# CONFIG_HWMON_DEBUG_CHIP is not set 639# CONFIG_HWMON_DEBUG_CHIP is not set
640# CONFIG_THERMAL is not set
615CONFIG_WATCHDOG=y 641CONFIG_WATCHDOG=y
616# CONFIG_WATCHDOG_NOWAYOUT is not set 642# CONFIG_WATCHDOG_NOWAYOUT is not set
617 643
@@ -665,21 +691,17 @@ CONFIG_USB_ARCH_HAS_HCD=y
665# CONFIG_USB_ARCH_HAS_OHCI is not set 691# CONFIG_USB_ARCH_HAS_OHCI is not set
666CONFIG_USB_ARCH_HAS_EHCI=y 692CONFIG_USB_ARCH_HAS_EHCI=y
667# CONFIG_USB is not set 693# CONFIG_USB is not set
668CONFIG_USB_EHCI_ROOT_HUB_TT=y
669CONFIG_USB_EHCI_FSL=y
670 694
671# 695#
672# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 696# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
673# 697#
674
675#
676# USB Gadget Support
677#
678# CONFIG_USB_GADGET is not set 698# CONFIG_USB_GADGET is not set
679# CONFIG_MMC is not set 699# CONFIG_MMC is not set
700# CONFIG_MEMSTICK is not set
680# CONFIG_NEW_LEDS is not set 701# CONFIG_NEW_LEDS is not set
681# CONFIG_EDAC is not set 702# CONFIG_EDAC is not set
682# CONFIG_RTC_CLASS is not set 703# CONFIG_RTC_CLASS is not set
704# CONFIG_DMADEVICES is not set
683 705
684# 706#
685# Userspace I/O 707# Userspace I/O
@@ -705,12 +727,10 @@ CONFIG_FS_MBCACHE=y
705# CONFIG_XFS_FS is not set 727# CONFIG_XFS_FS is not set
706# CONFIG_GFS2_FS is not set 728# CONFIG_GFS2_FS is not set
707# CONFIG_OCFS2_FS is not set 729# CONFIG_OCFS2_FS is not set
708# CONFIG_MINIX_FS is not set 730CONFIG_DNOTIFY=y
709# CONFIG_ROMFS_FS is not set
710CONFIG_INOTIFY=y 731CONFIG_INOTIFY=y
711CONFIG_INOTIFY_USER=y 732CONFIG_INOTIFY_USER=y
712# CONFIG_QUOTA is not set 733# CONFIG_QUOTA is not set
713CONFIG_DNOTIFY=y
714# CONFIG_AUTOFS_FS is not set 734# CONFIG_AUTOFS_FS is not set
715# CONFIG_AUTOFS4_FS is not set 735# CONFIG_AUTOFS4_FS is not set
716# CONFIG_FUSE_FS is not set 736# CONFIG_FUSE_FS is not set
@@ -752,8 +772,10 @@ CONFIG_TMPFS=y
752# CONFIG_EFS_FS is not set 772# CONFIG_EFS_FS is not set
753# CONFIG_CRAMFS is not set 773# CONFIG_CRAMFS is not set
754# CONFIG_VXFS_FS is not set 774# CONFIG_VXFS_FS is not set
775# CONFIG_MINIX_FS is not set
755# CONFIG_HPFS_FS is not set 776# CONFIG_HPFS_FS is not set
756# CONFIG_QNX4FS_FS is not set 777# CONFIG_QNX4FS_FS is not set
778# CONFIG_ROMFS_FS is not set
757# CONFIG_SYSV_FS is not set 779# CONFIG_SYSV_FS is not set
758# CONFIG_UFS_FS is not set 780# CONFIG_UFS_FS is not set
759CONFIG_NETWORK_FILESYSTEMS=y 781CONFIG_NETWORK_FILESYSTEMS=y
@@ -801,6 +823,8 @@ CONFIG_MSDOS_PARTITION=y
801# CONFIG_SYSV68_PARTITION is not set 823# CONFIG_SYSV68_PARTITION is not set
802# CONFIG_NLS is not set 824# CONFIG_NLS is not set
803# CONFIG_DLM is not set 825# CONFIG_DLM is not set
826CONFIG_UCC_FAST=y
827CONFIG_UCC=y
804 828
805# 829#
806# Library routines 830# Library routines
@@ -816,10 +840,6 @@ CONFIG_PLIST=y
816CONFIG_HAS_IOMEM=y 840CONFIG_HAS_IOMEM=y
817CONFIG_HAS_IOPORT=y 841CONFIG_HAS_IOPORT=y
818CONFIG_HAS_DMA=y 842CONFIG_HAS_DMA=y
819CONFIG_INSTRUMENTATION=y
820# CONFIG_PROFILING is not set
821# CONFIG_KPROBES is not set
822# CONFIG_MARKERS is not set
823 843
824# 844#
825# Kernel hacking 845# Kernel hacking
@@ -845,6 +865,7 @@ CONFIG_ENABLE_MUST_CHECK=y
845CONFIG_CRYPTO=y 865CONFIG_CRYPTO=y
846CONFIG_CRYPTO_ALGAPI=y 866CONFIG_CRYPTO_ALGAPI=y
847CONFIG_CRYPTO_BLKCIPHER=y 867CONFIG_CRYPTO_BLKCIPHER=y
868# CONFIG_CRYPTO_SEQIV is not set
848CONFIG_CRYPTO_MANAGER=y 869CONFIG_CRYPTO_MANAGER=y
849# CONFIG_CRYPTO_HMAC is not set 870# CONFIG_CRYPTO_HMAC is not set
850# CONFIG_CRYPTO_XCBC is not set 871# CONFIG_CRYPTO_XCBC is not set
@@ -862,6 +883,9 @@ CONFIG_CRYPTO_CBC=y
862CONFIG_CRYPTO_PCBC=m 883CONFIG_CRYPTO_PCBC=m
863# CONFIG_CRYPTO_LRW is not set 884# CONFIG_CRYPTO_LRW is not set
864# CONFIG_CRYPTO_XTS is not set 885# CONFIG_CRYPTO_XTS is not set
886# CONFIG_CRYPTO_CTR is not set
887# CONFIG_CRYPTO_GCM is not set
888# CONFIG_CRYPTO_CCM is not set
865# CONFIG_CRYPTO_CRYPTD is not set 889# CONFIG_CRYPTO_CRYPTD is not set
866CONFIG_CRYPTO_DES=y 890CONFIG_CRYPTO_DES=y
867# CONFIG_CRYPTO_FCRYPT is not set 891# CONFIG_CRYPTO_FCRYPT is not set
@@ -876,12 +900,14 @@ CONFIG_CRYPTO_DES=y
876# CONFIG_CRYPTO_KHAZAD is not set 900# CONFIG_CRYPTO_KHAZAD is not set
877# CONFIG_CRYPTO_ANUBIS is not set 901# CONFIG_CRYPTO_ANUBIS is not set
878# CONFIG_CRYPTO_SEED is not set 902# CONFIG_CRYPTO_SEED is not set
903# CONFIG_CRYPTO_SALSA20 is not set
879# CONFIG_CRYPTO_DEFLATE is not set 904# CONFIG_CRYPTO_DEFLATE is not set
880# CONFIG_CRYPTO_MICHAEL_MIC is not set 905# CONFIG_CRYPTO_MICHAEL_MIC is not set
881# CONFIG_CRYPTO_CRC32C is not set 906# CONFIG_CRYPTO_CRC32C is not set
882# CONFIG_CRYPTO_CAMELLIA is not set 907# CONFIG_CRYPTO_CAMELLIA is not set
883# CONFIG_CRYPTO_TEST is not set 908# CONFIG_CRYPTO_TEST is not set
884# CONFIG_CRYPTO_AUTHENC is not set 909# CONFIG_CRYPTO_AUTHENC is not set
910# CONFIG_CRYPTO_LZO is not set
885CONFIG_CRYPTO_HW=y 911CONFIG_CRYPTO_HW=y
886# CONFIG_PPC_CLOCK is not set 912# CONFIG_PPC_CLOCK is not set
887CONFIG_PPC_LIB_RHEAP=y 913CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc8540_ads_defconfig b/arch/powerpc/configs/mpc8540_ads_defconfig
index 3791e29e7d06..b998539da86e 100644
--- a/arch/powerpc/configs/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/mpc8540_ads_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:44 2007 4# Mon Mar 24 08:48:25 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,10 +14,10 @@ CONFIG_PPC_85xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y 17CONFIG_E500=y
19CONFIG_BOOKE=y 18CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 19CONFIG_FSL_BOOKE=y
20CONFIG_FSL_EMB_PERFMON=y
21# CONFIG_PHYS_64BIT is not set 21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -67,15 +68,19 @@ CONFIG_SYSVIPC_SYSCTL=y
67# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
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
76# CONFIG_FAIR_GROUP_SCHED is not set 76# CONFIG_FAIR_GROUP_SCHED is not set
77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set
77CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y
78# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
83# CONFIG_NAMESPACES is not set
79CONFIG_BLK_DEV_INITRD=y 84CONFIG_BLK_DEV_INITRD=y
80CONFIG_INITRAMFS_SOURCE="" 85CONFIG_INITRAMFS_SOURCE=""
81# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -89,11 +94,13 @@ CONFIG_HOTPLUG=y
89CONFIG_PRINTK=y 94CONFIG_PRINTK=y
90CONFIG_BUG=y 95CONFIG_BUG=y
91CONFIG_ELF_CORE=y 96CONFIG_ELF_CORE=y
97CONFIG_COMPAT_BRK=y
92CONFIG_BASE_FULL=y 98CONFIG_BASE_FULL=y
93CONFIG_FUTEX=y 99CONFIG_FUTEX=y
94CONFIG_ANON_INODES=y 100CONFIG_ANON_INODES=y
95CONFIG_EPOLL=y 101CONFIG_EPOLL=y
96CONFIG_SIGNALFD=y 102CONFIG_SIGNALFD=y
103CONFIG_TIMERFD=y
97CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
98CONFIG_SHMEM=y 105CONFIG_SHMEM=y
99CONFIG_VM_EVENT_COUNTERS=y 106CONFIG_VM_EVENT_COUNTERS=y
@@ -101,6 +108,13 @@ CONFIG_SLUB_DEBUG=y
101# CONFIG_SLAB is not set 108# CONFIG_SLAB is not set
102CONFIG_SLUB=y 109CONFIG_SLUB=y
103# 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
114CONFIG_HAVE_KPROBES=y
115CONFIG_HAVE_KRETPROBES=y
116CONFIG_PROC_PAGE_MONITOR=y
117CONFIG_SLABINFO=y
104CONFIG_RT_MUTEXES=y 118CONFIG_RT_MUTEXES=y
105# CONFIG_TINY_SHMEM is not set 119# CONFIG_TINY_SHMEM is not set
106CONFIG_BASE_SMALL=0 120CONFIG_BASE_SMALL=0
@@ -123,22 +137,30 @@ CONFIG_DEFAULT_AS=y
123# CONFIG_DEFAULT_CFQ is not set 137# CONFIG_DEFAULT_CFQ is not set
124# CONFIG_DEFAULT_NOOP is not set 138# CONFIG_DEFAULT_NOOP is not set
125CONFIG_DEFAULT_IOSCHED="anticipatory" 139CONFIG_DEFAULT_IOSCHED="anticipatory"
140CONFIG_CLASSIC_RCU=y
126 141
127# 142#
128# Platform support 143# Platform support
129# 144#
130# CONFIG_PPC_MPC52xx is not set 145# CONFIG_PPC_MPC512x is not set
131# CONFIG_PPC_MPC5200 is not set 146# CONFIG_PPC_MPC5121 is not set
132# CONFIG_PPC_CELL is not set 147# CONFIG_PPC_CELL is not set
133# CONFIG_PPC_CELL_NATIVE is not set 148# CONFIG_PPC_CELL_NATIVE is not set
134# CONFIG_PQ2ADS is not set 149# CONFIG_PQ2ADS is not set
150CONFIG_MPC85xx=y
135CONFIG_MPC8540_ADS=y 151CONFIG_MPC8540_ADS=y
136# CONFIG_MPC8560_ADS is not set 152# CONFIG_MPC8560_ADS is not set
137# CONFIG_MPC85xx_CDS is not set 153# CONFIG_MPC85xx_CDS is not set
138# CONFIG_MPC85xx_MDS is not set 154# CONFIG_MPC85xx_MDS is not set
139# CONFIG_MPC85xx_DS is not set 155# CONFIG_MPC85xx_DS is not set
140CONFIG_MPC8540=y 156# CONFIG_STX_GP3 is not set
141CONFIG_MPC85xx=y 157# CONFIG_TQM8540 is not set
158# CONFIG_TQM8541 is not set
159# CONFIG_TQM8555 is not set
160# CONFIG_TQM8560 is not set
161# CONFIG_SBC8548 is not set
162# CONFIG_SBC8560 is not set
163# CONFIG_IPIC is not set
142CONFIG_MPIC=y 164CONFIG_MPIC=y
143# CONFIG_MPIC_WEIRD is not set 165# CONFIG_MPIC_WEIRD is not set
144# CONFIG_PPC_I8259 is not set 166# CONFIG_PPC_I8259 is not set
@@ -165,13 +187,17 @@ CONFIG_HZ_250=y
165# CONFIG_HZ_300 is not set 187# CONFIG_HZ_300 is not set
166# CONFIG_HZ_1000 is not set 188# CONFIG_HZ_1000 is not set
167CONFIG_HZ=250 189CONFIG_HZ=250
190# CONFIG_SCHED_HRTICK is not set
168CONFIG_PREEMPT_NONE=y 191CONFIG_PREEMPT_NONE=y
169# CONFIG_PREEMPT_VOLUNTARY is not set 192# CONFIG_PREEMPT_VOLUNTARY is not set
170# CONFIG_PREEMPT is not set 193# CONFIG_PREEMPT is not set
171CONFIG_BINFMT_ELF=y 194CONFIG_BINFMT_ELF=y
172CONFIG_BINFMT_MISC=y 195CONFIG_BINFMT_MISC=y
173CONFIG_MATH_EMULATION=y 196CONFIG_MATH_EMULATION=y
197# CONFIG_IOMMU_HELPER is not set
174CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 198CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
199CONFIG_ARCH_HAS_WALK_MEMORY=y
200CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
175CONFIG_ARCH_FLATMEM_ENABLE=y 201CONFIG_ARCH_FLATMEM_ENABLE=y
176CONFIG_ARCH_POPULATES_NODE_MAP=y 202CONFIG_ARCH_POPULATES_NODE_MAP=y
177CONFIG_SELECT_MEMORY_MODEL=y 203CONFIG_SELECT_MEMORY_MODEL=y
@@ -190,18 +216,13 @@ CONFIG_VIRT_TO_BUS=y
190CONFIG_PROC_DEVICETREE=y 216CONFIG_PROC_DEVICETREE=y
191# CONFIG_CMDLINE_BOOL is not set 217# CONFIG_CMDLINE_BOOL is not set
192# CONFIG_PM is not set 218# CONFIG_PM is not set
193CONFIG_SUSPEND_UP_POSSIBLE=y
194CONFIG_HIBERNATION_UP_POSSIBLE=y
195# CONFIG_SECCOMP is not set 219# CONFIG_SECCOMP is not set
196CONFIG_WANT_DEVICE_TREE=y
197CONFIG_DEVICE_TREE=""
198CONFIG_ISA_DMA_API=y 220CONFIG_ISA_DMA_API=y
199 221
200# 222#
201# Bus options 223# Bus options
202# 224#
203CONFIG_ZONE_DMA=y 225CONFIG_ZONE_DMA=y
204CONFIG_PPC_INDIRECT_PCI=y
205CONFIG_FSL_SOC=y 226CONFIG_FSL_SOC=y
206# CONFIG_PCI is not set 227# CONFIG_PCI is not set
207# CONFIG_PCI_DOMAINS is not set 228# CONFIG_PCI_DOMAINS is not set
@@ -238,6 +259,7 @@ CONFIG_XFRM=y
238CONFIG_XFRM_USER=y 259CONFIG_XFRM_USER=y
239# CONFIG_XFRM_SUB_POLICY is not set 260# CONFIG_XFRM_SUB_POLICY is not set
240# CONFIG_XFRM_MIGRATE is not set 261# CONFIG_XFRM_MIGRATE is not set
262# CONFIG_XFRM_STATISTICS is not set
241# CONFIG_NET_KEY is not set 263# CONFIG_NET_KEY is not set
242CONFIG_INET=y 264CONFIG_INET=y
243CONFIG_IP_MULTICAST=y 265CONFIG_IP_MULTICAST=y
@@ -293,6 +315,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
293# 315#
294# CONFIG_NET_PKTGEN is not set 316# CONFIG_NET_PKTGEN is not set
295# CONFIG_HAMRADIO is not set 317# CONFIG_HAMRADIO is not set
318# CONFIG_CAN is not set
296# CONFIG_IRDA is not set 319# CONFIG_IRDA is not set
297# CONFIG_BT is not set 320# CONFIG_BT is not set
298# CONFIG_AF_RXRPC is not set 321# CONFIG_AF_RXRPC is not set
@@ -334,11 +357,13 @@ CONFIG_BLK_DEV_LOOP=y
334CONFIG_BLK_DEV_RAM=y 357CONFIG_BLK_DEV_RAM=y
335CONFIG_BLK_DEV_RAM_COUNT=16 358CONFIG_BLK_DEV_RAM_COUNT=16
336CONFIG_BLK_DEV_RAM_SIZE=32768 359CONFIG_BLK_DEV_RAM_SIZE=32768
337CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 360# CONFIG_BLK_DEV_XIP is not set
338# CONFIG_CDROM_PKTCDVD is not set 361# CONFIG_CDROM_PKTCDVD is not set
339# CONFIG_ATA_OVER_ETH is not set 362# CONFIG_ATA_OVER_ETH is not set
340CONFIG_MISC_DEVICES=y 363CONFIG_MISC_DEVICES=y
341# CONFIG_EEPROM_93CX6 is not set 364# CONFIG_EEPROM_93CX6 is not set
365# CONFIG_ENCLOSURE_SERVICES is not set
366CONFIG_HAVE_IDE=y
342# CONFIG_IDE is not set 367# CONFIG_IDE is not set
343 368
344# 369#
@@ -373,6 +398,7 @@ CONFIG_PHYLIB=y
373# CONFIG_SMSC_PHY is not set 398# CONFIG_SMSC_PHY is not set
374# CONFIG_BROADCOM_PHY is not set 399# CONFIG_BROADCOM_PHY is not set
375# CONFIG_ICPLUS_PHY is not set 400# CONFIG_ICPLUS_PHY is not set
401# CONFIG_REALTEK_PHY is not set
376# CONFIG_FIXED_PHY is not set 402# CONFIG_FIXED_PHY is not set
377# CONFIG_MDIO_BITBANG is not set 403# CONFIG_MDIO_BITBANG is not set
378CONFIG_NET_ETHERNET=y 404CONFIG_NET_ETHERNET=y
@@ -383,6 +409,7 @@ CONFIG_MII=y
383# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 409# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
384# CONFIG_B44 is not set 410# CONFIG_B44 is not set
385CONFIG_NETDEV_1000=y 411CONFIG_NETDEV_1000=y
412# CONFIG_E1000E_ENABLED is not set
386CONFIG_GIANFAR=y 413CONFIG_GIANFAR=y
387CONFIG_GFAR_NAPI=y 414CONFIG_GFAR_NAPI=y
388CONFIG_NETDEV_10000=y 415CONFIG_NETDEV_10000=y
@@ -395,7 +422,6 @@ CONFIG_NETDEV_10000=y
395# CONFIG_WAN is not set 422# CONFIG_WAN is not set
396# CONFIG_PPP is not set 423# CONFIG_PPP is not set
397# CONFIG_SLIP is not set 424# CONFIG_SLIP is not set
398# CONFIG_SHAPER is not set
399# CONFIG_NETCONSOLE is not set 425# CONFIG_NETCONSOLE is not set
400# CONFIG_NETPOLL is not set 426# CONFIG_NETPOLL is not set
401# CONFIG_NET_POLL_CONTROLLER is not set 427# CONFIG_NET_POLL_CONTROLLER is not set
@@ -489,6 +515,7 @@ CONFIG_HWMON=y
489# CONFIG_SENSORS_W83627HF is not set 515# CONFIG_SENSORS_W83627HF is not set
490# CONFIG_SENSORS_W83627EHF is not set 516# CONFIG_SENSORS_W83627EHF is not set
491# CONFIG_HWMON_DEBUG_CHIP is not set 517# CONFIG_HWMON_DEBUG_CHIP is not set
518# CONFIG_THERMAL is not set
492# CONFIG_WATCHDOG is not set 519# CONFIG_WATCHDOG is not set
493 520
494# 521#
@@ -538,15 +565,13 @@ CONFIG_USB_SUPPORT=y
538# 565#
539# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 566# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
540# 567#
541
542#
543# USB Gadget Support
544#
545# CONFIG_USB_GADGET is not set 568# CONFIG_USB_GADGET is not set
546# CONFIG_MMC is not set 569# CONFIG_MMC is not set
570# CONFIG_MEMSTICK is not set
547# CONFIG_NEW_LEDS is not set 571# CONFIG_NEW_LEDS is not set
548# CONFIG_EDAC is not set 572# CONFIG_EDAC is not set
549# CONFIG_RTC_CLASS is not set 573# CONFIG_RTC_CLASS is not set
574# CONFIG_DMADEVICES is not set
550 575
551# 576#
552# Userspace I/O 577# Userspace I/O
@@ -572,12 +597,10 @@ CONFIG_FS_MBCACHE=y
572# CONFIG_XFS_FS is not set 597# CONFIG_XFS_FS is not set
573# CONFIG_GFS2_FS is not set 598# CONFIG_GFS2_FS is not set
574# CONFIG_OCFS2_FS is not set 599# CONFIG_OCFS2_FS is not set
575# CONFIG_MINIX_FS is not set 600CONFIG_DNOTIFY=y
576# CONFIG_ROMFS_FS is not set
577CONFIG_INOTIFY=y 601CONFIG_INOTIFY=y
578CONFIG_INOTIFY_USER=y 602CONFIG_INOTIFY_USER=y
579# CONFIG_QUOTA is not set 603# CONFIG_QUOTA is not set
580CONFIG_DNOTIFY=y
581# CONFIG_AUTOFS_FS is not set 604# CONFIG_AUTOFS_FS is not set
582# CONFIG_AUTOFS4_FS is not set 605# CONFIG_AUTOFS4_FS is not set
583# CONFIG_FUSE_FS is not set 606# CONFIG_FUSE_FS is not set
@@ -619,8 +642,10 @@ CONFIG_TMPFS=y
619# CONFIG_EFS_FS is not set 642# CONFIG_EFS_FS is not set
620# CONFIG_CRAMFS is not set 643# CONFIG_CRAMFS is not set
621# CONFIG_VXFS_FS is not set 644# CONFIG_VXFS_FS is not set
645# CONFIG_MINIX_FS is not set
622# CONFIG_HPFS_FS is not set 646# CONFIG_HPFS_FS is not set
623# CONFIG_QNX4FS_FS is not set 647# CONFIG_QNX4FS_FS is not set
648# CONFIG_ROMFS_FS is not set
624# CONFIG_SYSV_FS is not set 649# CONFIG_SYSV_FS is not set
625# CONFIG_UFS_FS is not set 650# CONFIG_UFS_FS is not set
626CONFIG_NETWORK_FILESYSTEMS=y 651CONFIG_NETWORK_FILESYSTEMS=y
@@ -661,7 +686,6 @@ CONFIG_PARTITION_ADVANCED=y
661# CONFIG_SYSV68_PARTITION is not set 686# CONFIG_SYSV68_PARTITION is not set
662# CONFIG_NLS is not set 687# CONFIG_NLS is not set
663# CONFIG_DLM is not set 688# CONFIG_DLM is not set
664# CONFIG_UCC_SLOW is not set
665 689
666# 690#
667# Library routines 691# Library routines
@@ -677,7 +701,6 @@ CONFIG_PLIST=y
677CONFIG_HAS_IOMEM=y 701CONFIG_HAS_IOMEM=y
678CONFIG_HAS_IOPORT=y 702CONFIG_HAS_IOPORT=y
679CONFIG_HAS_DMA=y 703CONFIG_HAS_DMA=y
680# CONFIG_INSTRUMENTATION is not set
681 704
682# 705#
683# Kernel hacking 706# Kernel hacking
@@ -696,6 +719,7 @@ CONFIG_SCHED_DEBUG=y
696# CONFIG_SCHEDSTATS is not set 719# CONFIG_SCHEDSTATS is not set
697# CONFIG_TIMER_STATS is not set 720# CONFIG_TIMER_STATS is not set
698# CONFIG_SLUB_DEBUG_ON is not set 721# CONFIG_SLUB_DEBUG_ON is not set
722# CONFIG_SLUB_STATS is not set
699# CONFIG_DEBUG_RT_MUTEXES is not set 723# CONFIG_DEBUG_RT_MUTEXES is not set
700# CONFIG_RT_MUTEX_TESTER is not set 724# CONFIG_RT_MUTEX_TESTER is not set
701# CONFIG_DEBUG_SPINLOCK is not set 725# CONFIG_DEBUG_SPINLOCK is not set
@@ -708,8 +732,8 @@ CONFIG_DEBUG_MUTEXES=y
708# CONFIG_DEBUG_VM is not set 732# CONFIG_DEBUG_VM is not set
709# CONFIG_DEBUG_LIST is not set 733# CONFIG_DEBUG_LIST is not set
710# CONFIG_DEBUG_SG is not set 734# CONFIG_DEBUG_SG is not set
711CONFIG_FORCED_INLINING=y
712# CONFIG_BOOT_PRINTK_DELAY is not set 735# CONFIG_BOOT_PRINTK_DELAY is not set
736# CONFIG_BACKTRACE_SELF_TEST is not set
713# CONFIG_FAULT_INJECTION is not set 737# CONFIG_FAULT_INJECTION is not set
714# CONFIG_SAMPLES is not set 738# CONFIG_SAMPLES is not set
715# CONFIG_DEBUG_STACKOVERFLOW is not set 739# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -725,5 +749,48 @@ CONFIG_FORCED_INLINING=y
725# CONFIG_KEYS is not set 749# CONFIG_KEYS is not set
726# CONFIG_SECURITY is not set 750# CONFIG_SECURITY is not set
727# CONFIG_SECURITY_FILE_CAPABILITIES is not set 751# CONFIG_SECURITY_FILE_CAPABILITIES is not set
728# CONFIG_CRYPTO is not set 752CONFIG_CRYPTO=y
753# CONFIG_CRYPTO_SEQIV is not set
754# CONFIG_CRYPTO_MANAGER is not set
755# CONFIG_CRYPTO_HMAC is not set
756# CONFIG_CRYPTO_XCBC is not set
757# CONFIG_CRYPTO_NULL is not set
758# CONFIG_CRYPTO_MD4 is not set
759# CONFIG_CRYPTO_MD5 is not set
760# CONFIG_CRYPTO_SHA1 is not set
761# CONFIG_CRYPTO_SHA256 is not set
762# CONFIG_CRYPTO_SHA512 is not set
763# CONFIG_CRYPTO_WP512 is not set
764# CONFIG_CRYPTO_TGR192 is not set
765# CONFIG_CRYPTO_GF128MUL is not set
766# CONFIG_CRYPTO_ECB is not set
767# CONFIG_CRYPTO_CBC is not set
768# CONFIG_CRYPTO_PCBC is not set
769# CONFIG_CRYPTO_LRW is not set
770# CONFIG_CRYPTO_XTS is not set
771# CONFIG_CRYPTO_CTR is not set
772# CONFIG_CRYPTO_GCM is not set
773# CONFIG_CRYPTO_CCM is not set
774# CONFIG_CRYPTO_CRYPTD is not set
775# CONFIG_CRYPTO_DES is not set
776# CONFIG_CRYPTO_FCRYPT is not set
777# CONFIG_CRYPTO_BLOWFISH is not set
778# CONFIG_CRYPTO_TWOFISH is not set
779# CONFIG_CRYPTO_SERPENT is not set
780# CONFIG_CRYPTO_AES is not set
781# CONFIG_CRYPTO_CAST5 is not set
782# CONFIG_CRYPTO_CAST6 is not set
783# CONFIG_CRYPTO_TEA is not set
784# CONFIG_CRYPTO_ARC4 is not set
785# CONFIG_CRYPTO_KHAZAD is not set
786# CONFIG_CRYPTO_ANUBIS is not set
787# CONFIG_CRYPTO_SEED is not set
788# CONFIG_CRYPTO_SALSA20 is not set
789# CONFIG_CRYPTO_DEFLATE is not set
790# CONFIG_CRYPTO_MICHAEL_MIC is not set
791# CONFIG_CRYPTO_CRC32C is not set
792# CONFIG_CRYPTO_CAMELLIA is not set
793# CONFIG_CRYPTO_AUTHENC is not set
794# CONFIG_CRYPTO_LZO is not set
795CONFIG_CRYPTO_HW=y
729# CONFIG_PPC_CLOCK is not set 796# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc8544_ds_defconfig b/arch/powerpc/configs/mpc8544_ds_defconfig
index 18623a8ee75c..c75b6aee76d1 100644
--- a/arch/powerpc/configs/mpc8544_ds_defconfig
+++ b/arch/powerpc/configs/mpc8544_ds_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:46 2007 4# Mon Mar 24 08:48:26 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,10 +14,10 @@ CONFIG_PPC_85xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y 17CONFIG_E500=y
19CONFIG_BOOKE=y 18CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 19CONFIG_FSL_BOOKE=y
20CONFIG_FSL_EMB_PERFMON=y
21# CONFIG_PHYS_64BIT is not set 21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
@@ -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,21 @@ CONFIG_POSIX_MQUEUE=y
68CONFIG_BSD_PROCESS_ACCT=y 69CONFIG_BSD_PROCESS_ACCT=y
69# CONFIG_BSD_PROCESS_ACCT_V3 is not set 70# CONFIG_BSD_PROCESS_ACCT_V3 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
73CONFIG_AUDIT=y 72CONFIG_AUDIT=y
74# CONFIG_AUDITSYSCALL is not set 73# CONFIG_AUDITSYSCALL is not set
75CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
76CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
77CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
78CONFIG_GROUP_SCHED=y
79# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
80# CONFIG_RT_GROUP_SCHED is not set
81CONFIG_USER_SCHED=y
82# CONFIG_CGROUP_SCHED is not set
80CONFIG_SYSFS_DEPRECATED=y 83CONFIG_SYSFS_DEPRECATED=y
84CONFIG_SYSFS_DEPRECATED_V2=y
81# CONFIG_RELAY is not set 85# CONFIG_RELAY is not set
86# CONFIG_NAMESPACES is not set
82CONFIG_BLK_DEV_INITRD=y 87CONFIG_BLK_DEV_INITRD=y
83CONFIG_INITRAMFS_SOURCE="" 88CONFIG_INITRAMFS_SOURCE=""
84# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 89# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -92,11 +97,13 @@ CONFIG_HOTPLUG=y
92CONFIG_PRINTK=y 97CONFIG_PRINTK=y
93CONFIG_BUG=y 98CONFIG_BUG=y
94CONFIG_ELF_CORE=y 99CONFIG_ELF_CORE=y
100CONFIG_COMPAT_BRK=y
95CONFIG_BASE_FULL=y 101CONFIG_BASE_FULL=y
96CONFIG_FUTEX=y 102CONFIG_FUTEX=y
97CONFIG_ANON_INODES=y 103CONFIG_ANON_INODES=y
98CONFIG_EPOLL=y 104CONFIG_EPOLL=y
99CONFIG_SIGNALFD=y 105CONFIG_SIGNALFD=y
106CONFIG_TIMERFD=y
100CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
101CONFIG_SHMEM=y 108CONFIG_SHMEM=y
102CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
@@ -104,6 +111,14 @@ CONFIG_SLUB_DEBUG=y
104# CONFIG_SLAB is not set 111# CONFIG_SLAB is not set
105CONFIG_SLUB=y 112CONFIG_SLUB=y
106# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
114# CONFIG_PROFILING is not set
115# CONFIG_MARKERS is not set
116CONFIG_HAVE_OPROFILE=y
117# CONFIG_KPROBES is not set
118CONFIG_HAVE_KPROBES=y
119CONFIG_HAVE_KRETPROBES=y
120CONFIG_PROC_PAGE_MONITOR=y
121CONFIG_SLABINFO=y
107CONFIG_RT_MUTEXES=y 122CONFIG_RT_MUTEXES=y
108# CONFIG_TINY_SHMEM is not set 123# CONFIG_TINY_SHMEM is not set
109CONFIG_BASE_SMALL=0 124CONFIG_BASE_SMALL=0
@@ -131,21 +146,30 @@ CONFIG_IOSCHED_CFQ=y
131CONFIG_DEFAULT_CFQ=y 146CONFIG_DEFAULT_CFQ=y
132# CONFIG_DEFAULT_NOOP is not set 147# CONFIG_DEFAULT_NOOP is not set
133CONFIG_DEFAULT_IOSCHED="cfq" 148CONFIG_DEFAULT_IOSCHED="cfq"
149CONFIG_CLASSIC_RCU=y
134 150
135# 151#
136# Platform support 152# Platform support
137# 153#
138# CONFIG_PPC_MPC52xx is not set 154# CONFIG_PPC_MPC512x is not set
139# CONFIG_PPC_MPC5200 is not set 155# CONFIG_PPC_MPC5121 is not set
140# CONFIG_PPC_CELL is not set 156# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set 157# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set 158# CONFIG_PQ2ADS is not set
159CONFIG_MPC85xx=y
143# CONFIG_MPC8540_ADS is not set 160# CONFIG_MPC8540_ADS is not set
144# CONFIG_MPC8560_ADS is not set 161# CONFIG_MPC8560_ADS is not set
145# CONFIG_MPC85xx_CDS is not set 162# CONFIG_MPC85xx_CDS is not set
146# CONFIG_MPC85xx_MDS is not set 163# CONFIG_MPC85xx_MDS is not set
147CONFIG_MPC85xx_DS=y 164CONFIG_MPC85xx_DS=y
148CONFIG_MPC85xx=y 165# CONFIG_STX_GP3 is not set
166# CONFIG_TQM8540 is not set
167# CONFIG_TQM8541 is not set
168# CONFIG_TQM8555 is not set
169# CONFIG_TQM8560 is not set
170# CONFIG_SBC8548 is not set
171# CONFIG_SBC8560 is not set
172# CONFIG_IPIC is not set
149CONFIG_MPIC=y 173CONFIG_MPIC=y
150# CONFIG_MPIC_WEIRD is not set 174# CONFIG_MPIC_WEIRD is not set
151CONFIG_PPC_I8259=y 175CONFIG_PPC_I8259=y
@@ -172,13 +196,17 @@ CONFIG_HZ_250=y
172# CONFIG_HZ_300 is not set 196# CONFIG_HZ_300 is not set
173# CONFIG_HZ_1000 is not set 197# CONFIG_HZ_1000 is not set
174CONFIG_HZ=250 198CONFIG_HZ=250
199# CONFIG_SCHED_HRTICK is not set
175CONFIG_PREEMPT_NONE=y 200CONFIG_PREEMPT_NONE=y
176# CONFIG_PREEMPT_VOLUNTARY is not set 201# CONFIG_PREEMPT_VOLUNTARY is not set
177# CONFIG_PREEMPT is not set 202# CONFIG_PREEMPT is not set
178CONFIG_BINFMT_ELF=y 203CONFIG_BINFMT_ELF=y
179CONFIG_BINFMT_MISC=m 204CONFIG_BINFMT_MISC=m
180CONFIG_MATH_EMULATION=y 205CONFIG_MATH_EMULATION=y
206# CONFIG_IOMMU_HELPER is not set
181CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 207CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
208CONFIG_ARCH_HAS_WALK_MEMORY=y
209CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
182CONFIG_ARCH_FLATMEM_ENABLE=y 210CONFIG_ARCH_FLATMEM_ENABLE=y
183CONFIG_ARCH_POPULATES_NODE_MAP=y 211CONFIG_ARCH_POPULATES_NODE_MAP=y
184CONFIG_SELECT_MEMORY_MODEL=y 212CONFIG_SELECT_MEMORY_MODEL=y
@@ -197,11 +225,7 @@ CONFIG_VIRT_TO_BUS=y
197CONFIG_PROC_DEVICETREE=y 225CONFIG_PROC_DEVICETREE=y
198# CONFIG_CMDLINE_BOOL is not set 226# CONFIG_CMDLINE_BOOL is not set
199# CONFIG_PM is not set 227# CONFIG_PM is not set
200CONFIG_SUSPEND_UP_POSSIBLE=y
201CONFIG_HIBERNATION_UP_POSSIBLE=y
202CONFIG_SECCOMP=y 228CONFIG_SECCOMP=y
203CONFIG_WANT_DEVICE_TREE=y
204CONFIG_DEVICE_TREE=""
205CONFIG_ISA_DMA_API=y 229CONFIG_ISA_DMA_API=y
206 230
207# 231#
@@ -252,6 +276,7 @@ CONFIG_XFRM=y
252CONFIG_XFRM_USER=y 276CONFIG_XFRM_USER=y
253# CONFIG_XFRM_SUB_POLICY is not set 277# CONFIG_XFRM_SUB_POLICY is not set
254# CONFIG_XFRM_MIGRATE is not set 278# CONFIG_XFRM_MIGRATE is not set
279# CONFIG_XFRM_STATISTICS is not set
255CONFIG_NET_KEY=m 280CONFIG_NET_KEY=m
256# CONFIG_NET_KEY_MIGRATE is not set 281# CONFIG_NET_KEY_MIGRATE is not set
257CONFIG_INET=y 282CONFIG_INET=y
@@ -335,6 +360,7 @@ CONFIG_SCTP_HMAC_MD5=y
335# 360#
336# CONFIG_NET_PKTGEN is not set 361# CONFIG_NET_PKTGEN is not set
337# CONFIG_HAMRADIO is not set 362# CONFIG_HAMRADIO is not set
363# CONFIG_CAN is not set
338# CONFIG_IRDA is not set 364# CONFIG_IRDA is not set
339# CONFIG_BT is not set 365# CONFIG_BT is not set
340# CONFIG_AF_RXRPC is not set 366# CONFIG_AF_RXRPC is not set
@@ -383,7 +409,7 @@ CONFIG_BLK_DEV_NBD=y
383CONFIG_BLK_DEV_RAM=y 409CONFIG_BLK_DEV_RAM=y
384CONFIG_BLK_DEV_RAM_COUNT=16 410CONFIG_BLK_DEV_RAM_COUNT=16
385CONFIG_BLK_DEV_RAM_SIZE=131072 411CONFIG_BLK_DEV_RAM_SIZE=131072
386CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 412# CONFIG_BLK_DEV_XIP is not set
387# CONFIG_CDROM_PKTCDVD is not set 413# CONFIG_CDROM_PKTCDVD is not set
388# CONFIG_ATA_OVER_ETH is not set 414# CONFIG_ATA_OVER_ETH is not set
389CONFIG_MISC_DEVICES=y 415CONFIG_MISC_DEVICES=y
@@ -391,6 +417,8 @@ CONFIG_MISC_DEVICES=y
391# CONFIG_EEPROM_93CX6 is not set 417# CONFIG_EEPROM_93CX6 is not set
392# CONFIG_SGI_IOC4 is not set 418# CONFIG_SGI_IOC4 is not set
393# CONFIG_TIFM_CORE is not set 419# CONFIG_TIFM_CORE is not set
420# CONFIG_ENCLOSURE_SERVICES is not set
421CONFIG_HAVE_IDE=y
394# CONFIG_IDE is not set 422# CONFIG_IDE is not set
395 423
396# 424#
@@ -456,6 +484,7 @@ CONFIG_SCSI_LOWLEVEL=y
456# CONFIG_SCSI_IPS is not set 484# CONFIG_SCSI_IPS is not set
457# CONFIG_SCSI_INITIO is not set 485# CONFIG_SCSI_INITIO is not set
458# CONFIG_SCSI_INIA100 is not set 486# CONFIG_SCSI_INIA100 is not set
487# CONFIG_SCSI_MVSAS is not set
459# CONFIG_SCSI_STEX is not set 488# CONFIG_SCSI_STEX is not set
460# CONFIG_SCSI_SYM53C8XX_2 is not set 489# CONFIG_SCSI_SYM53C8XX_2 is not set
461# CONFIG_SCSI_IPR is not set 490# CONFIG_SCSI_IPR is not set
@@ -486,6 +515,7 @@ CONFIG_SATA_AHCI=y
486# CONFIG_SATA_VIA is not set 515# CONFIG_SATA_VIA is not set
487# CONFIG_SATA_VITESSE is not set 516# CONFIG_SATA_VITESSE is not set
488# CONFIG_SATA_INIC162X is not set 517# CONFIG_SATA_INIC162X is not set
518# CONFIG_SATA_FSL is not set
489CONFIG_PATA_ALI=y 519CONFIG_PATA_ALI=y
490# CONFIG_PATA_AMD is not set 520# CONFIG_PATA_AMD is not set
491# CONFIG_PATA_ARTOP is not set 521# CONFIG_PATA_ARTOP is not set
@@ -509,6 +539,7 @@ CONFIG_PATA_ALI=y
509# CONFIG_PATA_MPIIX is not set 539# CONFIG_PATA_MPIIX is not set
510# CONFIG_PATA_OLDPIIX is not set 540# CONFIG_PATA_OLDPIIX is not set
511# CONFIG_PATA_NETCELL is not set 541# CONFIG_PATA_NETCELL is not set
542# CONFIG_PATA_NINJA32 is not set
512# CONFIG_PATA_NS87410 is not set 543# CONFIG_PATA_NS87410 is not set
513# CONFIG_PATA_NS87415 is not set 544# CONFIG_PATA_NS87415 is not set
514# CONFIG_PATA_OPTI is not set 545# CONFIG_PATA_OPTI is not set
@@ -542,7 +573,6 @@ CONFIG_DUMMY=y
542# CONFIG_EQUALIZER is not set 573# CONFIG_EQUALIZER is not set
543# CONFIG_TUN is not set 574# CONFIG_TUN is not set
544# CONFIG_VETH is not set 575# CONFIG_VETH is not set
545# CONFIG_IP1000 is not set
546# CONFIG_ARCNET is not set 576# CONFIG_ARCNET is not set
547CONFIG_PHYLIB=y 577CONFIG_PHYLIB=y
548 578
@@ -558,6 +588,7 @@ CONFIG_VITESSE_PHY=y
558# CONFIG_SMSC_PHY is not set 588# CONFIG_SMSC_PHY is not set
559# CONFIG_BROADCOM_PHY is not set 589# CONFIG_BROADCOM_PHY is not set
560# CONFIG_ICPLUS_PHY is not set 590# CONFIG_ICPLUS_PHY is not set
591# CONFIG_REALTEK_PHY is not set
561# CONFIG_FIXED_PHY is not set 592# CONFIG_FIXED_PHY is not set
562# CONFIG_MDIO_BITBANG is not set 593# CONFIG_MDIO_BITBANG is not set
563CONFIG_NET_ETHERNET=y 594CONFIG_NET_ETHERNET=y
@@ -579,6 +610,9 @@ CONFIG_NETDEV_1000=y
579# CONFIG_DL2K is not set 610# CONFIG_DL2K is not set
580# CONFIG_E1000 is not set 611# CONFIG_E1000 is not set
581# CONFIG_E1000E is not set 612# CONFIG_E1000E is not set
613# CONFIG_E1000E_ENABLED is not set
614# CONFIG_IP1000 is not set
615# CONFIG_IGB is not set
582# CONFIG_NS83820 is not set 616# CONFIG_NS83820 is not set
583# CONFIG_HAMACHI is not set 617# CONFIG_HAMACHI is not set
584# CONFIG_YELLOWFIN is not set 618# CONFIG_YELLOWFIN is not set
@@ -605,6 +639,7 @@ CONFIG_NETDEV_10000=y
605# CONFIG_NIU is not set 639# CONFIG_NIU is not set
606# CONFIG_MLX4_CORE is not set 640# CONFIG_MLX4_CORE is not set
607# CONFIG_TEHUTI is not set 641# CONFIG_TEHUTI is not set
642# CONFIG_BNX2X is not set
608# CONFIG_TR is not set 643# CONFIG_TR is not set
609 644
610# 645#
@@ -627,7 +662,6 @@ CONFIG_NETDEV_10000=y
627# CONFIG_PPP is not set 662# CONFIG_PPP is not set
628# CONFIG_SLIP is not set 663# CONFIG_SLIP is not set
629# CONFIG_NET_FC is not set 664# CONFIG_NET_FC is not set
630# CONFIG_SHAPER is not set
631# CONFIG_NETCONSOLE is not set 665# CONFIG_NETCONSOLE is not set
632# CONFIG_NETPOLL is not set 666# CONFIG_NETPOLL is not set
633# CONFIG_NET_POLL_CONTROLLER is not set 667# CONFIG_NET_POLL_CONTROLLER is not set
@@ -678,6 +712,7 @@ CONFIG_VT_CONSOLE=y
678CONFIG_HW_CONSOLE=y 712CONFIG_HW_CONSOLE=y
679# CONFIG_VT_HW_CONSOLE_BINDING is not set 713# CONFIG_VT_HW_CONSOLE_BINDING is not set
680# CONFIG_SERIAL_NONSTANDARD is not set 714# CONFIG_SERIAL_NONSTANDARD is not set
715# CONFIG_NOZOMI is not set
681 716
682# 717#
683# Serial drivers 718# Serial drivers
@@ -756,14 +791,12 @@ CONFIG_I2C_MPC=y
756# 791#
757# Miscellaneous I2C Chip support 792# Miscellaneous I2C Chip support
758# 793#
759# CONFIG_SENSORS_DS1337 is not set
760# CONFIG_SENSORS_DS1374 is not set
761# CONFIG_DS1682 is not set 794# CONFIG_DS1682 is not set
762CONFIG_SENSORS_EEPROM=y 795CONFIG_SENSORS_EEPROM=y
763# CONFIG_SENSORS_PCF8574 is not set 796# CONFIG_SENSORS_PCF8574 is not set
764# CONFIG_SENSORS_PCA9539 is not set 797# CONFIG_PCF8575 is not set
765# CONFIG_SENSORS_PCF8591 is not set 798# CONFIG_SENSORS_PCF8591 is not set
766# CONFIG_SENSORS_M41T00 is not set 799# CONFIG_TPS65010 is not set
767# CONFIG_SENSORS_MAX6875 is not set 800# CONFIG_SENSORS_MAX6875 is not set
768# CONFIG_SENSORS_TSL2550 is not set 801# CONFIG_SENSORS_TSL2550 is not set
769# CONFIG_I2C_DEBUG_CORE is not set 802# CONFIG_I2C_DEBUG_CORE is not set
@@ -779,6 +812,7 @@ CONFIG_SENSORS_EEPROM=y
779# CONFIG_W1 is not set 812# CONFIG_W1 is not set
780# CONFIG_POWER_SUPPLY is not set 813# CONFIG_POWER_SUPPLY is not set
781# CONFIG_HWMON is not set 814# CONFIG_HWMON is not set
815# CONFIG_THERMAL is not set
782# CONFIG_WATCHDOG is not set 816# CONFIG_WATCHDOG is not set
783 817
784# 818#
@@ -803,6 +837,8 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
803# 837#
804# Supported SAA7146 based PCI Adapters 838# Supported SAA7146 based PCI Adapters
805# 839#
840# CONFIG_TTPCI_EEPROM is not set
841# CONFIG_DVB_BUDGET_CORE is not set
806 842
807# 843#
808# Supported USB Adapters 844# Supported USB Adapters
@@ -888,11 +924,13 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
888# CONFIG_DVB_PLL is not set 924# CONFIG_DVB_PLL is not set
889# CONFIG_DVB_TDA826X is not set 925# CONFIG_DVB_TDA826X is not set
890# CONFIG_DVB_TDA827X is not set 926# CONFIG_DVB_TDA827X is not set
927# CONFIG_DVB_TDA18271 is not set
891# CONFIG_DVB_TUNER_QT1010 is not set 928# CONFIG_DVB_TUNER_QT1010 is not set
892# CONFIG_DVB_TUNER_MT2060 is not set 929# CONFIG_DVB_TUNER_MT2060 is not set
893# CONFIG_DVB_TUNER_MT2266 is not set 930# CONFIG_DVB_TUNER_MT2266 is not set
894# CONFIG_DVB_TUNER_MT2131 is not set 931# CONFIG_DVB_TUNER_MT2131 is not set
895# CONFIG_DVB_TUNER_DIB0070 is not set 932# CONFIG_DVB_TUNER_DIB0070 is not set
933# CONFIG_DVB_TUNER_XC5000 is not set
896 934
897# 935#
898# Miscellaneous devices 936# Miscellaneous devices
@@ -970,6 +1008,7 @@ CONFIG_SND_AC97_CODEC=y
970# CONFIG_SND_BT87X is not set 1008# CONFIG_SND_BT87X is not set
971# CONFIG_SND_CA0106 is not set 1009# CONFIG_SND_CA0106 is not set
972# CONFIG_SND_CMIPCI is not set 1010# CONFIG_SND_CMIPCI is not set
1011# CONFIG_SND_OXYGEN is not set
973# CONFIG_SND_CS4281 is not set 1012# CONFIG_SND_CS4281 is not set
974# CONFIG_SND_CS46XX is not set 1013# CONFIG_SND_CS46XX is not set
975# CONFIG_SND_CS5530 is not set 1014# CONFIG_SND_CS5530 is not set
@@ -995,6 +1034,7 @@ CONFIG_SND_AC97_CODEC=y
995# CONFIG_SND_HDA_INTEL is not set 1034# CONFIG_SND_HDA_INTEL is not set
996# CONFIG_SND_HDSP is not set 1035# CONFIG_SND_HDSP is not set
997# CONFIG_SND_HDSPM is not set 1036# CONFIG_SND_HDSPM is not set
1037# CONFIG_SND_HIFIER is not set
998# CONFIG_SND_ICE1712 is not set 1038# CONFIG_SND_ICE1712 is not set
999# CONFIG_SND_ICE1724 is not set 1039# CONFIG_SND_ICE1724 is not set
1000CONFIG_SND_INTEL8X0=y 1040CONFIG_SND_INTEL8X0=y
@@ -1012,6 +1052,7 @@ CONFIG_SND_INTEL8X0=y
1012# CONFIG_SND_TRIDENT is not set 1052# CONFIG_SND_TRIDENT is not set
1013# CONFIG_SND_VIA82XX is not set 1053# CONFIG_SND_VIA82XX is not set
1014# CONFIG_SND_VIA82XX_MODEM is not set 1054# CONFIG_SND_VIA82XX_MODEM is not set
1055# CONFIG_SND_VIRTUOSO is not set
1015# CONFIG_SND_VX222 is not set 1056# CONFIG_SND_VX222 is not set
1016# CONFIG_SND_YMFPCI is not set 1057# CONFIG_SND_YMFPCI is not set
1017# CONFIG_SND_AC97_POWER_SAVE is not set 1058# CONFIG_SND_AC97_POWER_SAVE is not set
@@ -1041,6 +1082,10 @@ CONFIG_SND_INTEL8X0=y
1041# 1082#
1042 1083
1043# 1084#
1085# ALSA SoC audio for Freescale SOCs
1086#
1087
1088#
1044# Open Sound System 1089# Open Sound System
1045# 1090#
1046# CONFIG_SOUND_PRIME is not set 1091# CONFIG_SOUND_PRIME is not set
@@ -1063,6 +1108,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
1063CONFIG_USB_ARCH_HAS_EHCI=y 1108CONFIG_USB_ARCH_HAS_EHCI=y
1064CONFIG_USB=y 1109CONFIG_USB=y
1065# CONFIG_USB_DEBUG is not set 1110# CONFIG_USB_DEBUG is not set
1111# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1066 1112
1067# 1113#
1068# Miscellaneous USB options 1114# Miscellaneous USB options
@@ -1076,9 +1122,10 @@ CONFIG_USB_DEVICE_CLASS=y
1076# USB Host Controller Drivers 1122# USB Host Controller Drivers
1077# 1123#
1078CONFIG_USB_EHCI_HCD=y 1124CONFIG_USB_EHCI_HCD=y
1079# CONFIG_USB_EHCI_SPLIT_ISO is not set
1080# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1125# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1081# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1126# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1127# CONFIG_USB_EHCI_FSL is not set
1128CONFIG_USB_EHCI_HCD_PPC_OF=y
1082# CONFIG_USB_ISP116X_HCD is not set 1129# CONFIG_USB_ISP116X_HCD is not set
1083CONFIG_USB_OHCI_HCD=y 1130CONFIG_USB_OHCI_HCD=y
1084CONFIG_USB_OHCI_HCD_PPC_OF=y 1131CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -1129,10 +1176,6 @@ CONFIG_USB_MON=y
1129# 1176#
1130# USB port drivers 1177# USB port drivers
1131# 1178#
1132
1133#
1134# USB Serial Converter support
1135#
1136# CONFIG_USB_SERIAL is not set 1179# CONFIG_USB_SERIAL is not set
1137 1180
1138# 1181#
@@ -1158,21 +1201,18 @@ CONFIG_USB_MON=y
1158# CONFIG_USB_TRANCEVIBRATOR is not set 1201# CONFIG_USB_TRANCEVIBRATOR is not set
1159# CONFIG_USB_IOWARRIOR is not set 1202# CONFIG_USB_IOWARRIOR is not set
1160# CONFIG_USB_TEST is not set 1203# CONFIG_USB_TEST is not set
1161
1162#
1163# USB DSL modem support
1164#
1165
1166#
1167# USB Gadget Support
1168#
1169# CONFIG_USB_GADGET is not set 1204# CONFIG_USB_GADGET is not set
1170# CONFIG_MMC is not set 1205# CONFIG_MMC is not set
1206# CONFIG_MEMSTICK is not set
1171# CONFIG_NEW_LEDS is not set 1207# CONFIG_NEW_LEDS is not set
1172# CONFIG_INFINIBAND is not set 1208# CONFIG_INFINIBAND is not set
1173# CONFIG_EDAC is not set 1209# CONFIG_EDAC is not set
1174CONFIG_RTC_LIB=y 1210CONFIG_RTC_LIB=y
1175CONFIG_RTC_CLASS=y 1211CONFIG_RTC_CLASS=y
1212
1213#
1214# Conflicting RTC option has been selected, check GEN_RTC and RTC
1215#
1176CONFIG_RTC_HCTOSYS=y 1216CONFIG_RTC_HCTOSYS=y
1177CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 1217CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1178# CONFIG_RTC_DEBUG is not set 1218# CONFIG_RTC_DEBUG is not set
@@ -1199,6 +1239,7 @@ CONFIG_RTC_INTF_DEV=y
1199# CONFIG_RTC_DRV_PCF8563 is not set 1239# CONFIG_RTC_DRV_PCF8563 is not set
1200# CONFIG_RTC_DRV_PCF8583 is not set 1240# CONFIG_RTC_DRV_PCF8583 is not set
1201# CONFIG_RTC_DRV_M41T80 is not set 1241# CONFIG_RTC_DRV_M41T80 is not set
1242# CONFIG_RTC_DRV_S35390A is not set
1202 1243
1203# 1244#
1204# SPI RTC drivers 1245# SPI RTC drivers
@@ -1208,9 +1249,10 @@ CONFIG_RTC_INTF_DEV=y
1208# Platform RTC drivers 1249# Platform RTC drivers
1209# 1250#
1210CONFIG_RTC_DRV_CMOS=y 1251CONFIG_RTC_DRV_CMOS=y
1252# CONFIG_RTC_DRV_DS1511 is not set
1211# CONFIG_RTC_DRV_DS1553 is not set 1253# CONFIG_RTC_DRV_DS1553 is not set
1212# CONFIG_RTC_DRV_STK17TA8 is not set
1213# CONFIG_RTC_DRV_DS1742 is not set 1254# CONFIG_RTC_DRV_DS1742 is not set
1255# CONFIG_RTC_DRV_STK17TA8 is not set
1214# CONFIG_RTC_DRV_M48T86 is not set 1256# CONFIG_RTC_DRV_M48T86 is not set
1215# CONFIG_RTC_DRV_M48T59 is not set 1257# CONFIG_RTC_DRV_M48T59 is not set
1216# CONFIG_RTC_DRV_V3020 is not set 1258# CONFIG_RTC_DRV_V3020 is not set
@@ -1218,6 +1260,7 @@ CONFIG_RTC_DRV_CMOS=y
1218# 1260#
1219# on-CPU RTC drivers 1261# on-CPU RTC drivers
1220# 1262#
1263# CONFIG_DMADEVICES is not set
1221 1264
1222# 1265#
1223# Userspace I/O 1266# Userspace I/O
@@ -1243,12 +1286,10 @@ CONFIG_FS_MBCACHE=y
1243# CONFIG_XFS_FS is not set 1286# CONFIG_XFS_FS is not set
1244# CONFIG_GFS2_FS is not set 1287# CONFIG_GFS2_FS is not set
1245# CONFIG_OCFS2_FS is not set 1288# CONFIG_OCFS2_FS is not set
1246# CONFIG_MINIX_FS is not set 1289CONFIG_DNOTIFY=y
1247# CONFIG_ROMFS_FS is not set
1248CONFIG_INOTIFY=y 1290CONFIG_INOTIFY=y
1249CONFIG_INOTIFY_USER=y 1291CONFIG_INOTIFY_USER=y
1250# CONFIG_QUOTA is not set 1292# CONFIG_QUOTA is not set
1251CONFIG_DNOTIFY=y
1252# CONFIG_AUTOFS_FS is not set 1293# CONFIG_AUTOFS_FS is not set
1253# CONFIG_AUTOFS4_FS is not set 1294# CONFIG_AUTOFS4_FS is not set
1254# CONFIG_FUSE_FS is not set 1295# CONFIG_FUSE_FS is not set
@@ -1300,8 +1341,10 @@ CONFIG_BFS_FS=m
1300CONFIG_EFS_FS=m 1341CONFIG_EFS_FS=m
1301CONFIG_CRAMFS=y 1342CONFIG_CRAMFS=y
1302CONFIG_VXFS_FS=m 1343CONFIG_VXFS_FS=m
1344# CONFIG_MINIX_FS is not set
1303CONFIG_HPFS_FS=m 1345CONFIG_HPFS_FS=m
1304CONFIG_QNX4FS_FS=m 1346CONFIG_QNX4FS_FS=m
1347# CONFIG_ROMFS_FS is not set
1305CONFIG_SYSV_FS=m 1348CONFIG_SYSV_FS=m
1306CONFIG_UFS_FS=m 1349CONFIG_UFS_FS=m
1307# CONFIG_UFS_FS_WRITE is not set 1350# CONFIG_UFS_FS_WRITE is not set
@@ -1393,7 +1436,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1393# CONFIG_NLS_KOI8_U is not set 1436# CONFIG_NLS_KOI8_U is not set
1394CONFIG_NLS_UTF8=m 1437CONFIG_NLS_UTF8=m
1395# CONFIG_DLM is not set 1438# CONFIG_DLM is not set
1396# CONFIG_UCC_SLOW is not set
1397 1439
1398# 1440#
1399# Library routines 1441# Library routines
@@ -1410,7 +1452,6 @@ CONFIG_PLIST=y
1410CONFIG_HAS_IOMEM=y 1452CONFIG_HAS_IOMEM=y
1411CONFIG_HAS_IOPORT=y 1453CONFIG_HAS_IOPORT=y
1412CONFIG_HAS_DMA=y 1454CONFIG_HAS_DMA=y
1413# CONFIG_INSTRUMENTATION is not set
1414 1455
1415# 1456#
1416# Kernel hacking 1457# Kernel hacking
@@ -1429,6 +1470,7 @@ CONFIG_SCHED_DEBUG=y
1429# CONFIG_SCHEDSTATS is not set 1470# CONFIG_SCHEDSTATS is not set
1430# CONFIG_TIMER_STATS is not set 1471# CONFIG_TIMER_STATS is not set
1431# CONFIG_SLUB_DEBUG_ON is not set 1472# CONFIG_SLUB_DEBUG_ON is not set
1473# CONFIG_SLUB_STATS is not set
1432# CONFIG_DEBUG_RT_MUTEXES is not set 1474# CONFIG_DEBUG_RT_MUTEXES is not set
1433# CONFIG_RT_MUTEX_TESTER is not set 1475# CONFIG_RT_MUTEX_TESTER is not set
1434# CONFIG_DEBUG_SPINLOCK is not set 1476# CONFIG_DEBUG_SPINLOCK is not set
@@ -1442,9 +1484,9 @@ CONFIG_DEBUG_INFO=y
1442# CONFIG_DEBUG_VM is not set 1484# CONFIG_DEBUG_VM is not set
1443# CONFIG_DEBUG_LIST is not set 1485# CONFIG_DEBUG_LIST is not set
1444# CONFIG_DEBUG_SG is not set 1486# CONFIG_DEBUG_SG is not set
1445CONFIG_FORCED_INLINING=y
1446# CONFIG_BOOT_PRINTK_DELAY is not set 1487# CONFIG_BOOT_PRINTK_DELAY is not set
1447# CONFIG_RCU_TORTURE_TEST is not set 1488# CONFIG_RCU_TORTURE_TEST is not set
1489# CONFIG_BACKTRACE_SELF_TEST is not set
1448# CONFIG_FAULT_INJECTION is not set 1490# CONFIG_FAULT_INJECTION is not set
1449# CONFIG_SAMPLES is not set 1491# CONFIG_SAMPLES is not set
1450# CONFIG_DEBUG_STACKOVERFLOW is not set 1492# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1463,6 +1505,7 @@ CONFIG_FORCED_INLINING=y
1463CONFIG_CRYPTO=y 1505CONFIG_CRYPTO=y
1464CONFIG_CRYPTO_ALGAPI=y 1506CONFIG_CRYPTO_ALGAPI=y
1465CONFIG_CRYPTO_BLKCIPHER=y 1507CONFIG_CRYPTO_BLKCIPHER=y
1508# CONFIG_CRYPTO_SEQIV is not set
1466CONFIG_CRYPTO_HASH=y 1509CONFIG_CRYPTO_HASH=y
1467CONFIG_CRYPTO_MANAGER=y 1510CONFIG_CRYPTO_MANAGER=y
1468CONFIG_CRYPTO_HMAC=y 1511CONFIG_CRYPTO_HMAC=y
@@ -1481,6 +1524,9 @@ CONFIG_CRYPTO_CBC=y
1481CONFIG_CRYPTO_PCBC=m 1524CONFIG_CRYPTO_PCBC=m
1482# CONFIG_CRYPTO_LRW is not set 1525# CONFIG_CRYPTO_LRW is not set
1483# CONFIG_CRYPTO_XTS is not set 1526# CONFIG_CRYPTO_XTS is not set
1527# CONFIG_CRYPTO_CTR is not set
1528# CONFIG_CRYPTO_GCM is not set
1529# CONFIG_CRYPTO_CCM is not set
1484# CONFIG_CRYPTO_CRYPTD is not set 1530# CONFIG_CRYPTO_CRYPTD is not set
1485CONFIG_CRYPTO_DES=y 1531CONFIG_CRYPTO_DES=y
1486# CONFIG_CRYPTO_FCRYPT is not set 1532# CONFIG_CRYPTO_FCRYPT is not set
@@ -1495,11 +1541,14 @@ CONFIG_CRYPTO_DES=y
1495# CONFIG_CRYPTO_KHAZAD is not set 1541# CONFIG_CRYPTO_KHAZAD is not set
1496# CONFIG_CRYPTO_ANUBIS is not set 1542# CONFIG_CRYPTO_ANUBIS is not set
1497# CONFIG_CRYPTO_SEED is not set 1543# CONFIG_CRYPTO_SEED is not set
1544# CONFIG_CRYPTO_SALSA20 is not set
1498# CONFIG_CRYPTO_DEFLATE is not set 1545# CONFIG_CRYPTO_DEFLATE is not set
1499# CONFIG_CRYPTO_MICHAEL_MIC is not set 1546# CONFIG_CRYPTO_MICHAEL_MIC is not set
1500# CONFIG_CRYPTO_CRC32C is not set 1547# CONFIG_CRYPTO_CRC32C is not set
1501# CONFIG_CRYPTO_CAMELLIA is not set 1548# CONFIG_CRYPTO_CAMELLIA is not set
1502# CONFIG_CRYPTO_TEST is not set 1549# CONFIG_CRYPTO_TEST is not set
1503# CONFIG_CRYPTO_AUTHENC is not set 1550# CONFIG_CRYPTO_AUTHENC is not set
1551# CONFIG_CRYPTO_LZO is not set
1504CONFIG_CRYPTO_HW=y 1552CONFIG_CRYPTO_HW=y
1553# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1505# CONFIG_PPC_CLOCK is not set 1554# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc8560_ads_defconfig b/arch/powerpc/configs/mpc8560_ads_defconfig
index 51f9693bacd4..851ac9115617 100644
--- a/arch/powerpc/configs/mpc8560_ads_defconfig
+++ b/arch/powerpc/configs/mpc8560_ads_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:48 2007 4# Mon Mar 24 08:48:27 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,10 +14,10 @@ CONFIG_PPC_85xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y 17CONFIG_E500=y
19CONFIG_BOOKE=y 18CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 19CONFIG_FSL_BOOKE=y
20CONFIG_FSL_EMB_PERFMON=y
21# CONFIG_PHYS_64BIT is not set 21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -67,15 +68,19 @@ CONFIG_SYSVIPC_SYSCTL=y
67# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
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
76# CONFIG_FAIR_GROUP_SCHED is not set 76# CONFIG_FAIR_GROUP_SCHED is not set
77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set
77CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y
78# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
83# CONFIG_NAMESPACES is not set
79CONFIG_BLK_DEV_INITRD=y 84CONFIG_BLK_DEV_INITRD=y
80CONFIG_INITRAMFS_SOURCE="" 85CONFIG_INITRAMFS_SOURCE=""
81# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -89,11 +94,13 @@ CONFIG_HOTPLUG=y
89CONFIG_PRINTK=y 94CONFIG_PRINTK=y
90CONFIG_BUG=y 95CONFIG_BUG=y
91CONFIG_ELF_CORE=y 96CONFIG_ELF_CORE=y
97CONFIG_COMPAT_BRK=y
92CONFIG_BASE_FULL=y 98CONFIG_BASE_FULL=y
93CONFIG_FUTEX=y 99CONFIG_FUTEX=y
94CONFIG_ANON_INODES=y 100CONFIG_ANON_INODES=y
95CONFIG_EPOLL=y 101CONFIG_EPOLL=y
96CONFIG_SIGNALFD=y 102CONFIG_SIGNALFD=y
103CONFIG_TIMERFD=y
97CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
98CONFIG_SHMEM=y 105CONFIG_SHMEM=y
99CONFIG_VM_EVENT_COUNTERS=y 106CONFIG_VM_EVENT_COUNTERS=y
@@ -101,6 +108,13 @@ CONFIG_SLUB_DEBUG=y
101# CONFIG_SLAB is not set 108# CONFIG_SLAB is not set
102CONFIG_SLUB=y 109CONFIG_SLUB=y
103# 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
114CONFIG_HAVE_KPROBES=y
115CONFIG_HAVE_KRETPROBES=y
116CONFIG_PROC_PAGE_MONITOR=y
117CONFIG_SLABINFO=y
104CONFIG_RT_MUTEXES=y 118CONFIG_RT_MUTEXES=y
105# CONFIG_TINY_SHMEM is not set 119# CONFIG_TINY_SHMEM is not set
106CONFIG_BASE_SMALL=0 120CONFIG_BASE_SMALL=0
@@ -123,22 +137,30 @@ CONFIG_DEFAULT_AS=y
123# CONFIG_DEFAULT_CFQ is not set 137# CONFIG_DEFAULT_CFQ is not set
124# CONFIG_DEFAULT_NOOP is not set 138# CONFIG_DEFAULT_NOOP is not set
125CONFIG_DEFAULT_IOSCHED="anticipatory" 139CONFIG_DEFAULT_IOSCHED="anticipatory"
140CONFIG_CLASSIC_RCU=y
126 141
127# 142#
128# Platform support 143# Platform support
129# 144#
130# CONFIG_PPC_MPC52xx is not set 145# CONFIG_PPC_MPC512x is not set
131# CONFIG_PPC_MPC5200 is not set 146# CONFIG_PPC_MPC5121 is not set
132# CONFIG_PPC_CELL is not set 147# CONFIG_PPC_CELL is not set
133# CONFIG_PPC_CELL_NATIVE is not set 148# CONFIG_PPC_CELL_NATIVE is not set
134# CONFIG_PQ2ADS is not set 149# CONFIG_PQ2ADS is not set
150CONFIG_MPC85xx=y
135# CONFIG_MPC8540_ADS is not set 151# CONFIG_MPC8540_ADS is not set
136CONFIG_MPC8560_ADS=y 152CONFIG_MPC8560_ADS=y
137# CONFIG_MPC85xx_CDS is not set 153# CONFIG_MPC85xx_CDS is not set
138# CONFIG_MPC85xx_MDS is not set 154# CONFIG_MPC85xx_MDS is not set
139# CONFIG_MPC85xx_DS is not set 155# CONFIG_MPC85xx_DS is not set
140CONFIG_MPC8560=y 156# CONFIG_STX_GP3 is not set
141CONFIG_MPC85xx=y 157# CONFIG_TQM8540 is not set
158# CONFIG_TQM8541 is not set
159# CONFIG_TQM8555 is not set
160# CONFIG_TQM8560 is not set
161# CONFIG_SBC8548 is not set
162# CONFIG_SBC8560 is not set
163# CONFIG_IPIC is not set
142CONFIG_MPIC=y 164CONFIG_MPIC=y
143# CONFIG_MPIC_WEIRD is not set 165# CONFIG_MPIC_WEIRD is not set
144# CONFIG_PPC_I8259 is not set 166# CONFIG_PPC_I8259 is not set
@@ -167,13 +189,17 @@ CONFIG_HZ_250=y
167# CONFIG_HZ_300 is not set 189# CONFIG_HZ_300 is not set
168# CONFIG_HZ_1000 is not set 190# CONFIG_HZ_1000 is not set
169CONFIG_HZ=250 191CONFIG_HZ=250
192# CONFIG_SCHED_HRTICK is not set
170CONFIG_PREEMPT_NONE=y 193CONFIG_PREEMPT_NONE=y
171# CONFIG_PREEMPT_VOLUNTARY is not set 194# CONFIG_PREEMPT_VOLUNTARY is not set
172# CONFIG_PREEMPT is not set 195# CONFIG_PREEMPT is not set
173CONFIG_BINFMT_ELF=y 196CONFIG_BINFMT_ELF=y
174CONFIG_BINFMT_MISC=y 197CONFIG_BINFMT_MISC=y
175CONFIG_MATH_EMULATION=y 198CONFIG_MATH_EMULATION=y
199# CONFIG_IOMMU_HELPER is not set
176CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 200CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
201CONFIG_ARCH_HAS_WALK_MEMORY=y
202CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
177CONFIG_ARCH_FLATMEM_ENABLE=y 203CONFIG_ARCH_FLATMEM_ENABLE=y
178CONFIG_ARCH_POPULATES_NODE_MAP=y 204CONFIG_ARCH_POPULATES_NODE_MAP=y
179CONFIG_SELECT_MEMORY_MODEL=y 205CONFIG_SELECT_MEMORY_MODEL=y
@@ -192,11 +218,7 @@ CONFIG_VIRT_TO_BUS=y
192# CONFIG_PROC_DEVICETREE is not set 218# CONFIG_PROC_DEVICETREE is not set
193# CONFIG_CMDLINE_BOOL is not set 219# CONFIG_CMDLINE_BOOL is not set
194# CONFIG_PM is not set 220# CONFIG_PM is not set
195CONFIG_SUSPEND_UP_POSSIBLE=y
196CONFIG_HIBERNATION_UP_POSSIBLE=y
197# CONFIG_SECCOMP is not set 221# CONFIG_SECCOMP is not set
198CONFIG_WANT_DEVICE_TREE=y
199CONFIG_DEVICE_TREE=""
200CONFIG_ISA_DMA_API=y 222CONFIG_ISA_DMA_API=y
201 223
202# 224#
@@ -246,6 +268,7 @@ CONFIG_XFRM=y
246# CONFIG_XFRM_USER is not set 268# CONFIG_XFRM_USER is not set
247# CONFIG_XFRM_SUB_POLICY is not set 269# CONFIG_XFRM_SUB_POLICY is not set
248# CONFIG_XFRM_MIGRATE is not set 270# CONFIG_XFRM_MIGRATE is not set
271# CONFIG_XFRM_STATISTICS is not set
249# CONFIG_NET_KEY is not set 272# CONFIG_NET_KEY is not set
250CONFIG_INET=y 273CONFIG_INET=y
251CONFIG_IP_MULTICAST=y 274CONFIG_IP_MULTICAST=y
@@ -301,6 +324,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
301# 324#
302# CONFIG_NET_PKTGEN is not set 325# CONFIG_NET_PKTGEN is not set
303# CONFIG_HAMRADIO is not set 326# CONFIG_HAMRADIO is not set
327# CONFIG_CAN is not set
304# CONFIG_IRDA is not set 328# CONFIG_IRDA is not set
305# CONFIG_BT is not set 329# CONFIG_BT is not set
306# CONFIG_AF_RXRPC is not set 330# CONFIG_AF_RXRPC is not set
@@ -347,7 +371,7 @@ CONFIG_BLK_DEV_LOOP=y
347CONFIG_BLK_DEV_RAM=y 371CONFIG_BLK_DEV_RAM=y
348CONFIG_BLK_DEV_RAM_COUNT=16 372CONFIG_BLK_DEV_RAM_COUNT=16
349CONFIG_BLK_DEV_RAM_SIZE=32768 373CONFIG_BLK_DEV_RAM_SIZE=32768
350CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 374# CONFIG_BLK_DEV_XIP is not set
351# CONFIG_CDROM_PKTCDVD is not set 375# CONFIG_CDROM_PKTCDVD is not set
352# CONFIG_ATA_OVER_ETH is not set 376# CONFIG_ATA_OVER_ETH is not set
353CONFIG_MISC_DEVICES=y 377CONFIG_MISC_DEVICES=y
@@ -355,6 +379,8 @@ CONFIG_MISC_DEVICES=y
355# CONFIG_EEPROM_93CX6 is not set 379# CONFIG_EEPROM_93CX6 is not set
356# CONFIG_SGI_IOC4 is not set 380# CONFIG_SGI_IOC4 is not set
357# CONFIG_TIFM_CORE is not set 381# CONFIG_TIFM_CORE is not set
382# CONFIG_ENCLOSURE_SERVICES is not set
383CONFIG_HAVE_IDE=y
358# CONFIG_IDE is not set 384# CONFIG_IDE is not set
359 385
360# 386#
@@ -383,7 +409,6 @@ CONFIG_NETDEVICES=y
383# CONFIG_EQUALIZER is not set 409# CONFIG_EQUALIZER is not set
384# CONFIG_TUN is not set 410# CONFIG_TUN is not set
385# CONFIG_VETH is not set 411# CONFIG_VETH is not set
386# CONFIG_IP1000 is not set
387# CONFIG_ARCNET is not set 412# CONFIG_ARCNET is not set
388CONFIG_PHYLIB=y 413CONFIG_PHYLIB=y
389 414
@@ -399,6 +424,7 @@ CONFIG_DAVICOM_PHY=y
399# CONFIG_SMSC_PHY is not set 424# CONFIG_SMSC_PHY is not set
400# CONFIG_BROADCOM_PHY is not set 425# CONFIG_BROADCOM_PHY is not set
401# CONFIG_ICPLUS_PHY is not set 426# CONFIG_ICPLUS_PHY is not set
427# CONFIG_REALTEK_PHY is not set
402# CONFIG_FIXED_PHY is not set 428# CONFIG_FIXED_PHY is not set
403# CONFIG_MDIO_BITBANG is not set 429# CONFIG_MDIO_BITBANG is not set
404CONFIG_NET_ETHERNET=y 430CONFIG_NET_ETHERNET=y
@@ -426,6 +452,9 @@ CONFIG_E1000=y
426CONFIG_E1000_NAPI=y 452CONFIG_E1000_NAPI=y
427# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 453# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
428# CONFIG_E1000E is not set 454# CONFIG_E1000E is not set
455# CONFIG_E1000E_ENABLED is not set
456# CONFIG_IP1000 is not set
457# CONFIG_IGB is not set
429# CONFIG_NS83820 is not set 458# CONFIG_NS83820 is not set
430# CONFIG_HAMACHI is not set 459# CONFIG_HAMACHI is not set
431# CONFIG_YELLOWFIN is not set 460# CONFIG_YELLOWFIN is not set
@@ -452,6 +481,7 @@ CONFIG_NETDEV_10000=y
452# CONFIG_NIU is not set 481# CONFIG_NIU is not set
453# CONFIG_MLX4_CORE is not set 482# CONFIG_MLX4_CORE is not set
454# CONFIG_TEHUTI is not set 483# CONFIG_TEHUTI is not set
484# CONFIG_BNX2X is not set
455# CONFIG_TR is not set 485# CONFIG_TR is not set
456 486
457# 487#
@@ -464,7 +494,6 @@ CONFIG_NETDEV_10000=y
464# CONFIG_HIPPI is not set 494# CONFIG_HIPPI is not set
465# CONFIG_PPP is not set 495# CONFIG_PPP is not set
466# CONFIG_SLIP is not set 496# CONFIG_SLIP is not set
467# CONFIG_SHAPER is not set
468# CONFIG_NETCONSOLE is not set 497# CONFIG_NETCONSOLE is not set
469# CONFIG_NETPOLL is not set 498# CONFIG_NETPOLL is not set
470# CONFIG_NET_POLL_CONTROLLER is not set 499# CONFIG_NET_POLL_CONTROLLER is not set
@@ -507,6 +536,7 @@ CONFIG_INPUT=y
507# 536#
508# CONFIG_VT is not set 537# CONFIG_VT is not set
509# CONFIG_SERIAL_NONSTANDARD is not set 538# CONFIG_SERIAL_NONSTANDARD is not set
539# CONFIG_NOZOMI is not set
510 540
511# 541#
512# Serial drivers 542# Serial drivers
@@ -567,6 +597,7 @@ CONFIG_HWMON=y
567# CONFIG_SENSORS_W83627HF is not set 597# CONFIG_SENSORS_W83627HF is not set
568# CONFIG_SENSORS_W83627EHF is not set 598# CONFIG_SENSORS_W83627EHF is not set
569# CONFIG_HWMON_DEBUG_CHIP is not set 599# CONFIG_HWMON_DEBUG_CHIP is not set
600# CONFIG_THERMAL is not set
570# CONFIG_WATCHDOG is not set 601# CONFIG_WATCHDOG is not set
571 602
572# 603#
@@ -619,16 +650,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
619# 650#
620# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 651# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
621# 652#
622
623#
624# USB Gadget Support
625#
626# CONFIG_USB_GADGET is not set 653# CONFIG_USB_GADGET is not set
627# CONFIG_MMC is not set 654# CONFIG_MMC is not set
655# CONFIG_MEMSTICK is not set
628# CONFIG_NEW_LEDS is not set 656# CONFIG_NEW_LEDS is not set
629# CONFIG_INFINIBAND is not set 657# CONFIG_INFINIBAND is not set
630# CONFIG_EDAC is not set 658# CONFIG_EDAC is not set
631# CONFIG_RTC_CLASS is not set 659# CONFIG_RTC_CLASS is not set
660# CONFIG_DMADEVICES is not set
632 661
633# 662#
634# Userspace I/O 663# Userspace I/O
@@ -654,12 +683,10 @@ CONFIG_FS_MBCACHE=y
654# CONFIG_XFS_FS is not set 683# CONFIG_XFS_FS is not set
655# CONFIG_GFS2_FS is not set 684# CONFIG_GFS2_FS is not set
656# CONFIG_OCFS2_FS is not set 685# CONFIG_OCFS2_FS is not set
657# CONFIG_MINIX_FS is not set 686CONFIG_DNOTIFY=y
658# CONFIG_ROMFS_FS is not set
659CONFIG_INOTIFY=y 687CONFIG_INOTIFY=y
660CONFIG_INOTIFY_USER=y 688CONFIG_INOTIFY_USER=y
661# CONFIG_QUOTA is not set 689# CONFIG_QUOTA is not set
662CONFIG_DNOTIFY=y
663# CONFIG_AUTOFS_FS is not set 690# CONFIG_AUTOFS_FS is not set
664# CONFIG_AUTOFS4_FS is not set 691# CONFIG_AUTOFS4_FS is not set
665# CONFIG_FUSE_FS is not set 692# CONFIG_FUSE_FS is not set
@@ -701,8 +728,10 @@ CONFIG_TMPFS=y
701# CONFIG_EFS_FS is not set 728# CONFIG_EFS_FS is not set
702# CONFIG_CRAMFS is not set 729# CONFIG_CRAMFS is not set
703# CONFIG_VXFS_FS is not set 730# CONFIG_VXFS_FS is not set
731# CONFIG_MINIX_FS is not set
704# CONFIG_HPFS_FS is not set 732# CONFIG_HPFS_FS is not set
705# CONFIG_QNX4FS_FS is not set 733# CONFIG_QNX4FS_FS is not set
734# CONFIG_ROMFS_FS is not set
706# CONFIG_SYSV_FS is not set 735# CONFIG_SYSV_FS is not set
707# CONFIG_UFS_FS is not set 736# CONFIG_UFS_FS is not set
708CONFIG_NETWORK_FILESYSTEMS=y 737CONFIG_NETWORK_FILESYSTEMS=y
@@ -743,7 +772,6 @@ CONFIG_PARTITION_ADVANCED=y
743# CONFIG_SYSV68_PARTITION is not set 772# CONFIG_SYSV68_PARTITION is not set
744# CONFIG_NLS is not set 773# CONFIG_NLS is not set
745# CONFIG_DLM is not set 774# CONFIG_DLM is not set
746# CONFIG_UCC_SLOW is not set
747 775
748# 776#
749# Library routines 777# Library routines
@@ -759,7 +787,6 @@ CONFIG_PLIST=y
759CONFIG_HAS_IOMEM=y 787CONFIG_HAS_IOMEM=y
760CONFIG_HAS_IOPORT=y 788CONFIG_HAS_IOPORT=y
761CONFIG_HAS_DMA=y 789CONFIG_HAS_DMA=y
762# CONFIG_INSTRUMENTATION is not set
763 790
764# 791#
765# Kernel hacking 792# Kernel hacking
@@ -778,6 +805,7 @@ CONFIG_SCHED_DEBUG=y
778# CONFIG_SCHEDSTATS is not set 805# CONFIG_SCHEDSTATS is not set
779# CONFIG_TIMER_STATS is not set 806# CONFIG_TIMER_STATS is not set
780# CONFIG_SLUB_DEBUG_ON is not set 807# CONFIG_SLUB_DEBUG_ON is not set
808# CONFIG_SLUB_STATS is not set
781# CONFIG_DEBUG_RT_MUTEXES is not set 809# CONFIG_DEBUG_RT_MUTEXES is not set
782# CONFIG_RT_MUTEX_TESTER is not set 810# CONFIG_RT_MUTEX_TESTER is not set
783# CONFIG_DEBUG_SPINLOCK is not set 811# CONFIG_DEBUG_SPINLOCK is not set
@@ -790,8 +818,8 @@ CONFIG_DEBUG_MUTEXES=y
790# CONFIG_DEBUG_VM is not set 818# CONFIG_DEBUG_VM is not set
791# CONFIG_DEBUG_LIST is not set 819# CONFIG_DEBUG_LIST is not set
792# CONFIG_DEBUG_SG is not set 820# CONFIG_DEBUG_SG is not set
793CONFIG_FORCED_INLINING=y
794# CONFIG_BOOT_PRINTK_DELAY is not set 821# CONFIG_BOOT_PRINTK_DELAY is not set
822# CONFIG_BACKTRACE_SELF_TEST is not set
795# CONFIG_FAULT_INJECTION is not set 823# CONFIG_FAULT_INJECTION is not set
796# CONFIG_SAMPLES is not set 824# CONFIG_SAMPLES is not set
797# CONFIG_DEBUG_STACKOVERFLOW is not set 825# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -808,6 +836,50 @@ CONFIG_FORCED_INLINING=y
808# CONFIG_KEYS is not set 836# CONFIG_KEYS is not set
809# CONFIG_SECURITY is not set 837# CONFIG_SECURITY is not set
810# CONFIG_SECURITY_FILE_CAPABILITIES is not set 838# CONFIG_SECURITY_FILE_CAPABILITIES is not set
811# CONFIG_CRYPTO is not set 839CONFIG_CRYPTO=y
840# CONFIG_CRYPTO_SEQIV is not set
841# CONFIG_CRYPTO_MANAGER is not set
842# CONFIG_CRYPTO_HMAC is not set
843# CONFIG_CRYPTO_XCBC is not set
844# CONFIG_CRYPTO_NULL is not set
845# CONFIG_CRYPTO_MD4 is not set
846# CONFIG_CRYPTO_MD5 is not set
847# CONFIG_CRYPTO_SHA1 is not set
848# CONFIG_CRYPTO_SHA256 is not set
849# CONFIG_CRYPTO_SHA512 is not set
850# CONFIG_CRYPTO_WP512 is not set
851# CONFIG_CRYPTO_TGR192 is not set
852# CONFIG_CRYPTO_GF128MUL is not set
853# CONFIG_CRYPTO_ECB is not set
854# CONFIG_CRYPTO_CBC is not set
855# CONFIG_CRYPTO_PCBC is not set
856# CONFIG_CRYPTO_LRW is not set
857# CONFIG_CRYPTO_XTS is not set
858# CONFIG_CRYPTO_CTR is not set
859# CONFIG_CRYPTO_GCM is not set
860# CONFIG_CRYPTO_CCM is not set
861# CONFIG_CRYPTO_CRYPTD is not set
862# CONFIG_CRYPTO_DES is not set
863# CONFIG_CRYPTO_FCRYPT is not set
864# CONFIG_CRYPTO_BLOWFISH is not set
865# CONFIG_CRYPTO_TWOFISH is not set
866# CONFIG_CRYPTO_SERPENT is not set
867# CONFIG_CRYPTO_AES is not set
868# CONFIG_CRYPTO_CAST5 is not set
869# CONFIG_CRYPTO_CAST6 is not set
870# CONFIG_CRYPTO_TEA is not set
871# CONFIG_CRYPTO_ARC4 is not set
872# CONFIG_CRYPTO_KHAZAD is not set
873# CONFIG_CRYPTO_ANUBIS is not set
874# CONFIG_CRYPTO_SEED is not set
875# CONFIG_CRYPTO_SALSA20 is not set
876# CONFIG_CRYPTO_DEFLATE is not set
877# CONFIG_CRYPTO_MICHAEL_MIC is not set
878# CONFIG_CRYPTO_CRC32C is not set
879# CONFIG_CRYPTO_CAMELLIA is not set
880# CONFIG_CRYPTO_AUTHENC is not set
881# CONFIG_CRYPTO_LZO is not set
882CONFIG_CRYPTO_HW=y
883# CONFIG_CRYPTO_DEV_HIFN_795X is not set
812# CONFIG_PPC_CLOCK is not set 884# CONFIG_PPC_CLOCK is not set
813CONFIG_PPC_LIB_RHEAP=y 885CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc8568mds_defconfig b/arch/powerpc/configs/mpc8568mds_defconfig
index f51b58ae329a..e7da4b96cdeb 100644
--- a/arch/powerpc/configs/mpc8568mds_defconfig
+++ b/arch/powerpc/configs/mpc8568mds_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:50 2007 4# Mon Mar 24 08:48:28 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,10 +14,10 @@ CONFIG_PPC_85xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y 17CONFIG_E500=y
19CONFIG_BOOKE=y 18CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 19CONFIG_FSL_BOOKE=y
20CONFIG_FSL_EMB_PERFMON=y
21# CONFIG_PHYS_64BIT is not set 21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -67,15 +68,19 @@ CONFIG_SYSVIPC_SYSCTL=y
67# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
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
76# CONFIG_FAIR_GROUP_SCHED is not set 76# CONFIG_FAIR_GROUP_SCHED is not set
77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set
77CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y
78# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
83# CONFIG_NAMESPACES is not set
79CONFIG_BLK_DEV_INITRD=y 84CONFIG_BLK_DEV_INITRD=y
80CONFIG_INITRAMFS_SOURCE="" 85CONFIG_INITRAMFS_SOURCE=""
81# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -87,11 +92,13 @@ CONFIG_HOTPLUG=y
87CONFIG_PRINTK=y 92CONFIG_PRINTK=y
88CONFIG_BUG=y 93CONFIG_BUG=y
89CONFIG_ELF_CORE=y 94CONFIG_ELF_CORE=y
95CONFIG_COMPAT_BRK=y
90CONFIG_BASE_FULL=y 96CONFIG_BASE_FULL=y
91CONFIG_FUTEX=y 97CONFIG_FUTEX=y
92CONFIG_ANON_INODES=y 98CONFIG_ANON_INODES=y
93# CONFIG_EPOLL is not set 99# CONFIG_EPOLL is not set
94CONFIG_SIGNALFD=y 100CONFIG_SIGNALFD=y
101CONFIG_TIMERFD=y
95CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
96CONFIG_SHMEM=y 103CONFIG_SHMEM=y
97CONFIG_VM_EVENT_COUNTERS=y 104CONFIG_VM_EVENT_COUNTERS=y
@@ -99,6 +106,13 @@ CONFIG_SLUB_DEBUG=y
99# CONFIG_SLAB is not set 106# CONFIG_SLAB is not set
100CONFIG_SLUB=y 107CONFIG_SLUB=y
101# CONFIG_SLOB is not set 108# CONFIG_SLOB is not set
109# CONFIG_PROFILING is not set
110# CONFIG_MARKERS is not set
111CONFIG_HAVE_OPROFILE=y
112CONFIG_HAVE_KPROBES=y
113CONFIG_HAVE_KRETPROBES=y
114CONFIG_PROC_PAGE_MONITOR=y
115CONFIG_SLABINFO=y
102CONFIG_RT_MUTEXES=y 116CONFIG_RT_MUTEXES=y
103# CONFIG_TINY_SHMEM is not set 117# CONFIG_TINY_SHMEM is not set
104CONFIG_BASE_SMALL=0 118CONFIG_BASE_SMALL=0
@@ -126,21 +140,30 @@ CONFIG_DEFAULT_AS=y
126# CONFIG_DEFAULT_CFQ is not set 140# CONFIG_DEFAULT_CFQ is not set
127# CONFIG_DEFAULT_NOOP is not set 141# CONFIG_DEFAULT_NOOP is not set
128CONFIG_DEFAULT_IOSCHED="anticipatory" 142CONFIG_DEFAULT_IOSCHED="anticipatory"
143CONFIG_CLASSIC_RCU=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
153CONFIG_MPC85xx=y
138# CONFIG_MPC8540_ADS is not set 154# CONFIG_MPC8540_ADS is not set
139# CONFIG_MPC8560_ADS is not set 155# CONFIG_MPC8560_ADS is not set
140# CONFIG_MPC85xx_CDS is not set 156# CONFIG_MPC85xx_CDS is not set
141CONFIG_MPC85xx_MDS=y 157CONFIG_MPC85xx_MDS=y
142# CONFIG_MPC85xx_DS is not set 158# CONFIG_MPC85xx_DS is not set
143CONFIG_MPC85xx=y 159# CONFIG_STX_GP3 is not set
160# CONFIG_TQM8540 is not set
161# CONFIG_TQM8541 is not set
162# CONFIG_TQM8555 is not set
163# CONFIG_TQM8560 is not set
164# CONFIG_SBC8548 is not set
165# CONFIG_SBC8560 is not set
166# CONFIG_IPIC is not set
144CONFIG_MPIC=y 167CONFIG_MPIC=y
145# CONFIG_MPIC_WEIRD is not set 168# CONFIG_MPIC_WEIRD is not set
146# CONFIG_PPC_I8259 is not set 169# CONFIG_PPC_I8259 is not set
@@ -168,13 +191,17 @@ CONFIG_HZ_250=y
168# CONFIG_HZ_300 is not set 191# CONFIG_HZ_300 is not set
169# CONFIG_HZ_1000 is not set 192# CONFIG_HZ_1000 is not set
170CONFIG_HZ=250 193CONFIG_HZ=250
194# CONFIG_SCHED_HRTICK is not set
171CONFIG_PREEMPT_NONE=y 195CONFIG_PREEMPT_NONE=y
172# CONFIG_PREEMPT_VOLUNTARY is not set 196# CONFIG_PREEMPT_VOLUNTARY is not set
173# CONFIG_PREEMPT is not set 197# CONFIG_PREEMPT is not set
174CONFIG_BINFMT_ELF=y 198CONFIG_BINFMT_ELF=y
175# CONFIG_BINFMT_MISC is not set 199# CONFIG_BINFMT_MISC is not set
176CONFIG_MATH_EMULATION=y 200CONFIG_MATH_EMULATION=y
201# CONFIG_IOMMU_HELPER is not set
177CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 202CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
203CONFIG_ARCH_HAS_WALK_MEMORY=y
204CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
178CONFIG_ARCH_FLATMEM_ENABLE=y 205CONFIG_ARCH_FLATMEM_ENABLE=y
179CONFIG_ARCH_POPULATES_NODE_MAP=y 206CONFIG_ARCH_POPULATES_NODE_MAP=y
180CONFIG_SELECT_MEMORY_MODEL=y 207CONFIG_SELECT_MEMORY_MODEL=y
@@ -193,11 +220,7 @@ CONFIG_VIRT_TO_BUS=y
193CONFIG_PROC_DEVICETREE=y 220CONFIG_PROC_DEVICETREE=y
194# CONFIG_CMDLINE_BOOL is not set 221# CONFIG_CMDLINE_BOOL is not set
195# CONFIG_PM is not set 222# CONFIG_PM is not set
196CONFIG_SUSPEND_UP_POSSIBLE=y
197CONFIG_HIBERNATION_UP_POSSIBLE=y
198CONFIG_SECCOMP=y 223CONFIG_SECCOMP=y
199CONFIG_WANT_DEVICE_TREE=y
200CONFIG_DEVICE_TREE=""
201CONFIG_ISA_DMA_API=y 224CONFIG_ISA_DMA_API=y
202 225
203# 226#
@@ -247,6 +270,7 @@ CONFIG_XFRM=y
247# CONFIG_XFRM_USER is not set 270# CONFIG_XFRM_USER is not set
248# CONFIG_XFRM_SUB_POLICY is not set 271# CONFIG_XFRM_SUB_POLICY is not set
249# CONFIG_XFRM_MIGRATE is not set 272# CONFIG_XFRM_MIGRATE is not set
273# CONFIG_XFRM_STATISTICS is not set
250# CONFIG_NET_KEY is not set 274# CONFIG_NET_KEY is not set
251CONFIG_INET=y 275CONFIG_INET=y
252CONFIG_IP_MULTICAST=y 276CONFIG_IP_MULTICAST=y
@@ -302,6 +326,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
302# 326#
303# CONFIG_NET_PKTGEN is not set 327# CONFIG_NET_PKTGEN is not set
304# CONFIG_HAMRADIO is not set 328# CONFIG_HAMRADIO is not set
329# CONFIG_CAN is not set
305# CONFIG_IRDA is not set 330# CONFIG_IRDA is not set
306# CONFIG_BT is not set 331# CONFIG_BT is not set
307# CONFIG_AF_RXRPC is not set 332# CONFIG_AF_RXRPC is not set
@@ -348,7 +373,7 @@ CONFIG_BLK_DEV_LOOP=y
348CONFIG_BLK_DEV_RAM=y 373CONFIG_BLK_DEV_RAM=y
349CONFIG_BLK_DEV_RAM_COUNT=16 374CONFIG_BLK_DEV_RAM_COUNT=16
350CONFIG_BLK_DEV_RAM_SIZE=32768 375CONFIG_BLK_DEV_RAM_SIZE=32768
351CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 376# CONFIG_BLK_DEV_XIP is not set
352# CONFIG_CDROM_PKTCDVD is not set 377# CONFIG_CDROM_PKTCDVD is not set
353# CONFIG_ATA_OVER_ETH is not set 378# CONFIG_ATA_OVER_ETH is not set
354CONFIG_MISC_DEVICES=y 379CONFIG_MISC_DEVICES=y
@@ -356,6 +381,8 @@ CONFIG_MISC_DEVICES=y
356# CONFIG_EEPROM_93CX6 is not set 381# CONFIG_EEPROM_93CX6 is not set
357# CONFIG_SGI_IOC4 is not set 382# CONFIG_SGI_IOC4 is not set
358# CONFIG_TIFM_CORE is not set 383# CONFIG_TIFM_CORE is not set
384# CONFIG_ENCLOSURE_SERVICES is not set
385CONFIG_HAVE_IDE=y
359# CONFIG_IDE is not set 386# CONFIG_IDE is not set
360 387
361# 388#
@@ -420,6 +447,7 @@ CONFIG_SCSI_LOWLEVEL=y
420# CONFIG_SCSI_IPS is not set 447# CONFIG_SCSI_IPS is not set
421# CONFIG_SCSI_INITIO is not set 448# CONFIG_SCSI_INITIO is not set
422# CONFIG_SCSI_INIA100 is not set 449# CONFIG_SCSI_INIA100 is not set
450# CONFIG_SCSI_MVSAS is not set
423# CONFIG_SCSI_STEX is not set 451# CONFIG_SCSI_STEX is not set
424# CONFIG_SCSI_SYM53C8XX_2 is not set 452# CONFIG_SCSI_SYM53C8XX_2 is not set
425# CONFIG_SCSI_QLOGIC_1280 is not set 453# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -450,7 +478,6 @@ CONFIG_NETDEVICES=y
450# CONFIG_EQUALIZER is not set 478# CONFIG_EQUALIZER is not set
451# CONFIG_TUN is not set 479# CONFIG_TUN is not set
452# CONFIG_VETH is not set 480# CONFIG_VETH is not set
453# CONFIG_IP1000 is not set
454# CONFIG_ARCNET is not set 481# CONFIG_ARCNET is not set
455CONFIG_PHYLIB=y 482CONFIG_PHYLIB=y
456 483
@@ -466,6 +493,7 @@ CONFIG_MARVELL_PHY=y
466# CONFIG_SMSC_PHY is not set 493# CONFIG_SMSC_PHY is not set
467# CONFIG_BROADCOM_PHY is not set 494# CONFIG_BROADCOM_PHY is not set
468# CONFIG_ICPLUS_PHY is not set 495# CONFIG_ICPLUS_PHY is not set
496# CONFIG_REALTEK_PHY is not set
469# CONFIG_FIXED_PHY is not set 497# CONFIG_FIXED_PHY is not set
470# CONFIG_MDIO_BITBANG is not set 498# CONFIG_MDIO_BITBANG is not set
471CONFIG_NET_ETHERNET=y 499CONFIG_NET_ETHERNET=y
@@ -487,6 +515,9 @@ CONFIG_NETDEV_1000=y
487# CONFIG_DL2K is not set 515# CONFIG_DL2K is not set
488# CONFIG_E1000 is not set 516# CONFIG_E1000 is not set
489# CONFIG_E1000E is not set 517# CONFIG_E1000E is not set
518# CONFIG_E1000E_ENABLED is not set
519# CONFIG_IP1000 is not set
520# CONFIG_IGB is not set
490# CONFIG_NS83820 is not set 521# CONFIG_NS83820 is not set
491# CONFIG_HAMACHI is not set 522# CONFIG_HAMACHI is not set
492# CONFIG_YELLOWFIN is not set 523# CONFIG_YELLOWFIN is not set
@@ -514,6 +545,7 @@ CONFIG_NETDEV_10000=y
514# CONFIG_NIU is not set 545# CONFIG_NIU is not set
515# CONFIG_MLX4_CORE is not set 546# CONFIG_MLX4_CORE is not set
516# CONFIG_TEHUTI is not set 547# CONFIG_TEHUTI is not set
548# CONFIG_BNX2X is not set
517# CONFIG_TR is not set 549# CONFIG_TR is not set
518 550
519# 551#
@@ -527,7 +559,6 @@ CONFIG_NETDEV_10000=y
527# CONFIG_PPP is not set 559# CONFIG_PPP is not set
528# CONFIG_SLIP is not set 560# CONFIG_SLIP is not set
529# CONFIG_NET_FC is not set 561# CONFIG_NET_FC is not set
530# CONFIG_SHAPER is not set
531# CONFIG_NETCONSOLE is not set 562# CONFIG_NETCONSOLE is not set
532# CONFIG_NETPOLL is not set 563# CONFIG_NETPOLL is not set
533# CONFIG_NET_POLL_CONTROLLER is not set 564# CONFIG_NET_POLL_CONTROLLER is not set
@@ -570,6 +601,7 @@ CONFIG_INPUT=y
570# 601#
571# CONFIG_VT is not set 602# CONFIG_VT is not set
572# CONFIG_SERIAL_NONSTANDARD is not set 603# CONFIG_SERIAL_NONSTANDARD is not set
604# CONFIG_NOZOMI is not set
573 605
574# 606#
575# Serial drivers 607# Serial drivers
@@ -590,6 +622,7 @@ CONFIG_SERIAL_CORE=y
590CONFIG_SERIAL_CORE_CONSOLE=y 622CONFIG_SERIAL_CORE_CONSOLE=y
591# CONFIG_SERIAL_JSM is not set 623# CONFIG_SERIAL_JSM is not set
592# CONFIG_SERIAL_OF_PLATFORM is not set 624# CONFIG_SERIAL_OF_PLATFORM is not set
625# CONFIG_SERIAL_QE is not set
593CONFIG_UNIX98_PTYS=y 626CONFIG_UNIX98_PTYS=y
594CONFIG_LEGACY_PTYS=y 627CONFIG_LEGACY_PTYS=y
595CONFIG_LEGACY_PTY_COUNT=256 628CONFIG_LEGACY_PTY_COUNT=256
@@ -644,14 +677,12 @@ CONFIG_I2C_MPC=y
644# 677#
645# Miscellaneous I2C Chip support 678# Miscellaneous I2C Chip support
646# 679#
647# CONFIG_SENSORS_DS1337 is not set
648# CONFIG_SENSORS_DS1374 is not set
649# CONFIG_DS1682 is not set 680# CONFIG_DS1682 is not set
650# CONFIG_SENSORS_EEPROM is not set 681# CONFIG_SENSORS_EEPROM is not set
651# CONFIG_SENSORS_PCF8574 is not set 682# CONFIG_SENSORS_PCF8574 is not set
652# CONFIG_SENSORS_PCA9539 is not set 683# CONFIG_PCF8575 is not set
653# CONFIG_SENSORS_PCF8591 is not set 684# CONFIG_SENSORS_PCF8591 is not set
654# CONFIG_SENSORS_M41T00 is not set 685# CONFIG_TPS65010 is not set
655# CONFIG_SENSORS_MAX6875 is not set 686# CONFIG_SENSORS_MAX6875 is not set
656# CONFIG_SENSORS_TSL2550 is not set 687# CONFIG_SENSORS_TSL2550 is not set
657# CONFIG_I2C_DEBUG_CORE is not set 688# CONFIG_I2C_DEBUG_CORE is not set
@@ -676,6 +707,7 @@ CONFIG_HWMON=y
676# CONFIG_SENSORS_ADM1031 is not set 707# CONFIG_SENSORS_ADM1031 is not set
677# CONFIG_SENSORS_ADM9240 is not set 708# CONFIG_SENSORS_ADM9240 is not set
678# CONFIG_SENSORS_ADT7470 is not set 709# CONFIG_SENSORS_ADT7470 is not set
710# CONFIG_SENSORS_ADT7473 is not set
679# CONFIG_SENSORS_ATXP1 is not set 711# CONFIG_SENSORS_ATXP1 is not set
680# CONFIG_SENSORS_DS1621 is not set 712# CONFIG_SENSORS_DS1621 is not set
681# CONFIG_SENSORS_I5K_AMB is not set 713# CONFIG_SENSORS_I5K_AMB is not set
@@ -705,6 +737,7 @@ CONFIG_HWMON=y
705# CONFIG_SENSORS_SMSC47M1 is not set 737# CONFIG_SENSORS_SMSC47M1 is not set
706# CONFIG_SENSORS_SMSC47M192 is not set 738# CONFIG_SENSORS_SMSC47M192 is not set
707# CONFIG_SENSORS_SMSC47B397 is not set 739# CONFIG_SENSORS_SMSC47B397 is not set
740# CONFIG_SENSORS_ADS7828 is not set
708# CONFIG_SENSORS_THMC50 is not set 741# CONFIG_SENSORS_THMC50 is not set
709# CONFIG_SENSORS_VIA686A is not set 742# CONFIG_SENSORS_VIA686A is not set
710# CONFIG_SENSORS_VT1211 is not set 743# CONFIG_SENSORS_VT1211 is not set
@@ -714,9 +747,11 @@ CONFIG_HWMON=y
714# CONFIG_SENSORS_W83792D is not set 747# CONFIG_SENSORS_W83792D is not set
715# CONFIG_SENSORS_W83793 is not set 748# CONFIG_SENSORS_W83793 is not set
716# CONFIG_SENSORS_W83L785TS is not set 749# CONFIG_SENSORS_W83L785TS is not set
750# CONFIG_SENSORS_W83L786NG is not set
717# CONFIG_SENSORS_W83627HF is not set 751# CONFIG_SENSORS_W83627HF is not set
718# CONFIG_SENSORS_W83627EHF is not set 752# CONFIG_SENSORS_W83627EHF is not set
719# CONFIG_HWMON_DEBUG_CHIP is not set 753# CONFIG_HWMON_DEBUG_CHIP is not set
754# CONFIG_THERMAL is not set
720CONFIG_WATCHDOG=y 755CONFIG_WATCHDOG=y
721# CONFIG_WATCHDOG_NOWAYOUT is not set 756# CONFIG_WATCHDOG_NOWAYOUT is not set
722 757
@@ -782,17 +817,18 @@ CONFIG_USB_ARCH_HAS_EHCI=y
782# 817#
783# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 818# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
784# 819#
785
786#
787# USB Gadget Support
788#
789# CONFIG_USB_GADGET is not set 820# CONFIG_USB_GADGET is not set
790# CONFIG_MMC is not set 821# CONFIG_MMC is not set
822# CONFIG_MEMSTICK is not set
791# CONFIG_NEW_LEDS is not set 823# CONFIG_NEW_LEDS is not set
792# CONFIG_INFINIBAND is not set 824# CONFIG_INFINIBAND is not set
793# CONFIG_EDAC is not set 825# CONFIG_EDAC is not set
794CONFIG_RTC_LIB=y 826CONFIG_RTC_LIB=y
795CONFIG_RTC_CLASS=y 827CONFIG_RTC_CLASS=y
828
829#
830# Conflicting RTC option has been selected, check GEN_RTC and RTC
831#
796CONFIG_RTC_HCTOSYS=y 832CONFIG_RTC_HCTOSYS=y
797CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 833CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
798# CONFIG_RTC_DEBUG is not set 834# CONFIG_RTC_DEBUG is not set
@@ -819,6 +855,7 @@ CONFIG_RTC_DRV_DS1374=y
819# CONFIG_RTC_DRV_PCF8563 is not set 855# CONFIG_RTC_DRV_PCF8563 is not set
820# CONFIG_RTC_DRV_PCF8583 is not set 856# CONFIG_RTC_DRV_PCF8583 is not set
821# CONFIG_RTC_DRV_M41T80 is not set 857# CONFIG_RTC_DRV_M41T80 is not set
858# CONFIG_RTC_DRV_S35390A is not set
822 859
823# 860#
824# SPI RTC drivers 861# SPI RTC drivers
@@ -828,9 +865,10 @@ CONFIG_RTC_DRV_DS1374=y
828# Platform RTC drivers 865# Platform RTC drivers
829# 866#
830# CONFIG_RTC_DRV_CMOS is not set 867# CONFIG_RTC_DRV_CMOS is not set
868# CONFIG_RTC_DRV_DS1511 is not set
831# CONFIG_RTC_DRV_DS1553 is not set 869# CONFIG_RTC_DRV_DS1553 is not set
832# CONFIG_RTC_DRV_STK17TA8 is not set
833# CONFIG_RTC_DRV_DS1742 is not set 870# CONFIG_RTC_DRV_DS1742 is not set
871# CONFIG_RTC_DRV_STK17TA8 is not set
834# CONFIG_RTC_DRV_M48T86 is not set 872# CONFIG_RTC_DRV_M48T86 is not set
835# CONFIG_RTC_DRV_M48T59 is not set 873# CONFIG_RTC_DRV_M48T59 is not set
836# CONFIG_RTC_DRV_V3020 is not set 874# CONFIG_RTC_DRV_V3020 is not set
@@ -838,6 +876,7 @@ CONFIG_RTC_DRV_DS1374=y
838# 876#
839# on-CPU RTC drivers 877# on-CPU RTC drivers
840# 878#
879# CONFIG_DMADEVICES is not set
841 880
842# 881#
843# Userspace I/O 882# Userspace I/O
@@ -863,12 +902,10 @@ CONFIG_FS_MBCACHE=y
863# CONFIG_XFS_FS is not set 902# CONFIG_XFS_FS is not set
864# CONFIG_GFS2_FS is not set 903# CONFIG_GFS2_FS is not set
865# CONFIG_OCFS2_FS is not set 904# CONFIG_OCFS2_FS is not set
866# CONFIG_MINIX_FS is not set 905CONFIG_DNOTIFY=y
867# CONFIG_ROMFS_FS is not set
868CONFIG_INOTIFY=y 906CONFIG_INOTIFY=y
869CONFIG_INOTIFY_USER=y 907CONFIG_INOTIFY_USER=y
870# CONFIG_QUOTA is not set 908# CONFIG_QUOTA is not set
871CONFIG_DNOTIFY=y
872# CONFIG_AUTOFS_FS is not set 909# CONFIG_AUTOFS_FS is not set
873# CONFIG_AUTOFS4_FS is not set 910# CONFIG_AUTOFS4_FS is not set
874# CONFIG_FUSE_FS is not set 911# CONFIG_FUSE_FS is not set
@@ -910,8 +947,10 @@ CONFIG_TMPFS=y
910# CONFIG_EFS_FS is not set 947# CONFIG_EFS_FS is not set
911# CONFIG_CRAMFS is not set 948# CONFIG_CRAMFS is not set
912# CONFIG_VXFS_FS is not set 949# CONFIG_VXFS_FS is not set
950# CONFIG_MINIX_FS is not set
913# CONFIG_HPFS_FS is not set 951# CONFIG_HPFS_FS is not set
914# CONFIG_QNX4FS_FS is not set 952# CONFIG_QNX4FS_FS is not set
953# CONFIG_ROMFS_FS is not set
915# CONFIG_SYSV_FS is not set 954# CONFIG_SYSV_FS is not set
916# CONFIG_UFS_FS is not set 955# CONFIG_UFS_FS is not set
917CONFIG_NETWORK_FILESYSTEMS=y 956CONFIG_NETWORK_FILESYSTEMS=y
@@ -955,7 +994,6 @@ CONFIG_PARTITION_ADVANCED=y
955# CONFIG_SYSV68_PARTITION is not set 994# CONFIG_SYSV68_PARTITION is not set
956# CONFIG_NLS is not set 995# CONFIG_NLS is not set
957# CONFIG_DLM is not set 996# CONFIG_DLM is not set
958# CONFIG_UCC_SLOW is not set
959 997
960# 998#
961# Library routines 999# Library routines
@@ -971,7 +1009,6 @@ CONFIG_PLIST=y
971CONFIG_HAS_IOMEM=y 1009CONFIG_HAS_IOMEM=y
972CONFIG_HAS_IOPORT=y 1010CONFIG_HAS_IOPORT=y
973CONFIG_HAS_DMA=y 1011CONFIG_HAS_DMA=y
974# CONFIG_INSTRUMENTATION is not set
975 1012
976# 1013#
977# Kernel hacking 1014# Kernel hacking
@@ -990,6 +1027,7 @@ CONFIG_SCHED_DEBUG=y
990# CONFIG_SCHEDSTATS is not set 1027# CONFIG_SCHEDSTATS is not set
991# CONFIG_TIMER_STATS is not set 1028# CONFIG_TIMER_STATS is not set
992# CONFIG_SLUB_DEBUG_ON is not set 1029# CONFIG_SLUB_DEBUG_ON is not set
1030# CONFIG_SLUB_STATS is not set
993# CONFIG_DEBUG_RT_MUTEXES is not set 1031# CONFIG_DEBUG_RT_MUTEXES is not set
994# CONFIG_RT_MUTEX_TESTER is not set 1032# CONFIG_RT_MUTEX_TESTER is not set
995# CONFIG_DEBUG_SPINLOCK is not set 1033# CONFIG_DEBUG_SPINLOCK is not set
@@ -1002,9 +1040,9 @@ CONFIG_SCHED_DEBUG=y
1002# CONFIG_DEBUG_VM is not set 1040# CONFIG_DEBUG_VM is not set
1003# CONFIG_DEBUG_LIST is not set 1041# CONFIG_DEBUG_LIST is not set
1004# CONFIG_DEBUG_SG is not set 1042# CONFIG_DEBUG_SG is not set
1005CONFIG_FORCED_INLINING=y
1006# CONFIG_BOOT_PRINTK_DELAY is not set 1043# CONFIG_BOOT_PRINTK_DELAY is not set
1007# CONFIG_RCU_TORTURE_TEST is not set 1044# CONFIG_RCU_TORTURE_TEST is not set
1045# CONFIG_BACKTRACE_SELF_TEST is not set
1008# CONFIG_FAULT_INJECTION is not set 1046# CONFIG_FAULT_INJECTION is not set
1009# CONFIG_SAMPLES is not set 1047# CONFIG_SAMPLES is not set
1010# CONFIG_DEBUG_STACKOVERFLOW is not set 1048# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1023,6 +1061,7 @@ CONFIG_PPC_EARLY_DEBUG=y
1023# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set 1061# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
1024# CONFIG_PPC_EARLY_DEBUG_BEAT is not set 1062# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
1025# CONFIG_PPC_EARLY_DEBUG_44x is not set 1063# CONFIG_PPC_EARLY_DEBUG_44x is not set
1064# CONFIG_PPC_EARLY_DEBUG_40x is not set
1026# CONFIG_PPC_EARLY_DEBUG_CPM is not set 1065# CONFIG_PPC_EARLY_DEBUG_CPM is not set
1027 1066
1028# 1067#
@@ -1034,6 +1073,7 @@ CONFIG_PPC_EARLY_DEBUG=y
1034CONFIG_CRYPTO=y 1073CONFIG_CRYPTO=y
1035CONFIG_CRYPTO_ALGAPI=y 1074CONFIG_CRYPTO_ALGAPI=y
1036CONFIG_CRYPTO_BLKCIPHER=y 1075CONFIG_CRYPTO_BLKCIPHER=y
1076# CONFIG_CRYPTO_SEQIV is not set
1037CONFIG_CRYPTO_MANAGER=y 1077CONFIG_CRYPTO_MANAGER=y
1038# CONFIG_CRYPTO_HMAC is not set 1078# CONFIG_CRYPTO_HMAC is not set
1039# CONFIG_CRYPTO_XCBC is not set 1079# CONFIG_CRYPTO_XCBC is not set
@@ -1051,6 +1091,9 @@ CONFIG_CRYPTO_CBC=y
1051CONFIG_CRYPTO_PCBC=m 1091CONFIG_CRYPTO_PCBC=m
1052# CONFIG_CRYPTO_LRW is not set 1092# CONFIG_CRYPTO_LRW is not set
1053# CONFIG_CRYPTO_XTS is not set 1093# CONFIG_CRYPTO_XTS is not set
1094# CONFIG_CRYPTO_CTR is not set
1095# CONFIG_CRYPTO_GCM is not set
1096# CONFIG_CRYPTO_CCM is not set
1054# CONFIG_CRYPTO_CRYPTD is not set 1097# CONFIG_CRYPTO_CRYPTD is not set
1055CONFIG_CRYPTO_DES=y 1098CONFIG_CRYPTO_DES=y
1056# CONFIG_CRYPTO_FCRYPT is not set 1099# CONFIG_CRYPTO_FCRYPT is not set
@@ -1065,12 +1108,15 @@ CONFIG_CRYPTO_DES=y
1065# CONFIG_CRYPTO_KHAZAD is not set 1108# CONFIG_CRYPTO_KHAZAD is not set
1066# CONFIG_CRYPTO_ANUBIS is not set 1109# CONFIG_CRYPTO_ANUBIS is not set
1067# CONFIG_CRYPTO_SEED is not set 1110# CONFIG_CRYPTO_SEED is not set
1111# CONFIG_CRYPTO_SALSA20 is not set
1068# CONFIG_CRYPTO_DEFLATE is not set 1112# CONFIG_CRYPTO_DEFLATE is not set
1069# CONFIG_CRYPTO_MICHAEL_MIC is not set 1113# CONFIG_CRYPTO_MICHAEL_MIC is not set
1070# CONFIG_CRYPTO_CRC32C is not set 1114# CONFIG_CRYPTO_CRC32C is not set
1071# CONFIG_CRYPTO_CAMELLIA is not set 1115# CONFIG_CRYPTO_CAMELLIA is not set
1072# CONFIG_CRYPTO_TEST is not set 1116# CONFIG_CRYPTO_TEST is not set
1073# CONFIG_CRYPTO_AUTHENC is not set 1117# CONFIG_CRYPTO_AUTHENC is not set
1118# CONFIG_CRYPTO_LZO is not set
1074CONFIG_CRYPTO_HW=y 1119CONFIG_CRYPTO_HW=y
1120# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1075# CONFIG_PPC_CLOCK is not set 1121# CONFIG_PPC_CLOCK is not set
1076CONFIG_PPC_LIB_RHEAP=y 1122CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc8572_ds_defconfig b/arch/powerpc/configs/mpc8572_ds_defconfig
index b40802d17e03..460afe99c653 100644
--- a/arch/powerpc/configs/mpc8572_ds_defconfig
+++ b/arch/powerpc/configs/mpc8572_ds_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:52 2007 4# Mon Mar 24 08:48:29 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,10 +14,10 @@ CONFIG_PPC_85xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y 17CONFIG_E500=y
19CONFIG_BOOKE=y 18CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 19CONFIG_FSL_BOOKE=y
20CONFIG_FSL_EMB_PERFMON=y
21# CONFIG_PHYS_64BIT is not set 21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
@@ -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,21 @@ CONFIG_POSIX_MQUEUE=y
68CONFIG_BSD_PROCESS_ACCT=y 69CONFIG_BSD_PROCESS_ACCT=y
69# CONFIG_BSD_PROCESS_ACCT_V3 is not set 70# CONFIG_BSD_PROCESS_ACCT_V3 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
73CONFIG_AUDIT=y 72CONFIG_AUDIT=y
74# CONFIG_AUDITSYSCALL is not set 73# CONFIG_AUDITSYSCALL is not set
75CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
76CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
77CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
78CONFIG_GROUP_SCHED=y
79# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
80# CONFIG_RT_GROUP_SCHED is not set
81CONFIG_USER_SCHED=y
82# CONFIG_CGROUP_SCHED is not set
80CONFIG_SYSFS_DEPRECATED=y 83CONFIG_SYSFS_DEPRECATED=y
84CONFIG_SYSFS_DEPRECATED_V2=y
81# CONFIG_RELAY is not set 85# CONFIG_RELAY is not set
86# CONFIG_NAMESPACES is not set
82CONFIG_BLK_DEV_INITRD=y 87CONFIG_BLK_DEV_INITRD=y
83CONFIG_INITRAMFS_SOURCE="" 88CONFIG_INITRAMFS_SOURCE=""
84# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 89# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -92,11 +97,13 @@ CONFIG_HOTPLUG=y
92CONFIG_PRINTK=y 97CONFIG_PRINTK=y
93CONFIG_BUG=y 98CONFIG_BUG=y
94CONFIG_ELF_CORE=y 99CONFIG_ELF_CORE=y
100CONFIG_COMPAT_BRK=y
95CONFIG_BASE_FULL=y 101CONFIG_BASE_FULL=y
96CONFIG_FUTEX=y 102CONFIG_FUTEX=y
97CONFIG_ANON_INODES=y 103CONFIG_ANON_INODES=y
98CONFIG_EPOLL=y 104CONFIG_EPOLL=y
99CONFIG_SIGNALFD=y 105CONFIG_SIGNALFD=y
106CONFIG_TIMERFD=y
100CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
101CONFIG_SHMEM=y 108CONFIG_SHMEM=y
102CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
@@ -104,6 +111,14 @@ CONFIG_SLUB_DEBUG=y
104# CONFIG_SLAB is not set 111# CONFIG_SLAB is not set
105CONFIG_SLUB=y 112CONFIG_SLUB=y
106# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
114# CONFIG_PROFILING is not set
115# CONFIG_MARKERS is not set
116CONFIG_HAVE_OPROFILE=y
117# CONFIG_KPROBES is not set
118CONFIG_HAVE_KPROBES=y
119CONFIG_HAVE_KRETPROBES=y
120CONFIG_PROC_PAGE_MONITOR=y
121CONFIG_SLABINFO=y
107CONFIG_RT_MUTEXES=y 122CONFIG_RT_MUTEXES=y
108# CONFIG_TINY_SHMEM is not set 123# CONFIG_TINY_SHMEM is not set
109CONFIG_BASE_SMALL=0 124CONFIG_BASE_SMALL=0
@@ -131,21 +146,30 @@ CONFIG_IOSCHED_CFQ=y
131CONFIG_DEFAULT_CFQ=y 146CONFIG_DEFAULT_CFQ=y
132# CONFIG_DEFAULT_NOOP is not set 147# CONFIG_DEFAULT_NOOP is not set
133CONFIG_DEFAULT_IOSCHED="cfq" 148CONFIG_DEFAULT_IOSCHED="cfq"
149CONFIG_CLASSIC_RCU=y
134 150
135# 151#
136# Platform support 152# Platform support
137# 153#
138# CONFIG_PPC_MPC52xx is not set 154# CONFIG_PPC_MPC512x is not set
139# CONFIG_PPC_MPC5200 is not set 155# CONFIG_PPC_MPC5121 is not set
140# CONFIG_PPC_CELL is not set 156# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set 157# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set 158# CONFIG_PQ2ADS is not set
159CONFIG_MPC85xx=y
143# CONFIG_MPC8540_ADS is not set 160# CONFIG_MPC8540_ADS is not set
144# CONFIG_MPC8560_ADS is not set 161# CONFIG_MPC8560_ADS is not set
145# CONFIG_MPC85xx_CDS is not set 162# CONFIG_MPC85xx_CDS is not set
146# CONFIG_MPC85xx_MDS is not set 163# CONFIG_MPC85xx_MDS is not set
147CONFIG_MPC85xx_DS=y 164CONFIG_MPC85xx_DS=y
148CONFIG_MPC85xx=y 165# CONFIG_STX_GP3 is not set
166# CONFIG_TQM8540 is not set
167# CONFIG_TQM8541 is not set
168# CONFIG_TQM8555 is not set
169# CONFIG_TQM8560 is not set
170# CONFIG_SBC8548 is not set
171# CONFIG_SBC8560 is not set
172# CONFIG_IPIC is not set
149CONFIG_MPIC=y 173CONFIG_MPIC=y
150# CONFIG_MPIC_WEIRD is not set 174# CONFIG_MPIC_WEIRD is not set
151CONFIG_PPC_I8259=y 175CONFIG_PPC_I8259=y
@@ -172,13 +196,17 @@ CONFIG_HZ_250=y
172# CONFIG_HZ_300 is not set 196# CONFIG_HZ_300 is not set
173# CONFIG_HZ_1000 is not set 197# CONFIG_HZ_1000 is not set
174CONFIG_HZ=250 198CONFIG_HZ=250
199# CONFIG_SCHED_HRTICK is not set
175CONFIG_PREEMPT_NONE=y 200CONFIG_PREEMPT_NONE=y
176# CONFIG_PREEMPT_VOLUNTARY is not set 201# CONFIG_PREEMPT_VOLUNTARY is not set
177# CONFIG_PREEMPT is not set 202# CONFIG_PREEMPT is not set
178CONFIG_BINFMT_ELF=y 203CONFIG_BINFMT_ELF=y
179CONFIG_BINFMT_MISC=m 204CONFIG_BINFMT_MISC=m
180CONFIG_MATH_EMULATION=y 205CONFIG_MATH_EMULATION=y
206# CONFIG_IOMMU_HELPER is not set
181CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 207CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
208CONFIG_ARCH_HAS_WALK_MEMORY=y
209CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
182CONFIG_ARCH_FLATMEM_ENABLE=y 210CONFIG_ARCH_FLATMEM_ENABLE=y
183CONFIG_ARCH_POPULATES_NODE_MAP=y 211CONFIG_ARCH_POPULATES_NODE_MAP=y
184CONFIG_SELECT_MEMORY_MODEL=y 212CONFIG_SELECT_MEMORY_MODEL=y
@@ -197,11 +225,7 @@ CONFIG_VIRT_TO_BUS=y
197CONFIG_PROC_DEVICETREE=y 225CONFIG_PROC_DEVICETREE=y
198# CONFIG_CMDLINE_BOOL is not set 226# CONFIG_CMDLINE_BOOL is not set
199# CONFIG_PM is not set 227# CONFIG_PM is not set
200CONFIG_SUSPEND_UP_POSSIBLE=y
201CONFIG_HIBERNATION_UP_POSSIBLE=y
202CONFIG_SECCOMP=y 228CONFIG_SECCOMP=y
203CONFIG_WANT_DEVICE_TREE=y
204CONFIG_DEVICE_TREE=""
205CONFIG_ISA_DMA_API=y 229CONFIG_ISA_DMA_API=y
206 230
207# 231#
@@ -252,6 +276,7 @@ CONFIG_XFRM=y
252CONFIG_XFRM_USER=y 276CONFIG_XFRM_USER=y
253# CONFIG_XFRM_SUB_POLICY is not set 277# CONFIG_XFRM_SUB_POLICY is not set
254# CONFIG_XFRM_MIGRATE is not set 278# CONFIG_XFRM_MIGRATE is not set
279# CONFIG_XFRM_STATISTICS is not set
255CONFIG_NET_KEY=m 280CONFIG_NET_KEY=m
256# CONFIG_NET_KEY_MIGRATE is not set 281# CONFIG_NET_KEY_MIGRATE is not set
257CONFIG_INET=y 282CONFIG_INET=y
@@ -335,6 +360,7 @@ CONFIG_SCTP_HMAC_MD5=y
335# 360#
336# CONFIG_NET_PKTGEN is not set 361# CONFIG_NET_PKTGEN is not set
337# CONFIG_HAMRADIO is not set 362# CONFIG_HAMRADIO is not set
363# CONFIG_CAN is not set
338# CONFIG_IRDA is not set 364# CONFIG_IRDA is not set
339# CONFIG_BT is not set 365# CONFIG_BT is not set
340# CONFIG_AF_RXRPC is not set 366# CONFIG_AF_RXRPC is not set
@@ -383,7 +409,7 @@ CONFIG_BLK_DEV_NBD=y
383CONFIG_BLK_DEV_RAM=y 409CONFIG_BLK_DEV_RAM=y
384CONFIG_BLK_DEV_RAM_COUNT=16 410CONFIG_BLK_DEV_RAM_COUNT=16
385CONFIG_BLK_DEV_RAM_SIZE=131072 411CONFIG_BLK_DEV_RAM_SIZE=131072
386CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 412# CONFIG_BLK_DEV_XIP is not set
387# CONFIG_CDROM_PKTCDVD is not set 413# CONFIG_CDROM_PKTCDVD is not set
388# CONFIG_ATA_OVER_ETH is not set 414# CONFIG_ATA_OVER_ETH is not set
389CONFIG_MISC_DEVICES=y 415CONFIG_MISC_DEVICES=y
@@ -391,6 +417,8 @@ CONFIG_MISC_DEVICES=y
391# CONFIG_EEPROM_93CX6 is not set 417# CONFIG_EEPROM_93CX6 is not set
392# CONFIG_SGI_IOC4 is not set 418# CONFIG_SGI_IOC4 is not set
393# CONFIG_TIFM_CORE is not set 419# CONFIG_TIFM_CORE is not set
420# CONFIG_ENCLOSURE_SERVICES is not set
421CONFIG_HAVE_IDE=y
394# CONFIG_IDE is not set 422# CONFIG_IDE is not set
395 423
396# 424#
@@ -456,6 +484,7 @@ CONFIG_SCSI_LOWLEVEL=y
456# CONFIG_SCSI_IPS is not set 484# CONFIG_SCSI_IPS is not set
457# CONFIG_SCSI_INITIO is not set 485# CONFIG_SCSI_INITIO is not set
458# CONFIG_SCSI_INIA100 is not set 486# CONFIG_SCSI_INIA100 is not set
487# CONFIG_SCSI_MVSAS is not set
459# CONFIG_SCSI_STEX is not set 488# CONFIG_SCSI_STEX is not set
460# CONFIG_SCSI_SYM53C8XX_2 is not set 489# CONFIG_SCSI_SYM53C8XX_2 is not set
461# CONFIG_SCSI_IPR is not set 490# CONFIG_SCSI_IPR is not set
@@ -486,6 +515,7 @@ CONFIG_SATA_AHCI=y
486# CONFIG_SATA_VIA is not set 515# CONFIG_SATA_VIA is not set
487# CONFIG_SATA_VITESSE is not set 516# CONFIG_SATA_VITESSE is not set
488# CONFIG_SATA_INIC162X is not set 517# CONFIG_SATA_INIC162X is not set
518# CONFIG_SATA_FSL is not set
489CONFIG_PATA_ALI=y 519CONFIG_PATA_ALI=y
490# CONFIG_PATA_AMD is not set 520# CONFIG_PATA_AMD is not set
491# CONFIG_PATA_ARTOP is not set 521# CONFIG_PATA_ARTOP is not set
@@ -509,6 +539,7 @@ CONFIG_PATA_ALI=y
509# CONFIG_PATA_MPIIX is not set 539# CONFIG_PATA_MPIIX is not set
510# CONFIG_PATA_OLDPIIX is not set 540# CONFIG_PATA_OLDPIIX is not set
511# CONFIG_PATA_NETCELL is not set 541# CONFIG_PATA_NETCELL is not set
542# CONFIG_PATA_NINJA32 is not set
512# CONFIG_PATA_NS87410 is not set 543# CONFIG_PATA_NS87410 is not set
513# CONFIG_PATA_NS87415 is not set 544# CONFIG_PATA_NS87415 is not set
514# CONFIG_PATA_OPTI is not set 545# CONFIG_PATA_OPTI is not set
@@ -542,7 +573,6 @@ CONFIG_DUMMY=y
542# CONFIG_EQUALIZER is not set 573# CONFIG_EQUALIZER is not set
543# CONFIG_TUN is not set 574# CONFIG_TUN is not set
544# CONFIG_VETH is not set 575# CONFIG_VETH is not set
545# CONFIG_IP1000 is not set
546# CONFIG_ARCNET is not set 576# CONFIG_ARCNET is not set
547CONFIG_PHYLIB=y 577CONFIG_PHYLIB=y
548 578
@@ -558,6 +588,7 @@ CONFIG_VITESSE_PHY=y
558# CONFIG_SMSC_PHY is not set 588# CONFIG_SMSC_PHY is not set
559# CONFIG_BROADCOM_PHY is not set 589# CONFIG_BROADCOM_PHY is not set
560# CONFIG_ICPLUS_PHY is not set 590# CONFIG_ICPLUS_PHY is not set
591# CONFIG_REALTEK_PHY is not set
561# CONFIG_FIXED_PHY is not set 592# CONFIG_FIXED_PHY is not set
562# CONFIG_MDIO_BITBANG is not set 593# CONFIG_MDIO_BITBANG is not set
563CONFIG_NET_ETHERNET=y 594CONFIG_NET_ETHERNET=y
@@ -579,6 +610,9 @@ CONFIG_NETDEV_1000=y
579# CONFIG_DL2K is not set 610# CONFIG_DL2K is not set
580# CONFIG_E1000 is not set 611# CONFIG_E1000 is not set
581# CONFIG_E1000E is not set 612# CONFIG_E1000E is not set
613# CONFIG_E1000E_ENABLED is not set
614# CONFIG_IP1000 is not set
615# CONFIG_IGB is not set
582# CONFIG_NS83820 is not set 616# CONFIG_NS83820 is not set
583# CONFIG_HAMACHI is not set 617# CONFIG_HAMACHI is not set
584# CONFIG_YELLOWFIN is not set 618# CONFIG_YELLOWFIN is not set
@@ -605,6 +639,7 @@ CONFIG_NETDEV_10000=y
605# CONFIG_NIU is not set 639# CONFIG_NIU is not set
606# CONFIG_MLX4_CORE is not set 640# CONFIG_MLX4_CORE is not set
607# CONFIG_TEHUTI is not set 641# CONFIG_TEHUTI is not set
642# CONFIG_BNX2X is not set
608# CONFIG_TR is not set 643# CONFIG_TR is not set
609 644
610# 645#
@@ -627,7 +662,6 @@ CONFIG_NETDEV_10000=y
627# CONFIG_PPP is not set 662# CONFIG_PPP is not set
628# CONFIG_SLIP is not set 663# CONFIG_SLIP is not set
629# CONFIG_NET_FC is not set 664# CONFIG_NET_FC is not set
630# CONFIG_SHAPER is not set
631# CONFIG_NETCONSOLE is not set 665# CONFIG_NETCONSOLE is not set
632# CONFIG_NETPOLL is not set 666# CONFIG_NETPOLL is not set
633# CONFIG_NET_POLL_CONTROLLER is not set 667# CONFIG_NET_POLL_CONTROLLER is not set
@@ -678,6 +712,7 @@ CONFIG_VT_CONSOLE=y
678CONFIG_HW_CONSOLE=y 712CONFIG_HW_CONSOLE=y
679# CONFIG_VT_HW_CONSOLE_BINDING is not set 713# CONFIG_VT_HW_CONSOLE_BINDING is not set
680# CONFIG_SERIAL_NONSTANDARD is not set 714# CONFIG_SERIAL_NONSTANDARD is not set
715# CONFIG_NOZOMI is not set
681 716
682# 717#
683# Serial drivers 718# Serial drivers
@@ -756,14 +791,12 @@ CONFIG_I2C_MPC=y
756# 791#
757# Miscellaneous I2C Chip support 792# Miscellaneous I2C Chip support
758# 793#
759# CONFIG_SENSORS_DS1337 is not set
760# CONFIG_SENSORS_DS1374 is not set
761# CONFIG_DS1682 is not set 794# CONFIG_DS1682 is not set
762CONFIG_SENSORS_EEPROM=y 795CONFIG_SENSORS_EEPROM=y
763# CONFIG_SENSORS_PCF8574 is not set 796# CONFIG_SENSORS_PCF8574 is not set
764# CONFIG_SENSORS_PCA9539 is not set 797# CONFIG_PCF8575 is not set
765# CONFIG_SENSORS_PCF8591 is not set 798# CONFIG_SENSORS_PCF8591 is not set
766# CONFIG_SENSORS_M41T00 is not set 799# CONFIG_TPS65010 is not set
767# CONFIG_SENSORS_MAX6875 is not set 800# CONFIG_SENSORS_MAX6875 is not set
768# CONFIG_SENSORS_TSL2550 is not set 801# CONFIG_SENSORS_TSL2550 is not set
769# CONFIG_I2C_DEBUG_CORE is not set 802# CONFIG_I2C_DEBUG_CORE is not set
@@ -779,6 +812,7 @@ CONFIG_SENSORS_EEPROM=y
779# CONFIG_W1 is not set 812# CONFIG_W1 is not set
780# CONFIG_POWER_SUPPLY is not set 813# CONFIG_POWER_SUPPLY is not set
781# CONFIG_HWMON is not set 814# CONFIG_HWMON is not set
815# CONFIG_THERMAL is not set
782# CONFIG_WATCHDOG is not set 816# CONFIG_WATCHDOG is not set
783 817
784# 818#
@@ -803,6 +837,8 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
803# 837#
804# Supported SAA7146 based PCI Adapters 838# Supported SAA7146 based PCI Adapters
805# 839#
840# CONFIG_TTPCI_EEPROM is not set
841# CONFIG_DVB_BUDGET_CORE is not set
806 842
807# 843#
808# Supported USB Adapters 844# Supported USB Adapters
@@ -888,11 +924,13 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
888# CONFIG_DVB_PLL is not set 924# CONFIG_DVB_PLL is not set
889# CONFIG_DVB_TDA826X is not set 925# CONFIG_DVB_TDA826X is not set
890# CONFIG_DVB_TDA827X is not set 926# CONFIG_DVB_TDA827X is not set
927# CONFIG_DVB_TDA18271 is not set
891# CONFIG_DVB_TUNER_QT1010 is not set 928# CONFIG_DVB_TUNER_QT1010 is not set
892# CONFIG_DVB_TUNER_MT2060 is not set 929# CONFIG_DVB_TUNER_MT2060 is not set
893# CONFIG_DVB_TUNER_MT2266 is not set 930# CONFIG_DVB_TUNER_MT2266 is not set
894# CONFIG_DVB_TUNER_MT2131 is not set 931# CONFIG_DVB_TUNER_MT2131 is not set
895# CONFIG_DVB_TUNER_DIB0070 is not set 932# CONFIG_DVB_TUNER_DIB0070 is not set
933# CONFIG_DVB_TUNER_XC5000 is not set
896 934
897# 935#
898# Miscellaneous devices 936# Miscellaneous devices
@@ -970,6 +1008,7 @@ CONFIG_SND_AC97_CODEC=y
970# CONFIG_SND_BT87X is not set 1008# CONFIG_SND_BT87X is not set
971# CONFIG_SND_CA0106 is not set 1009# CONFIG_SND_CA0106 is not set
972# CONFIG_SND_CMIPCI is not set 1010# CONFIG_SND_CMIPCI is not set
1011# CONFIG_SND_OXYGEN is not set
973# CONFIG_SND_CS4281 is not set 1012# CONFIG_SND_CS4281 is not set
974# CONFIG_SND_CS46XX is not set 1013# CONFIG_SND_CS46XX is not set
975# CONFIG_SND_CS5530 is not set 1014# CONFIG_SND_CS5530 is not set
@@ -995,6 +1034,7 @@ CONFIG_SND_AC97_CODEC=y
995# CONFIG_SND_HDA_INTEL is not set 1034# CONFIG_SND_HDA_INTEL is not set
996# CONFIG_SND_HDSP is not set 1035# CONFIG_SND_HDSP is not set
997# CONFIG_SND_HDSPM is not set 1036# CONFIG_SND_HDSPM is not set
1037# CONFIG_SND_HIFIER is not set
998# CONFIG_SND_ICE1712 is not set 1038# CONFIG_SND_ICE1712 is not set
999# CONFIG_SND_ICE1724 is not set 1039# CONFIG_SND_ICE1724 is not set
1000CONFIG_SND_INTEL8X0=y 1040CONFIG_SND_INTEL8X0=y
@@ -1012,6 +1052,7 @@ CONFIG_SND_INTEL8X0=y
1012# CONFIG_SND_TRIDENT is not set 1052# CONFIG_SND_TRIDENT is not set
1013# CONFIG_SND_VIA82XX is not set 1053# CONFIG_SND_VIA82XX is not set
1014# CONFIG_SND_VIA82XX_MODEM is not set 1054# CONFIG_SND_VIA82XX_MODEM is not set
1055# CONFIG_SND_VIRTUOSO is not set
1015# CONFIG_SND_VX222 is not set 1056# CONFIG_SND_VX222 is not set
1016# CONFIG_SND_YMFPCI is not set 1057# CONFIG_SND_YMFPCI is not set
1017# CONFIG_SND_AC97_POWER_SAVE is not set 1058# CONFIG_SND_AC97_POWER_SAVE is not set
@@ -1041,6 +1082,10 @@ CONFIG_SND_INTEL8X0=y
1041# 1082#
1042 1083
1043# 1084#
1085# ALSA SoC audio for Freescale SOCs
1086#
1087
1088#
1044# Open Sound System 1089# Open Sound System
1045# 1090#
1046# CONFIG_SOUND_PRIME is not set 1091# CONFIG_SOUND_PRIME is not set
@@ -1063,6 +1108,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
1063CONFIG_USB_ARCH_HAS_EHCI=y 1108CONFIG_USB_ARCH_HAS_EHCI=y
1064CONFIG_USB=y 1109CONFIG_USB=y
1065# CONFIG_USB_DEBUG is not set 1110# CONFIG_USB_DEBUG is not set
1111# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1066 1112
1067# 1113#
1068# Miscellaneous USB options 1114# Miscellaneous USB options
@@ -1076,9 +1122,10 @@ CONFIG_USB_DEVICE_CLASS=y
1076# USB Host Controller Drivers 1122# USB Host Controller Drivers
1077# 1123#
1078CONFIG_USB_EHCI_HCD=y 1124CONFIG_USB_EHCI_HCD=y
1079# CONFIG_USB_EHCI_SPLIT_ISO is not set
1080# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1125# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1081# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1126# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1127# CONFIG_USB_EHCI_FSL is not set
1128CONFIG_USB_EHCI_HCD_PPC_OF=y
1082# CONFIG_USB_ISP116X_HCD is not set 1129# CONFIG_USB_ISP116X_HCD is not set
1083CONFIG_USB_OHCI_HCD=y 1130CONFIG_USB_OHCI_HCD=y
1084CONFIG_USB_OHCI_HCD_PPC_OF=y 1131CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -1129,10 +1176,6 @@ CONFIG_USB_MON=y
1129# 1176#
1130# USB port drivers 1177# USB port drivers
1131# 1178#
1132
1133#
1134# USB Serial Converter support
1135#
1136# CONFIG_USB_SERIAL is not set 1179# CONFIG_USB_SERIAL is not set
1137 1180
1138# 1181#
@@ -1158,21 +1201,18 @@ CONFIG_USB_MON=y
1158# CONFIG_USB_TRANCEVIBRATOR is not set 1201# CONFIG_USB_TRANCEVIBRATOR is not set
1159# CONFIG_USB_IOWARRIOR is not set 1202# CONFIG_USB_IOWARRIOR is not set
1160# CONFIG_USB_TEST is not set 1203# CONFIG_USB_TEST is not set
1161
1162#
1163# USB DSL modem support
1164#
1165
1166#
1167# USB Gadget Support
1168#
1169# CONFIG_USB_GADGET is not set 1204# CONFIG_USB_GADGET is not set
1170# CONFIG_MMC is not set 1205# CONFIG_MMC is not set
1206# CONFIG_MEMSTICK is not set
1171# CONFIG_NEW_LEDS is not set 1207# CONFIG_NEW_LEDS is not set
1172# CONFIG_INFINIBAND is not set 1208# CONFIG_INFINIBAND is not set
1173# CONFIG_EDAC is not set 1209# CONFIG_EDAC is not set
1174CONFIG_RTC_LIB=y 1210CONFIG_RTC_LIB=y
1175CONFIG_RTC_CLASS=y 1211CONFIG_RTC_CLASS=y
1212
1213#
1214# Conflicting RTC option has been selected, check GEN_RTC and RTC
1215#
1176CONFIG_RTC_HCTOSYS=y 1216CONFIG_RTC_HCTOSYS=y
1177CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 1217CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1178# CONFIG_RTC_DEBUG is not set 1218# CONFIG_RTC_DEBUG is not set
@@ -1199,6 +1239,7 @@ CONFIG_RTC_INTF_DEV=y
1199# CONFIG_RTC_DRV_PCF8563 is not set 1239# CONFIG_RTC_DRV_PCF8563 is not set
1200# CONFIG_RTC_DRV_PCF8583 is not set 1240# CONFIG_RTC_DRV_PCF8583 is not set
1201# CONFIG_RTC_DRV_M41T80 is not set 1241# CONFIG_RTC_DRV_M41T80 is not set
1242# CONFIG_RTC_DRV_S35390A is not set
1202 1243
1203# 1244#
1204# SPI RTC drivers 1245# SPI RTC drivers
@@ -1208,9 +1249,10 @@ CONFIG_RTC_INTF_DEV=y
1208# Platform RTC drivers 1249# Platform RTC drivers
1209# 1250#
1210CONFIG_RTC_DRV_CMOS=y 1251CONFIG_RTC_DRV_CMOS=y
1252# CONFIG_RTC_DRV_DS1511 is not set
1211# CONFIG_RTC_DRV_DS1553 is not set 1253# CONFIG_RTC_DRV_DS1553 is not set
1212# CONFIG_RTC_DRV_STK17TA8 is not set
1213# CONFIG_RTC_DRV_DS1742 is not set 1254# CONFIG_RTC_DRV_DS1742 is not set
1255# CONFIG_RTC_DRV_STK17TA8 is not set
1214# CONFIG_RTC_DRV_M48T86 is not set 1256# CONFIG_RTC_DRV_M48T86 is not set
1215# CONFIG_RTC_DRV_M48T59 is not set 1257# CONFIG_RTC_DRV_M48T59 is not set
1216# CONFIG_RTC_DRV_V3020 is not set 1258# CONFIG_RTC_DRV_V3020 is not set
@@ -1218,6 +1260,7 @@ CONFIG_RTC_DRV_CMOS=y
1218# 1260#
1219# on-CPU RTC drivers 1261# on-CPU RTC drivers
1220# 1262#
1263# CONFIG_DMADEVICES is not set
1221 1264
1222# 1265#
1223# Userspace I/O 1266# Userspace I/O
@@ -1243,12 +1286,10 @@ CONFIG_FS_MBCACHE=y
1243# CONFIG_XFS_FS is not set 1286# CONFIG_XFS_FS is not set
1244# CONFIG_GFS2_FS is not set 1287# CONFIG_GFS2_FS is not set
1245# CONFIG_OCFS2_FS is not set 1288# CONFIG_OCFS2_FS is not set
1246# CONFIG_MINIX_FS is not set 1289CONFIG_DNOTIFY=y
1247# CONFIG_ROMFS_FS is not set
1248CONFIG_INOTIFY=y 1290CONFIG_INOTIFY=y
1249CONFIG_INOTIFY_USER=y 1291CONFIG_INOTIFY_USER=y
1250# CONFIG_QUOTA is not set 1292# CONFIG_QUOTA is not set
1251CONFIG_DNOTIFY=y
1252# CONFIG_AUTOFS_FS is not set 1293# CONFIG_AUTOFS_FS is not set
1253# CONFIG_AUTOFS4_FS is not set 1294# CONFIG_AUTOFS4_FS is not set
1254# CONFIG_FUSE_FS is not set 1295# CONFIG_FUSE_FS is not set
@@ -1300,8 +1341,10 @@ CONFIG_BFS_FS=m
1300CONFIG_EFS_FS=m 1341CONFIG_EFS_FS=m
1301CONFIG_CRAMFS=y 1342CONFIG_CRAMFS=y
1302CONFIG_VXFS_FS=m 1343CONFIG_VXFS_FS=m
1344# CONFIG_MINIX_FS is not set
1303CONFIG_HPFS_FS=m 1345CONFIG_HPFS_FS=m
1304CONFIG_QNX4FS_FS=m 1346CONFIG_QNX4FS_FS=m
1347# CONFIG_ROMFS_FS is not set
1305CONFIG_SYSV_FS=m 1348CONFIG_SYSV_FS=m
1306CONFIG_UFS_FS=m 1349CONFIG_UFS_FS=m
1307# CONFIG_UFS_FS_WRITE is not set 1350# CONFIG_UFS_FS_WRITE is not set
@@ -1393,7 +1436,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1393# CONFIG_NLS_KOI8_U is not set 1436# CONFIG_NLS_KOI8_U is not set
1394CONFIG_NLS_UTF8=m 1437CONFIG_NLS_UTF8=m
1395# CONFIG_DLM is not set 1438# CONFIG_DLM is not set
1396# CONFIG_UCC_SLOW is not set
1397 1439
1398# 1440#
1399# Library routines 1441# Library routines
@@ -1410,7 +1452,6 @@ CONFIG_PLIST=y
1410CONFIG_HAS_IOMEM=y 1452CONFIG_HAS_IOMEM=y
1411CONFIG_HAS_IOPORT=y 1453CONFIG_HAS_IOPORT=y
1412CONFIG_HAS_DMA=y 1454CONFIG_HAS_DMA=y
1413# CONFIG_INSTRUMENTATION is not set
1414 1455
1415# 1456#
1416# Kernel hacking 1457# Kernel hacking
@@ -1429,6 +1470,7 @@ CONFIG_SCHED_DEBUG=y
1429# CONFIG_SCHEDSTATS is not set 1470# CONFIG_SCHEDSTATS is not set
1430# CONFIG_TIMER_STATS is not set 1471# CONFIG_TIMER_STATS is not set
1431# CONFIG_SLUB_DEBUG_ON is not set 1472# CONFIG_SLUB_DEBUG_ON is not set
1473# CONFIG_SLUB_STATS is not set
1432# CONFIG_DEBUG_RT_MUTEXES is not set 1474# CONFIG_DEBUG_RT_MUTEXES is not set
1433# CONFIG_RT_MUTEX_TESTER is not set 1475# CONFIG_RT_MUTEX_TESTER is not set
1434# CONFIG_DEBUG_SPINLOCK is not set 1476# CONFIG_DEBUG_SPINLOCK is not set
@@ -1442,9 +1484,9 @@ CONFIG_DEBUG_INFO=y
1442# CONFIG_DEBUG_VM is not set 1484# CONFIG_DEBUG_VM is not set
1443# CONFIG_DEBUG_LIST is not set 1485# CONFIG_DEBUG_LIST is not set
1444# CONFIG_DEBUG_SG is not set 1486# CONFIG_DEBUG_SG is not set
1445CONFIG_FORCED_INLINING=y
1446# CONFIG_BOOT_PRINTK_DELAY is not set 1487# CONFIG_BOOT_PRINTK_DELAY is not set
1447# CONFIG_RCU_TORTURE_TEST is not set 1488# CONFIG_RCU_TORTURE_TEST is not set
1489# CONFIG_BACKTRACE_SELF_TEST is not set
1448# CONFIG_FAULT_INJECTION is not set 1490# CONFIG_FAULT_INJECTION is not set
1449# CONFIG_SAMPLES is not set 1491# CONFIG_SAMPLES is not set
1450# CONFIG_DEBUG_STACKOVERFLOW is not set 1492# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1463,6 +1505,7 @@ CONFIG_FORCED_INLINING=y
1463CONFIG_CRYPTO=y 1505CONFIG_CRYPTO=y
1464CONFIG_CRYPTO_ALGAPI=y 1506CONFIG_CRYPTO_ALGAPI=y
1465CONFIG_CRYPTO_BLKCIPHER=y 1507CONFIG_CRYPTO_BLKCIPHER=y
1508# CONFIG_CRYPTO_SEQIV is not set
1466CONFIG_CRYPTO_HASH=y 1509CONFIG_CRYPTO_HASH=y
1467CONFIG_CRYPTO_MANAGER=y 1510CONFIG_CRYPTO_MANAGER=y
1468CONFIG_CRYPTO_HMAC=y 1511CONFIG_CRYPTO_HMAC=y
@@ -1481,6 +1524,9 @@ CONFIG_CRYPTO_CBC=y
1481CONFIG_CRYPTO_PCBC=m 1524CONFIG_CRYPTO_PCBC=m
1482# CONFIG_CRYPTO_LRW is not set 1525# CONFIG_CRYPTO_LRW is not set
1483# CONFIG_CRYPTO_XTS is not set 1526# CONFIG_CRYPTO_XTS is not set
1527# CONFIG_CRYPTO_CTR is not set
1528# CONFIG_CRYPTO_GCM is not set
1529# CONFIG_CRYPTO_CCM is not set
1484# CONFIG_CRYPTO_CRYPTD is not set 1530# CONFIG_CRYPTO_CRYPTD is not set
1485CONFIG_CRYPTO_DES=y 1531CONFIG_CRYPTO_DES=y
1486# CONFIG_CRYPTO_FCRYPT is not set 1532# CONFIG_CRYPTO_FCRYPT is not set
@@ -1495,11 +1541,14 @@ CONFIG_CRYPTO_DES=y
1495# CONFIG_CRYPTO_KHAZAD is not set 1541# CONFIG_CRYPTO_KHAZAD is not set
1496# CONFIG_CRYPTO_ANUBIS is not set 1542# CONFIG_CRYPTO_ANUBIS is not set
1497# CONFIG_CRYPTO_SEED is not set 1543# CONFIG_CRYPTO_SEED is not set
1544# CONFIG_CRYPTO_SALSA20 is not set
1498# CONFIG_CRYPTO_DEFLATE is not set 1545# CONFIG_CRYPTO_DEFLATE is not set
1499# CONFIG_CRYPTO_MICHAEL_MIC is not set 1546# CONFIG_CRYPTO_MICHAEL_MIC is not set
1500# CONFIG_CRYPTO_CRC32C is not set 1547# CONFIG_CRYPTO_CRC32C is not set
1501# CONFIG_CRYPTO_CAMELLIA is not set 1548# CONFIG_CRYPTO_CAMELLIA is not set
1502# CONFIG_CRYPTO_TEST is not set 1549# CONFIG_CRYPTO_TEST is not set
1503# CONFIG_CRYPTO_AUTHENC is not set 1550# CONFIG_CRYPTO_AUTHENC is not set
1551# CONFIG_CRYPTO_LZO is not set
1504CONFIG_CRYPTO_HW=y 1552CONFIG_CRYPTO_HW=y
1553# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1505# CONFIG_PPC_CLOCK is not set 1554# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc85xx_cds_defconfig b/arch/powerpc/configs/mpc85xx_cds_defconfig
index 2f9ad589b004..a469fe918816 100644
--- a/arch/powerpc/configs/mpc85xx_cds_defconfig
+++ b/arch/powerpc/configs/mpc85xx_cds_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:54 2007 4# Mon Mar 24 08:48:30 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,10 +14,10 @@ CONFIG_PPC_85xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y 17CONFIG_E500=y
19CONFIG_BOOKE=y 18CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 19CONFIG_FSL_BOOKE=y
20CONFIG_FSL_EMB_PERFMON=y
21# CONFIG_PHYS_64BIT is not set 21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -67,15 +68,19 @@ CONFIG_SYSVIPC_SYSCTL=y
67# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
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
76# CONFIG_FAIR_GROUP_SCHED is not set 76# CONFIG_FAIR_GROUP_SCHED is not set
77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set
77CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y
78# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
83# CONFIG_NAMESPACES is not set
79CONFIG_BLK_DEV_INITRD=y 84CONFIG_BLK_DEV_INITRD=y
80CONFIG_INITRAMFS_SOURCE="" 85CONFIG_INITRAMFS_SOURCE=""
81# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -89,11 +94,13 @@ CONFIG_HOTPLUG=y
89CONFIG_PRINTK=y 94CONFIG_PRINTK=y
90CONFIG_BUG=y 95CONFIG_BUG=y
91CONFIG_ELF_CORE=y 96CONFIG_ELF_CORE=y
97CONFIG_COMPAT_BRK=y
92CONFIG_BASE_FULL=y 98CONFIG_BASE_FULL=y
93CONFIG_FUTEX=y 99CONFIG_FUTEX=y
94CONFIG_ANON_INODES=y 100CONFIG_ANON_INODES=y
95CONFIG_EPOLL=y 101CONFIG_EPOLL=y
96CONFIG_SIGNALFD=y 102CONFIG_SIGNALFD=y
103CONFIG_TIMERFD=y
97CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
98CONFIG_SHMEM=y 105CONFIG_SHMEM=y
99CONFIG_VM_EVENT_COUNTERS=y 106CONFIG_VM_EVENT_COUNTERS=y
@@ -101,6 +108,13 @@ CONFIG_SLUB_DEBUG=y
101# CONFIG_SLAB is not set 108# CONFIG_SLAB is not set
102CONFIG_SLUB=y 109CONFIG_SLUB=y
103# 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
114CONFIG_HAVE_KPROBES=y
115CONFIG_HAVE_KRETPROBES=y
116CONFIG_PROC_PAGE_MONITOR=y
117CONFIG_SLABINFO=y
104CONFIG_RT_MUTEXES=y 118CONFIG_RT_MUTEXES=y
105# CONFIG_TINY_SHMEM is not set 119# CONFIG_TINY_SHMEM is not set
106CONFIG_BASE_SMALL=0 120CONFIG_BASE_SMALL=0
@@ -123,22 +137,30 @@ CONFIG_DEFAULT_AS=y
123# CONFIG_DEFAULT_CFQ is not set 137# CONFIG_DEFAULT_CFQ is not set
124# CONFIG_DEFAULT_NOOP is not set 138# CONFIG_DEFAULT_NOOP is not set
125CONFIG_DEFAULT_IOSCHED="anticipatory" 139CONFIG_DEFAULT_IOSCHED="anticipatory"
140CONFIG_CLASSIC_RCU=y
126 141
127# 142#
128# Platform support 143# Platform support
129# 144#
130# CONFIG_PPC_MPC52xx is not set 145# CONFIG_PPC_MPC512x is not set
131# CONFIG_PPC_MPC5200 is not set 146# CONFIG_PPC_MPC5121 is not set
132# CONFIG_PPC_CELL is not set 147# CONFIG_PPC_CELL is not set
133# CONFIG_PPC_CELL_NATIVE is not set 148# CONFIG_PPC_CELL_NATIVE is not set
134# CONFIG_PQ2ADS is not set 149# CONFIG_PQ2ADS is not set
150CONFIG_MPC85xx=y
135# CONFIG_MPC8540_ADS is not set 151# CONFIG_MPC8540_ADS is not set
136# CONFIG_MPC8560_ADS is not set 152# CONFIG_MPC8560_ADS is not set
137CONFIG_MPC85xx_CDS=y 153CONFIG_MPC85xx_CDS=y
138# CONFIG_MPC85xx_MDS is not set 154# CONFIG_MPC85xx_MDS is not set
139# CONFIG_MPC85xx_DS is not set 155# CONFIG_MPC85xx_DS is not set
140CONFIG_MPC8540=y 156# CONFIG_STX_GP3 is not set
141CONFIG_MPC85xx=y 157# CONFIG_TQM8540 is not set
158# CONFIG_TQM8541 is not set
159# CONFIG_TQM8555 is not set
160# CONFIG_TQM8560 is not set
161# CONFIG_SBC8548 is not set
162# CONFIG_SBC8560 is not set
163# CONFIG_IPIC is not set
142CONFIG_MPIC=y 164CONFIG_MPIC=y
143# CONFIG_MPIC_WEIRD is not set 165# CONFIG_MPIC_WEIRD is not set
144CONFIG_PPC_I8259=y 166CONFIG_PPC_I8259=y
@@ -165,13 +187,17 @@ CONFIG_HZ_250=y
165# CONFIG_HZ_300 is not set 187# CONFIG_HZ_300 is not set
166# CONFIG_HZ_1000 is not set 188# CONFIG_HZ_1000 is not set
167CONFIG_HZ=250 189CONFIG_HZ=250
190# CONFIG_SCHED_HRTICK is not set
168CONFIG_PREEMPT_NONE=y 191CONFIG_PREEMPT_NONE=y
169# CONFIG_PREEMPT_VOLUNTARY is not set 192# CONFIG_PREEMPT_VOLUNTARY is not set
170# CONFIG_PREEMPT is not set 193# CONFIG_PREEMPT is not set
171CONFIG_BINFMT_ELF=y 194CONFIG_BINFMT_ELF=y
172CONFIG_BINFMT_MISC=y 195CONFIG_BINFMT_MISC=y
173CONFIG_MATH_EMULATION=y 196CONFIG_MATH_EMULATION=y
197# CONFIG_IOMMU_HELPER is not set
174CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 198CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
199CONFIG_ARCH_HAS_WALK_MEMORY=y
200CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
175CONFIG_ARCH_FLATMEM_ENABLE=y 201CONFIG_ARCH_FLATMEM_ENABLE=y
176CONFIG_ARCH_POPULATES_NODE_MAP=y 202CONFIG_ARCH_POPULATES_NODE_MAP=y
177CONFIG_SELECT_MEMORY_MODEL=y 203CONFIG_SELECT_MEMORY_MODEL=y
@@ -190,11 +216,7 @@ CONFIG_VIRT_TO_BUS=y
190CONFIG_PROC_DEVICETREE=y 216CONFIG_PROC_DEVICETREE=y
191# CONFIG_CMDLINE_BOOL is not set 217# CONFIG_CMDLINE_BOOL is not set
192# CONFIG_PM is not set 218# CONFIG_PM is not set
193CONFIG_SUSPEND_UP_POSSIBLE=y
194CONFIG_HIBERNATION_UP_POSSIBLE=y
195# CONFIG_SECCOMP is not set 219# CONFIG_SECCOMP is not set
196CONFIG_WANT_DEVICE_TREE=y
197CONFIG_DEVICE_TREE=""
198CONFIG_ISA_DMA_API=y 220CONFIG_ISA_DMA_API=y
199 221
200# 222#
@@ -244,6 +266,7 @@ CONFIG_XFRM=y
244CONFIG_XFRM_USER=y 266CONFIG_XFRM_USER=y
245# CONFIG_XFRM_SUB_POLICY is not set 267# CONFIG_XFRM_SUB_POLICY is not set
246# CONFIG_XFRM_MIGRATE is not set 268# CONFIG_XFRM_MIGRATE is not set
269# CONFIG_XFRM_STATISTICS is not set
247# CONFIG_NET_KEY is not set 270# CONFIG_NET_KEY is not set
248CONFIG_INET=y 271CONFIG_INET=y
249CONFIG_IP_MULTICAST=y 272CONFIG_IP_MULTICAST=y
@@ -299,6 +322,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
299# 322#
300# CONFIG_NET_PKTGEN is not set 323# CONFIG_NET_PKTGEN is not set
301# CONFIG_HAMRADIO is not set 324# CONFIG_HAMRADIO is not set
325# CONFIG_CAN is not set
302# CONFIG_IRDA is not set 326# CONFIG_IRDA is not set
303# CONFIG_BT is not set 327# CONFIG_BT is not set
304# CONFIG_AF_RXRPC is not set 328# CONFIG_AF_RXRPC is not set
@@ -345,7 +369,7 @@ CONFIG_BLK_DEV_LOOP=y
345CONFIG_BLK_DEV_RAM=y 369CONFIG_BLK_DEV_RAM=y
346CONFIG_BLK_DEV_RAM_COUNT=16 370CONFIG_BLK_DEV_RAM_COUNT=16
347CONFIG_BLK_DEV_RAM_SIZE=32768 371CONFIG_BLK_DEV_RAM_SIZE=32768
348CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 372# CONFIG_BLK_DEV_XIP is not set
349# CONFIG_CDROM_PKTCDVD is not set 373# CONFIG_CDROM_PKTCDVD is not set
350# CONFIG_ATA_OVER_ETH is not set 374# CONFIG_ATA_OVER_ETH is not set
351CONFIG_MISC_DEVICES=y 375CONFIG_MISC_DEVICES=y
@@ -353,12 +377,14 @@ CONFIG_MISC_DEVICES=y
353# CONFIG_EEPROM_93CX6 is not set 377# CONFIG_EEPROM_93CX6 is not set
354# CONFIG_SGI_IOC4 is not set 378# CONFIG_SGI_IOC4 is not set
355# CONFIG_TIFM_CORE is not set 379# CONFIG_TIFM_CORE is not set
380# CONFIG_ENCLOSURE_SERVICES is not set
381CONFIG_HAVE_IDE=y
356CONFIG_IDE=y 382CONFIG_IDE=y
357CONFIG_IDE_MAX_HWIFS=4 383CONFIG_IDE_MAX_HWIFS=4
358CONFIG_BLK_DEV_IDE=y 384CONFIG_BLK_DEV_IDE=y
359 385
360# 386#
361# Please see Documentation/ide.txt for help/info on IDE drives 387# Please see Documentation/ide/ide.txt for help/info on IDE drives
362# 388#
363# CONFIG_BLK_DEV_IDE_SATA is not set 389# CONFIG_BLK_DEV_IDE_SATA is not set
364# CONFIG_BLK_DEV_IDEDISK is not set 390# CONFIG_BLK_DEV_IDEDISK is not set
@@ -374,12 +400,12 @@ CONFIG_IDE_PROC_FS=y
374# 400#
375CONFIG_IDE_GENERIC=y 401CONFIG_IDE_GENERIC=y
376# CONFIG_BLK_DEV_PLATFORM is not set 402# CONFIG_BLK_DEV_PLATFORM is not set
403CONFIG_BLK_DEV_IDEDMA_SFF=y
377 404
378# 405#
379# PCI IDE chipsets support 406# PCI IDE chipsets support
380# 407#
381CONFIG_BLK_DEV_IDEPCI=y 408CONFIG_BLK_DEV_IDEPCI=y
382CONFIG_IDEPCI_SHARE_IRQ=y
383CONFIG_IDEPCI_PCIBUS_ORDER=y 409CONFIG_IDEPCI_PCIBUS_ORDER=y
384# CONFIG_BLK_DEV_OFFBOARD is not set 410# CONFIG_BLK_DEV_OFFBOARD is not set
385CONFIG_BLK_DEV_GENERIC=y 411CONFIG_BLK_DEV_GENERIC=y
@@ -410,7 +436,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
410# CONFIG_BLK_DEV_TRM290 is not set 436# CONFIG_BLK_DEV_TRM290 is not set
411CONFIG_BLK_DEV_VIA82CXXX=y 437CONFIG_BLK_DEV_VIA82CXXX=y
412# CONFIG_BLK_DEV_TC86C001 is not set 438# CONFIG_BLK_DEV_TC86C001 is not set
413# CONFIG_IDE_ARM is not set
414CONFIG_BLK_DEV_IDEDMA=y 439CONFIG_BLK_DEV_IDEDMA=y
415CONFIG_IDE_ARCH_OBSOLETE_INIT=y 440CONFIG_IDE_ARCH_OBSOLETE_INIT=y
416# CONFIG_BLK_DEV_HD is not set 441# CONFIG_BLK_DEV_HD is not set
@@ -441,7 +466,6 @@ CONFIG_NETDEVICES=y
441# CONFIG_EQUALIZER is not set 466# CONFIG_EQUALIZER is not set
442# CONFIG_TUN is not set 467# CONFIG_TUN is not set
443# CONFIG_VETH is not set 468# CONFIG_VETH is not set
444# CONFIG_IP1000 is not set
445# CONFIG_ARCNET is not set 469# CONFIG_ARCNET is not set
446CONFIG_PHYLIB=y 470CONFIG_PHYLIB=y
447 471
@@ -457,6 +481,7 @@ CONFIG_PHYLIB=y
457# CONFIG_SMSC_PHY is not set 481# CONFIG_SMSC_PHY is not set
458# CONFIG_BROADCOM_PHY is not set 482# CONFIG_BROADCOM_PHY is not set
459# CONFIG_ICPLUS_PHY is not set 483# CONFIG_ICPLUS_PHY is not set
484# CONFIG_REALTEK_PHY is not set
460# CONFIG_FIXED_PHY is not set 485# CONFIG_FIXED_PHY is not set
461# CONFIG_MDIO_BITBANG is not set 486# CONFIG_MDIO_BITBANG is not set
462CONFIG_NET_ETHERNET=y 487CONFIG_NET_ETHERNET=y
@@ -480,6 +505,9 @@ CONFIG_E1000=y
480CONFIG_E1000_NAPI=y 505CONFIG_E1000_NAPI=y
481# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 506# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
482# CONFIG_E1000E is not set 507# CONFIG_E1000E is not set
508# CONFIG_E1000E_ENABLED is not set
509# CONFIG_IP1000 is not set
510# CONFIG_IGB is not set
483# CONFIG_NS83820 is not set 511# CONFIG_NS83820 is not set
484# CONFIG_HAMACHI is not set 512# CONFIG_HAMACHI is not set
485# CONFIG_YELLOWFIN is not set 513# CONFIG_YELLOWFIN is not set
@@ -506,6 +534,7 @@ CONFIG_NETDEV_10000=y
506# CONFIG_NIU is not set 534# CONFIG_NIU is not set
507# CONFIG_MLX4_CORE is not set 535# CONFIG_MLX4_CORE is not set
508# CONFIG_TEHUTI is not set 536# CONFIG_TEHUTI is not set
537# CONFIG_BNX2X is not set
509# CONFIG_TR is not set 538# CONFIG_TR is not set
510 539
511# 540#
@@ -518,7 +547,6 @@ CONFIG_NETDEV_10000=y
518# CONFIG_HIPPI is not set 547# CONFIG_HIPPI is not set
519# CONFIG_PPP is not set 548# CONFIG_PPP is not set
520# CONFIG_SLIP is not set 549# CONFIG_SLIP is not set
521# CONFIG_SHAPER is not set
522# CONFIG_NETCONSOLE is not set 550# CONFIG_NETCONSOLE is not set
523# CONFIG_NETPOLL is not set 551# CONFIG_NETPOLL is not set
524# CONFIG_NET_POLL_CONTROLLER is not set 552# CONFIG_NET_POLL_CONTROLLER is not set
@@ -561,6 +589,7 @@ CONFIG_INPUT=y
561# 589#
562# CONFIG_VT is not set 590# CONFIG_VT is not set
563# CONFIG_SERIAL_NONSTANDARD is not set 591# CONFIG_SERIAL_NONSTANDARD is not set
592# CONFIG_NOZOMI is not set
564 593
565# 594#
566# Serial drivers 595# Serial drivers
@@ -620,6 +649,7 @@ CONFIG_HWMON=y
620# CONFIG_SENSORS_W83627HF is not set 649# CONFIG_SENSORS_W83627HF is not set
621# CONFIG_SENSORS_W83627EHF is not set 650# CONFIG_SENSORS_W83627EHF is not set
622# CONFIG_HWMON_DEBUG_CHIP is not set 651# CONFIG_HWMON_DEBUG_CHIP is not set
652# CONFIG_THERMAL is not set
623# CONFIG_WATCHDOG is not set 653# CONFIG_WATCHDOG is not set
624 654
625# 655#
@@ -672,16 +702,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
672# 702#
673# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 703# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
674# 704#
675
676#
677# USB Gadget Support
678#
679# CONFIG_USB_GADGET is not set 705# CONFIG_USB_GADGET is not set
680# CONFIG_MMC is not set 706# CONFIG_MMC is not set
707# CONFIG_MEMSTICK is not set
681# CONFIG_NEW_LEDS is not set 708# CONFIG_NEW_LEDS is not set
682# CONFIG_INFINIBAND is not set 709# CONFIG_INFINIBAND is not set
683# CONFIG_EDAC is not set 710# CONFIG_EDAC is not set
684# CONFIG_RTC_CLASS is not set 711# CONFIG_RTC_CLASS is not set
712# CONFIG_DMADEVICES is not set
685 713
686# 714#
687# Userspace I/O 715# Userspace I/O
@@ -707,12 +735,10 @@ CONFIG_FS_MBCACHE=y
707# CONFIG_XFS_FS is not set 735# CONFIG_XFS_FS is not set
708# CONFIG_GFS2_FS is not set 736# CONFIG_GFS2_FS is not set
709# CONFIG_OCFS2_FS is not set 737# CONFIG_OCFS2_FS is not set
710# CONFIG_MINIX_FS is not set 738CONFIG_DNOTIFY=y
711# CONFIG_ROMFS_FS is not set
712CONFIG_INOTIFY=y 739CONFIG_INOTIFY=y
713CONFIG_INOTIFY_USER=y 740CONFIG_INOTIFY_USER=y
714# CONFIG_QUOTA is not set 741# CONFIG_QUOTA is not set
715CONFIG_DNOTIFY=y
716# CONFIG_AUTOFS_FS is not set 742# CONFIG_AUTOFS_FS is not set
717# CONFIG_AUTOFS4_FS is not set 743# CONFIG_AUTOFS4_FS is not set
718# CONFIG_FUSE_FS is not set 744# CONFIG_FUSE_FS is not set
@@ -754,8 +780,10 @@ CONFIG_TMPFS=y
754# CONFIG_EFS_FS is not set 780# CONFIG_EFS_FS is not set
755# CONFIG_CRAMFS is not set 781# CONFIG_CRAMFS is not set
756# CONFIG_VXFS_FS is not set 782# CONFIG_VXFS_FS is not set
783# CONFIG_MINIX_FS is not set
757# CONFIG_HPFS_FS is not set 784# CONFIG_HPFS_FS is not set
758# CONFIG_QNX4FS_FS is not set 785# CONFIG_QNX4FS_FS is not set
786# CONFIG_ROMFS_FS is not set
759# CONFIG_SYSV_FS is not set 787# CONFIG_SYSV_FS is not set
760# CONFIG_UFS_FS is not set 788# CONFIG_UFS_FS is not set
761CONFIG_NETWORK_FILESYSTEMS=y 789CONFIG_NETWORK_FILESYSTEMS=y
@@ -796,7 +824,6 @@ CONFIG_PARTITION_ADVANCED=y
796# CONFIG_SYSV68_PARTITION is not set 824# CONFIG_SYSV68_PARTITION is not set
797# CONFIG_NLS is not set 825# CONFIG_NLS is not set
798# CONFIG_DLM is not set 826# CONFIG_DLM is not set
799# CONFIG_UCC_SLOW is not set
800 827
801# 828#
802# Library routines 829# Library routines
@@ -812,7 +839,6 @@ CONFIG_PLIST=y
812CONFIG_HAS_IOMEM=y 839CONFIG_HAS_IOMEM=y
813CONFIG_HAS_IOPORT=y 840CONFIG_HAS_IOPORT=y
814CONFIG_HAS_DMA=y 841CONFIG_HAS_DMA=y
815# CONFIG_INSTRUMENTATION is not set
816 842
817# 843#
818# Kernel hacking 844# Kernel hacking
@@ -831,6 +857,7 @@ CONFIG_SCHED_DEBUG=y
831# CONFIG_SCHEDSTATS is not set 857# CONFIG_SCHEDSTATS is not set
832# CONFIG_TIMER_STATS is not set 858# CONFIG_TIMER_STATS is not set
833# CONFIG_SLUB_DEBUG_ON is not set 859# CONFIG_SLUB_DEBUG_ON is not set
860# CONFIG_SLUB_STATS is not set
834# CONFIG_DEBUG_RT_MUTEXES is not set 861# CONFIG_DEBUG_RT_MUTEXES is not set
835# CONFIG_RT_MUTEX_TESTER is not set 862# CONFIG_RT_MUTEX_TESTER is not set
836# CONFIG_DEBUG_SPINLOCK is not set 863# CONFIG_DEBUG_SPINLOCK is not set
@@ -843,8 +870,8 @@ CONFIG_DEBUG_MUTEXES=y
843# CONFIG_DEBUG_VM is not set 870# CONFIG_DEBUG_VM is not set
844# CONFIG_DEBUG_LIST is not set 871# CONFIG_DEBUG_LIST is not set
845# CONFIG_DEBUG_SG is not set 872# CONFIG_DEBUG_SG is not set
846CONFIG_FORCED_INLINING=y
847# CONFIG_BOOT_PRINTK_DELAY is not set 873# CONFIG_BOOT_PRINTK_DELAY is not set
874# CONFIG_BACKTRACE_SELF_TEST is not set
848# CONFIG_FAULT_INJECTION is not set 875# CONFIG_FAULT_INJECTION is not set
849# CONFIG_SAMPLES is not set 876# CONFIG_SAMPLES is not set
850# CONFIG_DEBUG_STACKOVERFLOW is not set 877# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -860,5 +887,49 @@ CONFIG_FORCED_INLINING=y
860# CONFIG_KEYS is not set 887# CONFIG_KEYS is not set
861# CONFIG_SECURITY is not set 888# CONFIG_SECURITY is not set
862# CONFIG_SECURITY_FILE_CAPABILITIES is not set 889# CONFIG_SECURITY_FILE_CAPABILITIES is not set
863# CONFIG_CRYPTO is not set 890CONFIG_CRYPTO=y
891# CONFIG_CRYPTO_SEQIV is not set
892# CONFIG_CRYPTO_MANAGER is not set
893# CONFIG_CRYPTO_HMAC is not set
894# CONFIG_CRYPTO_XCBC is not set
895# CONFIG_CRYPTO_NULL is not set
896# CONFIG_CRYPTO_MD4 is not set
897# CONFIG_CRYPTO_MD5 is not set
898# CONFIG_CRYPTO_SHA1 is not set
899# CONFIG_CRYPTO_SHA256 is not set
900# CONFIG_CRYPTO_SHA512 is not set
901# CONFIG_CRYPTO_WP512 is not set
902# CONFIG_CRYPTO_TGR192 is not set
903# CONFIG_CRYPTO_GF128MUL is not set
904# CONFIG_CRYPTO_ECB is not set
905# CONFIG_CRYPTO_CBC is not set
906# CONFIG_CRYPTO_PCBC is not set
907# CONFIG_CRYPTO_LRW is not set
908# CONFIG_CRYPTO_XTS is not set
909# CONFIG_CRYPTO_CTR is not set
910# CONFIG_CRYPTO_GCM is not set
911# CONFIG_CRYPTO_CCM is not set
912# CONFIG_CRYPTO_CRYPTD is not set
913# CONFIG_CRYPTO_DES is not set
914# CONFIG_CRYPTO_FCRYPT is not set
915# CONFIG_CRYPTO_BLOWFISH is not set
916# CONFIG_CRYPTO_TWOFISH is not set
917# CONFIG_CRYPTO_SERPENT is not set
918# CONFIG_CRYPTO_AES is not set
919# CONFIG_CRYPTO_CAST5 is not set
920# CONFIG_CRYPTO_CAST6 is not set
921# CONFIG_CRYPTO_TEA is not set
922# CONFIG_CRYPTO_ARC4 is not set
923# CONFIG_CRYPTO_KHAZAD is not set
924# CONFIG_CRYPTO_ANUBIS is not set
925# CONFIG_CRYPTO_SEED is not set
926# CONFIG_CRYPTO_SALSA20 is not set
927# CONFIG_CRYPTO_DEFLATE is not set
928# CONFIG_CRYPTO_MICHAEL_MIC is not set
929# CONFIG_CRYPTO_CRC32C is not set
930# CONFIG_CRYPTO_CAMELLIA is not set
931# CONFIG_CRYPTO_AUTHENC is not set
932# CONFIG_CRYPTO_LZO is not set
933CONFIG_CRYPTO_HW=y
934# CONFIG_CRYPTO_DEV_HIFN_795X is not set
864# CONFIG_PPC_CLOCK is not set 935# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index 90e38ba3832b..615e4c1bf735 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_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-rc8 3# Linux kernel version: 2.6.25-rc6
4# Mon Jan 28 13:12:07 2008 4# Mon Mar 24 08:48:31 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -17,6 +17,7 @@ CONFIG_PPC_85xx=y
17CONFIG_E500=y 17CONFIG_E500=y
18CONFIG_BOOKE=y 18CONFIG_BOOKE=y
19CONFIG_FSL_BOOKE=y 19CONFIG_FSL_BOOKE=y
20CONFIG_FSL_EMB_PERFMON=y
20# CONFIG_PHYS_64BIT is not set 21# CONFIG_PHYS_64BIT is not set
21CONFIG_SPE=y 22CONFIG_SPE=y
22# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
@@ -29,6 +30,7 @@ CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y 30CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y 31CONFIG_GENERIC_CLOCKEVENTS=y
31CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
32CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
33CONFIG_RWSEM_XCHGADD_ALGORITHM=y 35CONFIG_RWSEM_XCHGADD_ALGORITHM=y
34CONFIG_ARCH_HAS_ILOG2_U32=y 36CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -67,17 +69,21 @@ CONFIG_POSIX_MQUEUE=y
67CONFIG_BSD_PROCESS_ACCT=y 69CONFIG_BSD_PROCESS_ACCT=y
68# CONFIG_BSD_PROCESS_ACCT_V3 is not set 70# CONFIG_BSD_PROCESS_ACCT_V3 is not set
69# CONFIG_TASKSTATS is not set 71# CONFIG_TASKSTATS is not set
70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
72CONFIG_AUDIT=y 72CONFIG_AUDIT=y
73# CONFIG_AUDITSYSCALL is not set 73# CONFIG_AUDITSYSCALL is not set
74CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
75CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
76CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
77# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
78CONFIG_GROUP_SCHED=y
78# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
80# CONFIG_RT_GROUP_SCHED is not set
81CONFIG_USER_SCHED=y
82# CONFIG_CGROUP_SCHED is not set
79CONFIG_SYSFS_DEPRECATED=y 83CONFIG_SYSFS_DEPRECATED=y
84CONFIG_SYSFS_DEPRECATED_V2=y
80# CONFIG_RELAY is not set 85# CONFIG_RELAY is not set
86# CONFIG_NAMESPACES is not set
81CONFIG_BLK_DEV_INITRD=y 87CONFIG_BLK_DEV_INITRD=y
82CONFIG_INITRAMFS_SOURCE="" 88CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 89# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -91,11 +97,13 @@ CONFIG_HOTPLUG=y
91CONFIG_PRINTK=y 97CONFIG_PRINTK=y
92CONFIG_BUG=y 98CONFIG_BUG=y
93CONFIG_ELF_CORE=y 99CONFIG_ELF_CORE=y
100CONFIG_COMPAT_BRK=y
94CONFIG_BASE_FULL=y 101CONFIG_BASE_FULL=y
95CONFIG_FUTEX=y 102CONFIG_FUTEX=y
96CONFIG_ANON_INODES=y 103CONFIG_ANON_INODES=y
97CONFIG_EPOLL=y 104CONFIG_EPOLL=y
98CONFIG_SIGNALFD=y 105CONFIG_SIGNALFD=y
106CONFIG_TIMERFD=y
99CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
100CONFIG_SHMEM=y 108CONFIG_SHMEM=y
101CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
@@ -103,6 +111,13 @@ CONFIG_SLUB_DEBUG=y
103# CONFIG_SLAB is not set 111# CONFIG_SLAB is not set
104CONFIG_SLUB=y 112CONFIG_SLUB=y
105# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
114# CONFIG_PROFILING is not set
115# CONFIG_MARKERS is not set
116CONFIG_HAVE_OPROFILE=y
117# CONFIG_KPROBES is not set
118CONFIG_HAVE_KPROBES=y
119CONFIG_HAVE_KRETPROBES=y
120CONFIG_PROC_PAGE_MONITOR=y
106CONFIG_SLABINFO=y 121CONFIG_SLABINFO=y
107CONFIG_RT_MUTEXES=y 122CONFIG_RT_MUTEXES=y
108# CONFIG_TINY_SHMEM is not set 123# CONFIG_TINY_SHMEM is not set
@@ -131,12 +146,13 @@ CONFIG_IOSCHED_CFQ=y
131CONFIG_DEFAULT_CFQ=y 146CONFIG_DEFAULT_CFQ=y
132# CONFIG_DEFAULT_NOOP is not set 147# CONFIG_DEFAULT_NOOP is not set
133CONFIG_DEFAULT_IOSCHED="cfq" 148CONFIG_DEFAULT_IOSCHED="cfq"
149CONFIG_CLASSIC_RCU=y
134 150
135# 151#
136# Platform support 152# Platform support
137# 153#
138# CONFIG_PPC_MPC52xx is not set 154# CONFIG_PPC_MPC512x is not set
139# CONFIG_PPC_MPC5200 is not set 155# CONFIG_PPC_MPC5121 is not set
140# CONFIG_PPC_CELL is not set 156# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set 157# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set 158# CONFIG_PQ2ADS is not set
@@ -184,13 +200,17 @@ CONFIG_HZ_250=y
184# CONFIG_HZ_300 is not set 200# CONFIG_HZ_300 is not set
185# CONFIG_HZ_1000 is not set 201# CONFIG_HZ_1000 is not set
186CONFIG_HZ=250 202CONFIG_HZ=250
203# CONFIG_SCHED_HRTICK is not set
187CONFIG_PREEMPT_NONE=y 204CONFIG_PREEMPT_NONE=y
188# CONFIG_PREEMPT_VOLUNTARY is not set 205# CONFIG_PREEMPT_VOLUNTARY is not set
189# CONFIG_PREEMPT is not set 206# CONFIG_PREEMPT is not set
190CONFIG_BINFMT_ELF=y 207CONFIG_BINFMT_ELF=y
191CONFIG_BINFMT_MISC=m 208CONFIG_BINFMT_MISC=m
192CONFIG_MATH_EMULATION=y 209CONFIG_MATH_EMULATION=y
210# CONFIG_IOMMU_HELPER is not set
193CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 211CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
212CONFIG_ARCH_HAS_WALK_MEMORY=y
213CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
194CONFIG_ARCH_FLATMEM_ENABLE=y 214CONFIG_ARCH_FLATMEM_ENABLE=y
195CONFIG_ARCH_POPULATES_NODE_MAP=y 215CONFIG_ARCH_POPULATES_NODE_MAP=y
196CONFIG_SELECT_MEMORY_MODEL=y 216CONFIG_SELECT_MEMORY_MODEL=y
@@ -209,11 +229,7 @@ CONFIG_VIRT_TO_BUS=y
209CONFIG_PROC_DEVICETREE=y 229CONFIG_PROC_DEVICETREE=y
210# CONFIG_CMDLINE_BOOL is not set 230# CONFIG_CMDLINE_BOOL is not set
211# CONFIG_PM is not set 231# CONFIG_PM is not set
212CONFIG_SUSPEND_UP_POSSIBLE=y
213CONFIG_HIBERNATION_UP_POSSIBLE=y
214CONFIG_SECCOMP=y 232CONFIG_SECCOMP=y
215CONFIG_WANT_DEVICE_TREE=y
216CONFIG_DEVICE_TREE=""
217CONFIG_ISA_DMA_API=y 233CONFIG_ISA_DMA_API=y
218 234
219# 235#
@@ -264,6 +280,7 @@ CONFIG_XFRM=y
264CONFIG_XFRM_USER=y 280CONFIG_XFRM_USER=y
265# CONFIG_XFRM_SUB_POLICY is not set 281# CONFIG_XFRM_SUB_POLICY is not set
266# CONFIG_XFRM_MIGRATE is not set 282# CONFIG_XFRM_MIGRATE is not set
283# CONFIG_XFRM_STATISTICS is not set
267CONFIG_NET_KEY=m 284CONFIG_NET_KEY=m
268# CONFIG_NET_KEY_MIGRATE is not set 285# CONFIG_NET_KEY_MIGRATE is not set
269CONFIG_INET=y 286CONFIG_INET=y
@@ -347,6 +364,7 @@ CONFIG_SCTP_HMAC_MD5=y
347# 364#
348# CONFIG_NET_PKTGEN is not set 365# CONFIG_NET_PKTGEN is not set
349# CONFIG_HAMRADIO is not set 366# CONFIG_HAMRADIO is not set
367# CONFIG_CAN is not set
350# CONFIG_IRDA is not set 368# CONFIG_IRDA is not set
351# CONFIG_BT is not set 369# CONFIG_BT is not set
352# CONFIG_AF_RXRPC is not set 370# CONFIG_AF_RXRPC is not set
@@ -395,7 +413,7 @@ CONFIG_BLK_DEV_NBD=y
395CONFIG_BLK_DEV_RAM=y 413CONFIG_BLK_DEV_RAM=y
396CONFIG_BLK_DEV_RAM_COUNT=16 414CONFIG_BLK_DEV_RAM_COUNT=16
397CONFIG_BLK_DEV_RAM_SIZE=131072 415CONFIG_BLK_DEV_RAM_SIZE=131072
398CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 416# CONFIG_BLK_DEV_XIP is not set
399# CONFIG_CDROM_PKTCDVD is not set 417# CONFIG_CDROM_PKTCDVD is not set
400# CONFIG_ATA_OVER_ETH is not set 418# CONFIG_ATA_OVER_ETH is not set
401CONFIG_MISC_DEVICES=y 419CONFIG_MISC_DEVICES=y
@@ -403,6 +421,8 @@ CONFIG_MISC_DEVICES=y
403# CONFIG_EEPROM_93CX6 is not set 421# CONFIG_EEPROM_93CX6 is not set
404# CONFIG_SGI_IOC4 is not set 422# CONFIG_SGI_IOC4 is not set
405# CONFIG_TIFM_CORE is not set 423# CONFIG_TIFM_CORE is not set
424# CONFIG_ENCLOSURE_SERVICES is not set
425CONFIG_HAVE_IDE=y
406# CONFIG_IDE is not set 426# CONFIG_IDE is not set
407 427
408# 428#
@@ -468,6 +488,7 @@ CONFIG_SCSI_LOWLEVEL=y
468# CONFIG_SCSI_IPS is not set 488# CONFIG_SCSI_IPS is not set
469# CONFIG_SCSI_INITIO is not set 489# CONFIG_SCSI_INITIO is not set
470# CONFIG_SCSI_INIA100 is not set 490# CONFIG_SCSI_INIA100 is not set
491# CONFIG_SCSI_MVSAS is not set
471# CONFIG_SCSI_STEX is not set 492# CONFIG_SCSI_STEX is not set
472# CONFIG_SCSI_SYM53C8XX_2 is not set 493# CONFIG_SCSI_SYM53C8XX_2 is not set
473# CONFIG_SCSI_IPR is not set 494# CONFIG_SCSI_IPR is not set
@@ -522,6 +543,7 @@ CONFIG_PATA_ALI=y
522# CONFIG_PATA_MPIIX is not set 543# CONFIG_PATA_MPIIX is not set
523# CONFIG_PATA_OLDPIIX is not set 544# CONFIG_PATA_OLDPIIX is not set
524# CONFIG_PATA_NETCELL is not set 545# CONFIG_PATA_NETCELL is not set
546# CONFIG_PATA_NINJA32 is not set
525# CONFIG_PATA_NS87410 is not set 547# CONFIG_PATA_NS87410 is not set
526# CONFIG_PATA_NS87415 is not set 548# CONFIG_PATA_NS87415 is not set
527# CONFIG_PATA_OPTI is not set 549# CONFIG_PATA_OPTI is not set
@@ -570,6 +592,7 @@ CONFIG_VITESSE_PHY=y
570# CONFIG_SMSC_PHY is not set 592# CONFIG_SMSC_PHY is not set
571# CONFIG_BROADCOM_PHY is not set 593# CONFIG_BROADCOM_PHY is not set
572# CONFIG_ICPLUS_PHY is not set 594# CONFIG_ICPLUS_PHY is not set
595# CONFIG_REALTEK_PHY is not set
573# CONFIG_FIXED_PHY is not set 596# CONFIG_FIXED_PHY is not set
574# CONFIG_MDIO_BITBANG is not set 597# CONFIG_MDIO_BITBANG is not set
575CONFIG_NET_ETHERNET=y 598CONFIG_NET_ETHERNET=y
@@ -592,7 +615,9 @@ CONFIG_NETDEV_1000=y
592# CONFIG_DL2K is not set 615# CONFIG_DL2K is not set
593# CONFIG_E1000 is not set 616# CONFIG_E1000 is not set
594# CONFIG_E1000E is not set 617# CONFIG_E1000E is not set
618# CONFIG_E1000E_ENABLED is not set
595# CONFIG_IP1000 is not set 619# CONFIG_IP1000 is not set
620# CONFIG_IGB is not set
596# CONFIG_NS83820 is not set 621# CONFIG_NS83820 is not set
597# CONFIG_HAMACHI is not set 622# CONFIG_HAMACHI is not set
598# CONFIG_YELLOWFIN is not set 623# CONFIG_YELLOWFIN is not set
@@ -620,6 +645,7 @@ CONFIG_NETDEV_10000=y
620# CONFIG_NIU is not set 645# CONFIG_NIU is not set
621# CONFIG_MLX4_CORE is not set 646# CONFIG_MLX4_CORE is not set
622# CONFIG_TEHUTI is not set 647# CONFIG_TEHUTI is not set
648# CONFIG_BNX2X is not set
623# CONFIG_TR is not set 649# CONFIG_TR is not set
624 650
625# 651#
@@ -642,7 +668,6 @@ CONFIG_NETDEV_10000=y
642# CONFIG_PPP is not set 668# CONFIG_PPP is not set
643# CONFIG_SLIP is not set 669# CONFIG_SLIP is not set
644# CONFIG_NET_FC is not set 670# CONFIG_NET_FC is not set
645# CONFIG_SHAPER is not set
646# CONFIG_NETCONSOLE is not set 671# CONFIG_NETCONSOLE is not set
647# CONFIG_NETPOLL is not set 672# CONFIG_NETPOLL is not set
648# CONFIG_NET_POLL_CONTROLLER is not set 673# CONFIG_NET_POLL_CONTROLLER is not set
@@ -693,6 +718,7 @@ CONFIG_VT_CONSOLE=y
693CONFIG_HW_CONSOLE=y 718CONFIG_HW_CONSOLE=y
694# CONFIG_VT_HW_CONSOLE_BINDING is not set 719# CONFIG_VT_HW_CONSOLE_BINDING is not set
695# CONFIG_SERIAL_NONSTANDARD is not set 720# CONFIG_SERIAL_NONSTANDARD is not set
721# CONFIG_NOZOMI is not set
696 722
697# 723#
698# Serial drivers 724# Serial drivers
@@ -773,14 +799,12 @@ CONFIG_I2C_MPC=y
773# 799#
774# Miscellaneous I2C Chip support 800# Miscellaneous I2C Chip support
775# 801#
776# CONFIG_SENSORS_DS1337 is not set
777# CONFIG_SENSORS_DS1374 is not set
778# CONFIG_DS1682 is not set 802# CONFIG_DS1682 is not set
779CONFIG_SENSORS_EEPROM=y 803CONFIG_SENSORS_EEPROM=y
780# CONFIG_SENSORS_PCF8574 is not set 804# CONFIG_SENSORS_PCF8574 is not set
781# CONFIG_SENSORS_PCA9539 is not set 805# CONFIG_PCF8575 is not set
782# CONFIG_SENSORS_PCF8591 is not set 806# CONFIG_SENSORS_PCF8591 is not set
783# CONFIG_SENSORS_M41T00 is not set 807# CONFIG_TPS65010 is not set
784# CONFIG_SENSORS_MAX6875 is not set 808# CONFIG_SENSORS_MAX6875 is not set
785# CONFIG_SENSORS_TSL2550 is not set 809# CONFIG_SENSORS_TSL2550 is not set
786# CONFIG_I2C_DEBUG_CORE is not set 810# CONFIG_I2C_DEBUG_CORE is not set
@@ -796,6 +820,7 @@ CONFIG_SENSORS_EEPROM=y
796# CONFIG_W1 is not set 820# CONFIG_W1 is not set
797# CONFIG_POWER_SUPPLY is not set 821# CONFIG_POWER_SUPPLY is not set
798# CONFIG_HWMON is not set 822# CONFIG_HWMON is not set
823# CONFIG_THERMAL is not set
799# CONFIG_WATCHDOG is not set 824# CONFIG_WATCHDOG is not set
800 825
801# 826#
@@ -820,6 +845,8 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
820# 845#
821# Supported SAA7146 based PCI Adapters 846# Supported SAA7146 based PCI Adapters
822# 847#
848# CONFIG_TTPCI_EEPROM is not set
849# CONFIG_DVB_BUDGET_CORE is not set
823 850
824# 851#
825# Supported USB Adapters 852# Supported USB Adapters
@@ -905,11 +932,13 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
905# CONFIG_DVB_PLL is not set 932# CONFIG_DVB_PLL is not set
906# CONFIG_DVB_TDA826X is not set 933# CONFIG_DVB_TDA826X is not set
907# CONFIG_DVB_TDA827X is not set 934# CONFIG_DVB_TDA827X is not set
935# CONFIG_DVB_TDA18271 is not set
908# CONFIG_DVB_TUNER_QT1010 is not set 936# CONFIG_DVB_TUNER_QT1010 is not set
909# CONFIG_DVB_TUNER_MT2060 is not set 937# CONFIG_DVB_TUNER_MT2060 is not set
910# CONFIG_DVB_TUNER_MT2266 is not set 938# CONFIG_DVB_TUNER_MT2266 is not set
911# CONFIG_DVB_TUNER_MT2131 is not set 939# CONFIG_DVB_TUNER_MT2131 is not set
912# CONFIG_DVB_TUNER_DIB0070 is not set 940# CONFIG_DVB_TUNER_DIB0070 is not set
941# CONFIG_DVB_TUNER_XC5000 is not set
913 942
914# 943#
915# Miscellaneous devices 944# Miscellaneous devices
@@ -987,6 +1016,7 @@ CONFIG_SND_AC97_CODEC=y
987# CONFIG_SND_BT87X is not set 1016# CONFIG_SND_BT87X is not set
988# CONFIG_SND_CA0106 is not set 1017# CONFIG_SND_CA0106 is not set
989# CONFIG_SND_CMIPCI is not set 1018# CONFIG_SND_CMIPCI is not set
1019# CONFIG_SND_OXYGEN is not set
990# CONFIG_SND_CS4281 is not set 1020# CONFIG_SND_CS4281 is not set
991# CONFIG_SND_CS46XX is not set 1021# CONFIG_SND_CS46XX is not set
992# CONFIG_SND_CS5530 is not set 1022# CONFIG_SND_CS5530 is not set
@@ -1012,6 +1042,7 @@ CONFIG_SND_AC97_CODEC=y
1012# CONFIG_SND_HDA_INTEL is not set 1042# CONFIG_SND_HDA_INTEL is not set
1013# CONFIG_SND_HDSP is not set 1043# CONFIG_SND_HDSP is not set
1014# CONFIG_SND_HDSPM is not set 1044# CONFIG_SND_HDSPM is not set
1045# CONFIG_SND_HIFIER is not set
1015# CONFIG_SND_ICE1712 is not set 1046# CONFIG_SND_ICE1712 is not set
1016# CONFIG_SND_ICE1724 is not set 1047# CONFIG_SND_ICE1724 is not set
1017CONFIG_SND_INTEL8X0=y 1048CONFIG_SND_INTEL8X0=y
@@ -1029,6 +1060,7 @@ CONFIG_SND_INTEL8X0=y
1029# CONFIG_SND_TRIDENT is not set 1060# CONFIG_SND_TRIDENT is not set
1030# CONFIG_SND_VIA82XX is not set 1061# CONFIG_SND_VIA82XX is not set
1031# CONFIG_SND_VIA82XX_MODEM is not set 1062# CONFIG_SND_VIA82XX_MODEM is not set
1063# CONFIG_SND_VIRTUOSO is not set
1032# CONFIG_SND_VX222 is not set 1064# CONFIG_SND_VX222 is not set
1033# CONFIG_SND_YMFPCI is not set 1065# CONFIG_SND_YMFPCI is not set
1034# CONFIG_SND_AC97_POWER_SAVE is not set 1066# CONFIG_SND_AC97_POWER_SAVE is not set
@@ -1058,6 +1090,10 @@ CONFIG_SND_INTEL8X0=y
1058# 1090#
1059 1091
1060# 1092#
1093# ALSA SoC audio for Freescale SOCs
1094#
1095
1096#
1061# Open Sound System 1097# Open Sound System
1062# 1098#
1063# CONFIG_SOUND_PRIME is not set 1099# CONFIG_SOUND_PRIME is not set
@@ -1080,6 +1116,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
1080CONFIG_USB_ARCH_HAS_EHCI=y 1116CONFIG_USB_ARCH_HAS_EHCI=y
1081CONFIG_USB=y 1117CONFIG_USB=y
1082# CONFIG_USB_DEBUG is not set 1118# CONFIG_USB_DEBUG is not set
1119# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1083 1120
1084# 1121#
1085# Miscellaneous USB options 1122# Miscellaneous USB options
@@ -1093,9 +1130,10 @@ CONFIG_USB_DEVICE_CLASS=y
1093# USB Host Controller Drivers 1130# USB Host Controller Drivers
1094# 1131#
1095CONFIG_USB_EHCI_HCD=y 1132CONFIG_USB_EHCI_HCD=y
1096# CONFIG_USB_EHCI_SPLIT_ISO is not set
1097# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1133# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1098# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1134# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1135# CONFIG_USB_EHCI_FSL is not set
1136CONFIG_USB_EHCI_HCD_PPC_OF=y
1099# CONFIG_USB_ISP116X_HCD is not set 1137# CONFIG_USB_ISP116X_HCD is not set
1100CONFIG_USB_OHCI_HCD=y 1138CONFIG_USB_OHCI_HCD=y
1101CONFIG_USB_OHCI_HCD_PPC_OF=y 1139CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -1146,10 +1184,6 @@ CONFIG_USB_MON=y
1146# 1184#
1147# USB port drivers 1185# USB port drivers
1148# 1186#
1149
1150#
1151# USB Serial Converter support
1152#
1153# CONFIG_USB_SERIAL is not set 1187# CONFIG_USB_SERIAL is not set
1154 1188
1155# 1189#
@@ -1175,21 +1209,18 @@ CONFIG_USB_MON=y
1175# CONFIG_USB_TRANCEVIBRATOR is not set 1209# CONFIG_USB_TRANCEVIBRATOR is not set
1176# CONFIG_USB_IOWARRIOR is not set 1210# CONFIG_USB_IOWARRIOR is not set
1177# CONFIG_USB_TEST is not set 1211# CONFIG_USB_TEST is not set
1178
1179#
1180# USB DSL modem support
1181#
1182
1183#
1184# USB Gadget Support
1185#
1186# CONFIG_USB_GADGET is not set 1212# CONFIG_USB_GADGET is not set
1187# CONFIG_MMC is not set 1213# CONFIG_MMC is not set
1214# CONFIG_MEMSTICK is not set
1188# CONFIG_NEW_LEDS is not set 1215# CONFIG_NEW_LEDS is not set
1189# CONFIG_INFINIBAND is not set 1216# CONFIG_INFINIBAND is not set
1190# CONFIG_EDAC is not set 1217# CONFIG_EDAC is not set
1191CONFIG_RTC_LIB=y 1218CONFIG_RTC_LIB=y
1192CONFIG_RTC_CLASS=y 1219CONFIG_RTC_CLASS=y
1220
1221#
1222# Conflicting RTC option has been selected, check GEN_RTC and RTC
1223#
1193CONFIG_RTC_HCTOSYS=y 1224CONFIG_RTC_HCTOSYS=y
1194CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 1225CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1195# CONFIG_RTC_DEBUG is not set 1226# CONFIG_RTC_DEBUG is not set
@@ -1216,6 +1247,7 @@ CONFIG_RTC_INTF_DEV=y
1216# CONFIG_RTC_DRV_PCF8563 is not set 1247# CONFIG_RTC_DRV_PCF8563 is not set
1217# CONFIG_RTC_DRV_PCF8583 is not set 1248# CONFIG_RTC_DRV_PCF8583 is not set
1218# CONFIG_RTC_DRV_M41T80 is not set 1249# CONFIG_RTC_DRV_M41T80 is not set
1250# CONFIG_RTC_DRV_S35390A is not set
1219 1251
1220# 1252#
1221# SPI RTC drivers 1253# SPI RTC drivers
@@ -1225,9 +1257,10 @@ CONFIG_RTC_INTF_DEV=y
1225# Platform RTC drivers 1257# Platform RTC drivers
1226# 1258#
1227CONFIG_RTC_DRV_CMOS=y 1259CONFIG_RTC_DRV_CMOS=y
1260# CONFIG_RTC_DRV_DS1511 is not set
1228# CONFIG_RTC_DRV_DS1553 is not set 1261# CONFIG_RTC_DRV_DS1553 is not set
1229# CONFIG_RTC_DRV_STK17TA8 is not set
1230# CONFIG_RTC_DRV_DS1742 is not set 1262# CONFIG_RTC_DRV_DS1742 is not set
1263# CONFIG_RTC_DRV_STK17TA8 is not set
1231# CONFIG_RTC_DRV_M48T86 is not set 1264# CONFIG_RTC_DRV_M48T86 is not set
1232# CONFIG_RTC_DRV_M48T59 is not set 1265# CONFIG_RTC_DRV_M48T59 is not set
1233# CONFIG_RTC_DRV_V3020 is not set 1266# CONFIG_RTC_DRV_V3020 is not set
@@ -1235,6 +1268,7 @@ CONFIG_RTC_DRV_CMOS=y
1235# 1268#
1236# on-CPU RTC drivers 1269# on-CPU RTC drivers
1237# 1270#
1271# CONFIG_DMADEVICES is not set
1238 1272
1239# 1273#
1240# Userspace I/O 1274# Userspace I/O
@@ -1260,12 +1294,10 @@ CONFIG_FS_MBCACHE=y
1260# CONFIG_XFS_FS is not set 1294# CONFIG_XFS_FS is not set
1261# CONFIG_GFS2_FS is not set 1295# CONFIG_GFS2_FS is not set
1262# CONFIG_OCFS2_FS is not set 1296# CONFIG_OCFS2_FS is not set
1263# CONFIG_MINIX_FS is not set 1297CONFIG_DNOTIFY=y
1264# CONFIG_ROMFS_FS is not set
1265CONFIG_INOTIFY=y 1298CONFIG_INOTIFY=y
1266CONFIG_INOTIFY_USER=y 1299CONFIG_INOTIFY_USER=y
1267# CONFIG_QUOTA is not set 1300# CONFIG_QUOTA is not set
1268CONFIG_DNOTIFY=y
1269# CONFIG_AUTOFS_FS is not set 1301# CONFIG_AUTOFS_FS is not set
1270# CONFIG_AUTOFS4_FS is not set 1302# CONFIG_AUTOFS4_FS is not set
1271# CONFIG_FUSE_FS is not set 1303# CONFIG_FUSE_FS is not set
@@ -1317,8 +1349,10 @@ CONFIG_BFS_FS=m
1317CONFIG_EFS_FS=m 1349CONFIG_EFS_FS=m
1318CONFIG_CRAMFS=y 1350CONFIG_CRAMFS=y
1319CONFIG_VXFS_FS=m 1351CONFIG_VXFS_FS=m
1352# CONFIG_MINIX_FS is not set
1320CONFIG_HPFS_FS=m 1353CONFIG_HPFS_FS=m
1321CONFIG_QNX4FS_FS=m 1354CONFIG_QNX4FS_FS=m
1355# CONFIG_ROMFS_FS is not set
1322CONFIG_SYSV_FS=m 1356CONFIG_SYSV_FS=m
1323CONFIG_UFS_FS=m 1357CONFIG_UFS_FS=m
1324# CONFIG_UFS_FS_WRITE is not set 1358# CONFIG_UFS_FS_WRITE is not set
@@ -1426,7 +1460,6 @@ CONFIG_PLIST=y
1426CONFIG_HAS_IOMEM=y 1460CONFIG_HAS_IOMEM=y
1427CONFIG_HAS_IOPORT=y 1461CONFIG_HAS_IOPORT=y
1428CONFIG_HAS_DMA=y 1462CONFIG_HAS_DMA=y
1429# CONFIG_INSTRUMENTATION is not set
1430 1463
1431# 1464#
1432# Kernel hacking 1465# Kernel hacking
@@ -1445,6 +1478,7 @@ CONFIG_SCHED_DEBUG=y
1445# CONFIG_SCHEDSTATS is not set 1478# CONFIG_SCHEDSTATS is not set
1446# CONFIG_TIMER_STATS is not set 1479# CONFIG_TIMER_STATS is not set
1447# CONFIG_SLUB_DEBUG_ON is not set 1480# CONFIG_SLUB_DEBUG_ON is not set
1481# CONFIG_SLUB_STATS is not set
1448# CONFIG_DEBUG_RT_MUTEXES is not set 1482# CONFIG_DEBUG_RT_MUTEXES is not set
1449# CONFIG_RT_MUTEX_TESTER is not set 1483# CONFIG_RT_MUTEX_TESTER is not set
1450# CONFIG_DEBUG_SPINLOCK is not set 1484# CONFIG_DEBUG_SPINLOCK is not set
@@ -1458,9 +1492,9 @@ CONFIG_DEBUG_INFO=y
1458# CONFIG_DEBUG_VM is not set 1492# CONFIG_DEBUG_VM is not set
1459# CONFIG_DEBUG_LIST is not set 1493# CONFIG_DEBUG_LIST is not set
1460# CONFIG_DEBUG_SG is not set 1494# CONFIG_DEBUG_SG is not set
1461CONFIG_FORCED_INLINING=y
1462# CONFIG_BOOT_PRINTK_DELAY is not set 1495# CONFIG_BOOT_PRINTK_DELAY is not set
1463# CONFIG_RCU_TORTURE_TEST is not set 1496# CONFIG_RCU_TORTURE_TEST is not set
1497# CONFIG_BACKTRACE_SELF_TEST is not set
1464# CONFIG_FAULT_INJECTION is not set 1498# CONFIG_FAULT_INJECTION is not set
1465# CONFIG_SAMPLES is not set 1499# CONFIG_SAMPLES is not set
1466# CONFIG_DEBUG_STACKOVERFLOW is not set 1500# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1480,6 +1514,7 @@ CONFIG_FORCED_INLINING=y
1480CONFIG_CRYPTO=y 1514CONFIG_CRYPTO=y
1481CONFIG_CRYPTO_ALGAPI=y 1515CONFIG_CRYPTO_ALGAPI=y
1482CONFIG_CRYPTO_BLKCIPHER=y 1516CONFIG_CRYPTO_BLKCIPHER=y
1517# CONFIG_CRYPTO_SEQIV is not set
1483CONFIG_CRYPTO_HASH=y 1518CONFIG_CRYPTO_HASH=y
1484CONFIG_CRYPTO_MANAGER=y 1519CONFIG_CRYPTO_MANAGER=y
1485CONFIG_CRYPTO_HMAC=y 1520CONFIG_CRYPTO_HMAC=y
@@ -1498,6 +1533,9 @@ CONFIG_CRYPTO_CBC=y
1498CONFIG_CRYPTO_PCBC=m 1533CONFIG_CRYPTO_PCBC=m
1499# CONFIG_CRYPTO_LRW is not set 1534# CONFIG_CRYPTO_LRW is not set
1500# CONFIG_CRYPTO_XTS is not set 1535# CONFIG_CRYPTO_XTS is not set
1536# CONFIG_CRYPTO_CTR is not set
1537# CONFIG_CRYPTO_GCM is not set
1538# CONFIG_CRYPTO_CCM is not set
1501# CONFIG_CRYPTO_CRYPTD is not set 1539# CONFIG_CRYPTO_CRYPTD is not set
1502CONFIG_CRYPTO_DES=y 1540CONFIG_CRYPTO_DES=y
1503# CONFIG_CRYPTO_FCRYPT is not set 1541# CONFIG_CRYPTO_FCRYPT is not set
@@ -1512,12 +1550,15 @@ CONFIG_CRYPTO_DES=y
1512# CONFIG_CRYPTO_KHAZAD is not set 1550# CONFIG_CRYPTO_KHAZAD is not set
1513# CONFIG_CRYPTO_ANUBIS is not set 1551# CONFIG_CRYPTO_ANUBIS is not set
1514# CONFIG_CRYPTO_SEED is not set 1552# CONFIG_CRYPTO_SEED is not set
1553# CONFIG_CRYPTO_SALSA20 is not set
1515# CONFIG_CRYPTO_DEFLATE is not set 1554# CONFIG_CRYPTO_DEFLATE is not set
1516# CONFIG_CRYPTO_MICHAEL_MIC is not set 1555# CONFIG_CRYPTO_MICHAEL_MIC is not set
1517# CONFIG_CRYPTO_CRC32C is not set 1556# CONFIG_CRYPTO_CRC32C is not set
1518# CONFIG_CRYPTO_CAMELLIA is not set 1557# CONFIG_CRYPTO_CAMELLIA is not set
1519# CONFIG_CRYPTO_TEST is not set 1558# CONFIG_CRYPTO_TEST is not set
1520# CONFIG_CRYPTO_AUTHENC is not set 1559# CONFIG_CRYPTO_AUTHENC is not set
1560# CONFIG_CRYPTO_LZO is not set
1521CONFIG_CRYPTO_HW=y 1561CONFIG_CRYPTO_HW=y
1562# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1522# CONFIG_PPC_CLOCK is not set 1563# CONFIG_PPC_CLOCK is not set
1523CONFIG_PPC_LIB_RHEAP=y 1564CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc8610_hpcd_defconfig b/arch/powerpc/configs/mpc8610_hpcd_defconfig
index 2500ef42959d..9270afe7594d 100644
--- a/arch/powerpc/configs/mpc8610_hpcd_defconfig
+++ b/arch/powerpc/configs/mpc8610_hpcd_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:56 2007 4# Mon Mar 24 08:48:33 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
@@ -65,16 +66,20 @@ CONFIG_LOCALVERSION=""
65# CONFIG_POSIX_MQUEUE is not set 66# CONFIG_POSIX_MQUEUE is not set
66# CONFIG_BSD_PROCESS_ACCT is not set 67# CONFIG_BSD_PROCESS_ACCT is not set
67# CONFIG_TASKSTATS is not set 68# CONFIG_TASKSTATS is not set
68# CONFIG_USER_NS is not set
69# CONFIG_PID_NS is not set
70# CONFIG_AUDIT is not set 69# CONFIG_AUDIT is not set
71CONFIG_IKCONFIG=y 70CONFIG_IKCONFIG=y
72CONFIG_IKCONFIG_PROC=y 71CONFIG_IKCONFIG_PROC=y
73CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set 73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y
75# CONFIG_FAIR_GROUP_SCHED is not set 75# CONFIG_FAIR_GROUP_SCHED is not set
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
76CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
77# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
78CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
79CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -88,11 +93,13 @@ CONFIG_HOTPLUG=y
88CONFIG_PRINTK=y 93CONFIG_PRINTK=y
89CONFIG_BUG=y 94CONFIG_BUG=y
90# CONFIG_ELF_CORE is not set 95# CONFIG_ELF_CORE is not set
96CONFIG_COMPAT_BRK=y
91CONFIG_BASE_FULL=y 97CONFIG_BASE_FULL=y
92CONFIG_FUTEX=y 98CONFIG_FUTEX=y
93CONFIG_ANON_INODES=y 99CONFIG_ANON_INODES=y
94CONFIG_EPOLL=y 100CONFIG_EPOLL=y
95CONFIG_SIGNALFD=y 101CONFIG_SIGNALFD=y
102CONFIG_TIMERFD=y
96CONFIG_EVENTFD=y 103CONFIG_EVENTFD=y
97CONFIG_SHMEM=y 104CONFIG_SHMEM=y
98CONFIG_VM_EVENT_COUNTERS=y 105CONFIG_VM_EVENT_COUNTERS=y
@@ -100,6 +107,13 @@ CONFIG_SLUB_DEBUG=y
100# CONFIG_SLAB is not set 107# CONFIG_SLAB is not set
101CONFIG_SLUB=y 108CONFIG_SLUB=y
102# 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
113CONFIG_HAVE_KPROBES=y
114CONFIG_HAVE_KRETPROBES=y
115CONFIG_PROC_PAGE_MONITOR=y
116CONFIG_SLABINFO=y
103CONFIG_RT_MUTEXES=y 117CONFIG_RT_MUTEXES=y
104# CONFIG_TINY_SHMEM is not set 118# CONFIG_TINY_SHMEM is not set
105CONFIG_BASE_SMALL=0 119CONFIG_BASE_SMALL=0
@@ -122,6 +136,7 @@ CONFIG_DEFAULT_DEADLINE=y
122# CONFIG_DEFAULT_CFQ is not set 136# CONFIG_DEFAULT_CFQ is not set
123# CONFIG_DEFAULT_NOOP is not set 137# CONFIG_DEFAULT_NOOP is not set
124CONFIG_DEFAULT_IOSCHED="deadline" 138CONFIG_DEFAULT_IOSCHED="deadline"
139CONFIG_CLASSIC_RCU=y
125 140
126# 141#
127# Platform support 142# Platform support
@@ -130,14 +145,15 @@ CONFIG_DEFAULT_IOSCHED="deadline"
130# CONFIG_PPC_82xx is not set 145# CONFIG_PPC_82xx is not set
131# CONFIG_PPC_83xx is not set 146# CONFIG_PPC_83xx is not set
132CONFIG_PPC_86xx=y 147CONFIG_PPC_86xx=y
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
138# CONFIG_MPC8641_HPCN is not set 153# CONFIG_MPC8641_HPCN is not set
139CONFIG_MPC8610_HPCD=y 154CONFIG_MPC8610_HPCD=y
140CONFIG_MPC8610=y 155CONFIG_MPC8610=y
156# CONFIG_IPIC is not set
141CONFIG_MPIC=y 157CONFIG_MPIC=y
142# CONFIG_MPIC_WEIRD is not set 158# CONFIG_MPIC_WEIRD is not set
143# CONFIG_PPC_I8259 is not set 159# CONFIG_PPC_I8259 is not set
@@ -148,7 +164,6 @@ CONFIG_MPIC=y
148# CONFIG_PPC_INDIRECT_IO is not set 164# CONFIG_PPC_INDIRECT_IO is not set
149# CONFIG_GENERIC_IOMAP is not set 165# CONFIG_GENERIC_IOMAP is not set
150# CONFIG_CPU_FREQ is not set 166# CONFIG_CPU_FREQ is not set
151# CONFIG_CPM2 is not set
152# CONFIG_FSL_ULI1575 is not set 167# CONFIG_FSL_ULI1575 is not set
153 168
154# 169#
@@ -164,12 +179,16 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
164# CONFIG_HZ_300 is not set 179# CONFIG_HZ_300 is not set
165CONFIG_HZ_1000=y 180CONFIG_HZ_1000=y
166CONFIG_HZ=1000 181CONFIG_HZ=1000
182# CONFIG_SCHED_HRTICK is not set
167CONFIG_PREEMPT_NONE=y 183CONFIG_PREEMPT_NONE=y
168# CONFIG_PREEMPT_VOLUNTARY is not set 184# CONFIG_PREEMPT_VOLUNTARY is not set
169# CONFIG_PREEMPT is not set 185# CONFIG_PREEMPT is not set
170CONFIG_BINFMT_ELF=y 186CONFIG_BINFMT_ELF=y
171# CONFIG_BINFMT_MISC is not set 187# CONFIG_BINFMT_MISC is not set
188# CONFIG_IOMMU_HELPER is not set
172CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 189CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
190CONFIG_ARCH_HAS_WALK_MEMORY=y
191CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
173CONFIG_ARCH_FLATMEM_ENABLE=y 192CONFIG_ARCH_FLATMEM_ENABLE=y
174CONFIG_ARCH_POPULATES_NODE_MAP=y 193CONFIG_ARCH_POPULATES_NODE_MAP=y
175CONFIG_SELECT_MEMORY_MODEL=y 194CONFIG_SELECT_MEMORY_MODEL=y
@@ -188,10 +207,7 @@ CONFIG_VIRT_TO_BUS=y
188CONFIG_PROC_DEVICETREE=y 207CONFIG_PROC_DEVICETREE=y
189# CONFIG_CMDLINE_BOOL is not set 208# CONFIG_CMDLINE_BOOL is not set
190# CONFIG_PM is not set 209# CONFIG_PM is not set
191CONFIG_SUSPEND_UP_POSSIBLE=y
192CONFIG_HIBERNATION_UP_POSSIBLE=y
193# CONFIG_SECCOMP is not set 210# CONFIG_SECCOMP is not set
194# CONFIG_WANT_DEVICE_TREE is not set
195CONFIG_ISA_DMA_API=y 211CONFIG_ISA_DMA_API=y
196 212
197# 213#
@@ -243,6 +259,7 @@ CONFIG_XFRM=y
243CONFIG_XFRM_USER=y 259CONFIG_XFRM_USER=y
244# CONFIG_XFRM_SUB_POLICY is not set 260# CONFIG_XFRM_SUB_POLICY is not set
245# CONFIG_XFRM_MIGRATE is not set 261# CONFIG_XFRM_MIGRATE is not set
262# CONFIG_XFRM_STATISTICS is not set
246# CONFIG_NET_KEY is not set 263# CONFIG_NET_KEY is not set
247CONFIG_INET=y 264CONFIG_INET=y
248# CONFIG_IP_MULTICAST is not set 265# CONFIG_IP_MULTICAST is not set
@@ -311,6 +328,7 @@ CONFIG_IPV6_SIT=y
311# 328#
312# CONFIG_NET_PKTGEN is not set 329# CONFIG_NET_PKTGEN is not set
313# CONFIG_HAMRADIO is not set 330# CONFIG_HAMRADIO is not set
331# CONFIG_CAN is not set
314# CONFIG_IRDA is not set 332# CONFIG_IRDA is not set
315# CONFIG_BT is not set 333# CONFIG_BT is not set
316# CONFIG_AF_RXRPC is not set 334# CONFIG_AF_RXRPC is not set
@@ -357,7 +375,7 @@ CONFIG_BLK_DEV_LOOP=y
357CONFIG_BLK_DEV_RAM=y 375CONFIG_BLK_DEV_RAM=y
358CONFIG_BLK_DEV_RAM_COUNT=16 376CONFIG_BLK_DEV_RAM_COUNT=16
359CONFIG_BLK_DEV_RAM_SIZE=131072 377CONFIG_BLK_DEV_RAM_SIZE=131072
360CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 378# CONFIG_BLK_DEV_XIP is not set
361# CONFIG_CDROM_PKTCDVD is not set 379# CONFIG_CDROM_PKTCDVD is not set
362# CONFIG_ATA_OVER_ETH is not set 380# CONFIG_ATA_OVER_ETH is not set
363CONFIG_MISC_DEVICES=y 381CONFIG_MISC_DEVICES=y
@@ -365,6 +383,8 @@ CONFIG_MISC_DEVICES=y
365# CONFIG_EEPROM_93CX6 is not set 383# CONFIG_EEPROM_93CX6 is not set
366# CONFIG_SGI_IOC4 is not set 384# CONFIG_SGI_IOC4 is not set
367# CONFIG_TIFM_CORE is not set 385# CONFIG_TIFM_CORE is not set
386# CONFIG_ENCLOSURE_SERVICES is not set
387CONFIG_HAVE_IDE=y
368CONFIG_IDE=y 388CONFIG_IDE=y
369CONFIG_IDE_MAX_HWIFS=4 389CONFIG_IDE_MAX_HWIFS=4
370# CONFIG_BLK_DEV_IDE is not set 390# CONFIG_BLK_DEV_IDE is not set
@@ -432,6 +452,7 @@ CONFIG_SCSI_LOWLEVEL=y
432# CONFIG_SCSI_IPS is not set 452# CONFIG_SCSI_IPS is not set
433# CONFIG_SCSI_INITIO is not set 453# CONFIG_SCSI_INITIO is not set
434# CONFIG_SCSI_INIA100 is not set 454# CONFIG_SCSI_INIA100 is not set
455# CONFIG_SCSI_MVSAS is not set
435# CONFIG_SCSI_STEX is not set 456# CONFIG_SCSI_STEX is not set
436# CONFIG_SCSI_SYM53C8XX_2 is not set 457# CONFIG_SCSI_SYM53C8XX_2 is not set
437# CONFIG_SCSI_IPR is not set 458# CONFIG_SCSI_IPR is not set
@@ -462,6 +483,7 @@ CONFIG_SATA_AHCI=y
462# CONFIG_SATA_VIA is not set 483# CONFIG_SATA_VIA is not set
463# CONFIG_SATA_VITESSE is not set 484# CONFIG_SATA_VITESSE is not set
464# CONFIG_SATA_INIC162X is not set 485# CONFIG_SATA_INIC162X is not set
486# CONFIG_SATA_FSL is not set
465CONFIG_PATA_ALI=y 487CONFIG_PATA_ALI=y
466# CONFIG_PATA_AMD is not set 488# CONFIG_PATA_AMD is not set
467# CONFIG_PATA_ARTOP is not set 489# CONFIG_PATA_ARTOP is not set
@@ -485,6 +507,7 @@ CONFIG_PATA_ALI=y
485# CONFIG_PATA_MPIIX is not set 507# CONFIG_PATA_MPIIX is not set
486# CONFIG_PATA_OLDPIIX is not set 508# CONFIG_PATA_OLDPIIX is not set
487# CONFIG_PATA_NETCELL is not set 509# CONFIG_PATA_NETCELL is not set
510# CONFIG_PATA_NINJA32 is not set
488# CONFIG_PATA_NS87410 is not set 511# CONFIG_PATA_NS87410 is not set
489# CONFIG_PATA_NS87415 is not set 512# CONFIG_PATA_NS87415 is not set
490# CONFIG_PATA_OPTI is not set 513# CONFIG_PATA_OPTI is not set
@@ -518,7 +541,6 @@ CONFIG_DUMMY=y
518# CONFIG_EQUALIZER is not set 541# CONFIG_EQUALIZER is not set
519# CONFIG_TUN is not set 542# CONFIG_TUN is not set
520# CONFIG_VETH is not set 543# CONFIG_VETH is not set
521# CONFIG_IP1000 is not set
522# CONFIG_ARCNET is not set 544# CONFIG_ARCNET is not set
523CONFIG_PHYLIB=y 545CONFIG_PHYLIB=y
524 546
@@ -534,6 +556,7 @@ CONFIG_PHYLIB=y
534# CONFIG_SMSC_PHY is not set 556# CONFIG_SMSC_PHY is not set
535# CONFIG_BROADCOM_PHY is not set 557# CONFIG_BROADCOM_PHY is not set
536# CONFIG_ICPLUS_PHY is not set 558# CONFIG_ICPLUS_PHY is not set
559# CONFIG_REALTEK_PHY is not set
537# CONFIG_FIXED_PHY is not set 560# CONFIG_FIXED_PHY is not set
538# CONFIG_MDIO_BITBANG is not set 561# CONFIG_MDIO_BITBANG is not set
539CONFIG_NET_ETHERNET=y 562CONFIG_NET_ETHERNET=y
@@ -574,6 +597,7 @@ CONFIG_8139TOO_PIO=y
574# CONFIG_8139TOO_TUNE_TWISTER is not set 597# CONFIG_8139TOO_TUNE_TWISTER is not set
575# CONFIG_8139TOO_8129 is not set 598# CONFIG_8139TOO_8129 is not set
576# CONFIG_8139_OLD_RX_RESET is not set 599# CONFIG_8139_OLD_RX_RESET is not set
600# CONFIG_R6040 is not set
577# CONFIG_SIS900 is not set 601# CONFIG_SIS900 is not set
578# CONFIG_EPIC100 is not set 602# CONFIG_EPIC100 is not set
579# CONFIG_SUNDANCE is not set 603# CONFIG_SUNDANCE is not set
@@ -585,6 +609,9 @@ CONFIG_NETDEV_1000=y
585# CONFIG_DL2K is not set 609# CONFIG_DL2K is not set
586# CONFIG_E1000 is not set 610# CONFIG_E1000 is not set
587# CONFIG_E1000E is not set 611# CONFIG_E1000E is not set
612# CONFIG_E1000E_ENABLED is not set
613# CONFIG_IP1000 is not set
614# CONFIG_IGB is not set
588# CONFIG_NS83820 is not set 615# CONFIG_NS83820 is not set
589# CONFIG_HAMACHI is not set 616# CONFIG_HAMACHI is not set
590# CONFIG_YELLOWFIN is not set 617# CONFIG_YELLOWFIN is not set
@@ -610,6 +637,7 @@ CONFIG_NETDEV_10000=y
610# CONFIG_NIU is not set 637# CONFIG_NIU is not set
611# CONFIG_MLX4_CORE is not set 638# CONFIG_MLX4_CORE is not set
612# CONFIG_TEHUTI is not set 639# CONFIG_TEHUTI is not set
640# CONFIG_BNX2X is not set
613# CONFIG_TR is not set 641# CONFIG_TR is not set
614 642
615# 643#
@@ -623,7 +651,6 @@ CONFIG_NETDEV_10000=y
623# CONFIG_PPP is not set 651# CONFIG_PPP is not set
624# CONFIG_SLIP is not set 652# CONFIG_SLIP is not set
625# CONFIG_NET_FC is not set 653# CONFIG_NET_FC is not set
626# CONFIG_SHAPER is not set
627# CONFIG_NETCONSOLE is not set 654# CONFIG_NETCONSOLE is not set
628# CONFIG_NETPOLL is not set 655# CONFIG_NETPOLL is not set
629# CONFIG_NET_POLL_CONTROLLER is not set 656# CONFIG_NET_POLL_CONTROLLER is not set
@@ -674,6 +701,7 @@ CONFIG_VT_CONSOLE=y
674CONFIG_HW_CONSOLE=y 701CONFIG_HW_CONSOLE=y
675# CONFIG_VT_HW_CONSOLE_BINDING is not set 702# CONFIG_VT_HW_CONSOLE_BINDING is not set
676# CONFIG_SERIAL_NONSTANDARD is not set 703# CONFIG_SERIAL_NONSTANDARD is not set
704# CONFIG_NOZOMI is not set
677 705
678# 706#
679# Serial drivers 707# Serial drivers
@@ -748,14 +776,12 @@ CONFIG_I2C_MPC=y
748# 776#
749# Miscellaneous I2C Chip support 777# Miscellaneous I2C Chip support
750# 778#
751# CONFIG_SENSORS_DS1337 is not set
752# CONFIG_SENSORS_DS1374 is not set
753# CONFIG_DS1682 is not set 779# CONFIG_DS1682 is not set
754# CONFIG_SENSORS_EEPROM is not set 780# CONFIG_SENSORS_EEPROM is not set
755# CONFIG_SENSORS_PCF8574 is not set 781# CONFIG_SENSORS_PCF8574 is not set
756# CONFIG_SENSORS_PCA9539 is not set 782# CONFIG_PCF8575 is not set
757# CONFIG_SENSORS_PCF8591 is not set 783# CONFIG_SENSORS_PCF8591 is not set
758# CONFIG_SENSORS_M41T00 is not set 784# CONFIG_TPS65010 is not set
759# CONFIG_SENSORS_MAX6875 is not set 785# CONFIG_SENSORS_MAX6875 is not set
760# CONFIG_SENSORS_TSL2550 is not set 786# CONFIG_SENSORS_TSL2550 is not set
761# CONFIG_I2C_DEBUG_CORE is not set 787# CONFIG_I2C_DEBUG_CORE is not set
@@ -771,6 +797,7 @@ CONFIG_I2C_MPC=y
771# CONFIG_W1 is not set 797# CONFIG_W1 is not set
772# CONFIG_POWER_SUPPLY is not set 798# CONFIG_POWER_SUPPLY is not set
773# CONFIG_HWMON is not set 799# CONFIG_HWMON is not set
800# CONFIG_THERMAL is not set
774# CONFIG_WATCHDOG is not set 801# CONFIG_WATCHDOG is not set
775 802
776# 803#
@@ -859,6 +886,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
859# CONFIG_SND_BT87X is not set 886# CONFIG_SND_BT87X is not set
860# CONFIG_SND_CA0106 is not set 887# CONFIG_SND_CA0106 is not set
861# CONFIG_SND_CMIPCI is not set 888# CONFIG_SND_CMIPCI is not set
889# CONFIG_SND_OXYGEN is not set
862# CONFIG_SND_CS4281 is not set 890# CONFIG_SND_CS4281 is not set
863# CONFIG_SND_CS46XX is not set 891# CONFIG_SND_CS46XX is not set
864# CONFIG_SND_CS5530 is not set 892# CONFIG_SND_CS5530 is not set
@@ -884,6 +912,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
884# CONFIG_SND_HDA_INTEL is not set 912# CONFIG_SND_HDA_INTEL is not set
885# CONFIG_SND_HDSP is not set 913# CONFIG_SND_HDSP is not set
886# CONFIG_SND_HDSPM is not set 914# CONFIG_SND_HDSPM is not set
915# CONFIG_SND_HIFIER is not set
887# CONFIG_SND_ICE1712 is not set 916# CONFIG_SND_ICE1712 is not set
888# CONFIG_SND_ICE1724 is not set 917# CONFIG_SND_ICE1724 is not set
889# CONFIG_SND_INTEL8X0 is not set 918# CONFIG_SND_INTEL8X0 is not set
@@ -901,6 +930,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
901# CONFIG_SND_TRIDENT is not set 930# CONFIG_SND_TRIDENT is not set
902# CONFIG_SND_VIA82XX is not set 931# CONFIG_SND_VIA82XX is not set
903# CONFIG_SND_VIA82XX_MODEM is not set 932# CONFIG_SND_VIA82XX_MODEM is not set
933# CONFIG_SND_VIRTUOSO is not set
904# CONFIG_SND_VX222 is not set 934# CONFIG_SND_VX222 is not set
905# CONFIG_SND_YMFPCI is not set 935# CONFIG_SND_YMFPCI is not set
906 936
@@ -929,6 +959,10 @@ CONFIG_SND_SOC_MPC8610_HPCD=y
929CONFIG_SND_SOC_CS4270=y 959CONFIG_SND_SOC_CS4270=y
930CONFIG_SND_SOC_CS4270_VD33_ERRATA=y 960CONFIG_SND_SOC_CS4270_VD33_ERRATA=y
931 961
962#
963# Open Sound System
964#
965# CONFIG_SOUND_PRIME is not set
932CONFIG_HID_SUPPORT=y 966CONFIG_HID_SUPPORT=y
933CONFIG_HID=y 967CONFIG_HID=y
934# CONFIG_HID_DEBUG is not set 968# CONFIG_HID_DEBUG is not set
@@ -942,16 +976,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
942# 976#
943# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 977# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
944# 978#
945
946#
947# USB Gadget Support
948#
949# CONFIG_USB_GADGET is not set 979# CONFIG_USB_GADGET is not set
950# CONFIG_MMC is not set 980# CONFIG_MMC is not set
981# CONFIG_MEMSTICK is not set
951# CONFIG_NEW_LEDS is not set 982# CONFIG_NEW_LEDS is not set
952# CONFIG_INFINIBAND is not set 983# CONFIG_INFINIBAND is not set
953# CONFIG_EDAC is not set 984# CONFIG_EDAC is not set
954# CONFIG_RTC_CLASS is not set 985# CONFIG_RTC_CLASS is not set
986# CONFIG_DMADEVICES is not set
955 987
956# 988#
957# Userspace I/O 989# Userspace I/O
@@ -977,11 +1009,9 @@ CONFIG_FS_MBCACHE=y
977# CONFIG_XFS_FS is not set 1009# CONFIG_XFS_FS is not set
978# CONFIG_GFS2_FS is not set 1010# CONFIG_GFS2_FS is not set
979# CONFIG_OCFS2_FS is not set 1011# CONFIG_OCFS2_FS is not set
980# CONFIG_MINIX_FS is not set 1012# CONFIG_DNOTIFY is not set
981# CONFIG_ROMFS_FS is not set
982# CONFIG_INOTIFY is not set 1013# CONFIG_INOTIFY is not set
983# CONFIG_QUOTA is not set 1014# CONFIG_QUOTA is not set
984# CONFIG_DNOTIFY is not set
985# CONFIG_AUTOFS_FS is not set 1015# CONFIG_AUTOFS_FS is not set
986# CONFIG_AUTOFS4_FS is not set 1016# CONFIG_AUTOFS4_FS is not set
987# CONFIG_FUSE_FS is not set 1017# CONFIG_FUSE_FS is not set
@@ -1023,8 +1053,10 @@ CONFIG_TMPFS=y
1023# CONFIG_EFS_FS is not set 1053# CONFIG_EFS_FS is not set
1024# CONFIG_CRAMFS is not set 1054# CONFIG_CRAMFS is not set
1025# CONFIG_VXFS_FS is not set 1055# CONFIG_VXFS_FS is not set
1056# CONFIG_MINIX_FS is not set
1026# CONFIG_HPFS_FS is not set 1057# CONFIG_HPFS_FS is not set
1027# CONFIG_QNX4FS_FS is not set 1058# CONFIG_QNX4FS_FS is not set
1059# CONFIG_ROMFS_FS is not set
1028# CONFIG_SYSV_FS is not set 1060# CONFIG_SYSV_FS is not set
1029# CONFIG_UFS_FS is not set 1061# CONFIG_UFS_FS is not set
1030CONFIG_NETWORK_FILESYSTEMS=y 1062CONFIG_NETWORK_FILESYSTEMS=y
@@ -1114,7 +1146,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1114# CONFIG_NLS_KOI8_U is not set 1146# CONFIG_NLS_KOI8_U is not set
1115# CONFIG_NLS_UTF8 is not set 1147# CONFIG_NLS_UTF8 is not set
1116# CONFIG_DLM is not set 1148# CONFIG_DLM is not set
1117# CONFIG_UCC_SLOW is not set
1118 1149
1119# 1150#
1120# Library routines 1151# Library routines
@@ -1130,7 +1161,6 @@ CONFIG_PLIST=y
1130CONFIG_HAS_IOMEM=y 1161CONFIG_HAS_IOMEM=y
1131CONFIG_HAS_IOPORT=y 1162CONFIG_HAS_IOPORT=y
1132CONFIG_HAS_DMA=y 1163CONFIG_HAS_DMA=y
1133# CONFIG_INSTRUMENTATION is not set
1134 1164
1135# 1165#
1136# Kernel hacking 1166# Kernel hacking
@@ -1149,6 +1179,7 @@ CONFIG_SCHED_DEBUG=y
1149# CONFIG_SCHEDSTATS is not set 1179# CONFIG_SCHEDSTATS is not set
1150# CONFIG_TIMER_STATS is not set 1180# CONFIG_TIMER_STATS is not set
1151# CONFIG_SLUB_DEBUG_ON is not set 1181# CONFIG_SLUB_DEBUG_ON is not set
1182# CONFIG_SLUB_STATS is not set
1152# CONFIG_DEBUG_RT_MUTEXES is not set 1183# CONFIG_DEBUG_RT_MUTEXES is not set
1153# CONFIG_RT_MUTEX_TESTER is not set 1184# CONFIG_RT_MUTEX_TESTER is not set
1154# CONFIG_DEBUG_SPINLOCK is not set 1185# CONFIG_DEBUG_SPINLOCK is not set
@@ -1162,8 +1193,8 @@ CONFIG_DEBUG_INFO=y
1162# CONFIG_DEBUG_VM is not set 1193# CONFIG_DEBUG_VM is not set
1163# CONFIG_DEBUG_LIST is not set 1194# CONFIG_DEBUG_LIST is not set
1164# CONFIG_DEBUG_SG is not set 1195# CONFIG_DEBUG_SG is not set
1165CONFIG_FORCED_INLINING=y
1166# CONFIG_BOOT_PRINTK_DELAY is not set 1196# CONFIG_BOOT_PRINTK_DELAY is not set
1197# CONFIG_BACKTRACE_SELF_TEST is not set
1167# CONFIG_FAULT_INJECTION is not set 1198# CONFIG_FAULT_INJECTION is not set
1168# CONFIG_SAMPLES is not set 1199# CONFIG_SAMPLES is not set
1169# CONFIG_DEBUG_STACKOVERFLOW is not set 1200# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1179,5 +1210,49 @@ CONFIG_FORCED_INLINING=y
1179# CONFIG_KEYS is not set 1210# CONFIG_KEYS is not set
1180# CONFIG_SECURITY is not set 1211# CONFIG_SECURITY is not set
1181# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1212# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1182# CONFIG_CRYPTO is not set 1213CONFIG_CRYPTO=y
1214# CONFIG_CRYPTO_SEQIV is not set
1215# CONFIG_CRYPTO_MANAGER is not set
1216# CONFIG_CRYPTO_HMAC is not set
1217# CONFIG_CRYPTO_XCBC is not set
1218# CONFIG_CRYPTO_NULL is not set
1219# CONFIG_CRYPTO_MD4 is not set
1220# CONFIG_CRYPTO_MD5 is not set
1221# CONFIG_CRYPTO_SHA1 is not set
1222# CONFIG_CRYPTO_SHA256 is not set
1223# CONFIG_CRYPTO_SHA512 is not set
1224# CONFIG_CRYPTO_WP512 is not set
1225# CONFIG_CRYPTO_TGR192 is not set
1226# CONFIG_CRYPTO_GF128MUL is not set
1227# CONFIG_CRYPTO_ECB is not set
1228# CONFIG_CRYPTO_CBC is not set
1229# CONFIG_CRYPTO_PCBC is not set
1230# CONFIG_CRYPTO_LRW is not set
1231# CONFIG_CRYPTO_XTS is not set
1232# CONFIG_CRYPTO_CTR is not set
1233# CONFIG_CRYPTO_GCM is not set
1234# CONFIG_CRYPTO_CCM is not set
1235# CONFIG_CRYPTO_CRYPTD is not set
1236# CONFIG_CRYPTO_DES is not set
1237# CONFIG_CRYPTO_FCRYPT is not set
1238# CONFIG_CRYPTO_BLOWFISH is not set
1239# CONFIG_CRYPTO_TWOFISH is not set
1240# CONFIG_CRYPTO_SERPENT is not set
1241# CONFIG_CRYPTO_AES is not set
1242# CONFIG_CRYPTO_CAST5 is not set
1243# CONFIG_CRYPTO_CAST6 is not set
1244# CONFIG_CRYPTO_TEA is not set
1245# CONFIG_CRYPTO_ARC4 is not set
1246# CONFIG_CRYPTO_KHAZAD is not set
1247# CONFIG_CRYPTO_ANUBIS is not set
1248# CONFIG_CRYPTO_SEED is not set
1249# CONFIG_CRYPTO_SALSA20 is not set
1250# CONFIG_CRYPTO_DEFLATE is not set
1251# CONFIG_CRYPTO_MICHAEL_MIC is not set
1252# CONFIG_CRYPTO_CRC32C is not set
1253# CONFIG_CRYPTO_CAMELLIA is not set
1254# CONFIG_CRYPTO_AUTHENC is not set
1255# CONFIG_CRYPTO_LZO is not set
1256CONFIG_CRYPTO_HW=y
1257# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1183# CONFIG_PPC_CLOCK is not set 1258# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig
index ff092fc4c6be..994e76817967 100644
--- a/arch/powerpc/configs/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/mpc8641_hpcn_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:58 2007 4# Mon Mar 24 08:48:34 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,21 @@ CONFIG_POSIX_MQUEUE=y
68CONFIG_BSD_PROCESS_ACCT=y 69CONFIG_BSD_PROCESS_ACCT=y
69# CONFIG_BSD_PROCESS_ACCT_V3 is not set 70# CONFIG_BSD_PROCESS_ACCT_V3 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
73CONFIG_AUDIT=y 72CONFIG_AUDIT=y
74# CONFIG_AUDITSYSCALL is not set 73# CONFIG_AUDITSYSCALL is not set
75CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
76CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
77CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
78CONFIG_GROUP_SCHED=y
79# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
80# CONFIG_RT_GROUP_SCHED is not set
81CONFIG_USER_SCHED=y
82# CONFIG_CGROUP_SCHED is not set
80CONFIG_SYSFS_DEPRECATED=y 83CONFIG_SYSFS_DEPRECATED=y
84CONFIG_SYSFS_DEPRECATED_V2=y
81# CONFIG_RELAY is not set 85# CONFIG_RELAY is not set
86# CONFIG_NAMESPACES is not set
82CONFIG_BLK_DEV_INITRD=y 87CONFIG_BLK_DEV_INITRD=y
83CONFIG_INITRAMFS_SOURCE="" 88CONFIG_INITRAMFS_SOURCE=""
84# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 89# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -92,11 +97,13 @@ CONFIG_HOTPLUG=y
92CONFIG_PRINTK=y 97CONFIG_PRINTK=y
93CONFIG_BUG=y 98CONFIG_BUG=y
94CONFIG_ELF_CORE=y 99CONFIG_ELF_CORE=y
100CONFIG_COMPAT_BRK=y
95CONFIG_BASE_FULL=y 101CONFIG_BASE_FULL=y
96CONFIG_FUTEX=y 102CONFIG_FUTEX=y
97CONFIG_ANON_INODES=y 103CONFIG_ANON_INODES=y
98CONFIG_EPOLL=y 104CONFIG_EPOLL=y
99CONFIG_SIGNALFD=y 105CONFIG_SIGNALFD=y
106CONFIG_TIMERFD=y
100CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
101CONFIG_SHMEM=y 108CONFIG_SHMEM=y
102CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
@@ -104,6 +111,14 @@ CONFIG_SLUB_DEBUG=y
104# CONFIG_SLAB is not set 111# CONFIG_SLAB is not set
105CONFIG_SLUB=y 112CONFIG_SLUB=y
106# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
114# CONFIG_PROFILING is not set
115# CONFIG_MARKERS is not set
116CONFIG_HAVE_OPROFILE=y
117# CONFIG_KPROBES is not set
118CONFIG_HAVE_KPROBES=y
119CONFIG_HAVE_KRETPROBES=y
120CONFIG_PROC_PAGE_MONITOR=y
121CONFIG_SLABINFO=y
107CONFIG_RT_MUTEXES=y 122CONFIG_RT_MUTEXES=y
108# CONFIG_TINY_SHMEM is not set 123# CONFIG_TINY_SHMEM is not set
109CONFIG_BASE_SMALL=0 124CONFIG_BASE_SMALL=0
@@ -132,6 +147,7 @@ CONFIG_IOSCHED_CFQ=y
132CONFIG_DEFAULT_CFQ=y 147CONFIG_DEFAULT_CFQ=y
133# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
134CONFIG_DEFAULT_IOSCHED="cfq" 149CONFIG_DEFAULT_IOSCHED="cfq"
150CONFIG_CLASSIC_RCU=y
135 151
136# 152#
137# Platform support 153# Platform support
@@ -140,14 +156,15 @@ CONFIG_DEFAULT_IOSCHED="cfq"
140# CONFIG_PPC_82xx is not set 156# CONFIG_PPC_82xx is not set
141# CONFIG_PPC_83xx is not set 157# CONFIG_PPC_83xx is not set
142CONFIG_PPC_86xx=y 158CONFIG_PPC_86xx=y
143# CONFIG_PPC_MPC52xx is not set 159# CONFIG_PPC_MPC512x is not set
144# CONFIG_PPC_MPC5200 is not set 160# CONFIG_PPC_MPC5121 is not set
145# CONFIG_PPC_CELL is not set 161# CONFIG_PPC_CELL is not set
146# CONFIG_PPC_CELL_NATIVE is not set 162# CONFIG_PPC_CELL_NATIVE is not set
147# CONFIG_PQ2ADS is not set 163# CONFIG_PQ2ADS is not set
148CONFIG_MPC8641_HPCN=y 164CONFIG_MPC8641_HPCN=y
149# CONFIG_MPC8610_HPCD is not set 165# CONFIG_MPC8610_HPCD is not set
150CONFIG_MPC8641=y 166CONFIG_MPC8641=y
167# CONFIG_IPIC is not set
151CONFIG_MPIC=y 168CONFIG_MPIC=y
152# CONFIG_MPIC_WEIRD is not set 169# CONFIG_MPIC_WEIRD is not set
153CONFIG_PPC_I8259=y 170CONFIG_PPC_I8259=y
@@ -158,7 +175,6 @@ CONFIG_PPC_I8259=y
158# CONFIG_PPC_INDIRECT_IO is not set 175# CONFIG_PPC_INDIRECT_IO is not set
159# CONFIG_GENERIC_IOMAP is not set 176# CONFIG_GENERIC_IOMAP is not set
160# CONFIG_CPU_FREQ is not set 177# CONFIG_CPU_FREQ is not set
161# CONFIG_CPM2 is not set
162CONFIG_FSL_ULI1575=y 178CONFIG_FSL_ULI1575=y
163 179
164# 180#
@@ -174,13 +190,16 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
174# CONFIG_HZ_300 is not set 190# CONFIG_HZ_300 is not set
175CONFIG_HZ_1000=y 191CONFIG_HZ_1000=y
176CONFIG_HZ=1000 192CONFIG_HZ=1000
193# CONFIG_SCHED_HRTICK is not set
177CONFIG_PREEMPT_NONE=y 194CONFIG_PREEMPT_NONE=y
178# CONFIG_PREEMPT_VOLUNTARY is not set 195# CONFIG_PREEMPT_VOLUNTARY is not set
179# CONFIG_PREEMPT is not set 196# CONFIG_PREEMPT is not set
180CONFIG_PREEMPT_BKL=y
181CONFIG_BINFMT_ELF=y 197CONFIG_BINFMT_ELF=y
182CONFIG_BINFMT_MISC=m 198CONFIG_BINFMT_MISC=m
199# CONFIG_IOMMU_HELPER is not set
183CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 200CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
201CONFIG_ARCH_HAS_WALK_MEMORY=y
202CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
184# CONFIG_IRQ_ALL_CPUS is not set 203# CONFIG_IRQ_ALL_CPUS is not set
185CONFIG_ARCH_FLATMEM_ENABLE=y 204CONFIG_ARCH_FLATMEM_ENABLE=y
186CONFIG_ARCH_POPULATES_NODE_MAP=y 205CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -201,7 +220,6 @@ CONFIG_PROC_DEVICETREE=y
201# CONFIG_CMDLINE_BOOL is not set 220# CONFIG_CMDLINE_BOOL is not set
202# CONFIG_PM is not set 221# CONFIG_PM is not set
203CONFIG_SECCOMP=y 222CONFIG_SECCOMP=y
204# CONFIG_WANT_DEVICE_TREE is not set
205CONFIG_ISA_DMA_API=y 223CONFIG_ISA_DMA_API=y
206 224
207# 225#
@@ -252,6 +270,7 @@ CONFIG_XFRM=y
252CONFIG_XFRM_USER=y 270CONFIG_XFRM_USER=y
253# CONFIG_XFRM_SUB_POLICY is not set 271# CONFIG_XFRM_SUB_POLICY is not set
254# CONFIG_XFRM_MIGRATE is not set 272# CONFIG_XFRM_MIGRATE is not set
273# CONFIG_XFRM_STATISTICS is not set
255CONFIG_NET_KEY=m 274CONFIG_NET_KEY=m
256# CONFIG_NET_KEY_MIGRATE is not set 275# CONFIG_NET_KEY_MIGRATE is not set
257CONFIG_INET=y 276CONFIG_INET=y
@@ -335,6 +354,7 @@ CONFIG_SCTP_HMAC_MD5=y
335# 354#
336# CONFIG_NET_PKTGEN is not set 355# CONFIG_NET_PKTGEN is not set
337# CONFIG_HAMRADIO is not set 356# CONFIG_HAMRADIO is not set
357# CONFIG_CAN is not set
338# CONFIG_IRDA is not set 358# CONFIG_IRDA is not set
339# CONFIG_BT is not set 359# CONFIG_BT is not set
340# CONFIG_AF_RXRPC is not set 360# CONFIG_AF_RXRPC is not set
@@ -383,7 +403,7 @@ CONFIG_BLK_DEV_NBD=y
383CONFIG_BLK_DEV_RAM=y 403CONFIG_BLK_DEV_RAM=y
384CONFIG_BLK_DEV_RAM_COUNT=16 404CONFIG_BLK_DEV_RAM_COUNT=16
385CONFIG_BLK_DEV_RAM_SIZE=131072 405CONFIG_BLK_DEV_RAM_SIZE=131072
386CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 406# CONFIG_BLK_DEV_XIP is not set
387# CONFIG_CDROM_PKTCDVD is not set 407# CONFIG_CDROM_PKTCDVD is not set
388# CONFIG_ATA_OVER_ETH is not set 408# CONFIG_ATA_OVER_ETH is not set
389CONFIG_MISC_DEVICES=y 409CONFIG_MISC_DEVICES=y
@@ -391,6 +411,8 @@ CONFIG_MISC_DEVICES=y
391# CONFIG_EEPROM_93CX6 is not set 411# CONFIG_EEPROM_93CX6 is not set
392# CONFIG_SGI_IOC4 is not set 412# CONFIG_SGI_IOC4 is not set
393# CONFIG_TIFM_CORE is not set 413# CONFIG_TIFM_CORE is not set
414# CONFIG_ENCLOSURE_SERVICES is not set
415CONFIG_HAVE_IDE=y
394# CONFIG_IDE is not set 416# CONFIG_IDE is not set
395 417
396# 418#
@@ -456,6 +478,7 @@ CONFIG_SCSI_LOWLEVEL=y
456# CONFIG_SCSI_IPS is not set 478# CONFIG_SCSI_IPS is not set
457# CONFIG_SCSI_INITIO is not set 479# CONFIG_SCSI_INITIO is not set
458# CONFIG_SCSI_INIA100 is not set 480# CONFIG_SCSI_INIA100 is not set
481# CONFIG_SCSI_MVSAS is not set
459# CONFIG_SCSI_STEX is not set 482# CONFIG_SCSI_STEX is not set
460# CONFIG_SCSI_SYM53C8XX_2 is not set 483# CONFIG_SCSI_SYM53C8XX_2 is not set
461# CONFIG_SCSI_IPR is not set 484# CONFIG_SCSI_IPR is not set
@@ -486,6 +509,7 @@ CONFIG_SATA_AHCI=y
486# CONFIG_SATA_VIA is not set 509# CONFIG_SATA_VIA is not set
487# CONFIG_SATA_VITESSE is not set 510# CONFIG_SATA_VITESSE is not set
488# CONFIG_SATA_INIC162X is not set 511# CONFIG_SATA_INIC162X is not set
512# CONFIG_SATA_FSL is not set
489CONFIG_PATA_ALI=y 513CONFIG_PATA_ALI=y
490# CONFIG_PATA_AMD is not set 514# CONFIG_PATA_AMD is not set
491# CONFIG_PATA_ARTOP is not set 515# CONFIG_PATA_ARTOP is not set
@@ -509,6 +533,7 @@ CONFIG_PATA_ALI=y
509# CONFIG_PATA_MPIIX is not set 533# CONFIG_PATA_MPIIX is not set
510# CONFIG_PATA_OLDPIIX is not set 534# CONFIG_PATA_OLDPIIX is not set
511# CONFIG_PATA_NETCELL is not set 535# CONFIG_PATA_NETCELL is not set
536# CONFIG_PATA_NINJA32 is not set
512# CONFIG_PATA_NS87410 is not set 537# CONFIG_PATA_NS87410 is not set
513# CONFIG_PATA_NS87415 is not set 538# CONFIG_PATA_NS87415 is not set
514# CONFIG_PATA_OPTI is not set 539# CONFIG_PATA_OPTI is not set
@@ -542,7 +567,6 @@ CONFIG_DUMMY=y
542# CONFIG_EQUALIZER is not set 567# CONFIG_EQUALIZER is not set
543# CONFIG_TUN is not set 568# CONFIG_TUN is not set
544# CONFIG_VETH is not set 569# CONFIG_VETH is not set
545# CONFIG_IP1000 is not set
546# CONFIG_ARCNET is not set 570# CONFIG_ARCNET is not set
547CONFIG_PHYLIB=y 571CONFIG_PHYLIB=y
548 572
@@ -558,6 +582,7 @@ CONFIG_VITESSE_PHY=y
558# CONFIG_SMSC_PHY is not set 582# CONFIG_SMSC_PHY is not set
559# CONFIG_BROADCOM_PHY is not set 583# CONFIG_BROADCOM_PHY is not set
560# CONFIG_ICPLUS_PHY is not set 584# CONFIG_ICPLUS_PHY is not set
585# CONFIG_REALTEK_PHY is not set
561# CONFIG_FIXED_PHY is not set 586# CONFIG_FIXED_PHY is not set
562# CONFIG_MDIO_BITBANG is not set 587# CONFIG_MDIO_BITBANG is not set
563CONFIG_NET_ETHERNET=y 588CONFIG_NET_ETHERNET=y
@@ -579,6 +604,9 @@ CONFIG_NETDEV_1000=y
579# CONFIG_DL2K is not set 604# CONFIG_DL2K is not set
580# CONFIG_E1000 is not set 605# CONFIG_E1000 is not set
581# CONFIG_E1000E is not set 606# CONFIG_E1000E is not set
607# CONFIG_E1000E_ENABLED is not set
608# CONFIG_IP1000 is not set
609# CONFIG_IGB is not set
582# CONFIG_NS83820 is not set 610# CONFIG_NS83820 is not set
583# CONFIG_HAMACHI is not set 611# CONFIG_HAMACHI is not set
584# CONFIG_YELLOWFIN is not set 612# CONFIG_YELLOWFIN is not set
@@ -605,6 +633,7 @@ CONFIG_NETDEV_10000=y
605# CONFIG_NIU is not set 633# CONFIG_NIU is not set
606# CONFIG_MLX4_CORE is not set 634# CONFIG_MLX4_CORE is not set
607# CONFIG_TEHUTI is not set 635# CONFIG_TEHUTI is not set
636# CONFIG_BNX2X is not set
608# CONFIG_TR is not set 637# CONFIG_TR is not set
609 638
610# 639#
@@ -627,7 +656,6 @@ CONFIG_NETDEV_10000=y
627# CONFIG_PPP is not set 656# CONFIG_PPP is not set
628# CONFIG_SLIP is not set 657# CONFIG_SLIP is not set
629# CONFIG_NET_FC is not set 658# CONFIG_NET_FC is not set
630# CONFIG_SHAPER is not set
631# CONFIG_NETCONSOLE is not set 659# CONFIG_NETCONSOLE is not set
632# CONFIG_NETPOLL is not set 660# CONFIG_NETPOLL is not set
633# CONFIG_NET_POLL_CONTROLLER is not set 661# CONFIG_NET_POLL_CONTROLLER is not set
@@ -678,6 +706,7 @@ CONFIG_VT_CONSOLE=y
678CONFIG_HW_CONSOLE=y 706CONFIG_HW_CONSOLE=y
679# CONFIG_VT_HW_CONSOLE_BINDING is not set 707# CONFIG_VT_HW_CONSOLE_BINDING is not set
680# CONFIG_SERIAL_NONSTANDARD is not set 708# CONFIG_SERIAL_NONSTANDARD is not set
709# CONFIG_NOZOMI is not set
681 710
682# 711#
683# Serial drivers 712# Serial drivers
@@ -756,14 +785,12 @@ CONFIG_I2C_MPC=y
756# 785#
757# Miscellaneous I2C Chip support 786# Miscellaneous I2C Chip support
758# 787#
759# CONFIG_SENSORS_DS1337 is not set
760# CONFIG_SENSORS_DS1374 is not set
761# CONFIG_DS1682 is not set 788# CONFIG_DS1682 is not set
762CONFIG_SENSORS_EEPROM=y 789CONFIG_SENSORS_EEPROM=y
763# CONFIG_SENSORS_PCF8574 is not set 790# CONFIG_SENSORS_PCF8574 is not set
764# CONFIG_SENSORS_PCA9539 is not set 791# CONFIG_PCF8575 is not set
765# CONFIG_SENSORS_PCF8591 is not set 792# CONFIG_SENSORS_PCF8591 is not set
766# CONFIG_SENSORS_M41T00 is not set 793# CONFIG_TPS65010 is not set
767# CONFIG_SENSORS_MAX6875 is not set 794# CONFIG_SENSORS_MAX6875 is not set
768# CONFIG_SENSORS_TSL2550 is not set 795# CONFIG_SENSORS_TSL2550 is not set
769# CONFIG_I2C_DEBUG_CORE is not set 796# CONFIG_I2C_DEBUG_CORE is not set
@@ -779,6 +806,7 @@ CONFIG_SENSORS_EEPROM=y
779# CONFIG_W1 is not set 806# CONFIG_W1 is not set
780# CONFIG_POWER_SUPPLY is not set 807# CONFIG_POWER_SUPPLY is not set
781# CONFIG_HWMON is not set 808# CONFIG_HWMON is not set
809# CONFIG_THERMAL is not set
782# CONFIG_WATCHDOG is not set 810# CONFIG_WATCHDOG is not set
783 811
784# 812#
@@ -803,6 +831,8 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
803# 831#
804# Supported SAA7146 based PCI Adapters 832# Supported SAA7146 based PCI Adapters
805# 833#
834# CONFIG_TTPCI_EEPROM is not set
835# CONFIG_DVB_BUDGET_CORE is not set
806 836
807# 837#
808# Supported USB Adapters 838# Supported USB Adapters
@@ -888,11 +918,13 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
888# CONFIG_DVB_PLL is not set 918# CONFIG_DVB_PLL is not set
889# CONFIG_DVB_TDA826X is not set 919# CONFIG_DVB_TDA826X is not set
890# CONFIG_DVB_TDA827X is not set 920# CONFIG_DVB_TDA827X is not set
921# CONFIG_DVB_TDA18271 is not set
891# CONFIG_DVB_TUNER_QT1010 is not set 922# CONFIG_DVB_TUNER_QT1010 is not set
892# CONFIG_DVB_TUNER_MT2060 is not set 923# CONFIG_DVB_TUNER_MT2060 is not set
893# CONFIG_DVB_TUNER_MT2266 is not set 924# CONFIG_DVB_TUNER_MT2266 is not set
894# CONFIG_DVB_TUNER_MT2131 is not set 925# CONFIG_DVB_TUNER_MT2131 is not set
895# CONFIG_DVB_TUNER_DIB0070 is not set 926# CONFIG_DVB_TUNER_DIB0070 is not set
927# CONFIG_DVB_TUNER_XC5000 is not set
896 928
897# 929#
898# Miscellaneous devices 930# Miscellaneous devices
@@ -970,6 +1002,7 @@ CONFIG_SND_AC97_CODEC=y
970# CONFIG_SND_BT87X is not set 1002# CONFIG_SND_BT87X is not set
971# CONFIG_SND_CA0106 is not set 1003# CONFIG_SND_CA0106 is not set
972# CONFIG_SND_CMIPCI is not set 1004# CONFIG_SND_CMIPCI is not set
1005# CONFIG_SND_OXYGEN is not set
973# CONFIG_SND_CS4281 is not set 1006# CONFIG_SND_CS4281 is not set
974# CONFIG_SND_CS46XX is not set 1007# CONFIG_SND_CS46XX is not set
975# CONFIG_SND_CS5530 is not set 1008# CONFIG_SND_CS5530 is not set
@@ -995,6 +1028,7 @@ CONFIG_SND_AC97_CODEC=y
995# CONFIG_SND_HDA_INTEL is not set 1028# CONFIG_SND_HDA_INTEL is not set
996# CONFIG_SND_HDSP is not set 1029# CONFIG_SND_HDSP is not set
997# CONFIG_SND_HDSPM is not set 1030# CONFIG_SND_HDSPM is not set
1031# CONFIG_SND_HIFIER is not set
998# CONFIG_SND_ICE1712 is not set 1032# CONFIG_SND_ICE1712 is not set
999# CONFIG_SND_ICE1724 is not set 1033# CONFIG_SND_ICE1724 is not set
1000CONFIG_SND_INTEL8X0=y 1034CONFIG_SND_INTEL8X0=y
@@ -1012,6 +1046,7 @@ CONFIG_SND_INTEL8X0=y
1012# CONFIG_SND_TRIDENT is not set 1046# CONFIG_SND_TRIDENT is not set
1013# CONFIG_SND_VIA82XX is not set 1047# CONFIG_SND_VIA82XX is not set
1014# CONFIG_SND_VIA82XX_MODEM is not set 1048# CONFIG_SND_VIA82XX_MODEM is not set
1049# CONFIG_SND_VIRTUOSO is not set
1015# CONFIG_SND_VX222 is not set 1050# CONFIG_SND_VX222 is not set
1016# CONFIG_SND_YMFPCI is not set 1051# CONFIG_SND_YMFPCI is not set
1017# CONFIG_SND_AC97_POWER_SAVE is not set 1052# CONFIG_SND_AC97_POWER_SAVE is not set
@@ -1041,6 +1076,10 @@ CONFIG_SND_INTEL8X0=y
1041# 1076#
1042 1077
1043# 1078#
1079# ALSA SoC audio for Freescale SOCs
1080#
1081
1082#
1044# Open Sound System 1083# Open Sound System
1045# 1084#
1046# CONFIG_SOUND_PRIME is not set 1085# CONFIG_SOUND_PRIME is not set
@@ -1063,6 +1102,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
1063CONFIG_USB_ARCH_HAS_EHCI=y 1102CONFIG_USB_ARCH_HAS_EHCI=y
1064CONFIG_USB=y 1103CONFIG_USB=y
1065# CONFIG_USB_DEBUG is not set 1104# CONFIG_USB_DEBUG is not set
1105# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1066 1106
1067# 1107#
1068# Miscellaneous USB options 1108# Miscellaneous USB options
@@ -1076,9 +1116,10 @@ CONFIG_USB_DEVICE_CLASS=y
1076# USB Host Controller Drivers 1116# USB Host Controller Drivers
1077# 1117#
1078CONFIG_USB_EHCI_HCD=y 1118CONFIG_USB_EHCI_HCD=y
1079# CONFIG_USB_EHCI_SPLIT_ISO is not set
1080# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1119# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1081# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1120# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1121# CONFIG_USB_EHCI_FSL is not set
1122CONFIG_USB_EHCI_HCD_PPC_OF=y
1082# CONFIG_USB_ISP116X_HCD is not set 1123# CONFIG_USB_ISP116X_HCD is not set
1083CONFIG_USB_OHCI_HCD=y 1124CONFIG_USB_OHCI_HCD=y
1084CONFIG_USB_OHCI_HCD_PPC_OF=y 1125CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -1129,10 +1170,6 @@ CONFIG_USB_MON=y
1129# 1170#
1130# USB port drivers 1171# USB port drivers
1131# 1172#
1132
1133#
1134# USB Serial Converter support
1135#
1136# CONFIG_USB_SERIAL is not set 1173# CONFIG_USB_SERIAL is not set
1137 1174
1138# 1175#
@@ -1158,21 +1195,18 @@ CONFIG_USB_MON=y
1158# CONFIG_USB_TRANCEVIBRATOR is not set 1195# CONFIG_USB_TRANCEVIBRATOR is not set
1159# CONFIG_USB_IOWARRIOR is not set 1196# CONFIG_USB_IOWARRIOR is not set
1160# CONFIG_USB_TEST is not set 1197# CONFIG_USB_TEST is not set
1161
1162#
1163# USB DSL modem support
1164#
1165
1166#
1167# USB Gadget Support
1168#
1169# CONFIG_USB_GADGET is not set 1198# CONFIG_USB_GADGET is not set
1170# CONFIG_MMC is not set 1199# CONFIG_MMC is not set
1200# CONFIG_MEMSTICK is not set
1171# CONFIG_NEW_LEDS is not set 1201# CONFIG_NEW_LEDS is not set
1172# CONFIG_INFINIBAND is not set 1202# CONFIG_INFINIBAND is not set
1173# CONFIG_EDAC is not set 1203# CONFIG_EDAC is not set
1174CONFIG_RTC_LIB=y 1204CONFIG_RTC_LIB=y
1175CONFIG_RTC_CLASS=y 1205CONFIG_RTC_CLASS=y
1206
1207#
1208# Conflicting RTC option has been selected, check GEN_RTC and RTC
1209#
1176CONFIG_RTC_HCTOSYS=y 1210CONFIG_RTC_HCTOSYS=y
1177CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 1211CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1178# CONFIG_RTC_DEBUG is not set 1212# CONFIG_RTC_DEBUG is not set
@@ -1199,6 +1233,7 @@ CONFIG_RTC_INTF_DEV=y
1199# CONFIG_RTC_DRV_PCF8563 is not set 1233# CONFIG_RTC_DRV_PCF8563 is not set
1200# CONFIG_RTC_DRV_PCF8583 is not set 1234# CONFIG_RTC_DRV_PCF8583 is not set
1201# CONFIG_RTC_DRV_M41T80 is not set 1235# CONFIG_RTC_DRV_M41T80 is not set
1236# CONFIG_RTC_DRV_S35390A is not set
1202 1237
1203# 1238#
1204# SPI RTC drivers 1239# SPI RTC drivers
@@ -1208,9 +1243,10 @@ CONFIG_RTC_INTF_DEV=y
1208# Platform RTC drivers 1243# Platform RTC drivers
1209# 1244#
1210CONFIG_RTC_DRV_CMOS=y 1245CONFIG_RTC_DRV_CMOS=y
1246# CONFIG_RTC_DRV_DS1511 is not set
1211# CONFIG_RTC_DRV_DS1553 is not set 1247# CONFIG_RTC_DRV_DS1553 is not set
1212# CONFIG_RTC_DRV_STK17TA8 is not set
1213# CONFIG_RTC_DRV_DS1742 is not set 1248# CONFIG_RTC_DRV_DS1742 is not set
1249# CONFIG_RTC_DRV_STK17TA8 is not set
1214# CONFIG_RTC_DRV_M48T86 is not set 1250# CONFIG_RTC_DRV_M48T86 is not set
1215# CONFIG_RTC_DRV_M48T59 is not set 1251# CONFIG_RTC_DRV_M48T59 is not set
1216# CONFIG_RTC_DRV_V3020 is not set 1252# CONFIG_RTC_DRV_V3020 is not set
@@ -1218,6 +1254,7 @@ CONFIG_RTC_DRV_CMOS=y
1218# 1254#
1219# on-CPU RTC drivers 1255# on-CPU RTC drivers
1220# 1256#
1257# CONFIG_DMADEVICES is not set
1221 1258
1222# 1259#
1223# Userspace I/O 1260# Userspace I/O
@@ -1243,12 +1280,10 @@ CONFIG_FS_MBCACHE=y
1243# CONFIG_XFS_FS is not set 1280# CONFIG_XFS_FS is not set
1244# CONFIG_GFS2_FS is not set 1281# CONFIG_GFS2_FS is not set
1245# CONFIG_OCFS2_FS is not set 1282# CONFIG_OCFS2_FS is not set
1246# CONFIG_MINIX_FS is not set 1283CONFIG_DNOTIFY=y
1247# CONFIG_ROMFS_FS is not set
1248CONFIG_INOTIFY=y 1284CONFIG_INOTIFY=y
1249CONFIG_INOTIFY_USER=y 1285CONFIG_INOTIFY_USER=y
1250# CONFIG_QUOTA is not set 1286# CONFIG_QUOTA is not set
1251CONFIG_DNOTIFY=y
1252# CONFIG_AUTOFS_FS is not set 1287# CONFIG_AUTOFS_FS is not set
1253# CONFIG_AUTOFS4_FS is not set 1288# CONFIG_AUTOFS4_FS is not set
1254# CONFIG_FUSE_FS is not set 1289# CONFIG_FUSE_FS is not set
@@ -1300,8 +1335,10 @@ CONFIG_BFS_FS=m
1300CONFIG_EFS_FS=m 1335CONFIG_EFS_FS=m
1301CONFIG_CRAMFS=y 1336CONFIG_CRAMFS=y
1302CONFIG_VXFS_FS=m 1337CONFIG_VXFS_FS=m
1338# CONFIG_MINIX_FS is not set
1303CONFIG_HPFS_FS=m 1339CONFIG_HPFS_FS=m
1304CONFIG_QNX4FS_FS=m 1340CONFIG_QNX4FS_FS=m
1341# CONFIG_ROMFS_FS is not set
1305CONFIG_SYSV_FS=m 1342CONFIG_SYSV_FS=m
1306CONFIG_UFS_FS=m 1343CONFIG_UFS_FS=m
1307# CONFIG_UFS_FS_WRITE is not set 1344# CONFIG_UFS_FS_WRITE is not set
@@ -1393,7 +1430,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1393# CONFIG_NLS_KOI8_U is not set 1430# CONFIG_NLS_KOI8_U is not set
1394CONFIG_NLS_UTF8=m 1431CONFIG_NLS_UTF8=m
1395# CONFIG_DLM is not set 1432# CONFIG_DLM is not set
1396# CONFIG_UCC_SLOW is not set
1397 1433
1398# 1434#
1399# Library routines 1435# Library routines
@@ -1410,7 +1446,6 @@ CONFIG_PLIST=y
1410CONFIG_HAS_IOMEM=y 1446CONFIG_HAS_IOMEM=y
1411CONFIG_HAS_IOPORT=y 1447CONFIG_HAS_IOPORT=y
1412CONFIG_HAS_DMA=y 1448CONFIG_HAS_DMA=y
1413# CONFIG_INSTRUMENTATION is not set
1414 1449
1415# 1450#
1416# Kernel hacking 1451# Kernel hacking
@@ -1429,6 +1464,7 @@ CONFIG_SCHED_DEBUG=y
1429# CONFIG_SCHEDSTATS is not set 1464# CONFIG_SCHEDSTATS is not set
1430# CONFIG_TIMER_STATS is not set 1465# CONFIG_TIMER_STATS is not set
1431# CONFIG_SLUB_DEBUG_ON is not set 1466# CONFIG_SLUB_DEBUG_ON is not set
1467# CONFIG_SLUB_STATS is not set
1432# CONFIG_DEBUG_RT_MUTEXES is not set 1468# CONFIG_DEBUG_RT_MUTEXES is not set
1433# CONFIG_RT_MUTEX_TESTER is not set 1469# CONFIG_RT_MUTEX_TESTER is not set
1434# CONFIG_DEBUG_SPINLOCK is not set 1470# CONFIG_DEBUG_SPINLOCK is not set
@@ -1442,9 +1478,9 @@ CONFIG_DEBUG_INFO=y
1442# CONFIG_DEBUG_VM is not set 1478# CONFIG_DEBUG_VM is not set
1443# CONFIG_DEBUG_LIST is not set 1479# CONFIG_DEBUG_LIST is not set
1444# CONFIG_DEBUG_SG is not set 1480# CONFIG_DEBUG_SG is not set
1445CONFIG_FORCED_INLINING=y
1446# CONFIG_BOOT_PRINTK_DELAY is not set 1481# CONFIG_BOOT_PRINTK_DELAY is not set
1447# CONFIG_RCU_TORTURE_TEST is not set 1482# CONFIG_RCU_TORTURE_TEST is not set
1483# CONFIG_BACKTRACE_SELF_TEST is not set
1448# CONFIG_FAULT_INJECTION is not set 1484# CONFIG_FAULT_INJECTION is not set
1449# CONFIG_SAMPLES is not set 1485# CONFIG_SAMPLES is not set
1450# CONFIG_DEBUG_STACKOVERFLOW is not set 1486# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1463,6 +1499,7 @@ CONFIG_FORCED_INLINING=y
1463CONFIG_CRYPTO=y 1499CONFIG_CRYPTO=y
1464CONFIG_CRYPTO_ALGAPI=y 1500CONFIG_CRYPTO_ALGAPI=y
1465CONFIG_CRYPTO_BLKCIPHER=y 1501CONFIG_CRYPTO_BLKCIPHER=y
1502# CONFIG_CRYPTO_SEQIV is not set
1466CONFIG_CRYPTO_HASH=y 1503CONFIG_CRYPTO_HASH=y
1467CONFIG_CRYPTO_MANAGER=y 1504CONFIG_CRYPTO_MANAGER=y
1468CONFIG_CRYPTO_HMAC=y 1505CONFIG_CRYPTO_HMAC=y
@@ -1481,6 +1518,9 @@ CONFIG_CRYPTO_CBC=y
1481CONFIG_CRYPTO_PCBC=m 1518CONFIG_CRYPTO_PCBC=m
1482# CONFIG_CRYPTO_LRW is not set 1519# CONFIG_CRYPTO_LRW is not set
1483# CONFIG_CRYPTO_XTS is not set 1520# CONFIG_CRYPTO_XTS is not set
1521# CONFIG_CRYPTO_CTR is not set
1522# CONFIG_CRYPTO_GCM is not set
1523# CONFIG_CRYPTO_CCM is not set
1484# CONFIG_CRYPTO_CRYPTD is not set 1524# CONFIG_CRYPTO_CRYPTD is not set
1485CONFIG_CRYPTO_DES=y 1525CONFIG_CRYPTO_DES=y
1486# CONFIG_CRYPTO_FCRYPT is not set 1526# CONFIG_CRYPTO_FCRYPT is not set
@@ -1495,11 +1535,14 @@ CONFIG_CRYPTO_DES=y
1495# CONFIG_CRYPTO_KHAZAD is not set 1535# CONFIG_CRYPTO_KHAZAD is not set
1496# CONFIG_CRYPTO_ANUBIS is not set 1536# CONFIG_CRYPTO_ANUBIS is not set
1497# CONFIG_CRYPTO_SEED is not set 1537# CONFIG_CRYPTO_SEED is not set
1538# CONFIG_CRYPTO_SALSA20 is not set
1498# CONFIG_CRYPTO_DEFLATE is not set 1539# CONFIG_CRYPTO_DEFLATE is not set
1499# CONFIG_CRYPTO_MICHAEL_MIC is not set 1540# CONFIG_CRYPTO_MICHAEL_MIC is not set
1500# CONFIG_CRYPTO_CRC32C is not set 1541# CONFIG_CRYPTO_CRC32C is not set
1501# CONFIG_CRYPTO_CAMELLIA is not set 1542# CONFIG_CRYPTO_CAMELLIA is not set
1502# CONFIG_CRYPTO_TEST is not set 1543# CONFIG_CRYPTO_TEST is not set
1503# CONFIG_CRYPTO_AUTHENC is not set 1544# CONFIG_CRYPTO_AUTHENC is not set
1545# CONFIG_CRYPTO_LZO is not set
1504CONFIG_CRYPTO_HW=y 1546CONFIG_CRYPTO_HW=y
1547# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1505# CONFIG_PPC_CLOCK is not set 1548# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig
index a7ef231f2ab2..2d831db9ae5b 100644
--- a/arch/powerpc/configs/mpc866_ads_defconfig
+++ b/arch/powerpc/configs/mpc866_ads_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:48:59 2007 4# Mon Mar 24 08:48:35 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
@@ -62,15 +63,19 @@ CONFIG_SYSVIPC_SYSCTL=y
62# CONFIG_POSIX_MQUEUE is not set 63# CONFIG_POSIX_MQUEUE is not set
63# CONFIG_BSD_PROCESS_ACCT is not set 64# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set 65# CONFIG_TASKSTATS is not set
65# CONFIG_USER_NS is not set
66# CONFIG_PID_NS is not set
67# CONFIG_AUDIT is not set 66# CONFIG_AUDIT is not set
68# CONFIG_IKCONFIG is not set 67# CONFIG_IKCONFIG is not set
69CONFIG_LOG_BUF_SHIFT=14 68CONFIG_LOG_BUF_SHIFT=14
70# CONFIG_CGROUPS is not set 69# CONFIG_CGROUPS is not set
70CONFIG_GROUP_SCHED=y
71# CONFIG_FAIR_GROUP_SCHED is not set 71# CONFIG_FAIR_GROUP_SCHED is not set
72# CONFIG_RT_GROUP_SCHED is not set
73CONFIG_USER_SCHED=y
74# CONFIG_CGROUP_SCHED is not set
72CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
76CONFIG_SYSFS_DEPRECATED_V2=y
73# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
78# CONFIG_NAMESPACES is not set
74# CONFIG_BLK_DEV_INITRD is not set 79# CONFIG_BLK_DEV_INITRD is not set
75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
76CONFIG_SYSCTL=y 81CONFIG_SYSCTL=y
@@ -82,11 +87,13 @@ CONFIG_KALLSYMS=y
82CONFIG_PRINTK=y 87CONFIG_PRINTK=y
83# CONFIG_BUG is not set 88# CONFIG_BUG is not set
84CONFIG_ELF_CORE=y 89CONFIG_ELF_CORE=y
90CONFIG_COMPAT_BRK=y
85# CONFIG_BASE_FULL is not set 91# CONFIG_BASE_FULL is not set
86CONFIG_FUTEX=y 92CONFIG_FUTEX=y
87CONFIG_ANON_INODES=y 93CONFIG_ANON_INODES=y
88# CONFIG_EPOLL is not set 94# CONFIG_EPOLL is not set
89CONFIG_SIGNALFD=y 95CONFIG_SIGNALFD=y
96CONFIG_TIMERFD=y
90CONFIG_EVENTFD=y 97CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 98CONFIG_SHMEM=y
92# CONFIG_VM_EVENT_COUNTERS is not set 99# CONFIG_VM_EVENT_COUNTERS is not set
@@ -94,6 +101,13 @@ CONFIG_SLUB_DEBUG=y
94# CONFIG_SLAB is not set 101# CONFIG_SLAB is not set
95CONFIG_SLUB=y 102CONFIG_SLUB=y
96# CONFIG_SLOB is not set 103# CONFIG_SLOB is not set
104# CONFIG_PROFILING is not set
105# CONFIG_MARKERS is not set
106CONFIG_HAVE_OPROFILE=y
107CONFIG_HAVE_KPROBES=y
108CONFIG_HAVE_KRETPROBES=y
109CONFIG_PROC_PAGE_MONITOR=y
110CONFIG_SLABINFO=y
97CONFIG_RT_MUTEXES=y 111CONFIG_RT_MUTEXES=y
98# CONFIG_TINY_SHMEM is not set 112# CONFIG_TINY_SHMEM is not set
99CONFIG_BASE_SMALL=1 113CONFIG_BASE_SMALL=1
@@ -116,12 +130,13 @@ CONFIG_DEFAULT_AS=y
116# CONFIG_DEFAULT_CFQ is not set 130# CONFIG_DEFAULT_CFQ is not set
117# CONFIG_DEFAULT_NOOP is not set 131# CONFIG_DEFAULT_NOOP is not set
118CONFIG_DEFAULT_IOSCHED="anticipatory" 132CONFIG_DEFAULT_IOSCHED="anticipatory"
133CONFIG_CLASSIC_RCU=y
119 134
120# 135#
121# Platform support 136# Platform support
122# 137#
123# CONFIG_PPC_MPC52xx is not set 138# CONFIG_PPC_MPC512x is not set
124# CONFIG_PPC_MPC5200 is not set 139# CONFIG_PPC_MPC5121 is not set
125# CONFIG_PPC_CELL is not set 140# CONFIG_PPC_CELL is not set
126# CONFIG_PPC_CELL_NATIVE is not set 141# CONFIG_PPC_CELL_NATIVE is not set
127CONFIG_CPM1=y 142CONFIG_CPM1=y
@@ -129,6 +144,7 @@ CONFIG_CPM1=y
129CONFIG_MPC86XADS=y 144CONFIG_MPC86XADS=y
130# CONFIG_MPC885ADS is not set 145# CONFIG_MPC885ADS is not set
131# CONFIG_PPC_EP88XC is not set 146# CONFIG_PPC_EP88XC is not set
147# CONFIG_PPC_ADDER875 is not set
132 148
133# 149#
134# MPC8xx CPM Options 150# MPC8xx CPM Options
@@ -145,6 +161,7 @@ CONFIG_NO_UCODE_PATCH=y
145# CONFIG_I2C_SPI_UCODE_PATCH is not set 161# CONFIG_I2C_SPI_UCODE_PATCH is not set
146# CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set 162# CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set
147# CONFIG_PQ2ADS is not set 163# CONFIG_PQ2ADS is not set
164# CONFIG_IPIC is not set
148# CONFIG_MPIC is not set 165# CONFIG_MPIC is not set
149# CONFIG_MPIC_WEIRD is not set 166# CONFIG_MPIC_WEIRD is not set
150# CONFIG_PPC_I8259 is not set 167# CONFIG_PPC_I8259 is not set
@@ -155,7 +172,7 @@ CONFIG_NO_UCODE_PATCH=y
155# CONFIG_PPC_INDIRECT_IO is not set 172# CONFIG_PPC_INDIRECT_IO is not set
156# CONFIG_GENERIC_IOMAP is not set 173# CONFIG_GENERIC_IOMAP is not set
157# CONFIG_CPU_FREQ is not set 174# CONFIG_CPU_FREQ is not set
158# CONFIG_CPM2 is not set 175CONFIG_PPC_CPM_NEW_BINDING=y
159# CONFIG_FSL_ULI1575 is not set 176# CONFIG_FSL_ULI1575 is not set
160CONFIG_CPM=y 177CONFIG_CPM=y
161 178
@@ -172,13 +189,17 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
172# CONFIG_HZ_300 is not set 189# CONFIG_HZ_300 is not set
173CONFIG_HZ_1000=y 190CONFIG_HZ_1000=y
174CONFIG_HZ=1000 191CONFIG_HZ=1000
192# CONFIG_SCHED_HRTICK is not set
175CONFIG_PREEMPT_NONE=y 193CONFIG_PREEMPT_NONE=y
176# CONFIG_PREEMPT_VOLUNTARY is not set 194# CONFIG_PREEMPT_VOLUNTARY is not set
177# CONFIG_PREEMPT is not set 195# CONFIG_PREEMPT is not set
178CONFIG_BINFMT_ELF=y 196CONFIG_BINFMT_ELF=y
179# CONFIG_BINFMT_MISC is not set 197# CONFIG_BINFMT_MISC is not set
180CONFIG_MATH_EMULATION=y 198CONFIG_MATH_EMULATION=y
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
@@ -197,11 +218,7 @@ CONFIG_VIRT_TO_BUS=y
197# CONFIG_PROC_DEVICETREE is not set 218# CONFIG_PROC_DEVICETREE is not set
198# CONFIG_CMDLINE_BOOL is not set 219# CONFIG_CMDLINE_BOOL is not set
199# CONFIG_PM is not set 220# CONFIG_PM is not set
200CONFIG_SUSPEND_UP_POSSIBLE=y
201CONFIG_HIBERNATION_UP_POSSIBLE=y
202# CONFIG_SECCOMP is not set 221# CONFIG_SECCOMP is not set
203CONFIG_WANT_DEVICE_TREE=y
204CONFIG_DEVICE_TREE=""
205CONFIG_ISA_DMA_API=y 222CONFIG_ISA_DMA_API=y
206 223
207# 224#
@@ -246,6 +263,7 @@ CONFIG_XFRM=y
246# CONFIG_XFRM_USER is not set 263# CONFIG_XFRM_USER is not set
247# CONFIG_XFRM_SUB_POLICY is not set 264# CONFIG_XFRM_SUB_POLICY is not set
248# CONFIG_XFRM_MIGRATE is not set 265# CONFIG_XFRM_MIGRATE is not set
266# CONFIG_XFRM_STATISTICS is not set
249# CONFIG_NET_KEY is not set 267# CONFIG_NET_KEY is not set
250CONFIG_INET=y 268CONFIG_INET=y
251CONFIG_IP_MULTICAST=y 269CONFIG_IP_MULTICAST=y
@@ -301,6 +319,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
301# 319#
302# CONFIG_NET_PKTGEN is not set 320# CONFIG_NET_PKTGEN is not set
303# CONFIG_HAMRADIO is not set 321# CONFIG_HAMRADIO is not set
322# CONFIG_CAN is not set
304# CONFIG_IRDA is not set 323# CONFIG_IRDA is not set
305# CONFIG_BT is not set 324# CONFIG_BT is not set
306# CONFIG_AF_RXRPC is not set 325# CONFIG_AF_RXRPC is not set
@@ -340,6 +359,8 @@ CONFIG_BLK_DEV_LOOP=y
340# CONFIG_ATA_OVER_ETH is not set 359# CONFIG_ATA_OVER_ETH is not set
341CONFIG_MISC_DEVICES=y 360CONFIG_MISC_DEVICES=y
342# CONFIG_EEPROM_93CX6 is not set 361# CONFIG_EEPROM_93CX6 is not set
362# CONFIG_ENCLOSURE_SERVICES is not set
363CONFIG_HAVE_IDE=y
343# CONFIG_IDE is not set 364# CONFIG_IDE is not set
344 365
345# 366#
@@ -374,11 +395,8 @@ CONFIG_PHYLIB=y
374# CONFIG_SMSC_PHY is not set 395# CONFIG_SMSC_PHY is not set
375# CONFIG_BROADCOM_PHY is not set 396# CONFIG_BROADCOM_PHY is not set
376# CONFIG_ICPLUS_PHY is not set 397# CONFIG_ICPLUS_PHY is not set
398# CONFIG_REALTEK_PHY is not set
377CONFIG_FIXED_PHY=y 399CONFIG_FIXED_PHY=y
378CONFIG_FIXED_MII_10_FDX=y
379CONFIG_FIXED_MII_100_FDX=y
380# CONFIG_FIXED_MII_1000_FDX is not set
381CONFIG_FIXED_MII_AMNT=1
382# CONFIG_MDIO_BITBANG is not set 400# CONFIG_MDIO_BITBANG is not set
383CONFIG_NET_ETHERNET=y 401CONFIG_NET_ETHERNET=y
384CONFIG_MII=y 402CONFIG_MII=y
@@ -392,6 +410,8 @@ CONFIG_FS_ENET_HAS_SCC=y
392CONFIG_FS_ENET_HAS_FEC=y 410CONFIG_FS_ENET_HAS_FEC=y
393CONFIG_FS_ENET_MDIO_FEC=y 411CONFIG_FS_ENET_MDIO_FEC=y
394CONFIG_NETDEV_1000=y 412CONFIG_NETDEV_1000=y
413# CONFIG_E1000E_ENABLED is not set
414# CONFIG_GIANFAR is not set
395CONFIG_NETDEV_10000=y 415CONFIG_NETDEV_10000=y
396 416
397# 417#
@@ -402,7 +422,6 @@ CONFIG_NETDEV_10000=y
402# CONFIG_WAN is not set 422# CONFIG_WAN is not set
403# CONFIG_PPP is not set 423# CONFIG_PPP is not set
404# CONFIG_SLIP is not set 424# CONFIG_SLIP is not set
405# CONFIG_SHAPER is not set
406# CONFIG_NETCONSOLE is not set 425# CONFIG_NETCONSOLE is not set
407# CONFIG_NETPOLL is not set 426# CONFIG_NETPOLL is not set
408# CONFIG_NET_POLL_CONTROLLER is not set 427# CONFIG_NET_POLL_CONTROLLER is not set
@@ -519,6 +538,7 @@ CONFIG_HWMON=y
519# CONFIG_SENSORS_W83627HF is not set 538# CONFIG_SENSORS_W83627HF is not set
520# CONFIG_SENSORS_W83627EHF is not set 539# CONFIG_SENSORS_W83627EHF is not set
521# CONFIG_HWMON_DEBUG_CHIP is not set 540# CONFIG_HWMON_DEBUG_CHIP is not set
541# CONFIG_THERMAL is not set
522# CONFIG_WATCHDOG is not set 542# CONFIG_WATCHDOG is not set
523 543
524# 544#
@@ -568,15 +588,13 @@ CONFIG_USB_SUPPORT=y
568# 588#
569# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 589# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
570# 590#
571
572#
573# USB Gadget Support
574#
575# CONFIG_USB_GADGET is not set 591# CONFIG_USB_GADGET is not set
576# CONFIG_MMC is not set 592# CONFIG_MMC is not set
593# CONFIG_MEMSTICK is not set
577# CONFIG_NEW_LEDS is not set 594# CONFIG_NEW_LEDS is not set
578# CONFIG_EDAC is not set 595# CONFIG_EDAC is not set
579# CONFIG_RTC_CLASS is not set 596# CONFIG_RTC_CLASS is not set
597# CONFIG_DMADEVICES is not set
580 598
581# 599#
582# Userspace I/O 600# Userspace I/O
@@ -604,12 +622,10 @@ CONFIG_FS_MBCACHE=y
604# CONFIG_XFS_FS is not set 622# CONFIG_XFS_FS is not set
605# CONFIG_GFS2_FS is not set 623# CONFIG_GFS2_FS is not set
606# CONFIG_OCFS2_FS is not set 624# CONFIG_OCFS2_FS is not set
607# CONFIG_MINIX_FS is not set 625CONFIG_DNOTIFY=y
608# CONFIG_ROMFS_FS is not set
609CONFIG_INOTIFY=y 626CONFIG_INOTIFY=y
610CONFIG_INOTIFY_USER=y 627CONFIG_INOTIFY_USER=y
611# CONFIG_QUOTA is not set 628# CONFIG_QUOTA is not set
612CONFIG_DNOTIFY=y
613# CONFIG_AUTOFS_FS is not set 629# CONFIG_AUTOFS_FS is not set
614# CONFIG_AUTOFS4_FS is not set 630# CONFIG_AUTOFS4_FS is not set
615# CONFIG_FUSE_FS is not set 631# CONFIG_FUSE_FS is not set
@@ -651,8 +667,10 @@ CONFIG_TMPFS=y
651# CONFIG_EFS_FS is not set 667# CONFIG_EFS_FS is not set
652CONFIG_CRAMFS=y 668CONFIG_CRAMFS=y
653# CONFIG_VXFS_FS is not set 669# CONFIG_VXFS_FS is not set
670# CONFIG_MINIX_FS is not set
654# CONFIG_HPFS_FS is not set 671# CONFIG_HPFS_FS is not set
655# CONFIG_QNX4FS_FS is not set 672# CONFIG_QNX4FS_FS is not set
673# CONFIG_ROMFS_FS is not set
656# CONFIG_SYSV_FS is not set 674# CONFIG_SYSV_FS is not set
657# CONFIG_UFS_FS is not set 675# CONFIG_UFS_FS is not set
658CONFIG_NETWORK_FILESYSTEMS=y 676CONFIG_NETWORK_FILESYSTEMS=y
@@ -699,7 +717,6 @@ CONFIG_MSDOS_PARTITION=y
699# CONFIG_SYSV68_PARTITION is not set 717# CONFIG_SYSV68_PARTITION is not set
700# CONFIG_NLS is not set 718# CONFIG_NLS is not set
701# CONFIG_DLM is not set 719# CONFIG_DLM is not set
702# CONFIG_UCC_SLOW is not set
703 720
704# 721#
705# Library routines 722# Library routines
@@ -716,7 +733,6 @@ CONFIG_PLIST=y
716CONFIG_HAS_IOMEM=y 733CONFIG_HAS_IOMEM=y
717CONFIG_HAS_IOPORT=y 734CONFIG_HAS_IOPORT=y
718CONFIG_HAS_DMA=y 735CONFIG_HAS_DMA=y
719# CONFIG_INSTRUMENTATION is not set
720 736
721# 737#
722# Kernel hacking 738# Kernel hacking
@@ -730,6 +746,7 @@ CONFIG_ENABLE_MUST_CHECK=y
730# CONFIG_HEADERS_CHECK is not set 746# CONFIG_HEADERS_CHECK is not set
731# CONFIG_DEBUG_KERNEL is not set 747# CONFIG_DEBUG_KERNEL is not set
732# CONFIG_SLUB_DEBUG_ON is not set 748# CONFIG_SLUB_DEBUG_ON is not set
749# CONFIG_SLUB_STATS is not set
733# CONFIG_SAMPLES is not set 750# CONFIG_SAMPLES is not set
734# CONFIG_PPC_EARLY_DEBUG is not set 751# CONFIG_PPC_EARLY_DEBUG is not set
735 752
@@ -739,6 +756,49 @@ CONFIG_ENABLE_MUST_CHECK=y
739# CONFIG_KEYS is not set 756# CONFIG_KEYS is not set
740# CONFIG_SECURITY is not set 757# CONFIG_SECURITY is not set
741# CONFIG_SECURITY_FILE_CAPABILITIES is not set 758# CONFIG_SECURITY_FILE_CAPABILITIES is not set
742# CONFIG_CRYPTO is not set 759CONFIG_CRYPTO=y
760# CONFIG_CRYPTO_SEQIV is not set
761# CONFIG_CRYPTO_MANAGER is not set
762# CONFIG_CRYPTO_HMAC is not set
763# CONFIG_CRYPTO_XCBC is not set
764# CONFIG_CRYPTO_NULL is not set
765# CONFIG_CRYPTO_MD4 is not set
766# CONFIG_CRYPTO_MD5 is not set
767# CONFIG_CRYPTO_SHA1 is not set
768# CONFIG_CRYPTO_SHA256 is not set
769# CONFIG_CRYPTO_SHA512 is not set
770# CONFIG_CRYPTO_WP512 is not set
771# CONFIG_CRYPTO_TGR192 is not set
772# CONFIG_CRYPTO_GF128MUL is not set
773# CONFIG_CRYPTO_ECB is not set
774# CONFIG_CRYPTO_CBC is not set
775# CONFIG_CRYPTO_PCBC is not set
776# CONFIG_CRYPTO_LRW is not set
777# CONFIG_CRYPTO_XTS is not set
778# CONFIG_CRYPTO_CTR is not set
779# CONFIG_CRYPTO_GCM is not set
780# CONFIG_CRYPTO_CCM is not set
781# CONFIG_CRYPTO_CRYPTD is not set
782# CONFIG_CRYPTO_DES is not set
783# CONFIG_CRYPTO_FCRYPT is not set
784# CONFIG_CRYPTO_BLOWFISH is not set
785# CONFIG_CRYPTO_TWOFISH is not set
786# CONFIG_CRYPTO_SERPENT is not set
787# CONFIG_CRYPTO_AES is not set
788# CONFIG_CRYPTO_CAST5 is not set
789# CONFIG_CRYPTO_CAST6 is not set
790# CONFIG_CRYPTO_TEA is not set
791# CONFIG_CRYPTO_ARC4 is not set
792# CONFIG_CRYPTO_KHAZAD is not set
793# CONFIG_CRYPTO_ANUBIS is not set
794# CONFIG_CRYPTO_SEED is not set
795# CONFIG_CRYPTO_SALSA20 is not set
796# CONFIG_CRYPTO_DEFLATE is not set
797# CONFIG_CRYPTO_MICHAEL_MIC is not set
798# CONFIG_CRYPTO_CRC32C is not set
799# CONFIG_CRYPTO_CAMELLIA is not set
800# CONFIG_CRYPTO_AUTHENC is not set
801# CONFIG_CRYPTO_LZO is not set
802CONFIG_CRYPTO_HW=y
743# CONFIG_PPC_CLOCK is not set 803# CONFIG_PPC_CLOCK is not set
744CONFIG_PPC_LIB_RHEAP=y 804CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index 22f8171d6d45..82151b9bba26 100644
--- a/arch/powerpc/configs/mpc885_ads_defconfig
+++ b/arch/powerpc/configs/mpc885_ads_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:49:01 2007 4# Mon Mar 24 08:48:35 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
@@ -63,15 +64,19 @@ CONFIG_SYSVIPC_SYSCTL=y
63# CONFIG_POSIX_MQUEUE is not set 64# CONFIG_POSIX_MQUEUE is not set
64# CONFIG_BSD_PROCESS_ACCT is not set 65# CONFIG_BSD_PROCESS_ACCT is not set
65# CONFIG_TASKSTATS is not set 66# CONFIG_TASKSTATS is not set
66# CONFIG_USER_NS is not set
67# CONFIG_PID_NS is not set
68# CONFIG_AUDIT is not set 67# CONFIG_AUDIT is not set
69# CONFIG_IKCONFIG is not set 68# CONFIG_IKCONFIG is not set
70CONFIG_LOG_BUF_SHIFT=14 69CONFIG_LOG_BUF_SHIFT=14
71# CONFIG_CGROUPS is not set 70# CONFIG_CGROUPS is not set
71CONFIG_GROUP_SCHED=y
72# CONFIG_FAIR_GROUP_SCHED is not set 72# CONFIG_FAIR_GROUP_SCHED is not set
73# CONFIG_RT_GROUP_SCHED is not set
74CONFIG_USER_SCHED=y
75# CONFIG_CGROUP_SCHED is not set
73CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
77CONFIG_SYSFS_DEPRECATED_V2=y
74# CONFIG_RELAY is not set 78# CONFIG_RELAY is not set
79# CONFIG_NAMESPACES is not set
75# CONFIG_BLK_DEV_INITRD is not set 80# CONFIG_BLK_DEV_INITRD is not set
76# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 81# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
77CONFIG_SYSCTL=y 82CONFIG_SYSCTL=y
@@ -84,11 +89,13 @@ CONFIG_HOTPLUG=y
84CONFIG_PRINTK=y 89CONFIG_PRINTK=y
85CONFIG_BUG=y 90CONFIG_BUG=y
86# CONFIG_ELF_CORE is not set 91# CONFIG_ELF_CORE is not set
92CONFIG_COMPAT_BRK=y
87# CONFIG_BASE_FULL is not set 93# CONFIG_BASE_FULL is not set
88# CONFIG_FUTEX is not set 94# CONFIG_FUTEX is not set
89CONFIG_ANON_INODES=y 95CONFIG_ANON_INODES=y
90CONFIG_EPOLL=y 96CONFIG_EPOLL=y
91CONFIG_SIGNALFD=y 97CONFIG_SIGNALFD=y
98CONFIG_TIMERFD=y
92CONFIG_EVENTFD=y 99CONFIG_EVENTFD=y
93CONFIG_SHMEM=y 100CONFIG_SHMEM=y
94# CONFIG_VM_EVENT_COUNTERS is not set 101# CONFIG_VM_EVENT_COUNTERS is not set
@@ -96,6 +103,13 @@ CONFIG_SLUB_DEBUG=y
96# CONFIG_SLAB is not set 103# CONFIG_SLAB is not set
97CONFIG_SLUB=y 104CONFIG_SLUB=y
98# CONFIG_SLOB is not set 105# CONFIG_SLOB is not set
106# CONFIG_PROFILING is not set
107# CONFIG_MARKERS is not set
108CONFIG_HAVE_OPROFILE=y
109CONFIG_HAVE_KPROBES=y
110CONFIG_HAVE_KRETPROBES=y
111CONFIG_PROC_PAGE_MONITOR=y
112CONFIG_SLABINFO=y
99# CONFIG_TINY_SHMEM is not set 113# CONFIG_TINY_SHMEM is not set
100CONFIG_BASE_SMALL=1 114CONFIG_BASE_SMALL=1
101# CONFIG_MODULES is not set 115# CONFIG_MODULES is not set
@@ -117,12 +131,13 @@ CONFIG_DEFAULT_DEADLINE=y
117# CONFIG_DEFAULT_CFQ is not set 131# CONFIG_DEFAULT_CFQ is not set
118# CONFIG_DEFAULT_NOOP is not set 132# CONFIG_DEFAULT_NOOP is not set
119CONFIG_DEFAULT_IOSCHED="deadline" 133CONFIG_DEFAULT_IOSCHED="deadline"
134CONFIG_CLASSIC_RCU=y
120 135
121# 136#
122# Platform support 137# Platform support
123# 138#
124# CONFIG_PPC_MPC52xx is not set 139# CONFIG_PPC_MPC512x is not set
125# CONFIG_PPC_MPC5200 is not set 140# CONFIG_PPC_MPC5121 is not set
126# CONFIG_PPC_CELL is not set 141# CONFIG_PPC_CELL is not set
127# CONFIG_PPC_CELL_NATIVE is not set 142# CONFIG_PPC_CELL_NATIVE is not set
128CONFIG_CPM1=y 143CONFIG_CPM1=y
@@ -130,6 +145,7 @@ CONFIG_CPM1=y
130# CONFIG_MPC86XADS is not set 145# CONFIG_MPC86XADS is not set
131CONFIG_MPC885ADS=y 146CONFIG_MPC885ADS=y
132# CONFIG_PPC_EP88XC is not set 147# CONFIG_PPC_EP88XC is not set
148# CONFIG_PPC_ADDER875 is not set
133 149
134# 150#
135# Freescale Ethernet driver platform-specific options 151# Freescale Ethernet driver platform-specific options
@@ -153,6 +169,7 @@ CONFIG_NO_UCODE_PATCH=y
153# CONFIG_I2C_SPI_UCODE_PATCH is not set 169# CONFIG_I2C_SPI_UCODE_PATCH is not set
154# CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set 170# CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set
155# CONFIG_PQ2ADS is not set 171# CONFIG_PQ2ADS is not set
172# CONFIG_IPIC is not set
156# CONFIG_MPIC is not set 173# CONFIG_MPIC is not set
157# CONFIG_MPIC_WEIRD is not set 174# CONFIG_MPIC_WEIRD is not set
158# CONFIG_PPC_I8259 is not set 175# CONFIG_PPC_I8259 is not set
@@ -163,7 +180,6 @@ CONFIG_NO_UCODE_PATCH=y
163# CONFIG_PPC_INDIRECT_IO is not set 180# CONFIG_PPC_INDIRECT_IO is not set
164# CONFIG_GENERIC_IOMAP is not set 181# CONFIG_GENERIC_IOMAP is not set
165# CONFIG_CPU_FREQ is not set 182# CONFIG_CPU_FREQ is not set
166# CONFIG_CPM2 is not set
167CONFIG_PPC_CPM_NEW_BINDING=y 183CONFIG_PPC_CPM_NEW_BINDING=y
168# CONFIG_FSL_ULI1575 is not set 184# CONFIG_FSL_ULI1575 is not set
169CONFIG_CPM=y 185CONFIG_CPM=y
@@ -181,6 +197,7 @@ CONFIG_HZ_100=y
181# CONFIG_HZ_300 is not set 197# CONFIG_HZ_300 is not set
182# CONFIG_HZ_1000 is not set 198# CONFIG_HZ_1000 is not set
183CONFIG_HZ=100 199CONFIG_HZ=100
200# CONFIG_SCHED_HRTICK is not set
184CONFIG_PREEMPT_NONE=y 201CONFIG_PREEMPT_NONE=y
185# CONFIG_PREEMPT_VOLUNTARY is not set 202# CONFIG_PREEMPT_VOLUNTARY is not set
186# CONFIG_PREEMPT is not set 203# CONFIG_PREEMPT is not set
@@ -188,7 +205,10 @@ CONFIG_BINFMT_ELF=y
188# CONFIG_BINFMT_MISC is not set 205# CONFIG_BINFMT_MISC is not set
189# CONFIG_MATH_EMULATION is not set 206# CONFIG_MATH_EMULATION is not set
190CONFIG_8XX_MINIMAL_FPEMU=y 207CONFIG_8XX_MINIMAL_FPEMU=y
208# CONFIG_IOMMU_HELPER is not set
191CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 209CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
210CONFIG_ARCH_HAS_WALK_MEMORY=y
211CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
192CONFIG_ARCH_FLATMEM_ENABLE=y 212CONFIG_ARCH_FLATMEM_ENABLE=y
193CONFIG_ARCH_POPULATES_NODE_MAP=y 213CONFIG_ARCH_POPULATES_NODE_MAP=y
194CONFIG_SELECT_MEMORY_MODEL=y 214CONFIG_SELECT_MEMORY_MODEL=y
@@ -207,11 +227,7 @@ CONFIG_VIRT_TO_BUS=y
207CONFIG_PROC_DEVICETREE=y 227CONFIG_PROC_DEVICETREE=y
208# CONFIG_CMDLINE_BOOL is not set 228# CONFIG_CMDLINE_BOOL is not set
209# CONFIG_PM is not set 229# CONFIG_PM is not set
210CONFIG_SUSPEND_UP_POSSIBLE=y
211CONFIG_HIBERNATION_UP_POSSIBLE=y
212# CONFIG_SECCOMP is not set 230# CONFIG_SECCOMP is not set
213CONFIG_WANT_DEVICE_TREE=y
214CONFIG_DEVICE_TREE="mpc885ads.dts"
215CONFIG_ISA_DMA_API=y 231CONFIG_ISA_DMA_API=y
216 232
217# 233#
@@ -308,6 +324,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
308# 324#
309# CONFIG_NET_PKTGEN is not set 325# CONFIG_NET_PKTGEN is not set
310# CONFIG_HAMRADIO is not set 326# CONFIG_HAMRADIO is not set
327# CONFIG_CAN is not set
311# CONFIG_IRDA is not set 328# CONFIG_IRDA is not set
312# CONFIG_BT is not set 329# CONFIG_BT is not set
313# CONFIG_AF_RXRPC is not set 330# CONFIG_AF_RXRPC is not set
@@ -418,6 +435,7 @@ CONFIG_OF_DEVICE=y
418# CONFIG_PARPORT is not set 435# CONFIG_PARPORT is not set
419# CONFIG_BLK_DEV is not set 436# CONFIG_BLK_DEV is not set
420# CONFIG_MISC_DEVICES is not set 437# CONFIG_MISC_DEVICES is not set
438CONFIG_HAVE_IDE=y
421# CONFIG_IDE is not set 439# CONFIG_IDE is not set
422 440
423# 441#
@@ -452,6 +470,7 @@ CONFIG_DAVICOM_PHY=y
452# CONFIG_SMSC_PHY is not set 470# CONFIG_SMSC_PHY is not set
453# CONFIG_BROADCOM_PHY is not set 471# CONFIG_BROADCOM_PHY is not set
454# CONFIG_ICPLUS_PHY is not set 472# CONFIG_ICPLUS_PHY is not set
473# CONFIG_REALTEK_PHY is not set
455# CONFIG_FIXED_PHY is not set 474# CONFIG_FIXED_PHY is not set
456# CONFIG_MDIO_BITBANG is not set 475# CONFIG_MDIO_BITBANG is not set
457CONFIG_NET_ETHERNET=y 476CONFIG_NET_ETHERNET=y
@@ -476,7 +495,6 @@ CONFIG_FS_ENET_MDIO_FEC=y
476# CONFIG_WAN is not set 495# CONFIG_WAN is not set
477# CONFIG_PPP is not set 496# CONFIG_PPP is not set
478# CONFIG_SLIP is not set 497# CONFIG_SLIP is not set
479# CONFIG_SHAPER is not set
480# CONFIG_NETCONSOLE is not set 498# CONFIG_NETCONSOLE is not set
481# CONFIG_NETPOLL is not set 499# CONFIG_NETPOLL is not set
482# CONFIG_NET_POLL_CONTROLLER is not set 500# CONFIG_NET_POLL_CONTROLLER is not set
@@ -539,6 +557,7 @@ CONFIG_GEN_RTC=y
539# CONFIG_W1 is not set 557# CONFIG_W1 is not set
540# CONFIG_POWER_SUPPLY is not set 558# CONFIG_POWER_SUPPLY is not set
541# CONFIG_HWMON is not set 559# CONFIG_HWMON is not set
560# CONFIG_THERMAL is not set
542# CONFIG_WATCHDOG is not set 561# CONFIG_WATCHDOG is not set
543 562
544# 563#
@@ -578,9 +597,11 @@ CONFIG_DAB=y
578# CONFIG_SOUND is not set 597# CONFIG_SOUND is not set
579# CONFIG_USB_SUPPORT is not set 598# CONFIG_USB_SUPPORT is not set
580# CONFIG_MMC is not set 599# CONFIG_MMC is not set
600# CONFIG_MEMSTICK is not set
581# CONFIG_NEW_LEDS is not set 601# CONFIG_NEW_LEDS is not set
582# CONFIG_EDAC is not set 602# CONFIG_EDAC is not set
583# CONFIG_RTC_CLASS is not set 603# CONFIG_RTC_CLASS is not set
604# CONFIG_DMADEVICES is not set
584 605
585# 606#
586# Userspace I/O 607# Userspace I/O
@@ -599,11 +620,9 @@ CONFIG_DAB=y
599# CONFIG_XFS_FS is not set 620# CONFIG_XFS_FS is not set
600# CONFIG_GFS2_FS is not set 621# CONFIG_GFS2_FS is not set
601# CONFIG_OCFS2_FS is not set 622# CONFIG_OCFS2_FS is not set
602# CONFIG_MINIX_FS is not set 623# CONFIG_DNOTIFY is not set
603# CONFIG_ROMFS_FS is not set
604# CONFIG_INOTIFY is not set 624# CONFIG_INOTIFY is not set
605# CONFIG_QUOTA is not set 625# CONFIG_QUOTA is not set
606# CONFIG_DNOTIFY is not set
607# CONFIG_AUTOFS_FS is not set 626# CONFIG_AUTOFS_FS is not set
608# CONFIG_AUTOFS4_FS is not set 627# CONFIG_AUTOFS4_FS is not set
609# CONFIG_FUSE_FS is not set 628# CONFIG_FUSE_FS is not set
@@ -646,8 +665,10 @@ CONFIG_TMPFS=y
646# CONFIG_JFFS2_FS is not set 665# CONFIG_JFFS2_FS is not set
647CONFIG_CRAMFS=y 666CONFIG_CRAMFS=y
648# CONFIG_VXFS_FS is not set 667# CONFIG_VXFS_FS is not set
668# CONFIG_MINIX_FS is not set
649# CONFIG_HPFS_FS is not set 669# CONFIG_HPFS_FS is not set
650# CONFIG_QNX4FS_FS is not set 670# CONFIG_QNX4FS_FS is not set
671# CONFIG_ROMFS_FS is not set
651# CONFIG_SYSV_FS is not set 672# CONFIG_SYSV_FS is not set
652# CONFIG_UFS_FS is not set 673# CONFIG_UFS_FS is not set
653CONFIG_NETWORK_FILESYSTEMS=y 674CONFIG_NETWORK_FILESYSTEMS=y
@@ -694,7 +715,6 @@ CONFIG_MSDOS_PARTITION=y
694# CONFIG_SYSV68_PARTITION is not set 715# CONFIG_SYSV68_PARTITION is not set
695# CONFIG_NLS is not set 716# CONFIG_NLS is not set
696# CONFIG_DLM is not set 717# CONFIG_DLM is not set
697# CONFIG_UCC_SLOW is not set
698 718
699# 719#
700# Library routines 720# Library routines
@@ -709,7 +729,6 @@ CONFIG_ZLIB_INFLATE=y
709CONFIG_HAS_IOMEM=y 729CONFIG_HAS_IOMEM=y
710CONFIG_HAS_IOPORT=y 730CONFIG_HAS_IOPORT=y
711CONFIG_HAS_DMA=y 731CONFIG_HAS_DMA=y
712# CONFIG_INSTRUMENTATION is not set
713 732
714# 733#
715# Kernel hacking 734# Kernel hacking
@@ -728,6 +747,7 @@ CONFIG_SCHED_DEBUG=y
728# CONFIG_SCHEDSTATS is not set 747# CONFIG_SCHEDSTATS is not set
729# CONFIG_TIMER_STATS is not set 748# CONFIG_TIMER_STATS is not set
730# CONFIG_SLUB_DEBUG_ON is not set 749# CONFIG_SLUB_DEBUG_ON is not set
750# CONFIG_SLUB_STATS is not set
731# CONFIG_DEBUG_SPINLOCK is not set 751# CONFIG_DEBUG_SPINLOCK is not set
732# CONFIG_DEBUG_MUTEXES is not set 752# CONFIG_DEBUG_MUTEXES is not set
733# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 753# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
@@ -738,8 +758,8 @@ CONFIG_DEBUG_INFO=y
738# CONFIG_DEBUG_VM is not set 758# CONFIG_DEBUG_VM is not set
739# CONFIG_DEBUG_LIST is not set 759# CONFIG_DEBUG_LIST is not set
740# CONFIG_DEBUG_SG is not set 760# CONFIG_DEBUG_SG is not set
741CONFIG_FORCED_INLINING=y
742# CONFIG_BOOT_PRINTK_DELAY is not set 761# CONFIG_BOOT_PRINTK_DELAY is not set
762# CONFIG_BACKTRACE_SELF_TEST is not set
743# CONFIG_FAULT_INJECTION is not set 763# CONFIG_FAULT_INJECTION is not set
744# CONFIG_SAMPLES is not set 764# CONFIG_SAMPLES is not set
745# CONFIG_DEBUG_STACKOVERFLOW is not set 765# CONFIG_DEBUG_STACKOVERFLOW is not set
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 5416be4419bb..558b0d348d4f 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:49:05 2007 4# Thu Mar 20 11:05:14 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
@@ -49,6 +50,9 @@ CONFIG_AUDIT_ARCH=y
49CONFIG_GENERIC_BUG=y 50CONFIG_GENERIC_BUG=y
50CONFIG_SYS_SUPPORTS_APM_EMULATION=y 51CONFIG_SYS_SUPPORTS_APM_EMULATION=y
51# CONFIG_DEFAULT_UIMAGE is not set 52# CONFIG_DEFAULT_UIMAGE is not set
53CONFIG_HIBERNATE_32=y
54CONFIG_ARCH_HIBERNATION_POSSIBLE=y
55CONFIG_ARCH_SUSPEND_POSSIBLE=y
52# CONFIG_PPC_DCR_NATIVE is not set 56# CONFIG_PPC_DCR_NATIVE is not set
53# CONFIG_PPC_DCR_MMIO is not set 57# CONFIG_PPC_DCR_MMIO is not set
54CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 58CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -67,18 +71,22 @@ CONFIG_SYSVIPC_SYSCTL=y
67CONFIG_POSIX_MQUEUE=y 71CONFIG_POSIX_MQUEUE=y
68# CONFIG_BSD_PROCESS_ACCT is not set 72# CONFIG_BSD_PROCESS_ACCT is not set
69# CONFIG_TASKSTATS is not set 73# 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 74# CONFIG_AUDIT is not set
73CONFIG_IKCONFIG=y 75CONFIG_IKCONFIG=y
74CONFIG_IKCONFIG_PROC=y 76CONFIG_IKCONFIG_PROC=y
75CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
76# CONFIG_CGROUPS is not set 78# CONFIG_CGROUPS is not set
77CONFIG_FAIR_GROUP_SCHED=y 79# CONFIG_GROUP_SCHED is not set
78CONFIG_FAIR_USER_SCHED=y 80# CONFIG_USER_SCHED is not set
79# CONFIG_FAIR_CGROUP_SCHED is not set 81# CONFIG_CGROUP_SCHED is not set
80CONFIG_SYSFS_DEPRECATED=y 82CONFIG_SYSFS_DEPRECATED=y
83CONFIG_SYSFS_DEPRECATED_V2=y
81# CONFIG_RELAY is not set 84# CONFIG_RELAY is not set
85CONFIG_NAMESPACES=y
86# CONFIG_UTS_NS is not set
87# CONFIG_IPC_NS is not set
88# CONFIG_USER_NS is not set
89# CONFIG_PID_NS is not set
82CONFIG_BLK_DEV_INITRD=y 90CONFIG_BLK_DEV_INITRD=y
83CONFIG_INITRAMFS_SOURCE="" 91CONFIG_INITRAMFS_SOURCE=""
84# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 92# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -92,11 +100,13 @@ CONFIG_HOTPLUG=y
92CONFIG_PRINTK=y 100CONFIG_PRINTK=y
93CONFIG_BUG=y 101CONFIG_BUG=y
94CONFIG_ELF_CORE=y 102CONFIG_ELF_CORE=y
103# CONFIG_COMPAT_BRK is not set
95CONFIG_BASE_FULL=y 104CONFIG_BASE_FULL=y
96CONFIG_FUTEX=y 105CONFIG_FUTEX=y
97CONFIG_ANON_INODES=y 106CONFIG_ANON_INODES=y
98CONFIG_EPOLL=y 107CONFIG_EPOLL=y
99CONFIG_SIGNALFD=y 108CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y
100CONFIG_EVENTFD=y 110CONFIG_EVENTFD=y
101CONFIG_SHMEM=y 111CONFIG_SHMEM=y
102CONFIG_VM_EVENT_COUNTERS=y 112CONFIG_VM_EVENT_COUNTERS=y
@@ -104,6 +114,15 @@ CONFIG_SLUB_DEBUG=y
104# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
105CONFIG_SLUB=y 115CONFIG_SLUB=y
106# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
117CONFIG_PROFILING=y
118# CONFIG_MARKERS is not set
119CONFIG_OPROFILE=y
120CONFIG_HAVE_OPROFILE=y
121# CONFIG_KPROBES is not set
122CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y
124CONFIG_PROC_PAGE_MONITOR=y
125CONFIG_SLABINFO=y
107CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
108# CONFIG_TINY_SHMEM is not set 127# CONFIG_TINY_SHMEM is not set
109CONFIG_BASE_SMALL=0 128CONFIG_BASE_SMALL=0
@@ -131,6 +150,7 @@ CONFIG_DEFAULT_AS=y
131# CONFIG_DEFAULT_CFQ is not set 150# CONFIG_DEFAULT_CFQ is not set
132# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
133CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y
134 154
135# 155#
136# Platform support 156# Platform support
@@ -141,16 +161,17 @@ CONFIG_PPC_MULTIPLATFORM=y
141# CONFIG_PPC_86xx is not set 161# CONFIG_PPC_86xx is not set
142CONFIG_CLASSIC32=y 162CONFIG_CLASSIC32=y
143# CONFIG_PPC_CHRP is not set 163# CONFIG_PPC_CHRP is not set
164# CONFIG_PPC_MPC512x is not set
165# CONFIG_PPC_MPC5121 is not set
166# CONFIG_MPC5121_ADS is not set
144# CONFIG_PPC_MPC52xx is not set 167# CONFIG_PPC_MPC52xx is not set
145# CONFIG_PPC_MPC5200 is not set
146# CONFIG_PPC_EFIKA is not set
147# CONFIG_PPC_LITE5200 is not set
148CONFIG_PPC_PMAC=y 168CONFIG_PPC_PMAC=y
149# CONFIG_PPC_CELL is not set 169# CONFIG_PPC_CELL is not set
150# CONFIG_PPC_CELL_NATIVE is not set 170# CONFIG_PPC_CELL_NATIVE is not set
151# CONFIG_PQ2ADS is not set 171# CONFIG_PQ2ADS is not set
152# CONFIG_EMBEDDED6xx is not set 172# CONFIG_EMBEDDED6xx is not set
153CONFIG_PPC_NATIVE=y 173CONFIG_PPC_NATIVE=y
174# CONFIG_IPIC is not set
154CONFIG_MPIC=y 175CONFIG_MPIC=y
155# CONFIG_MPIC_WEIRD is not set 176# CONFIG_MPIC_WEIRD is not set
156# CONFIG_PPC_I8259 is not set 177# CONFIG_PPC_I8259 is not set
@@ -181,7 +202,6 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
181CONFIG_CPU_FREQ_PMAC=y 202CONFIG_CPU_FREQ_PMAC=y
182CONFIG_PPC601_SYNC_FIX=y 203CONFIG_PPC601_SYNC_FIX=y
183# CONFIG_TAU is not set 204# CONFIG_TAU is not set
184# CONFIG_CPM2 is not set
185# CONFIG_FSL_ULI1575 is not set 205# CONFIG_FSL_ULI1575 is not set
186 206
187# 207#
@@ -197,12 +217,16 @@ CONFIG_HZ_250=y
197# CONFIG_HZ_300 is not set 217# CONFIG_HZ_300 is not set
198# CONFIG_HZ_1000 is not set 218# CONFIG_HZ_1000 is not set
199CONFIG_HZ=250 219CONFIG_HZ=250
220# CONFIG_SCHED_HRTICK is not set
200CONFIG_PREEMPT_NONE=y 221CONFIG_PREEMPT_NONE=y
201# CONFIG_PREEMPT_VOLUNTARY is not set 222# CONFIG_PREEMPT_VOLUNTARY is not set
202# CONFIG_PREEMPT is not set 223# CONFIG_PREEMPT is not set
203CONFIG_BINFMT_ELF=y 224CONFIG_BINFMT_ELF=y
204CONFIG_BINFMT_MISC=m 225CONFIG_BINFMT_MISC=m
226# CONFIG_IOMMU_HELPER is not set
205CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 227CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
228CONFIG_ARCH_HAS_WALK_MEMORY=y
229CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
206# CONFIG_KEXEC is not set 230# CONFIG_KEXEC is not set
207CONFIG_ARCH_FLATMEM_ENABLE=y 231CONFIG_ARCH_FLATMEM_ENABLE=y
208CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -221,19 +245,19 @@ CONFIG_BOUNCE=y
221CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
222CONFIG_PROC_DEVICETREE=y 246CONFIG_PROC_DEVICETREE=y
223# CONFIG_CMDLINE_BOOL is not set 247# CONFIG_CMDLINE_BOOL is not set
248CONFIG_ARCH_WANTS_FREEZER_CONTROL=y
224CONFIG_PM=y 249CONFIG_PM=y
225# CONFIG_PM_LEGACY is not set 250# CONFIG_PM_LEGACY is not set
226CONFIG_PM_DEBUG=y 251CONFIG_PM_DEBUG=y
227# CONFIG_PM_VERBOSE is not set 252# CONFIG_PM_VERBOSE is not set
253CONFIG_CAN_PM_TRACE=y
228CONFIG_PM_SLEEP=y 254CONFIG_PM_SLEEP=y
229CONFIG_SUSPEND_UP_POSSIBLE=y
230CONFIG_SUSPEND=y 255CONFIG_SUSPEND=y
231CONFIG_HIBERNATION_UP_POSSIBLE=y 256CONFIG_SUSPEND_FREEZER=y
232CONFIG_HIBERNATION=y 257CONFIG_HIBERNATION=y
233CONFIG_PM_STD_PARTITION="" 258CONFIG_PM_STD_PARTITION=""
234CONFIG_APM_EMULATION=y 259CONFIG_APM_EMULATION=y
235CONFIG_SECCOMP=y 260CONFIG_SECCOMP=y
236# CONFIG_WANT_DEVICE_TREE is not set
237CONFIG_ISA_DMA_API=y 261CONFIG_ISA_DMA_API=y
238 262
239# 263#
@@ -300,6 +324,7 @@ CONFIG_XFRM=y
300CONFIG_XFRM_USER=y 324CONFIG_XFRM_USER=y
301# CONFIG_XFRM_SUB_POLICY is not set 325# CONFIG_XFRM_SUB_POLICY is not set
302# CONFIG_XFRM_MIGRATE is not set 326# CONFIG_XFRM_MIGRATE is not set
327# CONFIG_XFRM_STATISTICS is not set
303CONFIG_NET_KEY=y 328CONFIG_NET_KEY=y
304# CONFIG_NET_KEY_MIGRATE is not set 329# CONFIG_NET_KEY_MIGRATE is not set
305CONFIG_INET=y 330CONFIG_INET=y
@@ -334,12 +359,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
334# CONFIG_NETWORK_SECMARK is not set 359# CONFIG_NETWORK_SECMARK is not set
335CONFIG_NETFILTER=y 360CONFIG_NETFILTER=y
336# CONFIG_NETFILTER_DEBUG is not set 361# CONFIG_NETFILTER_DEBUG is not set
362CONFIG_NETFILTER_ADVANCED=y
337 363
338# 364#
339# Core Netfilter Configuration 365# Core Netfilter Configuration
340# 366#
341# CONFIG_NETFILTER_NETLINK is not set 367CONFIG_NETFILTER_NETLINK=m
342CONFIG_NF_CONNTRACK_ENABLED=m 368CONFIG_NETFILTER_NETLINK_QUEUE=m
369CONFIG_NETFILTER_NETLINK_LOG=m
343CONFIG_NF_CONNTRACK=m 370CONFIG_NF_CONNTRACK=m
344# CONFIG_NF_CT_ACCT is not set 371# CONFIG_NF_CT_ACCT is not set
345# CONFIG_NF_CONNTRACK_MARK is not set 372# CONFIG_NF_CONNTRACK_MARK is not set
@@ -355,6 +382,7 @@ CONFIG_NF_CONNTRACK_IRC=m
355# CONFIG_NF_CONNTRACK_SANE is not set 382# CONFIG_NF_CONNTRACK_SANE is not set
356# CONFIG_NF_CONNTRACK_SIP is not set 383# CONFIG_NF_CONNTRACK_SIP is not set
357CONFIG_NF_CONNTRACK_TFTP=m 384CONFIG_NF_CONNTRACK_TFTP=m
385CONFIG_NF_CT_NETLINK=m
358CONFIG_NETFILTER_XTABLES=m 386CONFIG_NETFILTER_XTABLES=m
359CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 387CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
360# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set 388# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
@@ -363,8 +391,10 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
363CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 391CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
364CONFIG_NETFILTER_XT_TARGET_NFLOG=m 392CONFIG_NETFILTER_XT_TARGET_NFLOG=m
365CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 393CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
394CONFIG_NETFILTER_XT_TARGET_RATEEST=m
366CONFIG_NETFILTER_XT_TARGET_TRACE=m 395CONFIG_NETFILTER_XT_TARGET_TRACE=m
367CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 396CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
397CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
368CONFIG_NETFILTER_XT_MATCH_COMMENT=m 398CONFIG_NETFILTER_XT_MATCH_COMMENT=m
369# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set 399# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
370CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 400CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -374,14 +404,17 @@ CONFIG_NETFILTER_XT_MATCH_DCCP=m
374CONFIG_NETFILTER_XT_MATCH_DSCP=m 404CONFIG_NETFILTER_XT_MATCH_DSCP=m
375CONFIG_NETFILTER_XT_MATCH_ESP=m 405CONFIG_NETFILTER_XT_MATCH_ESP=m
376CONFIG_NETFILTER_XT_MATCH_HELPER=m 406CONFIG_NETFILTER_XT_MATCH_HELPER=m
407CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
377CONFIG_NETFILTER_XT_MATCH_LENGTH=m 408CONFIG_NETFILTER_XT_MATCH_LENGTH=m
378CONFIG_NETFILTER_XT_MATCH_LIMIT=m 409CONFIG_NETFILTER_XT_MATCH_LIMIT=m
379CONFIG_NETFILTER_XT_MATCH_MAC=m 410CONFIG_NETFILTER_XT_MATCH_MAC=m
380CONFIG_NETFILTER_XT_MATCH_MARK=m 411CONFIG_NETFILTER_XT_MATCH_MARK=m
412CONFIG_NETFILTER_XT_MATCH_OWNER=m
381CONFIG_NETFILTER_XT_MATCH_POLICY=m 413CONFIG_NETFILTER_XT_MATCH_POLICY=m
382CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 414CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
383CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 415CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
384# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 416# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
417CONFIG_NETFILTER_XT_MATCH_RATEEST=m
385CONFIG_NETFILTER_XT_MATCH_REALM=m 418CONFIG_NETFILTER_XT_MATCH_REALM=m
386CONFIG_NETFILTER_XT_MATCH_SCTP=m 419CONFIG_NETFILTER_XT_MATCH_SCTP=m
387# CONFIG_NETFILTER_XT_MATCH_STATE is not set 420# CONFIG_NETFILTER_XT_MATCH_STATE is not set
@@ -399,13 +432,10 @@ CONFIG_NF_CONNTRACK_IPV4=m
399CONFIG_NF_CONNTRACK_PROC_COMPAT=y 432CONFIG_NF_CONNTRACK_PROC_COMPAT=y
400# CONFIG_IP_NF_QUEUE is not set 433# CONFIG_IP_NF_QUEUE is not set
401CONFIG_IP_NF_IPTABLES=m 434CONFIG_IP_NF_IPTABLES=m
402CONFIG_IP_NF_MATCH_IPRANGE=m
403CONFIG_IP_NF_MATCH_TOS=m
404CONFIG_IP_NF_MATCH_RECENT=m 435CONFIG_IP_NF_MATCH_RECENT=m
405CONFIG_IP_NF_MATCH_ECN=m 436CONFIG_IP_NF_MATCH_ECN=m
406CONFIG_IP_NF_MATCH_AH=m 437CONFIG_IP_NF_MATCH_AH=m
407CONFIG_IP_NF_MATCH_TTL=m 438CONFIG_IP_NF_MATCH_TTL=m
408CONFIG_IP_NF_MATCH_OWNER=m
409CONFIG_IP_NF_MATCH_ADDRTYPE=m 439CONFIG_IP_NF_MATCH_ADDRTYPE=m
410CONFIG_IP_NF_FILTER=m 440CONFIG_IP_NF_FILTER=m
411CONFIG_IP_NF_TARGET_REJECT=m 441CONFIG_IP_NF_TARGET_REJECT=m
@@ -416,7 +446,6 @@ CONFIG_NF_NAT_NEEDED=y
416CONFIG_IP_NF_TARGET_MASQUERADE=m 446CONFIG_IP_NF_TARGET_MASQUERADE=m
417CONFIG_IP_NF_TARGET_REDIRECT=m 447CONFIG_IP_NF_TARGET_REDIRECT=m
418CONFIG_IP_NF_TARGET_NETMAP=m 448CONFIG_IP_NF_TARGET_NETMAP=m
419CONFIG_IP_NF_TARGET_SAME=m
420# CONFIG_NF_NAT_SNMP_BASIC is not set 449# CONFIG_NF_NAT_SNMP_BASIC is not set
421CONFIG_NF_NAT_FTP=m 450CONFIG_NF_NAT_FTP=m
422CONFIG_NF_NAT_IRC=m 451CONFIG_NF_NAT_IRC=m
@@ -426,7 +455,6 @@ CONFIG_NF_NAT_TFTP=m
426# CONFIG_NF_NAT_H323 is not set 455# CONFIG_NF_NAT_H323 is not set
427# CONFIG_NF_NAT_SIP is not set 456# CONFIG_NF_NAT_SIP is not set
428CONFIG_IP_NF_MANGLE=m 457CONFIG_IP_NF_MANGLE=m
429CONFIG_IP_NF_TARGET_TOS=m
430CONFIG_IP_NF_TARGET_ECN=m 458CONFIG_IP_NF_TARGET_ECN=m
431CONFIG_IP_NF_TARGET_TTL=m 459CONFIG_IP_NF_TARGET_TTL=m
432# CONFIG_IP_NF_TARGET_CLUSTERIP is not set 460# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
@@ -444,9 +472,9 @@ CONFIG_IP_DCCP_ACKVEC=y
444CONFIG_IP_DCCP_CCID2=m 472CONFIG_IP_DCCP_CCID2=m
445# CONFIG_IP_DCCP_CCID2_DEBUG is not set 473# CONFIG_IP_DCCP_CCID2_DEBUG is not set
446CONFIG_IP_DCCP_CCID3=m 474CONFIG_IP_DCCP_CCID3=m
447CONFIG_IP_DCCP_TFRC_LIB=m
448# CONFIG_IP_DCCP_CCID3_DEBUG is not set 475# CONFIG_IP_DCCP_CCID3_DEBUG is not set
449CONFIG_IP_DCCP_CCID3_RTO=100 476CONFIG_IP_DCCP_CCID3_RTO=100
477CONFIG_IP_DCCP_TFRC_LIB=m
450 478
451# 479#
452# DCCP Kernel Hacking 480# DCCP Kernel Hacking
@@ -474,6 +502,7 @@ CONFIG_NET_SCH_FIFO=y
474# 502#
475# CONFIG_NET_PKTGEN is not set 503# CONFIG_NET_PKTGEN is not set
476# CONFIG_HAMRADIO is not set 504# CONFIG_HAMRADIO is not set
505# CONFIG_CAN is not set
477CONFIG_IRDA=m 506CONFIG_IRDA=m
478 507
479# 508#
@@ -509,15 +538,6 @@ CONFIG_IRTTY_SIR=m
509# CONFIG_KS959_DONGLE is not set 538# CONFIG_KS959_DONGLE is not set
510 539
511# 540#
512# Old SIR device drivers
513#
514# CONFIG_IRPORT_SIR is not set
515
516#
517# Old Serial dongle support
518#
519
520#
521# FIR device drivers 541# FIR device drivers
522# 542#
523# CONFIG_USB_IRDA is not set 543# CONFIG_USB_IRDA is not set
@@ -563,8 +583,26 @@ CONFIG_CFG80211=m
563CONFIG_NL80211=y 583CONFIG_NL80211=y
564CONFIG_WIRELESS_EXT=y 584CONFIG_WIRELESS_EXT=y
565CONFIG_MAC80211=m 585CONFIG_MAC80211=m
566CONFIG_MAC80211_RCSIMPLE=y 586
587#
588# Rate control algorithm selection
589#
590CONFIG_MAC80211_RC_DEFAULT_PID=y
591# CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set
592# CONFIG_MAC80211_RC_DEFAULT_NONE is not set
593
594#
595# Selecting 'y' for an algorithm will
596#
597
598#
599# build the algorithm into mac80211.
600#
601CONFIG_MAC80211_RC_DEFAULT="pid"
602CONFIG_MAC80211_RC_PID=y
603# CONFIG_MAC80211_RC_SIMPLE is not set
567CONFIG_MAC80211_LEDS=y 604CONFIG_MAC80211_LEDS=y
605# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
568# CONFIG_MAC80211_DEBUG is not set 606# CONFIG_MAC80211_DEBUG is not set
569CONFIG_IEEE80211=m 607CONFIG_IEEE80211=m
570# CONFIG_IEEE80211_DEBUG is not set 608# CONFIG_IEEE80211_DEBUG is not set
@@ -610,7 +648,7 @@ CONFIG_BLK_DEV_UB=m
610CONFIG_BLK_DEV_RAM=y 648CONFIG_BLK_DEV_RAM=y
611CONFIG_BLK_DEV_RAM_COUNT=16 649CONFIG_BLK_DEV_RAM_COUNT=16
612CONFIG_BLK_DEV_RAM_SIZE=4096 650CONFIG_BLK_DEV_RAM_SIZE=4096
613CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 651# CONFIG_BLK_DEV_XIP is not set
614# CONFIG_CDROM_PKTCDVD is not set 652# CONFIG_CDROM_PKTCDVD is not set
615# CONFIG_ATA_OVER_ETH is not set 653# CONFIG_ATA_OVER_ETH is not set
616CONFIG_MISC_DEVICES=y 654CONFIG_MISC_DEVICES=y
@@ -618,11 +656,13 @@ CONFIG_MISC_DEVICES=y
618# CONFIG_EEPROM_93CX6 is not set 656# CONFIG_EEPROM_93CX6 is not set
619# CONFIG_SGI_IOC4 is not set 657# CONFIG_SGI_IOC4 is not set
620# CONFIG_TIFM_CORE is not set 658# CONFIG_TIFM_CORE is not set
659# CONFIG_ENCLOSURE_SERVICES is not set
660CONFIG_HAVE_IDE=y
621CONFIG_IDE=y 661CONFIG_IDE=y
622CONFIG_BLK_DEV_IDE=y 662CONFIG_BLK_DEV_IDE=y
623 663
624# 664#
625# Please see Documentation/ide.txt for help/info on IDE drives 665# Please see Documentation/ide/ide.txt for help/info on IDE drives
626# 666#
627# CONFIG_BLK_DEV_IDE_SATA is not set 667# CONFIG_BLK_DEV_IDE_SATA is not set
628CONFIG_BLK_DEV_IDEDISK=y 668CONFIG_BLK_DEV_IDEDISK=y
@@ -630,6 +670,7 @@ CONFIG_BLK_DEV_IDEDISK=y
630CONFIG_BLK_DEV_IDECS=m 670CONFIG_BLK_DEV_IDECS=m
631# CONFIG_BLK_DEV_DELKIN is not set 671# CONFIG_BLK_DEV_DELKIN is not set
632CONFIG_BLK_DEV_IDECD=y 672CONFIG_BLK_DEV_IDECD=y
673CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
633# CONFIG_BLK_DEV_IDETAPE is not set 674# CONFIG_BLK_DEV_IDETAPE is not set
634CONFIG_BLK_DEV_IDEFLOPPY=y 675CONFIG_BLK_DEV_IDEFLOPPY=y
635CONFIG_BLK_DEV_IDESCSI=y 676CONFIG_BLK_DEV_IDESCSI=y
@@ -641,12 +682,12 @@ CONFIG_IDE_PROC_FS=y
641# 682#
642# CONFIG_IDE_GENERIC is not set 683# CONFIG_IDE_GENERIC is not set
643# CONFIG_BLK_DEV_PLATFORM is not set 684# CONFIG_BLK_DEV_PLATFORM is not set
685CONFIG_BLK_DEV_IDEDMA_SFF=y
644 686
645# 687#
646# PCI IDE chipsets support 688# PCI IDE chipsets support
647# 689#
648CONFIG_BLK_DEV_IDEPCI=y 690CONFIG_BLK_DEV_IDEPCI=y
649CONFIG_IDEPCI_SHARE_IRQ=y
650CONFIG_IDEPCI_PCIBUS_ORDER=y 691CONFIG_IDEPCI_PCIBUS_ORDER=y
651# CONFIG_BLK_DEV_OFFBOARD is not set 692# CONFIG_BLK_DEV_OFFBOARD is not set
652CONFIG_BLK_DEV_GENERIC=y 693CONFIG_BLK_DEV_GENERIC=y
@@ -680,7 +721,6 @@ CONFIG_BLK_DEV_SL82C105=y
680CONFIG_BLK_DEV_IDE_PMAC=y 721CONFIG_BLK_DEV_IDE_PMAC=y
681CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y 722CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
682CONFIG_BLK_DEV_IDEDMA_PMAC=y 723CONFIG_BLK_DEV_IDEDMA_PMAC=y
683# CONFIG_IDE_ARM is not set
684CONFIG_BLK_DEV_IDEDMA=y 724CONFIG_BLK_DEV_IDEDMA=y
685CONFIG_IDE_ARCH_OBSOLETE_INIT=y 725CONFIG_IDE_ARCH_OBSOLETE_INIT=y
686# CONFIG_BLK_DEV_HD is not set 726# CONFIG_BLK_DEV_HD is not set
@@ -754,6 +794,7 @@ CONFIG_SCSI_AIC7XXX_OLD=m
754# CONFIG_SCSI_IPS is not set 794# CONFIG_SCSI_IPS is not set
755# CONFIG_SCSI_INITIO is not set 795# CONFIG_SCSI_INITIO is not set
756# CONFIG_SCSI_INIA100 is not set 796# CONFIG_SCSI_INIA100 is not set
797# CONFIG_SCSI_MVSAS is not set
757# CONFIG_SCSI_STEX is not set 798# CONFIG_SCSI_STEX is not set
758CONFIG_SCSI_SYM53C8XX_2=y 799CONFIG_SCSI_SYM53C8XX_2=y
759CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 800CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
@@ -848,7 +889,6 @@ CONFIG_DUMMY=m
848# CONFIG_EQUALIZER is not set 889# CONFIG_EQUALIZER is not set
849CONFIG_TUN=m 890CONFIG_TUN=m
850# CONFIG_VETH is not set 891# CONFIG_VETH is not set
851# CONFIG_IP1000 is not set
852# CONFIG_ARCNET is not set 892# CONFIG_ARCNET is not set
853# CONFIG_PHYLIB is not set 893# CONFIG_PHYLIB is not set
854CONFIG_NET_ETHERNET=y 894CONFIG_NET_ETHERNET=y
@@ -880,6 +920,7 @@ CONFIG_PCNET32=y
880# CONFIG_NE2K_PCI is not set 920# CONFIG_NE2K_PCI is not set
881# CONFIG_8139CP is not set 921# CONFIG_8139CP is not set
882# CONFIG_8139TOO is not set 922# CONFIG_8139TOO is not set
923# CONFIG_R6040 is not set
883# CONFIG_SIS900 is not set 924# CONFIG_SIS900 is not set
884# CONFIG_EPIC100 is not set 925# CONFIG_EPIC100 is not set
885# CONFIG_SUNDANCE is not set 926# CONFIG_SUNDANCE is not set
@@ -891,6 +932,9 @@ CONFIG_NETDEV_1000=y
891# CONFIG_DL2K is not set 932# CONFIG_DL2K is not set
892# CONFIG_E1000 is not set 933# CONFIG_E1000 is not set
893# CONFIG_E1000E is not set 934# CONFIG_E1000E is not set
935# CONFIG_E1000E_ENABLED is not set
936# CONFIG_IP1000 is not set
937# CONFIG_IGB is not set
894# CONFIG_NS83820 is not set 938# CONFIG_NS83820 is not set
895# CONFIG_HAMACHI is not set 939# CONFIG_HAMACHI is not set
896# CONFIG_YELLOWFIN is not set 940# CONFIG_YELLOWFIN is not set
@@ -916,6 +960,7 @@ CONFIG_NETDEV_10000=y
916# CONFIG_NIU is not set 960# CONFIG_NIU is not set
917# CONFIG_MLX4_CORE is not set 961# CONFIG_MLX4_CORE is not set
918# CONFIG_TEHUTI is not set 962# CONFIG_TEHUTI is not set
963# CONFIG_BNX2X is not set
919# CONFIG_TR is not set 964# CONFIG_TR is not set
920 965
921# 966#
@@ -941,12 +986,16 @@ CONFIG_PCMCIA_HERMES=m
941# CONFIG_PCMCIA_WL3501 is not set 986# CONFIG_PCMCIA_WL3501 is not set
942CONFIG_PRISM54=m 987CONFIG_PRISM54=m
943# CONFIG_USB_ZD1201 is not set 988# CONFIG_USB_ZD1201 is not set
989# CONFIG_USB_NET_RNDIS_WLAN is not set
990# CONFIG_RTL8180 is not set
944# CONFIG_RTL8187 is not set 991# CONFIG_RTL8187 is not set
945# CONFIG_ADM8211 is not set 992# CONFIG_ADM8211 is not set
946CONFIG_P54_COMMON=m 993CONFIG_P54_COMMON=m
947# CONFIG_P54_USB is not set 994# CONFIG_P54_USB is not set
948# CONFIG_P54_PCI is not set 995# CONFIG_P54_PCI is not set
949# CONFIG_IWLWIFI is not set 996# CONFIG_ATH5K is not set
997# CONFIG_IWL4965 is not set
998# CONFIG_IWL3945 is not set
950# CONFIG_HOSTAP is not set 999# CONFIG_HOSTAP is not set
951CONFIG_B43=m 1000CONFIG_B43=m
952CONFIG_B43_PCI_AUTOSELECT=y 1001CONFIG_B43_PCI_AUTOSELECT=y
@@ -954,20 +1003,17 @@ CONFIG_B43_PCICORE_AUTOSELECT=y
954# CONFIG_B43_PCMCIA is not set 1003# CONFIG_B43_PCMCIA is not set
955CONFIG_B43_LEDS=y 1004CONFIG_B43_LEDS=y
956# CONFIG_B43_DEBUG is not set 1005# CONFIG_B43_DEBUG is not set
957CONFIG_B43_DMA=y
958CONFIG_B43_PIO=y
959CONFIG_B43_DMA_AND_PIO_MODE=y
960# CONFIG_B43_DMA_MODE is not set
961# CONFIG_B43_PIO_MODE is not set
962CONFIG_B43LEGACY=m 1006CONFIG_B43LEGACY=m
963CONFIG_B43LEGACY_PCI_AUTOSELECT=y 1007CONFIG_B43LEGACY_PCI_AUTOSELECT=y
964CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y 1008CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
1009CONFIG_B43LEGACY_LEDS=y
965CONFIG_B43LEGACY_DEBUG=y 1010CONFIG_B43LEGACY_DEBUG=y
966CONFIG_B43LEGACY_DMA=y 1011CONFIG_B43LEGACY_DMA=y
967CONFIG_B43LEGACY_PIO=y 1012CONFIG_B43LEGACY_PIO=y
968CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y 1013CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
969# CONFIG_B43LEGACY_DMA_MODE is not set 1014# CONFIG_B43LEGACY_DMA_MODE is not set
970# CONFIG_B43LEGACY_PIO_MODE is not set 1015# CONFIG_B43LEGACY_PIO_MODE is not set
1016# CONFIG_ZD1211RW is not set
971# CONFIG_RT2X00 is not set 1017# CONFIG_RT2X00 is not set
972 1018
973# 1019#
@@ -1005,7 +1051,6 @@ CONFIG_PPP_BSDCOMP=m
1005# CONFIG_SLIP is not set 1051# CONFIG_SLIP is not set
1006CONFIG_SLHC=y 1052CONFIG_SLHC=y
1007# CONFIG_NET_FC is not set 1053# CONFIG_NET_FC is not set
1008# CONFIG_SHAPER is not set
1009# CONFIG_NETCONSOLE is not set 1054# CONFIG_NETCONSOLE is not set
1010# CONFIG_NETPOLL is not set 1055# CONFIG_NETPOLL is not set
1011# CONFIG_NET_POLL_CONTROLLER is not set 1056# CONFIG_NET_POLL_CONTROLLER is not set
@@ -1068,6 +1113,7 @@ CONFIG_VT_CONSOLE=y
1068CONFIG_HW_CONSOLE=y 1113CONFIG_HW_CONSOLE=y
1069# CONFIG_VT_HW_CONSOLE_BINDING is not set 1114# CONFIG_VT_HW_CONSOLE_BINDING is not set
1070# CONFIG_SERIAL_NONSTANDARD is not set 1115# CONFIG_SERIAL_NONSTANDARD is not set
1116# CONFIG_NOZOMI is not set
1071 1117
1072# 1118#
1073# Serial drivers 1119# Serial drivers
@@ -1105,6 +1151,7 @@ CONFIG_GEN_RTC=y
1105# CONFIG_SYNCLINK_CS is not set 1151# CONFIG_SYNCLINK_CS is not set
1106# CONFIG_CARDMAN_4000 is not set 1152# CONFIG_CARDMAN_4000 is not set
1107# CONFIG_CARDMAN_4040 is not set 1153# CONFIG_CARDMAN_4040 is not set
1154# CONFIG_IPWIRELESS is not set
1108# CONFIG_RAW_DRIVER is not set 1155# CONFIG_RAW_DRIVER is not set
1109# CONFIG_TCG_TPM is not set 1156# CONFIG_TCG_TPM is not set
1110CONFIG_DEVPORT=y 1157CONFIG_DEVPORT=y
@@ -1151,14 +1198,12 @@ CONFIG_I2C_POWERMAC=y
1151# 1198#
1152# Miscellaneous I2C Chip support 1199# Miscellaneous I2C Chip support
1153# 1200#
1154# CONFIG_SENSORS_DS1337 is not set
1155# CONFIG_SENSORS_DS1374 is not set
1156# CONFIG_DS1682 is not set 1201# CONFIG_DS1682 is not set
1157# CONFIG_SENSORS_EEPROM is not set 1202# CONFIG_SENSORS_EEPROM is not set
1158# CONFIG_SENSORS_PCF8574 is not set 1203# CONFIG_SENSORS_PCF8574 is not set
1159# CONFIG_SENSORS_PCA9539 is not set 1204# CONFIG_PCF8575 is not set
1160# CONFIG_SENSORS_PCF8591 is not set 1205# CONFIG_SENSORS_PCF8591 is not set
1161# CONFIG_SENSORS_M41T00 is not set 1206# CONFIG_TPS65010 is not set
1162# CONFIG_SENSORS_MAX6875 is not set 1207# CONFIG_SENSORS_MAX6875 is not set
1163# CONFIG_SENSORS_TSL2550 is not set 1208# CONFIG_SENSORS_TSL2550 is not set
1164# CONFIG_I2C_DEBUG_CORE is not set 1209# CONFIG_I2C_DEBUG_CORE is not set
@@ -1179,6 +1224,7 @@ CONFIG_APM_POWER=y
1179# CONFIG_BATTERY_DS2760 is not set 1224# CONFIG_BATTERY_DS2760 is not set
1180CONFIG_BATTERY_PMU=y 1225CONFIG_BATTERY_PMU=y
1181# CONFIG_HWMON is not set 1226# CONFIG_HWMON is not set
1227# CONFIG_THERMAL is not set
1182# CONFIG_WATCHDOG is not set 1228# CONFIG_WATCHDOG is not set
1183 1229
1184# 1230#
@@ -1188,6 +1234,7 @@ CONFIG_SSB_POSSIBLE=y
1188CONFIG_SSB=m 1234CONFIG_SSB=m
1189CONFIG_SSB_PCIHOST_POSSIBLE=y 1235CONFIG_SSB_PCIHOST_POSSIBLE=y
1190CONFIG_SSB_PCIHOST=y 1236CONFIG_SSB_PCIHOST=y
1237CONFIG_SSB_B43_PCI_BRIDGE=y
1191CONFIG_SSB_PCMCIAHOST_POSSIBLE=y 1238CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
1192# CONFIG_SSB_PCMCIAHOST is not set 1239# CONFIG_SSB_PCMCIAHOST is not set
1193# CONFIG_SSB_DEBUG is not set 1240# CONFIG_SSB_DEBUG is not set
@@ -1372,6 +1419,7 @@ CONFIG_SND_DUMMY=m
1372# CONFIG_SND_BT87X is not set 1419# CONFIG_SND_BT87X is not set
1373# CONFIG_SND_CA0106 is not set 1420# CONFIG_SND_CA0106 is not set
1374# CONFIG_SND_CMIPCI is not set 1421# CONFIG_SND_CMIPCI is not set
1422# CONFIG_SND_OXYGEN is not set
1375# CONFIG_SND_CS4281 is not set 1423# CONFIG_SND_CS4281 is not set
1376# CONFIG_SND_CS46XX is not set 1424# CONFIG_SND_CS46XX is not set
1377# CONFIG_SND_CS5530 is not set 1425# CONFIG_SND_CS5530 is not set
@@ -1397,6 +1445,7 @@ CONFIG_SND_DUMMY=m
1397# CONFIG_SND_HDA_INTEL is not set 1445# CONFIG_SND_HDA_INTEL is not set
1398# CONFIG_SND_HDSP is not set 1446# CONFIG_SND_HDSP is not set
1399# CONFIG_SND_HDSPM is not set 1447# CONFIG_SND_HDSPM is not set
1448# CONFIG_SND_HIFIER is not set
1400# CONFIG_SND_ICE1712 is not set 1449# CONFIG_SND_ICE1712 is not set
1401# CONFIG_SND_ICE1724 is not set 1450# CONFIG_SND_ICE1724 is not set
1402# CONFIG_SND_INTEL8X0 is not set 1451# CONFIG_SND_INTEL8X0 is not set
@@ -1414,6 +1463,7 @@ CONFIG_SND_DUMMY=m
1414# CONFIG_SND_TRIDENT is not set 1463# CONFIG_SND_TRIDENT is not set
1415# CONFIG_SND_VIA82XX is not set 1464# CONFIG_SND_VIA82XX is not set
1416# CONFIG_SND_VIA82XX_MODEM is not set 1465# CONFIG_SND_VIA82XX_MODEM is not set
1466# CONFIG_SND_VIRTUOSO is not set
1417# CONFIG_SND_VX222 is not set 1467# CONFIG_SND_VX222 is not set
1418# CONFIG_SND_YMFPCI is not set 1468# CONFIG_SND_YMFPCI is not set
1419 1469
@@ -1461,6 +1511,10 @@ CONFIG_SND_USB_AUDIO=m
1461# 1511#
1462 1512
1463# 1513#
1514# ALSA SoC audio for Freescale SOCs
1515#
1516
1517#
1464# Open Sound System 1518# Open Sound System
1465# 1519#
1466# CONFIG_SOUND_PRIME is not set 1520# CONFIG_SOUND_PRIME is not set
@@ -1482,6 +1536,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
1482CONFIG_USB_ARCH_HAS_EHCI=y 1536CONFIG_USB_ARCH_HAS_EHCI=y
1483CONFIG_USB=y 1537CONFIG_USB=y
1484# CONFIG_USB_DEBUG is not set 1538# CONFIG_USB_DEBUG is not set
1539# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1485 1540
1486# 1541#
1487# Miscellaneous USB options 1542# Miscellaneous USB options
@@ -1497,9 +1552,9 @@ CONFIG_USB_DYNAMIC_MINORS=y
1497# USB Host Controller Drivers 1552# USB Host Controller Drivers
1498# 1553#
1499CONFIG_USB_EHCI_HCD=m 1554CONFIG_USB_EHCI_HCD=m
1500CONFIG_USB_EHCI_SPLIT_ISO=y
1501CONFIG_USB_EHCI_ROOT_HUB_TT=y 1555CONFIG_USB_EHCI_ROOT_HUB_TT=y
1502# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1556# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1557# CONFIG_USB_EHCI_HCD_PPC_OF is not set
1503# CONFIG_USB_ISP116X_HCD is not set 1558# CONFIG_USB_ISP116X_HCD is not set
1504CONFIG_USB_OHCI_HCD=y 1559CONFIG_USB_OHCI_HCD=y
1505# CONFIG_USB_OHCI_HCD_PPC_OF is not set 1560# CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -1547,11 +1602,8 @@ CONFIG_USB_MON=y
1547# 1602#
1548# USB port drivers 1603# USB port drivers
1549# 1604#
1550
1551#
1552# USB Serial Converter support
1553#
1554CONFIG_USB_SERIAL=m 1605CONFIG_USB_SERIAL=m
1606CONFIG_USB_EZUSB=y
1555# CONFIG_USB_SERIAL_GENERIC is not set 1607# CONFIG_USB_SERIAL_GENERIC is not set
1556# CONFIG_USB_SERIAL_AIRCABLE is not set 1608# CONFIG_USB_SERIAL_AIRCABLE is not set
1557# CONFIG_USB_SERIAL_AIRPRIME is not set 1609# CONFIG_USB_SERIAL_AIRPRIME is not set
@@ -1572,6 +1624,7 @@ CONFIG_USB_SERIAL_IPAQ=m
1572# CONFIG_USB_SERIAL_EDGEPORT_TI is not set 1624# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
1573# CONFIG_USB_SERIAL_GARMIN is not set 1625# CONFIG_USB_SERIAL_GARMIN is not set
1574# CONFIG_USB_SERIAL_IPW is not set 1626# CONFIG_USB_SERIAL_IPW is not set
1627# CONFIG_USB_SERIAL_IUU is not set
1575CONFIG_USB_SERIAL_KEYSPAN_PDA=m 1628CONFIG_USB_SERIAL_KEYSPAN_PDA=m
1576CONFIG_USB_SERIAL_KEYSPAN=m 1629CONFIG_USB_SERIAL_KEYSPAN=m
1577CONFIG_USB_SERIAL_KEYSPAN_MPR=y 1630CONFIG_USB_SERIAL_KEYSPAN_MPR=y
@@ -1603,7 +1656,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1603# CONFIG_USB_SERIAL_OPTION is not set 1656# CONFIG_USB_SERIAL_OPTION is not set
1604# CONFIG_USB_SERIAL_OMNINET is not set 1657# CONFIG_USB_SERIAL_OMNINET is not set
1605# CONFIG_USB_SERIAL_DEBUG is not set 1658# CONFIG_USB_SERIAL_DEBUG is not set
1606CONFIG_USB_EZUSB=y
1607 1659
1608# 1660#
1609# USB Miscellaneous drivers 1661# USB Miscellaneous drivers
@@ -1628,16 +1680,9 @@ CONFIG_USB_APPLEDISPLAY=m
1628# CONFIG_USB_TRANCEVIBRATOR is not set 1680# CONFIG_USB_TRANCEVIBRATOR is not set
1629# CONFIG_USB_IOWARRIOR is not set 1681# CONFIG_USB_IOWARRIOR is not set
1630# CONFIG_USB_TEST is not set 1682# CONFIG_USB_TEST is not set
1631
1632#
1633# USB DSL modem support
1634#
1635
1636#
1637# USB Gadget Support
1638#
1639# CONFIG_USB_GADGET is not set 1683# CONFIG_USB_GADGET is not set
1640# CONFIG_MMC is not set 1684# CONFIG_MMC is not set
1685# CONFIG_MEMSTICK is not set
1641CONFIG_NEW_LEDS=y 1686CONFIG_NEW_LEDS=y
1642CONFIG_LEDS_CLASS=y 1687CONFIG_LEDS_CLASS=y
1643 1688
@@ -1655,6 +1700,7 @@ CONFIG_LEDS_TRIGGER_IDE_DISK=y
1655# CONFIG_INFINIBAND is not set 1700# CONFIG_INFINIBAND is not set
1656# CONFIG_EDAC is not set 1701# CONFIG_EDAC is not set
1657# CONFIG_RTC_CLASS is not set 1702# CONFIG_RTC_CLASS is not set
1703# CONFIG_DMADEVICES is not set
1658 1704
1659# 1705#
1660# Userspace I/O 1706# Userspace I/O
@@ -1680,12 +1726,10 @@ CONFIG_FS_POSIX_ACL=y
1680# CONFIG_XFS_FS is not set 1726# CONFIG_XFS_FS is not set
1681# CONFIG_GFS2_FS is not set 1727# CONFIG_GFS2_FS is not set
1682# CONFIG_OCFS2_FS is not set 1728# CONFIG_OCFS2_FS is not set
1683# CONFIG_MINIX_FS is not set 1729CONFIG_DNOTIFY=y
1684# CONFIG_ROMFS_FS is not set
1685CONFIG_INOTIFY=y 1730CONFIG_INOTIFY=y
1686CONFIG_INOTIFY_USER=y 1731CONFIG_INOTIFY_USER=y
1687# CONFIG_QUOTA is not set 1732# CONFIG_QUOTA is not set
1688CONFIG_DNOTIFY=y
1689# CONFIG_AUTOFS_FS is not set 1733# CONFIG_AUTOFS_FS is not set
1690CONFIG_AUTOFS4_FS=m 1734CONFIG_AUTOFS4_FS=m
1691CONFIG_FUSE_FS=m 1735CONFIG_FUSE_FS=m
@@ -1733,8 +1777,10 @@ CONFIG_HFSPLUS_FS=m
1733# CONFIG_EFS_FS is not set 1777# CONFIG_EFS_FS is not set
1734# CONFIG_CRAMFS is not set 1778# CONFIG_CRAMFS is not set
1735# CONFIG_VXFS_FS is not set 1779# CONFIG_VXFS_FS is not set
1780# CONFIG_MINIX_FS is not set
1736# CONFIG_HPFS_FS is not set 1781# CONFIG_HPFS_FS is not set
1737# CONFIG_QNX4FS_FS is not set 1782# CONFIG_QNX4FS_FS is not set
1783# CONFIG_ROMFS_FS is not set
1738# CONFIG_SYSV_FS is not set 1784# CONFIG_SYSV_FS is not set
1739# CONFIG_UFS_FS is not set 1785# CONFIG_UFS_FS is not set
1740CONFIG_NETWORK_FILESYSTEMS=y 1786CONFIG_NETWORK_FILESYSTEMS=y
@@ -1828,7 +1874,6 @@ CONFIG_NLS_ISO8859_1=m
1828# CONFIG_NLS_KOI8_U is not set 1874# CONFIG_NLS_KOI8_U is not set
1829CONFIG_NLS_UTF8=m 1875CONFIG_NLS_UTF8=m
1830# CONFIG_DLM is not set 1876# CONFIG_DLM is not set
1831# CONFIG_UCC_SLOW is not set
1832 1877
1833# 1878#
1834# Library routines 1879# Library routines
@@ -1850,11 +1895,6 @@ CONFIG_PLIST=y
1850CONFIG_HAS_IOMEM=y 1895CONFIG_HAS_IOMEM=y
1851CONFIG_HAS_IOPORT=y 1896CONFIG_HAS_IOPORT=y
1852CONFIG_HAS_DMA=y 1897CONFIG_HAS_DMA=y
1853CONFIG_INSTRUMENTATION=y
1854CONFIG_PROFILING=y
1855CONFIG_OPROFILE=y
1856# CONFIG_KPROBES is not set
1857# CONFIG_MARKERS is not set
1858 1898
1859# 1899#
1860# Kernel hacking 1900# Kernel hacking
@@ -1873,6 +1913,7 @@ CONFIG_SCHED_DEBUG=y
1873# CONFIG_SCHEDSTATS is not set 1913# CONFIG_SCHEDSTATS is not set
1874# CONFIG_TIMER_STATS is not set 1914# CONFIG_TIMER_STATS is not set
1875# CONFIG_SLUB_DEBUG_ON is not set 1915# CONFIG_SLUB_DEBUG_ON is not set
1916# CONFIG_SLUB_STATS is not set
1876# CONFIG_DEBUG_RT_MUTEXES is not set 1917# CONFIG_DEBUG_RT_MUTEXES is not set
1877# CONFIG_RT_MUTEX_TESTER is not set 1918# CONFIG_RT_MUTEX_TESTER is not set
1878# CONFIG_DEBUG_SPINLOCK is not set 1919# CONFIG_DEBUG_SPINLOCK is not set
@@ -1885,9 +1926,9 @@ CONFIG_DEBUG_BUGVERBOSE=y
1885# CONFIG_DEBUG_VM is not set 1926# CONFIG_DEBUG_VM is not set
1886# CONFIG_DEBUG_LIST is not set 1927# CONFIG_DEBUG_LIST is not set
1887# CONFIG_DEBUG_SG is not set 1928# CONFIG_DEBUG_SG is not set
1888# CONFIG_FORCED_INLINING is not set
1889# CONFIG_BOOT_PRINTK_DELAY is not set 1929# CONFIG_BOOT_PRINTK_DELAY is not set
1890# CONFIG_RCU_TORTURE_TEST is not set 1930# CONFIG_RCU_TORTURE_TEST is not set
1931# CONFIG_BACKTRACE_SELF_TEST is not set
1891# CONFIG_FAULT_INJECTION is not set 1932# CONFIG_FAULT_INJECTION is not set
1892# CONFIG_SAMPLES is not set 1933# CONFIG_SAMPLES is not set
1893# CONFIG_DEBUG_STACKOVERFLOW is not set 1934# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1908,7 +1949,9 @@ CONFIG_BOOTX_TEXT=y
1908# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1949# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1909CONFIG_CRYPTO=y 1950CONFIG_CRYPTO=y
1910CONFIG_CRYPTO_ALGAPI=y 1951CONFIG_CRYPTO_ALGAPI=y
1952CONFIG_CRYPTO_AEAD=y
1911CONFIG_CRYPTO_BLKCIPHER=y 1953CONFIG_CRYPTO_BLKCIPHER=y
1954# CONFIG_CRYPTO_SEQIV is not set
1912CONFIG_CRYPTO_HASH=y 1955CONFIG_CRYPTO_HASH=y
1913CONFIG_CRYPTO_MANAGER=y 1956CONFIG_CRYPTO_MANAGER=y
1914CONFIG_CRYPTO_HMAC=y 1957CONFIG_CRYPTO_HMAC=y
@@ -1927,6 +1970,9 @@ CONFIG_CRYPTO_CBC=y
1927CONFIG_CRYPTO_PCBC=m 1970CONFIG_CRYPTO_PCBC=m
1928# CONFIG_CRYPTO_LRW is not set 1971# CONFIG_CRYPTO_LRW is not set
1929# CONFIG_CRYPTO_XTS is not set 1972# CONFIG_CRYPTO_XTS is not set
1973# CONFIG_CRYPTO_CTR is not set
1974# CONFIG_CRYPTO_GCM is not set
1975# CONFIG_CRYPTO_CCM is not set
1930# CONFIG_CRYPTO_CRYPTD is not set 1976# CONFIG_CRYPTO_CRYPTD is not set
1931CONFIG_CRYPTO_DES=y 1977CONFIG_CRYPTO_DES=y
1932# CONFIG_CRYPTO_FCRYPT is not set 1978# CONFIG_CRYPTO_FCRYPT is not set
@@ -1942,11 +1988,14 @@ CONFIG_CRYPTO_ARC4=m
1942CONFIG_CRYPTO_KHAZAD=m 1988CONFIG_CRYPTO_KHAZAD=m
1943CONFIG_CRYPTO_ANUBIS=m 1989CONFIG_CRYPTO_ANUBIS=m
1944# CONFIG_CRYPTO_SEED is not set 1990# CONFIG_CRYPTO_SEED is not set
1991# CONFIG_CRYPTO_SALSA20 is not set
1945CONFIG_CRYPTO_DEFLATE=m 1992CONFIG_CRYPTO_DEFLATE=m
1946CONFIG_CRYPTO_MICHAEL_MIC=m 1993CONFIG_CRYPTO_MICHAEL_MIC=m
1947CONFIG_CRYPTO_CRC32C=m 1994CONFIG_CRYPTO_CRC32C=m
1948# CONFIG_CRYPTO_CAMELLIA is not set 1995# CONFIG_CRYPTO_CAMELLIA is not set
1949# CONFIG_CRYPTO_TEST is not set 1996# CONFIG_CRYPTO_TEST is not set
1950# CONFIG_CRYPTO_AUTHENC is not set 1997CONFIG_CRYPTO_AUTHENC=y
1998# CONFIG_CRYPTO_LZO is not set
1951CONFIG_CRYPTO_HW=y 1999CONFIG_CRYPTO_HW=y
2000# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1952# CONFIG_PPC_CLOCK is not set 2001# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 7695a4c66e80..880ab7ad10c1 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Fri Dec 21 14:47:29 2007 4# Thu Mar 20 11:06:28 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -28,6 +28,7 @@ CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y 28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y 29CONFIG_GENERIC_CLOCKEVENTS=y
30CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
31CONFIG_HAVE_SETUP_PER_CPU_AREA=y
31CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
32CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
33CONFIG_ARCH_HAS_ILOG2_U32=y 34CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -49,7 +50,9 @@ CONFIG_GENERIC_TBSYNC=y
49CONFIG_AUDIT_ARCH=y 50CONFIG_AUDIT_ARCH=y
50CONFIG_GENERIC_BUG=y 51CONFIG_GENERIC_BUG=y
51# CONFIG_DEFAULT_UIMAGE is not set 52# CONFIG_DEFAULT_UIMAGE is not set
52CONFIG_PPC64_SWSUSP=y 53CONFIG_HIBERNATE_64=y
54CONFIG_ARCH_HIBERNATION_POSSIBLE=y
55CONFIG_ARCH_SUSPEND_POSSIBLE=y
53# CONFIG_PPC_DCR_NATIVE is not set 56# CONFIG_PPC_DCR_NATIVE is not set
54CONFIG_PPC_DCR_MMIO=y 57CONFIG_PPC_DCR_MMIO=y
55CONFIG_PPC_DCR=y 58CONFIG_PPC_DCR=y
@@ -72,8 +75,6 @@ CONFIG_POSIX_MQUEUE=y
72CONFIG_TASKSTATS=y 75CONFIG_TASKSTATS=y
73CONFIG_TASK_DELAY_ACCT=y 76CONFIG_TASK_DELAY_ACCT=y
74# CONFIG_TASK_XACCT is not set 77# CONFIG_TASK_XACCT is not set
75# CONFIG_USER_NS is not set
76# CONFIG_PID_NS is not set
77# CONFIG_AUDIT is not set 78# CONFIG_AUDIT is not set
78CONFIG_IKCONFIG=y 79CONFIG_IKCONFIG=y
79CONFIG_IKCONFIG_PROC=y 80CONFIG_IKCONFIG_PROC=y
@@ -82,13 +83,20 @@ CONFIG_CGROUPS=y
82# CONFIG_CGROUP_DEBUG is not set 83# CONFIG_CGROUP_DEBUG is not set
83# CONFIG_CGROUP_NS is not set 84# CONFIG_CGROUP_NS is not set
84CONFIG_CPUSETS=y 85CONFIG_CPUSETS=y
85CONFIG_FAIR_GROUP_SCHED=y 86# CONFIG_GROUP_SCHED is not set
86CONFIG_FAIR_USER_SCHED=y 87# CONFIG_USER_SCHED is not set
87# CONFIG_FAIR_CGROUP_SCHED is not set 88# CONFIG_CGROUP_SCHED is not set
88# CONFIG_CGROUP_CPUACCT is not set 89# CONFIG_CGROUP_CPUACCT is not set
90# CONFIG_RESOURCE_COUNTERS is not set
89CONFIG_SYSFS_DEPRECATED=y 91CONFIG_SYSFS_DEPRECATED=y
92CONFIG_SYSFS_DEPRECATED_V2=y
90CONFIG_PROC_PID_CPUSET=y 93CONFIG_PROC_PID_CPUSET=y
91CONFIG_RELAY=y 94CONFIG_RELAY=y
95CONFIG_NAMESPACES=y
96# CONFIG_UTS_NS is not set
97# CONFIG_IPC_NS is not set
98# CONFIG_USER_NS is not set
99# CONFIG_PID_NS is not set
92CONFIG_BLK_DEV_INITRD=y 100CONFIG_BLK_DEV_INITRD=y
93CONFIG_INITRAMFS_SOURCE="" 101CONFIG_INITRAMFS_SOURCE=""
94CONFIG_CC_OPTIMIZE_FOR_SIZE=y 102CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -102,11 +110,13 @@ CONFIG_HOTPLUG=y
102CONFIG_PRINTK=y 110CONFIG_PRINTK=y
103CONFIG_BUG=y 111CONFIG_BUG=y
104CONFIG_ELF_CORE=y 112CONFIG_ELF_CORE=y
113# CONFIG_COMPAT_BRK is not set
105CONFIG_BASE_FULL=y 114CONFIG_BASE_FULL=y
106CONFIG_FUTEX=y 115CONFIG_FUTEX=y
107CONFIG_ANON_INODES=y 116CONFIG_ANON_INODES=y
108CONFIG_EPOLL=y 117CONFIG_EPOLL=y
109CONFIG_SIGNALFD=y 118CONFIG_SIGNALFD=y
119CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 120CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 121CONFIG_SHMEM=y
112CONFIG_VM_EVENT_COUNTERS=y 122CONFIG_VM_EVENT_COUNTERS=y
@@ -114,6 +124,15 @@ CONFIG_SLUB_DEBUG=y
114# CONFIG_SLAB is not set 124# CONFIG_SLAB is not set
115CONFIG_SLUB=y 125CONFIG_SLUB=y
116# CONFIG_SLOB is not set 126# CONFIG_SLOB is not set
127CONFIG_PROFILING=y
128# CONFIG_MARKERS is not set
129CONFIG_OPROFILE=y
130CONFIG_HAVE_OPROFILE=y
131# CONFIG_KPROBES is not set
132CONFIG_HAVE_KPROBES=y
133CONFIG_HAVE_KRETPROBES=y
134CONFIG_PROC_PAGE_MONITOR=y
135CONFIG_SLABINFO=y
117CONFIG_RT_MUTEXES=y 136CONFIG_RT_MUTEXES=y
118# CONFIG_TINY_SHMEM is not set 137# CONFIG_TINY_SHMEM is not set
119CONFIG_BASE_SMALL=0 138CONFIG_BASE_SMALL=0
@@ -141,6 +160,7 @@ CONFIG_DEFAULT_AS=y
141# CONFIG_DEFAULT_CFQ is not set 160# CONFIG_DEFAULT_CFQ is not set
142# CONFIG_DEFAULT_NOOP is not set 161# CONFIG_DEFAULT_NOOP is not set
143CONFIG_DEFAULT_IOSCHED="anticipatory" 162CONFIG_DEFAULT_IOSCHED="anticipatory"
163CONFIG_CLASSIC_RCU=y
144 164
145# 165#
146# Platform support 166# Platform support
@@ -163,8 +183,8 @@ CONFIG_VIODASD=y
163CONFIG_VIOCD=m 183CONFIG_VIOCD=m
164CONFIG_VIOTAPE=m 184CONFIG_VIOTAPE=m
165CONFIG_VIOPATH=y 185CONFIG_VIOPATH=y
166# CONFIG_PPC_MPC52xx is not set 186# CONFIG_PPC_MPC512x is not set
167# CONFIG_PPC_MPC5200 is not set 187# CONFIG_PPC_MPC5121 is not set
168CONFIG_PPC_PMAC=y 188CONFIG_PPC_PMAC=y
169CONFIG_PPC_PMAC64=y 189CONFIG_PPC_PMAC64=y
170CONFIG_PPC_MAPLE=y 190CONFIG_PPC_MAPLE=y
@@ -176,7 +196,6 @@ CONFIG_PPC_PASEMI=y
176CONFIG_PPC_PASEMI_IOMMU=y 196CONFIG_PPC_PASEMI_IOMMU=y
177# CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set 197# CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
178CONFIG_PPC_PASEMI_MDIO=y 198CONFIG_PPC_PASEMI_MDIO=y
179CONFIG_ELECTRA_IDE=y
180CONFIG_PPC_CELLEB=y 199CONFIG_PPC_CELLEB=y
181# CONFIG_PPC_PS3 is not set 200# CONFIG_PPC_PS3 is not set
182CONFIG_PPC_CELL=y 201CONFIG_PPC_CELL=y
@@ -193,11 +212,13 @@ CONFIG_CBE_RAS=y
193CONFIG_CBE_THERM=m 212CONFIG_CBE_THERM=m
194CONFIG_CBE_CPUFREQ=m 213CONFIG_CBE_CPUFREQ=m
195CONFIG_CBE_CPUFREQ_PMI=m 214CONFIG_CBE_CPUFREQ_PMI=m
215CONFIG_OPROFILE_CELL=y
196# CONFIG_PQ2ADS is not set 216# CONFIG_PQ2ADS is not set
197CONFIG_PPC_NATIVE=y 217CONFIG_PPC_NATIVE=y
198CONFIG_UDBG_RTAS_CONSOLE=y 218CONFIG_UDBG_RTAS_CONSOLE=y
199CONFIG_PPC_UDBG_BEAT=y 219CONFIG_PPC_UDBG_BEAT=y
200CONFIG_XICS=y 220CONFIG_XICS=y
221# CONFIG_IPIC is not set
201CONFIG_MPIC=y 222CONFIG_MPIC=y
202# CONFIG_MPIC_WEIRD is not set 223# CONFIG_MPIC_WEIRD is not set
203CONFIG_PPC_I8259=y 224CONFIG_PPC_I8259=y
@@ -236,7 +257,6 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
236# 257#
237CONFIG_CPU_FREQ_PMAC64=y 258CONFIG_CPU_FREQ_PMAC64=y
238CONFIG_PPC_PASEMI_CPUFREQ=y 259CONFIG_PPC_PASEMI_CPUFREQ=y
239# CONFIG_CPM2 is not set
240CONFIG_AXON_RAM=m 260CONFIG_AXON_RAM=m
241# CONFIG_FSL_ULI1575 is not set 261# CONFIG_FSL_ULI1575 is not set
242 262
@@ -252,17 +272,21 @@ CONFIG_HZ_250=y
252# CONFIG_HZ_300 is not set 272# CONFIG_HZ_300 is not set
253# CONFIG_HZ_1000 is not set 273# CONFIG_HZ_1000 is not set
254CONFIG_HZ=250 274CONFIG_HZ=250
275# CONFIG_SCHED_HRTICK is not set
255CONFIG_PREEMPT_NONE=y 276CONFIG_PREEMPT_NONE=y
256# CONFIG_PREEMPT_VOLUNTARY is not set 277# CONFIG_PREEMPT_VOLUNTARY is not set
257# CONFIG_PREEMPT is not set 278# CONFIG_PREEMPT is not set
258# CONFIG_PREEMPT_BKL is not set
259CONFIG_BINFMT_ELF=y 279CONFIG_BINFMT_ELF=y
280CONFIG_COMPAT_BINFMT_ELF=y
260CONFIG_BINFMT_MISC=m 281CONFIG_BINFMT_MISC=m
261CONFIG_FORCE_MAX_ZONEORDER=13 282CONFIG_FORCE_MAX_ZONEORDER=13
262CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y 283CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
263CONFIG_IOMMU_VMERGE=y 284CONFIG_IOMMU_VMERGE=y
285CONFIG_IOMMU_HELPER=y
264CONFIG_HOTPLUG_CPU=y 286CONFIG_HOTPLUG_CPU=y
265CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 287CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
288CONFIG_ARCH_HAS_WALK_MEMORY=y
289CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
266CONFIG_KEXEC=y 290CONFIG_KEXEC=y
267# CONFIG_CRASH_DUMP is not set 291# CONFIG_CRASH_DUMP is not set
268CONFIG_IRQ_ALL_CPUS=y 292CONFIG_IRQ_ALL_CPUS=y
@@ -294,11 +318,9 @@ CONFIG_PPC_HAS_HASH_64K=y
294# CONFIG_SCHED_SMT is not set 318# CONFIG_SCHED_SMT is not set
295CONFIG_PROC_DEVICETREE=y 319CONFIG_PROC_DEVICETREE=y
296# CONFIG_CMDLINE_BOOL is not set 320# CONFIG_CMDLINE_BOOL is not set
321CONFIG_ARCH_WANTS_FREEZER_CONTROL=y
297# CONFIG_PM is not set 322# CONFIG_PM is not set
298CONFIG_SUSPEND_SMP_POSSIBLE=y
299CONFIG_HIBERNATION_SMP_POSSIBLE=y
300CONFIG_SECCOMP=y 323CONFIG_SECCOMP=y
301# CONFIG_WANT_DEVICE_TREE is not set
302CONFIG_ISA_DMA_API=y 324CONFIG_ISA_DMA_API=y
303 325
304# 326#
@@ -352,6 +374,7 @@ CONFIG_XFRM=y
352CONFIG_XFRM_USER=m 374CONFIG_XFRM_USER=m
353# CONFIG_XFRM_SUB_POLICY is not set 375# CONFIG_XFRM_SUB_POLICY is not set
354# CONFIG_XFRM_MIGRATE is not set 376# CONFIG_XFRM_MIGRATE is not set
377# CONFIG_XFRM_STATISTICS is not set
355CONFIG_NET_KEY=m 378CONFIG_NET_KEY=m
356# CONFIG_NET_KEY_MIGRATE is not set 379# CONFIG_NET_KEY_MIGRATE is not set
357CONFIG_INET=y 380CONFIG_INET=y
@@ -375,7 +398,7 @@ CONFIG_INET_TUNNEL=y
375CONFIG_INET_XFRM_MODE_TRANSPORT=y 398CONFIG_INET_XFRM_MODE_TRANSPORT=y
376CONFIG_INET_XFRM_MODE_TUNNEL=y 399CONFIG_INET_XFRM_MODE_TUNNEL=y
377CONFIG_INET_XFRM_MODE_BEET=y 400CONFIG_INET_XFRM_MODE_BEET=y
378CONFIG_INET_LRO=m 401CONFIG_INET_LRO=y
379CONFIG_INET_DIAG=y 402CONFIG_INET_DIAG=y
380CONFIG_INET_TCP_DIAG=y 403CONFIG_INET_TCP_DIAG=y
381# CONFIG_TCP_CONG_ADVANCED is not set 404# CONFIG_TCP_CONG_ADVANCED is not set
@@ -389,14 +412,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
389# CONFIG_NETWORK_SECMARK is not set 412# CONFIG_NETWORK_SECMARK is not set
390CONFIG_NETFILTER=y 413CONFIG_NETFILTER=y
391# CONFIG_NETFILTER_DEBUG is not set 414# CONFIG_NETFILTER_DEBUG is not set
415CONFIG_NETFILTER_ADVANCED=y
392 416
393# 417#
394# Core Netfilter Configuration 418# Core Netfilter Configuration
395# 419#
396CONFIG_NETFILTER_NETLINK=y 420CONFIG_NETFILTER_NETLINK=m
397CONFIG_NETFILTER_NETLINK_QUEUE=m 421CONFIG_NETFILTER_NETLINK_QUEUE=m
398CONFIG_NETFILTER_NETLINK_LOG=m 422CONFIG_NETFILTER_NETLINK_LOG=m
399CONFIG_NF_CONNTRACK_ENABLED=m
400CONFIG_NF_CONNTRACK=m 423CONFIG_NF_CONNTRACK=m
401CONFIG_NF_CT_ACCT=y 424CONFIG_NF_CT_ACCT=y
402CONFIG_NF_CONNTRACK_MARK=y 425CONFIG_NF_CONNTRACK_MARK=y
@@ -422,8 +445,10 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
422CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 445CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
423CONFIG_NETFILTER_XT_TARGET_NFLOG=m 446CONFIG_NETFILTER_XT_TARGET_NFLOG=m
424CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 447CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
448CONFIG_NETFILTER_XT_TARGET_RATEEST=m
425CONFIG_NETFILTER_XT_TARGET_TRACE=m 449CONFIG_NETFILTER_XT_TARGET_TRACE=m
426CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 450CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
451CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
427CONFIG_NETFILTER_XT_MATCH_COMMENT=m 452CONFIG_NETFILTER_XT_MATCH_COMMENT=m
428CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 453CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
429CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 454CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -433,14 +458,17 @@ CONFIG_NETFILTER_XT_MATCH_DCCP=m
433CONFIG_NETFILTER_XT_MATCH_DSCP=m 458CONFIG_NETFILTER_XT_MATCH_DSCP=m
434CONFIG_NETFILTER_XT_MATCH_ESP=m 459CONFIG_NETFILTER_XT_MATCH_ESP=m
435CONFIG_NETFILTER_XT_MATCH_HELPER=m 460CONFIG_NETFILTER_XT_MATCH_HELPER=m
461CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
436CONFIG_NETFILTER_XT_MATCH_LENGTH=m 462CONFIG_NETFILTER_XT_MATCH_LENGTH=m
437CONFIG_NETFILTER_XT_MATCH_LIMIT=m 463CONFIG_NETFILTER_XT_MATCH_LIMIT=m
438CONFIG_NETFILTER_XT_MATCH_MAC=m 464CONFIG_NETFILTER_XT_MATCH_MAC=m
439CONFIG_NETFILTER_XT_MATCH_MARK=m 465CONFIG_NETFILTER_XT_MATCH_MARK=m
466CONFIG_NETFILTER_XT_MATCH_OWNER=m
440CONFIG_NETFILTER_XT_MATCH_POLICY=m 467CONFIG_NETFILTER_XT_MATCH_POLICY=m
441CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 468CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
442CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 469CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
443CONFIG_NETFILTER_XT_MATCH_QUOTA=m 470CONFIG_NETFILTER_XT_MATCH_QUOTA=m
471CONFIG_NETFILTER_XT_MATCH_RATEEST=m
444CONFIG_NETFILTER_XT_MATCH_REALM=m 472CONFIG_NETFILTER_XT_MATCH_REALM=m
445CONFIG_NETFILTER_XT_MATCH_SCTP=m 473CONFIG_NETFILTER_XT_MATCH_SCTP=m
446CONFIG_NETFILTER_XT_MATCH_STATE=m 474CONFIG_NETFILTER_XT_MATCH_STATE=m
@@ -458,13 +486,10 @@ CONFIG_NF_CONNTRACK_IPV4=m
458CONFIG_NF_CONNTRACK_PROC_COMPAT=y 486CONFIG_NF_CONNTRACK_PROC_COMPAT=y
459CONFIG_IP_NF_QUEUE=m 487CONFIG_IP_NF_QUEUE=m
460CONFIG_IP_NF_IPTABLES=m 488CONFIG_IP_NF_IPTABLES=m
461CONFIG_IP_NF_MATCH_IPRANGE=m
462CONFIG_IP_NF_MATCH_TOS=m
463CONFIG_IP_NF_MATCH_RECENT=m 489CONFIG_IP_NF_MATCH_RECENT=m
464CONFIG_IP_NF_MATCH_ECN=m 490CONFIG_IP_NF_MATCH_ECN=m
465CONFIG_IP_NF_MATCH_AH=m 491CONFIG_IP_NF_MATCH_AH=m
466CONFIG_IP_NF_MATCH_TTL=m 492CONFIG_IP_NF_MATCH_TTL=m
467CONFIG_IP_NF_MATCH_OWNER=m
468CONFIG_IP_NF_MATCH_ADDRTYPE=m 493CONFIG_IP_NF_MATCH_ADDRTYPE=m
469CONFIG_IP_NF_FILTER=m 494CONFIG_IP_NF_FILTER=m
470CONFIG_IP_NF_TARGET_REJECT=m 495CONFIG_IP_NF_TARGET_REJECT=m
@@ -475,7 +500,6 @@ CONFIG_NF_NAT_NEEDED=y
475CONFIG_IP_NF_TARGET_MASQUERADE=m 500CONFIG_IP_NF_TARGET_MASQUERADE=m
476CONFIG_IP_NF_TARGET_REDIRECT=m 501CONFIG_IP_NF_TARGET_REDIRECT=m
477CONFIG_IP_NF_TARGET_NETMAP=m 502CONFIG_IP_NF_TARGET_NETMAP=m
478CONFIG_IP_NF_TARGET_SAME=m
479CONFIG_NF_NAT_SNMP_BASIC=m 503CONFIG_NF_NAT_SNMP_BASIC=m
480CONFIG_NF_NAT_PROTO_GRE=m 504CONFIG_NF_NAT_PROTO_GRE=m
481CONFIG_NF_NAT_FTP=m 505CONFIG_NF_NAT_FTP=m
@@ -486,7 +510,6 @@ CONFIG_NF_NAT_PPTP=m
486CONFIG_NF_NAT_H323=m 510CONFIG_NF_NAT_H323=m
487CONFIG_NF_NAT_SIP=m 511CONFIG_NF_NAT_SIP=m
488CONFIG_IP_NF_MANGLE=m 512CONFIG_IP_NF_MANGLE=m
489CONFIG_IP_NF_TARGET_TOS=m
490CONFIG_IP_NF_TARGET_ECN=m 513CONFIG_IP_NF_TARGET_ECN=m
491CONFIG_IP_NF_TARGET_TTL=m 514CONFIG_IP_NF_TARGET_TTL=m
492CONFIG_IP_NF_TARGET_CLUSTERIP=m 515CONFIG_IP_NF_TARGET_CLUSTERIP=m
@@ -517,6 +540,7 @@ CONFIG_NET_CLS_ROUTE=y
517# 540#
518# CONFIG_NET_PKTGEN is not set 541# CONFIG_NET_PKTGEN is not set
519# CONFIG_HAMRADIO is not set 542# CONFIG_HAMRADIO is not set
543# CONFIG_CAN is not set
520# CONFIG_IRDA is not set 544# CONFIG_IRDA is not set
521# CONFIG_BT is not set 545# CONFIG_BT is not set
522# CONFIG_AF_RXRPC is not set 546# CONFIG_AF_RXRPC is not set
@@ -563,7 +587,7 @@ CONFIG_BLK_DEV_NBD=m
563CONFIG_BLK_DEV_RAM=y 587CONFIG_BLK_DEV_RAM=y
564CONFIG_BLK_DEV_RAM_COUNT=16 588CONFIG_BLK_DEV_RAM_COUNT=16
565CONFIG_BLK_DEV_RAM_SIZE=65536 589CONFIG_BLK_DEV_RAM_SIZE=65536
566CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 590# CONFIG_BLK_DEV_XIP is not set
567# CONFIG_CDROM_PKTCDVD is not set 591# CONFIG_CDROM_PKTCDVD is not set
568# CONFIG_ATA_OVER_ETH is not set 592# CONFIG_ATA_OVER_ETH is not set
569CONFIG_MISC_DEVICES=y 593CONFIG_MISC_DEVICES=y
@@ -571,11 +595,13 @@ CONFIG_MISC_DEVICES=y
571# CONFIG_EEPROM_93CX6 is not set 595# CONFIG_EEPROM_93CX6 is not set
572# CONFIG_SGI_IOC4 is not set 596# CONFIG_SGI_IOC4 is not set
573# CONFIG_TIFM_CORE is not set 597# CONFIG_TIFM_CORE is not set
598# CONFIG_ENCLOSURE_SERVICES is not set
599CONFIG_HAVE_IDE=y
574CONFIG_IDE=y 600CONFIG_IDE=y
575CONFIG_BLK_DEV_IDE=y 601CONFIG_BLK_DEV_IDE=y
576 602
577# 603#
578# Please see Documentation/ide.txt for help/info on IDE drives 604# Please see Documentation/ide/ide.txt for help/info on IDE drives
579# 605#
580# CONFIG_BLK_DEV_IDE_SATA is not set 606# CONFIG_BLK_DEV_IDE_SATA is not set
581CONFIG_BLK_DEV_IDEDISK=y 607CONFIG_BLK_DEV_IDEDISK=y
@@ -583,6 +609,7 @@ CONFIG_BLK_DEV_IDEDISK=y
583# CONFIG_BLK_DEV_IDECS is not set 609# CONFIG_BLK_DEV_IDECS is not set
584# CONFIG_BLK_DEV_DELKIN is not set 610# CONFIG_BLK_DEV_DELKIN is not set
585CONFIG_BLK_DEV_IDECD=y 611CONFIG_BLK_DEV_IDECD=y
612CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
586# CONFIG_BLK_DEV_IDETAPE is not set 613# CONFIG_BLK_DEV_IDETAPE is not set
587# CONFIG_BLK_DEV_IDEFLOPPY is not set 614# CONFIG_BLK_DEV_IDEFLOPPY is not set
588# CONFIG_BLK_DEV_IDESCSI is not set 615# CONFIG_BLK_DEV_IDESCSI is not set
@@ -594,12 +621,12 @@ CONFIG_IDE_PROC_FS=y
594# 621#
595CONFIG_IDE_GENERIC=y 622CONFIG_IDE_GENERIC=y
596# CONFIG_BLK_DEV_PLATFORM is not set 623# CONFIG_BLK_DEV_PLATFORM is not set
624CONFIG_BLK_DEV_IDEDMA_SFF=y
597 625
598# 626#
599# PCI IDE chipsets support 627# PCI IDE chipsets support
600# 628#
601CONFIG_BLK_DEV_IDEPCI=y 629CONFIG_BLK_DEV_IDEPCI=y
602CONFIG_IDEPCI_SHARE_IRQ=y
603CONFIG_IDEPCI_PCIBUS_ORDER=y 630CONFIG_IDEPCI_PCIBUS_ORDER=y
604# CONFIG_BLK_DEV_OFFBOARD is not set 631# CONFIG_BLK_DEV_OFFBOARD is not set
605CONFIG_BLK_DEV_GENERIC=y 632CONFIG_BLK_DEV_GENERIC=y
@@ -634,7 +661,6 @@ CONFIG_BLK_DEV_CELLEB=y
634CONFIG_BLK_DEV_IDE_PMAC=y 661CONFIG_BLK_DEV_IDE_PMAC=y
635CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y 662CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
636CONFIG_BLK_DEV_IDEDMA_PMAC=y 663CONFIG_BLK_DEV_IDEDMA_PMAC=y
637# CONFIG_IDE_ARM is not set
638CONFIG_BLK_DEV_IDEDMA=y 664CONFIG_BLK_DEV_IDEDMA=y
639CONFIG_IDE_ARCH_OBSOLETE_INIT=y 665CONFIG_IDE_ARCH_OBSOLETE_INIT=y
640# CONFIG_BLK_DEV_HD is not set 666# CONFIG_BLK_DEV_HD is not set
@@ -701,6 +727,7 @@ CONFIG_SCSI_LOWLEVEL=y
701CONFIG_SCSI_IBMVSCSI=y 727CONFIG_SCSI_IBMVSCSI=y
702# CONFIG_SCSI_INITIO is not set 728# CONFIG_SCSI_INITIO is not set
703# CONFIG_SCSI_INIA100 is not set 729# CONFIG_SCSI_INIA100 is not set
730# CONFIG_SCSI_MVSAS is not set
704# CONFIG_SCSI_STEX is not set 731# CONFIG_SCSI_STEX is not set
705CONFIG_SCSI_SYM53C8XX_2=y 732CONFIG_SCSI_SYM53C8XX_2=y
706CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 733CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
@@ -760,6 +787,7 @@ CONFIG_SATA_SIL24=y
760# CONFIG_PATA_MPIIX is not set 787# CONFIG_PATA_MPIIX is not set
761# CONFIG_PATA_OLDPIIX is not set 788# CONFIG_PATA_OLDPIIX is not set
762# CONFIG_PATA_NETCELL is not set 789# CONFIG_PATA_NETCELL is not set
790# CONFIG_PATA_NINJA32 is not set
763# CONFIG_PATA_NS87410 is not set 791# CONFIG_PATA_NS87410 is not set
764# CONFIG_PATA_NS87415 is not set 792# CONFIG_PATA_NS87415 is not set
765# CONFIG_PATA_OPTI is not set 793# CONFIG_PATA_OPTI is not set
@@ -776,6 +804,7 @@ CONFIG_PATA_PCMCIA=y
776# CONFIG_PATA_VIA is not set 804# CONFIG_PATA_VIA is not set
777CONFIG_PATA_WINBOND=y 805CONFIG_PATA_WINBOND=y
778CONFIG_PATA_PLATFORM=y 806CONFIG_PATA_PLATFORM=y
807# CONFIG_PATA_OF_PLATFORM is not set
779CONFIG_PATA_SCC=y 808CONFIG_PATA_SCC=y
780CONFIG_MD=y 809CONFIG_MD=y
781CONFIG_BLK_DEV_MD=y 810CONFIG_BLK_DEV_MD=y
@@ -847,7 +876,6 @@ CONFIG_BONDING=m
847# CONFIG_EQUALIZER is not set 876# CONFIG_EQUALIZER is not set
848CONFIG_TUN=m 877CONFIG_TUN=m
849# CONFIG_VETH is not set 878# CONFIG_VETH is not set
850# CONFIG_IP1000 is not set
851# CONFIG_ARCNET is not set 879# CONFIG_ARCNET is not set
852CONFIG_PHYLIB=y 880CONFIG_PHYLIB=y
853 881
@@ -863,11 +891,8 @@ CONFIG_MARVELL_PHY=y
863# CONFIG_SMSC_PHY is not set 891# CONFIG_SMSC_PHY is not set
864CONFIG_BROADCOM_PHY=m 892CONFIG_BROADCOM_PHY=m
865# CONFIG_ICPLUS_PHY is not set 893# CONFIG_ICPLUS_PHY is not set
866CONFIG_FIXED_PHY=m 894# CONFIG_REALTEK_PHY is not set
867CONFIG_FIXED_MII_10_FDX=y 895# CONFIG_FIXED_PHY is not set
868CONFIG_FIXED_MII_100_FDX=y
869# CONFIG_FIXED_MII_1000_FDX is not set
870CONFIG_FIXED_MII_AMNT=1
871# CONFIG_MDIO_BITBANG is not set 896# CONFIG_MDIO_BITBANG is not set
872CONFIG_NET_ETHERNET=y 897CONFIG_NET_ETHERNET=y
873CONFIG_MII=y 898CONFIG_MII=y
@@ -899,6 +924,7 @@ CONFIG_E100=y
899# CONFIG_NE2K_PCI is not set 924# CONFIG_NE2K_PCI is not set
900# CONFIG_8139CP is not set 925# CONFIG_8139CP is not set
901# CONFIG_8139TOO is not set 926# CONFIG_8139TOO is not set
927# CONFIG_R6040 is not set
902# CONFIG_SIS900 is not set 928# CONFIG_SIS900 is not set
903# CONFIG_EPIC100 is not set 929# CONFIG_EPIC100 is not set
904# CONFIG_SUNDANCE is not set 930# CONFIG_SUNDANCE is not set
@@ -912,6 +938,9 @@ CONFIG_E1000=y
912# CONFIG_E1000_NAPI is not set 938# CONFIG_E1000_NAPI is not set
913# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 939# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
914# CONFIG_E1000E is not set 940# CONFIG_E1000E is not set
941# CONFIG_E1000E_ENABLED is not set
942# CONFIG_IP1000 is not set
943# CONFIG_IGB is not set
915# CONFIG_NS83820 is not set 944# CONFIG_NS83820 is not set
916# CONFIG_HAMACHI is not set 945# CONFIG_HAMACHI is not set
917# CONFIG_YELLOWFIN is not set 946# CONFIG_YELLOWFIN is not set
@@ -940,6 +969,7 @@ CONFIG_IXGB=m
940CONFIG_PASEMI_MAC=y 969CONFIG_PASEMI_MAC=y
941# CONFIG_MLX4_CORE is not set 970# CONFIG_MLX4_CORE is not set
942# CONFIG_TEHUTI is not set 971# CONFIG_TEHUTI is not set
972# CONFIG_BNX2X is not set
943CONFIG_TR=y 973CONFIG_TR=y
944CONFIG_IBMOL=y 974CONFIG_IBMOL=y
945# CONFIG_3C359 is not set 975# CONFIG_3C359 is not set
@@ -977,7 +1007,6 @@ CONFIG_PPPOE=m
977# CONFIG_SLIP is not set 1007# CONFIG_SLIP is not set
978CONFIG_SLHC=m 1008CONFIG_SLHC=m
979# CONFIG_NET_FC is not set 1009# CONFIG_NET_FC is not set
980# CONFIG_SHAPER is not set
981CONFIG_NETCONSOLE=y 1010CONFIG_NETCONSOLE=y
982# CONFIG_NETCONSOLE_DYNAMIC is not set 1011# CONFIG_NETCONSOLE_DYNAMIC is not set
983CONFIG_NETPOLL=y 1012CONFIG_NETPOLL=y
@@ -1056,6 +1085,7 @@ CONFIG_VT_CONSOLE=y
1056CONFIG_HW_CONSOLE=y 1085CONFIG_HW_CONSOLE=y
1057# CONFIG_VT_HW_CONSOLE_BINDING is not set 1086# CONFIG_VT_HW_CONSOLE_BINDING is not set
1058# CONFIG_SERIAL_NONSTANDARD is not set 1087# CONFIG_SERIAL_NONSTANDARD is not set
1088# CONFIG_NOZOMI is not set
1059 1089
1060# 1090#
1061# Serial drivers 1091# Serial drivers
@@ -1103,6 +1133,7 @@ CONFIG_GEN_RTC=y
1103# CONFIG_SYNCLINK_CS is not set 1133# CONFIG_SYNCLINK_CS is not set
1104# CONFIG_CARDMAN_4000 is not set 1134# CONFIG_CARDMAN_4000 is not set
1105# CONFIG_CARDMAN_4040 is not set 1135# CONFIG_CARDMAN_4040 is not set
1136# CONFIG_IPWIRELESS is not set
1106CONFIG_RAW_DRIVER=y 1137CONFIG_RAW_DRIVER=y
1107CONFIG_MAX_RAW_DEVS=256 1138CONFIG_MAX_RAW_DEVS=256
1108# CONFIG_HANGCHECK_TIMER is not set 1139# CONFIG_HANGCHECK_TIMER is not set
@@ -1151,13 +1182,12 @@ CONFIG_I2C_PASEMI=y
1151# 1182#
1152# Miscellaneous I2C Chip support 1183# Miscellaneous I2C Chip support
1153# 1184#
1154# CONFIG_SENSORS_DS1337 is not set
1155# CONFIG_SENSORS_DS1374 is not set
1156# CONFIG_DS1682 is not set 1185# CONFIG_DS1682 is not set
1157# CONFIG_SENSORS_EEPROM is not set 1186# CONFIG_SENSORS_EEPROM is not set
1158# CONFIG_SENSORS_PCF8574 is not set 1187# CONFIG_SENSORS_PCF8574 is not set
1159# CONFIG_SENSORS_PCA9539 is not set 1188# CONFIG_PCF8575 is not set
1160# CONFIG_SENSORS_PCF8591 is not set 1189# CONFIG_SENSORS_PCF8591 is not set
1190# CONFIG_TPS65010 is not set
1161# CONFIG_SENSORS_MAX6875 is not set 1191# CONFIG_SENSORS_MAX6875 is not set
1162# CONFIG_SENSORS_TSL2550 is not set 1192# CONFIG_SENSORS_TSL2550 is not set
1163# CONFIG_I2C_DEBUG_CORE is not set 1193# CONFIG_I2C_DEBUG_CORE is not set
@@ -1173,6 +1203,7 @@ CONFIG_I2C_PASEMI=y
1173# CONFIG_W1 is not set 1203# CONFIG_W1 is not set
1174# CONFIG_POWER_SUPPLY is not set 1204# CONFIG_POWER_SUPPLY is not set
1175# CONFIG_HWMON is not set 1205# CONFIG_HWMON is not set
1206# CONFIG_THERMAL is not set
1176# CONFIG_WATCHDOG is not set 1207# CONFIG_WATCHDOG is not set
1177 1208
1178# 1209#
@@ -1337,6 +1368,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
1337# CONFIG_SND_BT87X is not set 1368# CONFIG_SND_BT87X is not set
1338# CONFIG_SND_CA0106 is not set 1369# CONFIG_SND_CA0106 is not set
1339# CONFIG_SND_CMIPCI is not set 1370# CONFIG_SND_CMIPCI is not set
1371# CONFIG_SND_OXYGEN is not set
1340# CONFIG_SND_CS4281 is not set 1372# CONFIG_SND_CS4281 is not set
1341# CONFIG_SND_CS46XX is not set 1373# CONFIG_SND_CS46XX is not set
1342# CONFIG_SND_CS5530 is not set 1374# CONFIG_SND_CS5530 is not set
@@ -1362,6 +1394,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
1362# CONFIG_SND_HDA_INTEL is not set 1394# CONFIG_SND_HDA_INTEL is not set
1363# CONFIG_SND_HDSP is not set 1395# CONFIG_SND_HDSP is not set
1364# CONFIG_SND_HDSPM is not set 1396# CONFIG_SND_HDSPM is not set
1397# CONFIG_SND_HIFIER is not set
1365# CONFIG_SND_ICE1712 is not set 1398# CONFIG_SND_ICE1712 is not set
1366# CONFIG_SND_ICE1724 is not set 1399# CONFIG_SND_ICE1724 is not set
1367# CONFIG_SND_INTEL8X0 is not set 1400# CONFIG_SND_INTEL8X0 is not set
@@ -1379,6 +1412,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
1379# CONFIG_SND_TRIDENT is not set 1412# CONFIG_SND_TRIDENT is not set
1380# CONFIG_SND_VIA82XX is not set 1413# CONFIG_SND_VIA82XX is not set
1381# CONFIG_SND_VIA82XX_MODEM is not set 1414# CONFIG_SND_VIA82XX_MODEM is not set
1415# CONFIG_SND_VIRTUOSO is not set
1382# CONFIG_SND_VX222 is not set 1416# CONFIG_SND_VX222 is not set
1383# CONFIG_SND_YMFPCI is not set 1417# CONFIG_SND_YMFPCI is not set
1384 1418
@@ -1426,6 +1460,10 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m
1426# 1460#
1427 1461
1428# 1462#
1463# ALSA SoC audio for Freescale SOCs
1464#
1465
1466#
1429# Open Sound System 1467# Open Sound System
1430# 1468#
1431# CONFIG_SOUND_PRIME is not set 1469# CONFIG_SOUND_PRIME is not set
@@ -1447,6 +1485,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
1447CONFIG_USB_ARCH_HAS_EHCI=y 1485CONFIG_USB_ARCH_HAS_EHCI=y
1448CONFIG_USB=y 1486CONFIG_USB=y
1449# CONFIG_USB_DEBUG is not set 1487# CONFIG_USB_DEBUG is not set
1488# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1450 1489
1451# 1490#
1452# Miscellaneous USB options 1491# Miscellaneous USB options
@@ -1460,10 +1499,10 @@ CONFIG_USB_DEVICE_CLASS=y
1460# USB Host Controller Drivers 1499# USB Host Controller Drivers
1461# 1500#
1462CONFIG_USB_EHCI_HCD=y 1501CONFIG_USB_EHCI_HCD=y
1463# CONFIG_USB_EHCI_SPLIT_ISO is not set
1464# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1502# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1465CONFIG_USB_EHCI_TT_NEWSCHED=y 1503CONFIG_USB_EHCI_TT_NEWSCHED=y
1466CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y 1504CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
1505# CONFIG_USB_EHCI_HCD_PPC_OF is not set
1467# CONFIG_USB_ISP116X_HCD is not set 1506# CONFIG_USB_ISP116X_HCD is not set
1468CONFIG_USB_OHCI_HCD=y 1507CONFIG_USB_OHCI_HCD=y
1469# CONFIG_USB_OHCI_HCD_PPC_OF is not set 1508# CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -1512,10 +1551,6 @@ CONFIG_USB_STORAGE=m
1512# 1551#
1513# USB port drivers 1552# USB port drivers
1514# 1553#
1515
1516#
1517# USB Serial Converter support
1518#
1519# CONFIG_USB_SERIAL is not set 1554# CONFIG_USB_SERIAL is not set
1520 1555
1521# 1556#
@@ -1541,16 +1576,9 @@ CONFIG_USB_APPLEDISPLAY=m
1541# CONFIG_USB_TRANCEVIBRATOR is not set 1576# CONFIG_USB_TRANCEVIBRATOR is not set
1542# CONFIG_USB_IOWARRIOR is not set 1577# CONFIG_USB_IOWARRIOR is not set
1543# CONFIG_USB_TEST is not set 1578# CONFIG_USB_TEST is not set
1544
1545#
1546# USB DSL modem support
1547#
1548
1549#
1550# USB Gadget Support
1551#
1552# CONFIG_USB_GADGET is not set 1579# CONFIG_USB_GADGET is not set
1553# CONFIG_MMC is not set 1580# CONFIG_MMC is not set
1581# CONFIG_MEMSTICK is not set
1554# CONFIG_NEW_LEDS is not set 1582# CONFIG_NEW_LEDS is not set
1555CONFIG_INFINIBAND=m 1583CONFIG_INFINIBAND=m
1556# CONFIG_INFINIBAND_USER_MAD is not set 1584# CONFIG_INFINIBAND_USER_MAD is not set
@@ -1562,6 +1590,7 @@ CONFIG_INFINIBAND_MTHCA_DEBUG=y
1562CONFIG_INFINIBAND_EHCA=m 1590CONFIG_INFINIBAND_EHCA=m
1563# CONFIG_INFINIBAND_AMSO1100 is not set 1591# CONFIG_INFINIBAND_AMSO1100 is not set
1564# CONFIG_MLX4_INFINIBAND is not set 1592# CONFIG_MLX4_INFINIBAND is not set
1593# CONFIG_INFINIBAND_NES is not set
1565CONFIG_INFINIBAND_IPOIB=m 1594CONFIG_INFINIBAND_IPOIB=m
1566# CONFIG_INFINIBAND_IPOIB_CM is not set 1595# CONFIG_INFINIBAND_IPOIB_CM is not set
1567CONFIG_INFINIBAND_IPOIB_DEBUG=y 1596CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -1576,8 +1605,13 @@ CONFIG_EDAC=y
1576# CONFIG_EDAC_DEBUG is not set 1605# CONFIG_EDAC_DEBUG is not set
1577CONFIG_EDAC_MM_EDAC=y 1606CONFIG_EDAC_MM_EDAC=y
1578CONFIG_EDAC_PASEMI=y 1607CONFIG_EDAC_PASEMI=y
1608# CONFIG_EDAC_CELL is not set
1579CONFIG_RTC_LIB=y 1609CONFIG_RTC_LIB=y
1580CONFIG_RTC_CLASS=y 1610CONFIG_RTC_CLASS=y
1611
1612#
1613# Conflicting RTC option has been selected, check GEN_RTC and RTC
1614#
1581CONFIG_RTC_HCTOSYS=y 1615CONFIG_RTC_HCTOSYS=y
1582CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 1616CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1583# CONFIG_RTC_DEBUG is not set 1617# CONFIG_RTC_DEBUG is not set
@@ -1604,6 +1638,7 @@ CONFIG_RTC_DRV_DS1307=y
1604# CONFIG_RTC_DRV_PCF8563 is not set 1638# CONFIG_RTC_DRV_PCF8563 is not set
1605# CONFIG_RTC_DRV_PCF8583 is not set 1639# CONFIG_RTC_DRV_PCF8583 is not set
1606# CONFIG_RTC_DRV_M41T80 is not set 1640# CONFIG_RTC_DRV_M41T80 is not set
1641# CONFIG_RTC_DRV_S35390A is not set
1607 1642
1608# 1643#
1609# SPI RTC drivers 1644# SPI RTC drivers
@@ -1613,9 +1648,10 @@ CONFIG_RTC_DRV_DS1307=y
1613# Platform RTC drivers 1648# Platform RTC drivers
1614# 1649#
1615# CONFIG_RTC_DRV_CMOS is not set 1650# CONFIG_RTC_DRV_CMOS is not set
1651# CONFIG_RTC_DRV_DS1511 is not set
1616# CONFIG_RTC_DRV_DS1553 is not set 1652# CONFIG_RTC_DRV_DS1553 is not set
1617# CONFIG_RTC_DRV_STK17TA8 is not set
1618# CONFIG_RTC_DRV_DS1742 is not set 1653# CONFIG_RTC_DRV_DS1742 is not set
1654# CONFIG_RTC_DRV_STK17TA8 is not set
1619# CONFIG_RTC_DRV_M48T86 is not set 1655# CONFIG_RTC_DRV_M48T86 is not set
1620# CONFIG_RTC_DRV_M48T59 is not set 1656# CONFIG_RTC_DRV_M48T59 is not set
1621# CONFIG_RTC_DRV_V3020 is not set 1657# CONFIG_RTC_DRV_V3020 is not set
@@ -1623,6 +1659,7 @@ CONFIG_RTC_DRV_DS1307=y
1623# 1659#
1624# on-CPU RTC drivers 1660# on-CPU RTC drivers
1625# 1661#
1662# CONFIG_DMADEVICES is not set
1626 1663
1627# 1664#
1628# Userspace I/O 1665# Userspace I/O
@@ -1665,12 +1702,10 @@ CONFIG_XFS_POSIX_ACL=y
1665# CONFIG_XFS_RT is not set 1702# CONFIG_XFS_RT is not set
1666# CONFIG_GFS2_FS is not set 1703# CONFIG_GFS2_FS is not set
1667# CONFIG_OCFS2_FS is not set 1704# CONFIG_OCFS2_FS is not set
1668# CONFIG_MINIX_FS is not set 1705CONFIG_DNOTIFY=y
1669# CONFIG_ROMFS_FS is not set
1670CONFIG_INOTIFY=y 1706CONFIG_INOTIFY=y
1671CONFIG_INOTIFY_USER=y 1707CONFIG_INOTIFY_USER=y
1672# CONFIG_QUOTA is not set 1708# CONFIG_QUOTA is not set
1673CONFIG_DNOTIFY=y
1674# CONFIG_AUTOFS_FS is not set 1709# CONFIG_AUTOFS_FS is not set
1675CONFIG_AUTOFS4_FS=m 1710CONFIG_AUTOFS4_FS=m
1676# CONFIG_FUSE_FS is not set 1711# CONFIG_FUSE_FS is not set
@@ -1719,8 +1754,10 @@ CONFIG_HFSPLUS_FS=m
1719# CONFIG_EFS_FS is not set 1754# CONFIG_EFS_FS is not set
1720CONFIG_CRAMFS=y 1755CONFIG_CRAMFS=y
1721# CONFIG_VXFS_FS is not set 1756# CONFIG_VXFS_FS is not set
1757# CONFIG_MINIX_FS is not set
1722# CONFIG_HPFS_FS is not set 1758# CONFIG_HPFS_FS is not set
1723# CONFIG_QNX4FS_FS is not set 1759# CONFIG_QNX4FS_FS is not set
1760# CONFIG_ROMFS_FS is not set
1724# CONFIG_SYSV_FS is not set 1761# CONFIG_SYSV_FS is not set
1725# CONFIG_UFS_FS is not set 1762# CONFIG_UFS_FS is not set
1726CONFIG_NETWORK_FILESYSTEMS=y 1763CONFIG_NETWORK_FILESYSTEMS=y
@@ -1821,7 +1858,6 @@ CONFIG_NLS_KOI8_R=m
1821CONFIG_NLS_KOI8_U=m 1858CONFIG_NLS_KOI8_U=m
1822CONFIG_NLS_UTF8=m 1859CONFIG_NLS_UTF8=m
1823# CONFIG_DLM is not set 1860# CONFIG_DLM is not set
1824# CONFIG_UCC_SLOW is not set
1825 1861
1826# 1862#
1827# Library routines 1863# Library routines
@@ -1835,6 +1871,8 @@ CONFIG_CRC32=y
1835CONFIG_LIBCRC32C=m 1871CONFIG_LIBCRC32C=m
1836CONFIG_ZLIB_INFLATE=y 1872CONFIG_ZLIB_INFLATE=y
1837CONFIG_ZLIB_DEFLATE=m 1873CONFIG_ZLIB_DEFLATE=m
1874CONFIG_LZO_COMPRESS=m
1875CONFIG_LZO_DECOMPRESS=m
1838CONFIG_TEXTSEARCH=y 1876CONFIG_TEXTSEARCH=y
1839CONFIG_TEXTSEARCH_KMP=m 1877CONFIG_TEXTSEARCH_KMP=m
1840CONFIG_TEXTSEARCH_BM=m 1878CONFIG_TEXTSEARCH_BM=m
@@ -1843,11 +1881,6 @@ CONFIG_PLIST=y
1843CONFIG_HAS_IOMEM=y 1881CONFIG_HAS_IOMEM=y
1844CONFIG_HAS_IOPORT=y 1882CONFIG_HAS_IOPORT=y
1845CONFIG_HAS_DMA=y 1883CONFIG_HAS_DMA=y
1846CONFIG_INSTRUMENTATION=y
1847CONFIG_PROFILING=y
1848CONFIG_OPROFILE=y
1849# CONFIG_KPROBES is not set
1850# CONFIG_MARKERS is not set
1851 1884
1852# 1885#
1853# Kernel hacking 1886# Kernel hacking
@@ -1866,6 +1899,7 @@ CONFIG_SCHED_DEBUG=y
1866# CONFIG_SCHEDSTATS is not set 1899# CONFIG_SCHEDSTATS is not set
1867# CONFIG_TIMER_STATS is not set 1900# CONFIG_TIMER_STATS is not set
1868# CONFIG_SLUB_DEBUG_ON is not set 1901# CONFIG_SLUB_DEBUG_ON is not set
1902# CONFIG_SLUB_STATS is not set
1869# CONFIG_DEBUG_RT_MUTEXES is not set 1903# CONFIG_DEBUG_RT_MUTEXES is not set
1870# CONFIG_RT_MUTEX_TESTER is not set 1904# CONFIG_RT_MUTEX_TESTER is not set
1871# CONFIG_DEBUG_SPINLOCK is not set 1905# CONFIG_DEBUG_SPINLOCK is not set
@@ -1878,9 +1912,9 @@ CONFIG_DEBUG_BUGVERBOSE=y
1878# CONFIG_DEBUG_VM is not set 1912# CONFIG_DEBUG_VM is not set
1879# CONFIG_DEBUG_LIST is not set 1913# CONFIG_DEBUG_LIST is not set
1880# CONFIG_DEBUG_SG is not set 1914# CONFIG_DEBUG_SG is not set
1881CONFIG_FORCED_INLINING=y
1882# CONFIG_BOOT_PRINTK_DELAY is not set 1915# CONFIG_BOOT_PRINTK_DELAY is not set
1883# CONFIG_RCU_TORTURE_TEST is not set 1916# CONFIG_RCU_TORTURE_TEST is not set
1917# CONFIG_BACKTRACE_SELF_TEST is not set
1884# CONFIG_FAULT_INJECTION is not set 1918# CONFIG_FAULT_INJECTION is not set
1885# CONFIG_SAMPLES is not set 1919# CONFIG_SAMPLES is not set
1886CONFIG_DEBUG_STACKOVERFLOW=y 1920CONFIG_DEBUG_STACKOVERFLOW=y
@@ -1908,7 +1942,9 @@ CONFIG_ASYNC_MEMCPY=y
1908CONFIG_ASYNC_XOR=y 1942CONFIG_ASYNC_XOR=y
1909CONFIG_CRYPTO=y 1943CONFIG_CRYPTO=y
1910CONFIG_CRYPTO_ALGAPI=y 1944CONFIG_CRYPTO_ALGAPI=y
1945CONFIG_CRYPTO_AEAD=m
1911CONFIG_CRYPTO_BLKCIPHER=y 1946CONFIG_CRYPTO_BLKCIPHER=y
1947CONFIG_CRYPTO_SEQIV=m
1912CONFIG_CRYPTO_HASH=y 1948CONFIG_CRYPTO_HASH=y
1913CONFIG_CRYPTO_MANAGER=y 1949CONFIG_CRYPTO_MANAGER=y
1914CONFIG_CRYPTO_HMAC=y 1950CONFIG_CRYPTO_HMAC=y
@@ -1921,12 +1957,15 @@ CONFIG_CRYPTO_SHA256=m
1921CONFIG_CRYPTO_SHA512=m 1957CONFIG_CRYPTO_SHA512=m
1922CONFIG_CRYPTO_WP512=m 1958CONFIG_CRYPTO_WP512=m
1923CONFIG_CRYPTO_TGR192=m 1959CONFIG_CRYPTO_TGR192=m
1924# CONFIG_CRYPTO_GF128MUL is not set 1960CONFIG_CRYPTO_GF128MUL=m
1925CONFIG_CRYPTO_ECB=m 1961CONFIG_CRYPTO_ECB=m
1926CONFIG_CRYPTO_CBC=y 1962CONFIG_CRYPTO_CBC=y
1927CONFIG_CRYPTO_PCBC=m 1963CONFIG_CRYPTO_PCBC=m
1928# CONFIG_CRYPTO_LRW is not set 1964# CONFIG_CRYPTO_LRW is not set
1929# CONFIG_CRYPTO_XTS is not set 1965# CONFIG_CRYPTO_XTS is not set
1966CONFIG_CRYPTO_CTR=m
1967CONFIG_CRYPTO_GCM=m
1968CONFIG_CRYPTO_CCM=m
1930# CONFIG_CRYPTO_CRYPTD is not set 1969# CONFIG_CRYPTO_CRYPTD is not set
1931CONFIG_CRYPTO_DES=y 1970CONFIG_CRYPTO_DES=y
1932# CONFIG_CRYPTO_FCRYPT is not set 1971# CONFIG_CRYPTO_FCRYPT is not set
@@ -1942,11 +1981,13 @@ CONFIG_CRYPTO_ARC4=m
1942CONFIG_CRYPTO_KHAZAD=m 1981CONFIG_CRYPTO_KHAZAD=m
1943CONFIG_CRYPTO_ANUBIS=m 1982CONFIG_CRYPTO_ANUBIS=m
1944# CONFIG_CRYPTO_SEED is not set 1983# CONFIG_CRYPTO_SEED is not set
1984CONFIG_CRYPTO_SALSA20=m
1945CONFIG_CRYPTO_DEFLATE=m 1985CONFIG_CRYPTO_DEFLATE=m
1946CONFIG_CRYPTO_MICHAEL_MIC=m 1986CONFIG_CRYPTO_MICHAEL_MIC=m
1947CONFIG_CRYPTO_CRC32C=m 1987CONFIG_CRYPTO_CRC32C=m
1948# CONFIG_CRYPTO_CAMELLIA is not set 1988# CONFIG_CRYPTO_CAMELLIA is not set
1949CONFIG_CRYPTO_TEST=m 1989CONFIG_CRYPTO_TEST=m
1950# CONFIG_CRYPTO_AUTHENC is not set 1990CONFIG_CRYPTO_AUTHENC=m
1991CONFIG_CRYPTO_LZO=m
1951# CONFIG_CRYPTO_HW is not set 1992# CONFIG_CRYPTO_HW is not set
1952# CONFIG_PPC_CLOCK is not set 1993# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig
index a3bfbb65a933..1383eb696a20 100644
--- a/arch/powerpc/configs/pq2fads_defconfig
+++ b/arch/powerpc/configs/pq2fads_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-rc5 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 13 22:39:18 2007 4# Mon Mar 24 08:48:36 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -28,6 +28,7 @@ CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y 28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y 29CONFIG_GENERIC_CLOCKEVENTS=y
30CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
31# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
31CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
32CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
33CONFIG_ARCH_HAS_ILOG2_U32=y 34CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -69,9 +70,14 @@ CONFIG_IKCONFIG=y
69CONFIG_IKCONFIG_PROC=y 70CONFIG_IKCONFIG_PROC=y
70CONFIG_LOG_BUF_SHIFT=14 71CONFIG_LOG_BUF_SHIFT=14
71# CONFIG_CGROUPS is not set 72# CONFIG_CGROUPS is not set
73CONFIG_GROUP_SCHED=y
72# CONFIG_FAIR_GROUP_SCHED is not set 74# CONFIG_FAIR_GROUP_SCHED is not set
73# CONFIG_SYSFS_DEPRECATED is not set 75CONFIG_USER_SCHED=y
76# CONFIG_CGROUP_SCHED is not set
77CONFIG_SYSFS_DEPRECATED=y
78CONFIG_SYSFS_DEPRECATED_V2=y
74# CONFIG_RELAY is not set 79# CONFIG_RELAY is not set
80# CONFIG_NAMESPACES is not set
75CONFIG_BLK_DEV_INITRD=y 81CONFIG_BLK_DEV_INITRD=y
76CONFIG_INITRAMFS_SOURCE="" 82CONFIG_INITRAMFS_SOURCE=""
77CONFIG_SYSCTL=y 83CONFIG_SYSCTL=y
@@ -84,11 +90,13 @@ CONFIG_HOTPLUG=y
84CONFIG_PRINTK=y 90CONFIG_PRINTK=y
85CONFIG_BUG=y 91CONFIG_BUG=y
86CONFIG_ELF_CORE=y 92CONFIG_ELF_CORE=y
93CONFIG_COMPAT_BRK=y
87CONFIG_BASE_FULL=y 94CONFIG_BASE_FULL=y
88CONFIG_FUTEX=y 95CONFIG_FUTEX=y
89CONFIG_ANON_INODES=y 96CONFIG_ANON_INODES=y
90CONFIG_EPOLL=y 97CONFIG_EPOLL=y
91CONFIG_SIGNALFD=y 98CONFIG_SIGNALFD=y
99CONFIG_TIMERFD=y
92CONFIG_EVENTFD=y 100CONFIG_EVENTFD=y
93CONFIG_SHMEM=y 101CONFIG_SHMEM=y
94CONFIG_VM_EVENT_COUNTERS=y 102CONFIG_VM_EVENT_COUNTERS=y
@@ -96,6 +104,13 @@ CONFIG_SLUB_DEBUG=y
96# CONFIG_SLAB is not set 104# CONFIG_SLAB is not set
97CONFIG_SLUB=y 105CONFIG_SLUB=y
98# 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
110CONFIG_HAVE_KPROBES=y
111CONFIG_HAVE_KRETPROBES=y
112CONFIG_PROC_PAGE_MONITOR=y
113CONFIG_SLABINFO=y
99CONFIG_RT_MUTEXES=y 114CONFIG_RT_MUTEXES=y
100# CONFIG_TINY_SHMEM is not set 115# CONFIG_TINY_SHMEM is not set
101CONFIG_BASE_SMALL=0 116CONFIG_BASE_SMALL=0
@@ -117,6 +132,7 @@ CONFIG_DEFAULT_AS=y
117# CONFIG_DEFAULT_CFQ is not set 132# CONFIG_DEFAULT_CFQ is not set
118# CONFIG_DEFAULT_NOOP is not set 133# CONFIG_DEFAULT_NOOP is not set
119CONFIG_DEFAULT_IOSCHED="anticipatory" 134CONFIG_DEFAULT_IOSCHED="anticipatory"
135CONFIG_CLASSIC_RCU=y
120 136
121# 137#
122# Platform support 138# Platform support
@@ -125,15 +141,17 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
125CONFIG_PPC_82xx=y 141CONFIG_PPC_82xx=y
126# CONFIG_PPC_83xx is not set 142# CONFIG_PPC_83xx is not set
127# CONFIG_PPC_86xx is not set 143# CONFIG_PPC_86xx is not set
128# CONFIG_PPC_MPC52xx is not set 144# CONFIG_PPC_MPC512x is not set
129# CONFIG_PPC_MPC5200 is not set 145# CONFIG_PPC_MPC5121 is not set
130# CONFIG_PPC_CELL is not set 146# CONFIG_PPC_CELL is not set
131# CONFIG_PPC_CELL_NATIVE is not set 147# CONFIG_PPC_CELL_NATIVE is not set
132# CONFIG_MPC8272_ADS is not set 148# CONFIG_MPC8272_ADS is not set
133CONFIG_PQ2FADS=y 149CONFIG_PQ2FADS=y
150# CONFIG_EP8248E is not set
134CONFIG_PQ2ADS=y 151CONFIG_PQ2ADS=y
135CONFIG_8260=y 152CONFIG_8260=y
136CONFIG_PQ2_ADS_PCI_PIC=y 153CONFIG_PQ2_ADS_PCI_PIC=y
154# CONFIG_IPIC is not set
137# CONFIG_MPIC is not set 155# CONFIG_MPIC is not set
138# CONFIG_MPIC_WEIRD is not set 156# CONFIG_MPIC_WEIRD is not set
139# CONFIG_PPC_I8259 is not set 157# CONFIG_PPC_I8259 is not set
@@ -162,12 +180,16 @@ CONFIG_HZ_250=y
162# CONFIG_HZ_300 is not set 180# CONFIG_HZ_300 is not set
163# CONFIG_HZ_1000 is not set 181# CONFIG_HZ_1000 is not set
164CONFIG_HZ=250 182CONFIG_HZ=250
183# CONFIG_SCHED_HRTICK is not set
165CONFIG_PREEMPT_NONE=y 184CONFIG_PREEMPT_NONE=y
166# CONFIG_PREEMPT_VOLUNTARY is not set 185# CONFIG_PREEMPT_VOLUNTARY is not set
167# CONFIG_PREEMPT is not set 186# CONFIG_PREEMPT is not set
168CONFIG_BINFMT_ELF=y 187CONFIG_BINFMT_ELF=y
169CONFIG_BINFMT_MISC=y 188CONFIG_BINFMT_MISC=y
189# CONFIG_IOMMU_HELPER is not set
170CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 190CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
191CONFIG_ARCH_HAS_WALK_MEMORY=y
192CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
171CONFIG_ARCH_FLATMEM_ENABLE=y 193CONFIG_ARCH_FLATMEM_ENABLE=y
172CONFIG_ARCH_POPULATES_NODE_MAP=y 194CONFIG_ARCH_POPULATES_NODE_MAP=y
173CONFIG_FLATMEM=y 195CONFIG_FLATMEM=y
@@ -182,11 +204,7 @@ CONFIG_VIRT_TO_BUS=y
182CONFIG_PROC_DEVICETREE=y 204CONFIG_PROC_DEVICETREE=y
183# CONFIG_CMDLINE_BOOL is not set 205# CONFIG_CMDLINE_BOOL is not set
184# CONFIG_PM is not set 206# CONFIG_PM is not set
185CONFIG_SUSPEND_UP_POSSIBLE=y
186CONFIG_HIBERNATION_UP_POSSIBLE=y
187CONFIG_SECCOMP=y 207CONFIG_SECCOMP=y
188CONFIG_WANT_DEVICE_TREE=y
189CONFIG_DEVICE_TREE="pq2fads.dts"
190CONFIG_ISA_DMA_API=y 208CONFIG_ISA_DMA_API=y
191 209
192# 210#
@@ -206,6 +224,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
206CONFIG_PCI_LEGACY=y 224CONFIG_PCI_LEGACY=y
207# CONFIG_PCI_DEBUG is not set 225# CONFIG_PCI_DEBUG is not set
208# CONFIG_PCCARD is not set 226# CONFIG_PCCARD is not set
227# CONFIG_HOTPLUG_PCI is not set
209 228
210# 229#
211# Advanced setup 230# Advanced setup
@@ -278,12 +297,13 @@ CONFIG_IPV6_SIT=y
278# CONFIG_NETWORK_SECMARK is not set 297# CONFIG_NETWORK_SECMARK is not set
279CONFIG_NETFILTER=y 298CONFIG_NETFILTER=y
280# CONFIG_NETFILTER_DEBUG is not set 299# CONFIG_NETFILTER_DEBUG is not set
300CONFIG_NETFILTER_ADVANCED=y
281 301
282# 302#
283# Core Netfilter Configuration 303# Core Netfilter Configuration
284# 304#
285# CONFIG_NETFILTER_NETLINK is not set 305# CONFIG_NETFILTER_NETLINK_QUEUE is not set
286# CONFIG_NF_CONNTRACK_ENABLED is not set 306# CONFIG_NETFILTER_NETLINK_LOG is not set
287# CONFIG_NF_CONNTRACK is not set 307# CONFIG_NF_CONNTRACK is not set
288# CONFIG_NETFILTER_XTABLES is not set 308# CONFIG_NETFILTER_XTABLES is not set
289 309
@@ -293,6 +313,13 @@ CONFIG_NETFILTER=y
293# CONFIG_IP_NF_QUEUE is not set 313# CONFIG_IP_NF_QUEUE is not set
294# CONFIG_IP_NF_IPTABLES is not set 314# CONFIG_IP_NF_IPTABLES is not set
295# CONFIG_IP_NF_ARPTABLES is not set 315# CONFIG_IP_NF_ARPTABLES is not set
316
317#
318# IPv6: Netfilter Configuration
319#
320# CONFIG_IP6_NF_QUEUE is not set
321# CONFIG_IP6_NF_IPTABLES is not set
322# CONFIG_ATM is not set
296# CONFIG_BRIDGE is not set 323# CONFIG_BRIDGE is not set
297# CONFIG_VLAN_8021Q is not set 324# CONFIG_VLAN_8021Q is not set
298# CONFIG_DECNET is not set 325# CONFIG_DECNET is not set
@@ -306,6 +333,7 @@ CONFIG_NETFILTER=y
306# 333#
307# CONFIG_NET_PKTGEN is not set 334# CONFIG_NET_PKTGEN is not set
308# CONFIG_HAMRADIO is not set 335# CONFIG_HAMRADIO is not set
336# CONFIG_CAN is not set
309# CONFIG_IRDA is not set 337# CONFIG_IRDA is not set
310# CONFIG_BT is not set 338# CONFIG_BT is not set
311 339
@@ -314,6 +342,7 @@ CONFIG_NETFILTER=y
314# 342#
315# CONFIG_CFG80211 is not set 343# CONFIG_CFG80211 is not set
316# CONFIG_WIRELESS_EXT is not set 344# CONFIG_WIRELESS_EXT is not set
345# CONFIG_MAC80211 is not set
317# CONFIG_IEEE80211 is not set 346# CONFIG_IEEE80211 is not set
318# CONFIG_RFKILL is not set 347# CONFIG_RFKILL is not set
319 348
@@ -431,17 +460,20 @@ CONFIG_MISC_DEVICES=y
431# CONFIG_PHANTOM is not set 460# CONFIG_PHANTOM is not set
432# CONFIG_EEPROM_93CX6 is not set 461# CONFIG_EEPROM_93CX6 is not set
433# CONFIG_SGI_IOC4 is not set 462# CONFIG_SGI_IOC4 is not set
463# CONFIG_ENCLOSURE_SERVICES is not set
464CONFIG_HAVE_IDE=y
434CONFIG_IDE=y 465CONFIG_IDE=y
435CONFIG_IDE_MAX_HWIFS=4 466CONFIG_IDE_MAX_HWIFS=4
436CONFIG_BLK_DEV_IDE=y 467CONFIG_BLK_DEV_IDE=y
437 468
438# 469#
439# Please see Documentation/ide.txt for help/info on IDE drives 470# Please see Documentation/ide/ide.txt for help/info on IDE drives
440# 471#
441# CONFIG_BLK_DEV_IDE_SATA is not set 472# CONFIG_BLK_DEV_IDE_SATA is not set
442CONFIG_BLK_DEV_IDEDISK=y 473CONFIG_BLK_DEV_IDEDISK=y
443# CONFIG_IDEDISK_MULTI_MODE is not set 474# CONFIG_IDEDISK_MULTI_MODE is not set
444# CONFIG_BLK_DEV_IDECD is not set 475# CONFIG_BLK_DEV_IDECD is not set
476# CONFIG_BLK_DEV_IDETAPE is not set
445# CONFIG_BLK_DEV_IDEFLOPPY is not set 477# CONFIG_BLK_DEV_IDEFLOPPY is not set
446# CONFIG_IDE_TASK_IOCTL is not set 478# CONFIG_IDE_TASK_IOCTL is not set
447CONFIG_IDE_PROC_FS=y 479CONFIG_IDE_PROC_FS=y
@@ -455,7 +487,6 @@ CONFIG_IDE_PROC_FS=y
455# 487#
456# PCI IDE chipsets support 488# PCI IDE chipsets support
457# 489#
458# CONFIG_IDEPCI_PCIBUS_ORDER is not set
459# CONFIG_BLK_DEV_GENERIC is not set 490# CONFIG_BLK_DEV_GENERIC is not set
460# CONFIG_BLK_DEV_AEC62XX is not set 491# CONFIG_BLK_DEV_AEC62XX is not set
461# CONFIG_BLK_DEV_ALI15X3 is not set 492# CONFIG_BLK_DEV_ALI15X3 is not set
@@ -481,7 +512,6 @@ CONFIG_IDE_PROC_FS=y
481# CONFIG_BLK_DEV_TRM290 is not set 512# CONFIG_BLK_DEV_TRM290 is not set
482# CONFIG_BLK_DEV_VIA82CXXX is not set 513# CONFIG_BLK_DEV_VIA82CXXX is not set
483# CONFIG_BLK_DEV_TC86C001 is not set 514# CONFIG_BLK_DEV_TC86C001 is not set
484# CONFIG_IDE_ARM is not set
485# CONFIG_BLK_DEV_IDEDMA is not set 515# CONFIG_BLK_DEV_IDEDMA is not set
486CONFIG_IDE_ARCH_OBSOLETE_INIT=y 516CONFIG_IDE_ARCH_OBSOLETE_INIT=y
487# CONFIG_BLK_DEV_HD is not set 517# CONFIG_BLK_DEV_HD is not set
@@ -529,6 +559,7 @@ CONFIG_DAVICOM_PHY=y
529# CONFIG_SMSC_PHY is not set 559# CONFIG_SMSC_PHY is not set
530# CONFIG_BROADCOM_PHY is not set 560# CONFIG_BROADCOM_PHY is not set
531# CONFIG_ICPLUS_PHY is not set 561# CONFIG_ICPLUS_PHY is not set
562# CONFIG_REALTEK_PHY is not set
532# CONFIG_FIXED_PHY is not set 563# CONFIG_FIXED_PHY is not set
533CONFIG_MDIO_BITBANG=y 564CONFIG_MDIO_BITBANG=y
534CONFIG_NET_ETHERNET=y 565CONFIG_NET_ETHERNET=y
@@ -554,6 +585,8 @@ CONFIG_NETDEV_1000=y
554# CONFIG_DL2K is not set 585# CONFIG_DL2K is not set
555# CONFIG_E1000 is not set 586# CONFIG_E1000 is not set
556# CONFIG_E1000E is not set 587# CONFIG_E1000E is not set
588# CONFIG_E1000E_ENABLED is not set
589# CONFIG_IGB is not set
557# CONFIG_NS83820 is not set 590# CONFIG_NS83820 is not set
558# CONFIG_HAMACHI is not set 591# CONFIG_HAMACHI is not set
559# CONFIG_R8169 is not set 592# CONFIG_R8169 is not set
@@ -564,6 +597,7 @@ CONFIG_NETDEV_1000=y
564# CONFIG_VIA_VELOCITY is not set 597# CONFIG_VIA_VELOCITY is not set
565# CONFIG_TIGON3 is not set 598# CONFIG_TIGON3 is not set
566# CONFIG_BNX2 is not set 599# CONFIG_BNX2 is not set
600# CONFIG_GIANFAR is not set
567# CONFIG_QLA3XXX is not set 601# CONFIG_QLA3XXX is not set
568CONFIG_NETDEV_10000=y 602CONFIG_NETDEV_10000=y
569# CONFIG_CHELSIO_T1 is not set 603# CONFIG_CHELSIO_T1 is not set
@@ -576,6 +610,7 @@ CONFIG_NETDEV_10000=y
576# CONFIG_NIU is not set 610# CONFIG_NIU is not set
577# CONFIG_MLX4_CORE is not set 611# CONFIG_MLX4_CORE is not set
578# CONFIG_TEHUTI is not set 612# CONFIG_TEHUTI is not set
613# CONFIG_BNX2X is not set
579# CONFIG_TR is not set 614# CONFIG_TR is not set
580 615
581# 616#
@@ -700,6 +735,7 @@ CONFIG_DEVPORT=y
700# CONFIG_W1 is not set 735# CONFIG_W1 is not set
701# CONFIG_POWER_SUPPLY is not set 736# CONFIG_POWER_SUPPLY is not set
702# CONFIG_HWMON is not set 737# CONFIG_HWMON is not set
738# CONFIG_THERMAL is not set
703# CONFIG_WATCHDOG is not set 739# CONFIG_WATCHDOG is not set
704 740
705# 741#
@@ -749,10 +785,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
749# 785#
750# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 786# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
751# 787#
752
753#
754# USB Gadget Support
755#
756CONFIG_USB_GADGET=y 788CONFIG_USB_GADGET=y
757# CONFIG_USB_GADGET_DEBUG_FILES is not set 789# CONFIG_USB_GADGET_DEBUG_FILES is not set
758CONFIG_USB_GADGET_SELECTED=y 790CONFIG_USB_GADGET_SELECTED=y
@@ -776,10 +808,13 @@ CONFIG_USB_ETH=y
776# CONFIG_USB_FILE_STORAGE is not set 808# CONFIG_USB_FILE_STORAGE is not set
777# CONFIG_USB_G_SERIAL is not set 809# CONFIG_USB_G_SERIAL is not set
778# CONFIG_USB_MIDI_GADGET is not set 810# CONFIG_USB_MIDI_GADGET is not set
811# CONFIG_USB_G_PRINTER is not set
779# CONFIG_MMC is not set 812# CONFIG_MMC is not set
813# CONFIG_MEMSTICK is not set
780# CONFIG_NEW_LEDS is not set 814# CONFIG_NEW_LEDS is not set
781# CONFIG_INFINIBAND is not set 815# CONFIG_INFINIBAND is not set
782# CONFIG_RTC_CLASS is not set 816# CONFIG_RTC_CLASS is not set
817# CONFIG_DMADEVICES is not set
783 818
784# 819#
785# Userspace I/O 820# Userspace I/O
@@ -803,12 +838,10 @@ CONFIG_FS_MBCACHE=y
803CONFIG_FS_POSIX_ACL=y 838CONFIG_FS_POSIX_ACL=y
804# CONFIG_XFS_FS is not set 839# CONFIG_XFS_FS is not set
805# CONFIG_OCFS2_FS is not set 840# CONFIG_OCFS2_FS is not set
806# CONFIG_MINIX_FS is not set 841CONFIG_DNOTIFY=y
807# CONFIG_ROMFS_FS is not set
808CONFIG_INOTIFY=y 842CONFIG_INOTIFY=y
809CONFIG_INOTIFY_USER=y 843CONFIG_INOTIFY_USER=y
810# CONFIG_QUOTA is not set 844# CONFIG_QUOTA is not set
811CONFIG_DNOTIFY=y
812# CONFIG_AUTOFS_FS is not set 845# CONFIG_AUTOFS_FS is not set
813CONFIG_AUTOFS4_FS=y 846CONFIG_AUTOFS4_FS=y
814# CONFIG_FUSE_FS is not set 847# CONFIG_FUSE_FS is not set
@@ -836,6 +869,7 @@ CONFIG_SYSFS=y
836CONFIG_TMPFS=y 869CONFIG_TMPFS=y
837# CONFIG_TMPFS_POSIX_ACL is not set 870# CONFIG_TMPFS_POSIX_ACL is not set
838# CONFIG_HUGETLB_PAGE is not set 871# CONFIG_HUGETLB_PAGE is not set
872# CONFIG_CONFIGFS_FS is not set
839 873
840# 874#
841# Miscellaneous filesystems 875# Miscellaneous filesystems
@@ -844,8 +878,10 @@ CONFIG_TMPFS=y
844# CONFIG_JFFS2_FS is not set 878# CONFIG_JFFS2_FS is not set
845CONFIG_CRAMFS=y 879CONFIG_CRAMFS=y
846# CONFIG_VXFS_FS is not set 880# CONFIG_VXFS_FS is not set
881# CONFIG_MINIX_FS is not set
847# CONFIG_HPFS_FS is not set 882# CONFIG_HPFS_FS is not set
848# CONFIG_QNX4FS_FS is not set 883# CONFIG_QNX4FS_FS is not set
884# CONFIG_ROMFS_FS is not set
849# CONFIG_SYSV_FS is not set 885# CONFIG_SYSV_FS is not set
850# CONFIG_UFS_FS is not set 886# CONFIG_UFS_FS is not set
851CONFIG_NETWORK_FILESYSTEMS=y 887CONFIG_NETWORK_FILESYSTEMS=y
@@ -926,7 +962,6 @@ CONFIG_NLS_ISO8859_1=y
926# CONFIG_NLS_KOI8_R is not set 962# CONFIG_NLS_KOI8_R is not set
927# CONFIG_NLS_KOI8_U is not set 963# CONFIG_NLS_KOI8_U is not set
928CONFIG_NLS_UTF8=y 964CONFIG_NLS_UTF8=y
929# CONFIG_UCC_SLOW is not set
930 965
931# 966#
932# Library routines 967# Library routines
@@ -944,7 +979,6 @@ CONFIG_PLIST=y
944CONFIG_HAS_IOMEM=y 979CONFIG_HAS_IOMEM=y
945CONFIG_HAS_IOPORT=y 980CONFIG_HAS_IOPORT=y
946CONFIG_HAS_DMA=y 981CONFIG_HAS_DMA=y
947# CONFIG_INSTRUMENTATION is not set
948 982
949# 983#
950# Kernel hacking 984# Kernel hacking
@@ -963,6 +997,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
963# CONFIG_SCHEDSTATS is not set 997# CONFIG_SCHEDSTATS is not set
964# CONFIG_TIMER_STATS is not set 998# CONFIG_TIMER_STATS is not set
965# CONFIG_SLUB_DEBUG_ON is not set 999# CONFIG_SLUB_DEBUG_ON is not set
1000# CONFIG_SLUB_STATS is not set
966# CONFIG_DEBUG_RT_MUTEXES is not set 1001# CONFIG_DEBUG_RT_MUTEXES is not set
967# CONFIG_RT_MUTEX_TESTER is not set 1002# CONFIG_RT_MUTEX_TESTER is not set
968# CONFIG_DEBUG_SPINLOCK is not set 1003# CONFIG_DEBUG_SPINLOCK is not set
@@ -975,8 +1010,8 @@ CONFIG_DEBUG_INFO=y
975# CONFIG_DEBUG_VM is not set 1010# CONFIG_DEBUG_VM is not set
976# CONFIG_DEBUG_LIST is not set 1011# CONFIG_DEBUG_LIST is not set
977# CONFIG_DEBUG_SG is not set 1012# CONFIG_DEBUG_SG is not set
978CONFIG_FORCED_INLINING=y
979# CONFIG_BOOT_PRINTK_DELAY is not set 1013# CONFIG_BOOT_PRINTK_DELAY is not set
1014# CONFIG_BACKTRACE_SELF_TEST is not set
980# CONFIG_FAULT_INJECTION is not set 1015# CONFIG_FAULT_INJECTION is not set
981# CONFIG_SAMPLES is not set 1016# CONFIG_SAMPLES is not set
982# CONFIG_DEBUG_STACKOVERFLOW is not set 1017# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -995,6 +1030,7 @@ CONFIG_BDI_SWITCH=y
995CONFIG_CRYPTO=y 1030CONFIG_CRYPTO=y
996CONFIG_CRYPTO_ALGAPI=y 1031CONFIG_CRYPTO_ALGAPI=y
997CONFIG_CRYPTO_BLKCIPHER=y 1032CONFIG_CRYPTO_BLKCIPHER=y
1033# CONFIG_CRYPTO_SEQIV is not set
998CONFIG_CRYPTO_MANAGER=y 1034CONFIG_CRYPTO_MANAGER=y
999# CONFIG_CRYPTO_HMAC is not set 1035# CONFIG_CRYPTO_HMAC is not set
1000# CONFIG_CRYPTO_NULL is not set 1036# CONFIG_CRYPTO_NULL is not set
@@ -1008,6 +1044,9 @@ CONFIG_CRYPTO_MD5=y
1008CONFIG_CRYPTO_ECB=y 1044CONFIG_CRYPTO_ECB=y
1009CONFIG_CRYPTO_CBC=y 1045CONFIG_CRYPTO_CBC=y
1010CONFIG_CRYPTO_PCBC=y 1046CONFIG_CRYPTO_PCBC=y
1047# CONFIG_CRYPTO_CTR is not set
1048# CONFIG_CRYPTO_GCM is not set
1049# CONFIG_CRYPTO_CCM is not set
1011# CONFIG_CRYPTO_CRYPTD is not set 1050# CONFIG_CRYPTO_CRYPTD is not set
1012CONFIG_CRYPTO_DES=y 1051CONFIG_CRYPTO_DES=y
1013# CONFIG_CRYPTO_FCRYPT is not set 1052# CONFIG_CRYPTO_FCRYPT is not set
@@ -1027,6 +1066,8 @@ CONFIG_CRYPTO_DES=y
1027# CONFIG_CRYPTO_CRC32C is not set 1066# CONFIG_CRYPTO_CRC32C is not set
1028# CONFIG_CRYPTO_CAMELLIA is not set 1067# CONFIG_CRYPTO_CAMELLIA is not set
1029# CONFIG_CRYPTO_AUTHENC is not set 1068# CONFIG_CRYPTO_AUTHENC is not set
1069# CONFIG_CRYPTO_LZO is not set
1030CONFIG_CRYPTO_HW=y 1070CONFIG_CRYPTO_HW=y
1071# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1031# CONFIG_PPC_CLOCK is not set 1072# CONFIG_PPC_CLOCK is not set
1032CONFIG_PPC_LIB_RHEAP=y 1073CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig
index 46b2579d38b1..f53d55bbdd7c 100644
--- a/arch/powerpc/configs/prpmc2800_defconfig
+++ b/arch/powerpc/configs/prpmc2800_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:49:11 2007 4# Mon Mar 24 08:48:37 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -31,6 +31,7 @@ CONFIG_GENERIC_TIME=y
31CONFIG_GENERIC_TIME_VSYSCALL=y 31CONFIG_GENERIC_TIME_VSYSCALL=y
32CONFIG_GENERIC_CLOCKEVENTS=y 32CONFIG_GENERIC_CLOCKEVENTS=y
33CONFIG_GENERIC_HARDIRQS=y 33CONFIG_GENERIC_HARDIRQS=y
34# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
34CONFIG_IRQ_PER_CPU=y 35CONFIG_IRQ_PER_CPU=y
35CONFIG_RWSEM_XCHGADD_ALGORITHM=y 36CONFIG_RWSEM_XCHGADD_ALGORITHM=y
36CONFIG_ARCH_HAS_ILOG2_U32=y 37CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -68,15 +69,23 @@ 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_SYSFS_DEPRECATED is not set 78# CONFIG_RT_GROUP_SCHED is not set
79CONFIG_USER_SCHED=y
80# CONFIG_CGROUP_SCHED is not set
81CONFIG_SYSFS_DEPRECATED=y
82CONFIG_SYSFS_DEPRECATED_V2=y
79# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
84CONFIG_NAMESPACES=y
85# CONFIG_UTS_NS is not set
86# CONFIG_IPC_NS is not set
87# CONFIG_USER_NS is not set
88# CONFIG_PID_NS is not set
80CONFIG_BLK_DEV_INITRD=y 89CONFIG_BLK_DEV_INITRD=y
81CONFIG_INITRAMFS_SOURCE="" 90CONFIG_INITRAMFS_SOURCE=""
82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 91# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -89,11 +98,13 @@ CONFIG_HOTPLUG=y
89CONFIG_PRINTK=y 98CONFIG_PRINTK=y
90CONFIG_BUG=y 99CONFIG_BUG=y
91CONFIG_ELF_CORE=y 100CONFIG_ELF_CORE=y
101CONFIG_COMPAT_BRK=y
92CONFIG_BASE_FULL=y 102CONFIG_BASE_FULL=y
93CONFIG_FUTEX=y 103CONFIG_FUTEX=y
94CONFIG_ANON_INODES=y 104CONFIG_ANON_INODES=y
95CONFIG_EPOLL=y 105CONFIG_EPOLL=y
96CONFIG_SIGNALFD=y 106CONFIG_SIGNALFD=y
107CONFIG_TIMERFD=y
97CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
98CONFIG_SHMEM=y 109CONFIG_SHMEM=y
99CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
@@ -101,6 +112,13 @@ CONFIG_SLUB_DEBUG=y
101# CONFIG_SLAB is not set 112# CONFIG_SLAB is not set
102CONFIG_SLUB=y 113CONFIG_SLUB=y
103# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_KPROBES=y
119CONFIG_HAVE_KRETPROBES=y
120CONFIG_PROC_PAGE_MONITOR=y
121CONFIG_SLABINFO=y
104CONFIG_RT_MUTEXES=y 122CONFIG_RT_MUTEXES=y
105# CONFIG_TINY_SHMEM is not set 123# CONFIG_TINY_SHMEM is not set
106CONFIG_BASE_SMALL=0 124CONFIG_BASE_SMALL=0
@@ -123,6 +141,7 @@ CONFIG_DEFAULT_AS=y
123# CONFIG_DEFAULT_CFQ is not set 141# CONFIG_DEFAULT_CFQ is not set
124# CONFIG_DEFAULT_NOOP is not set 142# CONFIG_DEFAULT_NOOP is not set
125CONFIG_DEFAULT_IOSCHED="anticipatory" 143CONFIG_DEFAULT_IOSCHED="anticipatory"
144CONFIG_CLASSIC_RCU=y
126 145
127# 146#
128# Platform support 147# Platform support
@@ -133,20 +152,22 @@ CONFIG_PPC_MULTIPLATFORM=y
133# CONFIG_PPC_86xx is not set 152# CONFIG_PPC_86xx is not set
134CONFIG_CLASSIC32=y 153CONFIG_CLASSIC32=y
135# CONFIG_PPC_CHRP is not set 154# CONFIG_PPC_CHRP is not set
155# CONFIG_PPC_MPC512x is not set
156# CONFIG_PPC_MPC5121 is not set
157# CONFIG_MPC5121_ADS is not set
136# CONFIG_PPC_MPC52xx is not set 158# CONFIG_PPC_MPC52xx is not set
137# CONFIG_PPC_MPC5200 is not set
138# CONFIG_PPC_EFIKA is not set
139# CONFIG_PPC_LITE5200 is not set
140# CONFIG_PPC_PMAC is not set 159# CONFIG_PPC_PMAC is not set
141# CONFIG_PPC_CELL is not set 160# CONFIG_PPC_CELL is not set
142# CONFIG_PPC_CELL_NATIVE is not set 161# CONFIG_PPC_CELL_NATIVE is not set
143# CONFIG_PQ2ADS is not set 162# CONFIG_PQ2ADS is not set
144CONFIG_EMBEDDED6xx=y 163CONFIG_EMBEDDED6xx=y
145# CONFIG_LINKSTATION is not set 164# CONFIG_LINKSTATION is not set
165# CONFIG_STORCENTER is not set
146# CONFIG_MPC7448HPC2 is not set 166# CONFIG_MPC7448HPC2 is not set
147# CONFIG_PPC_HOLLY is not set 167# CONFIG_PPC_HOLLY is not set
148CONFIG_PPC_PRPMC2800=y 168CONFIG_PPC_PRPMC2800=y
149CONFIG_MV64X60=y 169CONFIG_MV64X60=y
170# CONFIG_IPIC is not set
150# CONFIG_MPIC is not set 171# CONFIG_MPIC is not set
151# CONFIG_MPIC_WEIRD is not set 172# CONFIG_MPIC_WEIRD is not set
152# CONFIG_PPC_I8259 is not set 173# CONFIG_PPC_I8259 is not set
@@ -158,7 +179,6 @@ CONFIG_MV64X60=y
158# CONFIG_GENERIC_IOMAP is not set 179# CONFIG_GENERIC_IOMAP is not set
159# CONFIG_CPU_FREQ is not set 180# CONFIG_CPU_FREQ is not set
160# CONFIG_TAU is not set 181# CONFIG_TAU is not set
161# CONFIG_CPM2 is not set
162# CONFIG_FSL_ULI1575 is not set 182# CONFIG_FSL_ULI1575 is not set
163 183
164# 184#
@@ -174,12 +194,16 @@ CONFIG_HZ_250=y
174# CONFIG_HZ_300 is not set 194# CONFIG_HZ_300 is not set
175# CONFIG_HZ_1000 is not set 195# CONFIG_HZ_1000 is not set
176CONFIG_HZ=250 196CONFIG_HZ=250
197# CONFIG_SCHED_HRTICK is not set
177CONFIG_PREEMPT_NONE=y 198CONFIG_PREEMPT_NONE=y
178# CONFIG_PREEMPT_VOLUNTARY is not set 199# CONFIG_PREEMPT_VOLUNTARY is not set
179# CONFIG_PREEMPT is not set 200# CONFIG_PREEMPT is not set
180CONFIG_BINFMT_ELF=y 201CONFIG_BINFMT_ELF=y
181CONFIG_BINFMT_MISC=y 202CONFIG_BINFMT_MISC=y
203# CONFIG_IOMMU_HELPER is not set
182CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 204CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
205CONFIG_ARCH_HAS_WALK_MEMORY=y
206CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
183# CONFIG_KEXEC is not set 207# CONFIG_KEXEC is not set
184CONFIG_ARCH_FLATMEM_ENABLE=y 208CONFIG_ARCH_FLATMEM_ENABLE=y
185CONFIG_ARCH_POPULATES_NODE_MAP=y 209CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -199,11 +223,7 @@ CONFIG_VIRT_TO_BUS=y
199CONFIG_PROC_DEVICETREE=y 223CONFIG_PROC_DEVICETREE=y
200# CONFIG_CMDLINE_BOOL is not set 224# CONFIG_CMDLINE_BOOL is not set
201# CONFIG_PM is not set 225# CONFIG_PM is not set
202CONFIG_SUSPEND_UP_POSSIBLE=y
203CONFIG_HIBERNATION_UP_POSSIBLE=y
204# CONFIG_SECCOMP is not set 226# CONFIG_SECCOMP is not set
205CONFIG_WANT_DEVICE_TREE=y
206CONFIG_DEVICE_TREE="prpmc2800.dts"
207CONFIG_ISA_DMA_API=y 227CONFIG_ISA_DMA_API=y
208 228
209# 229#
@@ -253,6 +273,7 @@ CONFIG_XFRM=y
253CONFIG_XFRM_USER=y 273CONFIG_XFRM_USER=y
254# CONFIG_XFRM_SUB_POLICY is not set 274# CONFIG_XFRM_SUB_POLICY is not set
255# CONFIG_XFRM_MIGRATE is not set 275# CONFIG_XFRM_MIGRATE is not set
276# CONFIG_XFRM_STATISTICS is not set
256# CONFIG_NET_KEY is not set 277# CONFIG_NET_KEY is not set
257CONFIG_INET=y 278CONFIG_INET=y
258CONFIG_IP_MULTICAST=y 279CONFIG_IP_MULTICAST=y
@@ -308,6 +329,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
308# 329#
309# CONFIG_NET_PKTGEN is not set 330# CONFIG_NET_PKTGEN is not set
310# CONFIG_HAMRADIO is not set 331# CONFIG_HAMRADIO is not set
332# CONFIG_CAN is not set
311# CONFIG_IRDA is not set 333# CONFIG_IRDA is not set
312# CONFIG_BT is not set 334# CONFIG_BT is not set
313# CONFIG_AF_RXRPC is not set 335# CONFIG_AF_RXRPC is not set
@@ -341,6 +363,7 @@ CONFIG_MTD_CONCAT=y
341CONFIG_MTD_PARTITIONS=y 363CONFIG_MTD_PARTITIONS=y
342# CONFIG_MTD_REDBOOT_PARTS is not set 364# CONFIG_MTD_REDBOOT_PARTS is not set
343# CONFIG_MTD_CMDLINE_PARTS is not set 365# CONFIG_MTD_CMDLINE_PARTS is not set
366# CONFIG_MTD_OF_PARTS is not set
344 367
345# 368#
346# User Modules And Translation Layers 369# User Modules And Translation Layers
@@ -428,7 +451,7 @@ CONFIG_BLK_DEV_LOOP=y
428CONFIG_BLK_DEV_RAM=y 451CONFIG_BLK_DEV_RAM=y
429CONFIG_BLK_DEV_RAM_COUNT=16 452CONFIG_BLK_DEV_RAM_COUNT=16
430CONFIG_BLK_DEV_RAM_SIZE=131072 453CONFIG_BLK_DEV_RAM_SIZE=131072
431CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 454# CONFIG_BLK_DEV_XIP is not set
432# CONFIG_CDROM_PKTCDVD is not set 455# CONFIG_CDROM_PKTCDVD is not set
433# CONFIG_ATA_OVER_ETH is not set 456# CONFIG_ATA_OVER_ETH is not set
434CONFIG_MISC_DEVICES=y 457CONFIG_MISC_DEVICES=y
@@ -436,11 +459,13 @@ CONFIG_MISC_DEVICES=y
436# CONFIG_EEPROM_93CX6 is not set 459# CONFIG_EEPROM_93CX6 is not set
437# CONFIG_SGI_IOC4 is not set 460# CONFIG_SGI_IOC4 is not set
438# CONFIG_TIFM_CORE is not set 461# CONFIG_TIFM_CORE is not set
462# CONFIG_ENCLOSURE_SERVICES is not set
463CONFIG_HAVE_IDE=y
439CONFIG_IDE=y 464CONFIG_IDE=y
440CONFIG_BLK_DEV_IDE=y 465CONFIG_BLK_DEV_IDE=y
441 466
442# 467#
443# Please see Documentation/ide.txt for help/info on IDE drives 468# Please see Documentation/ide/ide.txt for help/info on IDE drives
444# 469#
445# CONFIG_BLK_DEV_IDE_SATA is not set 470# CONFIG_BLK_DEV_IDE_SATA is not set
446CONFIG_BLK_DEV_IDEDISK=y 471CONFIG_BLK_DEV_IDEDISK=y
@@ -457,12 +482,12 @@ CONFIG_IDE_PROC_FS=y
457# 482#
458CONFIG_IDE_GENERIC=y 483CONFIG_IDE_GENERIC=y
459# CONFIG_BLK_DEV_PLATFORM is not set 484# CONFIG_BLK_DEV_PLATFORM is not set
485CONFIG_BLK_DEV_IDEDMA_SFF=y
460 486
461# 487#
462# PCI IDE chipsets support 488# PCI IDE chipsets support
463# 489#
464CONFIG_BLK_DEV_IDEPCI=y 490CONFIG_BLK_DEV_IDEPCI=y
465# CONFIG_IDEPCI_SHARE_IRQ is not set
466CONFIG_IDEPCI_PCIBUS_ORDER=y 491CONFIG_IDEPCI_PCIBUS_ORDER=y
467# CONFIG_BLK_DEV_OFFBOARD is not set 492# CONFIG_BLK_DEV_OFFBOARD is not set
468CONFIG_BLK_DEV_GENERIC=y 493CONFIG_BLK_DEV_GENERIC=y
@@ -493,7 +518,6 @@ CONFIG_BLK_DEV_PDC202XX_NEW=y
493# CONFIG_BLK_DEV_TRM290 is not set 518# CONFIG_BLK_DEV_TRM290 is not set
494# CONFIG_BLK_DEV_VIA82CXXX is not set 519# CONFIG_BLK_DEV_VIA82CXXX is not set
495# CONFIG_BLK_DEV_TC86C001 is not set 520# CONFIG_BLK_DEV_TC86C001 is not set
496# CONFIG_IDE_ARM is not set
497CONFIG_BLK_DEV_IDEDMA=y 521CONFIG_BLK_DEV_IDEDMA=y
498CONFIG_IDE_ARCH_OBSOLETE_INIT=y 522CONFIG_IDE_ARCH_OBSOLETE_INIT=y
499# CONFIG_BLK_DEV_HD is not set 523# CONFIG_BLK_DEV_HD is not set
@@ -559,6 +583,7 @@ CONFIG_SCSI_LOWLEVEL=y
559# CONFIG_SCSI_IPS is not set 583# CONFIG_SCSI_IPS is not set
560# CONFIG_SCSI_INITIO is not set 584# CONFIG_SCSI_INITIO is not set
561# CONFIG_SCSI_INIA100 is not set 585# CONFIG_SCSI_INIA100 is not set
586# CONFIG_SCSI_MVSAS is not set
562# CONFIG_SCSI_STEX is not set 587# CONFIG_SCSI_STEX is not set
563# CONFIG_SCSI_SYM53C8XX_2 is not set 588# CONFIG_SCSI_SYM53C8XX_2 is not set
564# CONFIG_SCSI_IPR is not set 589# CONFIG_SCSI_IPR is not set
@@ -612,6 +637,7 @@ CONFIG_SATA_MV=y
612# CONFIG_PATA_MPIIX is not set 637# CONFIG_PATA_MPIIX is not set
613# CONFIG_PATA_OLDPIIX is not set 638# CONFIG_PATA_OLDPIIX is not set
614# CONFIG_PATA_NETCELL is not set 639# CONFIG_PATA_NETCELL is not set
640# CONFIG_PATA_NINJA32 is not set
615# CONFIG_PATA_NS87410 is not set 641# CONFIG_PATA_NS87410 is not set
616# CONFIG_PATA_NS87415 is not set 642# CONFIG_PATA_NS87415 is not set
617# CONFIG_PATA_OPTI is not set 643# CONFIG_PATA_OPTI is not set
@@ -626,6 +652,7 @@ CONFIG_SATA_MV=y
626# CONFIG_PATA_SIS is not set 652# CONFIG_PATA_SIS is not set
627# CONFIG_PATA_VIA is not set 653# CONFIG_PATA_VIA is not set
628# CONFIG_PATA_WINBOND is not set 654# CONFIG_PATA_WINBOND is not set
655# CONFIG_PATA_PLATFORM is not set
629# CONFIG_MD is not set 656# CONFIG_MD is not set
630# CONFIG_FUSION is not set 657# CONFIG_FUSION is not set
631 658
@@ -646,7 +673,6 @@ CONFIG_NETDEVICES=y
646# CONFIG_EQUALIZER is not set 673# CONFIG_EQUALIZER is not set
647# CONFIG_TUN is not set 674# CONFIG_TUN is not set
648# CONFIG_VETH is not set 675# CONFIG_VETH is not set
649# CONFIG_IP1000 is not set
650# CONFIG_ARCNET is not set 676# CONFIG_ARCNET is not set
651CONFIG_PHYLIB=y 677CONFIG_PHYLIB=y
652 678
@@ -662,6 +688,7 @@ CONFIG_PHYLIB=y
662# CONFIG_SMSC_PHY is not set 688# CONFIG_SMSC_PHY is not set
663# CONFIG_BROADCOM_PHY is not set 689# CONFIG_BROADCOM_PHY is not set
664# CONFIG_ICPLUS_PHY is not set 690# CONFIG_ICPLUS_PHY is not set
691# CONFIG_REALTEK_PHY is not set
665# CONFIG_FIXED_PHY is not set 692# CONFIG_FIXED_PHY is not set
666# CONFIG_MDIO_BITBANG is not set 693# CONFIG_MDIO_BITBANG is not set
667CONFIG_NET_ETHERNET=y 694CONFIG_NET_ETHERNET=y
@@ -693,6 +720,7 @@ CONFIG_8139TOO=y
693# CONFIG_8139TOO_TUNE_TWISTER is not set 720# CONFIG_8139TOO_TUNE_TWISTER is not set
694# CONFIG_8139TOO_8129 is not set 721# CONFIG_8139TOO_8129 is not set
695# CONFIG_8139_OLD_RX_RESET is not set 722# CONFIG_8139_OLD_RX_RESET is not set
723# CONFIG_R6040 is not set
696# CONFIG_SIS900 is not set 724# CONFIG_SIS900 is not set
697# CONFIG_EPIC100 is not set 725# CONFIG_EPIC100 is not set
698# CONFIG_SUNDANCE is not set 726# CONFIG_SUNDANCE is not set
@@ -706,6 +734,9 @@ CONFIG_E1000=y
706# CONFIG_E1000_NAPI is not set 734# CONFIG_E1000_NAPI is not set
707# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 735# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
708# CONFIG_E1000E is not set 736# CONFIG_E1000E is not set
737# CONFIG_E1000E_ENABLED is not set
738# CONFIG_IP1000 is not set
739# CONFIG_IGB is not set
709# CONFIG_NS83820 is not set 740# CONFIG_NS83820 is not set
710# CONFIG_HAMACHI is not set 741# CONFIG_HAMACHI is not set
711# CONFIG_YELLOWFIN is not set 742# CONFIG_YELLOWFIN is not set
@@ -731,6 +762,7 @@ CONFIG_NETDEV_10000=y
731# CONFIG_NIU is not set 762# CONFIG_NIU is not set
732# CONFIG_MLX4_CORE is not set 763# CONFIG_MLX4_CORE is not set
733# CONFIG_TEHUTI is not set 764# CONFIG_TEHUTI is not set
765# CONFIG_BNX2X is not set
734# CONFIG_TR is not set 766# CONFIG_TR is not set
735 767
736# 768#
@@ -753,7 +785,6 @@ CONFIG_NETDEV_10000=y
753# CONFIG_PPP is not set 785# CONFIG_PPP is not set
754# CONFIG_SLIP is not set 786# CONFIG_SLIP is not set
755# CONFIG_NET_FC is not set 787# CONFIG_NET_FC is not set
756# CONFIG_SHAPER is not set
757# CONFIG_NETCONSOLE is not set 788# CONFIG_NETCONSOLE is not set
758# CONFIG_NETPOLL is not set 789# CONFIG_NETPOLL is not set
759# CONFIG_NET_POLL_CONTROLLER is not set 790# CONFIG_NET_POLL_CONTROLLER is not set
@@ -802,6 +833,7 @@ CONFIG_VT_CONSOLE=y
802CONFIG_HW_CONSOLE=y 833CONFIG_HW_CONSOLE=y
803# CONFIG_VT_HW_CONSOLE_BINDING is not set 834# CONFIG_VT_HW_CONSOLE_BINDING is not set
804# CONFIG_SERIAL_NONSTANDARD is not set 835# CONFIG_SERIAL_NONSTANDARD is not set
836# CONFIG_NOZOMI is not set
805 837
806# 838#
807# Serial drivers 839# Serial drivers
@@ -872,14 +904,12 @@ CONFIG_I2C_MV64XXX=y
872# 904#
873# Miscellaneous I2C Chip support 905# Miscellaneous I2C Chip support
874# 906#
875# CONFIG_SENSORS_DS1337 is not set
876# CONFIG_SENSORS_DS1374 is not set
877# CONFIG_DS1682 is not set 907# CONFIG_DS1682 is not set
878# CONFIG_SENSORS_EEPROM is not set 908# CONFIG_SENSORS_EEPROM is not set
879# CONFIG_SENSORS_PCF8574 is not set 909# CONFIG_SENSORS_PCF8574 is not set
880# CONFIG_SENSORS_PCA9539 is not set 910# CONFIG_PCF8575 is not set
881# CONFIG_SENSORS_PCF8591 is not set 911# CONFIG_SENSORS_PCF8591 is not set
882# CONFIG_SENSORS_M41T00 is not set 912# CONFIG_TPS65010 is not set
883# CONFIG_SENSORS_MAX6875 is not set 913# CONFIG_SENSORS_MAX6875 is not set
884# CONFIG_SENSORS_TSL2550 is not set 914# CONFIG_SENSORS_TSL2550 is not set
885# CONFIG_I2C_DEBUG_CORE is not set 915# CONFIG_I2C_DEBUG_CORE is not set
@@ -904,6 +934,7 @@ CONFIG_HWMON=y
904# CONFIG_SENSORS_ADM1031 is not set 934# CONFIG_SENSORS_ADM1031 is not set
905# CONFIG_SENSORS_ADM9240 is not set 935# CONFIG_SENSORS_ADM9240 is not set
906# CONFIG_SENSORS_ADT7470 is not set 936# CONFIG_SENSORS_ADT7470 is not set
937# CONFIG_SENSORS_ADT7473 is not set
907# CONFIG_SENSORS_ATXP1 is not set 938# CONFIG_SENSORS_ATXP1 is not set
908# CONFIG_SENSORS_DS1621 is not set 939# CONFIG_SENSORS_DS1621 is not set
909# CONFIG_SENSORS_I5K_AMB is not set 940# CONFIG_SENSORS_I5K_AMB is not set
@@ -933,6 +964,7 @@ CONFIG_HWMON=y
933# CONFIG_SENSORS_SMSC47M1 is not set 964# CONFIG_SENSORS_SMSC47M1 is not set
934# CONFIG_SENSORS_SMSC47M192 is not set 965# CONFIG_SENSORS_SMSC47M192 is not set
935# CONFIG_SENSORS_SMSC47B397 is not set 966# CONFIG_SENSORS_SMSC47B397 is not set
967# CONFIG_SENSORS_ADS7828 is not set
936# CONFIG_SENSORS_THMC50 is not set 968# CONFIG_SENSORS_THMC50 is not set
937# CONFIG_SENSORS_VIA686A is not set 969# CONFIG_SENSORS_VIA686A is not set
938# CONFIG_SENSORS_VT1211 is not set 970# CONFIG_SENSORS_VT1211 is not set
@@ -942,9 +974,11 @@ CONFIG_HWMON=y
942# CONFIG_SENSORS_W83792D is not set 974# CONFIG_SENSORS_W83792D is not set
943# CONFIG_SENSORS_W83793 is not set 975# CONFIG_SENSORS_W83793 is not set
944# CONFIG_SENSORS_W83L785TS is not set 976# CONFIG_SENSORS_W83L785TS is not set
977# CONFIG_SENSORS_W83L786NG is not set
945# CONFIG_SENSORS_W83627HF is not set 978# CONFIG_SENSORS_W83627HF is not set
946# CONFIG_SENSORS_W83627EHF is not set 979# CONFIG_SENSORS_W83627EHF is not set
947# CONFIG_HWMON_DEBUG_CHIP is not set 980# CONFIG_HWMON_DEBUG_CHIP is not set
981# CONFIG_THERMAL is not set
948# CONFIG_WATCHDOG is not set 982# CONFIG_WATCHDOG is not set
949 983
950# 984#
@@ -1009,6 +1043,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
1009CONFIG_USB_ARCH_HAS_EHCI=y 1043CONFIG_USB_ARCH_HAS_EHCI=y
1010CONFIG_USB=y 1044CONFIG_USB=y
1011# CONFIG_USB_DEBUG is not set 1045# CONFIG_USB_DEBUG is not set
1046# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1012 1047
1013# 1048#
1014# Miscellaneous USB options 1049# Miscellaneous USB options
@@ -1022,9 +1057,9 @@ CONFIG_USB_DEVICEFS=y
1022# USB Host Controller Drivers 1057# USB Host Controller Drivers
1023# 1058#
1024CONFIG_USB_EHCI_HCD=y 1059CONFIG_USB_EHCI_HCD=y
1025# CONFIG_USB_EHCI_SPLIT_ISO is not set
1026# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1060# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1027# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1061# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1062CONFIG_USB_EHCI_HCD_PPC_OF=y
1028# CONFIG_USB_ISP116X_HCD is not set 1063# CONFIG_USB_ISP116X_HCD is not set
1029CONFIG_USB_OHCI_HCD=y 1064CONFIG_USB_OHCI_HCD=y
1030# CONFIG_USB_OHCI_HCD_PPC_OF is not set 1065# CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -1061,10 +1096,6 @@ CONFIG_USB_MON=y
1061# 1096#
1062# USB port drivers 1097# USB port drivers
1063# 1098#
1064
1065#
1066# USB Serial Converter support
1067#
1068# CONFIG_USB_SERIAL is not set 1099# CONFIG_USB_SERIAL is not set
1069 1100
1070# 1101#
@@ -1090,21 +1121,18 @@ CONFIG_USB_MON=y
1090# CONFIG_USB_TRANCEVIBRATOR is not set 1121# CONFIG_USB_TRANCEVIBRATOR is not set
1091# CONFIG_USB_IOWARRIOR is not set 1122# CONFIG_USB_IOWARRIOR is not set
1092# CONFIG_USB_TEST is not set 1123# CONFIG_USB_TEST is not set
1093
1094#
1095# USB DSL modem support
1096#
1097
1098#
1099# USB Gadget Support
1100#
1101# CONFIG_USB_GADGET is not set 1124# CONFIG_USB_GADGET is not set
1102# CONFIG_MMC is not set 1125# CONFIG_MMC is not set
1126# CONFIG_MEMSTICK is not set
1103# CONFIG_NEW_LEDS is not set 1127# CONFIG_NEW_LEDS is not set
1104# CONFIG_INFINIBAND is not set 1128# CONFIG_INFINIBAND is not set
1105# CONFIG_EDAC is not set 1129# CONFIG_EDAC is not set
1106CONFIG_RTC_LIB=y 1130CONFIG_RTC_LIB=y
1107CONFIG_RTC_CLASS=y 1131CONFIG_RTC_CLASS=y
1132
1133#
1134# Conflicting RTC option has been selected, check GEN_RTC and RTC
1135#
1108CONFIG_RTC_HCTOSYS=y 1136CONFIG_RTC_HCTOSYS=y
1109CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 1137CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1110# CONFIG_RTC_DEBUG is not set 1138# CONFIG_RTC_DEBUG is not set
@@ -1131,6 +1159,7 @@ CONFIG_RTC_DRV_MAX6900=y
1131# CONFIG_RTC_DRV_PCF8563 is not set 1159# CONFIG_RTC_DRV_PCF8563 is not set
1132# CONFIG_RTC_DRV_PCF8583 is not set 1160# CONFIG_RTC_DRV_PCF8583 is not set
1133# CONFIG_RTC_DRV_M41T80 is not set 1161# CONFIG_RTC_DRV_M41T80 is not set
1162# CONFIG_RTC_DRV_S35390A is not set
1134 1163
1135# 1164#
1136# SPI RTC drivers 1165# SPI RTC drivers
@@ -1140,9 +1169,10 @@ CONFIG_RTC_DRV_MAX6900=y
1140# Platform RTC drivers 1169# Platform RTC drivers
1141# 1170#
1142# CONFIG_RTC_DRV_CMOS is not set 1171# CONFIG_RTC_DRV_CMOS is not set
1172# CONFIG_RTC_DRV_DS1511 is not set
1143# CONFIG_RTC_DRV_DS1553 is not set 1173# CONFIG_RTC_DRV_DS1553 is not set
1144# CONFIG_RTC_DRV_STK17TA8 is not set
1145# CONFIG_RTC_DRV_DS1742 is not set 1174# CONFIG_RTC_DRV_DS1742 is not set
1175# CONFIG_RTC_DRV_STK17TA8 is not set
1146# CONFIG_RTC_DRV_M48T86 is not set 1176# CONFIG_RTC_DRV_M48T86 is not set
1147# CONFIG_RTC_DRV_M48T59 is not set 1177# CONFIG_RTC_DRV_M48T59 is not set
1148# CONFIG_RTC_DRV_V3020 is not set 1178# CONFIG_RTC_DRV_V3020 is not set
@@ -1150,6 +1180,7 @@ CONFIG_RTC_DRV_MAX6900=y
1150# 1180#
1151# on-CPU RTC drivers 1181# on-CPU RTC drivers
1152# 1182#
1183# CONFIG_DMADEVICES is not set
1153 1184
1154# 1185#
1155# Userspace I/O 1186# Userspace I/O
@@ -1175,12 +1206,10 @@ CONFIG_FS_MBCACHE=y
1175# CONFIG_XFS_FS is not set 1206# CONFIG_XFS_FS is not set
1176# CONFIG_GFS2_FS is not set 1207# CONFIG_GFS2_FS is not set
1177# CONFIG_OCFS2_FS is not set 1208# CONFIG_OCFS2_FS is not set
1178# CONFIG_MINIX_FS is not set 1209CONFIG_DNOTIFY=y
1179# CONFIG_ROMFS_FS is not set
1180CONFIG_INOTIFY=y 1210CONFIG_INOTIFY=y
1181CONFIG_INOTIFY_USER=y 1211CONFIG_INOTIFY_USER=y
1182# CONFIG_QUOTA is not set 1212# CONFIG_QUOTA is not set
1183CONFIG_DNOTIFY=y
1184# CONFIG_AUTOFS_FS is not set 1213# CONFIG_AUTOFS_FS is not set
1185# CONFIG_AUTOFS4_FS is not set 1214# CONFIG_AUTOFS4_FS is not set
1186# CONFIG_FUSE_FS is not set 1215# CONFIG_FUSE_FS is not set
@@ -1223,8 +1252,10 @@ CONFIG_TMPFS=y
1223# CONFIG_JFFS2_FS is not set 1252# CONFIG_JFFS2_FS is not set
1224# CONFIG_CRAMFS is not set 1253# CONFIG_CRAMFS is not set
1225# CONFIG_VXFS_FS is not set 1254# CONFIG_VXFS_FS is not set
1255# CONFIG_MINIX_FS is not set
1226# CONFIG_HPFS_FS is not set 1256# CONFIG_HPFS_FS is not set
1227# CONFIG_QNX4FS_FS is not set 1257# CONFIG_QNX4FS_FS is not set
1258# CONFIG_ROMFS_FS is not set
1228# CONFIG_SYSV_FS is not set 1259# CONFIG_SYSV_FS is not set
1229# CONFIG_UFS_FS is not set 1260# CONFIG_UFS_FS is not set
1230CONFIG_NETWORK_FILESYSTEMS=y 1261CONFIG_NETWORK_FILESYSTEMS=y
@@ -1269,7 +1300,6 @@ CONFIG_MSDOS_PARTITION=y
1269# CONFIG_SYSV68_PARTITION is not set 1300# CONFIG_SYSV68_PARTITION is not set
1270# CONFIG_NLS is not set 1301# CONFIG_NLS is not set
1271# CONFIG_DLM is not set 1302# CONFIG_DLM is not set
1272# CONFIG_UCC_SLOW is not set
1273 1303
1274# 1304#
1275# Library routines 1305# Library routines
@@ -1285,7 +1315,6 @@ CONFIG_PLIST=y
1285CONFIG_HAS_IOMEM=y 1315CONFIG_HAS_IOMEM=y
1286CONFIG_HAS_IOPORT=y 1316CONFIG_HAS_IOPORT=y
1287CONFIG_HAS_DMA=y 1317CONFIG_HAS_DMA=y
1288# CONFIG_INSTRUMENTATION is not set
1289 1318
1290# 1319#
1291# Kernel hacking 1320# Kernel hacking
@@ -1299,6 +1328,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1299# CONFIG_HEADERS_CHECK is not set 1328# CONFIG_HEADERS_CHECK is not set
1300# CONFIG_DEBUG_KERNEL is not set 1329# CONFIG_DEBUG_KERNEL is not set
1301# CONFIG_SLUB_DEBUG_ON is not set 1330# CONFIG_SLUB_DEBUG_ON is not set
1331# CONFIG_SLUB_STATS is not set
1302CONFIG_DEBUG_BUGVERBOSE=y 1332CONFIG_DEBUG_BUGVERBOSE=y
1303# CONFIG_SAMPLES is not set 1333# CONFIG_SAMPLES is not set
1304# CONFIG_BOOTX_TEXT is not set 1334# CONFIG_BOOTX_TEXT is not set
@@ -1310,5 +1340,49 @@ CONFIG_DEBUG_BUGVERBOSE=y
1310# CONFIG_KEYS is not set 1340# CONFIG_KEYS is not set
1311# CONFIG_SECURITY is not set 1341# CONFIG_SECURITY is not set
1312# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1342# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1313# CONFIG_CRYPTO is not set 1343CONFIG_CRYPTO=y
1344# CONFIG_CRYPTO_SEQIV is not set
1345# CONFIG_CRYPTO_MANAGER is not set
1346# CONFIG_CRYPTO_HMAC is not set
1347# CONFIG_CRYPTO_XCBC is not set
1348# CONFIG_CRYPTO_NULL is not set
1349# CONFIG_CRYPTO_MD4 is not set
1350# CONFIG_CRYPTO_MD5 is not set
1351# CONFIG_CRYPTO_SHA1 is not set
1352# CONFIG_CRYPTO_SHA256 is not set
1353# CONFIG_CRYPTO_SHA512 is not set
1354# CONFIG_CRYPTO_WP512 is not set
1355# CONFIG_CRYPTO_TGR192 is not set
1356# CONFIG_CRYPTO_GF128MUL is not set
1357# CONFIG_CRYPTO_ECB is not set
1358# CONFIG_CRYPTO_CBC is not set
1359# CONFIG_CRYPTO_PCBC is not set
1360# CONFIG_CRYPTO_LRW is not set
1361# CONFIG_CRYPTO_XTS is not set
1362# CONFIG_CRYPTO_CTR is not set
1363# CONFIG_CRYPTO_GCM is not set
1364# CONFIG_CRYPTO_CCM is not set
1365# CONFIG_CRYPTO_CRYPTD is not set
1366# CONFIG_CRYPTO_DES is not set
1367# CONFIG_CRYPTO_FCRYPT is not set
1368# CONFIG_CRYPTO_BLOWFISH is not set
1369# CONFIG_CRYPTO_TWOFISH is not set
1370# CONFIG_CRYPTO_SERPENT is not set
1371# CONFIG_CRYPTO_AES is not set
1372# CONFIG_CRYPTO_CAST5 is not set
1373# CONFIG_CRYPTO_CAST6 is not set
1374# CONFIG_CRYPTO_TEA is not set
1375# CONFIG_CRYPTO_ARC4 is not set
1376# CONFIG_CRYPTO_KHAZAD is not set
1377# CONFIG_CRYPTO_ANUBIS is not set
1378# CONFIG_CRYPTO_SEED is not set
1379# CONFIG_CRYPTO_SALSA20 is not set
1380# CONFIG_CRYPTO_DEFLATE is not set
1381# CONFIG_CRYPTO_MICHAEL_MIC is not set
1382# CONFIG_CRYPTO_CRC32C is not set
1383# CONFIG_CRYPTO_CAMELLIA is not set
1384# CONFIG_CRYPTO_AUTHENC is not set
1385# CONFIG_CRYPTO_LZO is not set
1386CONFIG_CRYPTO_HW=y
1387# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1314# CONFIG_PPC_CLOCK is not set 1388# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index 7994955c29d3..7a64c564f6e6 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_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-rc8 3# Linux kernel version: 2.6.25-rc6
4# Wed Jan 16 14:31:21 2008 4# Thu Mar 20 11:07:04 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -28,6 +28,7 @@ CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y 28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y 29CONFIG_GENERIC_CLOCKEVENTS=y
30CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
31CONFIG_HAVE_SETUP_PER_CPU_AREA=y
31CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
32CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
33CONFIG_ARCH_HAS_ILOG2_U32=y 34CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -51,7 +52,6 @@ CONFIG_GENERIC_BUG=y
51# CONFIG_DEFAULT_UIMAGE is not set 52# CONFIG_DEFAULT_UIMAGE is not set
52# CONFIG_PPC_DCR_NATIVE is not set 53# CONFIG_PPC_DCR_NATIVE is not set
53# CONFIG_PPC_DCR_MMIO is not set 54# CONFIG_PPC_DCR_MMIO is not set
54# CONFIG_PPC_OF_PLATFORM_PCI is not set
55CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 55CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
56 56
57# 57#
@@ -68,17 +68,21 @@ CONFIG_SYSVIPC_SYSCTL=y
68CONFIG_POSIX_MQUEUE=y 68CONFIG_POSIX_MQUEUE=y
69# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
70# CONFIG_TASKSTATS is not set 70# 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 71# CONFIG_AUDIT is not set
74# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
75CONFIG_LOG_BUF_SHIFT=17 73CONFIG_LOG_BUF_SHIFT=17
76# CONFIG_CGROUPS is not set 74# CONFIG_CGROUPS is not set
77CONFIG_FAIR_GROUP_SCHED=y 75# CONFIG_GROUP_SCHED is not set
78CONFIG_FAIR_USER_SCHED=y 76# CONFIG_USER_SCHED is not set
79# CONFIG_FAIR_CGROUP_SCHED is not set 77# CONFIG_CGROUP_SCHED is not set
80CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y
81# CONFIG_RELAY is not set 80# CONFIG_RELAY is not set
81CONFIG_NAMESPACES=y
82# CONFIG_UTS_NS is not set
83# CONFIG_IPC_NS is not set
84# CONFIG_USER_NS is not set
85# CONFIG_PID_NS is not set
82CONFIG_BLK_DEV_INITRD=y 86CONFIG_BLK_DEV_INITRD=y
83CONFIG_INITRAMFS_SOURCE="" 87CONFIG_INITRAMFS_SOURCE=""
84CONFIG_CC_OPTIMIZE_FOR_SIZE=y 88CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -92,17 +96,27 @@ CONFIG_HOTPLUG=y
92CONFIG_PRINTK=y 96CONFIG_PRINTK=y
93CONFIG_BUG=y 97CONFIG_BUG=y
94CONFIG_ELF_CORE=y 98CONFIG_ELF_CORE=y
99# CONFIG_COMPAT_BRK is not set
95CONFIG_BASE_FULL=y 100CONFIG_BASE_FULL=y
96CONFIG_FUTEX=y 101CONFIG_FUTEX=y
97CONFIG_ANON_INODES=y 102CONFIG_ANON_INODES=y
98CONFIG_EPOLL=y 103CONFIG_EPOLL=y
99CONFIG_SIGNALFD=y 104CONFIG_SIGNALFD=y
105CONFIG_TIMERFD=y
100CONFIG_EVENTFD=y 106CONFIG_EVENTFD=y
101CONFIG_SHMEM=y 107CONFIG_SHMEM=y
102CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
103CONFIG_SLAB=y 109CONFIG_SLAB=y
104# CONFIG_SLUB is not set 110# CONFIG_SLUB is not set
105# CONFIG_SLOB is not set 111# CONFIG_SLOB is not set
112CONFIG_PROFILING=y
113# CONFIG_MARKERS is not set
114CONFIG_OPROFILE=m
115CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set
117CONFIG_HAVE_KPROBES=y
118CONFIG_HAVE_KRETPROBES=y
119CONFIG_PROC_PAGE_MONITOR=y
106CONFIG_SLABINFO=y 120CONFIG_SLABINFO=y
107CONFIG_RT_MUTEXES=y 121CONFIG_RT_MUTEXES=y
108# CONFIG_TINY_SHMEM is not set 122# CONFIG_TINY_SHMEM is not set
@@ -131,6 +145,7 @@ CONFIG_DEFAULT_AS=y
131# CONFIG_DEFAULT_CFQ is not set 145# CONFIG_DEFAULT_CFQ is not set
132# CONFIG_DEFAULT_NOOP is not set 146# CONFIG_DEFAULT_NOOP is not set
133CONFIG_DEFAULT_IOSCHED="anticipatory" 147CONFIG_DEFAULT_IOSCHED="anticipatory"
148CONFIG_CLASSIC_RCU=y
134 149
135# 150#
136# Platform support 151# Platform support
@@ -141,8 +156,8 @@ CONFIG_PPC_MULTIPLATFORM=y
141# CONFIG_PPC_86xx is not set 156# CONFIG_PPC_86xx is not set
142# CONFIG_PPC_PSERIES is not set 157# CONFIG_PPC_PSERIES is not set
143# CONFIG_PPC_ISERIES is not set 158# CONFIG_PPC_ISERIES is not set
144# CONFIG_PPC_MPC52xx is not set 159# CONFIG_PPC_MPC512x is not set
145# CONFIG_PPC_MPC5200 is not set 160# CONFIG_PPC_MPC5121 is not set
146# CONFIG_PPC_PMAC is not set 161# CONFIG_PPC_PMAC is not set
147# CONFIG_PPC_MAPLE is not set 162# CONFIG_PPC_MAPLE is not set
148# CONFIG_PPC_PASEMI is not set 163# CONFIG_PPC_PASEMI is not set
@@ -173,6 +188,7 @@ CONFIG_PPC_CELL=y
173CONFIG_SPU_FS=y 188CONFIG_SPU_FS=y
174CONFIG_SPU_BASE=y 189CONFIG_SPU_BASE=y
175# CONFIG_PQ2ADS is not set 190# CONFIG_PQ2ADS is not set
191# CONFIG_IPIC is not set
176# CONFIG_MPIC is not set 192# CONFIG_MPIC is not set
177# CONFIG_MPIC_WEIRD is not set 193# CONFIG_MPIC_WEIRD is not set
178# CONFIG_PPC_I8259 is not set 194# CONFIG_PPC_I8259 is not set
@@ -184,7 +200,6 @@ CONFIG_SPU_BASE=y
184# CONFIG_PPC_INDIRECT_IO is not set 200# CONFIG_PPC_INDIRECT_IO is not set
185# CONFIG_GENERIC_IOMAP is not set 201# CONFIG_GENERIC_IOMAP is not set
186# CONFIG_CPU_FREQ is not set 202# CONFIG_CPU_FREQ is not set
187# CONFIG_CPM2 is not set
188# CONFIG_FSL_ULI1575 is not set 203# CONFIG_FSL_ULI1575 is not set
189 204
190# 205#
@@ -199,15 +214,19 @@ CONFIG_HZ_250=y
199# CONFIG_HZ_300 is not set 214# CONFIG_HZ_300 is not set
200# CONFIG_HZ_1000 is not set 215# CONFIG_HZ_1000 is not set
201CONFIG_HZ=250 216CONFIG_HZ=250
217# CONFIG_SCHED_HRTICK is not set
202CONFIG_PREEMPT_NONE=y 218CONFIG_PREEMPT_NONE=y
203# CONFIG_PREEMPT_VOLUNTARY is not set 219# CONFIG_PREEMPT_VOLUNTARY is not set
204# CONFIG_PREEMPT is not set 220# CONFIG_PREEMPT is not set
205# CONFIG_PREEMPT_BKL is not set
206CONFIG_BINFMT_ELF=y 221CONFIG_BINFMT_ELF=y
222CONFIG_COMPAT_BINFMT_ELF=y
207CONFIG_BINFMT_MISC=y 223CONFIG_BINFMT_MISC=y
208CONFIG_FORCE_MAX_ZONEORDER=13 224CONFIG_FORCE_MAX_ZONEORDER=13
209# CONFIG_IOMMU_VMERGE is not set 225# CONFIG_IOMMU_VMERGE is not set
226CONFIG_IOMMU_HELPER=y
210CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 227CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
228CONFIG_ARCH_HAS_WALK_MEMORY=y
229CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
211CONFIG_KEXEC=y 230CONFIG_KEXEC=y
212# CONFIG_CRASH_DUMP is not set 231# CONFIG_CRASH_DUMP is not set
213# CONFIG_IRQ_ALL_CPUS is not set 232# CONFIG_IRQ_ALL_CPUS is not set
@@ -241,7 +260,6 @@ CONFIG_PROC_DEVICETREE=y
241# CONFIG_CMDLINE_BOOL is not set 260# CONFIG_CMDLINE_BOOL is not set
242# CONFIG_PM is not set 261# CONFIG_PM is not set
243# CONFIG_SECCOMP is not set 262# CONFIG_SECCOMP is not set
244# CONFIG_WANT_DEVICE_TREE is not set
245CONFIG_ISA_DMA_API=y 263CONFIG_ISA_DMA_API=y
246 264
247# 265#
@@ -271,6 +289,7 @@ CONFIG_XFRM=y
271# CONFIG_XFRM_USER is not set 289# CONFIG_XFRM_USER is not set
272# CONFIG_XFRM_SUB_POLICY is not set 290# CONFIG_XFRM_SUB_POLICY is not set
273# CONFIG_XFRM_MIGRATE is not set 291# CONFIG_XFRM_MIGRATE is not set
292# CONFIG_XFRM_STATISTICS is not set
274# CONFIG_NET_KEY is not set 293# CONFIG_NET_KEY is not set
275CONFIG_INET=y 294CONFIG_INET=y
276# CONFIG_IP_MULTICAST is not set 295# CONFIG_IP_MULTICAST is not set
@@ -338,6 +357,7 @@ CONFIG_IPV6_SIT=y
338# 357#
339# CONFIG_NET_PKTGEN is not set 358# CONFIG_NET_PKTGEN is not set
340# CONFIG_HAMRADIO is not set 359# CONFIG_HAMRADIO is not set
360# CONFIG_CAN is not set
341# CONFIG_IRDA is not set 361# CONFIG_IRDA is not set
342CONFIG_BT=m 362CONFIG_BT=m
343CONFIG_BT_L2CAP=m 363CONFIG_BT_L2CAP=m
@@ -405,11 +425,13 @@ CONFIG_BLK_DEV_LOOP=y
405CONFIG_BLK_DEV_RAM=y 425CONFIG_BLK_DEV_RAM=y
406CONFIG_BLK_DEV_RAM_COUNT=16 426CONFIG_BLK_DEV_RAM_COUNT=16
407CONFIG_BLK_DEV_RAM_SIZE=65535 427CONFIG_BLK_DEV_RAM_SIZE=65535
408CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 428# CONFIG_BLK_DEV_XIP is not set
409# CONFIG_CDROM_PKTCDVD is not set 429# CONFIG_CDROM_PKTCDVD is not set
410# CONFIG_ATA_OVER_ETH is not set 430# CONFIG_ATA_OVER_ETH is not set
411CONFIG_MISC_DEVICES=y 431CONFIG_MISC_DEVICES=y
412# CONFIG_EEPROM_93CX6 is not set 432# CONFIG_EEPROM_93CX6 is not set
433# CONFIG_ENCLOSURE_SERVICES is not set
434CONFIG_HAVE_IDE=y
413# CONFIG_IDE is not set 435# CONFIG_IDE is not set
414 436
415# 437#
@@ -472,7 +494,9 @@ CONFIG_MII=m
472# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 494# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
473# CONFIG_B44 is not set 495# CONFIG_B44 is not set
474CONFIG_NETDEV_1000=y 496CONFIG_NETDEV_1000=y
497# CONFIG_E1000E_ENABLED is not set
475CONFIG_GELIC_NET=y 498CONFIG_GELIC_NET=y
499CONFIG_GELIC_WIRELESS=y
476# CONFIG_NETDEV_10000 is not set 500# CONFIG_NETDEV_10000 is not set
477 501
478# 502#
@@ -482,9 +506,8 @@ CONFIG_GELIC_NET=y
482CONFIG_WLAN_80211=y 506CONFIG_WLAN_80211=y
483# CONFIG_LIBERTAS is not set 507# CONFIG_LIBERTAS is not set
484# CONFIG_USB_ZD1201 is not set 508# CONFIG_USB_ZD1201 is not set
509# CONFIG_USB_NET_RNDIS_WLAN is not set
485# CONFIG_HOSTAP is not set 510# CONFIG_HOSTAP is not set
486CONFIG_ZD1211RW=m
487# CONFIG_ZD1211RW_DEBUG is not set
488 511
489# 512#
490# USB Network Adapters 513# USB Network Adapters
@@ -507,7 +530,6 @@ CONFIG_USB_NET_MCS7830=m
507# CONFIG_WAN is not set 530# CONFIG_WAN is not set
508# CONFIG_PPP is not set 531# CONFIG_PPP is not set
509# CONFIG_SLIP is not set 532# CONFIG_SLIP is not set
510# CONFIG_SHAPER is not set
511# CONFIG_NETCONSOLE is not set 533# CONFIG_NETCONSOLE is not set
512# CONFIG_NETPOLL is not set 534# CONFIG_NETPOLL is not set
513# CONFIG_NET_POLL_CONTROLLER is not set 535# CONFIG_NET_POLL_CONTROLLER is not set
@@ -606,6 +628,7 @@ CONFIG_GEN_RTC=y
606# CONFIG_W1 is not set 628# CONFIG_W1 is not set
607# CONFIG_POWER_SUPPLY is not set 629# CONFIG_POWER_SUPPLY is not set
608# CONFIG_HWMON is not set 630# CONFIG_HWMON is not set
631# CONFIG_THERMAL is not set
609# CONFIG_WATCHDOG is not set 632# CONFIG_WATCHDOG is not set
610 633
611# 634#
@@ -742,6 +765,10 @@ CONFIG_SND_PS3_DEFAULT_START_DELAY=2000
742# 765#
743 766
744# 767#
768# ALSA SoC audio for Freescale SOCs
769#
770
771#
745# Open Sound System 772# Open Sound System
746# 773#
747# CONFIG_SOUND_PRIME is not set 774# CONFIG_SOUND_PRIME is not set
@@ -769,6 +796,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
769CONFIG_USB_ARCH_HAS_EHCI=y 796CONFIG_USB_ARCH_HAS_EHCI=y
770CONFIG_USB=m 797CONFIG_USB=m
771# CONFIG_USB_DEBUG is not set 798# CONFIG_USB_DEBUG is not set
799# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
772 800
773# 801#
774# Miscellaneous USB options 802# Miscellaneous USB options
@@ -782,10 +810,10 @@ CONFIG_USB_DEVICEFS=y
782# USB Host Controller Drivers 810# USB Host Controller Drivers
783# 811#
784CONFIG_USB_EHCI_HCD=m 812CONFIG_USB_EHCI_HCD=m
785# CONFIG_USB_EHCI_SPLIT_ISO is not set
786# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 813# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
787# CONFIG_USB_EHCI_TT_NEWSCHED is not set 814# CONFIG_USB_EHCI_TT_NEWSCHED is not set
788CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y 815CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
816# CONFIG_USB_EHCI_HCD_PPC_OF is not set
789# CONFIG_USB_ISP116X_HCD is not set 817# CONFIG_USB_ISP116X_HCD is not set
790CONFIG_USB_OHCI_HCD=m 818CONFIG_USB_OHCI_HCD=m
791# CONFIG_USB_OHCI_HCD_PPC_OF is not set 819# CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -833,10 +861,6 @@ CONFIG_USB_MON=y
833# 861#
834# USB port drivers 862# USB port drivers
835# 863#
836
837#
838# USB Serial Converter support
839#
840# CONFIG_USB_SERIAL is not set 864# CONFIG_USB_SERIAL is not set
841 865
842# 866#
@@ -862,19 +886,13 @@ CONFIG_USB_MON=y
862# CONFIG_USB_TRANCEVIBRATOR is not set 886# CONFIG_USB_TRANCEVIBRATOR is not set
863# CONFIG_USB_IOWARRIOR is not set 887# CONFIG_USB_IOWARRIOR is not set
864# CONFIG_USB_TEST is not set 888# CONFIG_USB_TEST is not set
865
866#
867# USB DSL modem support
868#
869
870#
871# USB Gadget Support
872#
873# CONFIG_USB_GADGET is not set 889# CONFIG_USB_GADGET is not set
874# CONFIG_MMC is not set 890# CONFIG_MMC is not set
891# CONFIG_MEMSTICK is not set
875# CONFIG_NEW_LEDS is not set 892# CONFIG_NEW_LEDS is not set
876# CONFIG_EDAC is not set 893# CONFIG_EDAC is not set
877# CONFIG_RTC_CLASS is not set 894# CONFIG_RTC_CLASS is not set
895# CONFIG_DMADEVICES is not set
878 896
879# 897#
880# Userspace I/O 898# Userspace I/O
@@ -900,8 +918,7 @@ CONFIG_FS_MBCACHE=y
900# CONFIG_XFS_FS is not set 918# CONFIG_XFS_FS is not set
901# CONFIG_GFS2_FS is not set 919# CONFIG_GFS2_FS is not set
902# CONFIG_OCFS2_FS is not set 920# CONFIG_OCFS2_FS is not set
903# CONFIG_MINIX_FS is not set 921CONFIG_DNOTIFY=y
904# CONFIG_ROMFS_FS is not set
905CONFIG_INOTIFY=y 922CONFIG_INOTIFY=y
906CONFIG_INOTIFY_USER=y 923CONFIG_INOTIFY_USER=y
907CONFIG_QUOTA=y 924CONFIG_QUOTA=y
@@ -910,7 +927,6 @@ CONFIG_PRINT_QUOTA_WARNING=y
910# CONFIG_QFMT_V1 is not set 927# CONFIG_QFMT_V1 is not set
911CONFIG_QFMT_V2=y 928CONFIG_QFMT_V2=y
912CONFIG_QUOTACTL=y 929CONFIG_QUOTACTL=y
913CONFIG_DNOTIFY=y
914CONFIG_AUTOFS_FS=m 930CONFIG_AUTOFS_FS=m
915CONFIG_AUTOFS4_FS=m 931CONFIG_AUTOFS4_FS=m
916# CONFIG_FUSE_FS is not set 932# CONFIG_FUSE_FS is not set
@@ -959,8 +975,10 @@ CONFIG_TMPFS=y
959# CONFIG_EFS_FS is not set 975# CONFIG_EFS_FS is not set
960# CONFIG_CRAMFS is not set 976# CONFIG_CRAMFS is not set
961# CONFIG_VXFS_FS is not set 977# CONFIG_VXFS_FS is not set
978# CONFIG_MINIX_FS is not set
962# CONFIG_HPFS_FS is not set 979# CONFIG_HPFS_FS is not set
963# CONFIG_QNX4FS_FS is not set 980# CONFIG_QNX4FS_FS is not set
981# CONFIG_ROMFS_FS is not set
964# CONFIG_SYSV_FS is not set 982# CONFIG_SYSV_FS is not set
965# CONFIG_UFS_FS is not set 983# CONFIG_UFS_FS is not set
966CONFIG_NETWORK_FILESYSTEMS=y 984CONFIG_NETWORK_FILESYSTEMS=y
@@ -1036,7 +1054,6 @@ CONFIG_NLS_ISO8859_1=y
1036# CONFIG_NLS_KOI8_U is not set 1054# CONFIG_NLS_KOI8_U is not set
1037# CONFIG_NLS_UTF8 is not set 1055# CONFIG_NLS_UTF8 is not set
1038# CONFIG_DLM is not set 1056# CONFIG_DLM is not set
1039# CONFIG_UCC_SLOW is not set
1040 1057
1041# 1058#
1042# Library routines 1059# Library routines
@@ -1048,15 +1065,12 @@ CONFIG_BITREVERSE=y
1048CONFIG_CRC32=y 1065CONFIG_CRC32=y
1049# CONFIG_CRC7 is not set 1066# CONFIG_CRC7 is not set
1050# CONFIG_LIBCRC32C is not set 1067# CONFIG_LIBCRC32C is not set
1068CONFIG_LZO_COMPRESS=m
1069CONFIG_LZO_DECOMPRESS=m
1051CONFIG_PLIST=y 1070CONFIG_PLIST=y
1052CONFIG_HAS_IOMEM=y 1071CONFIG_HAS_IOMEM=y
1053CONFIG_HAS_IOPORT=y 1072CONFIG_HAS_IOPORT=y
1054CONFIG_HAS_DMA=y 1073CONFIG_HAS_DMA=y
1055CONFIG_INSTRUMENTATION=y
1056CONFIG_PROFILING=y
1057CONFIG_OPROFILE=m
1058# CONFIG_KPROBES is not set
1059# CONFIG_MARKERS is not set
1060 1074
1061# 1075#
1062# Kernel hacking 1076# Kernel hacking
@@ -1087,9 +1101,9 @@ CONFIG_DEBUG_INFO=y
1087# CONFIG_DEBUG_VM is not set 1101# CONFIG_DEBUG_VM is not set
1088CONFIG_DEBUG_LIST=y 1102CONFIG_DEBUG_LIST=y
1089# CONFIG_DEBUG_SG is not set 1103# CONFIG_DEBUG_SG is not set
1090CONFIG_FORCED_INLINING=y
1091# CONFIG_BOOT_PRINTK_DELAY is not set 1104# CONFIG_BOOT_PRINTK_DELAY is not set
1092# CONFIG_RCU_TORTURE_TEST is not set 1105# CONFIG_RCU_TORTURE_TEST is not set
1106# CONFIG_BACKTRACE_SELF_TEST is not set
1093# CONFIG_FAULT_INJECTION is not set 1107# CONFIG_FAULT_INJECTION is not set
1094# CONFIG_SAMPLES is not set 1108# CONFIG_SAMPLES is not set
1095CONFIG_DEBUG_STACKOVERFLOW=y 1109CONFIG_DEBUG_STACKOVERFLOW=y
@@ -1108,7 +1122,9 @@ CONFIG_IRQSTACKS=y
1108# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1122# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1109CONFIG_CRYPTO=y 1123CONFIG_CRYPTO=y
1110CONFIG_CRYPTO_ALGAPI=y 1124CONFIG_CRYPTO_ALGAPI=y
1125CONFIG_CRYPTO_AEAD=m
1111CONFIG_CRYPTO_BLKCIPHER=y 1126CONFIG_CRYPTO_BLKCIPHER=y
1127CONFIG_CRYPTO_SEQIV=m
1112CONFIG_CRYPTO_MANAGER=y 1128CONFIG_CRYPTO_MANAGER=y
1113# CONFIG_CRYPTO_HMAC is not set 1129# CONFIG_CRYPTO_HMAC is not set
1114# CONFIG_CRYPTO_XCBC is not set 1130# CONFIG_CRYPTO_XCBC is not set
@@ -1120,12 +1136,15 @@ CONFIG_CRYPTO_MD5=y
1120# CONFIG_CRYPTO_SHA512 is not set 1136# CONFIG_CRYPTO_SHA512 is not set
1121# CONFIG_CRYPTO_WP512 is not set 1137# CONFIG_CRYPTO_WP512 is not set
1122# CONFIG_CRYPTO_TGR192 is not set 1138# CONFIG_CRYPTO_TGR192 is not set
1123# CONFIG_CRYPTO_GF128MUL is not set 1139CONFIG_CRYPTO_GF128MUL=m
1124CONFIG_CRYPTO_ECB=m 1140CONFIG_CRYPTO_ECB=m
1125CONFIG_CRYPTO_CBC=y 1141CONFIG_CRYPTO_CBC=y
1126CONFIG_CRYPTO_PCBC=m 1142CONFIG_CRYPTO_PCBC=m
1127# CONFIG_CRYPTO_LRW is not set 1143# CONFIG_CRYPTO_LRW is not set
1128# CONFIG_CRYPTO_XTS is not set 1144# CONFIG_CRYPTO_XTS is not set
1145CONFIG_CRYPTO_CTR=m
1146CONFIG_CRYPTO_GCM=m
1147CONFIG_CRYPTO_CCM=m
1129# CONFIG_CRYPTO_CRYPTD is not set 1148# CONFIG_CRYPTO_CRYPTD is not set
1130CONFIG_CRYPTO_DES=y 1149CONFIG_CRYPTO_DES=y
1131# CONFIG_CRYPTO_FCRYPT is not set 1150# CONFIG_CRYPTO_FCRYPT is not set
@@ -1140,11 +1159,13 @@ CONFIG_CRYPTO_ARC4=m
1140# CONFIG_CRYPTO_KHAZAD is not set 1159# CONFIG_CRYPTO_KHAZAD is not set
1141# CONFIG_CRYPTO_ANUBIS is not set 1160# CONFIG_CRYPTO_ANUBIS is not set
1142# CONFIG_CRYPTO_SEED is not set 1161# CONFIG_CRYPTO_SEED is not set
1162CONFIG_CRYPTO_SALSA20=m
1143# CONFIG_CRYPTO_DEFLATE is not set 1163# CONFIG_CRYPTO_DEFLATE is not set
1144CONFIG_CRYPTO_MICHAEL_MIC=m 1164CONFIG_CRYPTO_MICHAEL_MIC=m
1145# CONFIG_CRYPTO_CRC32C is not set 1165# CONFIG_CRYPTO_CRC32C is not set
1146# CONFIG_CRYPTO_CAMELLIA is not set 1166# CONFIG_CRYPTO_CAMELLIA is not set
1147# CONFIG_CRYPTO_TEST is not set 1167# CONFIG_CRYPTO_TEST is not set
1148# CONFIG_CRYPTO_AUTHENC is not set 1168# CONFIG_CRYPTO_AUTHENC is not set
1169CONFIG_CRYPTO_LZO=m
1149CONFIG_CRYPTO_HW=y 1170CONFIG_CRYPTO_HW=y
1150# CONFIG_PPC_CLOCK is not set 1171# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 92bbf51ad4f0..755aca72b522 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Thu Dec 6 16:49:15 2007 4# Thu Mar 20 11:08:01 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -28,6 +28,7 @@ CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y 28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y 29CONFIG_GENERIC_CLOCKEVENTS=y
30CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
31CONFIG_HAVE_SETUP_PER_CPU_AREA=y
31CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
32CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
33CONFIG_ARCH_HAS_ILOG2_U32=y 34CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -71,8 +72,6 @@ CONFIG_TASKSTATS=y
71CONFIG_TASK_DELAY_ACCT=y 72CONFIG_TASK_DELAY_ACCT=y
72CONFIG_TASK_XACCT=y 73CONFIG_TASK_XACCT=y
73CONFIG_TASK_IO_ACCOUNTING=y 74CONFIG_TASK_IO_ACCOUNTING=y
74# CONFIG_USER_NS is not set
75# CONFIG_PID_NS is not set
76CONFIG_AUDIT=y 75CONFIG_AUDIT=y
77CONFIG_AUDITSYSCALL=y 76CONFIG_AUDITSYSCALL=y
78CONFIG_AUDIT_TREE=y 77CONFIG_AUDIT_TREE=y
@@ -83,13 +82,20 @@ CONFIG_CGROUPS=y
83# CONFIG_CGROUP_DEBUG is not set 82# CONFIG_CGROUP_DEBUG is not set
84CONFIG_CGROUP_NS=y 83CONFIG_CGROUP_NS=y
85CONFIG_CPUSETS=y 84CONFIG_CPUSETS=y
86CONFIG_FAIR_GROUP_SCHED=y 85# CONFIG_GROUP_SCHED is not set
87# CONFIG_FAIR_USER_SCHED is not set 86# CONFIG_USER_SCHED is not set
88CONFIG_FAIR_CGROUP_SCHED=y 87# CONFIG_CGROUP_SCHED is not set
89CONFIG_CGROUP_CPUACCT=y 88CONFIG_CGROUP_CPUACCT=y
89# CONFIG_RESOURCE_COUNTERS is not set
90CONFIG_SYSFS_DEPRECATED=y 90CONFIG_SYSFS_DEPRECATED=y
91CONFIG_SYSFS_DEPRECATED_V2=y
91CONFIG_PROC_PID_CPUSET=y 92CONFIG_PROC_PID_CPUSET=y
92# CONFIG_RELAY is not set 93# CONFIG_RELAY is not set
94CONFIG_NAMESPACES=y
95# CONFIG_UTS_NS is not set
96# CONFIG_IPC_NS is not set
97# CONFIG_USER_NS is not set
98# CONFIG_PID_NS is not set
93CONFIG_BLK_DEV_INITRD=y 99CONFIG_BLK_DEV_INITRD=y
94CONFIG_INITRAMFS_SOURCE="" 100CONFIG_INITRAMFS_SOURCE=""
95CONFIG_CC_OPTIMIZE_FOR_SIZE=y 101CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -103,11 +109,13 @@ CONFIG_HOTPLUG=y
103CONFIG_PRINTK=y 109CONFIG_PRINTK=y
104CONFIG_BUG=y 110CONFIG_BUG=y
105CONFIG_ELF_CORE=y 111CONFIG_ELF_CORE=y
112# CONFIG_COMPAT_BRK is not set
106CONFIG_BASE_FULL=y 113CONFIG_BASE_FULL=y
107CONFIG_FUTEX=y 114CONFIG_FUTEX=y
108CONFIG_ANON_INODES=y 115CONFIG_ANON_INODES=y
109CONFIG_EPOLL=y 116CONFIG_EPOLL=y
110CONFIG_SIGNALFD=y 117CONFIG_SIGNALFD=y
118CONFIG_TIMERFD=y
111CONFIG_EVENTFD=y 119CONFIG_EVENTFD=y
112CONFIG_SHMEM=y 120CONFIG_SHMEM=y
113CONFIG_VM_EVENT_COUNTERS=y 121CONFIG_VM_EVENT_COUNTERS=y
@@ -115,6 +123,16 @@ CONFIG_SLUB_DEBUG=y
115# CONFIG_SLAB is not set 123# CONFIG_SLAB is not set
116CONFIG_SLUB=y 124CONFIG_SLUB=y
117# CONFIG_SLOB is not set 125# CONFIG_SLOB is not set
126CONFIG_PROFILING=y
127CONFIG_MARKERS=y
128CONFIG_OPROFILE=y
129CONFIG_HAVE_OPROFILE=y
130CONFIG_KPROBES=y
131CONFIG_KRETPROBES=y
132CONFIG_HAVE_KPROBES=y
133CONFIG_HAVE_KRETPROBES=y
134CONFIG_PROC_PAGE_MONITOR=y
135CONFIG_SLABINFO=y
118CONFIG_RT_MUTEXES=y 136CONFIG_RT_MUTEXES=y
119# CONFIG_TINY_SHMEM is not set 137# CONFIG_TINY_SHMEM is not set
120CONFIG_BASE_SMALL=0 138CONFIG_BASE_SMALL=0
@@ -142,6 +160,7 @@ CONFIG_DEFAULT_AS=y
142# CONFIG_DEFAULT_CFQ is not set 160# CONFIG_DEFAULT_CFQ is not set
143# CONFIG_DEFAULT_NOOP is not set 161# CONFIG_DEFAULT_NOOP is not set
144CONFIG_DEFAULT_IOSCHED="anticipatory" 162CONFIG_DEFAULT_IOSCHED="anticipatory"
163CONFIG_CLASSIC_RCU=y
145 164
146# 165#
147# Platform support 166# Platform support
@@ -156,8 +175,8 @@ CONFIG_EEH=y
156CONFIG_SCANLOG=m 175CONFIG_SCANLOG=m
157CONFIG_LPARCFG=y 176CONFIG_LPARCFG=y
158# CONFIG_PPC_ISERIES is not set 177# CONFIG_PPC_ISERIES is not set
159# CONFIG_PPC_MPC52xx is not set 178# CONFIG_PPC_MPC512x is not set
160# CONFIG_PPC_MPC5200 is not set 179# CONFIG_PPC_MPC5121 is not set
161# CONFIG_PPC_PMAC is not set 180# CONFIG_PPC_PMAC is not set
162# CONFIG_PPC_MAPLE is not set 181# CONFIG_PPC_MAPLE is not set
163# CONFIG_PPC_PASEMI is not set 182# CONFIG_PPC_PASEMI is not set
@@ -170,6 +189,7 @@ CONFIG_LPARCFG=y
170CONFIG_PPC_NATIVE=y 189CONFIG_PPC_NATIVE=y
171# CONFIG_UDBG_RTAS_CONSOLE is not set 190# CONFIG_UDBG_RTAS_CONSOLE is not set
172CONFIG_XICS=y 191CONFIG_XICS=y
192# CONFIG_IPIC is not set
173CONFIG_MPIC=y 193CONFIG_MPIC=y
174# CONFIG_MPIC_WEIRD is not set 194# CONFIG_MPIC_WEIRD is not set
175CONFIG_PPC_I8259=y 195CONFIG_PPC_I8259=y
@@ -186,7 +206,6 @@ CONFIG_IBMEBUS=y
186# CONFIG_PPC_INDIRECT_IO is not set 206# CONFIG_PPC_INDIRECT_IO is not set
187# CONFIG_GENERIC_IOMAP is not set 207# CONFIG_GENERIC_IOMAP is not set
188# CONFIG_CPU_FREQ is not set 208# CONFIG_CPU_FREQ is not set
189# CONFIG_CPM2 is not set
190# CONFIG_FSL_ULI1575 is not set 209# CONFIG_FSL_ULI1575 is not set
191 210
192# 211#
@@ -201,17 +220,21 @@ CONFIG_HZ_250=y
201# CONFIG_HZ_300 is not set 220# CONFIG_HZ_300 is not set
202# CONFIG_HZ_1000 is not set 221# CONFIG_HZ_1000 is not set
203CONFIG_HZ=250 222CONFIG_HZ=250
223# CONFIG_SCHED_HRTICK is not set
204CONFIG_PREEMPT_NONE=y 224CONFIG_PREEMPT_NONE=y
205# CONFIG_PREEMPT_VOLUNTARY is not set 225# CONFIG_PREEMPT_VOLUNTARY is not set
206# CONFIG_PREEMPT is not set 226# CONFIG_PREEMPT is not set
207# CONFIG_PREEMPT_BKL is not set
208CONFIG_BINFMT_ELF=y 227CONFIG_BINFMT_ELF=y
228CONFIG_COMPAT_BINFMT_ELF=y
209CONFIG_BINFMT_MISC=m 229CONFIG_BINFMT_MISC=m
210CONFIG_FORCE_MAX_ZONEORDER=13 230CONFIG_FORCE_MAX_ZONEORDER=13
211CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y 231CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
212CONFIG_IOMMU_VMERGE=y 232CONFIG_IOMMU_VMERGE=y
233CONFIG_IOMMU_HELPER=y
213CONFIG_HOTPLUG_CPU=y 234CONFIG_HOTPLUG_CPU=y
214CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 235CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
236CONFIG_ARCH_HAS_WALK_MEMORY=y
237CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
215CONFIG_KEXEC=y 238CONFIG_KEXEC=y
216# CONFIG_CRASH_DUMP is not set 239# CONFIG_CRASH_DUMP is not set
217CONFIG_IRQ_ALL_CPUS=y 240CONFIG_IRQ_ALL_CPUS=y
@@ -245,9 +268,7 @@ CONFIG_SCHED_SMT=y
245CONFIG_PROC_DEVICETREE=y 268CONFIG_PROC_DEVICETREE=y
246# CONFIG_CMDLINE_BOOL is not set 269# CONFIG_CMDLINE_BOOL is not set
247# CONFIG_PM is not set 270# CONFIG_PM is not set
248CONFIG_SUSPEND_SMP_POSSIBLE=y
249CONFIG_SECCOMP=y 271CONFIG_SECCOMP=y
250# CONFIG_WANT_DEVICE_TREE is not set
251CONFIG_ISA_DMA_API=y 272CONFIG_ISA_DMA_API=y
252 273
253# 274#
@@ -288,6 +309,7 @@ CONFIG_XFRM=y
288CONFIG_XFRM_USER=m 309CONFIG_XFRM_USER=m
289# CONFIG_XFRM_SUB_POLICY is not set 310# CONFIG_XFRM_SUB_POLICY is not set
290# CONFIG_XFRM_MIGRATE is not set 311# CONFIG_XFRM_MIGRATE is not set
312# CONFIG_XFRM_STATISTICS is not set
291CONFIG_NET_KEY=m 313CONFIG_NET_KEY=m
292# CONFIG_NET_KEY_MIGRATE is not set 314# CONFIG_NET_KEY_MIGRATE is not set
293CONFIG_INET=y 315CONFIG_INET=y
@@ -322,14 +344,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
322# CONFIG_NETWORK_SECMARK is not set 344# CONFIG_NETWORK_SECMARK is not set
323CONFIG_NETFILTER=y 345CONFIG_NETFILTER=y
324# CONFIG_NETFILTER_DEBUG is not set 346# CONFIG_NETFILTER_DEBUG is not set
347CONFIG_NETFILTER_ADVANCED=y
325 348
326# 349#
327# Core Netfilter Configuration 350# Core Netfilter Configuration
328# 351#
329CONFIG_NETFILTER_NETLINK=y 352CONFIG_NETFILTER_NETLINK=m
330CONFIG_NETFILTER_NETLINK_QUEUE=m 353CONFIG_NETFILTER_NETLINK_QUEUE=m
331CONFIG_NETFILTER_NETLINK_LOG=m 354CONFIG_NETFILTER_NETLINK_LOG=m
332CONFIG_NF_CONNTRACK_ENABLED=m
333CONFIG_NF_CONNTRACK=m 355CONFIG_NF_CONNTRACK=m
334CONFIG_NF_CT_ACCT=y 356CONFIG_NF_CT_ACCT=y
335CONFIG_NF_CONNTRACK_MARK=y 357CONFIG_NF_CONNTRACK_MARK=y
@@ -351,6 +373,7 @@ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
351CONFIG_NETFILTER_XT_TARGET_MARK=m 373CONFIG_NETFILTER_XT_TARGET_MARK=m
352CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 374CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
353CONFIG_NETFILTER_XT_TARGET_NFLOG=m 375CONFIG_NETFILTER_XT_TARGET_NFLOG=m
376CONFIG_NETFILTER_XT_TARGET_RATEEST=m
354CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 377CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
355CONFIG_NETFILTER_XT_MATCH_COMMENT=m 378CONFIG_NETFILTER_XT_MATCH_COMMENT=m
356CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 379CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
@@ -361,14 +384,17 @@ CONFIG_NETFILTER_XT_MATCH_DCCP=m
361CONFIG_NETFILTER_XT_MATCH_DSCP=m 384CONFIG_NETFILTER_XT_MATCH_DSCP=m
362CONFIG_NETFILTER_XT_MATCH_ESP=m 385CONFIG_NETFILTER_XT_MATCH_ESP=m
363CONFIG_NETFILTER_XT_MATCH_HELPER=m 386CONFIG_NETFILTER_XT_MATCH_HELPER=m
387CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
364CONFIG_NETFILTER_XT_MATCH_LENGTH=m 388CONFIG_NETFILTER_XT_MATCH_LENGTH=m
365CONFIG_NETFILTER_XT_MATCH_LIMIT=m 389CONFIG_NETFILTER_XT_MATCH_LIMIT=m
366CONFIG_NETFILTER_XT_MATCH_MAC=m 390CONFIG_NETFILTER_XT_MATCH_MAC=m
367CONFIG_NETFILTER_XT_MATCH_MARK=m 391CONFIG_NETFILTER_XT_MATCH_MARK=m
392CONFIG_NETFILTER_XT_MATCH_OWNER=m
368CONFIG_NETFILTER_XT_MATCH_POLICY=m 393CONFIG_NETFILTER_XT_MATCH_POLICY=m
369CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 394CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
370CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 395CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
371CONFIG_NETFILTER_XT_MATCH_QUOTA=m 396CONFIG_NETFILTER_XT_MATCH_QUOTA=m
397CONFIG_NETFILTER_XT_MATCH_RATEEST=m
372CONFIG_NETFILTER_XT_MATCH_REALM=m 398CONFIG_NETFILTER_XT_MATCH_REALM=m
373CONFIG_NETFILTER_XT_MATCH_SCTP=m 399CONFIG_NETFILTER_XT_MATCH_SCTP=m
374CONFIG_NETFILTER_XT_MATCH_STATE=m 400CONFIG_NETFILTER_XT_MATCH_STATE=m
@@ -386,13 +412,10 @@ CONFIG_NF_CONNTRACK_IPV4=m
386CONFIG_NF_CONNTRACK_PROC_COMPAT=y 412CONFIG_NF_CONNTRACK_PROC_COMPAT=y
387CONFIG_IP_NF_QUEUE=m 413CONFIG_IP_NF_QUEUE=m
388CONFIG_IP_NF_IPTABLES=m 414CONFIG_IP_NF_IPTABLES=m
389CONFIG_IP_NF_MATCH_IPRANGE=m
390CONFIG_IP_NF_MATCH_TOS=m
391CONFIG_IP_NF_MATCH_RECENT=m 415CONFIG_IP_NF_MATCH_RECENT=m
392CONFIG_IP_NF_MATCH_ECN=m 416CONFIG_IP_NF_MATCH_ECN=m
393CONFIG_IP_NF_MATCH_AH=m 417CONFIG_IP_NF_MATCH_AH=m
394CONFIG_IP_NF_MATCH_TTL=m 418CONFIG_IP_NF_MATCH_TTL=m
395CONFIG_IP_NF_MATCH_OWNER=m
396CONFIG_IP_NF_MATCH_ADDRTYPE=m 419CONFIG_IP_NF_MATCH_ADDRTYPE=m
397CONFIG_IP_NF_FILTER=m 420CONFIG_IP_NF_FILTER=m
398CONFIG_IP_NF_TARGET_REJECT=m 421CONFIG_IP_NF_TARGET_REJECT=m
@@ -403,7 +426,6 @@ CONFIG_NF_NAT_NEEDED=y
403CONFIG_IP_NF_TARGET_MASQUERADE=m 426CONFIG_IP_NF_TARGET_MASQUERADE=m
404CONFIG_IP_NF_TARGET_REDIRECT=m 427CONFIG_IP_NF_TARGET_REDIRECT=m
405CONFIG_IP_NF_TARGET_NETMAP=m 428CONFIG_IP_NF_TARGET_NETMAP=m
406CONFIG_IP_NF_TARGET_SAME=m
407CONFIG_NF_NAT_SNMP_BASIC=m 429CONFIG_NF_NAT_SNMP_BASIC=m
408CONFIG_NF_NAT_FTP=m 430CONFIG_NF_NAT_FTP=m
409CONFIG_NF_NAT_IRC=m 431CONFIG_NF_NAT_IRC=m
@@ -439,6 +461,7 @@ CONFIG_NET_CLS_ROUTE=y
439# CONFIG_NET_PKTGEN is not set 461# CONFIG_NET_PKTGEN is not set
440# CONFIG_NET_TCPPROBE is not set 462# CONFIG_NET_TCPPROBE is not set
441# CONFIG_HAMRADIO is not set 463# CONFIG_HAMRADIO is not set
464# CONFIG_CAN is not set
442# CONFIG_IRDA is not set 465# CONFIG_IRDA is not set
443# CONFIG_BT is not set 466# CONFIG_BT is not set
444# CONFIG_AF_RXRPC is not set 467# CONFIG_AF_RXRPC is not set
@@ -493,7 +516,7 @@ CONFIG_BLK_DEV_NBD=m
493CONFIG_BLK_DEV_RAM=y 516CONFIG_BLK_DEV_RAM=y
494CONFIG_BLK_DEV_RAM_COUNT=16 517CONFIG_BLK_DEV_RAM_COUNT=16
495CONFIG_BLK_DEV_RAM_SIZE=65536 518CONFIG_BLK_DEV_RAM_SIZE=65536
496CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 519# CONFIG_BLK_DEV_XIP is not set
497# CONFIG_CDROM_PKTCDVD is not set 520# CONFIG_CDROM_PKTCDVD is not set
498# CONFIG_ATA_OVER_ETH is not set 521# CONFIG_ATA_OVER_ETH is not set
499CONFIG_MISC_DEVICES=y 522CONFIG_MISC_DEVICES=y
@@ -501,16 +524,19 @@ CONFIG_MISC_DEVICES=y
501# CONFIG_EEPROM_93CX6 is not set 524# CONFIG_EEPROM_93CX6 is not set
502# CONFIG_SGI_IOC4 is not set 525# CONFIG_SGI_IOC4 is not set
503# CONFIG_TIFM_CORE is not set 526# CONFIG_TIFM_CORE is not set
527# CONFIG_ENCLOSURE_SERVICES is not set
528CONFIG_HAVE_IDE=y
504CONFIG_IDE=y 529CONFIG_IDE=y
505CONFIG_BLK_DEV_IDE=y 530CONFIG_BLK_DEV_IDE=y
506 531
507# 532#
508# Please see Documentation/ide.txt for help/info on IDE drives 533# Please see Documentation/ide/ide.txt for help/info on IDE drives
509# 534#
510# CONFIG_BLK_DEV_IDE_SATA is not set 535# CONFIG_BLK_DEV_IDE_SATA is not set
511CONFIG_BLK_DEV_IDEDISK=y 536CONFIG_BLK_DEV_IDEDISK=y
512# CONFIG_IDEDISK_MULTI_MODE is not set 537# CONFIG_IDEDISK_MULTI_MODE is not set
513CONFIG_BLK_DEV_IDECD=y 538CONFIG_BLK_DEV_IDECD=y
539CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
514# CONFIG_BLK_DEV_IDETAPE is not set 540# CONFIG_BLK_DEV_IDETAPE is not set
515# CONFIG_BLK_DEV_IDEFLOPPY is not set 541# CONFIG_BLK_DEV_IDEFLOPPY is not set
516# CONFIG_BLK_DEV_IDESCSI is not set 542# CONFIG_BLK_DEV_IDESCSI is not set
@@ -522,12 +548,12 @@ CONFIG_IDE_PROC_FS=y
522# 548#
523CONFIG_IDE_GENERIC=y 549CONFIG_IDE_GENERIC=y
524# CONFIG_BLK_DEV_PLATFORM is not set 550# CONFIG_BLK_DEV_PLATFORM is not set
551CONFIG_BLK_DEV_IDEDMA_SFF=y
525 552
526# 553#
527# PCI IDE chipsets support 554# PCI IDE chipsets support
528# 555#
529CONFIG_BLK_DEV_IDEPCI=y 556CONFIG_BLK_DEV_IDEPCI=y
530CONFIG_IDEPCI_SHARE_IRQ=y
531CONFIG_IDEPCI_PCIBUS_ORDER=y 557CONFIG_IDEPCI_PCIBUS_ORDER=y
532# CONFIG_BLK_DEV_OFFBOARD is not set 558# CONFIG_BLK_DEV_OFFBOARD is not set
533CONFIG_BLK_DEV_GENERIC=y 559CONFIG_BLK_DEV_GENERIC=y
@@ -558,7 +584,6 @@ CONFIG_BLK_DEV_AMD74XX=y
558# CONFIG_BLK_DEV_TRM290 is not set 584# CONFIG_BLK_DEV_TRM290 is not set
559# CONFIG_BLK_DEV_VIA82CXXX is not set 585# CONFIG_BLK_DEV_VIA82CXXX is not set
560# CONFIG_BLK_DEV_TC86C001 is not set 586# CONFIG_BLK_DEV_TC86C001 is not set
561# CONFIG_IDE_ARM is not set
562CONFIG_BLK_DEV_IDEDMA=y 587CONFIG_BLK_DEV_IDEDMA=y
563CONFIG_IDE_ARCH_OBSOLETE_INIT=y 588CONFIG_IDE_ARCH_OBSOLETE_INIT=y
564# CONFIG_BLK_DEV_HD is not set 589# CONFIG_BLK_DEV_HD is not set
@@ -627,6 +652,7 @@ CONFIG_SCSI_IBMVSCSI=y
627# CONFIG_SCSI_INIA100 is not set 652# CONFIG_SCSI_INIA100 is not set
628# CONFIG_SCSI_PPA is not set 653# CONFIG_SCSI_PPA is not set
629# CONFIG_SCSI_IMM is not set 654# CONFIG_SCSI_IMM is not set
655# CONFIG_SCSI_MVSAS is not set
630# CONFIG_SCSI_STEX is not set 656# CONFIG_SCSI_STEX is not set
631CONFIG_SCSI_SYM53C8XX_2=y 657CONFIG_SCSI_SYM53C8XX_2=y
632CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 658CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
@@ -685,6 +711,7 @@ CONFIG_ATA=y
685# CONFIG_PATA_MPIIX is not set 711# CONFIG_PATA_MPIIX is not set
686# CONFIG_PATA_OLDPIIX is not set 712# CONFIG_PATA_OLDPIIX is not set
687# CONFIG_PATA_NETCELL is not set 713# CONFIG_PATA_NETCELL is not set
714# CONFIG_PATA_NINJA32 is not set
688# CONFIG_PATA_NS87410 is not set 715# CONFIG_PATA_NS87410 is not set
689# CONFIG_PATA_NS87415 is not set 716# CONFIG_PATA_NS87415 is not set
690# CONFIG_PATA_OPTI is not set 717# CONFIG_PATA_OPTI is not set
@@ -699,6 +726,7 @@ CONFIG_ATA=y
699# CONFIG_PATA_SIS is not set 726# CONFIG_PATA_SIS is not set
700# CONFIG_PATA_VIA is not set 727# CONFIG_PATA_VIA is not set
701CONFIG_PATA_WINBOND=y 728CONFIG_PATA_WINBOND=y
729# CONFIG_PATA_PLATFORM is not set
702CONFIG_MD=y 730CONFIG_MD=y
703CONFIG_BLK_DEV_MD=y 731CONFIG_BLK_DEV_MD=y
704CONFIG_MD_LINEAR=y 732CONFIG_MD_LINEAR=y
@@ -737,7 +765,6 @@ CONFIG_BONDING=m
737# CONFIG_EQUALIZER is not set 765# CONFIG_EQUALIZER is not set
738CONFIG_TUN=m 766CONFIG_TUN=m
739# CONFIG_VETH is not set 767# CONFIG_VETH is not set
740# CONFIG_IP1000 is not set
741# CONFIG_ARCNET is not set 768# CONFIG_ARCNET is not set
742# CONFIG_PHYLIB is not set 769# CONFIG_PHYLIB is not set
743CONFIG_NET_ETHERNET=y 770CONFIG_NET_ETHERNET=y
@@ -769,6 +796,7 @@ CONFIG_E100=y
769# CONFIG_NE2K_PCI is not set 796# CONFIG_NE2K_PCI is not set
770# CONFIG_8139CP is not set 797# CONFIG_8139CP is not set
771# CONFIG_8139TOO is not set 798# CONFIG_8139TOO is not set
799# CONFIG_R6040 is not set
772# CONFIG_SIS900 is not set 800# CONFIG_SIS900 is not set
773# CONFIG_EPIC100 is not set 801# CONFIG_EPIC100 is not set
774# CONFIG_SUNDANCE is not set 802# CONFIG_SUNDANCE is not set
@@ -783,6 +811,9 @@ CONFIG_E1000=y
783# CONFIG_E1000_NAPI is not set 811# CONFIG_E1000_NAPI is not set
784# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 812# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
785# CONFIG_E1000E is not set 813# CONFIG_E1000E is not set
814# CONFIG_E1000E_ENABLED is not set
815# CONFIG_IP1000 is not set
816# CONFIG_IGB is not set
786# CONFIG_NS83820 is not set 817# CONFIG_NS83820 is not set
787# CONFIG_HAMACHI is not set 818# CONFIG_HAMACHI is not set
788# CONFIG_YELLOWFIN is not set 819# CONFIG_YELLOWFIN is not set
@@ -811,6 +842,7 @@ CONFIG_S2IO=m
811# CONFIG_PASEMI_MAC is not set 842# CONFIG_PASEMI_MAC is not set
812# CONFIG_MLX4_CORE is not set 843# CONFIG_MLX4_CORE is not set
813# CONFIG_TEHUTI is not set 844# CONFIG_TEHUTI is not set
845# CONFIG_BNX2X is not set
814CONFIG_TR=y 846CONFIG_TR=y
815CONFIG_IBMOL=y 847CONFIG_IBMOL=y
816# CONFIG_3C359 is not set 848# CONFIG_3C359 is not set
@@ -847,7 +879,6 @@ CONFIG_PPPOE=m
847# CONFIG_SLIP is not set 879# CONFIG_SLIP is not set
848CONFIG_SLHC=m 880CONFIG_SLHC=m
849# CONFIG_NET_FC is not set 881# CONFIG_NET_FC is not set
850# CONFIG_SHAPER is not set
851CONFIG_NETCONSOLE=y 882CONFIG_NETCONSOLE=y
852# CONFIG_NETCONSOLE_DYNAMIC is not set 883# CONFIG_NETCONSOLE_DYNAMIC is not set
853CONFIG_NETPOLL=y 884CONFIG_NETPOLL=y
@@ -927,6 +958,7 @@ CONFIG_VT_CONSOLE=y
927CONFIG_HW_CONSOLE=y 958CONFIG_HW_CONSOLE=y
928# CONFIG_VT_HW_CONSOLE_BINDING is not set 959# CONFIG_VT_HW_CONSOLE_BINDING is not set
929# CONFIG_SERIAL_NONSTANDARD is not set 960# CONFIG_SERIAL_NONSTANDARD is not set
961# CONFIG_NOZOMI is not set
930 962
931# 963#
932# Serial drivers 964# Serial drivers
@@ -951,7 +983,6 @@ CONFIG_LEGACY_PTYS=y
951CONFIG_LEGACY_PTY_COUNT=256 983CONFIG_LEGACY_PTY_COUNT=256
952# CONFIG_PRINTER is not set 984# CONFIG_PRINTER is not set
953# CONFIG_PPDEV is not set 985# CONFIG_PPDEV is not set
954# CONFIG_TIPAR is not set
955CONFIG_HVC_DRIVER=y 986CONFIG_HVC_DRIVER=y
956CONFIG_HVC_CONSOLE=y 987CONFIG_HVC_CONSOLE=y
957CONFIG_HVC_RTAS=y 988CONFIG_HVC_RTAS=y
@@ -1009,13 +1040,12 @@ CONFIG_I2C_ALGOBIT=y
1009# 1040#
1010# Miscellaneous I2C Chip support 1041# Miscellaneous I2C Chip support
1011# 1042#
1012# CONFIG_SENSORS_DS1337 is not set
1013# CONFIG_SENSORS_DS1374 is not set
1014# CONFIG_DS1682 is not set 1043# CONFIG_DS1682 is not set
1015# CONFIG_SENSORS_EEPROM is not set 1044# CONFIG_SENSORS_EEPROM is not set
1016# CONFIG_SENSORS_PCF8574 is not set 1045# CONFIG_SENSORS_PCF8574 is not set
1017# CONFIG_SENSORS_PCA9539 is not set 1046# CONFIG_PCF8575 is not set
1018# CONFIG_SENSORS_PCF8591 is not set 1047# CONFIG_SENSORS_PCF8591 is not set
1048# CONFIG_TPS65010 is not set
1019# CONFIG_SENSORS_MAX6875 is not set 1049# CONFIG_SENSORS_MAX6875 is not set
1020# CONFIG_SENSORS_TSL2550 is not set 1050# CONFIG_SENSORS_TSL2550 is not set
1021# CONFIG_I2C_DEBUG_CORE is not set 1051# CONFIG_I2C_DEBUG_CORE is not set
@@ -1031,6 +1061,7 @@ CONFIG_I2C_ALGOBIT=y
1031# CONFIG_W1 is not set 1061# CONFIG_W1 is not set
1032# CONFIG_POWER_SUPPLY is not set 1062# CONFIG_POWER_SUPPLY is not set
1033# CONFIG_HWMON is not set 1063# CONFIG_HWMON is not set
1064# CONFIG_THERMAL is not set
1034# CONFIG_WATCHDOG is not set 1065# CONFIG_WATCHDOG is not set
1035 1066
1036# 1067#
@@ -1166,6 +1197,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
1166CONFIG_USB_ARCH_HAS_EHCI=y 1197CONFIG_USB_ARCH_HAS_EHCI=y
1167CONFIG_USB=y 1198CONFIG_USB=y
1168# CONFIG_USB_DEBUG is not set 1199# CONFIG_USB_DEBUG is not set
1200# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1169 1201
1170# 1202#
1171# Miscellaneous USB options 1203# Miscellaneous USB options
@@ -1179,9 +1211,9 @@ CONFIG_USB_DEVICE_CLASS=y
1179# USB Host Controller Drivers 1211# USB Host Controller Drivers
1180# 1212#
1181CONFIG_USB_EHCI_HCD=y 1213CONFIG_USB_EHCI_HCD=y
1182# CONFIG_USB_EHCI_SPLIT_ISO is not set
1183# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1214# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1184# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1215# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1216# CONFIG_USB_EHCI_HCD_PPC_OF is not set
1185# CONFIG_USB_ISP116X_HCD is not set 1217# CONFIG_USB_ISP116X_HCD is not set
1186CONFIG_USB_OHCI_HCD=y 1218CONFIG_USB_OHCI_HCD=y
1187# CONFIG_USB_OHCI_HCD_PPC_OF is not set 1219# CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -1230,10 +1262,6 @@ CONFIG_USB_MON=y
1230# USB port drivers 1262# USB port drivers
1231# 1263#
1232# CONFIG_USB_USS720 is not set 1264# CONFIG_USB_USS720 is not set
1233
1234#
1235# USB Serial Converter support
1236#
1237# CONFIG_USB_SERIAL is not set 1265# CONFIG_USB_SERIAL is not set
1238 1266
1239# 1267#
@@ -1259,16 +1287,9 @@ CONFIG_USB_MON=y
1259# CONFIG_USB_TRANCEVIBRATOR is not set 1287# CONFIG_USB_TRANCEVIBRATOR is not set
1260# CONFIG_USB_IOWARRIOR is not set 1288# CONFIG_USB_IOWARRIOR is not set
1261# CONFIG_USB_TEST is not set 1289# CONFIG_USB_TEST is not set
1262
1263#
1264# USB DSL modem support
1265#
1266
1267#
1268# USB Gadget Support
1269#
1270# CONFIG_USB_GADGET is not set 1290# CONFIG_USB_GADGET is not set
1271# CONFIG_MMC is not set 1291# CONFIG_MMC is not set
1292# CONFIG_MEMSTICK is not set
1272# CONFIG_NEW_LEDS is not set 1293# CONFIG_NEW_LEDS is not set
1273CONFIG_INFINIBAND=m 1294CONFIG_INFINIBAND=m
1274CONFIG_INFINIBAND_USER_MAD=m 1295CONFIG_INFINIBAND_USER_MAD=m
@@ -1281,6 +1302,7 @@ CONFIG_INFINIBAND_MTHCA_DEBUG=y
1281CONFIG_INFINIBAND_EHCA=m 1302CONFIG_INFINIBAND_EHCA=m
1282# CONFIG_INFINIBAND_AMSO1100 is not set 1303# CONFIG_INFINIBAND_AMSO1100 is not set
1283# CONFIG_MLX4_INFINIBAND is not set 1304# CONFIG_MLX4_INFINIBAND is not set
1305# CONFIG_INFINIBAND_NES is not set
1284CONFIG_INFINIBAND_IPOIB=m 1306CONFIG_INFINIBAND_IPOIB=m
1285# CONFIG_INFINIBAND_IPOIB_CM is not set 1307# CONFIG_INFINIBAND_IPOIB_CM is not set
1286CONFIG_INFINIBAND_IPOIB_DEBUG=y 1308CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -1289,6 +1311,7 @@ CONFIG_INFINIBAND_SRP=m
1289# CONFIG_INFINIBAND_ISER is not set 1311# CONFIG_INFINIBAND_ISER is not set
1290# CONFIG_EDAC is not set 1312# CONFIG_EDAC is not set
1291# CONFIG_RTC_CLASS is not set 1313# CONFIG_RTC_CLASS is not set
1314# CONFIG_DMADEVICES is not set
1292# CONFIG_AUXDISPLAY is not set 1315# CONFIG_AUXDISPLAY is not set
1293 1316
1294# 1317#
@@ -1334,12 +1357,10 @@ CONFIG_XFS_POSIX_ACL=y
1334CONFIG_OCFS2_FS=m 1357CONFIG_OCFS2_FS=m
1335CONFIG_OCFS2_DEBUG_MASKLOG=y 1358CONFIG_OCFS2_DEBUG_MASKLOG=y
1336# CONFIG_OCFS2_DEBUG_FS is not set 1359# CONFIG_OCFS2_DEBUG_FS is not set
1337# CONFIG_MINIX_FS is not set 1360CONFIG_DNOTIFY=y
1338# CONFIG_ROMFS_FS is not set
1339CONFIG_INOTIFY=y 1361CONFIG_INOTIFY=y
1340CONFIG_INOTIFY_USER=y 1362CONFIG_INOTIFY_USER=y
1341# CONFIG_QUOTA is not set 1363# CONFIG_QUOTA is not set
1342CONFIG_DNOTIFY=y
1343# CONFIG_AUTOFS_FS is not set 1364# CONFIG_AUTOFS_FS is not set
1344CONFIG_AUTOFS4_FS=m 1365CONFIG_AUTOFS4_FS=m
1345CONFIG_FUSE_FS=m 1366CONFIG_FUSE_FS=m
@@ -1388,8 +1409,10 @@ CONFIG_CONFIGFS_FS=m
1388# CONFIG_EFS_FS is not set 1409# CONFIG_EFS_FS is not set
1389CONFIG_CRAMFS=y 1410CONFIG_CRAMFS=y
1390# CONFIG_VXFS_FS is not set 1411# CONFIG_VXFS_FS is not set
1412# CONFIG_MINIX_FS is not set
1391# CONFIG_HPFS_FS is not set 1413# CONFIG_HPFS_FS is not set
1392# CONFIG_QNX4FS_FS is not set 1414# CONFIG_QNX4FS_FS is not set
1415# CONFIG_ROMFS_FS is not set
1393# CONFIG_SYSV_FS is not set 1416# CONFIG_SYSV_FS is not set
1394# CONFIG_UFS_FS is not set 1417# CONFIG_UFS_FS is not set
1395CONFIG_NETWORK_FILESYSTEMS=y 1418CONFIG_NETWORK_FILESYSTEMS=y
@@ -1473,7 +1496,6 @@ CONFIG_NLS_ISO8859_1=y
1473# CONFIG_NLS_KOI8_U is not set 1496# CONFIG_NLS_KOI8_U is not set
1474# CONFIG_NLS_UTF8 is not set 1497# CONFIG_NLS_UTF8 is not set
1475# CONFIG_DLM is not set 1498# CONFIG_DLM is not set
1476# CONFIG_UCC_SLOW is not set
1477 1499
1478# 1500#
1479# Library routines 1501# Library routines
@@ -1487,6 +1509,8 @@ CONFIG_CRC32=y
1487CONFIG_LIBCRC32C=m 1509CONFIG_LIBCRC32C=m
1488CONFIG_ZLIB_INFLATE=y 1510CONFIG_ZLIB_INFLATE=y
1489CONFIG_ZLIB_DEFLATE=m 1511CONFIG_ZLIB_DEFLATE=m
1512CONFIG_LZO_COMPRESS=m
1513CONFIG_LZO_DECOMPRESS=m
1490CONFIG_TEXTSEARCH=y 1514CONFIG_TEXTSEARCH=y
1491CONFIG_TEXTSEARCH_KMP=m 1515CONFIG_TEXTSEARCH_KMP=m
1492CONFIG_TEXTSEARCH_BM=m 1516CONFIG_TEXTSEARCH_BM=m
@@ -1495,11 +1519,6 @@ CONFIG_PLIST=y
1495CONFIG_HAS_IOMEM=y 1519CONFIG_HAS_IOMEM=y
1496CONFIG_HAS_IOPORT=y 1520CONFIG_HAS_IOPORT=y
1497CONFIG_HAS_DMA=y 1521CONFIG_HAS_DMA=y
1498CONFIG_INSTRUMENTATION=y
1499CONFIG_PROFILING=y
1500CONFIG_OPROFILE=y
1501CONFIG_KPROBES=y
1502CONFIG_MARKERS=y
1503 1522
1504# 1523#
1505# Kernel hacking 1524# Kernel hacking
@@ -1518,6 +1537,7 @@ CONFIG_SCHED_DEBUG=y
1518# CONFIG_SCHEDSTATS is not set 1537# CONFIG_SCHEDSTATS is not set
1519# CONFIG_TIMER_STATS is not set 1538# CONFIG_TIMER_STATS is not set
1520# CONFIG_SLUB_DEBUG_ON is not set 1539# CONFIG_SLUB_DEBUG_ON is not set
1540# CONFIG_SLUB_STATS is not set
1521# CONFIG_DEBUG_RT_MUTEXES is not set 1541# CONFIG_DEBUG_RT_MUTEXES is not set
1522# CONFIG_RT_MUTEX_TESTER is not set 1542# CONFIG_RT_MUTEX_TESTER is not set
1523# CONFIG_DEBUG_SPINLOCK is not set 1543# CONFIG_DEBUG_SPINLOCK is not set
@@ -1530,9 +1550,10 @@ CONFIG_DEBUG_BUGVERBOSE=y
1530# CONFIG_DEBUG_VM is not set 1550# CONFIG_DEBUG_VM is not set
1531# CONFIG_DEBUG_LIST is not set 1551# CONFIG_DEBUG_LIST is not set
1532# CONFIG_DEBUG_SG is not set 1552# CONFIG_DEBUG_SG is not set
1533CONFIG_FORCED_INLINING=y
1534# CONFIG_BOOT_PRINTK_DELAY is not set 1553# CONFIG_BOOT_PRINTK_DELAY is not set
1535# CONFIG_RCU_TORTURE_TEST is not set 1554# CONFIG_RCU_TORTURE_TEST is not set
1555# CONFIG_KPROBES_SANITY_TEST is not set
1556# CONFIG_BACKTRACE_SELF_TEST is not set
1536# CONFIG_LKDTM is not set 1557# CONFIG_LKDTM is not set
1537# CONFIG_FAULT_INJECTION is not set 1558# CONFIG_FAULT_INJECTION is not set
1538# CONFIG_SAMPLES is not set 1559# CONFIG_SAMPLES is not set
@@ -1557,7 +1578,9 @@ CONFIG_VIRQ_DEBUG=y
1557# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1578# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1558CONFIG_CRYPTO=y 1579CONFIG_CRYPTO=y
1559CONFIG_CRYPTO_ALGAPI=y 1580CONFIG_CRYPTO_ALGAPI=y
1581CONFIG_CRYPTO_AEAD=m
1560CONFIG_CRYPTO_BLKCIPHER=y 1582CONFIG_CRYPTO_BLKCIPHER=y
1583CONFIG_CRYPTO_SEQIV=m
1561CONFIG_CRYPTO_HASH=y 1584CONFIG_CRYPTO_HASH=y
1562CONFIG_CRYPTO_MANAGER=y 1585CONFIG_CRYPTO_MANAGER=y
1563CONFIG_CRYPTO_HMAC=y 1586CONFIG_CRYPTO_HMAC=y
@@ -1570,12 +1593,15 @@ CONFIG_CRYPTO_SHA256=m
1570CONFIG_CRYPTO_SHA512=m 1593CONFIG_CRYPTO_SHA512=m
1571CONFIG_CRYPTO_WP512=m 1594CONFIG_CRYPTO_WP512=m
1572CONFIG_CRYPTO_TGR192=m 1595CONFIG_CRYPTO_TGR192=m
1573# CONFIG_CRYPTO_GF128MUL is not set 1596CONFIG_CRYPTO_GF128MUL=m
1574CONFIG_CRYPTO_ECB=m 1597CONFIG_CRYPTO_ECB=m
1575CONFIG_CRYPTO_CBC=y 1598CONFIG_CRYPTO_CBC=y
1576CONFIG_CRYPTO_PCBC=m 1599CONFIG_CRYPTO_PCBC=m
1577# CONFIG_CRYPTO_LRW is not set 1600# CONFIG_CRYPTO_LRW is not set
1578# CONFIG_CRYPTO_XTS is not set 1601# CONFIG_CRYPTO_XTS is not set
1602CONFIG_CRYPTO_CTR=m
1603CONFIG_CRYPTO_GCM=m
1604CONFIG_CRYPTO_CCM=m
1579# CONFIG_CRYPTO_CRYPTD is not set 1605# CONFIG_CRYPTO_CRYPTD is not set
1580CONFIG_CRYPTO_DES=y 1606CONFIG_CRYPTO_DES=y
1581# CONFIG_CRYPTO_FCRYPT is not set 1607# CONFIG_CRYPTO_FCRYPT is not set
@@ -1591,11 +1617,13 @@ CONFIG_CRYPTO_ARC4=m
1591CONFIG_CRYPTO_KHAZAD=m 1617CONFIG_CRYPTO_KHAZAD=m
1592CONFIG_CRYPTO_ANUBIS=m 1618CONFIG_CRYPTO_ANUBIS=m
1593# CONFIG_CRYPTO_SEED is not set 1619# CONFIG_CRYPTO_SEED is not set
1620CONFIG_CRYPTO_SALSA20=m
1594CONFIG_CRYPTO_DEFLATE=m 1621CONFIG_CRYPTO_DEFLATE=m
1595CONFIG_CRYPTO_MICHAEL_MIC=m 1622CONFIG_CRYPTO_MICHAEL_MIC=m
1596CONFIG_CRYPTO_CRC32C=m 1623CONFIG_CRYPTO_CRC32C=m
1597# CONFIG_CRYPTO_CAMELLIA is not set 1624# CONFIG_CRYPTO_CAMELLIA is not set
1598CONFIG_CRYPTO_TEST=m 1625CONFIG_CRYPTO_TEST=m
1599# CONFIG_CRYPTO_AUTHENC is not set 1626CONFIG_CRYPTO_AUTHENC=m
1627CONFIG_CRYPTO_LZO=m
1600# CONFIG_CRYPTO_HW is not set 1628# CONFIG_CRYPTO_HW is not set
1601# CONFIG_PPC_CLOCK is not set 1629# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/sbc834x_defconfig b/arch/powerpc/configs/sbc834x_defconfig
index 9245bcc24724..1f1518229f6d 100644
--- a/arch/powerpc/configs/sbc834x_defconfig
+++ b/arch/powerpc/configs/sbc834x_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-rc8 3# Linux kernel version: 2.6.25-rc6
4# Thu Jan 24 15:54:27 2008 4# Mon Mar 24 08:48:38 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,8 +14,8 @@ CONFIG_6xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_83xx=y
18CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
18# CONFIG_FSL_EMB_PERFMON is not set
19CONFIG_PPC_STD_MMU=y 19CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y 20CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -66,17 +67,19 @@ CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set 73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y
75CONFIG_FAIR_GROUP_SCHED=y 75CONFIG_FAIR_GROUP_SCHED=y
76CONFIG_FAIR_USER_SCHED=y 76# CONFIG_RT_GROUP_SCHED is not set
77# CONFIG_FAIR_CGROUP_SCHED is not set 77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
78CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
79# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
80CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
81CONFIG_INITRAMFS_SOURCE="" 84CONFIG_INITRAMFS_SOURCE=""
82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -88,17 +91,25 @@ CONFIG_HOTPLUG=y
88CONFIG_PRINTK=y 91CONFIG_PRINTK=y
89CONFIG_BUG=y 92CONFIG_BUG=y
90CONFIG_ELF_CORE=y 93CONFIG_ELF_CORE=y
94CONFIG_COMPAT_BRK=y
91CONFIG_BASE_FULL=y 95CONFIG_BASE_FULL=y
92CONFIG_FUTEX=y 96CONFIG_FUTEX=y
93CONFIG_ANON_INODES=y 97CONFIG_ANON_INODES=y
94# CONFIG_EPOLL is not set 98# CONFIG_EPOLL is not set
95CONFIG_SIGNALFD=y 99CONFIG_SIGNALFD=y
100CONFIG_TIMERFD=y
96CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
97CONFIG_SHMEM=y 102CONFIG_SHMEM=y
98CONFIG_VM_EVENT_COUNTERS=y 103CONFIG_VM_EVENT_COUNTERS=y
99CONFIG_SLAB=y 104CONFIG_SLAB=y
100# CONFIG_SLUB is not set 105# CONFIG_SLUB is not set
101# 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
110CONFIG_HAVE_KPROBES=y
111CONFIG_HAVE_KRETPROBES=y
112CONFIG_PROC_PAGE_MONITOR=y
102CONFIG_SLABINFO=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
@@ -127,6 +138,7 @@ 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
130 142
131# 143#
132# Platform support 144# Platform support
@@ -135,20 +147,22 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
135# CONFIG_PPC_82xx is not set 147# CONFIG_PPC_82xx is not set
136CONFIG_PPC_83xx=y 148CONFIG_PPC_83xx=y
137# CONFIG_PPC_86xx is not set 149# CONFIG_PPC_86xx is not set
138# CONFIG_PPC_MPC52xx is not set 150# CONFIG_PPC_MPC512x is not set
139# CONFIG_PPC_MPC5200 is not set 151# CONFIG_PPC_MPC5121 is not set
140# CONFIG_PPC_CELL is not set 152# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set 153# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set 154# CONFIG_PQ2ADS is not set
143# CONFIG_MPC8313_RDB is not set 155CONFIG_MPC83xx=y
156# CONFIG_MPC831x_RDB is not set
144# CONFIG_MPC832x_MDS is not set 157# CONFIG_MPC832x_MDS is not set
145# CONFIG_MPC832x_RDB is not set 158# CONFIG_MPC832x_RDB is not set
146# CONFIG_MPC834x_MDS is not set 159# CONFIG_MPC834x_MDS is not set
147# CONFIG_MPC834x_ITX is not set 160# CONFIG_MPC834x_ITX is not set
148# CONFIG_MPC836x_MDS is not set 161# CONFIG_MPC836x_MDS is not set
149# CONFIG_MPC837x_MDS is not set 162# CONFIG_MPC837x_MDS is not set
163# CONFIG_MPC837x_RDB is not set
150CONFIG_SBC834x=y 164CONFIG_SBC834x=y
151CONFIG_MPC834x=y 165CONFIG_PPC_MPC834x=y
152CONFIG_IPIC=y 166CONFIG_IPIC=y
153# CONFIG_MPIC is not set 167# CONFIG_MPIC is not set
154# CONFIG_MPIC_WEIRD is not set 168# CONFIG_MPIC_WEIRD is not set
@@ -175,12 +189,16 @@ 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
181CONFIG_BINFMT_ELF=y 196CONFIG_BINFMT_ELF=y
182# CONFIG_BINFMT_MISC is not set 197# CONFIG_BINFMT_MISC 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
@@ -199,11 +217,7 @@ CONFIG_VIRT_TO_BUS=y
199CONFIG_PROC_DEVICETREE=y 217CONFIG_PROC_DEVICETREE=y
200# CONFIG_CMDLINE_BOOL is not set 218# CONFIG_CMDLINE_BOOL is not set
201# CONFIG_PM is not set 219# CONFIG_PM is not set
202CONFIG_SUSPEND_UP_POSSIBLE=y
203CONFIG_HIBERNATION_UP_POSSIBLE=y
204CONFIG_SECCOMP=y 220CONFIG_SECCOMP=y
205CONFIG_WANT_DEVICE_TREE=y
206CONFIG_DEVICE_TREE=""
207CONFIG_ISA_DMA_API=y 221CONFIG_ISA_DMA_API=y
208 222
209# 223#
@@ -248,6 +262,7 @@ CONFIG_XFRM=y
248CONFIG_XFRM_USER=m 262CONFIG_XFRM_USER=m
249# CONFIG_XFRM_SUB_POLICY is not set 263# CONFIG_XFRM_SUB_POLICY is not set
250# CONFIG_XFRM_MIGRATE is not set 264# CONFIG_XFRM_MIGRATE is not set
265# CONFIG_XFRM_STATISTICS is not set
251# CONFIG_NET_KEY is not set 266# CONFIG_NET_KEY is not set
252CONFIG_INET=y 267CONFIG_INET=y
253CONFIG_IP_MULTICAST=y 268CONFIG_IP_MULTICAST=y
@@ -303,6 +318,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
303# 318#
304# CONFIG_NET_PKTGEN is not set 319# CONFIG_NET_PKTGEN is not set
305# CONFIG_HAMRADIO is not set 320# CONFIG_HAMRADIO is not set
321# CONFIG_CAN is not set
306# CONFIG_IRDA is not set 322# CONFIG_IRDA is not set
307# CONFIG_BT is not set 323# CONFIG_BT is not set
308# CONFIG_AF_RXRPC is not set 324# CONFIG_AF_RXRPC is not set
@@ -342,11 +358,13 @@ CONFIG_BLK_DEV_LOOP=y
342CONFIG_BLK_DEV_RAM=y 358CONFIG_BLK_DEV_RAM=y
343CONFIG_BLK_DEV_RAM_COUNT=16 359CONFIG_BLK_DEV_RAM_COUNT=16
344CONFIG_BLK_DEV_RAM_SIZE=32768 360CONFIG_BLK_DEV_RAM_SIZE=32768
345CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 361# CONFIG_BLK_DEV_XIP is not set
346# CONFIG_CDROM_PKTCDVD is not set 362# CONFIG_CDROM_PKTCDVD is not set
347# CONFIG_ATA_OVER_ETH is not set 363# CONFIG_ATA_OVER_ETH is not set
348CONFIG_MISC_DEVICES=y 364CONFIG_MISC_DEVICES=y
349# CONFIG_EEPROM_93CX6 is not set 365# CONFIG_EEPROM_93CX6 is not set
366# CONFIG_ENCLOSURE_SERVICES is not set
367CONFIG_HAVE_IDE=y
350# CONFIG_IDE is not set 368# CONFIG_IDE is not set
351 369
352# 370#
@@ -381,6 +399,7 @@ CONFIG_PHYLIB=y
381# CONFIG_SMSC_PHY is not set 399# CONFIG_SMSC_PHY is not set
382CONFIG_BROADCOM_PHY=y 400CONFIG_BROADCOM_PHY=y
383# CONFIG_ICPLUS_PHY is not set 401# CONFIG_ICPLUS_PHY is not set
402# CONFIG_REALTEK_PHY is not set
384# CONFIG_FIXED_PHY is not set 403# CONFIG_FIXED_PHY is not set
385# CONFIG_MDIO_BITBANG is not set 404# CONFIG_MDIO_BITBANG is not set
386CONFIG_NET_ETHERNET=y 405CONFIG_NET_ETHERNET=y
@@ -391,6 +410,7 @@ CONFIG_MII=y
391# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 410# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
392# CONFIG_B44 is not set 411# CONFIG_B44 is not set
393CONFIG_NETDEV_1000=y 412CONFIG_NETDEV_1000=y
413# CONFIG_E1000E_ENABLED is not set
394CONFIG_GIANFAR=y 414CONFIG_GIANFAR=y
395# CONFIG_GFAR_NAPI is not set 415# CONFIG_GFAR_NAPI is not set
396# CONFIG_NETDEV_10000 is not set 416# CONFIG_NETDEV_10000 is not set
@@ -403,7 +423,6 @@ CONFIG_GIANFAR=y
403# CONFIG_WAN is not set 423# CONFIG_WAN is not set
404# CONFIG_PPP is not set 424# CONFIG_PPP is not set
405# CONFIG_SLIP is not set 425# CONFIG_SLIP is not set
406# CONFIG_SHAPER is not set
407# CONFIG_NETCONSOLE is not set 426# CONFIG_NETCONSOLE is not set
408# CONFIG_NETPOLL is not set 427# CONFIG_NETPOLL is not set
409# CONFIG_NET_POLL_CONTROLLER is not set 428# CONFIG_NET_POLL_CONTROLLER is not set
@@ -498,14 +517,12 @@ CONFIG_I2C_MPC=y
498# 517#
499# Miscellaneous I2C Chip support 518# Miscellaneous I2C Chip support
500# 519#
501# CONFIG_SENSORS_DS1337 is not set
502# CONFIG_SENSORS_DS1374 is not set
503# CONFIG_DS1682 is not set 520# CONFIG_DS1682 is not set
504# CONFIG_SENSORS_EEPROM is not set 521# CONFIG_SENSORS_EEPROM is not set
505# CONFIG_SENSORS_PCF8574 is not set 522# CONFIG_SENSORS_PCF8574 is not set
506# CONFIG_SENSORS_PCA9539 is not set 523# CONFIG_PCF8575 is not set
507# CONFIG_SENSORS_PCF8591 is not set 524# CONFIG_SENSORS_PCF8591 is not set
508# CONFIG_SENSORS_M41T00 is not set 525# CONFIG_TPS65010 is not set
509# CONFIG_SENSORS_MAX6875 is not set 526# CONFIG_SENSORS_MAX6875 is not set
510# CONFIG_SENSORS_TSL2550 is not set 527# CONFIG_SENSORS_TSL2550 is not set
511# CONFIG_I2C_DEBUG_CORE is not set 528# CONFIG_I2C_DEBUG_CORE is not set
@@ -530,6 +547,7 @@ CONFIG_HWMON=y
530# CONFIG_SENSORS_ADM1031 is not set 547# CONFIG_SENSORS_ADM1031 is not set
531# CONFIG_SENSORS_ADM9240 is not set 548# CONFIG_SENSORS_ADM9240 is not set
532# CONFIG_SENSORS_ADT7470 is not set 549# CONFIG_SENSORS_ADT7470 is not set
550# CONFIG_SENSORS_ADT7473 is not set
533# CONFIG_SENSORS_ATXP1 is not set 551# CONFIG_SENSORS_ATXP1 is not set
534# CONFIG_SENSORS_DS1621 is not set 552# CONFIG_SENSORS_DS1621 is not set
535# CONFIG_SENSORS_F71805F is not set 553# CONFIG_SENSORS_F71805F is not set
@@ -557,6 +575,7 @@ CONFIG_HWMON=y
557# CONFIG_SENSORS_SMSC47M1 is not set 575# CONFIG_SENSORS_SMSC47M1 is not set
558# CONFIG_SENSORS_SMSC47M192 is not set 576# CONFIG_SENSORS_SMSC47M192 is not set
559# CONFIG_SENSORS_SMSC47B397 is not set 577# CONFIG_SENSORS_SMSC47B397 is not set
578# CONFIG_SENSORS_ADS7828 is not set
560# CONFIG_SENSORS_THMC50 is not set 579# CONFIG_SENSORS_THMC50 is not set
561# CONFIG_SENSORS_VT1211 is not set 580# CONFIG_SENSORS_VT1211 is not set
562# CONFIG_SENSORS_W83781D is not set 581# CONFIG_SENSORS_W83781D is not set
@@ -564,9 +583,11 @@ CONFIG_HWMON=y
564# CONFIG_SENSORS_W83792D is not set 583# CONFIG_SENSORS_W83792D is not set
565# CONFIG_SENSORS_W83793 is not set 584# CONFIG_SENSORS_W83793 is not set
566# CONFIG_SENSORS_W83L785TS is not set 585# CONFIG_SENSORS_W83L785TS is not set
586# CONFIG_SENSORS_W83L786NG is not set
567# CONFIG_SENSORS_W83627HF is not set 587# CONFIG_SENSORS_W83627HF is not set
568# CONFIG_SENSORS_W83627EHF is not set 588# CONFIG_SENSORS_W83627EHF is not set
569# CONFIG_HWMON_DEBUG_CHIP is not set 589# CONFIG_HWMON_DEBUG_CHIP is not set
590# CONFIG_THERMAL is not set
570CONFIG_WATCHDOG=y 591CONFIG_WATCHDOG=y
571# CONFIG_WATCHDOG_NOWAYOUT is not set 592# CONFIG_WATCHDOG_NOWAYOUT is not set
572 593
@@ -617,9 +638,11 @@ CONFIG_HID=y
617# CONFIG_HIDRAW is not set 638# CONFIG_HIDRAW is not set
618# CONFIG_USB_SUPPORT is not set 639# CONFIG_USB_SUPPORT is not set
619# CONFIG_MMC is not set 640# CONFIG_MMC is not set
641# CONFIG_MEMSTICK is not set
620# CONFIG_NEW_LEDS is not set 642# CONFIG_NEW_LEDS is not set
621# CONFIG_EDAC is not set 643# CONFIG_EDAC is not set
622# CONFIG_RTC_CLASS is not set 644# CONFIG_RTC_CLASS is not set
645# CONFIG_DMADEVICES is not set
623 646
624# 647#
625# Userspace I/O 648# Userspace I/O
@@ -638,12 +661,10 @@ CONFIG_HID=y
638# CONFIG_XFS_FS is not set 661# CONFIG_XFS_FS is not set
639# CONFIG_GFS2_FS is not set 662# CONFIG_GFS2_FS is not set
640# CONFIG_OCFS2_FS is not set 663# CONFIG_OCFS2_FS is not set
641# CONFIG_MINIX_FS is not set 664CONFIG_DNOTIFY=y
642# CONFIG_ROMFS_FS is not set
643CONFIG_INOTIFY=y 665CONFIG_INOTIFY=y
644CONFIG_INOTIFY_USER=y 666CONFIG_INOTIFY_USER=y
645# CONFIG_QUOTA is not set 667# CONFIG_QUOTA is not set
646CONFIG_DNOTIFY=y
647# CONFIG_AUTOFS_FS is not set 668# CONFIG_AUTOFS_FS is not set
648# CONFIG_AUTOFS4_FS is not set 669# CONFIG_AUTOFS4_FS is not set
649# CONFIG_FUSE_FS is not set 670# CONFIG_FUSE_FS is not set
@@ -685,8 +706,10 @@ CONFIG_TMPFS=y
685# CONFIG_EFS_FS is not set 706# CONFIG_EFS_FS is not set
686# CONFIG_CRAMFS is not set 707# CONFIG_CRAMFS is not set
687# CONFIG_VXFS_FS is not set 708# CONFIG_VXFS_FS is not set
709# CONFIG_MINIX_FS is not set
688# CONFIG_HPFS_FS is not set 710# CONFIG_HPFS_FS is not set
689# CONFIG_QNX4FS_FS is not set 711# CONFIG_QNX4FS_FS is not set
712# CONFIG_ROMFS_FS is not set
690# CONFIG_SYSV_FS is not set 713# CONFIG_SYSV_FS is not set
691# CONFIG_UFS_FS is not set 714# CONFIG_UFS_FS is not set
692CONFIG_NETWORK_FILESYSTEMS=y 715CONFIG_NETWORK_FILESYSTEMS=y
@@ -733,7 +756,6 @@ CONFIG_PLIST=y
733CONFIG_HAS_IOMEM=y 756CONFIG_HAS_IOMEM=y
734CONFIG_HAS_IOPORT=y 757CONFIG_HAS_IOPORT=y
735CONFIG_HAS_DMA=y 758CONFIG_HAS_DMA=y
736# CONFIG_INSTRUMENTATION is not set
737 759
738# 760#
739# Kernel hacking 761# Kernel hacking
@@ -759,6 +781,7 @@ CONFIG_ENABLE_MUST_CHECK=y
759CONFIG_CRYPTO=y 781CONFIG_CRYPTO=y
760CONFIG_CRYPTO_ALGAPI=y 782CONFIG_CRYPTO_ALGAPI=y
761CONFIG_CRYPTO_BLKCIPHER=y 783CONFIG_CRYPTO_BLKCIPHER=y
784# CONFIG_CRYPTO_SEQIV is not set
762CONFIG_CRYPTO_MANAGER=y 785CONFIG_CRYPTO_MANAGER=y
763# CONFIG_CRYPTO_HMAC is not set 786# CONFIG_CRYPTO_HMAC is not set
764# CONFIG_CRYPTO_XCBC is not set 787# CONFIG_CRYPTO_XCBC is not set
@@ -776,6 +799,9 @@ CONFIG_CRYPTO_CBC=y
776CONFIG_CRYPTO_PCBC=m 799CONFIG_CRYPTO_PCBC=m
777# CONFIG_CRYPTO_LRW is not set 800# CONFIG_CRYPTO_LRW is not set
778# CONFIG_CRYPTO_XTS is not set 801# CONFIG_CRYPTO_XTS is not set
802# CONFIG_CRYPTO_CTR is not set
803# CONFIG_CRYPTO_GCM is not set
804# CONFIG_CRYPTO_CCM is not set
779# CONFIG_CRYPTO_CRYPTD is not set 805# CONFIG_CRYPTO_CRYPTD is not set
780CONFIG_CRYPTO_DES=y 806CONFIG_CRYPTO_DES=y
781# CONFIG_CRYPTO_FCRYPT is not set 807# CONFIG_CRYPTO_FCRYPT is not set
@@ -790,11 +816,13 @@ CONFIG_CRYPTO_DES=y
790# CONFIG_CRYPTO_KHAZAD is not set 816# CONFIG_CRYPTO_KHAZAD is not set
791# CONFIG_CRYPTO_ANUBIS is not set 817# CONFIG_CRYPTO_ANUBIS is not set
792# CONFIG_CRYPTO_SEED is not set 818# CONFIG_CRYPTO_SEED is not set
819# CONFIG_CRYPTO_SALSA20 is not set
793# CONFIG_CRYPTO_DEFLATE is not set 820# CONFIG_CRYPTO_DEFLATE is not set
794# CONFIG_CRYPTO_MICHAEL_MIC is not set 821# CONFIG_CRYPTO_MICHAEL_MIC is not set
795# CONFIG_CRYPTO_CRC32C is not set 822# CONFIG_CRYPTO_CRC32C is not set
796# CONFIG_CRYPTO_CAMELLIA is not set 823# CONFIG_CRYPTO_CAMELLIA is not set
797# CONFIG_CRYPTO_TEST is not set 824# CONFIG_CRYPTO_TEST is not set
798# CONFIG_CRYPTO_AUTHENC is not set 825# CONFIG_CRYPTO_AUTHENC is not set
826# CONFIG_CRYPTO_LZO is not set
799# CONFIG_CRYPTO_HW is not set 827# CONFIG_CRYPTO_HW is not set
800# CONFIG_PPC_CLOCK is not set 828# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/sbc8548_defconfig b/arch/powerpc/configs/sbc8548_defconfig
index 3b7fa53a2475..67f67978c742 100644
--- a/arch/powerpc/configs/sbc8548_defconfig
+++ b/arch/powerpc/configs/sbc8548_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-rc8 3# Linux kernel version: 2.6.25-rc6
4# Thu Jan 24 15:19:12 2008 4# Mon Mar 24 08:48:39 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,10 +14,10 @@ CONFIG_PPC_85xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y 17CONFIG_E500=y
19CONFIG_BOOKE=y 18CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 19CONFIG_FSL_BOOKE=y
20CONFIG_FSL_EMB_PERFMON=y
21# CONFIG_PHYS_64BIT is not set 21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -67,17 +68,19 @@ CONFIG_SYSVIPC_SYSCTL=y
67# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
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
81CONFIG_SYSFS_DEPRECATED_V2=y
80# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
83# CONFIG_NAMESPACES is not set
81CONFIG_BLK_DEV_INITRD=y 84CONFIG_BLK_DEV_INITRD=y
82CONFIG_INITRAMFS_SOURCE="" 85CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -90,17 +93,25 @@ CONFIG_HOTPLUG=y
90CONFIG_PRINTK=y 93CONFIG_PRINTK=y
91CONFIG_BUG=y 94CONFIG_BUG=y
92CONFIG_ELF_CORE=y 95CONFIG_ELF_CORE=y
96CONFIG_COMPAT_BRK=y
93CONFIG_BASE_FULL=y 97CONFIG_BASE_FULL=y
94CONFIG_FUTEX=y 98CONFIG_FUTEX=y
95CONFIG_ANON_INODES=y 99CONFIG_ANON_INODES=y
96CONFIG_EPOLL=y 100CONFIG_EPOLL=y
97CONFIG_SIGNALFD=y 101CONFIG_SIGNALFD=y
102CONFIG_TIMERFD=y
98CONFIG_EVENTFD=y 103CONFIG_EVENTFD=y
99CONFIG_SHMEM=y 104CONFIG_SHMEM=y
100CONFIG_VM_EVENT_COUNTERS=y 105CONFIG_VM_EVENT_COUNTERS=y
101CONFIG_SLAB=y 106CONFIG_SLAB=y
102# CONFIG_SLUB is not set 107# CONFIG_SLUB is not set
103# CONFIG_SLOB is not set 108# CONFIG_SLOB is not set
109# CONFIG_PROFILING is not set
110# CONFIG_MARKERS is not set
111CONFIG_HAVE_OPROFILE=y
112CONFIG_HAVE_KPROBES=y
113CONFIG_HAVE_KRETPROBES=y
114CONFIG_PROC_PAGE_MONITOR=y
104CONFIG_SLABINFO=y 115CONFIG_SLABINFO=y
105CONFIG_RT_MUTEXES=y 116CONFIG_RT_MUTEXES=y
106# CONFIG_TINY_SHMEM is not set 117# CONFIG_TINY_SHMEM is not set
@@ -124,24 +135,29 @@ CONFIG_DEFAULT_AS=y
124# CONFIG_DEFAULT_CFQ is not set 135# CONFIG_DEFAULT_CFQ is not set
125# CONFIG_DEFAULT_NOOP is not set 136# CONFIG_DEFAULT_NOOP is not set
126CONFIG_DEFAULT_IOSCHED="anticipatory" 137CONFIG_DEFAULT_IOSCHED="anticipatory"
138CONFIG_CLASSIC_RCU=y
127 139
128# 140#
129# Platform support 141# Platform support
130# 142#
131# CONFIG_PPC_MPC52xx is not set 143# CONFIG_PPC_MPC512x is not set
132# CONFIG_PPC_MPC5200 is not set 144# CONFIG_PPC_MPC5121 is not set
133# CONFIG_PPC_CELL is not set 145# CONFIG_PPC_CELL is not set
134# CONFIG_PPC_CELL_NATIVE is not set 146# CONFIG_PPC_CELL_NATIVE is not set
135# CONFIG_PQ2ADS is not set 147# CONFIG_PQ2ADS is not set
148CONFIG_MPC85xx=y
136# CONFIG_MPC8540_ADS is not set 149# CONFIG_MPC8540_ADS is not set
137# CONFIG_MPC8560_ADS is not set 150# CONFIG_MPC8560_ADS is not set
138# CONFIG_MPC85xx_CDS is not set 151# CONFIG_MPC85xx_CDS is not set
139# CONFIG_MPC85xx_MDS is not set 152# CONFIG_MPC85xx_MDS is not set
140# CONFIG_MPC85xx_DS is not set 153# CONFIG_MPC85xx_DS is not set
154# CONFIG_STX_GP3 is not set
155# CONFIG_TQM8540 is not set
156# CONFIG_TQM8541 is not set
157# CONFIG_TQM8555 is not set
158# CONFIG_TQM8560 is not set
141CONFIG_SBC8548=y 159CONFIG_SBC8548=y
142# CONFIG_SBC8560 is not set 160# CONFIG_SBC8560 is not set
143CONFIG_MPC8540=y
144CONFIG_MPC85xx=y
145# CONFIG_IPIC is not set 161# CONFIG_IPIC is not set
146CONFIG_MPIC=y 162CONFIG_MPIC=y
147# CONFIG_MPIC_WEIRD is not set 163# CONFIG_MPIC_WEIRD is not set
@@ -153,6 +169,7 @@ CONFIG_MPIC=y
153# CONFIG_PPC_INDIRECT_IO is not set 169# CONFIG_PPC_INDIRECT_IO is not set
154# CONFIG_GENERIC_IOMAP is not set 170# CONFIG_GENERIC_IOMAP is not set
155# CONFIG_CPU_FREQ is not set 171# CONFIG_CPU_FREQ is not set
172# CONFIG_CPM2 is not set
156# CONFIG_FSL_ULI1575 is not set 173# CONFIG_FSL_ULI1575 is not set
157 174
158# 175#
@@ -168,13 +185,17 @@ CONFIG_HZ_250=y
168# CONFIG_HZ_300 is not set 185# CONFIG_HZ_300 is not set
169# CONFIG_HZ_1000 is not set 186# CONFIG_HZ_1000 is not set
170CONFIG_HZ=250 187CONFIG_HZ=250
188# CONFIG_SCHED_HRTICK is not set
171CONFIG_PREEMPT_NONE=y 189CONFIG_PREEMPT_NONE=y
172# CONFIG_PREEMPT_VOLUNTARY is not set 190# CONFIG_PREEMPT_VOLUNTARY is not set
173# CONFIG_PREEMPT is not set 191# CONFIG_PREEMPT is not set
174CONFIG_BINFMT_ELF=y 192CONFIG_BINFMT_ELF=y
175CONFIG_BINFMT_MISC=y 193CONFIG_BINFMT_MISC=y
176CONFIG_MATH_EMULATION=y 194CONFIG_MATH_EMULATION=y
195# CONFIG_IOMMU_HELPER is not set
177CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 196CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
197CONFIG_ARCH_HAS_WALK_MEMORY=y
198CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
178CONFIG_ARCH_FLATMEM_ENABLE=y 199CONFIG_ARCH_FLATMEM_ENABLE=y
179CONFIG_ARCH_POPULATES_NODE_MAP=y 200CONFIG_ARCH_POPULATES_NODE_MAP=y
180CONFIG_SELECT_MEMORY_MODEL=y 201CONFIG_SELECT_MEMORY_MODEL=y
@@ -193,11 +214,7 @@ CONFIG_VIRT_TO_BUS=y
193CONFIG_PROC_DEVICETREE=y 214CONFIG_PROC_DEVICETREE=y
194# CONFIG_CMDLINE_BOOL is not set 215# CONFIG_CMDLINE_BOOL is not set
195# CONFIG_PM is not set 216# CONFIG_PM is not set
196CONFIG_SUSPEND_UP_POSSIBLE=y
197CONFIG_HIBERNATION_UP_POSSIBLE=y
198# CONFIG_SECCOMP is not set 217# CONFIG_SECCOMP is not set
199CONFIG_WANT_DEVICE_TREE=y
200CONFIG_DEVICE_TREE=""
201CONFIG_ISA_DMA_API=y 218CONFIG_ISA_DMA_API=y
202 219
203# 220#
@@ -246,6 +263,7 @@ CONFIG_XFRM=y
246CONFIG_XFRM_USER=y 263CONFIG_XFRM_USER=y
247# CONFIG_XFRM_SUB_POLICY is not set 264# CONFIG_XFRM_SUB_POLICY is not set
248# CONFIG_XFRM_MIGRATE is not set 265# CONFIG_XFRM_MIGRATE is not set
266# CONFIG_XFRM_STATISTICS is not set
249# CONFIG_NET_KEY is not set 267# CONFIG_NET_KEY is not set
250CONFIG_INET=y 268CONFIG_INET=y
251CONFIG_IP_MULTICAST=y 269CONFIG_IP_MULTICAST=y
@@ -301,6 +319,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
301# 319#
302# CONFIG_NET_PKTGEN is not set 320# CONFIG_NET_PKTGEN is not set
303# CONFIG_HAMRADIO is not set 321# CONFIG_HAMRADIO is not set
322# CONFIG_CAN is not set
304# CONFIG_IRDA is not set 323# CONFIG_IRDA is not set
305# CONFIG_BT is not set 324# CONFIG_BT is not set
306# CONFIG_AF_RXRPC is not set 325# CONFIG_AF_RXRPC is not set
@@ -345,7 +364,7 @@ CONFIG_BLK_DEV_LOOP=y
345CONFIG_BLK_DEV_RAM=y 364CONFIG_BLK_DEV_RAM=y
346CONFIG_BLK_DEV_RAM_COUNT=16 365CONFIG_BLK_DEV_RAM_COUNT=16
347CONFIG_BLK_DEV_RAM_SIZE=4096 366CONFIG_BLK_DEV_RAM_SIZE=4096
348CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 367# CONFIG_BLK_DEV_XIP is not set
349# CONFIG_CDROM_PKTCDVD is not set 368# CONFIG_CDROM_PKTCDVD is not set
350# CONFIG_ATA_OVER_ETH is not set 369# CONFIG_ATA_OVER_ETH is not set
351CONFIG_MISC_DEVICES=y 370CONFIG_MISC_DEVICES=y
@@ -353,6 +372,8 @@ CONFIG_MISC_DEVICES=y
353# CONFIG_EEPROM_93CX6 is not set 372# CONFIG_EEPROM_93CX6 is not set
354# CONFIG_SGI_IOC4 is not set 373# CONFIG_SGI_IOC4 is not set
355# CONFIG_TIFM_CORE is not set 374# CONFIG_TIFM_CORE is not set
375# CONFIG_ENCLOSURE_SERVICES is not set
376CONFIG_HAVE_IDE=y
356# CONFIG_IDE is not set 377# CONFIG_IDE is not set
357 378
358# 379#
@@ -396,6 +417,7 @@ CONFIG_PHYLIB=y
396# CONFIG_SMSC_PHY is not set 417# CONFIG_SMSC_PHY is not set
397CONFIG_BROADCOM_PHY=y 418CONFIG_BROADCOM_PHY=y
398# CONFIG_ICPLUS_PHY is not set 419# CONFIG_ICPLUS_PHY is not set
420# CONFIG_REALTEK_PHY is not set
399# CONFIG_FIXED_PHY is not set 421# CONFIG_FIXED_PHY is not set
400# CONFIG_MDIO_BITBANG is not set 422# CONFIG_MDIO_BITBANG is not set
401CONFIG_NET_ETHERNET=y 423CONFIG_NET_ETHERNET=y
@@ -417,7 +439,9 @@ CONFIG_NETDEV_1000=y
417# CONFIG_DL2K is not set 439# CONFIG_DL2K is not set
418# CONFIG_E1000 is not set 440# CONFIG_E1000 is not set
419# CONFIG_E1000E is not set 441# CONFIG_E1000E is not set
442# CONFIG_E1000E_ENABLED is not set
420# CONFIG_IP1000 is not set 443# CONFIG_IP1000 is not set
444# CONFIG_IGB is not set
421# CONFIG_NS83820 is not set 445# CONFIG_NS83820 is not set
422# CONFIG_HAMACHI is not set 446# CONFIG_HAMACHI is not set
423# CONFIG_YELLOWFIN is not set 447# CONFIG_YELLOWFIN is not set
@@ -444,6 +468,7 @@ CONFIG_NETDEV_10000=y
444# CONFIG_NIU is not set 468# CONFIG_NIU is not set
445# CONFIG_MLX4_CORE is not set 469# CONFIG_MLX4_CORE is not set
446# CONFIG_TEHUTI is not set 470# CONFIG_TEHUTI is not set
471# CONFIG_BNX2X is not set
447# CONFIG_TR is not set 472# CONFIG_TR is not set
448 473
449# 474#
@@ -456,7 +481,6 @@ CONFIG_NETDEV_10000=y
456# CONFIG_HIPPI is not set 481# CONFIG_HIPPI is not set
457# CONFIG_PPP is not set 482# CONFIG_PPP is not set
458# CONFIG_SLIP is not set 483# CONFIG_SLIP is not set
459# CONFIG_SHAPER is not set
460# CONFIG_NETCONSOLE is not set 484# CONFIG_NETCONSOLE is not set
461# CONFIG_NETPOLL is not set 485# CONFIG_NETPOLL is not set
462# CONFIG_NET_POLL_CONTROLLER is not set 486# CONFIG_NET_POLL_CONTROLLER is not set
@@ -499,6 +523,7 @@ CONFIG_INPUT=y
499# 523#
500# CONFIG_VT is not set 524# CONFIG_VT is not set
501# CONFIG_SERIAL_NONSTANDARD is not set 525# CONFIG_SERIAL_NONSTANDARD is not set
526# CONFIG_NOZOMI is not set
502 527
503# 528#
504# Serial drivers 529# Serial drivers
@@ -558,6 +583,7 @@ CONFIG_HWMON=y
558# CONFIG_SENSORS_W83627HF is not set 583# CONFIG_SENSORS_W83627HF is not set
559# CONFIG_SENSORS_W83627EHF is not set 584# CONFIG_SENSORS_W83627EHF is not set
560# CONFIG_HWMON_DEBUG_CHIP is not set 585# CONFIG_HWMON_DEBUG_CHIP is not set
586# CONFIG_THERMAL is not set
561# CONFIG_WATCHDOG is not set 587# CONFIG_WATCHDOG is not set
562 588
563# 589#
@@ -600,10 +626,12 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
600# CONFIG_HID_SUPPORT is not set 626# CONFIG_HID_SUPPORT is not set
601# CONFIG_USB_SUPPORT is not set 627# CONFIG_USB_SUPPORT is not set
602# CONFIG_MMC is not set 628# CONFIG_MMC is not set
629# CONFIG_MEMSTICK is not set
603# CONFIG_NEW_LEDS is not set 630# CONFIG_NEW_LEDS is not set
604# CONFIG_INFINIBAND is not set 631# CONFIG_INFINIBAND is not set
605# CONFIG_EDAC is not set 632# CONFIG_EDAC is not set
606# CONFIG_RTC_CLASS is not set 633# CONFIG_RTC_CLASS is not set
634# CONFIG_DMADEVICES is not set
607 635
608# 636#
609# Userspace I/O 637# Userspace I/O
@@ -622,12 +650,10 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
622# CONFIG_XFS_FS is not set 650# CONFIG_XFS_FS is not set
623# CONFIG_GFS2_FS is not set 651# CONFIG_GFS2_FS is not set
624# CONFIG_OCFS2_FS is not set 652# CONFIG_OCFS2_FS is not set
625# CONFIG_MINIX_FS is not set 653CONFIG_DNOTIFY=y
626# CONFIG_ROMFS_FS is not set
627CONFIG_INOTIFY=y 654CONFIG_INOTIFY=y
628CONFIG_INOTIFY_USER=y 655CONFIG_INOTIFY_USER=y
629# CONFIG_QUOTA is not set 656# CONFIG_QUOTA is not set
630CONFIG_DNOTIFY=y
631# CONFIG_AUTOFS_FS is not set 657# CONFIG_AUTOFS_FS is not set
632# CONFIG_AUTOFS4_FS is not set 658# CONFIG_AUTOFS4_FS is not set
633# CONFIG_FUSE_FS is not set 659# CONFIG_FUSE_FS is not set
@@ -669,8 +695,10 @@ CONFIG_TMPFS=y
669# CONFIG_EFS_FS is not set 695# CONFIG_EFS_FS is not set
670# CONFIG_CRAMFS is not set 696# CONFIG_CRAMFS is not set
671# CONFIG_VXFS_FS is not set 697# CONFIG_VXFS_FS is not set
698# CONFIG_MINIX_FS is not set
672# CONFIG_HPFS_FS is not set 699# CONFIG_HPFS_FS is not set
673# CONFIG_QNX4FS_FS is not set 700# CONFIG_QNX4FS_FS is not set
701# CONFIG_ROMFS_FS is not set
674# CONFIG_SYSV_FS is not set 702# CONFIG_SYSV_FS is not set
675# CONFIG_UFS_FS is not set 703# CONFIG_UFS_FS is not set
676CONFIG_NETWORK_FILESYSTEMS=y 704CONFIG_NETWORK_FILESYSTEMS=y
@@ -714,7 +742,6 @@ CONFIG_PLIST=y
714CONFIG_HAS_IOMEM=y 742CONFIG_HAS_IOMEM=y
715CONFIG_HAS_IOPORT=y 743CONFIG_HAS_IOPORT=y
716CONFIG_HAS_DMA=y 744CONFIG_HAS_DMA=y
717# CONFIG_INSTRUMENTATION is not set
718 745
719# 746#
720# Kernel hacking 747# Kernel hacking
@@ -737,5 +764,49 @@ CONFIG_ENABLE_MUST_CHECK=y
737# CONFIG_KEYS is not set 764# CONFIG_KEYS is not set
738# CONFIG_SECURITY is not set 765# CONFIG_SECURITY is not set
739# CONFIG_SECURITY_FILE_CAPABILITIES is not set 766# CONFIG_SECURITY_FILE_CAPABILITIES is not set
740# CONFIG_CRYPTO is not set 767CONFIG_CRYPTO=y
768# CONFIG_CRYPTO_SEQIV is not set
769# CONFIG_CRYPTO_MANAGER is not set
770# CONFIG_CRYPTO_HMAC is not set
771# CONFIG_CRYPTO_XCBC is not set
772# CONFIG_CRYPTO_NULL is not set
773# CONFIG_CRYPTO_MD4 is not set
774# CONFIG_CRYPTO_MD5 is not set
775# CONFIG_CRYPTO_SHA1 is not set
776# CONFIG_CRYPTO_SHA256 is not set
777# CONFIG_CRYPTO_SHA512 is not set
778# CONFIG_CRYPTO_WP512 is not set
779# CONFIG_CRYPTO_TGR192 is not set
780# CONFIG_CRYPTO_GF128MUL is not set
781# CONFIG_CRYPTO_ECB is not set
782# CONFIG_CRYPTO_CBC is not set
783# CONFIG_CRYPTO_PCBC is not set
784# CONFIG_CRYPTO_LRW is not set
785# CONFIG_CRYPTO_XTS is not set
786# CONFIG_CRYPTO_CTR is not set
787# CONFIG_CRYPTO_GCM is not set
788# CONFIG_CRYPTO_CCM is not set
789# CONFIG_CRYPTO_CRYPTD is not set
790# CONFIG_CRYPTO_DES is not set
791# CONFIG_CRYPTO_FCRYPT is not set
792# CONFIG_CRYPTO_BLOWFISH is not set
793# CONFIG_CRYPTO_TWOFISH is not set
794# CONFIG_CRYPTO_SERPENT is not set
795# CONFIG_CRYPTO_AES is not set
796# CONFIG_CRYPTO_CAST5 is not set
797# CONFIG_CRYPTO_CAST6 is not set
798# CONFIG_CRYPTO_TEA is not set
799# CONFIG_CRYPTO_ARC4 is not set
800# CONFIG_CRYPTO_KHAZAD is not set
801# CONFIG_CRYPTO_ANUBIS is not set
802# CONFIG_CRYPTO_SEED is not set
803# CONFIG_CRYPTO_SALSA20 is not set
804# CONFIG_CRYPTO_DEFLATE is not set
805# CONFIG_CRYPTO_MICHAEL_MIC is not set
806# CONFIG_CRYPTO_CRC32C is not set
807# CONFIG_CRYPTO_CAMELLIA is not set
808# CONFIG_CRYPTO_AUTHENC is not set
809# CONFIG_CRYPTO_LZO is not set
810CONFIG_CRYPTO_HW=y
811# CONFIG_CRYPTO_DEV_HIFN_795X is not set
741# CONFIG_PPC_CLOCK is not set 812# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/sbc8560_defconfig b/arch/powerpc/configs/sbc8560_defconfig
index d89fce0d3ba1..fef605579e29 100644
--- a/arch/powerpc/configs/sbc8560_defconfig
+++ b/arch/powerpc/configs/sbc8560_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-rc4 3# Linux kernel version: 2.6.25-rc6
4# Wed Jan 23 14:59:20 2008 4# Mon Mar 24 08:48:39 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,10 +14,10 @@ CONFIG_PPC_85xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y 17CONFIG_E500=y
19CONFIG_BOOKE=y 18CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 19CONFIG_FSL_BOOKE=y
20CONFIG_FSL_EMB_PERFMON=y
21# CONFIG_PHYS_64BIT is not set 21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -67,17 +68,19 @@ CONFIG_SYSVIPC_SYSCTL=y
67# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
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
81CONFIG_SYSFS_DEPRECATED_V2=y
80# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
83# CONFIG_NAMESPACES is not set
81CONFIG_BLK_DEV_INITRD=y 84CONFIG_BLK_DEV_INITRD=y
82CONFIG_INITRAMFS_SOURCE="" 85CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -91,17 +94,26 @@ CONFIG_HOTPLUG=y
91CONFIG_PRINTK=y 94CONFIG_PRINTK=y
92CONFIG_BUG=y 95CONFIG_BUG=y
93CONFIG_ELF_CORE=y 96CONFIG_ELF_CORE=y
97CONFIG_COMPAT_BRK=y
94CONFIG_BASE_FULL=y 98CONFIG_BASE_FULL=y
95CONFIG_FUTEX=y 99CONFIG_FUTEX=y
96CONFIG_ANON_INODES=y 100CONFIG_ANON_INODES=y
97CONFIG_EPOLL=y 101CONFIG_EPOLL=y
98CONFIG_SIGNALFD=y 102CONFIG_SIGNALFD=y
103CONFIG_TIMERFD=y
99CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
100CONFIG_SHMEM=y 105CONFIG_SHMEM=y
101CONFIG_VM_EVENT_COUNTERS=y 106CONFIG_VM_EVENT_COUNTERS=y
102CONFIG_SLAB=y 107CONFIG_SLAB=y
103# CONFIG_SLUB is not set 108# CONFIG_SLUB is not set
104# 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
113CONFIG_HAVE_KPROBES=y
114CONFIG_HAVE_KRETPROBES=y
115CONFIG_PROC_PAGE_MONITOR=y
116CONFIG_SLABINFO=y
105CONFIG_RT_MUTEXES=y 117CONFIG_RT_MUTEXES=y
106# CONFIG_TINY_SHMEM is not set 118# CONFIG_TINY_SHMEM is not set
107CONFIG_BASE_SMALL=0 119CONFIG_BASE_SMALL=0
@@ -124,23 +136,30 @@ CONFIG_DEFAULT_AS=y
124# CONFIG_DEFAULT_CFQ is not set 136# CONFIG_DEFAULT_CFQ is not set
125# CONFIG_DEFAULT_NOOP is not set 137# CONFIG_DEFAULT_NOOP is not set
126CONFIG_DEFAULT_IOSCHED="anticipatory" 138CONFIG_DEFAULT_IOSCHED="anticipatory"
139CONFIG_CLASSIC_RCU=y
127 140
128# 141#
129# Platform support 142# Platform support
130# 143#
131# CONFIG_PPC_MPC52xx is not set 144# CONFIG_PPC_MPC512x is not set
132# CONFIG_PPC_MPC5200 is not set 145# CONFIG_PPC_MPC5121 is not set
133# CONFIG_PPC_CELL is not set 146# CONFIG_PPC_CELL is not set
134# CONFIG_PPC_CELL_NATIVE is not set 147# CONFIG_PPC_CELL_NATIVE is not set
135# CONFIG_PQ2ADS is not set 148# CONFIG_PQ2ADS is not set
149CONFIG_MPC85xx=y
136# CONFIG_MPC8540_ADS is not set 150# CONFIG_MPC8540_ADS is not set
137# CONFIG_MPC8560_ADS is not set 151# CONFIG_MPC8560_ADS is not set
138# CONFIG_MPC85xx_CDS is not set 152# CONFIG_MPC85xx_CDS is not set
139# CONFIG_MPC85xx_MDS is not set 153# CONFIG_MPC85xx_MDS is not set
140# CONFIG_MPC85xx_DS is not set 154# CONFIG_MPC85xx_DS is not set
155# CONFIG_STX_GP3 is not set
156# CONFIG_TQM8540 is not set
157# CONFIG_TQM8541 is not set
158# CONFIG_TQM8555 is not set
159# CONFIG_TQM8560 is not set
160# CONFIG_SBC8548 is not set
141CONFIG_SBC8560=y 161CONFIG_SBC8560=y
142CONFIG_MPC8560=y 162# CONFIG_IPIC is not set
143CONFIG_MPC85xx=y
144CONFIG_MPIC=y 163CONFIG_MPIC=y
145# CONFIG_MPIC_WEIRD is not set 164# CONFIG_MPIC_WEIRD is not set
146# CONFIG_PPC_I8259 is not set 165# CONFIG_PPC_I8259 is not set
@@ -167,13 +186,17 @@ CONFIG_HZ_250=y
167# CONFIG_HZ_300 is not set 186# CONFIG_HZ_300 is not set
168# CONFIG_HZ_1000 is not set 187# CONFIG_HZ_1000 is not set
169CONFIG_HZ=250 188CONFIG_HZ=250
189# CONFIG_SCHED_HRTICK is not set
170CONFIG_PREEMPT_NONE=y 190CONFIG_PREEMPT_NONE=y
171# CONFIG_PREEMPT_VOLUNTARY is not set 191# CONFIG_PREEMPT_VOLUNTARY is not set
172# CONFIG_PREEMPT is not set 192# CONFIG_PREEMPT is not set
173CONFIG_BINFMT_ELF=y 193CONFIG_BINFMT_ELF=y
174CONFIG_BINFMT_MISC=y 194CONFIG_BINFMT_MISC=y
175# CONFIG_MATH_EMULATION is not set 195# CONFIG_MATH_EMULATION is not set
196# CONFIG_IOMMU_HELPER is not set
176CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 197CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
198CONFIG_ARCH_HAS_WALK_MEMORY=y
199CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
177CONFIG_ARCH_FLATMEM_ENABLE=y 200CONFIG_ARCH_FLATMEM_ENABLE=y
178CONFIG_ARCH_POPULATES_NODE_MAP=y 201CONFIG_ARCH_POPULATES_NODE_MAP=y
179CONFIG_SELECT_MEMORY_MODEL=y 202CONFIG_SELECT_MEMORY_MODEL=y
@@ -192,11 +215,7 @@ CONFIG_VIRT_TO_BUS=y
192CONFIG_PROC_DEVICETREE=y 215CONFIG_PROC_DEVICETREE=y
193# CONFIG_CMDLINE_BOOL is not set 216# CONFIG_CMDLINE_BOOL is not set
194# CONFIG_PM is not set 217# CONFIG_PM is not set
195CONFIG_SUSPEND_UP_POSSIBLE=y
196CONFIG_HIBERNATION_UP_POSSIBLE=y
197# CONFIG_SECCOMP is not set 218# CONFIG_SECCOMP is not set
198CONFIG_WANT_DEVICE_TREE=y
199CONFIG_DEVICE_TREE=""
200CONFIG_ISA_DMA_API=y 219CONFIG_ISA_DMA_API=y
201 220
202# 221#
@@ -239,6 +258,7 @@ CONFIG_XFRM=y
239CONFIG_XFRM_USER=y 258CONFIG_XFRM_USER=y
240# CONFIG_XFRM_SUB_POLICY is not set 259# CONFIG_XFRM_SUB_POLICY is not set
241# CONFIG_XFRM_MIGRATE is not set 260# CONFIG_XFRM_MIGRATE is not set
261# CONFIG_XFRM_STATISTICS is not set
242# CONFIG_NET_KEY is not set 262# CONFIG_NET_KEY is not set
243CONFIG_INET=y 263CONFIG_INET=y
244CONFIG_IP_MULTICAST=y 264CONFIG_IP_MULTICAST=y
@@ -294,6 +314,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
294# 314#
295# CONFIG_NET_PKTGEN is not set 315# CONFIG_NET_PKTGEN is not set
296# CONFIG_HAMRADIO is not set 316# CONFIG_HAMRADIO is not set
317# CONFIG_CAN is not set
297# CONFIG_IRDA is not set 318# CONFIG_IRDA is not set
298# CONFIG_BT is not set 319# CONFIG_BT is not set
299# CONFIG_AF_RXRPC is not set 320# CONFIG_AF_RXRPC is not set
@@ -335,11 +356,13 @@ CONFIG_BLK_DEV_LOOP=y
335CONFIG_BLK_DEV_RAM=y 356CONFIG_BLK_DEV_RAM=y
336CONFIG_BLK_DEV_RAM_COUNT=16 357CONFIG_BLK_DEV_RAM_COUNT=16
337CONFIG_BLK_DEV_RAM_SIZE=32768 358CONFIG_BLK_DEV_RAM_SIZE=32768
338CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 359# CONFIG_BLK_DEV_XIP is not set
339# CONFIG_CDROM_PKTCDVD is not set 360# CONFIG_CDROM_PKTCDVD is not set
340# CONFIG_ATA_OVER_ETH is not set 361# CONFIG_ATA_OVER_ETH is not set
341CONFIG_MISC_DEVICES=y 362CONFIG_MISC_DEVICES=y
342# CONFIG_EEPROM_93CX6 is not set 363# CONFIG_EEPROM_93CX6 is not set
364# CONFIG_ENCLOSURE_SERVICES is not set
365CONFIG_HAVE_IDE=y
343# CONFIG_IDE is not set 366# CONFIG_IDE is not set
344 367
345# 368#
@@ -374,6 +397,7 @@ CONFIG_PHYLIB=y
374# CONFIG_SMSC_PHY is not set 397# CONFIG_SMSC_PHY is not set
375CONFIG_BROADCOM_PHY=y 398CONFIG_BROADCOM_PHY=y
376# CONFIG_ICPLUS_PHY is not set 399# CONFIG_ICPLUS_PHY is not set
400# CONFIG_REALTEK_PHY is not set
377# CONFIG_FIXED_PHY is not set 401# CONFIG_FIXED_PHY is not set
378# CONFIG_MDIO_BITBANG is not set 402# CONFIG_MDIO_BITBANG is not set
379CONFIG_NET_ETHERNET=y 403CONFIG_NET_ETHERNET=y
@@ -384,6 +408,7 @@ CONFIG_MII=y
384# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 408# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
385# CONFIG_B44 is not set 409# CONFIG_B44 is not set
386CONFIG_NETDEV_1000=y 410CONFIG_NETDEV_1000=y
411# CONFIG_E1000E_ENABLED is not set
387CONFIG_GIANFAR=y 412CONFIG_GIANFAR=y
388CONFIG_GFAR_NAPI=y 413CONFIG_GFAR_NAPI=y
389CONFIG_NETDEV_10000=y 414CONFIG_NETDEV_10000=y
@@ -396,7 +421,6 @@ CONFIG_NETDEV_10000=y
396# CONFIG_WAN is not set 421# CONFIG_WAN is not set
397# CONFIG_PPP is not set 422# CONFIG_PPP is not set
398# CONFIG_SLIP is not set 423# CONFIG_SLIP is not set
399# CONFIG_SHAPER is not set
400# CONFIG_NETCONSOLE is not set 424# CONFIG_NETCONSOLE is not set
401# CONFIG_NETPOLL is not set 425# CONFIG_NETPOLL is not set
402# CONFIG_NET_POLL_CONTROLLER is not set 426# CONFIG_NET_POLL_CONTROLLER is not set
@@ -489,6 +513,7 @@ CONFIG_HWMON=y
489# CONFIG_SENSORS_W83627HF is not set 513# CONFIG_SENSORS_W83627HF is not set
490# CONFIG_SENSORS_W83627EHF is not set 514# CONFIG_SENSORS_W83627EHF is not set
491# CONFIG_HWMON_DEBUG_CHIP is not set 515# CONFIG_HWMON_DEBUG_CHIP is not set
516# CONFIG_THERMAL is not set
492# CONFIG_WATCHDOG is not set 517# CONFIG_WATCHDOG is not set
493 518
494# 519#
@@ -538,12 +563,9 @@ CONFIG_USB_SUPPORT=y
538# 563#
539# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 564# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
540# 565#
541
542#
543# USB Gadget Support
544#
545# CONFIG_USB_GADGET is not set 566# CONFIG_USB_GADGET is not set
546# CONFIG_MMC is not set 567# CONFIG_MMC is not set
568# CONFIG_MEMSTICK is not set
547# CONFIG_NEW_LEDS is not set 569# CONFIG_NEW_LEDS is not set
548# CONFIG_EDAC is not set 570# CONFIG_EDAC is not set
549CONFIG_RTC_LIB=y 571CONFIG_RTC_LIB=y
@@ -569,9 +591,10 @@ CONFIG_RTC_INTF_DEV=y
569# Platform RTC drivers 591# Platform RTC drivers
570# 592#
571# CONFIG_RTC_DRV_CMOS is not set 593# CONFIG_RTC_DRV_CMOS is not set
594# CONFIG_RTC_DRV_DS1511 is not set
572# CONFIG_RTC_DRV_DS1553 is not set 595# CONFIG_RTC_DRV_DS1553 is not set
573# CONFIG_RTC_DRV_STK17TA8 is not set
574# CONFIG_RTC_DRV_DS1742 is not set 596# CONFIG_RTC_DRV_DS1742 is not set
597# CONFIG_RTC_DRV_STK17TA8 is not set
575# CONFIG_RTC_DRV_M48T86 is not set 598# CONFIG_RTC_DRV_M48T86 is not set
576CONFIG_RTC_DRV_M48T59=y 599CONFIG_RTC_DRV_M48T59=y
577# CONFIG_RTC_DRV_V3020 is not set 600# CONFIG_RTC_DRV_V3020 is not set
@@ -579,6 +602,7 @@ CONFIG_RTC_DRV_M48T59=y
579# 602#
580# on-CPU RTC drivers 603# on-CPU RTC drivers
581# 604#
605# CONFIG_DMADEVICES is not set
582 606
583# 607#
584# Userspace I/O 608# Userspace I/O
@@ -597,12 +621,10 @@ CONFIG_RTC_DRV_M48T59=y
597# CONFIG_XFS_FS is not set 621# CONFIG_XFS_FS is not set
598# CONFIG_GFS2_FS is not set 622# CONFIG_GFS2_FS is not set
599# CONFIG_OCFS2_FS is not set 623# CONFIG_OCFS2_FS is not set
600# CONFIG_MINIX_FS is not set 624CONFIG_DNOTIFY=y
601# CONFIG_ROMFS_FS is not set
602CONFIG_INOTIFY=y 625CONFIG_INOTIFY=y
603CONFIG_INOTIFY_USER=y 626CONFIG_INOTIFY_USER=y
604# CONFIG_QUOTA is not set 627# CONFIG_QUOTA is not set
605CONFIG_DNOTIFY=y
606# CONFIG_AUTOFS_FS is not set 628# CONFIG_AUTOFS_FS is not set
607# CONFIG_AUTOFS4_FS is not set 629# CONFIG_AUTOFS4_FS is not set
608# CONFIG_FUSE_FS is not set 630# CONFIG_FUSE_FS is not set
@@ -644,8 +666,10 @@ CONFIG_TMPFS=y
644# CONFIG_EFS_FS is not set 666# CONFIG_EFS_FS is not set
645# CONFIG_CRAMFS is not set 667# CONFIG_CRAMFS is not set
646# CONFIG_VXFS_FS is not set 668# CONFIG_VXFS_FS is not set
669# CONFIG_MINIX_FS is not set
647# CONFIG_HPFS_FS is not set 670# CONFIG_HPFS_FS is not set
648# CONFIG_QNX4FS_FS is not set 671# CONFIG_QNX4FS_FS is not set
672# CONFIG_ROMFS_FS is not set
649# CONFIG_SYSV_FS is not set 673# CONFIG_SYSV_FS is not set
650# CONFIG_UFS_FS is not set 674# CONFIG_UFS_FS is not set
651CONFIG_NETWORK_FILESYSTEMS=y 675CONFIG_NETWORK_FILESYSTEMS=y
@@ -686,7 +710,6 @@ CONFIG_PARTITION_ADVANCED=y
686# CONFIG_SYSV68_PARTITION is not set 710# CONFIG_SYSV68_PARTITION is not set
687# CONFIG_NLS is not set 711# CONFIG_NLS is not set
688# CONFIG_DLM is not set 712# CONFIG_DLM is not set
689# CONFIG_UCC_SLOW is not set
690 713
691# 714#
692# Library routines 715# Library routines
@@ -702,7 +725,6 @@ CONFIG_PLIST=y
702CONFIG_HAS_IOMEM=y 725CONFIG_HAS_IOMEM=y
703CONFIG_HAS_IOPORT=y 726CONFIG_HAS_IOPORT=y
704CONFIG_HAS_DMA=y 727CONFIG_HAS_DMA=y
705# CONFIG_INSTRUMENTATION is not set
706 728
707# 729#
708# Kernel hacking 730# Kernel hacking
@@ -733,8 +755,8 @@ CONFIG_DEBUG_MUTEXES=y
733# CONFIG_DEBUG_VM is not set 755# CONFIG_DEBUG_VM is not set
734# CONFIG_DEBUG_LIST is not set 756# CONFIG_DEBUG_LIST is not set
735# CONFIG_DEBUG_SG is not set 757# CONFIG_DEBUG_SG is not set
736CONFIG_FORCED_INLINING=y
737# CONFIG_BOOT_PRINTK_DELAY is not set 758# CONFIG_BOOT_PRINTK_DELAY is not set
759# CONFIG_BACKTRACE_SELF_TEST is not set
738# CONFIG_FAULT_INJECTION is not set 760# CONFIG_FAULT_INJECTION is not set
739# CONFIG_SAMPLES is not set 761# CONFIG_SAMPLES is not set
740# CONFIG_DEBUG_STACKOVERFLOW is not set 762# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -752,6 +774,7 @@ CONFIG_PPC_EARLY_DEBUG=y
752# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set 774# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
753# CONFIG_PPC_EARLY_DEBUG_BEAT is not set 775# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
754# CONFIG_PPC_EARLY_DEBUG_44x is not set 776# CONFIG_PPC_EARLY_DEBUG_44x is not set
777# CONFIG_PPC_EARLY_DEBUG_40x is not set
755# CONFIG_PPC_EARLY_DEBUG_CPM is not set 778# CONFIG_PPC_EARLY_DEBUG_CPM is not set
756 779
757# 780#
@@ -760,5 +783,48 @@ CONFIG_PPC_EARLY_DEBUG=y
760# CONFIG_KEYS is not set 783# CONFIG_KEYS is not set
761# CONFIG_SECURITY is not set 784# CONFIG_SECURITY is not set
762# CONFIG_SECURITY_FILE_CAPABILITIES is not set 785# CONFIG_SECURITY_FILE_CAPABILITIES is not set
763# CONFIG_CRYPTO is not set 786CONFIG_CRYPTO=y
787# CONFIG_CRYPTO_SEQIV is not set
788# CONFIG_CRYPTO_MANAGER is not set
789# CONFIG_CRYPTO_HMAC is not set
790# CONFIG_CRYPTO_XCBC is not set
791# CONFIG_CRYPTO_NULL is not set
792# CONFIG_CRYPTO_MD4 is not set
793# CONFIG_CRYPTO_MD5 is not set
794# CONFIG_CRYPTO_SHA1 is not set
795# CONFIG_CRYPTO_SHA256 is not set
796# CONFIG_CRYPTO_SHA512 is not set
797# CONFIG_CRYPTO_WP512 is not set
798# CONFIG_CRYPTO_TGR192 is not set
799# CONFIG_CRYPTO_GF128MUL is not set
800# CONFIG_CRYPTO_ECB is not set
801# CONFIG_CRYPTO_CBC is not set
802# CONFIG_CRYPTO_PCBC is not set
803# CONFIG_CRYPTO_LRW is not set
804# CONFIG_CRYPTO_XTS is not set
805# CONFIG_CRYPTO_CTR is not set
806# CONFIG_CRYPTO_GCM is not set
807# CONFIG_CRYPTO_CCM is not set
808# CONFIG_CRYPTO_CRYPTD is not set
809# CONFIG_CRYPTO_DES is not set
810# CONFIG_CRYPTO_FCRYPT is not set
811# CONFIG_CRYPTO_BLOWFISH is not set
812# CONFIG_CRYPTO_TWOFISH is not set
813# CONFIG_CRYPTO_SERPENT is not set
814# CONFIG_CRYPTO_AES is not set
815# CONFIG_CRYPTO_CAST5 is not set
816# CONFIG_CRYPTO_CAST6 is not set
817# CONFIG_CRYPTO_TEA is not set
818# CONFIG_CRYPTO_ARC4 is not set
819# CONFIG_CRYPTO_KHAZAD is not set
820# CONFIG_CRYPTO_ANUBIS is not set
821# CONFIG_CRYPTO_SEED is not set
822# CONFIG_CRYPTO_SALSA20 is not set
823# CONFIG_CRYPTO_DEFLATE is not set
824# CONFIG_CRYPTO_MICHAEL_MIC is not set
825# CONFIG_CRYPTO_CRC32C is not set
826# CONFIG_CRYPTO_CAMELLIA is not set
827# CONFIG_CRYPTO_AUTHENC is not set
828# CONFIG_CRYPTO_LZO is not set
829CONFIG_CRYPTO_HW=y
764# CONFIG_PPC_CLOCK is not set 830# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig
index a034a5e452ef..8fc85747a0a7 100644
--- a/arch/powerpc/configs/storcenter_defconfig
+++ b/arch/powerpc/configs/storcenter_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-rc6
4# Tue Jan 8 09:33:54 2008 4# Mon Mar 24 08:48:41 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
@@ -66,17 +67,19 @@ CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 67# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set 73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y
75CONFIG_FAIR_GROUP_SCHED=y 75CONFIG_FAIR_GROUP_SCHED=y
76CONFIG_FAIR_USER_SCHED=y 76# CONFIG_RT_GROUP_SCHED is not set
77# CONFIG_FAIR_CGROUP_SCHED is not set 77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
78CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y
79# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set
80# CONFIG_BLK_DEV_INITRD is not set 83# CONFIG_BLK_DEV_INITRD is not set
81CONFIG_CC_OPTIMIZE_FOR_SIZE=y 84CONFIG_CC_OPTIMIZE_FOR_SIZE=y
82CONFIG_SYSCTL=y 85CONFIG_SYSCTL=y
@@ -87,11 +90,13 @@ CONFIG_HOTPLUG=y
87CONFIG_PRINTK=y 90CONFIG_PRINTK=y
88CONFIG_BUG=y 91CONFIG_BUG=y
89CONFIG_ELF_CORE=y 92CONFIG_ELF_CORE=y
93CONFIG_COMPAT_BRK=y
90CONFIG_BASE_FULL=y 94CONFIG_BASE_FULL=y
91CONFIG_FUTEX=y 95CONFIG_FUTEX=y
92CONFIG_ANON_INODES=y 96CONFIG_ANON_INODES=y
93CONFIG_EPOLL=y 97CONFIG_EPOLL=y
94CONFIG_SIGNALFD=y 98CONFIG_SIGNALFD=y
99CONFIG_TIMERFD=y
95CONFIG_EVENTFD=y 100CONFIG_EVENTFD=y
96CONFIG_SHMEM=y 101CONFIG_SHMEM=y
97CONFIG_VM_EVENT_COUNTERS=y 102CONFIG_VM_EVENT_COUNTERS=y
@@ -99,6 +104,13 @@ CONFIG_SLUB_DEBUG=y
99# CONFIG_SLAB is not set 104# CONFIG_SLAB is not set
100CONFIG_SLUB=y 105CONFIG_SLUB=y
101# 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
110CONFIG_HAVE_KPROBES=y
111CONFIG_HAVE_KRETPROBES=y
112CONFIG_PROC_PAGE_MONITOR=y
113CONFIG_SLABINFO=y
102CONFIG_RT_MUTEXES=y 114CONFIG_RT_MUTEXES=y
103# CONFIG_TINY_SHMEM is not set 115# CONFIG_TINY_SHMEM is not set
104CONFIG_BASE_SMALL=0 116CONFIG_BASE_SMALL=0
@@ -126,6 +138,7 @@ CONFIG_IOSCHED_CFQ=y
126CONFIG_DEFAULT_CFQ=y 138CONFIG_DEFAULT_CFQ=y
127# CONFIG_DEFAULT_NOOP is not set 139# CONFIG_DEFAULT_NOOP is not set
128CONFIG_DEFAULT_IOSCHED="cfq" 140CONFIG_DEFAULT_IOSCHED="cfq"
141CONFIG_CLASSIC_RCU=y
129 142
130# 143#
131# Platform support 144# Platform support
@@ -136,10 +149,10 @@ CONFIG_PPC_MULTIPLATFORM=y
136# CONFIG_PPC_86xx is not set 149# CONFIG_PPC_86xx is not set
137CONFIG_CLASSIC32=y 150CONFIG_CLASSIC32=y
138# CONFIG_PPC_CHRP is not set 151# CONFIG_PPC_CHRP is not set
152# CONFIG_PPC_MPC512x is not set
153# CONFIG_PPC_MPC5121 is not set
154# CONFIG_MPC5121_ADS is not set
139# CONFIG_PPC_MPC52xx is not set 155# CONFIG_PPC_MPC52xx is not set
140# CONFIG_PPC_MPC5200 is not set
141# CONFIG_PPC_EFIKA is not set
142# CONFIG_PPC_LITE5200 is not set
143# CONFIG_PPC_PMAC is not set 156# CONFIG_PPC_PMAC is not set
144# CONFIG_PPC_CELL is not set 157# CONFIG_PPC_CELL is not set
145# CONFIG_PPC_CELL_NATIVE is not set 158# CONFIG_PPC_CELL_NATIVE is not set
@@ -153,6 +166,7 @@ CONFIG_STORCENTER=y
153CONFIG_MPC10X_BRIDGE=y 166CONFIG_MPC10X_BRIDGE=y
154CONFIG_MPC10X_OPENPIC=y 167CONFIG_MPC10X_OPENPIC=y
155# CONFIG_MPC10X_STORE_GATHERING is not set 168# CONFIG_MPC10X_STORE_GATHERING is not set
169# CONFIG_IPIC is not set
156CONFIG_MPIC=y 170CONFIG_MPIC=y
157# CONFIG_MPIC_WEIRD is not set 171# CONFIG_MPIC_WEIRD is not set
158# CONFIG_PPC_I8259 is not set 172# CONFIG_PPC_I8259 is not set
@@ -164,7 +178,6 @@ CONFIG_MPIC=y
164# CONFIG_GENERIC_IOMAP is not set 178# CONFIG_GENERIC_IOMAP is not set
165# CONFIG_CPU_FREQ is not set 179# CONFIG_CPU_FREQ is not set
166# CONFIG_TAU is not set 180# CONFIG_TAU is not set
167# CONFIG_CPM2 is not set
168# CONFIG_FSL_ULI1575 is not set 181# CONFIG_FSL_ULI1575 is not set
169 182
170# 183#
@@ -180,12 +193,16 @@ CONFIG_HZ_100=y
180# CONFIG_HZ_300 is not set 193# CONFIG_HZ_300 is not set
181# CONFIG_HZ_1000 is not set 194# CONFIG_HZ_1000 is not set
182CONFIG_HZ=100 195CONFIG_HZ=100
196# CONFIG_SCHED_HRTICK is not set
183CONFIG_PREEMPT_NONE=y 197CONFIG_PREEMPT_NONE=y
184# CONFIG_PREEMPT_VOLUNTARY is not set 198# CONFIG_PREEMPT_VOLUNTARY is not set
185# CONFIG_PREEMPT is not set 199# CONFIG_PREEMPT is not set
186CONFIG_BINFMT_ELF=y 200CONFIG_BINFMT_ELF=y
187CONFIG_BINFMT_MISC=y 201CONFIG_BINFMT_MISC=y
202# CONFIG_IOMMU_HELPER is not set
188CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 203CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
204CONFIG_ARCH_HAS_WALK_MEMORY=y
205CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
189# CONFIG_KEXEC is not set 206# CONFIG_KEXEC is not set
190CONFIG_ARCH_FLATMEM_ENABLE=y 207CONFIG_ARCH_FLATMEM_ENABLE=y
191CONFIG_ARCH_POPULATES_NODE_MAP=y 208CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -206,11 +223,7 @@ CONFIG_PROC_DEVICETREE=y
206CONFIG_CMDLINE_BOOL=y 223CONFIG_CMDLINE_BOOL=y
207CONFIG_CMDLINE="console=ttyS0,115200" 224CONFIG_CMDLINE="console=ttyS0,115200"
208# CONFIG_PM is not set 225# CONFIG_PM is not set
209CONFIG_SUSPEND_UP_POSSIBLE=y
210CONFIG_HIBERNATION_UP_POSSIBLE=y
211# CONFIG_SECCOMP is not set 226# CONFIG_SECCOMP is not set
212CONFIG_WANT_DEVICE_TREE=y
213CONFIG_DEVICE_TREE="storcenter.dts"
214CONFIG_ISA_DMA_API=y 227CONFIG_ISA_DMA_API=y
215 228
216# 229#
@@ -310,6 +323,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
310# 323#
311# CONFIG_NET_PKTGEN is not set 324# CONFIG_NET_PKTGEN is not set
312# CONFIG_HAMRADIO is not set 325# CONFIG_HAMRADIO is not set
326# CONFIG_CAN is not set
313# CONFIG_IRDA is not set 327# CONFIG_IRDA is not set
314# CONFIG_BT is not set 328# CONFIG_BT is not set
315# CONFIG_AF_RXRPC is not set 329# CONFIG_AF_RXRPC is not set
@@ -343,6 +357,7 @@ CONFIG_MTD=y
343CONFIG_MTD_PARTITIONS=y 357CONFIG_MTD_PARTITIONS=y
344# CONFIG_MTD_REDBOOT_PARTS is not set 358# CONFIG_MTD_REDBOOT_PARTS is not set
345# CONFIG_MTD_CMDLINE_PARTS is not set 359# CONFIG_MTD_CMDLINE_PARTS is not set
360# CONFIG_MTD_OF_PARTS is not set
346 361
347# 362#
348# User Modules And Translation Layers 363# User Modules And Translation Layers
@@ -438,12 +453,14 @@ CONFIG_MISC_DEVICES=y
438# CONFIG_EEPROM_93CX6 is not set 453# CONFIG_EEPROM_93CX6 is not set
439# CONFIG_SGI_IOC4 is not set 454# CONFIG_SGI_IOC4 is not set
440# CONFIG_TIFM_CORE is not set 455# CONFIG_TIFM_CORE is not set
456# CONFIG_ENCLOSURE_SERVICES is not set
457CONFIG_HAVE_IDE=y
441CONFIG_IDE=y 458CONFIG_IDE=y
442CONFIG_IDE_MAX_HWIFS=4 459CONFIG_IDE_MAX_HWIFS=4
443CONFIG_BLK_DEV_IDE=y 460CONFIG_BLK_DEV_IDE=y
444 461
445# 462#
446# Please see Documentation/ide.txt for help/info on IDE drives 463# Please see Documentation/ide/ide.txt for help/info on IDE drives
447# 464#
448# CONFIG_BLK_DEV_IDE_SATA is not set 465# CONFIG_BLK_DEV_IDE_SATA is not set
449CONFIG_BLK_DEV_IDEDISK=y 466CONFIG_BLK_DEV_IDEDISK=y
@@ -460,12 +477,12 @@ CONFIG_IDE_PROC_FS=y
460# 477#
461CONFIG_IDE_GENERIC=y 478CONFIG_IDE_GENERIC=y
462# CONFIG_BLK_DEV_PLATFORM is not set 479# CONFIG_BLK_DEV_PLATFORM is not set
480CONFIG_BLK_DEV_IDEDMA_SFF=y
463 481
464# 482#
465# PCI IDE chipsets support 483# PCI IDE chipsets support
466# 484#
467CONFIG_BLK_DEV_IDEPCI=y 485CONFIG_BLK_DEV_IDEPCI=y
468# CONFIG_IDEPCI_SHARE_IRQ is not set
469CONFIG_IDEPCI_PCIBUS_ORDER=y 486CONFIG_IDEPCI_PCIBUS_ORDER=y
470# CONFIG_BLK_DEV_GENERIC is not set 487# CONFIG_BLK_DEV_GENERIC is not set
471# CONFIG_BLK_DEV_OPTI621 is not set 488# CONFIG_BLK_DEV_OPTI621 is not set
@@ -495,7 +512,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
495# CONFIG_BLK_DEV_TRM290 is not set 512# CONFIG_BLK_DEV_TRM290 is not set
496CONFIG_BLK_DEV_VIA82CXXX=y 513CONFIG_BLK_DEV_VIA82CXXX=y
497# CONFIG_BLK_DEV_TC86C001 is not set 514# CONFIG_BLK_DEV_TC86C001 is not set
498# CONFIG_IDE_ARM is not set
499CONFIG_BLK_DEV_IDEDMA=y 515CONFIG_BLK_DEV_IDEDMA=y
500CONFIG_IDE_ARCH_OBSOLETE_INIT=y 516CONFIG_IDE_ARCH_OBSOLETE_INIT=y
501# CONFIG_BLK_DEV_HD is not set 517# CONFIG_BLK_DEV_HD is not set
@@ -563,6 +579,7 @@ CONFIG_SCSI_LOWLEVEL=y
563# CONFIG_SCSI_IPS is not set 579# CONFIG_SCSI_IPS is not set
564# CONFIG_SCSI_INITIO is not set 580# CONFIG_SCSI_INITIO is not set
565# CONFIG_SCSI_INIA100 is not set 581# CONFIG_SCSI_INIA100 is not set
582# CONFIG_SCSI_MVSAS is not set
566# CONFIG_SCSI_STEX is not set 583# CONFIG_SCSI_STEX is not set
567# CONFIG_SCSI_SYM53C8XX_2 is not set 584# CONFIG_SCSI_SYM53C8XX_2 is not set
568# CONFIG_SCSI_QLOGIC_1280 is not set 585# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -603,7 +620,6 @@ CONFIG_DUMMY=m
603# CONFIG_EQUALIZER is not set 620# CONFIG_EQUALIZER is not set
604# CONFIG_TUN is not set 621# CONFIG_TUN is not set
605# CONFIG_VETH is not set 622# CONFIG_VETH is not set
606# CONFIG_IP1000 is not set
607# CONFIG_ARCNET is not set 623# CONFIG_ARCNET is not set
608# CONFIG_NET_ETHERNET is not set 624# CONFIG_NET_ETHERNET is not set
609CONFIG_NETDEV_1000=y 625CONFIG_NETDEV_1000=y
@@ -611,6 +627,9 @@ CONFIG_NETDEV_1000=y
611# CONFIG_DL2K is not set 627# CONFIG_DL2K is not set
612# CONFIG_E1000 is not set 628# CONFIG_E1000 is not set
613# CONFIG_E1000E is not set 629# CONFIG_E1000E is not set
630# CONFIG_E1000E_ENABLED is not set
631# CONFIG_IP1000 is not set
632# CONFIG_IGB is not set
614# CONFIG_NS83820 is not set 633# CONFIG_NS83820 is not set
615# CONFIG_HAMACHI is not set 634# CONFIG_HAMACHI is not set
616# CONFIG_YELLOWFIN is not set 635# CONFIG_YELLOWFIN is not set
@@ -623,6 +642,7 @@ CONFIG_R8169=y
623# CONFIG_VIA_VELOCITY is not set 642# CONFIG_VIA_VELOCITY is not set
624# CONFIG_TIGON3 is not set 643# CONFIG_TIGON3 is not set
625# CONFIG_BNX2 is not set 644# CONFIG_BNX2 is not set
645# CONFIG_GIANFAR is not set
626# CONFIG_MV643XX_ETH is not set 646# CONFIG_MV643XX_ETH is not set
627# CONFIG_QLA3XXX is not set 647# CONFIG_QLA3XXX is not set
628# CONFIG_ATL1 is not set 648# CONFIG_ATL1 is not set
@@ -649,7 +669,6 @@ CONFIG_R8169=y
649# CONFIG_PPP is not set 669# CONFIG_PPP is not set
650# CONFIG_SLIP is not set 670# CONFIG_SLIP is not set
651# CONFIG_NET_FC is not set 671# CONFIG_NET_FC is not set
652# CONFIG_SHAPER is not set
653# CONFIG_NETCONSOLE is not set 672# CONFIG_NETCONSOLE is not set
654# CONFIG_NETPOLL is not set 673# CONFIG_NETPOLL is not set
655# CONFIG_NET_POLL_CONTROLLER is not set 674# CONFIG_NET_POLL_CONTROLLER is not set
@@ -672,6 +691,7 @@ CONFIG_R8169=y
672# 691#
673# CONFIG_VT is not set 692# CONFIG_VT is not set
674# CONFIG_SERIAL_NONSTANDARD is not set 693# CONFIG_SERIAL_NONSTANDARD is not set
694# CONFIG_NOZOMI is not set
675 695
676# 696#
677# Serial drivers 697# Serial drivers
@@ -746,14 +766,12 @@ CONFIG_I2C_MPC=y
746# 766#
747# Miscellaneous I2C Chip support 767# Miscellaneous I2C Chip support
748# 768#
749# CONFIG_SENSORS_DS1337 is not set
750# CONFIG_SENSORS_DS1374 is not set
751# CONFIG_DS1682 is not set 769# CONFIG_DS1682 is not set
752# CONFIG_SENSORS_EEPROM is not set 770# CONFIG_SENSORS_EEPROM is not set
753# CONFIG_SENSORS_PCF8574 is not set 771# CONFIG_SENSORS_PCF8574 is not set
754# CONFIG_SENSORS_PCA9539 is not set 772# CONFIG_PCF8575 is not set
755# CONFIG_SENSORS_PCF8591 is not set 773# CONFIG_SENSORS_PCF8591 is not set
756# CONFIG_SENSORS_M41T00 is not set 774# CONFIG_TPS65010 is not set
757# CONFIG_SENSORS_MAX6875 is not set 775# CONFIG_SENSORS_MAX6875 is not set
758# CONFIG_SENSORS_TSL2550 is not set 776# CONFIG_SENSORS_TSL2550 is not set
759# CONFIG_I2C_DEBUG_CORE is not set 777# CONFIG_I2C_DEBUG_CORE is not set
@@ -769,6 +787,7 @@ CONFIG_I2C_MPC=y
769# CONFIG_W1 is not set 787# CONFIG_W1 is not set
770# CONFIG_POWER_SUPPLY is not set 788# CONFIG_POWER_SUPPLY is not set
771# CONFIG_HWMON is not set 789# CONFIG_HWMON is not set
790# CONFIG_THERMAL is not set
772# CONFIG_WATCHDOG is not set 791# CONFIG_WATCHDOG is not set
773 792
774# 793#
@@ -814,6 +833,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
814CONFIG_USB_ARCH_HAS_EHCI=y 833CONFIG_USB_ARCH_HAS_EHCI=y
815CONFIG_USB=y 834CONFIG_USB=y
816# CONFIG_USB_DEBUG is not set 835# CONFIG_USB_DEBUG is not set
836# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
817 837
818# 838#
819# Miscellaneous USB options 839# Miscellaneous USB options
@@ -827,9 +847,10 @@ CONFIG_USB_DEVICE_CLASS=y
827# USB Host Controller Drivers 847# USB Host Controller Drivers
828# 848#
829CONFIG_USB_EHCI_HCD=y 849CONFIG_USB_EHCI_HCD=y
830# CONFIG_USB_EHCI_SPLIT_ISO is not set
831# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 850# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
832# CONFIG_USB_EHCI_TT_NEWSCHED is not set 851# CONFIG_USB_EHCI_TT_NEWSCHED is not set
852# CONFIG_USB_EHCI_FSL is not set
853CONFIG_USB_EHCI_HCD_PPC_OF=y
833# CONFIG_USB_ISP116X_HCD is not set 854# CONFIG_USB_ISP116X_HCD is not set
834CONFIG_USB_OHCI_HCD=y 855CONFIG_USB_OHCI_HCD=y
835# CONFIG_USB_OHCI_HCD_PPC_OF is not set 856# CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -877,10 +898,6 @@ CONFIG_USB_STORAGE=y
877# 898#
878# USB port drivers 899# USB port drivers
879# 900#
880
881#
882# USB Serial Converter support
883#
884# CONFIG_USB_SERIAL is not set 901# CONFIG_USB_SERIAL is not set
885 902
886# 903#
@@ -906,21 +923,18 @@ CONFIG_USB_STORAGE=y
906# CONFIG_USB_TRANCEVIBRATOR is not set 923# CONFIG_USB_TRANCEVIBRATOR is not set
907# CONFIG_USB_IOWARRIOR is not set 924# CONFIG_USB_IOWARRIOR is not set
908# CONFIG_USB_TEST is not set 925# CONFIG_USB_TEST is not set
909
910#
911# USB DSL modem support
912#
913
914#
915# USB Gadget Support
916#
917# CONFIG_USB_GADGET is not set 926# CONFIG_USB_GADGET is not set
918# CONFIG_MMC is not set 927# CONFIG_MMC is not set
928# CONFIG_MEMSTICK is not set
919# CONFIG_NEW_LEDS is not set 929# CONFIG_NEW_LEDS is not set
920# CONFIG_INFINIBAND is not set 930# CONFIG_INFINIBAND is not set
921# CONFIG_EDAC is not set 931# CONFIG_EDAC is not set
922CONFIG_RTC_LIB=y 932CONFIG_RTC_LIB=y
923CONFIG_RTC_CLASS=y 933CONFIG_RTC_CLASS=y
934
935#
936# Conflicting RTC option has been selected, check GEN_RTC and RTC
937#
924CONFIG_RTC_HCTOSYS=y 938CONFIG_RTC_HCTOSYS=y
925CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 939CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
926# CONFIG_RTC_DEBUG is not set 940# CONFIG_RTC_DEBUG is not set
@@ -947,6 +961,7 @@ CONFIG_RTC_DRV_DS1307=y
947# CONFIG_RTC_DRV_PCF8563 is not set 961# CONFIG_RTC_DRV_PCF8563 is not set
948# CONFIG_RTC_DRV_PCF8583 is not set 962# CONFIG_RTC_DRV_PCF8583 is not set
949# CONFIG_RTC_DRV_M41T80 is not set 963# CONFIG_RTC_DRV_M41T80 is not set
964# CONFIG_RTC_DRV_S35390A is not set
950 965
951# 966#
952# SPI RTC drivers 967# SPI RTC drivers
@@ -956,9 +971,10 @@ CONFIG_RTC_DRV_DS1307=y
956# Platform RTC drivers 971# Platform RTC drivers
957# 972#
958# CONFIG_RTC_DRV_CMOS is not set 973# CONFIG_RTC_DRV_CMOS is not set
974# CONFIG_RTC_DRV_DS1511 is not set
959# CONFIG_RTC_DRV_DS1553 is not set 975# CONFIG_RTC_DRV_DS1553 is not set
960# CONFIG_RTC_DRV_STK17TA8 is not set
961# CONFIG_RTC_DRV_DS1742 is not set 976# CONFIG_RTC_DRV_DS1742 is not set
977# CONFIG_RTC_DRV_STK17TA8 is not set
962# CONFIG_RTC_DRV_M48T86 is not set 978# CONFIG_RTC_DRV_M48T86 is not set
963# CONFIG_RTC_DRV_M48T59 is not set 979# CONFIG_RTC_DRV_M48T59 is not set
964# CONFIG_RTC_DRV_V3020 is not set 980# CONFIG_RTC_DRV_V3020 is not set
@@ -966,6 +982,7 @@ CONFIG_RTC_DRV_DS1307=y
966# 982#
967# on-CPU RTC drivers 983# on-CPU RTC drivers
968# 984#
985# CONFIG_DMADEVICES is not set
969 986
970# 987#
971# Userspace I/O 988# Userspace I/O
@@ -995,12 +1012,10 @@ CONFIG_XFS_FS=m
995# CONFIG_XFS_RT is not set 1012# CONFIG_XFS_RT is not set
996# CONFIG_GFS2_FS is not set 1013# CONFIG_GFS2_FS is not set
997# CONFIG_OCFS2_FS is not set 1014# CONFIG_OCFS2_FS is not set
998# CONFIG_MINIX_FS is not set 1015CONFIG_DNOTIFY=y
999# CONFIG_ROMFS_FS is not set
1000CONFIG_INOTIFY=y 1016CONFIG_INOTIFY=y
1001CONFIG_INOTIFY_USER=y 1017CONFIG_INOTIFY_USER=y
1002# CONFIG_QUOTA is not set 1018# CONFIG_QUOTA is not set
1003CONFIG_DNOTIFY=y
1004# CONFIG_AUTOFS_FS is not set 1019# CONFIG_AUTOFS_FS is not set
1005# CONFIG_AUTOFS4_FS is not set 1020# CONFIG_AUTOFS4_FS is not set
1006# CONFIG_FUSE_FS is not set 1021# CONFIG_FUSE_FS is not set
@@ -1053,8 +1068,10 @@ CONFIG_JFFS2_RTIME=y
1053# CONFIG_JFFS2_RUBIN is not set 1068# CONFIG_JFFS2_RUBIN is not set
1054# CONFIG_CRAMFS is not set 1069# CONFIG_CRAMFS is not set
1055# CONFIG_VXFS_FS is not set 1070# CONFIG_VXFS_FS is not set
1071# CONFIG_MINIX_FS is not set
1056# CONFIG_HPFS_FS is not set 1072# CONFIG_HPFS_FS is not set
1057# CONFIG_QNX4FS_FS is not set 1073# CONFIG_QNX4FS_FS is not set
1074# CONFIG_ROMFS_FS is not set
1058# CONFIG_SYSV_FS is not set 1075# CONFIG_SYSV_FS is not set
1059# CONFIG_UFS_FS is not set 1076# CONFIG_UFS_FS is not set
1060# CONFIG_NETWORK_FILESYSTEMS is not set 1077# CONFIG_NETWORK_FILESYSTEMS is not set
@@ -1121,7 +1138,6 @@ CONFIG_NLS_ISO8859_1=y
1121# CONFIG_NLS_KOI8_U is not set 1138# CONFIG_NLS_KOI8_U is not set
1122CONFIG_NLS_UTF8=y 1139CONFIG_NLS_UTF8=y
1123# CONFIG_DLM is not set 1140# CONFIG_DLM is not set
1124# CONFIG_UCC_SLOW is not set
1125 1141
1126# 1142#
1127# Library routines 1143# Library routines
@@ -1139,9 +1155,6 @@ CONFIG_PLIST=y
1139CONFIG_HAS_IOMEM=y 1155CONFIG_HAS_IOMEM=y
1140CONFIG_HAS_IOPORT=y 1156CONFIG_HAS_IOPORT=y
1141CONFIG_HAS_DMA=y 1157CONFIG_HAS_DMA=y
1142CONFIG_INSTRUMENTATION=y
1143# CONFIG_PROFILING is not set
1144# CONFIG_MARKERS is not set
1145 1158
1146# 1159#
1147# Kernel hacking 1160# Kernel hacking
@@ -1155,6 +1168,7 @@ CONFIG_INSTRUMENTATION=y
1155# CONFIG_HEADERS_CHECK is not set 1168# CONFIG_HEADERS_CHECK is not set
1156# CONFIG_DEBUG_KERNEL is not set 1169# CONFIG_DEBUG_KERNEL is not set
1157# CONFIG_SLUB_DEBUG_ON is not set 1170# CONFIG_SLUB_DEBUG_ON is not set
1171# CONFIG_SLUB_STATS is not set
1158# CONFIG_DEBUG_BUGVERBOSE is not set 1172# CONFIG_DEBUG_BUGVERBOSE is not set
1159# CONFIG_SAMPLES is not set 1173# CONFIG_SAMPLES is not set
1160# CONFIG_BOOTX_TEXT is not set 1174# CONFIG_BOOTX_TEXT is not set
diff --git a/arch/powerpc/configs/stx_gp3_defconfig b/arch/powerpc/configs/stx_gp3_defconfig
index e8137a839bd4..1d303c49bb0c 100644
--- a/arch/powerpc/configs/stx_gp3_defconfig
+++ b/arch/powerpc/configs/stx_gp3_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-rc8 3# Linux kernel version: 2.6.25-rc6
4# Thu Jan 24 02:02:30 2008 4# Mon Mar 24 08:48:42 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,10 +14,10 @@ CONFIG_PPC_85xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y 17CONFIG_E500=y
19CONFIG_BOOKE=y 18CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 19CONFIG_FSL_BOOKE=y
20CONFIG_FSL_EMB_PERFMON=y
21# CONFIG_PHYS_64BIT is not set 21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -67,17 +68,19 @@ CONFIG_SYSVIPC_SYSCTL=y
67# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
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
81CONFIG_SYSFS_DEPRECATED_V2=y
80# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
83# CONFIG_NAMESPACES is not set
81CONFIG_BLK_DEV_INITRD=y 84CONFIG_BLK_DEV_INITRD=y
82CONFIG_INITRAMFS_SOURCE="" 85CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -91,11 +94,13 @@ CONFIG_HOTPLUG=y
91CONFIG_PRINTK=y 94CONFIG_PRINTK=y
92CONFIG_BUG=y 95CONFIG_BUG=y
93CONFIG_ELF_CORE=y 96CONFIG_ELF_CORE=y
97CONFIG_COMPAT_BRK=y
94CONFIG_BASE_FULL=y 98CONFIG_BASE_FULL=y
95CONFIG_FUTEX=y 99CONFIG_FUTEX=y
96CONFIG_ANON_INODES=y 100CONFIG_ANON_INODES=y
97CONFIG_EPOLL=y 101CONFIG_EPOLL=y
98CONFIG_SIGNALFD=y 102CONFIG_SIGNALFD=y
103CONFIG_TIMERFD=y
99CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
100CONFIG_SHMEM=y 105CONFIG_SHMEM=y
101CONFIG_VM_EVENT_COUNTERS=y 106CONFIG_VM_EVENT_COUNTERS=y
@@ -103,6 +108,13 @@ CONFIG_SLUB_DEBUG=y
103# CONFIG_SLAB is not set 108# CONFIG_SLAB is not set
104CONFIG_SLUB=y 109CONFIG_SLUB=y
105# 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_HAVE_KRETPROBES=y
117CONFIG_PROC_PAGE_MONITOR=y
106CONFIG_SLABINFO=y 118CONFIG_SLABINFO=y
107CONFIG_RT_MUTEXES=y 119CONFIG_RT_MUTEXES=y
108# CONFIG_TINY_SHMEM is not set 120# CONFIG_TINY_SHMEM is not set
@@ -130,23 +142,29 @@ CONFIG_IOSCHED_CFQ=y
130CONFIG_DEFAULT_CFQ=y 142CONFIG_DEFAULT_CFQ=y
131# CONFIG_DEFAULT_NOOP is not set 143# CONFIG_DEFAULT_NOOP is not set
132CONFIG_DEFAULT_IOSCHED="cfq" 144CONFIG_DEFAULT_IOSCHED="cfq"
145CONFIG_CLASSIC_RCU=y
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
155CONFIG_MPC85xx=y
142# CONFIG_MPC8540_ADS is not set 156# CONFIG_MPC8540_ADS is not set
143# CONFIG_MPC8560_ADS is not set 157# CONFIG_MPC8560_ADS is not set
144# CONFIG_MPC85xx_CDS is not set 158# CONFIG_MPC85xx_CDS is not set
145# CONFIG_MPC85xx_MDS is not set 159# CONFIG_MPC85xx_MDS is not set
146# CONFIG_MPC85xx_DS is not set 160# CONFIG_MPC85xx_DS is not set
147CONFIG_STX_GP3=y 161CONFIG_STX_GP3=y
148CONFIG_MPC8560=y 162# CONFIG_TQM8540 is not set
149CONFIG_MPC85xx=y 163# CONFIG_TQM8541 is not set
164# CONFIG_TQM8555 is not set
165# CONFIG_TQM8560 is not set
166# CONFIG_SBC8548 is not set
167# CONFIG_SBC8560 is not set
150# CONFIG_IPIC is not set 168# CONFIG_IPIC is not set
151CONFIG_MPIC=y 169CONFIG_MPIC=y
152# CONFIG_MPIC_WEIRD is not set 170# CONFIG_MPIC_WEIRD is not set
@@ -176,13 +194,17 @@ CONFIG_HZ_250=y
176# CONFIG_HZ_300 is not set 194# CONFIG_HZ_300 is not set
177# CONFIG_HZ_1000 is not set 195# CONFIG_HZ_1000 is not set
178CONFIG_HZ=250 196CONFIG_HZ=250
197# CONFIG_SCHED_HRTICK is not set
179CONFIG_PREEMPT_NONE=y 198CONFIG_PREEMPT_NONE=y
180# CONFIG_PREEMPT_VOLUNTARY is not set 199# CONFIG_PREEMPT_VOLUNTARY is not set
181# CONFIG_PREEMPT is not set 200# CONFIG_PREEMPT is not set
182CONFIG_BINFMT_ELF=y 201CONFIG_BINFMT_ELF=y
183CONFIG_BINFMT_MISC=m 202CONFIG_BINFMT_MISC=m
184CONFIG_MATH_EMULATION=y 203CONFIG_MATH_EMULATION=y
204# CONFIG_IOMMU_HELPER is not set
185CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 205CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
206CONFIG_ARCH_HAS_WALK_MEMORY=y
207CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
186CONFIG_ARCH_FLATMEM_ENABLE=y 208CONFIG_ARCH_FLATMEM_ENABLE=y
187CONFIG_ARCH_POPULATES_NODE_MAP=y 209CONFIG_ARCH_POPULATES_NODE_MAP=y
188CONFIG_SELECT_MEMORY_MODEL=y 210CONFIG_SELECT_MEMORY_MODEL=y
@@ -201,11 +223,7 @@ CONFIG_VIRT_TO_BUS=y
201CONFIG_PROC_DEVICETREE=y 223CONFIG_PROC_DEVICETREE=y
202# CONFIG_CMDLINE_BOOL is not set 224# CONFIG_CMDLINE_BOOL is not set
203# CONFIG_PM is not set 225# CONFIG_PM is not set
204CONFIG_SUSPEND_UP_POSSIBLE=y
205CONFIG_HIBERNATION_UP_POSSIBLE=y
206CONFIG_SECCOMP=y 226CONFIG_SECCOMP=y
207CONFIG_WANT_DEVICE_TREE=y
208CONFIG_DEVICE_TREE="stx_gp3_8560.dts"
209CONFIG_ISA_DMA_API=y 227CONFIG_ISA_DMA_API=y
210 228
211# 229#
@@ -255,6 +273,7 @@ CONFIG_XFRM=y
255# CONFIG_XFRM_USER is not set 273# CONFIG_XFRM_USER is not set
256# CONFIG_XFRM_SUB_POLICY is not set 274# CONFIG_XFRM_SUB_POLICY is not set
257# CONFIG_XFRM_MIGRATE is not set 275# CONFIG_XFRM_MIGRATE is not set
276# CONFIG_XFRM_STATISTICS is not set
258# CONFIG_NET_KEY is not set 277# CONFIG_NET_KEY is not set
259CONFIG_INET=y 278CONFIG_INET=y
260# CONFIG_IP_MULTICAST is not set 279# CONFIG_IP_MULTICAST is not set
@@ -290,31 +309,36 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
290# CONFIG_NETWORK_SECMARK is not set 309# CONFIG_NETWORK_SECMARK is not set
291CONFIG_NETFILTER=y 310CONFIG_NETFILTER=y
292# CONFIG_NETFILTER_DEBUG is not set 311# CONFIG_NETFILTER_DEBUG is not set
312CONFIG_NETFILTER_ADVANCED=y
293 313
294# 314#
295# Core Netfilter Configuration 315# Core Netfilter Configuration
296# 316#
297# CONFIG_NETFILTER_NETLINK is not set 317# CONFIG_NETFILTER_NETLINK_QUEUE is not set
298# CONFIG_NF_CONNTRACK_ENABLED is not set 318# CONFIG_NETFILTER_NETLINK_LOG is not set
299# CONFIG_NF_CONNTRACK is not set 319# CONFIG_NF_CONNTRACK is not set
300CONFIG_NETFILTER_XTABLES=m 320CONFIG_NETFILTER_XTABLES=m
301# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set 321# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
302# CONFIG_NETFILTER_XT_TARGET_MARK is not set 322# CONFIG_NETFILTER_XT_TARGET_MARK is not set
303# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set 323# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
304# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 324# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
325# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
305# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 326# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
306# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set 327# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
307# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 328# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
308# CONFIG_NETFILTER_XT_MATCH_DSCP is not set 329# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
309# CONFIG_NETFILTER_XT_MATCH_ESP is not set 330# CONFIG_NETFILTER_XT_MATCH_ESP is not set
331# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
310# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set 332# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
311# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set 333# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
312# CONFIG_NETFILTER_XT_MATCH_MAC is not set 334# CONFIG_NETFILTER_XT_MATCH_MAC is not set
313# CONFIG_NETFILTER_XT_MATCH_MARK is not set 335# CONFIG_NETFILTER_XT_MATCH_MARK is not set
336# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
314# CONFIG_NETFILTER_XT_MATCH_POLICY is not set 337# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
315# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set 338# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
316# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set 339# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
317# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 340# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
341# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
318# CONFIG_NETFILTER_XT_MATCH_REALM is not set 342# CONFIG_NETFILTER_XT_MATCH_REALM is not set
319# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 343# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
320# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 344# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
@@ -329,13 +353,10 @@ CONFIG_NETFILTER_XTABLES=m
329# 353#
330# CONFIG_IP_NF_QUEUE is not set 354# CONFIG_IP_NF_QUEUE is not set
331CONFIG_IP_NF_IPTABLES=m 355CONFIG_IP_NF_IPTABLES=m
332# CONFIG_IP_NF_MATCH_IPRANGE is not set
333# CONFIG_IP_NF_MATCH_TOS is not set
334# CONFIG_IP_NF_MATCH_RECENT is not set 356# CONFIG_IP_NF_MATCH_RECENT is not set
335# CONFIG_IP_NF_MATCH_ECN is not set 357# CONFIG_IP_NF_MATCH_ECN is not set
336# CONFIG_IP_NF_MATCH_AH is not set 358# CONFIG_IP_NF_MATCH_AH is not set
337# CONFIG_IP_NF_MATCH_TTL is not set 359# CONFIG_IP_NF_MATCH_TTL is not set
338# CONFIG_IP_NF_MATCH_OWNER is not set
339# CONFIG_IP_NF_MATCH_ADDRTYPE is not set 360# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
340CONFIG_IP_NF_FILTER=m 361CONFIG_IP_NF_FILTER=m
341# CONFIG_IP_NF_TARGET_REJECT is not set 362# CONFIG_IP_NF_TARGET_REJECT is not set
@@ -365,6 +386,7 @@ CONFIG_IP_NF_FILTER=m
365# 386#
366CONFIG_NET_PKTGEN=y 387CONFIG_NET_PKTGEN=y
367# CONFIG_HAMRADIO is not set 388# CONFIG_HAMRADIO is not set
389# CONFIG_CAN is not set
368# CONFIG_IRDA is not set 390# CONFIG_IRDA is not set
369# CONFIG_BT is not set 391# CONFIG_BT is not set
370# CONFIG_AF_RXRPC is not set 392# CONFIG_AF_RXRPC is not set
@@ -418,7 +440,7 @@ CONFIG_BLK_DEV_NBD=m
418CONFIG_BLK_DEV_RAM=y 440CONFIG_BLK_DEV_RAM=y
419CONFIG_BLK_DEV_RAM_COUNT=16 441CONFIG_BLK_DEV_RAM_COUNT=16
420CONFIG_BLK_DEV_RAM_SIZE=32768 442CONFIG_BLK_DEV_RAM_SIZE=32768
421CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 443# CONFIG_BLK_DEV_XIP is not set
422# CONFIG_CDROM_PKTCDVD is not set 444# CONFIG_CDROM_PKTCDVD is not set
423# CONFIG_ATA_OVER_ETH is not set 445# CONFIG_ATA_OVER_ETH is not set
424CONFIG_MISC_DEVICES=y 446CONFIG_MISC_DEVICES=y
@@ -426,17 +448,20 @@ CONFIG_MISC_DEVICES=y
426# CONFIG_EEPROM_93CX6 is not set 448# CONFIG_EEPROM_93CX6 is not set
427# CONFIG_SGI_IOC4 is not set 449# CONFIG_SGI_IOC4 is not set
428# CONFIG_TIFM_CORE is not set 450# CONFIG_TIFM_CORE is not set
451# CONFIG_ENCLOSURE_SERVICES is not set
452CONFIG_HAVE_IDE=y
429CONFIG_IDE=y 453CONFIG_IDE=y
430CONFIG_IDE_MAX_HWIFS=4 454CONFIG_IDE_MAX_HWIFS=4
431CONFIG_BLK_DEV_IDE=y 455CONFIG_BLK_DEV_IDE=y
432 456
433# 457#
434# Please see Documentation/ide.txt for help/info on IDE drives 458# Please see Documentation/ide/ide.txt for help/info on IDE drives
435# 459#
436# CONFIG_BLK_DEV_IDE_SATA is not set 460# CONFIG_BLK_DEV_IDE_SATA is not set
437CONFIG_BLK_DEV_IDEDISK=y 461CONFIG_BLK_DEV_IDEDISK=y
438# CONFIG_IDEDISK_MULTI_MODE is not set 462# CONFIG_IDEDISK_MULTI_MODE is not set
439CONFIG_BLK_DEV_IDECD=m 463CONFIG_BLK_DEV_IDECD=m
464CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
440# CONFIG_BLK_DEV_IDETAPE is not set 465# CONFIG_BLK_DEV_IDETAPE is not set
441# CONFIG_BLK_DEV_IDEFLOPPY is not set 466# CONFIG_BLK_DEV_IDEFLOPPY is not set
442# CONFIG_BLK_DEV_IDESCSI is not set 467# CONFIG_BLK_DEV_IDESCSI is not set
@@ -452,7 +477,6 @@ CONFIG_IDE_GENERIC=y
452# 477#
453# PCI IDE chipsets support 478# PCI IDE chipsets support
454# 479#
455# CONFIG_IDEPCI_PCIBUS_ORDER is not set
456# CONFIG_BLK_DEV_GENERIC is not set 480# CONFIG_BLK_DEV_GENERIC is not set
457# CONFIG_BLK_DEV_OPTI621 is not set 481# CONFIG_BLK_DEV_OPTI621 is not set
458# CONFIG_BLK_DEV_AEC62XX is not set 482# CONFIG_BLK_DEV_AEC62XX is not set
@@ -480,7 +504,6 @@ CONFIG_IDE_GENERIC=y
480# CONFIG_BLK_DEV_TRM290 is not set 504# CONFIG_BLK_DEV_TRM290 is not set
481# CONFIG_BLK_DEV_VIA82CXXX is not set 505# CONFIG_BLK_DEV_VIA82CXXX is not set
482# CONFIG_BLK_DEV_TC86C001 is not set 506# CONFIG_BLK_DEV_TC86C001 is not set
483# CONFIG_IDE_ARM is not set
484# CONFIG_BLK_DEV_IDEDMA is not set 507# CONFIG_BLK_DEV_IDEDMA is not set
485CONFIG_IDE_ARCH_OBSOLETE_INIT=y 508CONFIG_IDE_ARCH_OBSOLETE_INIT=y
486# CONFIG_BLK_DEV_HD is not set 509# CONFIG_BLK_DEV_HD is not set
@@ -550,6 +573,7 @@ CONFIG_SCSI_LOWLEVEL=y
550# CONFIG_SCSI_INIA100 is not set 573# CONFIG_SCSI_INIA100 is not set
551# CONFIG_SCSI_PPA is not set 574# CONFIG_SCSI_PPA is not set
552# CONFIG_SCSI_IMM is not set 575# CONFIG_SCSI_IMM is not set
576# CONFIG_SCSI_MVSAS is not set
553# CONFIG_SCSI_STEX is not set 577# CONFIG_SCSI_STEX is not set
554# CONFIG_SCSI_SYM53C8XX_2 is not set 578# CONFIG_SCSI_SYM53C8XX_2 is not set
555# CONFIG_SCSI_QLOGIC_1280 is not set 579# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -595,6 +619,7 @@ CONFIG_MARVELL_PHY=y
595# CONFIG_SMSC_PHY is not set 619# CONFIG_SMSC_PHY is not set
596# CONFIG_BROADCOM_PHY is not set 620# CONFIG_BROADCOM_PHY is not set
597# CONFIG_ICPLUS_PHY is not set 621# CONFIG_ICPLUS_PHY is not set
622# CONFIG_REALTEK_PHY is not set
598# CONFIG_FIXED_PHY is not set 623# CONFIG_FIXED_PHY is not set
599# CONFIG_MDIO_BITBANG is not set 624# CONFIG_MDIO_BITBANG is not set
600CONFIG_NET_ETHERNET=y 625CONFIG_NET_ETHERNET=y
@@ -618,7 +643,9 @@ CONFIG_NETDEV_1000=y
618# CONFIG_DL2K is not set 643# CONFIG_DL2K is not set
619# CONFIG_E1000 is not set 644# CONFIG_E1000 is not set
620# CONFIG_E1000E is not set 645# CONFIG_E1000E is not set
646# CONFIG_E1000E_ENABLED is not set
621# CONFIG_IP1000 is not set 647# CONFIG_IP1000 is not set
648# CONFIG_IGB is not set
622# CONFIG_NS83820 is not set 649# CONFIG_NS83820 is not set
623# CONFIG_HAMACHI is not set 650# CONFIG_HAMACHI is not set
624# CONFIG_YELLOWFIN is not set 651# CONFIG_YELLOWFIN is not set
@@ -645,6 +672,7 @@ CONFIG_NETDEV_10000=y
645# CONFIG_NIU is not set 672# CONFIG_NIU is not set
646# CONFIG_MLX4_CORE is not set 673# CONFIG_MLX4_CORE is not set
647# CONFIG_TEHUTI is not set 674# CONFIG_TEHUTI is not set
675# CONFIG_BNX2X is not set
648# CONFIG_TR is not set 676# CONFIG_TR is not set
649 677
650# 678#
@@ -659,7 +687,6 @@ CONFIG_NETDEV_10000=y
659# CONFIG_PPP is not set 687# CONFIG_PPP is not set
660# CONFIG_SLIP is not set 688# CONFIG_SLIP is not set
661# CONFIG_NET_FC is not set 689# CONFIG_NET_FC is not set
662# CONFIG_SHAPER is not set
663# CONFIG_NETCONSOLE is not set 690# CONFIG_NETCONSOLE is not set
664# CONFIG_NETPOLL is not set 691# CONFIG_NETPOLL is not set
665# CONFIG_NET_POLL_CONTROLLER is not set 692# CONFIG_NET_POLL_CONTROLLER is not set
@@ -727,6 +754,7 @@ CONFIG_SERIO_LIBPS2=y
727# 754#
728# CONFIG_VT is not set 755# CONFIG_VT is not set
729# CONFIG_SERIAL_NONSTANDARD is not set 756# CONFIG_SERIAL_NONSTANDARD is not set
757# CONFIG_NOZOMI is not set
730 758
731# 759#
732# Serial drivers 760# Serial drivers
@@ -805,14 +833,12 @@ CONFIG_I2C_ALGOBIT=m
805# 833#
806# Miscellaneous I2C Chip support 834# Miscellaneous I2C Chip support
807# 835#
808# CONFIG_SENSORS_DS1337 is not set
809# CONFIG_SENSORS_DS1374 is not set
810# CONFIG_DS1682 is not set 836# CONFIG_DS1682 is not set
811# CONFIG_SENSORS_EEPROM is not set 837# CONFIG_SENSORS_EEPROM is not set
812# CONFIG_SENSORS_PCF8574 is not set 838# CONFIG_SENSORS_PCF8574 is not set
813# CONFIG_SENSORS_PCA9539 is not set 839# CONFIG_PCF8575 is not set
814# CONFIG_SENSORS_PCF8591 is not set 840# CONFIG_SENSORS_PCF8591 is not set
815# CONFIG_SENSORS_M41T00 is not set 841# CONFIG_TPS65010 is not set
816# CONFIG_SENSORS_MAX6875 is not set 842# CONFIG_SENSORS_MAX6875 is not set
817# CONFIG_SENSORS_TSL2550 is not set 843# CONFIG_SENSORS_TSL2550 is not set
818# CONFIG_I2C_DEBUG_CORE is not set 844# CONFIG_I2C_DEBUG_CORE is not set
@@ -837,6 +863,7 @@ CONFIG_HWMON=y
837# CONFIG_SENSORS_ADM1031 is not set 863# CONFIG_SENSORS_ADM1031 is not set
838# CONFIG_SENSORS_ADM9240 is not set 864# CONFIG_SENSORS_ADM9240 is not set
839# CONFIG_SENSORS_ADT7470 is not set 865# CONFIG_SENSORS_ADT7470 is not set
866# CONFIG_SENSORS_ADT7473 is not set
840# CONFIG_SENSORS_ATXP1 is not set 867# CONFIG_SENSORS_ATXP1 is not set
841# CONFIG_SENSORS_DS1621 is not set 868# CONFIG_SENSORS_DS1621 is not set
842# CONFIG_SENSORS_I5K_AMB is not set 869# CONFIG_SENSORS_I5K_AMB is not set
@@ -866,6 +893,7 @@ CONFIG_HWMON=y
866# CONFIG_SENSORS_SMSC47M1 is not set 893# CONFIG_SENSORS_SMSC47M1 is not set
867# CONFIG_SENSORS_SMSC47M192 is not set 894# CONFIG_SENSORS_SMSC47M192 is not set
868# CONFIG_SENSORS_SMSC47B397 is not set 895# CONFIG_SENSORS_SMSC47B397 is not set
896# CONFIG_SENSORS_ADS7828 is not set
869# CONFIG_SENSORS_THMC50 is not set 897# CONFIG_SENSORS_THMC50 is not set
870# CONFIG_SENSORS_VIA686A is not set 898# CONFIG_SENSORS_VIA686A is not set
871# CONFIG_SENSORS_VT1211 is not set 899# CONFIG_SENSORS_VT1211 is not set
@@ -875,9 +903,11 @@ CONFIG_HWMON=y
875# CONFIG_SENSORS_W83792D is not set 903# CONFIG_SENSORS_W83792D is not set
876# CONFIG_SENSORS_W83793 is not set 904# CONFIG_SENSORS_W83793 is not set
877# CONFIG_SENSORS_W83L785TS is not set 905# CONFIG_SENSORS_W83L785TS is not set
906# CONFIG_SENSORS_W83L786NG is not set
878# CONFIG_SENSORS_W83627HF is not set 907# CONFIG_SENSORS_W83627HF is not set
879# CONFIG_SENSORS_W83627EHF is not set 908# CONFIG_SENSORS_W83627EHF is not set
880# CONFIG_HWMON_DEBUG_CHIP is not set 909# CONFIG_HWMON_DEBUG_CHIP is not set
910# CONFIG_THERMAL is not set
881# CONFIG_WATCHDOG is not set 911# CONFIG_WATCHDOG is not set
882 912
883# 913#
@@ -947,16 +977,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
947# 977#
948# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 978# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
949# 979#
950
951#
952# USB Gadget Support
953#
954# CONFIG_USB_GADGET is not set 980# CONFIG_USB_GADGET is not set
955# CONFIG_MMC is not set 981# CONFIG_MMC is not set
982# CONFIG_MEMSTICK is not set
956# CONFIG_NEW_LEDS is not set 983# CONFIG_NEW_LEDS is not set
957# CONFIG_INFINIBAND is not set 984# CONFIG_INFINIBAND is not set
958# CONFIG_EDAC is not set 985# CONFIG_EDAC is not set
959# CONFIG_RTC_CLASS is not set 986# CONFIG_RTC_CLASS is not set
987# CONFIG_DMADEVICES is not set
960# CONFIG_AUXDISPLAY is not set 988# CONFIG_AUXDISPLAY is not set
961 989
962# 990#
@@ -983,12 +1011,10 @@ CONFIG_FS_MBCACHE=y
983# CONFIG_XFS_FS is not set 1011# CONFIG_XFS_FS is not set
984# CONFIG_GFS2_FS is not set 1012# CONFIG_GFS2_FS is not set
985# CONFIG_OCFS2_FS is not set 1013# CONFIG_OCFS2_FS is not set
986# CONFIG_MINIX_FS is not set 1014CONFIG_DNOTIFY=y
987# CONFIG_ROMFS_FS is not set
988CONFIG_INOTIFY=y 1015CONFIG_INOTIFY=y
989CONFIG_INOTIFY_USER=y 1016CONFIG_INOTIFY_USER=y
990# CONFIG_QUOTA is not set 1017# CONFIG_QUOTA is not set
991CONFIG_DNOTIFY=y
992CONFIG_AUTOFS_FS=m 1018CONFIG_AUTOFS_FS=m
993CONFIG_AUTOFS4_FS=y 1019CONFIG_AUTOFS4_FS=y
994# CONFIG_FUSE_FS is not set 1020# CONFIG_FUSE_FS is not set
@@ -1036,8 +1062,10 @@ CONFIG_TMPFS=y
1036# CONFIG_EFS_FS is not set 1062# CONFIG_EFS_FS is not set
1037CONFIG_CRAMFS=m 1063CONFIG_CRAMFS=m
1038# CONFIG_VXFS_FS is not set 1064# CONFIG_VXFS_FS is not set
1065# CONFIG_MINIX_FS is not set
1039# CONFIG_HPFS_FS is not set 1066# CONFIG_HPFS_FS is not set
1040# CONFIG_QNX4FS_FS is not set 1067# CONFIG_QNX4FS_FS is not set
1068# CONFIG_ROMFS_FS is not set
1041# CONFIG_SYSV_FS is not set 1069# CONFIG_SYSV_FS is not set
1042# CONFIG_UFS_FS is not set 1070# CONFIG_UFS_FS is not set
1043CONFIG_NETWORK_FILESYSTEMS=y 1071CONFIG_NETWORK_FILESYSTEMS=y
@@ -1124,10 +1152,6 @@ CONFIG_PLIST=y
1124CONFIG_HAS_IOMEM=y 1152CONFIG_HAS_IOMEM=y
1125CONFIG_HAS_IOPORT=y 1153CONFIG_HAS_IOPORT=y
1126CONFIG_HAS_DMA=y 1154CONFIG_HAS_DMA=y
1127CONFIG_INSTRUMENTATION=y
1128# CONFIG_PROFILING is not set
1129# CONFIG_KPROBES is not set
1130# CONFIG_MARKERS is not set
1131 1155
1132# 1156#
1133# Kernel hacking 1157# Kernel hacking
@@ -1146,6 +1170,7 @@ CONFIG_SCHED_DEBUG=y
1146# CONFIG_SCHEDSTATS is not set 1170# CONFIG_SCHEDSTATS is not set
1147# CONFIG_TIMER_STATS is not set 1171# CONFIG_TIMER_STATS is not set
1148# CONFIG_SLUB_DEBUG_ON is not set 1172# CONFIG_SLUB_DEBUG_ON is not set
1173# CONFIG_SLUB_STATS is not set
1149# CONFIG_DEBUG_RT_MUTEXES is not set 1174# CONFIG_DEBUG_RT_MUTEXES is not set
1150# CONFIG_RT_MUTEX_TESTER is not set 1175# CONFIG_RT_MUTEX_TESTER is not set
1151# CONFIG_DEBUG_SPINLOCK is not set 1176# CONFIG_DEBUG_SPINLOCK is not set
@@ -1159,9 +1184,9 @@ CONFIG_SCHED_DEBUG=y
1159# CONFIG_DEBUG_VM is not set 1184# CONFIG_DEBUG_VM is not set
1160# CONFIG_DEBUG_LIST is not set 1185# CONFIG_DEBUG_LIST is not set
1161# CONFIG_DEBUG_SG is not set 1186# CONFIG_DEBUG_SG is not set
1162CONFIG_FORCED_INLINING=y
1163# CONFIG_BOOT_PRINTK_DELAY is not set 1187# CONFIG_BOOT_PRINTK_DELAY is not set
1164# CONFIG_RCU_TORTURE_TEST is not set 1188# CONFIG_RCU_TORTURE_TEST is not set
1189# CONFIG_BACKTRACE_SELF_TEST is not set
1165# CONFIG_FAULT_INJECTION is not set 1190# CONFIG_FAULT_INJECTION is not set
1166# CONFIG_SAMPLES is not set 1191# CONFIG_SAMPLES is not set
1167# CONFIG_DEBUG_STACKOVERFLOW is not set 1192# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1178,6 +1203,51 @@ CONFIG_BDI_SWITCH=y
1178# CONFIG_KEYS is not set 1203# CONFIG_KEYS is not set
1179# CONFIG_SECURITY is not set 1204# CONFIG_SECURITY is not set
1180# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1205# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1181# CONFIG_CRYPTO is not set 1206CONFIG_CRYPTO=y
1207# CONFIG_CRYPTO_SEQIV is not set
1208# CONFIG_CRYPTO_MANAGER is not set
1209# CONFIG_CRYPTO_HMAC is not set
1210# CONFIG_CRYPTO_XCBC is not set
1211# CONFIG_CRYPTO_NULL is not set
1212# CONFIG_CRYPTO_MD4 is not set
1213# CONFIG_CRYPTO_MD5 is not set
1214# CONFIG_CRYPTO_SHA1 is not set
1215# CONFIG_CRYPTO_SHA256 is not set
1216# CONFIG_CRYPTO_SHA512 is not set
1217# CONFIG_CRYPTO_WP512 is not set
1218# CONFIG_CRYPTO_TGR192 is not set
1219# CONFIG_CRYPTO_GF128MUL is not set
1220# CONFIG_CRYPTO_ECB is not set
1221# CONFIG_CRYPTO_CBC is not set
1222# CONFIG_CRYPTO_PCBC is not set
1223# CONFIG_CRYPTO_LRW is not set
1224# CONFIG_CRYPTO_XTS is not set
1225# CONFIG_CRYPTO_CTR is not set
1226# CONFIG_CRYPTO_GCM is not set
1227# CONFIG_CRYPTO_CCM is not set
1228# CONFIG_CRYPTO_CRYPTD is not set
1229# CONFIG_CRYPTO_DES is not set
1230# CONFIG_CRYPTO_FCRYPT is not set
1231# CONFIG_CRYPTO_BLOWFISH is not set
1232# CONFIG_CRYPTO_TWOFISH is not set
1233# CONFIG_CRYPTO_SERPENT is not set
1234# CONFIG_CRYPTO_AES is not set
1235# CONFIG_CRYPTO_CAST5 is not set
1236# CONFIG_CRYPTO_CAST6 is not set
1237# CONFIG_CRYPTO_TEA is not set
1238# CONFIG_CRYPTO_ARC4 is not set
1239# CONFIG_CRYPTO_KHAZAD is not set
1240# CONFIG_CRYPTO_ANUBIS is not set
1241# CONFIG_CRYPTO_SEED is not set
1242# CONFIG_CRYPTO_SALSA20 is not set
1243# CONFIG_CRYPTO_DEFLATE is not set
1244# CONFIG_CRYPTO_MICHAEL_MIC is not set
1245# CONFIG_CRYPTO_CRC32C is not set
1246# CONFIG_CRYPTO_CAMELLIA is not set
1247# CONFIG_CRYPTO_TEST is not set
1248# CONFIG_CRYPTO_AUTHENC is not set
1249# CONFIG_CRYPTO_LZO is not set
1250CONFIG_CRYPTO_HW=y
1251# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1182# CONFIG_PPC_CLOCK is not set 1252# CONFIG_PPC_CLOCK is not set
1183CONFIG_PPC_LIB_RHEAP=y 1253CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/tqm8540_defconfig b/arch/powerpc/configs/tqm8540_defconfig
index 732de34cfc27..d39ee3b35bfc 100644
--- a/arch/powerpc/configs/tqm8540_defconfig
+++ b/arch/powerpc/configs/tqm8540_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-rc8 3# Linux kernel version: 2.6.25-rc6
4# Fri Jan 25 01:32:05 2008 4# Mon Mar 24 08:48:43 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,10 +14,10 @@ CONFIG_PPC_85xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y 17CONFIG_E500=y
19CONFIG_BOOKE=y 18CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 19CONFIG_FSL_BOOKE=y
20CONFIG_FSL_EMB_PERFMON=y
21# CONFIG_PHYS_64BIT is not set 21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -67,17 +68,19 @@ CONFIG_SYSVIPC_SYSCTL=y
67# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
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
81CONFIG_SYSFS_DEPRECATED_V2=y
80# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
83# CONFIG_NAMESPACES is not set
81CONFIG_BLK_DEV_INITRD=y 84CONFIG_BLK_DEV_INITRD=y
82CONFIG_INITRAMFS_SOURCE="" 85CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -89,11 +92,13 @@ CONFIG_SYSCTL_SYSCALL=y
89CONFIG_PRINTK=y 92CONFIG_PRINTK=y
90CONFIG_BUG=y 93CONFIG_BUG=y
91CONFIG_ELF_CORE=y 94CONFIG_ELF_CORE=y
95CONFIG_COMPAT_BRK=y
92CONFIG_BASE_FULL=y 96CONFIG_BASE_FULL=y
93CONFIG_FUTEX=y 97CONFIG_FUTEX=y
94CONFIG_ANON_INODES=y 98CONFIG_ANON_INODES=y
95# CONFIG_EPOLL is not set 99# CONFIG_EPOLL is not set
96CONFIG_SIGNALFD=y 100CONFIG_SIGNALFD=y
101CONFIG_TIMERFD=y
97CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
98CONFIG_SHMEM=y 103CONFIG_SHMEM=y
99CONFIG_VM_EVENT_COUNTERS=y 104CONFIG_VM_EVENT_COUNTERS=y
@@ -101,6 +106,12 @@ CONFIG_SLUB_DEBUG=y
101# CONFIG_SLAB is not set 106# CONFIG_SLAB is not set
102CONFIG_SLUB=y 107CONFIG_SLUB=y
103# CONFIG_SLOB is not set 108# CONFIG_SLOB is not set
109# CONFIG_PROFILING is not set
110# CONFIG_MARKERS is not set
111CONFIG_HAVE_OPROFILE=y
112CONFIG_HAVE_KPROBES=y
113CONFIG_HAVE_KRETPROBES=y
114CONFIG_PROC_PAGE_MONITOR=y
104CONFIG_SLABINFO=y 115CONFIG_SLABINFO=y
105CONFIG_RT_MUTEXES=y 116CONFIG_RT_MUTEXES=y
106# CONFIG_TINY_SHMEM is not set 117# CONFIG_TINY_SHMEM is not set
@@ -124,15 +135,17 @@ CONFIG_DEFAULT_AS=y
124# CONFIG_DEFAULT_CFQ is not set 135# CONFIG_DEFAULT_CFQ is not set
125# CONFIG_DEFAULT_NOOP is not set 136# CONFIG_DEFAULT_NOOP is not set
126CONFIG_DEFAULT_IOSCHED="anticipatory" 137CONFIG_DEFAULT_IOSCHED="anticipatory"
138CONFIG_CLASSIC_RCU=y
127 139
128# 140#
129# Platform support 141# Platform support
130# 142#
131# CONFIG_PPC_MPC52xx is not set 143# CONFIG_PPC_MPC512x is not set
132# CONFIG_PPC_MPC5200 is not set 144# CONFIG_PPC_MPC5121 is not set
133# CONFIG_PPC_CELL is not set 145# CONFIG_PPC_CELL is not set
134# CONFIG_PPC_CELL_NATIVE is not set 146# CONFIG_PPC_CELL_NATIVE is not set
135# CONFIG_PQ2ADS is not set 147# CONFIG_PQ2ADS is not set
148CONFIG_MPC85xx=y
136# CONFIG_MPC8540_ADS is not set 149# CONFIG_MPC8540_ADS is not set
137# CONFIG_MPC8560_ADS is not set 150# CONFIG_MPC8560_ADS is not set
138# CONFIG_MPC85xx_CDS is not set 151# CONFIG_MPC85xx_CDS is not set
@@ -143,8 +156,9 @@ CONFIG_TQM8540=y
143# CONFIG_TQM8541 is not set 156# CONFIG_TQM8541 is not set
144# CONFIG_TQM8555 is not set 157# CONFIG_TQM8555 is not set
145# CONFIG_TQM8560 is not set 158# CONFIG_TQM8560 is not set
159# CONFIG_SBC8548 is not set
160# CONFIG_SBC8560 is not set
146CONFIG_TQM85xx=y 161CONFIG_TQM85xx=y
147CONFIG_MPC85xx=y
148# CONFIG_IPIC is not set 162# CONFIG_IPIC is not set
149CONFIG_MPIC=y 163CONFIG_MPIC=y
150# CONFIG_MPIC_WEIRD is not set 164# CONFIG_MPIC_WEIRD is not set
@@ -173,13 +187,17 @@ 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
179CONFIG_BINFMT_ELF=y 194CONFIG_BINFMT_ELF=y
180# CONFIG_BINFMT_MISC is not set 195# CONFIG_BINFMT_MISC is not set
181CONFIG_MATH_EMULATION=y 196CONFIG_MATH_EMULATION=y
197# CONFIG_IOMMU_HELPER is not set
182CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 198CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
199CONFIG_ARCH_HAS_WALK_MEMORY=y
200CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
183CONFIG_ARCH_FLATMEM_ENABLE=y 201CONFIG_ARCH_FLATMEM_ENABLE=y
184CONFIG_ARCH_POPULATES_NODE_MAP=y 202CONFIG_ARCH_POPULATES_NODE_MAP=y
185CONFIG_SELECT_MEMORY_MODEL=y 203CONFIG_SELECT_MEMORY_MODEL=y
@@ -198,11 +216,7 @@ CONFIG_VIRT_TO_BUS=y
198# CONFIG_PROC_DEVICETREE is not set 216# CONFIG_PROC_DEVICETREE is not set
199# CONFIG_CMDLINE_BOOL is not set 217# CONFIG_CMDLINE_BOOL is not set
200# CONFIG_PM is not set 218# CONFIG_PM is not set
201CONFIG_SUSPEND_UP_POSSIBLE=y
202CONFIG_HIBERNATION_UP_POSSIBLE=y
203CONFIG_SECCOMP=y 219CONFIG_SECCOMP=y
204CONFIG_WANT_DEVICE_TREE=y
205CONFIG_DEVICE_TREE="tqm8540.dts"
206CONFIG_ISA_DMA_API=y 220CONFIG_ISA_DMA_API=y
207 221
208# 222#
@@ -249,6 +263,7 @@ CONFIG_XFRM=y
249# CONFIG_XFRM_USER is not set 263# CONFIG_XFRM_USER is not set
250# CONFIG_XFRM_SUB_POLICY is not set 264# CONFIG_XFRM_SUB_POLICY is not set
251# CONFIG_XFRM_MIGRATE is not set 265# CONFIG_XFRM_MIGRATE is not set
266# CONFIG_XFRM_STATISTICS is not set
252# CONFIG_NET_KEY is not set 267# CONFIG_NET_KEY is not set
253CONFIG_INET=y 268CONFIG_INET=y
254CONFIG_IP_MULTICAST=y 269CONFIG_IP_MULTICAST=y
@@ -304,6 +319,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
304# 319#
305# CONFIG_NET_PKTGEN is not set 320# CONFIG_NET_PKTGEN is not set
306# CONFIG_HAMRADIO is not set 321# CONFIG_HAMRADIO is not set
322# CONFIG_CAN is not set
307# CONFIG_IRDA is not set 323# CONFIG_IRDA is not set
308# CONFIG_BT is not set 324# CONFIG_BT is not set
309# CONFIG_AF_RXRPC is not set 325# CONFIG_AF_RXRPC is not set
@@ -335,6 +351,7 @@ CONFIG_MTD_CONCAT=y
335CONFIG_MTD_PARTITIONS=y 351CONFIG_MTD_PARTITIONS=y
336# CONFIG_MTD_REDBOOT_PARTS is not set 352# CONFIG_MTD_REDBOOT_PARTS is not set
337CONFIG_MTD_CMDLINE_PARTS=y 353CONFIG_MTD_CMDLINE_PARTS=y
354# CONFIG_MTD_OF_PARTS is not set
338 355
339# 356#
340# User Modules And Translation Layers 357# User Modules And Translation Layers
@@ -421,7 +438,7 @@ CONFIG_BLK_DEV_LOOP=y
421CONFIG_BLK_DEV_RAM=y 438CONFIG_BLK_DEV_RAM=y
422CONFIG_BLK_DEV_RAM_COUNT=16 439CONFIG_BLK_DEV_RAM_COUNT=16
423CONFIG_BLK_DEV_RAM_SIZE=32768 440CONFIG_BLK_DEV_RAM_SIZE=32768
424CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 441# CONFIG_BLK_DEV_XIP is not set
425# CONFIG_CDROM_PKTCDVD is not set 442# CONFIG_CDROM_PKTCDVD is not set
426# CONFIG_ATA_OVER_ETH is not set 443# CONFIG_ATA_OVER_ETH is not set
427CONFIG_MISC_DEVICES=y 444CONFIG_MISC_DEVICES=y
@@ -429,12 +446,14 @@ CONFIG_MISC_DEVICES=y
429# CONFIG_EEPROM_93CX6 is not set 446# CONFIG_EEPROM_93CX6 is not set
430# CONFIG_SGI_IOC4 is not set 447# CONFIG_SGI_IOC4 is not set
431# CONFIG_TIFM_CORE is not set 448# CONFIG_TIFM_CORE is not set
449# CONFIG_ENCLOSURE_SERVICES is not set
450CONFIG_HAVE_IDE=y
432CONFIG_IDE=y 451CONFIG_IDE=y
433CONFIG_IDE_MAX_HWIFS=4 452CONFIG_IDE_MAX_HWIFS=4
434CONFIG_BLK_DEV_IDE=y 453CONFIG_BLK_DEV_IDE=y
435 454
436# 455#
437# Please see Documentation/ide.txt for help/info on IDE drives 456# Please see Documentation/ide/ide.txt for help/info on IDE drives
438# 457#
439# CONFIG_BLK_DEV_IDE_SATA is not set 458# CONFIG_BLK_DEV_IDE_SATA is not set
440CONFIG_BLK_DEV_IDEDISK=y 459CONFIG_BLK_DEV_IDEDISK=y
@@ -450,12 +469,12 @@ CONFIG_IDE_PROC_FS=y
450# 469#
451CONFIG_IDE_GENERIC=y 470CONFIG_IDE_GENERIC=y
452# CONFIG_BLK_DEV_PLATFORM is not set 471# CONFIG_BLK_DEV_PLATFORM is not set
472CONFIG_BLK_DEV_IDEDMA_SFF=y
453 473
454# 474#
455# PCI IDE chipsets support 475# PCI IDE chipsets support
456# 476#
457CONFIG_BLK_DEV_IDEPCI=y 477CONFIG_BLK_DEV_IDEPCI=y
458CONFIG_IDEPCI_SHARE_IRQ=y
459CONFIG_IDEPCI_PCIBUS_ORDER=y 478CONFIG_IDEPCI_PCIBUS_ORDER=y
460# CONFIG_BLK_DEV_OFFBOARD is not set 479# CONFIG_BLK_DEV_OFFBOARD is not set
461CONFIG_BLK_DEV_GENERIC=y 480CONFIG_BLK_DEV_GENERIC=y
@@ -486,7 +505,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
486# CONFIG_BLK_DEV_TRM290 is not set 505# CONFIG_BLK_DEV_TRM290 is not set
487CONFIG_BLK_DEV_VIA82CXXX=y 506CONFIG_BLK_DEV_VIA82CXXX=y
488# CONFIG_BLK_DEV_TC86C001 is not set 507# CONFIG_BLK_DEV_TC86C001 is not set
489# CONFIG_IDE_ARM is not set
490CONFIG_BLK_DEV_IDEDMA=y 508CONFIG_BLK_DEV_IDEDMA=y
491CONFIG_IDE_ARCH_OBSOLETE_INIT=y 509CONFIG_IDE_ARCH_OBSOLETE_INIT=y
492# CONFIG_BLK_DEV_HD is not set 510# CONFIG_BLK_DEV_HD is not set
@@ -532,6 +550,7 @@ CONFIG_PHYLIB=y
532# CONFIG_SMSC_PHY is not set 550# CONFIG_SMSC_PHY is not set
533# CONFIG_BROADCOM_PHY is not set 551# CONFIG_BROADCOM_PHY is not set
534# CONFIG_ICPLUS_PHY is not set 552# CONFIG_ICPLUS_PHY is not set
553# CONFIG_REALTEK_PHY is not set
535# CONFIG_FIXED_PHY is not set 554# CONFIG_FIXED_PHY is not set
536# CONFIG_MDIO_BITBANG is not set 555# CONFIG_MDIO_BITBANG is not set
537CONFIG_NET_ETHERNET=y 556CONFIG_NET_ETHERNET=y
@@ -559,6 +578,7 @@ CONFIG_E100=y
559# CONFIG_NE2K_PCI is not set 578# CONFIG_NE2K_PCI is not set
560# CONFIG_8139CP is not set 579# CONFIG_8139CP is not set
561# CONFIG_8139TOO is not set 580# CONFIG_8139TOO is not set
581# CONFIG_R6040 is not set
562# CONFIG_SIS900 is not set 582# CONFIG_SIS900 is not set
563# CONFIG_EPIC100 is not set 583# CONFIG_EPIC100 is not set
564# CONFIG_SUNDANCE is not set 584# CONFIG_SUNDANCE is not set
@@ -570,7 +590,9 @@ CONFIG_NETDEV_1000=y
570# CONFIG_DL2K is not set 590# CONFIG_DL2K is not set
571# CONFIG_E1000 is not set 591# CONFIG_E1000 is not set
572# CONFIG_E1000E is not set 592# CONFIG_E1000E is not set
593# CONFIG_E1000E_ENABLED is not set
573# CONFIG_IP1000 is not set 594# CONFIG_IP1000 is not set
595# CONFIG_IGB is not set
574# CONFIG_NS83820 is not set 596# CONFIG_NS83820 is not set
575# CONFIG_HAMACHI is not set 597# CONFIG_HAMACHI is not set
576# CONFIG_YELLOWFIN is not set 598# CONFIG_YELLOWFIN is not set
@@ -597,6 +619,7 @@ CONFIG_NETDEV_10000=y
597# CONFIG_NIU is not set 619# CONFIG_NIU is not set
598# CONFIG_MLX4_CORE is not set 620# CONFIG_MLX4_CORE is not set
599# CONFIG_TEHUTI is not set 621# CONFIG_TEHUTI is not set
622# CONFIG_BNX2X is not set
600# CONFIG_TR is not set 623# CONFIG_TR is not set
601 624
602# 625#
@@ -609,7 +632,6 @@ CONFIG_NETDEV_10000=y
609# CONFIG_HIPPI is not set 632# CONFIG_HIPPI is not set
610# CONFIG_PPP is not set 633# CONFIG_PPP is not set
611# CONFIG_SLIP is not set 634# CONFIG_SLIP is not set
612# CONFIG_SHAPER is not set
613# CONFIG_NETCONSOLE is not set 635# CONFIG_NETCONSOLE is not set
614# CONFIG_NETPOLL is not set 636# CONFIG_NETPOLL is not set
615# CONFIG_NET_POLL_CONTROLLER is not set 637# CONFIG_NET_POLL_CONTROLLER is not set
@@ -652,6 +674,7 @@ CONFIG_INPUT=y
652# 674#
653# CONFIG_VT is not set 675# CONFIG_VT is not set
654# CONFIG_SERIAL_NONSTANDARD is not set 676# CONFIG_SERIAL_NONSTANDARD is not set
677# CONFIG_NOZOMI is not set
655 678
656# 679#
657# Serial drivers 680# Serial drivers
@@ -725,14 +748,12 @@ CONFIG_I2C_MPC=y
725# 748#
726# Miscellaneous I2C Chip support 749# Miscellaneous I2C Chip support
727# 750#
728CONFIG_SENSORS_DS1337=y
729# CONFIG_SENSORS_DS1374 is not set
730# CONFIG_DS1682 is not set 751# CONFIG_DS1682 is not set
731# CONFIG_SENSORS_EEPROM is not set 752# CONFIG_SENSORS_EEPROM is not set
732# CONFIG_SENSORS_PCF8574 is not set 753# CONFIG_SENSORS_PCF8574 is not set
733# CONFIG_SENSORS_PCA9539 is not set 754# CONFIG_PCF8575 is not set
734# CONFIG_SENSORS_PCF8591 is not set 755# CONFIG_SENSORS_PCF8591 is not set
735# CONFIG_SENSORS_M41T00 is not set 756# CONFIG_TPS65010 is not set
736# CONFIG_SENSORS_MAX6875 is not set 757# CONFIG_SENSORS_MAX6875 is not set
737# CONFIG_SENSORS_TSL2550 is not set 758# CONFIG_SENSORS_TSL2550 is not set
738# CONFIG_I2C_DEBUG_CORE is not set 759# CONFIG_I2C_DEBUG_CORE is not set
@@ -757,6 +778,7 @@ CONFIG_HWMON=y
757# CONFIG_SENSORS_ADM1031 is not set 778# CONFIG_SENSORS_ADM1031 is not set
758# CONFIG_SENSORS_ADM9240 is not set 779# CONFIG_SENSORS_ADM9240 is not set
759# CONFIG_SENSORS_ADT7470 is not set 780# CONFIG_SENSORS_ADT7470 is not set
781# CONFIG_SENSORS_ADT7473 is not set
760# CONFIG_SENSORS_ATXP1 is not set 782# CONFIG_SENSORS_ATXP1 is not set
761# CONFIG_SENSORS_DS1621 is not set 783# CONFIG_SENSORS_DS1621 is not set
762# CONFIG_SENSORS_I5K_AMB is not set 784# CONFIG_SENSORS_I5K_AMB is not set
@@ -786,6 +808,7 @@ CONFIG_SENSORS_LM75=y
786# CONFIG_SENSORS_SMSC47M1 is not set 808# CONFIG_SENSORS_SMSC47M1 is not set
787# CONFIG_SENSORS_SMSC47M192 is not set 809# CONFIG_SENSORS_SMSC47M192 is not set
788# CONFIG_SENSORS_SMSC47B397 is not set 810# CONFIG_SENSORS_SMSC47B397 is not set
811# CONFIG_SENSORS_ADS7828 is not set
789# CONFIG_SENSORS_THMC50 is not set 812# CONFIG_SENSORS_THMC50 is not set
790# CONFIG_SENSORS_VIA686A is not set 813# CONFIG_SENSORS_VIA686A is not set
791# CONFIG_SENSORS_VT1211 is not set 814# CONFIG_SENSORS_VT1211 is not set
@@ -795,9 +818,11 @@ CONFIG_SENSORS_LM75=y
795# CONFIG_SENSORS_W83792D is not set 818# CONFIG_SENSORS_W83792D is not set
796# CONFIG_SENSORS_W83793 is not set 819# CONFIG_SENSORS_W83793 is not set
797# CONFIG_SENSORS_W83L785TS is not set 820# CONFIG_SENSORS_W83L785TS is not set
821# CONFIG_SENSORS_W83L786NG is not set
798# CONFIG_SENSORS_W83627HF is not set 822# CONFIG_SENSORS_W83627HF is not set
799# CONFIG_SENSORS_W83627EHF is not set 823# CONFIG_SENSORS_W83627EHF is not set
800CONFIG_HWMON_DEBUG_CHIP=y 824CONFIG_HWMON_DEBUG_CHIP=y
825# CONFIG_THERMAL is not set
801# CONFIG_WATCHDOG is not set 826# CONFIG_WATCHDOG is not set
802 827
803# 828#
@@ -850,16 +875,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
850# 875#
851# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 876# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
852# 877#
853
854#
855# USB Gadget Support
856#
857# CONFIG_USB_GADGET is not set 878# CONFIG_USB_GADGET is not set
858# CONFIG_MMC is not set 879# CONFIG_MMC is not set
880# CONFIG_MEMSTICK is not set
859# CONFIG_NEW_LEDS is not set 881# CONFIG_NEW_LEDS is not set
860# CONFIG_INFINIBAND is not set 882# CONFIG_INFINIBAND is not set
861# CONFIG_EDAC is not set 883# CONFIG_EDAC is not set
862# CONFIG_RTC_CLASS is not set 884# CONFIG_RTC_CLASS is not set
885# CONFIG_DMADEVICES is not set
863 886
864# 887#
865# Userspace I/O 888# Userspace I/O
@@ -885,12 +908,10 @@ CONFIG_FS_MBCACHE=y
885# CONFIG_XFS_FS is not set 908# CONFIG_XFS_FS is not set
886# CONFIG_GFS2_FS is not set 909# CONFIG_GFS2_FS is not set
887# CONFIG_OCFS2_FS is not set 910# CONFIG_OCFS2_FS is not set
888# CONFIG_MINIX_FS is not set 911CONFIG_DNOTIFY=y
889# CONFIG_ROMFS_FS is not set
890CONFIG_INOTIFY=y 912CONFIG_INOTIFY=y
891CONFIG_INOTIFY_USER=y 913CONFIG_INOTIFY_USER=y
892# CONFIG_QUOTA is not set 914# CONFIG_QUOTA is not set
893CONFIG_DNOTIFY=y
894# CONFIG_AUTOFS_FS is not set 915# CONFIG_AUTOFS_FS is not set
895# CONFIG_AUTOFS4_FS is not set 916# CONFIG_AUTOFS4_FS is not set
896# CONFIG_FUSE_FS is not set 917# CONFIG_FUSE_FS is not set
@@ -943,8 +964,10 @@ CONFIG_JFFS2_RTIME=y
943# CONFIG_JFFS2_RUBIN is not set 964# CONFIG_JFFS2_RUBIN is not set
944CONFIG_CRAMFS=y 965CONFIG_CRAMFS=y
945# CONFIG_VXFS_FS is not set 966# CONFIG_VXFS_FS is not set
967# CONFIG_MINIX_FS is not set
946# CONFIG_HPFS_FS is not set 968# CONFIG_HPFS_FS is not set
947# CONFIG_QNX4FS_FS is not set 969# CONFIG_QNX4FS_FS is not set
970# CONFIG_ROMFS_FS is not set
948# CONFIG_SYSV_FS is not set 971# CONFIG_SYSV_FS is not set
949# CONFIG_UFS_FS is not set 972# CONFIG_UFS_FS is not set
950CONFIG_NETWORK_FILESYSTEMS=y 973CONFIG_NETWORK_FILESYSTEMS=y
@@ -1002,9 +1025,6 @@ CONFIG_PLIST=y
1002CONFIG_HAS_IOMEM=y 1025CONFIG_HAS_IOMEM=y
1003CONFIG_HAS_IOPORT=y 1026CONFIG_HAS_IOPORT=y
1004CONFIG_HAS_DMA=y 1027CONFIG_HAS_DMA=y
1005CONFIG_INSTRUMENTATION=y
1006# CONFIG_PROFILING is not set
1007# CONFIG_MARKERS is not set
1008 1028
1009# 1029#
1010# Kernel hacking 1030# Kernel hacking
@@ -1018,6 +1038,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1018# CONFIG_HEADERS_CHECK is not set 1038# CONFIG_HEADERS_CHECK is not set
1019# CONFIG_DEBUG_KERNEL is not set 1039# CONFIG_DEBUG_KERNEL is not set
1020# CONFIG_SLUB_DEBUG_ON is not set 1040# CONFIG_SLUB_DEBUG_ON is not set
1041# CONFIG_SLUB_STATS is not set
1021# CONFIG_DEBUG_BUGVERBOSE is not set 1042# CONFIG_DEBUG_BUGVERBOSE is not set
1022# CONFIG_SAMPLES is not set 1043# CONFIG_SAMPLES is not set
1023# CONFIG_PPC_EARLY_DEBUG is not set 1044# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1028,5 +1049,49 @@ CONFIG_ENABLE_MUST_CHECK=y
1028# CONFIG_KEYS is not set 1049# CONFIG_KEYS is not set
1029# CONFIG_SECURITY is not set 1050# CONFIG_SECURITY is not set
1030# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1051# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1031# CONFIG_CRYPTO is not set 1052CONFIG_CRYPTO=y
1053# CONFIG_CRYPTO_SEQIV is not set
1054# CONFIG_CRYPTO_MANAGER is not set
1055# CONFIG_CRYPTO_HMAC is not set
1056# CONFIG_CRYPTO_XCBC is not set
1057# CONFIG_CRYPTO_NULL is not set
1058# CONFIG_CRYPTO_MD4 is not set
1059# CONFIG_CRYPTO_MD5 is not set
1060# CONFIG_CRYPTO_SHA1 is not set
1061# CONFIG_CRYPTO_SHA256 is not set
1062# CONFIG_CRYPTO_SHA512 is not set
1063# CONFIG_CRYPTO_WP512 is not set
1064# CONFIG_CRYPTO_TGR192 is not set
1065# CONFIG_CRYPTO_GF128MUL is not set
1066# CONFIG_CRYPTO_ECB is not set
1067# CONFIG_CRYPTO_CBC is not set
1068# CONFIG_CRYPTO_PCBC is not set
1069# CONFIG_CRYPTO_LRW is not set
1070# CONFIG_CRYPTO_XTS is not set
1071# CONFIG_CRYPTO_CTR is not set
1072# CONFIG_CRYPTO_GCM is not set
1073# CONFIG_CRYPTO_CCM is not set
1074# CONFIG_CRYPTO_CRYPTD is not set
1075# CONFIG_CRYPTO_DES is not set
1076# CONFIG_CRYPTO_FCRYPT is not set
1077# CONFIG_CRYPTO_BLOWFISH is not set
1078# CONFIG_CRYPTO_TWOFISH is not set
1079# CONFIG_CRYPTO_SERPENT is not set
1080# CONFIG_CRYPTO_AES is not set
1081# CONFIG_CRYPTO_CAST5 is not set
1082# CONFIG_CRYPTO_CAST6 is not set
1083# CONFIG_CRYPTO_TEA is not set
1084# CONFIG_CRYPTO_ARC4 is not set
1085# CONFIG_CRYPTO_KHAZAD is not set
1086# CONFIG_CRYPTO_ANUBIS is not set
1087# CONFIG_CRYPTO_SEED is not set
1088# CONFIG_CRYPTO_SALSA20 is not set
1089# CONFIG_CRYPTO_DEFLATE is not set
1090# CONFIG_CRYPTO_MICHAEL_MIC is not set
1091# CONFIG_CRYPTO_CRC32C is not set
1092# CONFIG_CRYPTO_CAMELLIA is not set
1093# CONFIG_CRYPTO_AUTHENC is not set
1094# CONFIG_CRYPTO_LZO is not set
1095CONFIG_CRYPTO_HW=y
1096# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1032# CONFIG_PPC_CLOCK is not set 1097# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/tqm8541_defconfig b/arch/powerpc/configs/tqm8541_defconfig
index 1aff35f0c53a..cbf6ad2d71da 100644
--- a/arch/powerpc/configs/tqm8541_defconfig
+++ b/arch/powerpc/configs/tqm8541_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-rc8 3# Linux kernel version: 2.6.25-rc6
4# Fri Jan 25 01:31:28 2008 4# Mon Mar 24 08:48:44 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,10 +14,10 @@ CONFIG_PPC_85xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y 17CONFIG_E500=y
19CONFIG_BOOKE=y 18CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 19CONFIG_FSL_BOOKE=y
20CONFIG_FSL_EMB_PERFMON=y
21# CONFIG_PHYS_64BIT is not set 21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -67,17 +68,19 @@ CONFIG_SYSVIPC_SYSCTL=y
67# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
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
81CONFIG_SYSFS_DEPRECATED_V2=y
80# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
83# CONFIG_NAMESPACES is not set
81CONFIG_BLK_DEV_INITRD=y 84CONFIG_BLK_DEV_INITRD=y
82CONFIG_INITRAMFS_SOURCE="" 85CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -89,11 +92,13 @@ CONFIG_SYSCTL_SYSCALL=y
89CONFIG_PRINTK=y 92CONFIG_PRINTK=y
90CONFIG_BUG=y 93CONFIG_BUG=y
91CONFIG_ELF_CORE=y 94CONFIG_ELF_CORE=y
95CONFIG_COMPAT_BRK=y
92CONFIG_BASE_FULL=y 96CONFIG_BASE_FULL=y
93CONFIG_FUTEX=y 97CONFIG_FUTEX=y
94CONFIG_ANON_INODES=y 98CONFIG_ANON_INODES=y
95# CONFIG_EPOLL is not set 99# CONFIG_EPOLL is not set
96CONFIG_SIGNALFD=y 100CONFIG_SIGNALFD=y
101CONFIG_TIMERFD=y
97CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
98CONFIG_SHMEM=y 103CONFIG_SHMEM=y
99CONFIG_VM_EVENT_COUNTERS=y 104CONFIG_VM_EVENT_COUNTERS=y
@@ -101,6 +106,12 @@ CONFIG_SLUB_DEBUG=y
101# CONFIG_SLAB is not set 106# CONFIG_SLAB is not set
102CONFIG_SLUB=y 107CONFIG_SLUB=y
103# CONFIG_SLOB is not set 108# CONFIG_SLOB is not set
109# CONFIG_PROFILING is not set
110# CONFIG_MARKERS is not set
111CONFIG_HAVE_OPROFILE=y
112CONFIG_HAVE_KPROBES=y
113CONFIG_HAVE_KRETPROBES=y
114CONFIG_PROC_PAGE_MONITOR=y
104CONFIG_SLABINFO=y 115CONFIG_SLABINFO=y
105CONFIG_RT_MUTEXES=y 116CONFIG_RT_MUTEXES=y
106# CONFIG_TINY_SHMEM is not set 117# CONFIG_TINY_SHMEM is not set
@@ -124,15 +135,17 @@ CONFIG_DEFAULT_AS=y
124# CONFIG_DEFAULT_CFQ is not set 135# CONFIG_DEFAULT_CFQ is not set
125# CONFIG_DEFAULT_NOOP is not set 136# CONFIG_DEFAULT_NOOP is not set
126CONFIG_DEFAULT_IOSCHED="anticipatory" 137CONFIG_DEFAULT_IOSCHED="anticipatory"
138CONFIG_CLASSIC_RCU=y
127 139
128# 140#
129# Platform support 141# Platform support
130# 142#
131# CONFIG_PPC_MPC52xx is not set 143# CONFIG_PPC_MPC512x is not set
132# CONFIG_PPC_MPC5200 is not set 144# CONFIG_PPC_MPC5121 is not set
133# CONFIG_PPC_CELL is not set 145# CONFIG_PPC_CELL is not set
134# CONFIG_PPC_CELL_NATIVE is not set 146# CONFIG_PPC_CELL_NATIVE is not set
135# CONFIG_PQ2ADS is not set 147# CONFIG_PQ2ADS is not set
148CONFIG_MPC85xx=y
136# CONFIG_MPC8540_ADS is not set 149# CONFIG_MPC8540_ADS is not set
137# CONFIG_MPC8560_ADS is not set 150# CONFIG_MPC8560_ADS is not set
138# CONFIG_MPC85xx_CDS is not set 151# CONFIG_MPC85xx_CDS is not set
@@ -143,8 +156,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
143CONFIG_TQM8541=y 156CONFIG_TQM8541=y
144# CONFIG_TQM8555 is not set 157# CONFIG_TQM8555 is not set
145# CONFIG_TQM8560 is not set 158# CONFIG_TQM8560 is not set
159# CONFIG_SBC8548 is not set
160# CONFIG_SBC8560 is not set
146CONFIG_TQM85xx=y 161CONFIG_TQM85xx=y
147CONFIG_MPC85xx=y
148# CONFIG_IPIC is not set 162# CONFIG_IPIC is not set
149CONFIG_MPIC=y 163CONFIG_MPIC=y
150# CONFIG_MPIC_WEIRD is not set 164# CONFIG_MPIC_WEIRD is not set
@@ -174,13 +188,17 @@ CONFIG_HZ_250=y
174# CONFIG_HZ_300 is not set 188# CONFIG_HZ_300 is not set
175# CONFIG_HZ_1000 is not set 189# CONFIG_HZ_1000 is not set
176CONFIG_HZ=250 190CONFIG_HZ=250
191# CONFIG_SCHED_HRTICK is not set
177CONFIG_PREEMPT_NONE=y 192CONFIG_PREEMPT_NONE=y
178# CONFIG_PREEMPT_VOLUNTARY is not set 193# CONFIG_PREEMPT_VOLUNTARY is not set
179# CONFIG_PREEMPT is not set 194# CONFIG_PREEMPT is not set
180CONFIG_BINFMT_ELF=y 195CONFIG_BINFMT_ELF=y
181# CONFIG_BINFMT_MISC is not set 196# CONFIG_BINFMT_MISC is not set
182CONFIG_MATH_EMULATION=y 197CONFIG_MATH_EMULATION=y
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
@@ -199,11 +217,7 @@ CONFIG_VIRT_TO_BUS=y
199# CONFIG_PROC_DEVICETREE is not set 217# CONFIG_PROC_DEVICETREE is not set
200# CONFIG_CMDLINE_BOOL is not set 218# CONFIG_CMDLINE_BOOL is not set
201# CONFIG_PM is not set 219# CONFIG_PM is not set
202CONFIG_SUSPEND_UP_POSSIBLE=y
203CONFIG_HIBERNATION_UP_POSSIBLE=y
204CONFIG_SECCOMP=y 220CONFIG_SECCOMP=y
205CONFIG_WANT_DEVICE_TREE=y
206CONFIG_DEVICE_TREE="tqm8541.dts"
207CONFIG_ISA_DMA_API=y 221CONFIG_ISA_DMA_API=y
208 222
209# 223#
@@ -250,6 +264,7 @@ CONFIG_XFRM=y
250# CONFIG_XFRM_USER is not set 264# CONFIG_XFRM_USER is not set
251# CONFIG_XFRM_SUB_POLICY is not set 265# CONFIG_XFRM_SUB_POLICY is not set
252# CONFIG_XFRM_MIGRATE is not set 266# CONFIG_XFRM_MIGRATE is not set
267# CONFIG_XFRM_STATISTICS is not set
253# CONFIG_NET_KEY is not set 268# CONFIG_NET_KEY is not set
254CONFIG_INET=y 269CONFIG_INET=y
255CONFIG_IP_MULTICAST=y 270CONFIG_IP_MULTICAST=y
@@ -305,6 +320,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
305# 320#
306# CONFIG_NET_PKTGEN is not set 321# CONFIG_NET_PKTGEN is not set
307# CONFIG_HAMRADIO is not set 322# CONFIG_HAMRADIO is not set
323# CONFIG_CAN is not set
308# CONFIG_IRDA is not set 324# CONFIG_IRDA is not set
309# CONFIG_BT is not set 325# CONFIG_BT is not set
310# CONFIG_AF_RXRPC is not set 326# CONFIG_AF_RXRPC is not set
@@ -336,6 +352,7 @@ CONFIG_MTD_CONCAT=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
355# CONFIG_MTD_OF_PARTS is not set
339 356
340# 357#
341# User Modules And Translation Layers 358# User Modules And Translation Layers
@@ -422,7 +439,7 @@ CONFIG_BLK_DEV_LOOP=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=32768 441CONFIG_BLK_DEV_RAM_SIZE=32768
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
428CONFIG_MISC_DEVICES=y 445CONFIG_MISC_DEVICES=y
@@ -430,12 +447,14 @@ CONFIG_MISC_DEVICES=y
430# CONFIG_EEPROM_93CX6 is not set 447# CONFIG_EEPROM_93CX6 is not set
431# CONFIG_SGI_IOC4 is not set 448# CONFIG_SGI_IOC4 is not set
432# CONFIG_TIFM_CORE is not set 449# CONFIG_TIFM_CORE is not set
450# CONFIG_ENCLOSURE_SERVICES is not set
451CONFIG_HAVE_IDE=y
433CONFIG_IDE=y 452CONFIG_IDE=y
434CONFIG_IDE_MAX_HWIFS=4 453CONFIG_IDE_MAX_HWIFS=4
435CONFIG_BLK_DEV_IDE=y 454CONFIG_BLK_DEV_IDE=y
436 455
437# 456#
438# Please see Documentation/ide.txt for help/info on IDE drives 457# Please see Documentation/ide/ide.txt for help/info on IDE drives
439# 458#
440# CONFIG_BLK_DEV_IDE_SATA is not set 459# CONFIG_BLK_DEV_IDE_SATA is not set
441CONFIG_BLK_DEV_IDEDISK=y 460CONFIG_BLK_DEV_IDEDISK=y
@@ -451,12 +470,12 @@ CONFIG_IDE_PROC_FS=y
451# 470#
452CONFIG_IDE_GENERIC=y 471CONFIG_IDE_GENERIC=y
453# CONFIG_BLK_DEV_PLATFORM is not set 472# CONFIG_BLK_DEV_PLATFORM is not set
473CONFIG_BLK_DEV_IDEDMA_SFF=y
454 474
455# 475#
456# PCI IDE chipsets support 476# PCI IDE chipsets support
457# 477#
458CONFIG_BLK_DEV_IDEPCI=y 478CONFIG_BLK_DEV_IDEPCI=y
459CONFIG_IDEPCI_SHARE_IRQ=y
460CONFIG_IDEPCI_PCIBUS_ORDER=y 479CONFIG_IDEPCI_PCIBUS_ORDER=y
461# CONFIG_BLK_DEV_OFFBOARD is not set 480# CONFIG_BLK_DEV_OFFBOARD is not set
462CONFIG_BLK_DEV_GENERIC=y 481CONFIG_BLK_DEV_GENERIC=y
@@ -487,7 +506,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
487# CONFIG_BLK_DEV_TRM290 is not set 506# CONFIG_BLK_DEV_TRM290 is not set
488CONFIG_BLK_DEV_VIA82CXXX=y 507CONFIG_BLK_DEV_VIA82CXXX=y
489# CONFIG_BLK_DEV_TC86C001 is not set 508# CONFIG_BLK_DEV_TC86C001 is not set
490# CONFIG_IDE_ARM is not set
491CONFIG_BLK_DEV_IDEDMA=y 509CONFIG_BLK_DEV_IDEDMA=y
492CONFIG_IDE_ARCH_OBSOLETE_INIT=y 510CONFIG_IDE_ARCH_OBSOLETE_INIT=y
493# CONFIG_BLK_DEV_HD is not set 511# CONFIG_BLK_DEV_HD is not set
@@ -533,6 +551,7 @@ CONFIG_PHYLIB=y
533# CONFIG_SMSC_PHY is not set 551# CONFIG_SMSC_PHY is not set
534# CONFIG_BROADCOM_PHY is not set 552# CONFIG_BROADCOM_PHY is not set
535# CONFIG_ICPLUS_PHY is not set 553# CONFIG_ICPLUS_PHY is not set
554# CONFIG_REALTEK_PHY is not set
536# CONFIG_FIXED_PHY is not set 555# CONFIG_FIXED_PHY is not set
537# CONFIG_MDIO_BITBANG is not set 556# CONFIG_MDIO_BITBANG is not set
538CONFIG_NET_ETHERNET=y 557CONFIG_NET_ETHERNET=y
@@ -560,6 +579,7 @@ CONFIG_E100=y
560# CONFIG_NE2K_PCI is not set 579# CONFIG_NE2K_PCI is not set
561# CONFIG_8139CP is not set 580# CONFIG_8139CP is not set
562# CONFIG_8139TOO is not set 581# CONFIG_8139TOO is not set
582# CONFIG_R6040 is not set
563# CONFIG_SIS900 is not set 583# CONFIG_SIS900 is not set
564# CONFIG_EPIC100 is not set 584# CONFIG_EPIC100 is not set
565# CONFIG_SUNDANCE is not set 585# CONFIG_SUNDANCE is not set
@@ -572,7 +592,9 @@ CONFIG_NETDEV_1000=y
572# CONFIG_DL2K is not set 592# CONFIG_DL2K is not set
573# CONFIG_E1000 is not set 593# CONFIG_E1000 is not set
574# CONFIG_E1000E is not set 594# CONFIG_E1000E is not set
595# CONFIG_E1000E_ENABLED is not set
575# CONFIG_IP1000 is not set 596# CONFIG_IP1000 is not set
597# CONFIG_IGB is not set
576# CONFIG_NS83820 is not set 598# CONFIG_NS83820 is not set
577# CONFIG_HAMACHI is not set 599# CONFIG_HAMACHI is not set
578# CONFIG_YELLOWFIN is not set 600# CONFIG_YELLOWFIN is not set
@@ -599,6 +621,7 @@ CONFIG_NETDEV_10000=y
599# CONFIG_NIU is not set 621# CONFIG_NIU is not set
600# CONFIG_MLX4_CORE is not set 622# CONFIG_MLX4_CORE is not set
601# CONFIG_TEHUTI is not set 623# CONFIG_TEHUTI is not set
624# CONFIG_BNX2X is not set
602# CONFIG_TR is not set 625# CONFIG_TR is not set
603 626
604# 627#
@@ -611,7 +634,6 @@ CONFIG_NETDEV_10000=y
611# CONFIG_HIPPI is not set 634# CONFIG_HIPPI is not set
612# CONFIG_PPP is not set 635# CONFIG_PPP is not set
613# CONFIG_SLIP is not set 636# CONFIG_SLIP is not set
614# CONFIG_SHAPER is not set
615# CONFIG_NETCONSOLE is not set 637# CONFIG_NETCONSOLE is not set
616# CONFIG_NETPOLL is not set 638# CONFIG_NETPOLL is not set
617# CONFIG_NET_POLL_CONTROLLER is not set 639# CONFIG_NET_POLL_CONTROLLER is not set
@@ -654,6 +676,7 @@ CONFIG_INPUT=y
654# 676#
655# CONFIG_VT is not set 677# CONFIG_VT is not set
656# CONFIG_SERIAL_NONSTANDARD is not set 678# CONFIG_SERIAL_NONSTANDARD is not set
679# CONFIG_NOZOMI is not set
657 680
658# 681#
659# Serial drivers 682# Serial drivers
@@ -735,14 +758,12 @@ CONFIG_I2C_MPC=y
735# 758#
736# Miscellaneous I2C Chip support 759# Miscellaneous I2C Chip support
737# 760#
738CONFIG_SENSORS_DS1337=y
739# CONFIG_SENSORS_DS1374 is not set
740# CONFIG_DS1682 is not set 761# CONFIG_DS1682 is not set
741# CONFIG_SENSORS_EEPROM is not set 762# CONFIG_SENSORS_EEPROM is not set
742# CONFIG_SENSORS_PCF8574 is not set 763# CONFIG_SENSORS_PCF8574 is not set
743# CONFIG_SENSORS_PCA9539 is not set 764# CONFIG_PCF8575 is not set
744# CONFIG_SENSORS_PCF8591 is not set 765# CONFIG_SENSORS_PCF8591 is not set
745# CONFIG_SENSORS_M41T00 is not set 766# CONFIG_TPS65010 is not set
746# CONFIG_SENSORS_MAX6875 is not set 767# CONFIG_SENSORS_MAX6875 is not set
747# CONFIG_SENSORS_TSL2550 is not set 768# CONFIG_SENSORS_TSL2550 is not set
748# CONFIG_I2C_DEBUG_CORE is not set 769# CONFIG_I2C_DEBUG_CORE is not set
@@ -767,6 +788,7 @@ CONFIG_HWMON=y
767# CONFIG_SENSORS_ADM1031 is not set 788# CONFIG_SENSORS_ADM1031 is not set
768# CONFIG_SENSORS_ADM9240 is not set 789# CONFIG_SENSORS_ADM9240 is not set
769# CONFIG_SENSORS_ADT7470 is not set 790# CONFIG_SENSORS_ADT7470 is not set
791# CONFIG_SENSORS_ADT7473 is not set
770# CONFIG_SENSORS_ATXP1 is not set 792# CONFIG_SENSORS_ATXP1 is not set
771# CONFIG_SENSORS_DS1621 is not set 793# CONFIG_SENSORS_DS1621 is not set
772# CONFIG_SENSORS_I5K_AMB is not set 794# CONFIG_SENSORS_I5K_AMB is not set
@@ -796,6 +818,7 @@ CONFIG_SENSORS_LM75=y
796# CONFIG_SENSORS_SMSC47M1 is not set 818# CONFIG_SENSORS_SMSC47M1 is not set
797# CONFIG_SENSORS_SMSC47M192 is not set 819# CONFIG_SENSORS_SMSC47M192 is not set
798# CONFIG_SENSORS_SMSC47B397 is not set 820# CONFIG_SENSORS_SMSC47B397 is not set
821# CONFIG_SENSORS_ADS7828 is not set
799# CONFIG_SENSORS_THMC50 is not set 822# CONFIG_SENSORS_THMC50 is not set
800# CONFIG_SENSORS_VIA686A is not set 823# CONFIG_SENSORS_VIA686A is not set
801# CONFIG_SENSORS_VT1211 is not set 824# CONFIG_SENSORS_VT1211 is not set
@@ -805,9 +828,11 @@ CONFIG_SENSORS_LM75=y
805# CONFIG_SENSORS_W83792D is not set 828# CONFIG_SENSORS_W83792D is not set
806# CONFIG_SENSORS_W83793 is not set 829# CONFIG_SENSORS_W83793 is not set
807# CONFIG_SENSORS_W83L785TS is not set 830# CONFIG_SENSORS_W83L785TS is not set
831# CONFIG_SENSORS_W83L786NG is not set
808# CONFIG_SENSORS_W83627HF is not set 832# CONFIG_SENSORS_W83627HF is not set
809# CONFIG_SENSORS_W83627EHF is not set 833# CONFIG_SENSORS_W83627EHF is not set
810CONFIG_HWMON_DEBUG_CHIP=y 834CONFIG_HWMON_DEBUG_CHIP=y
835# CONFIG_THERMAL is not set
811# CONFIG_WATCHDOG is not set 836# CONFIG_WATCHDOG is not set
812 837
813# 838#
@@ -860,16 +885,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
860# 885#
861# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 886# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
862# 887#
863
864#
865# USB Gadget Support
866#
867# CONFIG_USB_GADGET is not set 888# CONFIG_USB_GADGET is not set
868# CONFIG_MMC is not set 889# CONFIG_MMC is not set
890# CONFIG_MEMSTICK is not set
869# CONFIG_NEW_LEDS is not set 891# CONFIG_NEW_LEDS is not set
870# CONFIG_INFINIBAND is not set 892# CONFIG_INFINIBAND is not set
871# CONFIG_EDAC is not set 893# CONFIG_EDAC is not set
872# CONFIG_RTC_CLASS is not set 894# CONFIG_RTC_CLASS is not set
895# CONFIG_DMADEVICES is not set
873 896
874# 897#
875# Userspace I/O 898# Userspace I/O
@@ -895,12 +918,10 @@ CONFIG_FS_MBCACHE=y
895# CONFIG_XFS_FS is not set 918# CONFIG_XFS_FS is not set
896# CONFIG_GFS2_FS is not set 919# CONFIG_GFS2_FS is not set
897# CONFIG_OCFS2_FS is not set 920# CONFIG_OCFS2_FS is not set
898# CONFIG_MINIX_FS is not set 921CONFIG_DNOTIFY=y
899# CONFIG_ROMFS_FS is not set
900CONFIG_INOTIFY=y 922CONFIG_INOTIFY=y
901CONFIG_INOTIFY_USER=y 923CONFIG_INOTIFY_USER=y
902# CONFIG_QUOTA is not set 924# CONFIG_QUOTA is not set
903CONFIG_DNOTIFY=y
904# CONFIG_AUTOFS_FS is not set 925# CONFIG_AUTOFS_FS is not set
905# CONFIG_AUTOFS4_FS is not set 926# CONFIG_AUTOFS4_FS is not set
906# CONFIG_FUSE_FS is not set 927# CONFIG_FUSE_FS is not set
@@ -953,8 +974,10 @@ CONFIG_JFFS2_RTIME=y
953# CONFIG_JFFS2_RUBIN is not set 974# CONFIG_JFFS2_RUBIN is not set
954CONFIG_CRAMFS=y 975CONFIG_CRAMFS=y
955# CONFIG_VXFS_FS is not set 976# CONFIG_VXFS_FS is not set
977# CONFIG_MINIX_FS is not set
956# CONFIG_HPFS_FS is not set 978# CONFIG_HPFS_FS is not set
957# CONFIG_QNX4FS_FS is not set 979# CONFIG_QNX4FS_FS is not set
980# CONFIG_ROMFS_FS is not set
958# CONFIG_SYSV_FS is not set 981# CONFIG_SYSV_FS is not set
959# CONFIG_UFS_FS is not set 982# CONFIG_UFS_FS is not set
960CONFIG_NETWORK_FILESYSTEMS=y 983CONFIG_NETWORK_FILESYSTEMS=y
@@ -1012,9 +1035,6 @@ CONFIG_PLIST=y
1012CONFIG_HAS_IOMEM=y 1035CONFIG_HAS_IOMEM=y
1013CONFIG_HAS_IOPORT=y 1036CONFIG_HAS_IOPORT=y
1014CONFIG_HAS_DMA=y 1037CONFIG_HAS_DMA=y
1015CONFIG_INSTRUMENTATION=y
1016# CONFIG_PROFILING is not set
1017# CONFIG_MARKERS is not set
1018 1038
1019# 1039#
1020# Kernel hacking 1040# Kernel hacking
@@ -1028,6 +1048,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1028# CONFIG_HEADERS_CHECK is not set 1048# CONFIG_HEADERS_CHECK is not set
1029# CONFIG_DEBUG_KERNEL is not set 1049# CONFIG_DEBUG_KERNEL is not set
1030# CONFIG_SLUB_DEBUG_ON is not set 1050# CONFIG_SLUB_DEBUG_ON is not set
1051# CONFIG_SLUB_STATS is not set
1031# CONFIG_DEBUG_BUGVERBOSE is not set 1052# CONFIG_DEBUG_BUGVERBOSE is not set
1032# CONFIG_SAMPLES is not set 1053# CONFIG_SAMPLES is not set
1033# CONFIG_KGDB_CONSOLE is not set 1054# CONFIG_KGDB_CONSOLE is not set
@@ -1039,6 +1060,50 @@ CONFIG_ENABLE_MUST_CHECK=y
1039# CONFIG_KEYS is not set 1060# CONFIG_KEYS is not set
1040# CONFIG_SECURITY is not set 1061# CONFIG_SECURITY is not set
1041# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1062# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1042# CONFIG_CRYPTO is not set 1063CONFIG_CRYPTO=y
1064# CONFIG_CRYPTO_SEQIV is not set
1065# CONFIG_CRYPTO_MANAGER is not set
1066# CONFIG_CRYPTO_HMAC is not set
1067# CONFIG_CRYPTO_XCBC is not set
1068# CONFIG_CRYPTO_NULL is not set
1069# CONFIG_CRYPTO_MD4 is not set
1070# CONFIG_CRYPTO_MD5 is not set
1071# CONFIG_CRYPTO_SHA1 is not set
1072# CONFIG_CRYPTO_SHA256 is not set
1073# CONFIG_CRYPTO_SHA512 is not set
1074# CONFIG_CRYPTO_WP512 is not set
1075# CONFIG_CRYPTO_TGR192 is not set
1076# CONFIG_CRYPTO_GF128MUL is not set
1077# CONFIG_CRYPTO_ECB is not set
1078# CONFIG_CRYPTO_CBC is not set
1079# CONFIG_CRYPTO_PCBC is not set
1080# CONFIG_CRYPTO_LRW is not set
1081# CONFIG_CRYPTO_XTS is not set
1082# CONFIG_CRYPTO_CTR is not set
1083# CONFIG_CRYPTO_GCM is not set
1084# CONFIG_CRYPTO_CCM is not set
1085# CONFIG_CRYPTO_CRYPTD is not set
1086# CONFIG_CRYPTO_DES is not set
1087# CONFIG_CRYPTO_FCRYPT is not set
1088# CONFIG_CRYPTO_BLOWFISH is not set
1089# CONFIG_CRYPTO_TWOFISH is not set
1090# CONFIG_CRYPTO_SERPENT is not set
1091# CONFIG_CRYPTO_AES is not set
1092# CONFIG_CRYPTO_CAST5 is not set
1093# CONFIG_CRYPTO_CAST6 is not set
1094# CONFIG_CRYPTO_TEA is not set
1095# CONFIG_CRYPTO_ARC4 is not set
1096# CONFIG_CRYPTO_KHAZAD is not set
1097# CONFIG_CRYPTO_ANUBIS is not set
1098# CONFIG_CRYPTO_SEED is not set
1099# CONFIG_CRYPTO_SALSA20 is not set
1100# CONFIG_CRYPTO_DEFLATE is not set
1101# CONFIG_CRYPTO_MICHAEL_MIC is not set
1102# CONFIG_CRYPTO_CRC32C is not set
1103# CONFIG_CRYPTO_CAMELLIA is not set
1104# CONFIG_CRYPTO_AUTHENC is not set
1105# CONFIG_CRYPTO_LZO is not set
1106CONFIG_CRYPTO_HW=y
1107# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1043# CONFIG_PPC_CLOCK is not set 1108# CONFIG_PPC_CLOCK is not set
1044CONFIG_PPC_LIB_RHEAP=y 1109CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/tqm8555_defconfig b/arch/powerpc/configs/tqm8555_defconfig
index a3af2262128b..bbff962c8472 100644
--- a/arch/powerpc/configs/tqm8555_defconfig
+++ b/arch/powerpc/configs/tqm8555_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-rc8 3# Linux kernel version: 2.6.25-rc6
4# Fri Jan 25 01:15:24 2008 4# Mon Mar 24 08:48:44 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,10 +14,10 @@ CONFIG_PPC_85xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y 17CONFIG_E500=y
19CONFIG_BOOKE=y 18CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 19CONFIG_FSL_BOOKE=y
20CONFIG_FSL_EMB_PERFMON=y
21# CONFIG_PHYS_64BIT is not set 21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -67,17 +68,19 @@ CONFIG_SYSVIPC_SYSCTL=y
67# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
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
81CONFIG_SYSFS_DEPRECATED_V2=y
80# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
83# CONFIG_NAMESPACES is not set
81CONFIG_BLK_DEV_INITRD=y 84CONFIG_BLK_DEV_INITRD=y
82CONFIG_INITRAMFS_SOURCE="" 85CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -89,11 +92,13 @@ CONFIG_SYSCTL_SYSCALL=y
89CONFIG_PRINTK=y 92CONFIG_PRINTK=y
90CONFIG_BUG=y 93CONFIG_BUG=y
91CONFIG_ELF_CORE=y 94CONFIG_ELF_CORE=y
95CONFIG_COMPAT_BRK=y
92CONFIG_BASE_FULL=y 96CONFIG_BASE_FULL=y
93CONFIG_FUTEX=y 97CONFIG_FUTEX=y
94CONFIG_ANON_INODES=y 98CONFIG_ANON_INODES=y
95# CONFIG_EPOLL is not set 99# CONFIG_EPOLL is not set
96CONFIG_SIGNALFD=y 100CONFIG_SIGNALFD=y
101CONFIG_TIMERFD=y
97CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
98CONFIG_SHMEM=y 103CONFIG_SHMEM=y
99CONFIG_VM_EVENT_COUNTERS=y 104CONFIG_VM_EVENT_COUNTERS=y
@@ -101,6 +106,12 @@ CONFIG_SLUB_DEBUG=y
101# CONFIG_SLAB is not set 106# CONFIG_SLAB is not set
102CONFIG_SLUB=y 107CONFIG_SLUB=y
103# CONFIG_SLOB is not set 108# CONFIG_SLOB is not set
109# CONFIG_PROFILING is not set
110# CONFIG_MARKERS is not set
111CONFIG_HAVE_OPROFILE=y
112CONFIG_HAVE_KPROBES=y
113CONFIG_HAVE_KRETPROBES=y
114CONFIG_PROC_PAGE_MONITOR=y
104CONFIG_SLABINFO=y 115CONFIG_SLABINFO=y
105CONFIG_RT_MUTEXES=y 116CONFIG_RT_MUTEXES=y
106# CONFIG_TINY_SHMEM is not set 117# CONFIG_TINY_SHMEM is not set
@@ -124,15 +135,17 @@ CONFIG_DEFAULT_AS=y
124# CONFIG_DEFAULT_CFQ is not set 135# CONFIG_DEFAULT_CFQ is not set
125# CONFIG_DEFAULT_NOOP is not set 136# CONFIG_DEFAULT_NOOP is not set
126CONFIG_DEFAULT_IOSCHED="anticipatory" 137CONFIG_DEFAULT_IOSCHED="anticipatory"
138CONFIG_CLASSIC_RCU=y
127 139
128# 140#
129# Platform support 141# Platform support
130# 142#
131# CONFIG_PPC_MPC52xx is not set 143# CONFIG_PPC_MPC512x is not set
132# CONFIG_PPC_MPC5200 is not set 144# CONFIG_PPC_MPC5121 is not set
133# CONFIG_PPC_CELL is not set 145# CONFIG_PPC_CELL is not set
134# CONFIG_PPC_CELL_NATIVE is not set 146# CONFIG_PPC_CELL_NATIVE is not set
135# CONFIG_PQ2ADS is not set 147# CONFIG_PQ2ADS is not set
148CONFIG_MPC85xx=y
136# CONFIG_MPC8540_ADS is not set 149# CONFIG_MPC8540_ADS is not set
137# CONFIG_MPC8560_ADS is not set 150# CONFIG_MPC8560_ADS is not set
138# CONFIG_MPC85xx_CDS is not set 151# CONFIG_MPC85xx_CDS is not set
@@ -143,8 +156,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
143# CONFIG_TQM8541 is not set 156# CONFIG_TQM8541 is not set
144CONFIG_TQM8555=y 157CONFIG_TQM8555=y
145# CONFIG_TQM8560 is not set 158# CONFIG_TQM8560 is not set
159# CONFIG_SBC8548 is not set
160# CONFIG_SBC8560 is not set
146CONFIG_TQM85xx=y 161CONFIG_TQM85xx=y
147CONFIG_MPC85xx=y
148# CONFIG_IPIC is not set 162# CONFIG_IPIC is not set
149CONFIG_MPIC=y 163CONFIG_MPIC=y
150# CONFIG_MPIC_WEIRD is not set 164# CONFIG_MPIC_WEIRD is not set
@@ -174,13 +188,17 @@ CONFIG_HZ_250=y
174# CONFIG_HZ_300 is not set 188# CONFIG_HZ_300 is not set
175# CONFIG_HZ_1000 is not set 189# CONFIG_HZ_1000 is not set
176CONFIG_HZ=250 190CONFIG_HZ=250
191# CONFIG_SCHED_HRTICK is not set
177CONFIG_PREEMPT_NONE=y 192CONFIG_PREEMPT_NONE=y
178# CONFIG_PREEMPT_VOLUNTARY is not set 193# CONFIG_PREEMPT_VOLUNTARY is not set
179# CONFIG_PREEMPT is not set 194# CONFIG_PREEMPT is not set
180CONFIG_BINFMT_ELF=y 195CONFIG_BINFMT_ELF=y
181# CONFIG_BINFMT_MISC is not set 196# CONFIG_BINFMT_MISC is not set
182CONFIG_MATH_EMULATION=y 197CONFIG_MATH_EMULATION=y
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
@@ -199,11 +217,7 @@ CONFIG_VIRT_TO_BUS=y
199# CONFIG_PROC_DEVICETREE is not set 217# CONFIG_PROC_DEVICETREE is not set
200# CONFIG_CMDLINE_BOOL is not set 218# CONFIG_CMDLINE_BOOL is not set
201# CONFIG_PM is not set 219# CONFIG_PM is not set
202CONFIG_SUSPEND_UP_POSSIBLE=y
203CONFIG_HIBERNATION_UP_POSSIBLE=y
204CONFIG_SECCOMP=y 220CONFIG_SECCOMP=y
205CONFIG_WANT_DEVICE_TREE=y
206CONFIG_DEVICE_TREE="tqm8555.dts"
207CONFIG_ISA_DMA_API=y 221CONFIG_ISA_DMA_API=y
208 222
209# 223#
@@ -250,6 +264,7 @@ CONFIG_XFRM=y
250# CONFIG_XFRM_USER is not set 264# CONFIG_XFRM_USER is not set
251# CONFIG_XFRM_SUB_POLICY is not set 265# CONFIG_XFRM_SUB_POLICY is not set
252# CONFIG_XFRM_MIGRATE is not set 266# CONFIG_XFRM_MIGRATE is not set
267# CONFIG_XFRM_STATISTICS is not set
253# CONFIG_NET_KEY is not set 268# CONFIG_NET_KEY is not set
254CONFIG_INET=y 269CONFIG_INET=y
255CONFIG_IP_MULTICAST=y 270CONFIG_IP_MULTICAST=y
@@ -305,6 +320,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
305# 320#
306# CONFIG_NET_PKTGEN is not set 321# CONFIG_NET_PKTGEN is not set
307# CONFIG_HAMRADIO is not set 322# CONFIG_HAMRADIO is not set
323# CONFIG_CAN is not set
308# CONFIG_IRDA is not set 324# CONFIG_IRDA is not set
309# CONFIG_BT is not set 325# CONFIG_BT is not set
310# CONFIG_AF_RXRPC is not set 326# CONFIG_AF_RXRPC is not set
@@ -336,6 +352,7 @@ CONFIG_MTD_CONCAT=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
355# CONFIG_MTD_OF_PARTS is not set
339 356
340# 357#
341# User Modules And Translation Layers 358# User Modules And Translation Layers
@@ -422,7 +439,7 @@ CONFIG_BLK_DEV_LOOP=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=32768 441CONFIG_BLK_DEV_RAM_SIZE=32768
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
428CONFIG_MISC_DEVICES=y 445CONFIG_MISC_DEVICES=y
@@ -430,12 +447,14 @@ CONFIG_MISC_DEVICES=y
430# CONFIG_EEPROM_93CX6 is not set 447# CONFIG_EEPROM_93CX6 is not set
431# CONFIG_SGI_IOC4 is not set 448# CONFIG_SGI_IOC4 is not set
432# CONFIG_TIFM_CORE is not set 449# CONFIG_TIFM_CORE is not set
450# CONFIG_ENCLOSURE_SERVICES is not set
451CONFIG_HAVE_IDE=y
433CONFIG_IDE=y 452CONFIG_IDE=y
434CONFIG_IDE_MAX_HWIFS=4 453CONFIG_IDE_MAX_HWIFS=4
435CONFIG_BLK_DEV_IDE=y 454CONFIG_BLK_DEV_IDE=y
436 455
437# 456#
438# Please see Documentation/ide.txt for help/info on IDE drives 457# Please see Documentation/ide/ide.txt for help/info on IDE drives
439# 458#
440# CONFIG_BLK_DEV_IDE_SATA is not set 459# CONFIG_BLK_DEV_IDE_SATA is not set
441CONFIG_BLK_DEV_IDEDISK=y 460CONFIG_BLK_DEV_IDEDISK=y
@@ -451,12 +470,12 @@ CONFIG_IDE_PROC_FS=y
451# 470#
452CONFIG_IDE_GENERIC=y 471CONFIG_IDE_GENERIC=y
453# CONFIG_BLK_DEV_PLATFORM is not set 472# CONFIG_BLK_DEV_PLATFORM is not set
473CONFIG_BLK_DEV_IDEDMA_SFF=y
454 474
455# 475#
456# PCI IDE chipsets support 476# PCI IDE chipsets support
457# 477#
458CONFIG_BLK_DEV_IDEPCI=y 478CONFIG_BLK_DEV_IDEPCI=y
459CONFIG_IDEPCI_SHARE_IRQ=y
460CONFIG_IDEPCI_PCIBUS_ORDER=y 479CONFIG_IDEPCI_PCIBUS_ORDER=y
461# CONFIG_BLK_DEV_OFFBOARD is not set 480# CONFIG_BLK_DEV_OFFBOARD is not set
462CONFIG_BLK_DEV_GENERIC=y 481CONFIG_BLK_DEV_GENERIC=y
@@ -487,7 +506,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
487# CONFIG_BLK_DEV_TRM290 is not set 506# CONFIG_BLK_DEV_TRM290 is not set
488CONFIG_BLK_DEV_VIA82CXXX=y 507CONFIG_BLK_DEV_VIA82CXXX=y
489# CONFIG_BLK_DEV_TC86C001 is not set 508# CONFIG_BLK_DEV_TC86C001 is not set
490# CONFIG_IDE_ARM is not set
491CONFIG_BLK_DEV_IDEDMA=y 509CONFIG_BLK_DEV_IDEDMA=y
492CONFIG_IDE_ARCH_OBSOLETE_INIT=y 510CONFIG_IDE_ARCH_OBSOLETE_INIT=y
493# CONFIG_BLK_DEV_HD is not set 511# CONFIG_BLK_DEV_HD is not set
@@ -533,6 +551,7 @@ CONFIG_PHYLIB=y
533# CONFIG_SMSC_PHY is not set 551# CONFIG_SMSC_PHY is not set
534# CONFIG_BROADCOM_PHY is not set 552# CONFIG_BROADCOM_PHY is not set
535# CONFIG_ICPLUS_PHY is not set 553# CONFIG_ICPLUS_PHY is not set
554# CONFIG_REALTEK_PHY is not set
536# CONFIG_FIXED_PHY is not set 555# CONFIG_FIXED_PHY is not set
537# CONFIG_MDIO_BITBANG is not set 556# CONFIG_MDIO_BITBANG is not set
538CONFIG_NET_ETHERNET=y 557CONFIG_NET_ETHERNET=y
@@ -560,6 +579,7 @@ CONFIG_E100=y
560# CONFIG_NE2K_PCI is not set 579# CONFIG_NE2K_PCI is not set
561# CONFIG_8139CP is not set 580# CONFIG_8139CP is not set
562# CONFIG_8139TOO is not set 581# CONFIG_8139TOO is not set
582# CONFIG_R6040 is not set
563# CONFIG_SIS900 is not set 583# CONFIG_SIS900 is not set
564# CONFIG_EPIC100 is not set 584# CONFIG_EPIC100 is not set
565# CONFIG_SUNDANCE is not set 585# CONFIG_SUNDANCE is not set
@@ -572,7 +592,9 @@ CONFIG_NETDEV_1000=y
572# CONFIG_DL2K is not set 592# CONFIG_DL2K is not set
573# CONFIG_E1000 is not set 593# CONFIG_E1000 is not set
574# CONFIG_E1000E is not set 594# CONFIG_E1000E is not set
595# CONFIG_E1000E_ENABLED is not set
575# CONFIG_IP1000 is not set 596# CONFIG_IP1000 is not set
597# CONFIG_IGB is not set
576# CONFIG_NS83820 is not set 598# CONFIG_NS83820 is not set
577# CONFIG_HAMACHI is not set 599# CONFIG_HAMACHI is not set
578# CONFIG_YELLOWFIN is not set 600# CONFIG_YELLOWFIN is not set
@@ -599,6 +621,7 @@ CONFIG_NETDEV_10000=y
599# CONFIG_NIU is not set 621# CONFIG_NIU is not set
600# CONFIG_MLX4_CORE is not set 622# CONFIG_MLX4_CORE is not set
601# CONFIG_TEHUTI is not set 623# CONFIG_TEHUTI is not set
624# CONFIG_BNX2X is not set
602# CONFIG_TR is not set 625# CONFIG_TR is not set
603 626
604# 627#
@@ -611,7 +634,6 @@ CONFIG_NETDEV_10000=y
611# CONFIG_HIPPI is not set 634# CONFIG_HIPPI is not set
612# CONFIG_PPP is not set 635# CONFIG_PPP is not set
613# CONFIG_SLIP is not set 636# CONFIG_SLIP is not set
614# CONFIG_SHAPER is not set
615# CONFIG_NETCONSOLE is not set 637# CONFIG_NETCONSOLE is not set
616# CONFIG_NETPOLL is not set 638# CONFIG_NETPOLL is not set
617# CONFIG_NET_POLL_CONTROLLER is not set 639# CONFIG_NET_POLL_CONTROLLER is not set
@@ -654,6 +676,7 @@ CONFIG_INPUT=y
654# 676#
655# CONFIG_VT is not set 677# CONFIG_VT is not set
656# CONFIG_SERIAL_NONSTANDARD is not set 678# CONFIG_SERIAL_NONSTANDARD is not set
679# CONFIG_NOZOMI is not set
657 680
658# 681#
659# Serial drivers 682# Serial drivers
@@ -735,14 +758,12 @@ CONFIG_I2C_MPC=y
735# 758#
736# Miscellaneous I2C Chip support 759# Miscellaneous I2C Chip support
737# 760#
738CONFIG_SENSORS_DS1337=y
739# CONFIG_SENSORS_DS1374 is not set
740# CONFIG_DS1682 is not set 761# CONFIG_DS1682 is not set
741# CONFIG_SENSORS_EEPROM is not set 762# CONFIG_SENSORS_EEPROM is not set
742# CONFIG_SENSORS_PCF8574 is not set 763# CONFIG_SENSORS_PCF8574 is not set
743# CONFIG_SENSORS_PCA9539 is not set 764# CONFIG_PCF8575 is not set
744# CONFIG_SENSORS_PCF8591 is not set 765# CONFIG_SENSORS_PCF8591 is not set
745# CONFIG_SENSORS_M41T00 is not set 766# CONFIG_TPS65010 is not set
746# CONFIG_SENSORS_MAX6875 is not set 767# CONFIG_SENSORS_MAX6875 is not set
747# CONFIG_SENSORS_TSL2550 is not set 768# CONFIG_SENSORS_TSL2550 is not set
748# CONFIG_I2C_DEBUG_CORE is not set 769# CONFIG_I2C_DEBUG_CORE is not set
@@ -767,6 +788,7 @@ CONFIG_HWMON=y
767# CONFIG_SENSORS_ADM1031 is not set 788# CONFIG_SENSORS_ADM1031 is not set
768# CONFIG_SENSORS_ADM9240 is not set 789# CONFIG_SENSORS_ADM9240 is not set
769# CONFIG_SENSORS_ADT7470 is not set 790# CONFIG_SENSORS_ADT7470 is not set
791# CONFIG_SENSORS_ADT7473 is not set
770# CONFIG_SENSORS_ATXP1 is not set 792# CONFIG_SENSORS_ATXP1 is not set
771# CONFIG_SENSORS_DS1621 is not set 793# CONFIG_SENSORS_DS1621 is not set
772# CONFIG_SENSORS_I5K_AMB is not set 794# CONFIG_SENSORS_I5K_AMB is not set
@@ -796,6 +818,7 @@ CONFIG_SENSORS_LM75=y
796# CONFIG_SENSORS_SMSC47M1 is not set 818# CONFIG_SENSORS_SMSC47M1 is not set
797# CONFIG_SENSORS_SMSC47M192 is not set 819# CONFIG_SENSORS_SMSC47M192 is not set
798# CONFIG_SENSORS_SMSC47B397 is not set 820# CONFIG_SENSORS_SMSC47B397 is not set
821# CONFIG_SENSORS_ADS7828 is not set
799# CONFIG_SENSORS_THMC50 is not set 822# CONFIG_SENSORS_THMC50 is not set
800# CONFIG_SENSORS_VIA686A is not set 823# CONFIG_SENSORS_VIA686A is not set
801# CONFIG_SENSORS_VT1211 is not set 824# CONFIG_SENSORS_VT1211 is not set
@@ -805,9 +828,11 @@ CONFIG_SENSORS_LM75=y
805# CONFIG_SENSORS_W83792D is not set 828# CONFIG_SENSORS_W83792D is not set
806# CONFIG_SENSORS_W83793 is not set 829# CONFIG_SENSORS_W83793 is not set
807# CONFIG_SENSORS_W83L785TS is not set 830# CONFIG_SENSORS_W83L785TS is not set
831# CONFIG_SENSORS_W83L786NG is not set
808# CONFIG_SENSORS_W83627HF is not set 832# CONFIG_SENSORS_W83627HF is not set
809# CONFIG_SENSORS_W83627EHF is not set 833# CONFIG_SENSORS_W83627EHF is not set
810CONFIG_HWMON_DEBUG_CHIP=y 834CONFIG_HWMON_DEBUG_CHIP=y
835# CONFIG_THERMAL is not set
811# CONFIG_WATCHDOG is not set 836# CONFIG_WATCHDOG is not set
812 837
813# 838#
@@ -860,16 +885,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
860# 885#
861# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 886# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
862# 887#
863
864#
865# USB Gadget Support
866#
867# CONFIG_USB_GADGET is not set 888# CONFIG_USB_GADGET is not set
868# CONFIG_MMC is not set 889# CONFIG_MMC is not set
890# CONFIG_MEMSTICK is not set
869# CONFIG_NEW_LEDS is not set 891# CONFIG_NEW_LEDS is not set
870# CONFIG_INFINIBAND is not set 892# CONFIG_INFINIBAND is not set
871# CONFIG_EDAC is not set 893# CONFIG_EDAC is not set
872# CONFIG_RTC_CLASS is not set 894# CONFIG_RTC_CLASS is not set
895# CONFIG_DMADEVICES is not set
873 896
874# 897#
875# Userspace I/O 898# Userspace I/O
@@ -895,12 +918,10 @@ CONFIG_FS_MBCACHE=y
895# CONFIG_XFS_FS is not set 918# CONFIG_XFS_FS is not set
896# CONFIG_GFS2_FS is not set 919# CONFIG_GFS2_FS is not set
897# CONFIG_OCFS2_FS is not set 920# CONFIG_OCFS2_FS is not set
898# CONFIG_MINIX_FS is not set 921CONFIG_DNOTIFY=y
899# CONFIG_ROMFS_FS is not set
900CONFIG_INOTIFY=y 922CONFIG_INOTIFY=y
901CONFIG_INOTIFY_USER=y 923CONFIG_INOTIFY_USER=y
902# CONFIG_QUOTA is not set 924# CONFIG_QUOTA is not set
903CONFIG_DNOTIFY=y
904# CONFIG_AUTOFS_FS is not set 925# CONFIG_AUTOFS_FS is not set
905# CONFIG_AUTOFS4_FS is not set 926# CONFIG_AUTOFS4_FS is not set
906# CONFIG_FUSE_FS is not set 927# CONFIG_FUSE_FS is not set
@@ -953,8 +974,10 @@ CONFIG_JFFS2_RTIME=y
953# CONFIG_JFFS2_RUBIN is not set 974# CONFIG_JFFS2_RUBIN is not set
954CONFIG_CRAMFS=y 975CONFIG_CRAMFS=y
955# CONFIG_VXFS_FS is not set 976# CONFIG_VXFS_FS is not set
977# CONFIG_MINIX_FS is not set
956# CONFIG_HPFS_FS is not set 978# CONFIG_HPFS_FS is not set
957# CONFIG_QNX4FS_FS is not set 979# CONFIG_QNX4FS_FS is not set
980# CONFIG_ROMFS_FS is not set
958# CONFIG_SYSV_FS is not set 981# CONFIG_SYSV_FS is not set
959# CONFIG_UFS_FS is not set 982# CONFIG_UFS_FS is not set
960CONFIG_NETWORK_FILESYSTEMS=y 983CONFIG_NETWORK_FILESYSTEMS=y
@@ -1012,9 +1035,6 @@ CONFIG_PLIST=y
1012CONFIG_HAS_IOMEM=y 1035CONFIG_HAS_IOMEM=y
1013CONFIG_HAS_IOPORT=y 1036CONFIG_HAS_IOPORT=y
1014CONFIG_HAS_DMA=y 1037CONFIG_HAS_DMA=y
1015CONFIG_INSTRUMENTATION=y
1016# CONFIG_PROFILING is not set
1017# CONFIG_MARKERS is not set
1018 1038
1019# 1039#
1020# Kernel hacking 1040# Kernel hacking
@@ -1028,6 +1048,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1028# CONFIG_HEADERS_CHECK is not set 1048# CONFIG_HEADERS_CHECK is not set
1029# CONFIG_DEBUG_KERNEL is not set 1049# CONFIG_DEBUG_KERNEL is not set
1030# CONFIG_SLUB_DEBUG_ON is not set 1050# CONFIG_SLUB_DEBUG_ON is not set
1051# CONFIG_SLUB_STATS is not set
1031# CONFIG_DEBUG_BUGVERBOSE is not set 1052# CONFIG_DEBUG_BUGVERBOSE is not set
1032# CONFIG_SAMPLES is not set 1053# CONFIG_SAMPLES is not set
1033# CONFIG_KGDB_CONSOLE is not set 1054# CONFIG_KGDB_CONSOLE is not set
@@ -1039,6 +1060,50 @@ CONFIG_ENABLE_MUST_CHECK=y
1039# CONFIG_KEYS is not set 1060# CONFIG_KEYS is not set
1040# CONFIG_SECURITY is not set 1061# CONFIG_SECURITY is not set
1041# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1062# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1042# CONFIG_CRYPTO is not set 1063CONFIG_CRYPTO=y
1064# CONFIG_CRYPTO_SEQIV is not set
1065# CONFIG_CRYPTO_MANAGER is not set
1066# CONFIG_CRYPTO_HMAC is not set
1067# CONFIG_CRYPTO_XCBC is not set
1068# CONFIG_CRYPTO_NULL is not set
1069# CONFIG_CRYPTO_MD4 is not set
1070# CONFIG_CRYPTO_MD5 is not set
1071# CONFIG_CRYPTO_SHA1 is not set
1072# CONFIG_CRYPTO_SHA256 is not set
1073# CONFIG_CRYPTO_SHA512 is not set
1074# CONFIG_CRYPTO_WP512 is not set
1075# CONFIG_CRYPTO_TGR192 is not set
1076# CONFIG_CRYPTO_GF128MUL is not set
1077# CONFIG_CRYPTO_ECB is not set
1078# CONFIG_CRYPTO_CBC is not set
1079# CONFIG_CRYPTO_PCBC is not set
1080# CONFIG_CRYPTO_LRW is not set
1081# CONFIG_CRYPTO_XTS is not set
1082# CONFIG_CRYPTO_CTR is not set
1083# CONFIG_CRYPTO_GCM is not set
1084# CONFIG_CRYPTO_CCM is not set
1085# CONFIG_CRYPTO_CRYPTD is not set
1086# CONFIG_CRYPTO_DES is not set
1087# CONFIG_CRYPTO_FCRYPT is not set
1088# CONFIG_CRYPTO_BLOWFISH is not set
1089# CONFIG_CRYPTO_TWOFISH is not set
1090# CONFIG_CRYPTO_SERPENT is not set
1091# CONFIG_CRYPTO_AES is not set
1092# CONFIG_CRYPTO_CAST5 is not set
1093# CONFIG_CRYPTO_CAST6 is not set
1094# CONFIG_CRYPTO_TEA is not set
1095# CONFIG_CRYPTO_ARC4 is not set
1096# CONFIG_CRYPTO_KHAZAD is not set
1097# CONFIG_CRYPTO_ANUBIS is not set
1098# CONFIG_CRYPTO_SEED is not set
1099# CONFIG_CRYPTO_SALSA20 is not set
1100# CONFIG_CRYPTO_DEFLATE is not set
1101# CONFIG_CRYPTO_MICHAEL_MIC is not set
1102# CONFIG_CRYPTO_CRC32C is not set
1103# CONFIG_CRYPTO_CAMELLIA is not set
1104# CONFIG_CRYPTO_AUTHENC is not set
1105# CONFIG_CRYPTO_LZO is not set
1106CONFIG_CRYPTO_HW=y
1107# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1043# CONFIG_PPC_CLOCK is not set 1108# CONFIG_PPC_CLOCK is not set
1044CONFIG_PPC_LIB_RHEAP=y 1109CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/tqm8560_defconfig b/arch/powerpc/configs/tqm8560_defconfig
index 0832e8996ac2..63c5ec8b6515 100644
--- a/arch/powerpc/configs/tqm8560_defconfig
+++ b/arch/powerpc/configs/tqm8560_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-rc8 3# Linux kernel version: 2.6.25-rc6
4# Thu Jan 24 23:50:42 2008 4# Mon Mar 24 08:48:45 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -14,10 +14,10 @@ CONFIG_PPC_85xx=y
14# CONFIG_40x is not set 14# CONFIG_40x is not set
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_85xx=y
18CONFIG_E500=y 17CONFIG_E500=y
19CONFIG_BOOKE=y 18CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 19CONFIG_FSL_BOOKE=y
20CONFIG_FSL_EMB_PERFMON=y
21# CONFIG_PHYS_64BIT is not set 21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
@@ -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
@@ -67,17 +68,19 @@ CONFIG_SYSVIPC_SYSCTL=y
67# CONFIG_POSIX_MQUEUE is not set 68# CONFIG_POSIX_MQUEUE is not set
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
81CONFIG_SYSFS_DEPRECATED_V2=y
80# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
83# CONFIG_NAMESPACES is not set
81CONFIG_BLK_DEV_INITRD=y 84CONFIG_BLK_DEV_INITRD=y
82CONFIG_INITRAMFS_SOURCE="" 85CONFIG_INITRAMFS_SOURCE=""
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -89,11 +92,13 @@ CONFIG_SYSCTL_SYSCALL=y
89CONFIG_PRINTK=y 92CONFIG_PRINTK=y
90CONFIG_BUG=y 93CONFIG_BUG=y
91CONFIG_ELF_CORE=y 94CONFIG_ELF_CORE=y
95CONFIG_COMPAT_BRK=y
92CONFIG_BASE_FULL=y 96CONFIG_BASE_FULL=y
93CONFIG_FUTEX=y 97CONFIG_FUTEX=y
94CONFIG_ANON_INODES=y 98CONFIG_ANON_INODES=y
95# CONFIG_EPOLL is not set 99# CONFIG_EPOLL is not set
96CONFIG_SIGNALFD=y 100CONFIG_SIGNALFD=y
101CONFIG_TIMERFD=y
97CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
98CONFIG_SHMEM=y 103CONFIG_SHMEM=y
99CONFIG_VM_EVENT_COUNTERS=y 104CONFIG_VM_EVENT_COUNTERS=y
@@ -101,6 +106,12 @@ CONFIG_SLUB_DEBUG=y
101# CONFIG_SLAB is not set 106# CONFIG_SLAB is not set
102CONFIG_SLUB=y 107CONFIG_SLUB=y
103# CONFIG_SLOB is not set 108# CONFIG_SLOB is not set
109# CONFIG_PROFILING is not set
110# CONFIG_MARKERS is not set
111CONFIG_HAVE_OPROFILE=y
112CONFIG_HAVE_KPROBES=y
113CONFIG_HAVE_KRETPROBES=y
114CONFIG_PROC_PAGE_MONITOR=y
104CONFIG_SLABINFO=y 115CONFIG_SLABINFO=y
105CONFIG_RT_MUTEXES=y 116CONFIG_RT_MUTEXES=y
106# CONFIG_TINY_SHMEM is not set 117# CONFIG_TINY_SHMEM is not set
@@ -124,15 +135,17 @@ CONFIG_DEFAULT_AS=y
124# CONFIG_DEFAULT_CFQ is not set 135# CONFIG_DEFAULT_CFQ is not set
125# CONFIG_DEFAULT_NOOP is not set 136# CONFIG_DEFAULT_NOOP is not set
126CONFIG_DEFAULT_IOSCHED="anticipatory" 137CONFIG_DEFAULT_IOSCHED="anticipatory"
138CONFIG_CLASSIC_RCU=y
127 139
128# 140#
129# Platform support 141# Platform support
130# 142#
131# CONFIG_PPC_MPC52xx is not set 143# CONFIG_PPC_MPC512x is not set
132# CONFIG_PPC_MPC5200 is not set 144# CONFIG_PPC_MPC5121 is not set
133# CONFIG_PPC_CELL is not set 145# CONFIG_PPC_CELL is not set
134# CONFIG_PPC_CELL_NATIVE is not set 146# CONFIG_PPC_CELL_NATIVE is not set
135# CONFIG_PQ2ADS is not set 147# CONFIG_PQ2ADS is not set
148CONFIG_MPC85xx=y
136# CONFIG_MPC8540_ADS is not set 149# CONFIG_MPC8540_ADS is not set
137# CONFIG_MPC8560_ADS is not set 150# CONFIG_MPC8560_ADS is not set
138# CONFIG_MPC85xx_CDS is not set 151# CONFIG_MPC85xx_CDS is not set
@@ -143,8 +156,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
143# CONFIG_TQM8541 is not set 156# CONFIG_TQM8541 is not set
144# CONFIG_TQM8555 is not set 157# CONFIG_TQM8555 is not set
145CONFIG_TQM8560=y 158CONFIG_TQM8560=y
159# CONFIG_SBC8548 is not set
160# CONFIG_SBC8560 is not set
146CONFIG_TQM85xx=y 161CONFIG_TQM85xx=y
147CONFIG_MPC85xx=y
148# CONFIG_IPIC is not set 162# CONFIG_IPIC is not set
149CONFIG_MPIC=y 163CONFIG_MPIC=y
150# CONFIG_MPIC_WEIRD is not set 164# CONFIG_MPIC_WEIRD is not set
@@ -174,13 +188,17 @@ CONFIG_HZ_250=y
174# CONFIG_HZ_300 is not set 188# CONFIG_HZ_300 is not set
175# CONFIG_HZ_1000 is not set 189# CONFIG_HZ_1000 is not set
176CONFIG_HZ=250 190CONFIG_HZ=250
191# CONFIG_SCHED_HRTICK is not set
177CONFIG_PREEMPT_NONE=y 192CONFIG_PREEMPT_NONE=y
178# CONFIG_PREEMPT_VOLUNTARY is not set 193# CONFIG_PREEMPT_VOLUNTARY is not set
179# CONFIG_PREEMPT is not set 194# CONFIG_PREEMPT is not set
180CONFIG_BINFMT_ELF=y 195CONFIG_BINFMT_ELF=y
181# CONFIG_BINFMT_MISC is not set 196# CONFIG_BINFMT_MISC is not set
182CONFIG_MATH_EMULATION=y 197CONFIG_MATH_EMULATION=y
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
@@ -199,11 +217,7 @@ CONFIG_VIRT_TO_BUS=y
199# CONFIG_PROC_DEVICETREE is not set 217# CONFIG_PROC_DEVICETREE is not set
200# CONFIG_CMDLINE_BOOL is not set 218# CONFIG_CMDLINE_BOOL is not set
201# CONFIG_PM is not set 219# CONFIG_PM is not set
202CONFIG_SUSPEND_UP_POSSIBLE=y
203CONFIG_HIBERNATION_UP_POSSIBLE=y
204CONFIG_SECCOMP=y 220CONFIG_SECCOMP=y
205CONFIG_WANT_DEVICE_TREE=y
206CONFIG_DEVICE_TREE="tqm8560.dts"
207CONFIG_ISA_DMA_API=y 221CONFIG_ISA_DMA_API=y
208 222
209# 223#
@@ -250,6 +264,7 @@ CONFIG_XFRM=y
250# CONFIG_XFRM_USER is not set 264# CONFIG_XFRM_USER is not set
251# CONFIG_XFRM_SUB_POLICY is not set 265# CONFIG_XFRM_SUB_POLICY is not set
252# CONFIG_XFRM_MIGRATE is not set 266# CONFIG_XFRM_MIGRATE is not set
267# CONFIG_XFRM_STATISTICS is not set
253# CONFIG_NET_KEY is not set 268# CONFIG_NET_KEY is not set
254CONFIG_INET=y 269CONFIG_INET=y
255CONFIG_IP_MULTICAST=y 270CONFIG_IP_MULTICAST=y
@@ -305,6 +320,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
305# 320#
306# CONFIG_NET_PKTGEN is not set 321# CONFIG_NET_PKTGEN is not set
307# CONFIG_HAMRADIO is not set 322# CONFIG_HAMRADIO is not set
323# CONFIG_CAN is not set
308# CONFIG_IRDA is not set 324# CONFIG_IRDA is not set
309# CONFIG_BT is not set 325# CONFIG_BT is not set
310# CONFIG_AF_RXRPC is not set 326# CONFIG_AF_RXRPC is not set
@@ -336,6 +352,7 @@ CONFIG_MTD_CONCAT=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
355# CONFIG_MTD_OF_PARTS is not set
339 356
340# 357#
341# User Modules And Translation Layers 358# User Modules And Translation Layers
@@ -422,7 +439,7 @@ CONFIG_BLK_DEV_LOOP=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=32768 441CONFIG_BLK_DEV_RAM_SIZE=32768
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
428CONFIG_MISC_DEVICES=y 445CONFIG_MISC_DEVICES=y
@@ -430,12 +447,14 @@ CONFIG_MISC_DEVICES=y
430# CONFIG_EEPROM_93CX6 is not set 447# CONFIG_EEPROM_93CX6 is not set
431# CONFIG_SGI_IOC4 is not set 448# CONFIG_SGI_IOC4 is not set
432# CONFIG_TIFM_CORE is not set 449# CONFIG_TIFM_CORE is not set
450# CONFIG_ENCLOSURE_SERVICES is not set
451CONFIG_HAVE_IDE=y
433CONFIG_IDE=y 452CONFIG_IDE=y
434CONFIG_IDE_MAX_HWIFS=4 453CONFIG_IDE_MAX_HWIFS=4
435CONFIG_BLK_DEV_IDE=y 454CONFIG_BLK_DEV_IDE=y
436 455
437# 456#
438# Please see Documentation/ide.txt for help/info on IDE drives 457# Please see Documentation/ide/ide.txt for help/info on IDE drives
439# 458#
440# CONFIG_BLK_DEV_IDE_SATA is not set 459# CONFIG_BLK_DEV_IDE_SATA is not set
441CONFIG_BLK_DEV_IDEDISK=y 460CONFIG_BLK_DEV_IDEDISK=y
@@ -451,12 +470,12 @@ CONFIG_IDE_PROC_FS=y
451# 470#
452CONFIG_IDE_GENERIC=y 471CONFIG_IDE_GENERIC=y
453# CONFIG_BLK_DEV_PLATFORM is not set 472# CONFIG_BLK_DEV_PLATFORM is not set
473CONFIG_BLK_DEV_IDEDMA_SFF=y
454 474
455# 475#
456# PCI IDE chipsets support 476# PCI IDE chipsets support
457# 477#
458CONFIG_BLK_DEV_IDEPCI=y 478CONFIG_BLK_DEV_IDEPCI=y
459CONFIG_IDEPCI_SHARE_IRQ=y
460CONFIG_IDEPCI_PCIBUS_ORDER=y 479CONFIG_IDEPCI_PCIBUS_ORDER=y
461# CONFIG_BLK_DEV_OFFBOARD is not set 480# CONFIG_BLK_DEV_OFFBOARD is not set
462CONFIG_BLK_DEV_GENERIC=y 481CONFIG_BLK_DEV_GENERIC=y
@@ -487,7 +506,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
487# CONFIG_BLK_DEV_TRM290 is not set 506# CONFIG_BLK_DEV_TRM290 is not set
488CONFIG_BLK_DEV_VIA82CXXX=y 507CONFIG_BLK_DEV_VIA82CXXX=y
489# CONFIG_BLK_DEV_TC86C001 is not set 508# CONFIG_BLK_DEV_TC86C001 is not set
490# CONFIG_IDE_ARM is not set
491CONFIG_BLK_DEV_IDEDMA=y 509CONFIG_BLK_DEV_IDEDMA=y
492CONFIG_IDE_ARCH_OBSOLETE_INIT=y 510CONFIG_IDE_ARCH_OBSOLETE_INIT=y
493# CONFIG_BLK_DEV_HD is not set 511# CONFIG_BLK_DEV_HD is not set
@@ -533,6 +551,7 @@ CONFIG_PHYLIB=y
533# CONFIG_SMSC_PHY is not set 551# CONFIG_SMSC_PHY is not set
534# CONFIG_BROADCOM_PHY is not set 552# CONFIG_BROADCOM_PHY is not set
535# CONFIG_ICPLUS_PHY is not set 553# CONFIG_ICPLUS_PHY is not set
554# CONFIG_REALTEK_PHY is not set
536# CONFIG_FIXED_PHY is not set 555# CONFIG_FIXED_PHY is not set
537# CONFIG_MDIO_BITBANG is not set 556# CONFIG_MDIO_BITBANG is not set
538CONFIG_NET_ETHERNET=y 557CONFIG_NET_ETHERNET=y
@@ -560,6 +579,7 @@ CONFIG_E100=y
560# CONFIG_NE2K_PCI is not set 579# CONFIG_NE2K_PCI is not set
561# CONFIG_8139CP is not set 580# CONFIG_8139CP is not set
562# CONFIG_8139TOO is not set 581# CONFIG_8139TOO is not set
582# CONFIG_R6040 is not set
563# CONFIG_SIS900 is not set 583# CONFIG_SIS900 is not set
564# CONFIG_EPIC100 is not set 584# CONFIG_EPIC100 is not set
565# CONFIG_SUNDANCE is not set 585# CONFIG_SUNDANCE is not set
@@ -572,7 +592,9 @@ CONFIG_NETDEV_1000=y
572# CONFIG_DL2K is not set 592# CONFIG_DL2K is not set
573# CONFIG_E1000 is not set 593# CONFIG_E1000 is not set
574# CONFIG_E1000E is not set 594# CONFIG_E1000E is not set
595# CONFIG_E1000E_ENABLED is not set
575# CONFIG_IP1000 is not set 596# CONFIG_IP1000 is not set
597# CONFIG_IGB is not set
576# CONFIG_NS83820 is not set 598# CONFIG_NS83820 is not set
577# CONFIG_HAMACHI is not set 599# CONFIG_HAMACHI is not set
578# CONFIG_YELLOWFIN is not set 600# CONFIG_YELLOWFIN is not set
@@ -599,6 +621,7 @@ CONFIG_NETDEV_10000=y
599# CONFIG_NIU is not set 621# CONFIG_NIU is not set
600# CONFIG_MLX4_CORE is not set 622# CONFIG_MLX4_CORE is not set
601# CONFIG_TEHUTI is not set 623# CONFIG_TEHUTI is not set
624# CONFIG_BNX2X is not set
602# CONFIG_TR is not set 625# CONFIG_TR is not set
603 626
604# 627#
@@ -611,7 +634,6 @@ CONFIG_NETDEV_10000=y
611# CONFIG_HIPPI is not set 634# CONFIG_HIPPI is not set
612# CONFIG_PPP is not set 635# CONFIG_PPP is not set
613# CONFIG_SLIP is not set 636# CONFIG_SLIP is not set
614# CONFIG_SHAPER is not set
615# CONFIG_NETCONSOLE is not set 637# CONFIG_NETCONSOLE is not set
616# CONFIG_NETPOLL is not set 638# CONFIG_NETPOLL is not set
617# CONFIG_NET_POLL_CONTROLLER is not set 639# CONFIG_NET_POLL_CONTROLLER is not set
@@ -654,6 +676,7 @@ CONFIG_INPUT=y
654# 676#
655# CONFIG_VT is not set 677# CONFIG_VT is not set
656# CONFIG_SERIAL_NONSTANDARD is not set 678# CONFIG_SERIAL_NONSTANDARD is not set
679# CONFIG_NOZOMI is not set
657 680
658# 681#
659# Serial drivers 682# Serial drivers
@@ -735,14 +758,12 @@ CONFIG_I2C_MPC=y
735# 758#
736# Miscellaneous I2C Chip support 759# Miscellaneous I2C Chip support
737# 760#
738CONFIG_SENSORS_DS1337=y
739# CONFIG_SENSORS_DS1374 is not set
740# CONFIG_DS1682 is not set 761# CONFIG_DS1682 is not set
741# CONFIG_SENSORS_EEPROM is not set 762# CONFIG_SENSORS_EEPROM is not set
742# CONFIG_SENSORS_PCF8574 is not set 763# CONFIG_SENSORS_PCF8574 is not set
743# CONFIG_SENSORS_PCA9539 is not set 764# CONFIG_PCF8575 is not set
744# CONFIG_SENSORS_PCF8591 is not set 765# CONFIG_SENSORS_PCF8591 is not set
745# CONFIG_SENSORS_M41T00 is not set 766# CONFIG_TPS65010 is not set
746# CONFIG_SENSORS_MAX6875 is not set 767# CONFIG_SENSORS_MAX6875 is not set
747# CONFIG_SENSORS_TSL2550 is not set 768# CONFIG_SENSORS_TSL2550 is not set
748# CONFIG_I2C_DEBUG_CORE is not set 769# CONFIG_I2C_DEBUG_CORE is not set
@@ -767,6 +788,7 @@ CONFIG_HWMON=y
767# CONFIG_SENSORS_ADM1031 is not set 788# CONFIG_SENSORS_ADM1031 is not set
768# CONFIG_SENSORS_ADM9240 is not set 789# CONFIG_SENSORS_ADM9240 is not set
769# CONFIG_SENSORS_ADT7470 is not set 790# CONFIG_SENSORS_ADT7470 is not set
791# CONFIG_SENSORS_ADT7473 is not set
770# CONFIG_SENSORS_ATXP1 is not set 792# CONFIG_SENSORS_ATXP1 is not set
771# CONFIG_SENSORS_DS1621 is not set 793# CONFIG_SENSORS_DS1621 is not set
772# CONFIG_SENSORS_I5K_AMB is not set 794# CONFIG_SENSORS_I5K_AMB is not set
@@ -796,6 +818,7 @@ CONFIG_SENSORS_LM75=y
796# CONFIG_SENSORS_SMSC47M1 is not set 818# CONFIG_SENSORS_SMSC47M1 is not set
797# CONFIG_SENSORS_SMSC47M192 is not set 819# CONFIG_SENSORS_SMSC47M192 is not set
798# CONFIG_SENSORS_SMSC47B397 is not set 820# CONFIG_SENSORS_SMSC47B397 is not set
821# CONFIG_SENSORS_ADS7828 is not set
799# CONFIG_SENSORS_THMC50 is not set 822# CONFIG_SENSORS_THMC50 is not set
800# CONFIG_SENSORS_VIA686A is not set 823# CONFIG_SENSORS_VIA686A is not set
801# CONFIG_SENSORS_VT1211 is not set 824# CONFIG_SENSORS_VT1211 is not set
@@ -805,9 +828,11 @@ CONFIG_SENSORS_LM75=y
805# CONFIG_SENSORS_W83792D is not set 828# CONFIG_SENSORS_W83792D is not set
806# CONFIG_SENSORS_W83793 is not set 829# CONFIG_SENSORS_W83793 is not set
807# CONFIG_SENSORS_W83L785TS is not set 830# CONFIG_SENSORS_W83L785TS is not set
831# CONFIG_SENSORS_W83L786NG is not set
808# CONFIG_SENSORS_W83627HF is not set 832# CONFIG_SENSORS_W83627HF is not set
809# CONFIG_SENSORS_W83627EHF is not set 833# CONFIG_SENSORS_W83627EHF is not set
810CONFIG_HWMON_DEBUG_CHIP=y 834CONFIG_HWMON_DEBUG_CHIP=y
835# CONFIG_THERMAL is not set
811# CONFIG_WATCHDOG is not set 836# CONFIG_WATCHDOG is not set
812 837
813# 838#
@@ -860,16 +885,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
860# 885#
861# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 886# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
862# 887#
863
864#
865# USB Gadget Support
866#
867# CONFIG_USB_GADGET is not set 888# CONFIG_USB_GADGET is not set
868# CONFIG_MMC is not set 889# CONFIG_MMC is not set
890# CONFIG_MEMSTICK is not set
869# CONFIG_NEW_LEDS is not set 891# CONFIG_NEW_LEDS is not set
870# CONFIG_INFINIBAND is not set 892# CONFIG_INFINIBAND is not set
871# CONFIG_EDAC is not set 893# CONFIG_EDAC is not set
872# CONFIG_RTC_CLASS is not set 894# CONFIG_RTC_CLASS is not set
895# CONFIG_DMADEVICES is not set
873 896
874# 897#
875# Userspace I/O 898# Userspace I/O
@@ -895,12 +918,10 @@ CONFIG_FS_MBCACHE=y
895# CONFIG_XFS_FS is not set 918# CONFIG_XFS_FS is not set
896# CONFIG_GFS2_FS is not set 919# CONFIG_GFS2_FS is not set
897# CONFIG_OCFS2_FS is not set 920# CONFIG_OCFS2_FS is not set
898# CONFIG_MINIX_FS is not set 921CONFIG_DNOTIFY=y
899# CONFIG_ROMFS_FS is not set
900CONFIG_INOTIFY=y 922CONFIG_INOTIFY=y
901CONFIG_INOTIFY_USER=y 923CONFIG_INOTIFY_USER=y
902# CONFIG_QUOTA is not set 924# CONFIG_QUOTA is not set
903CONFIG_DNOTIFY=y
904# CONFIG_AUTOFS_FS is not set 925# CONFIG_AUTOFS_FS is not set
905# CONFIG_AUTOFS4_FS is not set 926# CONFIG_AUTOFS4_FS is not set
906# CONFIG_FUSE_FS is not set 927# CONFIG_FUSE_FS is not set
@@ -953,8 +974,10 @@ CONFIG_JFFS2_RTIME=y
953# CONFIG_JFFS2_RUBIN is not set 974# CONFIG_JFFS2_RUBIN is not set
954CONFIG_CRAMFS=y 975CONFIG_CRAMFS=y
955# CONFIG_VXFS_FS is not set 976# CONFIG_VXFS_FS is not set
977# CONFIG_MINIX_FS is not set
956# CONFIG_HPFS_FS is not set 978# CONFIG_HPFS_FS is not set
957# CONFIG_QNX4FS_FS is not set 979# CONFIG_QNX4FS_FS is not set
980# CONFIG_ROMFS_FS is not set
958# CONFIG_SYSV_FS is not set 981# CONFIG_SYSV_FS is not set
959# CONFIG_UFS_FS is not set 982# CONFIG_UFS_FS is not set
960CONFIG_NETWORK_FILESYSTEMS=y 983CONFIG_NETWORK_FILESYSTEMS=y
@@ -1012,9 +1035,6 @@ CONFIG_PLIST=y
1012CONFIG_HAS_IOMEM=y 1035CONFIG_HAS_IOMEM=y
1013CONFIG_HAS_IOPORT=y 1036CONFIG_HAS_IOPORT=y
1014CONFIG_HAS_DMA=y 1037CONFIG_HAS_DMA=y
1015CONFIG_INSTRUMENTATION=y
1016# CONFIG_PROFILING is not set
1017# CONFIG_MARKERS is not set
1018 1038
1019# 1039#
1020# Kernel hacking 1040# Kernel hacking
@@ -1028,6 +1048,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1028# CONFIG_HEADERS_CHECK is not set 1048# CONFIG_HEADERS_CHECK is not set
1029# CONFIG_DEBUG_KERNEL is not set 1049# CONFIG_DEBUG_KERNEL is not set
1030# CONFIG_SLUB_DEBUG_ON is not set 1050# CONFIG_SLUB_DEBUG_ON is not set
1051# CONFIG_SLUB_STATS is not set
1031# CONFIG_DEBUG_BUGVERBOSE is not set 1052# CONFIG_DEBUG_BUGVERBOSE is not set
1032# CONFIG_SAMPLES is not set 1053# CONFIG_SAMPLES is not set
1033# CONFIG_KGDB_CONSOLE is not set 1054# CONFIG_KGDB_CONSOLE is not set
@@ -1039,6 +1060,50 @@ CONFIG_ENABLE_MUST_CHECK=y
1039# CONFIG_KEYS is not set 1060# CONFIG_KEYS is not set
1040# CONFIG_SECURITY is not set 1061# CONFIG_SECURITY is not set
1041# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1062# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1042# CONFIG_CRYPTO is not set 1063CONFIG_CRYPTO=y
1064# CONFIG_CRYPTO_SEQIV is not set
1065# CONFIG_CRYPTO_MANAGER is not set
1066# CONFIG_CRYPTO_HMAC is not set
1067# CONFIG_CRYPTO_XCBC is not set
1068# CONFIG_CRYPTO_NULL is not set
1069# CONFIG_CRYPTO_MD4 is not set
1070# CONFIG_CRYPTO_MD5 is not set
1071# CONFIG_CRYPTO_SHA1 is not set
1072# CONFIG_CRYPTO_SHA256 is not set
1073# CONFIG_CRYPTO_SHA512 is not set
1074# CONFIG_CRYPTO_WP512 is not set
1075# CONFIG_CRYPTO_TGR192 is not set
1076# CONFIG_CRYPTO_GF128MUL is not set
1077# CONFIG_CRYPTO_ECB is not set
1078# CONFIG_CRYPTO_CBC is not set
1079# CONFIG_CRYPTO_PCBC is not set
1080# CONFIG_CRYPTO_LRW is not set
1081# CONFIG_CRYPTO_XTS is not set
1082# CONFIG_CRYPTO_CTR is not set
1083# CONFIG_CRYPTO_GCM is not set
1084# CONFIG_CRYPTO_CCM is not set
1085# CONFIG_CRYPTO_CRYPTD is not set
1086# CONFIG_CRYPTO_DES is not set
1087# CONFIG_CRYPTO_FCRYPT is not set
1088# CONFIG_CRYPTO_BLOWFISH is not set
1089# CONFIG_CRYPTO_TWOFISH is not set
1090# CONFIG_CRYPTO_SERPENT is not set
1091# CONFIG_CRYPTO_AES is not set
1092# CONFIG_CRYPTO_CAST5 is not set
1093# CONFIG_CRYPTO_CAST6 is not set
1094# CONFIG_CRYPTO_TEA is not set
1095# CONFIG_CRYPTO_ARC4 is not set
1096# CONFIG_CRYPTO_KHAZAD is not set
1097# CONFIG_CRYPTO_ANUBIS is not set
1098# CONFIG_CRYPTO_SEED is not set
1099# CONFIG_CRYPTO_SALSA20 is not set
1100# CONFIG_CRYPTO_DEFLATE is not set
1101# CONFIG_CRYPTO_MICHAEL_MIC is not set
1102# CONFIG_CRYPTO_CRC32C is not set
1103# CONFIG_CRYPTO_CAMELLIA is not set
1104# CONFIG_CRYPTO_AUTHENC is not set
1105# CONFIG_CRYPTO_LZO is not set
1106CONFIG_CRYPTO_HW=y
1107# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1043# CONFIG_PPC_CLOCK is not set 1108# CONFIG_PPC_CLOCK is not set
1044CONFIG_PPC_LIB_RHEAP=y 1109CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 4846bf543a8c..59311ec0d422 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -353,6 +353,12 @@ struct task_struct *__switch_to(struct task_struct *prev,
353 account_process_vtime(current); 353 account_process_vtime(current);
354 calculate_steal_time(); 354 calculate_steal_time();
355 355
356 /*
357 * We can't take a PMU exception inside _switch() since there is a
358 * window where the kernel stack SLB and the kernel stack are out
359 * of sync. Hard disable here.
360 */
361 hard_irq_disable();
356 last = _switch(old_thread, new_thread); 362 last = _switch(old_thread, new_thread);
357 363
358 local_irq_restore(flags); 364 local_irq_restore(flags);
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 7673e9865733..2a9fe97e4521 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -530,15 +530,21 @@ static int gpr32_set(struct task_struct *target,
530 --count; 530 --count;
531 } 531 }
532 532
533 if (kbuf) 533 if (kbuf) {
534 for (; count > 0 && pos <= PT_MAX_PUT_REG; --count) 534 for (; count > 0 && pos <= PT_MAX_PUT_REG; --count)
535 regs[pos++] = *k++; 535 regs[pos++] = *k++;
536 else 536 for (; count > 0 && pos < PT_TRAP; --count, ++pos)
537 ++k;
538 } else {
537 for (; count > 0 && pos <= PT_MAX_PUT_REG; --count) { 539 for (; count > 0 && pos <= PT_MAX_PUT_REG; --count) {
538 if (__get_user(reg, u++)) 540 if (__get_user(reg, u++))
539 return -EFAULT; 541 return -EFAULT;
540 regs[pos++] = reg; 542 regs[pos++] = reg;
541 } 543 }
544 for (; count > 0 && pos < PT_TRAP; --count, ++pos)
545 if (__get_user(reg, u++))
546 return -EFAULT;
547 }
542 548
543 if (count > 0 && pos == PT_TRAP) { 549 if (count > 0 && pos == PT_TRAP) {
544 if (kbuf) 550 if (kbuf)
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 590f1f67c874..a83dfa3cf40c 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -351,9 +351,14 @@ static void __init htab_init_page_sizes(void)
351 mmu_vmalloc_psize = MMU_PAGE_64K; 351 mmu_vmalloc_psize = MMU_PAGE_64K;
352 if (mmu_linear_psize == MMU_PAGE_4K) 352 if (mmu_linear_psize == MMU_PAGE_4K)
353 mmu_linear_psize = MMU_PAGE_64K; 353 mmu_linear_psize = MMU_PAGE_64K;
354 if (cpu_has_feature(CPU_FTR_CI_LARGE_PAGE)) 354 if (cpu_has_feature(CPU_FTR_CI_LARGE_PAGE)) {
355 mmu_io_psize = MMU_PAGE_64K; 355 /*
356 else 356 * Don't use 64k pages for ioremap on pSeries, since
357 * that would stop us accessing the HEA ethernet.
358 */
359 if (!machine_is(pseries))
360 mmu_io_psize = MMU_PAGE_64K;
361 } else
357 mmu_ci_restrictions = 1; 362 mmu_ci_restrictions = 1;
358 } 363 }
359#endif /* CONFIG_PPC_64K_PAGES */ 364#endif /* CONFIG_PPC_64K_PAGES */
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c
index 47b06bad24ad..906daeda59a8 100644
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
@@ -124,6 +124,12 @@ void slb_flush_and_rebolt(void)
124 ksp_vsid_data = get_slb_shadow()->save_area[2].vsid; 124 ksp_vsid_data = get_slb_shadow()->save_area[2].vsid;
125 } 125 }
126 126
127 /*
128 * We can't take a PMU exception in the following code, so hard
129 * disable interrupts.
130 */
131 hard_irq_disable();
132
127 /* We need to do this all in asm, so we're sure we don't touch 133 /* We need to do this all in asm, so we're sure we don't touch
128 * the stack between the slbia and rebolting it. */ 134 * the stack between the slbia and rebolting it. */
129 asm volatile("isync\n" 135 asm volatile("isync\n"
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index 20ea0e118f24..d75ccded7f10 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -802,17 +802,24 @@ static int __init cell_iommu_init_disabled(void)
802 802
803static u64 cell_iommu_get_fixed_address(struct device *dev) 803static u64 cell_iommu_get_fixed_address(struct device *dev)
804{ 804{
805 u64 cpu_addr, size, best_size, pci_addr = OF_BAD_ADDR; 805 u64 cpu_addr, size, best_size, dev_addr = OF_BAD_ADDR;
806 struct device_node *np; 806 struct device_node *np;
807 const u32 *ranges = NULL; 807 const u32 *ranges = NULL;
808 int i, len, best; 808 int i, len, best, naddr, nsize, pna, range_size;
809 809
810 np = of_node_get(dev->archdata.of_node); 810 np = of_node_get(dev->archdata.of_node);
811 while (np) { 811 while (1) {
812 naddr = of_n_addr_cells(np);
813 nsize = of_n_size_cells(np);
814 np = of_get_next_parent(np);
815 if (!np)
816 break;
817
812 ranges = of_get_property(np, "dma-ranges", &len); 818 ranges = of_get_property(np, "dma-ranges", &len);
813 if (ranges) 819
820 /* Ignore empty ranges, they imply no translation required */
821 if (ranges && len > 0)
814 break; 822 break;
815 np = of_get_next_parent(np);
816 } 823 }
817 824
818 if (!ranges) { 825 if (!ranges) {
@@ -822,15 +829,17 @@ static u64 cell_iommu_get_fixed_address(struct device *dev)
822 829
823 len /= sizeof(u32); 830 len /= sizeof(u32);
824 831
832 pna = of_n_addr_cells(np);
833 range_size = naddr + nsize + pna;
834
825 /* dma-ranges format: 835 /* dma-ranges format:
826 * 1 cell: pci space 836 * child addr : naddr cells
827 * 2 cells: pci address 837 * parent addr : pna cells
828 * 2 cells: parent address 838 * size : nsize cells
829 * 2 cells: size
830 */ 839 */
831 for (i = 0, best = -1, best_size = 0; i < len; i += 7) { 840 for (i = 0, best = -1, best_size = 0; i < len; i += range_size) {
832 cpu_addr = of_translate_dma_address(np, ranges +i + 3); 841 cpu_addr = of_translate_dma_address(np, ranges + i + naddr);
833 size = of_read_number(ranges + i + 5, 2); 842 size = of_read_number(ranges + i + naddr + pna, nsize);
834 843
835 if (cpu_addr == 0 && size > best_size) { 844 if (cpu_addr == 0 && size > best_size) {
836 best = i; 845 best = i;
@@ -838,15 +847,15 @@ static u64 cell_iommu_get_fixed_address(struct device *dev)
838 } 847 }
839 } 848 }
840 849
841 if (best >= 0) 850 if (best >= 0) {
842 pci_addr = of_read_number(ranges + best + 1, 2); 851 dev_addr = of_read_number(ranges + best, naddr);
843 else 852 } else
844 dev_dbg(dev, "iommu: no suitable range found!\n"); 853 dev_dbg(dev, "iommu: no suitable range found!\n");
845 854
846out: 855out:
847 of_node_put(np); 856 of_node_put(np);
848 857
849 return pci_addr; 858 return dev_addr;
850} 859}
851 860
852static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask) 861static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask)
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index dda34650cb07..5c531e8f9f6f 100644
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -81,6 +81,42 @@ static void cell_progress(char *s, unsigned short hex)
81 printk("*** %04x : %s\n", hex, s ? s : ""); 81 printk("*** %04x : %s\n", hex, s ? s : "");
82} 82}
83 83
84static void cell_fixup_pcie_rootcomplex(struct pci_dev *dev)
85{
86 struct pci_controller *hose;
87 const char *s;
88 int i;
89
90 if (!machine_is(cell))
91 return;
92
93 /* We're searching for a direct child of the PHB */
94 if (dev->bus->self != NULL || dev->devfn != 0)
95 return;
96
97 hose = pci_bus_to_host(dev->bus);
98 if (hose == NULL)
99 return;
100
101 /* Only on PCIE */
102 if (!of_device_is_compatible(hose->dn, "pciex"))
103 return;
104
105 /* And only on axon */
106 s = of_get_property(hose->dn, "model", NULL);
107 if (!s || strcmp(s, "Axon") != 0)
108 return;
109
110 for (i = 0; i < PCI_BRIDGE_RESOURCES; i++) {
111 dev->resource[i].start = dev->resource[i].end = 0;
112 dev->resource[i].flags = 0;
113 }
114
115 printk(KERN_DEBUG "PCI: Hiding resources on Axon PCIE RC %s\n",
116 pci_name(dev));
117}
118DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, cell_fixup_pcie_rootcomplex);
119
84static int __init cell_publish_devices(void) 120static int __init cell_publish_devices(void)
85{ 121{
86 int node; 122 int node;
diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.c b/arch/powerpc/sysdev/bestcomm/bestcomm.c
index f589999361e0..64ec7d629363 100644
--- a/arch/powerpc/sysdev/bestcomm/bestcomm.c
+++ b/arch/powerpc/sysdev/bestcomm/bestcomm.c
@@ -52,6 +52,10 @@ bcom_task_alloc(int bd_count, int bd_size, int priv_size)
52 int i, tasknum = -1; 52 int i, tasknum = -1;
53 struct bcom_task *tsk; 53 struct bcom_task *tsk;
54 54
55 /* Don't try to do anything if bestcomm init failed */
56 if (!bcom_eng)
57 return NULL;
58
55 /* Get and reserve a task num */ 59 /* Get and reserve a task num */
56 spin_lock(&bcom_eng->lock); 60 spin_lock(&bcom_eng->lock);
57 61
@@ -484,8 +488,8 @@ mpc52xx_bcom_remove(struct of_device *op)
484} 488}
485 489
486static struct of_device_id mpc52xx_bcom_of_match[] = { 490static struct of_device_id mpc52xx_bcom_of_match[] = {
487 { .type = "dma-controller", .compatible = "fsl,mpc5200-bestcomm", }, 491 { .compatible = "fsl,mpc5200-bestcomm", },
488 { .type = "dma-controller", .compatible = "mpc5200-bestcomm", }, 492 { .compatible = "mpc5200-bestcomm", },
489 {}, 493 {},
490}; 494};
491 495
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index ae0dbf4c1d66..0f2dfb0aaa6a 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -906,7 +906,7 @@ static int __init init_ipic_sysfs(void)
906{ 906{
907 int rc; 907 int rc;
908 908
909 if (!primary_ipic->regs) 909 if (!primary_ipic || !primary_ipic->regs)
910 return -ENODEV; 910 return -ENODEV;
911 printk(KERN_DEBUG "Registering ipic with sysfs...\n"); 911 printk(KERN_DEBUG "Registering ipic with sysfs...\n");
912 912
diff --git a/arch/s390/lib/uaccess_pt.c b/arch/s390/lib/uaccess_pt.c
index 7e8efaade2ea..5efdfe9f5e76 100644
--- a/arch/s390/lib/uaccess_pt.c
+++ b/arch/s390/lib/uaccess_pt.c
@@ -406,6 +406,8 @@ int futex_atomic_cmpxchg_pt(int __user *uaddr, int oldval, int newval)
406{ 406{
407 int ret; 407 int ret;
408 408
409 if (!current->mm)
410 return -EFAULT;
409 spin_lock(&current->mm->page_table_lock); 411 spin_lock(&current->mm->page_table_lock);
410 uaddr = (int __user *) __dat_user_addr((unsigned long) uaddr); 412 uaddr = (int __user *) __dat_user_addr((unsigned long) uaddr);
411 if (!uaddr) { 413 if (!uaddr) {
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 95b7534e9e3c..12720489e458 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -580,6 +580,7 @@ config SH_TIMER_IRQ
580 CPU_SUBTYPE_SH7763 580 CPU_SUBTYPE_SH7763
581 default "86" if CPU_SUBTYPE_SH7619 581 default "86" if CPU_SUBTYPE_SH7619
582 default "140" if CPU_SUBTYPE_SH7206 582 default "140" if CPU_SUBTYPE_SH7206
583 default "142" if CPU_SUBTYPE_SH7203
583 default "16" 584 default "16"
584 585
585config SH_PCLK_FREQ 586config SH_PCLK_FREQ
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index c510c225144f..cffc92b1bf2e 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -154,7 +154,11 @@ drivers-$(CONFIG_OPROFILE) += arch/sh/oprofile/
154 154
155boot := arch/sh/boot 155boot := arch/sh/boot
156 156
157ifneq ($(KBUILD_SRC),)
157incdir-prefix := $(srctree)/include/asm-sh/ 158incdir-prefix := $(srctree)/include/asm-sh/
159else
160incdir-prefix :=
161endif
158 162
159# Update machine arch and proc symlinks if something which affects 163# Update machine arch and proc symlinks if something which affects
160# them changed. We use .arch and .mach to indicate when they were 164# them changed. We use .arch and .mach to indicate when they were
@@ -182,7 +186,7 @@ include/asm-sh/.mach: $(wildcard include/config/sh/*.h) \
182 $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi 186 $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi
183 $(Q)rm -f include/asm-sh/mach 187 $(Q)rm -f include/asm-sh/mach
184 $(Q)for i in $(incdir-y); do \ 188 $(Q)for i in $(incdir-y); do \
185 if [ -d $(incdir-prefix)$$i ]; then \ 189 if [ -d $(srctree)/include/asm-sh/$$i ]; then \
186 echo -n ' SYMLINK include/asm-sh/mach -> '; \ 190 echo -n ' SYMLINK include/asm-sh/mach -> '; \
187 echo -e "include/asm-sh/$$i"; \ 191 echo -e "include/asm-sh/$$i"; \
188 ln -fsn $(incdir-prefix)$$i \ 192 ln -fsn $(incdir-prefix)$$i \
@@ -191,7 +195,7 @@ include/asm-sh/.mach: $(wildcard include/config/sh/*.h) \
191 if [ ! -d include/asm-sh/mach ]; then \ 195 if [ ! -d include/asm-sh/mach ]; then \
192 echo -n ' SYMLINK include/asm-sh/mach -> '; \ 196 echo -n ' SYMLINK include/asm-sh/mach -> '; \
193 echo -e 'include/asm-sh'; \ 197 echo -e 'include/asm-sh'; \
194 ln -fsn $(incdir-prefix) include/asm-sh/mach; \ 198 ln -fsn $(incdir-prefix)../asm-sh include/asm-sh/mach; \
195 fi; \ 199 fi; \
196 fi; \ 200 fi; \
197 done 201 done
diff --git a/arch/sh/boot/Makefile b/arch/sh/boot/Makefile
index 59f552c13349..3dda24daa0a8 100644
--- a/arch/sh/boot/Makefile
+++ b/arch/sh/boot/Makefile
@@ -32,12 +32,12 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE
32$(obj)/compressed/vmlinux: FORCE 32$(obj)/compressed/vmlinux: FORCE
33 $(Q)$(MAKE) $(build)=$(obj)/compressed $@ 33 $(Q)$(MAKE) $(build)=$(obj)/compressed $@
34 34
35KERNEL_LOAD := $(shell /bin/bash -c 'printf "0x%8x" \ 35KERNEL_LOAD := $(shell /bin/bash -c 'printf "0x%08x" \
36 $$[$(CONFIG_PAGE_OFFSET) + \ 36 $$[$(CONFIG_PAGE_OFFSET) + \
37 $(CONFIG_MEMORY_START) + \ 37 $(CONFIG_MEMORY_START) + \
38 $(CONFIG_ZERO_PAGE_OFFSET)]') 38 $(CONFIG_ZERO_PAGE_OFFSET)]')
39 39
40KERNEL_ENTRY := $(shell /bin/bash -c 'printf "0x%8x" \ 40KERNEL_ENTRY := $(shell /bin/bash -c 'printf "0x%08x" \
41 $$[$(CONFIG_PAGE_OFFSET) + \ 41 $$[$(CONFIG_PAGE_OFFSET) + \
42 $(CONFIG_MEMORY_START) + \ 42 $(CONFIG_MEMORY_START) + \
43 $(CONFIG_ZERO_PAGE_OFFSET)+0x1000]') 43 $(CONFIG_ZERO_PAGE_OFFSET)+0x1000]')
diff --git a/arch/sh/kernel/cpu/sh2/entry.S b/arch/sh/kernel/cpu/sh2/entry.S
index 7a26569e7956..0fc89069d8c7 100644
--- a/arch/sh/kernel/cpu/sh2/entry.S
+++ b/arch/sh/kernel/cpu/sh2/entry.S
@@ -267,7 +267,6 @@ ENTRY(sh_bios_handler)
267 267
268ENTRY(address_error_trap_handler) 268ENTRY(address_error_trap_handler)
269 mov r15,r4 ! regs 269 mov r15,r4 ! regs
270 add #4,r4
271 mov #OFF_PC,r0 270 mov #OFF_PC,r0
272 mov.l @(r0,r15),r6 ! pc 271 mov.l @(r0,r15),r6 ! pc
273 mov.l 1f,r0 272 mov.l 1f,r0
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 94075e1a1e61..5d039d168f57 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -179,7 +179,7 @@ void smp_send_stop(void)
179} 179}
180 180
181struct smp_fn_call_struct smp_fn_call = { 181struct smp_fn_call_struct smp_fn_call = {
182 .lock = SPIN_LOCK_UNLOCKED, 182 .lock = __SPIN_LOCK_UNLOCKED(smp_fn_call.lock),
183 .finished = ATOMIC_INIT(0), 183 .finished = ATOMIC_INIT(0),
184}; 184};
185 185
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 250958d1e3cb..9d4bd2229493 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/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.25-rc1 3# Linux kernel version: 2.6.25-rc3
4# Sun Feb 17 22:44:12 2008 4# Wed Mar 26 04:33:35 2008
5# 5#
6CONFIG_SPARC=y 6CONFIG_SPARC=y
7CONFIG_SPARC64=y 7CONFIG_SPARC64=y
@@ -55,9 +55,11 @@ CONFIG_POSIX_MQUEUE=y
55# CONFIG_IKCONFIG is not set 55# CONFIG_IKCONFIG is not set
56CONFIG_LOG_BUF_SHIFT=18 56CONFIG_LOG_BUF_SHIFT=18
57# CONFIG_CGROUPS is not set 57# CONFIG_CGROUPS is not set
58CONFIG_GROUP_SCHED=y
58CONFIG_FAIR_GROUP_SCHED=y 59CONFIG_FAIR_GROUP_SCHED=y
59CONFIG_FAIR_USER_SCHED=y 60CONFIG_RT_GROUP_SCHED=y
60# CONFIG_FAIR_CGROUP_SCHED is not set 61CONFIG_USER_SCHED=y
62# CONFIG_CGROUP_SCHED is not set
61CONFIG_SYSFS_DEPRECATED=y 63CONFIG_SYSFS_DEPRECATED=y
62CONFIG_RELAY=y 64CONFIG_RELAY=y
63CONFIG_NAMESPACES=y 65CONFIG_NAMESPACES=y
@@ -482,6 +484,7 @@ CONFIG_SCSI_LOWLEVEL=y
482# CONFIG_SCSI_IPS is not set 484# CONFIG_SCSI_IPS is not set
483# CONFIG_SCSI_INITIO is not set 485# CONFIG_SCSI_INITIO is not set
484# CONFIG_SCSI_INIA100 is not set 486# CONFIG_SCSI_INIA100 is not set
487# CONFIG_SCSI_MVSAS is not set
485# CONFIG_SCSI_STEX is not set 488# CONFIG_SCSI_STEX is not set
486# CONFIG_SCSI_SYM53C8XX_2 is not set 489# CONFIG_SCSI_SYM53C8XX_2 is not set
487# CONFIG_SCSI_QLOGIC_1280 is not set 490# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -810,6 +813,7 @@ CONFIG_HWMON=y
810# CONFIG_SENSORS_ADM1031 is not set 813# CONFIG_SENSORS_ADM1031 is not set
811# CONFIG_SENSORS_ADM9240 is not set 814# CONFIG_SENSORS_ADM9240 is not set
812# CONFIG_SENSORS_ADT7470 is not set 815# CONFIG_SENSORS_ADT7470 is not set
816# CONFIG_SENSORS_ADT7473 is not set
813# CONFIG_SENSORS_ATXP1 is not set 817# CONFIG_SENSORS_ATXP1 is not set
814# CONFIG_SENSORS_DS1621 is not set 818# CONFIG_SENSORS_DS1621 is not set
815# CONFIG_SENSORS_I5K_AMB is not set 819# CONFIG_SENSORS_I5K_AMB is not set
diff --git a/arch/sparc64/kernel/cpu.c b/arch/sparc64/kernel/cpu.c
index dd5d28e3d798..0097c08dc600 100644
--- a/arch/sparc64/kernel/cpu.c
+++ b/arch/sparc64/kernel/cpu.c
@@ -15,6 +15,8 @@
15#include <asm/spitfire.h> 15#include <asm/spitfire.h>
16#include <asm/oplib.h> 16#include <asm/oplib.h>
17 17
18#include "entry.h"
19
18DEFINE_PER_CPU(cpuinfo_sparc, __cpu_data) = { 0 }; 20DEFINE_PER_CPU(cpuinfo_sparc, __cpu_data) = { 0 };
19 21
20struct cpu_iu_info { 22struct cpu_iu_info {
@@ -65,8 +67,6 @@ static struct cpu_iu_info linux_sparc_chips[] = {
65char *sparc_cpu_type; 67char *sparc_cpu_type;
66char *sparc_fpu_type; 68char *sparc_fpu_type;
67 69
68unsigned int fsr_storage;
69
70static void __init sun4v_cpu_probe(void) 70static void __init sun4v_cpu_probe(void)
71{ 71{
72 switch (sun4v_chip_type) { 72 switch (sun4v_chip_type) {
@@ -94,8 +94,10 @@ void __init cpu_probe(void)
94 unsigned long ver, fpu_vers, manuf, impl, fprs; 94 unsigned long ver, fpu_vers, manuf, impl, fprs;
95 int i; 95 int i;
96 96
97 if (tlb_type == hypervisor) 97 if (tlb_type == hypervisor) {
98 return sun4v_cpu_probe(); 98 sun4v_cpu_probe();
99 return;
100 }
99 101
100 fprs = fprs_read(); 102 fprs = fprs_read();
101 fprs_write(FPRS_FEF); 103 fprs_write(FPRS_FEF);
diff --git a/arch/sparc64/kernel/ds.c b/arch/sparc64/kernel/ds.c
index bd76482077be..edb74f5a1186 100644
--- a/arch/sparc64/kernel/ds.c
+++ b/arch/sparc64/kernel/ds.c
@@ -972,8 +972,7 @@ static void process_ds_work(void)
972 LIST_HEAD(todo); 972 LIST_HEAD(todo);
973 973
974 spin_lock_irqsave(&ds_lock, flags); 974 spin_lock_irqsave(&ds_lock, flags);
975 list_splice(&ds_work_list, &todo); 975 list_splice_init(&ds_work_list, &todo);
976 INIT_LIST_HEAD(&ds_work_list);
977 spin_unlock_irqrestore(&ds_lock, flags); 976 spin_unlock_irqrestore(&ds_lock, flags);
978 977
979 list_for_each_entry_safe(qp, tmp, &todo, list) { 978 list_for_each_entry_safe(qp, tmp, &todo, list) {
diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
index 6be4d2d2904e..49eca4b1cf25 100644
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
@@ -1705,6 +1705,36 @@ __flushw_user:
17052: retl 17052: retl
1706 nop 1706 nop
1707 1707
1708 /* Flush %fp and %i7 to the stack for all register
1709 * windows active inside of the cpu. This allows
1710 * show_stack_trace() to avoid using an expensive
1711 * 'flushw'.
1712 */
1713 .globl stack_trace_flush
1714 .type stack_trace_flush,#function
1715stack_trace_flush:
1716 rdpr %pstate, %o0
1717 wrpr %o0, PSTATE_IE, %pstate
1718
1719 rdpr %cwp, %g1
1720 rdpr %canrestore, %g2
1721 sub %g1, 1, %g3
1722
17231: brz,pn %g2, 2f
1724 sub %g2, 1, %g2
1725 wrpr %g3, %cwp
1726 stx %fp, [%sp + STACK_BIAS + RW_V9_I6]
1727 stx %i7, [%sp + STACK_BIAS + RW_V9_I7]
1728 ba,pt %xcc, 1b
1729 sub %g3, 1, %g3
1730
17312: wrpr %g1, %cwp
1732 wrpr %o0, %pstate
1733
1734 retl
1735 nop
1736 .size stack_trace_flush,.-stack_trace_flush
1737
1708#ifdef CONFIG_SMP 1738#ifdef CONFIG_SMP
1709 .globl hard_smp_processor_id 1739 .globl hard_smp_processor_id
1710hard_smp_processor_id: 1740hard_smp_processor_id:
diff --git a/arch/sparc64/kernel/entry.h b/arch/sparc64/kernel/entry.h
new file mode 100644
index 000000000000..4a91e9c6d31b
--- /dev/null
+++ b/arch/sparc64/kernel/entry.h
@@ -0,0 +1,196 @@
1#ifndef _ENTRY_H
2#define _ENTRY_H
3
4#include <linux/kernel.h>
5#include <linux/types.h>
6#include <linux/init.h>
7
8extern char *sparc_cpu_type;
9extern char *sparc_fpu_type;
10
11extern void __init per_cpu_patch(void);
12extern void __init sun4v_patch(void);
13extern void __init boot_cpu_id_too_large(int cpu);
14extern unsigned int dcache_parity_tl1_occurred;
15extern unsigned int icache_parity_tl1_occurred;
16
17extern asmlinkage void update_perfctrs(void);
18extern asmlinkage void sparc_breakpoint(struct pt_regs *regs);
19extern void timer_interrupt(int irq, struct pt_regs *regs);
20
21extern void do_notify_resume(struct pt_regs *regs,
22 unsigned long orig_i0,
23 int restart_syscall,
24 unsigned long thread_info_flags);
25
26extern asmlinkage void syscall_trace(struct pt_regs *regs,
27 int syscall_exit_p);
28
29extern void bad_trap_tl1(struct pt_regs *regs, long lvl);
30
31extern void do_fpe_common(struct pt_regs *regs);
32extern void do_fpieee(struct pt_regs *regs);
33extern void do_fpother(struct pt_regs *regs);
34extern void do_tof(struct pt_regs *regs);
35extern void do_div0(struct pt_regs *regs);
36extern void do_illegal_instruction(struct pt_regs *regs);
37extern void mem_address_unaligned(struct pt_regs *regs,
38 unsigned long sfar,
39 unsigned long sfsr);
40extern void sun4v_do_mna(struct pt_regs *regs,
41 unsigned long addr,
42 unsigned long type_ctx);
43extern void do_privop(struct pt_regs *regs);
44extern void do_privact(struct pt_regs *regs);
45extern void do_cee(struct pt_regs *regs);
46extern void do_cee_tl1(struct pt_regs *regs);
47extern void do_dae_tl1(struct pt_regs *regs);
48extern void do_iae_tl1(struct pt_regs *regs);
49extern void do_div0_tl1(struct pt_regs *regs);
50extern void do_fpdis_tl1(struct pt_regs *regs);
51extern void do_fpieee_tl1(struct pt_regs *regs);
52extern void do_fpother_tl1(struct pt_regs *regs);
53extern void do_ill_tl1(struct pt_regs *regs);
54extern void do_irq_tl1(struct pt_regs *regs);
55extern void do_lddfmna_tl1(struct pt_regs *regs);
56extern void do_stdfmna_tl1(struct pt_regs *regs);
57extern void do_paw(struct pt_regs *regs);
58extern void do_paw_tl1(struct pt_regs *regs);
59extern void do_vaw(struct pt_regs *regs);
60extern void do_vaw_tl1(struct pt_regs *regs);
61extern void do_tof_tl1(struct pt_regs *regs);
62extern void do_getpsr(struct pt_regs *regs);
63
64extern void spitfire_insn_access_exception(struct pt_regs *regs,
65 unsigned long sfsr,
66 unsigned long sfar);
67extern void spitfire_insn_access_exception_tl1(struct pt_regs *regs,
68 unsigned long sfsr,
69 unsigned long sfar);
70extern void spitfire_data_access_exception(struct pt_regs *regs,
71 unsigned long sfsr,
72 unsigned long sfar);
73extern void spitfire_data_access_exception_tl1(struct pt_regs *regs,
74 unsigned long sfsr,
75 unsigned long sfar);
76extern void spitfire_access_error(struct pt_regs *regs,
77 unsigned long status_encoded,
78 unsigned long afar);
79
80extern void cheetah_fecc_handler(struct pt_regs *regs,
81 unsigned long afsr,
82 unsigned long afar);
83extern void cheetah_cee_handler(struct pt_regs *regs,
84 unsigned long afsr,
85 unsigned long afar);
86extern void cheetah_deferred_handler(struct pt_regs *regs,
87 unsigned long afsr,
88 unsigned long afar);
89extern void cheetah_plus_parity_error(int type, struct pt_regs *regs);
90
91extern void sun4v_insn_access_exception(struct pt_regs *regs,
92 unsigned long addr,
93 unsigned long type_ctx);
94extern void sun4v_insn_access_exception_tl1(struct pt_regs *regs,
95 unsigned long addr,
96 unsigned long type_ctx);
97extern void sun4v_data_access_exception(struct pt_regs *regs,
98 unsigned long addr,
99 unsigned long type_ctx);
100extern void sun4v_data_access_exception_tl1(struct pt_regs *regs,
101 unsigned long addr,
102 unsigned long type_ctx);
103extern void sun4v_resum_error(struct pt_regs *regs,
104 unsigned long offset);
105extern void sun4v_resum_overflow(struct pt_regs *regs);
106extern void sun4v_nonresum_error(struct pt_regs *regs,
107 unsigned long offset);
108extern void sun4v_nonresum_overflow(struct pt_regs *regs);
109
110extern unsigned long sun4v_err_itlb_vaddr;
111extern unsigned long sun4v_err_itlb_ctx;
112extern unsigned long sun4v_err_itlb_pte;
113extern unsigned long sun4v_err_itlb_error;
114
115extern void sun4v_itlb_error_report(struct pt_regs *regs, int tl);
116
117extern unsigned long sun4v_err_dtlb_vaddr;
118extern unsigned long sun4v_err_dtlb_ctx;
119extern unsigned long sun4v_err_dtlb_pte;
120extern unsigned long sun4v_err_dtlb_error;
121
122extern void sun4v_dtlb_error_report(struct pt_regs *regs, int tl);
123extern void hypervisor_tlbop_error(unsigned long err,
124 unsigned long op);
125extern void hypervisor_tlbop_error_xcall(unsigned long err,
126 unsigned long op);
127
128/* WARNING: The error trap handlers in assembly know the precise
129 * layout of the following structure.
130 *
131 * C-level handlers in traps.c use this information to log the
132 * error and then determine how to recover (if possible).
133 */
134struct cheetah_err_info {
135/*0x00*/u64 afsr;
136/*0x08*/u64 afar;
137
138 /* D-cache state */
139/*0x10*/u64 dcache_data[4]; /* The actual data */
140/*0x30*/u64 dcache_index; /* D-cache index */
141/*0x38*/u64 dcache_tag; /* D-cache tag/valid */
142/*0x40*/u64 dcache_utag; /* D-cache microtag */
143/*0x48*/u64 dcache_stag; /* D-cache snooptag */
144
145 /* I-cache state */
146/*0x50*/u64 icache_data[8]; /* The actual insns + predecode */
147/*0x90*/u64 icache_index; /* I-cache index */
148/*0x98*/u64 icache_tag; /* I-cache phys tag */
149/*0xa0*/u64 icache_utag; /* I-cache microtag */
150/*0xa8*/u64 icache_stag; /* I-cache snooptag */
151/*0xb0*/u64 icache_upper; /* I-cache upper-tag */
152/*0xb8*/u64 icache_lower; /* I-cache lower-tag */
153
154 /* E-cache state */
155/*0xc0*/u64 ecache_data[4]; /* 32 bytes from staging registers */
156/*0xe0*/u64 ecache_index; /* E-cache index */
157/*0xe8*/u64 ecache_tag; /* E-cache tag/state */
158
159/*0xf0*/u64 __pad[32 - 30];
160};
161#define CHAFSR_INVALID ((u64)-1L)
162
163/* This is allocated at boot time based upon the largest hardware
164 * cpu ID in the system. We allocate two entries per cpu, one for
165 * TL==0 logging and one for TL >= 1 logging.
166 */
167extern struct cheetah_err_info *cheetah_error_log;
168
169/* UPA nodes send interrupt packet to UltraSparc with first data reg
170 * value low 5 (7 on Starfire) bits holding the IRQ identifier being
171 * delivered. We must translate this into a non-vector IRQ so we can
172 * set the softint on this cpu.
173 *
174 * To make processing these packets efficient and race free we use
175 * an array of irq buckets below. The interrupt vector handler in
176 * entry.S feeds incoming packets into per-cpu pil-indexed lists.
177 *
178 * If you make changes to ino_bucket, please update hand coded assembler
179 * of the vectored interrupt trap handler(s) in entry.S and sun4v_ivec.S
180 */
181struct ino_bucket {
182/*0x00*/unsigned long __irq_chain_pa;
183
184 /* Virtual interrupt number assigned to this INO. */
185/*0x08*/unsigned int __virt_irq;
186/*0x0c*/unsigned int __pad;
187};
188
189extern struct ino_bucket *ivector_table;
190extern unsigned long ivector_table_pa;
191
192extern void handler_irq(int irq, struct pt_regs *regs);
193extern void init_irqwork_curcpu(void);
194extern void __cpuinit sun4v_register_mondo_queues(int this_cpu);
195
196#endif /* _ENTRY_H */
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index 44b105c04dd3..34f8ff57c56b 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -288,8 +288,12 @@ sun4v_chip_type:
288 /* Leave arg2 as-is, prom_mmu_ihandle_cache */ 288 /* Leave arg2 as-is, prom_mmu_ihandle_cache */
289 mov -1, %l3 289 mov -1, %l3
290 stx %l3, [%sp + 2047 + 128 + 0x28] ! arg3: mode (-1 default) 290 stx %l3, [%sp + 2047 + 128 + 0x28] ! arg3: mode (-1 default)
291 sethi %hi(8 * 1024 * 1024), %l3 291 /* 4MB align the kernel image size. */
292 stx %l3, [%sp + 2047 + 128 + 0x30] ! arg4: size (8MB) 292 set (_end - KERNBASE), %l3
293 set ((4 * 1024 * 1024) - 1), %l4
294 add %l3, %l4, %l3
295 andn %l3, %l4, %l3
296 stx %l3, [%sp + 2047 + 128 + 0x30] ! arg4: roundup(ksize, 4MB)
293 sethi %hi(KERNBASE), %l3 297 sethi %hi(KERNBASE), %l3
294 stx %l3, [%sp + 2047 + 128 + 0x38] ! arg5: vaddr (KERNBASE) 298 stx %l3, [%sp + 2047 + 128 + 0x38] ! arg5: vaddr (KERNBASE)
295 stx %g0, [%sp + 2047 + 128 + 0x40] ! arg6: empty 299 stx %g0, [%sp + 2047 + 128 + 0x40] ! arg6: empty
diff --git a/arch/sparc64/kernel/iommu.c b/arch/sparc64/kernel/iommu.c
index fbaab3497bfd..b781d3d54fb8 100644
--- a/arch/sparc64/kernel/iommu.c
+++ b/arch/sparc64/kernel/iommu.c
@@ -626,7 +626,7 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,
626iommu_map_failed: 626iommu_map_failed:
627 for_each_sg(sglist, s, nelems, i) { 627 for_each_sg(sglist, s, nelems, i) {
628 if (s->dma_length != 0) { 628 if (s->dma_length != 0) {
629 unsigned long vaddr, npages, entry, i; 629 unsigned long vaddr, npages, entry, j;
630 iopte_t *base; 630 iopte_t *base;
631 631
632 vaddr = s->dma_address & IO_PAGE_MASK; 632 vaddr = s->dma_address & IO_PAGE_MASK;
@@ -637,8 +637,8 @@ iommu_map_failed:
637 >> IO_PAGE_SHIFT; 637 >> IO_PAGE_SHIFT;
638 base = iommu->page_table + entry; 638 base = iommu->page_table + entry;
639 639
640 for (i = 0; i < npages; i++) 640 for (j = 0; j < npages; j++)
641 iopte_make_dummy(iommu, base + i); 641 iopte_make_dummy(iommu, base + j);
642 642
643 s->dma_address = DMA_ERROR_CODE; 643 s->dma_address = DMA_ERROR_CODE;
644 s->dma_length = 0; 644 s->dma_length = 0;
@@ -803,7 +803,7 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev,
803 spin_unlock_irqrestore(&iommu->lock, flags); 803 spin_unlock_irqrestore(&iommu->lock, flags);
804} 804}
805 805
806const struct dma_ops sun4u_dma_ops = { 806static const struct dma_ops sun4u_dma_ops = {
807 .alloc_coherent = dma_4u_alloc_coherent, 807 .alloc_coherent = dma_4u_alloc_coherent,
808 .free_coherent = dma_4u_free_coherent, 808 .free_coherent = dma_4u_free_coherent,
809 .map_single = dma_4u_map_single, 809 .map_single = dma_4u_map_single,
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index 5ec06c8c7fea..eb88bd6e674e 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -44,27 +44,10 @@
44#include <asm/hypervisor.h> 44#include <asm/hypervisor.h>
45#include <asm/cacheflush.h> 45#include <asm/cacheflush.h>
46 46
47/* UPA nodes send interrupt packet to UltraSparc with first data reg 47#include "entry.h"
48 * value low 5 (7 on Starfire) bits holding the IRQ identifier being
49 * delivered. We must translate this into a non-vector IRQ so we can
50 * set the softint on this cpu.
51 *
52 * To make processing these packets efficient and race free we use
53 * an array of irq buckets below. The interrupt vector handler in
54 * entry.S feeds incoming packets into per-cpu pil-indexed lists.
55 *
56 * If you make changes to ino_bucket, please update hand coded assembler
57 * of the vectored interrupt trap handler(s) in entry.S and sun4v_ivec.S
58 */
59struct ino_bucket {
60/*0x00*/unsigned long __irq_chain_pa;
61
62 /* Virtual interrupt number assigned to this INO. */
63/*0x08*/unsigned int __virt_irq;
64/*0x0c*/unsigned int __pad;
65};
66 48
67#define NUM_IVECS (IMAP_INR + 1) 49#define NUM_IVECS (IMAP_INR + 1)
50
68struct ino_bucket *ivector_table; 51struct ino_bucket *ivector_table;
69unsigned long ivector_table_pa; 52unsigned long ivector_table_pa;
70 53
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index e116e38b160e..acf8c5250aa9 100644
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -731,9 +731,6 @@ asmlinkage int sparc_execve(struct pt_regs *regs)
731 current_thread_info()->xfsr[0] = 0; 731 current_thread_info()->xfsr[0] = 0;
732 current_thread_info()->fpsaved[0] = 0; 732 current_thread_info()->fpsaved[0] = 0;
733 regs->tstate &= ~TSTATE_PEF; 733 regs->tstate &= ~TSTATE_PEF;
734 task_lock(current);
735 current->ptrace &= ~PT_DTRACE;
736 task_unlock(current);
737 } 734 }
738out: 735out:
739 return error; 736 return error;
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index 9a1ba1fe859d..aaae865e7932 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -35,6 +35,9 @@
35#include <asm/spitfire.h> 35#include <asm/spitfire.h>
36#include <asm/page.h> 36#include <asm/page.h>
37#include <asm/cpudata.h> 37#include <asm/cpudata.h>
38#include <asm/cacheflush.h>
39
40#include "entry.h"
38 41
39/* #define ALLOW_INIT_TRACING */ 42/* #define ALLOW_INIT_TRACING */
40 43
@@ -67,6 +70,8 @@ void flush_ptrace_access(struct vm_area_struct *vma, struct page *page,
67 if (tlb_type == hypervisor) 70 if (tlb_type == hypervisor)
68 return; 71 return;
69 72
73 preempt_disable();
74
70#ifdef DCACHE_ALIASING_POSSIBLE 75#ifdef DCACHE_ALIASING_POSSIBLE
71 /* If bit 13 of the kernel address we used to access the 76 /* If bit 13 of the kernel address we used to access the
72 * user page is the same as the virtual address that page 77 * user page is the same as the virtual address that page
@@ -105,6 +110,8 @@ void flush_ptrace_access(struct vm_area_struct *vma, struct page *page,
105 for (; start < end; start += icache_line_size) 110 for (; start < end; start += icache_line_size)
106 flushi(start); 111 flushi(start);
107 } 112 }
113
114 preempt_enable();
108} 115}
109 116
110enum sparc_regset { 117enum sparc_regset {
@@ -382,6 +389,7 @@ static const struct user_regset_view user_sparc64_view = {
382 .regsets = sparc64_regsets, .n = ARRAY_SIZE(sparc64_regsets) 389 .regsets = sparc64_regsets, .n = ARRAY_SIZE(sparc64_regsets)
383}; 390};
384 391
392#ifdef CONFIG_COMPAT
385static int genregs32_get(struct task_struct *target, 393static int genregs32_get(struct task_struct *target,
386 const struct user_regset *regset, 394 const struct user_regset *regset,
387 unsigned int pos, unsigned int count, 395 unsigned int pos, unsigned int count,
@@ -676,14 +684,18 @@ static const struct user_regset_view user_sparc32_view = {
676 .name = "sparc", .e_machine = EM_SPARC, 684 .name = "sparc", .e_machine = EM_SPARC,
677 .regsets = sparc32_regsets, .n = ARRAY_SIZE(sparc32_regsets) 685 .regsets = sparc32_regsets, .n = ARRAY_SIZE(sparc32_regsets)
678}; 686};
687#endif /* CONFIG_COMPAT */
679 688
680const struct user_regset_view *task_user_regset_view(struct task_struct *task) 689const struct user_regset_view *task_user_regset_view(struct task_struct *task)
681{ 690{
691#ifdef CONFIG_COMPAT
682 if (test_tsk_thread_flag(task, TIF_32BIT)) 692 if (test_tsk_thread_flag(task, TIF_32BIT))
683 return &user_sparc32_view; 693 return &user_sparc32_view;
694#endif
684 return &user_sparc64_view; 695 return &user_sparc64_view;
685} 696}
686 697
698#ifdef CONFIG_COMPAT
687struct compat_fps { 699struct compat_fps {
688 unsigned int regs[32]; 700 unsigned int regs[32];
689 unsigned int fsr; 701 unsigned int fsr;
@@ -798,6 +810,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
798 810
799 return ret; 811 return ret;
800} 812}
813#endif /* CONFIG_COMPAT */
801 814
802struct fps { 815struct fps {
803 unsigned int regs[64]; 816 unsigned int regs[64];
@@ -807,11 +820,14 @@ struct fps {
807long arch_ptrace(struct task_struct *child, long request, long addr, long data) 820long arch_ptrace(struct task_struct *child, long request, long addr, long data)
808{ 821{
809 const struct user_regset_view *view = task_user_regset_view(child); 822 const struct user_regset_view *view = task_user_regset_view(child);
810 struct pt_regs __user *pregs = (struct pt_regs __user *) addr;
811 unsigned long addr2 = task_pt_regs(current)->u_regs[UREG_I4]; 823 unsigned long addr2 = task_pt_regs(current)->u_regs[UREG_I4];
812 struct fps __user *fps = (struct fps __user *) addr; 824 struct pt_regs __user *pregs;
825 struct fps __user *fps;
813 int ret; 826 int ret;
814 827
828 pregs = (struct pt_regs __user *) (unsigned long) addr;
829 fps = (struct fps __user *) (unsigned long) addr;
830
815 switch (request) { 831 switch (request) {
816 case PTRACE_PEEKUSR: 832 case PTRACE_PEEKUSR:
817 ret = (addr != 0) ? -EIO : 0; 833 ret = (addr != 0) ? -EIO : 0;
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index d036dbe72864..6acb4c51cfe4 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -51,6 +51,8 @@
51#include <net/ipconfig.h> 51#include <net/ipconfig.h>
52#endif 52#endif
53 53
54#include "entry.h"
55
54/* Used to synchronize accesses to NatSemi SUPER I/O chip configure 56/* Used to synchronize accesses to NatSemi SUPER I/O chip configure
55 * operations in asm/ns87303.h 57 * operations in asm/ns87303.h
56 */ 58 */
@@ -335,9 +337,6 @@ void __init setup_arch(char **cmdline_p)
335 337
336/* BUFFER is PAGE_SIZE bytes long. */ 338/* BUFFER is PAGE_SIZE bytes long. */
337 339
338extern char *sparc_cpu_type;
339extern char *sparc_fpu_type;
340
341extern void smp_info(struct seq_file *); 340extern void smp_info(struct seq_file *);
342extern void smp_bogo(struct seq_file *); 341extern void smp_bogo(struct seq_file *);
343extern void mmu_info(struct seq_file *); 342extern void mmu_info(struct seq_file *);
diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c
index fb13775b3682..94a9d64208ee 100644
--- a/arch/sparc64/kernel/signal.c
+++ b/arch/sparc64/kernel/signal.c
@@ -32,6 +32,9 @@
32#include <asm/siginfo.h> 32#include <asm/siginfo.h>
33#include <asm/visasm.h> 33#include <asm/visasm.h>
34 34
35#include "entry.h"
36#include "systbls.h"
37
35#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) 38#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
36 39
37/* {set, get}context() needed for 64-bit SparcLinux userland. */ 40/* {set, get}context() needed for 64-bit SparcLinux userland. */
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index cc454731d879..59f020d69d4c 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -1,6 +1,6 @@
1/* smp.c: Sparc64 SMP support. 1/* smp.c: Sparc64 SMP support.
2 * 2 *
3 * Copyright (C) 1997, 2007 David S. Miller (davem@davemloft.net) 3 * Copyright (C) 1997, 2007, 2008 David S. Miller (davem@davemloft.net)
4 */ 4 */
5 5
6#include <linux/module.h> 6#include <linux/module.h>
@@ -30,6 +30,7 @@
30#include <asm/cpudata.h> 30#include <asm/cpudata.h>
31#include <asm/hvtramp.h> 31#include <asm/hvtramp.h>
32#include <asm/io.h> 32#include <asm/io.h>
33#include <asm/timer.h>
33 34
34#include <asm/irq.h> 35#include <asm/irq.h>
35#include <asm/irq_regs.h> 36#include <asm/irq_regs.h>
@@ -284,14 +285,17 @@ static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg)
284{ 285{
285 extern unsigned long sparc64_ttable_tl0; 286 extern unsigned long sparc64_ttable_tl0;
286 extern unsigned long kern_locked_tte_data; 287 extern unsigned long kern_locked_tte_data;
287 extern int bigkernel;
288 struct hvtramp_descr *hdesc; 288 struct hvtramp_descr *hdesc;
289 unsigned long trampoline_ra; 289 unsigned long trampoline_ra;
290 struct trap_per_cpu *tb; 290 struct trap_per_cpu *tb;
291 u64 tte_vaddr, tte_data; 291 u64 tte_vaddr, tte_data;
292 unsigned long hv_err; 292 unsigned long hv_err;
293 int i;
293 294
294 hdesc = kzalloc(sizeof(*hdesc), GFP_KERNEL); 295 hdesc = kzalloc(sizeof(*hdesc) +
296 (sizeof(struct hvtramp_mapping) *
297 num_kernel_image_mappings - 1),
298 GFP_KERNEL);
295 if (!hdesc) { 299 if (!hdesc) {
296 printk(KERN_ERR "ldom_startcpu_cpuid: Cannot allocate " 300 printk(KERN_ERR "ldom_startcpu_cpuid: Cannot allocate "
297 "hvtramp_descr.\n"); 301 "hvtramp_descr.\n");
@@ -299,7 +303,7 @@ static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg)
299 } 303 }
300 304
301 hdesc->cpu = cpu; 305 hdesc->cpu = cpu;
302 hdesc->num_mappings = (bigkernel ? 2 : 1); 306 hdesc->num_mappings = num_kernel_image_mappings;
303 307
304 tb = &trap_block[cpu]; 308 tb = &trap_block[cpu];
305 tb->hdesc = hdesc; 309 tb->hdesc = hdesc;
@@ -312,13 +316,11 @@ static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg)
312 tte_vaddr = (unsigned long) KERNBASE; 316 tte_vaddr = (unsigned long) KERNBASE;
313 tte_data = kern_locked_tte_data; 317 tte_data = kern_locked_tte_data;
314 318
315 hdesc->maps[0].vaddr = tte_vaddr; 319 for (i = 0; i < hdesc->num_mappings; i++) {
316 hdesc->maps[0].tte = tte_data; 320 hdesc->maps[i].vaddr = tte_vaddr;
317 if (bigkernel) { 321 hdesc->maps[i].tte = tte_data;
318 tte_vaddr += 0x400000; 322 tte_vaddr += 0x400000;
319 tte_data += 0x400000; 323 tte_data += 0x400000;
320 hdesc->maps[1].vaddr = tte_vaddr;
321 hdesc->maps[1].tte = tte_data;
322 } 324 }
323 325
324 trampoline_ra = kimage_addr_to_ra(hv_cpu_startup); 326 trampoline_ra = kimage_addr_to_ra(hv_cpu_startup);
diff --git a/arch/sparc64/kernel/stacktrace.c b/arch/sparc64/kernel/stacktrace.c
index 47f92a59be18..84d39e873e88 100644
--- a/arch/sparc64/kernel/stacktrace.c
+++ b/arch/sparc64/kernel/stacktrace.c
@@ -2,13 +2,15 @@
2#include <linux/stacktrace.h> 2#include <linux/stacktrace.h>
3#include <linux/thread_info.h> 3#include <linux/thread_info.h>
4#include <asm/ptrace.h> 4#include <asm/ptrace.h>
5#include <asm/stacktrace.h>
5 6
6void save_stack_trace(struct stack_trace *trace) 7void save_stack_trace(struct stack_trace *trace)
7{ 8{
8 unsigned long ksp, fp, thread_base; 9 unsigned long ksp, fp, thread_base;
9 struct thread_info *tp = task_thread_info(current); 10 struct thread_info *tp = task_thread_info(current);
10 11
11 flushw_all(); 12 stack_trace_flush();
13
12 __asm__ __volatile__( 14 __asm__ __volatile__(
13 "mov %%fp, %0" 15 "mov %%fp, %0"
14 : "=r" (ksp) 16 : "=r" (ksp)
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
index 134d801579f9..f952745d0f3d 100644
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
@@ -1,5 +1,4 @@
1/* $Id: sys_sparc.c,v 1.57 2002/02/09 19:49:30 davem Exp $ 1/* linux/arch/sparc64/kernel/sys_sparc.c
2 * linux/arch/sparc64/kernel/sys_sparc.c
3 * 2 *
4 * This file contains various random system calls that 3 * This file contains various random system calls that
5 * have a non-standard calling sequence on the Linux/sparc 4 * have a non-standard calling sequence on the Linux/sparc
@@ -30,6 +29,9 @@
30#include <asm/perfctr.h> 29#include <asm/perfctr.h>
31#include <asm/unistd.h> 30#include <asm/unistd.h>
32 31
32#include "entry.h"
33#include "systbls.h"
34
33/* #define DEBUG_UNIMP_SYSCALL */ 35/* #define DEBUG_UNIMP_SYSCALL */
34 36
35asmlinkage unsigned long sys_getpagesize(void) 37asmlinkage unsigned long sys_getpagesize(void)
@@ -445,7 +447,8 @@ asmlinkage long sys_ipc(unsigned int call, int first, unsigned long second,
445 goto out; 447 goto out;
446 case SEMTIMEDOP: 448 case SEMTIMEDOP:
447 err = sys_semtimedop(first, ptr, (unsigned)second, 449 err = sys_semtimedop(first, ptr, (unsigned)second,
448 (const struct timespec __user *) fifth); 450 (const struct timespec __user *)
451 (unsigned long) fifth);
449 goto out; 452 goto out;
450 case SEMGET: 453 case SEMGET:
451 err = sys_semget(first, (int)second, (int)third); 454 err = sys_semget(first, (int)second, (int)third);
@@ -788,7 +791,7 @@ asmlinkage long sys_utrap_install(utrap_entry_t type,
788 } else { 791 } else {
789 if ((utrap_handler_t)current_thread_info()->utraps[type] != new_p && 792 if ((utrap_handler_t)current_thread_info()->utraps[type] != new_p &&
790 current_thread_info()->utraps[0] > 1) { 793 current_thread_info()->utraps[0] > 1) {
791 long *p = current_thread_info()->utraps; 794 unsigned long *p = current_thread_info()->utraps;
792 795
793 current_thread_info()->utraps = 796 current_thread_info()->utraps =
794 kmalloc((UT_TRAP_INSTRUCTION_31+1)*sizeof(long), 797 kmalloc((UT_TRAP_INSTRUCTION_31+1)*sizeof(long),
@@ -816,7 +819,8 @@ asmlinkage long sys_utrap_install(utrap_entry_t type,
816 return 0; 819 return 0;
817} 820}
818 821
819long sparc_memory_ordering(unsigned long model, struct pt_regs *regs) 822asmlinkage long sparc_memory_ordering(unsigned long model,
823 struct pt_regs *regs)
820{ 824{
821 if (model >= 3) 825 if (model >= 3)
822 return -EINVAL; 826 return -EINVAL;
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index deaba2bd0535..2455fa498876 100644
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -678,9 +678,6 @@ asmlinkage long sparc32_execve(struct pt_regs *regs)
678 current_thread_info()->xfsr[0] = 0; 678 current_thread_info()->xfsr[0] = 0;
679 current_thread_info()->fpsaved[0] = 0; 679 current_thread_info()->fpsaved[0] = 0;
680 regs->tstate &= ~TSTATE_PEF; 680 regs->tstate &= ~TSTATE_PEF;
681 task_lock(current);
682 current->ptrace &= ~PT_DTRACE;
683 task_unlock(current);
684 } 681 }
685out: 682out:
686 return error; 683 return error;
diff --git a/arch/sparc64/kernel/systbls.h b/arch/sparc64/kernel/systbls.h
new file mode 100644
index 000000000000..8a0d20a35d0c
--- /dev/null
+++ b/arch/sparc64/kernel/systbls.h
@@ -0,0 +1,53 @@
1#ifndef _SYSTBLS_H
2#define _SYSTBLS_H
3
4#include <linux/kernel.h>
5#include <linux/types.h>
6#include <linux/utsname.h>
7#include <asm/utrap.h>
8#include <asm/signal.h>
9
10extern asmlinkage unsigned long sys_getpagesize(void);
11extern asmlinkage unsigned long sparc_brk(unsigned long brk);
12extern asmlinkage long sparc_pipe(struct pt_regs *regs);
13extern asmlinkage long sys_ipc(unsigned int call, int first,
14 unsigned long second,
15 unsigned long third,
16 void __user *ptr, long fifth);
17extern asmlinkage long sparc64_newuname(struct new_utsname __user *name);
18extern asmlinkage long sparc64_personality(unsigned long personality);
19extern asmlinkage unsigned long sys_mmap(unsigned long addr, unsigned long len,
20 unsigned long prot, unsigned long flags,
21 unsigned long fd, unsigned long off);
22extern asmlinkage long sys64_munmap(unsigned long addr, size_t len);
23extern asmlinkage unsigned long sys64_mremap(unsigned long addr,
24 unsigned long old_len,
25 unsigned long new_len,
26 unsigned long flags,
27 unsigned long new_addr);
28extern asmlinkage unsigned long c_sys_nis_syscall(struct pt_regs *regs);
29extern asmlinkage long sys_getdomainname(char __user *name, int len);
30extern asmlinkage long solaris_syscall(struct pt_regs *regs);
31extern asmlinkage long sunos_syscall(struct pt_regs *regs);
32extern asmlinkage long sys_utrap_install(utrap_entry_t type,
33 utrap_handler_t new_p,
34 utrap_handler_t new_d,
35 utrap_handler_t __user *old_p,
36 utrap_handler_t __user *old_d);
37extern asmlinkage long sparc_memory_ordering(unsigned long model,
38 struct pt_regs *regs);
39extern asmlinkage long sys_rt_sigaction(int sig,
40 const struct sigaction __user *act,
41 struct sigaction __user *oact,
42 void __user *restorer,
43 size_t sigsetsize);
44extern asmlinkage long sys_perfctr(int opcode, unsigned long arg0,
45 unsigned long arg1, unsigned long arg2);
46
47extern asmlinkage void sparc64_set_context(struct pt_regs *regs);
48extern asmlinkage void sparc64_get_context(struct pt_regs *regs);
49extern asmlinkage long sys_sigpause(unsigned int set);
50extern asmlinkage long sys_sigsuspend(old_sigset_t set);
51extern void do_rt_sigreturn(struct pt_regs *regs);
52
53#endif /* _SYSTBLS_H */
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index d204f1ab1d4c..e5d238970c7e 100644
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -1,7 +1,6 @@
1/* $Id: time.c,v 1.42 2002/01/23 14:33:55 davem Exp $ 1/* time.c: UltraSparc timer and TOD clock support.
2 * time.c: UltraSparc timer and TOD clock support.
3 * 2 *
4 * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) 3 * Copyright (C) 1997, 2008 David S. Miller (davem@davemloft.net)
5 * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) 4 * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be)
6 * 5 *
7 * Based largely on code which is: 6 * Based largely on code which is:
@@ -48,6 +47,8 @@
48#include <asm/uaccess.h> 47#include <asm/uaccess.h>
49#include <asm/irq_regs.h> 48#include <asm/irq_regs.h>
50 49
50#include "entry.h"
51
51DEFINE_SPINLOCK(mostek_lock); 52DEFINE_SPINLOCK(mostek_lock);
52DEFINE_SPINLOCK(rtc_lock); 53DEFINE_SPINLOCK(rtc_lock);
53void __iomem *mstk48t02_regs = NULL; 54void __iomem *mstk48t02_regs = NULL;
@@ -508,6 +509,37 @@ static int __init has_low_battery(void)
508 return (data1 == data2); /* Was the write blocked? */ 509 return (data1 == data2); /* Was the write blocked? */
509} 510}
510 511
512static void __init mostek_set_system_time(void __iomem *mregs)
513{
514 unsigned int year, mon, day, hour, min, sec;
515 u8 tmp;
516
517 spin_lock_irq(&mostek_lock);
518
519 /* Traditional Mostek chip. */
520 tmp = mostek_read(mregs + MOSTEK_CREG);
521 tmp |= MSTK_CREG_READ;
522 mostek_write(mregs + MOSTEK_CREG, tmp);
523
524 sec = MSTK_REG_SEC(mregs);
525 min = MSTK_REG_MIN(mregs);
526 hour = MSTK_REG_HOUR(mregs);
527 day = MSTK_REG_DOM(mregs);
528 mon = MSTK_REG_MONTH(mregs);
529 year = MSTK_CVT_YEAR( MSTK_REG_YEAR(mregs) );
530
531 xtime.tv_sec = mktime(year, mon, day, hour, min, sec);
532 xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);
533 set_normalized_timespec(&wall_to_monotonic,
534 -xtime.tv_sec, -xtime.tv_nsec);
535
536 tmp = mostek_read(mregs + MOSTEK_CREG);
537 tmp &= ~MSTK_CREG_READ;
538 mostek_write(mregs + MOSTEK_CREG, tmp);
539
540 spin_unlock_irq(&mostek_lock);
541}
542
511/* Probe for the real time clock chip. */ 543/* Probe for the real time clock chip. */
512static void __init set_system_time(void) 544static void __init set_system_time(void)
513{ 545{
@@ -520,7 +552,6 @@ static void __init set_system_time(void)
520 unsigned long dregs = 0UL; 552 unsigned long dregs = 0UL;
521 void __iomem *bregs = 0UL; 553 void __iomem *bregs = 0UL;
522#endif 554#endif
523 u8 tmp;
524 555
525 if (!mregs && !dregs && !bregs) { 556 if (!mregs && !dregs && !bregs) {
526 prom_printf("Something wrong, clock regs not mapped yet.\n"); 557 prom_printf("Something wrong, clock regs not mapped yet.\n");
@@ -528,20 +559,11 @@ static void __init set_system_time(void)
528 } 559 }
529 560
530 if (mregs) { 561 if (mregs) {
531 spin_lock_irq(&mostek_lock); 562 mostek_set_system_time(mregs);
532 563 return;
533 /* Traditional Mostek chip. */ 564 }
534 tmp = mostek_read(mregs + MOSTEK_CREG);
535 tmp |= MSTK_CREG_READ;
536 mostek_write(mregs + MOSTEK_CREG, tmp);
537 565
538 sec = MSTK_REG_SEC(mregs); 566 if (bregs) {
539 min = MSTK_REG_MIN(mregs);
540 hour = MSTK_REG_HOUR(mregs);
541 day = MSTK_REG_DOM(mregs);
542 mon = MSTK_REG_MONTH(mregs);
543 year = MSTK_CVT_YEAR( MSTK_REG_YEAR(mregs) );
544 } else if (bregs) {
545 unsigned char val = readb(bregs + 0x0e); 567 unsigned char val = readb(bregs + 0x0e);
546 unsigned int century; 568 unsigned int century;
547 569
@@ -596,14 +618,6 @@ static void __init set_system_time(void)
596 xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ); 618 xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);
597 set_normalized_timespec(&wall_to_monotonic, 619 set_normalized_timespec(&wall_to_monotonic,
598 -xtime.tv_sec, -xtime.tv_nsec); 620 -xtime.tv_sec, -xtime.tv_nsec);
599
600 if (mregs) {
601 tmp = mostek_read(mregs + MOSTEK_CREG);
602 tmp &= ~MSTK_CREG_READ;
603 mostek_write(mregs + MOSTEK_CREG, tmp);
604
605 spin_unlock_irq(&mostek_lock);
606 }
607} 621}
608 622
609/* davem suggests we keep this within the 4M locked kernel image */ 623/* davem suggests we keep this within the 4M locked kernel image */
@@ -1027,7 +1041,7 @@ void __init time_init(void)
1027 setup_clockevent_multiplier(clock); 1041 setup_clockevent_multiplier(clock);
1028 1042
1029 sparc64_clockevent.max_delta_ns = 1043 sparc64_clockevent.max_delta_ns =
1030 clockevent_delta2ns(0x7fffffffffffffff, &sparc64_clockevent); 1044 clockevent_delta2ns(0x7fffffffffffffffUL, &sparc64_clockevent);
1031 sparc64_clockevent.min_delta_ns = 1045 sparc64_clockevent.min_delta_ns =
1032 clockevent_delta2ns(0xF, &sparc64_clockevent); 1046 clockevent_delta2ns(0xF, &sparc64_clockevent);
1033 1047
diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S
index 4ae2e525d68b..56ff55211341 100644
--- a/arch/sparc64/kernel/trampoline.S
+++ b/arch/sparc64/kernel/trampoline.S
@@ -105,7 +105,7 @@ startup_continue:
105 wr %g2, 0, %tick_cmpr 105 wr %g2, 0, %tick_cmpr
106 106
107 /* Call OBP by hand to lock KERNBASE into i/d tlbs. 107 /* Call OBP by hand to lock KERNBASE into i/d tlbs.
108 * We lock 2 consequetive entries if we are 'bigkernel'. 108 * We lock 'num_kernel_image_mappings' consequetive entries.
109 */ 109 */
110 sethi %hi(prom_entry_lock), %g2 110 sethi %hi(prom_entry_lock), %g2
1111: ldstub [%g2 + %lo(prom_entry_lock)], %g1 1111: ldstub [%g2 + %lo(prom_entry_lock)], %g1
@@ -119,6 +119,29 @@ startup_continue:
119 add %l2, -(192 + 128), %sp 119 add %l2, -(192 + 128), %sp
120 flushw 120 flushw
121 121
122 /* Setup the loop variables:
123 * %l3: VADDR base
124 * %l4: TTE base
125 * %l5: Loop iterator, iterates from 0 to 'num_kernel_image_mappings'
126 * %l6: Number of TTE entries to map
127 * %l7: Highest TTE entry number, we count down
128 */
129 sethi %hi(KERNBASE), %l3
130 sethi %hi(kern_locked_tte_data), %l4
131 ldx [%l4 + %lo(kern_locked_tte_data)], %l4
132 clr %l5
133 sethi %hi(num_kernel_image_mappings), %l6
134 lduw [%l6 + %lo(num_kernel_image_mappings)], %l6
135 add %l6, 1, %l6
136
137 mov 15, %l7
138 BRANCH_IF_ANY_CHEETAH(g1,g5,2f)
139
140 mov 63, %l7
1412:
142
1433:
144 /* Lock into I-MMU */
122 sethi %hi(call_method), %g2 145 sethi %hi(call_method), %g2
123 or %g2, %lo(call_method), %g2 146 or %g2, %lo(call_method), %g2
124 stx %g2, [%sp + 2047 + 128 + 0x00] 147 stx %g2, [%sp + 2047 + 128 + 0x00]
@@ -132,63 +155,26 @@ startup_continue:
132 sethi %hi(prom_mmu_ihandle_cache), %g2 155 sethi %hi(prom_mmu_ihandle_cache), %g2
133 lduw [%g2 + %lo(prom_mmu_ihandle_cache)], %g2 156 lduw [%g2 + %lo(prom_mmu_ihandle_cache)], %g2
134 stx %g2, [%sp + 2047 + 128 + 0x20] 157 stx %g2, [%sp + 2047 + 128 + 0x20]
135 sethi %hi(KERNBASE), %g2
136 stx %g2, [%sp + 2047 + 128 + 0x28]
137 sethi %hi(kern_locked_tte_data), %g2
138 ldx [%g2 + %lo(kern_locked_tte_data)], %g2
139 stx %g2, [%sp + 2047 + 128 + 0x30]
140
141 mov 15, %g2
142 BRANCH_IF_ANY_CHEETAH(g1,g5,1f)
143 158
144 mov 63, %g2 159 /* Each TTE maps 4MB, convert index to offset. */
1451: 160 sllx %l5, 22, %g1
146 stx %g2, [%sp + 2047 + 128 + 0x38]
147 sethi %hi(p1275buf), %g2
148 or %g2, %lo(p1275buf), %g2
149 ldx [%g2 + 0x08], %o1
150 call %o1
151 add %sp, (2047 + 128), %o0
152 161
153 sethi %hi(bigkernel), %g2 162 add %l3, %g1, %g2
154 lduw [%g2 + %lo(bigkernel)], %g2 163 stx %g2, [%sp + 2047 + 128 + 0x28] ! VADDR
155 brz,pt %g2, do_dtlb 164 add %l4, %g1, %g2
156 nop 165 stx %g2, [%sp + 2047 + 128 + 0x30] ! TTE
157 166
158 sethi %hi(call_method), %g2 167 /* TTE index is highest minus loop index. */
159 or %g2, %lo(call_method), %g2 168 sub %l7, %l5, %g2
160 stx %g2, [%sp + 2047 + 128 + 0x00]
161 mov 5, %g2
162 stx %g2, [%sp + 2047 + 128 + 0x08]
163 mov 1, %g2
164 stx %g2, [%sp + 2047 + 128 + 0x10]
165 sethi %hi(itlb_load), %g2
166 or %g2, %lo(itlb_load), %g2
167 stx %g2, [%sp + 2047 + 128 + 0x18]
168 sethi %hi(prom_mmu_ihandle_cache), %g2
169 lduw [%g2 + %lo(prom_mmu_ihandle_cache)], %g2
170 stx %g2, [%sp + 2047 + 128 + 0x20]
171 sethi %hi(KERNBASE + 0x400000), %g2
172 stx %g2, [%sp + 2047 + 128 + 0x28]
173 sethi %hi(kern_locked_tte_data), %g2
174 ldx [%g2 + %lo(kern_locked_tte_data)], %g2
175 sethi %hi(0x400000), %g1
176 add %g2, %g1, %g2
177 stx %g2, [%sp + 2047 + 128 + 0x30]
178
179 mov 14, %g2
180 BRANCH_IF_ANY_CHEETAH(g1,g5,1f)
181
182 mov 62, %g2
1831:
184 stx %g2, [%sp + 2047 + 128 + 0x38] 169 stx %g2, [%sp + 2047 + 128 + 0x38]
170
185 sethi %hi(p1275buf), %g2 171 sethi %hi(p1275buf), %g2
186 or %g2, %lo(p1275buf), %g2 172 or %g2, %lo(p1275buf), %g2
187 ldx [%g2 + 0x08], %o1 173 ldx [%g2 + 0x08], %o1
188 call %o1 174 call %o1
189 add %sp, (2047 + 128), %o0 175 add %sp, (2047 + 128), %o0
190 176
191do_dtlb: 177 /* Lock into D-MMU */
192 sethi %hi(call_method), %g2 178 sethi %hi(call_method), %g2
193 or %g2, %lo(call_method), %g2 179 or %g2, %lo(call_method), %g2
194 stx %g2, [%sp + 2047 + 128 + 0x00] 180 stx %g2, [%sp + 2047 + 128 + 0x00]
@@ -202,65 +188,30 @@ do_dtlb:
202 sethi %hi(prom_mmu_ihandle_cache), %g2 188 sethi %hi(prom_mmu_ihandle_cache), %g2
203 lduw [%g2 + %lo(prom_mmu_ihandle_cache)], %g2 189 lduw [%g2 + %lo(prom_mmu_ihandle_cache)], %g2
204 stx %g2, [%sp + 2047 + 128 + 0x20] 190 stx %g2, [%sp + 2047 + 128 + 0x20]
205 sethi %hi(KERNBASE), %g2
206 stx %g2, [%sp + 2047 + 128 + 0x28]
207 sethi %hi(kern_locked_tte_data), %g2
208 ldx [%g2 + %lo(kern_locked_tte_data)], %g2
209 stx %g2, [%sp + 2047 + 128 + 0x30]
210 191
211 mov 15, %g2 192 /* Each TTE maps 4MB, convert index to offset. */
212 BRANCH_IF_ANY_CHEETAH(g1,g5,1f) 193 sllx %l5, 22, %g1
213 194
214 mov 63, %g2 195 add %l3, %g1, %g2
2151: 196 stx %g2, [%sp + 2047 + 128 + 0x28] ! VADDR
197 add %l4, %g1, %g2
198 stx %g2, [%sp + 2047 + 128 + 0x30] ! TTE
216 199
200 /* TTE index is highest minus loop index. */
201 sub %l7, %l5, %g2
217 stx %g2, [%sp + 2047 + 128 + 0x38] 202 stx %g2, [%sp + 2047 + 128 + 0x38]
203
218 sethi %hi(p1275buf), %g2 204 sethi %hi(p1275buf), %g2
219 or %g2, %lo(p1275buf), %g2 205 or %g2, %lo(p1275buf), %g2
220 ldx [%g2 + 0x08], %o1 206 ldx [%g2 + 0x08], %o1
221 call %o1 207 call %o1
222 add %sp, (2047 + 128), %o0 208 add %sp, (2047 + 128), %o0
223 209
224 sethi %hi(bigkernel), %g2 210 add %l5, 1, %l5
225 lduw [%g2 + %lo(bigkernel)], %g2 211 cmp %l5, %l6
226 brz,pt %g2, do_unlock 212 bne,pt %xcc, 3b
227 nop 213 nop
228 214
229 sethi %hi(call_method), %g2
230 or %g2, %lo(call_method), %g2
231 stx %g2, [%sp + 2047 + 128 + 0x00]
232 mov 5, %g2
233 stx %g2, [%sp + 2047 + 128 + 0x08]
234 mov 1, %g2
235 stx %g2, [%sp + 2047 + 128 + 0x10]
236 sethi %hi(dtlb_load), %g2
237 or %g2, %lo(dtlb_load), %g2
238 stx %g2, [%sp + 2047 + 128 + 0x18]
239 sethi %hi(prom_mmu_ihandle_cache), %g2
240 lduw [%g2 + %lo(prom_mmu_ihandle_cache)], %g2
241 stx %g2, [%sp + 2047 + 128 + 0x20]
242 sethi %hi(KERNBASE + 0x400000), %g2
243 stx %g2, [%sp + 2047 + 128 + 0x28]
244 sethi %hi(kern_locked_tte_data), %g2
245 ldx [%g2 + %lo(kern_locked_tte_data)], %g2
246 sethi %hi(0x400000), %g1
247 add %g2, %g1, %g2
248 stx %g2, [%sp + 2047 + 128 + 0x30]
249
250 mov 14, %g2
251 BRANCH_IF_ANY_CHEETAH(g1,g5,1f)
252
253 mov 62, %g2
2541:
255
256 stx %g2, [%sp + 2047 + 128 + 0x38]
257 sethi %hi(p1275buf), %g2
258 or %g2, %lo(p1275buf), %g2
259 ldx [%g2 + 0x08], %o1
260 call %o1
261 add %sp, (2047 + 128), %o0
262
263do_unlock:
264 sethi %hi(prom_entry_lock), %g2 215 sethi %hi(prom_entry_lock), %g2
265 stb %g0, [%g2 + %lo(prom_entry_lock)] 216 stb %g0, [%g2 + %lo(prom_entry_lock)]
266 membar #StoreStore | #StoreLoad 217 membar #StoreStore | #StoreLoad
@@ -269,47 +220,36 @@ do_unlock:
269 nop 220 nop
270 221
271niagara_lock_tlb: 222niagara_lock_tlb:
223 sethi %hi(KERNBASE), %l3
224 sethi %hi(kern_locked_tte_data), %l4
225 ldx [%l4 + %lo(kern_locked_tte_data)], %l4
226 clr %l5
227 sethi %hi(num_kernel_image_mappings), %l6
228 lduw [%l6 + %lo(num_kernel_image_mappings)], %l6
229 add %l6, 1, %l6
230
2311:
272 mov HV_FAST_MMU_MAP_PERM_ADDR, %o5 232 mov HV_FAST_MMU_MAP_PERM_ADDR, %o5
273 sethi %hi(KERNBASE), %o0 233 sllx %l5, 22, %g2
234 add %l3, %g2, %o0
274 clr %o1 235 clr %o1
275 sethi %hi(kern_locked_tte_data), %o2 236 add %l4, %g2, %o2
276 ldx [%o2 + %lo(kern_locked_tte_data)], %o2
277 mov HV_MMU_IMMU, %o3 237 mov HV_MMU_IMMU, %o3
278 ta HV_FAST_TRAP 238 ta HV_FAST_TRAP
279 239
280 mov HV_FAST_MMU_MAP_PERM_ADDR, %o5 240 mov HV_FAST_MMU_MAP_PERM_ADDR, %o5
281 sethi %hi(KERNBASE), %o0 241 sllx %l5, 22, %g2
242 add %l3, %g2, %o0
282 clr %o1 243 clr %o1
283 sethi %hi(kern_locked_tte_data), %o2 244 add %l4, %g2, %o2
284 ldx [%o2 + %lo(kern_locked_tte_data)], %o2
285 mov HV_MMU_DMMU, %o3 245 mov HV_MMU_DMMU, %o3
286 ta HV_FAST_TRAP 246 ta HV_FAST_TRAP
287 247
288 sethi %hi(bigkernel), %g2 248 add %l5, 1, %l5
289 lduw [%g2 + %lo(bigkernel)], %g2 249 cmp %l5, %l6
290 brz,pt %g2, after_lock_tlb 250 bne,pt %xcc, 1b
291 nop 251 nop
292 252
293 mov HV_FAST_MMU_MAP_PERM_ADDR, %o5
294 sethi %hi(KERNBASE + 0x400000), %o0
295 clr %o1
296 sethi %hi(kern_locked_tte_data), %o2
297 ldx [%o2 + %lo(kern_locked_tte_data)], %o2
298 sethi %hi(0x400000), %o3
299 add %o2, %o3, %o2
300 mov HV_MMU_IMMU, %o3
301 ta HV_FAST_TRAP
302
303 mov HV_FAST_MMU_MAP_PERM_ADDR, %o5
304 sethi %hi(KERNBASE + 0x400000), %o0
305 clr %o1
306 sethi %hi(kern_locked_tte_data), %o2
307 ldx [%o2 + %lo(kern_locked_tte_data)], %o2
308 sethi %hi(0x400000), %o3
309 add %o2, %o3, %o2
310 mov HV_MMU_DMMU, %o3
311 ta HV_FAST_TRAP
312
313after_lock_tlb: 253after_lock_tlb:
314 wrpr %g0, (PSTATE_PRIV | PSTATE_PEF), %pstate 254 wrpr %g0, (PSTATE_PRIV | PSTATE_PEF), %pstate
315 wr %g0, 0, %fprs 255 wr %g0, 0, %fprs
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c
index 007f5317c0de..96da847023f3 100644
--- a/arch/sparc64/kernel/traps.c
+++ b/arch/sparc64/kernel/traps.c
@@ -42,6 +42,7 @@
42#endif 42#endif
43#include <asm/prom.h> 43#include <asm/prom.h>
44 44
45#include "entry.h"
45 46
46/* When an irrecoverable trap occurs at tl > 0, the trap entry 47/* When an irrecoverable trap occurs at tl > 0, the trap entry
47 * code logs the trap state registers at every level in the trap 48 * code logs the trap state registers at every level in the trap
@@ -77,11 +78,6 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
77 } 78 }
78} 79}
79 80
80void do_call_debug(struct pt_regs *regs)
81{
82 notify_die(DIE_CALL, "debug call", regs, 0, 255, SIGINT);
83}
84
85void bad_trap(struct pt_regs *regs, long lvl) 81void bad_trap(struct pt_regs *regs, long lvl)
86{ 82{
87 char buffer[32]; 83 char buffer[32];
@@ -550,41 +546,6 @@ static unsigned long ecache_flush_physbase;
550static unsigned long ecache_flush_linesize; 546static unsigned long ecache_flush_linesize;
551static unsigned long ecache_flush_size; 547static unsigned long ecache_flush_size;
552 548
553/* WARNING: The error trap handlers in assembly know the precise
554 * layout of the following structure.
555 *
556 * C-level handlers below use this information to log the error
557 * and then determine how to recover (if possible).
558 */
559struct cheetah_err_info {
560/*0x00*/u64 afsr;
561/*0x08*/u64 afar;
562
563 /* D-cache state */
564/*0x10*/u64 dcache_data[4]; /* The actual data */
565/*0x30*/u64 dcache_index; /* D-cache index */
566/*0x38*/u64 dcache_tag; /* D-cache tag/valid */
567/*0x40*/u64 dcache_utag; /* D-cache microtag */
568/*0x48*/u64 dcache_stag; /* D-cache snooptag */
569
570 /* I-cache state */
571/*0x50*/u64 icache_data[8]; /* The actual insns + predecode */
572/*0x90*/u64 icache_index; /* I-cache index */
573/*0x98*/u64 icache_tag; /* I-cache phys tag */
574/*0xa0*/u64 icache_utag; /* I-cache microtag */
575/*0xa8*/u64 icache_stag; /* I-cache snooptag */
576/*0xb0*/u64 icache_upper; /* I-cache upper-tag */
577/*0xb8*/u64 icache_lower; /* I-cache lower-tag */
578
579 /* E-cache state */
580/*0xc0*/u64 ecache_data[4]; /* 32 bytes from staging registers */
581/*0xe0*/u64 ecache_index; /* E-cache index */
582/*0xe8*/u64 ecache_tag; /* E-cache tag/state */
583
584/*0xf0*/u64 __pad[32 - 30];
585};
586#define CHAFSR_INVALID ((u64)-1L)
587
588/* This table is ordered in priority of errors and matches the 549/* This table is ordered in priority of errors and matches the
589 * AFAR overwrite policy as well. 550 * AFAR overwrite policy as well.
590 */ 551 */
@@ -758,10 +719,6 @@ static struct afsr_error_table __jalapeno_error_table[] = {
758static struct afsr_error_table *cheetah_error_table; 719static struct afsr_error_table *cheetah_error_table;
759static unsigned long cheetah_afsr_errors; 720static unsigned long cheetah_afsr_errors;
760 721
761/* This is allocated at boot time based upon the largest hardware
762 * cpu ID in the system. We allocate two entries per cpu, one for
763 * TL==0 logging and one for TL >= 1 logging.
764 */
765struct cheetah_err_info *cheetah_error_log; 722struct cheetah_err_info *cheetah_error_log;
766 723
767static inline struct cheetah_err_info *cheetah_get_error_log(unsigned long afsr) 724static inline struct cheetah_err_info *cheetah_get_error_log(unsigned long afsr)
@@ -2102,7 +2059,7 @@ void do_div0(struct pt_regs *regs)
2102 force_sig_info(SIGFPE, &info, current); 2059 force_sig_info(SIGFPE, &info, current);
2103} 2060}
2104 2061
2105void instruction_dump (unsigned int *pc) 2062static void instruction_dump(unsigned int *pc)
2106{ 2063{
2107 int i; 2064 int i;
2108 2065
@@ -2115,7 +2072,7 @@ void instruction_dump (unsigned int *pc)
2115 printk("\n"); 2072 printk("\n");
2116} 2073}
2117 2074
2118static void user_instruction_dump (unsigned int __user *pc) 2075static void user_instruction_dump(unsigned int __user *pc)
2119{ 2076{
2120 int i; 2077 int i;
2121 unsigned int buf[9]; 2078 unsigned int buf[9];
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index b5c30416fdac..f37078d96407 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -46,6 +46,7 @@
46#include <asm/prom.h> 46#include <asm/prom.h>
47#include <asm/sstate.h> 47#include <asm/sstate.h>
48#include <asm/mdesc.h> 48#include <asm/mdesc.h>
49#include <asm/cpudata.h>
49 50
50#define MAX_PHYS_ADDRESS (1UL << 42UL) 51#define MAX_PHYS_ADDRESS (1UL << 42UL)
51#define KPTE_BITMAP_CHUNK_SZ (256UL * 1024UL * 1024UL) 52#define KPTE_BITMAP_CHUNK_SZ (256UL * 1024UL * 1024UL)
@@ -166,7 +167,7 @@ unsigned long sparc64_kern_pri_context __read_mostly;
166unsigned long sparc64_kern_pri_nuc_bits __read_mostly; 167unsigned long sparc64_kern_pri_nuc_bits __read_mostly;
167unsigned long sparc64_kern_sec_context __read_mostly; 168unsigned long sparc64_kern_sec_context __read_mostly;
168 169
169int bigkernel = 0; 170int num_kernel_image_mappings;
170 171
171#ifdef CONFIG_DEBUG_DCFLUSH 172#ifdef CONFIG_DEBUG_DCFLUSH
172atomic_t dcpage_flushes = ATOMIC_INIT(0); 173atomic_t dcpage_flushes = ATOMIC_INIT(0);
@@ -572,7 +573,7 @@ static unsigned long kern_large_tte(unsigned long paddr);
572static void __init remap_kernel(void) 573static void __init remap_kernel(void)
573{ 574{
574 unsigned long phys_page, tte_vaddr, tte_data; 575 unsigned long phys_page, tte_vaddr, tte_data;
575 int tlb_ent = sparc64_highest_locked_tlbent(); 576 int i, tlb_ent = sparc64_highest_locked_tlbent();
576 577
577 tte_vaddr = (unsigned long) KERNBASE; 578 tte_vaddr = (unsigned long) KERNBASE;
578 phys_page = (prom_boot_mapping_phys_low >> 22UL) << 22UL; 579 phys_page = (prom_boot_mapping_phys_low >> 22UL) << 22UL;
@@ -582,27 +583,20 @@ static void __init remap_kernel(void)
582 583
583 /* Now lock us into the TLBs via Hypervisor or OBP. */ 584 /* Now lock us into the TLBs via Hypervisor or OBP. */
584 if (tlb_type == hypervisor) { 585 if (tlb_type == hypervisor) {
585 hypervisor_tlb_lock(tte_vaddr, tte_data, HV_MMU_DMMU); 586 for (i = 0; i < num_kernel_image_mappings; i++) {
586 hypervisor_tlb_lock(tte_vaddr, tte_data, HV_MMU_IMMU);
587 if (bigkernel) {
588 tte_vaddr += 0x400000;
589 tte_data += 0x400000;
590 hypervisor_tlb_lock(tte_vaddr, tte_data, HV_MMU_DMMU); 587 hypervisor_tlb_lock(tte_vaddr, tte_data, HV_MMU_DMMU);
591 hypervisor_tlb_lock(tte_vaddr, tte_data, HV_MMU_IMMU); 588 hypervisor_tlb_lock(tte_vaddr, tte_data, HV_MMU_IMMU);
589 tte_vaddr += 0x400000;
590 tte_data += 0x400000;
592 } 591 }
593 } else { 592 } else {
594 prom_dtlb_load(tlb_ent, tte_data, tte_vaddr); 593 for (i = 0; i < num_kernel_image_mappings; i++) {
595 prom_itlb_load(tlb_ent, tte_data, tte_vaddr); 594 prom_dtlb_load(tlb_ent - i, tte_data, tte_vaddr);
596 if (bigkernel) { 595 prom_itlb_load(tlb_ent - i, tte_data, tte_vaddr);
597 tlb_ent -= 1; 596 tte_vaddr += 0x400000;
598 prom_dtlb_load(tlb_ent, 597 tte_data += 0x400000;
599 tte_data + 0x400000,
600 tte_vaddr + 0x400000);
601 prom_itlb_load(tlb_ent,
602 tte_data + 0x400000,
603 tte_vaddr + 0x400000);
604 } 598 }
605 sparc64_highest_unlocked_tlb_ent = tlb_ent - 1; 599 sparc64_highest_unlocked_tlb_ent = tlb_ent - i;
606 } 600 }
607 if (tlb_type == cheetah_plus) { 601 if (tlb_type == cheetah_plus) {
608 sparc64_kern_pri_context = (CTX_CHEETAH_PLUS_CTX0 | 602 sparc64_kern_pri_context = (CTX_CHEETAH_PLUS_CTX0 |
@@ -1280,10 +1274,6 @@ void __cpuinit sun4v_ktsb_register(void)
1280 1274
1281/* paging_init() sets up the page tables */ 1275/* paging_init() sets up the page tables */
1282 1276
1283extern void cheetah_ecache_flush_init(void);
1284extern void sun4v_patch_tlb_handlers(void);
1285
1286extern void cpu_probe(void);
1287extern void central_probe(void); 1277extern void central_probe(void);
1288 1278
1289static unsigned long last_valid_pfn; 1279static unsigned long last_valid_pfn;
@@ -1352,12 +1342,9 @@ void __init paging_init(void)
1352 shift = kern_base + PAGE_OFFSET - ((unsigned long)KERNBASE); 1342 shift = kern_base + PAGE_OFFSET - ((unsigned long)KERNBASE);
1353 1343
1354 real_end = (unsigned long)_end; 1344 real_end = (unsigned long)_end;
1355 if ((real_end > ((unsigned long)KERNBASE + 0x400000))) 1345 num_kernel_image_mappings = DIV_ROUND_UP(real_end - KERNBASE, 1 << 22);
1356 bigkernel = 1; 1346 printk("Kernel: Using %d locked TLB entries for main kernel image.\n",
1357 if ((real_end > ((unsigned long)KERNBASE + 0x800000))) { 1347 num_kernel_image_mappings);
1358 prom_printf("paging_init: Kernel > 8MB, too large.\n");
1359 prom_halt();
1360 }
1361 1348
1362 /* Set kernel pgd to upper alias so physical page computations 1349 /* Set kernel pgd to upper alias so physical page computations
1363 * work. 1350 * work.
diff --git a/arch/sparc64/mm/tlb.c b/arch/sparc64/mm/tlb.c
index 3f10fc921b00..a0f000b293de 100644
--- a/arch/sparc64/mm/tlb.c
+++ b/arch/sparc64/mm/tlb.c
@@ -23,10 +23,11 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers) = { 0, };
23 23
24void flush_tlb_pending(void) 24void flush_tlb_pending(void)
25{ 25{
26 struct mmu_gather *mp = &__get_cpu_var(mmu_gathers); 26 struct mmu_gather *mp;
27 27
28 preempt_disable(); 28 preempt_disable();
29 29
30 mp = &__get_cpu_var(mmu_gathers);
30 if (mp->tlb_nr) { 31 if (mp->tlb_nr) {
31 flush_tsb_user(mp); 32 flush_tsb_user(mp);
32 33
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
index 608152a2a05e..00df126169b4 100644
--- a/arch/x86/kernel/aperture_64.c
+++ b/arch/x86/kernel/aperture_64.c
@@ -18,6 +18,7 @@
18#include <linux/pci.h> 18#include <linux/pci.h>
19#include <linux/bitops.h> 19#include <linux/bitops.h>
20#include <linux/ioport.h> 20#include <linux/ioport.h>
21#include <linux/suspend.h>
21#include <asm/e820.h> 22#include <asm/e820.h>
22#include <asm/io.h> 23#include <asm/io.h>
23#include <asm/gart.h> 24#include <asm/gart.h>
@@ -76,6 +77,8 @@ static u32 __init allocate_aperture(void)
76 printk(KERN_INFO "Mapping aperture over %d KB of RAM @ %lx\n", 77 printk(KERN_INFO "Mapping aperture over %d KB of RAM @ %lx\n",
77 aper_size >> 10, __pa(p)); 78 aper_size >> 10, __pa(p));
78 insert_aperture_resource((u32)__pa(p), aper_size); 79 insert_aperture_resource((u32)__pa(p), aper_size);
80 register_nosave_region((u32)__pa(p) >> PAGE_SHIFT,
81 (u32)__pa(p+aper_size) >> PAGE_SHIFT);
79 82
80 return (u32)__pa(p); 83 return (u32)__pa(p);
81} 84}
diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c b/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c
index f2b5a621d27b..8a85c93bd62a 100644
--- a/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c
+++ b/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c
@@ -63,7 +63,7 @@ static struct cpufreq_frequency_table speedstep_freqs[] = {
63 */ 63 */
64static int speedstep_smi_ownership (void) 64static int speedstep_smi_ownership (void)
65{ 65{
66 u32 command, result, magic; 66 u32 command, result, magic, dummy;
67 u32 function = GET_SPEEDSTEP_OWNER; 67 u32 function = GET_SPEEDSTEP_OWNER;
68 unsigned char magic_data[] = "Copyright (c) 1999 Intel Corporation"; 68 unsigned char magic_data[] = "Copyright (c) 1999 Intel Corporation";
69 69
@@ -73,8 +73,11 @@ static int speedstep_smi_ownership (void)
73 dprintk("trying to obtain ownership with command %x at port %x\n", command, smi_port); 73 dprintk("trying to obtain ownership with command %x at port %x\n", command, smi_port);
74 74
75 __asm__ __volatile__( 75 __asm__ __volatile__(
76 "push %%ebp\n"
76 "out %%al, (%%dx)\n" 77 "out %%al, (%%dx)\n"
77 : "=D" (result) 78 "pop %%ebp\n"
79 : "=D" (result), "=a" (dummy), "=b" (dummy), "=c" (dummy), "=d" (dummy),
80 "=S" (dummy)
78 : "a" (command), "b" (function), "c" (0), "d" (smi_port), 81 : "a" (command), "b" (function), "c" (0), "d" (smi_port),
79 "D" (0), "S" (magic) 82 "D" (0), "S" (magic)
80 : "memory" 83 : "memory"
@@ -96,7 +99,7 @@ static int speedstep_smi_ownership (void)
96 */ 99 */
97static int speedstep_smi_get_freqs (unsigned int *low, unsigned int *high) 100static int speedstep_smi_get_freqs (unsigned int *low, unsigned int *high)
98{ 101{
99 u32 command, result = 0, edi, high_mhz, low_mhz; 102 u32 command, result = 0, edi, high_mhz, low_mhz, dummy;
100 u32 state=0; 103 u32 state=0;
101 u32 function = GET_SPEEDSTEP_FREQS; 104 u32 function = GET_SPEEDSTEP_FREQS;
102 105
@@ -109,10 +112,12 @@ static int speedstep_smi_get_freqs (unsigned int *low, unsigned int *high)
109 112
110 dprintk("trying to determine frequencies with command %x at port %x\n", command, smi_port); 113 dprintk("trying to determine frequencies with command %x at port %x\n", command, smi_port);
111 114
112 __asm__ __volatile__("movl $0, %%edi\n" 115 __asm__ __volatile__(
116 "push %%ebp\n"
113 "out %%al, (%%dx)\n" 117 "out %%al, (%%dx)\n"
114 : "=a" (result), "=b" (high_mhz), "=c" (low_mhz), "=d" (state), "=D" (edi) 118 "pop %%ebp"
115 : "a" (command), "b" (function), "c" (state), "d" (smi_port), "S" (0) 119 : "=a" (result), "=b" (high_mhz), "=c" (low_mhz), "=d" (state), "=D" (edi), "=S" (dummy)
120 : "a" (command), "b" (function), "c" (state), "d" (smi_port), "S" (0), "D" (0)
116 ); 121 );
117 122
118 dprintk("result %x, low_freq %u, high_freq %u\n", result, low_mhz, high_mhz); 123 dprintk("result %x, low_freq %u, high_freq %u\n", result, low_mhz, high_mhz);
@@ -135,16 +140,18 @@ static int speedstep_smi_get_freqs (unsigned int *low, unsigned int *high)
135static int speedstep_get_state (void) 140static int speedstep_get_state (void)
136{ 141{
137 u32 function=GET_SPEEDSTEP_STATE; 142 u32 function=GET_SPEEDSTEP_STATE;
138 u32 result, state, edi, command; 143 u32 result, state, edi, command, dummy;
139 144
140 command = (smi_sig & 0xffffff00) | (smi_cmd & 0xff); 145 command = (smi_sig & 0xffffff00) | (smi_cmd & 0xff);
141 146
142 dprintk("trying to determine current setting with command %x at port %x\n", command, smi_port); 147 dprintk("trying to determine current setting with command %x at port %x\n", command, smi_port);
143 148
144 __asm__ __volatile__("movl $0, %%edi\n" 149 __asm__ __volatile__(
150 "push %%ebp\n"
145 "out %%al, (%%dx)\n" 151 "out %%al, (%%dx)\n"
146 : "=a" (result), "=b" (state), "=D" (edi) 152 "pop %%ebp\n"
147 : "a" (command), "b" (function), "c" (0), "d" (smi_port), "S" (0) 153 : "=a" (result), "=b" (state), "=D" (edi), "=c" (dummy), "=d" (dummy), "=S" (dummy)
154 : "a" (command), "b" (function), "c" (0), "d" (smi_port), "S" (0), "D" (0)
148 ); 155 );
149 156
150 dprintk("state is %x, result is %x\n", state, result); 157 dprintk("state is %x, result is %x\n", state, result);
@@ -160,7 +167,7 @@ static int speedstep_get_state (void)
160 */ 167 */
161static void speedstep_set_state (unsigned int state) 168static void speedstep_set_state (unsigned int state)
162{ 169{
163 unsigned int result = 0, command, new_state; 170 unsigned int result = 0, command, new_state, dummy;
164 unsigned long flags; 171 unsigned long flags;
165 unsigned int function=SET_SPEEDSTEP_STATE; 172 unsigned int function=SET_SPEEDSTEP_STATE;
166 unsigned int retry = 0; 173 unsigned int retry = 0;
@@ -182,10 +189,12 @@ static void speedstep_set_state (unsigned int state)
182 } 189 }
183 retry++; 190 retry++;
184 __asm__ __volatile__( 191 __asm__ __volatile__(
185 "movl $0, %%edi\n" 192 "push %%ebp\n"
186 "out %%al, (%%dx)\n" 193 "out %%al, (%%dx)\n"
187 : "=b" (new_state), "=D" (result) 194 "pop %%ebp"
188 : "a" (command), "b" (function), "c" (state), "d" (smi_port), "S" (0) 195 : "=b" (new_state), "=D" (result), "=c" (dummy), "=a" (dummy),
196 "=d" (dummy), "=S" (dummy)
197 : "a" (command), "b" (function), "c" (state), "d" (smi_port), "S" (0), "D" (0)
189 ); 198 );
190 } while ((new_state != state) && (retry <= SMI_TRIES)); 199 } while ((new_state != state) && (retry <= SMI_TRIES));
191 200
@@ -195,7 +204,7 @@ static void speedstep_set_state (unsigned int state)
195 if (new_state == state) { 204 if (new_state == state) {
196 dprintk("change to %u MHz succeeded after %u tries with result %u\n", (speedstep_freqs[new_state].frequency / 1000), retry, result); 205 dprintk("change to %u MHz succeeded after %u tries with result %u\n", (speedstep_freqs[new_state].frequency / 1000), retry, result);
197 } else { 206 } else {
198 printk(KERN_ERR "cpufreq: change failed with new_state %u and result %u\n", new_state, result); 207 printk(KERN_ERR "cpufreq: change to state %u failed with new_state %u and result %u\n", state, new_state, result);
199 } 208 }
200 209
201 return; 210 return;
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index 103d61a59b19..3e18db4cefee 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -176,12 +176,13 @@ static inline void k8_enable_fixed_iorrs(void)
176} 176}
177 177
178/** 178/**
179 * Checks and updates an fixed-range MTRR if it differs from the value it 179 * set_fixed_range - checks & updates a fixed-range MTRR if it differs from the value it should have
180 * should have. If K8 extentions are wanted, update the K8 SYSCFG MSR also. 180 * @msr: MSR address of the MTTR which should be checked and updated
181 * see AMD publication no. 24593, chapter 7.8.1, page 233 for more information 181 * @changed: pointer which indicates whether the MTRR needed to be changed
182 * \param msr MSR address of the MTTR which should be checked and updated 182 * @msrwords: pointer to the MSR values which the MSR should have
183 * \param changed pointer which indicates whether the MTRR needed to be changed 183 *
184 * \param msrwords pointer to the MSR values which the MSR should have 184 * If K8 extentions are wanted, update the K8 SYSCFG MSR also.
185 * See AMD publication no. 24593, chapter 7.8.1, page 233 for more information.
185 */ 186 */
186static void set_fixed_range(int msr, bool *changed, unsigned int *msrwords) 187static void set_fixed_range(int msr, bool *changed, unsigned int *msrwords)
187{ 188{
@@ -199,12 +200,15 @@ static void set_fixed_range(int msr, bool *changed, unsigned int *msrwords)
199 } 200 }
200} 201}
201 202
203/**
204 * generic_get_free_region - Get a free MTRR.
205 * @base: The starting (base) address of the region.
206 * @size: The size (in bytes) of the region.
207 * @replace_reg: mtrr index to be replaced; set to invalid value if none.
208 *
209 * Returns: The index of the region on success, else negative on error.
210 */
202int generic_get_free_region(unsigned long base, unsigned long size, int replace_reg) 211int generic_get_free_region(unsigned long base, unsigned long size, int replace_reg)
203/* [SUMMARY] Get a free MTRR.
204 <base> The starting (base) address of the region.
205 <size> The size (in bytes) of the region.
206 [RETURNS] The index of the region on success, else -1 on error.
207*/
208{ 212{
209 int i, max; 213 int i, max;
210 mtrr_type ltype; 214 mtrr_type ltype;
@@ -249,8 +253,8 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,
249} 253}
250 254
251/** 255/**
252 * Checks and updates the fixed-range MTRRs if they differ from the saved set 256 * set_fixed_ranges - checks & updates the fixed-range MTRRs if they differ from the saved set
253 * \param frs pointer to fixed-range MTRR values, saved by get_fixed_ranges() 257 * @frs: pointer to fixed-range MTRR values, saved by get_fixed_ranges()
254 */ 258 */
255static int set_fixed_ranges(mtrr_type * frs) 259static int set_fixed_ranges(mtrr_type * frs)
256{ 260{
@@ -294,13 +298,13 @@ static bool set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr)
294 298
295static u32 deftype_lo, deftype_hi; 299static u32 deftype_lo, deftype_hi;
296 300
301/**
302 * set_mtrr_state - Set the MTRR state for this CPU.
303 *
304 * NOTE: The CPU must already be in a safe state for MTRR changes.
305 * RETURNS: 0 if no changes made, else a mask indicating what was changed.
306 */
297static unsigned long set_mtrr_state(void) 307static unsigned long set_mtrr_state(void)
298/* [SUMMARY] Set the MTRR state for this CPU.
299 <state> The MTRR state information to read.
300 <ctxt> Some relevant CPU context.
301 [NOTE] The CPU must already be in a safe state for MTRR changes.
302 [RETURNS] 0 if no changes made, else a mask indication what was changed.
303*/
304{ 308{
305 unsigned int i; 309 unsigned int i;
306 unsigned long change_mask = 0; 310 unsigned long change_mask = 0;
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index be83336fddba..a6450b3ae759 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -711,7 +711,8 @@ int __init mtrr_trim_uncached_memory(unsigned long end_pfn)
711 trim_size = end_pfn; 711 trim_size = end_pfn;
712 trim_size <<= PAGE_SHIFT; 712 trim_size <<= PAGE_SHIFT;
713 trim_size -= trim_start; 713 trim_size -= trim_start;
714 add_memory_region(trim_start, trim_size, E820_RESERVED); 714 update_memory_range(trim_start, trim_size, E820_RAM,
715 E820_RESERVED);
715 update_e820(); 716 update_e820();
716 return 1; 717 return 1;
717 } 718 }
diff --git a/arch/x86/kernel/e820_32.c b/arch/x86/kernel/e820_32.c
index 4e16ef4a2659..80444c5c9b14 100644
--- a/arch/x86/kernel/e820_32.c
+++ b/arch/x86/kernel/e820_32.c
@@ -749,6 +749,32 @@ static int __init parse_memmap(char *arg)
749 return 0; 749 return 0;
750} 750}
751early_param("memmap", parse_memmap); 751early_param("memmap", parse_memmap);
752void __init update_memory_range(u64 start, u64 size, unsigned old_type,
753 unsigned new_type)
754{
755 int i;
756
757 BUG_ON(old_type == new_type);
758
759 for (i = 0; i < e820.nr_map; i++) {
760 struct e820entry *ei = &e820.map[i];
761 u64 final_start, final_end;
762 if (ei->type != old_type)
763 continue;
764 /* totally covered? */
765 if (ei->addr >= start && ei->size <= size) {
766 ei->type = new_type;
767 continue;
768 }
769 /* partially covered */
770 final_start = max(start, ei->addr);
771 final_end = min(start + size, ei->addr + ei->size);
772 if (final_start >= final_end)
773 continue;
774 add_memory_region(final_start, final_end - final_start,
775 new_type);
776 }
777}
752void __init update_e820(void) 778void __init update_e820(void)
753{ 779{
754 u8 nr_map; 780 u8 nr_map;
diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c
index 9f65b4cc323c..9be697126013 100644
--- a/arch/x86/kernel/e820_64.c
+++ b/arch/x86/kernel/e820_64.c
@@ -744,6 +744,33 @@ void __init finish_e820_parsing(void)
744 } 744 }
745} 745}
746 746
747void __init update_memory_range(u64 start, u64 size, unsigned old_type,
748 unsigned new_type)
749{
750 int i;
751
752 BUG_ON(old_type == new_type);
753
754 for (i = 0; i < e820.nr_map; i++) {
755 struct e820entry *ei = &e820.map[i];
756 u64 final_start, final_end;
757 if (ei->type != old_type)
758 continue;
759 /* totally covered? */
760 if (ei->addr >= start && ei->size <= size) {
761 ei->type = new_type;
762 continue;
763 }
764 /* partially covered */
765 final_start = max(start, ei->addr);
766 final_end = min(start + size, ei->addr + ei->size);
767 if (final_start >= final_end)
768 continue;
769 add_memory_region(final_start, final_end - final_start,
770 new_type);
771 }
772}
773
747void __init update_e820(void) 774void __init update_e820(void)
748{ 775{
749 u8 nr_map; 776 u8 nr_map;
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index fd8ca53943a8..74d87ea85b5c 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -657,7 +657,7 @@ int_msg:
657 .asciz "Unknown interrupt or fault at EIP %p %p %p\n" 657 .asciz "Unknown interrupt or fault at EIP %p %p %p\n"
658 658
659fault_msg: 659fault_msg:
660 .ascii \ 660 .asciz \
661/* fault info: */ "BUG: Int %d: CR2 %p\n" \ 661/* fault info: */ "BUG: Int %d: CR2 %p\n" \
662/* pusha regs: */ " EDI %p ESI %p EBP %p ESP %p\n" \ 662/* pusha regs: */ " EDI %p ESI %p EBP %p ESP %p\n" \
663 " EBX %p EDX %p ECX %p EAX %p\n" \ 663 " EBX %p EDX %p ECX %p EAX %p\n" \
diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
index c706a3061553..5921e5f0a640 100644
--- a/arch/x86/kernel/io_delay.c
+++ b/arch/x86/kernel/io_delay.c
@@ -78,6 +78,14 @@ static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
78 }, 78 },
79 { 79 {
80 .callback = dmi_io_delay_0xed_port, 80 .callback = dmi_io_delay_0xed_port,
81 .ident = "HP Pavilion dv6000",
82 .matches = {
83 DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"),
84 DMI_MATCH(DMI_BOARD_NAME, "30B8")
85 }
86 },
87 {
88 .callback = dmi_io_delay_0xed_port,
81 .ident = "HP Pavilion tx1000", 89 .ident = "HP Pavilion tx1000",
82 .matches = { 90 .matches = {
83 DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"), 91 DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"),
diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c
index 027fc067b399..b402c0f3f192 100644
--- a/arch/x86/kernel/mfgpt_32.c
+++ b/arch/x86/kernel/mfgpt_32.c
@@ -30,6 +30,7 @@
30 30
31#include <linux/kernel.h> 31#include <linux/kernel.h>
32#include <linux/interrupt.h> 32#include <linux/interrupt.h>
33#include <linux/module.h>
33#include <asm/geode.h> 34#include <asm/geode.h>
34 35
35static struct mfgpt_timer_t { 36static struct mfgpt_timer_t {
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c
index a82473d192a3..375cb2bc45be 100644
--- a/arch/x86/kernel/pci-dma_64.c
+++ b/arch/x86/kernel/pci-dma_64.c
@@ -53,11 +53,6 @@ dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order)
53 int node; 53 int node;
54 54
55 node = dev_to_node(dev); 55 node = dev_to_node(dev);
56 if (node == -1)
57 node = numa_node_id();
58
59 if (node < first_node(node_online_map))
60 node = first_node(node_online_map);
61 56
62 page = alloc_pages_node(node, gfp, order); 57 page = alloc_pages_node(node, gfp, order);
63 return page ? page_address(page) : NULL; 58 return page ? page_address(page) : NULL;
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index c47208fc5932..d89a648fe710 100644
--- a/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@ -363,6 +363,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, 0x0051,
363 nvidia_force_enable_hpet); 363 nvidia_force_enable_hpet);
364 364
365/* LPC bridges */ 365/* LPC bridges */
366DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, 0x0260,
367 nvidia_force_enable_hpet);
366DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, 0x0360, 368DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, 0x0360,
367 nvidia_force_enable_hpet); 369 nvidia_force_enable_hpet);
368DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, 0x0361, 370DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, 0x0361,
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 55ceb8cdef75..484c4a80d38a 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -152,6 +152,24 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
152 DMI_MATCH(DMI_BOARD_NAME, "0WF810"), 152 DMI_MATCH(DMI_BOARD_NAME, "0WF810"),
153 }, 153 },
154 }, 154 },
155 { /* Handle problems with rebooting on Dell Optiplex 745's DFF*/
156 .callback = set_bios_reboot,
157 .ident = "Dell OptiPlex 745",
158 .matches = {
159 DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
160 DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"),
161 DMI_MATCH(DMI_BOARD_NAME, "0MM599"),
162 },
163 },
164 { /* Handle problems with rebooting on Dell Optiplex 745 with 0KW626 */
165 .callback = set_bios_reboot,
166 .ident = "Dell OptiPlex 745",
167 .matches = {
168 DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
169 DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"),
170 DMI_MATCH(DMI_BOARD_NAME, "0KW626"),
171 },
172 },
155 { /* Handle problems with rebooting on Dell 2400's */ 173 { /* Handle problems with rebooting on Dell 2400's */
156 .callback = set_bios_reboot, 174 .callback = set_bios_reboot,
157 .ident = "Dell PowerEdge 2400", 175 .ident = "Dell PowerEdge 2400",
diff --git a/arch/x86/kernel/setup64.c b/arch/x86/kernel/setup64.c
index 309366f8f603..e24c45677094 100644
--- a/arch/x86/kernel/setup64.c
+++ b/arch/x86/kernel/setup64.c
@@ -142,14 +142,16 @@ void __init setup_per_cpu_areas(void)
142 printk(KERN_INFO "PERCPU: Allocating %lu bytes of per cpu data\n", size); 142 printk(KERN_INFO "PERCPU: Allocating %lu bytes of per cpu data\n", size);
143 for_each_cpu_mask (i, cpu_possible_map) { 143 for_each_cpu_mask (i, cpu_possible_map) {
144 char *ptr; 144 char *ptr;
145#ifndef CONFIG_NEED_MULTIPLE_NODES
146 ptr = alloc_bootmem_pages(size);
147#else
148 int node = early_cpu_to_node(i);
145 149
146 if (!NODE_DATA(early_cpu_to_node(i))) { 150 if (!node_online(node) || !NODE_DATA(node))
147 printk("cpu with no node %d, num_online_nodes %d\n",
148 i, num_online_nodes());
149 ptr = alloc_bootmem_pages(size); 151 ptr = alloc_bootmem_pages(size);
150 } else { 152 else
151 ptr = alloc_bootmem_pages_node(NODE_DATA(early_cpu_to_node(i)), size); 153 ptr = alloc_bootmem_pages_node(NODE_DATA(node), size);
152 } 154#endif
153 if (!ptr) 155 if (!ptr)
154 panic("Cannot allocate cpu data for CPU %d\n", i); 156 panic("Cannot allocate cpu data for CPU %d\n", i);
155 cpu_pda(i)->data_offset = ptr - __per_cpu_start; 157 cpu_pda(i)->data_offset = ptr - __per_cpu_start;
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index a1d7071a51c9..2b3e5d45176b 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -406,8 +406,6 @@ static unsigned long __init setup_memory(void)
406 */ 406 */
407 min_low_pfn = PFN_UP(init_pg_tables_end); 407 min_low_pfn = PFN_UP(init_pg_tables_end);
408 408
409 find_max_pfn();
410
411 max_low_pfn = find_max_low_pfn(); 409 max_low_pfn = find_max_low_pfn();
412 410
413#ifdef CONFIG_HIGHMEM 411#ifdef CONFIG_HIGHMEM
@@ -764,12 +762,13 @@ void __init setup_arch(char **cmdline_p)
764 if (efi_enabled) 762 if (efi_enabled)
765 efi_init(); 763 efi_init();
766 764
767 max_low_pfn = setup_memory();
768
769 /* update e820 for memory not covered by WB MTRRs */ 765 /* update e820 for memory not covered by WB MTRRs */
766 find_max_pfn();
770 mtrr_bp_init(); 767 mtrr_bp_init();
771 if (mtrr_trim_uncached_memory(max_pfn)) 768 if (mtrr_trim_uncached_memory(max_pfn))
772 max_low_pfn = setup_memory(); 769 find_max_pfn();
770
771 max_low_pfn = setup_memory();
773 772
774#ifdef CONFIG_VMI 773#ifdef CONFIG_VMI
775 /* 774 /*
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 7637dc91c79b..f4f7ecfb898c 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -801,7 +801,7 @@ static void __cpuinit srat_detect_node(void)
801 /* Don't do the funky fallback heuristics the AMD version employs 801 /* Don't do the funky fallback heuristics the AMD version employs
802 for now. */ 802 for now. */
803 node = apicid_to_node[apicid]; 803 node = apicid_to_node[apicid];
804 if (node == NUMA_NO_NODE) 804 if (node == NUMA_NO_NODE || !node_online(node))
805 node = first_node(node_online_map); 805 node = first_node(node_online_map);
806 numa_set_node(cpu, node); 806 numa_set_node(cpu, node);
807 807
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index d8172aabc660..e55af12e11b7 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -222,8 +222,7 @@ static int is_io_pte(unsigned long pte)
222 222
223static int is_rmap_pte(u64 pte) 223static int is_rmap_pte(u64 pte)
224{ 224{
225 return pte != shadow_trap_nonpresent_pte 225 return is_shadow_present_pte(pte);
226 && pte != shadow_notrap_nonpresent_pte;
227} 226}
228 227
229static gfn_t pse36_gfn_delta(u32 gpte) 228static gfn_t pse36_gfn_delta(u32 gpte)
@@ -893,14 +892,25 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte,
893 int *ptwrite, gfn_t gfn, struct page *page) 892 int *ptwrite, gfn_t gfn, struct page *page)
894{ 893{
895 u64 spte; 894 u64 spte;
896 int was_rmapped = is_rmap_pte(*shadow_pte); 895 int was_rmapped = 0;
897 int was_writeble = is_writeble_pte(*shadow_pte); 896 int was_writeble = is_writeble_pte(*shadow_pte);
897 hfn_t host_pfn = (*shadow_pte & PT64_BASE_ADDR_MASK) >> PAGE_SHIFT;
898 898
899 pgprintk("%s: spte %llx access %x write_fault %d" 899 pgprintk("%s: spte %llx access %x write_fault %d"
900 " user_fault %d gfn %lx\n", 900 " user_fault %d gfn %lx\n",
901 __FUNCTION__, *shadow_pte, pt_access, 901 __FUNCTION__, *shadow_pte, pt_access,
902 write_fault, user_fault, gfn); 902 write_fault, user_fault, gfn);
903 903
904 if (is_rmap_pte(*shadow_pte)) {
905 if (host_pfn != page_to_pfn(page)) {
906 pgprintk("hfn old %lx new %lx\n",
907 host_pfn, page_to_pfn(page));
908 rmap_remove(vcpu->kvm, shadow_pte);
909 }
910 else
911 was_rmapped = 1;
912 }
913
904 /* 914 /*
905 * We don't set the accessed bit, since we sometimes want to see 915 * We don't set the accessed bit, since we sometimes want to see
906 * whether the guest actually used the pte (in order to detect 916 * whether the guest actually used the pte (in order to detect
@@ -1402,7 +1412,7 @@ static void mmu_guess_page_from_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
1402 up_read(&current->mm->mmap_sem); 1412 up_read(&current->mm->mmap_sem);
1403 1413
1404 vcpu->arch.update_pte.gfn = gfn; 1414 vcpu->arch.update_pte.gfn = gfn;
1405 vcpu->arch.update_pte.page = gfn_to_page(vcpu->kvm, gfn); 1415 vcpu->arch.update_pte.page = page;
1406} 1416}
1407 1417
1408void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa, 1418void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 94ea724638fd..8e1462880d1f 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -349,8 +349,6 @@ static void update_exception_bitmap(struct kvm_vcpu *vcpu)
349 349
350static void reload_tss(void) 350static void reload_tss(void)
351{ 351{
352#ifndef CONFIG_X86_64
353
354 /* 352 /*
355 * VT restores TR but not its size. Useless. 353 * VT restores TR but not its size. Useless.
356 */ 354 */
@@ -361,7 +359,6 @@ static void reload_tss(void)
361 descs = (void *)gdt.base; 359 descs = (void *)gdt.base;
362 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */ 360 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
363 load_TR_desc(); 361 load_TR_desc();
364#endif
365} 362}
366 363
367static void load_transition_efer(struct vcpu_vmx *vmx) 364static void load_transition_efer(struct vcpu_vmx *vmx)
@@ -1436,7 +1433,7 @@ static int init_rmode_tss(struct kvm *kvm)
1436 int ret = 0; 1433 int ret = 0;
1437 int r; 1434 int r;
1438 1435
1439 down_read(&current->mm->mmap_sem); 1436 down_read(&kvm->slots_lock);
1440 r = kvm_clear_guest_page(kvm, fn, 0, PAGE_SIZE); 1437 r = kvm_clear_guest_page(kvm, fn, 0, PAGE_SIZE);
1441 if (r < 0) 1438 if (r < 0)
1442 goto out; 1439 goto out;
@@ -1459,7 +1456,7 @@ static int init_rmode_tss(struct kvm *kvm)
1459 1456
1460 ret = 1; 1457 ret = 1;
1461out: 1458out:
1462 up_read(&current->mm->mmap_sem); 1459 up_read(&kvm->slots_lock);
1463 return ret; 1460 return ret;
1464} 1461}
1465 1462
diff --git a/arch/x86/mach-visws/traps.c b/arch/x86/mach-visws/traps.c
index 843b67acf43b..bfac6ba10f8a 100644
--- a/arch/x86/mach-visws/traps.c
+++ b/arch/x86/mach-visws/traps.c
@@ -46,8 +46,9 @@ static __init void cobalt_init(void)
46 */ 46 */
47 set_fixmap(FIX_APIC_BASE, APIC_DEFAULT_PHYS_BASE); 47 set_fixmap(FIX_APIC_BASE, APIC_DEFAULT_PHYS_BASE);
48 setup_local_APIC(); 48 setup_local_APIC();
49 printk(KERN_INFO "Local APIC Version %#lx, ID %#lx\n", 49 printk(KERN_INFO "Local APIC Version %#x, ID %#x\n",
50 apic_read(APIC_LVR), apic_read(APIC_ID)); 50 (unsigned int)apic_read(APIC_LVR),
51 (unsigned int)apic_read(APIC_ID));
51 52
52 set_fixmap(FIX_CO_CPU, CO_CPU_PHYS); 53 set_fixmap(FIX_CO_CPU, CO_CPU_PHYS);
53 set_fixmap(FIX_CO_APIC, CO_APIC_PHYS); 54 set_fixmap(FIX_CO_APIC, CO_APIC_PHYS);
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c
index c394ca0720b8..8e25e06ff730 100644
--- a/arch/x86/mm/discontig_32.c
+++ b/arch/x86/mm/discontig_32.c
@@ -324,7 +324,6 @@ unsigned long __init setup_memory(void)
324 * this space and use it to adjust the boundary between ZONE_NORMAL 324 * this space and use it to adjust the boundary between ZONE_NORMAL
325 * and ZONE_HIGHMEM. 325 * and ZONE_HIGHMEM.
326 */ 326 */
327 find_max_pfn();
328 get_memcfg_numa(); 327 get_memcfg_numa();
329 328
330 kva_pages = calculate_numa_remap_pages(); 329 kva_pages = calculate_numa_remap_pages();
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 8fe576baa148..794895c6dcc9 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -106,7 +106,7 @@ static int ioremap_change_attr(unsigned long vaddr, unsigned long size,
106 * have to convert them into an offset in a page-aligned mapping, but the 106 * have to convert them into an offset in a page-aligned mapping, but the
107 * caller shouldn't need to know that small detail. 107 * caller shouldn't need to know that small detail.
108 */ 108 */
109static void __iomem *__ioremap(unsigned long phys_addr, unsigned long size, 109static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size,
110 enum ioremap_mode mode) 110 enum ioremap_mode mode)
111{ 111{
112 unsigned long pfn, offset, last_addr, vaddr; 112 unsigned long pfn, offset, last_addr, vaddr;
@@ -137,7 +137,11 @@ static void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
137 switch (mode) { 137 switch (mode) {
138 case IOR_MODE_UNCACHED: 138 case IOR_MODE_UNCACHED:
139 default: 139 default:
140 prot = PAGE_KERNEL_NOCACHE; 140 /*
141 * FIXME: we will use UC MINUS for now, as video fb drivers
142 * depend on it. Upcoming ioremap_wc() will fix this behavior.
143 */
144 prot = PAGE_KERNEL_UC_MINUS;
141 break; 145 break;
142 case IOR_MODE_CACHED: 146 case IOR_MODE_CACHED:
143 prot = PAGE_KERNEL; 147 prot = PAGE_KERNEL;
@@ -193,13 +197,13 @@ static void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
193 * 197 *
194 * Must be freed with iounmap. 198 * Must be freed with iounmap.
195 */ 199 */
196void __iomem *ioremap_nocache(unsigned long phys_addr, unsigned long size) 200void __iomem *ioremap_nocache(resource_size_t phys_addr, unsigned long size)
197{ 201{
198 return __ioremap(phys_addr, size, IOR_MODE_UNCACHED); 202 return __ioremap(phys_addr, size, IOR_MODE_UNCACHED);
199} 203}
200EXPORT_SYMBOL(ioremap_nocache); 204EXPORT_SYMBOL(ioremap_nocache);
201 205
202void __iomem *ioremap_cache(unsigned long phys_addr, unsigned long size) 206void __iomem *ioremap_cache(resource_size_t phys_addr, unsigned long size)
203{ 207{
204 return __ioremap(phys_addr, size, IOR_MODE_CACHED); 208 return __ioremap(phys_addr, size, IOR_MODE_CACHED);
205} 209}
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index 8ccfee10f5b5..16b82ad34b96 100644
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -221,8 +221,7 @@ void __init setup_node_bootmem(int nodeid, unsigned long start,
221 bootmap_pages<<PAGE_SHIFT, PAGE_SIZE); 221 bootmap_pages<<PAGE_SHIFT, PAGE_SIZE);
222 if (bootmap == NULL) { 222 if (bootmap == NULL) {
223 if (nodedata_phys < start || nodedata_phys >= end) 223 if (nodedata_phys < start || nodedata_phys >= end)
224 free_bootmem((unsigned long)node_data[nodeid], 224 free_bootmem(nodedata_phys, pgdat_size);
225 pgdat_size);
226 node_data[nodeid] = NULL; 225 node_data[nodeid] = NULL;
227 return; 226 return;
228 } 227 }
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 14e48b5a94ba..7b79f6be4e7d 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -771,7 +771,7 @@ static inline int change_page_attr_clear(unsigned long addr, int numpages,
771int set_memory_uc(unsigned long addr, int numpages) 771int set_memory_uc(unsigned long addr, int numpages)
772{ 772{
773 return change_page_attr_set(addr, numpages, 773 return change_page_attr_set(addr, numpages,
774 __pgprot(_PAGE_PCD | _PAGE_PWT)); 774 __pgprot(_PAGE_PCD));
775} 775}
776EXPORT_SYMBOL(set_memory_uc); 776EXPORT_SYMBOL(set_memory_uc);
777 777
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-03 12:05:01 -0500