aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-18 10:48:49 -0500
committerIngo Molnar <mingo@elte.hu>2008-11-18 10:48:49 -0500
commit73f56c0d35e6427081a4eabd620d8b8d8a35bd09 (patch)
tree9fe1a2577baea03f3a6ec4a5e79f3ff26c4ee0ae /arch
parent0af40a4b1050c050e62eb1dc30b82d5ab22bf221 (diff)
parent8501c45cc32c311ae755a2d5ac8c4a5f04908d42 (diff)
Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/dma-mapping.h13
-rw-r--r--arch/arm/include/asm/hardware/iop3xx-adma.h5
-rw-r--r--arch/arm/include/asm/hardware/iop_adma.h6
-rw-r--r--arch/arm/include/asm/mach/map.h13
-rw-r--r--arch/arm/mach-clps711x/include/mach/hardware.h22
-rw-r--r--arch/arm/mach-clps7500/core.c6
-rw-r--r--arch/arm/mach-clps7500/include/mach/hardware.h6
-rw-r--r--arch/arm/mach-h720x/include/mach/boards.h6
-rw-r--r--arch/arm/mach-integrator/include/mach/platform.h19
-rw-r--r--arch/arm/mach-iop13xx/include/mach/adma.h3
-rw-r--r--arch/arm/mach-realview/clock.c2
-rw-r--r--arch/arm/mach-realview/include/mach/platform.h19
-rw-r--r--arch/arm/mach-versatile/clock.c2
-rw-r--r--arch/arm/mach-versatile/include/mach/platform.h18
-rw-r--r--arch/arm/mm/cache-feroceon-l2.c4
-rw-r--r--arch/arm/mm/mmu.c6
-rw-r--r--arch/arm/plat-iop/setup.c5
-rw-r--r--arch/ia64/kvm/Kconfig2
-rw-r--r--arch/ia64/kvm/kvm-ia64.c12
-rw-r--r--arch/ia64/kvm/vcpu.h5
-rw-r--r--arch/m68k/kernel/ints.c2
-rw-r--r--arch/mn10300/Kconfig.debug9
-rw-r--r--arch/mn10300/mm/misalignment.c538
-rw-r--r--arch/parisc/include/asm/smp.h2
-rw-r--r--arch/powerpc/boot/dts/gef_sbc610.dts2
-rw-r--r--arch/powerpc/configs/83xx/asp8347_defconfig121
-rw-r--r--arch/powerpc/configs/83xx/mpc8313_rdb_defconfig158
-rw-r--r--arch/powerpc/configs/83xx/mpc8315_rdb_defconfig158
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_mds_defconfig125
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_rdb_defconfig136
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itx_defconfig171
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig121
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_mds_defconfig123
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_mds_defconfig126
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_rdk_defconfig119
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_mds_defconfig123
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_rdb_defconfig155
-rw-r--r--arch/powerpc/configs/83xx/sbc834x_defconfig119
-rw-r--r--arch/powerpc/configs/85xx/ksi8560_defconfig87
-rw-r--r--arch/powerpc/configs/85xx/mpc8536_ds_defconfig143
-rw-r--r--arch/powerpc/configs/85xx/mpc8540_ads_defconfig74
-rw-r--r--arch/powerpc/configs/85xx/mpc8544_ds_defconfig143
-rw-r--r--arch/powerpc/configs/85xx/mpc8560_ads_defconfig90
-rw-r--r--arch/powerpc/configs/85xx/mpc8568mds_defconfig93
-rw-r--r--arch/powerpc/configs/85xx/mpc8572_ds_defconfig143
-rw-r--r--arch/powerpc/configs/85xx/mpc85xx_cds_defconfig91
-rw-r--r--arch/powerpc/configs/85xx/sbc8548_defconfig75
-rw-r--r--arch/powerpc/configs/85xx/sbc8560_defconfig78
-rw-r--r--arch/powerpc/configs/85xx/stx_gp3_defconfig115
-rw-r--r--arch/powerpc/configs/85xx/tqm8540_defconfig91
-rw-r--r--arch/powerpc/configs/85xx/tqm8541_defconfig96
-rw-r--r--arch/powerpc/configs/85xx/tqm8548_defconfig98
-rw-r--r--arch/powerpc/configs/85xx/tqm8555_defconfig96
-rw-r--r--arch/powerpc/configs/85xx/tqm8560_defconfig96
-rw-r--r--arch/powerpc/configs/86xx/gef_sbc610_defconfig281
-rw-r--r--arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig177
-rw-r--r--arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig175
-rw-r--r--arch/powerpc/configs/86xx/sbc8641d_defconfig152
-rw-r--r--arch/powerpc/configs/adder875_defconfig69
-rw-r--r--arch/powerpc/configs/c2k_defconfig179
-rw-r--r--arch/powerpc/configs/chrp32_defconfig159
-rw-r--r--arch/powerpc/configs/ep8248e_defconfig113
-rw-r--r--arch/powerpc/configs/ep88xc_defconfig67
-rw-r--r--arch/powerpc/configs/g5_defconfig142
-rw-r--r--arch/powerpc/configs/iseries_defconfig114
-rw-r--r--arch/powerpc/configs/linkstation_defconfig122
-rw-r--r--arch/powerpc/configs/maple_defconfig142
-rw-r--r--arch/powerpc/configs/mgcoge_defconfig234
-rw-r--r--arch/powerpc/configs/mgsuvd_defconfig107
-rw-r--r--arch/powerpc/configs/mpc7448_hpc2_defconfig78
-rw-r--r--arch/powerpc/configs/mpc8272_ads_defconfig113
-rw-r--r--arch/powerpc/configs/mpc83xx_defconfig156
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig145
-rw-r--r--arch/powerpc/configs/mpc866_ads_defconfig77
-rw-r--r--arch/powerpc/configs/mpc86xx_defconfig144
-rw-r--r--arch/powerpc/configs/mpc885_ads_defconfig67
-rw-r--r--arch/powerpc/configs/pmac32_defconfig160
-rw-r--r--arch/powerpc/configs/ppc64_defconfig174
-rw-r--r--arch/powerpc/configs/ppc6xx_defconfig286
-rw-r--r--arch/powerpc/configs/pq2fads_defconfig137
-rw-r--r--arch/powerpc/configs/prpmc2800_defconfig126
-rw-r--r--arch/powerpc/configs/pseries_defconfig169
-rw-r--r--arch/powerpc/configs/storcenter_defconfig83
-rw-r--r--arch/powerpc/include/asm/immap_cpm2.h9
-rw-r--r--arch/powerpc/include/asm/immap_qe.h5
-rw-r--r--arch/powerpc/kernel/misc_32.S4
-rw-r--r--arch/powerpc/kernel/signal_32.c18
-rw-r--r--arch/s390/kernel/entry.S20
-rw-r--r--arch/s390/kernel/entry64.S11
-rw-r--r--arch/s390/kernel/process.c3
-rw-r--r--arch/s390/kernel/setup.c4
-rw-r--r--arch/s390/kernel/sys_s390.c2
-rw-r--r--arch/s390/kernel/topology.c11
-rw-r--r--arch/sh/include/asm/io.h4
-rw-r--r--arch/sh/include/asm/pgtable.h6
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7723.c6
-rw-r--r--arch/sh/kernel/early_printk.c3
-rw-r--r--arch/sh/kernel/timers/timer-tmu.c2
-rw-r--r--arch/sh/lib/copy_page.S11
-rw-r--r--arch/sh/mm/Makefile_322
-rw-r--r--arch/sh/mm/Makefile_642
-rw-r--r--arch/sh/mm/init.c12
-rw-r--r--arch/sh/mm/mmap.c31
-rw-r--r--arch/sh/mm/pg-sh4.c17
-rw-r--r--arch/sparc/include/asm/termbits.h11
-rw-r--r--arch/sparc/kernel/head.S1
-rw-r--r--arch/sparc/kernel/of_device.c4
-rw-r--r--arch/sparc64/defconfig232
-rw-r--r--arch/x86/Kconfig2
-rw-r--r--arch/x86/include/asm/acpi.h1
-rw-r--r--arch/x86/include/asm/iommu.h1
-rw-r--r--arch/x86/kernel/acpi/boot.c1
-rw-r--r--arch/x86/kernel/amd_iommu.c2
-rw-r--r--arch/x86/kernel/amd_iommu_init.c6
-rw-r--r--arch/x86/kernel/early-quirks.c18
-rw-r--r--arch/x86/kernel/hpet.c4
-rw-r--r--arch/x86/kernel/kvmclock.c2
-rw-r--r--arch/x86/kvm/Kconfig2
-rw-r--r--arch/x86/kvm/i8254.c4
-rw-r--r--arch/x86/kvm/mmu.c2
-rw-r--r--arch/x86/kvm/vmx.c3
-rw-r--r--arch/x86/kvm/vmx.h1
122 files changed, 6127 insertions, 2592 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index 1cb8602dd9d5..4ed149cbb32a 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -256,8 +256,17 @@ int dmabounce_sync_for_cpu(struct device *, dma_addr_t, unsigned long,
256int dmabounce_sync_for_device(struct device *, dma_addr_t, unsigned long, 256int dmabounce_sync_for_device(struct device *, dma_addr_t, unsigned long,
257 size_t, enum dma_data_direction); 257 size_t, enum dma_data_direction);
258#else 258#else
259#define dmabounce_sync_for_cpu(dev,dma,off,sz,dir) (1) 259static inline int dmabounce_sync_for_cpu(struct device *d, dma_addr_t addr,
260#define dmabounce_sync_for_device(dev,dma,off,sz,dir) (1) 260 unsigned long offset, size_t size, enum dma_data_direction dir)
261{
262 return 1;
263}
264
265static inline int dmabounce_sync_for_device(struct device *d, dma_addr_t addr,
266 unsigned long offset, size_t size, enum dma_data_direction dir)
267{
268 return 1;
269}
261 270
262 271
263/** 272/**
diff --git a/arch/arm/include/asm/hardware/iop3xx-adma.h b/arch/arm/include/asm/hardware/iop3xx-adma.h
index 87bff09633aa..83e6ba338e2c 100644
--- a/arch/arm/include/asm/hardware/iop3xx-adma.h
+++ b/arch/arm/include/asm/hardware/iop3xx-adma.h
@@ -730,7 +730,8 @@ static inline void iop_desc_set_next_desc(struct iop_adma_desc_slot *desc,
730{ 730{
731 /* hw_desc->next_desc is the same location for all channels */ 731 /* hw_desc->next_desc is the same location for all channels */
732 union iop3xx_desc hw_desc = { .ptr = desc->hw_desc, }; 732 union iop3xx_desc hw_desc = { .ptr = desc->hw_desc, };
733 BUG_ON(hw_desc.dma->next_desc); 733
734 iop_paranoia(hw_desc.dma->next_desc);
734 hw_desc.dma->next_desc = next_desc_addr; 735 hw_desc.dma->next_desc = next_desc_addr;
735} 736}
736 737
@@ -760,7 +761,7 @@ static inline int iop_desc_get_zero_result(struct iop_adma_desc_slot *desc)
760 struct iop3xx_desc_aau *hw_desc = desc->hw_desc; 761 struct iop3xx_desc_aau *hw_desc = desc->hw_desc;
761 struct iop3xx_aau_desc_ctrl desc_ctrl = hw_desc->desc_ctrl_field; 762 struct iop3xx_aau_desc_ctrl desc_ctrl = hw_desc->desc_ctrl_field;
762 763
763 BUG_ON(!(desc_ctrl.tx_complete && desc_ctrl.zero_result_en)); 764 iop_paranoia(!(desc_ctrl.tx_complete && desc_ctrl.zero_result_en));
764 return desc_ctrl.zero_result_err; 765 return desc_ctrl.zero_result_err;
765} 766}
766 767
diff --git a/arch/arm/include/asm/hardware/iop_adma.h b/arch/arm/include/asm/hardware/iop_adma.h
index cb7e3611bcba..385c6e8cbbd2 100644
--- a/arch/arm/include/asm/hardware/iop_adma.h
+++ b/arch/arm/include/asm/hardware/iop_adma.h
@@ -23,6 +23,12 @@
23 23
24#define IOP_ADMA_SLOT_SIZE 32 24#define IOP_ADMA_SLOT_SIZE 32
25#define IOP_ADMA_THRESHOLD 4 25#define IOP_ADMA_THRESHOLD 4
26#ifdef DEBUG
27#define IOP_PARANOIA 1
28#else
29#define IOP_PARANOIA 0
30#endif
31#define iop_paranoia(x) BUG_ON(IOP_PARANOIA && (x))
26 32
27/** 33/**
28 * struct iop_adma_device - internal representation of an ADMA device 34 * struct iop_adma_device - internal representation of an ADMA device
diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
index cb1139ac1943..39d949b63e80 100644
--- a/arch/arm/include/asm/mach/map.h
+++ b/arch/arm/include/asm/mach/map.h
@@ -19,12 +19,13 @@ struct map_desc {
19}; 19};
20 20
21/* types 0-3 are defined in asm/io.h */ 21/* types 0-3 are defined in asm/io.h */
22#define MT_CACHECLEAN 4 22#define MT_UNCACHED 4
23#define MT_MINICLEAN 5 23#define MT_CACHECLEAN 5
24#define MT_LOW_VECTORS 6 24#define MT_MINICLEAN 6
25#define MT_HIGH_VECTORS 7 25#define MT_LOW_VECTORS 7
26#define MT_MEMORY 8 26#define MT_HIGH_VECTORS 8
27#define MT_ROM 9 27#define MT_MEMORY 9
28#define MT_ROM 10
28 29
29#ifdef CONFIG_MMU 30#ifdef CONFIG_MMU
30extern void iotable_init(struct map_desc *, int); 31extern void iotable_init(struct map_desc *, int);
diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h
index 4c3e101b96c9..b3ebe9e4871f 100644
--- a/arch/arm/mach-clps711x/include/mach/hardware.h
+++ b/arch/arm/mach-clps711x/include/mach/hardware.h
@@ -94,20 +94,6 @@
94#include <asm/hardware/ep7212.h> 94#include <asm/hardware/ep7212.h>
95#include <asm/hardware/cs89712.h> 95#include <asm/hardware/cs89712.h>
96 96
97/* dynamic ioremap() areas */
98#define FLASH_START 0x00000000
99#define FLASH_SIZE 0x800000
100#define FLASH_WIDTH 4
101
102#define SRAM_START 0x60000000
103#define SRAM_SIZE 0xc000
104#define SRAM_WIDTH 4
105
106#define BOOTROM_START 0x70000000
107#define BOOTROM_SIZE 0x80
108#define BOOTROM_WIDTH 4
109
110
111/* static cdb89712_map_io() areas */ 97/* static cdb89712_map_io() areas */
112#define REGISTER_START 0x80000000 98#define REGISTER_START 0x80000000
113#define REGISTER_SIZE 0x4000 99#define REGISTER_SIZE 0x4000
@@ -198,14 +184,6 @@
198#define CEIVA_FLASH_SIZE 0x100000 184#define CEIVA_FLASH_SIZE 0x100000
199#define CEIVA_FLASH_WIDTH 2 185#define CEIVA_FLASH_WIDTH 2
200 186
201#define SRAM_START 0x60000000
202#define SRAM_SIZE 0xc000
203#define SRAM_WIDTH 4
204
205#define BOOTROM_START 0x70000000
206#define BOOTROM_SIZE 0x80
207#define BOOTROM_WIDTH 4
208
209/* 187/*
210 * SED1355 LCD controller 188 * SED1355 LCD controller
211 */ 189 */
diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c
index c3a33b8a5aac..7e247c04d41c 100644
--- a/arch/arm/mach-clps7500/core.c
+++ b/arch/arm/mach-clps7500/core.c
@@ -275,9 +275,9 @@ static struct map_desc cl7500_io_desc[] __initdata = {
275 .length = ISA_SIZE, 275 .length = ISA_SIZE,
276 .type = MT_DEVICE 276 .type = MT_DEVICE
277 }, { /* Flash */ 277 }, { /* Flash */
278 .virtual = FLASH_BASE, 278 .virtual = CLPS7500_FLASH_BASE,
279 .pfn = __phys_to_pfn(FLASH_START), 279 .pfn = __phys_to_pfn(CLPS7500_FLASH_START),
280 .length = FLASH_SIZE, 280 .length = CLPS7500_FLASH_SIZE,
281 .type = MT_DEVICE 281 .type = MT_DEVICE
282 }, { /* LED */ 282 }, { /* LED */
283 .virtual = LED_BASE, 283 .virtual = LED_BASE,
diff --git a/arch/arm/mach-clps7500/include/mach/hardware.h b/arch/arm/mach-clps7500/include/mach/hardware.h
index d66578a3371c..a6ad1d44badf 100644
--- a/arch/arm/mach-clps7500/include/mach/hardware.h
+++ b/arch/arm/mach-clps7500/include/mach/hardware.h
@@ -39,9 +39,9 @@
39#define ISA_SIZE 0x00010000 39#define ISA_SIZE 0x00010000
40#define ISA_BASE 0xe1000000 40#define ISA_BASE 0xe1000000
41 41
42#define FLASH_START 0x01000000 /* XXX */ 42#define CLPS7500_FLASH_START 0x01000000 /* XXX */
43#define FLASH_SIZE 0x01000000 43#define CLPS7500_FLASH_SIZE 0x01000000
44#define FLASH_BASE 0xe2000000 44#define CLPS7500_FLASH_BASE 0xe2000000
45 45
46#define LED_START 0x0302B000 46#define LED_START 0x0302B000
47#define LED_SIZE 0x00001000 47#define LED_SIZE 0x00001000
diff --git a/arch/arm/mach-h720x/include/mach/boards.h b/arch/arm/mach-h720x/include/mach/boards.h
index 079b279e1242..38b8e0d61fbf 100644
--- a/arch/arm/mach-h720x/include/mach/boards.h
+++ b/arch/arm/mach-h720x/include/mach/boards.h
@@ -19,9 +19,9 @@
19#ifdef CONFIG_ARCH_H7202 19#ifdef CONFIG_ARCH_H7202
20 20
21/* FLASH */ 21/* FLASH */
22#define FLASH_VIRT 0xd0000000 22#define H720X_FLASH_VIRT 0xd0000000
23#define FLASH_PHYS 0x00000000 23#define H720X_FLASH_PHYS 0x00000000
24#define FLASH_SIZE 0x02000000 24#define H720X_FLASH_SIZE 0x02000000
25 25
26/* onboard LAN controller */ 26/* onboard LAN controller */
27# define ETH0_PHYS 0x08000000 27# define ETH0_PHYS 0x08000000
diff --git a/arch/arm/mach-integrator/include/mach/platform.h b/arch/arm/mach-integrator/include/mach/platform.h
index 028b87839c0f..e00a2624f269 100644
--- a/arch/arm/mach-integrator/include/mach/platform.h
+++ b/arch/arm/mach-integrator/include/mach/platform.h
@@ -408,27 +408,10 @@
408#define uHAL_MEMORY_SIZE INTEGRATOR_SSRAM_SIZE 408#define uHAL_MEMORY_SIZE INTEGRATOR_SSRAM_SIZE
409 409
410/* 410/*
411 * Application Flash
412 *
413 */
414#define FLASH_BASE INTEGRATOR_FLASH_BASE
415#define FLASH_SIZE INTEGRATOR_FLASH_SIZE
416#define FLASH_END (FLASH_BASE + FLASH_SIZE - 1)
417#define FLASH_BLOCK_SIZE SZ_128K
418
419/*
420 * Boot Flash
421 *
422 */
423#define EPROM_BASE INTEGRATOR_BOOT_ROM_HI
424#define EPROM_SIZE INTEGRATOR_BOOT_ROM_SIZE
425#define EPROM_END (EPROM_BASE + EPROM_SIZE - 1)
426
427/*
428 * Clean base - dummy 411 * Clean base - dummy
429 * 412 *
430 */ 413 */
431#define CLEAN_BASE EPROM_BASE 414#define CLEAN_BASE INTEGRATOR_BOOT_ROM_HI
432 415
433/* 416/*
434 * Timer definitions 417 * Timer definitions
diff --git a/arch/arm/mach-iop13xx/include/mach/adma.h b/arch/arm/mach-iop13xx/include/mach/adma.h
index 60019c8e6465..5722e86f2174 100644
--- a/arch/arm/mach-iop13xx/include/mach/adma.h
+++ b/arch/arm/mach-iop13xx/include/mach/adma.h
@@ -404,7 +404,8 @@ static inline void iop_desc_set_next_desc(struct iop_adma_desc_slot *desc,
404 u32 next_desc_addr) 404 u32 next_desc_addr)
405{ 405{
406 struct iop13xx_adma_desc_hw *hw_desc = desc->hw_desc; 406 struct iop13xx_adma_desc_hw *hw_desc = desc->hw_desc;
407 BUG_ON(hw_desc->next_desc); 407
408 iop_paranoia(hw_desc->next_desc);
408 hw_desc->next_desc = next_desc_addr; 409 hw_desc->next_desc = next_desc_addr;
409} 410}
410 411
diff --git a/arch/arm/mach-realview/clock.c b/arch/arm/mach-realview/clock.c
index 3e706c57833a..3347c4236a60 100644
--- a/arch/arm/mach-realview/clock.c
+++ b/arch/arm/mach-realview/clock.c
@@ -104,7 +104,7 @@ static struct clk uart_clk = {
104 104
105static struct clk mmci_clk = { 105static struct clk mmci_clk = {
106 .name = "MCLK", 106 .name = "MCLK",
107 .rate = 33000000, 107 .rate = 24000000,
108}; 108};
109 109
110int clk_register(struct clk *clk) 110int clk_register(struct clk *clk)
diff --git a/arch/arm/mach-realview/include/mach/platform.h b/arch/arm/mach-realview/include/mach/platform.h
index 4034b54950c2..793a3a332712 100644
--- a/arch/arm/mach-realview/include/mach/platform.h
+++ b/arch/arm/mach-realview/include/mach/platform.h
@@ -239,27 +239,10 @@
239#define REALVIEW_DECODE_OFFSET 0xC /* Fitted logic modules */ 239#define REALVIEW_DECODE_OFFSET 0xC /* Fitted logic modules */
240 240
241/* 241/*
242 * Application Flash
243 *
244 */
245#define FLASH_BASE REALVIEW_FLASH_BASE
246#define FLASH_SIZE REALVIEW_FLASH_SIZE
247#define FLASH_END (FLASH_BASE + FLASH_SIZE - 1)
248#define FLASH_BLOCK_SIZE SZ_128K
249
250/*
251 * Boot Flash
252 *
253 */
254#define EPROM_BASE REALVIEW_BOOT_ROM_HI
255#define EPROM_SIZE REALVIEW_BOOT_ROM_SIZE
256#define EPROM_END (EPROM_BASE + EPROM_SIZE - 1)
257
258/*
259 * Clean base - dummy 242 * Clean base - dummy
260 * 243 *
261 */ 244 */
262#define CLEAN_BASE EPROM_BASE 245#define CLEAN_BASE REALVIEW_BOOT_ROM_HI
263 246
264/* 247/*
265 * System controller bit assignment 248 * System controller bit assignment
diff --git a/arch/arm/mach-versatile/clock.c b/arch/arm/mach-versatile/clock.c
index 9336508ec0b2..58937f1fb38c 100644
--- a/arch/arm/mach-versatile/clock.c
+++ b/arch/arm/mach-versatile/clock.c
@@ -105,7 +105,7 @@ static struct clk uart_clk = {
105 105
106static struct clk mmci_clk = { 106static struct clk mmci_clk = {
107 .name = "MCLK", 107 .name = "MCLK",
108 .rate = 33000000, 108 .rate = 24000000,
109}; 109};
110 110
111int clk_register(struct clk *clk) 111int clk_register(struct clk *clk)
diff --git a/arch/arm/mach-versatile/include/mach/platform.h b/arch/arm/mach-versatile/include/mach/platform.h
index 27cbe6a3f220..f91ba930ca8a 100644
--- a/arch/arm/mach-versatile/include/mach/platform.h
+++ b/arch/arm/mach-versatile/include/mach/platform.h
@@ -436,28 +436,12 @@
436#define SIC_INTMASK_PCI1 (1 << SIC_INT_PCI1) 436#define SIC_INTMASK_PCI1 (1 << SIC_INT_PCI1)
437#define SIC_INTMASK_PCI2 (1 << SIC_INT_PCI2) 437#define SIC_INTMASK_PCI2 (1 << SIC_INT_PCI2)
438#define SIC_INTMASK_PCI3 (1 << SIC_INT_PCI3) 438#define SIC_INTMASK_PCI3 (1 << SIC_INT_PCI3)
439/*
440 * Application Flash
441 *
442 */
443#define FLASH_BASE VERSATILE_FLASH_BASE
444#define FLASH_SIZE VERSATILE_FLASH_SIZE
445#define FLASH_END (FLASH_BASE + FLASH_SIZE - 1)
446#define FLASH_BLOCK_SIZE SZ_128K
447
448/*
449 * Boot Flash
450 *
451 */
452#define EPROM_BASE VERSATILE_BOOT_ROM_HI
453#define EPROM_SIZE VERSATILE_BOOT_ROM_SIZE
454#define EPROM_END (EPROM_BASE + EPROM_SIZE - 1)
455 439
456/* 440/*
457 * Clean base - dummy 441 * Clean base - dummy
458 * 442 *
459 */ 443 */
460#define CLEAN_BASE EPROM_BASE 444#define CLEAN_BASE VERSATILE_BOOT_ROM_HI
461 445
462/* 446/*
463 * System controller bit assignment 447 * System controller bit assignment
diff --git a/arch/arm/mm/cache-feroceon-l2.c b/arch/arm/mm/cache-feroceon-l2.c
index 13cdae8b0d44..80cd207cbaea 100644
--- a/arch/arm/mm/cache-feroceon-l2.c
+++ b/arch/arm/mm/cache-feroceon-l2.c
@@ -150,7 +150,7 @@ static void feroceon_l2_inv_range(unsigned long start, unsigned long end)
150 /* 150 /*
151 * Clean and invalidate partial last cache line. 151 * Clean and invalidate partial last cache line.
152 */ 152 */
153 if (end & (CACHE_LINE_SIZE - 1)) { 153 if (start < end && end & (CACHE_LINE_SIZE - 1)) {
154 l2_clean_inv_pa(end & ~(CACHE_LINE_SIZE - 1)); 154 l2_clean_inv_pa(end & ~(CACHE_LINE_SIZE - 1));
155 end &= ~(CACHE_LINE_SIZE - 1); 155 end &= ~(CACHE_LINE_SIZE - 1);
156 } 156 }
@@ -158,7 +158,7 @@ static void feroceon_l2_inv_range(unsigned long start, unsigned long end)
158 /* 158 /*
159 * Invalidate all full cache lines between 'start' and 'end'. 159 * Invalidate all full cache lines between 'start' and 'end'.
160 */ 160 */
161 while (start != end) { 161 while (start < end) {
162 unsigned long range_end = calc_range_end(start, end); 162 unsigned long range_end = calc_range_end(start, end);
163 l2_inv_pa_range(start, range_end - CACHE_LINE_SIZE); 163 l2_inv_pa_range(start, range_end - CACHE_LINE_SIZE);
164 start = range_end; 164 start = range_end;
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index e63db11f16a8..7f36c825718d 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -208,6 +208,12 @@ static struct mem_type mem_types[] = {
208 .prot_sect = PROT_SECT_DEVICE, 208 .prot_sect = PROT_SECT_DEVICE,
209 .domain = DOMAIN_IO, 209 .domain = DOMAIN_IO,
210 }, 210 },
211 [MT_UNCACHED] = {
212 .prot_pte = PROT_PTE_DEVICE,
213 .prot_l1 = PMD_TYPE_TABLE,
214 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
215 .domain = DOMAIN_IO,
216 },
211 [MT_CACHECLEAN] = { 217 [MT_CACHECLEAN] = {
212 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN, 218 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
213 .domain = DOMAIN_KERNEL, 219 .domain = DOMAIN_KERNEL,
diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
index 4689db638e95..9e573e78176a 100644
--- a/arch/arm/plat-iop/setup.c
+++ b/arch/arm/plat-iop/setup.c
@@ -16,14 +16,15 @@
16#include <asm/hardware/iop3xx.h> 16#include <asm/hardware/iop3xx.h>
17 17
18/* 18/*
19 * Standard IO mapping for all IOP3xx based systems 19 * Standard IO mapping for all IOP3xx based systems. Note that
20 * the IOP3xx OCCDR must be mapped uncached and unbuffered.
20 */ 21 */
21static struct map_desc iop3xx_std_desc[] __initdata = { 22static struct map_desc iop3xx_std_desc[] __initdata = {
22 { /* mem mapped registers */ 23 { /* mem mapped registers */
23 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE, 24 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
24 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE), 25 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
25 .length = IOP3XX_PERIPHERAL_SIZE, 26 .length = IOP3XX_PERIPHERAL_SIZE,
26 .type = MT_DEVICE, 27 .type = MT_UNCACHED,
27 }, { /* PCI IO space */ 28 }, { /* PCI IO space */
28 .virtual = IOP3XX_PCI_LOWER_IO_VA, 29 .virtual = IOP3XX_PCI_LOWER_IO_VA,
29 .pfn = __phys_to_pfn(IOP3XX_PCI_LOWER_IO_PA), 30 .pfn = __phys_to_pfn(IOP3XX_PCI_LOWER_IO_PA),
diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig
index 8e99fed6b3fd..f833a0b4188d 100644
--- a/arch/ia64/kvm/Kconfig
+++ b/arch/ia64/kvm/Kconfig
@@ -20,6 +20,8 @@ if VIRTUALIZATION
20config KVM 20config KVM
21 tristate "Kernel-based Virtual Machine (KVM) support" 21 tristate "Kernel-based Virtual Machine (KVM) support"
22 depends on HAVE_KVM && EXPERIMENTAL 22 depends on HAVE_KVM && EXPERIMENTAL
23 # for device assignment:
24 depends on PCI
23 select PREEMPT_NOTIFIERS 25 select PREEMPT_NOTIFIERS
24 select ANON_INODES 26 select ANON_INODES
25 ---help--- 27 ---help---
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 3caac477de9e..af1464f7a6ad 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -673,16 +673,16 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
673 673
674 vcpu_load(vcpu); 674 vcpu_load(vcpu);
675 675
676 if (vcpu->sigset_active)
677 sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);
678
676 if (unlikely(vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED)) { 679 if (unlikely(vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED)) {
677 kvm_vcpu_block(vcpu); 680 kvm_vcpu_block(vcpu);
678 clear_bit(KVM_REQ_UNHALT, &vcpu->requests); 681 clear_bit(KVM_REQ_UNHALT, &vcpu->requests);
679 vcpu_put(vcpu); 682 r = -EAGAIN;
680 return -EAGAIN; 683 goto out;
681 } 684 }
682 685
683 if (vcpu->sigset_active)
684 sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);
685
686 if (vcpu->mmio_needed) { 686 if (vcpu->mmio_needed) {
687 memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8); 687 memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8);
688 kvm_set_mmio_data(vcpu); 688 kvm_set_mmio_data(vcpu);
@@ -690,7 +690,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
690 vcpu->mmio_needed = 0; 690 vcpu->mmio_needed = 0;
691 } 691 }
692 r = __vcpu_run(vcpu, kvm_run); 692 r = __vcpu_run(vcpu, kvm_run);
693 693out:
694 if (vcpu->sigset_active) 694 if (vcpu->sigset_active)
695 sigprocmask(SIG_SETMASK, &sigsaved, NULL); 695 sigprocmask(SIG_SETMASK, &sigsaved, NULL);
696 696
diff --git a/arch/ia64/kvm/vcpu.h b/arch/ia64/kvm/vcpu.h
index 341e3fee280c..e9b2a4e121c0 100644
--- a/arch/ia64/kvm/vcpu.h
+++ b/arch/ia64/kvm/vcpu.h
@@ -384,6 +384,10 @@ static inline u64 __gpfn_is_io(u64 gpfn)
384#define MODE_IND(psr) \ 384#define MODE_IND(psr) \
385 (((psr).it << 2) + ((psr).dt << 1) + (psr).rt) 385 (((psr).it << 2) + ((psr).dt << 1) + (psr).rt)
386 386
387#ifndef CONFIG_SMP
388#define _vmm_raw_spin_lock(x) do {}while(0)
389#define _vmm_raw_spin_unlock(x) do {}while(0)
390#else
387#define _vmm_raw_spin_lock(x) \ 391#define _vmm_raw_spin_lock(x) \
388 do { \ 392 do { \
389 __u32 *ia64_spinlock_ptr = (__u32 *) (x); \ 393 __u32 *ia64_spinlock_ptr = (__u32 *) (x); \
@@ -403,6 +407,7 @@ static inline u64 __gpfn_is_io(u64 gpfn)
403 do { barrier(); \ 407 do { barrier(); \
404 ((spinlock_t *)x)->raw_lock.lock = 0; } \ 408 ((spinlock_t *)x)->raw_lock.lock = 0; } \
405while (0) 409while (0)
410#endif
406 411
407void vmm_spin_lock(spinlock_t *lock); 412void vmm_spin_lock(spinlock_t *lock);
408void vmm_spin_unlock(spinlock_t *lock); 413void vmm_spin_unlock(spinlock_t *lock);
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index 7e8a0d394e61..761ee0440c99 100644
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
@@ -133,7 +133,7 @@ void __init m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt,
133{ 133{
134 int i; 134 int i;
135 135
136 BUG_ON(IRQ_USER + cnt >= NR_IRQS); 136 BUG_ON(IRQ_USER + cnt > NR_IRQS);
137 m68k_first_user_vec = vec; 137 m68k_first_user_vec = vec;
138 for (i = 0; i < cnt; i++) 138 for (i = 0; i < cnt; i++)
139 irq_controller[IRQ_USER + i] = &user_irq_controller; 139 irq_controller[IRQ_USER + i] = &user_irq_controller;
diff --git a/arch/mn10300/Kconfig.debug b/arch/mn10300/Kconfig.debug
index 524e33819f32..ff80e86b9bd2 100644
--- a/arch/mn10300/Kconfig.debug
+++ b/arch/mn10300/Kconfig.debug
@@ -15,6 +15,15 @@ config DEBUG_DECOMPRESS_KERNEL
15 decompressing Linux seeing "Uncompressing Linux... " and 15 decompressing Linux seeing "Uncompressing Linux... " and
16 "Ok, booting the kernel.\n" on console. 16 "Ok, booting the kernel.\n" on console.
17 17
18config TEST_MISALIGNMENT_HANDLER
19 bool "Run tests on the misalignment handler"
20 depends on DEBUG_KERNEL
21 default n
22 help
23 If you say Y here the kernel will execute a list of misaligned memory
24 accesses to make sure the misalignment handler deals them with
25 correctly. If it does not, the kernel will throw a BUG.
26
18config KPROBES 27config KPROBES
19 bool "Kprobes" 28 bool "Kprobes"
20 depends on DEBUG_KERNEL 29 depends on DEBUG_KERNEL
diff --git a/arch/mn10300/mm/misalignment.c b/arch/mn10300/mm/misalignment.c
index 32aa89dc3848..94c4a4358065 100644
--- a/arch/mn10300/mm/misalignment.c
+++ b/arch/mn10300/mm/misalignment.c
@@ -37,26 +37,22 @@
37#include <asm/asm-offsets.h> 37#include <asm/asm-offsets.h>
38 38
39#if 0 39#if 0
40#define kdebug(FMT, ...) printk(KERN_DEBUG FMT, ##__VA_ARGS__) 40#define kdebug(FMT, ...) printk(KERN_DEBUG "MISALIGN: "FMT"\n", ##__VA_ARGS__)
41#else 41#else
42#define kdebug(FMT, ...) do {} while (0) 42#define kdebug(FMT, ...) do {} while (0)
43#endif 43#endif
44 44
45static int misalignment_addr(unsigned long *registers, unsigned params, 45static int misalignment_addr(unsigned long *registers, unsigned long sp,
46 unsigned opcode, unsigned disp, 46 unsigned params, unsigned opcode,
47 void **_address, unsigned long **_postinc); 47 unsigned long disp,
48 void **_address, unsigned long **_postinc,
49 unsigned long *_inc);
48 50
49static int misalignment_reg(unsigned long *registers, unsigned params, 51static int misalignment_reg(unsigned long *registers, unsigned params,
50 unsigned opcode, unsigned disp, 52 unsigned opcode, unsigned long disp,
51 unsigned long **_register); 53 unsigned long **_register);
52 54
53static inline unsigned int_log2(unsigned x) 55static void misalignment_MOV_Lcc(struct pt_regs *regs, uint32_t opcode);
54{
55 unsigned y;
56 asm("bsch %1,%0" : "=r"(y) : "r"(x), "0"(0));
57 return y;
58}
59#define log2(x) int_log2(x)
60 56
61static const unsigned Dreg_index[] = { 57static const unsigned Dreg_index[] = {
62 REG_D0 >> 2, REG_D1 >> 2, REG_D2 >> 2, REG_D3 >> 2 58 REG_D0 >> 2, REG_D1 >> 2, REG_D2 >> 2, REG_D3 >> 2
@@ -86,9 +82,10 @@ enum format_id {
86 FMT_D7, 82 FMT_D7,
87 FMT_D8, 83 FMT_D8,
88 FMT_D9, 84 FMT_D9,
85 FMT_D10,
89}; 86};
90 87
91struct { 88static const struct {
92 u_int8_t opsz, dispsz; 89 u_int8_t opsz, dispsz;
93} format_tbl[16] = { 90} format_tbl[16] = {
94 [FMT_S0] = { 8, 0 }, 91 [FMT_S0] = { 8, 0 },
@@ -103,6 +100,7 @@ struct {
103 [FMT_D7] = { 24, 8 }, 100 [FMT_D7] = { 24, 8 },
104 [FMT_D8] = { 24, 24 }, 101 [FMT_D8] = { 24, 24 },
105 [FMT_D9] = { 24, 32 }, 102 [FMT_D9] = { 24, 32 },
103 [FMT_D10] = { 32, 0 },
106}; 104};
107 105
108enum value_id { 106enum value_id {
@@ -128,9 +126,14 @@ enum value_id {
128 SD24, /* 24-bit signed displacement */ 126 SD24, /* 24-bit signed displacement */
129 SIMM4_2, /* 4-bit signed displacement in opcode bits 4-7 */ 127 SIMM4_2, /* 4-bit signed displacement in opcode bits 4-7 */
130 SIMM8, /* 8-bit signed immediate */ 128 SIMM8, /* 8-bit signed immediate */
129 IMM8, /* 8-bit unsigned immediate */
130 IMM16, /* 16-bit unsigned immediate */
131 IMM24, /* 24-bit unsigned immediate */ 131 IMM24, /* 24-bit unsigned immediate */
132 IMM32, /* 32-bit unsigned immediate */ 132 IMM32, /* 32-bit unsigned immediate */
133 IMM32_HIGH8, /* 32-bit unsigned immediate, high 8-bits in opcode */ 133 IMM32_HIGH8, /* 32-bit unsigned immediate, LSB in opcode */
134
135 IMM32_MEM, /* 32-bit unsigned displacement */
136 IMM32_HIGH8_MEM, /* 32-bit unsigned displacement, LSB in opcode */
134 137
135 DN0 = DM0, 138 DN0 = DM0,
136 DN1 = DM1, 139 DN1 = DM1,
@@ -149,7 +152,7 @@ enum value_id {
149}; 152};
150 153
151struct mn10300_opcode { 154struct mn10300_opcode {
152 const char *name; 155 const char name[8];
153 u_int32_t opcode; 156 u_int32_t opcode;
154 u_int32_t opmask; 157 u_int32_t opmask;
155 unsigned exclusion; 158 unsigned exclusion;
@@ -185,6 +188,10 @@ struct mn10300_opcode {
185 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 188 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
186*/ 189*/
187static const struct mn10300_opcode mn10300_opcodes[] = { 190static const struct mn10300_opcode mn10300_opcodes[] = {
191{ "mov", 0x4200, 0xf300, 0, FMT_S1, 0, {DM1, MEM2(IMM8, SP)}},
192{ "mov", 0x4300, 0xf300, 0, FMT_S1, 0, {AM1, MEM2(IMM8, SP)}},
193{ "mov", 0x5800, 0xfc00, 0, FMT_S1, 0, {MEM2(IMM8, SP), DN0}},
194{ "mov", 0x5c00, 0xfc00, 0, FMT_S1, 0, {MEM2(IMM8, SP), AN0}},
188{ "mov", 0x60, 0xf0, 0, FMT_S0, 0, {DM1, MEM(AN0)}}, 195{ "mov", 0x60, 0xf0, 0, FMT_S0, 0, {DM1, MEM(AN0)}},
189{ "mov", 0x70, 0xf0, 0, FMT_S0, 0, {MEM(AM0), DN1}}, 196{ "mov", 0x70, 0xf0, 0, FMT_S0, 0, {MEM(AM0), DN1}},
190{ "mov", 0xf000, 0xfff0, 0, FMT_D0, 0, {MEM(AM0), AN1}}, 197{ "mov", 0xf000, 0xfff0, 0, FMT_D0, 0, {MEM(AM0), AN1}},
@@ -197,8 +204,6 @@ static const struct mn10300_opcode mn10300_opcodes[] = {
197{ "mov", 0xf81000, 0xfff000, 0, FMT_D1, 0, {DM1, MEM2(SD8, AN0)}}, 204{ "mov", 0xf81000, 0xfff000, 0, FMT_D1, 0, {DM1, MEM2(SD8, AN0)}},
198{ "mov", 0xf82000, 0xfff000, 0, FMT_D1, 0, {MEM2(SD8,AM0), AN1}}, 205{ "mov", 0xf82000, 0xfff000, 0, FMT_D1, 0, {MEM2(SD8,AM0), AN1}},
199{ "mov", 0xf83000, 0xfff000, 0, FMT_D1, 0, {AM1, MEM2(SD8, AN0)}}, 206{ "mov", 0xf83000, 0xfff000, 0, FMT_D1, 0, {AM1, MEM2(SD8, AN0)}},
200{ "mov", 0xf8f000, 0xfffc00, 0, FMT_D1, AM33, {MEM2(SD8, AM0), SP}},
201{ "mov", 0xf8f400, 0xfffc00, 0, FMT_D1, AM33, {SP, MEM2(SD8, AN0)}},
202{ "mov", 0xf90a00, 0xffff00, 0, FMT_D6, AM33, {MEM(RM0), RN2}}, 207{ "mov", 0xf90a00, 0xffff00, 0, FMT_D6, AM33, {MEM(RM0), RN2}},
203{ "mov", 0xf91a00, 0xffff00, 0, FMT_D6, AM33, {RM2, MEM(RN0)}}, 208{ "mov", 0xf91a00, 0xffff00, 0, FMT_D6, AM33, {RM2, MEM(RN0)}},
204{ "mov", 0xf96a00, 0xffff00, 0x12, FMT_D6, AM33, {MEMINC(RM0), RN2}}, 209{ "mov", 0xf96a00, 0xffff00, 0x12, FMT_D6, AM33, {MEMINC(RM0), RN2}},
@@ -207,24 +212,46 @@ static const struct mn10300_opcode mn10300_opcodes[] = {
207{ "mov", 0xfa100000, 0xfff00000, 0, FMT_D2, 0, {DM1, MEM2(SD16, AN0)}}, 212{ "mov", 0xfa100000, 0xfff00000, 0, FMT_D2, 0, {DM1, MEM2(SD16, AN0)}},
208{ "mov", 0xfa200000, 0xfff00000, 0, FMT_D2, 0, {MEM2(SD16, AM0), AN1}}, 213{ "mov", 0xfa200000, 0xfff00000, 0, FMT_D2, 0, {MEM2(SD16, AM0), AN1}},
209{ "mov", 0xfa300000, 0xfff00000, 0, FMT_D2, 0, {AM1, MEM2(SD16, AN0)}}, 214{ "mov", 0xfa300000, 0xfff00000, 0, FMT_D2, 0, {AM1, MEM2(SD16, AN0)}},
215{ "mov", 0xfa900000, 0xfff30000, 0, FMT_D2, 0, {AM1, MEM2(IMM16, SP)}},
216{ "mov", 0xfa910000, 0xfff30000, 0, FMT_D2, 0, {DM1, MEM2(IMM16, SP)}},
217{ "mov", 0xfab00000, 0xfffc0000, 0, FMT_D2, 0, {MEM2(IMM16, SP), AN0}},
218{ "mov", 0xfab40000, 0xfffc0000, 0, FMT_D2, 0, {MEM2(IMM16, SP), DN0}},
210{ "mov", 0xfb0a0000, 0xffff0000, 0, FMT_D7, AM33, {MEM2(SD8, RM0), RN2}}, 219{ "mov", 0xfb0a0000, 0xffff0000, 0, FMT_D7, AM33, {MEM2(SD8, RM0), RN2}},
211{ "mov", 0xfb1a0000, 0xffff0000, 0, FMT_D7, AM33, {RM2, MEM2(SD8, RN0)}}, 220{ "mov", 0xfb1a0000, 0xffff0000, 0, FMT_D7, AM33, {RM2, MEM2(SD8, RN0)}},
212{ "mov", 0xfb6a0000, 0xffff0000, 0x22, FMT_D7, AM33, {MEMINC2 (RM0, SIMM8), RN2}}, 221{ "mov", 0xfb6a0000, 0xffff0000, 0x22, FMT_D7, AM33, {MEMINC2 (RM0, SIMM8), RN2}},
213{ "mov", 0xfb7a0000, 0xffff0000, 0, FMT_D7, AM33, {RM2, MEMINC2 (RN0, SIMM8)}}, 222{ "mov", 0xfb7a0000, 0xffff0000, 0, FMT_D7, AM33, {RM2, MEMINC2 (RN0, SIMM8)}},
223{ "mov", 0xfb8a0000, 0xffff0f00, 0, FMT_D7, AM33, {MEM2(IMM8, SP), RN2}},
214{ "mov", 0xfb8e0000, 0xffff000f, 0, FMT_D7, AM33, {MEM2(RI, RM0), RD2}}, 224{ "mov", 0xfb8e0000, 0xffff000f, 0, FMT_D7, AM33, {MEM2(RI, RM0), RD2}},
225{ "mov", 0xfb9a0000, 0xffff0f00, 0, FMT_D7, AM33, {RM2, MEM2(IMM8, SP)}},
215{ "mov", 0xfb9e0000, 0xffff000f, 0, FMT_D7, AM33, {RD2, MEM2(RI, RN0)}}, 226{ "mov", 0xfb9e0000, 0xffff000f, 0, FMT_D7, AM33, {RD2, MEM2(RI, RN0)}},
216{ "mov", 0xfc000000, 0xfff00000, 0, FMT_D4, 0, {MEM2(IMM32,AM0), DN1}}, 227{ "mov", 0xfc000000, 0xfff00000, 0, FMT_D4, 0, {MEM2(IMM32,AM0), DN1}},
217{ "mov", 0xfc100000, 0xfff00000, 0, FMT_D4, 0, {DM1, MEM2(IMM32,AN0)}}, 228{ "mov", 0xfc100000, 0xfff00000, 0, FMT_D4, 0, {DM1, MEM2(IMM32,AN0)}},
218{ "mov", 0xfc200000, 0xfff00000, 0, FMT_D4, 0, {MEM2(IMM32,AM0), AN1}}, 229{ "mov", 0xfc200000, 0xfff00000, 0, FMT_D4, 0, {MEM2(IMM32,AM0), AN1}},
219{ "mov", 0xfc300000, 0xfff00000, 0, FMT_D4, 0, {AM1, MEM2(IMM32,AN0)}}, 230{ "mov", 0xfc300000, 0xfff00000, 0, FMT_D4, 0, {AM1, MEM2(IMM32,AN0)}},
231{ "mov", 0xfc800000, 0xfff30000, 0, FMT_D4, 0, {AM1, MEM(IMM32_MEM)}},
232{ "mov", 0xfc810000, 0xfff30000, 0, FMT_D4, 0, {DM1, MEM(IMM32_MEM)}},
233{ "mov", 0xfc900000, 0xfff30000, 0, FMT_D4, 0, {AM1, MEM2(IMM32, SP)}},
234{ "mov", 0xfc910000, 0xfff30000, 0, FMT_D4, 0, {DM1, MEM2(IMM32, SP)}},
235{ "mov", 0xfca00000, 0xfffc0000, 0, FMT_D4, 0, {MEM(IMM32_MEM), AN0}},
236{ "mov", 0xfca40000, 0xfffc0000, 0, FMT_D4, 0, {MEM(IMM32_MEM), DN0}},
237{ "mov", 0xfcb00000, 0xfffc0000, 0, FMT_D4, 0, {MEM2(IMM32, SP), AN0}},
238{ "mov", 0xfcb40000, 0xfffc0000, 0, FMT_D4, 0, {MEM2(IMM32, SP), DN0}},
220{ "mov", 0xfd0a0000, 0xffff0000, 0, FMT_D8, AM33, {MEM2(SD24, RM0), RN2}}, 239{ "mov", 0xfd0a0000, 0xffff0000, 0, FMT_D8, AM33, {MEM2(SD24, RM0), RN2}},
221{ "mov", 0xfd1a0000, 0xffff0000, 0, FMT_D8, AM33, {RM2, MEM2(SD24, RN0)}}, 240{ "mov", 0xfd1a0000, 0xffff0000, 0, FMT_D8, AM33, {RM2, MEM2(SD24, RN0)}},
222{ "mov", 0xfd6a0000, 0xffff0000, 0x22, FMT_D8, AM33, {MEMINC2 (RM0, IMM24), RN2}}, 241{ "mov", 0xfd6a0000, 0xffff0000, 0x22, FMT_D8, AM33, {MEMINC2 (RM0, IMM24), RN2}},
223{ "mov", 0xfd7a0000, 0xffff0000, 0, FMT_D8, AM33, {RM2, MEMINC2 (RN0, IMM24)}}, 242{ "mov", 0xfd7a0000, 0xffff0000, 0, FMT_D8, AM33, {RM2, MEMINC2 (RN0, IMM24)}},
243{ "mov", 0xfd8a0000, 0xffff0f00, 0, FMT_D8, AM33, {MEM2(IMM24, SP), RN2}},
244{ "mov", 0xfd9a0000, 0xffff0f00, 0, FMT_D8, AM33, {RM2, MEM2(IMM24, SP)}},
224{ "mov", 0xfe0a0000, 0xffff0000, 0, FMT_D9, AM33, {MEM2(IMM32_HIGH8,RM0), RN2}}, 245{ "mov", 0xfe0a0000, 0xffff0000, 0, FMT_D9, AM33, {MEM2(IMM32_HIGH8,RM0), RN2}},
246{ "mov", 0xfe0a0000, 0xffff0000, 0, FMT_D9, AM33, {MEM2(IMM32_HIGH8,RM0), RN2}},
247{ "mov", 0xfe0e0000, 0xffff0f00, 0, FMT_D9, AM33, {MEM(IMM32_HIGH8_MEM), RN2}},
248{ "mov", 0xfe1a0000, 0xffff0000, 0, FMT_D9, AM33, {RM2, MEM2(IMM32_HIGH8, RN0)}},
225{ "mov", 0xfe1a0000, 0xffff0000, 0, FMT_D9, AM33, {RM2, MEM2(IMM32_HIGH8, RN0)}}, 249{ "mov", 0xfe1a0000, 0xffff0000, 0, FMT_D9, AM33, {RM2, MEM2(IMM32_HIGH8, RN0)}},
250{ "mov", 0xfe1e0000, 0xffff0f00, 0, FMT_D9, AM33, {RM2, MEM(IMM32_HIGH8_MEM)}},
226{ "mov", 0xfe6a0000, 0xffff0000, 0x22, FMT_D9, AM33, {MEMINC2 (RM0, IMM32_HIGH8), RN2}}, 251{ "mov", 0xfe6a0000, 0xffff0000, 0x22, FMT_D9, AM33, {MEMINC2 (RM0, IMM32_HIGH8), RN2}},
227{ "mov", 0xfe7a0000, 0xffff0000, 0, FMT_D9, AM33, {RN2, MEMINC2 (RM0, IMM32_HIGH8)}}, 252{ "mov", 0xfe7a0000, 0xffff0000, 0, FMT_D9, AM33, {RN2, MEMINC2 (RM0, IMM32_HIGH8)}},
253{ "mov", 0xfe8a0000, 0xffff0f00, 0, FMT_D9, AM33, {MEM2(IMM32_HIGH8, SP), RN2}},
254{ "mov", 0xfe9a0000, 0xffff0f00, 0, FMT_D9, AM33, {RM2, MEM2(IMM32_HIGH8, SP)}},
228 255
229{ "movhu", 0xf060, 0xfff0, 0, FMT_D0, 0, {MEM(AM0), DN1}}, 256{ "movhu", 0xf060, 0xfff0, 0, FMT_D0, 0, {MEM(AM0), DN1}},
230{ "movhu", 0xf070, 0xfff0, 0, FMT_D0, 0, {DM1, MEM(AN0)}}, 257{ "movhu", 0xf070, 0xfff0, 0, FMT_D0, 0, {DM1, MEM(AN0)}},
@@ -232,29 +259,58 @@ static const struct mn10300_opcode mn10300_opcodes[] = {
232{ "movhu", 0xf4c0, 0xffc0, 0, FMT_D0, 0, {DM2, MEM2(DI, AN0)}}, 259{ "movhu", 0xf4c0, 0xffc0, 0, FMT_D0, 0, {DM2, MEM2(DI, AN0)}},
233{ "movhu", 0xf86000, 0xfff000, 0, FMT_D1, 0, {MEM2(SD8, AM0), DN1}}, 260{ "movhu", 0xf86000, 0xfff000, 0, FMT_D1, 0, {MEM2(SD8, AM0), DN1}},
234{ "movhu", 0xf87000, 0xfff000, 0, FMT_D1, 0, {DM1, MEM2(SD8, AN0)}}, 261{ "movhu", 0xf87000, 0xfff000, 0, FMT_D1, 0, {DM1, MEM2(SD8, AN0)}},
262{ "movhu", 0xf89300, 0xfff300, 0, FMT_D1, 0, {DM1, MEM2(IMM8, SP)}},
263{ "movhu", 0xf8bc00, 0xfffc00, 0, FMT_D1, 0, {MEM2(IMM8, SP), DN0}},
235{ "movhu", 0xf94a00, 0xffff00, 0, FMT_D6, AM33, {MEM(RM0), RN2}}, 264{ "movhu", 0xf94a00, 0xffff00, 0, FMT_D6, AM33, {MEM(RM0), RN2}},
236{ "movhu", 0xf95a00, 0xffff00, 0, FMT_D6, AM33, {RM2, MEM(RN0)}}, 265{ "movhu", 0xf95a00, 0xffff00, 0, FMT_D6, AM33, {RM2, MEM(RN0)}},
237{ "movhu", 0xf9ea00, 0xffff00, 0x12, FMT_D6, AM33, {MEMINC(RM0), RN2}}, 266{ "movhu", 0xf9ea00, 0xffff00, 0x12, FMT_D6, AM33, {MEMINC(RM0), RN2}},
238{ "movhu", 0xf9fa00, 0xffff00, 0, FMT_D6, AM33, {RM2, MEMINC(RN0)}}, 267{ "movhu", 0xf9fa00, 0xffff00, 0, FMT_D6, AM33, {RM2, MEMINC(RN0)}},
239{ "movhu", 0xfa600000, 0xfff00000, 0, FMT_D2, 0, {MEM2(SD16, AM0), DN1}}, 268{ "movhu", 0xfa600000, 0xfff00000, 0, FMT_D2, 0, {MEM2(SD16, AM0), DN1}},
240{ "movhu", 0xfa700000, 0xfff00000, 0, FMT_D2, 0, {DM1, MEM2(SD16, AN0)}}, 269{ "movhu", 0xfa700000, 0xfff00000, 0, FMT_D2, 0, {DM1, MEM2(SD16, AN0)}},
270{ "movhu", 0xfa930000, 0xfff30000, 0, FMT_D2, 0, {DM1, MEM2(IMM16, SP)}},
271{ "movhu", 0xfabc0000, 0xfffc0000, 0, FMT_D2, 0, {MEM2(IMM16, SP), DN0}},
241{ "movhu", 0xfb4a0000, 0xffff0000, 0, FMT_D7, AM33, {MEM2(SD8, RM0), RN2}}, 272{ "movhu", 0xfb4a0000, 0xffff0000, 0, FMT_D7, AM33, {MEM2(SD8, RM0), RN2}},
242{ "movhu", 0xfb5a0000, 0xffff0000, 0, FMT_D7, AM33, {RM2, MEM2(SD8, RN0)}}, 273{ "movhu", 0xfb5a0000, 0xffff0000, 0, FMT_D7, AM33, {RM2, MEM2(SD8, RN0)}},
274{ "movhu", 0xfbca0000, 0xffff0f00, 0, FMT_D7, AM33, {MEM2(IMM8, SP), RN2}},
243{ "movhu", 0xfbce0000, 0xffff000f, 0, FMT_D7, AM33, {MEM2(RI, RM0), RD2}}, 275{ "movhu", 0xfbce0000, 0xffff000f, 0, FMT_D7, AM33, {MEM2(RI, RM0), RD2}},
276{ "movhu", 0xfbda0000, 0xffff0f00, 0, FMT_D7, AM33, {RM2, MEM2(IMM8, SP)}},
244{ "movhu", 0xfbde0000, 0xffff000f, 0, FMT_D7, AM33, {RD2, MEM2(RI, RN0)}}, 277{ "movhu", 0xfbde0000, 0xffff000f, 0, FMT_D7, AM33, {RD2, MEM2(RI, RN0)}},
245{ "movhu", 0xfbea0000, 0xffff0000, 0x22, FMT_D7, AM33, {MEMINC2 (RM0, SIMM8), RN2}}, 278{ "movhu", 0xfbea0000, 0xffff0000, 0x22, FMT_D7, AM33, {MEMINC2 (RM0, SIMM8), RN2}},
246{ "movhu", 0xfbfa0000, 0xffff0000, 0, FMT_D7, AM33, {RM2, MEMINC2 (RN0, SIMM8)}}, 279{ "movhu", 0xfbfa0000, 0xffff0000, 0, FMT_D7, AM33, {RM2, MEMINC2 (RN0, SIMM8)}},
247{ "movhu", 0xfc600000, 0xfff00000, 0, FMT_D4, 0, {MEM2(IMM32,AM0), DN1}}, 280{ "movhu", 0xfc600000, 0xfff00000, 0, FMT_D4, 0, {MEM2(IMM32,AM0), DN1}},
248{ "movhu", 0xfc700000, 0xfff00000, 0, FMT_D4, 0, {DM1, MEM2(IMM32,AN0)}}, 281{ "movhu", 0xfc700000, 0xfff00000, 0, FMT_D4, 0, {DM1, MEM2(IMM32,AN0)}},
282{ "movhu", 0xfc830000, 0xfff30000, 0, FMT_D4, 0, {DM1, MEM(IMM32_MEM)}},
283{ "movhu", 0xfc930000, 0xfff30000, 0, FMT_D4, 0, {DM1, MEM2(IMM32, SP)}},
284{ "movhu", 0xfcac0000, 0xfffc0000, 0, FMT_D4, 0, {MEM(IMM32_MEM), DN0}},
285{ "movhu", 0xfcbc0000, 0xfffc0000, 0, FMT_D4, 0, {MEM2(IMM32, SP), DN0}},
249{ "movhu", 0xfd4a0000, 0xffff0000, 0, FMT_D8, AM33, {MEM2(SD24, RM0), RN2}}, 286{ "movhu", 0xfd4a0000, 0xffff0000, 0, FMT_D8, AM33, {MEM2(SD24, RM0), RN2}},
250{ "movhu", 0xfd5a0000, 0xffff0000, 0, FMT_D8, AM33, {RM2, MEM2(SD24, RN0)}}, 287{ "movhu", 0xfd5a0000, 0xffff0000, 0, FMT_D8, AM33, {RM2, MEM2(SD24, RN0)}},
288{ "movhu", 0xfdca0000, 0xffff0f00, 0, FMT_D8, AM33, {MEM2(IMM24, SP), RN2}},
289{ "movhu", 0xfdda0000, 0xffff0f00, 0, FMT_D8, AM33, {RM2, MEM2(IMM24, SP)}},
251{ "movhu", 0xfdea0000, 0xffff0000, 0x22, FMT_D8, AM33, {MEMINC2 (RM0, IMM24), RN2}}, 290{ "movhu", 0xfdea0000, 0xffff0000, 0x22, FMT_D8, AM33, {MEMINC2 (RM0, IMM24), RN2}},
252{ "movhu", 0xfdfa0000, 0xffff0000, 0, FMT_D8, AM33, {RM2, MEMINC2 (RN0, IMM24)}}, 291{ "movhu", 0xfdfa0000, 0xffff0000, 0, FMT_D8, AM33, {RM2, MEMINC2 (RN0, IMM24)}},
253{ "movhu", 0xfe4a0000, 0xffff0000, 0, FMT_D9, AM33, {MEM2(IMM32_HIGH8,RM0), RN2}}, 292{ "movhu", 0xfe4a0000, 0xffff0000, 0, FMT_D9, AM33, {MEM2(IMM32_HIGH8,RM0), RN2}},
293{ "movhu", 0xfe4e0000, 0xffff0f00, 0, FMT_D9, AM33, {MEM(IMM32_HIGH8_MEM), RN2}},
254{ "movhu", 0xfe5a0000, 0xffff0000, 0, FMT_D9, AM33, {RM2, MEM2(IMM32_HIGH8, RN0)}}, 294{ "movhu", 0xfe5a0000, 0xffff0000, 0, FMT_D9, AM33, {RM2, MEM2(IMM32_HIGH8, RN0)}},
295{ "movhu", 0xfe5e0000, 0xffff0f00, 0, FMT_D9, AM33, {RM2, MEM(IMM32_HIGH8_MEM)}},
296{ "movhu", 0xfeca0000, 0xffff0f00, 0, FMT_D9, AM33, {MEM2(IMM32_HIGH8, SP), RN2}},
297{ "movhu", 0xfeda0000, 0xffff0f00, 0, FMT_D9, AM33, {RM2, MEM2(IMM32_HIGH8, SP)}},
255{ "movhu", 0xfeea0000, 0xffff0000, 0x22, FMT_D9, AM33, {MEMINC2 (RM0, IMM32_HIGH8), RN2}}, 298{ "movhu", 0xfeea0000, 0xffff0000, 0x22, FMT_D9, AM33, {MEMINC2 (RM0, IMM32_HIGH8), RN2}},
256{ "movhu", 0xfefa0000, 0xffff0000, 0, FMT_D9, AM33, {RN2, MEMINC2 (RM0, IMM32_HIGH8)}}, 299{ "movhu", 0xfefa0000, 0xffff0000, 0, FMT_D9, AM33, {RN2, MEMINC2 (RM0, IMM32_HIGH8)}},
257{ 0, 0, 0, 0, 0, 0, {0}}, 300
301{ "mov_llt", 0xf7e00000, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}},
302{ "mov_lgt", 0xf7e00001, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}},
303{ "mov_lge", 0xf7e00002, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}},
304{ "mov_lle", 0xf7e00003, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}},
305{ "mov_lcs", 0xf7e00004, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}},
306{ "mov_lhi", 0xf7e00005, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}},
307{ "mov_lcc", 0xf7e00006, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}},
308{ "mov_lls", 0xf7e00007, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}},
309{ "mov_leq", 0xf7e00008, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}},
310{ "mov_lne", 0xf7e00009, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}},
311{ "mov_lra", 0xf7e0000a, 0xffff000f, 0x22, FMT_D10, AM33, {MEMINC2 (RN4,SIMM4_2), RM6}},
312
313{ "", 0, 0, 0, 0, 0, {0}},
258}; 314};
259 315
260/* 316/*
@@ -265,18 +321,21 @@ asmlinkage void misalignment(struct pt_regs *regs, enum exception_code code)
265 const struct exception_table_entry *fixup; 321 const struct exception_table_entry *fixup;
266 const struct mn10300_opcode *pop; 322 const struct mn10300_opcode *pop;
267 unsigned long *registers = (unsigned long *) regs; 323 unsigned long *registers = (unsigned long *) regs;
268 unsigned long data, *store, *postinc; 324 unsigned long data, *store, *postinc, disp, inc, sp;
269 mm_segment_t seg; 325 mm_segment_t seg;
270 siginfo_t info; 326 siginfo_t info;
271 uint32_t opcode, disp, noc, xo, xm; 327 uint32_t opcode, noc, xo, xm;
272 uint8_t *pc, byte; 328 uint8_t *pc, byte, datasz;
273 void *address; 329 void *address;
274 unsigned tmp, npop; 330 unsigned tmp, npop, dispsz, loop;
331
332 /* we don't fix up userspace misalignment faults */
333 if (user_mode(regs))
334 goto bus_error;
275 335
276 kdebug("MISALIGN at %lx\n", regs->pc); 336 sp = (unsigned long) regs + sizeof(*regs);
277 337
278 if (in_interrupt()) 338 kdebug("==>misalignment({pc=%lx,sp=%lx})", regs->pc, sp);
279 die("Misalignment trap in interrupt context", regs, code);
280 339
281 if (regs->epsw & EPSW_IE) 340 if (regs->epsw & EPSW_IE)
282 asm volatile("or %0,epsw" : : "i"(EPSW_IE)); 341 asm volatile("or %0,epsw" : : "i"(EPSW_IE));
@@ -294,8 +353,8 @@ asmlinkage void misalignment(struct pt_regs *regs, enum exception_code code)
294 opcode = byte; 353 opcode = byte;
295 noc = 8; 354 noc = 8;
296 355
297 for (pop = mn10300_opcodes; pop->name; pop++) { 356 for (pop = mn10300_opcodes; pop->name[0]; pop++) {
298 npop = log2(pop->opcode | pop->opmask); 357 npop = ilog2(pop->opcode | pop->opmask);
299 if (npop <= 0 || npop > 31) 358 if (npop <= 0 || npop > 31)
300 continue; 359 continue;
301 npop = (npop + 8) & ~7; 360 npop = (npop + 8) & ~7;
@@ -328,15 +387,15 @@ asmlinkage void misalignment(struct pt_regs *regs, enum exception_code code)
328 } 387 }
329 388
330 /* didn't manage to find a fixup */ 389 /* didn't manage to find a fixup */
331 if (!user_mode(regs)) 390 printk(KERN_CRIT "MISALIGN: %lx: unsupported instruction %x\n",
332 printk(KERN_CRIT "MISALIGN: %lx: unsupported instruction %x\n", 391 regs->pc, opcode);
333 regs->pc, opcode);
334 392
335failed: 393failed:
336 set_fs(seg); 394 set_fs(seg);
337 if (die_if_no_fixup("misalignment error", regs, code)) 395 if (die_if_no_fixup("misalignment error", regs, code))
338 return; 396 return;
339 397
398bus_error:
340 info.si_signo = SIGBUS; 399 info.si_signo = SIGBUS;
341 info.si_errno = 0; 400 info.si_errno = 0;
342 info.si_code = BUS_ADRALN; 401 info.si_code = BUS_ADRALN;
@@ -346,31 +405,27 @@ failed:
346 405
347 /* error reading opcodes */ 406 /* error reading opcodes */
348fetch_error: 407fetch_error:
349 if (!user_mode(regs)) 408 printk(KERN_CRIT
350 printk(KERN_CRIT 409 "MISALIGN: %p: fault whilst reading instruction data\n",
351 "MISALIGN: %p: fault whilst reading instruction data\n", 410 pc);
352 pc);
353 goto failed; 411 goto failed;
354 412
355bad_addr_mode: 413bad_addr_mode:
356 if (!user_mode(regs)) 414 printk(KERN_CRIT
357 printk(KERN_CRIT 415 "MISALIGN: %lx: unsupported addressing mode %x\n",
358 "MISALIGN: %lx: unsupported addressing mode %x\n", 416 regs->pc, opcode);
359 regs->pc, opcode);
360 goto failed; 417 goto failed;
361 418
362bad_reg_mode: 419bad_reg_mode:
363 if (!user_mode(regs)) 420 printk(KERN_CRIT
364 printk(KERN_CRIT 421 "MISALIGN: %lx: unsupported register mode %x\n",
365 "MISALIGN: %lx: unsupported register mode %x\n", 422 regs->pc, opcode);
366 regs->pc, opcode);
367 goto failed; 423 goto failed;
368 424
369unsupported_instruction: 425unsupported_instruction:
370 if (!user_mode(regs)) 426 printk(KERN_CRIT
371 printk(KERN_CRIT 427 "MISALIGN: %lx: unsupported instruction %x (%s)\n",
372 "MISALIGN: %lx: unsupported instruction %x (%s)\n", 428 regs->pc, opcode, pop->name);
373 regs->pc, opcode, pop->name);
374 goto failed; 429 goto failed;
375 430
376transfer_failed: 431transfer_failed:
@@ -391,7 +446,7 @@ transfer_failed:
391 446
392 /* we matched the opcode */ 447 /* we matched the opcode */
393found_opcode: 448found_opcode:
394 kdebug("MISALIGN: %lx: %x==%x { %x, %x }\n", 449 kdebug("%lx: %x==%x { %x, %x }",
395 regs->pc, opcode, pop->opcode, pop->params[0], pop->params[1]); 450 regs->pc, opcode, pop->opcode, pop->params[0], pop->params[1]);
396 451
397 tmp = format_tbl[pop->format].opsz; 452 tmp = format_tbl[pop->format].opsz;
@@ -406,106 +461,108 @@ found_opcode:
406 461
407 /* grab the extra displacement (note it's LSB first) */ 462 /* grab the extra displacement (note it's LSB first) */
408 disp = 0; 463 disp = 0;
409 tmp = format_tbl[pop->format].dispsz >> 3; 464 dispsz = format_tbl[pop->format].dispsz;
410 while (tmp > 0) { 465 for (loop = 0; loop < dispsz; loop += 8) {
411 tmp--;
412 disp <<= 8;
413
414 pc++; 466 pc++;
415 if (__get_user(byte, pc) != 0) 467 if (__get_user(byte, pc) != 0)
416 goto fetch_error; 468 goto fetch_error;
417 disp |= byte; 469 disp |= byte << loop;
470 kdebug("{%p} disp[%02x]=%02x", pc, loop, byte);
418 } 471 }
419 472
473 kdebug("disp=%lx", disp);
474
420 set_fs(KERNEL_XDS); 475 set_fs(KERNEL_XDS);
421 if (fixup || regs->epsw & EPSW_nSL) 476 if (fixup)
422 set_fs(seg); 477 set_fs(seg);
423 478
424 tmp = (pop->params[0] ^ pop->params[1]) & 0x80000000; 479 tmp = (pop->params[0] ^ pop->params[1]) & 0x80000000;
425 if (!tmp) { 480 if (!tmp) {
426 if (!user_mode(regs)) 481 printk(KERN_CRIT
427 printk(KERN_CRIT 482 "MISALIGN: %lx: insn not move to/from memory %x\n",
428 "MISALIGN: %lx:" 483 regs->pc, opcode);
429 " insn not move to/from memory %x\n",
430 regs->pc, opcode);
431 goto failed; 484 goto failed;
432 } 485 }
433 486
487 /* determine the data transfer size of the move */
488 if (pop->name[3] == 0 || /* "mov" */
489 pop->name[4] == 'l') /* mov_lcc */
490 inc = datasz = 4;
491 else if (pop->name[3] == 'h') /* movhu */
492 inc = datasz = 2;
493 else
494 goto unsupported_instruction;
495
434 if (pop->params[0] & 0x80000000) { 496 if (pop->params[0] & 0x80000000) {
435 /* move memory to register */ 497 /* move memory to register */
436 if (!misalignment_addr(registers, pop->params[0], opcode, disp, 498 if (!misalignment_addr(registers, sp,
437 &address, &postinc)) 499 pop->params[0], opcode, disp,
500 &address, &postinc, &inc))
438 goto bad_addr_mode; 501 goto bad_addr_mode;
439 502
440 if (!misalignment_reg(registers, pop->params[1], opcode, disp, 503 if (!misalignment_reg(registers, pop->params[1], opcode, disp,
441 &store)) 504 &store))
442 goto bad_reg_mode; 505 goto bad_reg_mode;
443 506
444 if (strcmp(pop->name, "mov") == 0) { 507 kdebug("mov%u (%p),DARn", datasz, address);
445 kdebug("FIXUP: mov (%p),DARn\n", address); 508 if (copy_from_user(&data, (void *) address, datasz) != 0)
446 if (copy_from_user(&data, (void *) address, 4) != 0) 509 goto transfer_failed;
447 goto transfer_failed; 510 if (pop->params[0] & 0x1000000) {
448 if (pop->params[0] & 0x1000000) 511 kdebug("inc=%lx", inc);
449 *postinc += 4; 512 *postinc += inc;
450 } else if (strcmp(pop->name, "movhu") == 0) {
451 kdebug("FIXUP: movhu (%p),DARn\n", address);
452 data = 0;
453 if (copy_from_user(&data, (void *) address, 2) != 0)
454 goto transfer_failed;
455 if (pop->params[0] & 0x1000000)
456 *postinc += 2;
457 } else {
458 goto unsupported_instruction;
459 } 513 }
460 514
461 *store = data; 515 *store = data;
516 kdebug("loaded %lx", data);
462 } else { 517 } else {
463 /* move register to memory */ 518 /* move register to memory */
464 if (!misalignment_reg(registers, pop->params[0], opcode, disp, 519 if (!misalignment_reg(registers, pop->params[0], opcode, disp,
465 &store)) 520 &store))
466 goto bad_reg_mode; 521 goto bad_reg_mode;
467 522
468 if (!misalignment_addr(registers, pop->params[1], opcode, disp, 523 if (!misalignment_addr(registers, sp,
469 &address, &postinc)) 524 pop->params[1], opcode, disp,
525 &address, &postinc, &inc))
470 goto bad_addr_mode; 526 goto bad_addr_mode;
471 527
472 data = *store; 528 data = *store;
473 529
474 if (strcmp(pop->name, "mov") == 0) { 530 kdebug("mov%u %lx,(%p)", datasz, data, address);
475 kdebug("FIXUP: mov %lx,(%p)\n", data, address); 531 if (copy_to_user((void *) address, &data, datasz) != 0)
476 if (copy_to_user((void *) address, &data, 4) != 0) 532 goto transfer_failed;
477 goto transfer_failed; 533 if (pop->params[1] & 0x1000000)
478 if (pop->params[1] & 0x1000000) 534 *postinc += inc;
479 *postinc += 4;
480 } else if (strcmp(pop->name, "movhu") == 0) {
481 kdebug("FIXUP: movhu %hx,(%p)\n",
482 (uint16_t) data, address);
483 if (copy_to_user((void *) address, &data, 2) != 0)
484 goto transfer_failed;
485 if (pop->params[1] & 0x1000000)
486 *postinc += 2;
487 } else {
488 goto unsupported_instruction;
489 }
490 } 535 }
491 536
492 tmp = format_tbl[pop->format].opsz + format_tbl[pop->format].dispsz; 537 tmp = format_tbl[pop->format].opsz + format_tbl[pop->format].dispsz;
493 regs->pc += tmp >> 3; 538 regs->pc += tmp >> 3;
494 539
540 /* handle MOV_Lcc, which are currently the only FMT_D10 insns that
541 * access memory */
542 if (pop->format == FMT_D10)
543 misalignment_MOV_Lcc(regs, opcode);
544
495 set_fs(seg); 545 set_fs(seg);
496 return;
497} 546}
498 547
499/* 548/*
500 * determine the address that was being accessed 549 * determine the address that was being accessed
501 */ 550 */
502static int misalignment_addr(unsigned long *registers, unsigned params, 551static int misalignment_addr(unsigned long *registers, unsigned long sp,
503 unsigned opcode, unsigned disp, 552 unsigned params, unsigned opcode,
504 void **_address, unsigned long **_postinc) 553 unsigned long disp,
554 void **_address, unsigned long **_postinc,
555 unsigned long *_inc)
505{ 556{
506 unsigned long *postinc = NULL, address = 0, tmp; 557 unsigned long *postinc = NULL, address = 0, tmp;
507 558
508 params &= 0x7fffffff; 559 if (!(params & 0x1000000)) {
560 kdebug("noinc");
561 *_inc = 0;
562 _inc = NULL;
563 }
564
565 params &= 0x00ffffff;
509 566
510 do { 567 do {
511 switch (params & 0xff) { 568 switch (params & 0xff) {
@@ -514,11 +571,11 @@ static int misalignment_addr(unsigned long *registers, unsigned params,
514 address += *postinc; 571 address += *postinc;
515 break; 572 break;
516 case DM1: 573 case DM1:
517 postinc = &registers[Dreg_index[opcode >> 2 & 0x0c]]; 574 postinc = &registers[Dreg_index[opcode >> 2 & 0x03]];
518 address += *postinc; 575 address += *postinc;
519 break; 576 break;
520 case DM2: 577 case DM2:
521 postinc = &registers[Dreg_index[opcode >> 4 & 0x30]]; 578 postinc = &registers[Dreg_index[opcode >> 4 & 0x03]];
522 address += *postinc; 579 address += *postinc;
523 break; 580 break;
524 case AM0: 581 case AM0:
@@ -526,11 +583,11 @@ static int misalignment_addr(unsigned long *registers, unsigned params,
526 address += *postinc; 583 address += *postinc;
527 break; 584 break;
528 case AM1: 585 case AM1:
529 postinc = &registers[Areg_index[opcode >> 2 & 0x0c]]; 586 postinc = &registers[Areg_index[opcode >> 2 & 0x03]];
530 address += *postinc; 587 address += *postinc;
531 break; 588 break;
532 case AM2: 589 case AM2:
533 postinc = &registers[Areg_index[opcode >> 4 & 0x30]]; 590 postinc = &registers[Areg_index[opcode >> 4 & 0x03]];
534 address += *postinc; 591 address += *postinc;
535 break; 592 break;
536 case RM0: 593 case RM0:
@@ -561,33 +618,53 @@ static int misalignment_addr(unsigned long *registers, unsigned params,
561 postinc = &registers[Rreg_index[disp >> 4 & 0x0f]]; 618 postinc = &registers[Rreg_index[disp >> 4 & 0x0f]];
562 address += *postinc; 619 address += *postinc;
563 break; 620 break;
621 case SP:
622 address += sp;
623 break;
564 624
625 /* displacements are either to be added to the address
626 * before use, or, in the case of post-inc addressing,
627 * to be added into the base register after use */
565 case SD8: 628 case SD8:
566 case SIMM8: 629 case SIMM8:
567 address += (int32_t) (int8_t) (disp & 0xff); 630 disp = (long) (int8_t) (disp & 0xff);
568 break; 631 goto displace_or_inc;
569 case SD16: 632 case SD16:
570 address += (int32_t) (int16_t) (disp & 0xffff); 633 disp = (long) (int16_t) (disp & 0xffff);
571 break; 634 goto displace_or_inc;
572 case SD24: 635 case SD24:
573 tmp = disp << 8; 636 tmp = disp << 8;
574 asm("asr 8,%0" : "=r"(tmp) : "0"(tmp)); 637 asm("asr 8,%0" : "=r"(tmp) : "0"(tmp));
575 address += tmp; 638 disp = (long) tmp;
576 break; 639 goto displace_or_inc;
577 case SIMM4_2: 640 case SIMM4_2:
578 tmp = opcode >> 4 & 0x0f; 641 tmp = opcode >> 4 & 0x0f;
579 tmp <<= 28; 642 tmp <<= 28;
580 asm("asr 28,%0" : "=r"(tmp) : "0"(tmp)); 643 asm("asr 28,%0" : "=r"(tmp) : "0"(tmp));
581 address += tmp; 644 disp = (long) tmp;
582 break; 645 goto displace_or_inc;
646 case IMM8:
647 disp &= 0x000000ff;
648 goto displace_or_inc;
649 case IMM16:
650 disp &= 0x0000ffff;
651 goto displace_or_inc;
583 case IMM24: 652 case IMM24:
584 address += disp & 0x00ffffff; 653 disp &= 0x00ffffff;
585 break; 654 goto displace_or_inc;
586 case IMM32: 655 case IMM32:
656 case IMM32_MEM:
587 case IMM32_HIGH8: 657 case IMM32_HIGH8:
588 address += disp; 658 case IMM32_HIGH8_MEM:
659 displace_or_inc:
660 kdebug("%s %lx", _inc ? "incr" : "disp", disp);
661 if (!_inc)
662 address += disp;
663 else
664 *_inc = disp;
589 break; 665 break;
590 default: 666 default:
667 BUG();
591 return 0; 668 return 0;
592 } 669 }
593 } while ((params >>= 8)); 670 } while ((params >>= 8));
@@ -601,7 +678,7 @@ static int misalignment_addr(unsigned long *registers, unsigned params,
601 * determine the register that is acting as source/dest 678 * determine the register that is acting as source/dest
602 */ 679 */
603static int misalignment_reg(unsigned long *registers, unsigned params, 680static int misalignment_reg(unsigned long *registers, unsigned params,
604 unsigned opcode, unsigned disp, 681 unsigned opcode, unsigned long disp,
605 unsigned long **_register) 682 unsigned long **_register)
606{ 683{
607 params &= 0x7fffffff; 684 params &= 0x7fffffff;
@@ -654,8 +731,239 @@ static int misalignment_reg(unsigned long *registers, unsigned params,
654 break; 731 break;
655 732
656 default: 733 default:
734 BUG();
657 return 0; 735 return 0;
658 } 736 }
659 737
660 return 1; 738 return 1;
661} 739}
740
741/*
742 * handle the conditional loop part of the move-and-loop instructions
743 */
744static void misalignment_MOV_Lcc(struct pt_regs *regs, uint32_t opcode)
745{
746 unsigned long epsw = regs->epsw;
747 unsigned long NxorV;
748
749 kdebug("MOV_Lcc %x [flags=%lx]", opcode, epsw & 0xf);
750
751 /* calculate N^V and shift onto the same bit position as Z */
752 NxorV = ((epsw >> 3) ^ epsw >> 1) & 1;
753
754 switch (opcode & 0xf) {
755 case 0x0: /* MOV_LLT: N^V */
756 if (NxorV)
757 goto take_the_loop;
758 return;
759 case 0x1: /* MOV_LGT: ~(Z or (N^V))*/
760 if (!((epsw & EPSW_FLAG_Z) | NxorV))
761 goto take_the_loop;
762 return;
763 case 0x2: /* MOV_LGE: ~(N^V) */
764 if (!NxorV)
765 goto take_the_loop;
766 return;
767 case 0x3: /* MOV_LLE: Z or (N^V) */
768 if ((epsw & EPSW_FLAG_Z) | NxorV)
769 goto take_the_loop;
770 return;
771
772 case 0x4: /* MOV_LCS: C */
773 if (epsw & EPSW_FLAG_C)
774 goto take_the_loop;
775 return;
776 case 0x5: /* MOV_LHI: ~(C or Z) */
777 if (!(epsw & (EPSW_FLAG_C | EPSW_FLAG_Z)))
778 goto take_the_loop;
779 return;
780 case 0x6: /* MOV_LCC: ~C */
781 if (!(epsw & EPSW_FLAG_C))
782 goto take_the_loop;
783 return;
784 case 0x7: /* MOV_LLS: C or Z */
785 if (epsw & (EPSW_FLAG_C | EPSW_FLAG_Z))
786 goto take_the_loop;
787 return;
788
789 case 0x8: /* MOV_LEQ: Z */
790 if (epsw & EPSW_FLAG_Z)
791 goto take_the_loop;
792 return;
793 case 0x9: /* MOV_LNE: ~Z */
794 if (!(epsw & EPSW_FLAG_Z))
795 goto take_the_loop;
796 return;
797 case 0xa: /* MOV_LRA: always */
798 goto take_the_loop;
799
800 default:
801 BUG();
802 }
803
804take_the_loop:
805 /* wind the PC back to just after the SETLB insn */
806 kdebug("loop LAR=%lx", regs->lar);
807 regs->pc = regs->lar - 4;
808}
809
810/*
811 * misalignment handler tests
812 */
813#ifdef CONFIG_TEST_MISALIGNMENT_HANDLER
814static u8 __initdata testbuf[512] __attribute__((aligned(16))) = {
815 [257] = 0x11,
816 [258] = 0x22,
817 [259] = 0x33,
818 [260] = 0x44,
819};
820
821#define ASSERTCMP(X, OP, Y) \
822do { \
823 if (unlikely(!((X) OP (Y)))) { \
824 printk(KERN_ERR "\n"); \
825 printk(KERN_ERR "MISALIGN: Assertion failed at line %u\n", \
826 __LINE__); \
827 printk(KERN_ERR "0x%lx " #OP " 0x%lx is false\n", \
828 (unsigned long)(X), (unsigned long)(Y)); \
829 BUG(); \
830 } \
831} while(0)
832
833static int __init test_misalignment(void)
834{
835 register void *r asm("e0");
836 register u32 y asm("e1");
837 void *p = testbuf, *q;
838 u32 tmp, tmp2, x;
839
840 printk(KERN_NOTICE "==>test_misalignment() [testbuf=%p]\n", p);
841 p++;
842
843 printk(KERN_NOTICE "___ MOV (Am),Dn ___\n");
844 q = p + 256;
845 asm volatile("mov (%0),%1" : "+a"(q), "=d"(x));
846 ASSERTCMP(q, ==, p + 256);
847 ASSERTCMP(x, ==, 0x44332211);
848
849 printk(KERN_NOTICE "___ MOV (256,Am),Dn ___\n");
850 q = p;
851 asm volatile("mov (256,%0),%1" : "+a"(q), "=d"(x));
852 ASSERTCMP(q, ==, p);
853 ASSERTCMP(x, ==, 0x44332211);
854
855 printk(KERN_NOTICE "___ MOV (Di,Am),Dn ___\n");
856 tmp = 256;
857 q = p;
858 asm volatile("mov (%2,%0),%1" : "+a"(q), "=d"(x), "+d"(tmp));
859 ASSERTCMP(q, ==, p);
860 ASSERTCMP(x, ==, 0x44332211);
861 ASSERTCMP(tmp, ==, 256);
862
863 printk(KERN_NOTICE "___ MOV (256,Rm),Rn ___\n");
864 r = p;
865 asm volatile("mov (256,%0),%1" : "+r"(r), "=r"(y));
866 ASSERTCMP(r, ==, p);
867 ASSERTCMP(y, ==, 0x44332211);
868
869 printk(KERN_NOTICE "___ MOV (Rm+),Rn ___\n");
870 r = p + 256;
871 asm volatile("mov (%0+),%1" : "+r"(r), "=r"(y));
872 ASSERTCMP(r, ==, p + 256 + 4);
873 ASSERTCMP(y, ==, 0x44332211);
874
875 printk(KERN_NOTICE "___ MOV (Rm+,8),Rn ___\n");
876 r = p + 256;
877 asm volatile("mov (%0+,8),%1" : "+r"(r), "=r"(y));
878 ASSERTCMP(r, ==, p + 256 + 8);
879 ASSERTCMP(y, ==, 0x44332211);
880
881 printk(KERN_NOTICE "___ MOV (7,SP),Rn ___\n");
882 asm volatile(
883 "add -16,sp \n"
884 "mov +0x11,%0 \n"
885 "movbu %0,(7,sp) \n"
886 "mov +0x22,%0 \n"
887 "movbu %0,(8,sp) \n"
888 "mov +0x33,%0 \n"
889 "movbu %0,(9,sp) \n"
890 "mov +0x44,%0 \n"
891 "movbu %0,(10,sp) \n"
892 "mov (7,sp),%1 \n"
893 "add +16,sp \n"
894 : "+a"(q), "=d"(x));
895 ASSERTCMP(x, ==, 0x44332211);
896
897 printk(KERN_NOTICE "___ MOV (259,SP),Rn ___\n");
898 asm volatile(
899 "add -264,sp \n"
900 "mov +0x11,%0 \n"
901 "movbu %0,(259,sp) \n"
902 "mov +0x22,%0 \n"
903 "movbu %0,(260,sp) \n"
904 "mov +0x33,%0 \n"
905 "movbu %0,(261,sp) \n"
906 "mov +0x55,%0 \n"
907 "movbu %0,(262,sp) \n"
908 "mov (259,sp),%1 \n"
909 "add +264,sp \n"
910 : "+d"(tmp), "=d"(x));
911 ASSERTCMP(x, ==, 0x55332211);
912
913 printk(KERN_NOTICE "___ MOV (260,SP),Rn ___\n");
914 asm volatile(
915 "add -264,sp \n"
916 "mov +0x11,%0 \n"
917 "movbu %0,(260,sp) \n"
918 "mov +0x22,%0 \n"
919 "movbu %0,(261,sp) \n"
920 "mov +0x33,%0 \n"
921 "movbu %0,(262,sp) \n"
922 "mov +0x55,%0 \n"
923 "movbu %0,(263,sp) \n"
924 "mov (260,sp),%1 \n"
925 "add +264,sp \n"
926 : "+d"(tmp), "=d"(x));
927 ASSERTCMP(x, ==, 0x55332211);
928
929
930 printk(KERN_NOTICE "___ MOV_LNE ___\n");
931 tmp = 1;
932 tmp2 = 2;
933 q = p + 256;
934 asm volatile(
935 "setlb \n"
936 "mov %2,%3 \n"
937 "mov %1,%2 \n"
938 "cmp +0,%1 \n"
939 "mov_lne (%0+,4),%1"
940 : "+r"(q), "+d"(tmp), "+d"(tmp2), "=d"(x)
941 :
942 : "cc");
943 ASSERTCMP(q, ==, p + 256 + 12);
944 ASSERTCMP(x, ==, 0x44332211);
945
946 printk(KERN_NOTICE "___ MOV in SETLB ___\n");
947 tmp = 1;
948 tmp2 = 2;
949 q = p + 256;
950 asm volatile(
951 "setlb \n"
952 "mov %1,%3 \n"
953 "mov (%0+),%1 \n"
954 "cmp +0,%1 \n"
955 "lne "
956 : "+a"(q), "+d"(tmp), "+d"(tmp2), "=d"(x)
957 :
958 : "cc");
959
960 ASSERTCMP(q, ==, p + 256 + 8);
961 ASSERTCMP(x, ==, 0x44332211);
962
963 printk(KERN_NOTICE "<==test_misalignment()\n");
964 return 0;
965}
966
967arch_initcall(test_misalignment);
968
969#endif /* CONFIG_TEST_MISALIGNMENT_HANDLER */
diff --git a/arch/parisc/include/asm/smp.h b/arch/parisc/include/asm/smp.h
index 398cdbaf4e54..409e698f4361 100644
--- a/arch/parisc/include/asm/smp.h
+++ b/arch/parisc/include/asm/smp.h
@@ -44,8 +44,6 @@ extern void arch_send_call_function_ipi(cpumask_t mask);
44 44
45#define PROC_CHANGE_PENALTY 15 /* Schedule penalty */ 45#define PROC_CHANGE_PENALTY 15 /* Schedule penalty */
46 46
47extern unsigned long cpu_present_mask;
48
49#define raw_smp_processor_id() (current_thread_info()->cpu) 47#define raw_smp_processor_id() (current_thread_info()->cpu)
50 48
51#else /* CONFIG_SMP */ 49#else /* CONFIG_SMP */
diff --git a/arch/powerpc/boot/dts/gef_sbc610.dts b/arch/powerpc/boot/dts/gef_sbc610.dts
index 6ed608322ddc..e48cfa740c8a 100644
--- a/arch/powerpc/boot/dts/gef_sbc610.dts
+++ b/arch/powerpc/boot/dts/gef_sbc610.dts
@@ -108,7 +108,7 @@
108 compatible = "simple-bus"; 108 compatible = "simple-bus";
109 ranges = <0x0 0xfef00000 0x00100000>; 109 ranges = <0x0 0xfef00000 0x00100000>;
110 reg = <0xfef00000 0x100000>; // CCSRBAR 1M 110 reg = <0xfef00000 0x100000>; // CCSRBAR 1M
111 bus-frequency = <0>; 111 bus-frequency = <33333333>;
112 112
113 i2c1: i2c@3000 { 113 i2c1: i2c@3000 {
114 #address-cells = <1>; 114 #address-cells = <1>;
diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig
index 0b1fa20f745c..cbecaf3d7906 100644
--- a/arch/powerpc/configs/83xx/asp8347_defconfig
+++ b/arch/powerpc/configs/83xx/asp8347_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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:01 2008 4# Sat Nov 8 12:39:49 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
23# CONFIG_SMP is not set 23# CONFIG_SMP is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -54,8 +54,6 @@ CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
55# CONFIG_DEFAULT_UIMAGE is not set 55# CONFIG_DEFAULT_UIMAGE is not set
56CONFIG_REDBOOT=y 56CONFIG_REDBOOT=y
57CONFIG_HIBERNATE_32=y
58CONFIG_ARCH_HIBERNATION_POSSIBLE=y
59CONFIG_ARCH_SUSPEND_POSSIBLE=y 57CONFIG_ARCH_SUSPEND_POSSIBLE=y
60# CONFIG_PPC_DCR_NATIVE is not set 58# CONFIG_PPC_DCR_NATIVE is not set
61# CONFIG_PPC_DCR_MMIO is not set 59# CONFIG_PPC_DCR_MMIO is not set
@@ -99,7 +97,6 @@ CONFIG_HOTPLUG=y
99CONFIG_PRINTK=y 97CONFIG_PRINTK=y
100CONFIG_BUG=y 98CONFIG_BUG=y
101CONFIG_ELF_CORE=y 99CONFIG_ELF_CORE=y
102CONFIG_PCSPKR_PLATFORM=y
103CONFIG_COMPAT_BRK=y 100CONFIG_COMPAT_BRK=y
104CONFIG_BASE_FULL=y 101CONFIG_BASE_FULL=y
105CONFIG_FUTEX=y 102CONFIG_FUTEX=y
@@ -109,7 +106,9 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 106CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 108CONFIG_SHMEM=y
109CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y
113CONFIG_SLUB_DEBUG=y 112CONFIG_SLUB_DEBUG=y
114# CONFIG_SLAB is not set 113# CONFIG_SLAB is not set
115CONFIG_SLUB=y 114CONFIG_SLUB=y
@@ -122,10 +121,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
122CONFIG_HAVE_KPROBES=y 121CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y 122CONFIG_HAVE_KRETPROBES=y
124CONFIG_HAVE_ARCH_TRACEHOOK=y 123CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_DMA_ATTRS is not set
126# CONFIG_USE_GENERIC_SMP_HELPERS is not set
127# CONFIG_HAVE_CLK is not set
128CONFIG_PROC_PAGE_MONITOR=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
@@ -158,6 +153,7 @@ CONFIG_DEFAULT_AS=y
158# CONFIG_DEFAULT_NOOP is not set 153# CONFIG_DEFAULT_NOOP is not set
159CONFIG_DEFAULT_IOSCHED="anticipatory" 154CONFIG_DEFAULT_IOSCHED="anticipatory"
160CONFIG_CLASSIC_RCU=y 155CONFIG_CLASSIC_RCU=y
156# CONFIG_FREEZER is not set
161 157
162# 158#
163# Platform support 159# Platform support
@@ -165,10 +161,10 @@ CONFIG_CLASSIC_RCU=y
165CONFIG_PPC_MULTIPLATFORM=y 161CONFIG_PPC_MULTIPLATFORM=y
166CONFIG_CLASSIC32=y 162CONFIG_CLASSIC32=y
167# CONFIG_PPC_CHRP is not set 163# CONFIG_PPC_CHRP is not set
168# CONFIG_PPC_PMAC is not set
169# CONFIG_MPC5121_ADS is not set 164# CONFIG_MPC5121_ADS is not set
170# CONFIG_MPC5121_GENERIC is not set 165# CONFIG_MPC5121_GENERIC is not set
171# CONFIG_PPC_MPC52xx is not set 166# CONFIG_PPC_MPC52xx is not set
167# CONFIG_PPC_PMAC is not set
172# CONFIG_PPC_CELL is not set 168# CONFIG_PPC_CELL is not set
173# CONFIG_PPC_CELL_NATIVE is not set 169# CONFIG_PPC_CELL_NATIVE is not set
174# CONFIG_PPC_82xx is not set 170# CONFIG_PPC_82xx is not set
@@ -188,24 +184,21 @@ CONFIG_ASP834x=y
188CONFIG_PPC_MPC834x=y 184CONFIG_PPC_MPC834x=y
189# CONFIG_PPC_86xx is not set 185# CONFIG_PPC_86xx is not set
190# CONFIG_EMBEDDED6xx is not set 186# CONFIG_EMBEDDED6xx is not set
191CONFIG_PPC_NATIVE=y
192# CONFIG_UDBG_RTAS_CONSOLE is not set
193CONFIG_IPIC=y 187CONFIG_IPIC=y
194CONFIG_MPIC=y 188# CONFIG_MPIC is not set
195# CONFIG_MPIC_WEIRD is not set 189# CONFIG_MPIC_WEIRD is not set
196CONFIG_PPC_I8259=y 190# CONFIG_PPC_I8259 is not set
197CONFIG_PPC_RTAS=y 191# CONFIG_PPC_RTAS is not set
198# CONFIG_RTAS_ERROR_LOGGING is not set
199CONFIG_RTAS_PROC=y
200# CONFIG_MMIO_NVRAM is not set 192# CONFIG_MMIO_NVRAM is not set
201CONFIG_PPC_MPC106=y 193# CONFIG_PPC_MPC106 is not set
202# CONFIG_PPC_970_NAP is not set 194# CONFIG_PPC_970_NAP is not set
203# CONFIG_PPC_INDIRECT_IO is not set 195# CONFIG_PPC_INDIRECT_IO is not set
204# CONFIG_GENERIC_IOMAP is not set 196# CONFIG_GENERIC_IOMAP is not set
205# CONFIG_CPU_FREQ is not set 197# CONFIG_CPU_FREQ is not set
206# CONFIG_PPC601_SYNC_FIX is not set
207# CONFIG_TAU is not set 198# CONFIG_TAU is not set
199# CONFIG_QUICC_ENGINE is not set
208# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
201# CONFIG_MPC8xxx_GPIO is not set
209 202
210# 203#
211# Kernel options 204# Kernel options
@@ -225,6 +218,8 @@ CONFIG_PREEMPT_NONE=y
225# CONFIG_PREEMPT_VOLUNTARY is not set 218# CONFIG_PREEMPT_VOLUNTARY is not set
226# CONFIG_PREEMPT is not set 219# CONFIG_PREEMPT is not set
227CONFIG_BINFMT_ELF=y 220CONFIG_BINFMT_ELF=y
221# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
222# CONFIG_HAVE_AOUT is not set
228# CONFIG_BINFMT_MISC is not set 223# CONFIG_BINFMT_MISC is not set
229# CONFIG_IOMMU_HELPER is not set 224# CONFIG_IOMMU_HELPER is not set
230CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 225CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -239,15 +234,15 @@ CONFIG_FLATMEM_MANUAL=y
239# CONFIG_SPARSEMEM_MANUAL is not set 234# CONFIG_SPARSEMEM_MANUAL is not set
240CONFIG_FLATMEM=y 235CONFIG_FLATMEM=y
241CONFIG_FLAT_NODE_MEM_MAP=y 236CONFIG_FLAT_NODE_MEM_MAP=y
242# CONFIG_SPARSEMEM_STATIC is not set
243# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
244CONFIG_PAGEFLAGS_EXTENDED=y 237CONFIG_PAGEFLAGS_EXTENDED=y
245CONFIG_SPLIT_PTLOCK_CPUS=4 238CONFIG_SPLIT_PTLOCK_CPUS=4
246CONFIG_MIGRATION=y 239CONFIG_MIGRATION=y
247# CONFIG_RESOURCES_64BIT is not set 240# CONFIG_RESOURCES_64BIT is not set
241# CONFIG_PHYS_ADDR_T_64BIT is not set
248CONFIG_ZONE_DMA_FLAG=1 242CONFIG_ZONE_DMA_FLAG=1
249CONFIG_BOUNCE=y 243CONFIG_BOUNCE=y
250CONFIG_VIRT_TO_BUS=y 244CONFIG_VIRT_TO_BUS=y
245CONFIG_UNEVICTABLE_LRU=y
251CONFIG_FORCE_MAX_ZONEORDER=11 246CONFIG_FORCE_MAX_ZONEORDER=11
252CONFIG_PROC_DEVICETREE=y 247CONFIG_PROC_DEVICETREE=y
253# CONFIG_CMDLINE_BOOL is not set 248# CONFIG_CMDLINE_BOOL is not set
@@ -259,7 +254,6 @@ CONFIG_ISA_DMA_API=y
259# 254#
260# Bus options 255# Bus options
261# 256#
262# CONFIG_ISA is not set
263CONFIG_ZONE_DMA=y 257CONFIG_ZONE_DMA=y
264CONFIG_GENERIC_ISA_DMA=y 258CONFIG_GENERIC_ISA_DMA=y
265CONFIG_PPC_INDIRECT_PCI=y 259CONFIG_PPC_INDIRECT_PCI=y
@@ -272,7 +266,7 @@ CONFIG_PCI_SYSCALL=y
272# CONFIG_PCIEPORTBUS is not set 266# CONFIG_PCIEPORTBUS is not set
273CONFIG_ARCH_SUPPORTS_MSI=y 267CONFIG_ARCH_SUPPORTS_MSI=y
274# CONFIG_PCI_MSI is not set 268# CONFIG_PCI_MSI is not set
275CONFIG_PCI_LEGACY=y 269# CONFIG_PCI_LEGACY is not set
276# CONFIG_PCCARD is not set 270# CONFIG_PCCARD is not set
277# CONFIG_HOTPLUG_PCI is not set 271# CONFIG_HOTPLUG_PCI is not set
278# CONFIG_HAS_RAPIDIO is not set 272# CONFIG_HAS_RAPIDIO is not set
@@ -340,6 +334,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
340# CONFIG_TIPC is not set 334# CONFIG_TIPC is not set
341# CONFIG_ATM is not set 335# CONFIG_ATM is not set
342# CONFIG_BRIDGE is not set 336# CONFIG_BRIDGE is not set
337# CONFIG_NET_DSA is not set
343# CONFIG_VLAN_8021Q is not set 338# CONFIG_VLAN_8021Q is not set
344# CONFIG_DECNET is not set 339# CONFIG_DECNET is not set
345# CONFIG_LLC2 is not set 340# CONFIG_LLC2 is not set
@@ -360,11 +355,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
360# CONFIG_IRDA is not set 355# CONFIG_IRDA is not set
361# CONFIG_BT is not set 356# CONFIG_BT is not set
362# CONFIG_AF_RXRPC is not set 357# CONFIG_AF_RXRPC is not set
363 358# CONFIG_PHONET is not set
364# 359CONFIG_WIRELESS=y
365# Wireless
366#
367# CONFIG_CFG80211 is not set 360# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y
368# CONFIG_WIRELESS_EXT is not set 362# CONFIG_WIRELESS_EXT is not set
369# CONFIG_MAC80211 is not set 363# CONFIG_MAC80211 is not set
370# CONFIG_IEEE80211 is not set 364# CONFIG_IEEE80211 is not set
@@ -470,7 +464,6 @@ CONFIG_OF_I2C=y
470# CONFIG_PARPORT is not set 464# CONFIG_PARPORT is not set
471CONFIG_BLK_DEV=y 465CONFIG_BLK_DEV=y
472# CONFIG_BLK_DEV_FD is not set 466# CONFIG_BLK_DEV_FD is not set
473# CONFIG_MAC_FLOPPY is not set
474# CONFIG_BLK_CPQ_DA is not set 467# CONFIG_BLK_CPQ_DA is not set
475# CONFIG_BLK_CPQ_CISS_DA is not set 468# CONFIG_BLK_CPQ_CISS_DA is not set
476# CONFIG_BLK_DEV_DAC960 is not set 469# CONFIG_BLK_DEV_DAC960 is not set
@@ -547,8 +540,6 @@ CONFIG_PHYLIB=y
547# CONFIG_MDIO_BITBANG is not set 540# CONFIG_MDIO_BITBANG is not set
548CONFIG_NET_ETHERNET=y 541CONFIG_NET_ETHERNET=y
549CONFIG_MII=y 542CONFIG_MII=y
550# CONFIG_MACE is not set
551# CONFIG_BMAC is not set
552# CONFIG_HAPPYMEAL is not set 543# CONFIG_HAPPYMEAL is not set
553# CONFIG_SUNGEM is not set 544# CONFIG_SUNGEM is not set
554# CONFIG_CASSINI is not set 545# CONFIG_CASSINI is not set
@@ -559,8 +550,12 @@ CONFIG_MII=y
559# CONFIG_IBM_NEW_EMAC_RGMII is not set 550# CONFIG_IBM_NEW_EMAC_RGMII is not set
560# CONFIG_IBM_NEW_EMAC_TAH is not set 551# CONFIG_IBM_NEW_EMAC_TAH is not set
561# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 552# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
553# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
554# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
555# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
562# CONFIG_NET_PCI is not set 556# CONFIG_NET_PCI is not set
563# CONFIG_B44 is not set 557# CONFIG_B44 is not set
558# CONFIG_ATL2 is not set
564CONFIG_NETDEV_1000=y 559CONFIG_NETDEV_1000=y
565# CONFIG_ACENIC is not set 560# CONFIG_ACENIC is not set
566# CONFIG_DL2K is not set 561# CONFIG_DL2K is not set
@@ -583,6 +578,7 @@ CONFIG_GIANFAR=y
583# CONFIG_QLA3XXX is not set 578# CONFIG_QLA3XXX is not set
584# CONFIG_ATL1 is not set 579# CONFIG_ATL1 is not set
585# CONFIG_ATL1E is not set 580# CONFIG_ATL1E is not set
581# CONFIG_JME is not set
586# CONFIG_NETDEV_10000 is not set 582# CONFIG_NETDEV_10000 is not set
587# CONFIG_TR is not set 583# CONFIG_TR is not set
588 584
@@ -667,14 +663,11 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
667# CONFIG_SERIAL_UARTLITE is not set 663# CONFIG_SERIAL_UARTLITE is not set
668CONFIG_SERIAL_CORE=y 664CONFIG_SERIAL_CORE=y
669CONFIG_SERIAL_CORE_CONSOLE=y 665CONFIG_SERIAL_CORE_CONSOLE=y
670# CONFIG_SERIAL_PMACZILOG is not set
671# CONFIG_SERIAL_JSM is not set 666# CONFIG_SERIAL_JSM is not set
672# CONFIG_SERIAL_OF_PLATFORM is not set 667# CONFIG_SERIAL_OF_PLATFORM is not set
673CONFIG_UNIX98_PTYS=y 668CONFIG_UNIX98_PTYS=y
674CONFIG_LEGACY_PTYS=y 669CONFIG_LEGACY_PTYS=y
675CONFIG_LEGACY_PTY_COUNT=256 670CONFIG_LEGACY_PTY_COUNT=256
676# CONFIG_BRIQ_PANEL is not set
677# CONFIG_HVC_RTAS is not set
678# CONFIG_IPMI_HANDLER is not set 671# CONFIG_IPMI_HANDLER is not set
679# CONFIG_HW_RANDOM is not set 672# CONFIG_HW_RANDOM is not set
680# CONFIG_NVRAM is not set 673# CONFIG_NVRAM is not set
@@ -711,12 +704,6 @@ CONFIG_I2C_HELPER_AUTO=y
711# CONFIG_I2C_VIAPRO is not set 704# CONFIG_I2C_VIAPRO is not set
712 705
713# 706#
714# Mac SMBus host controller drivers
715#
716# CONFIG_I2C_HYDRA is not set
717CONFIG_I2C_POWERMAC=y
718
719#
720# I2C system bus drivers (mostly embedded / system-on-chip) 707# I2C system bus drivers (mostly embedded / system-on-chip)
721# 708#
722CONFIG_I2C_MPC=y 709CONFIG_I2C_MPC=y
@@ -753,6 +740,7 @@ CONFIG_I2C_MPC=y
753# CONFIG_SENSORS_PCF8591 is not set 740# CONFIG_SENSORS_PCF8591 is not set
754# CONFIG_SENSORS_MAX6875 is not set 741# CONFIG_SENSORS_MAX6875 is not set
755# CONFIG_SENSORS_TSL2550 is not set 742# CONFIG_SENSORS_TSL2550 is not set
743# CONFIG_MCU_MPC8349EMITX is not set
756# CONFIG_I2C_DEBUG_CORE is not set 744# CONFIG_I2C_DEBUG_CORE is not set
757# CONFIG_I2C_DEBUG_ALGO is not set 745# CONFIG_I2C_DEBUG_ALGO is not set
758# CONFIG_I2C_DEBUG_BUS is not set 746# CONFIG_I2C_DEBUG_BUS is not set
@@ -774,7 +762,6 @@ CONFIG_HWMON=y
774# CONFIG_SENSORS_ADM9240 is not set 762# CONFIG_SENSORS_ADM9240 is not set
775# CONFIG_SENSORS_ADT7470 is not set 763# CONFIG_SENSORS_ADT7470 is not set
776# CONFIG_SENSORS_ADT7473 is not set 764# CONFIG_SENSORS_ADT7473 is not set
777# CONFIG_SENSORS_AMS is not set
778# CONFIG_SENSORS_ATXP1 is not set 765# CONFIG_SENSORS_ATXP1 is not set
779# CONFIG_SENSORS_DS1621 is not set 766# CONFIG_SENSORS_DS1621 is not set
780# CONFIG_SENSORS_I5K_AMB is not set 767# CONFIG_SENSORS_I5K_AMB is not set
@@ -829,7 +816,6 @@ CONFIG_WATCHDOG=y
829# CONFIG_SOFT_WATCHDOG is not set 816# CONFIG_SOFT_WATCHDOG is not set
830# CONFIG_ALIM7101_WDT is not set 817# CONFIG_ALIM7101_WDT is not set
831# CONFIG_8xxx_WDT is not set 818# CONFIG_8xxx_WDT is not set
832# CONFIG_WATCHDOG_RTAS is not set
833 819
834# 820#
835# PCI-based Watchdog Cards 821# PCI-based Watchdog Cards
@@ -855,6 +841,17 @@ CONFIG_SSB_POSSIBLE=y
855# CONFIG_MFD_SM501 is not set 841# CONFIG_MFD_SM501 is not set
856# CONFIG_HTC_PASIC3 is not set 842# CONFIG_HTC_PASIC3 is not set
857# CONFIG_MFD_TMIO is not set 843# CONFIG_MFD_TMIO is not set
844# CONFIG_PMIC_DA903X is not set
845# CONFIG_MFD_WM8400 is not set
846# CONFIG_MFD_WM8350_I2C is not set
847
848#
849# Voltage and Current regulators
850#
851# CONFIG_REGULATOR is not set
852# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
853# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
854# CONFIG_REGULATOR_BQ24022 is not set
858 855
859# 856#
860# Multimedia devices 857# Multimedia devices
@@ -907,6 +904,8 @@ CONFIG_USB_DEVICE_CLASS=y
907# CONFIG_USB_OTG_WHITELIST is not set 904# CONFIG_USB_OTG_WHITELIST is not set
908# CONFIG_USB_OTG_BLACKLIST_HUB is not set 905# CONFIG_USB_OTG_BLACKLIST_HUB is not set
909CONFIG_USB_MON=y 906CONFIG_USB_MON=y
907# CONFIG_USB_WUSB is not set
908# CONFIG_USB_WUSB_CBAF is not set
910 909
911# 910#
912# USB Host Controller Drivers 911# USB Host Controller Drivers
@@ -923,6 +922,8 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
923# CONFIG_USB_UHCI_HCD is not set 922# CONFIG_USB_UHCI_HCD is not set
924# CONFIG_USB_SL811_HCD is not set 923# CONFIG_USB_SL811_HCD is not set
925# CONFIG_USB_R8A66597_HCD is not set 924# CONFIG_USB_R8A66597_HCD is not set
925# CONFIG_USB_WHCI_HCD is not set
926# CONFIG_USB_HWA_HCD is not set
926 927
927# 928#
928# USB Device Class drivers 929# USB Device Class drivers
@@ -930,6 +931,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
930# CONFIG_USB_ACM is not set 931# CONFIG_USB_ACM is not set
931# CONFIG_USB_PRINTER is not set 932# CONFIG_USB_PRINTER is not set
932# CONFIG_USB_WDM is not set 933# CONFIG_USB_WDM is not set
934# CONFIG_USB_TMC is not set
933 935
934# 936#
935# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 937# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -956,6 +958,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
956# CONFIG_USB_EMI62 is not set 958# CONFIG_USB_EMI62 is not set
957# CONFIG_USB_EMI26 is not set 959# CONFIG_USB_EMI26 is not set
958# CONFIG_USB_ADUTUX is not set 960# CONFIG_USB_ADUTUX is not set
961# CONFIG_USB_SEVSEG is not set
959# CONFIG_USB_RIO500 is not set 962# CONFIG_USB_RIO500 is not set
960# CONFIG_USB_LEGOTOWER is not set 963# CONFIG_USB_LEGOTOWER is not set
961# CONFIG_USB_LCD is not set 964# CONFIG_USB_LCD is not set
@@ -972,7 +975,9 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
972# CONFIG_USB_TRANCEVIBRATOR is not set 975# CONFIG_USB_TRANCEVIBRATOR is not set
973# CONFIG_USB_IOWARRIOR is not set 976# CONFIG_USB_IOWARRIOR is not set
974# CONFIG_USB_ISIGHTFW is not set 977# CONFIG_USB_ISIGHTFW is not set
978# CONFIG_USB_VST is not set
975# CONFIG_USB_GADGET is not set 979# CONFIG_USB_GADGET is not set
980# CONFIG_UWB is not set
976# CONFIG_MMC is not set 981# CONFIG_MMC is not set
977# CONFIG_MEMSTICK is not set 982# CONFIG_MEMSTICK is not set
978# CONFIG_NEW_LEDS is not set 983# CONFIG_NEW_LEDS is not set
@@ -1018,12 +1023,15 @@ CONFIG_RTC_DRV_DS1374=y
1018# Platform RTC drivers 1023# Platform RTC drivers
1019# 1024#
1020# CONFIG_RTC_DRV_CMOS is not set 1025# CONFIG_RTC_DRV_CMOS is not set
1026# CONFIG_RTC_DRV_DS1286 is not set
1021# CONFIG_RTC_DRV_DS1511 is not set 1027# CONFIG_RTC_DRV_DS1511 is not set
1022# CONFIG_RTC_DRV_DS1553 is not set 1028# CONFIG_RTC_DRV_DS1553 is not set
1023# CONFIG_RTC_DRV_DS1742 is not set 1029# CONFIG_RTC_DRV_DS1742 is not set
1024# CONFIG_RTC_DRV_STK17TA8 is not set 1030# CONFIG_RTC_DRV_STK17TA8 is not set
1025# CONFIG_RTC_DRV_M48T86 is not set 1031# CONFIG_RTC_DRV_M48T86 is not set
1032# CONFIG_RTC_DRV_M48T35 is not set
1026# CONFIG_RTC_DRV_M48T59 is not set 1033# CONFIG_RTC_DRV_M48T59 is not set
1034# CONFIG_RTC_DRV_BQ4802 is not set
1027# CONFIG_RTC_DRV_V3020 is not set 1035# CONFIG_RTC_DRV_V3020 is not set
1028 1036
1029# 1037#
@@ -1032,6 +1040,7 @@ CONFIG_RTC_DRV_DS1374=y
1032# CONFIG_RTC_DRV_PPC is not set 1040# CONFIG_RTC_DRV_PPC is not set
1033# CONFIG_DMADEVICES is not set 1041# CONFIG_DMADEVICES is not set
1034# CONFIG_UIO is not set 1042# CONFIG_UIO is not set
1043# CONFIG_STAGING is not set
1035 1044
1036# 1045#
1037# File systems 1046# File systems
@@ -1043,12 +1052,13 @@ CONFIG_EXT3_FS=y
1043CONFIG_EXT3_FS_XATTR=y 1052CONFIG_EXT3_FS_XATTR=y
1044# CONFIG_EXT3_FS_POSIX_ACL is not set 1053# CONFIG_EXT3_FS_POSIX_ACL is not set
1045# CONFIG_EXT3_FS_SECURITY is not set 1054# CONFIG_EXT3_FS_SECURITY is not set
1046# CONFIG_EXT4DEV_FS is not set 1055# CONFIG_EXT4_FS is not set
1047CONFIG_JBD=y 1056CONFIG_JBD=y
1048CONFIG_FS_MBCACHE=y 1057CONFIG_FS_MBCACHE=y
1049# CONFIG_REISERFS_FS is not set 1058# CONFIG_REISERFS_FS is not set
1050# CONFIG_JFS_FS is not set 1059# CONFIG_JFS_FS is not set
1051# CONFIG_FS_POSIX_ACL is not set 1060# CONFIG_FS_POSIX_ACL is not set
1061CONFIG_FILE_LOCKING=y
1052# CONFIG_XFS_FS is not set 1062# CONFIG_XFS_FS is not set
1053# CONFIG_OCFS2_FS is not set 1063# CONFIG_OCFS2_FS is not set
1054CONFIG_DNOTIFY=y 1064CONFIG_DNOTIFY=y
@@ -1078,6 +1088,7 @@ CONFIG_INOTIFY_USER=y
1078CONFIG_PROC_FS=y 1088CONFIG_PROC_FS=y
1079CONFIG_PROC_KCORE=y 1089CONFIG_PROC_KCORE=y
1080CONFIG_PROC_SYSCTL=y 1090CONFIG_PROC_SYSCTL=y
1091CONFIG_PROC_PAGE_MONITOR=y
1081CONFIG_SYSFS=y 1092CONFIG_SYSFS=y
1082CONFIG_TMPFS=y 1093CONFIG_TMPFS=y
1083# CONFIG_TMPFS_POSIX_ACL is not set 1094# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1126,6 +1137,7 @@ CONFIG_LOCKD_V4=y
1126CONFIG_NFS_COMMON=y 1137CONFIG_NFS_COMMON=y
1127CONFIG_SUNRPC=y 1138CONFIG_SUNRPC=y
1128CONFIG_SUNRPC_GSS=y 1139CONFIG_SUNRPC_GSS=y
1140# CONFIG_SUNRPC_REGISTER_V4 is not set
1129CONFIG_RPCSEC_GSS_KRB5=y 1141CONFIG_RPCSEC_GSS_KRB5=y
1130# CONFIG_RPCSEC_GSS_SPKM3 is not set 1142# CONFIG_RPCSEC_GSS_SPKM3 is not set
1131# CONFIG_SMB_FS is not set 1143# CONFIG_SMB_FS is not set
@@ -1197,7 +1209,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1197# Library routines 1209# Library routines
1198# 1210#
1199CONFIG_BITREVERSE=y 1211CONFIG_BITREVERSE=y
1200# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1201# CONFIG_CRC_CCITT is not set 1212# CONFIG_CRC_CCITT is not set
1202# CONFIG_CRC16 is not set 1213# CONFIG_CRC16 is not set
1203# CONFIG_CRC_T10DIF is not set 1214# CONFIG_CRC_T10DIF is not set
@@ -1229,13 +1240,15 @@ CONFIG_FRAME_WARN=1024
1229# CONFIG_SLUB_STATS is not set 1240# CONFIG_SLUB_STATS is not set
1230# CONFIG_DEBUG_BUGVERBOSE is not set 1241# CONFIG_DEBUG_BUGVERBOSE is not set
1231# CONFIG_DEBUG_MEMORY_INIT is not set 1242# CONFIG_DEBUG_MEMORY_INIT is not set
1243# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1232# CONFIG_LATENCYTOP is not set 1244# CONFIG_LATENCYTOP is not set
1233# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1245# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1234CONFIG_HAVE_FTRACE=y 1246CONFIG_HAVE_FUNCTION_TRACER=y
1235CONFIG_HAVE_DYNAMIC_FTRACE=y 1247
1236# CONFIG_FTRACE is not set 1248#
1237# CONFIG_SCHED_TRACER is not set 1249# Tracers
1238# CONFIG_CONTEXT_SWITCH_TRACER is not set 1250#
1251# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1239# CONFIG_SAMPLES is not set 1252# CONFIG_SAMPLES is not set
1240CONFIG_HAVE_ARCH_KGDB=y 1253CONFIG_HAVE_ARCH_KGDB=y
1241# CONFIG_IRQSTACKS is not set 1254# CONFIG_IRQSTACKS is not set
@@ -1247,14 +1260,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1247# 1260#
1248# CONFIG_KEYS is not set 1261# CONFIG_KEYS is not set
1249# CONFIG_SECURITY is not set 1262# CONFIG_SECURITY is not set
1263# CONFIG_SECURITYFS is not set
1250# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1264# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1251CONFIG_CRYPTO=y 1265CONFIG_CRYPTO=y
1252 1266
1253# 1267#
1254# Crypto core or helper 1268# Crypto core or helper
1255# 1269#
1270# CONFIG_CRYPTO_FIPS is not set
1256CONFIG_CRYPTO_ALGAPI=y 1271CONFIG_CRYPTO_ALGAPI=y
1272CONFIG_CRYPTO_AEAD=y
1257CONFIG_CRYPTO_BLKCIPHER=y 1273CONFIG_CRYPTO_BLKCIPHER=y
1274CONFIG_CRYPTO_HASH=y
1275CONFIG_CRYPTO_RNG=y
1258CONFIG_CRYPTO_MANAGER=y 1276CONFIG_CRYPTO_MANAGER=y
1259# CONFIG_CRYPTO_GF128MUL is not set 1277# CONFIG_CRYPTO_GF128MUL is not set
1260# CONFIG_CRYPTO_NULL is not set 1278# CONFIG_CRYPTO_NULL is not set
@@ -1327,6 +1345,11 @@ CONFIG_CRYPTO_DES=y
1327# 1345#
1328# CONFIG_CRYPTO_DEFLATE is not set 1346# CONFIG_CRYPTO_DEFLATE is not set
1329# CONFIG_CRYPTO_LZO is not set 1347# CONFIG_CRYPTO_LZO is not set
1348
1349#
1350# Random Number Generation
1351#
1352# CONFIG_CRYPTO_ANSI_CPRNG is not set
1330CONFIG_CRYPTO_HW=y 1353CONFIG_CRYPTO_HW=y
1331# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1354# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1332# CONFIG_CRYPTO_DEV_TALITOS is not set 1355# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
index b7eae2bdf19c..bfc32ea265a7 100644
--- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:17 2008 4# Sat Nov 8 12:39:50 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
23# CONFIG_SMP is not set 23# CONFIG_SMP is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -53,8 +53,6 @@ CONFIG_PPC_UDBG_16550=y
53CONFIG_AUDIT_ARCH=y 53CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
55CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
56CONFIG_HIBERNATE_32=y
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
58CONFIG_ARCH_SUSPEND_POSSIBLE=y 56CONFIG_ARCH_SUSPEND_POSSIBLE=y
59# CONFIG_PPC_DCR_NATIVE is not set 57# CONFIG_PPC_DCR_NATIVE is not set
60# CONFIG_PPC_DCR_MMIO is not set 58# CONFIG_PPC_DCR_MMIO is not set
@@ -98,7 +96,6 @@ CONFIG_HOTPLUG=y
98CONFIG_PRINTK=y 96CONFIG_PRINTK=y
99CONFIG_BUG=y 97CONFIG_BUG=y
100CONFIG_ELF_CORE=y 98CONFIG_ELF_CORE=y
101CONFIG_PCSPKR_PLATFORM=y
102CONFIG_COMPAT_BRK=y 99CONFIG_COMPAT_BRK=y
103CONFIG_BASE_FULL=y 100CONFIG_BASE_FULL=y
104CONFIG_FUTEX=y 101CONFIG_FUTEX=y
@@ -108,7 +105,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 105CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 106CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 107CONFIG_SHMEM=y
108CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
110CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 111CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 112# CONFIG_SLAB is not set
114CONFIG_SLUB=y 113CONFIG_SLUB=y
@@ -121,10 +120,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
121CONFIG_HAVE_KPROBES=y 120CONFIG_HAVE_KPROBES=y
122CONFIG_HAVE_KRETPROBES=y 121CONFIG_HAVE_KRETPROBES=y
123CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_DMA_ATTRS is not set
125# CONFIG_USE_GENERIC_SMP_HELPERS is not set
126# CONFIG_HAVE_CLK is not set
127CONFIG_PROC_PAGE_MONITOR=y
128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
129CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
130CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
@@ -157,6 +152,7 @@ CONFIG_DEFAULT_AS=y
157# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
158CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
159CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_FREEZER is not set
160 156
161# 157#
162# Platform support 158# Platform support
@@ -164,10 +160,10 @@ CONFIG_CLASSIC_RCU=y
164CONFIG_PPC_MULTIPLATFORM=y 160CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y 161CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set 162# CONFIG_PPC_CHRP is not set
167# CONFIG_PPC_PMAC is not set
168# CONFIG_MPC5121_ADS is not set 163# CONFIG_MPC5121_ADS is not set
169# CONFIG_MPC5121_GENERIC is not set 164# CONFIG_MPC5121_GENERIC is not set
170# CONFIG_PPC_MPC52xx is not set 165# CONFIG_PPC_MPC52xx is not set
166# CONFIG_PPC_PMAC is not set
171# CONFIG_PPC_CELL is not set 167# CONFIG_PPC_CELL is not set
172# CONFIG_PPC_CELL_NATIVE is not set 168# CONFIG_PPC_CELL_NATIVE is not set
173# CONFIG_PPC_82xx is not set 169# CONFIG_PPC_82xx is not set
@@ -187,24 +183,21 @@ CONFIG_MPC831x_RDB=y
187CONFIG_PPC_MPC831x=y 183CONFIG_PPC_MPC831x=y
188# CONFIG_PPC_86xx is not set 184# CONFIG_PPC_86xx is not set
189# CONFIG_EMBEDDED6xx is not set 185# CONFIG_EMBEDDED6xx is not set
190CONFIG_PPC_NATIVE=y
191# CONFIG_UDBG_RTAS_CONSOLE is not set
192CONFIG_IPIC=y 186CONFIG_IPIC=y
193CONFIG_MPIC=y 187# CONFIG_MPIC is not set
194# CONFIG_MPIC_WEIRD is not set 188# CONFIG_MPIC_WEIRD is not set
195CONFIG_PPC_I8259=y 189# CONFIG_PPC_I8259 is not set
196CONFIG_PPC_RTAS=y 190# CONFIG_PPC_RTAS is not set
197# CONFIG_RTAS_ERROR_LOGGING is not set
198CONFIG_RTAS_PROC=y
199# CONFIG_MMIO_NVRAM is not set 191# CONFIG_MMIO_NVRAM is not set
200CONFIG_PPC_MPC106=y 192# CONFIG_PPC_MPC106 is not set
201# CONFIG_PPC_970_NAP is not set 193# CONFIG_PPC_970_NAP is not set
202# CONFIG_PPC_INDIRECT_IO is not set 194# CONFIG_PPC_INDIRECT_IO is not set
203# CONFIG_GENERIC_IOMAP is not set 195# CONFIG_GENERIC_IOMAP is not set
204# CONFIG_CPU_FREQ is not set 196# CONFIG_CPU_FREQ is not set
205# CONFIG_PPC601_SYNC_FIX is not set
206# CONFIG_TAU is not set 197# CONFIG_TAU is not set
198# CONFIG_QUICC_ENGINE is not set
207# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_MPC8xxx_GPIO is not set
208 201
209# 202#
210# Kernel options 203# Kernel options
@@ -224,6 +217,8 @@ CONFIG_PREEMPT_NONE=y
224# CONFIG_PREEMPT_VOLUNTARY is not set 217# CONFIG_PREEMPT_VOLUNTARY is not set
225# CONFIG_PREEMPT is not set 218# CONFIG_PREEMPT is not set
226CONFIG_BINFMT_ELF=y 219CONFIG_BINFMT_ELF=y
220# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
221# CONFIG_HAVE_AOUT is not set
227# CONFIG_BINFMT_MISC is not set 222# CONFIG_BINFMT_MISC is not set
228# CONFIG_IOMMU_HELPER is not set 223# CONFIG_IOMMU_HELPER is not set
229CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -238,15 +233,15 @@ CONFIG_FLATMEM_MANUAL=y
238# CONFIG_SPARSEMEM_MANUAL is not set 233# CONFIG_SPARSEMEM_MANUAL is not set
239CONFIG_FLATMEM=y 234CONFIG_FLATMEM=y
240CONFIG_FLAT_NODE_MEM_MAP=y 235CONFIG_FLAT_NODE_MEM_MAP=y
241# CONFIG_SPARSEMEM_STATIC is not set
242# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
243CONFIG_PAGEFLAGS_EXTENDED=y 236CONFIG_PAGEFLAGS_EXTENDED=y
244CONFIG_SPLIT_PTLOCK_CPUS=4 237CONFIG_SPLIT_PTLOCK_CPUS=4
245CONFIG_MIGRATION=y 238CONFIG_MIGRATION=y
246# CONFIG_RESOURCES_64BIT is not set 239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set
247CONFIG_ZONE_DMA_FLAG=1 241CONFIG_ZONE_DMA_FLAG=1
248CONFIG_BOUNCE=y 242CONFIG_BOUNCE=y
249CONFIG_VIRT_TO_BUS=y 243CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y
250CONFIG_FORCE_MAX_ZONEORDER=11 245CONFIG_FORCE_MAX_ZONEORDER=11
251CONFIG_PROC_DEVICETREE=y 246CONFIG_PROC_DEVICETREE=y
252# CONFIG_CMDLINE_BOOL is not set 247# CONFIG_CMDLINE_BOOL is not set
@@ -258,7 +253,6 @@ CONFIG_ISA_DMA_API=y
258# 253#
259# Bus options 254# Bus options
260# 255#
261# CONFIG_ISA is not set
262CONFIG_ZONE_DMA=y 256CONFIG_ZONE_DMA=y
263CONFIG_GENERIC_ISA_DMA=y 257CONFIG_GENERIC_ISA_DMA=y
264CONFIG_PPC_INDIRECT_PCI=y 258CONFIG_PPC_INDIRECT_PCI=y
@@ -271,7 +265,7 @@ CONFIG_PCI_SYSCALL=y
271# CONFIG_PCIEPORTBUS is not set 265# CONFIG_PCIEPORTBUS is not set
272CONFIG_ARCH_SUPPORTS_MSI=y 266CONFIG_ARCH_SUPPORTS_MSI=y
273# CONFIG_PCI_MSI is not set 267# CONFIG_PCI_MSI is not set
274CONFIG_PCI_LEGACY=y 268# CONFIG_PCI_LEGACY is not set
275# CONFIG_PCI_DEBUG is not set 269# CONFIG_PCI_DEBUG is not set
276# CONFIG_PCCARD is not set 270# CONFIG_PCCARD is not set
277# CONFIG_HOTPLUG_PCI is not set 271# CONFIG_HOTPLUG_PCI is not set
@@ -340,6 +334,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
340# CONFIG_TIPC is not set 334# CONFIG_TIPC is not set
341# CONFIG_ATM is not set 335# CONFIG_ATM is not set
342# CONFIG_BRIDGE is not set 336# CONFIG_BRIDGE is not set
337# CONFIG_NET_DSA is not set
343# CONFIG_VLAN_8021Q is not set 338# CONFIG_VLAN_8021Q is not set
344# CONFIG_DECNET is not set 339# CONFIG_DECNET is not set
345# CONFIG_LLC2 is not set 340# CONFIG_LLC2 is not set
@@ -360,11 +355,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
360# CONFIG_IRDA is not set 355# CONFIG_IRDA is not set
361# CONFIG_BT is not set 356# CONFIG_BT is not set
362# CONFIG_AF_RXRPC is not set 357# CONFIG_AF_RXRPC is not set
363 358# CONFIG_PHONET is not set
364# 359CONFIG_WIRELESS=y
365# Wireless
366#
367# CONFIG_CFG80211 is not set 360# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y
368# CONFIG_WIRELESS_EXT is not set 362# CONFIG_WIRELESS_EXT is not set
369# CONFIG_MAC80211 is not set 363# CONFIG_MAC80211 is not set
370# CONFIG_IEEE80211 is not set 364# CONFIG_IEEE80211 is not set
@@ -470,6 +464,7 @@ CONFIG_MTD_NAND_IDS=y
470# CONFIG_MTD_NAND_PLATFORM is not set 464# CONFIG_MTD_NAND_PLATFORM is not set
471# CONFIG_MTD_ALAUDA is not set 465# CONFIG_MTD_ALAUDA is not set
472CONFIG_MTD_NAND_FSL_ELBC=y 466CONFIG_MTD_NAND_FSL_ELBC=y
467# CONFIG_MTD_NAND_FSL_UPM is not set
473# CONFIG_MTD_ONENAND is not set 468# CONFIG_MTD_ONENAND is not set
474 469
475# 470#
@@ -482,7 +477,6 @@ CONFIG_OF_SPI=y
482# CONFIG_PARPORT is not set 477# CONFIG_PARPORT is not set
483CONFIG_BLK_DEV=y 478CONFIG_BLK_DEV=y
484# CONFIG_BLK_DEV_FD is not set 479# CONFIG_BLK_DEV_FD is not set
485# CONFIG_MAC_FLOPPY is not set
486# CONFIG_BLK_CPQ_DA is not set 480# CONFIG_BLK_CPQ_DA is not set
487# CONFIG_BLK_CPQ_CISS_DA is not set 481# CONFIG_BLK_CPQ_CISS_DA is not set
488# CONFIG_BLK_DEV_DAC960 is not set 482# CONFIG_BLK_DEV_DAC960 is not set
@@ -583,13 +577,12 @@ CONFIG_SCSI_LOWLEVEL=y
583# CONFIG_SCSI_DC390T is not set 577# CONFIG_SCSI_DC390T is not set
584# CONFIG_SCSI_NSP32 is not set 578# CONFIG_SCSI_NSP32 is not set
585# CONFIG_SCSI_DEBUG is not set 579# CONFIG_SCSI_DEBUG is not set
586# CONFIG_SCSI_MESH is not set
587# CONFIG_SCSI_MAC53C94 is not set
588# CONFIG_SCSI_SRP is not set 580# CONFIG_SCSI_SRP is not set
589# CONFIG_SCSI_DH is not set 581# CONFIG_SCSI_DH is not set
590# CONFIG_ATA is not set 582# CONFIG_ATA is not set
591CONFIG_MD=y 583CONFIG_MD=y
592CONFIG_BLK_DEV_MD=y 584CONFIG_BLK_DEV_MD=y
585CONFIG_MD_AUTODETECT=y
593CONFIG_MD_LINEAR=y 586CONFIG_MD_LINEAR=y
594CONFIG_MD_RAID0=y 587CONFIG_MD_RAID0=y
595CONFIG_MD_RAID1=y 588CONFIG_MD_RAID1=y
@@ -638,8 +631,6 @@ CONFIG_CICADA_PHY=y
638# CONFIG_MDIO_BITBANG is not set 631# CONFIG_MDIO_BITBANG is not set
639CONFIG_NET_ETHERNET=y 632CONFIG_NET_ETHERNET=y
640CONFIG_MII=y 633CONFIG_MII=y
641# CONFIG_MACE is not set
642# CONFIG_BMAC is not set
643# CONFIG_HAPPYMEAL is not set 634# CONFIG_HAPPYMEAL is not set
644# CONFIG_SUNGEM is not set 635# CONFIG_SUNGEM is not set
645# CONFIG_CASSINI is not set 636# CONFIG_CASSINI is not set
@@ -651,6 +642,9 @@ CONFIG_MII=y
651# CONFIG_IBM_NEW_EMAC_RGMII is not set 642# CONFIG_IBM_NEW_EMAC_RGMII is not set
652# CONFIG_IBM_NEW_EMAC_TAH is not set 643# CONFIG_IBM_NEW_EMAC_TAH is not set
653# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 644# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
645# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
646# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
647# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
654CONFIG_NET_PCI=y 648CONFIG_NET_PCI=y
655# CONFIG_PCNET32 is not set 649# CONFIG_PCNET32 is not set
656# CONFIG_AMD8111_ETH is not set 650# CONFIG_AMD8111_ETH is not set
@@ -671,6 +665,7 @@ CONFIG_E100=y
671# CONFIG_TLAN is not set 665# CONFIG_TLAN is not set
672# CONFIG_VIA_RHINE is not set 666# CONFIG_VIA_RHINE is not set
673# CONFIG_SC92031 is not set 667# CONFIG_SC92031 is not set
668# CONFIG_ATL2 is not set
674CONFIG_NETDEV_1000=y 669CONFIG_NETDEV_1000=y
675# CONFIG_ACENIC is not set 670# CONFIG_ACENIC is not set
676# CONFIG_DL2K is not set 671# CONFIG_DL2K is not set
@@ -693,18 +688,22 @@ CONFIG_GIANFAR=y
693# CONFIG_QLA3XXX is not set 688# CONFIG_QLA3XXX is not set
694# CONFIG_ATL1 is not set 689# CONFIG_ATL1 is not set
695# CONFIG_ATL1E is not set 690# CONFIG_ATL1E is not set
691# CONFIG_JME is not set
696CONFIG_NETDEV_10000=y 692CONFIG_NETDEV_10000=y
697# CONFIG_CHELSIO_T1 is not set 693# CONFIG_CHELSIO_T1 is not set
698# CONFIG_CHELSIO_T3 is not set 694# CONFIG_CHELSIO_T3 is not set
695# CONFIG_ENIC is not set
699# CONFIG_IXGBE is not set 696# CONFIG_IXGBE is not set
700# CONFIG_IXGB is not set 697# CONFIG_IXGB is not set
701# CONFIG_S2IO is not set 698# CONFIG_S2IO is not set
702# CONFIG_MYRI10GE is not set 699# CONFIG_MYRI10GE is not set
703# CONFIG_NETXEN_NIC is not set 700# CONFIG_NETXEN_NIC is not set
704# CONFIG_NIU is not set 701# CONFIG_NIU is not set
702# CONFIG_MLX4_EN is not set
705# CONFIG_MLX4_CORE is not set 703# CONFIG_MLX4_CORE is not set
706# CONFIG_TEHUTI is not set 704# CONFIG_TEHUTI is not set
707# CONFIG_BNX2X is not set 705# CONFIG_BNX2X is not set
706# CONFIG_QLGE is not set
708# CONFIG_SFC is not set 707# CONFIG_SFC is not set
709# CONFIG_TR is not set 708# CONFIG_TR is not set
710 709
@@ -790,14 +789,11 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
790# CONFIG_SERIAL_UARTLITE is not set 789# CONFIG_SERIAL_UARTLITE is not set
791CONFIG_SERIAL_CORE=y 790CONFIG_SERIAL_CORE=y
792CONFIG_SERIAL_CORE_CONSOLE=y 791CONFIG_SERIAL_CORE_CONSOLE=y
793# CONFIG_SERIAL_PMACZILOG is not set
794# CONFIG_SERIAL_JSM is not set 792# CONFIG_SERIAL_JSM is not set
795# CONFIG_SERIAL_OF_PLATFORM is not set 793# CONFIG_SERIAL_OF_PLATFORM is not set
796CONFIG_UNIX98_PTYS=y 794CONFIG_UNIX98_PTYS=y
797CONFIG_LEGACY_PTYS=y 795CONFIG_LEGACY_PTYS=y
798CONFIG_LEGACY_PTY_COUNT=256 796CONFIG_LEGACY_PTY_COUNT=256
799# CONFIG_BRIQ_PANEL is not set
800# CONFIG_HVC_RTAS is not set
801# CONFIG_IPMI_HANDLER is not set 797# CONFIG_IPMI_HANDLER is not set
802CONFIG_HW_RANDOM=y 798CONFIG_HW_RANDOM=y
803# CONFIG_NVRAM is not set 799# CONFIG_NVRAM is not set
@@ -834,12 +830,6 @@ CONFIG_I2C_HELPER_AUTO=y
834# CONFIG_I2C_VIAPRO is not set 830# CONFIG_I2C_VIAPRO is not set
835 831
836# 832#
837# Mac SMBus host controller drivers
838#
839# CONFIG_I2C_HYDRA is not set
840CONFIG_I2C_POWERMAC=y
841
842#
843# I2C system bus drivers (mostly embedded / system-on-chip) 833# I2C system bus drivers (mostly embedded / system-on-chip)
844# 834#
845CONFIG_I2C_MPC=y 835CONFIG_I2C_MPC=y
@@ -876,6 +866,7 @@ CONFIG_I2C_MPC=y
876# CONFIG_SENSORS_PCF8591 is not set 866# CONFIG_SENSORS_PCF8591 is not set
877# CONFIG_SENSORS_MAX6875 is not set 867# CONFIG_SENSORS_MAX6875 is not set
878# CONFIG_SENSORS_TSL2550 is not set 868# CONFIG_SENSORS_TSL2550 is not set
869# CONFIG_MCU_MPC8349EMITX is not set
879# CONFIG_I2C_DEBUG_CORE is not set 870# CONFIG_I2C_DEBUG_CORE is not set
880# CONFIG_I2C_DEBUG_ALGO is not set 871# CONFIG_I2C_DEBUG_ALGO is not set
881# CONFIG_I2C_DEBUG_BUS is not set 872# CONFIG_I2C_DEBUG_BUS is not set
@@ -913,7 +904,6 @@ CONFIG_HWMON=y
913# CONFIG_SENSORS_ADM9240 is not set 904# CONFIG_SENSORS_ADM9240 is not set
914# CONFIG_SENSORS_ADT7470 is not set 905# CONFIG_SENSORS_ADT7470 is not set
915# CONFIG_SENSORS_ADT7473 is not set 906# CONFIG_SENSORS_ADT7473 is not set
916# CONFIG_SENSORS_AMS is not set
917# CONFIG_SENSORS_ATXP1 is not set 907# CONFIG_SENSORS_ATXP1 is not set
918# CONFIG_SENSORS_DS1621 is not set 908# CONFIG_SENSORS_DS1621 is not set
919# CONFIG_SENSORS_I5K_AMB is not set 909# CONFIG_SENSORS_I5K_AMB is not set
@@ -935,6 +925,7 @@ CONFIG_HWMON=y
935# CONFIG_SENSORS_LM90 is not set 925# CONFIG_SENSORS_LM90 is not set
936# CONFIG_SENSORS_LM92 is not set 926# CONFIG_SENSORS_LM92 is not set
937# CONFIG_SENSORS_LM93 is not set 927# CONFIG_SENSORS_LM93 is not set
928# CONFIG_SENSORS_MAX1111 is not set
938# CONFIG_SENSORS_MAX1619 is not set 929# CONFIG_SENSORS_MAX1619 is not set
939# CONFIG_SENSORS_MAX6650 is not set 930# CONFIG_SENSORS_MAX6650 is not set
940# CONFIG_SENSORS_PC87360 is not set 931# CONFIG_SENSORS_PC87360 is not set
@@ -969,7 +960,6 @@ CONFIG_WATCHDOG=y
969# CONFIG_SOFT_WATCHDOG is not set 960# CONFIG_SOFT_WATCHDOG is not set
970# CONFIG_ALIM7101_WDT is not set 961# CONFIG_ALIM7101_WDT is not set
971# CONFIG_8xxx_WDT is not set 962# CONFIG_8xxx_WDT is not set
972# CONFIG_WATCHDOG_RTAS is not set
973 963
974# 964#
975# PCI-based Watchdog Cards 965# PCI-based Watchdog Cards
@@ -995,6 +985,17 @@ CONFIG_SSB_POSSIBLE=y
995# CONFIG_MFD_SM501 is not set 985# CONFIG_MFD_SM501 is not set
996# CONFIG_HTC_PASIC3 is not set 986# CONFIG_HTC_PASIC3 is not set
997# CONFIG_MFD_TMIO is not set 987# CONFIG_MFD_TMIO is not set
988# CONFIG_PMIC_DA903X is not set
989# CONFIG_MFD_WM8400 is not set
990# CONFIG_MFD_WM8350_I2C is not set
991
992#
993# Voltage and Current regulators
994#
995# CONFIG_REGULATOR is not set
996# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
997# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
998# CONFIG_REGULATOR_BQ24022 is not set
998 999
999# 1000#
1000# Multimedia devices 1001# Multimedia devices
@@ -1037,12 +1038,18 @@ CONFIG_HID=y
1037# USB Input Devices 1038# USB Input Devices
1038# 1039#
1039# CONFIG_USB_HID is not set 1040# CONFIG_USB_HID is not set
1041# CONFIG_HID_PID is not set
1040 1042
1041# 1043#
1042# USB HID Boot Protocol drivers 1044# USB HID Boot Protocol drivers
1043# 1045#
1044# CONFIG_USB_KBD is not set 1046# CONFIG_USB_KBD is not set
1045# CONFIG_USB_MOUSE is not set 1047# CONFIG_USB_MOUSE is not set
1048
1049#
1050# Special HID drivers
1051#
1052CONFIG_HID_COMPAT=y
1046CONFIG_USB_SUPPORT=y 1053CONFIG_USB_SUPPORT=y
1047CONFIG_USB_ARCH_HAS_HCD=y 1054CONFIG_USB_ARCH_HAS_HCD=y
1048CONFIG_USB_ARCH_HAS_OHCI=y 1055CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1061,6 +1068,8 @@ CONFIG_USB_DEVICE_CLASS=y
1061# CONFIG_USB_OTG_WHITELIST is not set 1068# CONFIG_USB_OTG_WHITELIST is not set
1062# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1069# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1063CONFIG_USB_MON=y 1070CONFIG_USB_MON=y
1071# CONFIG_USB_WUSB is not set
1072# CONFIG_USB_WUSB_CBAF is not set
1064 1073
1065# 1074#
1066# USB Host Controller Drivers 1075# USB Host Controller Drivers
@@ -1084,6 +1093,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1084CONFIG_USB_UHCI_HCD=y 1093CONFIG_USB_UHCI_HCD=y
1085# CONFIG_USB_SL811_HCD is not set 1094# CONFIG_USB_SL811_HCD is not set
1086# CONFIG_USB_R8A66597_HCD is not set 1095# CONFIG_USB_R8A66597_HCD is not set
1096# CONFIG_USB_WHCI_HCD is not set
1097# CONFIG_USB_HWA_HCD is not set
1087# CONFIG_USB_GADGET_MUSB_HDRC is not set 1098# CONFIG_USB_GADGET_MUSB_HDRC is not set
1088 1099
1089# 1100#
@@ -1092,6 +1103,7 @@ CONFIG_USB_UHCI_HCD=y
1092# CONFIG_USB_ACM is not set 1103# CONFIG_USB_ACM is not set
1093# CONFIG_USB_PRINTER is not set 1104# CONFIG_USB_PRINTER is not set
1094# CONFIG_USB_WDM is not set 1105# CONFIG_USB_WDM is not set
1106# CONFIG_USB_TMC is not set
1095 1107
1096# 1108#
1097# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1109# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1113,7 +1125,6 @@ CONFIG_USB_STORAGE=y
1113# CONFIG_USB_STORAGE_ALAUDA is not set 1125# CONFIG_USB_STORAGE_ALAUDA is not set
1114# CONFIG_USB_STORAGE_ONETOUCH is not set 1126# CONFIG_USB_STORAGE_ONETOUCH is not set
1115# CONFIG_USB_STORAGE_KARMA is not set 1127# CONFIG_USB_STORAGE_KARMA is not set
1116# CONFIG_USB_STORAGE_SIERRA is not set
1117# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1128# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1118# CONFIG_USB_LIBUSUAL is not set 1129# CONFIG_USB_LIBUSUAL is not set
1119 1130
@@ -1134,6 +1145,7 @@ CONFIG_USB_STORAGE=y
1134# CONFIG_USB_EMI62 is not set 1145# CONFIG_USB_EMI62 is not set
1135# CONFIG_USB_EMI26 is not set 1146# CONFIG_USB_EMI26 is not set
1136# CONFIG_USB_ADUTUX is not set 1147# CONFIG_USB_ADUTUX is not set
1148# CONFIG_USB_SEVSEG is not set
1137# CONFIG_USB_RIO500 is not set 1149# CONFIG_USB_RIO500 is not set
1138# CONFIG_USB_LEGOTOWER is not set 1150# CONFIG_USB_LEGOTOWER is not set
1139# CONFIG_USB_LCD is not set 1151# CONFIG_USB_LCD is not set
@@ -1151,23 +1163,26 @@ CONFIG_USB_STORAGE=y
1151# CONFIG_USB_IOWARRIOR is not set 1163# CONFIG_USB_IOWARRIOR is not set
1152# CONFIG_USB_TEST is not set 1164# CONFIG_USB_TEST is not set
1153# CONFIG_USB_ISIGHTFW is not set 1165# CONFIG_USB_ISIGHTFW is not set
1166# CONFIG_USB_VST is not set
1154CONFIG_USB_GADGET=y 1167CONFIG_USB_GADGET=y
1155# CONFIG_USB_GADGET_DEBUG is not set 1168# CONFIG_USB_GADGET_DEBUG is not set
1156# CONFIG_USB_GADGET_DEBUG_FILES is not set 1169# CONFIG_USB_GADGET_DEBUG_FILES is not set
1170CONFIG_USB_GADGET_VBUS_DRAW=2
1157CONFIG_USB_GADGET_SELECTED=y 1171CONFIG_USB_GADGET_SELECTED=y
1158# CONFIG_USB_GADGET_AMD5536UDC is not set 1172# CONFIG_USB_GADGET_AT91 is not set
1159# CONFIG_USB_GADGET_ATMEL_USBA is not set 1173# CONFIG_USB_GADGET_ATMEL_USBA is not set
1160# CONFIG_USB_GADGET_FSL_USB2 is not set 1174# CONFIG_USB_GADGET_FSL_USB2 is not set
1161CONFIG_USB_GADGET_NET2280=y
1162CONFIG_USB_NET2280=y
1163# CONFIG_USB_GADGET_PXA25X is not set
1164# CONFIG_USB_GADGET_M66592 is not set
1165# CONFIG_USB_GADGET_PXA27X is not set
1166# CONFIG_USB_GADGET_GOKU is not set
1167# CONFIG_USB_GADGET_LH7A40X is not set 1175# CONFIG_USB_GADGET_LH7A40X is not set
1168# CONFIG_USB_GADGET_OMAP is not set 1176# CONFIG_USB_GADGET_OMAP is not set
1177# CONFIG_USB_GADGET_PXA25X is not set
1178# CONFIG_USB_GADGET_PXA27X is not set
1169# CONFIG_USB_GADGET_S3C2410 is not set 1179# CONFIG_USB_GADGET_S3C2410 is not set
1170# CONFIG_USB_GADGET_AT91 is not set 1180# CONFIG_USB_GADGET_M66592 is not set
1181# CONFIG_USB_GADGET_AMD5536UDC is not set
1182# CONFIG_USB_GADGET_FSL_QE is not set
1183CONFIG_USB_GADGET_NET2280=y
1184CONFIG_USB_NET2280=y
1185# CONFIG_USB_GADGET_GOKU is not set
1171# CONFIG_USB_GADGET_DUMMY_HCD is not set 1186# CONFIG_USB_GADGET_DUMMY_HCD is not set
1172CONFIG_USB_GADGET_DUALSPEED=y 1187CONFIG_USB_GADGET_DUALSPEED=y
1173# CONFIG_USB_ZERO is not set 1188# CONFIG_USB_ZERO is not set
@@ -1179,6 +1194,7 @@ CONFIG_USB_ETH_RNDIS=y
1179# CONFIG_USB_MIDI_GADGET is not set 1194# CONFIG_USB_MIDI_GADGET is not set
1180# CONFIG_USB_G_PRINTER is not set 1195# CONFIG_USB_G_PRINTER is not set
1181# CONFIG_USB_CDC_COMPOSITE is not set 1196# CONFIG_USB_CDC_COMPOSITE is not set
1197# CONFIG_UWB is not set
1182# CONFIG_MMC is not set 1198# CONFIG_MMC is not set
1183# CONFIG_MEMSTICK is not set 1199# CONFIG_MEMSTICK is not set
1184# CONFIG_NEW_LEDS is not set 1200# CONFIG_NEW_LEDS is not set
@@ -1224,17 +1240,21 @@ CONFIG_RTC_DRV_DS1307=y
1224# CONFIG_RTC_DRV_MAX6902 is not set 1240# CONFIG_RTC_DRV_MAX6902 is not set
1225# CONFIG_RTC_DRV_R9701 is not set 1241# CONFIG_RTC_DRV_R9701 is not set
1226# CONFIG_RTC_DRV_RS5C348 is not set 1242# CONFIG_RTC_DRV_RS5C348 is not set
1243# CONFIG_RTC_DRV_DS3234 is not set
1227 1244
1228# 1245#
1229# Platform RTC drivers 1246# Platform RTC drivers
1230# 1247#
1231# CONFIG_RTC_DRV_CMOS is not set 1248# CONFIG_RTC_DRV_CMOS is not set
1249# CONFIG_RTC_DRV_DS1286 is not set
1232# CONFIG_RTC_DRV_DS1511 is not set 1250# CONFIG_RTC_DRV_DS1511 is not set
1233# CONFIG_RTC_DRV_DS1553 is not set 1251# CONFIG_RTC_DRV_DS1553 is not set
1234# CONFIG_RTC_DRV_DS1742 is not set 1252# CONFIG_RTC_DRV_DS1742 is not set
1235# CONFIG_RTC_DRV_STK17TA8 is not set 1253# CONFIG_RTC_DRV_STK17TA8 is not set
1236# CONFIG_RTC_DRV_M48T86 is not set 1254# CONFIG_RTC_DRV_M48T86 is not set
1255# CONFIG_RTC_DRV_M48T35 is not set
1237# CONFIG_RTC_DRV_M48T59 is not set 1256# CONFIG_RTC_DRV_M48T59 is not set
1257# CONFIG_RTC_DRV_BQ4802 is not set
1238# CONFIG_RTC_DRV_V3020 is not set 1258# CONFIG_RTC_DRV_V3020 is not set
1239 1259
1240# 1260#
@@ -1243,6 +1263,7 @@ CONFIG_RTC_DRV_DS1307=y
1243# CONFIG_RTC_DRV_PPC is not set 1263# CONFIG_RTC_DRV_PPC is not set
1244# CONFIG_DMADEVICES is not set 1264# CONFIG_DMADEVICES is not set
1245# CONFIG_UIO is not set 1265# CONFIG_UIO is not set
1266# CONFIG_STAGING is not set
1246 1267
1247# 1268#
1248# File systems 1269# File systems
@@ -1254,12 +1275,13 @@ CONFIG_EXT3_FS=y
1254CONFIG_EXT3_FS_XATTR=y 1275CONFIG_EXT3_FS_XATTR=y
1255# CONFIG_EXT3_FS_POSIX_ACL is not set 1276# CONFIG_EXT3_FS_POSIX_ACL is not set
1256# CONFIG_EXT3_FS_SECURITY is not set 1277# CONFIG_EXT3_FS_SECURITY is not set
1257# CONFIG_EXT4DEV_FS is not set 1278# CONFIG_EXT4_FS is not set
1258CONFIG_JBD=y 1279CONFIG_JBD=y
1259CONFIG_FS_MBCACHE=y 1280CONFIG_FS_MBCACHE=y
1260# CONFIG_REISERFS_FS is not set 1281# CONFIG_REISERFS_FS is not set
1261# CONFIG_JFS_FS is not set 1282# CONFIG_JFS_FS is not set
1262# CONFIG_FS_POSIX_ACL is not set 1283# CONFIG_FS_POSIX_ACL is not set
1284CONFIG_FILE_LOCKING=y
1263# CONFIG_XFS_FS is not set 1285# CONFIG_XFS_FS is not set
1264# CONFIG_OCFS2_FS is not set 1286# CONFIG_OCFS2_FS is not set
1265CONFIG_DNOTIFY=y 1287CONFIG_DNOTIFY=y
@@ -1289,6 +1311,7 @@ CONFIG_INOTIFY_USER=y
1289CONFIG_PROC_FS=y 1311CONFIG_PROC_FS=y
1290CONFIG_PROC_KCORE=y 1312CONFIG_PROC_KCORE=y
1291CONFIG_PROC_SYSCTL=y 1313CONFIG_PROC_SYSCTL=y
1314CONFIG_PROC_PAGE_MONITOR=y
1292CONFIG_SYSFS=y 1315CONFIG_SYSFS=y
1293CONFIG_TMPFS=y 1316CONFIG_TMPFS=y
1294# CONFIG_TMPFS_POSIX_ACL is not set 1317# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1337,6 +1360,7 @@ CONFIG_LOCKD_V4=y
1337CONFIG_NFS_COMMON=y 1360CONFIG_NFS_COMMON=y
1338CONFIG_SUNRPC=y 1361CONFIG_SUNRPC=y
1339CONFIG_SUNRPC_GSS=y 1362CONFIG_SUNRPC_GSS=y
1363# CONFIG_SUNRPC_REGISTER_V4 is not set
1340CONFIG_RPCSEC_GSS_KRB5=y 1364CONFIG_RPCSEC_GSS_KRB5=y
1341# CONFIG_RPCSEC_GSS_SPKM3 is not set 1365# CONFIG_RPCSEC_GSS_SPKM3 is not set
1342# CONFIG_SMB_FS is not set 1366# CONFIG_SMB_FS is not set
@@ -1373,7 +1397,6 @@ CONFIG_MSDOS_PARTITION=y
1373# Library routines 1397# Library routines
1374# 1398#
1375CONFIG_BITREVERSE=y 1399CONFIG_BITREVERSE=y
1376# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1377# CONFIG_CRC_CCITT is not set 1400# CONFIG_CRC_CCITT is not set
1378# CONFIG_CRC16 is not set 1401# CONFIG_CRC16 is not set
1379# CONFIG_CRC_T10DIF is not set 1402# CONFIG_CRC_T10DIF is not set
@@ -1427,15 +1450,23 @@ CONFIG_SCHED_DEBUG=y
1427# CONFIG_DEBUG_SG is not set 1450# CONFIG_DEBUG_SG is not set
1428# CONFIG_BOOT_PRINTK_DELAY is not set 1451# CONFIG_BOOT_PRINTK_DELAY is not set
1429# CONFIG_RCU_TORTURE_TEST is not set 1452# CONFIG_RCU_TORTURE_TEST is not set
1453# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1430# CONFIG_BACKTRACE_SELF_TEST is not set 1454# CONFIG_BACKTRACE_SELF_TEST is not set
1455# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1431# CONFIG_FAULT_INJECTION is not set 1456# CONFIG_FAULT_INJECTION is not set
1432# CONFIG_LATENCYTOP is not set 1457# CONFIG_LATENCYTOP is not set
1433CONFIG_SYSCTL_SYSCALL_CHECK=y 1458CONFIG_SYSCTL_SYSCALL_CHECK=y
1434CONFIG_HAVE_FTRACE=y 1459CONFIG_HAVE_FUNCTION_TRACER=y
1435CONFIG_HAVE_DYNAMIC_FTRACE=y 1460
1436# CONFIG_FTRACE is not set 1461#
1462# Tracers
1463#
1464# CONFIG_FUNCTION_TRACER is not set
1437# CONFIG_SCHED_TRACER is not set 1465# CONFIG_SCHED_TRACER is not set
1438# CONFIG_CONTEXT_SWITCH_TRACER is not set 1466# CONFIG_CONTEXT_SWITCH_TRACER is not set
1467# CONFIG_BOOT_TRACER is not set
1468# CONFIG_STACK_TRACER is not set
1469# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1439# CONFIG_SAMPLES is not set 1470# CONFIG_SAMPLES is not set
1440CONFIG_HAVE_ARCH_KGDB=y 1471CONFIG_HAVE_ARCH_KGDB=y
1441# CONFIG_KGDB is not set 1472# CONFIG_KGDB is not set
@@ -1444,6 +1475,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1444# CONFIG_DEBUG_PAGEALLOC is not set 1475# CONFIG_DEBUG_PAGEALLOC is not set
1445# CONFIG_CODE_PATCHING_SELFTEST is not set 1476# CONFIG_CODE_PATCHING_SELFTEST is not set
1446# CONFIG_FTR_FIXUP_SELFTEST is not set 1477# CONFIG_FTR_FIXUP_SELFTEST is not set
1478# CONFIG_MSI_BITMAP_SELFTEST is not set
1447# CONFIG_XMON is not set 1479# CONFIG_XMON is not set
1448# CONFIG_IRQSTACKS is not set 1480# CONFIG_IRQSTACKS is not set
1449# CONFIG_BDI_SWITCH is not set 1481# CONFIG_BDI_SWITCH is not set
@@ -1455,14 +1487,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1455# 1487#
1456# CONFIG_KEYS is not set 1488# CONFIG_KEYS is not set
1457# CONFIG_SECURITY is not set 1489# CONFIG_SECURITY is not set
1490# CONFIG_SECURITYFS is not set
1458# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1491# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1459CONFIG_CRYPTO=y 1492CONFIG_CRYPTO=y
1460 1493
1461# 1494#
1462# Crypto core or helper 1495# Crypto core or helper
1463# 1496#
1497# CONFIG_CRYPTO_FIPS is not set
1464CONFIG_CRYPTO_ALGAPI=y 1498CONFIG_CRYPTO_ALGAPI=y
1499CONFIG_CRYPTO_AEAD=y
1465CONFIG_CRYPTO_BLKCIPHER=y 1500CONFIG_CRYPTO_BLKCIPHER=y
1501CONFIG_CRYPTO_HASH=y
1502CONFIG_CRYPTO_RNG=y
1466CONFIG_CRYPTO_MANAGER=y 1503CONFIG_CRYPTO_MANAGER=y
1467# CONFIG_CRYPTO_GF128MUL is not set 1504# CONFIG_CRYPTO_GF128MUL is not set
1468# CONFIG_CRYPTO_NULL is not set 1505# CONFIG_CRYPTO_NULL is not set
@@ -1535,6 +1572,11 @@ CONFIG_CRYPTO_DES=y
1535# 1572#
1536# CONFIG_CRYPTO_DEFLATE is not set 1573# CONFIG_CRYPTO_DEFLATE is not set
1537# CONFIG_CRYPTO_LZO is not set 1574# CONFIG_CRYPTO_LZO is not set
1575
1576#
1577# Random Number Generation
1578#
1579# CONFIG_CRYPTO_ANSI_CPRNG is not set
1538CONFIG_CRYPTO_HW=y 1580CONFIG_CRYPTO_HW=y
1539# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1581# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1540# CONFIG_CRYPTO_DEV_TALITOS is not set 1582# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
index b0a27a67d8c7..aad0e1a98c55 100644
--- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:18 2008 4# Sat Nov 8 12:39:51 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
23# CONFIG_SMP is not set 23# CONFIG_SMP is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -53,8 +53,6 @@ CONFIG_PPC_UDBG_16550=y
53CONFIG_AUDIT_ARCH=y 53CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
55CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
56CONFIG_HIBERNATE_32=y
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
58CONFIG_ARCH_SUSPEND_POSSIBLE=y 56CONFIG_ARCH_SUSPEND_POSSIBLE=y
59# CONFIG_PPC_DCR_NATIVE is not set 57# CONFIG_PPC_DCR_NATIVE is not set
60# CONFIG_PPC_DCR_MMIO is not set 58# CONFIG_PPC_DCR_MMIO is not set
@@ -98,7 +96,6 @@ CONFIG_HOTPLUG=y
98CONFIG_PRINTK=y 96CONFIG_PRINTK=y
99CONFIG_BUG=y 97CONFIG_BUG=y
100CONFIG_ELF_CORE=y 98CONFIG_ELF_CORE=y
101CONFIG_PCSPKR_PLATFORM=y
102CONFIG_COMPAT_BRK=y 99CONFIG_COMPAT_BRK=y
103CONFIG_BASE_FULL=y 100CONFIG_BASE_FULL=y
104CONFIG_FUTEX=y 101CONFIG_FUTEX=y
@@ -108,7 +105,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 105CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 106CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 107CONFIG_SHMEM=y
108CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
110CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 111CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 112# CONFIG_SLAB is not set
114CONFIG_SLUB=y 113CONFIG_SLUB=y
@@ -121,10 +120,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
121CONFIG_HAVE_KPROBES=y 120CONFIG_HAVE_KPROBES=y
122CONFIG_HAVE_KRETPROBES=y 121CONFIG_HAVE_KRETPROBES=y
123CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_DMA_ATTRS is not set
125# CONFIG_USE_GENERIC_SMP_HELPERS is not set
126# CONFIG_HAVE_CLK is not set
127CONFIG_PROC_PAGE_MONITOR=y
128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
129CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
130CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
@@ -157,6 +152,7 @@ CONFIG_DEFAULT_AS=y
157# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
158CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
159CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_FREEZER is not set
160 156
161# 157#
162# Platform support 158# Platform support
@@ -164,10 +160,10 @@ CONFIG_CLASSIC_RCU=y
164CONFIG_PPC_MULTIPLATFORM=y 160CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y 161CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set 162# CONFIG_PPC_CHRP is not set
167# CONFIG_PPC_PMAC is not set
168# CONFIG_MPC5121_ADS is not set 163# CONFIG_MPC5121_ADS is not set
169# CONFIG_MPC5121_GENERIC is not set 164# CONFIG_MPC5121_GENERIC is not set
170# CONFIG_PPC_MPC52xx is not set 165# CONFIG_PPC_MPC52xx is not set
166# CONFIG_PPC_PMAC is not set
171# CONFIG_PPC_CELL is not set 167# CONFIG_PPC_CELL is not set
172# CONFIG_PPC_CELL_NATIVE is not set 168# CONFIG_PPC_CELL_NATIVE is not set
173# CONFIG_PPC_82xx is not set 169# CONFIG_PPC_82xx is not set
@@ -187,24 +183,21 @@ CONFIG_MPC831x_RDB=y
187CONFIG_PPC_MPC831x=y 183CONFIG_PPC_MPC831x=y
188# CONFIG_PPC_86xx is not set 184# CONFIG_PPC_86xx is not set
189# CONFIG_EMBEDDED6xx is not set 185# CONFIG_EMBEDDED6xx is not set
190CONFIG_PPC_NATIVE=y
191# CONFIG_UDBG_RTAS_CONSOLE is not set
192CONFIG_IPIC=y 186CONFIG_IPIC=y
193CONFIG_MPIC=y 187# CONFIG_MPIC is not set
194# CONFIG_MPIC_WEIRD is not set 188# CONFIG_MPIC_WEIRD is not set
195CONFIG_PPC_I8259=y 189# CONFIG_PPC_I8259 is not set
196CONFIG_PPC_RTAS=y 190# CONFIG_PPC_RTAS is not set
197# CONFIG_RTAS_ERROR_LOGGING is not set
198CONFIG_RTAS_PROC=y
199# CONFIG_MMIO_NVRAM is not set 191# CONFIG_MMIO_NVRAM is not set
200CONFIG_PPC_MPC106=y 192# CONFIG_PPC_MPC106 is not set
201# CONFIG_PPC_970_NAP is not set 193# CONFIG_PPC_970_NAP is not set
202# CONFIG_PPC_INDIRECT_IO is not set 194# CONFIG_PPC_INDIRECT_IO is not set
203# CONFIG_GENERIC_IOMAP is not set 195# CONFIG_GENERIC_IOMAP is not set
204# CONFIG_CPU_FREQ is not set 196# CONFIG_CPU_FREQ is not set
205# CONFIG_PPC601_SYNC_FIX is not set
206# CONFIG_TAU is not set 197# CONFIG_TAU is not set
198# CONFIG_QUICC_ENGINE is not set
207# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_MPC8xxx_GPIO is not set
208 201
209# 202#
210# Kernel options 203# Kernel options
@@ -224,6 +217,8 @@ CONFIG_PREEMPT_NONE=y
224# CONFIG_PREEMPT_VOLUNTARY is not set 217# CONFIG_PREEMPT_VOLUNTARY is not set
225# CONFIG_PREEMPT is not set 218# CONFIG_PREEMPT is not set
226CONFIG_BINFMT_ELF=y 219CONFIG_BINFMT_ELF=y
220# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
221# CONFIG_HAVE_AOUT is not set
227# CONFIG_BINFMT_MISC is not set 222# CONFIG_BINFMT_MISC is not set
228# CONFIG_IOMMU_HELPER is not set 223# CONFIG_IOMMU_HELPER is not set
229CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -238,15 +233,15 @@ CONFIG_FLATMEM_MANUAL=y
238# CONFIG_SPARSEMEM_MANUAL is not set 233# CONFIG_SPARSEMEM_MANUAL is not set
239CONFIG_FLATMEM=y 234CONFIG_FLATMEM=y
240CONFIG_FLAT_NODE_MEM_MAP=y 235CONFIG_FLAT_NODE_MEM_MAP=y
241# CONFIG_SPARSEMEM_STATIC is not set
242# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
243CONFIG_PAGEFLAGS_EXTENDED=y 236CONFIG_PAGEFLAGS_EXTENDED=y
244CONFIG_SPLIT_PTLOCK_CPUS=4 237CONFIG_SPLIT_PTLOCK_CPUS=4
245CONFIG_MIGRATION=y 238CONFIG_MIGRATION=y
246# CONFIG_RESOURCES_64BIT is not set 239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set
247CONFIG_ZONE_DMA_FLAG=1 241CONFIG_ZONE_DMA_FLAG=1
248CONFIG_BOUNCE=y 242CONFIG_BOUNCE=y
249CONFIG_VIRT_TO_BUS=y 243CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y
250CONFIG_FORCE_MAX_ZONEORDER=11 245CONFIG_FORCE_MAX_ZONEORDER=11
251CONFIG_PROC_DEVICETREE=y 246CONFIG_PROC_DEVICETREE=y
252# CONFIG_CMDLINE_BOOL is not set 247# CONFIG_CMDLINE_BOOL is not set
@@ -258,7 +253,6 @@ CONFIG_ISA_DMA_API=y
258# 253#
259# Bus options 254# Bus options
260# 255#
261# CONFIG_ISA is not set
262CONFIG_ZONE_DMA=y 256CONFIG_ZONE_DMA=y
263CONFIG_GENERIC_ISA_DMA=y 257CONFIG_GENERIC_ISA_DMA=y
264CONFIG_PPC_INDIRECT_PCI=y 258CONFIG_PPC_INDIRECT_PCI=y
@@ -271,7 +265,7 @@ CONFIG_PCI_SYSCALL=y
271# CONFIG_PCIEPORTBUS is not set 265# CONFIG_PCIEPORTBUS is not set
272CONFIG_ARCH_SUPPORTS_MSI=y 266CONFIG_ARCH_SUPPORTS_MSI=y
273# CONFIG_PCI_MSI is not set 267# CONFIG_PCI_MSI is not set
274CONFIG_PCI_LEGACY=y 268# CONFIG_PCI_LEGACY is not set
275# CONFIG_PCI_DEBUG is not set 269# CONFIG_PCI_DEBUG is not set
276# CONFIG_PCCARD is not set 270# CONFIG_PCCARD is not set
277# CONFIG_HOTPLUG_PCI is not set 271# CONFIG_HOTPLUG_PCI is not set
@@ -340,6 +334,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
340# CONFIG_TIPC is not set 334# CONFIG_TIPC is not set
341# CONFIG_ATM is not set 335# CONFIG_ATM is not set
342# CONFIG_BRIDGE is not set 336# CONFIG_BRIDGE is not set
337# CONFIG_NET_DSA is not set
343# CONFIG_VLAN_8021Q is not set 338# CONFIG_VLAN_8021Q is not set
344# CONFIG_DECNET is not set 339# CONFIG_DECNET is not set
345# CONFIG_LLC2 is not set 340# CONFIG_LLC2 is not set
@@ -360,11 +355,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
360# CONFIG_IRDA is not set 355# CONFIG_IRDA is not set
361# CONFIG_BT is not set 356# CONFIG_BT is not set
362# CONFIG_AF_RXRPC is not set 357# CONFIG_AF_RXRPC is not set
363 358# CONFIG_PHONET is not set
364# 359CONFIG_WIRELESS=y
365# Wireless
366#
367# CONFIG_CFG80211 is not set 360# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y
368# CONFIG_WIRELESS_EXT is not set 362# CONFIG_WIRELESS_EXT is not set
369# CONFIG_MAC80211 is not set 363# CONFIG_MAC80211 is not set
370# CONFIG_IEEE80211 is not set 364# CONFIG_IEEE80211 is not set
@@ -470,6 +464,7 @@ CONFIG_MTD_NAND_IDS=y
470# CONFIG_MTD_NAND_PLATFORM is not set 464# CONFIG_MTD_NAND_PLATFORM is not set
471# CONFIG_MTD_ALAUDA is not set 465# CONFIG_MTD_ALAUDA is not set
472# CONFIG_MTD_NAND_FSL_ELBC is not set 466# CONFIG_MTD_NAND_FSL_ELBC is not set
467# CONFIG_MTD_NAND_FSL_UPM is not set
473# CONFIG_MTD_ONENAND is not set 468# CONFIG_MTD_ONENAND is not set
474 469
475# 470#
@@ -482,7 +477,6 @@ CONFIG_OF_SPI=y
482# CONFIG_PARPORT is not set 477# CONFIG_PARPORT is not set
483CONFIG_BLK_DEV=y 478CONFIG_BLK_DEV=y
484# CONFIG_BLK_DEV_FD is not set 479# CONFIG_BLK_DEV_FD is not set
485# CONFIG_MAC_FLOPPY is not set
486# CONFIG_BLK_CPQ_DA is not set 480# CONFIG_BLK_CPQ_DA is not set
487# CONFIG_BLK_CPQ_CISS_DA is not set 481# CONFIG_BLK_CPQ_CISS_DA is not set
488# CONFIG_BLK_DEV_DAC960 is not set 482# CONFIG_BLK_DEV_DAC960 is not set
@@ -584,8 +578,6 @@ CONFIG_SCSI_LOWLEVEL=y
584# CONFIG_SCSI_DC390T is not set 578# CONFIG_SCSI_DC390T is not set
585# CONFIG_SCSI_NSP32 is not set 579# CONFIG_SCSI_NSP32 is not set
586# CONFIG_SCSI_DEBUG is not set 580# CONFIG_SCSI_DEBUG is not set
587# CONFIG_SCSI_MESH is not set
588# CONFIG_SCSI_MAC53C94 is not set
589# CONFIG_SCSI_SRP is not set 581# CONFIG_SCSI_SRP is not set
590# CONFIG_SCSI_DH is not set 582# CONFIG_SCSI_DH is not set
591CONFIG_ATA=y 583CONFIG_ATA=y
@@ -651,6 +643,7 @@ CONFIG_ATA_SFF=y
651# CONFIG_PATA_SCH is not set 643# CONFIG_PATA_SCH is not set
652CONFIG_MD=y 644CONFIG_MD=y
653CONFIG_BLK_DEV_MD=y 645CONFIG_BLK_DEV_MD=y
646CONFIG_MD_AUTODETECT=y
654CONFIG_MD_LINEAR=y 647CONFIG_MD_LINEAR=y
655CONFIG_MD_RAID0=y 648CONFIG_MD_RAID0=y
656CONFIG_MD_RAID1=y 649CONFIG_MD_RAID1=y
@@ -699,8 +692,6 @@ CONFIG_PHYLIB=y
699# CONFIG_MDIO_BITBANG is not set 692# CONFIG_MDIO_BITBANG is not set
700CONFIG_NET_ETHERNET=y 693CONFIG_NET_ETHERNET=y
701CONFIG_MII=y 694CONFIG_MII=y
702# CONFIG_MACE is not set
703# CONFIG_BMAC is not set
704# CONFIG_HAPPYMEAL is not set 695# CONFIG_HAPPYMEAL is not set
705# CONFIG_SUNGEM is not set 696# CONFIG_SUNGEM is not set
706# CONFIG_CASSINI is not set 697# CONFIG_CASSINI is not set
@@ -712,6 +703,9 @@ CONFIG_MII=y
712# CONFIG_IBM_NEW_EMAC_RGMII is not set 703# CONFIG_IBM_NEW_EMAC_RGMII is not set
713# CONFIG_IBM_NEW_EMAC_TAH is not set 704# CONFIG_IBM_NEW_EMAC_TAH is not set
714# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 705# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
706# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
707# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
708# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
715CONFIG_NET_PCI=y 709CONFIG_NET_PCI=y
716# CONFIG_PCNET32 is not set 710# CONFIG_PCNET32 is not set
717# CONFIG_AMD8111_ETH is not set 711# CONFIG_AMD8111_ETH is not set
@@ -732,6 +726,7 @@ CONFIG_E100=y
732# CONFIG_TLAN is not set 726# CONFIG_TLAN is not set
733# CONFIG_VIA_RHINE is not set 727# CONFIG_VIA_RHINE is not set
734# CONFIG_SC92031 is not set 728# CONFIG_SC92031 is not set
729# CONFIG_ATL2 is not set
735CONFIG_NETDEV_1000=y 730CONFIG_NETDEV_1000=y
736# CONFIG_ACENIC is not set 731# CONFIG_ACENIC is not set
737# CONFIG_DL2K is not set 732# CONFIG_DL2K is not set
@@ -754,18 +749,22 @@ CONFIG_GIANFAR=y
754# CONFIG_QLA3XXX is not set 749# CONFIG_QLA3XXX is not set
755# CONFIG_ATL1 is not set 750# CONFIG_ATL1 is not set
756# CONFIG_ATL1E is not set 751# CONFIG_ATL1E is not set
752# CONFIG_JME is not set
757CONFIG_NETDEV_10000=y 753CONFIG_NETDEV_10000=y
758# CONFIG_CHELSIO_T1 is not set 754# CONFIG_CHELSIO_T1 is not set
759# CONFIG_CHELSIO_T3 is not set 755# CONFIG_CHELSIO_T3 is not set
756# CONFIG_ENIC is not set
760# CONFIG_IXGBE is not set 757# CONFIG_IXGBE is not set
761# CONFIG_IXGB is not set 758# CONFIG_IXGB is not set
762# CONFIG_S2IO is not set 759# CONFIG_S2IO is not set
763# CONFIG_MYRI10GE is not set 760# CONFIG_MYRI10GE is not set
764# CONFIG_NETXEN_NIC is not set 761# CONFIG_NETXEN_NIC is not set
765# CONFIG_NIU is not set 762# CONFIG_NIU is not set
763# CONFIG_MLX4_EN is not set
766# CONFIG_MLX4_CORE is not set 764# CONFIG_MLX4_CORE is not set
767# CONFIG_TEHUTI is not set 765# CONFIG_TEHUTI is not set
768# CONFIG_BNX2X is not set 766# CONFIG_BNX2X is not set
767# CONFIG_QLGE is not set
769# CONFIG_SFC is not set 768# CONFIG_SFC is not set
770# CONFIG_TR is not set 769# CONFIG_TR is not set
771 770
@@ -851,14 +850,11 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
851# CONFIG_SERIAL_UARTLITE is not set 850# CONFIG_SERIAL_UARTLITE is not set
852CONFIG_SERIAL_CORE=y 851CONFIG_SERIAL_CORE=y
853CONFIG_SERIAL_CORE_CONSOLE=y 852CONFIG_SERIAL_CORE_CONSOLE=y
854# CONFIG_SERIAL_PMACZILOG is not set
855# CONFIG_SERIAL_JSM is not set 853# CONFIG_SERIAL_JSM is not set
856# CONFIG_SERIAL_OF_PLATFORM is not set 854# CONFIG_SERIAL_OF_PLATFORM is not set
857CONFIG_UNIX98_PTYS=y 855CONFIG_UNIX98_PTYS=y
858CONFIG_LEGACY_PTYS=y 856CONFIG_LEGACY_PTYS=y
859CONFIG_LEGACY_PTY_COUNT=256 857CONFIG_LEGACY_PTY_COUNT=256
860# CONFIG_BRIQ_PANEL is not set
861# CONFIG_HVC_RTAS is not set
862# CONFIG_IPMI_HANDLER is not set 858# CONFIG_IPMI_HANDLER is not set
863CONFIG_HW_RANDOM=y 859CONFIG_HW_RANDOM=y
864# CONFIG_NVRAM is not set 860# CONFIG_NVRAM is not set
@@ -895,12 +891,6 @@ CONFIG_I2C_HELPER_AUTO=y
895# CONFIG_I2C_VIAPRO is not set 891# CONFIG_I2C_VIAPRO is not set
896 892
897# 893#
898# Mac SMBus host controller drivers
899#
900# CONFIG_I2C_HYDRA is not set
901CONFIG_I2C_POWERMAC=y
902
903#
904# I2C system bus drivers (mostly embedded / system-on-chip) 894# I2C system bus drivers (mostly embedded / system-on-chip)
905# 895#
906CONFIG_I2C_MPC=y 896CONFIG_I2C_MPC=y
@@ -937,6 +927,7 @@ CONFIG_I2C_MPC=y
937# CONFIG_SENSORS_PCF8591 is not set 927# CONFIG_SENSORS_PCF8591 is not set
938# CONFIG_SENSORS_MAX6875 is not set 928# CONFIG_SENSORS_MAX6875 is not set
939# CONFIG_SENSORS_TSL2550 is not set 929# CONFIG_SENSORS_TSL2550 is not set
930# CONFIG_MCU_MPC8349EMITX is not set
940# CONFIG_I2C_DEBUG_CORE is not set 931# CONFIG_I2C_DEBUG_CORE is not set
941# CONFIG_I2C_DEBUG_ALGO is not set 932# CONFIG_I2C_DEBUG_ALGO is not set
942# CONFIG_I2C_DEBUG_BUS is not set 933# CONFIG_I2C_DEBUG_BUS is not set
@@ -974,7 +965,6 @@ CONFIG_HWMON=y
974# CONFIG_SENSORS_ADM9240 is not set 965# CONFIG_SENSORS_ADM9240 is not set
975# CONFIG_SENSORS_ADT7470 is not set 966# CONFIG_SENSORS_ADT7470 is not set
976# CONFIG_SENSORS_ADT7473 is not set 967# CONFIG_SENSORS_ADT7473 is not set
977# CONFIG_SENSORS_AMS is not set
978# CONFIG_SENSORS_ATXP1 is not set 968# CONFIG_SENSORS_ATXP1 is not set
979# CONFIG_SENSORS_DS1621 is not set 969# CONFIG_SENSORS_DS1621 is not set
980# CONFIG_SENSORS_I5K_AMB is not set 970# CONFIG_SENSORS_I5K_AMB is not set
@@ -996,6 +986,7 @@ CONFIG_HWMON=y
996# CONFIG_SENSORS_LM90 is not set 986# CONFIG_SENSORS_LM90 is not set
997# CONFIG_SENSORS_LM92 is not set 987# CONFIG_SENSORS_LM92 is not set
998# CONFIG_SENSORS_LM93 is not set 988# CONFIG_SENSORS_LM93 is not set
989# CONFIG_SENSORS_MAX1111 is not set
999# CONFIG_SENSORS_MAX1619 is not set 990# CONFIG_SENSORS_MAX1619 is not set
1000# CONFIG_SENSORS_MAX6650 is not set 991# CONFIG_SENSORS_MAX6650 is not set
1001# CONFIG_SENSORS_PC87360 is not set 992# CONFIG_SENSORS_PC87360 is not set
@@ -1030,7 +1021,6 @@ CONFIG_WATCHDOG=y
1030# CONFIG_SOFT_WATCHDOG is not set 1021# CONFIG_SOFT_WATCHDOG is not set
1031# CONFIG_ALIM7101_WDT is not set 1022# CONFIG_ALIM7101_WDT is not set
1032# CONFIG_8xxx_WDT is not set 1023# CONFIG_8xxx_WDT is not set
1033# CONFIG_WATCHDOG_RTAS is not set
1034 1024
1035# 1025#
1036# PCI-based Watchdog Cards 1026# PCI-based Watchdog Cards
@@ -1056,6 +1046,17 @@ CONFIG_SSB_POSSIBLE=y
1056# CONFIG_MFD_SM501 is not set 1046# CONFIG_MFD_SM501 is not set
1057# CONFIG_HTC_PASIC3 is not set 1047# CONFIG_HTC_PASIC3 is not set
1058# CONFIG_MFD_TMIO is not set 1048# CONFIG_MFD_TMIO is not set
1049# CONFIG_PMIC_DA903X is not set
1050# CONFIG_MFD_WM8400 is not set
1051# CONFIG_MFD_WM8350_I2C is not set
1052
1053#
1054# Voltage and Current regulators
1055#
1056# CONFIG_REGULATOR is not set
1057# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1058# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1059# CONFIG_REGULATOR_BQ24022 is not set
1059 1060
1060# 1061#
1061# Multimedia devices 1062# Multimedia devices
@@ -1098,12 +1099,18 @@ CONFIG_HID=y
1098# USB Input Devices 1099# USB Input Devices
1099# 1100#
1100# CONFIG_USB_HID is not set 1101# CONFIG_USB_HID is not set
1102# CONFIG_HID_PID is not set
1101 1103
1102# 1104#
1103# USB HID Boot Protocol drivers 1105# USB HID Boot Protocol drivers
1104# 1106#
1105# CONFIG_USB_KBD is not set 1107# CONFIG_USB_KBD is not set
1106# CONFIG_USB_MOUSE is not set 1108# CONFIG_USB_MOUSE is not set
1109
1110#
1111# Special HID drivers
1112#
1113CONFIG_HID_COMPAT=y
1107CONFIG_USB_SUPPORT=y 1114CONFIG_USB_SUPPORT=y
1108CONFIG_USB_ARCH_HAS_HCD=y 1115CONFIG_USB_ARCH_HAS_HCD=y
1109CONFIG_USB_ARCH_HAS_OHCI=y 1116CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1122,6 +1129,8 @@ CONFIG_USB_DEVICE_CLASS=y
1122# CONFIG_USB_OTG_WHITELIST is not set 1129# CONFIG_USB_OTG_WHITELIST is not set
1123# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1130# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1124CONFIG_USB_MON=y 1131CONFIG_USB_MON=y
1132# CONFIG_USB_WUSB is not set
1133# CONFIG_USB_WUSB_CBAF is not set
1125 1134
1126# 1135#
1127# USB Host Controller Drivers 1136# USB Host Controller Drivers
@@ -1145,6 +1154,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1145CONFIG_USB_UHCI_HCD=y 1154CONFIG_USB_UHCI_HCD=y
1146# CONFIG_USB_SL811_HCD is not set 1155# CONFIG_USB_SL811_HCD is not set
1147# CONFIG_USB_R8A66597_HCD is not set 1156# CONFIG_USB_R8A66597_HCD is not set
1157# CONFIG_USB_WHCI_HCD is not set
1158# CONFIG_USB_HWA_HCD is not set
1148# CONFIG_USB_GADGET_MUSB_HDRC is not set 1159# CONFIG_USB_GADGET_MUSB_HDRC is not set
1149 1160
1150# 1161#
@@ -1153,6 +1164,7 @@ CONFIG_USB_UHCI_HCD=y
1153# CONFIG_USB_ACM is not set 1164# CONFIG_USB_ACM is not set
1154# CONFIG_USB_PRINTER is not set 1165# CONFIG_USB_PRINTER is not set
1155# CONFIG_USB_WDM is not set 1166# CONFIG_USB_WDM is not set
1167# CONFIG_USB_TMC is not set
1156 1168
1157# 1169#
1158# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1170# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1174,7 +1186,6 @@ CONFIG_USB_STORAGE=y
1174# CONFIG_USB_STORAGE_ALAUDA is not set 1186# CONFIG_USB_STORAGE_ALAUDA is not set
1175# CONFIG_USB_STORAGE_ONETOUCH is not set 1187# CONFIG_USB_STORAGE_ONETOUCH is not set
1176# CONFIG_USB_STORAGE_KARMA is not set 1188# CONFIG_USB_STORAGE_KARMA is not set
1177# CONFIG_USB_STORAGE_SIERRA is not set
1178# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1189# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1179# CONFIG_USB_LIBUSUAL is not set 1190# CONFIG_USB_LIBUSUAL is not set
1180 1191
@@ -1195,6 +1206,7 @@ CONFIG_USB_STORAGE=y
1195# CONFIG_USB_EMI62 is not set 1206# CONFIG_USB_EMI62 is not set
1196# CONFIG_USB_EMI26 is not set 1207# CONFIG_USB_EMI26 is not set
1197# CONFIG_USB_ADUTUX is not set 1208# CONFIG_USB_ADUTUX is not set
1209# CONFIG_USB_SEVSEG is not set
1198# CONFIG_USB_RIO500 is not set 1210# CONFIG_USB_RIO500 is not set
1199# CONFIG_USB_LEGOTOWER is not set 1211# CONFIG_USB_LEGOTOWER is not set
1200# CONFIG_USB_LCD is not set 1212# CONFIG_USB_LCD is not set
@@ -1212,23 +1224,26 @@ CONFIG_USB_STORAGE=y
1212# CONFIG_USB_IOWARRIOR is not set 1224# CONFIG_USB_IOWARRIOR is not set
1213# CONFIG_USB_TEST is not set 1225# CONFIG_USB_TEST is not set
1214# CONFIG_USB_ISIGHTFW is not set 1226# CONFIG_USB_ISIGHTFW is not set
1227# CONFIG_USB_VST is not set
1215CONFIG_USB_GADGET=y 1228CONFIG_USB_GADGET=y
1216# CONFIG_USB_GADGET_DEBUG is not set 1229# CONFIG_USB_GADGET_DEBUG is not set
1217# CONFIG_USB_GADGET_DEBUG_FILES is not set 1230# CONFIG_USB_GADGET_DEBUG_FILES is not set
1231CONFIG_USB_GADGET_VBUS_DRAW=2
1218CONFIG_USB_GADGET_SELECTED=y 1232CONFIG_USB_GADGET_SELECTED=y
1219# CONFIG_USB_GADGET_AMD5536UDC is not set 1233# CONFIG_USB_GADGET_AT91 is not set
1220# CONFIG_USB_GADGET_ATMEL_USBA is not set 1234# CONFIG_USB_GADGET_ATMEL_USBA is not set
1221# CONFIG_USB_GADGET_FSL_USB2 is not set 1235# CONFIG_USB_GADGET_FSL_USB2 is not set
1222CONFIG_USB_GADGET_NET2280=y
1223CONFIG_USB_NET2280=y
1224# CONFIG_USB_GADGET_PXA25X is not set
1225# CONFIG_USB_GADGET_M66592 is not set
1226# CONFIG_USB_GADGET_PXA27X is not set
1227# CONFIG_USB_GADGET_GOKU is not set
1228# CONFIG_USB_GADGET_LH7A40X is not set 1236# CONFIG_USB_GADGET_LH7A40X is not set
1229# CONFIG_USB_GADGET_OMAP is not set 1237# CONFIG_USB_GADGET_OMAP is not set
1238# CONFIG_USB_GADGET_PXA25X is not set
1239# CONFIG_USB_GADGET_PXA27X is not set
1230# CONFIG_USB_GADGET_S3C2410 is not set 1240# CONFIG_USB_GADGET_S3C2410 is not set
1231# CONFIG_USB_GADGET_AT91 is not set 1241# CONFIG_USB_GADGET_M66592 is not set
1242# CONFIG_USB_GADGET_AMD5536UDC is not set
1243# CONFIG_USB_GADGET_FSL_QE is not set
1244CONFIG_USB_GADGET_NET2280=y
1245CONFIG_USB_NET2280=y
1246# CONFIG_USB_GADGET_GOKU is not set
1232# CONFIG_USB_GADGET_DUMMY_HCD is not set 1247# CONFIG_USB_GADGET_DUMMY_HCD is not set
1233CONFIG_USB_GADGET_DUALSPEED=y 1248CONFIG_USB_GADGET_DUALSPEED=y
1234# CONFIG_USB_ZERO is not set 1249# CONFIG_USB_ZERO is not set
@@ -1240,6 +1255,7 @@ CONFIG_USB_ETH_RNDIS=y
1240# CONFIG_USB_MIDI_GADGET is not set 1255# CONFIG_USB_MIDI_GADGET is not set
1241# CONFIG_USB_G_PRINTER is not set 1256# CONFIG_USB_G_PRINTER is not set
1242# CONFIG_USB_CDC_COMPOSITE is not set 1257# CONFIG_USB_CDC_COMPOSITE is not set
1258# CONFIG_UWB is not set
1243# CONFIG_MMC is not set 1259# CONFIG_MMC is not set
1244# CONFIG_MEMSTICK is not set 1260# CONFIG_MEMSTICK is not set
1245# CONFIG_NEW_LEDS is not set 1261# CONFIG_NEW_LEDS is not set
@@ -1285,17 +1301,21 @@ CONFIG_RTC_DRV_DS1307=y
1285# CONFIG_RTC_DRV_MAX6902 is not set 1301# CONFIG_RTC_DRV_MAX6902 is not set
1286# CONFIG_RTC_DRV_R9701 is not set 1302# CONFIG_RTC_DRV_R9701 is not set
1287# CONFIG_RTC_DRV_RS5C348 is not set 1303# CONFIG_RTC_DRV_RS5C348 is not set
1304# CONFIG_RTC_DRV_DS3234 is not set
1288 1305
1289# 1306#
1290# Platform RTC drivers 1307# Platform RTC drivers
1291# 1308#
1292# CONFIG_RTC_DRV_CMOS is not set 1309# CONFIG_RTC_DRV_CMOS is not set
1310# CONFIG_RTC_DRV_DS1286 is not set
1293# CONFIG_RTC_DRV_DS1511 is not set 1311# CONFIG_RTC_DRV_DS1511 is not set
1294# CONFIG_RTC_DRV_DS1553 is not set 1312# CONFIG_RTC_DRV_DS1553 is not set
1295# CONFIG_RTC_DRV_DS1742 is not set 1313# CONFIG_RTC_DRV_DS1742 is not set
1296# CONFIG_RTC_DRV_STK17TA8 is not set 1314# CONFIG_RTC_DRV_STK17TA8 is not set
1297# CONFIG_RTC_DRV_M48T86 is not set 1315# CONFIG_RTC_DRV_M48T86 is not set
1316# CONFIG_RTC_DRV_M48T35 is not set
1298# CONFIG_RTC_DRV_M48T59 is not set 1317# CONFIG_RTC_DRV_M48T59 is not set
1318# CONFIG_RTC_DRV_BQ4802 is not set
1299# CONFIG_RTC_DRV_V3020 is not set 1319# CONFIG_RTC_DRV_V3020 is not set
1300 1320
1301# 1321#
@@ -1304,6 +1324,7 @@ CONFIG_RTC_DRV_DS1307=y
1304# CONFIG_RTC_DRV_PPC is not set 1324# CONFIG_RTC_DRV_PPC is not set
1305# CONFIG_DMADEVICES is not set 1325# CONFIG_DMADEVICES is not set
1306# CONFIG_UIO is not set 1326# CONFIG_UIO is not set
1327# CONFIG_STAGING is not set
1307 1328
1308# 1329#
1309# File systems 1330# File systems
@@ -1315,12 +1336,13 @@ CONFIG_EXT3_FS=y
1315CONFIG_EXT3_FS_XATTR=y 1336CONFIG_EXT3_FS_XATTR=y
1316# CONFIG_EXT3_FS_POSIX_ACL is not set 1337# CONFIG_EXT3_FS_POSIX_ACL is not set
1317# CONFIG_EXT3_FS_SECURITY is not set 1338# CONFIG_EXT3_FS_SECURITY is not set
1318# CONFIG_EXT4DEV_FS is not set 1339# CONFIG_EXT4_FS is not set
1319CONFIG_JBD=y 1340CONFIG_JBD=y
1320CONFIG_FS_MBCACHE=y 1341CONFIG_FS_MBCACHE=y
1321# CONFIG_REISERFS_FS is not set 1342# CONFIG_REISERFS_FS is not set
1322# CONFIG_JFS_FS is not set 1343# CONFIG_JFS_FS is not set
1323# CONFIG_FS_POSIX_ACL is not set 1344# CONFIG_FS_POSIX_ACL is not set
1345CONFIG_FILE_LOCKING=y
1324# CONFIG_XFS_FS is not set 1346# CONFIG_XFS_FS is not set
1325# CONFIG_OCFS2_FS is not set 1347# CONFIG_OCFS2_FS is not set
1326CONFIG_DNOTIFY=y 1348CONFIG_DNOTIFY=y
@@ -1350,6 +1372,7 @@ CONFIG_INOTIFY_USER=y
1350CONFIG_PROC_FS=y 1372CONFIG_PROC_FS=y
1351CONFIG_PROC_KCORE=y 1373CONFIG_PROC_KCORE=y
1352CONFIG_PROC_SYSCTL=y 1374CONFIG_PROC_SYSCTL=y
1375CONFIG_PROC_PAGE_MONITOR=y
1353CONFIG_SYSFS=y 1376CONFIG_SYSFS=y
1354CONFIG_TMPFS=y 1377CONFIG_TMPFS=y
1355# CONFIG_TMPFS_POSIX_ACL is not set 1378# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1398,6 +1421,7 @@ CONFIG_LOCKD_V4=y
1398CONFIG_NFS_COMMON=y 1421CONFIG_NFS_COMMON=y
1399CONFIG_SUNRPC=y 1422CONFIG_SUNRPC=y
1400CONFIG_SUNRPC_GSS=y 1423CONFIG_SUNRPC_GSS=y
1424# CONFIG_SUNRPC_REGISTER_V4 is not set
1401CONFIG_RPCSEC_GSS_KRB5=y 1425CONFIG_RPCSEC_GSS_KRB5=y
1402# CONFIG_RPCSEC_GSS_SPKM3 is not set 1426# CONFIG_RPCSEC_GSS_SPKM3 is not set
1403# CONFIG_SMB_FS is not set 1427# CONFIG_SMB_FS is not set
@@ -1434,7 +1458,6 @@ CONFIG_MSDOS_PARTITION=y
1434# Library routines 1458# Library routines
1435# 1459#
1436CONFIG_BITREVERSE=y 1460CONFIG_BITREVERSE=y
1437# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1438# CONFIG_CRC_CCITT is not set 1461# CONFIG_CRC_CCITT is not set
1439# CONFIG_CRC16 is not set 1462# CONFIG_CRC16 is not set
1440# CONFIG_CRC_T10DIF is not set 1463# CONFIG_CRC_T10DIF is not set
@@ -1488,15 +1511,23 @@ CONFIG_SCHED_DEBUG=y
1488# CONFIG_DEBUG_SG is not set 1511# CONFIG_DEBUG_SG is not set
1489# CONFIG_BOOT_PRINTK_DELAY is not set 1512# CONFIG_BOOT_PRINTK_DELAY is not set
1490# CONFIG_RCU_TORTURE_TEST is not set 1513# CONFIG_RCU_TORTURE_TEST is not set
1514# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1491# CONFIG_BACKTRACE_SELF_TEST is not set 1515# CONFIG_BACKTRACE_SELF_TEST is not set
1516# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1492# CONFIG_FAULT_INJECTION is not set 1517# CONFIG_FAULT_INJECTION is not set
1493# CONFIG_LATENCYTOP is not set 1518# CONFIG_LATENCYTOP is not set
1494CONFIG_SYSCTL_SYSCALL_CHECK=y 1519CONFIG_SYSCTL_SYSCALL_CHECK=y
1495CONFIG_HAVE_FTRACE=y 1520CONFIG_HAVE_FUNCTION_TRACER=y
1496CONFIG_HAVE_DYNAMIC_FTRACE=y 1521
1497# CONFIG_FTRACE is not set 1522#
1523# Tracers
1524#
1525# CONFIG_FUNCTION_TRACER is not set
1498# CONFIG_SCHED_TRACER is not set 1526# CONFIG_SCHED_TRACER is not set
1499# CONFIG_CONTEXT_SWITCH_TRACER is not set 1527# CONFIG_CONTEXT_SWITCH_TRACER is not set
1528# CONFIG_BOOT_TRACER is not set
1529# CONFIG_STACK_TRACER is not set
1530# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1500# CONFIG_SAMPLES is not set 1531# CONFIG_SAMPLES is not set
1501CONFIG_HAVE_ARCH_KGDB=y 1532CONFIG_HAVE_ARCH_KGDB=y
1502# CONFIG_KGDB is not set 1533# CONFIG_KGDB is not set
@@ -1505,6 +1536,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1505# CONFIG_DEBUG_PAGEALLOC is not set 1536# CONFIG_DEBUG_PAGEALLOC is not set
1506# CONFIG_CODE_PATCHING_SELFTEST is not set 1537# CONFIG_CODE_PATCHING_SELFTEST is not set
1507# CONFIG_FTR_FIXUP_SELFTEST is not set 1538# CONFIG_FTR_FIXUP_SELFTEST is not set
1539# CONFIG_MSI_BITMAP_SELFTEST is not set
1508# CONFIG_XMON is not set 1540# CONFIG_XMON is not set
1509# CONFIG_IRQSTACKS is not set 1541# CONFIG_IRQSTACKS is not set
1510# CONFIG_BDI_SWITCH is not set 1542# CONFIG_BDI_SWITCH is not set
@@ -1516,14 +1548,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1516# 1548#
1517# CONFIG_KEYS is not set 1549# CONFIG_KEYS is not set
1518# CONFIG_SECURITY is not set 1550# CONFIG_SECURITY is not set
1551# CONFIG_SECURITYFS is not set
1519# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1552# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1520CONFIG_CRYPTO=y 1553CONFIG_CRYPTO=y
1521 1554
1522# 1555#
1523# Crypto core or helper 1556# Crypto core or helper
1524# 1557#
1558# CONFIG_CRYPTO_FIPS is not set
1525CONFIG_CRYPTO_ALGAPI=y 1559CONFIG_CRYPTO_ALGAPI=y
1560CONFIG_CRYPTO_AEAD=y
1526CONFIG_CRYPTO_BLKCIPHER=y 1561CONFIG_CRYPTO_BLKCIPHER=y
1562CONFIG_CRYPTO_HASH=y
1563CONFIG_CRYPTO_RNG=y
1527CONFIG_CRYPTO_MANAGER=y 1564CONFIG_CRYPTO_MANAGER=y
1528# CONFIG_CRYPTO_GF128MUL is not set 1565# CONFIG_CRYPTO_GF128MUL is not set
1529# CONFIG_CRYPTO_NULL is not set 1566# CONFIG_CRYPTO_NULL is not set
@@ -1596,6 +1633,11 @@ CONFIG_CRYPTO_DES=y
1596# 1633#
1597# CONFIG_CRYPTO_DEFLATE is not set 1634# CONFIG_CRYPTO_DEFLATE is not set
1598# CONFIG_CRYPTO_LZO is not set 1635# CONFIG_CRYPTO_LZO is not set
1636
1637#
1638# Random Number Generation
1639#
1640# CONFIG_CRYPTO_ANSI_CPRNG is not set
1599CONFIG_CRYPTO_HW=y 1641CONFIG_CRYPTO_HW=y
1600# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1642# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1601# CONFIG_CRYPTO_DEV_TALITOS is not set 1643# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
index ad825bcddd1f..9cb8c8b956e4 100644
--- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:18 2008 4# Sat Nov 8 12:39:53 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
23# CONFIG_SMP is not set 23# CONFIG_SMP is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -53,8 +53,6 @@ CONFIG_PPC_UDBG_16550=y
53CONFIG_AUDIT_ARCH=y 53CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
55CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
56CONFIG_HIBERNATE_32=y
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
58CONFIG_ARCH_SUSPEND_POSSIBLE=y 56CONFIG_ARCH_SUSPEND_POSSIBLE=y
59# CONFIG_PPC_DCR_NATIVE is not set 57# CONFIG_PPC_DCR_NATIVE is not set
60# CONFIG_PPC_DCR_MMIO is not set 58# CONFIG_PPC_DCR_MMIO is not set
@@ -98,7 +96,6 @@ CONFIG_HOTPLUG=y
98CONFIG_PRINTK=y 96CONFIG_PRINTK=y
99CONFIG_BUG=y 97CONFIG_BUG=y
100CONFIG_ELF_CORE=y 98CONFIG_ELF_CORE=y
101CONFIG_PCSPKR_PLATFORM=y
102CONFIG_COMPAT_BRK=y 99CONFIG_COMPAT_BRK=y
103CONFIG_BASE_FULL=y 100CONFIG_BASE_FULL=y
104CONFIG_FUTEX=y 101CONFIG_FUTEX=y
@@ -108,7 +105,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 105CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 106CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 107CONFIG_SHMEM=y
108CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
110CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 111CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 112# CONFIG_SLAB is not set
114CONFIG_SLUB=y 113CONFIG_SLUB=y
@@ -121,10 +120,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
121CONFIG_HAVE_KPROBES=y 120CONFIG_HAVE_KPROBES=y
122CONFIG_HAVE_KRETPROBES=y 121CONFIG_HAVE_KRETPROBES=y
123CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_DMA_ATTRS is not set
125# CONFIG_USE_GENERIC_SMP_HELPERS is not set
126# CONFIG_HAVE_CLK is not set
127CONFIG_PROC_PAGE_MONITOR=y
128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
129CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
130CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
@@ -157,6 +152,7 @@ CONFIG_DEFAULT_AS=y
157# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
158CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
159CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_FREEZER is not set
160 156
161# 157#
162# Platform support 158# Platform support
@@ -164,10 +160,10 @@ CONFIG_CLASSIC_RCU=y
164CONFIG_PPC_MULTIPLATFORM=y 160CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y 161CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set 162# CONFIG_PPC_CHRP is not set
167# CONFIG_PPC_PMAC is not set
168# CONFIG_MPC5121_ADS is not set 163# CONFIG_MPC5121_ADS is not set
169# CONFIG_MPC5121_GENERIC is not set 164# CONFIG_MPC5121_GENERIC is not set
170# CONFIG_PPC_MPC52xx is not set 165# CONFIG_PPC_MPC52xx is not set
166# CONFIG_PPC_PMAC is not set
171# CONFIG_PPC_CELL is not set 167# CONFIG_PPC_CELL is not set
172# CONFIG_PPC_CELL_NATIVE is not set 168# CONFIG_PPC_CELL_NATIVE is not set
173# CONFIG_PPC_82xx is not set 169# CONFIG_PPC_82xx is not set
@@ -187,24 +183,20 @@ CONFIG_MPC832x_MDS=y
187CONFIG_PPC_MPC832x=y 183CONFIG_PPC_MPC832x=y
188# CONFIG_PPC_86xx is not set 184# CONFIG_PPC_86xx is not set
189# CONFIG_EMBEDDED6xx is not set 185# CONFIG_EMBEDDED6xx is not set
190CONFIG_PPC_NATIVE=y
191# CONFIG_UDBG_RTAS_CONSOLE is not set
192CONFIG_IPIC=y 186CONFIG_IPIC=y
193CONFIG_MPIC=y 187# CONFIG_MPIC is not set
194# CONFIG_MPIC_WEIRD is not set 188# CONFIG_MPIC_WEIRD is not set
195CONFIG_PPC_I8259=y 189# CONFIG_PPC_I8259 is not set
196CONFIG_PPC_RTAS=y 190# CONFIG_PPC_RTAS is not set
197# CONFIG_RTAS_ERROR_LOGGING is not set
198CONFIG_RTAS_PROC=y
199# CONFIG_MMIO_NVRAM is not set 191# CONFIG_MMIO_NVRAM is not set
200CONFIG_PPC_MPC106=y 192# CONFIG_PPC_MPC106 is not set
201# CONFIG_PPC_970_NAP is not set 193# CONFIG_PPC_970_NAP is not set
202# CONFIG_PPC_INDIRECT_IO is not set 194# CONFIG_PPC_INDIRECT_IO is not set
203# CONFIG_GENERIC_IOMAP is not set 195# CONFIG_GENERIC_IOMAP is not set
204# CONFIG_CPU_FREQ is not set 196# CONFIG_CPU_FREQ is not set
205# CONFIG_PPC601_SYNC_FIX is not set
206# CONFIG_TAU is not set 197# CONFIG_TAU is not set
207CONFIG_QUICC_ENGINE=y 198CONFIG_QUICC_ENGINE=y
199# CONFIG_QE_GPIO is not set
208# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
209 201
210# 202#
@@ -225,6 +217,8 @@ CONFIG_PREEMPT_NONE=y
225# CONFIG_PREEMPT_VOLUNTARY is not set 217# CONFIG_PREEMPT_VOLUNTARY is not set
226# CONFIG_PREEMPT is not set 218# CONFIG_PREEMPT is not set
227CONFIG_BINFMT_ELF=y 219CONFIG_BINFMT_ELF=y
220# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
221# CONFIG_HAVE_AOUT is not set
228# CONFIG_BINFMT_MISC is not set 222# CONFIG_BINFMT_MISC is not set
229CONFIG_MATH_EMULATION=y 223CONFIG_MATH_EMULATION=y
230# CONFIG_IOMMU_HELPER is not set 224# CONFIG_IOMMU_HELPER is not set
@@ -240,15 +234,15 @@ CONFIG_FLATMEM_MANUAL=y
240# CONFIG_SPARSEMEM_MANUAL is not set 234# CONFIG_SPARSEMEM_MANUAL is not set
241CONFIG_FLATMEM=y 235CONFIG_FLATMEM=y
242CONFIG_FLAT_NODE_MEM_MAP=y 236CONFIG_FLAT_NODE_MEM_MAP=y
243# CONFIG_SPARSEMEM_STATIC is not set
244# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
245CONFIG_PAGEFLAGS_EXTENDED=y 237CONFIG_PAGEFLAGS_EXTENDED=y
246CONFIG_SPLIT_PTLOCK_CPUS=4 238CONFIG_SPLIT_PTLOCK_CPUS=4
247CONFIG_MIGRATION=y 239CONFIG_MIGRATION=y
248# CONFIG_RESOURCES_64BIT is not set 240# CONFIG_RESOURCES_64BIT is not set
241# CONFIG_PHYS_ADDR_T_64BIT is not set
249CONFIG_ZONE_DMA_FLAG=1 242CONFIG_ZONE_DMA_FLAG=1
250CONFIG_BOUNCE=y 243CONFIG_BOUNCE=y
251CONFIG_VIRT_TO_BUS=y 244CONFIG_VIRT_TO_BUS=y
245CONFIG_UNEVICTABLE_LRU=y
252CONFIG_FORCE_MAX_ZONEORDER=11 246CONFIG_FORCE_MAX_ZONEORDER=11
253CONFIG_PROC_DEVICETREE=y 247CONFIG_PROC_DEVICETREE=y
254# CONFIG_CMDLINE_BOOL is not set 248# CONFIG_CMDLINE_BOOL is not set
@@ -260,7 +254,6 @@ CONFIG_ISA_DMA_API=y
260# 254#
261# Bus options 255# Bus options
262# 256#
263# CONFIG_ISA is not set
264CONFIG_ZONE_DMA=y 257CONFIG_ZONE_DMA=y
265CONFIG_GENERIC_ISA_DMA=y 258CONFIG_GENERIC_ISA_DMA=y
266CONFIG_PPC_INDIRECT_PCI=y 259CONFIG_PPC_INDIRECT_PCI=y
@@ -273,7 +266,7 @@ CONFIG_PCI_SYSCALL=y
273# CONFIG_PCIEPORTBUS is not set 266# CONFIG_PCIEPORTBUS is not set
274CONFIG_ARCH_SUPPORTS_MSI=y 267CONFIG_ARCH_SUPPORTS_MSI=y
275# CONFIG_PCI_MSI is not set 268# CONFIG_PCI_MSI is not set
276CONFIG_PCI_LEGACY=y 269# CONFIG_PCI_LEGACY is not set
277# CONFIG_PCCARD is not set 270# CONFIG_PCCARD is not set
278# CONFIG_HOTPLUG_PCI is not set 271# CONFIG_HOTPLUG_PCI is not set
279# CONFIG_HAS_RAPIDIO is not set 272# CONFIG_HAS_RAPIDIO is not set
@@ -341,6 +334,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
341# CONFIG_TIPC is not set 334# CONFIG_TIPC is not set
342# CONFIG_ATM is not set 335# CONFIG_ATM is not set
343# CONFIG_BRIDGE is not set 336# CONFIG_BRIDGE is not set
337# CONFIG_NET_DSA is not set
344# CONFIG_VLAN_8021Q is not set 338# CONFIG_VLAN_8021Q is not set
345# CONFIG_DECNET is not set 339# CONFIG_DECNET is not set
346# CONFIG_LLC2 is not set 340# CONFIG_LLC2 is not set
@@ -361,11 +355,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
361# CONFIG_IRDA is not set 355# CONFIG_IRDA is not set
362# CONFIG_BT is not set 356# CONFIG_BT is not set
363# CONFIG_AF_RXRPC is not set 357# CONFIG_AF_RXRPC is not set
364 358# CONFIG_PHONET is not set
365# 359CONFIG_WIRELESS=y
366# Wireless
367#
368# CONFIG_CFG80211 is not set 360# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y
369# CONFIG_WIRELESS_EXT is not set 362# CONFIG_WIRELESS_EXT is not set
370# CONFIG_MAC80211 is not set 363# CONFIG_MAC80211 is not set
371# CONFIG_IEEE80211 is not set 364# CONFIG_IEEE80211 is not set
@@ -391,7 +384,6 @@ CONFIG_OF_I2C=y
391# CONFIG_PARPORT is not set 384# CONFIG_PARPORT is not set
392CONFIG_BLK_DEV=y 385CONFIG_BLK_DEV=y
393# CONFIG_BLK_DEV_FD is not set 386# CONFIG_BLK_DEV_FD is not set
394# CONFIG_MAC_FLOPPY is not set
395# CONFIG_BLK_CPQ_DA is not set 387# CONFIG_BLK_CPQ_DA is not set
396# CONFIG_BLK_CPQ_CISS_DA is not set 388# CONFIG_BLK_CPQ_CISS_DA is not set
397# CONFIG_BLK_DEV_DAC960 is not set 389# CONFIG_BLK_DEV_DAC960 is not set
@@ -491,8 +483,6 @@ CONFIG_SCSI_LOWLEVEL=y
491# CONFIG_SCSI_DC390T is not set 483# CONFIG_SCSI_DC390T is not set
492# CONFIG_SCSI_NSP32 is not set 484# CONFIG_SCSI_NSP32 is not set
493# CONFIG_SCSI_DEBUG is not set 485# CONFIG_SCSI_DEBUG is not set
494# CONFIG_SCSI_MESH is not set
495# CONFIG_SCSI_MAC53C94 is not set
496# CONFIG_SCSI_SRP is not set 486# CONFIG_SCSI_SRP is not set
497# CONFIG_SCSI_DH is not set 487# CONFIG_SCSI_DH is not set
498# CONFIG_ATA is not set 488# CONFIG_ATA is not set
@@ -537,8 +527,6 @@ CONFIG_DAVICOM_PHY=y
537# CONFIG_MDIO_BITBANG is not set 527# CONFIG_MDIO_BITBANG is not set
538CONFIG_NET_ETHERNET=y 528CONFIG_NET_ETHERNET=y
539CONFIG_MII=y 529CONFIG_MII=y
540# CONFIG_MACE is not set
541# CONFIG_BMAC is not set
542# CONFIG_HAPPYMEAL is not set 530# CONFIG_HAPPYMEAL is not set
543# CONFIG_SUNGEM is not set 531# CONFIG_SUNGEM is not set
544# CONFIG_CASSINI is not set 532# CONFIG_CASSINI is not set
@@ -549,8 +537,12 @@ CONFIG_MII=y
549# CONFIG_IBM_NEW_EMAC_RGMII is not set 537# CONFIG_IBM_NEW_EMAC_RGMII is not set
550# CONFIG_IBM_NEW_EMAC_TAH is not set 538# CONFIG_IBM_NEW_EMAC_TAH is not set
551# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 539# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
540# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
541# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
542# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
552# CONFIG_NET_PCI is not set 543# CONFIG_NET_PCI is not set
553# CONFIG_B44 is not set 544# CONFIG_B44 is not set
545# CONFIG_ATL2 is not set
554CONFIG_NETDEV_1000=y 546CONFIG_NETDEV_1000=y
555# CONFIG_ACENIC is not set 547# CONFIG_ACENIC is not set
556# CONFIG_DL2K is not set 548# CONFIG_DL2K is not set
@@ -577,18 +569,22 @@ CONFIG_UCC_GETH=y
577# CONFIG_QLA3XXX is not set 569# CONFIG_QLA3XXX is not set
578# CONFIG_ATL1 is not set 570# CONFIG_ATL1 is not set
579# CONFIG_ATL1E is not set 571# CONFIG_ATL1E is not set
572# CONFIG_JME is not set
580CONFIG_NETDEV_10000=y 573CONFIG_NETDEV_10000=y
581# CONFIG_CHELSIO_T1 is not set 574# CONFIG_CHELSIO_T1 is not set
582# CONFIG_CHELSIO_T3 is not set 575# CONFIG_CHELSIO_T3 is not set
576# CONFIG_ENIC is not set
583# CONFIG_IXGBE is not set 577# CONFIG_IXGBE is not set
584# CONFIG_IXGB is not set 578# CONFIG_IXGB is not set
585# CONFIG_S2IO is not set 579# CONFIG_S2IO is not set
586# CONFIG_MYRI10GE is not set 580# CONFIG_MYRI10GE is not set
587# CONFIG_NETXEN_NIC is not set 581# CONFIG_NETXEN_NIC is not set
588# CONFIG_NIU is not set 582# CONFIG_NIU is not set
583# CONFIG_MLX4_EN is not set
589# CONFIG_MLX4_CORE is not set 584# CONFIG_MLX4_CORE is not set
590# CONFIG_TEHUTI is not set 585# CONFIG_TEHUTI is not set
591# CONFIG_BNX2X is not set 586# CONFIG_BNX2X is not set
587# CONFIG_QLGE is not set
592# CONFIG_SFC is not set 588# CONFIG_SFC is not set
593# CONFIG_TR is not set 589# CONFIG_TR is not set
594 590
@@ -665,15 +661,12 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
665# CONFIG_SERIAL_UARTLITE is not set 661# CONFIG_SERIAL_UARTLITE is not set
666CONFIG_SERIAL_CORE=y 662CONFIG_SERIAL_CORE=y
667CONFIG_SERIAL_CORE_CONSOLE=y 663CONFIG_SERIAL_CORE_CONSOLE=y
668# CONFIG_SERIAL_PMACZILOG is not set
669# CONFIG_SERIAL_JSM is not set 664# CONFIG_SERIAL_JSM is not set
670# CONFIG_SERIAL_OF_PLATFORM is not set 665# CONFIG_SERIAL_OF_PLATFORM is not set
671# CONFIG_SERIAL_QE is not set 666# CONFIG_SERIAL_QE is not set
672CONFIG_UNIX98_PTYS=y 667CONFIG_UNIX98_PTYS=y
673CONFIG_LEGACY_PTYS=y 668CONFIG_LEGACY_PTYS=y
674CONFIG_LEGACY_PTY_COUNT=256 669CONFIG_LEGACY_PTY_COUNT=256
675# CONFIG_BRIQ_PANEL is not set
676# CONFIG_HVC_RTAS is not set
677# CONFIG_IPMI_HANDLER is not set 670# CONFIG_IPMI_HANDLER is not set
678CONFIG_HW_RANDOM=y 671CONFIG_HW_RANDOM=y
679# CONFIG_NVRAM is not set 672# CONFIG_NVRAM is not set
@@ -710,12 +703,6 @@ CONFIG_I2C_HELPER_AUTO=y
710# CONFIG_I2C_VIAPRO is not set 703# CONFIG_I2C_VIAPRO is not set
711 704
712# 705#
713# Mac SMBus host controller drivers
714#
715# CONFIG_I2C_HYDRA is not set
716CONFIG_I2C_POWERMAC=y
717
718#
719# I2C system bus drivers (mostly embedded / system-on-chip) 706# I2C system bus drivers (mostly embedded / system-on-chip)
720# 707#
721CONFIG_I2C_MPC=y 708CONFIG_I2C_MPC=y
@@ -751,6 +738,7 @@ CONFIG_I2C_MPC=y
751# CONFIG_SENSORS_PCF8591 is not set 738# CONFIG_SENSORS_PCF8591 is not set
752# CONFIG_SENSORS_MAX6875 is not set 739# CONFIG_SENSORS_MAX6875 is not set
753# CONFIG_SENSORS_TSL2550 is not set 740# CONFIG_SENSORS_TSL2550 is not set
741# CONFIG_MCU_MPC8349EMITX is not set
754# CONFIG_I2C_DEBUG_CORE is not set 742# CONFIG_I2C_DEBUG_CORE is not set
755# CONFIG_I2C_DEBUG_ALGO is not set 743# CONFIG_I2C_DEBUG_ALGO is not set
756# CONFIG_I2C_DEBUG_BUS is not set 744# CONFIG_I2C_DEBUG_BUS is not set
@@ -772,7 +760,6 @@ CONFIG_HWMON=y
772# CONFIG_SENSORS_ADM9240 is not set 760# CONFIG_SENSORS_ADM9240 is not set
773# CONFIG_SENSORS_ADT7470 is not set 761# CONFIG_SENSORS_ADT7470 is not set
774# CONFIG_SENSORS_ADT7473 is not set 762# CONFIG_SENSORS_ADT7473 is not set
775# CONFIG_SENSORS_AMS is not set
776# CONFIG_SENSORS_ATXP1 is not set 763# CONFIG_SENSORS_ATXP1 is not set
777# CONFIG_SENSORS_DS1621 is not set 764# CONFIG_SENSORS_DS1621 is not set
778# CONFIG_SENSORS_I5K_AMB is not set 765# CONFIG_SENSORS_I5K_AMB is not set
@@ -827,7 +814,6 @@ CONFIG_WATCHDOG=y
827# CONFIG_SOFT_WATCHDOG is not set 814# CONFIG_SOFT_WATCHDOG is not set
828# CONFIG_ALIM7101_WDT is not set 815# CONFIG_ALIM7101_WDT is not set
829# CONFIG_8xxx_WDT is not set 816# CONFIG_8xxx_WDT is not set
830# CONFIG_WATCHDOG_RTAS is not set
831 817
832# 818#
833# PCI-based Watchdog Cards 819# PCI-based Watchdog Cards
@@ -848,6 +834,17 @@ CONFIG_SSB_POSSIBLE=y
848# CONFIG_MFD_SM501 is not set 834# CONFIG_MFD_SM501 is not set
849# CONFIG_HTC_PASIC3 is not set 835# CONFIG_HTC_PASIC3 is not set
850# CONFIG_MFD_TMIO is not set 836# CONFIG_MFD_TMIO is not set
837# CONFIG_PMIC_DA903X is not set
838# CONFIG_MFD_WM8400 is not set
839# CONFIG_MFD_WM8350_I2C is not set
840
841#
842# Voltage and Current regulators
843#
844# CONFIG_REGULATOR is not set
845# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
846# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
847# CONFIG_REGULATOR_BQ24022 is not set
851 848
852# 849#
853# Multimedia devices 850# Multimedia devices
@@ -884,6 +881,12 @@ CONFIG_HID_SUPPORT=y
884CONFIG_HID=y 881CONFIG_HID=y
885# CONFIG_HID_DEBUG is not set 882# CONFIG_HID_DEBUG is not set
886# CONFIG_HIDRAW is not set 883# CONFIG_HIDRAW is not set
884# CONFIG_HID_PID is not set
885
886#
887# Special HID drivers
888#
889CONFIG_HID_COMPAT=y
887CONFIG_USB_SUPPORT=y 890CONFIG_USB_SUPPORT=y
888CONFIG_USB_ARCH_HAS_HCD=y 891CONFIG_USB_ARCH_HAS_HCD=y
889CONFIG_USB_ARCH_HAS_OHCI=y 892CONFIG_USB_ARCH_HAS_OHCI=y
@@ -900,6 +903,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
900# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 903# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
901# 904#
902# CONFIG_USB_GADGET is not set 905# CONFIG_USB_GADGET is not set
906# CONFIG_UWB is not set
903# CONFIG_MMC is not set 907# CONFIG_MMC is not set
904# CONFIG_MEMSTICK is not set 908# CONFIG_MEMSTICK is not set
905# CONFIG_NEW_LEDS is not set 909# CONFIG_NEW_LEDS is not set
@@ -945,12 +949,15 @@ CONFIG_RTC_DRV_DS1374=y
945# Platform RTC drivers 949# Platform RTC drivers
946# 950#
947# CONFIG_RTC_DRV_CMOS is not set 951# CONFIG_RTC_DRV_CMOS is not set
952# CONFIG_RTC_DRV_DS1286 is not set
948# CONFIG_RTC_DRV_DS1511 is not set 953# CONFIG_RTC_DRV_DS1511 is not set
949# CONFIG_RTC_DRV_DS1553 is not set 954# CONFIG_RTC_DRV_DS1553 is not set
950# CONFIG_RTC_DRV_DS1742 is not set 955# CONFIG_RTC_DRV_DS1742 is not set
951# CONFIG_RTC_DRV_STK17TA8 is not set 956# CONFIG_RTC_DRV_STK17TA8 is not set
952# CONFIG_RTC_DRV_M48T86 is not set 957# CONFIG_RTC_DRV_M48T86 is not set
958# CONFIG_RTC_DRV_M48T35 is not set
953# CONFIG_RTC_DRV_M48T59 is not set 959# CONFIG_RTC_DRV_M48T59 is not set
960# CONFIG_RTC_DRV_BQ4802 is not set
954# CONFIG_RTC_DRV_V3020 is not set 961# CONFIG_RTC_DRV_V3020 is not set
955 962
956# 963#
@@ -959,6 +966,7 @@ CONFIG_RTC_DRV_DS1374=y
959# CONFIG_RTC_DRV_PPC is not set 966# CONFIG_RTC_DRV_PPC is not set
960# CONFIG_DMADEVICES is not set 967# CONFIG_DMADEVICES is not set
961# CONFIG_UIO is not set 968# CONFIG_UIO is not set
969# CONFIG_STAGING is not set
962 970
963# 971#
964# File systems 972# File systems
@@ -970,12 +978,13 @@ CONFIG_EXT3_FS=y
970CONFIG_EXT3_FS_XATTR=y 978CONFIG_EXT3_FS_XATTR=y
971# CONFIG_EXT3_FS_POSIX_ACL is not set 979# CONFIG_EXT3_FS_POSIX_ACL is not set
972# CONFIG_EXT3_FS_SECURITY is not set 980# CONFIG_EXT3_FS_SECURITY is not set
973# CONFIG_EXT4DEV_FS is not set 981# CONFIG_EXT4_FS is not set
974CONFIG_JBD=y 982CONFIG_JBD=y
975CONFIG_FS_MBCACHE=y 983CONFIG_FS_MBCACHE=y
976# CONFIG_REISERFS_FS is not set 984# CONFIG_REISERFS_FS is not set
977# CONFIG_JFS_FS is not set 985# CONFIG_JFS_FS is not set
978# CONFIG_FS_POSIX_ACL is not set 986# CONFIG_FS_POSIX_ACL is not set
987CONFIG_FILE_LOCKING=y
979# CONFIG_XFS_FS is not set 988# CONFIG_XFS_FS is not set
980# CONFIG_OCFS2_FS is not set 989# CONFIG_OCFS2_FS is not set
981CONFIG_DNOTIFY=y 990CONFIG_DNOTIFY=y
@@ -1005,6 +1014,7 @@ CONFIG_INOTIFY_USER=y
1005CONFIG_PROC_FS=y 1014CONFIG_PROC_FS=y
1006CONFIG_PROC_KCORE=y 1015CONFIG_PROC_KCORE=y
1007CONFIG_PROC_SYSCTL=y 1016CONFIG_PROC_SYSCTL=y
1017CONFIG_PROC_PAGE_MONITOR=y
1008CONFIG_SYSFS=y 1018CONFIG_SYSFS=y
1009CONFIG_TMPFS=y 1019CONFIG_TMPFS=y
1010# CONFIG_TMPFS_POSIX_ACL is not set 1020# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1042,6 +1052,7 @@ CONFIG_LOCKD_V4=y
1042CONFIG_NFS_COMMON=y 1052CONFIG_NFS_COMMON=y
1043CONFIG_SUNRPC=y 1053CONFIG_SUNRPC=y
1044CONFIG_SUNRPC_GSS=y 1054CONFIG_SUNRPC_GSS=y
1055# CONFIG_SUNRPC_REGISTER_V4 is not set
1045CONFIG_RPCSEC_GSS_KRB5=y 1056CONFIG_RPCSEC_GSS_KRB5=y
1046# CONFIG_RPCSEC_GSS_SPKM3 is not set 1057# CONFIG_RPCSEC_GSS_SPKM3 is not set
1047# CONFIG_SMB_FS is not set 1058# CONFIG_SMB_FS is not set
@@ -1071,13 +1082,11 @@ CONFIG_PARTITION_ADVANCED=y
1071# CONFIG_DLM is not set 1082# CONFIG_DLM is not set
1072CONFIG_UCC_FAST=y 1083CONFIG_UCC_FAST=y
1073CONFIG_UCC=y 1084CONFIG_UCC=y
1074# CONFIG_QE_GPIO is not set
1075 1085
1076# 1086#
1077# Library routines 1087# Library routines
1078# 1088#
1079CONFIG_BITREVERSE=y 1089CONFIG_BITREVERSE=y
1080# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1081# CONFIG_CRC_CCITT is not set 1090# CONFIG_CRC_CCITT is not set
1082# CONFIG_CRC16 is not set 1091# CONFIG_CRC16 is not set
1083# CONFIG_CRC_T10DIF is not set 1092# CONFIG_CRC_T10DIF is not set
@@ -1107,13 +1116,15 @@ CONFIG_FRAME_WARN=1024
1107# CONFIG_SLUB_STATS is not set 1116# CONFIG_SLUB_STATS is not set
1108# CONFIG_DEBUG_BUGVERBOSE is not set 1117# CONFIG_DEBUG_BUGVERBOSE is not set
1109# CONFIG_DEBUG_MEMORY_INIT is not set 1118# CONFIG_DEBUG_MEMORY_INIT is not set
1119# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1110# CONFIG_LATENCYTOP is not set 1120# CONFIG_LATENCYTOP is not set
1111CONFIG_SYSCTL_SYSCALL_CHECK=y 1121CONFIG_SYSCTL_SYSCALL_CHECK=y
1112CONFIG_HAVE_FTRACE=y 1122CONFIG_HAVE_FUNCTION_TRACER=y
1113CONFIG_HAVE_DYNAMIC_FTRACE=y 1123
1114# CONFIG_FTRACE is not set 1124#
1115# CONFIG_SCHED_TRACER is not set 1125# Tracers
1116# CONFIG_CONTEXT_SWITCH_TRACER is not set 1126#
1127# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1117# CONFIG_SAMPLES is not set 1128# CONFIG_SAMPLES is not set
1118CONFIG_HAVE_ARCH_KGDB=y 1129CONFIG_HAVE_ARCH_KGDB=y
1119# CONFIG_IRQSTACKS is not set 1130# CONFIG_IRQSTACKS is not set
@@ -1125,14 +1136,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1125# 1136#
1126# CONFIG_KEYS is not set 1137# CONFIG_KEYS is not set
1127# CONFIG_SECURITY is not set 1138# CONFIG_SECURITY is not set
1139# CONFIG_SECURITYFS is not set
1128# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1140# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1129CONFIG_CRYPTO=y 1141CONFIG_CRYPTO=y
1130 1142
1131# 1143#
1132# Crypto core or helper 1144# Crypto core or helper
1133# 1145#
1146# CONFIG_CRYPTO_FIPS is not set
1134CONFIG_CRYPTO_ALGAPI=y 1147CONFIG_CRYPTO_ALGAPI=y
1148CONFIG_CRYPTO_AEAD=y
1135CONFIG_CRYPTO_BLKCIPHER=y 1149CONFIG_CRYPTO_BLKCIPHER=y
1150CONFIG_CRYPTO_HASH=y
1151CONFIG_CRYPTO_RNG=y
1136CONFIG_CRYPTO_MANAGER=y 1152CONFIG_CRYPTO_MANAGER=y
1137# CONFIG_CRYPTO_GF128MUL is not set 1153# CONFIG_CRYPTO_GF128MUL is not set
1138# CONFIG_CRYPTO_NULL is not set 1154# CONFIG_CRYPTO_NULL is not set
@@ -1205,6 +1221,11 @@ CONFIG_CRYPTO_DES=y
1205# 1221#
1206# CONFIG_CRYPTO_DEFLATE is not set 1222# CONFIG_CRYPTO_DEFLATE is not set
1207# CONFIG_CRYPTO_LZO is not set 1223# CONFIG_CRYPTO_LZO is not set
1224
1225#
1226# Random Number Generation
1227#
1228# CONFIG_CRYPTO_ANSI_CPRNG is not set
1208CONFIG_CRYPTO_HW=y 1229CONFIG_CRYPTO_HW=y
1209# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1230# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1210# CONFIG_CRYPTO_DEV_TALITOS is not set 1231# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
index 38267501f44d..9cc976f010c9 100644
--- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:19 2008 4# Sat Nov 8 12:39:54 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
23# CONFIG_SMP is not set 23# CONFIG_SMP is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -53,8 +53,6 @@ CONFIG_PPC_UDBG_16550=y
53CONFIG_AUDIT_ARCH=y 53CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
55CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
56CONFIG_HIBERNATE_32=y
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
58CONFIG_ARCH_SUSPEND_POSSIBLE=y 56CONFIG_ARCH_SUSPEND_POSSIBLE=y
59# CONFIG_PPC_DCR_NATIVE is not set 57# CONFIG_PPC_DCR_NATIVE is not set
60# CONFIG_PPC_DCR_MMIO is not set 58# CONFIG_PPC_DCR_MMIO is not set
@@ -98,7 +96,6 @@ CONFIG_HOTPLUG=y
98CONFIG_PRINTK=y 96CONFIG_PRINTK=y
99CONFIG_BUG=y 97CONFIG_BUG=y
100CONFIG_ELF_CORE=y 98CONFIG_ELF_CORE=y
101CONFIG_PCSPKR_PLATFORM=y
102CONFIG_COMPAT_BRK=y 99CONFIG_COMPAT_BRK=y
103CONFIG_BASE_FULL=y 100CONFIG_BASE_FULL=y
104CONFIG_FUTEX=y 101CONFIG_FUTEX=y
@@ -108,7 +105,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 105CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 106CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 107CONFIG_SHMEM=y
108CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
110CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 111CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 112# CONFIG_SLAB is not set
114CONFIG_SLUB=y 113CONFIG_SLUB=y
@@ -121,10 +120,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
121CONFIG_HAVE_KPROBES=y 120CONFIG_HAVE_KPROBES=y
122CONFIG_HAVE_KRETPROBES=y 121CONFIG_HAVE_KRETPROBES=y
123CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_DMA_ATTRS is not set
125# CONFIG_USE_GENERIC_SMP_HELPERS is not set
126# CONFIG_HAVE_CLK is not set
127CONFIG_PROC_PAGE_MONITOR=y
128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
129CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
130CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
@@ -157,6 +152,7 @@ CONFIG_DEFAULT_AS=y
157# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
158CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
159CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_FREEZER is not set
160 156
161# 157#
162# Platform support 158# Platform support
@@ -164,10 +160,10 @@ CONFIG_CLASSIC_RCU=y
164CONFIG_PPC_MULTIPLATFORM=y 160CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y 161CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set 162# CONFIG_PPC_CHRP is not set
167# CONFIG_PPC_PMAC is not set
168# CONFIG_MPC5121_ADS is not set 163# CONFIG_MPC5121_ADS is not set
169# CONFIG_MPC5121_GENERIC is not set 164# CONFIG_MPC5121_GENERIC is not set
170# CONFIG_PPC_MPC52xx is not set 165# CONFIG_PPC_MPC52xx is not set
166# CONFIG_PPC_PMAC is not set
171# CONFIG_PPC_CELL is not set 167# CONFIG_PPC_CELL is not set
172# CONFIG_PPC_CELL_NATIVE is not set 168# CONFIG_PPC_CELL_NATIVE is not set
173# CONFIG_PPC_82xx is not set 169# CONFIG_PPC_82xx is not set
@@ -187,24 +183,20 @@ CONFIG_MPC832x_RDB=y
187CONFIG_PPC_MPC832x=y 183CONFIG_PPC_MPC832x=y
188# CONFIG_PPC_86xx is not set 184# CONFIG_PPC_86xx is not set
189# CONFIG_EMBEDDED6xx is not set 185# CONFIG_EMBEDDED6xx is not set
190CONFIG_PPC_NATIVE=y
191# CONFIG_UDBG_RTAS_CONSOLE is not set
192CONFIG_IPIC=y 186CONFIG_IPIC=y
193CONFIG_MPIC=y 187# CONFIG_MPIC is not set
194# CONFIG_MPIC_WEIRD is not set 188# CONFIG_MPIC_WEIRD is not set
195CONFIG_PPC_I8259=y 189# CONFIG_PPC_I8259 is not set
196CONFIG_PPC_RTAS=y 190# CONFIG_PPC_RTAS is not set
197# CONFIG_RTAS_ERROR_LOGGING is not set
198CONFIG_RTAS_PROC=y
199# CONFIG_MMIO_NVRAM is not set 191# CONFIG_MMIO_NVRAM is not set
200CONFIG_PPC_MPC106=y 192# CONFIG_PPC_MPC106 is not set
201# CONFIG_PPC_970_NAP is not set 193# CONFIG_PPC_970_NAP is not set
202# CONFIG_PPC_INDIRECT_IO is not set 194# CONFIG_PPC_INDIRECT_IO is not set
203# CONFIG_GENERIC_IOMAP is not set 195# CONFIG_GENERIC_IOMAP is not set
204# CONFIG_CPU_FREQ is not set 196# CONFIG_CPU_FREQ is not set
205# CONFIG_PPC601_SYNC_FIX is not set
206# CONFIG_TAU is not set 197# CONFIG_TAU is not set
207CONFIG_QUICC_ENGINE=y 198CONFIG_QUICC_ENGINE=y
199# CONFIG_QE_GPIO is not set
208# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
209 201
210# 202#
@@ -225,6 +217,8 @@ CONFIG_PREEMPT_NONE=y
225# CONFIG_PREEMPT_VOLUNTARY is not set 217# CONFIG_PREEMPT_VOLUNTARY is not set
226# CONFIG_PREEMPT is not set 218# CONFIG_PREEMPT is not set
227CONFIG_BINFMT_ELF=y 219CONFIG_BINFMT_ELF=y
220# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
221# CONFIG_HAVE_AOUT is not set
228# CONFIG_BINFMT_MISC is not set 222# CONFIG_BINFMT_MISC is not set
229CONFIG_MATH_EMULATION=y 223CONFIG_MATH_EMULATION=y
230# CONFIG_IOMMU_HELPER is not set 224# CONFIG_IOMMU_HELPER is not set
@@ -240,15 +234,15 @@ CONFIG_FLATMEM_MANUAL=y
240# CONFIG_SPARSEMEM_MANUAL is not set 234# CONFIG_SPARSEMEM_MANUAL is not set
241CONFIG_FLATMEM=y 235CONFIG_FLATMEM=y
242CONFIG_FLAT_NODE_MEM_MAP=y 236CONFIG_FLAT_NODE_MEM_MAP=y
243# CONFIG_SPARSEMEM_STATIC is not set
244# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
245CONFIG_PAGEFLAGS_EXTENDED=y 237CONFIG_PAGEFLAGS_EXTENDED=y
246CONFIG_SPLIT_PTLOCK_CPUS=4 238CONFIG_SPLIT_PTLOCK_CPUS=4
247CONFIG_MIGRATION=y 239CONFIG_MIGRATION=y
248# CONFIG_RESOURCES_64BIT is not set 240# CONFIG_RESOURCES_64BIT is not set
241# CONFIG_PHYS_ADDR_T_64BIT is not set
249CONFIG_ZONE_DMA_FLAG=1 242CONFIG_ZONE_DMA_FLAG=1
250CONFIG_BOUNCE=y 243CONFIG_BOUNCE=y
251CONFIG_VIRT_TO_BUS=y 244CONFIG_VIRT_TO_BUS=y
245CONFIG_UNEVICTABLE_LRU=y
252CONFIG_FORCE_MAX_ZONEORDER=11 246CONFIG_FORCE_MAX_ZONEORDER=11
253CONFIG_PROC_DEVICETREE=y 247CONFIG_PROC_DEVICETREE=y
254# CONFIG_CMDLINE_BOOL is not set 248# CONFIG_CMDLINE_BOOL is not set
@@ -260,7 +254,6 @@ CONFIG_ISA_DMA_API=y
260# 254#
261# Bus options 255# Bus options
262# 256#
263# CONFIG_ISA is not set
264CONFIG_ZONE_DMA=y 257CONFIG_ZONE_DMA=y
265CONFIG_GENERIC_ISA_DMA=y 258CONFIG_GENERIC_ISA_DMA=y
266CONFIG_PPC_INDIRECT_PCI=y 259CONFIG_PPC_INDIRECT_PCI=y
@@ -273,7 +266,7 @@ CONFIG_PCI_SYSCALL=y
273# CONFIG_PCIEPORTBUS is not set 266# CONFIG_PCIEPORTBUS is not set
274CONFIG_ARCH_SUPPORTS_MSI=y 267CONFIG_ARCH_SUPPORTS_MSI=y
275# CONFIG_PCI_MSI is not set 268# CONFIG_PCI_MSI is not set
276CONFIG_PCI_LEGACY=y 269# CONFIG_PCI_LEGACY is not set
277# CONFIG_PCCARD is not set 270# CONFIG_PCCARD is not set
278# CONFIG_HOTPLUG_PCI is not set 271# CONFIG_HOTPLUG_PCI is not set
279# CONFIG_HAS_RAPIDIO is not set 272# CONFIG_HAS_RAPIDIO is not set
@@ -341,6 +334,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
341# CONFIG_TIPC is not set 334# CONFIG_TIPC is not set
342# CONFIG_ATM is not set 335# CONFIG_ATM is not set
343# CONFIG_BRIDGE is not set 336# CONFIG_BRIDGE is not set
337# CONFIG_NET_DSA is not set
344# CONFIG_VLAN_8021Q is not set 338# CONFIG_VLAN_8021Q is not set
345# CONFIG_DECNET is not set 339# CONFIG_DECNET is not set
346# CONFIG_LLC2 is not set 340# CONFIG_LLC2 is not set
@@ -361,11 +355,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
361# CONFIG_IRDA is not set 355# CONFIG_IRDA is not set
362# CONFIG_BT is not set 356# CONFIG_BT is not set
363# CONFIG_AF_RXRPC is not set 357# CONFIG_AF_RXRPC is not set
364 358# CONFIG_PHONET is not set
365# 359CONFIG_WIRELESS=y
366# Wireless
367#
368# CONFIG_CFG80211 is not set 360# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y
369# CONFIG_WIRELESS_EXT is not set 362# CONFIG_WIRELESS_EXT is not set
370# CONFIG_MAC80211 is not set 363# CONFIG_MAC80211 is not set
371# CONFIG_IEEE80211 is not set 364# CONFIG_IEEE80211 is not set
@@ -392,7 +385,6 @@ CONFIG_OF_SPI=y
392# CONFIG_PARPORT is not set 385# CONFIG_PARPORT is not set
393CONFIG_BLK_DEV=y 386CONFIG_BLK_DEV=y
394# CONFIG_BLK_DEV_FD is not set 387# CONFIG_BLK_DEV_FD is not set
395# CONFIG_MAC_FLOPPY is not set
396# CONFIG_BLK_CPQ_DA is not set 388# CONFIG_BLK_CPQ_DA is not set
397# CONFIG_BLK_CPQ_CISS_DA is not set 389# CONFIG_BLK_CPQ_CISS_DA is not set
398# CONFIG_BLK_DEV_DAC960 is not set 390# CONFIG_BLK_DEV_DAC960 is not set
@@ -493,8 +485,6 @@ CONFIG_SCSI_LOWLEVEL=y
493# CONFIG_SCSI_DC390T is not set 485# CONFIG_SCSI_DC390T is not set
494# CONFIG_SCSI_NSP32 is not set 486# CONFIG_SCSI_NSP32 is not set
495# CONFIG_SCSI_DEBUG is not set 487# CONFIG_SCSI_DEBUG is not set
496# CONFIG_SCSI_MESH is not set
497# CONFIG_SCSI_MAC53C94 is not set
498# CONFIG_SCSI_SRP is not set 488# CONFIG_SCSI_SRP is not set
499# CONFIG_SCSI_DH is not set 489# CONFIG_SCSI_DH is not set
500# CONFIG_ATA is not set 490# CONFIG_ATA is not set
@@ -539,8 +529,6 @@ CONFIG_ICPLUS_PHY=y
539# CONFIG_MDIO_BITBANG is not set 529# CONFIG_MDIO_BITBANG is not set
540CONFIG_NET_ETHERNET=y 530CONFIG_NET_ETHERNET=y
541CONFIG_MII=y 531CONFIG_MII=y
542# CONFIG_MACE is not set
543# CONFIG_BMAC is not set
544# CONFIG_HAPPYMEAL is not set 532# CONFIG_HAPPYMEAL is not set
545# CONFIG_SUNGEM is not set 533# CONFIG_SUNGEM is not set
546# CONFIG_CASSINI is not set 534# CONFIG_CASSINI is not set
@@ -552,13 +540,16 @@ CONFIG_MII=y
552# CONFIG_IBM_NEW_EMAC_RGMII is not set 540# CONFIG_IBM_NEW_EMAC_RGMII is not set
553# CONFIG_IBM_NEW_EMAC_TAH is not set 541# CONFIG_IBM_NEW_EMAC_TAH is not set
554# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 542# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
543# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
544# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
545# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
555# CONFIG_NET_PCI is not set 546# CONFIG_NET_PCI is not set
556# CONFIG_B44 is not set 547# CONFIG_B44 is not set
548# CONFIG_ATL2 is not set
557CONFIG_NETDEV_1000=y 549CONFIG_NETDEV_1000=y
558# CONFIG_ACENIC is not set 550# CONFIG_ACENIC is not set
559# CONFIG_DL2K is not set 551# CONFIG_DL2K is not set
560CONFIG_E1000=y 552CONFIG_E1000=y
561# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
562# CONFIG_E1000E is not set 553# CONFIG_E1000E is not set
563# CONFIG_IP1000 is not set 554# CONFIG_IP1000 is not set
564# CONFIG_IGB is not set 555# CONFIG_IGB is not set
@@ -581,18 +572,22 @@ CONFIG_UCC_GETH=y
581# CONFIG_QLA3XXX is not set 572# CONFIG_QLA3XXX is not set
582# CONFIG_ATL1 is not set 573# CONFIG_ATL1 is not set
583# CONFIG_ATL1E is not set 574# CONFIG_ATL1E is not set
575# CONFIG_JME is not set
584CONFIG_NETDEV_10000=y 576CONFIG_NETDEV_10000=y
585# CONFIG_CHELSIO_T1 is not set 577# CONFIG_CHELSIO_T1 is not set
586# CONFIG_CHELSIO_T3 is not set 578# CONFIG_CHELSIO_T3 is not set
579# CONFIG_ENIC is not set
587# CONFIG_IXGBE is not set 580# CONFIG_IXGBE is not set
588# CONFIG_IXGB is not set 581# CONFIG_IXGB is not set
589# CONFIG_S2IO is not set 582# CONFIG_S2IO is not set
590# CONFIG_MYRI10GE is not set 583# CONFIG_MYRI10GE is not set
591# CONFIG_NETXEN_NIC is not set 584# CONFIG_NETXEN_NIC is not set
592# CONFIG_NIU is not set 585# CONFIG_NIU is not set
586# CONFIG_MLX4_EN is not set
593# CONFIG_MLX4_CORE is not set 587# CONFIG_MLX4_CORE is not set
594# CONFIG_TEHUTI is not set 588# CONFIG_TEHUTI is not set
595# CONFIG_BNX2X is not set 589# CONFIG_BNX2X is not set
590# CONFIG_QLGE is not set
596# CONFIG_SFC is not set 591# CONFIG_SFC is not set
597# CONFIG_TR is not set 592# CONFIG_TR is not set
598 593
@@ -678,15 +673,12 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
678# CONFIG_SERIAL_UARTLITE is not set 673# CONFIG_SERIAL_UARTLITE is not set
679CONFIG_SERIAL_CORE=y 674CONFIG_SERIAL_CORE=y
680CONFIG_SERIAL_CORE_CONSOLE=y 675CONFIG_SERIAL_CORE_CONSOLE=y
681# CONFIG_SERIAL_PMACZILOG is not set
682# CONFIG_SERIAL_JSM is not set 676# CONFIG_SERIAL_JSM is not set
683# CONFIG_SERIAL_OF_PLATFORM is not set 677# CONFIG_SERIAL_OF_PLATFORM is not set
684# CONFIG_SERIAL_QE is not set 678# CONFIG_SERIAL_QE is not set
685CONFIG_UNIX98_PTYS=y 679CONFIG_UNIX98_PTYS=y
686CONFIG_LEGACY_PTYS=y 680CONFIG_LEGACY_PTYS=y
687CONFIG_LEGACY_PTY_COUNT=256 681CONFIG_LEGACY_PTY_COUNT=256
688# CONFIG_BRIQ_PANEL is not set
689# CONFIG_HVC_RTAS is not set
690# CONFIG_IPMI_HANDLER is not set 682# CONFIG_IPMI_HANDLER is not set
691CONFIG_HW_RANDOM=y 683CONFIG_HW_RANDOM=y
692# CONFIG_NVRAM is not set 684# CONFIG_NVRAM is not set
@@ -725,12 +717,6 @@ CONFIG_I2C_HELPER_AUTO=y
725# CONFIG_I2C_VIAPRO is not set 717# CONFIG_I2C_VIAPRO is not set
726 718
727# 719#
728# Mac SMBus host controller drivers
729#
730# CONFIG_I2C_HYDRA is not set
731CONFIG_I2C_POWERMAC=y
732
733#
734# I2C system bus drivers (mostly embedded / system-on-chip) 720# I2C system bus drivers (mostly embedded / system-on-chip)
735# 721#
736CONFIG_I2C_MPC=y 722CONFIG_I2C_MPC=y
@@ -767,6 +753,7 @@ CONFIG_I2C_MPC=y
767# CONFIG_SENSORS_PCF8591 is not set 753# CONFIG_SENSORS_PCF8591 is not set
768# CONFIG_SENSORS_MAX6875 is not set 754# CONFIG_SENSORS_MAX6875 is not set
769# CONFIG_SENSORS_TSL2550 is not set 755# CONFIG_SENSORS_TSL2550 is not set
756# CONFIG_MCU_MPC8349EMITX is not set
770# CONFIG_I2C_DEBUG_CORE is not set 757# CONFIG_I2C_DEBUG_CORE is not set
771# CONFIG_I2C_DEBUG_ALGO is not set 758# CONFIG_I2C_DEBUG_ALGO is not set
772# CONFIG_I2C_DEBUG_BUS is not set 759# CONFIG_I2C_DEBUG_BUS is not set
@@ -803,7 +790,6 @@ CONFIG_HWMON=y
803# CONFIG_SENSORS_ADM9240 is not set 790# CONFIG_SENSORS_ADM9240 is not set
804# CONFIG_SENSORS_ADT7470 is not set 791# CONFIG_SENSORS_ADT7470 is not set
805# CONFIG_SENSORS_ADT7473 is not set 792# CONFIG_SENSORS_ADT7473 is not set
806# CONFIG_SENSORS_AMS is not set
807# CONFIG_SENSORS_ATXP1 is not set 793# CONFIG_SENSORS_ATXP1 is not set
808# CONFIG_SENSORS_DS1621 is not set 794# CONFIG_SENSORS_DS1621 is not set
809# CONFIG_SENSORS_I5K_AMB is not set 795# CONFIG_SENSORS_I5K_AMB is not set
@@ -825,6 +811,7 @@ CONFIG_HWMON=y
825# CONFIG_SENSORS_LM90 is not set 811# CONFIG_SENSORS_LM90 is not set
826# CONFIG_SENSORS_LM92 is not set 812# CONFIG_SENSORS_LM92 is not set
827# CONFIG_SENSORS_LM93 is not set 813# CONFIG_SENSORS_LM93 is not set
814# CONFIG_SENSORS_MAX1111 is not set
828# CONFIG_SENSORS_MAX1619 is not set 815# CONFIG_SENSORS_MAX1619 is not set
829# CONFIG_SENSORS_MAX6650 is not set 816# CONFIG_SENSORS_MAX6650 is not set
830# CONFIG_SENSORS_PC87360 is not set 817# CONFIG_SENSORS_PC87360 is not set
@@ -859,7 +846,6 @@ CONFIG_WATCHDOG=y
859# CONFIG_SOFT_WATCHDOG is not set 846# CONFIG_SOFT_WATCHDOG is not set
860# CONFIG_ALIM7101_WDT is not set 847# CONFIG_ALIM7101_WDT is not set
861# CONFIG_8xxx_WDT is not set 848# CONFIG_8xxx_WDT is not set
862# CONFIG_WATCHDOG_RTAS is not set
863 849
864# 850#
865# PCI-based Watchdog Cards 851# PCI-based Watchdog Cards
@@ -885,6 +871,17 @@ CONFIG_SSB_POSSIBLE=y
885# CONFIG_MFD_SM501 is not set 871# CONFIG_MFD_SM501 is not set
886# CONFIG_HTC_PASIC3 is not set 872# CONFIG_HTC_PASIC3 is not set
887# CONFIG_MFD_TMIO is not set 873# CONFIG_MFD_TMIO is not set
874# CONFIG_PMIC_DA903X is not set
875# CONFIG_MFD_WM8400 is not set
876# CONFIG_MFD_WM8350_I2C is not set
877
878#
879# Voltage and Current regulators
880#
881# CONFIG_REGULATOR is not set
882# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
883# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
884# CONFIG_REGULATOR_BQ24022 is not set
888 885
889# 886#
890# Multimedia devices 887# Multimedia devices
@@ -927,12 +924,18 @@ CONFIG_HID=y
927# USB Input Devices 924# USB Input Devices
928# 925#
929# CONFIG_USB_HID is not set 926# CONFIG_USB_HID is not set
927# CONFIG_HID_PID is not set
930 928
931# 929#
932# USB HID Boot Protocol drivers 930# USB HID Boot Protocol drivers
933# 931#
934# CONFIG_USB_KBD is not set 932# CONFIG_USB_KBD is not set
935# CONFIG_USB_MOUSE is not set 933# CONFIG_USB_MOUSE is not set
934
935#
936# Special HID drivers
937#
938CONFIG_HID_COMPAT=y
936CONFIG_USB_SUPPORT=y 939CONFIG_USB_SUPPORT=y
937CONFIG_USB_ARCH_HAS_HCD=y 940CONFIG_USB_ARCH_HAS_HCD=y
938CONFIG_USB_ARCH_HAS_OHCI=y 941CONFIG_USB_ARCH_HAS_OHCI=y
@@ -951,6 +954,8 @@ CONFIG_USB_DEVICE_CLASS=y
951# CONFIG_USB_OTG_WHITELIST is not set 954# CONFIG_USB_OTG_WHITELIST is not set
952# CONFIG_USB_OTG_BLACKLIST_HUB is not set 955# CONFIG_USB_OTG_BLACKLIST_HUB is not set
953CONFIG_USB_MON=y 956CONFIG_USB_MON=y
957# CONFIG_USB_WUSB is not set
958# CONFIG_USB_WUSB_CBAF is not set
954 959
955# 960#
956# USB Host Controller Drivers 961# USB Host Controller Drivers
@@ -974,6 +979,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
974# CONFIG_USB_UHCI_HCD is not set 979# CONFIG_USB_UHCI_HCD is not set
975# CONFIG_USB_SL811_HCD is not set 980# CONFIG_USB_SL811_HCD is not set
976# CONFIG_USB_R8A66597_HCD is not set 981# CONFIG_USB_R8A66597_HCD is not set
982# CONFIG_USB_WHCI_HCD is not set
983# CONFIG_USB_HWA_HCD is not set
977 984
978# 985#
979# USB Device Class drivers 986# USB Device Class drivers
@@ -981,6 +988,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
981# CONFIG_USB_ACM is not set 988# CONFIG_USB_ACM is not set
982# CONFIG_USB_PRINTER is not set 989# CONFIG_USB_PRINTER is not set
983# CONFIG_USB_WDM is not set 990# CONFIG_USB_WDM is not set
991# CONFIG_USB_TMC is not set
984 992
985# 993#
986# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 994# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1002,7 +1010,6 @@ CONFIG_USB_STORAGE=y
1002# CONFIG_USB_STORAGE_ALAUDA is not set 1010# CONFIG_USB_STORAGE_ALAUDA is not set
1003# CONFIG_USB_STORAGE_ONETOUCH is not set 1011# CONFIG_USB_STORAGE_ONETOUCH is not set
1004# CONFIG_USB_STORAGE_KARMA is not set 1012# CONFIG_USB_STORAGE_KARMA is not set
1005# CONFIG_USB_STORAGE_SIERRA is not set
1006# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1013# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1007# CONFIG_USB_LIBUSUAL is not set 1014# CONFIG_USB_LIBUSUAL is not set
1008 1015
@@ -1023,6 +1030,7 @@ CONFIG_USB_STORAGE=y
1023# CONFIG_USB_EMI62 is not set 1030# CONFIG_USB_EMI62 is not set
1024# CONFIG_USB_EMI26 is not set 1031# CONFIG_USB_EMI26 is not set
1025# CONFIG_USB_ADUTUX is not set 1032# CONFIG_USB_ADUTUX is not set
1033# CONFIG_USB_SEVSEG is not set
1026# CONFIG_USB_RIO500 is not set 1034# CONFIG_USB_RIO500 is not set
1027# CONFIG_USB_LEGOTOWER is not set 1035# CONFIG_USB_LEGOTOWER is not set
1028# CONFIG_USB_LCD is not set 1036# CONFIG_USB_LCD is not set
@@ -1040,13 +1048,15 @@ CONFIG_USB_STORAGE=y
1040# CONFIG_USB_IOWARRIOR is not set 1048# CONFIG_USB_IOWARRIOR is not set
1041# CONFIG_USB_TEST is not set 1049# CONFIG_USB_TEST is not set
1042# CONFIG_USB_ISIGHTFW is not set 1050# CONFIG_USB_ISIGHTFW is not set
1051# CONFIG_USB_VST is not set
1043# CONFIG_USB_GADGET is not set 1052# CONFIG_USB_GADGET is not set
1053# CONFIG_UWB is not set
1044CONFIG_MMC=y 1054CONFIG_MMC=y
1045# CONFIG_MMC_DEBUG is not set 1055# CONFIG_MMC_DEBUG is not set
1046# CONFIG_MMC_UNSAFE_RESUME is not set 1056# CONFIG_MMC_UNSAFE_RESUME is not set
1047 1057
1048# 1058#
1049# MMC/SD Card Drivers 1059# MMC/SD/SDIO Card Drivers
1050# 1060#
1051CONFIG_MMC_BLOCK=y 1061CONFIG_MMC_BLOCK=y
1052CONFIG_MMC_BLOCK_BOUNCE=y 1062CONFIG_MMC_BLOCK_BOUNCE=y
@@ -1054,7 +1064,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
1054# CONFIG_MMC_TEST is not set 1064# CONFIG_MMC_TEST is not set
1055 1065
1056# 1066#
1057# MMC/SD Host Controller Drivers 1067# MMC/SD/SDIO Host Controller Drivers
1058# 1068#
1059# CONFIG_MMC_SDHCI is not set 1069# CONFIG_MMC_SDHCI is not set
1060# CONFIG_MMC_WBSD is not set 1070# CONFIG_MMC_WBSD is not set
@@ -1068,6 +1078,7 @@ CONFIG_MMC_SPI=y
1068# CONFIG_RTC_CLASS is not set 1078# CONFIG_RTC_CLASS is not set
1069# CONFIG_DMADEVICES is not set 1079# CONFIG_DMADEVICES is not set
1070# CONFIG_UIO is not set 1080# CONFIG_UIO is not set
1081# CONFIG_STAGING is not set
1071 1082
1072# 1083#
1073# File systems 1084# File systems
@@ -1079,12 +1090,13 @@ CONFIG_EXT3_FS=y
1079CONFIG_EXT3_FS_XATTR=y 1090CONFIG_EXT3_FS_XATTR=y
1080# CONFIG_EXT3_FS_POSIX_ACL is not set 1091# CONFIG_EXT3_FS_POSIX_ACL is not set
1081# CONFIG_EXT3_FS_SECURITY is not set 1092# CONFIG_EXT3_FS_SECURITY is not set
1082# CONFIG_EXT4DEV_FS is not set 1093# CONFIG_EXT4_FS is not set
1083CONFIG_JBD=y 1094CONFIG_JBD=y
1084CONFIG_FS_MBCACHE=y 1095CONFIG_FS_MBCACHE=y
1085# CONFIG_REISERFS_FS is not set 1096# CONFIG_REISERFS_FS is not set
1086# CONFIG_JFS_FS is not set 1097# CONFIG_JFS_FS is not set
1087# CONFIG_FS_POSIX_ACL is not set 1098# CONFIG_FS_POSIX_ACL is not set
1099CONFIG_FILE_LOCKING=y
1088# CONFIG_XFS_FS is not set 1100# CONFIG_XFS_FS is not set
1089# CONFIG_OCFS2_FS is not set 1101# CONFIG_OCFS2_FS is not set
1090CONFIG_DNOTIFY=y 1102CONFIG_DNOTIFY=y
@@ -1117,6 +1129,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1117CONFIG_PROC_FS=y 1129CONFIG_PROC_FS=y
1118CONFIG_PROC_KCORE=y 1130CONFIG_PROC_KCORE=y
1119CONFIG_PROC_SYSCTL=y 1131CONFIG_PROC_SYSCTL=y
1132CONFIG_PROC_PAGE_MONITOR=y
1120CONFIG_SYSFS=y 1133CONFIG_SYSFS=y
1121CONFIG_TMPFS=y 1134CONFIG_TMPFS=y
1122# CONFIG_TMPFS_POSIX_ACL is not set 1135# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1154,6 +1167,7 @@ CONFIG_LOCKD_V4=y
1154CONFIG_NFS_COMMON=y 1167CONFIG_NFS_COMMON=y
1155CONFIG_SUNRPC=y 1168CONFIG_SUNRPC=y
1156CONFIG_SUNRPC_GSS=y 1169CONFIG_SUNRPC_GSS=y
1170# CONFIG_SUNRPC_REGISTER_V4 is not set
1157CONFIG_RPCSEC_GSS_KRB5=y 1171CONFIG_RPCSEC_GSS_KRB5=y
1158# CONFIG_RPCSEC_GSS_SPKM3 is not set 1172# CONFIG_RPCSEC_GSS_SPKM3 is not set
1159# CONFIG_SMB_FS is not set 1173# CONFIG_SMB_FS is not set
@@ -1227,13 +1241,11 @@ CONFIG_NLS_ISO8859_1=y
1227# CONFIG_DLM is not set 1241# CONFIG_DLM is not set
1228CONFIG_UCC_FAST=y 1242CONFIG_UCC_FAST=y
1229CONFIG_UCC=y 1243CONFIG_UCC=y
1230# CONFIG_QE_GPIO is not set
1231 1244
1232# 1245#
1233# Library routines 1246# Library routines
1234# 1247#
1235CONFIG_BITREVERSE=y 1248CONFIG_BITREVERSE=y
1236# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1237# CONFIG_CRC_CCITT is not set 1249# CONFIG_CRC_CCITT is not set
1238# CONFIG_CRC16 is not set 1250# CONFIG_CRC16 is not set
1239CONFIG_CRC_T10DIF=y 1251CONFIG_CRC_T10DIF=y
@@ -1263,13 +1275,15 @@ CONFIG_FRAME_WARN=1024
1263# CONFIG_SLUB_STATS is not set 1275# CONFIG_SLUB_STATS is not set
1264# CONFIG_DEBUG_BUGVERBOSE is not set 1276# CONFIG_DEBUG_BUGVERBOSE is not set
1265# CONFIG_DEBUG_MEMORY_INIT is not set 1277# CONFIG_DEBUG_MEMORY_INIT is not set
1278# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1266# CONFIG_LATENCYTOP is not set 1279# CONFIG_LATENCYTOP is not set
1267CONFIG_SYSCTL_SYSCALL_CHECK=y 1280CONFIG_SYSCTL_SYSCALL_CHECK=y
1268CONFIG_HAVE_FTRACE=y 1281CONFIG_HAVE_FUNCTION_TRACER=y
1269CONFIG_HAVE_DYNAMIC_FTRACE=y 1282
1270# CONFIG_FTRACE is not set 1283#
1271# CONFIG_SCHED_TRACER is not set 1284# Tracers
1272# CONFIG_CONTEXT_SWITCH_TRACER is not set 1285#
1286# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1273# CONFIG_SAMPLES is not set 1287# CONFIG_SAMPLES is not set
1274CONFIG_HAVE_ARCH_KGDB=y 1288CONFIG_HAVE_ARCH_KGDB=y
1275# CONFIG_IRQSTACKS is not set 1289# CONFIG_IRQSTACKS is not set
@@ -1281,14 +1295,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1281# 1295#
1282# CONFIG_KEYS is not set 1296# CONFIG_KEYS is not set
1283# CONFIG_SECURITY is not set 1297# CONFIG_SECURITY is not set
1298# CONFIG_SECURITYFS is not set
1284# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1299# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1285CONFIG_CRYPTO=y 1300CONFIG_CRYPTO=y
1286 1301
1287# 1302#
1288# Crypto core or helper 1303# Crypto core or helper
1289# 1304#
1305# CONFIG_CRYPTO_FIPS is not set
1290CONFIG_CRYPTO_ALGAPI=y 1306CONFIG_CRYPTO_ALGAPI=y
1307CONFIG_CRYPTO_AEAD=y
1291CONFIG_CRYPTO_BLKCIPHER=y 1308CONFIG_CRYPTO_BLKCIPHER=y
1309CONFIG_CRYPTO_HASH=y
1310CONFIG_CRYPTO_RNG=y
1292CONFIG_CRYPTO_MANAGER=y 1311CONFIG_CRYPTO_MANAGER=y
1293# CONFIG_CRYPTO_GF128MUL is not set 1312# CONFIG_CRYPTO_GF128MUL is not set
1294# CONFIG_CRYPTO_NULL is not set 1313# CONFIG_CRYPTO_NULL is not set
@@ -1361,6 +1380,11 @@ CONFIG_CRYPTO_DES=y
1361# 1380#
1362# CONFIG_CRYPTO_DEFLATE is not set 1381# CONFIG_CRYPTO_DEFLATE is not set
1363# CONFIG_CRYPTO_LZO is not set 1382# CONFIG_CRYPTO_LZO is not set
1383
1384#
1385# Random Number Generation
1386#
1387# CONFIG_CRYPTO_ANSI_CPRNG is not set
1364CONFIG_CRYPTO_HW=y 1388CONFIG_CRYPTO_HW=y
1365# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1389# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1366# CONFIG_CRYPTO_DEV_TALITOS is not set 1390# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
index 90aab340e7ff..e55ff7c47a36 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/83xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:20 2008 4# Sat Nov 8 12:39:56 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
23# CONFIG_SMP is not set 23# CONFIG_SMP is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -53,8 +53,6 @@ CONFIG_PPC_UDBG_16550=y
53CONFIG_AUDIT_ARCH=y 53CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
55CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
56CONFIG_HIBERNATE_32=y
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
58CONFIG_ARCH_SUSPEND_POSSIBLE=y 56CONFIG_ARCH_SUSPEND_POSSIBLE=y
59# CONFIG_PPC_DCR_NATIVE is not set 57# CONFIG_PPC_DCR_NATIVE is not set
60# CONFIG_PPC_DCR_MMIO is not set 58# CONFIG_PPC_DCR_MMIO is not set
@@ -98,7 +96,6 @@ CONFIG_HOTPLUG=y
98CONFIG_PRINTK=y 96CONFIG_PRINTK=y
99CONFIG_BUG=y 97CONFIG_BUG=y
100CONFIG_ELF_CORE=y 98CONFIG_ELF_CORE=y
101CONFIG_PCSPKR_PLATFORM=y
102CONFIG_COMPAT_BRK=y 99CONFIG_COMPAT_BRK=y
103CONFIG_BASE_FULL=y 100CONFIG_BASE_FULL=y
104CONFIG_FUTEX=y 101CONFIG_FUTEX=y
@@ -108,7 +105,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 105CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 106CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 107CONFIG_SHMEM=y
108CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
110CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 111CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 112# CONFIG_SLAB is not set
114CONFIG_SLUB=y 113CONFIG_SLUB=y
@@ -121,10 +120,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
121CONFIG_HAVE_KPROBES=y 120CONFIG_HAVE_KPROBES=y
122CONFIG_HAVE_KRETPROBES=y 121CONFIG_HAVE_KRETPROBES=y
123CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_DMA_ATTRS is not set
125# CONFIG_USE_GENERIC_SMP_HELPERS is not set
126# CONFIG_HAVE_CLK is not set
127CONFIG_PROC_PAGE_MONITOR=y
128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
129CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
130CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
@@ -157,6 +152,7 @@ CONFIG_DEFAULT_AS=y
157# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
158CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
159CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_FREEZER is not set
160 156
161# 157#
162# Platform support 158# Platform support
@@ -164,10 +160,10 @@ CONFIG_CLASSIC_RCU=y
164CONFIG_PPC_MULTIPLATFORM=y 160CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y 161CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set 162# CONFIG_PPC_CHRP is not set
167# CONFIG_PPC_PMAC is not set
168# CONFIG_MPC5121_ADS is not set 163# CONFIG_MPC5121_ADS is not set
169# CONFIG_MPC5121_GENERIC is not set 164# CONFIG_MPC5121_GENERIC is not set
170# CONFIG_PPC_MPC52xx is not set 165# CONFIG_PPC_MPC52xx is not set
166# CONFIG_PPC_PMAC is not set
171# CONFIG_PPC_CELL is not set 167# CONFIG_PPC_CELL is not set
172# CONFIG_PPC_CELL_NATIVE is not set 168# CONFIG_PPC_CELL_NATIVE is not set
173# CONFIG_PPC_82xx is not set 169# CONFIG_PPC_82xx is not set
@@ -187,24 +183,21 @@ CONFIG_MPC834x_ITX=y
187CONFIG_PPC_MPC834x=y 183CONFIG_PPC_MPC834x=y
188# CONFIG_PPC_86xx is not set 184# CONFIG_PPC_86xx is not set
189# CONFIG_EMBEDDED6xx is not set 185# CONFIG_EMBEDDED6xx is not set
190CONFIG_PPC_NATIVE=y
191# CONFIG_UDBG_RTAS_CONSOLE is not set
192CONFIG_IPIC=y 186CONFIG_IPIC=y
193CONFIG_MPIC=y 187# CONFIG_MPIC is not set
194# CONFIG_MPIC_WEIRD is not set 188# CONFIG_MPIC_WEIRD is not set
195CONFIG_PPC_I8259=y 189# CONFIG_PPC_I8259 is not set
196CONFIG_PPC_RTAS=y 190# CONFIG_PPC_RTAS is not set
197# CONFIG_RTAS_ERROR_LOGGING is not set
198CONFIG_RTAS_PROC=y
199# CONFIG_MMIO_NVRAM is not set 191# CONFIG_MMIO_NVRAM is not set
200CONFIG_PPC_MPC106=y 192# CONFIG_PPC_MPC106 is not set
201# CONFIG_PPC_970_NAP is not set 193# CONFIG_PPC_970_NAP is not set
202# CONFIG_PPC_INDIRECT_IO is not set 194# CONFIG_PPC_INDIRECT_IO is not set
203# CONFIG_GENERIC_IOMAP is not set 195# CONFIG_GENERIC_IOMAP is not set
204# CONFIG_CPU_FREQ is not set 196# CONFIG_CPU_FREQ is not set
205# CONFIG_PPC601_SYNC_FIX is not set
206# CONFIG_TAU is not set 197# CONFIG_TAU is not set
198# CONFIG_QUICC_ENGINE is not set
207# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_MPC8xxx_GPIO is not set
208 201
209# 202#
210# Kernel options 203# Kernel options
@@ -224,6 +217,8 @@ CONFIG_PREEMPT_NONE=y
224# CONFIG_PREEMPT_VOLUNTARY is not set 217# CONFIG_PREEMPT_VOLUNTARY is not set
225# CONFIG_PREEMPT is not set 218# CONFIG_PREEMPT is not set
226CONFIG_BINFMT_ELF=y 219CONFIG_BINFMT_ELF=y
220# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
221# CONFIG_HAVE_AOUT is not set
227# CONFIG_BINFMT_MISC is not set 222# CONFIG_BINFMT_MISC is not set
228# CONFIG_IOMMU_HELPER is not set 223# CONFIG_IOMMU_HELPER is not set
229CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -238,15 +233,15 @@ CONFIG_FLATMEM_MANUAL=y
238# CONFIG_SPARSEMEM_MANUAL is not set 233# CONFIG_SPARSEMEM_MANUAL is not set
239CONFIG_FLATMEM=y 234CONFIG_FLATMEM=y
240CONFIG_FLAT_NODE_MEM_MAP=y 235CONFIG_FLAT_NODE_MEM_MAP=y
241# CONFIG_SPARSEMEM_STATIC is not set
242# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
243CONFIG_PAGEFLAGS_EXTENDED=y 236CONFIG_PAGEFLAGS_EXTENDED=y
244CONFIG_SPLIT_PTLOCK_CPUS=4 237CONFIG_SPLIT_PTLOCK_CPUS=4
245CONFIG_MIGRATION=y 238CONFIG_MIGRATION=y
246# CONFIG_RESOURCES_64BIT is not set 239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set
247CONFIG_ZONE_DMA_FLAG=1 241CONFIG_ZONE_DMA_FLAG=1
248CONFIG_BOUNCE=y 242CONFIG_BOUNCE=y
249CONFIG_VIRT_TO_BUS=y 243CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y
250CONFIG_FORCE_MAX_ZONEORDER=11 245CONFIG_FORCE_MAX_ZONEORDER=11
251CONFIG_PROC_DEVICETREE=y 246CONFIG_PROC_DEVICETREE=y
252# CONFIG_CMDLINE_BOOL is not set 247# CONFIG_CMDLINE_BOOL is not set
@@ -258,7 +253,6 @@ CONFIG_ISA_DMA_API=y
258# 253#
259# Bus options 254# Bus options
260# 255#
261# CONFIG_ISA is not set
262CONFIG_ZONE_DMA=y 256CONFIG_ZONE_DMA=y
263CONFIG_GENERIC_ISA_DMA=y 257CONFIG_GENERIC_ISA_DMA=y
264CONFIG_PPC_INDIRECT_PCI=y 258CONFIG_PPC_INDIRECT_PCI=y
@@ -271,7 +265,7 @@ CONFIG_PCI_SYSCALL=y
271# CONFIG_PCIEPORTBUS is not set 265# CONFIG_PCIEPORTBUS is not set
272CONFIG_ARCH_SUPPORTS_MSI=y 266CONFIG_ARCH_SUPPORTS_MSI=y
273# CONFIG_PCI_MSI is not set 267# CONFIG_PCI_MSI is not set
274CONFIG_PCI_LEGACY=y 268# CONFIG_PCI_LEGACY is not set
275# CONFIG_PCCARD is not set 269# CONFIG_PCCARD is not set
276# CONFIG_HOTPLUG_PCI is not set 270# CONFIG_HOTPLUG_PCI is not set
277# CONFIG_HAS_RAPIDIO is not set 271# CONFIG_HAS_RAPIDIO is not set
@@ -339,6 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
339# CONFIG_TIPC is not set 333# CONFIG_TIPC is not set
340# CONFIG_ATM is not set 334# CONFIG_ATM is not set
341# CONFIG_BRIDGE is not set 335# CONFIG_BRIDGE is not set
336# CONFIG_NET_DSA is not set
342# CONFIG_VLAN_8021Q is not set 337# CONFIG_VLAN_8021Q is not set
343# CONFIG_DECNET is not set 338# CONFIG_DECNET is not set
344# CONFIG_LLC2 is not set 339# CONFIG_LLC2 is not set
@@ -359,11 +354,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
359# CONFIG_IRDA is not set 354# CONFIG_IRDA is not set
360# CONFIG_BT is not set 355# CONFIG_BT is not set
361# CONFIG_AF_RXRPC is not set 356# CONFIG_AF_RXRPC is not set
362 357# CONFIG_PHONET is not set
363# 358CONFIG_WIRELESS=y
364# Wireless
365#
366# CONFIG_CFG80211 is not set 359# CONFIG_CFG80211 is not set
360CONFIG_WIRELESS_OLD_REGULATORY=y
367# CONFIG_WIRELESS_EXT is not set 361# CONFIG_WIRELESS_EXT is not set
368# CONFIG_MAC80211 is not set 362# CONFIG_MAC80211 is not set
369# CONFIG_IEEE80211 is not set 363# CONFIG_IEEE80211 is not set
@@ -469,7 +463,6 @@ CONFIG_OF_SPI=y
469# CONFIG_PARPORT is not set 463# CONFIG_PARPORT is not set
470CONFIG_BLK_DEV=y 464CONFIG_BLK_DEV=y
471# CONFIG_BLK_DEV_FD is not set 465# CONFIG_BLK_DEV_FD is not set
472# CONFIG_MAC_FLOPPY is not set
473# CONFIG_BLK_CPQ_DA is not set 466# CONFIG_BLK_CPQ_DA is not set
474# CONFIG_BLK_CPQ_CISS_DA is not set 467# CONFIG_BLK_CPQ_CISS_DA is not set
475# CONFIG_BLK_DEV_DAC960 is not set 468# CONFIG_BLK_DEV_DAC960 is not set
@@ -496,7 +489,54 @@ CONFIG_MISC_DEVICES=y
496# CONFIG_HP_ILO is not set 489# CONFIG_HP_ILO is not set
497CONFIG_HAVE_IDE=y 490CONFIG_HAVE_IDE=y
498CONFIG_IDE=y 491CONFIG_IDE=y
499# CONFIG_BLK_DEV_IDE is not set 492
493#
494# Please see Documentation/ide/ide.txt for help/info on IDE drives
495#
496# CONFIG_BLK_DEV_IDE_SATA is not set
497CONFIG_IDE_GD=y
498CONFIG_IDE_GD_ATA=y
499# CONFIG_IDE_GD_ATAPI is not set
500# CONFIG_BLK_DEV_IDECD is not set
501# CONFIG_BLK_DEV_IDETAPE is not set
502# CONFIG_BLK_DEV_IDESCSI is not set
503# CONFIG_IDE_TASK_IOCTL is not set
504CONFIG_IDE_PROC_FS=y
505
506#
507# IDE chipset support/bugfixes
508#
509# CONFIG_BLK_DEV_PLATFORM is not set
510
511#
512# PCI IDE chipsets support
513#
514# CONFIG_BLK_DEV_GENERIC is not set
515# CONFIG_BLK_DEV_OPTI621 is not set
516# CONFIG_BLK_DEV_AEC62XX is not set
517# CONFIG_BLK_DEV_ALI15X3 is not set
518# CONFIG_BLK_DEV_AMD74XX is not set
519# CONFIG_BLK_DEV_CMD64X is not set
520# CONFIG_BLK_DEV_TRIFLEX is not set
521# CONFIG_BLK_DEV_CS5520 is not set
522# CONFIG_BLK_DEV_CS5530 is not set
523# CONFIG_BLK_DEV_HPT366 is not set
524# CONFIG_BLK_DEV_JMICRON is not set
525# CONFIG_BLK_DEV_SC1200 is not set
526# CONFIG_BLK_DEV_PIIX is not set
527# CONFIG_BLK_DEV_IT8213 is not set
528# CONFIG_BLK_DEV_IT821X is not set
529# CONFIG_BLK_DEV_NS87415 is not set
530# CONFIG_BLK_DEV_PDC202XX_OLD is not set
531# CONFIG_BLK_DEV_PDC202XX_NEW is not set
532# CONFIG_BLK_DEV_SVWKS is not set
533# CONFIG_BLK_DEV_SIIMAGE is not set
534# CONFIG_BLK_DEV_SL82C105 is not set
535# CONFIG_BLK_DEV_SLC90E66 is not set
536# CONFIG_BLK_DEV_TRM290 is not set
537# CONFIG_BLK_DEV_VIA82CXXX is not set
538# CONFIG_BLK_DEV_TC86C001 is not set
539# CONFIG_BLK_DEV_IDEDMA is not set
500 540
501# 541#
502# SCSI device support 542# SCSI device support
@@ -572,8 +612,6 @@ CONFIG_SCSI_LOWLEVEL=y
572# CONFIG_SCSI_DC390T is not set 612# CONFIG_SCSI_DC390T is not set
573# CONFIG_SCSI_NSP32 is not set 613# CONFIG_SCSI_NSP32 is not set
574# CONFIG_SCSI_DEBUG is not set 614# CONFIG_SCSI_DEBUG is not set
575# CONFIG_SCSI_MESH is not set
576# CONFIG_SCSI_MAC53C94 is not set
577# CONFIG_SCSI_SRP is not set 615# CONFIG_SCSI_SRP is not set
578# CONFIG_SCSI_DH is not set 616# CONFIG_SCSI_DH is not set
579CONFIG_ATA=y 617CONFIG_ATA=y
@@ -640,6 +678,7 @@ CONFIG_PATA_OF_PLATFORM=y
640# CONFIG_PATA_SCH is not set 678# CONFIG_PATA_SCH is not set
641CONFIG_MD=y 679CONFIG_MD=y
642CONFIG_BLK_DEV_MD=y 680CONFIG_BLK_DEV_MD=y
681CONFIG_MD_AUTODETECT=y
643CONFIG_MD_LINEAR=y 682CONFIG_MD_LINEAR=y
644CONFIG_MD_RAID0=y 683CONFIG_MD_RAID0=y
645CONFIG_MD_RAID1=y 684CONFIG_MD_RAID1=y
@@ -709,18 +748,22 @@ CONFIG_GIANFAR=y
709# CONFIG_QLA3XXX is not set 748# CONFIG_QLA3XXX is not set
710# CONFIG_ATL1 is not set 749# CONFIG_ATL1 is not set
711# CONFIG_ATL1E is not set 750# CONFIG_ATL1E is not set
751# CONFIG_JME is not set
712CONFIG_NETDEV_10000=y 752CONFIG_NETDEV_10000=y
713# CONFIG_CHELSIO_T1 is not set 753# CONFIG_CHELSIO_T1 is not set
714# CONFIG_CHELSIO_T3 is not set 754# CONFIG_CHELSIO_T3 is not set
755# CONFIG_ENIC is not set
715# CONFIG_IXGBE is not set 756# CONFIG_IXGBE is not set
716# CONFIG_IXGB is not set 757# CONFIG_IXGB is not set
717# CONFIG_S2IO is not set 758# CONFIG_S2IO is not set
718# CONFIG_MYRI10GE is not set 759# CONFIG_MYRI10GE is not set
719# CONFIG_NETXEN_NIC is not set 760# CONFIG_NETXEN_NIC is not set
720# CONFIG_NIU is not set 761# CONFIG_NIU is not set
762# CONFIG_MLX4_EN is not set
721# CONFIG_MLX4_CORE is not set 763# CONFIG_MLX4_CORE is not set
722# CONFIG_TEHUTI is not set 764# CONFIG_TEHUTI is not set
723# CONFIG_BNX2X is not set 765# CONFIG_BNX2X is not set
766# CONFIG_QLGE is not set
724# CONFIG_SFC is not set 767# CONFIG_SFC is not set
725# CONFIG_TR is not set 768# CONFIG_TR is not set
726 769
@@ -786,14 +829,11 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
786# CONFIG_SERIAL_UARTLITE is not set 829# CONFIG_SERIAL_UARTLITE is not set
787CONFIG_SERIAL_CORE=y 830CONFIG_SERIAL_CORE=y
788CONFIG_SERIAL_CORE_CONSOLE=y 831CONFIG_SERIAL_CORE_CONSOLE=y
789# CONFIG_SERIAL_PMACZILOG is not set
790# CONFIG_SERIAL_JSM is not set 832# CONFIG_SERIAL_JSM is not set
791# CONFIG_SERIAL_OF_PLATFORM is not set 833# CONFIG_SERIAL_OF_PLATFORM is not set
792CONFIG_UNIX98_PTYS=y 834CONFIG_UNIX98_PTYS=y
793CONFIG_LEGACY_PTYS=y 835CONFIG_LEGACY_PTYS=y
794CONFIG_LEGACY_PTY_COUNT=256 836CONFIG_LEGACY_PTY_COUNT=256
795# CONFIG_BRIQ_PANEL is not set
796# CONFIG_HVC_RTAS is not set
797# CONFIG_IPMI_HANDLER is not set 837# CONFIG_IPMI_HANDLER is not set
798CONFIG_HW_RANDOM=y 838CONFIG_HW_RANDOM=y
799# CONFIG_NVRAM is not set 839# CONFIG_NVRAM is not set
@@ -830,12 +870,6 @@ CONFIG_I2C_HELPER_AUTO=y
830# CONFIG_I2C_VIAPRO is not set 870# CONFIG_I2C_VIAPRO is not set
831 871
832# 872#
833# Mac SMBus host controller drivers
834#
835# CONFIG_I2C_HYDRA is not set
836CONFIG_I2C_POWERMAC=y
837
838#
839# I2C system bus drivers (mostly embedded / system-on-chip) 873# I2C system bus drivers (mostly embedded / system-on-chip)
840# 874#
841CONFIG_I2C_MPC=y 875CONFIG_I2C_MPC=y
@@ -872,6 +906,7 @@ CONFIG_SENSORS_PCF8574=y
872# CONFIG_SENSORS_PCF8591 is not set 906# CONFIG_SENSORS_PCF8591 is not set
873# CONFIG_SENSORS_MAX6875 is not set 907# CONFIG_SENSORS_MAX6875 is not set
874# CONFIG_SENSORS_TSL2550 is not set 908# CONFIG_SENSORS_TSL2550 is not set
909# CONFIG_MCU_MPC8349EMITX is not set
875# CONFIG_I2C_DEBUG_CORE is not set 910# CONFIG_I2C_DEBUG_CORE is not set
876# CONFIG_I2C_DEBUG_ALGO is not set 911# CONFIG_I2C_DEBUG_ALGO is not set
877# CONFIG_I2C_DEBUG_BUS is not set 912# CONFIG_I2C_DEBUG_BUS is not set
@@ -907,7 +942,6 @@ CONFIG_WATCHDOG=y
907# CONFIG_SOFT_WATCHDOG is not set 942# CONFIG_SOFT_WATCHDOG is not set
908# CONFIG_ALIM7101_WDT is not set 943# CONFIG_ALIM7101_WDT is not set
909# CONFIG_8xxx_WDT is not set 944# CONFIG_8xxx_WDT is not set
910# CONFIG_WATCHDOG_RTAS is not set
911 945
912# 946#
913# PCI-based Watchdog Cards 947# PCI-based Watchdog Cards
@@ -933,6 +967,17 @@ CONFIG_SSB_POSSIBLE=y
933# CONFIG_MFD_SM501 is not set 967# CONFIG_MFD_SM501 is not set
934# CONFIG_HTC_PASIC3 is not set 968# CONFIG_HTC_PASIC3 is not set
935# CONFIG_MFD_TMIO is not set 969# CONFIG_MFD_TMIO is not set
970# CONFIG_PMIC_DA903X is not set
971# CONFIG_MFD_WM8400 is not set
972# CONFIG_MFD_WM8350_I2C is not set
973
974#
975# Voltage and Current regulators
976#
977# CONFIG_REGULATOR is not set
978# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
979# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
980# CONFIG_REGULATOR_BQ24022 is not set
936 981
937# 982#
938# Multimedia devices 983# Multimedia devices
@@ -984,6 +1029,8 @@ CONFIG_USB_DEVICE_CLASS=y
984# CONFIG_USB_OTG_WHITELIST is not set 1029# CONFIG_USB_OTG_WHITELIST is not set
985# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1030# CONFIG_USB_OTG_BLACKLIST_HUB is not set
986CONFIG_USB_MON=y 1031CONFIG_USB_MON=y
1032# CONFIG_USB_WUSB is not set
1033# CONFIG_USB_WUSB_CBAF is not set
987 1034
988# 1035#
989# USB Host Controller Drivers 1036# USB Host Controller Drivers
@@ -1000,6 +1047,8 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1000CONFIG_USB_UHCI_HCD=y 1047CONFIG_USB_UHCI_HCD=y
1001# CONFIG_USB_SL811_HCD is not set 1048# CONFIG_USB_SL811_HCD is not set
1002# CONFIG_USB_R8A66597_HCD is not set 1049# CONFIG_USB_R8A66597_HCD is not set
1050# CONFIG_USB_WHCI_HCD is not set
1051# CONFIG_USB_HWA_HCD is not set
1003 1052
1004# 1053#
1005# USB Device Class drivers 1054# USB Device Class drivers
@@ -1007,6 +1056,7 @@ CONFIG_USB_UHCI_HCD=y
1007# CONFIG_USB_ACM is not set 1056# CONFIG_USB_ACM is not set
1008# CONFIG_USB_PRINTER is not set 1057# CONFIG_USB_PRINTER is not set
1009# CONFIG_USB_WDM is not set 1058# CONFIG_USB_WDM is not set
1059# CONFIG_USB_TMC is not set
1010 1060
1011# 1061#
1012# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1062# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1027,7 +1077,6 @@ CONFIG_USB_STORAGE=y
1027# CONFIG_USB_STORAGE_JUMPSHOT is not set 1077# CONFIG_USB_STORAGE_JUMPSHOT is not set
1028# CONFIG_USB_STORAGE_ALAUDA is not set 1078# CONFIG_USB_STORAGE_ALAUDA is not set
1029# CONFIG_USB_STORAGE_KARMA is not set 1079# CONFIG_USB_STORAGE_KARMA is not set
1030# CONFIG_USB_STORAGE_SIERRA is not set
1031# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1080# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1032# CONFIG_USB_LIBUSUAL is not set 1081# CONFIG_USB_LIBUSUAL is not set
1033 1082
@@ -1048,6 +1097,7 @@ CONFIG_USB_STORAGE=y
1048# CONFIG_USB_EMI62 is not set 1097# CONFIG_USB_EMI62 is not set
1049# CONFIG_USB_EMI26 is not set 1098# CONFIG_USB_EMI26 is not set
1050# CONFIG_USB_ADUTUX is not set 1099# CONFIG_USB_ADUTUX is not set
1100# CONFIG_USB_SEVSEG is not set
1051# CONFIG_USB_RIO500 is not set 1101# CONFIG_USB_RIO500 is not set
1052# CONFIG_USB_LEGOTOWER is not set 1102# CONFIG_USB_LEGOTOWER is not set
1053# CONFIG_USB_LCD is not set 1103# CONFIG_USB_LCD is not set
@@ -1065,7 +1115,9 @@ CONFIG_USB_STORAGE=y
1065# CONFIG_USB_IOWARRIOR is not set 1115# CONFIG_USB_IOWARRIOR is not set
1066# CONFIG_USB_TEST is not set 1116# CONFIG_USB_TEST is not set
1067# CONFIG_USB_ISIGHTFW is not set 1117# CONFIG_USB_ISIGHTFW is not set
1118# CONFIG_USB_VST is not set
1068# CONFIG_USB_GADGET is not set 1119# CONFIG_USB_GADGET is not set
1120# CONFIG_UWB is not set
1069# CONFIG_MMC is not set 1121# CONFIG_MMC is not set
1070# CONFIG_MEMSTICK is not set 1122# CONFIG_MEMSTICK is not set
1071# CONFIG_NEW_LEDS is not set 1123# CONFIG_NEW_LEDS is not set
@@ -1111,17 +1163,21 @@ CONFIG_RTC_DRV_DS1307=y
1111# CONFIG_RTC_DRV_MAX6902 is not set 1163# CONFIG_RTC_DRV_MAX6902 is not set
1112# CONFIG_RTC_DRV_R9701 is not set 1164# CONFIG_RTC_DRV_R9701 is not set
1113# CONFIG_RTC_DRV_RS5C348 is not set 1165# CONFIG_RTC_DRV_RS5C348 is not set
1166# CONFIG_RTC_DRV_DS3234 is not set
1114 1167
1115# 1168#
1116# Platform RTC drivers 1169# Platform RTC drivers
1117# 1170#
1118# CONFIG_RTC_DRV_CMOS is not set 1171# CONFIG_RTC_DRV_CMOS is not set
1172# CONFIG_RTC_DRV_DS1286 is not set
1119# CONFIG_RTC_DRV_DS1511 is not set 1173# CONFIG_RTC_DRV_DS1511 is not set
1120# CONFIG_RTC_DRV_DS1553 is not set 1174# CONFIG_RTC_DRV_DS1553 is not set
1121# CONFIG_RTC_DRV_DS1742 is not set 1175# CONFIG_RTC_DRV_DS1742 is not set
1122# CONFIG_RTC_DRV_STK17TA8 is not set 1176# CONFIG_RTC_DRV_STK17TA8 is not set
1123# CONFIG_RTC_DRV_M48T86 is not set 1177# CONFIG_RTC_DRV_M48T86 is not set
1178# CONFIG_RTC_DRV_M48T35 is not set
1124# CONFIG_RTC_DRV_M48T59 is not set 1179# CONFIG_RTC_DRV_M48T59 is not set
1180# CONFIG_RTC_DRV_BQ4802 is not set
1125# CONFIG_RTC_DRV_V3020 is not set 1181# CONFIG_RTC_DRV_V3020 is not set
1126 1182
1127# 1183#
@@ -1130,6 +1186,7 @@ CONFIG_RTC_DRV_DS1307=y
1130# CONFIG_RTC_DRV_PPC is not set 1186# CONFIG_RTC_DRV_PPC is not set
1131# CONFIG_DMADEVICES is not set 1187# CONFIG_DMADEVICES is not set
1132# CONFIG_UIO is not set 1188# CONFIG_UIO is not set
1189# CONFIG_STAGING is not set
1133 1190
1134# 1191#
1135# File systems 1192# File systems
@@ -1141,12 +1198,13 @@ CONFIG_EXT3_FS=y
1141CONFIG_EXT3_FS_XATTR=y 1198CONFIG_EXT3_FS_XATTR=y
1142# CONFIG_EXT3_FS_POSIX_ACL is not set 1199# CONFIG_EXT3_FS_POSIX_ACL is not set
1143# CONFIG_EXT3_FS_SECURITY is not set 1200# CONFIG_EXT3_FS_SECURITY is not set
1144# CONFIG_EXT4DEV_FS is not set 1201# CONFIG_EXT4_FS is not set
1145CONFIG_JBD=y 1202CONFIG_JBD=y
1146CONFIG_FS_MBCACHE=y 1203CONFIG_FS_MBCACHE=y
1147# CONFIG_REISERFS_FS is not set 1204# CONFIG_REISERFS_FS is not set
1148# CONFIG_JFS_FS is not set 1205# CONFIG_JFS_FS is not set
1149# CONFIG_FS_POSIX_ACL is not set 1206# CONFIG_FS_POSIX_ACL is not set
1207CONFIG_FILE_LOCKING=y
1150# CONFIG_XFS_FS is not set 1208# CONFIG_XFS_FS is not set
1151# CONFIG_OCFS2_FS is not set 1209# CONFIG_OCFS2_FS is not set
1152CONFIG_DNOTIFY=y 1210CONFIG_DNOTIFY=y
@@ -1179,6 +1237,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1179CONFIG_PROC_FS=y 1237CONFIG_PROC_FS=y
1180CONFIG_PROC_KCORE=y 1238CONFIG_PROC_KCORE=y
1181CONFIG_PROC_SYSCTL=y 1239CONFIG_PROC_SYSCTL=y
1240CONFIG_PROC_PAGE_MONITOR=y
1182CONFIG_SYSFS=y 1241CONFIG_SYSFS=y
1183CONFIG_TMPFS=y 1242CONFIG_TMPFS=y
1184# CONFIG_TMPFS_POSIX_ACL is not set 1243# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1217,6 +1276,7 @@ CONFIG_LOCKD_V4=y
1217CONFIG_NFS_COMMON=y 1276CONFIG_NFS_COMMON=y
1218CONFIG_SUNRPC=y 1277CONFIG_SUNRPC=y
1219CONFIG_SUNRPC_GSS=y 1278CONFIG_SUNRPC_GSS=y
1279# CONFIG_SUNRPC_REGISTER_V4 is not set
1220CONFIG_RPCSEC_GSS_KRB5=y 1280CONFIG_RPCSEC_GSS_KRB5=y
1221# CONFIG_RPCSEC_GSS_SPKM3 is not set 1281# CONFIG_RPCSEC_GSS_SPKM3 is not set
1222# CONFIG_SMB_FS is not set 1282# CONFIG_SMB_FS is not set
@@ -1292,7 +1352,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1292# Library routines 1352# Library routines
1293# 1353#
1294CONFIG_BITREVERSE=y 1354CONFIG_BITREVERSE=y
1295# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1296# CONFIG_CRC_CCITT is not set 1355# CONFIG_CRC_CCITT is not set
1297# CONFIG_CRC16 is not set 1356# CONFIG_CRC16 is not set
1298CONFIG_CRC_T10DIF=y 1357CONFIG_CRC_T10DIF=y
@@ -1322,13 +1381,15 @@ CONFIG_FRAME_WARN=1024
1322# CONFIG_SLUB_STATS is not set 1381# CONFIG_SLUB_STATS is not set
1323# CONFIG_DEBUG_BUGVERBOSE is not set 1382# CONFIG_DEBUG_BUGVERBOSE is not set
1324# CONFIG_DEBUG_MEMORY_INIT is not set 1383# CONFIG_DEBUG_MEMORY_INIT is not set
1384# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1325# CONFIG_LATENCYTOP is not set 1385# CONFIG_LATENCYTOP is not set
1326CONFIG_SYSCTL_SYSCALL_CHECK=y 1386CONFIG_SYSCTL_SYSCALL_CHECK=y
1327CONFIG_HAVE_FTRACE=y 1387CONFIG_HAVE_FUNCTION_TRACER=y
1328CONFIG_HAVE_DYNAMIC_FTRACE=y 1388
1329# CONFIG_FTRACE is not set 1389#
1330# CONFIG_SCHED_TRACER is not set 1390# Tracers
1331# CONFIG_CONTEXT_SWITCH_TRACER is not set 1391#
1392# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1332# CONFIG_SAMPLES is not set 1393# CONFIG_SAMPLES is not set
1333CONFIG_HAVE_ARCH_KGDB=y 1394CONFIG_HAVE_ARCH_KGDB=y
1334# CONFIG_IRQSTACKS is not set 1395# CONFIG_IRQSTACKS is not set
@@ -1340,14 +1401,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1340# 1401#
1341# CONFIG_KEYS is not set 1402# CONFIG_KEYS is not set
1342# CONFIG_SECURITY is not set 1403# CONFIG_SECURITY is not set
1404# CONFIG_SECURITYFS is not set
1343# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1405# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1344CONFIG_CRYPTO=y 1406CONFIG_CRYPTO=y
1345 1407
1346# 1408#
1347# Crypto core or helper 1409# Crypto core or helper
1348# 1410#
1411# CONFIG_CRYPTO_FIPS is not set
1349CONFIG_CRYPTO_ALGAPI=y 1412CONFIG_CRYPTO_ALGAPI=y
1413CONFIG_CRYPTO_AEAD=y
1350CONFIG_CRYPTO_BLKCIPHER=y 1414CONFIG_CRYPTO_BLKCIPHER=y
1415CONFIG_CRYPTO_HASH=y
1416CONFIG_CRYPTO_RNG=y
1351CONFIG_CRYPTO_MANAGER=y 1417CONFIG_CRYPTO_MANAGER=y
1352# CONFIG_CRYPTO_GF128MUL is not set 1418# CONFIG_CRYPTO_GF128MUL is not set
1353# CONFIG_CRYPTO_NULL is not set 1419# CONFIG_CRYPTO_NULL is not set
@@ -1420,6 +1486,11 @@ CONFIG_CRYPTO_DES=y
1420# 1486#
1421# CONFIG_CRYPTO_DEFLATE is not set 1487# CONFIG_CRYPTO_DEFLATE is not set
1422# CONFIG_CRYPTO_LZO is not set 1488# CONFIG_CRYPTO_LZO is not set
1489
1490#
1491# Random Number Generation
1492#
1493# CONFIG_CRYPTO_ANSI_CPRNG is not set
1423CONFIG_CRYPTO_HW=y 1494CONFIG_CRYPTO_HW=y
1424# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1495# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1425# CONFIG_CRYPTO_DEV_TALITOS is not set 1496# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
index 7458a242d251..426232cb0097 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/83xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:21 2008 4# Sat Nov 8 12:39:57 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
23# CONFIG_SMP is not set 23# CONFIG_SMP is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -53,8 +53,6 @@ CONFIG_PPC_UDBG_16550=y
53CONFIG_AUDIT_ARCH=y 53CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
55CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
56CONFIG_HIBERNATE_32=y
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
58CONFIG_ARCH_SUSPEND_POSSIBLE=y 56CONFIG_ARCH_SUSPEND_POSSIBLE=y
59# CONFIG_PPC_DCR_NATIVE is not set 57# CONFIG_PPC_DCR_NATIVE is not set
60# CONFIG_PPC_DCR_MMIO is not set 58# CONFIG_PPC_DCR_MMIO is not set
@@ -98,7 +96,6 @@ CONFIG_HOTPLUG=y
98CONFIG_PRINTK=y 96CONFIG_PRINTK=y
99CONFIG_BUG=y 97CONFIG_BUG=y
100CONFIG_ELF_CORE=y 98CONFIG_ELF_CORE=y
101CONFIG_PCSPKR_PLATFORM=y
102CONFIG_COMPAT_BRK=y 99CONFIG_COMPAT_BRK=y
103CONFIG_BASE_FULL=y 100CONFIG_BASE_FULL=y
104CONFIG_FUTEX=y 101CONFIG_FUTEX=y
@@ -108,7 +105,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 105CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 106CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 107CONFIG_SHMEM=y
108CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
110CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 111CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 112# CONFIG_SLAB is not set
114CONFIG_SLUB=y 113CONFIG_SLUB=y
@@ -121,10 +120,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
121CONFIG_HAVE_KPROBES=y 120CONFIG_HAVE_KPROBES=y
122CONFIG_HAVE_KRETPROBES=y 121CONFIG_HAVE_KRETPROBES=y
123CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_DMA_ATTRS is not set
125# CONFIG_USE_GENERIC_SMP_HELPERS is not set
126# CONFIG_HAVE_CLK is not set
127CONFIG_PROC_PAGE_MONITOR=y
128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
129CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
130CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
@@ -157,6 +152,7 @@ CONFIG_DEFAULT_AS=y
157# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
158CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
159CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_FREEZER is not set
160 156
161# 157#
162# Platform support 158# Platform support
@@ -164,10 +160,10 @@ CONFIG_CLASSIC_RCU=y
164CONFIG_PPC_MULTIPLATFORM=y 160CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y 161CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set 162# CONFIG_PPC_CHRP is not set
167# CONFIG_PPC_PMAC is not set
168# CONFIG_MPC5121_ADS is not set 163# CONFIG_MPC5121_ADS is not set
169# CONFIG_MPC5121_GENERIC is not set 164# CONFIG_MPC5121_GENERIC is not set
170# CONFIG_PPC_MPC52xx is not set 165# CONFIG_PPC_MPC52xx is not set
166# CONFIG_PPC_PMAC is not set
171# CONFIG_PPC_CELL is not set 167# CONFIG_PPC_CELL is not set
172# CONFIG_PPC_CELL_NATIVE is not set 168# CONFIG_PPC_CELL_NATIVE is not set
173# CONFIG_PPC_82xx is not set 169# CONFIG_PPC_82xx is not set
@@ -187,24 +183,21 @@ CONFIG_MPC834x_ITX=y
187CONFIG_PPC_MPC834x=y 183CONFIG_PPC_MPC834x=y
188# CONFIG_PPC_86xx is not set 184# CONFIG_PPC_86xx is not set
189# CONFIG_EMBEDDED6xx is not set 185# CONFIG_EMBEDDED6xx is not set
190CONFIG_PPC_NATIVE=y
191# CONFIG_UDBG_RTAS_CONSOLE is not set
192CONFIG_IPIC=y 186CONFIG_IPIC=y
193CONFIG_MPIC=y 187# CONFIG_MPIC is not set
194# CONFIG_MPIC_WEIRD is not set 188# CONFIG_MPIC_WEIRD is not set
195CONFIG_PPC_I8259=y 189# CONFIG_PPC_I8259 is not set
196CONFIG_PPC_RTAS=y 190# CONFIG_PPC_RTAS is not set
197# CONFIG_RTAS_ERROR_LOGGING is not set
198CONFIG_RTAS_PROC=y
199# CONFIG_MMIO_NVRAM is not set 191# CONFIG_MMIO_NVRAM is not set
200CONFIG_PPC_MPC106=y 192# CONFIG_PPC_MPC106 is not set
201# CONFIG_PPC_970_NAP is not set 193# CONFIG_PPC_970_NAP is not set
202# CONFIG_PPC_INDIRECT_IO is not set 194# CONFIG_PPC_INDIRECT_IO is not set
203# CONFIG_GENERIC_IOMAP is not set 195# CONFIG_GENERIC_IOMAP is not set
204# CONFIG_CPU_FREQ is not set 196# CONFIG_CPU_FREQ is not set
205# CONFIG_PPC601_SYNC_FIX is not set
206# CONFIG_TAU is not set 197# CONFIG_TAU is not set
198# CONFIG_QUICC_ENGINE is not set
207# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_MPC8xxx_GPIO is not set
208 201
209# 202#
210# Kernel options 203# Kernel options
@@ -224,6 +217,8 @@ CONFIG_PREEMPT_NONE=y
224# CONFIG_PREEMPT_VOLUNTARY is not set 217# CONFIG_PREEMPT_VOLUNTARY is not set
225# CONFIG_PREEMPT is not set 218# CONFIG_PREEMPT is not set
226CONFIG_BINFMT_ELF=y 219CONFIG_BINFMT_ELF=y
220# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
221# CONFIG_HAVE_AOUT is not set
227# CONFIG_BINFMT_MISC is not set 222# CONFIG_BINFMT_MISC is not set
228# CONFIG_IOMMU_HELPER is not set 223# CONFIG_IOMMU_HELPER is not set
229CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -238,15 +233,15 @@ CONFIG_FLATMEM_MANUAL=y
238# CONFIG_SPARSEMEM_MANUAL is not set 233# CONFIG_SPARSEMEM_MANUAL is not set
239CONFIG_FLATMEM=y 234CONFIG_FLATMEM=y
240CONFIG_FLAT_NODE_MEM_MAP=y 235CONFIG_FLAT_NODE_MEM_MAP=y
241# CONFIG_SPARSEMEM_STATIC is not set
242# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
243CONFIG_PAGEFLAGS_EXTENDED=y 236CONFIG_PAGEFLAGS_EXTENDED=y
244CONFIG_SPLIT_PTLOCK_CPUS=4 237CONFIG_SPLIT_PTLOCK_CPUS=4
245CONFIG_MIGRATION=y 238CONFIG_MIGRATION=y
246# CONFIG_RESOURCES_64BIT is not set 239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set
247CONFIG_ZONE_DMA_FLAG=1 241CONFIG_ZONE_DMA_FLAG=1
248CONFIG_BOUNCE=y 242CONFIG_BOUNCE=y
249CONFIG_VIRT_TO_BUS=y 243CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y
250CONFIG_FORCE_MAX_ZONEORDER=11 245CONFIG_FORCE_MAX_ZONEORDER=11
251CONFIG_PROC_DEVICETREE=y 246CONFIG_PROC_DEVICETREE=y
252# CONFIG_CMDLINE_BOOL is not set 247# CONFIG_CMDLINE_BOOL is not set
@@ -258,7 +253,6 @@ CONFIG_ISA_DMA_API=y
258# 253#
259# Bus options 254# Bus options
260# 255#
261# CONFIG_ISA is not set
262CONFIG_ZONE_DMA=y 256CONFIG_ZONE_DMA=y
263CONFIG_GENERIC_ISA_DMA=y 257CONFIG_GENERIC_ISA_DMA=y
264CONFIG_PPC_INDIRECT_PCI=y 258CONFIG_PPC_INDIRECT_PCI=y
@@ -271,7 +265,7 @@ CONFIG_PCI_SYSCALL=y
271# CONFIG_PCIEPORTBUS is not set 265# CONFIG_PCIEPORTBUS is not set
272CONFIG_ARCH_SUPPORTS_MSI=y 266CONFIG_ARCH_SUPPORTS_MSI=y
273# CONFIG_PCI_MSI is not set 267# CONFIG_PCI_MSI is not set
274CONFIG_PCI_LEGACY=y 268# CONFIG_PCI_LEGACY is not set
275# CONFIG_PCCARD is not set 269# CONFIG_PCCARD is not set
276# CONFIG_HOTPLUG_PCI is not set 270# CONFIG_HOTPLUG_PCI is not set
277# CONFIG_HAS_RAPIDIO is not set 271# CONFIG_HAS_RAPIDIO is not set
@@ -339,6 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
339# CONFIG_TIPC is not set 333# CONFIG_TIPC is not set
340# CONFIG_ATM is not set 334# CONFIG_ATM is not set
341# CONFIG_BRIDGE is not set 335# CONFIG_BRIDGE is not set
336# CONFIG_NET_DSA is not set
342# CONFIG_VLAN_8021Q is not set 337# CONFIG_VLAN_8021Q is not set
343# CONFIG_DECNET is not set 338# CONFIG_DECNET is not set
344# CONFIG_LLC2 is not set 339# CONFIG_LLC2 is not set
@@ -359,11 +354,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
359# CONFIG_IRDA is not set 354# CONFIG_IRDA is not set
360# CONFIG_BT is not set 355# CONFIG_BT is not set
361# CONFIG_AF_RXRPC is not set 356# CONFIG_AF_RXRPC is not set
362 357# CONFIG_PHONET is not set
363# 358CONFIG_WIRELESS=y
364# Wireless
365#
366# CONFIG_CFG80211 is not set 359# CONFIG_CFG80211 is not set
360CONFIG_WIRELESS_OLD_REGULATORY=y
367# CONFIG_WIRELESS_EXT is not set 361# CONFIG_WIRELESS_EXT is not set
368# CONFIG_MAC80211 is not set 362# CONFIG_MAC80211 is not set
369# CONFIG_IEEE80211 is not set 363# CONFIG_IEEE80211 is not set
@@ -469,7 +463,6 @@ CONFIG_OF_SPI=y
469# CONFIG_PARPORT is not set 463# CONFIG_PARPORT is not set
470CONFIG_BLK_DEV=y 464CONFIG_BLK_DEV=y
471# CONFIG_BLK_DEV_FD is not set 465# CONFIG_BLK_DEV_FD is not set
472# CONFIG_MAC_FLOPPY is not set
473# CONFIG_BLK_CPQ_DA is not set 466# CONFIG_BLK_CPQ_DA is not set
474# CONFIG_BLK_CPQ_CISS_DA is not set 467# CONFIG_BLK_CPQ_CISS_DA is not set
475# CONFIG_BLK_DEV_DAC960 is not set 468# CONFIG_BLK_DEV_DAC960 is not set
@@ -570,8 +563,6 @@ CONFIG_SCSI_LOWLEVEL=y
570# CONFIG_SCSI_DC390T is not set 563# CONFIG_SCSI_DC390T is not set
571# CONFIG_SCSI_NSP32 is not set 564# CONFIG_SCSI_NSP32 is not set
572# CONFIG_SCSI_DEBUG is not set 565# CONFIG_SCSI_DEBUG is not set
573# CONFIG_SCSI_MESH is not set
574# CONFIG_SCSI_MAC53C94 is not set
575# CONFIG_SCSI_SRP is not set 566# CONFIG_SCSI_SRP is not set
576# CONFIG_SCSI_DH is not set 567# CONFIG_SCSI_DH is not set
577# CONFIG_ATA is not set 568# CONFIG_ATA is not set
@@ -637,18 +628,22 @@ CONFIG_GIANFAR=y
637# CONFIG_QLA3XXX is not set 628# CONFIG_QLA3XXX is not set
638# CONFIG_ATL1 is not set 629# CONFIG_ATL1 is not set
639# CONFIG_ATL1E is not set 630# CONFIG_ATL1E is not set
631# CONFIG_JME is not set
640CONFIG_NETDEV_10000=y 632CONFIG_NETDEV_10000=y
641# CONFIG_CHELSIO_T1 is not set 633# CONFIG_CHELSIO_T1 is not set
642# CONFIG_CHELSIO_T3 is not set 634# CONFIG_CHELSIO_T3 is not set
635# CONFIG_ENIC is not set
643# CONFIG_IXGBE is not set 636# CONFIG_IXGBE is not set
644# CONFIG_IXGB is not set 637# CONFIG_IXGB is not set
645# CONFIG_S2IO is not set 638# CONFIG_S2IO is not set
646# CONFIG_MYRI10GE is not set 639# CONFIG_MYRI10GE is not set
647# CONFIG_NETXEN_NIC is not set 640# CONFIG_NETXEN_NIC is not set
648# CONFIG_NIU is not set 641# CONFIG_NIU is not set
642# CONFIG_MLX4_EN is not set
649# CONFIG_MLX4_CORE is not set 643# CONFIG_MLX4_CORE is not set
650# CONFIG_TEHUTI is not set 644# CONFIG_TEHUTI is not set
651# CONFIG_BNX2X is not set 645# CONFIG_BNX2X is not set
646# CONFIG_QLGE is not set
652# CONFIG_SFC is not set 647# CONFIG_SFC is not set
653# CONFIG_TR is not set 648# CONFIG_TR is not set
654 649
@@ -714,14 +709,11 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
714# CONFIG_SERIAL_UARTLITE is not set 709# CONFIG_SERIAL_UARTLITE is not set
715CONFIG_SERIAL_CORE=y 710CONFIG_SERIAL_CORE=y
716CONFIG_SERIAL_CORE_CONSOLE=y 711CONFIG_SERIAL_CORE_CONSOLE=y
717# CONFIG_SERIAL_PMACZILOG is not set
718# CONFIG_SERIAL_JSM is not set 712# CONFIG_SERIAL_JSM is not set
719# CONFIG_SERIAL_OF_PLATFORM is not set 713# CONFIG_SERIAL_OF_PLATFORM is not set
720CONFIG_UNIX98_PTYS=y 714CONFIG_UNIX98_PTYS=y
721CONFIG_LEGACY_PTYS=y 715CONFIG_LEGACY_PTYS=y
722CONFIG_LEGACY_PTY_COUNT=256 716CONFIG_LEGACY_PTY_COUNT=256
723# CONFIG_BRIQ_PANEL is not set
724# CONFIG_HVC_RTAS is not set
725# CONFIG_IPMI_HANDLER is not set 717# CONFIG_IPMI_HANDLER is not set
726CONFIG_HW_RANDOM=y 718CONFIG_HW_RANDOM=y
727# CONFIG_NVRAM is not set 719# CONFIG_NVRAM is not set
@@ -758,12 +750,6 @@ CONFIG_I2C_HELPER_AUTO=y
758# CONFIG_I2C_VIAPRO is not set 750# CONFIG_I2C_VIAPRO is not set
759 751
760# 752#
761# Mac SMBus host controller drivers
762#
763# CONFIG_I2C_HYDRA is not set
764CONFIG_I2C_POWERMAC=y
765
766#
767# I2C system bus drivers (mostly embedded / system-on-chip) 753# I2C system bus drivers (mostly embedded / system-on-chip)
768# 754#
769CONFIG_I2C_MPC=y 755CONFIG_I2C_MPC=y
@@ -800,6 +786,7 @@ CONFIG_SENSORS_PCF8574=y
800# CONFIG_SENSORS_PCF8591 is not set 786# CONFIG_SENSORS_PCF8591 is not set
801# CONFIG_SENSORS_MAX6875 is not set 787# CONFIG_SENSORS_MAX6875 is not set
802# CONFIG_SENSORS_TSL2550 is not set 788# CONFIG_SENSORS_TSL2550 is not set
789# CONFIG_MCU_MPC8349EMITX is not set
803# CONFIG_I2C_DEBUG_CORE is not set 790# CONFIG_I2C_DEBUG_CORE is not set
804# CONFIG_I2C_DEBUG_ALGO is not set 791# CONFIG_I2C_DEBUG_ALGO is not set
805# CONFIG_I2C_DEBUG_BUS is not set 792# CONFIG_I2C_DEBUG_BUS is not set
@@ -835,7 +822,6 @@ CONFIG_WATCHDOG=y
835# CONFIG_SOFT_WATCHDOG is not set 822# CONFIG_SOFT_WATCHDOG is not set
836# CONFIG_ALIM7101_WDT is not set 823# CONFIG_ALIM7101_WDT is not set
837# CONFIG_8xxx_WDT is not set 824# CONFIG_8xxx_WDT is not set
838# CONFIG_WATCHDOG_RTAS is not set
839 825
840# 826#
841# PCI-based Watchdog Cards 827# PCI-based Watchdog Cards
@@ -861,6 +847,17 @@ CONFIG_SSB_POSSIBLE=y
861# CONFIG_MFD_SM501 is not set 847# CONFIG_MFD_SM501 is not set
862# CONFIG_HTC_PASIC3 is not set 848# CONFIG_HTC_PASIC3 is not set
863# CONFIG_MFD_TMIO is not set 849# CONFIG_MFD_TMIO is not set
850# CONFIG_PMIC_DA903X is not set
851# CONFIG_MFD_WM8400 is not set
852# CONFIG_MFD_WM8350_I2C is not set
853
854#
855# Voltage and Current regulators
856#
857# CONFIG_REGULATOR is not set
858# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
859# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
860# CONFIG_REGULATOR_BQ24022 is not set
864 861
865# 862#
866# Multimedia devices 863# Multimedia devices
@@ -912,6 +909,8 @@ CONFIG_USB_DEVICE_CLASS=y
912# CONFIG_USB_OTG_WHITELIST is not set 909# CONFIG_USB_OTG_WHITELIST is not set
913# CONFIG_USB_OTG_BLACKLIST_HUB is not set 910# CONFIG_USB_OTG_BLACKLIST_HUB is not set
914CONFIG_USB_MON=y 911CONFIG_USB_MON=y
912# CONFIG_USB_WUSB is not set
913# CONFIG_USB_WUSB_CBAF is not set
915 914
916# 915#
917# USB Host Controller Drivers 916# USB Host Controller Drivers
@@ -928,6 +927,8 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
928CONFIG_USB_UHCI_HCD=y 927CONFIG_USB_UHCI_HCD=y
929# CONFIG_USB_SL811_HCD is not set 928# CONFIG_USB_SL811_HCD is not set
930# CONFIG_USB_R8A66597_HCD is not set 929# CONFIG_USB_R8A66597_HCD is not set
930# CONFIG_USB_WHCI_HCD is not set
931# CONFIG_USB_HWA_HCD is not set
931 932
932# 933#
933# USB Device Class drivers 934# USB Device Class drivers
@@ -935,6 +936,7 @@ CONFIG_USB_UHCI_HCD=y
935# CONFIG_USB_ACM is not set 936# CONFIG_USB_ACM is not set
936# CONFIG_USB_PRINTER is not set 937# CONFIG_USB_PRINTER is not set
937# CONFIG_USB_WDM is not set 938# CONFIG_USB_WDM is not set
939# CONFIG_USB_TMC is not set
938 940
939# 941#
940# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 942# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -955,7 +957,6 @@ CONFIG_USB_STORAGE=y
955# CONFIG_USB_STORAGE_JUMPSHOT is not set 957# CONFIG_USB_STORAGE_JUMPSHOT is not set
956# CONFIG_USB_STORAGE_ALAUDA is not set 958# CONFIG_USB_STORAGE_ALAUDA is not set
957# CONFIG_USB_STORAGE_KARMA is not set 959# CONFIG_USB_STORAGE_KARMA is not set
958# CONFIG_USB_STORAGE_SIERRA is not set
959# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 960# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
960# CONFIG_USB_LIBUSUAL is not set 961# CONFIG_USB_LIBUSUAL is not set
961 962
@@ -976,6 +977,7 @@ CONFIG_USB_STORAGE=y
976# CONFIG_USB_EMI62 is not set 977# CONFIG_USB_EMI62 is not set
977# CONFIG_USB_EMI26 is not set 978# CONFIG_USB_EMI26 is not set
978# CONFIG_USB_ADUTUX is not set 979# CONFIG_USB_ADUTUX is not set
980# CONFIG_USB_SEVSEG is not set
979# CONFIG_USB_RIO500 is not set 981# CONFIG_USB_RIO500 is not set
980# CONFIG_USB_LEGOTOWER is not set 982# CONFIG_USB_LEGOTOWER is not set
981# CONFIG_USB_LCD is not set 983# CONFIG_USB_LCD is not set
@@ -992,7 +994,9 @@ CONFIG_USB_STORAGE=y
992# CONFIG_USB_TRANCEVIBRATOR is not set 994# CONFIG_USB_TRANCEVIBRATOR is not set
993# CONFIG_USB_IOWARRIOR is not set 995# CONFIG_USB_IOWARRIOR is not set
994# CONFIG_USB_ISIGHTFW is not set 996# CONFIG_USB_ISIGHTFW is not set
997# CONFIG_USB_VST is not set
995# CONFIG_USB_GADGET is not set 998# CONFIG_USB_GADGET is not set
999# CONFIG_UWB is not set
996# CONFIG_MMC is not set 1000# CONFIG_MMC is not set
997# CONFIG_MEMSTICK is not set 1001# CONFIG_MEMSTICK is not set
998# CONFIG_NEW_LEDS is not set 1002# CONFIG_NEW_LEDS is not set
@@ -1038,17 +1042,21 @@ CONFIG_RTC_DRV_DS1307=y
1038# CONFIG_RTC_DRV_MAX6902 is not set 1042# CONFIG_RTC_DRV_MAX6902 is not set
1039# CONFIG_RTC_DRV_R9701 is not set 1043# CONFIG_RTC_DRV_R9701 is not set
1040# CONFIG_RTC_DRV_RS5C348 is not set 1044# CONFIG_RTC_DRV_RS5C348 is not set
1045# CONFIG_RTC_DRV_DS3234 is not set
1041 1046
1042# 1047#
1043# Platform RTC drivers 1048# Platform RTC drivers
1044# 1049#
1045# CONFIG_RTC_DRV_CMOS is not set 1050# CONFIG_RTC_DRV_CMOS is not set
1051# CONFIG_RTC_DRV_DS1286 is not set
1046# CONFIG_RTC_DRV_DS1511 is not set 1052# CONFIG_RTC_DRV_DS1511 is not set
1047# CONFIG_RTC_DRV_DS1553 is not set 1053# CONFIG_RTC_DRV_DS1553 is not set
1048# CONFIG_RTC_DRV_DS1742 is not set 1054# CONFIG_RTC_DRV_DS1742 is not set
1049# CONFIG_RTC_DRV_STK17TA8 is not set 1055# CONFIG_RTC_DRV_STK17TA8 is not set
1050# CONFIG_RTC_DRV_M48T86 is not set 1056# CONFIG_RTC_DRV_M48T86 is not set
1057# CONFIG_RTC_DRV_M48T35 is not set
1051# CONFIG_RTC_DRV_M48T59 is not set 1058# CONFIG_RTC_DRV_M48T59 is not set
1059# CONFIG_RTC_DRV_BQ4802 is not set
1052# CONFIG_RTC_DRV_V3020 is not set 1060# CONFIG_RTC_DRV_V3020 is not set
1053 1061
1054# 1062#
@@ -1057,6 +1065,7 @@ CONFIG_RTC_DRV_DS1307=y
1057# CONFIG_RTC_DRV_PPC is not set 1065# CONFIG_RTC_DRV_PPC is not set
1058# CONFIG_DMADEVICES is not set 1066# CONFIG_DMADEVICES is not set
1059# CONFIG_UIO is not set 1067# CONFIG_UIO is not set
1068# CONFIG_STAGING is not set
1060 1069
1061# 1070#
1062# File systems 1071# File systems
@@ -1068,12 +1077,13 @@ CONFIG_EXT3_FS=y
1068CONFIG_EXT3_FS_XATTR=y 1077CONFIG_EXT3_FS_XATTR=y
1069# CONFIG_EXT3_FS_POSIX_ACL is not set 1078# CONFIG_EXT3_FS_POSIX_ACL is not set
1070# CONFIG_EXT3_FS_SECURITY is not set 1079# CONFIG_EXT3_FS_SECURITY is not set
1071# CONFIG_EXT4DEV_FS is not set 1080# CONFIG_EXT4_FS is not set
1072CONFIG_JBD=y 1081CONFIG_JBD=y
1073CONFIG_FS_MBCACHE=y 1082CONFIG_FS_MBCACHE=y
1074# CONFIG_REISERFS_FS is not set 1083# CONFIG_REISERFS_FS is not set
1075# CONFIG_JFS_FS is not set 1084# CONFIG_JFS_FS is not set
1076# CONFIG_FS_POSIX_ACL is not set 1085# CONFIG_FS_POSIX_ACL is not set
1086CONFIG_FILE_LOCKING=y
1077# CONFIG_XFS_FS is not set 1087# CONFIG_XFS_FS is not set
1078# CONFIG_OCFS2_FS is not set 1088# CONFIG_OCFS2_FS is not set
1079CONFIG_DNOTIFY=y 1089CONFIG_DNOTIFY=y
@@ -1106,6 +1116,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1106CONFIG_PROC_FS=y 1116CONFIG_PROC_FS=y
1107CONFIG_PROC_KCORE=y 1117CONFIG_PROC_KCORE=y
1108CONFIG_PROC_SYSCTL=y 1118CONFIG_PROC_SYSCTL=y
1119CONFIG_PROC_PAGE_MONITOR=y
1109CONFIG_SYSFS=y 1120CONFIG_SYSFS=y
1110CONFIG_TMPFS=y 1121CONFIG_TMPFS=y
1111# CONFIG_TMPFS_POSIX_ACL is not set 1122# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1144,6 +1155,7 @@ CONFIG_LOCKD_V4=y
1144CONFIG_NFS_COMMON=y 1155CONFIG_NFS_COMMON=y
1145CONFIG_SUNRPC=y 1156CONFIG_SUNRPC=y
1146CONFIG_SUNRPC_GSS=y 1157CONFIG_SUNRPC_GSS=y
1158# CONFIG_SUNRPC_REGISTER_V4 is not set
1147CONFIG_RPCSEC_GSS_KRB5=y 1159CONFIG_RPCSEC_GSS_KRB5=y
1148# CONFIG_RPCSEC_GSS_SPKM3 is not set 1160# CONFIG_RPCSEC_GSS_SPKM3 is not set
1149# CONFIG_SMB_FS is not set 1161# CONFIG_SMB_FS is not set
@@ -1219,7 +1231,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1219# Library routines 1231# Library routines
1220# 1232#
1221CONFIG_BITREVERSE=y 1233CONFIG_BITREVERSE=y
1222# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1223# CONFIG_CRC_CCITT is not set 1234# CONFIG_CRC_CCITT is not set
1224# CONFIG_CRC16 is not set 1235# CONFIG_CRC16 is not set
1225CONFIG_CRC_T10DIF=y 1236CONFIG_CRC_T10DIF=y
@@ -1249,13 +1260,15 @@ CONFIG_FRAME_WARN=1024
1249# CONFIG_SLUB_STATS is not set 1260# CONFIG_SLUB_STATS is not set
1250# CONFIG_DEBUG_BUGVERBOSE is not set 1261# CONFIG_DEBUG_BUGVERBOSE is not set
1251# CONFIG_DEBUG_MEMORY_INIT is not set 1262# CONFIG_DEBUG_MEMORY_INIT is not set
1263# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1252# CONFIG_LATENCYTOP is not set 1264# CONFIG_LATENCYTOP is not set
1253CONFIG_SYSCTL_SYSCALL_CHECK=y 1265CONFIG_SYSCTL_SYSCALL_CHECK=y
1254CONFIG_HAVE_FTRACE=y 1266CONFIG_HAVE_FUNCTION_TRACER=y
1255CONFIG_HAVE_DYNAMIC_FTRACE=y 1267
1256# CONFIG_FTRACE is not set 1268#
1257# CONFIG_SCHED_TRACER is not set 1269# Tracers
1258# CONFIG_CONTEXT_SWITCH_TRACER is not set 1270#
1271# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1259# CONFIG_SAMPLES is not set 1272# CONFIG_SAMPLES is not set
1260CONFIG_HAVE_ARCH_KGDB=y 1273CONFIG_HAVE_ARCH_KGDB=y
1261# CONFIG_IRQSTACKS is not set 1274# CONFIG_IRQSTACKS is not set
@@ -1267,14 +1280,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1267# 1280#
1268# CONFIG_KEYS is not set 1281# CONFIG_KEYS is not set
1269# CONFIG_SECURITY is not set 1282# CONFIG_SECURITY is not set
1283# CONFIG_SECURITYFS is not set
1270# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1284# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1271CONFIG_CRYPTO=y 1285CONFIG_CRYPTO=y
1272 1286
1273# 1287#
1274# Crypto core or helper 1288# Crypto core or helper
1275# 1289#
1290# CONFIG_CRYPTO_FIPS is not set
1276CONFIG_CRYPTO_ALGAPI=y 1291CONFIG_CRYPTO_ALGAPI=y
1292CONFIG_CRYPTO_AEAD=y
1277CONFIG_CRYPTO_BLKCIPHER=y 1293CONFIG_CRYPTO_BLKCIPHER=y
1294CONFIG_CRYPTO_HASH=y
1295CONFIG_CRYPTO_RNG=y
1278CONFIG_CRYPTO_MANAGER=y 1296CONFIG_CRYPTO_MANAGER=y
1279# CONFIG_CRYPTO_GF128MUL is not set 1297# CONFIG_CRYPTO_GF128MUL is not set
1280# CONFIG_CRYPTO_NULL is not set 1298# CONFIG_CRYPTO_NULL is not set
@@ -1347,6 +1365,11 @@ CONFIG_CRYPTO_DES=y
1347# 1365#
1348# CONFIG_CRYPTO_DEFLATE is not set 1366# CONFIG_CRYPTO_DEFLATE is not set
1349# CONFIG_CRYPTO_LZO is not set 1367# CONFIG_CRYPTO_LZO is not set
1368
1369#
1370# Random Number Generation
1371#
1372# CONFIG_CRYPTO_ANSI_CPRNG is not set
1350CONFIG_CRYPTO_HW=y 1373CONFIG_CRYPTO_HW=y
1351# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1374# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1352# CONFIG_CRYPTO_DEV_TALITOS is not set 1375# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
index 1a92798938cf..36e2e93a1c53 100644
--- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:21 2008 4# Sat Nov 8 12:39:58 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
23# CONFIG_SMP is not set 23# CONFIG_SMP is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -53,8 +53,6 @@ CONFIG_PPC_UDBG_16550=y
53CONFIG_AUDIT_ARCH=y 53CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
55CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
56CONFIG_HIBERNATE_32=y
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
58CONFIG_ARCH_SUSPEND_POSSIBLE=y 56CONFIG_ARCH_SUSPEND_POSSIBLE=y
59# CONFIG_PPC_DCR_NATIVE is not set 57# CONFIG_PPC_DCR_NATIVE is not set
60# CONFIG_PPC_DCR_MMIO is not set 58# CONFIG_PPC_DCR_MMIO is not set
@@ -98,7 +96,6 @@ CONFIG_HOTPLUG=y
98CONFIG_PRINTK=y 96CONFIG_PRINTK=y
99CONFIG_BUG=y 97CONFIG_BUG=y
100CONFIG_ELF_CORE=y 98CONFIG_ELF_CORE=y
101CONFIG_PCSPKR_PLATFORM=y
102CONFIG_COMPAT_BRK=y 99CONFIG_COMPAT_BRK=y
103CONFIG_BASE_FULL=y 100CONFIG_BASE_FULL=y
104CONFIG_FUTEX=y 101CONFIG_FUTEX=y
@@ -108,7 +105,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 105CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 106CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 107CONFIG_SHMEM=y
108CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
110CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 111CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 112# CONFIG_SLAB is not set
114CONFIG_SLUB=y 113CONFIG_SLUB=y
@@ -121,10 +120,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
121CONFIG_HAVE_KPROBES=y 120CONFIG_HAVE_KPROBES=y
122CONFIG_HAVE_KRETPROBES=y 121CONFIG_HAVE_KRETPROBES=y
123CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_DMA_ATTRS is not set
125# CONFIG_USE_GENERIC_SMP_HELPERS is not set
126# CONFIG_HAVE_CLK is not set
127CONFIG_PROC_PAGE_MONITOR=y
128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
129CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
130CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
@@ -157,6 +152,7 @@ CONFIG_DEFAULT_AS=y
157# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
158CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
159CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_FREEZER is not set
160 156
161# 157#
162# Platform support 158# Platform support
@@ -164,10 +160,10 @@ CONFIG_CLASSIC_RCU=y
164CONFIG_PPC_MULTIPLATFORM=y 160CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y 161CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set 162# CONFIG_PPC_CHRP is not set
167# CONFIG_PPC_PMAC is not set
168# CONFIG_MPC5121_ADS is not set 163# CONFIG_MPC5121_ADS is not set
169# CONFIG_MPC5121_GENERIC is not set 164# CONFIG_MPC5121_GENERIC is not set
170# CONFIG_PPC_MPC52xx is not set 165# CONFIG_PPC_MPC52xx is not set
166# CONFIG_PPC_PMAC is not set
171# CONFIG_PPC_CELL is not set 167# CONFIG_PPC_CELL is not set
172# CONFIG_PPC_CELL_NATIVE is not set 168# CONFIG_PPC_CELL_NATIVE is not set
173# CONFIG_PPC_82xx is not set 169# CONFIG_PPC_82xx is not set
@@ -187,24 +183,21 @@ CONFIG_MPC834x_MDS=y
187CONFIG_PPC_MPC834x=y 183CONFIG_PPC_MPC834x=y
188# CONFIG_PPC_86xx is not set 184# CONFIG_PPC_86xx is not set
189# CONFIG_EMBEDDED6xx is not set 185# CONFIG_EMBEDDED6xx is not set
190CONFIG_PPC_NATIVE=y
191# CONFIG_UDBG_RTAS_CONSOLE is not set
192CONFIG_IPIC=y 186CONFIG_IPIC=y
193CONFIG_MPIC=y 187# CONFIG_MPIC is not set
194# CONFIG_MPIC_WEIRD is not set 188# CONFIG_MPIC_WEIRD is not set
195CONFIG_PPC_I8259=y 189# CONFIG_PPC_I8259 is not set
196CONFIG_PPC_RTAS=y 190# CONFIG_PPC_RTAS is not set
197# CONFIG_RTAS_ERROR_LOGGING is not set
198CONFIG_RTAS_PROC=y
199# CONFIG_MMIO_NVRAM is not set 191# CONFIG_MMIO_NVRAM is not set
200CONFIG_PPC_MPC106=y 192# CONFIG_PPC_MPC106 is not set
201# CONFIG_PPC_970_NAP is not set 193# CONFIG_PPC_970_NAP is not set
202# CONFIG_PPC_INDIRECT_IO is not set 194# CONFIG_PPC_INDIRECT_IO is not set
203# CONFIG_GENERIC_IOMAP is not set 195# CONFIG_GENERIC_IOMAP is not set
204# CONFIG_CPU_FREQ is not set 196# CONFIG_CPU_FREQ is not set
205# CONFIG_PPC601_SYNC_FIX is not set
206# CONFIG_TAU is not set 197# CONFIG_TAU is not set
198# CONFIG_QUICC_ENGINE is not set
207# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_MPC8xxx_GPIO is not set
208 201
209# 202#
210# Kernel options 203# Kernel options
@@ -224,6 +217,8 @@ CONFIG_PREEMPT_NONE=y
224# CONFIG_PREEMPT_VOLUNTARY is not set 217# CONFIG_PREEMPT_VOLUNTARY is not set
225# CONFIG_PREEMPT is not set 218# CONFIG_PREEMPT is not set
226CONFIG_BINFMT_ELF=y 219CONFIG_BINFMT_ELF=y
220# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
221# CONFIG_HAVE_AOUT is not set
227# CONFIG_BINFMT_MISC is not set 222# CONFIG_BINFMT_MISC is not set
228# CONFIG_IOMMU_HELPER is not set 223# CONFIG_IOMMU_HELPER is not set
229CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -238,15 +233,15 @@ CONFIG_FLATMEM_MANUAL=y
238# CONFIG_SPARSEMEM_MANUAL is not set 233# CONFIG_SPARSEMEM_MANUAL is not set
239CONFIG_FLATMEM=y 234CONFIG_FLATMEM=y
240CONFIG_FLAT_NODE_MEM_MAP=y 235CONFIG_FLAT_NODE_MEM_MAP=y
241# CONFIG_SPARSEMEM_STATIC is not set
242# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
243CONFIG_PAGEFLAGS_EXTENDED=y 236CONFIG_PAGEFLAGS_EXTENDED=y
244CONFIG_SPLIT_PTLOCK_CPUS=4 237CONFIG_SPLIT_PTLOCK_CPUS=4
245CONFIG_MIGRATION=y 238CONFIG_MIGRATION=y
246# CONFIG_RESOURCES_64BIT is not set 239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set
247CONFIG_ZONE_DMA_FLAG=1 241CONFIG_ZONE_DMA_FLAG=1
248CONFIG_BOUNCE=y 242CONFIG_BOUNCE=y
249CONFIG_VIRT_TO_BUS=y 243CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y
250CONFIG_FORCE_MAX_ZONEORDER=11 245CONFIG_FORCE_MAX_ZONEORDER=11
251CONFIG_PROC_DEVICETREE=y 246CONFIG_PROC_DEVICETREE=y
252# CONFIG_CMDLINE_BOOL is not set 247# CONFIG_CMDLINE_BOOL is not set
@@ -258,7 +253,6 @@ CONFIG_ISA_DMA_API=y
258# 253#
259# Bus options 254# Bus options
260# 255#
261# CONFIG_ISA is not set
262CONFIG_ZONE_DMA=y 256CONFIG_ZONE_DMA=y
263CONFIG_GENERIC_ISA_DMA=y 257CONFIG_GENERIC_ISA_DMA=y
264CONFIG_PPC_INDIRECT_PCI=y 258CONFIG_PPC_INDIRECT_PCI=y
@@ -271,7 +265,7 @@ CONFIG_PCI_SYSCALL=y
271# CONFIG_PCIEPORTBUS is not set 265# CONFIG_PCIEPORTBUS is not set
272CONFIG_ARCH_SUPPORTS_MSI=y 266CONFIG_ARCH_SUPPORTS_MSI=y
273# CONFIG_PCI_MSI is not set 267# CONFIG_PCI_MSI is not set
274CONFIG_PCI_LEGACY=y 268# CONFIG_PCI_LEGACY is not set
275# CONFIG_PCCARD is not set 269# CONFIG_PCCARD is not set
276# CONFIG_HOTPLUG_PCI is not set 270# CONFIG_HOTPLUG_PCI is not set
277# CONFIG_HAS_RAPIDIO is not set 271# CONFIG_HAS_RAPIDIO is not set
@@ -339,6 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
339# CONFIG_TIPC is not set 333# CONFIG_TIPC is not set
340# CONFIG_ATM is not set 334# CONFIG_ATM is not set
341# CONFIG_BRIDGE is not set 335# CONFIG_BRIDGE is not set
336# CONFIG_NET_DSA is not set
342# CONFIG_VLAN_8021Q is not set 337# CONFIG_VLAN_8021Q is not set
343# CONFIG_DECNET is not set 338# CONFIG_DECNET is not set
344# CONFIG_LLC2 is not set 339# CONFIG_LLC2 is not set
@@ -359,11 +354,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
359# CONFIG_IRDA is not set 354# CONFIG_IRDA is not set
360# CONFIG_BT is not set 355# CONFIG_BT is not set
361# CONFIG_AF_RXRPC is not set 356# CONFIG_AF_RXRPC is not set
362 357# CONFIG_PHONET is not set
363# 358CONFIG_WIRELESS=y
364# Wireless
365#
366# CONFIG_CFG80211 is not set 359# CONFIG_CFG80211 is not set
360CONFIG_WIRELESS_OLD_REGULATORY=y
367# CONFIG_WIRELESS_EXT is not set 361# CONFIG_WIRELESS_EXT is not set
368# CONFIG_MAC80211 is not set 362# CONFIG_MAC80211 is not set
369# CONFIG_IEEE80211 is not set 363# CONFIG_IEEE80211 is not set
@@ -389,7 +383,6 @@ CONFIG_OF_I2C=y
389# CONFIG_PARPORT is not set 383# CONFIG_PARPORT is not set
390CONFIG_BLK_DEV=y 384CONFIG_BLK_DEV=y
391# CONFIG_BLK_DEV_FD is not set 385# CONFIG_BLK_DEV_FD is not set
392# CONFIG_MAC_FLOPPY is not set
393# CONFIG_BLK_CPQ_DA is not set 386# CONFIG_BLK_CPQ_DA is not set
394# CONFIG_BLK_CPQ_CISS_DA is not set 387# CONFIG_BLK_CPQ_CISS_DA is not set
395# CONFIG_BLK_DEV_DAC960 is not set 388# CONFIG_BLK_DEV_DAC960 is not set
@@ -465,8 +458,6 @@ CONFIG_MARVELL_PHY=y
465# CONFIG_MDIO_BITBANG is not set 458# CONFIG_MDIO_BITBANG is not set
466CONFIG_NET_ETHERNET=y 459CONFIG_NET_ETHERNET=y
467CONFIG_MII=y 460CONFIG_MII=y
468# CONFIG_MACE is not set
469# CONFIG_BMAC is not set
470# CONFIG_HAPPYMEAL is not set 461# CONFIG_HAPPYMEAL is not set
471# CONFIG_SUNGEM is not set 462# CONFIG_SUNGEM is not set
472# CONFIG_CASSINI is not set 463# CONFIG_CASSINI is not set
@@ -477,6 +468,9 @@ CONFIG_MII=y
477# CONFIG_IBM_NEW_EMAC_RGMII is not set 468# CONFIG_IBM_NEW_EMAC_RGMII is not set
478# CONFIG_IBM_NEW_EMAC_TAH is not set 469# CONFIG_IBM_NEW_EMAC_TAH is not set
479# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 470# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
471# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
472# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
473# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
480CONFIG_NET_PCI=y 474CONFIG_NET_PCI=y
481# CONFIG_PCNET32 is not set 475# CONFIG_PCNET32 is not set
482# CONFIG_AMD8111_ETH is not set 476# CONFIG_AMD8111_ETH is not set
@@ -497,6 +491,7 @@ CONFIG_E100=y
497# CONFIG_TLAN is not set 491# CONFIG_TLAN is not set
498# CONFIG_VIA_RHINE is not set 492# CONFIG_VIA_RHINE is not set
499# CONFIG_SC92031 is not set 493# CONFIG_SC92031 is not set
494# CONFIG_ATL2 is not set
500CONFIG_NETDEV_1000=y 495CONFIG_NETDEV_1000=y
501# CONFIG_ACENIC is not set 496# CONFIG_ACENIC is not set
502# CONFIG_DL2K is not set 497# CONFIG_DL2K is not set
@@ -519,18 +514,22 @@ CONFIG_GIANFAR=y
519# CONFIG_QLA3XXX is not set 514# CONFIG_QLA3XXX is not set
520# CONFIG_ATL1 is not set 515# CONFIG_ATL1 is not set
521# CONFIG_ATL1E is not set 516# CONFIG_ATL1E is not set
517# CONFIG_JME is not set
522CONFIG_NETDEV_10000=y 518CONFIG_NETDEV_10000=y
523# CONFIG_CHELSIO_T1 is not set 519# CONFIG_CHELSIO_T1 is not set
524# CONFIG_CHELSIO_T3 is not set 520# CONFIG_CHELSIO_T3 is not set
521# CONFIG_ENIC is not set
525# CONFIG_IXGBE is not set 522# CONFIG_IXGBE is not set
526# CONFIG_IXGB is not set 523# CONFIG_IXGB is not set
527# CONFIG_S2IO is not set 524# CONFIG_S2IO is not set
528# CONFIG_MYRI10GE is not set 525# CONFIG_MYRI10GE is not set
529# CONFIG_NETXEN_NIC is not set 526# CONFIG_NETXEN_NIC is not set
530# CONFIG_NIU is not set 527# CONFIG_NIU is not set
528# CONFIG_MLX4_EN is not set
531# CONFIG_MLX4_CORE is not set 529# CONFIG_MLX4_CORE is not set
532# CONFIG_TEHUTI is not set 530# CONFIG_TEHUTI is not set
533# CONFIG_BNX2X is not set 531# CONFIG_BNX2X is not set
532# CONFIG_QLGE is not set
534# CONFIG_SFC is not set 533# CONFIG_SFC is not set
535# CONFIG_TR is not set 534# CONFIG_TR is not set
536 535
@@ -606,14 +605,11 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
606# CONFIG_SERIAL_UARTLITE is not set 605# CONFIG_SERIAL_UARTLITE is not set
607CONFIG_SERIAL_CORE=y 606CONFIG_SERIAL_CORE=y
608CONFIG_SERIAL_CORE_CONSOLE=y 607CONFIG_SERIAL_CORE_CONSOLE=y
609# CONFIG_SERIAL_PMACZILOG is not set
610# CONFIG_SERIAL_JSM is not set 608# CONFIG_SERIAL_JSM is not set
611# CONFIG_SERIAL_OF_PLATFORM is not set 609# CONFIG_SERIAL_OF_PLATFORM is not set
612CONFIG_UNIX98_PTYS=y 610CONFIG_UNIX98_PTYS=y
613CONFIG_LEGACY_PTYS=y 611CONFIG_LEGACY_PTYS=y
614CONFIG_LEGACY_PTY_COUNT=256 612CONFIG_LEGACY_PTY_COUNT=256
615# CONFIG_BRIQ_PANEL is not set
616# CONFIG_HVC_RTAS is not set
617# CONFIG_IPMI_HANDLER is not set 613# CONFIG_IPMI_HANDLER is not set
618# CONFIG_HW_RANDOM is not set 614# CONFIG_HW_RANDOM is not set
619# CONFIG_NVRAM is not set 615# CONFIG_NVRAM is not set
@@ -650,12 +646,6 @@ CONFIG_I2C_HELPER_AUTO=y
650# CONFIG_I2C_VIAPRO is not set 646# CONFIG_I2C_VIAPRO is not set
651 647
652# 648#
653# Mac SMBus host controller drivers
654#
655# CONFIG_I2C_HYDRA is not set
656CONFIG_I2C_POWERMAC=y
657
658#
659# I2C system bus drivers (mostly embedded / system-on-chip) 649# I2C system bus drivers (mostly embedded / system-on-chip)
660# 650#
661CONFIG_I2C_MPC=y 651CONFIG_I2C_MPC=y
@@ -691,6 +681,7 @@ CONFIG_I2C_MPC=y
691# CONFIG_SENSORS_PCF8591 is not set 681# CONFIG_SENSORS_PCF8591 is not set
692# CONFIG_SENSORS_MAX6875 is not set 682# CONFIG_SENSORS_MAX6875 is not set
693# CONFIG_SENSORS_TSL2550 is not set 683# CONFIG_SENSORS_TSL2550 is not set
684# CONFIG_MCU_MPC8349EMITX is not set
694# CONFIG_I2C_DEBUG_CORE is not set 685# CONFIG_I2C_DEBUG_CORE is not set
695# CONFIG_I2C_DEBUG_ALGO is not set 686# CONFIG_I2C_DEBUG_ALGO is not set
696# CONFIG_I2C_DEBUG_BUS is not set 687# CONFIG_I2C_DEBUG_BUS is not set
@@ -712,7 +703,6 @@ CONFIG_HWMON=y
712# CONFIG_SENSORS_ADM9240 is not set 703# CONFIG_SENSORS_ADM9240 is not set
713# CONFIG_SENSORS_ADT7470 is not set 704# CONFIG_SENSORS_ADT7470 is not set
714# CONFIG_SENSORS_ADT7473 is not set 705# CONFIG_SENSORS_ADT7473 is not set
715# CONFIG_SENSORS_AMS is not set
716# CONFIG_SENSORS_ATXP1 is not set 706# CONFIG_SENSORS_ATXP1 is not set
717# CONFIG_SENSORS_DS1621 is not set 707# CONFIG_SENSORS_DS1621 is not set
718# CONFIG_SENSORS_I5K_AMB is not set 708# CONFIG_SENSORS_I5K_AMB is not set
@@ -767,7 +757,6 @@ CONFIG_WATCHDOG=y
767# CONFIG_SOFT_WATCHDOG is not set 757# CONFIG_SOFT_WATCHDOG is not set
768# CONFIG_ALIM7101_WDT is not set 758# CONFIG_ALIM7101_WDT is not set
769# CONFIG_8xxx_WDT is not set 759# CONFIG_8xxx_WDT is not set
770# CONFIG_WATCHDOG_RTAS is not set
771 760
772# 761#
773# PCI-based Watchdog Cards 762# PCI-based Watchdog Cards
@@ -788,6 +777,17 @@ CONFIG_SSB_POSSIBLE=y
788# CONFIG_MFD_SM501 is not set 777# CONFIG_MFD_SM501 is not set
789# CONFIG_HTC_PASIC3 is not set 778# CONFIG_HTC_PASIC3 is not set
790# CONFIG_MFD_TMIO is not set 779# CONFIG_MFD_TMIO is not set
780# CONFIG_PMIC_DA903X is not set
781# CONFIG_MFD_WM8400 is not set
782# CONFIG_MFD_WM8350_I2C is not set
783
784#
785# Voltage and Current regulators
786#
787# CONFIG_REGULATOR is not set
788# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
789# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
790# CONFIG_REGULATOR_BQ24022 is not set
791 791
792# 792#
793# Multimedia devices 793# Multimedia devices
@@ -824,6 +824,12 @@ CONFIG_HID_SUPPORT=y
824CONFIG_HID=y 824CONFIG_HID=y
825# CONFIG_HID_DEBUG is not set 825# CONFIG_HID_DEBUG is not set
826# CONFIG_HIDRAW is not set 826# CONFIG_HIDRAW is not set
827# CONFIG_HID_PID is not set
828
829#
830# Special HID drivers
831#
832CONFIG_HID_COMPAT=y
827CONFIG_USB_SUPPORT=y 833CONFIG_USB_SUPPORT=y
828CONFIG_USB_ARCH_HAS_HCD=y 834CONFIG_USB_ARCH_HAS_HCD=y
829CONFIG_USB_ARCH_HAS_OHCI=y 835CONFIG_USB_ARCH_HAS_OHCI=y
@@ -840,6 +846,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
840# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 846# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
841# 847#
842# CONFIG_USB_GADGET is not set 848# CONFIG_USB_GADGET is not set
849# CONFIG_UWB is not set
843# CONFIG_MMC is not set 850# CONFIG_MMC is not set
844# CONFIG_MEMSTICK is not set 851# CONFIG_MEMSTICK is not set
845# CONFIG_NEW_LEDS is not set 852# CONFIG_NEW_LEDS is not set
@@ -885,12 +892,15 @@ CONFIG_RTC_DRV_DS1374=y
885# Platform RTC drivers 892# Platform RTC drivers
886# 893#
887# CONFIG_RTC_DRV_CMOS is not set 894# CONFIG_RTC_DRV_CMOS is not set
895# CONFIG_RTC_DRV_DS1286 is not set
888# CONFIG_RTC_DRV_DS1511 is not set 896# CONFIG_RTC_DRV_DS1511 is not set
889# CONFIG_RTC_DRV_DS1553 is not set 897# CONFIG_RTC_DRV_DS1553 is not set
890# CONFIG_RTC_DRV_DS1742 is not set 898# CONFIG_RTC_DRV_DS1742 is not set
891# CONFIG_RTC_DRV_STK17TA8 is not set 899# CONFIG_RTC_DRV_STK17TA8 is not set
892# CONFIG_RTC_DRV_M48T86 is not set 900# CONFIG_RTC_DRV_M48T86 is not set
901# CONFIG_RTC_DRV_M48T35 is not set
893# CONFIG_RTC_DRV_M48T59 is not set 902# CONFIG_RTC_DRV_M48T59 is not set
903# CONFIG_RTC_DRV_BQ4802 is not set
894# CONFIG_RTC_DRV_V3020 is not set 904# CONFIG_RTC_DRV_V3020 is not set
895 905
896# 906#
@@ -899,6 +909,7 @@ CONFIG_RTC_DRV_DS1374=y
899# CONFIG_RTC_DRV_PPC is not set 909# CONFIG_RTC_DRV_PPC is not set
900# CONFIG_DMADEVICES is not set 910# CONFIG_DMADEVICES is not set
901# CONFIG_UIO is not set 911# CONFIG_UIO is not set
912# CONFIG_STAGING is not set
902 913
903# 914#
904# File systems 915# File systems
@@ -910,12 +921,13 @@ CONFIG_EXT3_FS=y
910CONFIG_EXT3_FS_XATTR=y 921CONFIG_EXT3_FS_XATTR=y
911# CONFIG_EXT3_FS_POSIX_ACL is not set 922# CONFIG_EXT3_FS_POSIX_ACL is not set
912# CONFIG_EXT3_FS_SECURITY is not set 923# CONFIG_EXT3_FS_SECURITY is not set
913# CONFIG_EXT4DEV_FS is not set 924# CONFIG_EXT4_FS is not set
914CONFIG_JBD=y 925CONFIG_JBD=y
915CONFIG_FS_MBCACHE=y 926CONFIG_FS_MBCACHE=y
916# CONFIG_REISERFS_FS is not set 927# CONFIG_REISERFS_FS is not set
917# CONFIG_JFS_FS is not set 928# CONFIG_JFS_FS is not set
918# CONFIG_FS_POSIX_ACL is not set 929# CONFIG_FS_POSIX_ACL is not set
930CONFIG_FILE_LOCKING=y
919# CONFIG_XFS_FS is not set 931# CONFIG_XFS_FS is not set
920# CONFIG_OCFS2_FS is not set 932# CONFIG_OCFS2_FS is not set
921CONFIG_DNOTIFY=y 933CONFIG_DNOTIFY=y
@@ -945,6 +957,7 @@ CONFIG_INOTIFY_USER=y
945CONFIG_PROC_FS=y 957CONFIG_PROC_FS=y
946CONFIG_PROC_KCORE=y 958CONFIG_PROC_KCORE=y
947CONFIG_PROC_SYSCTL=y 959CONFIG_PROC_SYSCTL=y
960CONFIG_PROC_PAGE_MONITOR=y
948CONFIG_SYSFS=y 961CONFIG_SYSFS=y
949CONFIG_TMPFS=y 962CONFIG_TMPFS=y
950# CONFIG_TMPFS_POSIX_ACL is not set 963# CONFIG_TMPFS_POSIX_ACL is not set
@@ -982,6 +995,7 @@ CONFIG_LOCKD_V4=y
982CONFIG_NFS_COMMON=y 995CONFIG_NFS_COMMON=y
983CONFIG_SUNRPC=y 996CONFIG_SUNRPC=y
984CONFIG_SUNRPC_GSS=y 997CONFIG_SUNRPC_GSS=y
998# CONFIG_SUNRPC_REGISTER_V4 is not set
985CONFIG_RPCSEC_GSS_KRB5=y 999CONFIG_RPCSEC_GSS_KRB5=y
986# CONFIG_RPCSEC_GSS_SPKM3 is not set 1000# CONFIG_RPCSEC_GSS_SPKM3 is not set
987# CONFIG_SMB_FS is not set 1001# CONFIG_SMB_FS is not set
@@ -1014,7 +1028,6 @@ CONFIG_PARTITION_ADVANCED=y
1014# Library routines 1028# Library routines
1015# 1029#
1016CONFIG_BITREVERSE=y 1030CONFIG_BITREVERSE=y
1017# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1018# CONFIG_CRC_CCITT is not set 1031# CONFIG_CRC_CCITT is not set
1019# CONFIG_CRC16 is not set 1032# CONFIG_CRC16 is not set
1020# CONFIG_CRC_T10DIF is not set 1033# CONFIG_CRC_T10DIF is not set
@@ -1044,13 +1057,15 @@ CONFIG_FRAME_WARN=1024
1044# CONFIG_SLUB_STATS is not set 1057# CONFIG_SLUB_STATS is not set
1045# CONFIG_DEBUG_BUGVERBOSE is not set 1058# CONFIG_DEBUG_BUGVERBOSE is not set
1046# CONFIG_DEBUG_MEMORY_INIT is not set 1059# CONFIG_DEBUG_MEMORY_INIT is not set
1060# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1047# CONFIG_LATENCYTOP is not set 1061# CONFIG_LATENCYTOP is not set
1048CONFIG_SYSCTL_SYSCALL_CHECK=y 1062CONFIG_SYSCTL_SYSCALL_CHECK=y
1049CONFIG_HAVE_FTRACE=y 1063CONFIG_HAVE_FUNCTION_TRACER=y
1050CONFIG_HAVE_DYNAMIC_FTRACE=y 1064
1051# CONFIG_FTRACE is not set 1065#
1052# CONFIG_SCHED_TRACER is not set 1066# Tracers
1053# CONFIG_CONTEXT_SWITCH_TRACER is not set 1067#
1068# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1054# CONFIG_SAMPLES is not set 1069# CONFIG_SAMPLES is not set
1055CONFIG_HAVE_ARCH_KGDB=y 1070CONFIG_HAVE_ARCH_KGDB=y
1056# CONFIG_IRQSTACKS is not set 1071# CONFIG_IRQSTACKS is not set
@@ -1062,14 +1077,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1062# 1077#
1063# CONFIG_KEYS is not set 1078# CONFIG_KEYS is not set
1064# CONFIG_SECURITY is not set 1079# CONFIG_SECURITY is not set
1080# CONFIG_SECURITYFS is not set
1065# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1081# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1066CONFIG_CRYPTO=y 1082CONFIG_CRYPTO=y
1067 1083
1068# 1084#
1069# Crypto core or helper 1085# Crypto core or helper
1070# 1086#
1087# CONFIG_CRYPTO_FIPS is not set
1071CONFIG_CRYPTO_ALGAPI=y 1088CONFIG_CRYPTO_ALGAPI=y
1089CONFIG_CRYPTO_AEAD=y
1072CONFIG_CRYPTO_BLKCIPHER=y 1090CONFIG_CRYPTO_BLKCIPHER=y
1091CONFIG_CRYPTO_HASH=y
1092CONFIG_CRYPTO_RNG=y
1073CONFIG_CRYPTO_MANAGER=y 1093CONFIG_CRYPTO_MANAGER=y
1074# CONFIG_CRYPTO_GF128MUL is not set 1094# CONFIG_CRYPTO_GF128MUL is not set
1075# CONFIG_CRYPTO_NULL is not set 1095# CONFIG_CRYPTO_NULL is not set
@@ -1142,6 +1162,11 @@ CONFIG_CRYPTO_DES=y
1142# 1162#
1143# CONFIG_CRYPTO_DEFLATE is not set 1163# CONFIG_CRYPTO_DEFLATE is not set
1144# CONFIG_CRYPTO_LZO is not set 1164# CONFIG_CRYPTO_LZO is not set
1165
1166#
1167# Random Number Generation
1168#
1169# CONFIG_CRYPTO_ANSI_CPRNG is not set
1145CONFIG_CRYPTO_HW=y 1170CONFIG_CRYPTO_HW=y
1146# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1171# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1147# CONFIG_CRYPTO_DEV_TALITOS is not set 1172# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
index 03d8cede0272..80eb6c9a05c4 100644
--- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:22 2008 4# Sat Nov 8 12:39:59 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
23# CONFIG_SMP is not set 23# CONFIG_SMP is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -53,8 +53,6 @@ CONFIG_PPC_UDBG_16550=y
53CONFIG_AUDIT_ARCH=y 53CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
55CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
56CONFIG_HIBERNATE_32=y
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
58CONFIG_ARCH_SUSPEND_POSSIBLE=y 56CONFIG_ARCH_SUSPEND_POSSIBLE=y
59# CONFIG_PPC_DCR_NATIVE is not set 57# CONFIG_PPC_DCR_NATIVE is not set
60# CONFIG_PPC_DCR_MMIO is not set 58# CONFIG_PPC_DCR_MMIO is not set
@@ -98,7 +96,6 @@ CONFIG_HOTPLUG=y
98CONFIG_PRINTK=y 96CONFIG_PRINTK=y
99CONFIG_BUG=y 97CONFIG_BUG=y
100CONFIG_ELF_CORE=y 98CONFIG_ELF_CORE=y
101CONFIG_PCSPKR_PLATFORM=y
102CONFIG_COMPAT_BRK=y 99CONFIG_COMPAT_BRK=y
103CONFIG_BASE_FULL=y 100CONFIG_BASE_FULL=y
104CONFIG_FUTEX=y 101CONFIG_FUTEX=y
@@ -108,7 +105,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 105CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 106CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 107CONFIG_SHMEM=y
108CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
110CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 111CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 112# CONFIG_SLAB is not set
114CONFIG_SLUB=y 113CONFIG_SLUB=y
@@ -121,10 +120,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
121CONFIG_HAVE_KPROBES=y 120CONFIG_HAVE_KPROBES=y
122CONFIG_HAVE_KRETPROBES=y 121CONFIG_HAVE_KRETPROBES=y
123CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_DMA_ATTRS is not set
125# CONFIG_USE_GENERIC_SMP_HELPERS is not set
126# CONFIG_HAVE_CLK is not set
127CONFIG_PROC_PAGE_MONITOR=y
128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
129CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
130CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
@@ -157,6 +152,7 @@ CONFIG_DEFAULT_AS=y
157# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
158CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
159CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_FREEZER is not set
160 156
161# 157#
162# Platform support 158# Platform support
@@ -164,10 +160,10 @@ CONFIG_CLASSIC_RCU=y
164CONFIG_PPC_MULTIPLATFORM=y 160CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y 161CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set 162# CONFIG_PPC_CHRP is not set
167# CONFIG_PPC_PMAC is not set
168# CONFIG_MPC5121_ADS is not set 163# CONFIG_MPC5121_ADS is not set
169# CONFIG_MPC5121_GENERIC is not set 164# CONFIG_MPC5121_GENERIC is not set
170# CONFIG_PPC_MPC52xx is not set 165# CONFIG_PPC_MPC52xx is not set
166# CONFIG_PPC_PMAC is not set
171# CONFIG_PPC_CELL is not set 167# CONFIG_PPC_CELL is not set
172# CONFIG_PPC_CELL_NATIVE is not set 168# CONFIG_PPC_CELL_NATIVE is not set
173# CONFIG_PPC_82xx is not set 169# CONFIG_PPC_82xx is not set
@@ -186,24 +182,20 @@ CONFIG_MPC836x_MDS=y
186# CONFIG_ASP834x is not set 182# CONFIG_ASP834x is not set
187# CONFIG_PPC_86xx is not set 183# CONFIG_PPC_86xx is not set
188# CONFIG_EMBEDDED6xx is not set 184# CONFIG_EMBEDDED6xx is not set
189CONFIG_PPC_NATIVE=y
190# CONFIG_UDBG_RTAS_CONSOLE is not set
191CONFIG_IPIC=y 185CONFIG_IPIC=y
192CONFIG_MPIC=y 186# CONFIG_MPIC is not set
193# CONFIG_MPIC_WEIRD is not set 187# CONFIG_MPIC_WEIRD is not set
194CONFIG_PPC_I8259=y 188# CONFIG_PPC_I8259 is not set
195CONFIG_PPC_RTAS=y 189# CONFIG_PPC_RTAS is not set
196# CONFIG_RTAS_ERROR_LOGGING is not set
197CONFIG_RTAS_PROC=y
198# CONFIG_MMIO_NVRAM is not set 190# CONFIG_MMIO_NVRAM is not set
199CONFIG_PPC_MPC106=y 191# CONFIG_PPC_MPC106 is not set
200# CONFIG_PPC_970_NAP is not set 192# CONFIG_PPC_970_NAP is not set
201# CONFIG_PPC_INDIRECT_IO is not set 193# CONFIG_PPC_INDIRECT_IO is not set
202# CONFIG_GENERIC_IOMAP is not set 194# CONFIG_GENERIC_IOMAP is not set
203# CONFIG_CPU_FREQ is not set 195# CONFIG_CPU_FREQ is not set
204# CONFIG_PPC601_SYNC_FIX is not set
205# CONFIG_TAU is not set 196# CONFIG_TAU is not set
206CONFIG_QUICC_ENGINE=y 197CONFIG_QUICC_ENGINE=y
198# CONFIG_QE_GPIO is not set
207# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
208 200
209# 201#
@@ -224,6 +216,8 @@ CONFIG_PREEMPT_NONE=y
224# CONFIG_PREEMPT_VOLUNTARY is not set 216# CONFIG_PREEMPT_VOLUNTARY is not set
225# CONFIG_PREEMPT is not set 217# CONFIG_PREEMPT is not set
226CONFIG_BINFMT_ELF=y 218CONFIG_BINFMT_ELF=y
219# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
220# CONFIG_HAVE_AOUT is not set
227# CONFIG_BINFMT_MISC is not set 221# CONFIG_BINFMT_MISC is not set
228# CONFIG_IOMMU_HELPER is not set 222# CONFIG_IOMMU_HELPER is not set
229CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 223CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -238,15 +232,15 @@ CONFIG_FLATMEM_MANUAL=y
238# CONFIG_SPARSEMEM_MANUAL is not set 232# CONFIG_SPARSEMEM_MANUAL is not set
239CONFIG_FLATMEM=y 233CONFIG_FLATMEM=y
240CONFIG_FLAT_NODE_MEM_MAP=y 234CONFIG_FLAT_NODE_MEM_MAP=y
241# CONFIG_SPARSEMEM_STATIC is not set
242# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
243CONFIG_PAGEFLAGS_EXTENDED=y 235CONFIG_PAGEFLAGS_EXTENDED=y
244CONFIG_SPLIT_PTLOCK_CPUS=4 236CONFIG_SPLIT_PTLOCK_CPUS=4
245CONFIG_MIGRATION=y 237CONFIG_MIGRATION=y
246# CONFIG_RESOURCES_64BIT is not set 238# CONFIG_RESOURCES_64BIT is not set
239# CONFIG_PHYS_ADDR_T_64BIT is not set
247CONFIG_ZONE_DMA_FLAG=1 240CONFIG_ZONE_DMA_FLAG=1
248CONFIG_BOUNCE=y 241CONFIG_BOUNCE=y
249CONFIG_VIRT_TO_BUS=y 242CONFIG_VIRT_TO_BUS=y
243CONFIG_UNEVICTABLE_LRU=y
250CONFIG_FORCE_MAX_ZONEORDER=11 244CONFIG_FORCE_MAX_ZONEORDER=11
251CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
252# CONFIG_CMDLINE_BOOL is not set 246# CONFIG_CMDLINE_BOOL is not set
@@ -258,7 +252,6 @@ CONFIG_ISA_DMA_API=y
258# 252#
259# Bus options 253# Bus options
260# 254#
261# CONFIG_ISA is not set
262CONFIG_ZONE_DMA=y 255CONFIG_ZONE_DMA=y
263CONFIG_GENERIC_ISA_DMA=y 256CONFIG_GENERIC_ISA_DMA=y
264CONFIG_PPC_INDIRECT_PCI=y 257CONFIG_PPC_INDIRECT_PCI=y
@@ -271,7 +264,7 @@ CONFIG_PCI_SYSCALL=y
271# CONFIG_PCIEPORTBUS is not set 264# CONFIG_PCIEPORTBUS is not set
272CONFIG_ARCH_SUPPORTS_MSI=y 265CONFIG_ARCH_SUPPORTS_MSI=y
273# CONFIG_PCI_MSI is not set 266# CONFIG_PCI_MSI is not set
274CONFIG_PCI_LEGACY=y 267# CONFIG_PCI_LEGACY is not set
275# CONFIG_PCCARD is not set 268# CONFIG_PCCARD is not set
276# CONFIG_HOTPLUG_PCI is not set 269# CONFIG_HOTPLUG_PCI is not set
277# CONFIG_HAS_RAPIDIO is not set 270# CONFIG_HAS_RAPIDIO is not set
@@ -339,6 +332,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
339# CONFIG_TIPC is not set 332# CONFIG_TIPC is not set
340# CONFIG_ATM is not set 333# CONFIG_ATM is not set
341# CONFIG_BRIDGE is not set 334# CONFIG_BRIDGE is not set
335# CONFIG_NET_DSA is not set
342# CONFIG_VLAN_8021Q is not set 336# CONFIG_VLAN_8021Q is not set
343# CONFIG_DECNET is not set 337# CONFIG_DECNET is not set
344# CONFIG_LLC2 is not set 338# CONFIG_LLC2 is not set
@@ -359,11 +353,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
359# CONFIG_IRDA is not set 353# CONFIG_IRDA is not set
360# CONFIG_BT is not set 354# CONFIG_BT is not set
361# CONFIG_AF_RXRPC is not set 355# CONFIG_AF_RXRPC is not set
362 356# CONFIG_PHONET is not set
363# 357CONFIG_WIRELESS=y
364# Wireless
365#
366# CONFIG_CFG80211 is not set 358# CONFIG_CFG80211 is not set
359CONFIG_WIRELESS_OLD_REGULATORY=y
367# CONFIG_WIRELESS_EXT is not set 360# CONFIG_WIRELESS_EXT is not set
368# CONFIG_MAC80211 is not set 361# CONFIG_MAC80211 is not set
369# CONFIG_IEEE80211 is not set 362# CONFIG_IEEE80211 is not set
@@ -466,7 +459,6 @@ CONFIG_OF_I2C=y
466# CONFIG_PARPORT is not set 459# CONFIG_PARPORT is not set
467CONFIG_BLK_DEV=y 460CONFIG_BLK_DEV=y
468# CONFIG_BLK_DEV_FD is not set 461# CONFIG_BLK_DEV_FD is not set
469# CONFIG_MAC_FLOPPY is not set
470# CONFIG_BLK_CPQ_DA is not set 462# CONFIG_BLK_CPQ_DA is not set
471# CONFIG_BLK_CPQ_CISS_DA is not set 463# CONFIG_BLK_CPQ_CISS_DA is not set
472# CONFIG_BLK_DEV_DAC960 is not set 464# CONFIG_BLK_DEV_DAC960 is not set
@@ -566,8 +558,6 @@ CONFIG_SCSI_LOWLEVEL=y
566# CONFIG_SCSI_DC390T is not set 558# CONFIG_SCSI_DC390T is not set
567# CONFIG_SCSI_NSP32 is not set 559# CONFIG_SCSI_NSP32 is not set
568# CONFIG_SCSI_DEBUG is not set 560# CONFIG_SCSI_DEBUG is not set
569# CONFIG_SCSI_MESH is not set
570# CONFIG_SCSI_MAC53C94 is not set
571# CONFIG_SCSI_SRP is not set 561# CONFIG_SCSI_SRP is not set
572# CONFIG_SCSI_DH is not set 562# CONFIG_SCSI_DH is not set
573# CONFIG_ATA is not set 563# CONFIG_ATA is not set
@@ -612,8 +602,6 @@ CONFIG_MARVELL_PHY=y
612# CONFIG_MDIO_BITBANG is not set 602# CONFIG_MDIO_BITBANG is not set
613CONFIG_NET_ETHERNET=y 603CONFIG_NET_ETHERNET=y
614CONFIG_MII=y 604CONFIG_MII=y
615# CONFIG_MACE is not set
616# CONFIG_BMAC is not set
617# CONFIG_HAPPYMEAL is not set 605# CONFIG_HAPPYMEAL is not set
618# CONFIG_SUNGEM is not set 606# CONFIG_SUNGEM is not set
619# CONFIG_CASSINI is not set 607# CONFIG_CASSINI is not set
@@ -624,8 +612,12 @@ CONFIG_MII=y
624# CONFIG_IBM_NEW_EMAC_RGMII is not set 612# CONFIG_IBM_NEW_EMAC_RGMII is not set
625# CONFIG_IBM_NEW_EMAC_TAH is not set 613# CONFIG_IBM_NEW_EMAC_TAH is not set
626# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 614# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
615# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
616# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
617# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
627# CONFIG_NET_PCI is not set 618# CONFIG_NET_PCI is not set
628# CONFIG_B44 is not set 619# CONFIG_B44 is not set
620# CONFIG_ATL2 is not set
629CONFIG_NETDEV_1000=y 621CONFIG_NETDEV_1000=y
630# CONFIG_ACENIC is not set 622# CONFIG_ACENIC is not set
631# CONFIG_DL2K is not set 623# CONFIG_DL2K is not set
@@ -652,18 +644,22 @@ CONFIG_UCC_GETH=y
652# CONFIG_QLA3XXX is not set 644# CONFIG_QLA3XXX is not set
653# CONFIG_ATL1 is not set 645# CONFIG_ATL1 is not set
654# CONFIG_ATL1E is not set 646# CONFIG_ATL1E is not set
647# CONFIG_JME is not set
655CONFIG_NETDEV_10000=y 648CONFIG_NETDEV_10000=y
656# CONFIG_CHELSIO_T1 is not set 649# CONFIG_CHELSIO_T1 is not set
657# CONFIG_CHELSIO_T3 is not set 650# CONFIG_CHELSIO_T3 is not set
651# CONFIG_ENIC is not set
658# CONFIG_IXGBE is not set 652# CONFIG_IXGBE is not set
659# CONFIG_IXGB is not set 653# CONFIG_IXGB is not set
660# CONFIG_S2IO is not set 654# CONFIG_S2IO is not set
661# CONFIG_MYRI10GE is not set 655# CONFIG_MYRI10GE is not set
662# CONFIG_NETXEN_NIC is not set 656# CONFIG_NETXEN_NIC is not set
663# CONFIG_NIU is not set 657# CONFIG_NIU is not set
658# CONFIG_MLX4_EN is not set
664# CONFIG_MLX4_CORE is not set 659# CONFIG_MLX4_CORE is not set
665# CONFIG_TEHUTI is not set 660# CONFIG_TEHUTI is not set
666# CONFIG_BNX2X is not set 661# CONFIG_BNX2X is not set
662# CONFIG_QLGE is not set
667# CONFIG_SFC is not set 663# CONFIG_SFC is not set
668# CONFIG_TR is not set 664# CONFIG_TR is not set
669 665
@@ -740,15 +736,12 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
740# CONFIG_SERIAL_UARTLITE is not set 736# CONFIG_SERIAL_UARTLITE is not set
741CONFIG_SERIAL_CORE=y 737CONFIG_SERIAL_CORE=y
742CONFIG_SERIAL_CORE_CONSOLE=y 738CONFIG_SERIAL_CORE_CONSOLE=y
743# CONFIG_SERIAL_PMACZILOG is not set
744# CONFIG_SERIAL_JSM is not set 739# CONFIG_SERIAL_JSM is not set
745# CONFIG_SERIAL_OF_PLATFORM is not set 740# CONFIG_SERIAL_OF_PLATFORM is not set
746# CONFIG_SERIAL_QE is not set 741# CONFIG_SERIAL_QE is not set
747CONFIG_UNIX98_PTYS=y 742CONFIG_UNIX98_PTYS=y
748CONFIG_LEGACY_PTYS=y 743CONFIG_LEGACY_PTYS=y
749CONFIG_LEGACY_PTY_COUNT=256 744CONFIG_LEGACY_PTY_COUNT=256
750# CONFIG_BRIQ_PANEL is not set
751# CONFIG_HVC_RTAS is not set
752# CONFIG_IPMI_HANDLER is not set 745# CONFIG_IPMI_HANDLER is not set
753CONFIG_HW_RANDOM=y 746CONFIG_HW_RANDOM=y
754# CONFIG_NVRAM is not set 747# CONFIG_NVRAM is not set
@@ -785,12 +778,6 @@ CONFIG_I2C_HELPER_AUTO=y
785# CONFIG_I2C_VIAPRO is not set 778# CONFIG_I2C_VIAPRO is not set
786 779
787# 780#
788# Mac SMBus host controller drivers
789#
790# CONFIG_I2C_HYDRA is not set
791CONFIG_I2C_POWERMAC=y
792
793#
794# I2C system bus drivers (mostly embedded / system-on-chip) 781# I2C system bus drivers (mostly embedded / system-on-chip)
795# 782#
796CONFIG_I2C_MPC=y 783CONFIG_I2C_MPC=y
@@ -826,6 +813,7 @@ CONFIG_I2C_MPC=y
826# CONFIG_SENSORS_PCF8591 is not set 813# CONFIG_SENSORS_PCF8591 is not set
827# CONFIG_SENSORS_MAX6875 is not set 814# CONFIG_SENSORS_MAX6875 is not set
828# CONFIG_SENSORS_TSL2550 is not set 815# CONFIG_SENSORS_TSL2550 is not set
816# CONFIG_MCU_MPC8349EMITX is not set
829# CONFIG_I2C_DEBUG_CORE is not set 817# CONFIG_I2C_DEBUG_CORE is not set
830# CONFIG_I2C_DEBUG_ALGO is not set 818# CONFIG_I2C_DEBUG_ALGO is not set
831# CONFIG_I2C_DEBUG_BUS is not set 819# CONFIG_I2C_DEBUG_BUS is not set
@@ -847,7 +835,6 @@ CONFIG_HWMON=y
847# CONFIG_SENSORS_ADM9240 is not set 835# CONFIG_SENSORS_ADM9240 is not set
848# CONFIG_SENSORS_ADT7470 is not set 836# CONFIG_SENSORS_ADT7470 is not set
849# CONFIG_SENSORS_ADT7473 is not set 837# CONFIG_SENSORS_ADT7473 is not set
850# CONFIG_SENSORS_AMS is not set
851# CONFIG_SENSORS_ATXP1 is not set 838# CONFIG_SENSORS_ATXP1 is not set
852# CONFIG_SENSORS_DS1621 is not set 839# CONFIG_SENSORS_DS1621 is not set
853# CONFIG_SENSORS_I5K_AMB is not set 840# CONFIG_SENSORS_I5K_AMB is not set
@@ -902,7 +889,6 @@ CONFIG_WATCHDOG=y
902# CONFIG_SOFT_WATCHDOG is not set 889# CONFIG_SOFT_WATCHDOG is not set
903# CONFIG_ALIM7101_WDT is not set 890# CONFIG_ALIM7101_WDT is not set
904# CONFIG_8xxx_WDT is not set 891# CONFIG_8xxx_WDT is not set
905# CONFIG_WATCHDOG_RTAS is not set
906 892
907# 893#
908# PCI-based Watchdog Cards 894# PCI-based Watchdog Cards
@@ -923,6 +909,17 @@ CONFIG_SSB_POSSIBLE=y
923# CONFIG_MFD_SM501 is not set 909# CONFIG_MFD_SM501 is not set
924# CONFIG_HTC_PASIC3 is not set 910# CONFIG_HTC_PASIC3 is not set
925# CONFIG_MFD_TMIO is not set 911# CONFIG_MFD_TMIO is not set
912# CONFIG_PMIC_DA903X is not set
913# CONFIG_MFD_WM8400 is not set
914# CONFIG_MFD_WM8350_I2C is not set
915
916#
917# Voltage and Current regulators
918#
919# CONFIG_REGULATOR is not set
920# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
921# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
922# CONFIG_REGULATOR_BQ24022 is not set
926 923
927# 924#
928# Multimedia devices 925# Multimedia devices
@@ -959,6 +956,12 @@ CONFIG_HID_SUPPORT=y
959CONFIG_HID=y 956CONFIG_HID=y
960# CONFIG_HID_DEBUG is not set 957# CONFIG_HID_DEBUG is not set
961# CONFIG_HIDRAW is not set 958# CONFIG_HIDRAW is not set
959# CONFIG_HID_PID is not set
960
961#
962# Special HID drivers
963#
964CONFIG_HID_COMPAT=y
962CONFIG_USB_SUPPORT=y 965CONFIG_USB_SUPPORT=y
963CONFIG_USB_ARCH_HAS_HCD=y 966CONFIG_USB_ARCH_HAS_HCD=y
964CONFIG_USB_ARCH_HAS_OHCI=y 967CONFIG_USB_ARCH_HAS_OHCI=y
@@ -975,6 +978,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
975# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 978# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
976# 979#
977# CONFIG_USB_GADGET is not set 980# CONFIG_USB_GADGET is not set
981# CONFIG_UWB is not set
978# CONFIG_MMC is not set 982# CONFIG_MMC is not set
979# CONFIG_MEMSTICK is not set 983# CONFIG_MEMSTICK is not set
980# CONFIG_NEW_LEDS is not set 984# CONFIG_NEW_LEDS is not set
@@ -1020,12 +1024,15 @@ CONFIG_RTC_DRV_DS1374=y
1020# Platform RTC drivers 1024# Platform RTC drivers
1021# 1025#
1022# CONFIG_RTC_DRV_CMOS is not set 1026# CONFIG_RTC_DRV_CMOS is not set
1027# CONFIG_RTC_DRV_DS1286 is not set
1023# CONFIG_RTC_DRV_DS1511 is not set 1028# CONFIG_RTC_DRV_DS1511 is not set
1024# CONFIG_RTC_DRV_DS1553 is not set 1029# CONFIG_RTC_DRV_DS1553 is not set
1025# CONFIG_RTC_DRV_DS1742 is not set 1030# CONFIG_RTC_DRV_DS1742 is not set
1026# CONFIG_RTC_DRV_STK17TA8 is not set 1031# CONFIG_RTC_DRV_STK17TA8 is not set
1027# CONFIG_RTC_DRV_M48T86 is not set 1032# CONFIG_RTC_DRV_M48T86 is not set
1033# CONFIG_RTC_DRV_M48T35 is not set
1028# CONFIG_RTC_DRV_M48T59 is not set 1034# CONFIG_RTC_DRV_M48T59 is not set
1035# CONFIG_RTC_DRV_BQ4802 is not set
1029# CONFIG_RTC_DRV_V3020 is not set 1036# CONFIG_RTC_DRV_V3020 is not set
1030 1037
1031# 1038#
@@ -1034,6 +1041,7 @@ CONFIG_RTC_DRV_DS1374=y
1034# CONFIG_RTC_DRV_PPC is not set 1041# CONFIG_RTC_DRV_PPC is not set
1035# CONFIG_DMADEVICES is not set 1042# CONFIG_DMADEVICES is not set
1036# CONFIG_UIO is not set 1043# CONFIG_UIO is not set
1044# CONFIG_STAGING is not set
1037 1045
1038# 1046#
1039# File systems 1047# File systems
@@ -1045,12 +1053,13 @@ CONFIG_EXT3_FS=y
1045CONFIG_EXT3_FS_XATTR=y 1053CONFIG_EXT3_FS_XATTR=y
1046# CONFIG_EXT3_FS_POSIX_ACL is not set 1054# CONFIG_EXT3_FS_POSIX_ACL is not set
1047# CONFIG_EXT3_FS_SECURITY is not set 1055# CONFIG_EXT3_FS_SECURITY is not set
1048# CONFIG_EXT4DEV_FS is not set 1056# CONFIG_EXT4_FS is not set
1049CONFIG_JBD=y 1057CONFIG_JBD=y
1050CONFIG_FS_MBCACHE=y 1058CONFIG_FS_MBCACHE=y
1051# CONFIG_REISERFS_FS is not set 1059# CONFIG_REISERFS_FS is not set
1052# CONFIG_JFS_FS is not set 1060# CONFIG_JFS_FS is not set
1053# CONFIG_FS_POSIX_ACL is not set 1061# CONFIG_FS_POSIX_ACL is not set
1062CONFIG_FILE_LOCKING=y
1054# CONFIG_XFS_FS is not set 1063# CONFIG_XFS_FS is not set
1055# CONFIG_OCFS2_FS is not set 1064# CONFIG_OCFS2_FS is not set
1056CONFIG_DNOTIFY=y 1065CONFIG_DNOTIFY=y
@@ -1080,6 +1089,7 @@ CONFIG_INOTIFY_USER=y
1080CONFIG_PROC_FS=y 1089CONFIG_PROC_FS=y
1081CONFIG_PROC_KCORE=y 1090CONFIG_PROC_KCORE=y
1082CONFIG_PROC_SYSCTL=y 1091CONFIG_PROC_SYSCTL=y
1092CONFIG_PROC_PAGE_MONITOR=y
1083CONFIG_SYSFS=y 1093CONFIG_SYSFS=y
1084CONFIG_TMPFS=y 1094CONFIG_TMPFS=y
1085# CONFIG_TMPFS_POSIX_ACL is not set 1095# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1096,6 +1106,7 @@ CONFIG_TMPFS=y
1096# CONFIG_BEFS_FS is not set 1106# CONFIG_BEFS_FS is not set
1097# CONFIG_BFS_FS is not set 1107# CONFIG_BFS_FS is not set
1098# CONFIG_EFS_FS is not set 1108# CONFIG_EFS_FS is not set
1109# CONFIG_JFFS2_FS is not set
1099# CONFIG_CRAMFS is not set 1110# CONFIG_CRAMFS is not set
1100# CONFIG_VXFS_FS is not set 1111# CONFIG_VXFS_FS is not set
1101# CONFIG_MINIX_FS is not set 1112# CONFIG_MINIX_FS is not set
@@ -1117,6 +1128,7 @@ CONFIG_LOCKD_V4=y
1117CONFIG_NFS_COMMON=y 1128CONFIG_NFS_COMMON=y
1118CONFIG_SUNRPC=y 1129CONFIG_SUNRPC=y
1119CONFIG_SUNRPC_GSS=y 1130CONFIG_SUNRPC_GSS=y
1131# CONFIG_SUNRPC_REGISTER_V4 is not set
1120CONFIG_RPCSEC_GSS_KRB5=y 1132CONFIG_RPCSEC_GSS_KRB5=y
1121# CONFIG_RPCSEC_GSS_SPKM3 is not set 1133# CONFIG_RPCSEC_GSS_SPKM3 is not set
1122# CONFIG_SMB_FS is not set 1134# CONFIG_SMB_FS is not set
@@ -1146,13 +1158,11 @@ CONFIG_PARTITION_ADVANCED=y
1146# CONFIG_DLM is not set 1158# CONFIG_DLM is not set
1147CONFIG_UCC_FAST=y 1159CONFIG_UCC_FAST=y
1148CONFIG_UCC=y 1160CONFIG_UCC=y
1149# CONFIG_QE_GPIO is not set
1150 1161
1151# 1162#
1152# Library routines 1163# Library routines
1153# 1164#
1154CONFIG_BITREVERSE=y 1165CONFIG_BITREVERSE=y
1155# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1156# CONFIG_CRC_CCITT is not set 1166# CONFIG_CRC_CCITT is not set
1157# CONFIG_CRC16 is not set 1167# CONFIG_CRC16 is not set
1158# CONFIG_CRC_T10DIF is not set 1168# CONFIG_CRC_T10DIF is not set
@@ -1182,13 +1192,15 @@ CONFIG_FRAME_WARN=1024
1182# CONFIG_SLUB_STATS is not set 1192# CONFIG_SLUB_STATS is not set
1183# CONFIG_DEBUG_BUGVERBOSE is not set 1193# CONFIG_DEBUG_BUGVERBOSE is not set
1184# CONFIG_DEBUG_MEMORY_INIT is not set 1194# CONFIG_DEBUG_MEMORY_INIT is not set
1195# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1185# CONFIG_LATENCYTOP is not set 1196# CONFIG_LATENCYTOP is not set
1186CONFIG_SYSCTL_SYSCALL_CHECK=y 1197CONFIG_SYSCTL_SYSCALL_CHECK=y
1187CONFIG_HAVE_FTRACE=y 1198CONFIG_HAVE_FUNCTION_TRACER=y
1188CONFIG_HAVE_DYNAMIC_FTRACE=y 1199
1189# CONFIG_FTRACE is not set 1200#
1190# CONFIG_SCHED_TRACER is not set 1201# Tracers
1191# CONFIG_CONTEXT_SWITCH_TRACER is not set 1202#
1203# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1192# CONFIG_SAMPLES is not set 1204# CONFIG_SAMPLES is not set
1193CONFIG_HAVE_ARCH_KGDB=y 1205CONFIG_HAVE_ARCH_KGDB=y
1194# CONFIG_IRQSTACKS is not set 1206# CONFIG_IRQSTACKS is not set
@@ -1200,14 +1212,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1200# 1212#
1201# CONFIG_KEYS is not set 1213# CONFIG_KEYS is not set
1202# CONFIG_SECURITY is not set 1214# CONFIG_SECURITY is not set
1215# CONFIG_SECURITYFS is not set
1203# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1216# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1204CONFIG_CRYPTO=y 1217CONFIG_CRYPTO=y
1205 1218
1206# 1219#
1207# Crypto core or helper 1220# Crypto core or helper
1208# 1221#
1222# CONFIG_CRYPTO_FIPS is not set
1209CONFIG_CRYPTO_ALGAPI=y 1223CONFIG_CRYPTO_ALGAPI=y
1224CONFIG_CRYPTO_AEAD=y
1210CONFIG_CRYPTO_BLKCIPHER=y 1225CONFIG_CRYPTO_BLKCIPHER=y
1226CONFIG_CRYPTO_HASH=y
1227CONFIG_CRYPTO_RNG=y
1211CONFIG_CRYPTO_MANAGER=y 1228CONFIG_CRYPTO_MANAGER=y
1212# CONFIG_CRYPTO_GF128MUL is not set 1229# CONFIG_CRYPTO_GF128MUL is not set
1213# CONFIG_CRYPTO_NULL is not set 1230# CONFIG_CRYPTO_NULL is not set
@@ -1280,6 +1297,11 @@ CONFIG_CRYPTO_DES=y
1280# 1297#
1281# CONFIG_CRYPTO_DEFLATE is not set 1298# CONFIG_CRYPTO_DEFLATE is not set
1282# CONFIG_CRYPTO_LZO is not set 1299# CONFIG_CRYPTO_LZO is not set
1300
1301#
1302# Random Number Generation
1303#
1304# CONFIG_CRYPTO_ANSI_CPRNG is not set
1283CONFIG_CRYPTO_HW=y 1305CONFIG_CRYPTO_HW=y
1284# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1306# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1285# CONFIG_CRYPTO_DEV_TALITOS is not set 1307# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
index cdf84177370a..b9b236806e9f 100644
--- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_rdk_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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:24 2008 4# Sat Nov 8 12:40:00 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
23# CONFIG_SMP is not set 23# CONFIG_SMP is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -54,8 +54,6 @@ CONFIG_PPC_UDBG_16550=y
54CONFIG_AUDIT_ARCH=y 54CONFIG_AUDIT_ARCH=y
55CONFIG_GENERIC_BUG=y 55CONFIG_GENERIC_BUG=y
56CONFIG_DEFAULT_UIMAGE=y 56CONFIG_DEFAULT_UIMAGE=y
57CONFIG_HIBERNATE_32=y
58CONFIG_ARCH_HIBERNATION_POSSIBLE=y
59CONFIG_ARCH_SUSPEND_POSSIBLE=y 57CONFIG_ARCH_SUSPEND_POSSIBLE=y
60# CONFIG_PPC_DCR_NATIVE is not set 58# CONFIG_PPC_DCR_NATIVE is not set
61# CONFIG_PPC_DCR_MMIO is not set 59# CONFIG_PPC_DCR_MMIO is not set
@@ -99,7 +97,6 @@ CONFIG_HOTPLUG=y
99CONFIG_PRINTK=y 97CONFIG_PRINTK=y
100CONFIG_BUG=y 98CONFIG_BUG=y
101CONFIG_ELF_CORE=y 99CONFIG_ELF_CORE=y
102CONFIG_PCSPKR_PLATFORM=y
103CONFIG_COMPAT_BRK=y 100CONFIG_COMPAT_BRK=y
104CONFIG_BASE_FULL=y 101CONFIG_BASE_FULL=y
105CONFIG_FUTEX=y 102CONFIG_FUTEX=y
@@ -109,7 +106,9 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 106CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 108CONFIG_SHMEM=y
109CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y
113CONFIG_SLUB_DEBUG=y 112CONFIG_SLUB_DEBUG=y
114# CONFIG_SLAB is not set 113# CONFIG_SLAB is not set
115CONFIG_SLUB=y 114CONFIG_SLUB=y
@@ -122,10 +121,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
122CONFIG_HAVE_KPROBES=y 121CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y 122CONFIG_HAVE_KRETPROBES=y
124CONFIG_HAVE_ARCH_TRACEHOOK=y 123CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_DMA_ATTRS is not set
126# CONFIG_USE_GENERIC_SMP_HELPERS is not set
127# CONFIG_HAVE_CLK is not set
128CONFIG_PROC_PAGE_MONITOR=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
@@ -158,6 +153,7 @@ CONFIG_DEFAULT_AS=y
158# CONFIG_DEFAULT_NOOP is not set 153# CONFIG_DEFAULT_NOOP is not set
159CONFIG_DEFAULT_IOSCHED="anticipatory" 154CONFIG_DEFAULT_IOSCHED="anticipatory"
160CONFIG_CLASSIC_RCU=y 155CONFIG_CLASSIC_RCU=y
156# CONFIG_FREEZER is not set
161 157
162# 158#
163# Platform support 159# Platform support
@@ -165,10 +161,10 @@ CONFIG_CLASSIC_RCU=y
165CONFIG_PPC_MULTIPLATFORM=y 161CONFIG_PPC_MULTIPLATFORM=y
166CONFIG_CLASSIC32=y 162CONFIG_CLASSIC32=y
167# CONFIG_PPC_CHRP is not set 163# CONFIG_PPC_CHRP is not set
168# CONFIG_PPC_PMAC is not set
169# CONFIG_MPC5121_ADS is not set 164# CONFIG_MPC5121_ADS is not set
170# CONFIG_MPC5121_GENERIC is not set 165# CONFIG_MPC5121_GENERIC is not set
171# CONFIG_PPC_MPC52xx is not set 166# CONFIG_PPC_MPC52xx is not set
167# CONFIG_PPC_PMAC is not set
172# CONFIG_PPC_CELL is not set 168# CONFIG_PPC_CELL is not set
173# CONFIG_PPC_CELL_NATIVE is not set 169# CONFIG_PPC_CELL_NATIVE is not set
174# CONFIG_PPC_82xx is not set 170# CONFIG_PPC_82xx is not set
@@ -187,31 +183,26 @@ CONFIG_MPC836x_RDK=y
187# CONFIG_ASP834x is not set 183# CONFIG_ASP834x is not set
188# CONFIG_PPC_86xx is not set 184# CONFIG_PPC_86xx is not set
189# CONFIG_EMBEDDED6xx is not set 185# CONFIG_EMBEDDED6xx is not set
190CONFIG_PPC_NATIVE=y
191# CONFIG_UDBG_RTAS_CONSOLE is not set
192CONFIG_IPIC=y 186CONFIG_IPIC=y
193CONFIG_MPIC=y 187# CONFIG_MPIC is not set
194# CONFIG_MPIC_WEIRD is not set 188# CONFIG_MPIC_WEIRD is not set
195CONFIG_PPC_I8259=y 189# CONFIG_PPC_I8259 is not set
196CONFIG_PPC_RTAS=y 190# CONFIG_PPC_RTAS is not set
197# CONFIG_RTAS_ERROR_LOGGING is not set
198CONFIG_RTAS_PROC=y
199# CONFIG_MMIO_NVRAM is not set 191# CONFIG_MMIO_NVRAM is not set
200CONFIG_PPC_MPC106=y 192# CONFIG_PPC_MPC106 is not set
201# CONFIG_PPC_970_NAP is not set 193# CONFIG_PPC_970_NAP is not set
202# CONFIG_PPC_INDIRECT_IO is not set 194# CONFIG_PPC_INDIRECT_IO is not set
203# CONFIG_GENERIC_IOMAP is not set 195# CONFIG_GENERIC_IOMAP is not set
204# CONFIG_CPU_FREQ is not set 196# CONFIG_CPU_FREQ is not set
205# CONFIG_PPC601_SYNC_FIX is not set
206# CONFIG_TAU is not set 197# CONFIG_TAU is not set
207CONFIG_QUICC_ENGINE=y 198CONFIG_QUICC_ENGINE=y
199CONFIG_QE_GPIO=y
208# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
209 201
210# 202#
211# Kernel options 203# Kernel options
212# 204#
213# CONFIG_HIGHMEM is not set 205# CONFIG_HIGHMEM is not set
214# CONFIG_TICK_ONESHOT is not set
215# CONFIG_NO_HZ is not set 206# CONFIG_NO_HZ is not set
216# CONFIG_HIGH_RES_TIMERS is not set 207# CONFIG_HIGH_RES_TIMERS is not set
217CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 208CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -225,6 +216,8 @@ CONFIG_PREEMPT_NONE=y
225# CONFIG_PREEMPT_VOLUNTARY is not set 216# CONFIG_PREEMPT_VOLUNTARY is not set
226# CONFIG_PREEMPT is not set 217# CONFIG_PREEMPT is not set
227CONFIG_BINFMT_ELF=y 218CONFIG_BINFMT_ELF=y
219# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
220# CONFIG_HAVE_AOUT is not set
228# CONFIG_BINFMT_MISC is not set 221# CONFIG_BINFMT_MISC is not set
229# CONFIG_IOMMU_HELPER is not set 222# CONFIG_IOMMU_HELPER is not set
230CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 223CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -239,15 +232,15 @@ CONFIG_FLATMEM_MANUAL=y
239# CONFIG_SPARSEMEM_MANUAL is not set 232# CONFIG_SPARSEMEM_MANUAL is not set
240CONFIG_FLATMEM=y 233CONFIG_FLATMEM=y
241CONFIG_FLAT_NODE_MEM_MAP=y 234CONFIG_FLAT_NODE_MEM_MAP=y
242# CONFIG_SPARSEMEM_STATIC is not set
243# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
244CONFIG_PAGEFLAGS_EXTENDED=y 235CONFIG_PAGEFLAGS_EXTENDED=y
245CONFIG_SPLIT_PTLOCK_CPUS=4 236CONFIG_SPLIT_PTLOCK_CPUS=4
246CONFIG_MIGRATION=y 237CONFIG_MIGRATION=y
247# CONFIG_RESOURCES_64BIT is not set 238# CONFIG_RESOURCES_64BIT is not set
239# CONFIG_PHYS_ADDR_T_64BIT is not set
248CONFIG_ZONE_DMA_FLAG=1 240CONFIG_ZONE_DMA_FLAG=1
249CONFIG_BOUNCE=y 241CONFIG_BOUNCE=y
250CONFIG_VIRT_TO_BUS=y 242CONFIG_VIRT_TO_BUS=y
243CONFIG_UNEVICTABLE_LRU=y
251CONFIG_FORCE_MAX_ZONEORDER=11 244CONFIG_FORCE_MAX_ZONEORDER=11
252CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
253# CONFIG_CMDLINE_BOOL is not set 246# CONFIG_CMDLINE_BOOL is not set
@@ -259,7 +252,6 @@ CONFIG_ISA_DMA_API=y
259# 252#
260# Bus options 253# Bus options
261# 254#
262# CONFIG_ISA is not set
263CONFIG_ZONE_DMA=y 255CONFIG_ZONE_DMA=y
264CONFIG_GENERIC_ISA_DMA=y 256CONFIG_GENERIC_ISA_DMA=y
265CONFIG_PPC_INDIRECT_PCI=y 257CONFIG_PPC_INDIRECT_PCI=y
@@ -274,7 +266,7 @@ CONFIG_PCI_SYSCALL=y
274# CONFIG_PCIEPORTBUS is not set 266# CONFIG_PCIEPORTBUS is not set
275CONFIG_ARCH_SUPPORTS_MSI=y 267CONFIG_ARCH_SUPPORTS_MSI=y
276# CONFIG_PCI_MSI is not set 268# CONFIG_PCI_MSI is not set
277CONFIG_PCI_LEGACY=y 269# CONFIG_PCI_LEGACY is not set
278# CONFIG_PCCARD is not set 270# CONFIG_PCCARD is not set
279# CONFIG_HOTPLUG_PCI is not set 271# CONFIG_HOTPLUG_PCI is not set
280# CONFIG_HAS_RAPIDIO is not set 272# CONFIG_HAS_RAPIDIO is not set
@@ -342,6 +334,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
342# CONFIG_TIPC is not set 334# CONFIG_TIPC is not set
343# CONFIG_ATM is not set 335# CONFIG_ATM is not set
344# CONFIG_BRIDGE is not set 336# CONFIG_BRIDGE is not set
337# CONFIG_NET_DSA is not set
345# CONFIG_VLAN_8021Q is not set 338# CONFIG_VLAN_8021Q is not set
346# CONFIG_DECNET is not set 339# CONFIG_DECNET is not set
347# CONFIG_LLC2 is not set 340# CONFIG_LLC2 is not set
@@ -362,11 +355,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
362# CONFIG_IRDA is not set 355# CONFIG_IRDA is not set
363# CONFIG_BT is not set 356# CONFIG_BT is not set
364# CONFIG_AF_RXRPC is not set 357# CONFIG_AF_RXRPC is not set
365 358# CONFIG_PHONET is not set
366# 359CONFIG_WIRELESS=y
367# Wireless
368#
369# CONFIG_CFG80211 is not set 360# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y
370# CONFIG_WIRELESS_EXT is not set 362# CONFIG_WIRELESS_EXT is not set
371# CONFIG_MAC80211 is not set 363# CONFIG_MAC80211 is not set
372# CONFIG_IEEE80211 is not set 364# CONFIG_IEEE80211 is not set
@@ -480,7 +472,6 @@ CONFIG_OF_SPI=y
480# CONFIG_PARPORT is not set 472# CONFIG_PARPORT is not set
481CONFIG_BLK_DEV=y 473CONFIG_BLK_DEV=y
482# CONFIG_BLK_DEV_FD is not set 474# CONFIG_BLK_DEV_FD is not set
483# CONFIG_MAC_FLOPPY is not set
484# CONFIG_BLK_CPQ_DA is not set 475# CONFIG_BLK_CPQ_DA is not set
485# CONFIG_BLK_CPQ_CISS_DA is not set 476# CONFIG_BLK_CPQ_CISS_DA is not set
486# CONFIG_BLK_DEV_DAC960 is not set 477# CONFIG_BLK_DEV_DAC960 is not set
@@ -581,6 +572,7 @@ CONFIG_UCC_GETH=y
581# CONFIG_QLA3XXX is not set 572# CONFIG_QLA3XXX is not set
582# CONFIG_ATL1 is not set 573# CONFIG_ATL1 is not set
583# CONFIG_ATL1E is not set 574# CONFIG_ATL1E is not set
575# CONFIG_JME is not set
584# CONFIG_NETDEV_10000 is not set 576# CONFIG_NETDEV_10000 is not set
585# CONFIG_TR is not set 577# CONFIG_TR is not set
586 578
@@ -660,15 +652,12 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
660# CONFIG_SERIAL_UARTLITE is not set 652# CONFIG_SERIAL_UARTLITE is not set
661CONFIG_SERIAL_CORE=y 653CONFIG_SERIAL_CORE=y
662CONFIG_SERIAL_CORE_CONSOLE=y 654CONFIG_SERIAL_CORE_CONSOLE=y
663# CONFIG_SERIAL_PMACZILOG is not set
664# CONFIG_SERIAL_JSM is not set 655# CONFIG_SERIAL_JSM is not set
665# CONFIG_SERIAL_OF_PLATFORM is not set 656# CONFIG_SERIAL_OF_PLATFORM is not set
666CONFIG_SERIAL_QE=y 657CONFIG_SERIAL_QE=y
667CONFIG_UNIX98_PTYS=y 658CONFIG_UNIX98_PTYS=y
668CONFIG_LEGACY_PTYS=y 659CONFIG_LEGACY_PTYS=y
669CONFIG_LEGACY_PTY_COUNT=256 660CONFIG_LEGACY_PTY_COUNT=256
670# CONFIG_BRIQ_PANEL is not set
671# CONFIG_HVC_RTAS is not set
672# CONFIG_IPMI_HANDLER is not set 661# CONFIG_IPMI_HANDLER is not set
673CONFIG_HW_RANDOM=y 662CONFIG_HW_RANDOM=y
674# CONFIG_NVRAM is not set 663# CONFIG_NVRAM is not set
@@ -706,12 +695,6 @@ CONFIG_I2C_HELPER_AUTO=y
706# CONFIG_I2C_VIAPRO is not set 695# CONFIG_I2C_VIAPRO is not set
707 696
708# 697#
709# Mac SMBus host controller drivers
710#
711# CONFIG_I2C_HYDRA is not set
712CONFIG_I2C_POWERMAC=y
713
714#
715# I2C system bus drivers (mostly embedded / system-on-chip) 698# I2C system bus drivers (mostly embedded / system-on-chip)
716# 699#
717# CONFIG_I2C_GPIO is not set 700# CONFIG_I2C_GPIO is not set
@@ -749,6 +732,7 @@ CONFIG_I2C_MPC=y
749# CONFIG_TPS65010 is not set 732# CONFIG_TPS65010 is not set
750# CONFIG_SENSORS_MAX6875 is not set 733# CONFIG_SENSORS_MAX6875 is not set
751# CONFIG_SENSORS_TSL2550 is not set 734# CONFIG_SENSORS_TSL2550 is not set
735# CONFIG_MCU_MPC8349EMITX is not set
752# CONFIG_I2C_DEBUG_CORE is not set 736# CONFIG_I2C_DEBUG_CORE is not set
753# CONFIG_I2C_DEBUG_ALGO is not set 737# CONFIG_I2C_DEBUG_ALGO is not set
754# CONFIG_I2C_DEBUG_BUS is not set 738# CONFIG_I2C_DEBUG_BUS is not set
@@ -804,7 +788,6 @@ CONFIG_WATCHDOG=y
804# CONFIG_SOFT_WATCHDOG is not set 788# CONFIG_SOFT_WATCHDOG is not set
805# CONFIG_ALIM7101_WDT is not set 789# CONFIG_ALIM7101_WDT is not set
806# CONFIG_8xxx_WDT is not set 790# CONFIG_8xxx_WDT is not set
807# CONFIG_WATCHDOG_RTAS is not set
808 791
809# 792#
810# PCI-based Watchdog Cards 793# PCI-based Watchdog Cards
@@ -825,6 +808,17 @@ CONFIG_SSB_POSSIBLE=y
825# CONFIG_MFD_SM501 is not set 808# CONFIG_MFD_SM501 is not set
826# CONFIG_HTC_PASIC3 is not set 809# CONFIG_HTC_PASIC3 is not set
827# CONFIG_MFD_TMIO is not set 810# CONFIG_MFD_TMIO is not set
811# CONFIG_PMIC_DA903X is not set
812# CONFIG_MFD_WM8400 is not set
813# CONFIG_MFD_WM8350_I2C is not set
814
815#
816# Voltage and Current regulators
817#
818# CONFIG_REGULATOR is not set
819# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
820# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
821# CONFIG_REGULATOR_BQ24022 is not set
828 822
829# 823#
830# Multimedia devices 824# Multimedia devices
@@ -852,6 +846,7 @@ CONFIG_DAB=y
852CONFIG_FB=y 846CONFIG_FB=y
853# CONFIG_FIRMWARE_EDID is not set 847# CONFIG_FIRMWARE_EDID is not set
854# CONFIG_FB_DDC is not set 848# CONFIG_FB_DDC is not set
849# CONFIG_FB_BOOT_VESA_SUPPORT is not set
855CONFIG_FB_CFB_FILLRECT=y 850CONFIG_FB_CFB_FILLRECT=y
856CONFIG_FB_CFB_COPYAREA=y 851CONFIG_FB_CFB_COPYAREA=y
857CONFIG_FB_CFB_IMAGEBLIT=y 852CONFIG_FB_CFB_IMAGEBLIT=y
@@ -874,9 +869,6 @@ CONFIG_FB_MACMODES=y
874# CONFIG_FB_PM2 is not set 869# CONFIG_FB_PM2 is not set
875# CONFIG_FB_CYBER2000 is not set 870# CONFIG_FB_CYBER2000 is not set
876CONFIG_FB_OF=y 871CONFIG_FB_OF=y
877# CONFIG_FB_CONTROL is not set
878# CONFIG_FB_PLATINUM is not set
879# CONFIG_FB_VALKYRIE is not set
880# CONFIG_FB_CT65550 is not set 872# CONFIG_FB_CT65550 is not set
881# CONFIG_FB_ASILIANT is not set 873# CONFIG_FB_ASILIANT is not set
882# CONFIG_FB_IMSTT is not set 874# CONFIG_FB_IMSTT is not set
@@ -891,6 +883,7 @@ CONFIG_FB_OF=y
891# CONFIG_FB_S3 is not set 883# CONFIG_FB_S3 is not set
892# CONFIG_FB_SAVAGE is not set 884# CONFIG_FB_SAVAGE is not set
893# CONFIG_FB_SIS is not set 885# CONFIG_FB_SIS is not set
886# CONFIG_FB_VIA is not set
894# CONFIG_FB_NEOMAGIC is not set 887# CONFIG_FB_NEOMAGIC is not set
895# CONFIG_FB_KYRO is not set 888# CONFIG_FB_KYRO is not set
896# CONFIG_FB_3DFX is not set 889# CONFIG_FB_3DFX is not set
@@ -903,6 +896,7 @@ CONFIG_FB_OF=y
903# CONFIG_FB_FSL_DIU is not set 896# CONFIG_FB_FSL_DIU is not set
904# CONFIG_FB_IBM_GXT4500 is not set 897# CONFIG_FB_IBM_GXT4500 is not set
905# CONFIG_FB_VIRTUAL is not set 898# CONFIG_FB_VIRTUAL is not set
899# CONFIG_FB_METRONOME is not set
906# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 900# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
907 901
908# 902#
@@ -930,7 +924,14 @@ CONFIG_HID_SUPPORT=y
930CONFIG_HID=y 924CONFIG_HID=y
931# CONFIG_HID_DEBUG is not set 925# CONFIG_HID_DEBUG is not set
932# CONFIG_HIDRAW is not set 926# CONFIG_HIDRAW is not set
927# CONFIG_HID_PID is not set
928
929#
930# Special HID drivers
931#
932CONFIG_HID_COMPAT=y
933# CONFIG_USB_SUPPORT is not set 933# CONFIG_USB_SUPPORT is not set
934# CONFIG_UWB is not set
934# CONFIG_MMC is not set 935# CONFIG_MMC is not set
935# CONFIG_MEMSTICK is not set 936# CONFIG_MEMSTICK is not set
936# CONFIG_NEW_LEDS is not set 937# CONFIG_NEW_LEDS is not set
@@ -940,6 +941,7 @@ CONFIG_HID=y
940# CONFIG_RTC_CLASS is not set 941# CONFIG_RTC_CLASS is not set
941# CONFIG_DMADEVICES is not set 942# CONFIG_DMADEVICES is not set
942# CONFIG_UIO is not set 943# CONFIG_UIO is not set
944# CONFIG_STAGING is not set
943 945
944# 946#
945# File systems 947# File systems
@@ -951,12 +953,13 @@ CONFIG_EXT3_FS=y
951CONFIG_EXT3_FS_XATTR=y 953CONFIG_EXT3_FS_XATTR=y
952# CONFIG_EXT3_FS_POSIX_ACL is not set 954# CONFIG_EXT3_FS_POSIX_ACL is not set
953# CONFIG_EXT3_FS_SECURITY is not set 955# CONFIG_EXT3_FS_SECURITY is not set
954# CONFIG_EXT4DEV_FS is not set 956# CONFIG_EXT4_FS is not set
955CONFIG_JBD=y 957CONFIG_JBD=y
956CONFIG_FS_MBCACHE=y 958CONFIG_FS_MBCACHE=y
957# CONFIG_REISERFS_FS is not set 959# CONFIG_REISERFS_FS is not set
958# CONFIG_JFS_FS is not set 960# CONFIG_JFS_FS is not set
959# CONFIG_FS_POSIX_ACL is not set 961# CONFIG_FS_POSIX_ACL is not set
962CONFIG_FILE_LOCKING=y
960# CONFIG_XFS_FS is not set 963# CONFIG_XFS_FS is not set
961# CONFIG_OCFS2_FS is not set 964# CONFIG_OCFS2_FS is not set
962CONFIG_DNOTIFY=y 965CONFIG_DNOTIFY=y
@@ -986,6 +989,7 @@ CONFIG_INOTIFY_USER=y
986CONFIG_PROC_FS=y 989CONFIG_PROC_FS=y
987CONFIG_PROC_KCORE=y 990CONFIG_PROC_KCORE=y
988CONFIG_PROC_SYSCTL=y 991CONFIG_PROC_SYSCTL=y
992CONFIG_PROC_PAGE_MONITOR=y
989CONFIG_SYSFS=y 993CONFIG_SYSFS=y
990CONFIG_TMPFS=y 994CONFIG_TMPFS=y
991# CONFIG_TMPFS_POSIX_ACL is not set 995# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1034,6 +1038,7 @@ CONFIG_LOCKD_V4=y
1034CONFIG_NFS_COMMON=y 1038CONFIG_NFS_COMMON=y
1035CONFIG_SUNRPC=y 1039CONFIG_SUNRPC=y
1036CONFIG_SUNRPC_GSS=y 1040CONFIG_SUNRPC_GSS=y
1041# CONFIG_SUNRPC_REGISTER_V4 is not set
1037CONFIG_RPCSEC_GSS_KRB5=y 1042CONFIG_RPCSEC_GSS_KRB5=y
1038# CONFIG_RPCSEC_GSS_SPKM3 is not set 1043# CONFIG_RPCSEC_GSS_SPKM3 is not set
1039# CONFIG_SMB_FS is not set 1044# CONFIG_SMB_FS is not set
@@ -1064,13 +1069,11 @@ CONFIG_PARTITION_ADVANCED=y
1064CONFIG_UCC_SLOW=y 1069CONFIG_UCC_SLOW=y
1065CONFIG_UCC_FAST=y 1070CONFIG_UCC_FAST=y
1066CONFIG_UCC=y 1071CONFIG_UCC=y
1067CONFIG_QE_GPIO=y
1068 1072
1069# 1073#
1070# Library routines 1074# Library routines
1071# 1075#
1072CONFIG_BITREVERSE=y 1076CONFIG_BITREVERSE=y
1073# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1074# CONFIG_CRC_CCITT is not set 1077# CONFIG_CRC_CCITT is not set
1075# CONFIG_CRC16 is not set 1078# CONFIG_CRC16 is not set
1076# CONFIG_CRC_T10DIF is not set 1079# CONFIG_CRC_T10DIF is not set
@@ -1102,13 +1105,15 @@ CONFIG_FRAME_WARN=1024
1102# CONFIG_SLUB_STATS is not set 1105# CONFIG_SLUB_STATS is not set
1103# CONFIG_DEBUG_BUGVERBOSE is not set 1106# CONFIG_DEBUG_BUGVERBOSE is not set
1104# CONFIG_DEBUG_MEMORY_INIT is not set 1107# CONFIG_DEBUG_MEMORY_INIT is not set
1108# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1105# CONFIG_LATENCYTOP is not set 1109# CONFIG_LATENCYTOP is not set
1106CONFIG_SYSCTL_SYSCALL_CHECK=y 1110CONFIG_SYSCTL_SYSCALL_CHECK=y
1107CONFIG_HAVE_FTRACE=y 1111CONFIG_HAVE_FUNCTION_TRACER=y
1108CONFIG_HAVE_DYNAMIC_FTRACE=y 1112
1109# CONFIG_FTRACE is not set 1113#
1110# CONFIG_SCHED_TRACER is not set 1114# Tracers
1111# CONFIG_CONTEXT_SWITCH_TRACER is not set 1115#
1116# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1112# CONFIG_SAMPLES is not set 1117# CONFIG_SAMPLES is not set
1113CONFIG_HAVE_ARCH_KGDB=y 1118CONFIG_HAVE_ARCH_KGDB=y
1114# CONFIG_IRQSTACKS is not set 1119# CONFIG_IRQSTACKS is not set
@@ -1116,7 +1121,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1116CONFIG_PPC_EARLY_DEBUG=y 1121CONFIG_PPC_EARLY_DEBUG=y
1117# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 1122# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
1118# CONFIG_PPC_EARLY_DEBUG_G5 is not set 1123# CONFIG_PPC_EARLY_DEBUG_G5 is not set
1119CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL=y 1124# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
1120# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set 1125# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
1121# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set 1126# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
1122# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set 1127# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
@@ -1131,14 +1136,19 @@ CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL=y
1131# 1136#
1132# CONFIG_KEYS is not set 1137# CONFIG_KEYS is not set
1133# CONFIG_SECURITY is not set 1138# CONFIG_SECURITY is not set
1139# CONFIG_SECURITYFS is not set
1134# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1140# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1135CONFIG_CRYPTO=y 1141CONFIG_CRYPTO=y
1136 1142
1137# 1143#
1138# Crypto core or helper 1144# Crypto core or helper
1139# 1145#
1146# CONFIG_CRYPTO_FIPS is not set
1140CONFIG_CRYPTO_ALGAPI=y 1147CONFIG_CRYPTO_ALGAPI=y
1148CONFIG_CRYPTO_AEAD=y
1141CONFIG_CRYPTO_BLKCIPHER=y 1149CONFIG_CRYPTO_BLKCIPHER=y
1150CONFIG_CRYPTO_HASH=y
1151CONFIG_CRYPTO_RNG=y
1142CONFIG_CRYPTO_MANAGER=y 1152CONFIG_CRYPTO_MANAGER=y
1143# CONFIG_CRYPTO_GF128MUL is not set 1153# CONFIG_CRYPTO_GF128MUL is not set
1144# CONFIG_CRYPTO_NULL is not set 1154# CONFIG_CRYPTO_NULL is not set
@@ -1211,6 +1221,11 @@ CONFIG_CRYPTO_DES=y
1211# 1221#
1212# CONFIG_CRYPTO_DEFLATE is not set 1222# CONFIG_CRYPTO_DEFLATE is not set
1213# CONFIG_CRYPTO_LZO is not set 1223# CONFIG_CRYPTO_LZO is not set
1224
1225#
1226# Random Number Generation
1227#
1228# CONFIG_CRYPTO_ANSI_CPRNG is not set
1214CONFIG_CRYPTO_HW=y 1229CONFIG_CRYPTO_HW=y
1215# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1230# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1216# CONFIG_CRYPTO_DEV_TALITOS is not set 1231# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
index 97e02d7a5b09..f6350d7e1688 100644
--- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:23 2008 4# Sat Nov 8 12:40:00 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
23# CONFIG_SMP is not set 23# CONFIG_SMP is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -53,8 +53,6 @@ CONFIG_PPC_UDBG_16550=y
53CONFIG_AUDIT_ARCH=y 53CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
55CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
56CONFIG_HIBERNATE_32=y
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
58CONFIG_ARCH_SUSPEND_POSSIBLE=y 56CONFIG_ARCH_SUSPEND_POSSIBLE=y
59# CONFIG_PPC_DCR_NATIVE is not set 57# CONFIG_PPC_DCR_NATIVE is not set
60# CONFIG_PPC_DCR_MMIO is not set 58# CONFIG_PPC_DCR_MMIO is not set
@@ -99,7 +97,6 @@ CONFIG_HOTPLUG=y
99CONFIG_PRINTK=y 97CONFIG_PRINTK=y
100CONFIG_BUG=y 98CONFIG_BUG=y
101CONFIG_ELF_CORE=y 99CONFIG_ELF_CORE=y
102CONFIG_PCSPKR_PLATFORM=y
103CONFIG_COMPAT_BRK=y 100CONFIG_COMPAT_BRK=y
104CONFIG_BASE_FULL=y 101CONFIG_BASE_FULL=y
105CONFIG_FUTEX=y 102CONFIG_FUTEX=y
@@ -109,7 +106,9 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 106CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 108CONFIG_SHMEM=y
109CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y
113CONFIG_SLAB=y 112CONFIG_SLAB=y
114# CONFIG_SLUB is not set 113# CONFIG_SLUB is not set
115# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
@@ -122,10 +121,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
122CONFIG_HAVE_KPROBES=y 121CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y 122CONFIG_HAVE_KRETPROBES=y
124CONFIG_HAVE_ARCH_TRACEHOOK=y 123CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_DMA_ATTRS is not set
126# CONFIG_USE_GENERIC_SMP_HELPERS is not set
127# CONFIG_HAVE_CLK is not set
128CONFIG_PROC_PAGE_MONITOR=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
@@ -158,6 +153,7 @@ CONFIG_DEFAULT_AS=y
158# CONFIG_DEFAULT_NOOP is not set 153# CONFIG_DEFAULT_NOOP is not set
159CONFIG_DEFAULT_IOSCHED="anticipatory" 154CONFIG_DEFAULT_IOSCHED="anticipatory"
160CONFIG_CLASSIC_RCU=y 155CONFIG_CLASSIC_RCU=y
156# CONFIG_FREEZER is not set
161 157
162# 158#
163# Platform support 159# Platform support
@@ -165,10 +161,10 @@ CONFIG_CLASSIC_RCU=y
165CONFIG_PPC_MULTIPLATFORM=y 161CONFIG_PPC_MULTIPLATFORM=y
166CONFIG_CLASSIC32=y 162CONFIG_CLASSIC32=y
167# CONFIG_PPC_CHRP is not set 163# CONFIG_PPC_CHRP is not set
168# CONFIG_PPC_PMAC is not set
169# CONFIG_MPC5121_ADS is not set 164# CONFIG_MPC5121_ADS is not set
170# CONFIG_MPC5121_GENERIC is not set 165# CONFIG_MPC5121_GENERIC is not set
171# CONFIG_PPC_MPC52xx is not set 166# CONFIG_PPC_MPC52xx is not set
167# CONFIG_PPC_PMAC is not set
172# CONFIG_PPC_CELL is not set 168# CONFIG_PPC_CELL is not set
173# CONFIG_PPC_CELL_NATIVE is not set 169# CONFIG_PPC_CELL_NATIVE is not set
174# CONFIG_PPC_82xx is not set 170# CONFIG_PPC_82xx is not set
@@ -188,30 +184,26 @@ CONFIG_MPC837x_MDS=y
188CONFIG_PPC_MPC837x=y 184CONFIG_PPC_MPC837x=y
189# CONFIG_PPC_86xx is not set 185# CONFIG_PPC_86xx is not set
190# CONFIG_EMBEDDED6xx is not set 186# CONFIG_EMBEDDED6xx is not set
191CONFIG_PPC_NATIVE=y
192# CONFIG_UDBG_RTAS_CONSOLE is not set
193CONFIG_IPIC=y 187CONFIG_IPIC=y
194CONFIG_MPIC=y 188# CONFIG_MPIC is not set
195# CONFIG_MPIC_WEIRD is not set 189# CONFIG_MPIC_WEIRD is not set
196CONFIG_PPC_I8259=y 190# CONFIG_PPC_I8259 is not set
197CONFIG_PPC_RTAS=y 191# CONFIG_PPC_RTAS is not set
198# CONFIG_RTAS_ERROR_LOGGING is not set
199CONFIG_RTAS_PROC=y
200# CONFIG_MMIO_NVRAM is not set 192# CONFIG_MMIO_NVRAM is not set
201CONFIG_PPC_MPC106=y 193# CONFIG_PPC_MPC106 is not set
202# CONFIG_PPC_970_NAP is not set 194# CONFIG_PPC_970_NAP is not set
203# CONFIG_PPC_INDIRECT_IO is not set 195# CONFIG_PPC_INDIRECT_IO is not set
204# CONFIG_GENERIC_IOMAP is not set 196# CONFIG_GENERIC_IOMAP is not set
205# CONFIG_CPU_FREQ is not set 197# CONFIG_CPU_FREQ is not set
206# CONFIG_PPC601_SYNC_FIX is not set
207# CONFIG_TAU is not set 198# CONFIG_TAU is not set
199# CONFIG_QUICC_ENGINE is not set
208# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
201# CONFIG_MPC8xxx_GPIO is not set
209 202
210# 203#
211# Kernel options 204# Kernel options
212# 205#
213# CONFIG_HIGHMEM is not set 206# CONFIG_HIGHMEM is not set
214# CONFIG_TICK_ONESHOT is not set
215# CONFIG_NO_HZ is not set 207# CONFIG_NO_HZ is not set
216# CONFIG_HIGH_RES_TIMERS is not set 208# CONFIG_HIGH_RES_TIMERS is not set
217CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 209CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -225,6 +217,8 @@ CONFIG_PREEMPT_NONE=y
225# CONFIG_PREEMPT_VOLUNTARY is not set 217# CONFIG_PREEMPT_VOLUNTARY is not set
226# CONFIG_PREEMPT is not set 218# CONFIG_PREEMPT is not set
227CONFIG_BINFMT_ELF=y 219CONFIG_BINFMT_ELF=y
220# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
221# CONFIG_HAVE_AOUT is not set
228# CONFIG_BINFMT_MISC is not set 222# CONFIG_BINFMT_MISC is not set
229# CONFIG_IOMMU_HELPER is not set 223# CONFIG_IOMMU_HELPER is not set
230CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -239,15 +233,15 @@ CONFIG_FLATMEM_MANUAL=y
239# CONFIG_SPARSEMEM_MANUAL is not set 233# CONFIG_SPARSEMEM_MANUAL is not set
240CONFIG_FLATMEM=y 234CONFIG_FLATMEM=y
241CONFIG_FLAT_NODE_MEM_MAP=y 235CONFIG_FLAT_NODE_MEM_MAP=y
242# CONFIG_SPARSEMEM_STATIC is not set
243# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
244CONFIG_PAGEFLAGS_EXTENDED=y 236CONFIG_PAGEFLAGS_EXTENDED=y
245CONFIG_SPLIT_PTLOCK_CPUS=4 237CONFIG_SPLIT_PTLOCK_CPUS=4
246CONFIG_MIGRATION=y 238CONFIG_MIGRATION=y
247# CONFIG_RESOURCES_64BIT is not set 239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set
248CONFIG_ZONE_DMA_FLAG=1 241CONFIG_ZONE_DMA_FLAG=1
249CONFIG_BOUNCE=y 242CONFIG_BOUNCE=y
250CONFIG_VIRT_TO_BUS=y 243CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y
251CONFIG_FORCE_MAX_ZONEORDER=11 245CONFIG_FORCE_MAX_ZONEORDER=11
252CONFIG_PROC_DEVICETREE=y 246CONFIG_PROC_DEVICETREE=y
253# CONFIG_CMDLINE_BOOL is not set 247# CONFIG_CMDLINE_BOOL is not set
@@ -259,7 +253,6 @@ CONFIG_ISA_DMA_API=y
259# 253#
260# Bus options 254# Bus options
261# 255#
262# CONFIG_ISA is not set
263CONFIG_ZONE_DMA=y 256CONFIG_ZONE_DMA=y
264CONFIG_GENERIC_ISA_DMA=y 257CONFIG_GENERIC_ISA_DMA=y
265CONFIG_PPC_INDIRECT_PCI=y 258CONFIG_PPC_INDIRECT_PCI=y
@@ -272,7 +265,7 @@ CONFIG_PCI_SYSCALL=y
272# CONFIG_PCIEPORTBUS is not set 265# CONFIG_PCIEPORTBUS is not set
273CONFIG_ARCH_SUPPORTS_MSI=y 266CONFIG_ARCH_SUPPORTS_MSI=y
274# CONFIG_PCI_MSI is not set 267# CONFIG_PCI_MSI is not set
275CONFIG_PCI_LEGACY=y 268# CONFIG_PCI_LEGACY is not set
276# CONFIG_PCCARD is not set 269# CONFIG_PCCARD is not set
277# CONFIG_HOTPLUG_PCI is not set 270# CONFIG_HOTPLUG_PCI is not set
278# CONFIG_HAS_RAPIDIO is not set 271# CONFIG_HAS_RAPIDIO is not set
@@ -340,6 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
340# CONFIG_TIPC is not set 333# CONFIG_TIPC is not set
341# CONFIG_ATM is not set 334# CONFIG_ATM is not set
342# CONFIG_BRIDGE is not set 335# CONFIG_BRIDGE is not set
336# CONFIG_NET_DSA is not set
343# CONFIG_VLAN_8021Q is not set 337# CONFIG_VLAN_8021Q is not set
344# CONFIG_DECNET is not set 338# CONFIG_DECNET is not set
345# CONFIG_LLC2 is not set 339# CONFIG_LLC2 is not set
@@ -360,11 +354,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
360# CONFIG_IRDA is not set 354# CONFIG_IRDA is not set
361# CONFIG_BT is not set 355# CONFIG_BT is not set
362# CONFIG_AF_RXRPC is not set 356# CONFIG_AF_RXRPC is not set
363 357# CONFIG_PHONET is not set
364# 358CONFIG_WIRELESS=y
365# Wireless
366#
367# CONFIG_CFG80211 is not set 359# CONFIG_CFG80211 is not set
360CONFIG_WIRELESS_OLD_REGULATORY=y
368# CONFIG_WIRELESS_EXT is not set 361# CONFIG_WIRELESS_EXT is not set
369# CONFIG_MAC80211 is not set 362# CONFIG_MAC80211 is not set
370# CONFIG_IEEE80211 is not set 363# CONFIG_IEEE80211 is not set
@@ -390,7 +383,6 @@ CONFIG_OF_I2C=y
390# CONFIG_PARPORT is not set 383# CONFIG_PARPORT is not set
391CONFIG_BLK_DEV=y 384CONFIG_BLK_DEV=y
392# CONFIG_BLK_DEV_FD is not set 385# CONFIG_BLK_DEV_FD is not set
393# CONFIG_MAC_FLOPPY is not set
394# CONFIG_BLK_CPQ_DA is not set 386# CONFIG_BLK_CPQ_DA is not set
395# CONFIG_BLK_CPQ_CISS_DA is not set 387# CONFIG_BLK_CPQ_CISS_DA is not set
396# CONFIG_BLK_DEV_DAC960 is not set 388# CONFIG_BLK_DEV_DAC960 is not set
@@ -491,8 +483,6 @@ CONFIG_SCSI_LOWLEVEL=y
491# CONFIG_SCSI_DC390T is not set 483# CONFIG_SCSI_DC390T is not set
492# CONFIG_SCSI_NSP32 is not set 484# CONFIG_SCSI_NSP32 is not set
493# CONFIG_SCSI_DEBUG is not set 485# CONFIG_SCSI_DEBUG is not set
494# CONFIG_SCSI_MESH is not set
495# CONFIG_SCSI_MAC53C94 is not set
496# CONFIG_SCSI_SRP is not set 486# CONFIG_SCSI_SRP is not set
497# CONFIG_SCSI_DH is not set 487# CONFIG_SCSI_DH is not set
498CONFIG_ATA=y 488CONFIG_ATA=y
@@ -597,8 +587,6 @@ CONFIG_MARVELL_PHY=y
597# CONFIG_MDIO_BITBANG is not set 587# CONFIG_MDIO_BITBANG is not set
598CONFIG_NET_ETHERNET=y 588CONFIG_NET_ETHERNET=y
599CONFIG_MII=y 589CONFIG_MII=y
600# CONFIG_MACE is not set
601# CONFIG_BMAC is not set
602# CONFIG_HAPPYMEAL is not set 590# CONFIG_HAPPYMEAL is not set
603# CONFIG_SUNGEM is not set 591# CONFIG_SUNGEM is not set
604# CONFIG_CASSINI is not set 592# CONFIG_CASSINI is not set
@@ -609,8 +597,12 @@ CONFIG_MII=y
609# CONFIG_IBM_NEW_EMAC_RGMII is not set 597# CONFIG_IBM_NEW_EMAC_RGMII is not set
610# CONFIG_IBM_NEW_EMAC_TAH is not set 598# CONFIG_IBM_NEW_EMAC_TAH is not set
611# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 599# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
600# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
601# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
602# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
612# CONFIG_NET_PCI is not set 603# CONFIG_NET_PCI is not set
613# CONFIG_B44 is not set 604# CONFIG_B44 is not set
605# CONFIG_ATL2 is not set
614CONFIG_NETDEV_1000=y 606CONFIG_NETDEV_1000=y
615# CONFIG_ACENIC is not set 607# CONFIG_ACENIC is not set
616# CONFIG_DL2K is not set 608# CONFIG_DL2K is not set
@@ -633,18 +625,22 @@ CONFIG_GIANFAR=y
633# CONFIG_QLA3XXX is not set 625# CONFIG_QLA3XXX is not set
634# CONFIG_ATL1 is not set 626# CONFIG_ATL1 is not set
635# CONFIG_ATL1E is not set 627# CONFIG_ATL1E is not set
628# CONFIG_JME is not set
636CONFIG_NETDEV_10000=y 629CONFIG_NETDEV_10000=y
637# CONFIG_CHELSIO_T1 is not set 630# CONFIG_CHELSIO_T1 is not set
638# CONFIG_CHELSIO_T3 is not set 631# CONFIG_CHELSIO_T3 is not set
632# CONFIG_ENIC is not set
639# CONFIG_IXGBE is not set 633# CONFIG_IXGBE is not set
640# CONFIG_IXGB is not set 634# CONFIG_IXGB is not set
641# CONFIG_S2IO is not set 635# CONFIG_S2IO is not set
642# CONFIG_MYRI10GE is not set 636# CONFIG_MYRI10GE is not set
643# CONFIG_NETXEN_NIC is not set 637# CONFIG_NETXEN_NIC is not set
644# CONFIG_NIU is not set 638# CONFIG_NIU is not set
639# CONFIG_MLX4_EN is not set
645# CONFIG_MLX4_CORE is not set 640# CONFIG_MLX4_CORE is not set
646# CONFIG_TEHUTI is not set 641# CONFIG_TEHUTI is not set
647# CONFIG_BNX2X is not set 642# CONFIG_BNX2X is not set
643# CONFIG_QLGE is not set
648# CONFIG_SFC is not set 644# CONFIG_SFC is not set
649# CONFIG_TR is not set 645# CONFIG_TR is not set
650 646
@@ -721,14 +717,11 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
721# CONFIG_SERIAL_UARTLITE is not set 717# CONFIG_SERIAL_UARTLITE is not set
722CONFIG_SERIAL_CORE=y 718CONFIG_SERIAL_CORE=y
723CONFIG_SERIAL_CORE_CONSOLE=y 719CONFIG_SERIAL_CORE_CONSOLE=y
724# CONFIG_SERIAL_PMACZILOG is not set
725# CONFIG_SERIAL_JSM is not set 720# CONFIG_SERIAL_JSM is not set
726# CONFIG_SERIAL_OF_PLATFORM is not set 721# CONFIG_SERIAL_OF_PLATFORM is not set
727CONFIG_UNIX98_PTYS=y 722CONFIG_UNIX98_PTYS=y
728CONFIG_LEGACY_PTYS=y 723CONFIG_LEGACY_PTYS=y
729CONFIG_LEGACY_PTY_COUNT=256 724CONFIG_LEGACY_PTY_COUNT=256
730# CONFIG_BRIQ_PANEL is not set
731# CONFIG_HVC_RTAS is not set
732# CONFIG_IPMI_HANDLER is not set 725# CONFIG_IPMI_HANDLER is not set
733# CONFIG_HW_RANDOM is not set 726# CONFIG_HW_RANDOM is not set
734# CONFIG_NVRAM is not set 727# CONFIG_NVRAM is not set
@@ -767,12 +760,6 @@ CONFIG_I2C_HELPER_AUTO=y
767# CONFIG_I2C_VIAPRO is not set 760# CONFIG_I2C_VIAPRO is not set
768 761
769# 762#
770# Mac SMBus host controller drivers
771#
772# CONFIG_I2C_HYDRA is not set
773CONFIG_I2C_POWERMAC=y
774
775#
776# I2C system bus drivers (mostly embedded / system-on-chip) 763# I2C system bus drivers (mostly embedded / system-on-chip)
777# 764#
778CONFIG_I2C_MPC=y 765CONFIG_I2C_MPC=y
@@ -808,6 +795,7 @@ CONFIG_I2C_MPC=y
808# CONFIG_SENSORS_PCF8591 is not set 795# CONFIG_SENSORS_PCF8591 is not set
809# CONFIG_SENSORS_MAX6875 is not set 796# CONFIG_SENSORS_MAX6875 is not set
810# CONFIG_SENSORS_TSL2550 is not set 797# CONFIG_SENSORS_TSL2550 is not set
798# CONFIG_MCU_MPC8349EMITX is not set
811# CONFIG_I2C_DEBUG_CORE is not set 799# CONFIG_I2C_DEBUG_CORE is not set
812# CONFIG_I2C_DEBUG_ALGO is not set 800# CONFIG_I2C_DEBUG_ALGO is not set
813# CONFIG_I2C_DEBUG_BUS is not set 801# CONFIG_I2C_DEBUG_BUS is not set
@@ -829,7 +817,6 @@ CONFIG_HWMON=y
829# CONFIG_SENSORS_ADM9240 is not set 817# CONFIG_SENSORS_ADM9240 is not set
830# CONFIG_SENSORS_ADT7470 is not set 818# CONFIG_SENSORS_ADT7470 is not set
831# CONFIG_SENSORS_ADT7473 is not set 819# CONFIG_SENSORS_ADT7473 is not set
832# CONFIG_SENSORS_AMS is not set
833# CONFIG_SENSORS_ATXP1 is not set 820# CONFIG_SENSORS_ATXP1 is not set
834# CONFIG_SENSORS_DS1621 is not set 821# CONFIG_SENSORS_DS1621 is not set
835# CONFIG_SENSORS_I5K_AMB is not set 822# CONFIG_SENSORS_I5K_AMB is not set
@@ -884,7 +871,6 @@ CONFIG_WATCHDOG=y
884# CONFIG_SOFT_WATCHDOG is not set 871# CONFIG_SOFT_WATCHDOG is not set
885# CONFIG_ALIM7101_WDT is not set 872# CONFIG_ALIM7101_WDT is not set
886# CONFIG_8xxx_WDT is not set 873# CONFIG_8xxx_WDT is not set
887# CONFIG_WATCHDOG_RTAS is not set
888 874
889# 875#
890# PCI-based Watchdog Cards 876# PCI-based Watchdog Cards
@@ -905,6 +891,17 @@ CONFIG_SSB_POSSIBLE=y
905# CONFIG_MFD_SM501 is not set 891# CONFIG_MFD_SM501 is not set
906# CONFIG_HTC_PASIC3 is not set 892# CONFIG_HTC_PASIC3 is not set
907# CONFIG_MFD_TMIO is not set 893# CONFIG_MFD_TMIO is not set
894# CONFIG_PMIC_DA903X is not set
895# CONFIG_MFD_WM8400 is not set
896# CONFIG_MFD_WM8350_I2C is not set
897
898#
899# Voltage and Current regulators
900#
901# CONFIG_REGULATOR is not set
902# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
903# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
904# CONFIG_REGULATOR_BQ24022 is not set
908 905
909# 906#
910# Multimedia devices 907# Multimedia devices
@@ -941,6 +938,12 @@ CONFIG_HID_SUPPORT=y
941CONFIG_HID=y 938CONFIG_HID=y
942# CONFIG_HID_DEBUG is not set 939# CONFIG_HID_DEBUG is not set
943# CONFIG_HIDRAW is not set 940# CONFIG_HIDRAW is not set
941# CONFIG_HID_PID is not set
942
943#
944# Special HID drivers
945#
946CONFIG_HID_COMPAT=y
944CONFIG_USB_SUPPORT=y 947CONFIG_USB_SUPPORT=y
945CONFIG_USB_ARCH_HAS_HCD=y 948CONFIG_USB_ARCH_HAS_HCD=y
946CONFIG_USB_ARCH_HAS_OHCI=y 949CONFIG_USB_ARCH_HAS_OHCI=y
@@ -957,6 +960,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
957# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 960# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
958# 961#
959# CONFIG_USB_GADGET is not set 962# CONFIG_USB_GADGET is not set
963# CONFIG_UWB is not set
960# CONFIG_MMC is not set 964# CONFIG_MMC is not set
961# CONFIG_MEMSTICK is not set 965# CONFIG_MEMSTICK is not set
962# CONFIG_NEW_LEDS is not set 966# CONFIG_NEW_LEDS is not set
@@ -966,6 +970,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
966# CONFIG_RTC_CLASS is not set 970# CONFIG_RTC_CLASS is not set
967# CONFIG_DMADEVICES is not set 971# CONFIG_DMADEVICES is not set
968# CONFIG_UIO is not set 972# CONFIG_UIO is not set
973# CONFIG_STAGING is not set
969 974
970# 975#
971# File systems 976# File systems
@@ -977,12 +982,13 @@ CONFIG_EXT3_FS=y
977CONFIG_EXT3_FS_XATTR=y 982CONFIG_EXT3_FS_XATTR=y
978# CONFIG_EXT3_FS_POSIX_ACL is not set 983# CONFIG_EXT3_FS_POSIX_ACL is not set
979# CONFIG_EXT3_FS_SECURITY is not set 984# CONFIG_EXT3_FS_SECURITY is not set
980# CONFIG_EXT4DEV_FS is not set 985# CONFIG_EXT4_FS is not set
981CONFIG_JBD=y 986CONFIG_JBD=y
982CONFIG_FS_MBCACHE=y 987CONFIG_FS_MBCACHE=y
983# CONFIG_REISERFS_FS is not set 988# CONFIG_REISERFS_FS is not set
984# CONFIG_JFS_FS is not set 989# CONFIG_JFS_FS is not set
985# CONFIG_FS_POSIX_ACL is not set 990# CONFIG_FS_POSIX_ACL is not set
991CONFIG_FILE_LOCKING=y
986# CONFIG_XFS_FS is not set 992# CONFIG_XFS_FS is not set
987# CONFIG_OCFS2_FS is not set 993# CONFIG_OCFS2_FS is not set
988CONFIG_DNOTIFY=y 994CONFIG_DNOTIFY=y
@@ -1012,6 +1018,7 @@ CONFIG_INOTIFY_USER=y
1012CONFIG_PROC_FS=y 1018CONFIG_PROC_FS=y
1013CONFIG_PROC_KCORE=y 1019CONFIG_PROC_KCORE=y
1014CONFIG_PROC_SYSCTL=y 1020CONFIG_PROC_SYSCTL=y
1021CONFIG_PROC_PAGE_MONITOR=y
1015CONFIG_SYSFS=y 1022CONFIG_SYSFS=y
1016CONFIG_TMPFS=y 1023CONFIG_TMPFS=y
1017# CONFIG_TMPFS_POSIX_ACL is not set 1024# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1049,6 +1056,7 @@ CONFIG_LOCKD_V4=y
1049CONFIG_NFS_COMMON=y 1056CONFIG_NFS_COMMON=y
1050CONFIG_SUNRPC=y 1057CONFIG_SUNRPC=y
1051CONFIG_SUNRPC_GSS=y 1058CONFIG_SUNRPC_GSS=y
1059# CONFIG_SUNRPC_REGISTER_V4 is not set
1052CONFIG_RPCSEC_GSS_KRB5=y 1060CONFIG_RPCSEC_GSS_KRB5=y
1053# CONFIG_RPCSEC_GSS_SPKM3 is not set 1061# CONFIG_RPCSEC_GSS_SPKM3 is not set
1054# CONFIG_SMB_FS is not set 1062# CONFIG_SMB_FS is not set
@@ -1085,7 +1093,6 @@ CONFIG_MSDOS_PARTITION=y
1085# Library routines 1093# Library routines
1086# 1094#
1087CONFIG_BITREVERSE=y 1095CONFIG_BITREVERSE=y
1088# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1089# CONFIG_CRC_CCITT is not set 1096# CONFIG_CRC_CCITT is not set
1090# CONFIG_CRC16 is not set 1097# CONFIG_CRC16 is not set
1091CONFIG_CRC_T10DIF=y 1098CONFIG_CRC_T10DIF=y
@@ -1113,13 +1120,15 @@ CONFIG_FRAME_WARN=1024
1113# CONFIG_DEBUG_KERNEL is not set 1120# CONFIG_DEBUG_KERNEL is not set
1114# CONFIG_DEBUG_BUGVERBOSE is not set 1121# CONFIG_DEBUG_BUGVERBOSE is not set
1115# CONFIG_DEBUG_MEMORY_INIT is not set 1122# CONFIG_DEBUG_MEMORY_INIT is not set
1123# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1116# CONFIG_LATENCYTOP is not set 1124# CONFIG_LATENCYTOP is not set
1117CONFIG_SYSCTL_SYSCALL_CHECK=y 1125CONFIG_SYSCTL_SYSCALL_CHECK=y
1118CONFIG_HAVE_FTRACE=y 1126CONFIG_HAVE_FUNCTION_TRACER=y
1119CONFIG_HAVE_DYNAMIC_FTRACE=y 1127
1120# CONFIG_FTRACE is not set 1128#
1121# CONFIG_SCHED_TRACER is not set 1129# Tracers
1122# CONFIG_CONTEXT_SWITCH_TRACER is not set 1130#
1131# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1123# CONFIG_SAMPLES is not set 1132# CONFIG_SAMPLES is not set
1124CONFIG_HAVE_ARCH_KGDB=y 1133CONFIG_HAVE_ARCH_KGDB=y
1125# CONFIG_IRQSTACKS is not set 1134# CONFIG_IRQSTACKS is not set
@@ -1131,14 +1140,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1131# 1140#
1132# CONFIG_KEYS is not set 1141# CONFIG_KEYS is not set
1133# CONFIG_SECURITY is not set 1142# CONFIG_SECURITY is not set
1143# CONFIG_SECURITYFS is not set
1134# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1144# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1135CONFIG_CRYPTO=y 1145CONFIG_CRYPTO=y
1136 1146
1137# 1147#
1138# Crypto core or helper 1148# Crypto core or helper
1139# 1149#
1150# CONFIG_CRYPTO_FIPS is not set
1140CONFIG_CRYPTO_ALGAPI=y 1151CONFIG_CRYPTO_ALGAPI=y
1152CONFIG_CRYPTO_AEAD=y
1141CONFIG_CRYPTO_BLKCIPHER=y 1153CONFIG_CRYPTO_BLKCIPHER=y
1154CONFIG_CRYPTO_HASH=y
1155CONFIG_CRYPTO_RNG=y
1142CONFIG_CRYPTO_MANAGER=y 1156CONFIG_CRYPTO_MANAGER=y
1143# CONFIG_CRYPTO_GF128MUL is not set 1157# CONFIG_CRYPTO_GF128MUL is not set
1144# CONFIG_CRYPTO_NULL is not set 1158# CONFIG_CRYPTO_NULL is not set
@@ -1211,6 +1225,11 @@ CONFIG_CRYPTO_DES=y
1211# 1225#
1212# CONFIG_CRYPTO_DEFLATE is not set 1226# CONFIG_CRYPTO_DEFLATE is not set
1213# CONFIG_CRYPTO_LZO is not set 1227# CONFIG_CRYPTO_LZO is not set
1228
1229#
1230# Random Number Generation
1231#
1232# CONFIG_CRYPTO_ANSI_CPRNG is not set
1214CONFIG_CRYPTO_HW=y 1233CONFIG_CRYPTO_HW=y
1215# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1234# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1216# CONFIG_CRYPTO_DEV_TALITOS is not set 1235# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
index 5ac33054ce2c..f447de16f75d 100644
--- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:25 2008 4# Sat Nov 8 12:40:01 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
23# CONFIG_SMP is not set 23# CONFIG_SMP is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -53,8 +53,6 @@ CONFIG_PPC_UDBG_16550=y
53CONFIG_AUDIT_ARCH=y 53CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
55CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
56CONFIG_HIBERNATE_32=y
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
58CONFIG_ARCH_SUSPEND_POSSIBLE=y 56CONFIG_ARCH_SUSPEND_POSSIBLE=y
59# CONFIG_PPC_DCR_NATIVE is not set 57# CONFIG_PPC_DCR_NATIVE is not set
60# CONFIG_PPC_DCR_MMIO is not set 58# CONFIG_PPC_DCR_MMIO is not set
@@ -99,7 +97,6 @@ CONFIG_HOTPLUG=y
99CONFIG_PRINTK=y 97CONFIG_PRINTK=y
100CONFIG_BUG=y 98CONFIG_BUG=y
101CONFIG_ELF_CORE=y 99CONFIG_ELF_CORE=y
102CONFIG_PCSPKR_PLATFORM=y
103CONFIG_COMPAT_BRK=y 100CONFIG_COMPAT_BRK=y
104CONFIG_BASE_FULL=y 101CONFIG_BASE_FULL=y
105CONFIG_FUTEX=y 102CONFIG_FUTEX=y
@@ -109,7 +106,9 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 106CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 108CONFIG_SHMEM=y
109CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y
113CONFIG_SLAB=y 112CONFIG_SLAB=y
114# CONFIG_SLUB is not set 113# CONFIG_SLUB is not set
115# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
@@ -122,10 +121,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
122CONFIG_HAVE_KPROBES=y 121CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y 122CONFIG_HAVE_KRETPROBES=y
124CONFIG_HAVE_ARCH_TRACEHOOK=y 123CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_DMA_ATTRS is not set
126# CONFIG_USE_GENERIC_SMP_HELPERS is not set
127# CONFIG_HAVE_CLK is not set
128CONFIG_PROC_PAGE_MONITOR=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
@@ -158,6 +153,7 @@ CONFIG_DEFAULT_AS=y
158# CONFIG_DEFAULT_NOOP is not set 153# CONFIG_DEFAULT_NOOP is not set
159CONFIG_DEFAULT_IOSCHED="anticipatory" 154CONFIG_DEFAULT_IOSCHED="anticipatory"
160CONFIG_CLASSIC_RCU=y 155CONFIG_CLASSIC_RCU=y
156# CONFIG_FREEZER is not set
161 157
162# 158#
163# Platform support 159# Platform support
@@ -165,10 +161,10 @@ CONFIG_CLASSIC_RCU=y
165CONFIG_PPC_MULTIPLATFORM=y 161CONFIG_PPC_MULTIPLATFORM=y
166CONFIG_CLASSIC32=y 162CONFIG_CLASSIC32=y
167# CONFIG_PPC_CHRP is not set 163# CONFIG_PPC_CHRP is not set
168# CONFIG_PPC_PMAC is not set
169# CONFIG_MPC5121_ADS is not set 164# CONFIG_MPC5121_ADS is not set
170# CONFIG_MPC5121_GENERIC is not set 165# CONFIG_MPC5121_GENERIC is not set
171# CONFIG_PPC_MPC52xx is not set 166# CONFIG_PPC_MPC52xx is not set
167# CONFIG_PPC_PMAC is not set
172# CONFIG_PPC_CELL is not set 168# CONFIG_PPC_CELL is not set
173# CONFIG_PPC_CELL_NATIVE is not set 169# CONFIG_PPC_CELL_NATIVE is not set
174# CONFIG_PPC_82xx is not set 170# CONFIG_PPC_82xx is not set
@@ -188,30 +184,26 @@ CONFIG_MPC837x_RDB=y
188CONFIG_PPC_MPC837x=y 184CONFIG_PPC_MPC837x=y
189# CONFIG_PPC_86xx is not set 185# CONFIG_PPC_86xx is not set
190# CONFIG_EMBEDDED6xx is not set 186# CONFIG_EMBEDDED6xx is not set
191CONFIG_PPC_NATIVE=y
192# CONFIG_UDBG_RTAS_CONSOLE is not set
193CONFIG_IPIC=y 187CONFIG_IPIC=y
194CONFIG_MPIC=y 188# CONFIG_MPIC is not set
195# CONFIG_MPIC_WEIRD is not set 189# CONFIG_MPIC_WEIRD is not set
196CONFIG_PPC_I8259=y 190# CONFIG_PPC_I8259 is not set
197CONFIG_PPC_RTAS=y 191# CONFIG_PPC_RTAS is not set
198# CONFIG_RTAS_ERROR_LOGGING is not set
199CONFIG_RTAS_PROC=y
200# CONFIG_MMIO_NVRAM is not set 192# CONFIG_MMIO_NVRAM is not set
201CONFIG_PPC_MPC106=y 193# CONFIG_PPC_MPC106 is not set
202# CONFIG_PPC_970_NAP is not set 194# CONFIG_PPC_970_NAP is not set
203# CONFIG_PPC_INDIRECT_IO is not set 195# CONFIG_PPC_INDIRECT_IO is not set
204# CONFIG_GENERIC_IOMAP is not set 196# CONFIG_GENERIC_IOMAP is not set
205# CONFIG_CPU_FREQ is not set 197# CONFIG_CPU_FREQ is not set
206# CONFIG_PPC601_SYNC_FIX is not set
207# CONFIG_TAU is not set 198# CONFIG_TAU is not set
199# CONFIG_QUICC_ENGINE is not set
208# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
201# CONFIG_MPC8xxx_GPIO is not set
209 202
210# 203#
211# Kernel options 204# Kernel options
212# 205#
213# CONFIG_HIGHMEM is not set 206# CONFIG_HIGHMEM is not set
214# CONFIG_TICK_ONESHOT is not set
215# CONFIG_NO_HZ is not set 207# CONFIG_NO_HZ is not set
216# CONFIG_HIGH_RES_TIMERS is not set 208# CONFIG_HIGH_RES_TIMERS is not set
217CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 209CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -225,6 +217,8 @@ CONFIG_PREEMPT_NONE=y
225# CONFIG_PREEMPT_VOLUNTARY is not set 217# CONFIG_PREEMPT_VOLUNTARY is not set
226# CONFIG_PREEMPT is not set 218# CONFIG_PREEMPT is not set
227CONFIG_BINFMT_ELF=y 219CONFIG_BINFMT_ELF=y
220# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
221# CONFIG_HAVE_AOUT is not set
228# CONFIG_BINFMT_MISC is not set 222# CONFIG_BINFMT_MISC is not set
229# CONFIG_IOMMU_HELPER is not set 223# CONFIG_IOMMU_HELPER is not set
230CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -239,15 +233,15 @@ CONFIG_FLATMEM_MANUAL=y
239# CONFIG_SPARSEMEM_MANUAL is not set 233# CONFIG_SPARSEMEM_MANUAL is not set
240CONFIG_FLATMEM=y 234CONFIG_FLATMEM=y
241CONFIG_FLAT_NODE_MEM_MAP=y 235CONFIG_FLAT_NODE_MEM_MAP=y
242# CONFIG_SPARSEMEM_STATIC is not set
243# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
244CONFIG_PAGEFLAGS_EXTENDED=y 236CONFIG_PAGEFLAGS_EXTENDED=y
245CONFIG_SPLIT_PTLOCK_CPUS=4 237CONFIG_SPLIT_PTLOCK_CPUS=4
246CONFIG_MIGRATION=y 238CONFIG_MIGRATION=y
247# CONFIG_RESOURCES_64BIT is not set 239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set
248CONFIG_ZONE_DMA_FLAG=1 241CONFIG_ZONE_DMA_FLAG=1
249CONFIG_BOUNCE=y 242CONFIG_BOUNCE=y
250CONFIG_VIRT_TO_BUS=y 243CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y
251CONFIG_FORCE_MAX_ZONEORDER=11 245CONFIG_FORCE_MAX_ZONEORDER=11
252CONFIG_PROC_DEVICETREE=y 246CONFIG_PROC_DEVICETREE=y
253# CONFIG_CMDLINE_BOOL is not set 247# CONFIG_CMDLINE_BOOL is not set
@@ -259,7 +253,6 @@ CONFIG_ISA_DMA_API=y
259# 253#
260# Bus options 254# Bus options
261# 255#
262# CONFIG_ISA is not set
263CONFIG_ZONE_DMA=y 256CONFIG_ZONE_DMA=y
264CONFIG_GENERIC_ISA_DMA=y 257CONFIG_GENERIC_ISA_DMA=y
265CONFIG_PPC_INDIRECT_PCI=y 258CONFIG_PPC_INDIRECT_PCI=y
@@ -272,7 +265,7 @@ CONFIG_PCI_SYSCALL=y
272# CONFIG_PCIEPORTBUS is not set 265# CONFIG_PCIEPORTBUS is not set
273CONFIG_ARCH_SUPPORTS_MSI=y 266CONFIG_ARCH_SUPPORTS_MSI=y
274# CONFIG_PCI_MSI is not set 267# CONFIG_PCI_MSI is not set
275CONFIG_PCI_LEGACY=y 268# CONFIG_PCI_LEGACY is not set
276# CONFIG_PCCARD is not set 269# CONFIG_PCCARD is not set
277# CONFIG_HOTPLUG_PCI is not set 270# CONFIG_HOTPLUG_PCI is not set
278# CONFIG_HAS_RAPIDIO is not set 271# CONFIG_HAS_RAPIDIO is not set
@@ -335,6 +328,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
335# CONFIG_TIPC is not set 328# CONFIG_TIPC is not set
336# CONFIG_ATM is not set 329# CONFIG_ATM is not set
337# CONFIG_BRIDGE is not set 330# CONFIG_BRIDGE is not set
331# CONFIG_NET_DSA is not set
338# CONFIG_VLAN_8021Q is not set 332# CONFIG_VLAN_8021Q is not set
339# CONFIG_DECNET is not set 333# CONFIG_DECNET is not set
340# CONFIG_LLC2 is not set 334# CONFIG_LLC2 is not set
@@ -355,11 +349,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
355# CONFIG_IRDA is not set 349# CONFIG_IRDA is not set
356# CONFIG_BT is not set 350# CONFIG_BT is not set
357# CONFIG_AF_RXRPC is not set 351# CONFIG_AF_RXRPC is not set
358 352# CONFIG_PHONET is not set
359# 353CONFIG_WIRELESS=y
360# Wireless
361#
362# CONFIG_CFG80211 is not set 354# CONFIG_CFG80211 is not set
355CONFIG_WIRELESS_OLD_REGULATORY=y
363# CONFIG_WIRELESS_EXT is not set 356# CONFIG_WIRELESS_EXT is not set
364# CONFIG_MAC80211 is not set 357# CONFIG_MAC80211 is not set
365# CONFIG_IEEE80211 is not set 358# CONFIG_IEEE80211 is not set
@@ -385,7 +378,6 @@ CONFIG_OF_I2C=y
385# CONFIG_PARPORT is not set 378# CONFIG_PARPORT is not set
386CONFIG_BLK_DEV=y 379CONFIG_BLK_DEV=y
387# CONFIG_BLK_DEV_FD is not set 380# CONFIG_BLK_DEV_FD is not set
388# CONFIG_MAC_FLOPPY is not set
389# CONFIG_BLK_CPQ_DA is not set 381# CONFIG_BLK_CPQ_DA is not set
390# CONFIG_BLK_CPQ_CISS_DA is not set 382# CONFIG_BLK_CPQ_CISS_DA is not set
391# CONFIG_BLK_DEV_DAC960 is not set 383# CONFIG_BLK_DEV_DAC960 is not set
@@ -487,8 +479,6 @@ CONFIG_SCSI_LOWLEVEL=y
487# CONFIG_SCSI_DC390T is not set 479# CONFIG_SCSI_DC390T is not set
488# CONFIG_SCSI_NSP32 is not set 480# CONFIG_SCSI_NSP32 is not set
489# CONFIG_SCSI_DEBUG is not set 481# CONFIG_SCSI_DEBUG is not set
490# CONFIG_SCSI_MESH is not set
491# CONFIG_SCSI_MAC53C94 is not set
492# CONFIG_SCSI_SRP is not set 482# CONFIG_SCSI_SRP is not set
493# CONFIG_SCSI_DH is not set 483# CONFIG_SCSI_DH is not set
494CONFIG_ATA=y 484CONFIG_ATA=y
@@ -554,6 +544,7 @@ CONFIG_ATA_SFF=y
554# CONFIG_PATA_SCH is not set 544# CONFIG_PATA_SCH is not set
555CONFIG_MD=y 545CONFIG_MD=y
556CONFIG_BLK_DEV_MD=y 546CONFIG_BLK_DEV_MD=y
547CONFIG_MD_AUTODETECT=y
557# CONFIG_MD_LINEAR is not set 548# CONFIG_MD_LINEAR is not set
558# CONFIG_MD_RAID0 is not set 549# CONFIG_MD_RAID0 is not set
559CONFIG_MD_RAID1=y 550CONFIG_MD_RAID1=y
@@ -603,8 +594,6 @@ CONFIG_FIXED_PHY=y
603# CONFIG_MDIO_BITBANG is not set 594# CONFIG_MDIO_BITBANG is not set
604CONFIG_NET_ETHERNET=y 595CONFIG_NET_ETHERNET=y
605CONFIG_MII=y 596CONFIG_MII=y
606# CONFIG_MACE is not set
607# CONFIG_BMAC is not set
608# CONFIG_HAPPYMEAL is not set 597# CONFIG_HAPPYMEAL is not set
609# CONFIG_SUNGEM is not set 598# CONFIG_SUNGEM is not set
610# CONFIG_CASSINI is not set 599# CONFIG_CASSINI is not set
@@ -615,8 +604,12 @@ CONFIG_MII=y
615# CONFIG_IBM_NEW_EMAC_RGMII is not set 604# CONFIG_IBM_NEW_EMAC_RGMII is not set
616# CONFIG_IBM_NEW_EMAC_TAH is not set 605# CONFIG_IBM_NEW_EMAC_TAH is not set
617# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 606# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
607# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
608# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
609# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
618# CONFIG_NET_PCI is not set 610# CONFIG_NET_PCI is not set
619# CONFIG_B44 is not set 611# CONFIG_B44 is not set
612# CONFIG_ATL2 is not set
620CONFIG_NETDEV_1000=y 613CONFIG_NETDEV_1000=y
621# CONFIG_ACENIC is not set 614# CONFIG_ACENIC is not set
622# CONFIG_DL2K is not set 615# CONFIG_DL2K is not set
@@ -639,6 +632,7 @@ CONFIG_GIANFAR=y
639# CONFIG_QLA3XXX is not set 632# CONFIG_QLA3XXX is not set
640# CONFIG_ATL1 is not set 633# CONFIG_ATL1 is not set
641# CONFIG_ATL1E is not set 634# CONFIG_ATL1E is not set
635# CONFIG_JME is not set
642# CONFIG_NETDEV_10000 is not set 636# CONFIG_NETDEV_10000 is not set
643# CONFIG_TR is not set 637# CONFIG_TR is not set
644 638
@@ -673,7 +667,7 @@ CONFIG_GIANFAR=y
673# Input device support 667# Input device support
674# 668#
675CONFIG_INPUT=y 669CONFIG_INPUT=y
676# CONFIG_INPUT_FF_MEMLESS is not set 670CONFIG_INPUT_FF_MEMLESS=m
677# CONFIG_INPUT_POLLDEV is not set 671# CONFIG_INPUT_POLLDEV is not set
678 672
679# 673#
@@ -724,14 +718,11 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
724# CONFIG_SERIAL_UARTLITE is not set 718# CONFIG_SERIAL_UARTLITE is not set
725CONFIG_SERIAL_CORE=y 719CONFIG_SERIAL_CORE=y
726CONFIG_SERIAL_CORE_CONSOLE=y 720CONFIG_SERIAL_CORE_CONSOLE=y
727# CONFIG_SERIAL_PMACZILOG is not set
728# CONFIG_SERIAL_JSM is not set 721# CONFIG_SERIAL_JSM is not set
729# CONFIG_SERIAL_OF_PLATFORM is not set 722# CONFIG_SERIAL_OF_PLATFORM is not set
730CONFIG_UNIX98_PTYS=y 723CONFIG_UNIX98_PTYS=y
731CONFIG_LEGACY_PTYS=y 724CONFIG_LEGACY_PTYS=y
732CONFIG_LEGACY_PTY_COUNT=256 725CONFIG_LEGACY_PTY_COUNT=256
733# CONFIG_BRIQ_PANEL is not set
734# CONFIG_HVC_RTAS is not set
735# CONFIG_IPMI_HANDLER is not set 726# CONFIG_IPMI_HANDLER is not set
736# CONFIG_HW_RANDOM is not set 727# CONFIG_HW_RANDOM is not set
737# CONFIG_NVRAM is not set 728# CONFIG_NVRAM is not set
@@ -770,12 +761,6 @@ CONFIG_I2C_HELPER_AUTO=y
770# CONFIG_I2C_VIAPRO is not set 761# CONFIG_I2C_VIAPRO is not set
771 762
772# 763#
773# Mac SMBus host controller drivers
774#
775# CONFIG_I2C_HYDRA is not set
776CONFIG_I2C_POWERMAC=y
777
778#
779# I2C system bus drivers (mostly embedded / system-on-chip) 764# I2C system bus drivers (mostly embedded / system-on-chip)
780# 765#
781CONFIG_I2C_MPC=y 766CONFIG_I2C_MPC=y
@@ -812,6 +797,7 @@ CONFIG_I2C_MPC=y
812# CONFIG_SENSORS_PCF8591 is not set 797# CONFIG_SENSORS_PCF8591 is not set
813# CONFIG_SENSORS_MAX6875 is not set 798# CONFIG_SENSORS_MAX6875 is not set
814# CONFIG_SENSORS_TSL2550 is not set 799# CONFIG_SENSORS_TSL2550 is not set
800# CONFIG_MCU_MPC8349EMITX is not set
815# CONFIG_I2C_DEBUG_CORE is not set 801# CONFIG_I2C_DEBUG_CORE is not set
816# CONFIG_I2C_DEBUG_ALGO is not set 802# CONFIG_I2C_DEBUG_ALGO is not set
817# CONFIG_I2C_DEBUG_BUS is not set 803# CONFIG_I2C_DEBUG_BUS is not set
@@ -833,7 +819,6 @@ CONFIG_HWMON=y
833# CONFIG_SENSORS_ADM9240 is not set 819# CONFIG_SENSORS_ADM9240 is not set
834# CONFIG_SENSORS_ADT7470 is not set 820# CONFIG_SENSORS_ADT7470 is not set
835# CONFIG_SENSORS_ADT7473 is not set 821# CONFIG_SENSORS_ADT7473 is not set
836# CONFIG_SENSORS_AMS is not set
837# CONFIG_SENSORS_ATXP1 is not set 822# CONFIG_SENSORS_ATXP1 is not set
838# CONFIG_SENSORS_DS1621 is not set 823# CONFIG_SENSORS_DS1621 is not set
839# CONFIG_SENSORS_I5K_AMB is not set 824# CONFIG_SENSORS_I5K_AMB is not set
@@ -888,7 +873,6 @@ CONFIG_WATCHDOG=y
888# CONFIG_SOFT_WATCHDOG is not set 873# CONFIG_SOFT_WATCHDOG is not set
889# CONFIG_ALIM7101_WDT is not set 874# CONFIG_ALIM7101_WDT is not set
890# CONFIG_8xxx_WDT is not set 875# CONFIG_8xxx_WDT is not set
891# CONFIG_WATCHDOG_RTAS is not set
892 876
893# 877#
894# PCI-based Watchdog Cards 878# PCI-based Watchdog Cards
@@ -914,6 +898,17 @@ CONFIG_SSB_POSSIBLE=y
914# CONFIG_MFD_SM501 is not set 898# CONFIG_MFD_SM501 is not set
915# CONFIG_HTC_PASIC3 is not set 899# CONFIG_HTC_PASIC3 is not set
916# CONFIG_MFD_TMIO is not set 900# CONFIG_MFD_TMIO is not set
901# CONFIG_PMIC_DA903X is not set
902# CONFIG_MFD_WM8400 is not set
903# CONFIG_MFD_WM8350_I2C is not set
904
905#
906# Voltage and Current regulators
907#
908# CONFIG_REGULATOR is not set
909# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
910# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
911# CONFIG_REGULATOR_BQ24022 is not set
917 912
918# 913#
919# Multimedia devices 914# Multimedia devices
@@ -956,9 +951,36 @@ CONFIG_HID=y
956# USB Input Devices 951# USB Input Devices
957# 952#
958CONFIG_USB_HID=y 953CONFIG_USB_HID=y
959# CONFIG_USB_HIDINPUT_POWERBOOK is not set 954# CONFIG_HID_PID is not set
960# CONFIG_HID_FF is not set
961# CONFIG_USB_HIDDEV is not set 955# CONFIG_USB_HIDDEV is not set
956
957#
958# Special HID drivers
959#
960CONFIG_HID_COMPAT=y
961CONFIG_HID_A4TECH=y
962CONFIG_HID_APPLE=y
963CONFIG_HID_BELKIN=y
964CONFIG_HID_BRIGHT=y
965CONFIG_HID_CHERRY=y
966CONFIG_HID_CHICONY=y
967CONFIG_HID_CYPRESS=y
968CONFIG_HID_DELL=y
969CONFIG_HID_EZKEY=y
970CONFIG_HID_GYRATION=y
971CONFIG_HID_LOGITECH=y
972# CONFIG_LOGITECH_FF is not set
973# CONFIG_LOGIRUMBLEPAD2_FF is not set
974CONFIG_HID_MICROSOFT=y
975CONFIG_HID_MONTEREY=y
976CONFIG_HID_PANTHERLORD=y
977# CONFIG_PANTHERLORD_FF is not set
978CONFIG_HID_PETALYNX=y
979CONFIG_HID_SAMSUNG=y
980CONFIG_HID_SONY=y
981CONFIG_HID_SUNPLUS=y
982CONFIG_THRUSTMASTER_FF=m
983CONFIG_ZEROPLUS_FF=m
962CONFIG_USB_SUPPORT=y 984CONFIG_USB_SUPPORT=y
963CONFIG_USB_ARCH_HAS_HCD=y 985CONFIG_USB_ARCH_HAS_HCD=y
964CONFIG_USB_ARCH_HAS_OHCI=y 986CONFIG_USB_ARCH_HAS_OHCI=y
@@ -977,6 +999,8 @@ CONFIG_USB_DEVICE_CLASS=y
977# CONFIG_USB_OTG_WHITELIST is not set 999# CONFIG_USB_OTG_WHITELIST is not set
978# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1000# CONFIG_USB_OTG_BLACKLIST_HUB is not set
979CONFIG_USB_MON=y 1001CONFIG_USB_MON=y
1002# CONFIG_USB_WUSB is not set
1003# CONFIG_USB_WUSB_CBAF is not set
980 1004
981# 1005#
982# USB Host Controller Drivers 1006# USB Host Controller Drivers
@@ -993,6 +1017,8 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
993# CONFIG_USB_UHCI_HCD is not set 1017# CONFIG_USB_UHCI_HCD is not set
994# CONFIG_USB_SL811_HCD is not set 1018# CONFIG_USB_SL811_HCD is not set
995# CONFIG_USB_R8A66597_HCD is not set 1019# CONFIG_USB_R8A66597_HCD is not set
1020# CONFIG_USB_WHCI_HCD is not set
1021# CONFIG_USB_HWA_HCD is not set
996 1022
997# 1023#
998# USB Device Class drivers 1024# USB Device Class drivers
@@ -1000,6 +1026,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1000# CONFIG_USB_ACM is not set 1026# CONFIG_USB_ACM is not set
1001# CONFIG_USB_PRINTER is not set 1027# CONFIG_USB_PRINTER is not set
1002# CONFIG_USB_WDM is not set 1028# CONFIG_USB_WDM is not set
1029# CONFIG_USB_TMC is not set
1003 1030
1004# 1031#
1005# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1032# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1028,6 +1055,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1028# CONFIG_USB_EMI62 is not set 1055# CONFIG_USB_EMI62 is not set
1029# CONFIG_USB_EMI26 is not set 1056# CONFIG_USB_EMI26 is not set
1030# CONFIG_USB_ADUTUX is not set 1057# CONFIG_USB_ADUTUX is not set
1058# CONFIG_USB_SEVSEG is not set
1031# CONFIG_USB_RIO500 is not set 1059# CONFIG_USB_RIO500 is not set
1032# CONFIG_USB_LEGOTOWER is not set 1060# CONFIG_USB_LEGOTOWER is not set
1033# CONFIG_USB_LCD is not set 1061# CONFIG_USB_LCD is not set
@@ -1044,7 +1072,9 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1044# CONFIG_USB_TRANCEVIBRATOR is not set 1072# CONFIG_USB_TRANCEVIBRATOR is not set
1045# CONFIG_USB_IOWARRIOR is not set 1073# CONFIG_USB_IOWARRIOR is not set
1046# CONFIG_USB_ISIGHTFW is not set 1074# CONFIG_USB_ISIGHTFW is not set
1075# CONFIG_USB_VST is not set
1047# CONFIG_USB_GADGET is not set 1076# CONFIG_USB_GADGET is not set
1077# CONFIG_UWB is not set
1048# CONFIG_MMC is not set 1078# CONFIG_MMC is not set
1049# CONFIG_MEMSTICK is not set 1079# CONFIG_MEMSTICK is not set
1050# CONFIG_NEW_LEDS is not set 1080# CONFIG_NEW_LEDS is not set
@@ -1054,6 +1084,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1054# CONFIG_RTC_CLASS is not set 1084# CONFIG_RTC_CLASS is not set
1055# CONFIG_DMADEVICES is not set 1085# CONFIG_DMADEVICES is not set
1056# CONFIG_UIO is not set 1086# CONFIG_UIO is not set
1087# CONFIG_STAGING is not set
1057 1088
1058# 1089#
1059# File systems 1090# File systems
@@ -1065,12 +1096,13 @@ CONFIG_EXT3_FS=y
1065CONFIG_EXT3_FS_XATTR=y 1096CONFIG_EXT3_FS_XATTR=y
1066# CONFIG_EXT3_FS_POSIX_ACL is not set 1097# CONFIG_EXT3_FS_POSIX_ACL is not set
1067# CONFIG_EXT3_FS_SECURITY is not set 1098# CONFIG_EXT3_FS_SECURITY is not set
1068# CONFIG_EXT4DEV_FS is not set 1099# CONFIG_EXT4_FS is not set
1069CONFIG_JBD=y 1100CONFIG_JBD=y
1070CONFIG_FS_MBCACHE=y 1101CONFIG_FS_MBCACHE=y
1071# CONFIG_REISERFS_FS is not set 1102# CONFIG_REISERFS_FS is not set
1072# CONFIG_JFS_FS is not set 1103# CONFIG_JFS_FS is not set
1073# CONFIG_FS_POSIX_ACL is not set 1104# CONFIG_FS_POSIX_ACL is not set
1105CONFIG_FILE_LOCKING=y
1074# CONFIG_XFS_FS is not set 1106# CONFIG_XFS_FS is not set
1075# CONFIG_OCFS2_FS is not set 1107# CONFIG_OCFS2_FS is not set
1076CONFIG_DNOTIFY=y 1108CONFIG_DNOTIFY=y
@@ -1100,6 +1132,7 @@ CONFIG_INOTIFY_USER=y
1100CONFIG_PROC_FS=y 1132CONFIG_PROC_FS=y
1101CONFIG_PROC_KCORE=y 1133CONFIG_PROC_KCORE=y
1102CONFIG_PROC_SYSCTL=y 1134CONFIG_PROC_SYSCTL=y
1135CONFIG_PROC_PAGE_MONITOR=y
1103CONFIG_SYSFS=y 1136CONFIG_SYSFS=y
1104CONFIG_TMPFS=y 1137CONFIG_TMPFS=y
1105# CONFIG_TMPFS_POSIX_ACL is not set 1138# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1137,6 +1170,7 @@ CONFIG_LOCKD_V4=y
1137CONFIG_NFS_COMMON=y 1170CONFIG_NFS_COMMON=y
1138CONFIG_SUNRPC=y 1171CONFIG_SUNRPC=y
1139CONFIG_SUNRPC_GSS=y 1172CONFIG_SUNRPC_GSS=y
1173# CONFIG_SUNRPC_REGISTER_V4 is not set
1140CONFIG_RPCSEC_GSS_KRB5=y 1174CONFIG_RPCSEC_GSS_KRB5=y
1141# CONFIG_RPCSEC_GSS_SPKM3 is not set 1175# CONFIG_RPCSEC_GSS_SPKM3 is not set
1142# CONFIG_SMB_FS is not set 1176# CONFIG_SMB_FS is not set
@@ -1173,7 +1207,6 @@ CONFIG_MSDOS_PARTITION=y
1173# Library routines 1207# Library routines
1174# 1208#
1175CONFIG_BITREVERSE=y 1209CONFIG_BITREVERSE=y
1176# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1177# CONFIG_CRC_CCITT is not set 1210# CONFIG_CRC_CCITT is not set
1178# CONFIG_CRC16 is not set 1211# CONFIG_CRC16 is not set
1179CONFIG_CRC_T10DIF=y 1212CONFIG_CRC_T10DIF=y
@@ -1201,13 +1234,15 @@ CONFIG_FRAME_WARN=1024
1201# CONFIG_DEBUG_KERNEL is not set 1234# CONFIG_DEBUG_KERNEL is not set
1202# CONFIG_DEBUG_BUGVERBOSE is not set 1235# CONFIG_DEBUG_BUGVERBOSE is not set
1203# CONFIG_DEBUG_MEMORY_INIT is not set 1236# CONFIG_DEBUG_MEMORY_INIT is not set
1237# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1204# CONFIG_LATENCYTOP is not set 1238# CONFIG_LATENCYTOP is not set
1205CONFIG_SYSCTL_SYSCALL_CHECK=y 1239CONFIG_SYSCTL_SYSCALL_CHECK=y
1206CONFIG_HAVE_FTRACE=y 1240CONFIG_HAVE_FUNCTION_TRACER=y
1207CONFIG_HAVE_DYNAMIC_FTRACE=y 1241
1208# CONFIG_FTRACE is not set 1242#
1209# CONFIG_SCHED_TRACER is not set 1243# Tracers
1210# CONFIG_CONTEXT_SWITCH_TRACER is not set 1244#
1245# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1211# CONFIG_SAMPLES is not set 1246# CONFIG_SAMPLES is not set
1212CONFIG_HAVE_ARCH_KGDB=y 1247CONFIG_HAVE_ARCH_KGDB=y
1213# CONFIG_IRQSTACKS is not set 1248# CONFIG_IRQSTACKS is not set
@@ -1219,6 +1254,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1219# 1254#
1220# CONFIG_KEYS is not set 1255# CONFIG_KEYS is not set
1221# CONFIG_SECURITY is not set 1256# CONFIG_SECURITY is not set
1257# CONFIG_SECURITYFS is not set
1222# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1258# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1223CONFIG_XOR_BLOCKS=y 1259CONFIG_XOR_BLOCKS=y
1224CONFIG_ASYNC_CORE=y 1260CONFIG_ASYNC_CORE=y
@@ -1229,8 +1265,12 @@ CONFIG_CRYPTO=y
1229# 1265#
1230# Crypto core or helper 1266# Crypto core or helper
1231# 1267#
1268# CONFIG_CRYPTO_FIPS is not set
1232CONFIG_CRYPTO_ALGAPI=y 1269CONFIG_CRYPTO_ALGAPI=y
1270CONFIG_CRYPTO_AEAD=y
1233CONFIG_CRYPTO_BLKCIPHER=y 1271CONFIG_CRYPTO_BLKCIPHER=y
1272CONFIG_CRYPTO_HASH=y
1273CONFIG_CRYPTO_RNG=y
1234CONFIG_CRYPTO_MANAGER=y 1274CONFIG_CRYPTO_MANAGER=y
1235# CONFIG_CRYPTO_GF128MUL is not set 1275# CONFIG_CRYPTO_GF128MUL is not set
1236# CONFIG_CRYPTO_NULL is not set 1276# CONFIG_CRYPTO_NULL is not set
@@ -1303,6 +1343,11 @@ CONFIG_CRYPTO_DES=y
1303# 1343#
1304# CONFIG_CRYPTO_DEFLATE is not set 1344# CONFIG_CRYPTO_DEFLATE is not set
1305# CONFIG_CRYPTO_LZO is not set 1345# CONFIG_CRYPTO_LZO is not set
1346
1347#
1348# Random Number Generation
1349#
1350# CONFIG_CRYPTO_ANSI_CPRNG is not set
1306CONFIG_CRYPTO_HW=y 1351CONFIG_CRYPTO_HW=y
1307# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1352# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1308# CONFIG_CRYPTO_DEV_TALITOS is not set 1353# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig
index c359cc2a380e..8d2d7eeab5f5 100644
--- a/arch/powerpc/configs/83xx/sbc834x_defconfig
+++ b/arch/powerpc/configs/83xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:27 2008 4# Sat Nov 8 12:40:02 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
23# CONFIG_SMP is not set 23# CONFIG_SMP is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -53,8 +53,6 @@ CONFIG_PPC_UDBG_16550=y
53CONFIG_AUDIT_ARCH=y 53CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
55CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
56CONFIG_HIBERNATE_32=y
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
58CONFIG_ARCH_SUSPEND_POSSIBLE=y 56CONFIG_ARCH_SUSPEND_POSSIBLE=y
59# CONFIG_PPC_DCR_NATIVE is not set 57# CONFIG_PPC_DCR_NATIVE is not set
60# CONFIG_PPC_DCR_MMIO is not set 58# CONFIG_PPC_DCR_MMIO is not set
@@ -98,7 +96,6 @@ CONFIG_HOTPLUG=y
98CONFIG_PRINTK=y 96CONFIG_PRINTK=y
99CONFIG_BUG=y 97CONFIG_BUG=y
100CONFIG_ELF_CORE=y 98CONFIG_ELF_CORE=y
101CONFIG_PCSPKR_PLATFORM=y
102CONFIG_COMPAT_BRK=y 99CONFIG_COMPAT_BRK=y
103CONFIG_BASE_FULL=y 100CONFIG_BASE_FULL=y
104CONFIG_FUTEX=y 101CONFIG_FUTEX=y
@@ -108,7 +105,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 105CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 106CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 107CONFIG_SHMEM=y
108CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
110CONFIG_PCI_QUIRKS=y
112CONFIG_SLAB=y 111CONFIG_SLAB=y
113# CONFIG_SLUB is not set 112# CONFIG_SLUB is not set
114# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
@@ -120,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
120CONFIG_HAVE_KPROBES=y 119CONFIG_HAVE_KPROBES=y
121CONFIG_HAVE_KRETPROBES=y 120CONFIG_HAVE_KRETPROBES=y
122CONFIG_HAVE_ARCH_TRACEHOOK=y 121CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_DMA_ATTRS is not set
124# CONFIG_USE_GENERIC_SMP_HELPERS is not set
125# CONFIG_HAVE_CLK is not set
126CONFIG_PROC_PAGE_MONITOR=y
127# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
128CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
129CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
@@ -156,6 +151,7 @@ CONFIG_DEFAULT_AS=y
156# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
157CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
158CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_FREEZER is not set
159 155
160# 156#
161# Platform support 157# Platform support
@@ -163,10 +159,10 @@ CONFIG_CLASSIC_RCU=y
163CONFIG_PPC_MULTIPLATFORM=y 159CONFIG_PPC_MULTIPLATFORM=y
164CONFIG_CLASSIC32=y 160CONFIG_CLASSIC32=y
165# CONFIG_PPC_CHRP is not set 161# CONFIG_PPC_CHRP is not set
166# CONFIG_PPC_PMAC is not set
167# CONFIG_MPC5121_ADS is not set 162# CONFIG_MPC5121_ADS is not set
168# CONFIG_MPC5121_GENERIC is not set 163# CONFIG_MPC5121_GENERIC is not set
169# CONFIG_PPC_MPC52xx is not set 164# CONFIG_PPC_MPC52xx is not set
165# CONFIG_PPC_PMAC is not set
170# CONFIG_PPC_CELL is not set 166# CONFIG_PPC_CELL is not set
171# CONFIG_PPC_CELL_NATIVE is not set 167# CONFIG_PPC_CELL_NATIVE is not set
172# CONFIG_PPC_82xx is not set 168# CONFIG_PPC_82xx is not set
@@ -186,30 +182,26 @@ CONFIG_SBC834x=y
186CONFIG_PPC_MPC834x=y 182CONFIG_PPC_MPC834x=y
187# CONFIG_PPC_86xx is not set 183# CONFIG_PPC_86xx is not set
188# CONFIG_EMBEDDED6xx is not set 184# CONFIG_EMBEDDED6xx is not set
189CONFIG_PPC_NATIVE=y
190# CONFIG_UDBG_RTAS_CONSOLE is not set
191CONFIG_IPIC=y 185CONFIG_IPIC=y
192CONFIG_MPIC=y 186# CONFIG_MPIC is not set
193# CONFIG_MPIC_WEIRD is not set 187# CONFIG_MPIC_WEIRD is not set
194CONFIG_PPC_I8259=y 188# CONFIG_PPC_I8259 is not set
195CONFIG_PPC_RTAS=y 189# CONFIG_PPC_RTAS is not set
196# CONFIG_RTAS_ERROR_LOGGING is not set
197CONFIG_RTAS_PROC=y
198# CONFIG_MMIO_NVRAM is not set 190# CONFIG_MMIO_NVRAM is not set
199CONFIG_PPC_MPC106=y 191# CONFIG_PPC_MPC106 is not set
200# CONFIG_PPC_970_NAP is not set 192# CONFIG_PPC_970_NAP is not set
201# CONFIG_PPC_INDIRECT_IO is not set 193# CONFIG_PPC_INDIRECT_IO is not set
202# CONFIG_GENERIC_IOMAP is not set 194# CONFIG_GENERIC_IOMAP is not set
203# CONFIG_CPU_FREQ is not set 195# CONFIG_CPU_FREQ is not set
204# CONFIG_PPC601_SYNC_FIX is not set
205# CONFIG_TAU is not set 196# CONFIG_TAU is not set
197# CONFIG_QUICC_ENGINE is not set
206# CONFIG_FSL_ULI1575 is not set 198# CONFIG_FSL_ULI1575 is not set
199# CONFIG_MPC8xxx_GPIO is not set
207 200
208# 201#
209# Kernel options 202# Kernel options
210# 203#
211# CONFIG_HIGHMEM is not set 204# CONFIG_HIGHMEM is not set
212# CONFIG_TICK_ONESHOT is not set
213# CONFIG_NO_HZ is not set 205# CONFIG_NO_HZ is not set
214# CONFIG_HIGH_RES_TIMERS is not set 206# CONFIG_HIGH_RES_TIMERS is not set
215CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 207CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -223,6 +215,8 @@ CONFIG_PREEMPT_NONE=y
223# CONFIG_PREEMPT_VOLUNTARY is not set 215# CONFIG_PREEMPT_VOLUNTARY is not set
224# CONFIG_PREEMPT is not set 216# CONFIG_PREEMPT is not set
225CONFIG_BINFMT_ELF=y 217CONFIG_BINFMT_ELF=y
218# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
219# CONFIG_HAVE_AOUT is not set
226# CONFIG_BINFMT_MISC is not set 220# CONFIG_BINFMT_MISC is not set
227# CONFIG_IOMMU_HELPER is not set 221# CONFIG_IOMMU_HELPER is not set
228CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 222CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -237,15 +231,15 @@ CONFIG_FLATMEM_MANUAL=y
237# CONFIG_SPARSEMEM_MANUAL is not set 231# CONFIG_SPARSEMEM_MANUAL is not set
238CONFIG_FLATMEM=y 232CONFIG_FLATMEM=y
239CONFIG_FLAT_NODE_MEM_MAP=y 233CONFIG_FLAT_NODE_MEM_MAP=y
240# CONFIG_SPARSEMEM_STATIC is not set
241# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
242CONFIG_PAGEFLAGS_EXTENDED=y 234CONFIG_PAGEFLAGS_EXTENDED=y
243CONFIG_SPLIT_PTLOCK_CPUS=4 235CONFIG_SPLIT_PTLOCK_CPUS=4
244CONFIG_MIGRATION=y 236CONFIG_MIGRATION=y
245# CONFIG_RESOURCES_64BIT is not set 237# CONFIG_RESOURCES_64BIT is not set
238# CONFIG_PHYS_ADDR_T_64BIT is not set
246CONFIG_ZONE_DMA_FLAG=1 239CONFIG_ZONE_DMA_FLAG=1
247CONFIG_BOUNCE=y 240CONFIG_BOUNCE=y
248CONFIG_VIRT_TO_BUS=y 241CONFIG_VIRT_TO_BUS=y
242CONFIG_UNEVICTABLE_LRU=y
249CONFIG_FORCE_MAX_ZONEORDER=11 243CONFIG_FORCE_MAX_ZONEORDER=11
250CONFIG_PROC_DEVICETREE=y 244CONFIG_PROC_DEVICETREE=y
251# CONFIG_CMDLINE_BOOL is not set 245# CONFIG_CMDLINE_BOOL is not set
@@ -257,7 +251,6 @@ CONFIG_ISA_DMA_API=y
257# 251#
258# Bus options 252# Bus options
259# 253#
260# CONFIG_ISA is not set
261CONFIG_ZONE_DMA=y 254CONFIG_ZONE_DMA=y
262CONFIG_GENERIC_ISA_DMA=y 255CONFIG_GENERIC_ISA_DMA=y
263CONFIG_PPC_INDIRECT_PCI=y 256CONFIG_PPC_INDIRECT_PCI=y
@@ -270,7 +263,7 @@ CONFIG_PCI_SYSCALL=y
270# CONFIG_PCIEPORTBUS is not set 263# CONFIG_PCIEPORTBUS is not set
271CONFIG_ARCH_SUPPORTS_MSI=y 264CONFIG_ARCH_SUPPORTS_MSI=y
272# CONFIG_PCI_MSI is not set 265# CONFIG_PCI_MSI is not set
273CONFIG_PCI_LEGACY=y 266# CONFIG_PCI_LEGACY is not set
274# CONFIG_PCCARD is not set 267# CONFIG_PCCARD is not set
275# CONFIG_HOTPLUG_PCI is not set 268# CONFIG_HOTPLUG_PCI is not set
276# CONFIG_HAS_RAPIDIO is not set 269# CONFIG_HAS_RAPIDIO is not set
@@ -338,6 +331,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
338# CONFIG_TIPC is not set 331# CONFIG_TIPC is not set
339# CONFIG_ATM is not set 332# CONFIG_ATM is not set
340# CONFIG_BRIDGE is not set 333# CONFIG_BRIDGE is not set
334# CONFIG_NET_DSA is not set
341# CONFIG_VLAN_8021Q is not set 335# CONFIG_VLAN_8021Q is not set
342# CONFIG_DECNET is not set 336# CONFIG_DECNET is not set
343# CONFIG_LLC2 is not set 337# CONFIG_LLC2 is not set
@@ -358,11 +352,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
358# CONFIG_IRDA is not set 352# CONFIG_IRDA is not set
359# CONFIG_BT is not set 353# CONFIG_BT is not set
360# CONFIG_AF_RXRPC is not set 354# CONFIG_AF_RXRPC is not set
361 355# CONFIG_PHONET is not set
362# 356CONFIG_WIRELESS=y
363# Wireless
364#
365# CONFIG_CFG80211 is not set 357# CONFIG_CFG80211 is not set
358CONFIG_WIRELESS_OLD_REGULATORY=y
366# CONFIG_WIRELESS_EXT is not set 359# CONFIG_WIRELESS_EXT is not set
367# CONFIG_MAC80211 is not set 360# CONFIG_MAC80211 is not set
368# CONFIG_IEEE80211 is not set 361# CONFIG_IEEE80211 is not set
@@ -388,7 +381,6 @@ CONFIG_OF_I2C=y
388# CONFIG_PARPORT is not set 381# CONFIG_PARPORT is not set
389CONFIG_BLK_DEV=y 382CONFIG_BLK_DEV=y
390# CONFIG_BLK_DEV_FD is not set 383# CONFIG_BLK_DEV_FD is not set
391# CONFIG_MAC_FLOPPY is not set
392# CONFIG_BLK_CPQ_DA is not set 384# CONFIG_BLK_CPQ_DA is not set
393# CONFIG_BLK_CPQ_CISS_DA is not set 385# CONFIG_BLK_CPQ_CISS_DA is not set
394# CONFIG_BLK_DEV_DAC960 is not set 386# CONFIG_BLK_DEV_DAC960 is not set
@@ -464,8 +456,6 @@ CONFIG_BROADCOM_PHY=y
464# CONFIG_MDIO_BITBANG is not set 456# CONFIG_MDIO_BITBANG is not set
465CONFIG_NET_ETHERNET=y 457CONFIG_NET_ETHERNET=y
466CONFIG_MII=y 458CONFIG_MII=y
467# CONFIG_MACE is not set
468# CONFIG_BMAC is not set
469# CONFIG_HAPPYMEAL is not set 459# CONFIG_HAPPYMEAL is not set
470# CONFIG_SUNGEM is not set 460# CONFIG_SUNGEM is not set
471# CONFIG_CASSINI is not set 461# CONFIG_CASSINI is not set
@@ -476,8 +466,12 @@ CONFIG_MII=y
476# CONFIG_IBM_NEW_EMAC_RGMII is not set 466# CONFIG_IBM_NEW_EMAC_RGMII is not set
477# CONFIG_IBM_NEW_EMAC_TAH is not set 467# CONFIG_IBM_NEW_EMAC_TAH is not set
478# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 468# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
469# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
470# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
471# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
479# CONFIG_NET_PCI is not set 472# CONFIG_NET_PCI is not set
480# CONFIG_B44 is not set 473# CONFIG_B44 is not set
474# CONFIG_ATL2 is not set
481CONFIG_NETDEV_1000=y 475CONFIG_NETDEV_1000=y
482# CONFIG_ACENIC is not set 476# CONFIG_ACENIC is not set
483# CONFIG_DL2K is not set 477# CONFIG_DL2K is not set
@@ -500,6 +494,7 @@ CONFIG_GIANFAR=y
500# CONFIG_QLA3XXX is not set 494# CONFIG_QLA3XXX is not set
501# CONFIG_ATL1 is not set 495# CONFIG_ATL1 is not set
502# CONFIG_ATL1E is not set 496# CONFIG_ATL1E is not set
497# CONFIG_JME is not set
503# CONFIG_NETDEV_10000 is not set 498# CONFIG_NETDEV_10000 is not set
504# CONFIG_TR is not set 499# CONFIG_TR is not set
505 500
@@ -575,14 +570,11 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
575# CONFIG_SERIAL_UARTLITE is not set 570# CONFIG_SERIAL_UARTLITE is not set
576CONFIG_SERIAL_CORE=y 571CONFIG_SERIAL_CORE=y
577CONFIG_SERIAL_CORE_CONSOLE=y 572CONFIG_SERIAL_CORE_CONSOLE=y
578# CONFIG_SERIAL_PMACZILOG is not set
579# CONFIG_SERIAL_JSM is not set 573# CONFIG_SERIAL_JSM is not set
580# CONFIG_SERIAL_OF_PLATFORM is not set 574# CONFIG_SERIAL_OF_PLATFORM is not set
581CONFIG_UNIX98_PTYS=y 575CONFIG_UNIX98_PTYS=y
582CONFIG_LEGACY_PTYS=y 576CONFIG_LEGACY_PTYS=y
583CONFIG_LEGACY_PTY_COUNT=256 577CONFIG_LEGACY_PTY_COUNT=256
584# CONFIG_BRIQ_PANEL is not set
585# CONFIG_HVC_RTAS is not set
586# CONFIG_IPMI_HANDLER is not set 578# CONFIG_IPMI_HANDLER is not set
587# CONFIG_HW_RANDOM is not set 579# CONFIG_HW_RANDOM is not set
588# CONFIG_NVRAM is not set 580# CONFIG_NVRAM is not set
@@ -621,12 +613,6 @@ CONFIG_I2C_HELPER_AUTO=y
621# CONFIG_I2C_VIAPRO is not set 613# CONFIG_I2C_VIAPRO is not set
622 614
623# 615#
624# Mac SMBus host controller drivers
625#
626# CONFIG_I2C_HYDRA is not set
627CONFIG_I2C_POWERMAC=y
628
629#
630# I2C system bus drivers (mostly embedded / system-on-chip) 616# I2C system bus drivers (mostly embedded / system-on-chip)
631# 617#
632CONFIG_I2C_MPC=y 618CONFIG_I2C_MPC=y
@@ -662,6 +648,7 @@ CONFIG_I2C_MPC=y
662# CONFIG_SENSORS_PCF8591 is not set 648# CONFIG_SENSORS_PCF8591 is not set
663# CONFIG_SENSORS_MAX6875 is not set 649# CONFIG_SENSORS_MAX6875 is not set
664# CONFIG_SENSORS_TSL2550 is not set 650# CONFIG_SENSORS_TSL2550 is not set
651# CONFIG_MCU_MPC8349EMITX is not set
665# CONFIG_I2C_DEBUG_CORE is not set 652# CONFIG_I2C_DEBUG_CORE is not set
666# CONFIG_I2C_DEBUG_ALGO is not set 653# CONFIG_I2C_DEBUG_ALGO is not set
667# CONFIG_I2C_DEBUG_BUS is not set 654# CONFIG_I2C_DEBUG_BUS is not set
@@ -683,7 +670,6 @@ CONFIG_HWMON=y
683# CONFIG_SENSORS_ADM9240 is not set 670# CONFIG_SENSORS_ADM9240 is not set
684# CONFIG_SENSORS_ADT7470 is not set 671# CONFIG_SENSORS_ADT7470 is not set
685# CONFIG_SENSORS_ADT7473 is not set 672# CONFIG_SENSORS_ADT7473 is not set
686# CONFIG_SENSORS_AMS is not set
687# CONFIG_SENSORS_ATXP1 is not set 673# CONFIG_SENSORS_ATXP1 is not set
688# CONFIG_SENSORS_DS1621 is not set 674# CONFIG_SENSORS_DS1621 is not set
689# CONFIG_SENSORS_I5K_AMB is not set 675# CONFIG_SENSORS_I5K_AMB is not set
@@ -738,7 +724,6 @@ CONFIG_WATCHDOG=y
738# CONFIG_SOFT_WATCHDOG is not set 724# CONFIG_SOFT_WATCHDOG is not set
739# CONFIG_ALIM7101_WDT is not set 725# CONFIG_ALIM7101_WDT is not set
740# CONFIG_8xxx_WDT is not set 726# CONFIG_8xxx_WDT is not set
741# CONFIG_WATCHDOG_RTAS is not set
742 727
743# 728#
744# PCI-based Watchdog Cards 729# PCI-based Watchdog Cards
@@ -759,6 +744,17 @@ CONFIG_SSB_POSSIBLE=y
759# CONFIG_MFD_SM501 is not set 744# CONFIG_MFD_SM501 is not set
760# CONFIG_HTC_PASIC3 is not set 745# CONFIG_HTC_PASIC3 is not set
761# CONFIG_MFD_TMIO is not set 746# CONFIG_MFD_TMIO is not set
747# CONFIG_PMIC_DA903X is not set
748# CONFIG_MFD_WM8400 is not set
749# CONFIG_MFD_WM8350_I2C is not set
750
751#
752# Voltage and Current regulators
753#
754# CONFIG_REGULATOR is not set
755# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
756# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
757# CONFIG_REGULATOR_BQ24022 is not set
762 758
763# 759#
764# Multimedia devices 760# Multimedia devices
@@ -795,7 +791,14 @@ CONFIG_HID_SUPPORT=y
795CONFIG_HID=y 791CONFIG_HID=y
796# CONFIG_HID_DEBUG is not set 792# CONFIG_HID_DEBUG is not set
797# CONFIG_HIDRAW is not set 793# CONFIG_HIDRAW is not set
794# CONFIG_HID_PID is not set
795
796#
797# Special HID drivers
798#
799CONFIG_HID_COMPAT=y
798# CONFIG_USB_SUPPORT is not set 800# CONFIG_USB_SUPPORT is not set
801# CONFIG_UWB is not set
799# CONFIG_MMC is not set 802# CONFIG_MMC is not set
800# CONFIG_MEMSTICK is not set 803# CONFIG_MEMSTICK is not set
801# CONFIG_NEW_LEDS is not set 804# CONFIG_NEW_LEDS is not set
@@ -805,16 +808,18 @@ CONFIG_HID=y
805# CONFIG_RTC_CLASS is not set 808# CONFIG_RTC_CLASS is not set
806# CONFIG_DMADEVICES is not set 809# CONFIG_DMADEVICES is not set
807# CONFIG_UIO is not set 810# CONFIG_UIO is not set
811# CONFIG_STAGING is not set
808 812
809# 813#
810# File systems 814# File systems
811# 815#
812# CONFIG_EXT2_FS is not set 816# CONFIG_EXT2_FS is not set
813# CONFIG_EXT3_FS is not set 817# CONFIG_EXT3_FS is not set
814# CONFIG_EXT4DEV_FS is not set 818# CONFIG_EXT4_FS is not set
815# CONFIG_REISERFS_FS is not set 819# CONFIG_REISERFS_FS is not set
816# CONFIG_JFS_FS is not set 820# CONFIG_JFS_FS is not set
817# CONFIG_FS_POSIX_ACL is not set 821# CONFIG_FS_POSIX_ACL is not set
822CONFIG_FILE_LOCKING=y
818# CONFIG_XFS_FS is not set 823# CONFIG_XFS_FS is not set
819# CONFIG_OCFS2_FS is not set 824# CONFIG_OCFS2_FS is not set
820CONFIG_DNOTIFY=y 825CONFIG_DNOTIFY=y
@@ -844,6 +849,7 @@ CONFIG_INOTIFY_USER=y
844CONFIG_PROC_FS=y 849CONFIG_PROC_FS=y
845CONFIG_PROC_KCORE=y 850CONFIG_PROC_KCORE=y
846CONFIG_PROC_SYSCTL=y 851CONFIG_PROC_SYSCTL=y
852CONFIG_PROC_PAGE_MONITOR=y
847CONFIG_SYSFS=y 853CONFIG_SYSFS=y
848CONFIG_TMPFS=y 854CONFIG_TMPFS=y
849# CONFIG_TMPFS_POSIX_ACL is not set 855# CONFIG_TMPFS_POSIX_ACL is not set
@@ -881,6 +887,7 @@ CONFIG_LOCKD_V4=y
881CONFIG_NFS_COMMON=y 887CONFIG_NFS_COMMON=y
882CONFIG_SUNRPC=y 888CONFIG_SUNRPC=y
883CONFIG_SUNRPC_GSS=y 889CONFIG_SUNRPC_GSS=y
890# CONFIG_SUNRPC_REGISTER_V4 is not set
884CONFIG_RPCSEC_GSS_KRB5=y 891CONFIG_RPCSEC_GSS_KRB5=y
885# CONFIG_RPCSEC_GSS_SPKM3 is not set 892# CONFIG_RPCSEC_GSS_SPKM3 is not set
886# CONFIG_SMB_FS is not set 893# CONFIG_SMB_FS is not set
@@ -893,7 +900,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
893# Partition Types 900# Partition Types
894# 901#
895# CONFIG_PARTITION_ADVANCED is not set 902# CONFIG_PARTITION_ADVANCED is not set
896CONFIG_MAC_PARTITION=y
897CONFIG_MSDOS_PARTITION=y 903CONFIG_MSDOS_PARTITION=y
898# CONFIG_NLS is not set 904# CONFIG_NLS is not set
899# CONFIG_DLM is not set 905# CONFIG_DLM is not set
@@ -902,7 +908,6 @@ CONFIG_MSDOS_PARTITION=y
902# Library routines 908# Library routines
903# 909#
904CONFIG_BITREVERSE=y 910CONFIG_BITREVERSE=y
905# CONFIG_GENERIC_FIND_FIRST_BIT is not set
906# CONFIG_CRC_CCITT is not set 911# CONFIG_CRC_CCITT is not set
907# CONFIG_CRC16 is not set 912# CONFIG_CRC16 is not set
908# CONFIG_CRC_T10DIF is not set 913# CONFIG_CRC_T10DIF is not set
@@ -930,13 +935,15 @@ CONFIG_FRAME_WARN=1024
930# CONFIG_DEBUG_KERNEL is not set 935# CONFIG_DEBUG_KERNEL is not set
931# CONFIG_DEBUG_BUGVERBOSE is not set 936# CONFIG_DEBUG_BUGVERBOSE is not set
932# CONFIG_DEBUG_MEMORY_INIT is not set 937# CONFIG_DEBUG_MEMORY_INIT is not set
938# CONFIG_RCU_CPU_STALL_DETECTOR is not set
933# CONFIG_LATENCYTOP is not set 939# CONFIG_LATENCYTOP is not set
934CONFIG_SYSCTL_SYSCALL_CHECK=y 940CONFIG_SYSCTL_SYSCALL_CHECK=y
935CONFIG_HAVE_FTRACE=y 941CONFIG_HAVE_FUNCTION_TRACER=y
936CONFIG_HAVE_DYNAMIC_FTRACE=y 942
937# CONFIG_FTRACE is not set 943#
938# CONFIG_SCHED_TRACER is not set 944# Tracers
939# CONFIG_CONTEXT_SWITCH_TRACER is not set 945#
946# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
940# CONFIG_SAMPLES is not set 947# CONFIG_SAMPLES is not set
941CONFIG_HAVE_ARCH_KGDB=y 948CONFIG_HAVE_ARCH_KGDB=y
942# CONFIG_IRQSTACKS is not set 949# CONFIG_IRQSTACKS is not set
@@ -948,14 +955,19 @@ CONFIG_HAVE_ARCH_KGDB=y
948# 955#
949# CONFIG_KEYS is not set 956# CONFIG_KEYS is not set
950# CONFIG_SECURITY is not set 957# CONFIG_SECURITY is not set
958# CONFIG_SECURITYFS is not set
951# CONFIG_SECURITY_FILE_CAPABILITIES is not set 959# CONFIG_SECURITY_FILE_CAPABILITIES is not set
952CONFIG_CRYPTO=y 960CONFIG_CRYPTO=y
953 961
954# 962#
955# Crypto core or helper 963# Crypto core or helper
956# 964#
965# CONFIG_CRYPTO_FIPS is not set
957CONFIG_CRYPTO_ALGAPI=y 966CONFIG_CRYPTO_ALGAPI=y
967CONFIG_CRYPTO_AEAD=y
958CONFIG_CRYPTO_BLKCIPHER=y 968CONFIG_CRYPTO_BLKCIPHER=y
969CONFIG_CRYPTO_HASH=y
970CONFIG_CRYPTO_RNG=y
959CONFIG_CRYPTO_MANAGER=y 971CONFIG_CRYPTO_MANAGER=y
960# CONFIG_CRYPTO_GF128MUL is not set 972# CONFIG_CRYPTO_GF128MUL is not set
961# CONFIG_CRYPTO_NULL is not set 973# CONFIG_CRYPTO_NULL is not set
@@ -1028,6 +1040,11 @@ CONFIG_CRYPTO_DES=y
1028# 1040#
1029# CONFIG_CRYPTO_DEFLATE is not set 1041# CONFIG_CRYPTO_DEFLATE is not set
1030# CONFIG_CRYPTO_LZO is not set 1042# CONFIG_CRYPTO_LZO is not set
1043
1044#
1045# Random Number Generation
1046#
1047# CONFIG_CRYPTO_ANSI_CPRNG is not set
1031# CONFIG_CRYPTO_HW is not set 1048# CONFIG_CRYPTO_HW is not set
1032# CONFIG_PPC_CLOCK is not set 1049# CONFIG_PPC_CLOCK is not set
1033# CONFIG_VIRTUALIZATION is not set 1050# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig
index 8bb89f26a20d..1af7b9e37b61 100644
--- a/arch/powerpc/configs/85xx/ksi8560_defconfig
+++ b/arch/powerpc/configs/85xx/ksi8560_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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:28 2008 4# Sat Nov 8 12:40:03 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -104,6 +104,7 @@ CONFIG_SIGNALFD=y
104CONFIG_TIMERFD=y 104CONFIG_TIMERFD=y
105CONFIG_EVENTFD=y 105CONFIG_EVENTFD=y
106CONFIG_SHMEM=y 106CONFIG_SHMEM=y
107CONFIG_AIO=y
107CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_SLUB_DEBUG=y 109CONFIG_SLUB_DEBUG=y
109# CONFIG_SLAB is not set 110# CONFIG_SLAB is not set
@@ -117,10 +118,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
117CONFIG_HAVE_KPROBES=y 118CONFIG_HAVE_KPROBES=y
118CONFIG_HAVE_KRETPROBES=y 119CONFIG_HAVE_KRETPROBES=y
119CONFIG_HAVE_ARCH_TRACEHOOK=y 120CONFIG_HAVE_ARCH_TRACEHOOK=y
120# CONFIG_HAVE_DMA_ATTRS is not set
121# CONFIG_USE_GENERIC_SMP_HELPERS is not set
122CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
123CONFIG_PROC_PAGE_MONITOR=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
@@ -147,6 +145,7 @@ CONFIG_DEFAULT_AS=y
147# CONFIG_DEFAULT_NOOP is not set 145# CONFIG_DEFAULT_NOOP is not set
148CONFIG_DEFAULT_IOSCHED="anticipatory" 146CONFIG_DEFAULT_IOSCHED="anticipatory"
149CONFIG_CLASSIC_RCU=y 147CONFIG_CLASSIC_RCU=y
148# CONFIG_FREEZER is not set
150 149
151# 150#
152# Platform support 151# Platform support
@@ -181,15 +180,16 @@ CONFIG_MPIC=y
181# CONFIG_PPC_INDIRECT_IO is not set 180# CONFIG_PPC_INDIRECT_IO is not set
182# CONFIG_GENERIC_IOMAP is not set 181# CONFIG_GENERIC_IOMAP is not set
183# CONFIG_CPU_FREQ is not set 182# CONFIG_CPU_FREQ is not set
183# CONFIG_QUICC_ENGINE is not set
184CONFIG_CPM2=y 184CONFIG_CPM2=y
185# CONFIG_FSL_ULI1575 is not set 185# CONFIG_FSL_ULI1575 is not set
186CONFIG_CPM=y 186CONFIG_CPM=y
187# CONFIG_MPC8xxx_GPIO is not set
187 188
188# 189#
189# Kernel options 190# Kernel options
190# 191#
191CONFIG_HIGHMEM=y 192CONFIG_HIGHMEM=y
192# CONFIG_TICK_ONESHOT is not set
193# CONFIG_NO_HZ is not set 193# CONFIG_NO_HZ is not set
194# CONFIG_HIGH_RES_TIMERS is not set 194# CONFIG_HIGH_RES_TIMERS is not set
195CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 195CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -203,6 +203,8 @@ CONFIG_PREEMPT_NONE=y
203# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
204# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
205CONFIG_BINFMT_ELF=y 205CONFIG_BINFMT_ELF=y
206# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
207# CONFIG_HAVE_AOUT is not set
206CONFIG_BINFMT_MISC=y 208CONFIG_BINFMT_MISC=y
207CONFIG_MATH_EMULATION=y 209CONFIG_MATH_EMULATION=y
208# CONFIG_IOMMU_HELPER is not set 210# CONFIG_IOMMU_HELPER is not set
@@ -217,15 +219,15 @@ CONFIG_FLATMEM_MANUAL=y
217# CONFIG_SPARSEMEM_MANUAL is not set 219# CONFIG_SPARSEMEM_MANUAL is not set
218CONFIG_FLATMEM=y 220CONFIG_FLATMEM=y
219CONFIG_FLAT_NODE_MEM_MAP=y 221CONFIG_FLAT_NODE_MEM_MAP=y
220# CONFIG_SPARSEMEM_STATIC is not set
221# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
222CONFIG_PAGEFLAGS_EXTENDED=y 222CONFIG_PAGEFLAGS_EXTENDED=y
223CONFIG_SPLIT_PTLOCK_CPUS=4 223CONFIG_SPLIT_PTLOCK_CPUS=4
224CONFIG_MIGRATION=y 224CONFIG_MIGRATION=y
225# CONFIG_RESOURCES_64BIT is not set 225# CONFIG_RESOURCES_64BIT is not set
226# CONFIG_PHYS_ADDR_T_64BIT is not set
226CONFIG_ZONE_DMA_FLAG=1 227CONFIG_ZONE_DMA_FLAG=1
227CONFIG_BOUNCE=y 228CONFIG_BOUNCE=y
228CONFIG_VIRT_TO_BUS=y 229CONFIG_VIRT_TO_BUS=y
230CONFIG_UNEVICTABLE_LRU=y
229CONFIG_FORCE_MAX_ZONEORDER=11 231CONFIG_FORCE_MAX_ZONEORDER=11
230# CONFIG_PROC_DEVICETREE is not set 232# CONFIG_PROC_DEVICETREE is not set
231# CONFIG_CMDLINE_BOOL is not set 233# CONFIG_CMDLINE_BOOL is not set
@@ -311,6 +313,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
311# CONFIG_TIPC is not set 313# CONFIG_TIPC is not set
312# CONFIG_ATM is not set 314# CONFIG_ATM is not set
313# CONFIG_BRIDGE is not set 315# CONFIG_BRIDGE is not set
316# CONFIG_NET_DSA is not set
314# CONFIG_VLAN_8021Q is not set 317# CONFIG_VLAN_8021Q is not set
315# CONFIG_DECNET is not set 318# CONFIG_DECNET is not set
316# CONFIG_LLC2 is not set 319# CONFIG_LLC2 is not set
@@ -331,11 +334,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
331# CONFIG_IRDA is not set 334# CONFIG_IRDA is not set
332# CONFIG_BT is not set 335# CONFIG_BT is not set
333# CONFIG_AF_RXRPC is not set 336# CONFIG_AF_RXRPC is not set
334 337# CONFIG_PHONET is not set
335# 338CONFIG_WIRELESS=y
336# Wireless
337#
338# CONFIG_CFG80211 is not set 339# CONFIG_CFG80211 is not set
340CONFIG_WIRELESS_OLD_REGULATORY=y
339# CONFIG_WIRELESS_EXT is not set 341# CONFIG_WIRELESS_EXT is not set
340# CONFIG_MAC80211 is not set 342# CONFIG_MAC80211 is not set
341# CONFIG_IEEE80211 is not set 343# CONFIG_IEEE80211 is not set
@@ -454,17 +456,16 @@ CONFIG_MISC_DEVICES=y
454# CONFIG_ENCLOSURE_SERVICES is not set 456# CONFIG_ENCLOSURE_SERVICES is not set
455CONFIG_HAVE_IDE=y 457CONFIG_HAVE_IDE=y
456CONFIG_IDE=y 458CONFIG_IDE=y
457CONFIG_BLK_DEV_IDE=y
458 459
459# 460#
460# Please see Documentation/ide/ide.txt for help/info on IDE drives 461# Please see Documentation/ide/ide.txt for help/info on IDE drives
461# 462#
462# CONFIG_BLK_DEV_IDE_SATA is not set 463# CONFIG_BLK_DEV_IDE_SATA is not set
463# CONFIG_BLK_DEV_IDEDISK is not set 464CONFIG_IDE_GD=y
464# CONFIG_IDEDISK_MULTI_MODE is not set 465CONFIG_IDE_GD_ATA=y
466# CONFIG_IDE_GD_ATAPI is not set
465# CONFIG_BLK_DEV_IDECD is not set 467# CONFIG_BLK_DEV_IDECD is not set
466# CONFIG_BLK_DEV_IDETAPE is not set 468# CONFIG_BLK_DEV_IDETAPE is not set
467# CONFIG_BLK_DEV_IDEFLOPPY is not set
468# CONFIG_IDE_TASK_IOCTL is not set 469# CONFIG_IDE_TASK_IOCTL is not set
469CONFIG_IDE_PROC_FS=y 470CONFIG_IDE_PROC_FS=y
470 471
@@ -515,6 +516,9 @@ CONFIG_MII=y
515# CONFIG_IBM_NEW_EMAC_RGMII is not set 516# CONFIG_IBM_NEW_EMAC_RGMII is not set
516# CONFIG_IBM_NEW_EMAC_TAH is not set 517# CONFIG_IBM_NEW_EMAC_TAH is not set
517# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 518# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
519# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
520# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
521# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
518# CONFIG_B44 is not set 522# CONFIG_B44 is not set
519CONFIG_FS_ENET=y 523CONFIG_FS_ENET=y
520# CONFIG_FS_ENET_HAS_SCC is not set 524# CONFIG_FS_ENET_HAS_SCC is not set
@@ -590,12 +594,6 @@ CONFIG_SERIAL_CORE=y
590CONFIG_SERIAL_CORE_CONSOLE=y 594CONFIG_SERIAL_CORE_CONSOLE=y
591CONFIG_SERIAL_CPM=y 595CONFIG_SERIAL_CPM=y
592CONFIG_SERIAL_CPM_CONSOLE=y 596CONFIG_SERIAL_CPM_CONSOLE=y
593CONFIG_SERIAL_CPM_SCC1=y
594# CONFIG_SERIAL_CPM_SCC2 is not set
595# CONFIG_SERIAL_CPM_SCC3 is not set
596# CONFIG_SERIAL_CPM_SCC4 is not set
597# CONFIG_SERIAL_CPM_SMC1 is not set
598# CONFIG_SERIAL_CPM_SMC2 is not set
599CONFIG_UNIX98_PTYS=y 597CONFIG_UNIX98_PTYS=y
600CONFIG_LEGACY_PTYS=y 598CONFIG_LEGACY_PTYS=y
601CONFIG_LEGACY_PTY_COUNT=256 599CONFIG_LEGACY_PTY_COUNT=256
@@ -660,6 +658,14 @@ CONFIG_SSB_POSSIBLE=y
660# CONFIG_MFD_TMIO is not set 658# CONFIG_MFD_TMIO is not set
661 659
662# 660#
661# Voltage and Current regulators
662#
663# CONFIG_REGULATOR is not set
664# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
665# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
666# CONFIG_REGULATOR_BQ24022 is not set
667
668#
663# Multimedia devices 669# Multimedia devices
664# 670#
665 671
@@ -692,6 +698,12 @@ CONFIG_HID_SUPPORT=y
692CONFIG_HID=y 698CONFIG_HID=y
693# CONFIG_HID_DEBUG is not set 699# CONFIG_HID_DEBUG is not set
694# CONFIG_HIDRAW is not set 700# CONFIG_HIDRAW is not set
701# CONFIG_HID_PID is not set
702
703#
704# Special HID drivers
705#
706CONFIG_HID_COMPAT=y
695CONFIG_USB_SUPPORT=y 707CONFIG_USB_SUPPORT=y
696# CONFIG_USB_ARCH_HAS_HCD is not set 708# CONFIG_USB_ARCH_HAS_HCD is not set
697# CONFIG_USB_ARCH_HAS_OHCI is not set 709# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -715,6 +727,7 @@ CONFIG_USB_SUPPORT=y
715# CONFIG_RTC_CLASS is not set 727# CONFIG_RTC_CLASS is not set
716# CONFIG_DMADEVICES is not set 728# CONFIG_DMADEVICES is not set
717# CONFIG_UIO is not set 729# CONFIG_UIO is not set
730# CONFIG_STAGING is not set
718 731
719# 732#
720# File systems 733# File systems
@@ -726,13 +739,14 @@ CONFIG_EXT3_FS=y
726CONFIG_EXT3_FS_XATTR=y 739CONFIG_EXT3_FS_XATTR=y
727# CONFIG_EXT3_FS_POSIX_ACL is not set 740# CONFIG_EXT3_FS_POSIX_ACL is not set
728# CONFIG_EXT3_FS_SECURITY is not set 741# CONFIG_EXT3_FS_SECURITY is not set
729# CONFIG_EXT4DEV_FS is not set 742# CONFIG_EXT4_FS is not set
730CONFIG_JBD=y 743CONFIG_JBD=y
731# CONFIG_JBD_DEBUG is not set 744# CONFIG_JBD_DEBUG is not set
732CONFIG_FS_MBCACHE=y 745CONFIG_FS_MBCACHE=y
733# CONFIG_REISERFS_FS is not set 746# CONFIG_REISERFS_FS is not set
734# CONFIG_JFS_FS is not set 747# CONFIG_JFS_FS is not set
735# CONFIG_FS_POSIX_ACL is not set 748# CONFIG_FS_POSIX_ACL is not set
749CONFIG_FILE_LOCKING=y
736# CONFIG_XFS_FS is not set 750# CONFIG_XFS_FS is not set
737# CONFIG_OCFS2_FS is not set 751# CONFIG_OCFS2_FS is not set
738CONFIG_DNOTIFY=y 752CONFIG_DNOTIFY=y
@@ -762,6 +776,7 @@ CONFIG_INOTIFY_USER=y
762CONFIG_PROC_FS=y 776CONFIG_PROC_FS=y
763CONFIG_PROC_KCORE=y 777CONFIG_PROC_KCORE=y
764CONFIG_PROC_SYSCTL=y 778CONFIG_PROC_SYSCTL=y
779CONFIG_PROC_PAGE_MONITOR=y
765CONFIG_SYSFS=y 780CONFIG_SYSFS=y
766CONFIG_TMPFS=y 781CONFIG_TMPFS=y
767# CONFIG_TMPFS_POSIX_ACL is not set 782# CONFIG_TMPFS_POSIX_ACL is not set
@@ -797,6 +812,7 @@ CONFIG_ROOT_NFS=y
797CONFIG_LOCKD=y 812CONFIG_LOCKD=y
798CONFIG_NFS_COMMON=y 813CONFIG_NFS_COMMON=y
799CONFIG_SUNRPC=y 814CONFIG_SUNRPC=y
815# CONFIG_SUNRPC_REGISTER_V4 is not set
800# CONFIG_RPCSEC_GSS_KRB5 is not set 816# CONFIG_RPCSEC_GSS_KRB5 is not set
801# CONFIG_RPCSEC_GSS_SPKM3 is not set 817# CONFIG_RPCSEC_GSS_SPKM3 is not set
802# CONFIG_SMB_FS is not set 818# CONFIG_SMB_FS is not set
@@ -829,7 +845,6 @@ CONFIG_PARTITION_ADVANCED=y
829# Library routines 845# Library routines
830# 846#
831CONFIG_BITREVERSE=y 847CONFIG_BITREVERSE=y
832# CONFIG_GENERIC_FIND_FIRST_BIT is not set
833# CONFIG_CRC_CCITT is not set 848# CONFIG_CRC_CCITT is not set
834# CONFIG_CRC16 is not set 849# CONFIG_CRC16 is not set
835# CONFIG_CRC_T10DIF is not set 850# CONFIG_CRC_T10DIF is not set
@@ -882,15 +897,23 @@ CONFIG_DEBUG_MUTEXES=y
882# CONFIG_DEBUG_SG is not set 897# CONFIG_DEBUG_SG is not set
883# CONFIG_BOOT_PRINTK_DELAY is not set 898# CONFIG_BOOT_PRINTK_DELAY is not set
884# CONFIG_RCU_TORTURE_TEST is not set 899# CONFIG_RCU_TORTURE_TEST is not set
900# CONFIG_RCU_CPU_STALL_DETECTOR is not set
885# CONFIG_BACKTRACE_SELF_TEST is not set 901# CONFIG_BACKTRACE_SELF_TEST is not set
902# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
886# CONFIG_FAULT_INJECTION is not set 903# CONFIG_FAULT_INJECTION is not set
887# CONFIG_LATENCYTOP is not set 904# CONFIG_LATENCYTOP is not set
888CONFIG_SYSCTL_SYSCALL_CHECK=y 905CONFIG_SYSCTL_SYSCALL_CHECK=y
889CONFIG_HAVE_FTRACE=y 906CONFIG_HAVE_FUNCTION_TRACER=y
890CONFIG_HAVE_DYNAMIC_FTRACE=y 907
891# CONFIG_FTRACE is not set 908#
909# Tracers
910#
911# CONFIG_FUNCTION_TRACER is not set
892# CONFIG_SCHED_TRACER is not set 912# CONFIG_SCHED_TRACER is not set
893# CONFIG_CONTEXT_SWITCH_TRACER is not set 913# CONFIG_CONTEXT_SWITCH_TRACER is not set
914# CONFIG_BOOT_TRACER is not set
915# CONFIG_STACK_TRACER is not set
916# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
894# CONFIG_SAMPLES is not set 917# CONFIG_SAMPLES is not set
895CONFIG_HAVE_ARCH_KGDB=y 918CONFIG_HAVE_ARCH_KGDB=y
896# CONFIG_KGDB is not set 919# CONFIG_KGDB is not set
@@ -899,6 +922,7 @@ CONFIG_HAVE_ARCH_KGDB=y
899# CONFIG_DEBUG_PAGEALLOC is not set 922# CONFIG_DEBUG_PAGEALLOC is not set
900# CONFIG_CODE_PATCHING_SELFTEST is not set 923# CONFIG_CODE_PATCHING_SELFTEST is not set
901# CONFIG_FTR_FIXUP_SELFTEST is not set 924# CONFIG_FTR_FIXUP_SELFTEST is not set
925# CONFIG_MSI_BITMAP_SELFTEST is not set
902# CONFIG_XMON is not set 926# CONFIG_XMON is not set
903# CONFIG_IRQSTACKS is not set 927# CONFIG_IRQSTACKS is not set
904# CONFIG_VIRQ_DEBUG is not set 928# CONFIG_VIRQ_DEBUG is not set
@@ -910,12 +934,14 @@ CONFIG_HAVE_ARCH_KGDB=y
910# 934#
911# CONFIG_KEYS is not set 935# CONFIG_KEYS is not set
912# CONFIG_SECURITY is not set 936# CONFIG_SECURITY is not set
937# CONFIG_SECURITYFS is not set
913# CONFIG_SECURITY_FILE_CAPABILITIES is not set 938# CONFIG_SECURITY_FILE_CAPABILITIES is not set
914CONFIG_CRYPTO=y 939CONFIG_CRYPTO=y
915 940
916# 941#
917# Crypto core or helper 942# Crypto core or helper
918# 943#
944# CONFIG_CRYPTO_FIPS is not set
919# CONFIG_CRYPTO_MANAGER is not set 945# CONFIG_CRYPTO_MANAGER is not set
920# CONFIG_CRYPTO_GF128MUL is not set 946# CONFIG_CRYPTO_GF128MUL is not set
921# CONFIG_CRYPTO_NULL is not set 947# CONFIG_CRYPTO_NULL is not set
@@ -987,6 +1013,11 @@ CONFIG_CRYPTO=y
987# 1013#
988# CONFIG_CRYPTO_DEFLATE is not set 1014# CONFIG_CRYPTO_DEFLATE is not set
989# CONFIG_CRYPTO_LZO is not set 1015# CONFIG_CRYPTO_LZO is not set
1016
1017#
1018# Random Number Generation
1019#
1020# CONFIG_CRYPTO_ANSI_CPRNG is not set
990CONFIG_CRYPTO_HW=y 1021CONFIG_CRYPTO_HW=y
991# CONFIG_CRYPTO_DEV_TALITOS is not set 1022# CONFIG_CRYPTO_DEV_TALITOS is not set
992CONFIG_PPC_CLOCK=y 1023CONFIG_PPC_CLOCK=y
diff --git a/arch/powerpc/configs/85xx/mpc8536_ds_defconfig b/arch/powerpc/configs/85xx/mpc8536_ds_defconfig
index 6b516bea6e75..e243e14a6708 100644
--- a/arch/powerpc/configs/85xx/mpc8536_ds_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8536_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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 07:18:18 2008 4# Sat Nov 8 12:40:05 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -110,7 +110,9 @@ CONFIG_SIGNALFD=y
110CONFIG_TIMERFD=y 110CONFIG_TIMERFD=y
111CONFIG_EVENTFD=y 111CONFIG_EVENTFD=y
112CONFIG_SHMEM=y 112CONFIG_SHMEM=y
113CONFIG_AIO=y
113CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_PCI_QUIRKS=y
114CONFIG_SLUB_DEBUG=y 116CONFIG_SLUB_DEBUG=y
115# CONFIG_SLAB is not set 117# CONFIG_SLAB is not set
116CONFIG_SLUB=y 118CONFIG_SLUB=y
@@ -124,10 +126,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
124CONFIG_HAVE_KPROBES=y 126CONFIG_HAVE_KPROBES=y
125CONFIG_HAVE_KRETPROBES=y 127CONFIG_HAVE_KRETPROBES=y
126CONFIG_HAVE_ARCH_TRACEHOOK=y 128CONFIG_HAVE_ARCH_TRACEHOOK=y
127# CONFIG_HAVE_DMA_ATTRS is not set
128# CONFIG_USE_GENERIC_SMP_HELPERS is not set
129# CONFIG_HAVE_CLK is not set
130CONFIG_PROC_PAGE_MONITOR=y
131# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
132CONFIG_SLABINFO=y 130CONFIG_SLABINFO=y
133CONFIG_RT_MUTEXES=y 131CONFIG_RT_MUTEXES=y
@@ -160,6 +158,7 @@ CONFIG_DEFAULT_CFQ=y
160# CONFIG_DEFAULT_NOOP is not set 158# CONFIG_DEFAULT_NOOP is not set
161CONFIG_DEFAULT_IOSCHED="cfq" 159CONFIG_DEFAULT_IOSCHED="cfq"
162CONFIG_CLASSIC_RCU=y 160CONFIG_CLASSIC_RCU=y
161# CONFIG_FREEZER is not set
163 162
164# 163#
165# Platform support 164# Platform support
@@ -194,8 +193,10 @@ CONFIG_MPIC=y
194# CONFIG_PPC_INDIRECT_IO is not set 193# CONFIG_PPC_INDIRECT_IO is not set
195# CONFIG_GENERIC_IOMAP is not set 194# CONFIG_GENERIC_IOMAP is not set
196# CONFIG_CPU_FREQ is not set 195# CONFIG_CPU_FREQ is not set
196# CONFIG_QUICC_ENGINE is not set
197# CONFIG_CPM2 is not set 197# CONFIG_CPM2 is not set
198# CONFIG_FSL_ULI1575 is not set 198# CONFIG_FSL_ULI1575 is not set
199# CONFIG_MPC8xxx_GPIO is not set
199 200
200# 201#
201# Kernel options 202# Kernel options
@@ -215,6 +216,8 @@ CONFIG_PREEMPT_NONE=y
215# CONFIG_PREEMPT_VOLUNTARY is not set 216# CONFIG_PREEMPT_VOLUNTARY is not set
216# CONFIG_PREEMPT is not set 217# CONFIG_PREEMPT is not set
217CONFIG_BINFMT_ELF=y 218CONFIG_BINFMT_ELF=y
219# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
220# CONFIG_HAVE_AOUT is not set
218CONFIG_BINFMT_MISC=m 221CONFIG_BINFMT_MISC=m
219CONFIG_MATH_EMULATION=y 222CONFIG_MATH_EMULATION=y
220# CONFIG_IOMMU_HELPER is not set 223# CONFIG_IOMMU_HELPER is not set
@@ -229,15 +232,15 @@ CONFIG_FLATMEM_MANUAL=y
229# CONFIG_SPARSEMEM_MANUAL is not set 232# CONFIG_SPARSEMEM_MANUAL is not set
230CONFIG_FLATMEM=y 233CONFIG_FLATMEM=y
231CONFIG_FLAT_NODE_MEM_MAP=y 234CONFIG_FLAT_NODE_MEM_MAP=y
232# CONFIG_SPARSEMEM_STATIC is not set
233# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
234CONFIG_PAGEFLAGS_EXTENDED=y 235CONFIG_PAGEFLAGS_EXTENDED=y
235CONFIG_SPLIT_PTLOCK_CPUS=4 236CONFIG_SPLIT_PTLOCK_CPUS=4
236CONFIG_MIGRATION=y 237CONFIG_MIGRATION=y
237# CONFIG_RESOURCES_64BIT is not set 238# CONFIG_RESOURCES_64BIT is not set
239# CONFIG_PHYS_ADDR_T_64BIT is not set
238CONFIG_ZONE_DMA_FLAG=1 240CONFIG_ZONE_DMA_FLAG=1
239CONFIG_BOUNCE=y 241CONFIG_BOUNCE=y
240CONFIG_VIRT_TO_BUS=y 242CONFIG_VIRT_TO_BUS=y
243CONFIG_UNEVICTABLE_LRU=y
241CONFIG_FORCE_MAX_ZONEORDER=11 244CONFIG_FORCE_MAX_ZONEORDER=11
242CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
243# CONFIG_CMDLINE_BOOL is not set 246# CONFIG_CMDLINE_BOOL is not set
@@ -260,7 +263,7 @@ CONFIG_PCI_SYSCALL=y
260# CONFIG_PCIEPORTBUS is not set 263# CONFIG_PCIEPORTBUS is not set
261CONFIG_ARCH_SUPPORTS_MSI=y 264CONFIG_ARCH_SUPPORTS_MSI=y
262# CONFIG_PCI_MSI is not set 265# CONFIG_PCI_MSI is not set
263CONFIG_PCI_LEGACY=y 266# CONFIG_PCI_LEGACY is not set
264# CONFIG_PCI_DEBUG is not set 267# CONFIG_PCI_DEBUG is not set
265# CONFIG_PCCARD is not set 268# CONFIG_PCCARD is not set
266# CONFIG_HOTPLUG_PCI is not set 269# CONFIG_HOTPLUG_PCI is not set
@@ -362,6 +365,7 @@ CONFIG_SCTP_HMAC_MD5=y
362# CONFIG_TIPC is not set 365# CONFIG_TIPC is not set
363# CONFIG_ATM is not set 366# CONFIG_ATM is not set
364# CONFIG_BRIDGE is not set 367# CONFIG_BRIDGE is not set
368# CONFIG_NET_DSA is not set
365# CONFIG_VLAN_8021Q is not set 369# CONFIG_VLAN_8021Q is not set
366# CONFIG_DECNET is not set 370# CONFIG_DECNET is not set
367# CONFIG_LLC2 is not set 371# CONFIG_LLC2 is not set
@@ -382,12 +386,11 @@ CONFIG_SCTP_HMAC_MD5=y
382# CONFIG_IRDA is not set 386# CONFIG_IRDA is not set
383# CONFIG_BT is not set 387# CONFIG_BT is not set
384# CONFIG_AF_RXRPC is not set 388# CONFIG_AF_RXRPC is not set
389# CONFIG_PHONET is not set
385CONFIG_FIB_RULES=y 390CONFIG_FIB_RULES=y
386 391CONFIG_WIRELESS=y
387#
388# Wireless
389#
390# CONFIG_CFG80211 is not set 392# CONFIG_CFG80211 is not set
393CONFIG_WIRELESS_OLD_REGULATORY=y
391# CONFIG_WIRELESS_EXT is not set 394# CONFIG_WIRELESS_EXT is not set
392# CONFIG_MAC80211 is not set 395# CONFIG_MAC80211 is not set
393# CONFIG_IEEE80211 is not set 396# CONFIG_IEEE80211 is not set
@@ -633,8 +636,12 @@ CONFIG_MII=y
633# CONFIG_IBM_NEW_EMAC_RGMII is not set 636# CONFIG_IBM_NEW_EMAC_RGMII is not set
634# CONFIG_IBM_NEW_EMAC_TAH is not set 637# CONFIG_IBM_NEW_EMAC_TAH is not set
635# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 638# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
639# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
640# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
641# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
636# CONFIG_NET_PCI is not set 642# CONFIG_NET_PCI is not set
637# CONFIG_B44 is not set 643# CONFIG_B44 is not set
644# CONFIG_ATL2 is not set
638CONFIG_NETDEV_1000=y 645CONFIG_NETDEV_1000=y
639# CONFIG_ACENIC is not set 646# CONFIG_ACENIC is not set
640# CONFIG_DL2K is not set 647# CONFIG_DL2K is not set
@@ -658,18 +665,22 @@ CONFIG_GIANFAR=y
658# CONFIG_QLA3XXX is not set 665# CONFIG_QLA3XXX is not set
659# CONFIG_ATL1 is not set 666# CONFIG_ATL1 is not set
660# CONFIG_ATL1E is not set 667# CONFIG_ATL1E is not set
668# CONFIG_JME is not set
661CONFIG_NETDEV_10000=y 669CONFIG_NETDEV_10000=y
662# CONFIG_CHELSIO_T1 is not set 670# CONFIG_CHELSIO_T1 is not set
663# CONFIG_CHELSIO_T3 is not set 671# CONFIG_CHELSIO_T3 is not set
672# CONFIG_ENIC is not set
664# CONFIG_IXGBE is not set 673# CONFIG_IXGBE is not set
665# CONFIG_IXGB is not set 674# CONFIG_IXGB is not set
666# CONFIG_S2IO is not set 675# CONFIG_S2IO is not set
667# CONFIG_MYRI10GE is not set 676# CONFIG_MYRI10GE is not set
668# CONFIG_NETXEN_NIC is not set 677# CONFIG_NETXEN_NIC is not set
669# CONFIG_NIU is not set 678# CONFIG_NIU is not set
679# CONFIG_MLX4_EN is not set
670# CONFIG_MLX4_CORE is not set 680# CONFIG_MLX4_CORE is not set
671# CONFIG_TEHUTI is not set 681# CONFIG_TEHUTI is not set
672# CONFIG_BNX2X is not set 682# CONFIG_BNX2X is not set
683# CONFIG_QLGE is not set
673# CONFIG_SFC is not set 684# CONFIG_SFC is not set
674# CONFIG_TR is not set 685# CONFIG_TR is not set
675 686
@@ -704,7 +715,7 @@ CONFIG_NETDEV_10000=y
704# Input device support 715# Input device support
705# 716#
706CONFIG_INPUT=y 717CONFIG_INPUT=y
707# CONFIG_INPUT_FF_MEMLESS is not set 718CONFIG_INPUT_FF_MEMLESS=m
708# CONFIG_INPUT_POLLDEV is not set 719# CONFIG_INPUT_POLLDEV is not set
709 720
710# 721#
@@ -872,6 +883,17 @@ CONFIG_SSB_POSSIBLE=y
872# CONFIG_MFD_SM501 is not set 883# CONFIG_MFD_SM501 is not set
873# CONFIG_HTC_PASIC3 is not set 884# CONFIG_HTC_PASIC3 is not set
874# CONFIG_MFD_TMIO is not set 885# CONFIG_MFD_TMIO is not set
886# CONFIG_PMIC_DA903X is not set
887# CONFIG_MFD_WM8400 is not set
888# CONFIG_MFD_WM8350_I2C is not set
889
890#
891# Voltage and Current regulators
892#
893# CONFIG_REGULATOR is not set
894# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
895# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
896# CONFIG_REGULATOR_BQ24022 is not set
875 897
876# 898#
877# Multimedia devices 899# Multimedia devices
@@ -912,7 +934,6 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
912# CONFIG_DVB_USB is not set 934# CONFIG_DVB_USB is not set
913# CONFIG_DVB_TTUSB_BUDGET is not set 935# CONFIG_DVB_TTUSB_BUDGET is not set
914# CONFIG_DVB_TTUSB_DEC is not set 936# CONFIG_DVB_TTUSB_DEC is not set
915# CONFIG_DVB_CINERGYT2 is not set
916# CONFIG_DVB_SIANO_SMS1XXX is not set 937# CONFIG_DVB_SIANO_SMS1XXX is not set
917 938
918# 939#
@@ -930,6 +951,11 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
930# CONFIG_DVB_PLUTO2 is not set 951# CONFIG_DVB_PLUTO2 is not set
931 952
932# 953#
954# Supported SDMC DM1105 Adapters
955#
956# CONFIG_DVB_DM1105 is not set
957
958#
933# Supported DVB Frontends 959# Supported DVB Frontends
934# 960#
935 961
@@ -945,6 +971,8 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
945# CONFIG_DVB_CX24123 is not set 971# CONFIG_DVB_CX24123 is not set
946# CONFIG_DVB_MT312 is not set 972# CONFIG_DVB_MT312 is not set
947# CONFIG_DVB_S5H1420 is not set 973# CONFIG_DVB_S5H1420 is not set
974# CONFIG_DVB_STV0288 is not set
975# CONFIG_DVB_STB6000 is not set
948# CONFIG_DVB_STV0299 is not set 976# CONFIG_DVB_STV0299 is not set
949# CONFIG_DVB_TDA8083 is not set 977# CONFIG_DVB_TDA8083 is not set
950# CONFIG_DVB_TDA10086 is not set 978# CONFIG_DVB_TDA10086 is not set
@@ -952,6 +980,8 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
952# CONFIG_DVB_TUNER_ITD1000 is not set 980# CONFIG_DVB_TUNER_ITD1000 is not set
953# CONFIG_DVB_TDA826X is not set 981# CONFIG_DVB_TDA826X is not set
954# CONFIG_DVB_TUA6100 is not set 982# CONFIG_DVB_TUA6100 is not set
983# CONFIG_DVB_CX24116 is not set
984# CONFIG_DVB_SI21XX is not set
955 985
956# 986#
957# DVB-T (terrestrial) frontends 987# DVB-T (terrestrial) frontends
@@ -1004,6 +1034,13 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
1004# CONFIG_DVB_LNBP21 is not set 1034# CONFIG_DVB_LNBP21 is not set
1005# CONFIG_DVB_ISL6405 is not set 1035# CONFIG_DVB_ISL6405 is not set
1006# CONFIG_DVB_ISL6421 is not set 1036# CONFIG_DVB_ISL6421 is not set
1037# CONFIG_DVB_LGS8GL5 is not set
1038
1039#
1040# Tools to develop new frontends
1041#
1042# CONFIG_DVB_DUMMY_FE is not set
1043# CONFIG_DVB_AF9013 is not set
1007CONFIG_DAB=y 1044CONFIG_DAB=y
1008# CONFIG_USB_DABUSB is not set 1045# CONFIG_USB_DABUSB is not set
1009 1046
@@ -1029,6 +1066,7 @@ CONFIG_VGA_CONSOLE=y
1029# CONFIG_VGACON_SOFT_SCROLLBACK is not set 1066# CONFIG_VGACON_SOFT_SCROLLBACK is not set
1030CONFIG_DUMMY_CONSOLE=y 1067CONFIG_DUMMY_CONSOLE=y
1031CONFIG_SOUND=y 1068CONFIG_SOUND=y
1069# CONFIG_SOUND_OSS_CORE is not set
1032CONFIG_SND=y 1070CONFIG_SND=y
1033CONFIG_SND_TIMER=y 1071CONFIG_SND_TIMER=y
1034CONFIG_SND_PCM=y 1072CONFIG_SND_PCM=y
@@ -1127,9 +1165,36 @@ CONFIG_HID=y
1127# USB Input Devices 1165# USB Input Devices
1128# 1166#
1129CONFIG_USB_HID=y 1167CONFIG_USB_HID=y
1130# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1168# CONFIG_HID_PID is not set
1131# CONFIG_HID_FF is not set
1132# CONFIG_USB_HIDDEV is not set 1169# CONFIG_USB_HIDDEV is not set
1170
1171#
1172# Special HID drivers
1173#
1174CONFIG_HID_COMPAT=y
1175CONFIG_HID_A4TECH=y
1176CONFIG_HID_APPLE=y
1177CONFIG_HID_BELKIN=y
1178CONFIG_HID_BRIGHT=y
1179CONFIG_HID_CHERRY=y
1180CONFIG_HID_CHICONY=y
1181CONFIG_HID_CYPRESS=y
1182CONFIG_HID_DELL=y
1183CONFIG_HID_EZKEY=y
1184CONFIG_HID_GYRATION=y
1185CONFIG_HID_LOGITECH=y
1186# CONFIG_LOGITECH_FF is not set
1187# CONFIG_LOGIRUMBLEPAD2_FF is not set
1188CONFIG_HID_MICROSOFT=y
1189CONFIG_HID_MONTEREY=y
1190CONFIG_HID_PANTHERLORD=y
1191# CONFIG_PANTHERLORD_FF is not set
1192CONFIG_HID_PETALYNX=y
1193CONFIG_HID_SAMSUNG=y
1194CONFIG_HID_SONY=y
1195CONFIG_HID_SUNPLUS=y
1196CONFIG_THRUSTMASTER_FF=m
1197CONFIG_ZEROPLUS_FF=m
1133CONFIG_USB_SUPPORT=y 1198CONFIG_USB_SUPPORT=y
1134CONFIG_USB_ARCH_HAS_HCD=y 1199CONFIG_USB_ARCH_HAS_HCD=y
1135CONFIG_USB_ARCH_HAS_OHCI=y 1200CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1148,6 +1213,8 @@ CONFIG_USB_DEVICE_CLASS=y
1148# CONFIG_USB_OTG_WHITELIST is not set 1213# CONFIG_USB_OTG_WHITELIST is not set
1149# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1214# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1150CONFIG_USB_MON=y 1215CONFIG_USB_MON=y
1216# CONFIG_USB_WUSB is not set
1217# CONFIG_USB_WUSB_CBAF is not set
1151 1218
1152# 1219#
1153# USB Host Controller Drivers 1220# USB Host Controller Drivers
@@ -1171,6 +1238,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1171# CONFIG_USB_UHCI_HCD is not set 1238# CONFIG_USB_UHCI_HCD is not set
1172# CONFIG_USB_SL811_HCD is not set 1239# CONFIG_USB_SL811_HCD is not set
1173# CONFIG_USB_R8A66597_HCD is not set 1240# CONFIG_USB_R8A66597_HCD is not set
1241# CONFIG_USB_WHCI_HCD is not set
1242# CONFIG_USB_HWA_HCD is not set
1174 1243
1175# 1244#
1176# USB Device Class drivers 1245# USB Device Class drivers
@@ -1178,6 +1247,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1178# CONFIG_USB_ACM is not set 1247# CONFIG_USB_ACM is not set
1179# CONFIG_USB_PRINTER is not set 1248# CONFIG_USB_PRINTER is not set
1180# CONFIG_USB_WDM is not set 1249# CONFIG_USB_WDM is not set
1250# CONFIG_USB_TMC is not set
1181 1251
1182# 1252#
1183# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1253# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1199,7 +1269,6 @@ CONFIG_USB_STORAGE=y
1199# CONFIG_USB_STORAGE_ALAUDA is not set 1269# CONFIG_USB_STORAGE_ALAUDA is not set
1200# CONFIG_USB_STORAGE_ONETOUCH is not set 1270# CONFIG_USB_STORAGE_ONETOUCH is not set
1201# CONFIG_USB_STORAGE_KARMA is not set 1271# CONFIG_USB_STORAGE_KARMA is not set
1202# CONFIG_USB_STORAGE_SIERRA is not set
1203# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1272# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1204# CONFIG_USB_LIBUSUAL is not set 1273# CONFIG_USB_LIBUSUAL is not set
1205 1274
@@ -1220,6 +1289,7 @@ CONFIG_USB_STORAGE=y
1220# CONFIG_USB_EMI62 is not set 1289# CONFIG_USB_EMI62 is not set
1221# CONFIG_USB_EMI26 is not set 1290# CONFIG_USB_EMI26 is not set
1222# CONFIG_USB_ADUTUX is not set 1291# CONFIG_USB_ADUTUX is not set
1292# CONFIG_USB_SEVSEG is not set
1223# CONFIG_USB_RIO500 is not set 1293# CONFIG_USB_RIO500 is not set
1224# CONFIG_USB_LEGOTOWER is not set 1294# CONFIG_USB_LEGOTOWER is not set
1225# CONFIG_USB_LCD is not set 1295# CONFIG_USB_LCD is not set
@@ -1237,7 +1307,9 @@ CONFIG_USB_STORAGE=y
1237# CONFIG_USB_IOWARRIOR is not set 1307# CONFIG_USB_IOWARRIOR is not set
1238# CONFIG_USB_TEST is not set 1308# CONFIG_USB_TEST is not set
1239# CONFIG_USB_ISIGHTFW is not set 1309# CONFIG_USB_ISIGHTFW is not set
1310# CONFIG_USB_VST is not set
1240# CONFIG_USB_GADGET is not set 1311# CONFIG_USB_GADGET is not set
1312# CONFIG_UWB is not set
1241# CONFIG_MMC is not set 1313# CONFIG_MMC is not set
1242# CONFIG_MEMSTICK is not set 1314# CONFIG_MEMSTICK is not set
1243# CONFIG_NEW_LEDS is not set 1315# CONFIG_NEW_LEDS is not set
@@ -1283,12 +1355,15 @@ CONFIG_RTC_INTF_DEV=y
1283# Platform RTC drivers 1355# Platform RTC drivers
1284# 1356#
1285CONFIG_RTC_DRV_CMOS=y 1357CONFIG_RTC_DRV_CMOS=y
1358# CONFIG_RTC_DRV_DS1286 is not set
1286# CONFIG_RTC_DRV_DS1511 is not set 1359# CONFIG_RTC_DRV_DS1511 is not set
1287# CONFIG_RTC_DRV_DS1553 is not set 1360# CONFIG_RTC_DRV_DS1553 is not set
1288# CONFIG_RTC_DRV_DS1742 is not set 1361# CONFIG_RTC_DRV_DS1742 is not set
1289# CONFIG_RTC_DRV_STK17TA8 is not set 1362# CONFIG_RTC_DRV_STK17TA8 is not set
1290# CONFIG_RTC_DRV_M48T86 is not set 1363# CONFIG_RTC_DRV_M48T86 is not set
1364# CONFIG_RTC_DRV_M48T35 is not set
1291# CONFIG_RTC_DRV_M48T59 is not set 1365# CONFIG_RTC_DRV_M48T59 is not set
1366# CONFIG_RTC_DRV_BQ4802 is not set
1292# CONFIG_RTC_DRV_V3020 is not set 1367# CONFIG_RTC_DRV_V3020 is not set
1293 1368
1294# 1369#
@@ -1309,6 +1384,7 @@ CONFIG_DMA_ENGINE=y
1309# CONFIG_NET_DMA is not set 1384# CONFIG_NET_DMA is not set
1310# CONFIG_DMATEST is not set 1385# CONFIG_DMATEST is not set
1311# CONFIG_UIO is not set 1386# CONFIG_UIO is not set
1387# CONFIG_STAGING is not set
1312 1388
1313# 1389#
1314# File systems 1390# File systems
@@ -1320,13 +1396,14 @@ CONFIG_EXT3_FS=y
1320CONFIG_EXT3_FS_XATTR=y 1396CONFIG_EXT3_FS_XATTR=y
1321# CONFIG_EXT3_FS_POSIX_ACL is not set 1397# CONFIG_EXT3_FS_POSIX_ACL is not set
1322# CONFIG_EXT3_FS_SECURITY is not set 1398# CONFIG_EXT3_FS_SECURITY is not set
1323# CONFIG_EXT4DEV_FS is not set 1399# CONFIG_EXT4_FS is not set
1324CONFIG_JBD=y 1400CONFIG_JBD=y
1325# CONFIG_JBD_DEBUG is not set 1401# CONFIG_JBD_DEBUG is not set
1326CONFIG_FS_MBCACHE=y 1402CONFIG_FS_MBCACHE=y
1327# CONFIG_REISERFS_FS is not set 1403# CONFIG_REISERFS_FS is not set
1328# CONFIG_JFS_FS is not set 1404# CONFIG_JFS_FS is not set
1329# CONFIG_FS_POSIX_ACL is not set 1405# CONFIG_FS_POSIX_ACL is not set
1406CONFIG_FILE_LOCKING=y
1330# CONFIG_XFS_FS is not set 1407# CONFIG_XFS_FS is not set
1331# CONFIG_OCFS2_FS is not set 1408# CONFIG_OCFS2_FS is not set
1332CONFIG_DNOTIFY=y 1409CONFIG_DNOTIFY=y
@@ -1364,6 +1441,7 @@ CONFIG_NTFS_FS=y
1364CONFIG_PROC_FS=y 1441CONFIG_PROC_FS=y
1365CONFIG_PROC_KCORE=y 1442CONFIG_PROC_KCORE=y
1366CONFIG_PROC_SYSCTL=y 1443CONFIG_PROC_SYSCTL=y
1444CONFIG_PROC_PAGE_MONITOR=y
1367CONFIG_SYSFS=y 1445CONFIG_SYSFS=y
1368CONFIG_TMPFS=y 1446CONFIG_TMPFS=y
1369# CONFIG_TMPFS_POSIX_ACL is not set 1447# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1408,6 +1486,7 @@ CONFIG_EXPORTFS=y
1408CONFIG_NFS_COMMON=y 1486CONFIG_NFS_COMMON=y
1409CONFIG_SUNRPC=y 1487CONFIG_SUNRPC=y
1410CONFIG_SUNRPC_GSS=y 1488CONFIG_SUNRPC_GSS=y
1489# CONFIG_SUNRPC_REGISTER_V4 is not set
1411CONFIG_RPCSEC_GSS_KRB5=y 1490CONFIG_RPCSEC_GSS_KRB5=y
1412# CONFIG_RPCSEC_GSS_SPKM3 is not set 1491# CONFIG_RPCSEC_GSS_SPKM3 is not set
1413# CONFIG_SMB_FS is not set 1492# CONFIG_SMB_FS is not set
@@ -1483,7 +1562,6 @@ CONFIG_NLS_UTF8=m
1483# Library routines 1562# Library routines
1484# 1563#
1485CONFIG_BITREVERSE=y 1564CONFIG_BITREVERSE=y
1486# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1487# CONFIG_CRC_CCITT is not set 1565# CONFIG_CRC_CCITT is not set
1488# CONFIG_CRC16 is not set 1566# CONFIG_CRC16 is not set
1489CONFIG_CRC_T10DIF=y 1567CONFIG_CRC_T10DIF=y
@@ -1537,15 +1615,23 @@ CONFIG_DEBUG_INFO=y
1537# CONFIG_DEBUG_SG is not set 1615# CONFIG_DEBUG_SG is not set
1538# CONFIG_BOOT_PRINTK_DELAY is not set 1616# CONFIG_BOOT_PRINTK_DELAY is not set
1539# CONFIG_RCU_TORTURE_TEST is not set 1617# CONFIG_RCU_TORTURE_TEST is not set
1618# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1540# CONFIG_BACKTRACE_SELF_TEST is not set 1619# CONFIG_BACKTRACE_SELF_TEST is not set
1620# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1541# CONFIG_FAULT_INJECTION is not set 1621# CONFIG_FAULT_INJECTION is not set
1542# CONFIG_LATENCYTOP is not set 1622# CONFIG_LATENCYTOP is not set
1543CONFIG_SYSCTL_SYSCALL_CHECK=y 1623CONFIG_SYSCTL_SYSCALL_CHECK=y
1544CONFIG_HAVE_FTRACE=y 1624CONFIG_HAVE_FUNCTION_TRACER=y
1545CONFIG_HAVE_DYNAMIC_FTRACE=y 1625
1546# CONFIG_FTRACE is not set 1626#
1627# Tracers
1628#
1629# CONFIG_FUNCTION_TRACER is not set
1547# CONFIG_SCHED_TRACER is not set 1630# CONFIG_SCHED_TRACER is not set
1548# CONFIG_CONTEXT_SWITCH_TRACER is not set 1631# CONFIG_CONTEXT_SWITCH_TRACER is not set
1632# CONFIG_BOOT_TRACER is not set
1633# CONFIG_STACK_TRACER is not set
1634# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1549# CONFIG_SAMPLES is not set 1635# CONFIG_SAMPLES is not set
1550CONFIG_HAVE_ARCH_KGDB=y 1636CONFIG_HAVE_ARCH_KGDB=y
1551# CONFIG_KGDB is not set 1637# CONFIG_KGDB is not set
@@ -1554,6 +1640,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1554# CONFIG_DEBUG_PAGEALLOC is not set 1640# CONFIG_DEBUG_PAGEALLOC is not set
1555# CONFIG_CODE_PATCHING_SELFTEST is not set 1641# CONFIG_CODE_PATCHING_SELFTEST is not set
1556# CONFIG_FTR_FIXUP_SELFTEST is not set 1642# CONFIG_FTR_FIXUP_SELFTEST is not set
1643# CONFIG_MSI_BITMAP_SELFTEST is not set
1557# CONFIG_XMON is not set 1644# CONFIG_XMON is not set
1558# CONFIG_IRQSTACKS is not set 1645# CONFIG_IRQSTACKS is not set
1559# CONFIG_VIRQ_DEBUG is not set 1646# CONFIG_VIRQ_DEBUG is not set
@@ -1565,16 +1652,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1565# 1652#
1566# CONFIG_KEYS is not set 1653# CONFIG_KEYS is not set
1567# CONFIG_SECURITY is not set 1654# CONFIG_SECURITY is not set
1655# CONFIG_SECURITYFS is not set
1568# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1656# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1569CONFIG_CRYPTO=y 1657CONFIG_CRYPTO=y
1570 1658
1571# 1659#
1572# Crypto core or helper 1660# Crypto core or helper
1573# 1661#
1662# CONFIG_CRYPTO_FIPS is not set
1574CONFIG_CRYPTO_ALGAPI=y 1663CONFIG_CRYPTO_ALGAPI=y
1575CONFIG_CRYPTO_AEAD=y 1664CONFIG_CRYPTO_AEAD=y
1576CONFIG_CRYPTO_BLKCIPHER=y 1665CONFIG_CRYPTO_BLKCIPHER=y
1577CONFIG_CRYPTO_HASH=y 1666CONFIG_CRYPTO_HASH=y
1667CONFIG_CRYPTO_RNG=y
1578CONFIG_CRYPTO_MANAGER=y 1668CONFIG_CRYPTO_MANAGER=y
1579# CONFIG_CRYPTO_GF128MUL is not set 1669# CONFIG_CRYPTO_GF128MUL is not set
1580# CONFIG_CRYPTO_NULL is not set 1670# CONFIG_CRYPTO_NULL is not set
@@ -1647,6 +1737,11 @@ CONFIG_CRYPTO_DES=y
1647# 1737#
1648# CONFIG_CRYPTO_DEFLATE is not set 1738# CONFIG_CRYPTO_DEFLATE is not set
1649# CONFIG_CRYPTO_LZO is not set 1739# CONFIG_CRYPTO_LZO is not set
1740
1741#
1742# Random Number Generation
1743#
1744# CONFIG_CRYPTO_ANSI_CPRNG is not set
1650CONFIG_CRYPTO_HW=y 1745CONFIG_CRYPTO_HW=y
1651# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1746# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1652CONFIG_CRYPTO_DEV_TALITOS=y 1747CONFIG_CRYPTO_DEV_TALITOS=y
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
index 1ea181f826f1..d790cbab80b8 100644
--- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/85xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:30 2008 4# Sat Nov 8 12:40:06 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -107,6 +107,7 @@ CONFIG_SIGNALFD=y
107CONFIG_TIMERFD=y 107CONFIG_TIMERFD=y
108CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
109CONFIG_SHMEM=y 109CONFIG_SHMEM=y
110CONFIG_AIO=y
110CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_SLUB_DEBUG=y 112CONFIG_SLUB_DEBUG=y
112# CONFIG_SLAB is not set 113# CONFIG_SLAB is not set
@@ -120,10 +121,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
120CONFIG_HAVE_KPROBES=y 121CONFIG_HAVE_KPROBES=y
121CONFIG_HAVE_KRETPROBES=y 122CONFIG_HAVE_KRETPROBES=y
122CONFIG_HAVE_ARCH_TRACEHOOK=y 123CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_DMA_ATTRS is not set
124# CONFIG_USE_GENERIC_SMP_HELPERS is not set
125# CONFIG_HAVE_CLK is not set
126CONFIG_PROC_PAGE_MONITOR=y
127# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
128CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
129CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
@@ -150,6 +147,7 @@ CONFIG_DEFAULT_AS=y
150# CONFIG_DEFAULT_NOOP is not set 147# CONFIG_DEFAULT_NOOP is not set
151CONFIG_DEFAULT_IOSCHED="anticipatory" 148CONFIG_DEFAULT_IOSCHED="anticipatory"
152CONFIG_CLASSIC_RCU=y 149CONFIG_CLASSIC_RCU=y
150# CONFIG_FREEZER is not set
153 151
154# 152#
155# Platform support 153# Platform support
@@ -184,8 +182,10 @@ CONFIG_MPIC=y
184# CONFIG_PPC_INDIRECT_IO is not set 182# CONFIG_PPC_INDIRECT_IO is not set
185# CONFIG_GENERIC_IOMAP is not set 183# CONFIG_GENERIC_IOMAP is not set
186# CONFIG_CPU_FREQ is not set 184# CONFIG_CPU_FREQ is not set
185# CONFIG_QUICC_ENGINE is not set
187# CONFIG_CPM2 is not set 186# CONFIG_CPM2 is not set
188# CONFIG_FSL_ULI1575 is not set 187# CONFIG_FSL_ULI1575 is not set
188# CONFIG_MPC8xxx_GPIO is not set
189 189
190# 190#
191# Kernel options 191# Kernel options
@@ -205,6 +205,8 @@ CONFIG_PREEMPT_NONE=y
205# CONFIG_PREEMPT_VOLUNTARY is not set 205# CONFIG_PREEMPT_VOLUNTARY is not set
206# CONFIG_PREEMPT is not set 206# CONFIG_PREEMPT is not set
207CONFIG_BINFMT_ELF=y 207CONFIG_BINFMT_ELF=y
208# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
209# CONFIG_HAVE_AOUT is not set
208CONFIG_BINFMT_MISC=y 210CONFIG_BINFMT_MISC=y
209CONFIG_MATH_EMULATION=y 211CONFIG_MATH_EMULATION=y
210# CONFIG_IOMMU_HELPER is not set 212# CONFIG_IOMMU_HELPER is not set
@@ -219,15 +221,15 @@ CONFIG_FLATMEM_MANUAL=y
219# CONFIG_SPARSEMEM_MANUAL is not set 221# CONFIG_SPARSEMEM_MANUAL is not set
220CONFIG_FLATMEM=y 222CONFIG_FLATMEM=y
221CONFIG_FLAT_NODE_MEM_MAP=y 223CONFIG_FLAT_NODE_MEM_MAP=y
222# CONFIG_SPARSEMEM_STATIC is not set
223# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
224CONFIG_PAGEFLAGS_EXTENDED=y 224CONFIG_PAGEFLAGS_EXTENDED=y
225CONFIG_SPLIT_PTLOCK_CPUS=4 225CONFIG_SPLIT_PTLOCK_CPUS=4
226CONFIG_MIGRATION=y 226CONFIG_MIGRATION=y
227# CONFIG_RESOURCES_64BIT is not set 227# CONFIG_RESOURCES_64BIT is not set
228# CONFIG_PHYS_ADDR_T_64BIT is not set
228CONFIG_ZONE_DMA_FLAG=1 229CONFIG_ZONE_DMA_FLAG=1
229CONFIG_BOUNCE=y 230CONFIG_BOUNCE=y
230CONFIG_VIRT_TO_BUS=y 231CONFIG_VIRT_TO_BUS=y
232CONFIG_UNEVICTABLE_LRU=y
231CONFIG_FORCE_MAX_ZONEORDER=11 233CONFIG_FORCE_MAX_ZONEORDER=11
232CONFIG_PROC_DEVICETREE=y 234CONFIG_PROC_DEVICETREE=y
233# CONFIG_CMDLINE_BOOL is not set 235# CONFIG_CMDLINE_BOOL is not set
@@ -313,6 +315,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
313# CONFIG_TIPC is not set 315# CONFIG_TIPC is not set
314# CONFIG_ATM is not set 316# CONFIG_ATM is not set
315# CONFIG_BRIDGE is not set 317# CONFIG_BRIDGE is not set
318# CONFIG_NET_DSA is not set
316# CONFIG_VLAN_8021Q is not set 319# CONFIG_VLAN_8021Q is not set
317# CONFIG_DECNET is not set 320# CONFIG_DECNET is not set
318# CONFIG_LLC2 is not set 321# CONFIG_LLC2 is not set
@@ -333,11 +336,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
333# CONFIG_IRDA is not set 336# CONFIG_IRDA is not set
334# CONFIG_BT is not set 337# CONFIG_BT is not set
335# CONFIG_AF_RXRPC is not set 338# CONFIG_AF_RXRPC is not set
336 339# CONFIG_PHONET is not set
337# 340CONFIG_WIRELESS=y
338# Wireless
339#
340# CONFIG_CFG80211 is not set 341# CONFIG_CFG80211 is not set
342CONFIG_WIRELESS_OLD_REGULATORY=y
341# CONFIG_WIRELESS_EXT is not set 343# CONFIG_WIRELESS_EXT is not set
342# CONFIG_MAC80211 is not set 344# CONFIG_MAC80211 is not set
343# CONFIG_IEEE80211 is not set 345# CONFIG_IEEE80211 is not set
@@ -421,6 +423,9 @@ CONFIG_MII=y
421# CONFIG_IBM_NEW_EMAC_RGMII is not set 423# CONFIG_IBM_NEW_EMAC_RGMII is not set
422# CONFIG_IBM_NEW_EMAC_TAH is not set 424# CONFIG_IBM_NEW_EMAC_TAH is not set
423# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 425# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
426# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
427# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
428# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
424# CONFIG_B44 is not set 429# CONFIG_B44 is not set
425CONFIG_NETDEV_1000=y 430CONFIG_NETDEV_1000=y
426CONFIG_GIANFAR=y 431CONFIG_GIANFAR=y
@@ -545,6 +550,14 @@ CONFIG_SSB_POSSIBLE=y
545# CONFIG_MFD_TMIO is not set 550# CONFIG_MFD_TMIO is not set
546 551
547# 552#
553# Voltage and Current regulators
554#
555# CONFIG_REGULATOR is not set
556# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
557# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
558# CONFIG_REGULATOR_BQ24022 is not set
559
560#
548# Multimedia devices 561# Multimedia devices
549# 562#
550 563
@@ -577,6 +590,12 @@ CONFIG_HID_SUPPORT=y
577CONFIG_HID=y 590CONFIG_HID=y
578# CONFIG_HID_DEBUG is not set 591# CONFIG_HID_DEBUG is not set
579# CONFIG_HIDRAW is not set 592# CONFIG_HIDRAW is not set
593# CONFIG_HID_PID is not set
594
595#
596# Special HID drivers
597#
598CONFIG_HID_COMPAT=y
580CONFIG_USB_SUPPORT=y 599CONFIG_USB_SUPPORT=y
581# CONFIG_USB_ARCH_HAS_HCD is not set 600# CONFIG_USB_ARCH_HAS_HCD is not set
582# CONFIG_USB_ARCH_HAS_OHCI is not set 601# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -600,6 +619,7 @@ CONFIG_USB_SUPPORT=y
600# CONFIG_RTC_CLASS is not set 619# CONFIG_RTC_CLASS is not set
601# CONFIG_DMADEVICES is not set 620# CONFIG_DMADEVICES is not set
602# CONFIG_UIO is not set 621# CONFIG_UIO is not set
622# CONFIG_STAGING is not set
603 623
604# 624#
605# File systems 625# File systems
@@ -611,12 +631,13 @@ CONFIG_EXT3_FS=y
611CONFIG_EXT3_FS_XATTR=y 631CONFIG_EXT3_FS_XATTR=y
612# CONFIG_EXT3_FS_POSIX_ACL is not set 632# CONFIG_EXT3_FS_POSIX_ACL is not set
613# CONFIG_EXT3_FS_SECURITY is not set 633# CONFIG_EXT3_FS_SECURITY is not set
614# CONFIG_EXT4DEV_FS is not set 634# CONFIG_EXT4_FS is not set
615CONFIG_JBD=y 635CONFIG_JBD=y
616CONFIG_FS_MBCACHE=y 636CONFIG_FS_MBCACHE=y
617# CONFIG_REISERFS_FS is not set 637# CONFIG_REISERFS_FS is not set
618# CONFIG_JFS_FS is not set 638# CONFIG_JFS_FS is not set
619# CONFIG_FS_POSIX_ACL is not set 639# CONFIG_FS_POSIX_ACL is not set
640CONFIG_FILE_LOCKING=y
620# CONFIG_XFS_FS is not set 641# CONFIG_XFS_FS is not set
621# CONFIG_OCFS2_FS is not set 642# CONFIG_OCFS2_FS is not set
622CONFIG_DNOTIFY=y 643CONFIG_DNOTIFY=y
@@ -646,6 +667,7 @@ CONFIG_INOTIFY_USER=y
646CONFIG_PROC_FS=y 667CONFIG_PROC_FS=y
647CONFIG_PROC_KCORE=y 668CONFIG_PROC_KCORE=y
648CONFIG_PROC_SYSCTL=y 669CONFIG_PROC_SYSCTL=y
670CONFIG_PROC_PAGE_MONITOR=y
649CONFIG_SYSFS=y 671CONFIG_SYSFS=y
650CONFIG_TMPFS=y 672CONFIG_TMPFS=y
651# CONFIG_TMPFS_POSIX_ACL is not set 673# CONFIG_TMPFS_POSIX_ACL is not set
@@ -680,6 +702,7 @@ CONFIG_ROOT_NFS=y
680CONFIG_LOCKD=y 702CONFIG_LOCKD=y
681CONFIG_NFS_COMMON=y 703CONFIG_NFS_COMMON=y
682CONFIG_SUNRPC=y 704CONFIG_SUNRPC=y
705# CONFIG_SUNRPC_REGISTER_V4 is not set
683# CONFIG_RPCSEC_GSS_KRB5 is not set 706# CONFIG_RPCSEC_GSS_KRB5 is not set
684# CONFIG_RPCSEC_GSS_SPKM3 is not set 707# CONFIG_RPCSEC_GSS_SPKM3 is not set
685# CONFIG_SMB_FS is not set 708# CONFIG_SMB_FS is not set
@@ -712,7 +735,6 @@ CONFIG_PARTITION_ADVANCED=y
712# Library routines 735# Library routines
713# 736#
714CONFIG_BITREVERSE=y 737CONFIG_BITREVERSE=y
715# CONFIG_GENERIC_FIND_FIRST_BIT is not set
716# CONFIG_CRC_CCITT is not set 738# CONFIG_CRC_CCITT is not set
717# CONFIG_CRC16 is not set 739# CONFIG_CRC16 is not set
718# CONFIG_CRC_T10DIF is not set 740# CONFIG_CRC_T10DIF is not set
@@ -764,15 +786,23 @@ CONFIG_DEBUG_MUTEXES=y
764# CONFIG_DEBUG_SG is not set 786# CONFIG_DEBUG_SG is not set
765# CONFIG_BOOT_PRINTK_DELAY is not set 787# CONFIG_BOOT_PRINTK_DELAY is not set
766# CONFIG_RCU_TORTURE_TEST is not set 788# CONFIG_RCU_TORTURE_TEST is not set
789# CONFIG_RCU_CPU_STALL_DETECTOR is not set
767# CONFIG_BACKTRACE_SELF_TEST is not set 790# CONFIG_BACKTRACE_SELF_TEST is not set
791# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
768# CONFIG_FAULT_INJECTION is not set 792# CONFIG_FAULT_INJECTION is not set
769# CONFIG_LATENCYTOP is not set 793# CONFIG_LATENCYTOP is not set
770CONFIG_SYSCTL_SYSCALL_CHECK=y 794CONFIG_SYSCTL_SYSCALL_CHECK=y
771CONFIG_HAVE_FTRACE=y 795CONFIG_HAVE_FUNCTION_TRACER=y
772CONFIG_HAVE_DYNAMIC_FTRACE=y 796
773# CONFIG_FTRACE is not set 797#
798# Tracers
799#
800# CONFIG_FUNCTION_TRACER is not set
774# CONFIG_SCHED_TRACER is not set 801# CONFIG_SCHED_TRACER is not set
775# CONFIG_CONTEXT_SWITCH_TRACER is not set 802# CONFIG_CONTEXT_SWITCH_TRACER is not set
803# CONFIG_BOOT_TRACER is not set
804# CONFIG_STACK_TRACER is not set
805# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
776# CONFIG_SAMPLES is not set 806# CONFIG_SAMPLES is not set
777CONFIG_HAVE_ARCH_KGDB=y 807CONFIG_HAVE_ARCH_KGDB=y
778# CONFIG_KGDB is not set 808# CONFIG_KGDB is not set
@@ -781,6 +811,7 @@ CONFIG_HAVE_ARCH_KGDB=y
781# CONFIG_DEBUG_PAGEALLOC is not set 811# CONFIG_DEBUG_PAGEALLOC is not set
782# CONFIG_CODE_PATCHING_SELFTEST is not set 812# CONFIG_CODE_PATCHING_SELFTEST is not set
783# CONFIG_FTR_FIXUP_SELFTEST is not set 813# CONFIG_FTR_FIXUP_SELFTEST is not set
814# CONFIG_MSI_BITMAP_SELFTEST is not set
784# CONFIG_XMON is not set 815# CONFIG_XMON is not set
785# CONFIG_IRQSTACKS is not set 816# CONFIG_IRQSTACKS is not set
786# CONFIG_BDI_SWITCH is not set 817# CONFIG_BDI_SWITCH is not set
@@ -791,12 +822,14 @@ CONFIG_HAVE_ARCH_KGDB=y
791# 822#
792# CONFIG_KEYS is not set 823# CONFIG_KEYS is not set
793# CONFIG_SECURITY is not set 824# CONFIG_SECURITY is not set
825# CONFIG_SECURITYFS is not set
794# CONFIG_SECURITY_FILE_CAPABILITIES is not set 826# CONFIG_SECURITY_FILE_CAPABILITIES is not set
795CONFIG_CRYPTO=y 827CONFIG_CRYPTO=y
796 828
797# 829#
798# Crypto core or helper 830# Crypto core or helper
799# 831#
832# CONFIG_CRYPTO_FIPS is not set
800# CONFIG_CRYPTO_MANAGER is not set 833# CONFIG_CRYPTO_MANAGER is not set
801# CONFIG_CRYPTO_GF128MUL is not set 834# CONFIG_CRYPTO_GF128MUL is not set
802# CONFIG_CRYPTO_NULL is not set 835# CONFIG_CRYPTO_NULL is not set
@@ -868,6 +901,11 @@ CONFIG_CRYPTO=y
868# 901#
869# CONFIG_CRYPTO_DEFLATE is not set 902# CONFIG_CRYPTO_DEFLATE is not set
870# CONFIG_CRYPTO_LZO is not set 903# CONFIG_CRYPTO_LZO is not set
904
905#
906# Random Number Generation
907#
908# CONFIG_CRYPTO_ANSI_CPRNG is not set
871CONFIG_CRYPTO_HW=y 909CONFIG_CRYPTO_HW=y
872# CONFIG_CRYPTO_DEV_TALITOS is not set 910# CONFIG_CRYPTO_DEV_TALITOS is not set
873# CONFIG_PPC_CLOCK is not set 911# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
index 1aecdeab9841..f6cb01495ea6 100644
--- a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
+++ b/arch/powerpc/configs/85xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 07:20:43 2008 4# Sat Nov 8 12:40:08 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -110,7 +110,9 @@ CONFIG_SIGNALFD=y
110CONFIG_TIMERFD=y 110CONFIG_TIMERFD=y
111CONFIG_EVENTFD=y 111CONFIG_EVENTFD=y
112CONFIG_SHMEM=y 112CONFIG_SHMEM=y
113CONFIG_AIO=y
113CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_PCI_QUIRKS=y
114CONFIG_SLUB_DEBUG=y 116CONFIG_SLUB_DEBUG=y
115# CONFIG_SLAB is not set 117# CONFIG_SLAB is not set
116CONFIG_SLUB=y 118CONFIG_SLUB=y
@@ -124,10 +126,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
124CONFIG_HAVE_KPROBES=y 126CONFIG_HAVE_KPROBES=y
125CONFIG_HAVE_KRETPROBES=y 127CONFIG_HAVE_KRETPROBES=y
126CONFIG_HAVE_ARCH_TRACEHOOK=y 128CONFIG_HAVE_ARCH_TRACEHOOK=y
127# CONFIG_HAVE_DMA_ATTRS is not set
128# CONFIG_USE_GENERIC_SMP_HELPERS is not set
129# CONFIG_HAVE_CLK is not set
130CONFIG_PROC_PAGE_MONITOR=y
131# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
132CONFIG_SLABINFO=y 130CONFIG_SLABINFO=y
133CONFIG_RT_MUTEXES=y 131CONFIG_RT_MUTEXES=y
@@ -160,6 +158,7 @@ CONFIG_DEFAULT_CFQ=y
160# CONFIG_DEFAULT_NOOP is not set 158# CONFIG_DEFAULT_NOOP is not set
161CONFIG_DEFAULT_IOSCHED="cfq" 159CONFIG_DEFAULT_IOSCHED="cfq"
162CONFIG_CLASSIC_RCU=y 160CONFIG_CLASSIC_RCU=y
161# CONFIG_FREEZER is not set
163 162
164# 163#
165# Platform support 164# Platform support
@@ -194,8 +193,10 @@ CONFIG_PPC_I8259=y
194# CONFIG_PPC_INDIRECT_IO is not set 193# CONFIG_PPC_INDIRECT_IO is not set
195# CONFIG_GENERIC_IOMAP is not set 194# CONFIG_GENERIC_IOMAP is not set
196# CONFIG_CPU_FREQ is not set 195# CONFIG_CPU_FREQ is not set
196# CONFIG_QUICC_ENGINE is not set
197# CONFIG_CPM2 is not set 197# CONFIG_CPM2 is not set
198CONFIG_FSL_ULI1575=y 198CONFIG_FSL_ULI1575=y
199# CONFIG_MPC8xxx_GPIO is not set
199 200
200# 201#
201# Kernel options 202# Kernel options
@@ -215,6 +216,8 @@ CONFIG_PREEMPT_NONE=y
215# CONFIG_PREEMPT_VOLUNTARY is not set 216# CONFIG_PREEMPT_VOLUNTARY is not set
216# CONFIG_PREEMPT is not set 217# CONFIG_PREEMPT is not set
217CONFIG_BINFMT_ELF=y 218CONFIG_BINFMT_ELF=y
219# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
220# CONFIG_HAVE_AOUT is not set
218CONFIG_BINFMT_MISC=m 221CONFIG_BINFMT_MISC=m
219CONFIG_MATH_EMULATION=y 222CONFIG_MATH_EMULATION=y
220# CONFIG_IOMMU_HELPER is not set 223# CONFIG_IOMMU_HELPER is not set
@@ -229,15 +232,15 @@ CONFIG_FLATMEM_MANUAL=y
229# CONFIG_SPARSEMEM_MANUAL is not set 232# CONFIG_SPARSEMEM_MANUAL is not set
230CONFIG_FLATMEM=y 233CONFIG_FLATMEM=y
231CONFIG_FLAT_NODE_MEM_MAP=y 234CONFIG_FLAT_NODE_MEM_MAP=y
232# CONFIG_SPARSEMEM_STATIC is not set
233# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
234CONFIG_PAGEFLAGS_EXTENDED=y 235CONFIG_PAGEFLAGS_EXTENDED=y
235CONFIG_SPLIT_PTLOCK_CPUS=4 236CONFIG_SPLIT_PTLOCK_CPUS=4
236CONFIG_MIGRATION=y 237CONFIG_MIGRATION=y
237# CONFIG_RESOURCES_64BIT is not set 238# CONFIG_RESOURCES_64BIT is not set
239# CONFIG_PHYS_ADDR_T_64BIT is not set
238CONFIG_ZONE_DMA_FLAG=1 240CONFIG_ZONE_DMA_FLAG=1
239CONFIG_BOUNCE=y 241CONFIG_BOUNCE=y
240CONFIG_VIRT_TO_BUS=y 242CONFIG_VIRT_TO_BUS=y
243CONFIG_UNEVICTABLE_LRU=y
241CONFIG_FORCE_MAX_ZONEORDER=11 244CONFIG_FORCE_MAX_ZONEORDER=11
242CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
243# CONFIG_CMDLINE_BOOL is not set 246# CONFIG_CMDLINE_BOOL is not set
@@ -261,7 +264,7 @@ CONFIG_PCI_SYSCALL=y
261# CONFIG_PCIEPORTBUS is not set 264# CONFIG_PCIEPORTBUS is not set
262CONFIG_ARCH_SUPPORTS_MSI=y 265CONFIG_ARCH_SUPPORTS_MSI=y
263# CONFIG_PCI_MSI is not set 266# CONFIG_PCI_MSI is not set
264CONFIG_PCI_LEGACY=y 267# CONFIG_PCI_LEGACY is not set
265# CONFIG_PCI_DEBUG is not set 268# CONFIG_PCI_DEBUG is not set
266# CONFIG_PCCARD is not set 269# CONFIG_PCCARD is not set
267# CONFIG_HOTPLUG_PCI is not set 270# CONFIG_HOTPLUG_PCI is not set
@@ -363,6 +366,7 @@ CONFIG_SCTP_HMAC_MD5=y
363# CONFIG_TIPC is not set 366# CONFIG_TIPC is not set
364# CONFIG_ATM is not set 367# CONFIG_ATM is not set
365# CONFIG_BRIDGE is not set 368# CONFIG_BRIDGE is not set
369# CONFIG_NET_DSA is not set
366# CONFIG_VLAN_8021Q is not set 370# CONFIG_VLAN_8021Q is not set
367# CONFIG_DECNET is not set 371# CONFIG_DECNET is not set
368# CONFIG_LLC2 is not set 372# CONFIG_LLC2 is not set
@@ -383,12 +387,11 @@ CONFIG_SCTP_HMAC_MD5=y
383# CONFIG_IRDA is not set 387# CONFIG_IRDA is not set
384# CONFIG_BT is not set 388# CONFIG_BT is not set
385# CONFIG_AF_RXRPC is not set 389# CONFIG_AF_RXRPC is not set
390# CONFIG_PHONET is not set
386CONFIG_FIB_RULES=y 391CONFIG_FIB_RULES=y
387 392CONFIG_WIRELESS=y
388#
389# Wireless
390#
391# CONFIG_CFG80211 is not set 393# CONFIG_CFG80211 is not set
394CONFIG_WIRELESS_OLD_REGULATORY=y
392# CONFIG_WIRELESS_EXT is not set 395# CONFIG_WIRELESS_EXT is not set
393# CONFIG_MAC80211 is not set 396# CONFIG_MAC80211 is not set
394# CONFIG_IEEE80211 is not set 397# CONFIG_IEEE80211 is not set
@@ -634,8 +637,12 @@ CONFIG_MII=y
634# CONFIG_IBM_NEW_EMAC_RGMII is not set 637# CONFIG_IBM_NEW_EMAC_RGMII is not set
635# CONFIG_IBM_NEW_EMAC_TAH is not set 638# CONFIG_IBM_NEW_EMAC_TAH is not set
636# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 639# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
640# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
641# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
642# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
637# CONFIG_NET_PCI is not set 643# CONFIG_NET_PCI is not set
638# CONFIG_B44 is not set 644# CONFIG_B44 is not set
645# CONFIG_ATL2 is not set
639CONFIG_NETDEV_1000=y 646CONFIG_NETDEV_1000=y
640# CONFIG_ACENIC is not set 647# CONFIG_ACENIC is not set
641# CONFIG_DL2K is not set 648# CONFIG_DL2K is not set
@@ -657,18 +664,22 @@ CONFIG_GIANFAR=y
657# CONFIG_QLA3XXX is not set 664# CONFIG_QLA3XXX is not set
658# CONFIG_ATL1 is not set 665# CONFIG_ATL1 is not set
659# CONFIG_ATL1E is not set 666# CONFIG_ATL1E is not set
667# CONFIG_JME is not set
660CONFIG_NETDEV_10000=y 668CONFIG_NETDEV_10000=y
661# CONFIG_CHELSIO_T1 is not set 669# CONFIG_CHELSIO_T1 is not set
662# CONFIG_CHELSIO_T3 is not set 670# CONFIG_CHELSIO_T3 is not set
671# CONFIG_ENIC is not set
663# CONFIG_IXGBE is not set 672# CONFIG_IXGBE is not set
664# CONFIG_IXGB is not set 673# CONFIG_IXGB is not set
665# CONFIG_S2IO is not set 674# CONFIG_S2IO is not set
666# CONFIG_MYRI10GE is not set 675# CONFIG_MYRI10GE is not set
667# CONFIG_NETXEN_NIC is not set 676# CONFIG_NETXEN_NIC is not set
668# CONFIG_NIU is not set 677# CONFIG_NIU is not set
678# CONFIG_MLX4_EN is not set
669# CONFIG_MLX4_CORE is not set 679# CONFIG_MLX4_CORE is not set
670# CONFIG_TEHUTI is not set 680# CONFIG_TEHUTI is not set
671# CONFIG_BNX2X is not set 681# CONFIG_BNX2X is not set
682# CONFIG_QLGE is not set
672# CONFIG_SFC is not set 683# CONFIG_SFC is not set
673# CONFIG_TR is not set 684# CONFIG_TR is not set
674 685
@@ -703,7 +714,7 @@ CONFIG_NETDEV_10000=y
703# Input device support 714# Input device support
704# 715#
705CONFIG_INPUT=y 716CONFIG_INPUT=y
706# CONFIG_INPUT_FF_MEMLESS is not set 717CONFIG_INPUT_FF_MEMLESS=m
707# CONFIG_INPUT_POLLDEV is not set 718# CONFIG_INPUT_POLLDEV is not set
708 719
709# 720#
@@ -872,6 +883,17 @@ CONFIG_SSB_POSSIBLE=y
872# CONFIG_MFD_SM501 is not set 883# CONFIG_MFD_SM501 is not set
873# CONFIG_HTC_PASIC3 is not set 884# CONFIG_HTC_PASIC3 is not set
874# CONFIG_MFD_TMIO is not set 885# CONFIG_MFD_TMIO is not set
886# CONFIG_PMIC_DA903X is not set
887# CONFIG_MFD_WM8400 is not set
888# CONFIG_MFD_WM8350_I2C is not set
889
890#
891# Voltage and Current regulators
892#
893# CONFIG_REGULATOR is not set
894# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
895# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
896# CONFIG_REGULATOR_BQ24022 is not set
875 897
876# 898#
877# Multimedia devices 899# Multimedia devices
@@ -912,7 +934,6 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
912# CONFIG_DVB_USB is not set 934# CONFIG_DVB_USB is not set
913# CONFIG_DVB_TTUSB_BUDGET is not set 935# CONFIG_DVB_TTUSB_BUDGET is not set
914# CONFIG_DVB_TTUSB_DEC is not set 936# CONFIG_DVB_TTUSB_DEC is not set
915# CONFIG_DVB_CINERGYT2 is not set
916# CONFIG_DVB_SIANO_SMS1XXX is not set 937# CONFIG_DVB_SIANO_SMS1XXX is not set
917 938
918# 939#
@@ -930,6 +951,11 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
930# CONFIG_DVB_PLUTO2 is not set 951# CONFIG_DVB_PLUTO2 is not set
931 952
932# 953#
954# Supported SDMC DM1105 Adapters
955#
956# CONFIG_DVB_DM1105 is not set
957
958#
933# Supported DVB Frontends 959# Supported DVB Frontends
934# 960#
935 961
@@ -945,6 +971,8 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
945# CONFIG_DVB_CX24123 is not set 971# CONFIG_DVB_CX24123 is not set
946# CONFIG_DVB_MT312 is not set 972# CONFIG_DVB_MT312 is not set
947# CONFIG_DVB_S5H1420 is not set 973# CONFIG_DVB_S5H1420 is not set
974# CONFIG_DVB_STV0288 is not set
975# CONFIG_DVB_STB6000 is not set
948# CONFIG_DVB_STV0299 is not set 976# CONFIG_DVB_STV0299 is not set
949# CONFIG_DVB_TDA8083 is not set 977# CONFIG_DVB_TDA8083 is not set
950# CONFIG_DVB_TDA10086 is not set 978# CONFIG_DVB_TDA10086 is not set
@@ -952,6 +980,8 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
952# CONFIG_DVB_TUNER_ITD1000 is not set 980# CONFIG_DVB_TUNER_ITD1000 is not set
953# CONFIG_DVB_TDA826X is not set 981# CONFIG_DVB_TDA826X is not set
954# CONFIG_DVB_TUA6100 is not set 982# CONFIG_DVB_TUA6100 is not set
983# CONFIG_DVB_CX24116 is not set
984# CONFIG_DVB_SI21XX is not set
955 985
956# 986#
957# DVB-T (terrestrial) frontends 987# DVB-T (terrestrial) frontends
@@ -1004,6 +1034,13 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
1004# CONFIG_DVB_LNBP21 is not set 1034# CONFIG_DVB_LNBP21 is not set
1005# CONFIG_DVB_ISL6405 is not set 1035# CONFIG_DVB_ISL6405 is not set
1006# CONFIG_DVB_ISL6421 is not set 1036# CONFIG_DVB_ISL6421 is not set
1037# CONFIG_DVB_LGS8GL5 is not set
1038
1039#
1040# Tools to develop new frontends
1041#
1042# CONFIG_DVB_DUMMY_FE is not set
1043# CONFIG_DVB_AF9013 is not set
1007CONFIG_DAB=y 1044CONFIG_DAB=y
1008# CONFIG_USB_DABUSB is not set 1045# CONFIG_USB_DABUSB is not set
1009 1046
@@ -1029,6 +1066,7 @@ CONFIG_VGA_CONSOLE=y
1029# CONFIG_VGACON_SOFT_SCROLLBACK is not set 1066# CONFIG_VGACON_SOFT_SCROLLBACK is not set
1030CONFIG_DUMMY_CONSOLE=y 1067CONFIG_DUMMY_CONSOLE=y
1031CONFIG_SOUND=y 1068CONFIG_SOUND=y
1069CONFIG_SOUND_OSS_CORE=y
1032CONFIG_SND=y 1070CONFIG_SND=y
1033CONFIG_SND_TIMER=y 1071CONFIG_SND_TIMER=y
1034CONFIG_SND_PCM=y 1072CONFIG_SND_PCM=y
@@ -1129,9 +1167,36 @@ CONFIG_HID=y
1129# USB Input Devices 1167# USB Input Devices
1130# 1168#
1131CONFIG_USB_HID=y 1169CONFIG_USB_HID=y
1132# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1170# CONFIG_HID_PID is not set
1133# CONFIG_HID_FF is not set
1134# CONFIG_USB_HIDDEV is not set 1171# CONFIG_USB_HIDDEV is not set
1172
1173#
1174# Special HID drivers
1175#
1176CONFIG_HID_COMPAT=y
1177CONFIG_HID_A4TECH=y
1178CONFIG_HID_APPLE=y
1179CONFIG_HID_BELKIN=y
1180CONFIG_HID_BRIGHT=y
1181CONFIG_HID_CHERRY=y
1182CONFIG_HID_CHICONY=y
1183CONFIG_HID_CYPRESS=y
1184CONFIG_HID_DELL=y
1185CONFIG_HID_EZKEY=y
1186CONFIG_HID_GYRATION=y
1187CONFIG_HID_LOGITECH=y
1188# CONFIG_LOGITECH_FF is not set
1189# CONFIG_LOGIRUMBLEPAD2_FF is not set
1190CONFIG_HID_MICROSOFT=y
1191CONFIG_HID_MONTEREY=y
1192CONFIG_HID_PANTHERLORD=y
1193# CONFIG_PANTHERLORD_FF is not set
1194CONFIG_HID_PETALYNX=y
1195CONFIG_HID_SAMSUNG=y
1196CONFIG_HID_SONY=y
1197CONFIG_HID_SUNPLUS=y
1198CONFIG_THRUSTMASTER_FF=m
1199CONFIG_ZEROPLUS_FF=m
1135CONFIG_USB_SUPPORT=y 1200CONFIG_USB_SUPPORT=y
1136CONFIG_USB_ARCH_HAS_HCD=y 1201CONFIG_USB_ARCH_HAS_HCD=y
1137CONFIG_USB_ARCH_HAS_OHCI=y 1202CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1150,6 +1215,8 @@ CONFIG_USB_DEVICE_CLASS=y
1150# CONFIG_USB_OTG_WHITELIST is not set 1215# CONFIG_USB_OTG_WHITELIST is not set
1151# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1216# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1152CONFIG_USB_MON=y 1217CONFIG_USB_MON=y
1218# CONFIG_USB_WUSB is not set
1219# CONFIG_USB_WUSB_CBAF is not set
1153 1220
1154# 1221#
1155# USB Host Controller Drivers 1222# USB Host Controller Drivers
@@ -1173,6 +1240,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1173# CONFIG_USB_UHCI_HCD is not set 1240# CONFIG_USB_UHCI_HCD is not set
1174# CONFIG_USB_SL811_HCD is not set 1241# CONFIG_USB_SL811_HCD is not set
1175# CONFIG_USB_R8A66597_HCD is not set 1242# CONFIG_USB_R8A66597_HCD is not set
1243# CONFIG_USB_WHCI_HCD is not set
1244# CONFIG_USB_HWA_HCD is not set
1176 1245
1177# 1246#
1178# USB Device Class drivers 1247# USB Device Class drivers
@@ -1180,6 +1249,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1180# CONFIG_USB_ACM is not set 1249# CONFIG_USB_ACM is not set
1181# CONFIG_USB_PRINTER is not set 1250# CONFIG_USB_PRINTER is not set
1182# CONFIG_USB_WDM is not set 1251# CONFIG_USB_WDM is not set
1252# CONFIG_USB_TMC is not set
1183 1253
1184# 1254#
1185# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1255# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1201,7 +1271,6 @@ CONFIG_USB_STORAGE=y
1201# CONFIG_USB_STORAGE_ALAUDA is not set 1271# CONFIG_USB_STORAGE_ALAUDA is not set
1202# CONFIG_USB_STORAGE_ONETOUCH is not set 1272# CONFIG_USB_STORAGE_ONETOUCH is not set
1203# CONFIG_USB_STORAGE_KARMA is not set 1273# CONFIG_USB_STORAGE_KARMA is not set
1204# CONFIG_USB_STORAGE_SIERRA is not set
1205# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1274# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1206# CONFIG_USB_LIBUSUAL is not set 1275# CONFIG_USB_LIBUSUAL is not set
1207 1276
@@ -1222,6 +1291,7 @@ CONFIG_USB_STORAGE=y
1222# CONFIG_USB_EMI62 is not set 1291# CONFIG_USB_EMI62 is not set
1223# CONFIG_USB_EMI26 is not set 1292# CONFIG_USB_EMI26 is not set
1224# CONFIG_USB_ADUTUX is not set 1293# CONFIG_USB_ADUTUX is not set
1294# CONFIG_USB_SEVSEG is not set
1225# CONFIG_USB_RIO500 is not set 1295# CONFIG_USB_RIO500 is not set
1226# CONFIG_USB_LEGOTOWER is not set 1296# CONFIG_USB_LEGOTOWER is not set
1227# CONFIG_USB_LCD is not set 1297# CONFIG_USB_LCD is not set
@@ -1239,7 +1309,9 @@ CONFIG_USB_STORAGE=y
1239# CONFIG_USB_IOWARRIOR is not set 1309# CONFIG_USB_IOWARRIOR is not set
1240# CONFIG_USB_TEST is not set 1310# CONFIG_USB_TEST is not set
1241# CONFIG_USB_ISIGHTFW is not set 1311# CONFIG_USB_ISIGHTFW is not set
1312# CONFIG_USB_VST is not set
1242# CONFIG_USB_GADGET is not set 1313# CONFIG_USB_GADGET is not set
1314# CONFIG_UWB is not set
1243# CONFIG_MMC is not set 1315# CONFIG_MMC is not set
1244# CONFIG_MEMSTICK is not set 1316# CONFIG_MEMSTICK is not set
1245# CONFIG_NEW_LEDS is not set 1317# CONFIG_NEW_LEDS is not set
@@ -1285,12 +1357,15 @@ CONFIG_RTC_INTF_DEV=y
1285# Platform RTC drivers 1357# Platform RTC drivers
1286# 1358#
1287CONFIG_RTC_DRV_CMOS=y 1359CONFIG_RTC_DRV_CMOS=y
1360# CONFIG_RTC_DRV_DS1286 is not set
1288# CONFIG_RTC_DRV_DS1511 is not set 1361# CONFIG_RTC_DRV_DS1511 is not set
1289# CONFIG_RTC_DRV_DS1553 is not set 1362# CONFIG_RTC_DRV_DS1553 is not set
1290# CONFIG_RTC_DRV_DS1742 is not set 1363# CONFIG_RTC_DRV_DS1742 is not set
1291# CONFIG_RTC_DRV_STK17TA8 is not set 1364# CONFIG_RTC_DRV_STK17TA8 is not set
1292# CONFIG_RTC_DRV_M48T86 is not set 1365# CONFIG_RTC_DRV_M48T86 is not set
1366# CONFIG_RTC_DRV_M48T35 is not set
1293# CONFIG_RTC_DRV_M48T59 is not set 1367# CONFIG_RTC_DRV_M48T59 is not set
1368# CONFIG_RTC_DRV_BQ4802 is not set
1294# CONFIG_RTC_DRV_V3020 is not set 1369# CONFIG_RTC_DRV_V3020 is not set
1295 1370
1296# 1371#
@@ -1311,6 +1386,7 @@ CONFIG_DMA_ENGINE=y
1311# CONFIG_NET_DMA is not set 1386# CONFIG_NET_DMA is not set
1312# CONFIG_DMATEST is not set 1387# CONFIG_DMATEST is not set
1313# CONFIG_UIO is not set 1388# CONFIG_UIO is not set
1389# CONFIG_STAGING is not set
1314 1390
1315# 1391#
1316# File systems 1392# File systems
@@ -1322,12 +1398,13 @@ CONFIG_EXT3_FS=y
1322CONFIG_EXT3_FS_XATTR=y 1398CONFIG_EXT3_FS_XATTR=y
1323# CONFIG_EXT3_FS_POSIX_ACL is not set 1399# CONFIG_EXT3_FS_POSIX_ACL is not set
1324# CONFIG_EXT3_FS_SECURITY is not set 1400# CONFIG_EXT3_FS_SECURITY is not set
1325# CONFIG_EXT4DEV_FS is not set 1401# CONFIG_EXT4_FS is not set
1326CONFIG_JBD=y 1402CONFIG_JBD=y
1327CONFIG_FS_MBCACHE=y 1403CONFIG_FS_MBCACHE=y
1328# CONFIG_REISERFS_FS is not set 1404# CONFIG_REISERFS_FS is not set
1329# CONFIG_JFS_FS is not set 1405# CONFIG_JFS_FS is not set
1330# CONFIG_FS_POSIX_ACL is not set 1406# CONFIG_FS_POSIX_ACL is not set
1407CONFIG_FILE_LOCKING=y
1331# CONFIG_XFS_FS is not set 1408# CONFIG_XFS_FS is not set
1332# CONFIG_OCFS2_FS is not set 1409# CONFIG_OCFS2_FS is not set
1333CONFIG_DNOTIFY=y 1410CONFIG_DNOTIFY=y
@@ -1365,6 +1442,7 @@ CONFIG_NTFS_FS=y
1365CONFIG_PROC_FS=y 1442CONFIG_PROC_FS=y
1366CONFIG_PROC_KCORE=y 1443CONFIG_PROC_KCORE=y
1367CONFIG_PROC_SYSCTL=y 1444CONFIG_PROC_SYSCTL=y
1445CONFIG_PROC_PAGE_MONITOR=y
1368CONFIG_SYSFS=y 1446CONFIG_SYSFS=y
1369CONFIG_TMPFS=y 1447CONFIG_TMPFS=y
1370# CONFIG_TMPFS_POSIX_ACL is not set 1448# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1409,6 +1487,7 @@ CONFIG_EXPORTFS=y
1409CONFIG_NFS_COMMON=y 1487CONFIG_NFS_COMMON=y
1410CONFIG_SUNRPC=y 1488CONFIG_SUNRPC=y
1411CONFIG_SUNRPC_GSS=y 1489CONFIG_SUNRPC_GSS=y
1490# CONFIG_SUNRPC_REGISTER_V4 is not set
1412CONFIG_RPCSEC_GSS_KRB5=y 1491CONFIG_RPCSEC_GSS_KRB5=y
1413# CONFIG_RPCSEC_GSS_SPKM3 is not set 1492# CONFIG_RPCSEC_GSS_SPKM3 is not set
1414# CONFIG_SMB_FS is not set 1493# CONFIG_SMB_FS is not set
@@ -1484,7 +1563,6 @@ CONFIG_NLS_UTF8=m
1484# Library routines 1563# Library routines
1485# 1564#
1486CONFIG_BITREVERSE=y 1565CONFIG_BITREVERSE=y
1487# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1488# CONFIG_CRC_CCITT is not set 1566# CONFIG_CRC_CCITT is not set
1489# CONFIG_CRC16 is not set 1567# CONFIG_CRC16 is not set
1490CONFIG_CRC_T10DIF=y 1568CONFIG_CRC_T10DIF=y
@@ -1538,15 +1616,23 @@ CONFIG_DEBUG_INFO=y
1538# CONFIG_DEBUG_SG is not set 1616# CONFIG_DEBUG_SG is not set
1539# CONFIG_BOOT_PRINTK_DELAY is not set 1617# CONFIG_BOOT_PRINTK_DELAY is not set
1540# CONFIG_RCU_TORTURE_TEST is not set 1618# CONFIG_RCU_TORTURE_TEST is not set
1619# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1541# CONFIG_BACKTRACE_SELF_TEST is not set 1620# CONFIG_BACKTRACE_SELF_TEST is not set
1621# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1542# CONFIG_FAULT_INJECTION is not set 1622# CONFIG_FAULT_INJECTION is not set
1543# CONFIG_LATENCYTOP is not set 1623# CONFIG_LATENCYTOP is not set
1544CONFIG_SYSCTL_SYSCALL_CHECK=y 1624CONFIG_SYSCTL_SYSCALL_CHECK=y
1545CONFIG_HAVE_FTRACE=y 1625CONFIG_HAVE_FUNCTION_TRACER=y
1546CONFIG_HAVE_DYNAMIC_FTRACE=y 1626
1547# CONFIG_FTRACE is not set 1627#
1628# Tracers
1629#
1630# CONFIG_FUNCTION_TRACER is not set
1548# CONFIG_SCHED_TRACER is not set 1631# CONFIG_SCHED_TRACER is not set
1549# CONFIG_CONTEXT_SWITCH_TRACER is not set 1632# CONFIG_CONTEXT_SWITCH_TRACER is not set
1633# CONFIG_BOOT_TRACER is not set
1634# CONFIG_STACK_TRACER is not set
1635# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1550# CONFIG_SAMPLES is not set 1636# CONFIG_SAMPLES is not set
1551CONFIG_HAVE_ARCH_KGDB=y 1637CONFIG_HAVE_ARCH_KGDB=y
1552# CONFIG_KGDB is not set 1638# CONFIG_KGDB is not set
@@ -1555,6 +1641,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1555# CONFIG_DEBUG_PAGEALLOC is not set 1641# CONFIG_DEBUG_PAGEALLOC is not set
1556# CONFIG_CODE_PATCHING_SELFTEST is not set 1642# CONFIG_CODE_PATCHING_SELFTEST is not set
1557# CONFIG_FTR_FIXUP_SELFTEST is not set 1643# CONFIG_FTR_FIXUP_SELFTEST is not set
1644# CONFIG_MSI_BITMAP_SELFTEST is not set
1558# CONFIG_XMON is not set 1645# CONFIG_XMON is not set
1559# CONFIG_IRQSTACKS is not set 1646# CONFIG_IRQSTACKS is not set
1560# CONFIG_BDI_SWITCH is not set 1647# CONFIG_BDI_SWITCH is not set
@@ -1565,16 +1652,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1565# 1652#
1566# CONFIG_KEYS is not set 1653# CONFIG_KEYS is not set
1567# CONFIG_SECURITY is not set 1654# CONFIG_SECURITY is not set
1655# CONFIG_SECURITYFS is not set
1568# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1656# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1569CONFIG_CRYPTO=y 1657CONFIG_CRYPTO=y
1570 1658
1571# 1659#
1572# Crypto core or helper 1660# Crypto core or helper
1573# 1661#
1662# CONFIG_CRYPTO_FIPS is not set
1574CONFIG_CRYPTO_ALGAPI=y 1663CONFIG_CRYPTO_ALGAPI=y
1575CONFIG_CRYPTO_AEAD=y 1664CONFIG_CRYPTO_AEAD=y
1576CONFIG_CRYPTO_BLKCIPHER=y 1665CONFIG_CRYPTO_BLKCIPHER=y
1577CONFIG_CRYPTO_HASH=y 1666CONFIG_CRYPTO_HASH=y
1667CONFIG_CRYPTO_RNG=y
1578CONFIG_CRYPTO_MANAGER=y 1668CONFIG_CRYPTO_MANAGER=y
1579# CONFIG_CRYPTO_GF128MUL is not set 1669# CONFIG_CRYPTO_GF128MUL is not set
1580# CONFIG_CRYPTO_NULL is not set 1670# CONFIG_CRYPTO_NULL is not set
@@ -1647,6 +1737,11 @@ CONFIG_CRYPTO_DES=y
1647# 1737#
1648# CONFIG_CRYPTO_DEFLATE is not set 1738# CONFIG_CRYPTO_DEFLATE is not set
1649# CONFIG_CRYPTO_LZO is not set 1739# CONFIG_CRYPTO_LZO is not set
1740
1741#
1742# Random Number Generation
1743#
1744# CONFIG_CRYPTO_ANSI_CPRNG is not set
1650CONFIG_CRYPTO_HW=y 1745CONFIG_CRYPTO_HW=y
1651# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1746# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1652CONFIG_CRYPTO_DEV_TALITOS=y 1747CONFIG_CRYPTO_DEV_TALITOS=y
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
index 06e26d906f65..6cf929259ba7 100644
--- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
+++ b/arch/powerpc/configs/85xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:32 2008 4# Sat Nov 8 12:40:09 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -108,7 +108,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 108CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 109CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 110CONFIG_SHMEM=y
111CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 112CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 114CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 115# CONFIG_SLAB is not set
114CONFIG_SLUB=y 116CONFIG_SLUB=y
@@ -121,10 +123,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
121CONFIG_HAVE_KPROBES=y 123CONFIG_HAVE_KPROBES=y
122CONFIG_HAVE_KRETPROBES=y 124CONFIG_HAVE_KRETPROBES=y
123CONFIG_HAVE_ARCH_TRACEHOOK=y 125CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_DMA_ATTRS is not set
125# CONFIG_USE_GENERIC_SMP_HELPERS is not set
126CONFIG_HAVE_CLK=y 126CONFIG_HAVE_CLK=y
127CONFIG_PROC_PAGE_MONITOR=y
128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 127# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
129CONFIG_SLABINFO=y 128CONFIG_SLABINFO=y
130CONFIG_RT_MUTEXES=y 129CONFIG_RT_MUTEXES=y
@@ -151,6 +150,7 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 150# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 151CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 152CONFIG_CLASSIC_RCU=y
153# CONFIG_FREEZER is not set
154 154
155# 155#
156# Platform support 156# Platform support
@@ -185,15 +185,16 @@ CONFIG_MPIC=y
185# CONFIG_PPC_INDIRECT_IO is not set 185# CONFIG_PPC_INDIRECT_IO is not set
186# CONFIG_GENERIC_IOMAP is not set 186# CONFIG_GENERIC_IOMAP is not set
187# CONFIG_CPU_FREQ is not set 187# CONFIG_CPU_FREQ is not set
188# CONFIG_QUICC_ENGINE is not set
188CONFIG_CPM2=y 189CONFIG_CPM2=y
189# CONFIG_FSL_ULI1575 is not set 190# CONFIG_FSL_ULI1575 is not set
190CONFIG_CPM=y 191CONFIG_CPM=y
192# CONFIG_MPC8xxx_GPIO is not set
191 193
192# 194#
193# Kernel options 195# Kernel options
194# 196#
195# CONFIG_HIGHMEM is not set 197# CONFIG_HIGHMEM is not set
196# CONFIG_TICK_ONESHOT is not set
197# CONFIG_NO_HZ is not set 198# CONFIG_NO_HZ is not set
198# CONFIG_HIGH_RES_TIMERS is not set 199# CONFIG_HIGH_RES_TIMERS is not set
199CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 200CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -207,6 +208,8 @@ CONFIG_PREEMPT_NONE=y
207# CONFIG_PREEMPT_VOLUNTARY is not set 208# CONFIG_PREEMPT_VOLUNTARY is not set
208# CONFIG_PREEMPT is not set 209# CONFIG_PREEMPT is not set
209CONFIG_BINFMT_ELF=y 210CONFIG_BINFMT_ELF=y
211# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
212# CONFIG_HAVE_AOUT is not set
210CONFIG_BINFMT_MISC=y 213CONFIG_BINFMT_MISC=y
211CONFIG_MATH_EMULATION=y 214CONFIG_MATH_EMULATION=y
212# CONFIG_IOMMU_HELPER is not set 215# CONFIG_IOMMU_HELPER is not set
@@ -221,15 +224,15 @@ CONFIG_FLATMEM_MANUAL=y
221# CONFIG_SPARSEMEM_MANUAL is not set 224# CONFIG_SPARSEMEM_MANUAL is not set
222CONFIG_FLATMEM=y 225CONFIG_FLATMEM=y
223CONFIG_FLAT_NODE_MEM_MAP=y 226CONFIG_FLAT_NODE_MEM_MAP=y
224# CONFIG_SPARSEMEM_STATIC is not set
225# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
226CONFIG_PAGEFLAGS_EXTENDED=y 227CONFIG_PAGEFLAGS_EXTENDED=y
227CONFIG_SPLIT_PTLOCK_CPUS=4 228CONFIG_SPLIT_PTLOCK_CPUS=4
228CONFIG_MIGRATION=y 229CONFIG_MIGRATION=y
229# CONFIG_RESOURCES_64BIT is not set 230# CONFIG_RESOURCES_64BIT is not set
231# CONFIG_PHYS_ADDR_T_64BIT is not set
230CONFIG_ZONE_DMA_FLAG=1 232CONFIG_ZONE_DMA_FLAG=1
231CONFIG_BOUNCE=y 233CONFIG_BOUNCE=y
232CONFIG_VIRT_TO_BUS=y 234CONFIG_VIRT_TO_BUS=y
235CONFIG_UNEVICTABLE_LRU=y
233CONFIG_FORCE_MAX_ZONEORDER=11 236CONFIG_FORCE_MAX_ZONEORDER=11
234# CONFIG_PROC_DEVICETREE is not set 237# CONFIG_PROC_DEVICETREE is not set
235# CONFIG_CMDLINE_BOOL is not set 238# CONFIG_CMDLINE_BOOL is not set
@@ -252,7 +255,7 @@ CONFIG_PCI_SYSCALL=y
252# CONFIG_PCIEPORTBUS is not set 255# CONFIG_PCIEPORTBUS is not set
253CONFIG_ARCH_SUPPORTS_MSI=y 256CONFIG_ARCH_SUPPORTS_MSI=y
254# CONFIG_PCI_MSI is not set 257# CONFIG_PCI_MSI is not set
255CONFIG_PCI_LEGACY=y 258# CONFIG_PCI_LEGACY is not set
256CONFIG_PCI_DEBUG=y 259CONFIG_PCI_DEBUG=y
257# CONFIG_PCCARD is not set 260# CONFIG_PCCARD is not set
258# CONFIG_HOTPLUG_PCI is not set 261# CONFIG_HOTPLUG_PCI is not set
@@ -322,6 +325,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
322# CONFIG_TIPC is not set 325# CONFIG_TIPC is not set
323# CONFIG_ATM is not set 326# CONFIG_ATM is not set
324# CONFIG_BRIDGE is not set 327# CONFIG_BRIDGE is not set
328# CONFIG_NET_DSA is not set
325# CONFIG_VLAN_8021Q is not set 329# CONFIG_VLAN_8021Q is not set
326# CONFIG_DECNET is not set 330# CONFIG_DECNET is not set
327# CONFIG_LLC2 is not set 331# CONFIG_LLC2 is not set
@@ -342,11 +346,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
342# CONFIG_IRDA is not set 346# CONFIG_IRDA is not set
343# CONFIG_BT is not set 347# CONFIG_BT is not set
344# CONFIG_AF_RXRPC is not set 348# CONFIG_AF_RXRPC is not set
345 349# CONFIG_PHONET is not set
346# 350CONFIG_WIRELESS=y
347# Wireless
348#
349# CONFIG_CFG80211 is not set 351# CONFIG_CFG80211 is not set
352CONFIG_WIRELESS_OLD_REGULATORY=y
350# CONFIG_WIRELESS_EXT is not set 353# CONFIG_WIRELESS_EXT is not set
351# CONFIG_MAC80211 is not set 354# CONFIG_MAC80211 is not set
352# CONFIG_IEEE80211 is not set 355# CONFIG_IEEE80211 is not set
@@ -459,8 +462,12 @@ CONFIG_MII=y
459# CONFIG_IBM_NEW_EMAC_RGMII is not set 462# CONFIG_IBM_NEW_EMAC_RGMII is not set
460# CONFIG_IBM_NEW_EMAC_TAH is not set 463# CONFIG_IBM_NEW_EMAC_TAH is not set
461# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 464# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
465# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
466# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
467# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
462# CONFIG_NET_PCI is not set 468# CONFIG_NET_PCI is not set
463# CONFIG_B44 is not set 469# CONFIG_B44 is not set
470# CONFIG_ATL2 is not set
464CONFIG_FS_ENET=y 471CONFIG_FS_ENET=y
465# CONFIG_FS_ENET_HAS_SCC is not set 472# CONFIG_FS_ENET_HAS_SCC is not set
466CONFIG_FS_ENET_HAS_FCC=y 473CONFIG_FS_ENET_HAS_FCC=y
@@ -469,7 +476,6 @@ CONFIG_NETDEV_1000=y
469# CONFIG_ACENIC is not set 476# CONFIG_ACENIC is not set
470# CONFIG_DL2K is not set 477# CONFIG_DL2K is not set
471CONFIG_E1000=y 478CONFIG_E1000=y
472# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
473# CONFIG_E1000E is not set 479# CONFIG_E1000E is not set
474# CONFIG_IP1000 is not set 480# CONFIG_IP1000 is not set
475# CONFIG_IGB is not set 481# CONFIG_IGB is not set
@@ -487,18 +493,22 @@ CONFIG_GIANFAR=y
487# CONFIG_QLA3XXX is not set 493# CONFIG_QLA3XXX is not set
488# CONFIG_ATL1 is not set 494# CONFIG_ATL1 is not set
489# CONFIG_ATL1E is not set 495# CONFIG_ATL1E is not set
496# CONFIG_JME is not set
490CONFIG_NETDEV_10000=y 497CONFIG_NETDEV_10000=y
491# CONFIG_CHELSIO_T1 is not set 498# CONFIG_CHELSIO_T1 is not set
492# CONFIG_CHELSIO_T3 is not set 499# CONFIG_CHELSIO_T3 is not set
500# CONFIG_ENIC is not set
493# CONFIG_IXGBE is not set 501# CONFIG_IXGBE is not set
494# CONFIG_IXGB is not set 502# CONFIG_IXGB is not set
495# CONFIG_S2IO is not set 503# CONFIG_S2IO is not set
496# CONFIG_MYRI10GE is not set 504# CONFIG_MYRI10GE is not set
497# CONFIG_NETXEN_NIC is not set 505# CONFIG_NETXEN_NIC is not set
498# CONFIG_NIU is not set 506# CONFIG_NIU is not set
507# CONFIG_MLX4_EN is not set
499# CONFIG_MLX4_CORE is not set 508# CONFIG_MLX4_CORE is not set
500# CONFIG_TEHUTI is not set 509# CONFIG_TEHUTI is not set
501# CONFIG_BNX2X is not set 510# CONFIG_BNX2X is not set
511# CONFIG_QLGE is not set
502# CONFIG_SFC is not set 512# CONFIG_SFC is not set
503# CONFIG_TR is not set 513# CONFIG_TR is not set
504 514
@@ -571,12 +581,6 @@ CONFIG_SERIAL_CORE=y
571CONFIG_SERIAL_CORE_CONSOLE=y 581CONFIG_SERIAL_CORE_CONSOLE=y
572CONFIG_SERIAL_CPM=y 582CONFIG_SERIAL_CPM=y
573CONFIG_SERIAL_CPM_CONSOLE=y 583CONFIG_SERIAL_CPM_CONSOLE=y
574CONFIG_SERIAL_CPM_SCC1=y
575CONFIG_SERIAL_CPM_SCC2=y
576# CONFIG_SERIAL_CPM_SCC3 is not set
577# CONFIG_SERIAL_CPM_SCC4 is not set
578# CONFIG_SERIAL_CPM_SMC1 is not set
579# CONFIG_SERIAL_CPM_SMC2 is not set
580# CONFIG_SERIAL_JSM is not set 584# CONFIG_SERIAL_JSM is not set
581CONFIG_UNIX98_PTYS=y 585CONFIG_UNIX98_PTYS=y
582CONFIG_LEGACY_PTYS=y 586CONFIG_LEGACY_PTYS=y
@@ -649,6 +653,14 @@ CONFIG_SSB_POSSIBLE=y
649# CONFIG_MFD_TMIO is not set 653# CONFIG_MFD_TMIO is not set
650 654
651# 655#
656# Voltage and Current regulators
657#
658# CONFIG_REGULATOR is not set
659# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
660# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
661# CONFIG_REGULATOR_BQ24022 is not set
662
663#
652# Multimedia devices 664# Multimedia devices
653# 665#
654 666
@@ -683,6 +695,12 @@ CONFIG_HID_SUPPORT=y
683CONFIG_HID=y 695CONFIG_HID=y
684# CONFIG_HID_DEBUG is not set 696# CONFIG_HID_DEBUG is not set
685# CONFIG_HIDRAW is not set 697# CONFIG_HIDRAW is not set
698# CONFIG_HID_PID is not set
699
700#
701# Special HID drivers
702#
703CONFIG_HID_COMPAT=y
686CONFIG_USB_SUPPORT=y 704CONFIG_USB_SUPPORT=y
687CONFIG_USB_ARCH_HAS_HCD=y 705CONFIG_USB_ARCH_HAS_HCD=y
688CONFIG_USB_ARCH_HAS_OHCI=y 706CONFIG_USB_ARCH_HAS_OHCI=y
@@ -699,6 +717,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
699# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 717# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
700# 718#
701# CONFIG_USB_GADGET is not set 719# CONFIG_USB_GADGET is not set
720# CONFIG_UWB is not set
702# CONFIG_MMC is not set 721# CONFIG_MMC is not set
703# CONFIG_MEMSTICK is not set 722# CONFIG_MEMSTICK is not set
704# CONFIG_NEW_LEDS is not set 723# CONFIG_NEW_LEDS is not set
@@ -708,6 +727,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
708# CONFIG_RTC_CLASS is not set 727# CONFIG_RTC_CLASS is not set
709# CONFIG_DMADEVICES is not set 728# CONFIG_DMADEVICES is not set
710# CONFIG_UIO is not set 729# CONFIG_UIO is not set
730# CONFIG_STAGING is not set
711 731
712# 732#
713# File systems 733# File systems
@@ -719,12 +739,13 @@ CONFIG_EXT3_FS=y
719CONFIG_EXT3_FS_XATTR=y 739CONFIG_EXT3_FS_XATTR=y
720# CONFIG_EXT3_FS_POSIX_ACL is not set 740# CONFIG_EXT3_FS_POSIX_ACL is not set
721# CONFIG_EXT3_FS_SECURITY is not set 741# CONFIG_EXT3_FS_SECURITY is not set
722# CONFIG_EXT4DEV_FS is not set 742# CONFIG_EXT4_FS is not set
723CONFIG_JBD=y 743CONFIG_JBD=y
724CONFIG_FS_MBCACHE=y 744CONFIG_FS_MBCACHE=y
725# CONFIG_REISERFS_FS is not set 745# CONFIG_REISERFS_FS is not set
726# CONFIG_JFS_FS is not set 746# CONFIG_JFS_FS is not set
727# CONFIG_FS_POSIX_ACL is not set 747# CONFIG_FS_POSIX_ACL is not set
748CONFIG_FILE_LOCKING=y
728# CONFIG_XFS_FS is not set 749# CONFIG_XFS_FS is not set
729# CONFIG_OCFS2_FS is not set 750# CONFIG_OCFS2_FS is not set
730CONFIG_DNOTIFY=y 751CONFIG_DNOTIFY=y
@@ -754,6 +775,7 @@ CONFIG_INOTIFY_USER=y
754CONFIG_PROC_FS=y 775CONFIG_PROC_FS=y
755CONFIG_PROC_KCORE=y 776CONFIG_PROC_KCORE=y
756CONFIG_PROC_SYSCTL=y 777CONFIG_PROC_SYSCTL=y
778CONFIG_PROC_PAGE_MONITOR=y
757CONFIG_SYSFS=y 779CONFIG_SYSFS=y
758CONFIG_TMPFS=y 780CONFIG_TMPFS=y
759# CONFIG_TMPFS_POSIX_ACL is not set 781# CONFIG_TMPFS_POSIX_ACL is not set
@@ -788,6 +810,7 @@ CONFIG_ROOT_NFS=y
788CONFIG_LOCKD=y 810CONFIG_LOCKD=y
789CONFIG_NFS_COMMON=y 811CONFIG_NFS_COMMON=y
790CONFIG_SUNRPC=y 812CONFIG_SUNRPC=y
813# CONFIG_SUNRPC_REGISTER_V4 is not set
791# CONFIG_RPCSEC_GSS_KRB5 is not set 814# CONFIG_RPCSEC_GSS_KRB5 is not set
792# CONFIG_RPCSEC_GSS_SPKM3 is not set 815# CONFIG_RPCSEC_GSS_SPKM3 is not set
793# CONFIG_SMB_FS is not set 816# CONFIG_SMB_FS is not set
@@ -820,7 +843,6 @@ CONFIG_PARTITION_ADVANCED=y
820# Library routines 843# Library routines
821# 844#
822CONFIG_BITREVERSE=y 845CONFIG_BITREVERSE=y
823# CONFIG_GENERIC_FIND_FIRST_BIT is not set
824# CONFIG_CRC_CCITT is not set 846# CONFIG_CRC_CCITT is not set
825# CONFIG_CRC16 is not set 847# CONFIG_CRC16 is not set
826# CONFIG_CRC_T10DIF is not set 848# CONFIG_CRC_T10DIF is not set
@@ -872,15 +894,23 @@ CONFIG_DEBUG_MUTEXES=y
872# CONFIG_DEBUG_SG is not set 894# CONFIG_DEBUG_SG is not set
873# CONFIG_BOOT_PRINTK_DELAY is not set 895# CONFIG_BOOT_PRINTK_DELAY is not set
874# CONFIG_RCU_TORTURE_TEST is not set 896# CONFIG_RCU_TORTURE_TEST is not set
897# CONFIG_RCU_CPU_STALL_DETECTOR is not set
875# CONFIG_BACKTRACE_SELF_TEST is not set 898# CONFIG_BACKTRACE_SELF_TEST is not set
899# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
876# CONFIG_FAULT_INJECTION is not set 900# CONFIG_FAULT_INJECTION is not set
877# CONFIG_LATENCYTOP is not set 901# CONFIG_LATENCYTOP is not set
878CONFIG_SYSCTL_SYSCALL_CHECK=y 902CONFIG_SYSCTL_SYSCALL_CHECK=y
879CONFIG_HAVE_FTRACE=y 903CONFIG_HAVE_FUNCTION_TRACER=y
880CONFIG_HAVE_DYNAMIC_FTRACE=y 904
881# CONFIG_FTRACE is not set 905#
906# Tracers
907#
908# CONFIG_FUNCTION_TRACER is not set
882# CONFIG_SCHED_TRACER is not set 909# CONFIG_SCHED_TRACER is not set
883# CONFIG_CONTEXT_SWITCH_TRACER is not set 910# CONFIG_CONTEXT_SWITCH_TRACER is not set
911# CONFIG_BOOT_TRACER is not set
912# CONFIG_STACK_TRACER is not set
913# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
884# CONFIG_SAMPLES is not set 914# CONFIG_SAMPLES is not set
885CONFIG_HAVE_ARCH_KGDB=y 915CONFIG_HAVE_ARCH_KGDB=y
886# CONFIG_KGDB is not set 916# CONFIG_KGDB is not set
@@ -889,6 +919,7 @@ CONFIG_HAVE_ARCH_KGDB=y
889# CONFIG_DEBUG_PAGEALLOC is not set 919# CONFIG_DEBUG_PAGEALLOC is not set
890# CONFIG_CODE_PATCHING_SELFTEST is not set 920# CONFIG_CODE_PATCHING_SELFTEST is not set
891# CONFIG_FTR_FIXUP_SELFTEST is not set 921# CONFIG_FTR_FIXUP_SELFTEST is not set
922# CONFIG_MSI_BITMAP_SELFTEST is not set
892# CONFIG_XMON is not set 923# CONFIG_XMON is not set
893# CONFIG_IRQSTACKS is not set 924# CONFIG_IRQSTACKS is not set
894# CONFIG_BDI_SWITCH is not set 925# CONFIG_BDI_SWITCH is not set
@@ -899,12 +930,14 @@ CONFIG_HAVE_ARCH_KGDB=y
899# 930#
900# CONFIG_KEYS is not set 931# CONFIG_KEYS is not set
901# CONFIG_SECURITY is not set 932# CONFIG_SECURITY is not set
933# CONFIG_SECURITYFS is not set
902# CONFIG_SECURITY_FILE_CAPABILITIES is not set 934# CONFIG_SECURITY_FILE_CAPABILITIES is not set
903CONFIG_CRYPTO=y 935CONFIG_CRYPTO=y
904 936
905# 937#
906# Crypto core or helper 938# Crypto core or helper
907# 939#
940# CONFIG_CRYPTO_FIPS is not set
908# CONFIG_CRYPTO_MANAGER is not set 941# CONFIG_CRYPTO_MANAGER is not set
909# CONFIG_CRYPTO_GF128MUL is not set 942# CONFIG_CRYPTO_GF128MUL is not set
910# CONFIG_CRYPTO_NULL is not set 943# CONFIG_CRYPTO_NULL is not set
@@ -976,6 +1009,11 @@ CONFIG_CRYPTO=y
976# 1009#
977# CONFIG_CRYPTO_DEFLATE is not set 1010# CONFIG_CRYPTO_DEFLATE is not set
978# CONFIG_CRYPTO_LZO is not set 1011# CONFIG_CRYPTO_LZO is not set
1012
1013#
1014# Random Number Generation
1015#
1016# CONFIG_CRYPTO_ANSI_CPRNG is not set
979CONFIG_CRYPTO_HW=y 1017CONFIG_CRYPTO_HW=y
980# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1018# CONFIG_CRYPTO_DEV_HIFN_795X is not set
981# CONFIG_CRYPTO_DEV_TALITOS is not set 1019# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/85xx/mpc8568mds_defconfig b/arch/powerpc/configs/85xx/mpc8568mds_defconfig
index dc27c74955fa..597be8491812 100644
--- a/arch/powerpc/configs/85xx/mpc8568mds_defconfig
+++ b/arch/powerpc/configs/85xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:33 2008 4# Sat Nov 8 12:40:11 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -105,7 +105,9 @@ CONFIG_SIGNALFD=y
105CONFIG_TIMERFD=y 105CONFIG_TIMERFD=y
106CONFIG_EVENTFD=y 106CONFIG_EVENTFD=y
107CONFIG_SHMEM=y 107CONFIG_SHMEM=y
108CONFIG_AIO=y
108CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
110CONFIG_PCI_QUIRKS=y
109CONFIG_SLUB_DEBUG=y 111CONFIG_SLUB_DEBUG=y
110# CONFIG_SLAB is not set 112# CONFIG_SLAB is not set
111CONFIG_SLUB=y 113CONFIG_SLUB=y
@@ -118,10 +120,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
118CONFIG_HAVE_KPROBES=y 120CONFIG_HAVE_KPROBES=y
119CONFIG_HAVE_KRETPROBES=y 121CONFIG_HAVE_KRETPROBES=y
120CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
121# CONFIG_HAVE_DMA_ATTRS is not set
122# CONFIG_USE_GENERIC_SMP_HELPERS is not set
123# CONFIG_HAVE_CLK is not set
124CONFIG_PROC_PAGE_MONITOR=y
125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
126CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
127CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
@@ -154,6 +152,7 @@ CONFIG_DEFAULT_AS=y
154# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
155CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
156CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_FREEZER is not set
157 156
158# 157#
159# Platform support 158# Platform support
@@ -189,8 +188,10 @@ CONFIG_MPIC=y
189# CONFIG_GENERIC_IOMAP is not set 188# CONFIG_GENERIC_IOMAP is not set
190# CONFIG_CPU_FREQ is not set 189# CONFIG_CPU_FREQ is not set
191CONFIG_QUICC_ENGINE=y 190CONFIG_QUICC_ENGINE=y
191# CONFIG_QE_GPIO is not set
192# CONFIG_CPM2 is not set 192# CONFIG_CPM2 is not set
193# CONFIG_FSL_ULI1575 is not set 193# CONFIG_FSL_ULI1575 is not set
194# CONFIG_MPC8xxx_GPIO is not set
194 195
195# 196#
196# Kernel options 197# Kernel options
@@ -210,6 +211,8 @@ CONFIG_PREEMPT_NONE=y
210# CONFIG_PREEMPT_VOLUNTARY is not set 211# CONFIG_PREEMPT_VOLUNTARY is not set
211# CONFIG_PREEMPT is not set 212# CONFIG_PREEMPT is not set
212CONFIG_BINFMT_ELF=y 213CONFIG_BINFMT_ELF=y
214# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
215# CONFIG_HAVE_AOUT is not set
213# CONFIG_BINFMT_MISC is not set 216# CONFIG_BINFMT_MISC is not set
214CONFIG_MATH_EMULATION=y 217CONFIG_MATH_EMULATION=y
215# CONFIG_IOMMU_HELPER is not set 218# CONFIG_IOMMU_HELPER is not set
@@ -224,15 +227,15 @@ CONFIG_FLATMEM_MANUAL=y
224# CONFIG_SPARSEMEM_MANUAL is not set 227# CONFIG_SPARSEMEM_MANUAL is not set
225CONFIG_FLATMEM=y 228CONFIG_FLATMEM=y
226CONFIG_FLAT_NODE_MEM_MAP=y 229CONFIG_FLAT_NODE_MEM_MAP=y
227# CONFIG_SPARSEMEM_STATIC is not set
228# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
229CONFIG_PAGEFLAGS_EXTENDED=y 230CONFIG_PAGEFLAGS_EXTENDED=y
230CONFIG_SPLIT_PTLOCK_CPUS=4 231CONFIG_SPLIT_PTLOCK_CPUS=4
231CONFIG_MIGRATION=y 232CONFIG_MIGRATION=y
232# CONFIG_RESOURCES_64BIT is not set 233# CONFIG_RESOURCES_64BIT is not set
234# CONFIG_PHYS_ADDR_T_64BIT is not set
233CONFIG_ZONE_DMA_FLAG=1 235CONFIG_ZONE_DMA_FLAG=1
234CONFIG_BOUNCE=y 236CONFIG_BOUNCE=y
235CONFIG_VIRT_TO_BUS=y 237CONFIG_VIRT_TO_BUS=y
238CONFIG_UNEVICTABLE_LRU=y
236CONFIG_FORCE_MAX_ZONEORDER=11 239CONFIG_FORCE_MAX_ZONEORDER=11
237CONFIG_PROC_DEVICETREE=y 240CONFIG_PROC_DEVICETREE=y
238# CONFIG_CMDLINE_BOOL is not set 241# CONFIG_CMDLINE_BOOL is not set
@@ -255,7 +258,7 @@ CONFIG_PCI_SYSCALL=y
255# CONFIG_PCIEPORTBUS is not set 258# CONFIG_PCIEPORTBUS is not set
256CONFIG_ARCH_SUPPORTS_MSI=y 259CONFIG_ARCH_SUPPORTS_MSI=y
257# CONFIG_PCI_MSI is not set 260# CONFIG_PCI_MSI is not set
258CONFIG_PCI_LEGACY=y 261# CONFIG_PCI_LEGACY is not set
259# CONFIG_PCI_DEBUG is not set 262# CONFIG_PCI_DEBUG is not set
260# CONFIG_PCCARD is not set 263# CONFIG_PCCARD is not set
261# CONFIG_HOTPLUG_PCI is not set 264# CONFIG_HOTPLUG_PCI is not set
@@ -325,6 +328,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
325# CONFIG_TIPC is not set 328# CONFIG_TIPC is not set
326# CONFIG_ATM is not set 329# CONFIG_ATM is not set
327# CONFIG_BRIDGE is not set 330# CONFIG_BRIDGE is not set
331# CONFIG_NET_DSA is not set
328# CONFIG_VLAN_8021Q is not set 332# CONFIG_VLAN_8021Q is not set
329# CONFIG_DECNET is not set 333# CONFIG_DECNET is not set
330# CONFIG_LLC2 is not set 334# CONFIG_LLC2 is not set
@@ -345,11 +349,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_IRDA is not set 349# CONFIG_IRDA is not set
346# CONFIG_BT is not set 350# CONFIG_BT is not set
347# CONFIG_AF_RXRPC is not set 351# CONFIG_AF_RXRPC is not set
348 352# CONFIG_PHONET is not set
349# 353CONFIG_WIRELESS=y
350# Wireless
351#
352# CONFIG_CFG80211 is not set 354# CONFIG_CFG80211 is not set
355CONFIG_WIRELESS_OLD_REGULATORY=y
353# CONFIG_WIRELESS_EXT is not set 356# CONFIG_WIRELESS_EXT is not set
354# CONFIG_MAC80211 is not set 357# CONFIG_MAC80211 is not set
355# CONFIG_IEEE80211 is not set 358# CONFIG_IEEE80211 is not set
@@ -530,8 +533,12 @@ CONFIG_MII=y
530# CONFIG_IBM_NEW_EMAC_RGMII is not set 533# CONFIG_IBM_NEW_EMAC_RGMII is not set
531# CONFIG_IBM_NEW_EMAC_TAH is not set 534# CONFIG_IBM_NEW_EMAC_TAH is not set
532# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 535# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
536# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
537# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
538# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
533# CONFIG_NET_PCI is not set 539# CONFIG_NET_PCI is not set
534# CONFIG_B44 is not set 540# CONFIG_B44 is not set
541# CONFIG_ATL2 is not set
535CONFIG_NETDEV_1000=y 542CONFIG_NETDEV_1000=y
536# CONFIG_ACENIC is not set 543# CONFIG_ACENIC is not set
537# CONFIG_DL2K is not set 544# CONFIG_DL2K is not set
@@ -554,18 +561,22 @@ CONFIG_GIANFAR=y
554# CONFIG_QLA3XXX is not set 561# CONFIG_QLA3XXX is not set
555# CONFIG_ATL1 is not set 562# CONFIG_ATL1 is not set
556# CONFIG_ATL1E is not set 563# CONFIG_ATL1E is not set
564# CONFIG_JME is not set
557CONFIG_NETDEV_10000=y 565CONFIG_NETDEV_10000=y
558# CONFIG_CHELSIO_T1 is not set 566# CONFIG_CHELSIO_T1 is not set
559# CONFIG_CHELSIO_T3 is not set 567# CONFIG_CHELSIO_T3 is not set
568# CONFIG_ENIC is not set
560# CONFIG_IXGBE is not set 569# CONFIG_IXGBE is not set
561# CONFIG_IXGB is not set 570# CONFIG_IXGB is not set
562# CONFIG_S2IO is not set 571# CONFIG_S2IO is not set
563# CONFIG_MYRI10GE is not set 572# CONFIG_MYRI10GE is not set
564# CONFIG_NETXEN_NIC is not set 573# CONFIG_NETXEN_NIC is not set
565# CONFIG_NIU is not set 574# CONFIG_NIU is not set
575# CONFIG_MLX4_EN is not set
566# CONFIG_MLX4_CORE is not set 576# CONFIG_MLX4_CORE is not set
567# CONFIG_TEHUTI is not set 577# CONFIG_TEHUTI is not set
568# CONFIG_BNX2X is not set 578# CONFIG_BNX2X is not set
579# CONFIG_QLGE is not set
569# CONFIG_SFC is not set 580# CONFIG_SFC is not set
570# CONFIG_TR is not set 581# CONFIG_TR is not set
571 582
@@ -815,6 +826,17 @@ CONFIG_SSB_POSSIBLE=y
815# CONFIG_MFD_SM501 is not set 826# CONFIG_MFD_SM501 is not set
816# CONFIG_HTC_PASIC3 is not set 827# CONFIG_HTC_PASIC3 is not set
817# CONFIG_MFD_TMIO is not set 828# CONFIG_MFD_TMIO is not set
829# CONFIG_PMIC_DA903X is not set
830# CONFIG_MFD_WM8400 is not set
831# CONFIG_MFD_WM8350_I2C is not set
832
833#
834# Voltage and Current regulators
835#
836# CONFIG_REGULATOR is not set
837# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
838# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
839# CONFIG_REGULATOR_BQ24022 is not set
818 840
819# 841#
820# Multimedia devices 842# Multimedia devices
@@ -851,6 +873,12 @@ CONFIG_HID_SUPPORT=y
851CONFIG_HID=y 873CONFIG_HID=y
852# CONFIG_HID_DEBUG is not set 874# CONFIG_HID_DEBUG is not set
853# CONFIG_HIDRAW is not set 875# CONFIG_HIDRAW is not set
876# CONFIG_HID_PID is not set
877
878#
879# Special HID drivers
880#
881CONFIG_HID_COMPAT=y
854CONFIG_USB_SUPPORT=y 882CONFIG_USB_SUPPORT=y
855CONFIG_USB_ARCH_HAS_HCD=y 883CONFIG_USB_ARCH_HAS_HCD=y
856CONFIG_USB_ARCH_HAS_OHCI=y 884CONFIG_USB_ARCH_HAS_OHCI=y
@@ -867,6 +895,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
867# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 895# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
868# 896#
869# CONFIG_USB_GADGET is not set 897# CONFIG_USB_GADGET is not set
898# CONFIG_UWB is not set
870# CONFIG_MMC is not set 899# CONFIG_MMC is not set
871# CONFIG_MEMSTICK is not set 900# CONFIG_MEMSTICK is not set
872# CONFIG_NEW_LEDS is not set 901# CONFIG_NEW_LEDS is not set
@@ -912,12 +941,15 @@ CONFIG_RTC_DRV_DS1374=y
912# Platform RTC drivers 941# Platform RTC drivers
913# 942#
914# CONFIG_RTC_DRV_CMOS is not set 943# CONFIG_RTC_DRV_CMOS is not set
944# CONFIG_RTC_DRV_DS1286 is not set
915# CONFIG_RTC_DRV_DS1511 is not set 945# CONFIG_RTC_DRV_DS1511 is not set
916# CONFIG_RTC_DRV_DS1553 is not set 946# CONFIG_RTC_DRV_DS1553 is not set
917# CONFIG_RTC_DRV_DS1742 is not set 947# CONFIG_RTC_DRV_DS1742 is not set
918# CONFIG_RTC_DRV_STK17TA8 is not set 948# CONFIG_RTC_DRV_STK17TA8 is not set
919# CONFIG_RTC_DRV_M48T86 is not set 949# CONFIG_RTC_DRV_M48T86 is not set
950# CONFIG_RTC_DRV_M48T35 is not set
920# CONFIG_RTC_DRV_M48T59 is not set 951# CONFIG_RTC_DRV_M48T59 is not set
952# CONFIG_RTC_DRV_BQ4802 is not set
921# CONFIG_RTC_DRV_V3020 is not set 953# CONFIG_RTC_DRV_V3020 is not set
922 954
923# 955#
@@ -926,6 +958,7 @@ CONFIG_RTC_DRV_DS1374=y
926# CONFIG_RTC_DRV_PPC is not set 958# CONFIG_RTC_DRV_PPC is not set
927# CONFIG_DMADEVICES is not set 959# CONFIG_DMADEVICES is not set
928# CONFIG_UIO is not set 960# CONFIG_UIO is not set
961# CONFIG_STAGING is not set
929 962
930# 963#
931# File systems 964# File systems
@@ -937,12 +970,13 @@ CONFIG_EXT3_FS=y
937CONFIG_EXT3_FS_XATTR=y 970CONFIG_EXT3_FS_XATTR=y
938# CONFIG_EXT3_FS_POSIX_ACL is not set 971# CONFIG_EXT3_FS_POSIX_ACL is not set
939# CONFIG_EXT3_FS_SECURITY is not set 972# CONFIG_EXT3_FS_SECURITY is not set
940# CONFIG_EXT4DEV_FS is not set 973# CONFIG_EXT4_FS is not set
941CONFIG_JBD=y 974CONFIG_JBD=y
942CONFIG_FS_MBCACHE=y 975CONFIG_FS_MBCACHE=y
943# CONFIG_REISERFS_FS is not set 976# CONFIG_REISERFS_FS is not set
944# CONFIG_JFS_FS is not set 977# CONFIG_JFS_FS is not set
945# CONFIG_FS_POSIX_ACL is not set 978# CONFIG_FS_POSIX_ACL is not set
979CONFIG_FILE_LOCKING=y
946# CONFIG_XFS_FS is not set 980# CONFIG_XFS_FS is not set
947# CONFIG_OCFS2_FS is not set 981# CONFIG_OCFS2_FS is not set
948CONFIG_DNOTIFY=y 982CONFIG_DNOTIFY=y
@@ -972,6 +1006,7 @@ CONFIG_INOTIFY_USER=y
972CONFIG_PROC_FS=y 1006CONFIG_PROC_FS=y
973CONFIG_PROC_KCORE=y 1007CONFIG_PROC_KCORE=y
974CONFIG_PROC_SYSCTL=y 1008CONFIG_PROC_SYSCTL=y
1009CONFIG_PROC_PAGE_MONITOR=y
975CONFIG_SYSFS=y 1010CONFIG_SYSFS=y
976CONFIG_TMPFS=y 1011CONFIG_TMPFS=y
977# CONFIG_TMPFS_POSIX_ACL is not set 1012# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1009,6 +1044,7 @@ CONFIG_LOCKD_V4=y
1009CONFIG_NFS_COMMON=y 1044CONFIG_NFS_COMMON=y
1010CONFIG_SUNRPC=y 1045CONFIG_SUNRPC=y
1011CONFIG_SUNRPC_GSS=y 1046CONFIG_SUNRPC_GSS=y
1047# CONFIG_SUNRPC_REGISTER_V4 is not set
1012CONFIG_RPCSEC_GSS_KRB5=y 1048CONFIG_RPCSEC_GSS_KRB5=y
1013# CONFIG_RPCSEC_GSS_SPKM3 is not set 1049# CONFIG_RPCSEC_GSS_SPKM3 is not set
1014# CONFIG_SMB_FS is not set 1050# CONFIG_SMB_FS is not set
@@ -1036,13 +1072,11 @@ CONFIG_PARTITION_ADVANCED=y
1036# CONFIG_SYSV68_PARTITION is not set 1072# CONFIG_SYSV68_PARTITION is not set
1037# CONFIG_NLS is not set 1073# CONFIG_NLS is not set
1038# CONFIG_DLM is not set 1074# CONFIG_DLM is not set
1039# CONFIG_QE_GPIO is not set
1040 1075
1041# 1076#
1042# Library routines 1077# Library routines
1043# 1078#
1044CONFIG_BITREVERSE=y 1079CONFIG_BITREVERSE=y
1045# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1046# CONFIG_CRC_CCITT is not set 1080# CONFIG_CRC_CCITT is not set
1047# CONFIG_CRC16 is not set 1081# CONFIG_CRC16 is not set
1048# CONFIG_CRC_T10DIF is not set 1082# CONFIG_CRC_T10DIF is not set
@@ -1094,15 +1128,23 @@ CONFIG_SCHED_DEBUG=y
1094# CONFIG_DEBUG_SG is not set 1128# CONFIG_DEBUG_SG is not set
1095# CONFIG_BOOT_PRINTK_DELAY is not set 1129# CONFIG_BOOT_PRINTK_DELAY is not set
1096# CONFIG_RCU_TORTURE_TEST is not set 1130# CONFIG_RCU_TORTURE_TEST is not set
1131# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1097# CONFIG_BACKTRACE_SELF_TEST is not set 1132# CONFIG_BACKTRACE_SELF_TEST is not set
1133# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1098# CONFIG_FAULT_INJECTION is not set 1134# CONFIG_FAULT_INJECTION is not set
1099# CONFIG_LATENCYTOP is not set 1135# CONFIG_LATENCYTOP is not set
1100CONFIG_SYSCTL_SYSCALL_CHECK=y 1136CONFIG_SYSCTL_SYSCALL_CHECK=y
1101CONFIG_HAVE_FTRACE=y 1137CONFIG_HAVE_FUNCTION_TRACER=y
1102CONFIG_HAVE_DYNAMIC_FTRACE=y 1138
1103# CONFIG_FTRACE is not set 1139#
1140# Tracers
1141#
1142# CONFIG_FUNCTION_TRACER is not set
1104# CONFIG_SCHED_TRACER is not set 1143# CONFIG_SCHED_TRACER is not set
1105# CONFIG_CONTEXT_SWITCH_TRACER is not set 1144# CONFIG_CONTEXT_SWITCH_TRACER is not set
1145# CONFIG_BOOT_TRACER is not set
1146# CONFIG_STACK_TRACER is not set
1147# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1106# CONFIG_SAMPLES is not set 1148# CONFIG_SAMPLES is not set
1107CONFIG_HAVE_ARCH_KGDB=y 1149CONFIG_HAVE_ARCH_KGDB=y
1108# CONFIG_KGDB is not set 1150# CONFIG_KGDB is not set
@@ -1111,6 +1153,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1111# CONFIG_DEBUG_PAGEALLOC is not set 1153# CONFIG_DEBUG_PAGEALLOC is not set
1112# CONFIG_CODE_PATCHING_SELFTEST is not set 1154# CONFIG_CODE_PATCHING_SELFTEST is not set
1113# CONFIG_FTR_FIXUP_SELFTEST is not set 1155# CONFIG_FTR_FIXUP_SELFTEST is not set
1156# CONFIG_MSI_BITMAP_SELFTEST is not set
1114# CONFIG_XMON is not set 1157# CONFIG_XMON is not set
1115# CONFIG_IRQSTACKS is not set 1158# CONFIG_IRQSTACKS is not set
1116# CONFIG_BDI_SWITCH is not set 1159# CONFIG_BDI_SWITCH is not set
@@ -1132,14 +1175,19 @@ CONFIG_PPC_EARLY_DEBUG=y
1132# 1175#
1133# CONFIG_KEYS is not set 1176# CONFIG_KEYS is not set
1134# CONFIG_SECURITY is not set 1177# CONFIG_SECURITY is not set
1178# CONFIG_SECURITYFS is not set
1135# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1179# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1136CONFIG_CRYPTO=y 1180CONFIG_CRYPTO=y
1137 1181
1138# 1182#
1139# Crypto core or helper 1183# Crypto core or helper
1140# 1184#
1185# CONFIG_CRYPTO_FIPS is not set
1141CONFIG_CRYPTO_ALGAPI=y 1186CONFIG_CRYPTO_ALGAPI=y
1187CONFIG_CRYPTO_AEAD=y
1142CONFIG_CRYPTO_BLKCIPHER=y 1188CONFIG_CRYPTO_BLKCIPHER=y
1189CONFIG_CRYPTO_HASH=y
1190CONFIG_CRYPTO_RNG=y
1143CONFIG_CRYPTO_MANAGER=y 1191CONFIG_CRYPTO_MANAGER=y
1144# CONFIG_CRYPTO_GF128MUL is not set 1192# CONFIG_CRYPTO_GF128MUL is not set
1145# CONFIG_CRYPTO_NULL is not set 1193# CONFIG_CRYPTO_NULL is not set
@@ -1212,6 +1260,11 @@ CONFIG_CRYPTO_DES=y
1212# 1260#
1213# CONFIG_CRYPTO_DEFLATE is not set 1261# CONFIG_CRYPTO_DEFLATE is not set
1214# CONFIG_CRYPTO_LZO is not set 1262# CONFIG_CRYPTO_LZO is not set
1263
1264#
1265# Random Number Generation
1266#
1267# CONFIG_CRYPTO_ANSI_CPRNG is not set
1215CONFIG_CRYPTO_HW=y 1268CONFIG_CRYPTO_HW=y
1216# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1269# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1217# CONFIG_CRYPTO_DEV_TALITOS is not set 1270# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
index eda45bb8a13f..635588319e0d 100644
--- a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
+++ b/arch/powerpc/configs/85xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 07:21:42 2008 4# Sat Nov 8 12:40:13 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -110,7 +110,9 @@ CONFIG_SIGNALFD=y
110CONFIG_TIMERFD=y 110CONFIG_TIMERFD=y
111CONFIG_EVENTFD=y 111CONFIG_EVENTFD=y
112CONFIG_SHMEM=y 112CONFIG_SHMEM=y
113CONFIG_AIO=y
113CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_PCI_QUIRKS=y
114CONFIG_SLUB_DEBUG=y 116CONFIG_SLUB_DEBUG=y
115# CONFIG_SLAB is not set 117# CONFIG_SLAB is not set
116CONFIG_SLUB=y 118CONFIG_SLUB=y
@@ -124,10 +126,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
124CONFIG_HAVE_KPROBES=y 126CONFIG_HAVE_KPROBES=y
125CONFIG_HAVE_KRETPROBES=y 127CONFIG_HAVE_KRETPROBES=y
126CONFIG_HAVE_ARCH_TRACEHOOK=y 128CONFIG_HAVE_ARCH_TRACEHOOK=y
127# CONFIG_HAVE_DMA_ATTRS is not set
128# CONFIG_USE_GENERIC_SMP_HELPERS is not set
129# CONFIG_HAVE_CLK is not set
130CONFIG_PROC_PAGE_MONITOR=y
131# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
132CONFIG_SLABINFO=y 130CONFIG_SLABINFO=y
133CONFIG_RT_MUTEXES=y 131CONFIG_RT_MUTEXES=y
@@ -160,6 +158,7 @@ CONFIG_DEFAULT_CFQ=y
160# CONFIG_DEFAULT_NOOP is not set 158# CONFIG_DEFAULT_NOOP is not set
161CONFIG_DEFAULT_IOSCHED="cfq" 159CONFIG_DEFAULT_IOSCHED="cfq"
162CONFIG_CLASSIC_RCU=y 160CONFIG_CLASSIC_RCU=y
161# CONFIG_FREEZER is not set
163 162
164# 163#
165# Platform support 164# Platform support
@@ -194,8 +193,10 @@ CONFIG_PPC_I8259=y
194# CONFIG_PPC_INDIRECT_IO is not set 193# CONFIG_PPC_INDIRECT_IO is not set
195# CONFIG_GENERIC_IOMAP is not set 194# CONFIG_GENERIC_IOMAP is not set
196# CONFIG_CPU_FREQ is not set 195# CONFIG_CPU_FREQ is not set
196# CONFIG_QUICC_ENGINE is not set
197# CONFIG_CPM2 is not set 197# CONFIG_CPM2 is not set
198CONFIG_FSL_ULI1575=y 198CONFIG_FSL_ULI1575=y
199# CONFIG_MPC8xxx_GPIO is not set
199 200
200# 201#
201# Kernel options 202# Kernel options
@@ -215,6 +216,8 @@ CONFIG_PREEMPT_NONE=y
215# CONFIG_PREEMPT_VOLUNTARY is not set 216# CONFIG_PREEMPT_VOLUNTARY is not set
216# CONFIG_PREEMPT is not set 217# CONFIG_PREEMPT is not set
217CONFIG_BINFMT_ELF=y 218CONFIG_BINFMT_ELF=y
219# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
220# CONFIG_HAVE_AOUT is not set
218CONFIG_BINFMT_MISC=m 221CONFIG_BINFMT_MISC=m
219CONFIG_MATH_EMULATION=y 222CONFIG_MATH_EMULATION=y
220# CONFIG_IOMMU_HELPER is not set 223# CONFIG_IOMMU_HELPER is not set
@@ -229,15 +232,15 @@ CONFIG_FLATMEM_MANUAL=y
229# CONFIG_SPARSEMEM_MANUAL is not set 232# CONFIG_SPARSEMEM_MANUAL is not set
230CONFIG_FLATMEM=y 233CONFIG_FLATMEM=y
231CONFIG_FLAT_NODE_MEM_MAP=y 234CONFIG_FLAT_NODE_MEM_MAP=y
232# CONFIG_SPARSEMEM_STATIC is not set
233# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
234CONFIG_PAGEFLAGS_EXTENDED=y 235CONFIG_PAGEFLAGS_EXTENDED=y
235CONFIG_SPLIT_PTLOCK_CPUS=4 236CONFIG_SPLIT_PTLOCK_CPUS=4
236CONFIG_MIGRATION=y 237CONFIG_MIGRATION=y
237# CONFIG_RESOURCES_64BIT is not set 238# CONFIG_RESOURCES_64BIT is not set
239# CONFIG_PHYS_ADDR_T_64BIT is not set
238CONFIG_ZONE_DMA_FLAG=1 240CONFIG_ZONE_DMA_FLAG=1
239CONFIG_BOUNCE=y 241CONFIG_BOUNCE=y
240CONFIG_VIRT_TO_BUS=y 242CONFIG_VIRT_TO_BUS=y
243CONFIG_UNEVICTABLE_LRU=y
241CONFIG_FORCE_MAX_ZONEORDER=11 244CONFIG_FORCE_MAX_ZONEORDER=11
242CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
243# CONFIG_CMDLINE_BOOL is not set 246# CONFIG_CMDLINE_BOOL is not set
@@ -261,7 +264,7 @@ CONFIG_PCI_SYSCALL=y
261# CONFIG_PCIEPORTBUS is not set 264# CONFIG_PCIEPORTBUS is not set
262CONFIG_ARCH_SUPPORTS_MSI=y 265CONFIG_ARCH_SUPPORTS_MSI=y
263# CONFIG_PCI_MSI is not set 266# CONFIG_PCI_MSI is not set
264CONFIG_PCI_LEGACY=y 267# CONFIG_PCI_LEGACY is not set
265# CONFIG_PCI_DEBUG is not set 268# CONFIG_PCI_DEBUG is not set
266# CONFIG_PCCARD is not set 269# CONFIG_PCCARD is not set
267# CONFIG_HOTPLUG_PCI is not set 270# CONFIG_HOTPLUG_PCI is not set
@@ -363,6 +366,7 @@ CONFIG_SCTP_HMAC_MD5=y
363# CONFIG_TIPC is not set 366# CONFIG_TIPC is not set
364# CONFIG_ATM is not set 367# CONFIG_ATM is not set
365# CONFIG_BRIDGE is not set 368# CONFIG_BRIDGE is not set
369# CONFIG_NET_DSA is not set
366# CONFIG_VLAN_8021Q is not set 370# CONFIG_VLAN_8021Q is not set
367# CONFIG_DECNET is not set 371# CONFIG_DECNET is not set
368# CONFIG_LLC2 is not set 372# CONFIG_LLC2 is not set
@@ -383,12 +387,11 @@ CONFIG_SCTP_HMAC_MD5=y
383# CONFIG_IRDA is not set 387# CONFIG_IRDA is not set
384# CONFIG_BT is not set 388# CONFIG_BT is not set
385# CONFIG_AF_RXRPC is not set 389# CONFIG_AF_RXRPC is not set
390# CONFIG_PHONET is not set
386CONFIG_FIB_RULES=y 391CONFIG_FIB_RULES=y
387 392CONFIG_WIRELESS=y
388#
389# Wireless
390#
391# CONFIG_CFG80211 is not set 393# CONFIG_CFG80211 is not set
394CONFIG_WIRELESS_OLD_REGULATORY=y
392# CONFIG_WIRELESS_EXT is not set 395# CONFIG_WIRELESS_EXT is not set
393# CONFIG_MAC80211 is not set 396# CONFIG_MAC80211 is not set
394# CONFIG_IEEE80211 is not set 397# CONFIG_IEEE80211 is not set
@@ -634,8 +637,12 @@ CONFIG_MII=y
634# CONFIG_IBM_NEW_EMAC_RGMII is not set 637# CONFIG_IBM_NEW_EMAC_RGMII is not set
635# CONFIG_IBM_NEW_EMAC_TAH is not set 638# CONFIG_IBM_NEW_EMAC_TAH is not set
636# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 639# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
640# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
641# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
642# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
637# CONFIG_NET_PCI is not set 643# CONFIG_NET_PCI is not set
638# CONFIG_B44 is not set 644# CONFIG_B44 is not set
645# CONFIG_ATL2 is not set
639CONFIG_NETDEV_1000=y 646CONFIG_NETDEV_1000=y
640# CONFIG_ACENIC is not set 647# CONFIG_ACENIC is not set
641# CONFIG_DL2K is not set 648# CONFIG_DL2K is not set
@@ -657,18 +664,22 @@ CONFIG_GIANFAR=y
657# CONFIG_QLA3XXX is not set 664# CONFIG_QLA3XXX is not set
658# CONFIG_ATL1 is not set 665# CONFIG_ATL1 is not set
659# CONFIG_ATL1E is not set 666# CONFIG_ATL1E is not set
667# CONFIG_JME is not set
660CONFIG_NETDEV_10000=y 668CONFIG_NETDEV_10000=y
661# CONFIG_CHELSIO_T1 is not set 669# CONFIG_CHELSIO_T1 is not set
662# CONFIG_CHELSIO_T3 is not set 670# CONFIG_CHELSIO_T3 is not set
671# CONFIG_ENIC is not set
663# CONFIG_IXGBE is not set 672# CONFIG_IXGBE is not set
664# CONFIG_IXGB is not set 673# CONFIG_IXGB is not set
665# CONFIG_S2IO is not set 674# CONFIG_S2IO is not set
666# CONFIG_MYRI10GE is not set 675# CONFIG_MYRI10GE is not set
667# CONFIG_NETXEN_NIC is not set 676# CONFIG_NETXEN_NIC is not set
668# CONFIG_NIU is not set 677# CONFIG_NIU is not set
678# CONFIG_MLX4_EN is not set
669# CONFIG_MLX4_CORE is not set 679# CONFIG_MLX4_CORE is not set
670# CONFIG_TEHUTI is not set 680# CONFIG_TEHUTI is not set
671# CONFIG_BNX2X is not set 681# CONFIG_BNX2X is not set
682# CONFIG_QLGE is not set
672# CONFIG_SFC is not set 683# CONFIG_SFC is not set
673# CONFIG_TR is not set 684# CONFIG_TR is not set
674 685
@@ -703,7 +714,7 @@ CONFIG_NETDEV_10000=y
703# Input device support 714# Input device support
704# 715#
705CONFIG_INPUT=y 716CONFIG_INPUT=y
706# CONFIG_INPUT_FF_MEMLESS is not set 717CONFIG_INPUT_FF_MEMLESS=m
707# CONFIG_INPUT_POLLDEV is not set 718# CONFIG_INPUT_POLLDEV is not set
708 719
709# 720#
@@ -872,6 +883,17 @@ CONFIG_SSB_POSSIBLE=y
872# CONFIG_MFD_SM501 is not set 883# CONFIG_MFD_SM501 is not set
873# CONFIG_HTC_PASIC3 is not set 884# CONFIG_HTC_PASIC3 is not set
874# CONFIG_MFD_TMIO is not set 885# CONFIG_MFD_TMIO is not set
886# CONFIG_PMIC_DA903X is not set
887# CONFIG_MFD_WM8400 is not set
888# CONFIG_MFD_WM8350_I2C is not set
889
890#
891# Voltage and Current regulators
892#
893# CONFIG_REGULATOR is not set
894# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
895# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
896# CONFIG_REGULATOR_BQ24022 is not set
875 897
876# 898#
877# Multimedia devices 899# Multimedia devices
@@ -912,7 +934,6 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
912# CONFIG_DVB_USB is not set 934# CONFIG_DVB_USB is not set
913# CONFIG_DVB_TTUSB_BUDGET is not set 935# CONFIG_DVB_TTUSB_BUDGET is not set
914# CONFIG_DVB_TTUSB_DEC is not set 936# CONFIG_DVB_TTUSB_DEC is not set
915# CONFIG_DVB_CINERGYT2 is not set
916# CONFIG_DVB_SIANO_SMS1XXX is not set 937# CONFIG_DVB_SIANO_SMS1XXX is not set
917 938
918# 939#
@@ -930,6 +951,11 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
930# CONFIG_DVB_PLUTO2 is not set 951# CONFIG_DVB_PLUTO2 is not set
931 952
932# 953#
954# Supported SDMC DM1105 Adapters
955#
956# CONFIG_DVB_DM1105 is not set
957
958#
933# Supported DVB Frontends 959# Supported DVB Frontends
934# 960#
935 961
@@ -945,6 +971,8 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
945# CONFIG_DVB_CX24123 is not set 971# CONFIG_DVB_CX24123 is not set
946# CONFIG_DVB_MT312 is not set 972# CONFIG_DVB_MT312 is not set
947# CONFIG_DVB_S5H1420 is not set 973# CONFIG_DVB_S5H1420 is not set
974# CONFIG_DVB_STV0288 is not set
975# CONFIG_DVB_STB6000 is not set
948# CONFIG_DVB_STV0299 is not set 976# CONFIG_DVB_STV0299 is not set
949# CONFIG_DVB_TDA8083 is not set 977# CONFIG_DVB_TDA8083 is not set
950# CONFIG_DVB_TDA10086 is not set 978# CONFIG_DVB_TDA10086 is not set
@@ -952,6 +980,8 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
952# CONFIG_DVB_TUNER_ITD1000 is not set 980# CONFIG_DVB_TUNER_ITD1000 is not set
953# CONFIG_DVB_TDA826X is not set 981# CONFIG_DVB_TDA826X is not set
954# CONFIG_DVB_TUA6100 is not set 982# CONFIG_DVB_TUA6100 is not set
983# CONFIG_DVB_CX24116 is not set
984# CONFIG_DVB_SI21XX is not set
955 985
956# 986#
957# DVB-T (terrestrial) frontends 987# DVB-T (terrestrial) frontends
@@ -1004,6 +1034,13 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
1004# CONFIG_DVB_LNBP21 is not set 1034# CONFIG_DVB_LNBP21 is not set
1005# CONFIG_DVB_ISL6405 is not set 1035# CONFIG_DVB_ISL6405 is not set
1006# CONFIG_DVB_ISL6421 is not set 1036# CONFIG_DVB_ISL6421 is not set
1037# CONFIG_DVB_LGS8GL5 is not set
1038
1039#
1040# Tools to develop new frontends
1041#
1042# CONFIG_DVB_DUMMY_FE is not set
1043# CONFIG_DVB_AF9013 is not set
1007CONFIG_DAB=y 1044CONFIG_DAB=y
1008# CONFIG_USB_DABUSB is not set 1045# CONFIG_USB_DABUSB is not set
1009 1046
@@ -1029,6 +1066,7 @@ CONFIG_VGA_CONSOLE=y
1029# CONFIG_VGACON_SOFT_SCROLLBACK is not set 1066# CONFIG_VGACON_SOFT_SCROLLBACK is not set
1030CONFIG_DUMMY_CONSOLE=y 1067CONFIG_DUMMY_CONSOLE=y
1031CONFIG_SOUND=y 1068CONFIG_SOUND=y
1069CONFIG_SOUND_OSS_CORE=y
1032CONFIG_SND=y 1070CONFIG_SND=y
1033CONFIG_SND_TIMER=y 1071CONFIG_SND_TIMER=y
1034CONFIG_SND_PCM=y 1072CONFIG_SND_PCM=y
@@ -1129,9 +1167,36 @@ CONFIG_HID=y
1129# USB Input Devices 1167# USB Input Devices
1130# 1168#
1131CONFIG_USB_HID=y 1169CONFIG_USB_HID=y
1132# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1170# CONFIG_HID_PID is not set
1133# CONFIG_HID_FF is not set
1134# CONFIG_USB_HIDDEV is not set 1171# CONFIG_USB_HIDDEV is not set
1172
1173#
1174# Special HID drivers
1175#
1176CONFIG_HID_COMPAT=y
1177CONFIG_HID_A4TECH=y
1178CONFIG_HID_APPLE=y
1179CONFIG_HID_BELKIN=y
1180CONFIG_HID_BRIGHT=y
1181CONFIG_HID_CHERRY=y
1182CONFIG_HID_CHICONY=y
1183CONFIG_HID_CYPRESS=y
1184CONFIG_HID_DELL=y
1185CONFIG_HID_EZKEY=y
1186CONFIG_HID_GYRATION=y
1187CONFIG_HID_LOGITECH=y
1188# CONFIG_LOGITECH_FF is not set
1189# CONFIG_LOGIRUMBLEPAD2_FF is not set
1190CONFIG_HID_MICROSOFT=y
1191CONFIG_HID_MONTEREY=y
1192CONFIG_HID_PANTHERLORD=y
1193# CONFIG_PANTHERLORD_FF is not set
1194CONFIG_HID_PETALYNX=y
1195CONFIG_HID_SAMSUNG=y
1196CONFIG_HID_SONY=y
1197CONFIG_HID_SUNPLUS=y
1198CONFIG_THRUSTMASTER_FF=m
1199CONFIG_ZEROPLUS_FF=m
1135CONFIG_USB_SUPPORT=y 1200CONFIG_USB_SUPPORT=y
1136CONFIG_USB_ARCH_HAS_HCD=y 1201CONFIG_USB_ARCH_HAS_HCD=y
1137CONFIG_USB_ARCH_HAS_OHCI=y 1202CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1150,6 +1215,8 @@ CONFIG_USB_DEVICE_CLASS=y
1150# CONFIG_USB_OTG_WHITELIST is not set 1215# CONFIG_USB_OTG_WHITELIST is not set
1151# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1216# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1152CONFIG_USB_MON=y 1217CONFIG_USB_MON=y
1218# CONFIG_USB_WUSB is not set
1219# CONFIG_USB_WUSB_CBAF is not set
1153 1220
1154# 1221#
1155# USB Host Controller Drivers 1222# USB Host Controller Drivers
@@ -1173,6 +1240,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1173# CONFIG_USB_UHCI_HCD is not set 1240# CONFIG_USB_UHCI_HCD is not set
1174# CONFIG_USB_SL811_HCD is not set 1241# CONFIG_USB_SL811_HCD is not set
1175# CONFIG_USB_R8A66597_HCD is not set 1242# CONFIG_USB_R8A66597_HCD is not set
1243# CONFIG_USB_WHCI_HCD is not set
1244# CONFIG_USB_HWA_HCD is not set
1176 1245
1177# 1246#
1178# USB Device Class drivers 1247# USB Device Class drivers
@@ -1180,6 +1249,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1180# CONFIG_USB_ACM is not set 1249# CONFIG_USB_ACM is not set
1181# CONFIG_USB_PRINTER is not set 1250# CONFIG_USB_PRINTER is not set
1182# CONFIG_USB_WDM is not set 1251# CONFIG_USB_WDM is not set
1252# CONFIG_USB_TMC is not set
1183 1253
1184# 1254#
1185# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1255# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1201,7 +1271,6 @@ CONFIG_USB_STORAGE=y
1201# CONFIG_USB_STORAGE_ALAUDA is not set 1271# CONFIG_USB_STORAGE_ALAUDA is not set
1202# CONFIG_USB_STORAGE_ONETOUCH is not set 1272# CONFIG_USB_STORAGE_ONETOUCH is not set
1203# CONFIG_USB_STORAGE_KARMA is not set 1273# CONFIG_USB_STORAGE_KARMA is not set
1204# CONFIG_USB_STORAGE_SIERRA is not set
1205# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1274# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1206# CONFIG_USB_LIBUSUAL is not set 1275# CONFIG_USB_LIBUSUAL is not set
1207 1276
@@ -1222,6 +1291,7 @@ CONFIG_USB_STORAGE=y
1222# CONFIG_USB_EMI62 is not set 1291# CONFIG_USB_EMI62 is not set
1223# CONFIG_USB_EMI26 is not set 1292# CONFIG_USB_EMI26 is not set
1224# CONFIG_USB_ADUTUX is not set 1293# CONFIG_USB_ADUTUX is not set
1294# CONFIG_USB_SEVSEG is not set
1225# CONFIG_USB_RIO500 is not set 1295# CONFIG_USB_RIO500 is not set
1226# CONFIG_USB_LEGOTOWER is not set 1296# CONFIG_USB_LEGOTOWER is not set
1227# CONFIG_USB_LCD is not set 1297# CONFIG_USB_LCD is not set
@@ -1239,7 +1309,9 @@ CONFIG_USB_STORAGE=y
1239# CONFIG_USB_IOWARRIOR is not set 1309# CONFIG_USB_IOWARRIOR is not set
1240# CONFIG_USB_TEST is not set 1310# CONFIG_USB_TEST is not set
1241# CONFIG_USB_ISIGHTFW is not set 1311# CONFIG_USB_ISIGHTFW is not set
1312# CONFIG_USB_VST is not set
1242# CONFIG_USB_GADGET is not set 1313# CONFIG_USB_GADGET is not set
1314# CONFIG_UWB is not set
1243# CONFIG_MMC is not set 1315# CONFIG_MMC is not set
1244# CONFIG_MEMSTICK is not set 1316# CONFIG_MEMSTICK is not set
1245# CONFIG_NEW_LEDS is not set 1317# CONFIG_NEW_LEDS is not set
@@ -1285,12 +1357,15 @@ CONFIG_RTC_INTF_DEV=y
1285# Platform RTC drivers 1357# Platform RTC drivers
1286# 1358#
1287CONFIG_RTC_DRV_CMOS=y 1359CONFIG_RTC_DRV_CMOS=y
1360# CONFIG_RTC_DRV_DS1286 is not set
1288# CONFIG_RTC_DRV_DS1511 is not set 1361# CONFIG_RTC_DRV_DS1511 is not set
1289# CONFIG_RTC_DRV_DS1553 is not set 1362# CONFIG_RTC_DRV_DS1553 is not set
1290# CONFIG_RTC_DRV_DS1742 is not set 1363# CONFIG_RTC_DRV_DS1742 is not set
1291# CONFIG_RTC_DRV_STK17TA8 is not set 1364# CONFIG_RTC_DRV_STK17TA8 is not set
1292# CONFIG_RTC_DRV_M48T86 is not set 1365# CONFIG_RTC_DRV_M48T86 is not set
1366# CONFIG_RTC_DRV_M48T35 is not set
1293# CONFIG_RTC_DRV_M48T59 is not set 1367# CONFIG_RTC_DRV_M48T59 is not set
1368# CONFIG_RTC_DRV_BQ4802 is not set
1294# CONFIG_RTC_DRV_V3020 is not set 1369# CONFIG_RTC_DRV_V3020 is not set
1295 1370
1296# 1371#
@@ -1299,6 +1374,7 @@ CONFIG_RTC_DRV_CMOS=y
1299# CONFIG_RTC_DRV_PPC is not set 1374# CONFIG_RTC_DRV_PPC is not set
1300# CONFIG_DMADEVICES is not set 1375# CONFIG_DMADEVICES is not set
1301# CONFIG_UIO is not set 1376# CONFIG_UIO is not set
1377# CONFIG_STAGING is not set
1302 1378
1303# 1379#
1304# File systems 1380# File systems
@@ -1310,12 +1386,13 @@ CONFIG_EXT3_FS=y
1310CONFIG_EXT3_FS_XATTR=y 1386CONFIG_EXT3_FS_XATTR=y
1311# CONFIG_EXT3_FS_POSIX_ACL is not set 1387# CONFIG_EXT3_FS_POSIX_ACL is not set
1312# CONFIG_EXT3_FS_SECURITY is not set 1388# CONFIG_EXT3_FS_SECURITY is not set
1313# CONFIG_EXT4DEV_FS is not set 1389# CONFIG_EXT4_FS is not set
1314CONFIG_JBD=y 1390CONFIG_JBD=y
1315CONFIG_FS_MBCACHE=y 1391CONFIG_FS_MBCACHE=y
1316# CONFIG_REISERFS_FS is not set 1392# CONFIG_REISERFS_FS is not set
1317# CONFIG_JFS_FS is not set 1393# CONFIG_JFS_FS is not set
1318# CONFIG_FS_POSIX_ACL is not set 1394# CONFIG_FS_POSIX_ACL is not set
1395CONFIG_FILE_LOCKING=y
1319# CONFIG_XFS_FS is not set 1396# CONFIG_XFS_FS is not set
1320# CONFIG_OCFS2_FS is not set 1397# CONFIG_OCFS2_FS is not set
1321CONFIG_DNOTIFY=y 1398CONFIG_DNOTIFY=y
@@ -1353,6 +1430,7 @@ CONFIG_NTFS_FS=y
1353CONFIG_PROC_FS=y 1430CONFIG_PROC_FS=y
1354CONFIG_PROC_KCORE=y 1431CONFIG_PROC_KCORE=y
1355CONFIG_PROC_SYSCTL=y 1432CONFIG_PROC_SYSCTL=y
1433CONFIG_PROC_PAGE_MONITOR=y
1356CONFIG_SYSFS=y 1434CONFIG_SYSFS=y
1357CONFIG_TMPFS=y 1435CONFIG_TMPFS=y
1358# CONFIG_TMPFS_POSIX_ACL is not set 1436# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1397,6 +1475,7 @@ CONFIG_EXPORTFS=y
1397CONFIG_NFS_COMMON=y 1475CONFIG_NFS_COMMON=y
1398CONFIG_SUNRPC=y 1476CONFIG_SUNRPC=y
1399CONFIG_SUNRPC_GSS=y 1477CONFIG_SUNRPC_GSS=y
1478# CONFIG_SUNRPC_REGISTER_V4 is not set
1400CONFIG_RPCSEC_GSS_KRB5=y 1479CONFIG_RPCSEC_GSS_KRB5=y
1401# CONFIG_RPCSEC_GSS_SPKM3 is not set 1480# CONFIG_RPCSEC_GSS_SPKM3 is not set
1402# CONFIG_SMB_FS is not set 1481# CONFIG_SMB_FS is not set
@@ -1472,7 +1551,6 @@ CONFIG_NLS_UTF8=m
1472# Library routines 1551# Library routines
1473# 1552#
1474CONFIG_BITREVERSE=y 1553CONFIG_BITREVERSE=y
1475# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1476# CONFIG_CRC_CCITT is not set 1554# CONFIG_CRC_CCITT is not set
1477# CONFIG_CRC16 is not set 1555# CONFIG_CRC16 is not set
1478CONFIG_CRC_T10DIF=y 1556CONFIG_CRC_T10DIF=y
@@ -1526,15 +1604,23 @@ CONFIG_DEBUG_INFO=y
1526# CONFIG_DEBUG_SG is not set 1604# CONFIG_DEBUG_SG is not set
1527# CONFIG_BOOT_PRINTK_DELAY is not set 1605# CONFIG_BOOT_PRINTK_DELAY is not set
1528# CONFIG_RCU_TORTURE_TEST is not set 1606# CONFIG_RCU_TORTURE_TEST is not set
1607# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1529# CONFIG_BACKTRACE_SELF_TEST is not set 1608# CONFIG_BACKTRACE_SELF_TEST is not set
1609# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1530# CONFIG_FAULT_INJECTION is not set 1610# CONFIG_FAULT_INJECTION is not set
1531# CONFIG_LATENCYTOP is not set 1611# CONFIG_LATENCYTOP is not set
1532CONFIG_SYSCTL_SYSCALL_CHECK=y 1612CONFIG_SYSCTL_SYSCALL_CHECK=y
1533CONFIG_HAVE_FTRACE=y 1613CONFIG_HAVE_FUNCTION_TRACER=y
1534CONFIG_HAVE_DYNAMIC_FTRACE=y 1614
1535# CONFIG_FTRACE is not set 1615#
1616# Tracers
1617#
1618# CONFIG_FUNCTION_TRACER is not set
1536# CONFIG_SCHED_TRACER is not set 1619# CONFIG_SCHED_TRACER is not set
1537# CONFIG_CONTEXT_SWITCH_TRACER is not set 1620# CONFIG_CONTEXT_SWITCH_TRACER is not set
1621# CONFIG_BOOT_TRACER is not set
1622# CONFIG_STACK_TRACER is not set
1623# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1538# CONFIG_SAMPLES is not set 1624# CONFIG_SAMPLES is not set
1539CONFIG_HAVE_ARCH_KGDB=y 1625CONFIG_HAVE_ARCH_KGDB=y
1540# CONFIG_KGDB is not set 1626# CONFIG_KGDB is not set
@@ -1543,6 +1629,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1543# CONFIG_DEBUG_PAGEALLOC is not set 1629# CONFIG_DEBUG_PAGEALLOC is not set
1544# CONFIG_CODE_PATCHING_SELFTEST is not set 1630# CONFIG_CODE_PATCHING_SELFTEST is not set
1545# CONFIG_FTR_FIXUP_SELFTEST is not set 1631# CONFIG_FTR_FIXUP_SELFTEST is not set
1632# CONFIG_MSI_BITMAP_SELFTEST is not set
1546# CONFIG_XMON is not set 1633# CONFIG_XMON is not set
1547# CONFIG_IRQSTACKS is not set 1634# CONFIG_IRQSTACKS is not set
1548# CONFIG_BDI_SWITCH is not set 1635# CONFIG_BDI_SWITCH is not set
@@ -1553,16 +1640,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1553# 1640#
1554# CONFIG_KEYS is not set 1641# CONFIG_KEYS is not set
1555# CONFIG_SECURITY is not set 1642# CONFIG_SECURITY is not set
1643# CONFIG_SECURITYFS is not set
1556# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1644# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1557CONFIG_CRYPTO=y 1645CONFIG_CRYPTO=y
1558 1646
1559# 1647#
1560# Crypto core or helper 1648# Crypto core or helper
1561# 1649#
1650# CONFIG_CRYPTO_FIPS is not set
1562CONFIG_CRYPTO_ALGAPI=y 1651CONFIG_CRYPTO_ALGAPI=y
1563CONFIG_CRYPTO_AEAD=y 1652CONFIG_CRYPTO_AEAD=y
1564CONFIG_CRYPTO_BLKCIPHER=y 1653CONFIG_CRYPTO_BLKCIPHER=y
1565CONFIG_CRYPTO_HASH=y 1654CONFIG_CRYPTO_HASH=y
1655CONFIG_CRYPTO_RNG=y
1566CONFIG_CRYPTO_MANAGER=y 1656CONFIG_CRYPTO_MANAGER=y
1567# CONFIG_CRYPTO_GF128MUL is not set 1657# CONFIG_CRYPTO_GF128MUL is not set
1568# CONFIG_CRYPTO_NULL is not set 1658# CONFIG_CRYPTO_NULL is not set
@@ -1635,6 +1725,11 @@ CONFIG_CRYPTO_DES=y
1635# 1725#
1636# CONFIG_CRYPTO_DEFLATE is not set 1726# CONFIG_CRYPTO_DEFLATE is not set
1637# CONFIG_CRYPTO_LZO is not set 1727# CONFIG_CRYPTO_LZO is not set
1728
1729#
1730# Random Number Generation
1731#
1732# CONFIG_CRYPTO_ANSI_CPRNG is not set
1638CONFIG_CRYPTO_HW=y 1733CONFIG_CRYPTO_HW=y
1639# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1734# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1640CONFIG_CRYPTO_DEV_TALITOS=y 1735CONFIG_CRYPTO_DEV_TALITOS=y
diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
index 97f3c4fe440b..8769359dfe6a 100644
--- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
+++ b/arch/powerpc/configs/85xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:34 2008 4# Sat Nov 8 12:40:14 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -107,7 +107,9 @@ CONFIG_SIGNALFD=y
107CONFIG_TIMERFD=y 107CONFIG_TIMERFD=y
108CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
109CONFIG_SHMEM=y 109CONFIG_SHMEM=y
110CONFIG_AIO=y
110CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_PCI_QUIRKS=y
111CONFIG_SLUB_DEBUG=y 113CONFIG_SLUB_DEBUG=y
112# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
113CONFIG_SLUB=y 115CONFIG_SLUB=y
@@ -120,10 +122,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
120CONFIG_HAVE_KPROBES=y 122CONFIG_HAVE_KPROBES=y
121CONFIG_HAVE_KRETPROBES=y 123CONFIG_HAVE_KRETPROBES=y
122CONFIG_HAVE_ARCH_TRACEHOOK=y 124CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_DMA_ATTRS is not set
124# CONFIG_USE_GENERIC_SMP_HELPERS is not set
125# CONFIG_HAVE_CLK is not set
126CONFIG_PROC_PAGE_MONITOR=y
127# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
128CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
129CONFIG_RT_MUTEXES=y 127CONFIG_RT_MUTEXES=y
@@ -150,6 +148,7 @@ CONFIG_DEFAULT_AS=y
150# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
151CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
152CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_FREEZER is not set
153 152
154# 153#
155# Platform support 154# Platform support
@@ -184,8 +183,10 @@ CONFIG_PPC_I8259=y
184# CONFIG_PPC_INDIRECT_IO is not set 183# CONFIG_PPC_INDIRECT_IO is not set
185# CONFIG_GENERIC_IOMAP is not set 184# CONFIG_GENERIC_IOMAP is not set
186# CONFIG_CPU_FREQ is not set 185# CONFIG_CPU_FREQ is not set
186# CONFIG_QUICC_ENGINE is not set
187# CONFIG_CPM2 is not set 187# CONFIG_CPM2 is not set
188# CONFIG_FSL_ULI1575 is not set 188# CONFIG_FSL_ULI1575 is not set
189# CONFIG_MPC8xxx_GPIO is not set
189 190
190# 191#
191# Kernel options 192# Kernel options
@@ -205,6 +206,8 @@ CONFIG_PREEMPT_NONE=y
205# CONFIG_PREEMPT_VOLUNTARY is not set 206# CONFIG_PREEMPT_VOLUNTARY is not set
206# CONFIG_PREEMPT is not set 207# CONFIG_PREEMPT is not set
207CONFIG_BINFMT_ELF=y 208CONFIG_BINFMT_ELF=y
209# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
210# CONFIG_HAVE_AOUT is not set
208CONFIG_BINFMT_MISC=y 211CONFIG_BINFMT_MISC=y
209CONFIG_MATH_EMULATION=y 212CONFIG_MATH_EMULATION=y
210# CONFIG_IOMMU_HELPER is not set 213# CONFIG_IOMMU_HELPER is not set
@@ -219,15 +222,15 @@ CONFIG_FLATMEM_MANUAL=y
219# CONFIG_SPARSEMEM_MANUAL is not set 222# CONFIG_SPARSEMEM_MANUAL is not set
220CONFIG_FLATMEM=y 223CONFIG_FLATMEM=y
221CONFIG_FLAT_NODE_MEM_MAP=y 224CONFIG_FLAT_NODE_MEM_MAP=y
222# CONFIG_SPARSEMEM_STATIC is not set
223# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
224CONFIG_PAGEFLAGS_EXTENDED=y 225CONFIG_PAGEFLAGS_EXTENDED=y
225CONFIG_SPLIT_PTLOCK_CPUS=4 226CONFIG_SPLIT_PTLOCK_CPUS=4
226CONFIG_MIGRATION=y 227CONFIG_MIGRATION=y
227# CONFIG_RESOURCES_64BIT is not set 228# CONFIG_RESOURCES_64BIT is not set
229# CONFIG_PHYS_ADDR_T_64BIT is not set
228CONFIG_ZONE_DMA_FLAG=1 230CONFIG_ZONE_DMA_FLAG=1
229CONFIG_BOUNCE=y 231CONFIG_BOUNCE=y
230CONFIG_VIRT_TO_BUS=y 232CONFIG_VIRT_TO_BUS=y
233CONFIG_UNEVICTABLE_LRU=y
231CONFIG_FORCE_MAX_ZONEORDER=11 234CONFIG_FORCE_MAX_ZONEORDER=11
232CONFIG_PROC_DEVICETREE=y 235CONFIG_PROC_DEVICETREE=y
233# CONFIG_CMDLINE_BOOL is not set 236# CONFIG_CMDLINE_BOOL is not set
@@ -250,7 +253,7 @@ CONFIG_PCI_SYSCALL=y
250# CONFIG_PCIEPORTBUS is not set 253# CONFIG_PCIEPORTBUS is not set
251CONFIG_ARCH_SUPPORTS_MSI=y 254CONFIG_ARCH_SUPPORTS_MSI=y
252# CONFIG_PCI_MSI is not set 255# CONFIG_PCI_MSI is not set
253CONFIG_PCI_LEGACY=y 256# CONFIG_PCI_LEGACY is not set
254# CONFIG_PCI_DEBUG is not set 257# CONFIG_PCI_DEBUG is not set
255# CONFIG_PCCARD is not set 258# CONFIG_PCCARD is not set
256# CONFIG_HOTPLUG_PCI is not set 259# CONFIG_HOTPLUG_PCI is not set
@@ -320,6 +323,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
320# CONFIG_TIPC is not set 323# CONFIG_TIPC is not set
321# CONFIG_ATM is not set 324# CONFIG_ATM is not set
322# CONFIG_BRIDGE is not set 325# CONFIG_BRIDGE is not set
326# CONFIG_NET_DSA is not set
323# CONFIG_VLAN_8021Q is not set 327# CONFIG_VLAN_8021Q is not set
324# CONFIG_DECNET is not set 328# CONFIG_DECNET is not set
325# CONFIG_LLC2 is not set 329# CONFIG_LLC2 is not set
@@ -340,11 +344,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
340# CONFIG_IRDA is not set 344# CONFIG_IRDA is not set
341# CONFIG_BT is not set 345# CONFIG_BT is not set
342# CONFIG_AF_RXRPC is not set 346# CONFIG_AF_RXRPC is not set
343 347# CONFIG_PHONET is not set
344# 348CONFIG_WIRELESS=y
345# Wireless
346#
347# CONFIG_CFG80211 is not set 349# CONFIG_CFG80211 is not set
350CONFIG_WIRELESS_OLD_REGULATORY=y
348# CONFIG_WIRELESS_EXT is not set 351# CONFIG_WIRELESS_EXT is not set
349# CONFIG_MAC80211 is not set 352# CONFIG_MAC80211 is not set
350# CONFIG_IEEE80211 is not set 353# CONFIG_IEEE80211 is not set
@@ -396,18 +399,17 @@ CONFIG_MISC_DEVICES=y
396# CONFIG_HP_ILO is not set 399# CONFIG_HP_ILO is not set
397CONFIG_HAVE_IDE=y 400CONFIG_HAVE_IDE=y
398CONFIG_IDE=y 401CONFIG_IDE=y
399CONFIG_BLK_DEV_IDE=y
400 402
401# 403#
402# Please see Documentation/ide/ide.txt for help/info on IDE drives 404# Please see Documentation/ide/ide.txt for help/info on IDE drives
403# 405#
404CONFIG_IDE_TIMINGS=y 406CONFIG_IDE_TIMINGS=y
405# CONFIG_BLK_DEV_IDE_SATA is not set 407# CONFIG_BLK_DEV_IDE_SATA is not set
406# CONFIG_BLK_DEV_IDEDISK is not set 408CONFIG_IDE_GD=y
407# CONFIG_IDEDISK_MULTI_MODE is not set 409CONFIG_IDE_GD_ATA=y
410# CONFIG_IDE_GD_ATAPI is not set
408# CONFIG_BLK_DEV_IDECD is not set 411# CONFIG_BLK_DEV_IDECD is not set
409# CONFIG_BLK_DEV_IDETAPE is not set 412# CONFIG_BLK_DEV_IDETAPE is not set
410# CONFIG_BLK_DEV_IDEFLOPPY is not set
411# CONFIG_IDE_TASK_IOCTL is not set 413# CONFIG_IDE_TASK_IOCTL is not set
412CONFIG_IDE_PROC_FS=y 414CONFIG_IDE_PROC_FS=y
413 415
@@ -510,13 +512,16 @@ CONFIG_MII=y
510# CONFIG_IBM_NEW_EMAC_RGMII is not set 512# CONFIG_IBM_NEW_EMAC_RGMII is not set
511# CONFIG_IBM_NEW_EMAC_TAH is not set 513# CONFIG_IBM_NEW_EMAC_TAH is not set
512# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 514# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
515# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
516# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
517# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
513# CONFIG_NET_PCI is not set 518# CONFIG_NET_PCI is not set
514# CONFIG_B44 is not set 519# CONFIG_B44 is not set
520# CONFIG_ATL2 is not set
515CONFIG_NETDEV_1000=y 521CONFIG_NETDEV_1000=y
516# CONFIG_ACENIC is not set 522# CONFIG_ACENIC is not set
517# CONFIG_DL2K is not set 523# CONFIG_DL2K is not set
518CONFIG_E1000=y 524CONFIG_E1000=y
519# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
520# CONFIG_E1000E is not set 525# CONFIG_E1000E is not set
521# CONFIG_IP1000 is not set 526# CONFIG_IP1000 is not set
522# CONFIG_IGB is not set 527# CONFIG_IGB is not set
@@ -534,18 +539,22 @@ CONFIG_GIANFAR=y
534# CONFIG_QLA3XXX is not set 539# CONFIG_QLA3XXX is not set
535# CONFIG_ATL1 is not set 540# CONFIG_ATL1 is not set
536# CONFIG_ATL1E is not set 541# CONFIG_ATL1E is not set
542# CONFIG_JME is not set
537CONFIG_NETDEV_10000=y 543CONFIG_NETDEV_10000=y
538# CONFIG_CHELSIO_T1 is not set 544# CONFIG_CHELSIO_T1 is not set
539# CONFIG_CHELSIO_T3 is not set 545# CONFIG_CHELSIO_T3 is not set
546# CONFIG_ENIC is not set
540# CONFIG_IXGBE is not set 547# CONFIG_IXGBE is not set
541# CONFIG_IXGB is not set 548# CONFIG_IXGB is not set
542# CONFIG_S2IO is not set 549# CONFIG_S2IO is not set
543# CONFIG_MYRI10GE is not set 550# CONFIG_MYRI10GE is not set
544# CONFIG_NETXEN_NIC is not set 551# CONFIG_NETXEN_NIC is not set
545# CONFIG_NIU is not set 552# CONFIG_NIU is not set
553# CONFIG_MLX4_EN is not set
546# CONFIG_MLX4_CORE is not set 554# CONFIG_MLX4_CORE is not set
547# CONFIG_TEHUTI is not set 555# CONFIG_TEHUTI is not set
548# CONFIG_BNX2X is not set 556# CONFIG_BNX2X is not set
557# CONFIG_QLGE is not set
549# CONFIG_SFC is not set 558# CONFIG_SFC is not set
550# CONFIG_TR is not set 559# CONFIG_TR is not set
551 560
@@ -679,6 +688,14 @@ CONFIG_SSB_POSSIBLE=y
679# CONFIG_MFD_TMIO is not set 688# CONFIG_MFD_TMIO is not set
680 689
681# 690#
691# Voltage and Current regulators
692#
693# CONFIG_REGULATOR is not set
694# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
695# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
696# CONFIG_REGULATOR_BQ24022 is not set
697
698#
682# Multimedia devices 699# Multimedia devices
683# 700#
684 701
@@ -713,6 +730,12 @@ CONFIG_HID_SUPPORT=y
713CONFIG_HID=y 730CONFIG_HID=y
714# CONFIG_HID_DEBUG is not set 731# CONFIG_HID_DEBUG is not set
715# CONFIG_HIDRAW is not set 732# CONFIG_HIDRAW is not set
733# CONFIG_HID_PID is not set
734
735#
736# Special HID drivers
737#
738CONFIG_HID_COMPAT=y
716CONFIG_USB_SUPPORT=y 739CONFIG_USB_SUPPORT=y
717CONFIG_USB_ARCH_HAS_HCD=y 740CONFIG_USB_ARCH_HAS_HCD=y
718CONFIG_USB_ARCH_HAS_OHCI=y 741CONFIG_USB_ARCH_HAS_OHCI=y
@@ -729,6 +752,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
729# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 752# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
730# 753#
731# CONFIG_USB_GADGET is not set 754# CONFIG_USB_GADGET is not set
755# CONFIG_UWB is not set
732# CONFIG_MMC is not set 756# CONFIG_MMC is not set
733# CONFIG_MEMSTICK is not set 757# CONFIG_MEMSTICK is not set
734# CONFIG_NEW_LEDS is not set 758# CONFIG_NEW_LEDS is not set
@@ -738,6 +762,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
738# CONFIG_RTC_CLASS is not set 762# CONFIG_RTC_CLASS is not set
739# CONFIG_DMADEVICES is not set 763# CONFIG_DMADEVICES is not set
740# CONFIG_UIO is not set 764# CONFIG_UIO is not set
765# CONFIG_STAGING is not set
741 766
742# 767#
743# File systems 768# File systems
@@ -749,12 +774,13 @@ CONFIG_EXT3_FS=y
749CONFIG_EXT3_FS_XATTR=y 774CONFIG_EXT3_FS_XATTR=y
750# CONFIG_EXT3_FS_POSIX_ACL is not set 775# CONFIG_EXT3_FS_POSIX_ACL is not set
751# CONFIG_EXT3_FS_SECURITY is not set 776# CONFIG_EXT3_FS_SECURITY is not set
752# CONFIG_EXT4DEV_FS is not set 777# CONFIG_EXT4_FS is not set
753CONFIG_JBD=y 778CONFIG_JBD=y
754CONFIG_FS_MBCACHE=y 779CONFIG_FS_MBCACHE=y
755# CONFIG_REISERFS_FS is not set 780# CONFIG_REISERFS_FS is not set
756# CONFIG_JFS_FS is not set 781# CONFIG_JFS_FS is not set
757# CONFIG_FS_POSIX_ACL is not set 782# CONFIG_FS_POSIX_ACL is not set
783CONFIG_FILE_LOCKING=y
758# CONFIG_XFS_FS is not set 784# CONFIG_XFS_FS is not set
759# CONFIG_OCFS2_FS is not set 785# CONFIG_OCFS2_FS is not set
760CONFIG_DNOTIFY=y 786CONFIG_DNOTIFY=y
@@ -784,6 +810,7 @@ CONFIG_INOTIFY_USER=y
784CONFIG_PROC_FS=y 810CONFIG_PROC_FS=y
785CONFIG_PROC_KCORE=y 811CONFIG_PROC_KCORE=y
786CONFIG_PROC_SYSCTL=y 812CONFIG_PROC_SYSCTL=y
813CONFIG_PROC_PAGE_MONITOR=y
787CONFIG_SYSFS=y 814CONFIG_SYSFS=y
788CONFIG_TMPFS=y 815CONFIG_TMPFS=y
789# CONFIG_TMPFS_POSIX_ACL is not set 816# CONFIG_TMPFS_POSIX_ACL is not set
@@ -818,6 +845,7 @@ CONFIG_ROOT_NFS=y
818CONFIG_LOCKD=y 845CONFIG_LOCKD=y
819CONFIG_NFS_COMMON=y 846CONFIG_NFS_COMMON=y
820CONFIG_SUNRPC=y 847CONFIG_SUNRPC=y
848# CONFIG_SUNRPC_REGISTER_V4 is not set
821# CONFIG_RPCSEC_GSS_KRB5 is not set 849# CONFIG_RPCSEC_GSS_KRB5 is not set
822# CONFIG_RPCSEC_GSS_SPKM3 is not set 850# CONFIG_RPCSEC_GSS_SPKM3 is not set
823# CONFIG_SMB_FS is not set 851# CONFIG_SMB_FS is not set
@@ -850,7 +878,6 @@ CONFIG_PARTITION_ADVANCED=y
850# Library routines 878# Library routines
851# 879#
852CONFIG_BITREVERSE=y 880CONFIG_BITREVERSE=y
853# CONFIG_GENERIC_FIND_FIRST_BIT is not set
854# CONFIG_CRC_CCITT is not set 881# CONFIG_CRC_CCITT is not set
855# CONFIG_CRC16 is not set 882# CONFIG_CRC16 is not set
856# CONFIG_CRC_T10DIF is not set 883# CONFIG_CRC_T10DIF is not set
@@ -902,15 +929,23 @@ CONFIG_DEBUG_MUTEXES=y
902# CONFIG_DEBUG_SG is not set 929# CONFIG_DEBUG_SG is not set
903# CONFIG_BOOT_PRINTK_DELAY is not set 930# CONFIG_BOOT_PRINTK_DELAY is not set
904# CONFIG_RCU_TORTURE_TEST is not set 931# CONFIG_RCU_TORTURE_TEST is not set
932# CONFIG_RCU_CPU_STALL_DETECTOR is not set
905# CONFIG_BACKTRACE_SELF_TEST is not set 933# CONFIG_BACKTRACE_SELF_TEST is not set
934# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
906# CONFIG_FAULT_INJECTION is not set 935# CONFIG_FAULT_INJECTION is not set
907# CONFIG_LATENCYTOP is not set 936# CONFIG_LATENCYTOP is not set
908CONFIG_SYSCTL_SYSCALL_CHECK=y 937CONFIG_SYSCTL_SYSCALL_CHECK=y
909CONFIG_HAVE_FTRACE=y 938CONFIG_HAVE_FUNCTION_TRACER=y
910CONFIG_HAVE_DYNAMIC_FTRACE=y 939
911# CONFIG_FTRACE is not set 940#
941# Tracers
942#
943# CONFIG_FUNCTION_TRACER is not set
912# CONFIG_SCHED_TRACER is not set 944# CONFIG_SCHED_TRACER is not set
913# CONFIG_CONTEXT_SWITCH_TRACER is not set 945# CONFIG_CONTEXT_SWITCH_TRACER is not set
946# CONFIG_BOOT_TRACER is not set
947# CONFIG_STACK_TRACER is not set
948# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
914# CONFIG_SAMPLES is not set 949# CONFIG_SAMPLES is not set
915CONFIG_HAVE_ARCH_KGDB=y 950CONFIG_HAVE_ARCH_KGDB=y
916# CONFIG_KGDB is not set 951# CONFIG_KGDB is not set
@@ -919,6 +954,7 @@ CONFIG_HAVE_ARCH_KGDB=y
919# CONFIG_DEBUG_PAGEALLOC is not set 954# CONFIG_DEBUG_PAGEALLOC is not set
920# CONFIG_CODE_PATCHING_SELFTEST is not set 955# CONFIG_CODE_PATCHING_SELFTEST is not set
921# CONFIG_FTR_FIXUP_SELFTEST is not set 956# CONFIG_FTR_FIXUP_SELFTEST is not set
957# CONFIG_MSI_BITMAP_SELFTEST is not set
922# CONFIG_XMON is not set 958# CONFIG_XMON is not set
923# CONFIG_IRQSTACKS is not set 959# CONFIG_IRQSTACKS is not set
924# CONFIG_BDI_SWITCH is not set 960# CONFIG_BDI_SWITCH is not set
@@ -929,12 +965,14 @@ CONFIG_HAVE_ARCH_KGDB=y
929# 965#
930# CONFIG_KEYS is not set 966# CONFIG_KEYS is not set
931# CONFIG_SECURITY is not set 967# CONFIG_SECURITY is not set
968# CONFIG_SECURITYFS is not set
932# CONFIG_SECURITY_FILE_CAPABILITIES is not set 969# CONFIG_SECURITY_FILE_CAPABILITIES is not set
933CONFIG_CRYPTO=y 970CONFIG_CRYPTO=y
934 971
935# 972#
936# Crypto core or helper 973# Crypto core or helper
937# 974#
975# CONFIG_CRYPTO_FIPS is not set
938# CONFIG_CRYPTO_MANAGER is not set 976# CONFIG_CRYPTO_MANAGER is not set
939# CONFIG_CRYPTO_GF128MUL is not set 977# CONFIG_CRYPTO_GF128MUL is not set
940# CONFIG_CRYPTO_NULL is not set 978# CONFIG_CRYPTO_NULL is not set
@@ -1006,6 +1044,11 @@ CONFIG_CRYPTO=y
1006# 1044#
1007# CONFIG_CRYPTO_DEFLATE is not set 1045# CONFIG_CRYPTO_DEFLATE is not set
1008# CONFIG_CRYPTO_LZO is not set 1046# CONFIG_CRYPTO_LZO is not set
1047
1048#
1049# Random Number Generation
1050#
1051# CONFIG_CRYPTO_ANSI_CPRNG is not set
1009CONFIG_CRYPTO_HW=y 1052CONFIG_CRYPTO_HW=y
1010# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1053# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1011# CONFIG_CRYPTO_DEV_TALITOS is not set 1054# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig
index 41cedc4b63f6..bfe3c9731573 100644
--- a/arch/powerpc/configs/85xx/sbc8548_defconfig
+++ b/arch/powerpc/configs/85xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:35 2008 4# Sat Nov 8 12:40:16 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -106,7 +106,9 @@ CONFIG_SIGNALFD=y
106CONFIG_TIMERFD=y 106CONFIG_TIMERFD=y
107CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
108CONFIG_SHMEM=y 108CONFIG_SHMEM=y
109CONFIG_AIO=y
109CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y
110CONFIG_SLAB=y 112CONFIG_SLAB=y
111# CONFIG_SLUB is not set 113# CONFIG_SLUB is not set
112# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
@@ -118,10 +120,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
118CONFIG_HAVE_KPROBES=y 120CONFIG_HAVE_KPROBES=y
119CONFIG_HAVE_KRETPROBES=y 121CONFIG_HAVE_KRETPROBES=y
120CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
121# CONFIG_HAVE_DMA_ATTRS is not set
122# CONFIG_USE_GENERIC_SMP_HELPERS is not set
123# CONFIG_HAVE_CLK is not set
124CONFIG_PROC_PAGE_MONITOR=y
125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
126CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
127CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
@@ -148,6 +146,7 @@ CONFIG_DEFAULT_AS=y
148# CONFIG_DEFAULT_NOOP is not set 146# CONFIG_DEFAULT_NOOP is not set
149CONFIG_DEFAULT_IOSCHED="anticipatory" 147CONFIG_DEFAULT_IOSCHED="anticipatory"
150CONFIG_CLASSIC_RCU=y 148CONFIG_CLASSIC_RCU=y
149# CONFIG_FREEZER is not set
151 150
152# 151#
153# Platform support 152# Platform support
@@ -182,14 +181,15 @@ CONFIG_MPIC=y
182# CONFIG_PPC_INDIRECT_IO is not set 181# CONFIG_PPC_INDIRECT_IO is not set
183# CONFIG_GENERIC_IOMAP is not set 182# CONFIG_GENERIC_IOMAP is not set
184# CONFIG_CPU_FREQ is not set 183# CONFIG_CPU_FREQ is not set
184# CONFIG_QUICC_ENGINE is not set
185# CONFIG_CPM2 is not set 185# CONFIG_CPM2 is not set
186# CONFIG_FSL_ULI1575 is not set 186# CONFIG_FSL_ULI1575 is not set
187# CONFIG_MPC8xxx_GPIO is not set
187 188
188# 189#
189# Kernel options 190# Kernel options
190# 191#
191# CONFIG_HIGHMEM is not set 192# CONFIG_HIGHMEM is not set
192# CONFIG_TICK_ONESHOT is not set
193# CONFIG_NO_HZ is not set 193# CONFIG_NO_HZ is not set
194# CONFIG_HIGH_RES_TIMERS is not set 194# CONFIG_HIGH_RES_TIMERS is not set
195CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 195CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -203,6 +203,8 @@ CONFIG_PREEMPT_NONE=y
203# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
204# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
205CONFIG_BINFMT_ELF=y 205CONFIG_BINFMT_ELF=y
206# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
207# CONFIG_HAVE_AOUT is not set
206CONFIG_BINFMT_MISC=y 208CONFIG_BINFMT_MISC=y
207CONFIG_MATH_EMULATION=y 209CONFIG_MATH_EMULATION=y
208# CONFIG_IOMMU_HELPER is not set 210# CONFIG_IOMMU_HELPER is not set
@@ -217,15 +219,15 @@ CONFIG_FLATMEM_MANUAL=y
217# CONFIG_SPARSEMEM_MANUAL is not set 219# CONFIG_SPARSEMEM_MANUAL is not set
218CONFIG_FLATMEM=y 220CONFIG_FLATMEM=y
219CONFIG_FLAT_NODE_MEM_MAP=y 221CONFIG_FLAT_NODE_MEM_MAP=y
220# CONFIG_SPARSEMEM_STATIC is not set
221# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
222CONFIG_PAGEFLAGS_EXTENDED=y 222CONFIG_PAGEFLAGS_EXTENDED=y
223CONFIG_SPLIT_PTLOCK_CPUS=4 223CONFIG_SPLIT_PTLOCK_CPUS=4
224CONFIG_MIGRATION=y 224CONFIG_MIGRATION=y
225# CONFIG_RESOURCES_64BIT is not set 225# CONFIG_RESOURCES_64BIT is not set
226# CONFIG_PHYS_ADDR_T_64BIT is not set
226CONFIG_ZONE_DMA_FLAG=1 227CONFIG_ZONE_DMA_FLAG=1
227CONFIG_BOUNCE=y 228CONFIG_BOUNCE=y
228CONFIG_VIRT_TO_BUS=y 229CONFIG_VIRT_TO_BUS=y
230CONFIG_UNEVICTABLE_LRU=y
229CONFIG_FORCE_MAX_ZONEORDER=11 231CONFIG_FORCE_MAX_ZONEORDER=11
230CONFIG_PROC_DEVICETREE=y 232CONFIG_PROC_DEVICETREE=y
231# CONFIG_CMDLINE_BOOL is not set 233# CONFIG_CMDLINE_BOOL is not set
@@ -248,7 +250,7 @@ CONFIG_PCI_SYSCALL=y
248# CONFIG_PCIEPORTBUS is not set 250# CONFIG_PCIEPORTBUS is not set
249CONFIG_ARCH_SUPPORTS_MSI=y 251CONFIG_ARCH_SUPPORTS_MSI=y
250# CONFIG_PCI_MSI is not set 252# CONFIG_PCI_MSI is not set
251CONFIG_PCI_LEGACY=y 253# CONFIG_PCI_LEGACY is not set
252# CONFIG_PCCARD is not set 254# CONFIG_PCCARD is not set
253# CONFIG_HOTPLUG_PCI is not set 255# CONFIG_HOTPLUG_PCI is not set
254# CONFIG_HAS_RAPIDIO is not set 256# CONFIG_HAS_RAPIDIO is not set
@@ -317,6 +319,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
317# CONFIG_TIPC is not set 319# CONFIG_TIPC is not set
318# CONFIG_ATM is not set 320# CONFIG_ATM is not set
319# CONFIG_BRIDGE is not set 321# CONFIG_BRIDGE is not set
322# CONFIG_NET_DSA is not set
320# CONFIG_VLAN_8021Q is not set 323# CONFIG_VLAN_8021Q is not set
321# CONFIG_DECNET is not set 324# CONFIG_DECNET is not set
322# CONFIG_LLC2 is not set 325# CONFIG_LLC2 is not set
@@ -337,11 +340,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
337# CONFIG_IRDA is not set 340# CONFIG_IRDA is not set
338# CONFIG_BT is not set 341# CONFIG_BT is not set
339# CONFIG_AF_RXRPC is not set 342# CONFIG_AF_RXRPC is not set
340 343# CONFIG_PHONET is not set
341# 344CONFIG_WIRELESS=y
342# Wireless
343#
344# CONFIG_CFG80211 is not set 345# CONFIG_CFG80211 is not set
346CONFIG_WIRELESS_OLD_REGULATORY=y
345# CONFIG_WIRELESS_EXT is not set 347# CONFIG_WIRELESS_EXT is not set
346# CONFIG_MAC80211 is not set 348# CONFIG_MAC80211 is not set
347# CONFIG_IEEE80211 is not set 349# CONFIG_IEEE80211 is not set
@@ -451,8 +453,12 @@ CONFIG_MII=y
451# CONFIG_IBM_NEW_EMAC_RGMII is not set 453# CONFIG_IBM_NEW_EMAC_RGMII is not set
452# CONFIG_IBM_NEW_EMAC_TAH is not set 454# CONFIG_IBM_NEW_EMAC_TAH is not set
453# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 455# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
456# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
457# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
458# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
454# CONFIG_NET_PCI is not set 459# CONFIG_NET_PCI is not set
455# CONFIG_B44 is not set 460# CONFIG_B44 is not set
461# CONFIG_ATL2 is not set
456CONFIG_NETDEV_1000=y 462CONFIG_NETDEV_1000=y
457# CONFIG_ACENIC is not set 463# CONFIG_ACENIC is not set
458# CONFIG_DL2K is not set 464# CONFIG_DL2K is not set
@@ -474,18 +480,22 @@ CONFIG_GIANFAR=y
474# CONFIG_QLA3XXX is not set 480# CONFIG_QLA3XXX is not set
475# CONFIG_ATL1 is not set 481# CONFIG_ATL1 is not set
476# CONFIG_ATL1E is not set 482# CONFIG_ATL1E is not set
483# CONFIG_JME is not set
477CONFIG_NETDEV_10000=y 484CONFIG_NETDEV_10000=y
478# CONFIG_CHELSIO_T1 is not set 485# CONFIG_CHELSIO_T1 is not set
479# CONFIG_CHELSIO_T3 is not set 486# CONFIG_CHELSIO_T3 is not set
487# CONFIG_ENIC is not set
480# CONFIG_IXGBE is not set 488# CONFIG_IXGBE is not set
481# CONFIG_IXGB is not set 489# CONFIG_IXGB is not set
482# CONFIG_S2IO is not set 490# CONFIG_S2IO is not set
483# CONFIG_MYRI10GE is not set 491# CONFIG_MYRI10GE is not set
484# CONFIG_NETXEN_NIC is not set 492# CONFIG_NETXEN_NIC is not set
485# CONFIG_NIU is not set 493# CONFIG_NIU is not set
494# CONFIG_MLX4_EN is not set
486# CONFIG_MLX4_CORE is not set 495# CONFIG_MLX4_CORE is not set
487# CONFIG_TEHUTI is not set 496# CONFIG_TEHUTI is not set
488# CONFIG_BNX2X is not set 497# CONFIG_BNX2X is not set
498# CONFIG_QLGE is not set
489# CONFIG_SFC is not set 499# CONFIG_SFC is not set
490# CONFIG_TR is not set 500# CONFIG_TR is not set
491 501
@@ -619,6 +629,14 @@ CONFIG_SSB_POSSIBLE=y
619# CONFIG_MFD_TMIO is not set 629# CONFIG_MFD_TMIO is not set
620 630
621# 631#
632# Voltage and Current regulators
633#
634# CONFIG_REGULATOR is not set
635# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
636# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
637# CONFIG_REGULATOR_BQ24022 is not set
638
639#
622# Multimedia devices 640# Multimedia devices
623# 641#
624 642
@@ -651,6 +669,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
651# CONFIG_SOUND is not set 669# CONFIG_SOUND is not set
652# CONFIG_HID_SUPPORT is not set 670# CONFIG_HID_SUPPORT is not set
653# CONFIG_USB_SUPPORT is not set 671# CONFIG_USB_SUPPORT is not set
672# CONFIG_UWB is not set
654# CONFIG_MMC is not set 673# CONFIG_MMC is not set
655# CONFIG_MEMSTICK is not set 674# CONFIG_MEMSTICK is not set
656# CONFIG_NEW_LEDS is not set 675# CONFIG_NEW_LEDS is not set
@@ -660,16 +679,18 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
660# CONFIG_RTC_CLASS is not set 679# CONFIG_RTC_CLASS is not set
661# CONFIG_DMADEVICES is not set 680# CONFIG_DMADEVICES is not set
662# CONFIG_UIO is not set 681# CONFIG_UIO is not set
682# CONFIG_STAGING is not set
663 683
664# 684#
665# File systems 685# File systems
666# 686#
667# CONFIG_EXT2_FS is not set 687# CONFIG_EXT2_FS is not set
668# CONFIG_EXT3_FS is not set 688# CONFIG_EXT3_FS is not set
669# CONFIG_EXT4DEV_FS is not set 689# CONFIG_EXT4_FS is not set
670# CONFIG_REISERFS_FS is not set 690# CONFIG_REISERFS_FS is not set
671# CONFIG_JFS_FS is not set 691# CONFIG_JFS_FS is not set
672# CONFIG_FS_POSIX_ACL is not set 692# CONFIG_FS_POSIX_ACL is not set
693CONFIG_FILE_LOCKING=y
673# CONFIG_XFS_FS is not set 694# CONFIG_XFS_FS is not set
674# CONFIG_OCFS2_FS is not set 695# CONFIG_OCFS2_FS is not set
675CONFIG_DNOTIFY=y 696CONFIG_DNOTIFY=y
@@ -699,6 +720,7 @@ CONFIG_INOTIFY_USER=y
699CONFIG_PROC_FS=y 720CONFIG_PROC_FS=y
700CONFIG_PROC_KCORE=y 721CONFIG_PROC_KCORE=y
701CONFIG_PROC_SYSCTL=y 722CONFIG_PROC_SYSCTL=y
723CONFIG_PROC_PAGE_MONITOR=y
702CONFIG_SYSFS=y 724CONFIG_SYSFS=y
703CONFIG_TMPFS=y 725CONFIG_TMPFS=y
704# CONFIG_TMPFS_POSIX_ACL is not set 726# CONFIG_TMPFS_POSIX_ACL is not set
@@ -733,6 +755,7 @@ CONFIG_ROOT_NFS=y
733CONFIG_LOCKD=y 755CONFIG_LOCKD=y
734CONFIG_NFS_COMMON=y 756CONFIG_NFS_COMMON=y
735CONFIG_SUNRPC=y 757CONFIG_SUNRPC=y
758# CONFIG_SUNRPC_REGISTER_V4 is not set
736# CONFIG_RPCSEC_GSS_KRB5 is not set 759# CONFIG_RPCSEC_GSS_KRB5 is not set
737# CONFIG_RPCSEC_GSS_SPKM3 is not set 760# CONFIG_RPCSEC_GSS_SPKM3 is not set
738# CONFIG_SMB_FS is not set 761# CONFIG_SMB_FS is not set
@@ -753,7 +776,6 @@ CONFIG_MSDOS_PARTITION=y
753# Library routines 776# Library routines
754# 777#
755CONFIG_BITREVERSE=y 778CONFIG_BITREVERSE=y
756# CONFIG_GENERIC_FIND_FIRST_BIT is not set
757# CONFIG_CRC_CCITT is not set 779# CONFIG_CRC_CCITT is not set
758# CONFIG_CRC16 is not set 780# CONFIG_CRC16 is not set
759# CONFIG_CRC_T10DIF is not set 781# CONFIG_CRC_T10DIF is not set
@@ -781,13 +803,15 @@ CONFIG_FRAME_WARN=1024
781# CONFIG_DEBUG_KERNEL is not set 803# CONFIG_DEBUG_KERNEL is not set
782# CONFIG_DEBUG_BUGVERBOSE is not set 804# CONFIG_DEBUG_BUGVERBOSE is not set
783# CONFIG_DEBUG_MEMORY_INIT is not set 805# CONFIG_DEBUG_MEMORY_INIT is not set
806# CONFIG_RCU_CPU_STALL_DETECTOR is not set
784# CONFIG_LATENCYTOP is not set 807# CONFIG_LATENCYTOP is not set
785CONFIG_SYSCTL_SYSCALL_CHECK=y 808CONFIG_SYSCTL_SYSCALL_CHECK=y
786CONFIG_HAVE_FTRACE=y 809CONFIG_HAVE_FUNCTION_TRACER=y
787CONFIG_HAVE_DYNAMIC_FTRACE=y 810
788# CONFIG_FTRACE is not set 811#
789# CONFIG_SCHED_TRACER is not set 812# Tracers
790# CONFIG_CONTEXT_SWITCH_TRACER is not set 813#
814# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
791# CONFIG_SAMPLES is not set 815# CONFIG_SAMPLES is not set
792CONFIG_HAVE_ARCH_KGDB=y 816CONFIG_HAVE_ARCH_KGDB=y
793# CONFIG_IRQSTACKS is not set 817# CONFIG_IRQSTACKS is not set
@@ -798,12 +822,14 @@ CONFIG_HAVE_ARCH_KGDB=y
798# 822#
799# CONFIG_KEYS is not set 823# CONFIG_KEYS is not set
800# CONFIG_SECURITY is not set 824# CONFIG_SECURITY is not set
825# CONFIG_SECURITYFS is not set
801# CONFIG_SECURITY_FILE_CAPABILITIES is not set 826# CONFIG_SECURITY_FILE_CAPABILITIES is not set
802CONFIG_CRYPTO=y 827CONFIG_CRYPTO=y
803 828
804# 829#
805# Crypto core or helper 830# Crypto core or helper
806# 831#
832# CONFIG_CRYPTO_FIPS is not set
807# CONFIG_CRYPTO_MANAGER is not set 833# CONFIG_CRYPTO_MANAGER is not set
808# CONFIG_CRYPTO_GF128MUL is not set 834# CONFIG_CRYPTO_GF128MUL is not set
809# CONFIG_CRYPTO_NULL is not set 835# CONFIG_CRYPTO_NULL is not set
@@ -875,6 +901,11 @@ CONFIG_CRYPTO=y
875# 901#
876# CONFIG_CRYPTO_DEFLATE is not set 902# CONFIG_CRYPTO_DEFLATE is not set
877# CONFIG_CRYPTO_LZO is not set 903# CONFIG_CRYPTO_LZO is not set
904
905#
906# Random Number Generation
907#
908# CONFIG_CRYPTO_ANSI_CPRNG is not set
878CONFIG_CRYPTO_HW=y 909CONFIG_CRYPTO_HW=y
879# CONFIG_CRYPTO_DEV_HIFN_795X is not set 910# CONFIG_CRYPTO_DEV_HIFN_795X is not set
880# CONFIG_CRYPTO_DEV_TALITOS is not set 911# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/85xx/sbc8560_defconfig b/arch/powerpc/configs/85xx/sbc8560_defconfig
index daef36f41b42..8c507f8d15a8 100644
--- a/arch/powerpc/configs/85xx/sbc8560_defconfig
+++ b/arch/powerpc/configs/85xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:36 2008 4# Sat Nov 8 12:40:17 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -107,6 +107,7 @@ CONFIG_SIGNALFD=y
107CONFIG_TIMERFD=y 107CONFIG_TIMERFD=y
108CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
109CONFIG_SHMEM=y 109CONFIG_SHMEM=y
110CONFIG_AIO=y
110CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_SLAB=y 112CONFIG_SLAB=y
112# CONFIG_SLUB is not set 113# CONFIG_SLUB is not set
@@ -119,10 +120,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
119CONFIG_HAVE_KPROBES=y 120CONFIG_HAVE_KPROBES=y
120CONFIG_HAVE_KRETPROBES=y 121CONFIG_HAVE_KRETPROBES=y
121CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_DMA_ATTRS is not set
123# CONFIG_USE_GENERIC_SMP_HELPERS is not set
124# CONFIG_HAVE_CLK is not set
125CONFIG_PROC_PAGE_MONITOR=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
@@ -149,6 +146,7 @@ CONFIG_DEFAULT_AS=y
149# CONFIG_DEFAULT_NOOP is not set 146# CONFIG_DEFAULT_NOOP is not set
150CONFIG_DEFAULT_IOSCHED="anticipatory" 147CONFIG_DEFAULT_IOSCHED="anticipatory"
151CONFIG_CLASSIC_RCU=y 148CONFIG_CLASSIC_RCU=y
149# CONFIG_FREEZER is not set
152 150
153# 151#
154# Platform support 152# Platform support
@@ -183,14 +181,15 @@ CONFIG_MPIC=y
183# CONFIG_PPC_INDIRECT_IO is not set 181# CONFIG_PPC_INDIRECT_IO is not set
184# CONFIG_GENERIC_IOMAP is not set 182# CONFIG_GENERIC_IOMAP is not set
185# CONFIG_CPU_FREQ is not set 183# CONFIG_CPU_FREQ is not set
184# CONFIG_QUICC_ENGINE is not set
186# CONFIG_CPM2 is not set 185# CONFIG_CPM2 is not set
187# CONFIG_FSL_ULI1575 is not set 186# CONFIG_FSL_ULI1575 is not set
187# CONFIG_MPC8xxx_GPIO is not set
188 188
189# 189#
190# Kernel options 190# Kernel options
191# 191#
192# CONFIG_HIGHMEM is not set 192# CONFIG_HIGHMEM is not set
193# CONFIG_TICK_ONESHOT is not set
194# CONFIG_NO_HZ is not set 193# CONFIG_NO_HZ is not set
195# CONFIG_HIGH_RES_TIMERS is not set 194# CONFIG_HIGH_RES_TIMERS is not set
196CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 195CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -204,6 +203,8 @@ CONFIG_PREEMPT_NONE=y
204# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
205# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
206CONFIG_BINFMT_ELF=y 205CONFIG_BINFMT_ELF=y
206# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
207# CONFIG_HAVE_AOUT is not set
207CONFIG_BINFMT_MISC=y 208CONFIG_BINFMT_MISC=y
208# CONFIG_MATH_EMULATION is not set 209# CONFIG_MATH_EMULATION is not set
209# CONFIG_IOMMU_HELPER is not set 210# CONFIG_IOMMU_HELPER is not set
@@ -218,15 +219,15 @@ CONFIG_FLATMEM_MANUAL=y
218# CONFIG_SPARSEMEM_MANUAL is not set 219# CONFIG_SPARSEMEM_MANUAL is not set
219CONFIG_FLATMEM=y 220CONFIG_FLATMEM=y
220CONFIG_FLAT_NODE_MEM_MAP=y 221CONFIG_FLAT_NODE_MEM_MAP=y
221# CONFIG_SPARSEMEM_STATIC is not set
222# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
223CONFIG_PAGEFLAGS_EXTENDED=y 222CONFIG_PAGEFLAGS_EXTENDED=y
224CONFIG_SPLIT_PTLOCK_CPUS=4 223CONFIG_SPLIT_PTLOCK_CPUS=4
225CONFIG_MIGRATION=y 224CONFIG_MIGRATION=y
226# CONFIG_RESOURCES_64BIT is not set 225# CONFIG_RESOURCES_64BIT is not set
226# CONFIG_PHYS_ADDR_T_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=1 227CONFIG_ZONE_DMA_FLAG=1
228CONFIG_BOUNCE=y 228CONFIG_BOUNCE=y
229CONFIG_VIRT_TO_BUS=y 229CONFIG_VIRT_TO_BUS=y
230CONFIG_UNEVICTABLE_LRU=y
230CONFIG_FORCE_MAX_ZONEORDER=11 231CONFIG_FORCE_MAX_ZONEORDER=11
231CONFIG_PROC_DEVICETREE=y 232CONFIG_PROC_DEVICETREE=y
232# CONFIG_CMDLINE_BOOL is not set 233# CONFIG_CMDLINE_BOOL is not set
@@ -312,6 +313,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
312# CONFIG_TIPC is not set 313# CONFIG_TIPC is not set
313# CONFIG_ATM is not set 314# CONFIG_ATM is not set
314# CONFIG_BRIDGE is not set 315# CONFIG_BRIDGE is not set
316# CONFIG_NET_DSA is not set
315# CONFIG_VLAN_8021Q is not set 317# CONFIG_VLAN_8021Q is not set
316# CONFIG_DECNET is not set 318# CONFIG_DECNET is not set
317# CONFIG_LLC2 is not set 319# CONFIG_LLC2 is not set
@@ -332,11 +334,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
332# CONFIG_IRDA is not set 334# CONFIG_IRDA is not set
333# CONFIG_BT is not set 335# CONFIG_BT is not set
334# CONFIG_AF_RXRPC is not set 336# CONFIG_AF_RXRPC is not set
335 337# CONFIG_PHONET is not set
336# 338CONFIG_WIRELESS=y
337# Wireless
338#
339# CONFIG_CFG80211 is not set 339# CONFIG_CFG80211 is not set
340CONFIG_WIRELESS_OLD_REGULATORY=y
340# CONFIG_WIRELESS_EXT is not set 341# CONFIG_WIRELESS_EXT is not set
341# CONFIG_MAC80211 is not set 342# CONFIG_MAC80211 is not set
342# CONFIG_IEEE80211 is not set 343# CONFIG_IEEE80211 is not set
@@ -420,6 +421,9 @@ CONFIG_MII=y
420# CONFIG_IBM_NEW_EMAC_RGMII is not set 421# CONFIG_IBM_NEW_EMAC_RGMII is not set
421# CONFIG_IBM_NEW_EMAC_TAH is not set 422# CONFIG_IBM_NEW_EMAC_TAH is not set
422# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 423# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
424# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
425# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
426# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
423# CONFIG_B44 is not set 427# CONFIG_B44 is not set
424CONFIG_NETDEV_1000=y 428CONFIG_NETDEV_1000=y
425CONFIG_GIANFAR=y 429CONFIG_GIANFAR=y
@@ -542,6 +546,14 @@ CONFIG_SSB_POSSIBLE=y
542# CONFIG_MFD_TMIO is not set 546# CONFIG_MFD_TMIO is not set
543 547
544# 548#
549# Voltage and Current regulators
550#
551# CONFIG_REGULATOR is not set
552# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
553# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
554# CONFIG_REGULATOR_BQ24022 is not set
555
556#
545# Multimedia devices 557# Multimedia devices
546# 558#
547 559
@@ -574,6 +586,12 @@ CONFIG_HID_SUPPORT=y
574CONFIG_HID=y 586CONFIG_HID=y
575# CONFIG_HID_DEBUG is not set 587# CONFIG_HID_DEBUG is not set
576# CONFIG_HIDRAW is not set 588# CONFIG_HIDRAW is not set
589# CONFIG_HID_PID is not set
590
591#
592# Special HID drivers
593#
594CONFIG_HID_COMPAT=y
577CONFIG_USB_SUPPORT=y 595CONFIG_USB_SUPPORT=y
578# CONFIG_USB_ARCH_HAS_HCD is not set 596# CONFIG_USB_ARCH_HAS_HCD is not set
579# CONFIG_USB_ARCH_HAS_OHCI is not set 597# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -617,12 +635,15 @@ CONFIG_RTC_INTF_DEV=y
617# Platform RTC drivers 635# Platform RTC drivers
618# 636#
619# CONFIG_RTC_DRV_CMOS is not set 637# CONFIG_RTC_DRV_CMOS is not set
638# CONFIG_RTC_DRV_DS1286 is not set
620# CONFIG_RTC_DRV_DS1511 is not set 639# CONFIG_RTC_DRV_DS1511 is not set
621# CONFIG_RTC_DRV_DS1553 is not set 640# CONFIG_RTC_DRV_DS1553 is not set
622# CONFIG_RTC_DRV_DS1742 is not set 641# CONFIG_RTC_DRV_DS1742 is not set
623# CONFIG_RTC_DRV_STK17TA8 is not set 642# CONFIG_RTC_DRV_STK17TA8 is not set
624# CONFIG_RTC_DRV_M48T86 is not set 643# CONFIG_RTC_DRV_M48T86 is not set
644# CONFIG_RTC_DRV_M48T35 is not set
625CONFIG_RTC_DRV_M48T59=y 645CONFIG_RTC_DRV_M48T59=y
646# CONFIG_RTC_DRV_BQ4802 is not set
626# CONFIG_RTC_DRV_V3020 is not set 647# CONFIG_RTC_DRV_V3020 is not set
627 648
628# 649#
@@ -631,16 +652,18 @@ CONFIG_RTC_DRV_M48T59=y
631# CONFIG_RTC_DRV_PPC is not set 652# CONFIG_RTC_DRV_PPC is not set
632# CONFIG_DMADEVICES is not set 653# CONFIG_DMADEVICES is not set
633# CONFIG_UIO is not set 654# CONFIG_UIO is not set
655# CONFIG_STAGING is not set
634 656
635# 657#
636# File systems 658# File systems
637# 659#
638# CONFIG_EXT2_FS is not set 660# CONFIG_EXT2_FS is not set
639# CONFIG_EXT3_FS is not set 661# CONFIG_EXT3_FS is not set
640# CONFIG_EXT4DEV_FS is not set 662# CONFIG_EXT4_FS is not set
641# CONFIG_REISERFS_FS is not set 663# CONFIG_REISERFS_FS is not set
642# CONFIG_JFS_FS is not set 664# CONFIG_JFS_FS is not set
643# CONFIG_FS_POSIX_ACL is not set 665# CONFIG_FS_POSIX_ACL is not set
666CONFIG_FILE_LOCKING=y
644# CONFIG_XFS_FS is not set 667# CONFIG_XFS_FS is not set
645# CONFIG_OCFS2_FS is not set 668# CONFIG_OCFS2_FS is not set
646CONFIG_DNOTIFY=y 669CONFIG_DNOTIFY=y
@@ -670,6 +693,7 @@ CONFIG_INOTIFY_USER=y
670CONFIG_PROC_FS=y 693CONFIG_PROC_FS=y
671CONFIG_PROC_KCORE=y 694CONFIG_PROC_KCORE=y
672CONFIG_PROC_SYSCTL=y 695CONFIG_PROC_SYSCTL=y
696CONFIG_PROC_PAGE_MONITOR=y
673CONFIG_SYSFS=y 697CONFIG_SYSFS=y
674CONFIG_TMPFS=y 698CONFIG_TMPFS=y
675# CONFIG_TMPFS_POSIX_ACL is not set 699# CONFIG_TMPFS_POSIX_ACL is not set
@@ -704,6 +728,7 @@ CONFIG_ROOT_NFS=y
704CONFIG_LOCKD=y 728CONFIG_LOCKD=y
705CONFIG_NFS_COMMON=y 729CONFIG_NFS_COMMON=y
706CONFIG_SUNRPC=y 730CONFIG_SUNRPC=y
731# CONFIG_SUNRPC_REGISTER_V4 is not set
707# CONFIG_RPCSEC_GSS_KRB5 is not set 732# CONFIG_RPCSEC_GSS_KRB5 is not set
708# CONFIG_RPCSEC_GSS_SPKM3 is not set 733# CONFIG_RPCSEC_GSS_SPKM3 is not set
709# CONFIG_SMB_FS is not set 734# CONFIG_SMB_FS is not set
@@ -736,7 +761,6 @@ CONFIG_PARTITION_ADVANCED=y
736# Library routines 761# Library routines
737# 762#
738CONFIG_BITREVERSE=y 763CONFIG_BITREVERSE=y
739# CONFIG_GENERIC_FIND_FIRST_BIT is not set
740# CONFIG_CRC_CCITT is not set 764# CONFIG_CRC_CCITT is not set
741# CONFIG_CRC16 is not set 765# CONFIG_CRC16 is not set
742# CONFIG_CRC_T10DIF is not set 766# CONFIG_CRC_T10DIF is not set
@@ -787,15 +811,23 @@ CONFIG_DEBUG_MUTEXES=y
787# CONFIG_DEBUG_SG is not set 811# CONFIG_DEBUG_SG is not set
788# CONFIG_BOOT_PRINTK_DELAY is not set 812# CONFIG_BOOT_PRINTK_DELAY is not set
789# CONFIG_RCU_TORTURE_TEST is not set 813# CONFIG_RCU_TORTURE_TEST is not set
814# CONFIG_RCU_CPU_STALL_DETECTOR is not set
790# CONFIG_BACKTRACE_SELF_TEST is not set 815# CONFIG_BACKTRACE_SELF_TEST is not set
816# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
791# CONFIG_FAULT_INJECTION is not set 817# CONFIG_FAULT_INJECTION is not set
792# CONFIG_LATENCYTOP is not set 818# CONFIG_LATENCYTOP is not set
793CONFIG_SYSCTL_SYSCALL_CHECK=y 819CONFIG_SYSCTL_SYSCALL_CHECK=y
794CONFIG_HAVE_FTRACE=y 820CONFIG_HAVE_FUNCTION_TRACER=y
795CONFIG_HAVE_DYNAMIC_FTRACE=y 821
796# CONFIG_FTRACE is not set 822#
823# Tracers
824#
825# CONFIG_FUNCTION_TRACER is not set
797# CONFIG_SCHED_TRACER is not set 826# CONFIG_SCHED_TRACER is not set
798# CONFIG_CONTEXT_SWITCH_TRACER is not set 827# CONFIG_CONTEXT_SWITCH_TRACER is not set
828# CONFIG_BOOT_TRACER is not set
829# CONFIG_STACK_TRACER is not set
830# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
799# CONFIG_SAMPLES is not set 831# CONFIG_SAMPLES is not set
800CONFIG_HAVE_ARCH_KGDB=y 832CONFIG_HAVE_ARCH_KGDB=y
801# CONFIG_KGDB is not set 833# CONFIG_KGDB is not set
@@ -804,6 +836,7 @@ CONFIG_HAVE_ARCH_KGDB=y
804# CONFIG_DEBUG_PAGEALLOC is not set 836# CONFIG_DEBUG_PAGEALLOC is not set
805# CONFIG_CODE_PATCHING_SELFTEST is not set 837# CONFIG_CODE_PATCHING_SELFTEST is not set
806# CONFIG_FTR_FIXUP_SELFTEST is not set 838# CONFIG_FTR_FIXUP_SELFTEST is not set
839# CONFIG_MSI_BITMAP_SELFTEST is not set
807# CONFIG_XMON is not set 840# CONFIG_XMON is not set
808# CONFIG_IRQSTACKS is not set 841# CONFIG_IRQSTACKS is not set
809# CONFIG_BDI_SWITCH is not set 842# CONFIG_BDI_SWITCH is not set
@@ -825,12 +858,14 @@ CONFIG_PPC_EARLY_DEBUG=y
825# 858#
826# CONFIG_KEYS is not set 859# CONFIG_KEYS is not set
827# CONFIG_SECURITY is not set 860# CONFIG_SECURITY is not set
861# CONFIG_SECURITYFS is not set
828# CONFIG_SECURITY_FILE_CAPABILITIES is not set 862# CONFIG_SECURITY_FILE_CAPABILITIES is not set
829CONFIG_CRYPTO=y 863CONFIG_CRYPTO=y
830 864
831# 865#
832# Crypto core or helper 866# Crypto core or helper
833# 867#
868# CONFIG_CRYPTO_FIPS is not set
834# CONFIG_CRYPTO_MANAGER is not set 869# CONFIG_CRYPTO_MANAGER is not set
835# CONFIG_CRYPTO_GF128MUL is not set 870# CONFIG_CRYPTO_GF128MUL is not set
836# CONFIG_CRYPTO_NULL is not set 871# CONFIG_CRYPTO_NULL is not set
@@ -902,6 +937,11 @@ CONFIG_CRYPTO=y
902# 937#
903# CONFIG_CRYPTO_DEFLATE is not set 938# CONFIG_CRYPTO_DEFLATE is not set
904# CONFIG_CRYPTO_LZO is not set 939# CONFIG_CRYPTO_LZO is not set
940
941#
942# Random Number Generation
943#
944# CONFIG_CRYPTO_ANSI_CPRNG is not set
905CONFIG_CRYPTO_HW=y 945CONFIG_CRYPTO_HW=y
906# CONFIG_CRYPTO_DEV_TALITOS is not set 946# CONFIG_CRYPTO_DEV_TALITOS is not set
907# CONFIG_PPC_CLOCK is not set 947# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig
index 2b05d43f8f7e..5a0cf58d2b8c 100644
--- a/arch/powerpc/configs/85xx/stx_gp3_defconfig
+++ b/arch/powerpc/configs/85xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:37 2008 4# Sat Nov 8 12:40:19 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -108,7 +108,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 108CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 109CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 110CONFIG_SHMEM=y
111CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 112CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 114CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 115# CONFIG_SLAB is not set
114CONFIG_SLUB=y 116CONFIG_SLUB=y
@@ -122,10 +124,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
122CONFIG_HAVE_KPROBES=y 124CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y 125CONFIG_HAVE_KRETPROBES=y
124CONFIG_HAVE_ARCH_TRACEHOOK=y 126CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_DMA_ATTRS is not set
126# CONFIG_USE_GENERIC_SMP_HELPERS is not set
127CONFIG_HAVE_CLK=y 127CONFIG_HAVE_CLK=y
128CONFIG_PROC_PAGE_MONITOR=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 129CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 130CONFIG_RT_MUTEXES=y
@@ -157,6 +156,7 @@ CONFIG_DEFAULT_CFQ=y
157# CONFIG_DEFAULT_NOOP is not set 156# CONFIG_DEFAULT_NOOP is not set
158CONFIG_DEFAULT_IOSCHED="cfq" 157CONFIG_DEFAULT_IOSCHED="cfq"
159CONFIG_CLASSIC_RCU=y 158CONFIG_CLASSIC_RCU=y
159# CONFIG_FREEZER is not set
160 160
161# 161#
162# Platform support 162# Platform support
@@ -191,15 +191,16 @@ CONFIG_MPIC=y
191# CONFIG_PPC_INDIRECT_IO is not set 191# CONFIG_PPC_INDIRECT_IO is not set
192# CONFIG_GENERIC_IOMAP is not set 192# CONFIG_GENERIC_IOMAP is not set
193# CONFIG_CPU_FREQ is not set 193# CONFIG_CPU_FREQ is not set
194# CONFIG_QUICC_ENGINE is not set
194CONFIG_CPM2=y 195CONFIG_CPM2=y
195# CONFIG_FSL_ULI1575 is not set 196# CONFIG_FSL_ULI1575 is not set
196CONFIG_CPM=y 197CONFIG_CPM=y
198# CONFIG_MPC8xxx_GPIO is not set
197 199
198# 200#
199# Kernel options 201# Kernel options
200# 202#
201CONFIG_HIGHMEM=y 203CONFIG_HIGHMEM=y
202# CONFIG_TICK_ONESHOT is not set
203# CONFIG_NO_HZ is not set 204# CONFIG_NO_HZ is not set
204# CONFIG_HIGH_RES_TIMERS is not set 205# CONFIG_HIGH_RES_TIMERS is not set
205CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 206CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -213,6 +214,8 @@ CONFIG_PREEMPT_NONE=y
213# CONFIG_PREEMPT_VOLUNTARY is not set 214# CONFIG_PREEMPT_VOLUNTARY is not set
214# CONFIG_PREEMPT is not set 215# CONFIG_PREEMPT is not set
215CONFIG_BINFMT_ELF=y 216CONFIG_BINFMT_ELF=y
217# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
218# CONFIG_HAVE_AOUT is not set
216CONFIG_BINFMT_MISC=m 219CONFIG_BINFMT_MISC=m
217CONFIG_MATH_EMULATION=y 220CONFIG_MATH_EMULATION=y
218# CONFIG_IOMMU_HELPER is not set 221# CONFIG_IOMMU_HELPER is not set
@@ -227,15 +230,15 @@ CONFIG_FLATMEM_MANUAL=y
227# CONFIG_SPARSEMEM_MANUAL is not set 230# CONFIG_SPARSEMEM_MANUAL is not set
228CONFIG_FLATMEM=y 231CONFIG_FLATMEM=y
229CONFIG_FLAT_NODE_MEM_MAP=y 232CONFIG_FLAT_NODE_MEM_MAP=y
230# CONFIG_SPARSEMEM_STATIC is not set
231# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
232CONFIG_PAGEFLAGS_EXTENDED=y 233CONFIG_PAGEFLAGS_EXTENDED=y
233CONFIG_SPLIT_PTLOCK_CPUS=4 234CONFIG_SPLIT_PTLOCK_CPUS=4
234CONFIG_MIGRATION=y 235CONFIG_MIGRATION=y
235# CONFIG_RESOURCES_64BIT is not set 236# CONFIG_RESOURCES_64BIT is not set
237# CONFIG_PHYS_ADDR_T_64BIT is not set
236CONFIG_ZONE_DMA_FLAG=1 238CONFIG_ZONE_DMA_FLAG=1
237CONFIG_BOUNCE=y 239CONFIG_BOUNCE=y
238CONFIG_VIRT_TO_BUS=y 240CONFIG_VIRT_TO_BUS=y
241CONFIG_UNEVICTABLE_LRU=y
239CONFIG_FORCE_MAX_ZONEORDER=11 242CONFIG_FORCE_MAX_ZONEORDER=11
240CONFIG_PROC_DEVICETREE=y 243CONFIG_PROC_DEVICETREE=y
241# CONFIG_CMDLINE_BOOL is not set 244# CONFIG_CMDLINE_BOOL is not set
@@ -258,7 +261,7 @@ CONFIG_PCI_SYSCALL=y
258# CONFIG_PCIEPORTBUS is not set 261# CONFIG_PCIEPORTBUS is not set
259CONFIG_ARCH_SUPPORTS_MSI=y 262CONFIG_ARCH_SUPPORTS_MSI=y
260# CONFIG_PCI_MSI is not set 263# CONFIG_PCI_MSI is not set
261CONFIG_PCI_LEGACY=y 264# CONFIG_PCI_LEGACY is not set
262# CONFIG_PCI_DEBUG is not set 265# CONFIG_PCI_DEBUG is not set
263# CONFIG_PCCARD is not set 266# CONFIG_PCCARD is not set
264# CONFIG_HOTPLUG_PCI is not set 267# CONFIG_HOTPLUG_PCI is not set
@@ -319,7 +322,6 @@ CONFIG_INET_TCP_DIAG=y
319CONFIG_TCP_CONG_CUBIC=y 322CONFIG_TCP_CONG_CUBIC=y
320CONFIG_DEFAULT_TCP_CONG="cubic" 323CONFIG_DEFAULT_TCP_CONG="cubic"
321# CONFIG_TCP_MD5SIG is not set 324# CONFIG_TCP_MD5SIG is not set
322# CONFIG_IP_VS is not set
323# CONFIG_IPV6 is not set 325# CONFIG_IPV6 is not set
324# CONFIG_NETWORK_SECMARK is not set 326# CONFIG_NETWORK_SECMARK is not set
325CONFIG_NETFILTER=y 327CONFIG_NETFILTER=y
@@ -335,44 +337,46 @@ CONFIG_NETFILTER_ADVANCED=y
335CONFIG_NETFILTER_XTABLES=m 337CONFIG_NETFILTER_XTABLES=m
336# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set 338# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
337# CONFIG_NETFILTER_XT_TARGET_MARK is not set 339# CONFIG_NETFILTER_XT_TARGET_MARK is not set
338# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
339# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 340# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
341# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
340# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set 342# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
341# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 343# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
342# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set 344# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
343# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 345# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
344# CONFIG_NETFILTER_XT_MATCH_DSCP is not set 346# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
345# CONFIG_NETFILTER_XT_MATCH_ESP is not set 347# CONFIG_NETFILTER_XT_MATCH_ESP is not set
348# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
346# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set 349# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
347# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set 350# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
348# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set 351# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
349# CONFIG_NETFILTER_XT_MATCH_MAC is not set 352# CONFIG_NETFILTER_XT_MATCH_MAC is not set
350# CONFIG_NETFILTER_XT_MATCH_MARK is not set 353# CONFIG_NETFILTER_XT_MATCH_MARK is not set
354# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
351# CONFIG_NETFILTER_XT_MATCH_OWNER is not set 355# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
352# CONFIG_NETFILTER_XT_MATCH_POLICY is not set 356# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
353# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
354# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set 357# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
355# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 358# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
356# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set 359# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
357# CONFIG_NETFILTER_XT_MATCH_REALM is not set 360# CONFIG_NETFILTER_XT_MATCH_REALM is not set
361# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
358# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 362# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
359# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 363# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
360# CONFIG_NETFILTER_XT_MATCH_STRING is not set 364# CONFIG_NETFILTER_XT_MATCH_STRING is not set
361# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set 365# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
362# CONFIG_NETFILTER_XT_MATCH_TIME is not set 366# CONFIG_NETFILTER_XT_MATCH_TIME is not set
363# CONFIG_NETFILTER_XT_MATCH_U32 is not set 367# CONFIG_NETFILTER_XT_MATCH_U32 is not set
364# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 368# CONFIG_IP_VS is not set
365 369
366# 370#
367# IP: Netfilter Configuration 371# IP: Netfilter Configuration
368# 372#
373# CONFIG_NF_DEFRAG_IPV4 is not set
369# CONFIG_IP_NF_QUEUE is not set 374# CONFIG_IP_NF_QUEUE is not set
370CONFIG_IP_NF_IPTABLES=m 375CONFIG_IP_NF_IPTABLES=m
371# CONFIG_IP_NF_MATCH_RECENT is not set 376# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
372# CONFIG_IP_NF_MATCH_ECN is not set
373# CONFIG_IP_NF_MATCH_AH is not set 377# CONFIG_IP_NF_MATCH_AH is not set
378# CONFIG_IP_NF_MATCH_ECN is not set
374# CONFIG_IP_NF_MATCH_TTL is not set 379# CONFIG_IP_NF_MATCH_TTL is not set
375# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
376CONFIG_IP_NF_FILTER=m 380CONFIG_IP_NF_FILTER=m
377# CONFIG_IP_NF_TARGET_REJECT is not set 381# CONFIG_IP_NF_TARGET_REJECT is not set
378# CONFIG_IP_NF_TARGET_LOG is not set 382# CONFIG_IP_NF_TARGET_LOG is not set
@@ -385,6 +389,7 @@ CONFIG_IP_NF_FILTER=m
385# CONFIG_TIPC is not set 389# CONFIG_TIPC is not set
386# CONFIG_ATM is not set 390# CONFIG_ATM is not set
387# CONFIG_BRIDGE is not set 391# CONFIG_BRIDGE is not set
392# CONFIG_NET_DSA is not set
388# CONFIG_VLAN_8021Q is not set 393# CONFIG_VLAN_8021Q is not set
389# CONFIG_DECNET is not set 394# CONFIG_DECNET is not set
390# CONFIG_LLC2 is not set 395# CONFIG_LLC2 is not set
@@ -405,11 +410,10 @@ CONFIG_NET_PKTGEN=y
405# CONFIG_IRDA is not set 410# CONFIG_IRDA is not set
406# CONFIG_BT is not set 411# CONFIG_BT is not set
407# CONFIG_AF_RXRPC is not set 412# CONFIG_AF_RXRPC is not set
408 413# CONFIG_PHONET is not set
409# 414CONFIG_WIRELESS=y
410# Wireless
411#
412# CONFIG_CFG80211 is not set 415# CONFIG_CFG80211 is not set
416CONFIG_WIRELESS_OLD_REGULATORY=y
413# CONFIG_WIRELESS_EXT is not set 417# CONFIG_WIRELESS_EXT is not set
414# CONFIG_MAC80211 is not set 418# CONFIG_MAC80211 is not set
415# CONFIG_IEEE80211 is not set 419# CONFIG_IEEE80211 is not set
@@ -470,18 +474,17 @@ CONFIG_MISC_DEVICES=y
470# CONFIG_HP_ILO is not set 474# CONFIG_HP_ILO is not set
471CONFIG_HAVE_IDE=y 475CONFIG_HAVE_IDE=y
472CONFIG_IDE=y 476CONFIG_IDE=y
473CONFIG_BLK_DEV_IDE=y
474 477
475# 478#
476# Please see Documentation/ide/ide.txt for help/info on IDE drives 479# Please see Documentation/ide/ide.txt for help/info on IDE drives
477# 480#
478# CONFIG_BLK_DEV_IDE_SATA is not set 481# CONFIG_BLK_DEV_IDE_SATA is not set
479CONFIG_BLK_DEV_IDEDISK=y 482CONFIG_IDE_GD=y
480# CONFIG_IDEDISK_MULTI_MODE is not set 483CONFIG_IDE_GD_ATA=y
484# CONFIG_IDE_GD_ATAPI is not set
481CONFIG_BLK_DEV_IDECD=m 485CONFIG_BLK_DEV_IDECD=m
482CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 486CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
483# CONFIG_BLK_DEV_IDETAPE is not set 487# CONFIG_BLK_DEV_IDETAPE is not set
484# CONFIG_BLK_DEV_IDEFLOPPY is not set
485# CONFIG_BLK_DEV_IDESCSI is not set 488# CONFIG_BLK_DEV_IDESCSI is not set
486# CONFIG_IDE_TASK_IOCTL is not set 489# CONFIG_IDE_TASK_IOCTL is not set
487CONFIG_IDE_PROC_FS=y 490CONFIG_IDE_PROC_FS=y
@@ -651,9 +654,13 @@ CONFIG_NET_ETHERNET=y
651# CONFIG_IBM_NEW_EMAC_RGMII is not set 654# CONFIG_IBM_NEW_EMAC_RGMII is not set
652# CONFIG_IBM_NEW_EMAC_TAH is not set 655# CONFIG_IBM_NEW_EMAC_TAH is not set
653# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 656# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
657# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
658# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
659# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
654# CONFIG_NET_PCI is not set 660# CONFIG_NET_PCI is not set
655# CONFIG_B44 is not set 661# CONFIG_B44 is not set
656# CONFIG_NET_POCKET is not set 662# CONFIG_NET_POCKET is not set
663# CONFIG_ATL2 is not set
657# CONFIG_FS_ENET is not set 664# CONFIG_FS_ENET is not set
658CONFIG_NETDEV_1000=y 665CONFIG_NETDEV_1000=y
659# CONFIG_ACENIC is not set 666# CONFIG_ACENIC is not set
@@ -676,18 +683,22 @@ CONFIG_GIANFAR=y
676# CONFIG_QLA3XXX is not set 683# CONFIG_QLA3XXX is not set
677# CONFIG_ATL1 is not set 684# CONFIG_ATL1 is not set
678# CONFIG_ATL1E is not set 685# CONFIG_ATL1E is not set
686# CONFIG_JME is not set
679CONFIG_NETDEV_10000=y 687CONFIG_NETDEV_10000=y
680# CONFIG_CHELSIO_T1 is not set 688# CONFIG_CHELSIO_T1 is not set
681# CONFIG_CHELSIO_T3 is not set 689# CONFIG_CHELSIO_T3 is not set
690# CONFIG_ENIC is not set
682# CONFIG_IXGBE is not set 691# CONFIG_IXGBE is not set
683# CONFIG_IXGB is not set 692# CONFIG_IXGB is not set
684# CONFIG_S2IO is not set 693# CONFIG_S2IO is not set
685# CONFIG_MYRI10GE is not set 694# CONFIG_MYRI10GE is not set
686# CONFIG_NETXEN_NIC is not set 695# CONFIG_NETXEN_NIC is not set
687# CONFIG_NIU is not set 696# CONFIG_NIU is not set
697# CONFIG_MLX4_EN is not set
688# CONFIG_MLX4_CORE is not set 698# CONFIG_MLX4_CORE is not set
689# CONFIG_TEHUTI is not set 699# CONFIG_TEHUTI is not set
690# CONFIG_BNX2X is not set 700# CONFIG_BNX2X is not set
701# CONFIG_QLGE is not set
691# CONFIG_SFC is not set 702# CONFIG_SFC is not set
692# CONFIG_TR is not set 703# CONFIG_TR is not set
693 704
@@ -746,6 +757,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
746CONFIG_MOUSE_PS2_SYNAPTICS=y 757CONFIG_MOUSE_PS2_SYNAPTICS=y
747CONFIG_MOUSE_PS2_LIFEBOOK=y 758CONFIG_MOUSE_PS2_LIFEBOOK=y
748CONFIG_MOUSE_PS2_TRACKPOINT=y 759CONFIG_MOUSE_PS2_TRACKPOINT=y
760# CONFIG_MOUSE_PS2_ELANTECH is not set
749# CONFIG_MOUSE_PS2_TOUCHKIT is not set 761# CONFIG_MOUSE_PS2_TOUCHKIT is not set
750# CONFIG_MOUSE_SERIAL is not set 762# CONFIG_MOUSE_SERIAL is not set
751# CONFIG_MOUSE_APPLETOUCH is not set 763# CONFIG_MOUSE_APPLETOUCH is not set
@@ -791,12 +803,6 @@ CONFIG_SERIAL_CORE=y
791CONFIG_SERIAL_CORE_CONSOLE=y 803CONFIG_SERIAL_CORE_CONSOLE=y
792CONFIG_SERIAL_CPM=y 804CONFIG_SERIAL_CPM=y
793CONFIG_SERIAL_CPM_CONSOLE=y 805CONFIG_SERIAL_CPM_CONSOLE=y
794# CONFIG_SERIAL_CPM_SCC1 is not set
795CONFIG_SERIAL_CPM_SCC2=y
796# CONFIG_SERIAL_CPM_SCC3 is not set
797# CONFIG_SERIAL_CPM_SCC4 is not set
798# CONFIG_SERIAL_CPM_SMC1 is not set
799# CONFIG_SERIAL_CPM_SMC2 is not set
800# CONFIG_SERIAL_JSM is not set 806# CONFIG_SERIAL_JSM is not set
801CONFIG_UNIX98_PTYS=y 807CONFIG_UNIX98_PTYS=y
802CONFIG_LEGACY_PTYS=y 808CONFIG_LEGACY_PTYS=y
@@ -980,6 +986,16 @@ CONFIG_SSB_POSSIBLE=y
980# CONFIG_MFD_SM501 is not set 986# CONFIG_MFD_SM501 is not set
981# CONFIG_HTC_PASIC3 is not set 987# CONFIG_HTC_PASIC3 is not set
982# CONFIG_MFD_TMIO is not set 988# CONFIG_MFD_TMIO is not set
989# CONFIG_MFD_WM8400 is not set
990# CONFIG_MFD_WM8350_I2C is not set
991
992#
993# Voltage and Current regulators
994#
995# CONFIG_REGULATOR is not set
996# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
997# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
998# CONFIG_REGULATOR_BQ24022 is not set
983 999
984# 1000#
985# Multimedia devices 1001# Multimedia devices
@@ -1019,12 +1035,19 @@ CONFIG_DRM=m
1019# 1035#
1020# CONFIG_DISPLAY_SUPPORT is not set 1036# CONFIG_DISPLAY_SUPPORT is not set
1021CONFIG_SOUND=m 1037CONFIG_SOUND=m
1038# CONFIG_SOUND_OSS_CORE is not set
1022# CONFIG_SND is not set 1039# CONFIG_SND is not set
1023# CONFIG_SOUND_PRIME is not set 1040# CONFIG_SOUND_PRIME is not set
1024CONFIG_HID_SUPPORT=y 1041CONFIG_HID_SUPPORT=y
1025CONFIG_HID=y 1042CONFIG_HID=y
1026# CONFIG_HID_DEBUG is not set 1043# CONFIG_HID_DEBUG is not set
1027# CONFIG_HIDRAW is not set 1044# CONFIG_HIDRAW is not set
1045# CONFIG_HID_PID is not set
1046
1047#
1048# Special HID drivers
1049#
1050CONFIG_HID_COMPAT=y
1028CONFIG_USB_SUPPORT=y 1051CONFIG_USB_SUPPORT=y
1029CONFIG_USB_ARCH_HAS_HCD=y 1052CONFIG_USB_ARCH_HAS_HCD=y
1030CONFIG_USB_ARCH_HAS_OHCI=y 1053CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1041,6 +1064,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1041# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1064# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1042# 1065#
1043# CONFIG_USB_GADGET is not set 1066# CONFIG_USB_GADGET is not set
1067# CONFIG_UWB is not set
1044# CONFIG_MMC is not set 1068# CONFIG_MMC is not set
1045# CONFIG_MEMSTICK is not set 1069# CONFIG_MEMSTICK is not set
1046# CONFIG_NEW_LEDS is not set 1070# CONFIG_NEW_LEDS is not set
@@ -1051,6 +1075,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1051# CONFIG_DMADEVICES is not set 1075# CONFIG_DMADEVICES is not set
1052# CONFIG_AUXDISPLAY is not set 1076# CONFIG_AUXDISPLAY is not set
1053# CONFIG_UIO is not set 1077# CONFIG_UIO is not set
1078# CONFIG_STAGING is not set
1054 1079
1055# 1080#
1056# File systems 1081# File systems
@@ -1062,12 +1087,13 @@ CONFIG_EXT3_FS=y
1062CONFIG_EXT3_FS_XATTR=y 1087CONFIG_EXT3_FS_XATTR=y
1063# CONFIG_EXT3_FS_POSIX_ACL is not set 1088# CONFIG_EXT3_FS_POSIX_ACL is not set
1064# CONFIG_EXT3_FS_SECURITY is not set 1089# CONFIG_EXT3_FS_SECURITY is not set
1065# CONFIG_EXT4DEV_FS is not set 1090# CONFIG_EXT4_FS is not set
1066CONFIG_JBD=y 1091CONFIG_JBD=y
1067CONFIG_FS_MBCACHE=y 1092CONFIG_FS_MBCACHE=y
1068# CONFIG_REISERFS_FS is not set 1093# CONFIG_REISERFS_FS is not set
1069# CONFIG_JFS_FS is not set 1094# CONFIG_JFS_FS is not set
1070# CONFIG_FS_POSIX_ACL is not set 1095# CONFIG_FS_POSIX_ACL is not set
1096CONFIG_FILE_LOCKING=y
1071# CONFIG_XFS_FS is not set 1097# CONFIG_XFS_FS is not set
1072# CONFIG_OCFS2_FS is not set 1098# CONFIG_OCFS2_FS is not set
1073CONFIG_DNOTIFY=y 1099CONFIG_DNOTIFY=y
@@ -1103,6 +1129,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1103CONFIG_PROC_FS=y 1129CONFIG_PROC_FS=y
1104# CONFIG_PROC_KCORE is not set 1130# CONFIG_PROC_KCORE is not set
1105CONFIG_PROC_SYSCTL=y 1131CONFIG_PROC_SYSCTL=y
1132CONFIG_PROC_PAGE_MONITOR=y
1106CONFIG_SYSFS=y 1133CONFIG_SYSFS=y
1107CONFIG_TMPFS=y 1134CONFIG_TMPFS=y
1108# CONFIG_TMPFS_POSIX_ACL is not set 1135# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1139,6 +1166,7 @@ CONFIG_LOCKD=y
1139CONFIG_LOCKD_V4=y 1166CONFIG_LOCKD_V4=y
1140CONFIG_NFS_COMMON=y 1167CONFIG_NFS_COMMON=y
1141CONFIG_SUNRPC=y 1168CONFIG_SUNRPC=y
1169# CONFIG_SUNRPC_REGISTER_V4 is not set
1142# CONFIG_RPCSEC_GSS_KRB5 is not set 1170# CONFIG_RPCSEC_GSS_KRB5 is not set
1143# CONFIG_RPCSEC_GSS_SPKM3 is not set 1171# CONFIG_RPCSEC_GSS_SPKM3 is not set
1144CONFIG_SMB_FS=m 1172CONFIG_SMB_FS=m
@@ -1199,7 +1227,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1199# Library routines 1227# Library routines
1200# 1228#
1201CONFIG_BITREVERSE=y 1229CONFIG_BITREVERSE=y
1202# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1203CONFIG_CRC_CCITT=y 1230CONFIG_CRC_CCITT=y
1204# CONFIG_CRC16 is not set 1231# CONFIG_CRC16 is not set
1205CONFIG_CRC_T10DIF=m 1232CONFIG_CRC_T10DIF=m
@@ -1253,15 +1280,23 @@ CONFIG_SCHED_DEBUG=y
1253# CONFIG_DEBUG_SG is not set 1280# CONFIG_DEBUG_SG is not set
1254# CONFIG_BOOT_PRINTK_DELAY is not set 1281# CONFIG_BOOT_PRINTK_DELAY is not set
1255# CONFIG_RCU_TORTURE_TEST is not set 1282# CONFIG_RCU_TORTURE_TEST is not set
1283# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1256# CONFIG_BACKTRACE_SELF_TEST is not set 1284# CONFIG_BACKTRACE_SELF_TEST is not set
1285# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1257# CONFIG_FAULT_INJECTION is not set 1286# CONFIG_FAULT_INJECTION is not set
1258# CONFIG_LATENCYTOP is not set 1287# CONFIG_LATENCYTOP is not set
1259CONFIG_SYSCTL_SYSCALL_CHECK=y 1288CONFIG_SYSCTL_SYSCALL_CHECK=y
1260CONFIG_HAVE_FTRACE=y 1289CONFIG_HAVE_FUNCTION_TRACER=y
1261CONFIG_HAVE_DYNAMIC_FTRACE=y 1290
1262# CONFIG_FTRACE is not set 1291#
1292# Tracers
1293#
1294# CONFIG_FUNCTION_TRACER is not set
1263# CONFIG_SCHED_TRACER is not set 1295# CONFIG_SCHED_TRACER is not set
1264# CONFIG_CONTEXT_SWITCH_TRACER is not set 1296# CONFIG_CONTEXT_SWITCH_TRACER is not set
1297# CONFIG_BOOT_TRACER is not set
1298# CONFIG_STACK_TRACER is not set
1299# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1265# CONFIG_SAMPLES is not set 1300# CONFIG_SAMPLES is not set
1266CONFIG_HAVE_ARCH_KGDB=y 1301CONFIG_HAVE_ARCH_KGDB=y
1267# CONFIG_KGDB is not set 1302# CONFIG_KGDB is not set
@@ -1270,6 +1305,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1270# CONFIG_DEBUG_PAGEALLOC is not set 1305# CONFIG_DEBUG_PAGEALLOC is not set
1271# CONFIG_CODE_PATCHING_SELFTEST is not set 1306# CONFIG_CODE_PATCHING_SELFTEST is not set
1272# CONFIG_FTR_FIXUP_SELFTEST is not set 1307# CONFIG_FTR_FIXUP_SELFTEST is not set
1308# CONFIG_MSI_BITMAP_SELFTEST is not set
1273# CONFIG_XMON is not set 1309# CONFIG_XMON is not set
1274# CONFIG_IRQSTACKS is not set 1310# CONFIG_IRQSTACKS is not set
1275CONFIG_BDI_SWITCH=y 1311CONFIG_BDI_SWITCH=y
@@ -1280,12 +1316,14 @@ CONFIG_BDI_SWITCH=y
1280# 1316#
1281# CONFIG_KEYS is not set 1317# CONFIG_KEYS is not set
1282# CONFIG_SECURITY is not set 1318# CONFIG_SECURITY is not set
1319# CONFIG_SECURITYFS is not set
1283# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1320# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1284CONFIG_CRYPTO=y 1321CONFIG_CRYPTO=y
1285 1322
1286# 1323#
1287# Crypto core or helper 1324# Crypto core or helper
1288# 1325#
1326# CONFIG_CRYPTO_FIPS is not set
1289# CONFIG_CRYPTO_MANAGER is not set 1327# CONFIG_CRYPTO_MANAGER is not set
1290# CONFIG_CRYPTO_GF128MUL is not set 1328# CONFIG_CRYPTO_GF128MUL is not set
1291# CONFIG_CRYPTO_NULL is not set 1329# CONFIG_CRYPTO_NULL is not set
@@ -1358,6 +1396,11 @@ CONFIG_CRYPTO=y
1358# 1396#
1359# CONFIG_CRYPTO_DEFLATE is not set 1397# CONFIG_CRYPTO_DEFLATE is not set
1360# CONFIG_CRYPTO_LZO is not set 1398# CONFIG_CRYPTO_LZO is not set
1399
1400#
1401# Random Number Generation
1402#
1403# CONFIG_CRYPTO_ANSI_CPRNG is not set
1361CONFIG_CRYPTO_HW=y 1404CONFIG_CRYPTO_HW=y
1362# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1405# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1363# CONFIG_CRYPTO_DEV_TALITOS is not set 1406# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig
index 1b2d5d577915..f3e4f3481fda 100644
--- a/arch/powerpc/configs/85xx/tqm8540_defconfig
+++ b/arch/powerpc/configs/85xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:37 2008 4# Sat Nov 8 12:40:20 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -105,7 +105,9 @@ CONFIG_SIGNALFD=y
105CONFIG_TIMERFD=y 105CONFIG_TIMERFD=y
106CONFIG_EVENTFD=y 106CONFIG_EVENTFD=y
107CONFIG_SHMEM=y 107CONFIG_SHMEM=y
108CONFIG_AIO=y
108CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
110CONFIG_PCI_QUIRKS=y
109CONFIG_SLUB_DEBUG=y 111CONFIG_SLUB_DEBUG=y
110# CONFIG_SLAB is not set 112# CONFIG_SLAB is not set
111CONFIG_SLUB=y 113CONFIG_SLUB=y
@@ -118,10 +120,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
118CONFIG_HAVE_KPROBES=y 120CONFIG_HAVE_KPROBES=y
119CONFIG_HAVE_KRETPROBES=y 121CONFIG_HAVE_KRETPROBES=y
120CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
121# CONFIG_HAVE_DMA_ATTRS is not set
122# CONFIG_USE_GENERIC_SMP_HELPERS is not set
123# CONFIG_HAVE_CLK is not set
124CONFIG_PROC_PAGE_MONITOR=y
125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
126CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
127CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
@@ -148,6 +146,7 @@ CONFIG_DEFAULT_AS=y
148# CONFIG_DEFAULT_NOOP is not set 146# CONFIG_DEFAULT_NOOP is not set
149CONFIG_DEFAULT_IOSCHED="anticipatory" 147CONFIG_DEFAULT_IOSCHED="anticipatory"
150CONFIG_CLASSIC_RCU=y 148CONFIG_CLASSIC_RCU=y
149# CONFIG_FREEZER is not set
151 150
152# 151#
153# Platform support 152# Platform support
@@ -183,14 +182,15 @@ CONFIG_MPIC=y
183# CONFIG_PPC_INDIRECT_IO is not set 182# CONFIG_PPC_INDIRECT_IO is not set
184# CONFIG_GENERIC_IOMAP is not set 183# CONFIG_GENERIC_IOMAP is not set
185# CONFIG_CPU_FREQ is not set 184# CONFIG_CPU_FREQ is not set
185# CONFIG_QUICC_ENGINE is not set
186# CONFIG_CPM2 is not set 186# CONFIG_CPM2 is not set
187# CONFIG_FSL_ULI1575 is not set 187# CONFIG_FSL_ULI1575 is not set
188# CONFIG_MPC8xxx_GPIO is not set
188 189
189# 190#
190# Kernel options 191# Kernel options
191# 192#
192# CONFIG_HIGHMEM is not set 193# CONFIG_HIGHMEM is not set
193# CONFIG_TICK_ONESHOT is not set
194# CONFIG_NO_HZ is not set 194# CONFIG_NO_HZ is not set
195# CONFIG_HIGH_RES_TIMERS is not set 195# CONFIG_HIGH_RES_TIMERS is not set
196CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 196CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -204,6 +204,8 @@ CONFIG_PREEMPT_NONE=y
204# CONFIG_PREEMPT_VOLUNTARY is not set 204# CONFIG_PREEMPT_VOLUNTARY is not set
205# CONFIG_PREEMPT is not set 205# CONFIG_PREEMPT is not set
206CONFIG_BINFMT_ELF=y 206CONFIG_BINFMT_ELF=y
207# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
208# CONFIG_HAVE_AOUT is not set
207# CONFIG_BINFMT_MISC is not set 209# CONFIG_BINFMT_MISC is not set
208CONFIG_MATH_EMULATION=y 210CONFIG_MATH_EMULATION=y
209# CONFIG_IOMMU_HELPER is not set 211# CONFIG_IOMMU_HELPER is not set
@@ -218,15 +220,15 @@ CONFIG_FLATMEM_MANUAL=y
218# CONFIG_SPARSEMEM_MANUAL is not set 220# CONFIG_SPARSEMEM_MANUAL is not set
219CONFIG_FLATMEM=y 221CONFIG_FLATMEM=y
220CONFIG_FLAT_NODE_MEM_MAP=y 222CONFIG_FLAT_NODE_MEM_MAP=y
221# CONFIG_SPARSEMEM_STATIC is not set
222# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
223CONFIG_PAGEFLAGS_EXTENDED=y 223CONFIG_PAGEFLAGS_EXTENDED=y
224CONFIG_SPLIT_PTLOCK_CPUS=4 224CONFIG_SPLIT_PTLOCK_CPUS=4
225CONFIG_MIGRATION=y 225CONFIG_MIGRATION=y
226# CONFIG_RESOURCES_64BIT is not set 226# CONFIG_RESOURCES_64BIT is not set
227# CONFIG_PHYS_ADDR_T_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=1 228CONFIG_ZONE_DMA_FLAG=1
228CONFIG_BOUNCE=y 229CONFIG_BOUNCE=y
229CONFIG_VIRT_TO_BUS=y 230CONFIG_VIRT_TO_BUS=y
231CONFIG_UNEVICTABLE_LRU=y
230CONFIG_FORCE_MAX_ZONEORDER=11 232CONFIG_FORCE_MAX_ZONEORDER=11
231# CONFIG_PROC_DEVICETREE is not set 233# CONFIG_PROC_DEVICETREE is not set
232# CONFIG_CMDLINE_BOOL is not set 234# CONFIG_CMDLINE_BOOL is not set
@@ -249,7 +251,7 @@ CONFIG_PCI_SYSCALL=y
249# CONFIG_PCIEPORTBUS is not set 251# CONFIG_PCIEPORTBUS is not set
250CONFIG_ARCH_SUPPORTS_MSI=y 252CONFIG_ARCH_SUPPORTS_MSI=y
251# CONFIG_PCI_MSI is not set 253# CONFIG_PCI_MSI is not set
252CONFIG_PCI_LEGACY=y 254# CONFIG_PCI_LEGACY is not set
253# CONFIG_HAS_RAPIDIO is not set 255# CONFIG_HAS_RAPIDIO is not set
254 256
255# 257#
@@ -316,6 +318,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
316# CONFIG_TIPC is not set 318# CONFIG_TIPC is not set
317# CONFIG_ATM is not set 319# CONFIG_ATM is not set
318# CONFIG_BRIDGE is not set 320# CONFIG_BRIDGE is not set
321# CONFIG_NET_DSA is not set
319# CONFIG_VLAN_8021Q is not set 322# CONFIG_VLAN_8021Q is not set
320# CONFIG_DECNET is not set 323# CONFIG_DECNET is not set
321# CONFIG_LLC2 is not set 324# CONFIG_LLC2 is not set
@@ -336,11 +339,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
336# CONFIG_IRDA is not set 339# CONFIG_IRDA is not set
337# CONFIG_BT is not set 340# CONFIG_BT is not set
338# CONFIG_AF_RXRPC is not set 341# CONFIG_AF_RXRPC is not set
339 342# CONFIG_PHONET is not set
340# 343CONFIG_WIRELESS=y
341# Wireless
342#
343# CONFIG_CFG80211 is not set 344# CONFIG_CFG80211 is not set
345CONFIG_WIRELESS_OLD_REGULATORY=y
344# CONFIG_WIRELESS_EXT is not set 346# CONFIG_WIRELESS_EXT is not set
345# CONFIG_MAC80211 is not set 347# CONFIG_MAC80211 is not set
346# CONFIG_IEEE80211 is not set 348# CONFIG_IEEE80211 is not set
@@ -466,18 +468,17 @@ CONFIG_MISC_DEVICES=y
466# CONFIG_HP_ILO is not set 468# CONFIG_HP_ILO is not set
467CONFIG_HAVE_IDE=y 469CONFIG_HAVE_IDE=y
468CONFIG_IDE=y 470CONFIG_IDE=y
469CONFIG_BLK_DEV_IDE=y
470 471
471# 472#
472# Please see Documentation/ide/ide.txt for help/info on IDE drives 473# Please see Documentation/ide/ide.txt for help/info on IDE drives
473# 474#
474CONFIG_IDE_TIMINGS=y 475CONFIG_IDE_TIMINGS=y
475# CONFIG_BLK_DEV_IDE_SATA is not set 476# CONFIG_BLK_DEV_IDE_SATA is not set
476CONFIG_BLK_DEV_IDEDISK=y 477CONFIG_IDE_GD=y
477# CONFIG_IDEDISK_MULTI_MODE is not set 478CONFIG_IDE_GD_ATA=y
479# CONFIG_IDE_GD_ATAPI is not set
478# CONFIG_BLK_DEV_IDECD is not set 480# CONFIG_BLK_DEV_IDECD is not set
479# CONFIG_BLK_DEV_IDETAPE is not set 481# CONFIG_BLK_DEV_IDETAPE is not set
480# CONFIG_BLK_DEV_IDEFLOPPY is not set
481# CONFIG_IDE_TASK_IOCTL is not set 482# CONFIG_IDE_TASK_IOCTL is not set
482CONFIG_IDE_PROC_FS=y 483CONFIG_IDE_PROC_FS=y
483 484
@@ -580,6 +581,9 @@ CONFIG_MII=y
580# CONFIG_IBM_NEW_EMAC_RGMII is not set 581# CONFIG_IBM_NEW_EMAC_RGMII is not set
581# CONFIG_IBM_NEW_EMAC_TAH is not set 582# CONFIG_IBM_NEW_EMAC_TAH is not set
582# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 583# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
584# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
585# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
586# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
583CONFIG_NET_PCI=y 587CONFIG_NET_PCI=y
584# CONFIG_PCNET32 is not set 588# CONFIG_PCNET32 is not set
585# CONFIG_AMD8111_ETH is not set 589# CONFIG_AMD8111_ETH is not set
@@ -600,6 +604,7 @@ CONFIG_E100=y
600# CONFIG_TLAN is not set 604# CONFIG_TLAN is not set
601# CONFIG_VIA_RHINE is not set 605# CONFIG_VIA_RHINE is not set
602# CONFIG_SC92031 is not set 606# CONFIG_SC92031 is not set
607# CONFIG_ATL2 is not set
603CONFIG_NETDEV_1000=y 608CONFIG_NETDEV_1000=y
604# CONFIG_ACENIC is not set 609# CONFIG_ACENIC is not set
605# CONFIG_DL2K is not set 610# CONFIG_DL2K is not set
@@ -621,18 +626,22 @@ CONFIG_GIANFAR=y
621# CONFIG_QLA3XXX is not set 626# CONFIG_QLA3XXX is not set
622# CONFIG_ATL1 is not set 627# CONFIG_ATL1 is not set
623# CONFIG_ATL1E is not set 628# CONFIG_ATL1E is not set
629# CONFIG_JME is not set
624CONFIG_NETDEV_10000=y 630CONFIG_NETDEV_10000=y
625# CONFIG_CHELSIO_T1 is not set 631# CONFIG_CHELSIO_T1 is not set
626# CONFIG_CHELSIO_T3 is not set 632# CONFIG_CHELSIO_T3 is not set
633# CONFIG_ENIC is not set
627# CONFIG_IXGBE is not set 634# CONFIG_IXGBE is not set
628# CONFIG_IXGB is not set 635# CONFIG_IXGB is not set
629# CONFIG_S2IO is not set 636# CONFIG_S2IO is not set
630# CONFIG_MYRI10GE is not set 637# CONFIG_MYRI10GE is not set
631# CONFIG_NETXEN_NIC is not set 638# CONFIG_NETXEN_NIC is not set
632# CONFIG_NIU is not set 639# CONFIG_NIU is not set
640# CONFIG_MLX4_EN is not set
633# CONFIG_MLX4_CORE is not set 641# CONFIG_MLX4_CORE is not set
634# CONFIG_TEHUTI is not set 642# CONFIG_TEHUTI is not set
635# CONFIG_BNX2X is not set 643# CONFIG_BNX2X is not set
644# CONFIG_QLGE is not set
636# CONFIG_SFC is not set 645# CONFIG_SFC is not set
637# CONFIG_TR is not set 646# CONFIG_TR is not set
638 647
@@ -867,6 +876,17 @@ CONFIG_SSB_POSSIBLE=y
867# CONFIG_MFD_SM501 is not set 876# CONFIG_MFD_SM501 is not set
868# CONFIG_HTC_PASIC3 is not set 877# CONFIG_HTC_PASIC3 is not set
869# CONFIG_MFD_TMIO is not set 878# CONFIG_MFD_TMIO is not set
879# CONFIG_PMIC_DA903X is not set
880# CONFIG_MFD_WM8400 is not set
881# CONFIG_MFD_WM8350_I2C is not set
882
883#
884# Voltage and Current regulators
885#
886# CONFIG_REGULATOR is not set
887# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
888# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
889# CONFIG_REGULATOR_BQ24022 is not set
870 890
871# 891#
872# Multimedia devices 892# Multimedia devices
@@ -903,6 +923,12 @@ CONFIG_HID_SUPPORT=y
903CONFIG_HID=y 923CONFIG_HID=y
904# CONFIG_HID_DEBUG is not set 924# CONFIG_HID_DEBUG is not set
905# CONFIG_HIDRAW is not set 925# CONFIG_HIDRAW is not set
926# CONFIG_HID_PID is not set
927
928#
929# Special HID drivers
930#
931CONFIG_HID_COMPAT=y
906CONFIG_USB_SUPPORT=y 932CONFIG_USB_SUPPORT=y
907CONFIG_USB_ARCH_HAS_HCD=y 933CONFIG_USB_ARCH_HAS_HCD=y
908CONFIG_USB_ARCH_HAS_OHCI=y 934CONFIG_USB_ARCH_HAS_OHCI=y
@@ -919,6 +945,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
919# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 945# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
920# 946#
921# CONFIG_USB_GADGET is not set 947# CONFIG_USB_GADGET is not set
948# CONFIG_UWB is not set
922# CONFIG_MMC is not set 949# CONFIG_MMC is not set
923# CONFIG_MEMSTICK is not set 950# CONFIG_MEMSTICK is not set
924# CONFIG_NEW_LEDS is not set 951# CONFIG_NEW_LEDS is not set
@@ -928,6 +955,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
928# CONFIG_RTC_CLASS is not set 955# CONFIG_RTC_CLASS is not set
929# CONFIG_DMADEVICES is not set 956# CONFIG_DMADEVICES is not set
930# CONFIG_UIO is not set 957# CONFIG_UIO is not set
958# CONFIG_STAGING is not set
931 959
932# 960#
933# File systems 961# File systems
@@ -939,12 +967,13 @@ CONFIG_EXT3_FS=y
939CONFIG_EXT3_FS_XATTR=y 967CONFIG_EXT3_FS_XATTR=y
940# CONFIG_EXT3_FS_POSIX_ACL is not set 968# CONFIG_EXT3_FS_POSIX_ACL is not set
941# CONFIG_EXT3_FS_SECURITY is not set 969# CONFIG_EXT3_FS_SECURITY is not set
942# CONFIG_EXT4DEV_FS is not set 970# CONFIG_EXT4_FS is not set
943CONFIG_JBD=y 971CONFIG_JBD=y
944CONFIG_FS_MBCACHE=y 972CONFIG_FS_MBCACHE=y
945# CONFIG_REISERFS_FS is not set 973# CONFIG_REISERFS_FS is not set
946# CONFIG_JFS_FS is not set 974# CONFIG_JFS_FS is not set
947# CONFIG_FS_POSIX_ACL is not set 975# CONFIG_FS_POSIX_ACL is not set
976CONFIG_FILE_LOCKING=y
948# CONFIG_XFS_FS is not set 977# CONFIG_XFS_FS is not set
949# CONFIG_OCFS2_FS is not set 978# CONFIG_OCFS2_FS is not set
950CONFIG_DNOTIFY=y 979CONFIG_DNOTIFY=y
@@ -974,6 +1003,7 @@ CONFIG_INOTIFY_USER=y
974CONFIG_PROC_FS=y 1003CONFIG_PROC_FS=y
975CONFIG_PROC_KCORE=y 1004CONFIG_PROC_KCORE=y
976CONFIG_PROC_SYSCTL=y 1005CONFIG_PROC_SYSCTL=y
1006CONFIG_PROC_PAGE_MONITOR=y
977CONFIG_SYSFS=y 1007CONFIG_SYSFS=y
978CONFIG_TMPFS=y 1008CONFIG_TMPFS=y
979# CONFIG_TMPFS_POSIX_ACL is not set 1009# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1019,6 +1049,7 @@ CONFIG_ROOT_NFS=y
1019CONFIG_LOCKD=y 1049CONFIG_LOCKD=y
1020CONFIG_NFS_COMMON=y 1050CONFIG_NFS_COMMON=y
1021CONFIG_SUNRPC=y 1051CONFIG_SUNRPC=y
1052# CONFIG_SUNRPC_REGISTER_V4 is not set
1022# CONFIG_RPCSEC_GSS_KRB5 is not set 1053# CONFIG_RPCSEC_GSS_KRB5 is not set
1023# CONFIG_RPCSEC_GSS_SPKM3 is not set 1054# CONFIG_RPCSEC_GSS_SPKM3 is not set
1024# CONFIG_SMB_FS is not set 1055# CONFIG_SMB_FS is not set
@@ -1051,7 +1082,6 @@ CONFIG_PARTITION_ADVANCED=y
1051# Library routines 1082# Library routines
1052# 1083#
1053CONFIG_BITREVERSE=y 1084CONFIG_BITREVERSE=y
1054# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1055# CONFIG_CRC_CCITT is not set 1085# CONFIG_CRC_CCITT is not set
1056# CONFIG_CRC16 is not set 1086# CONFIG_CRC16 is not set
1057# CONFIG_CRC_T10DIF is not set 1087# CONFIG_CRC_T10DIF is not set
@@ -1083,13 +1113,15 @@ CONFIG_FRAME_WARN=1024
1083# CONFIG_SLUB_STATS is not set 1113# CONFIG_SLUB_STATS is not set
1084# CONFIG_DEBUG_BUGVERBOSE is not set 1114# CONFIG_DEBUG_BUGVERBOSE is not set
1085# CONFIG_DEBUG_MEMORY_INIT is not set 1115# CONFIG_DEBUG_MEMORY_INIT is not set
1116# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1086# CONFIG_LATENCYTOP is not set 1117# CONFIG_LATENCYTOP is not set
1087CONFIG_SYSCTL_SYSCALL_CHECK=y 1118CONFIG_SYSCTL_SYSCALL_CHECK=y
1088CONFIG_HAVE_FTRACE=y 1119CONFIG_HAVE_FUNCTION_TRACER=y
1089CONFIG_HAVE_DYNAMIC_FTRACE=y 1120
1090# CONFIG_FTRACE is not set 1121#
1091# CONFIG_SCHED_TRACER is not set 1122# Tracers
1092# CONFIG_CONTEXT_SWITCH_TRACER is not set 1123#
1124# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1093# CONFIG_SAMPLES is not set 1125# CONFIG_SAMPLES is not set
1094CONFIG_HAVE_ARCH_KGDB=y 1126CONFIG_HAVE_ARCH_KGDB=y
1095# CONFIG_IRQSTACKS is not set 1127# CONFIG_IRQSTACKS is not set
@@ -1100,12 +1132,14 @@ CONFIG_HAVE_ARCH_KGDB=y
1100# 1132#
1101# CONFIG_KEYS is not set 1133# CONFIG_KEYS is not set
1102# CONFIG_SECURITY is not set 1134# CONFIG_SECURITY is not set
1135# CONFIG_SECURITYFS is not set
1103# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1136# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1104CONFIG_CRYPTO=y 1137CONFIG_CRYPTO=y
1105 1138
1106# 1139#
1107# Crypto core or helper 1140# Crypto core or helper
1108# 1141#
1142# CONFIG_CRYPTO_FIPS is not set
1109# CONFIG_CRYPTO_MANAGER is not set 1143# CONFIG_CRYPTO_MANAGER is not set
1110# CONFIG_CRYPTO_GF128MUL is not set 1144# CONFIG_CRYPTO_GF128MUL is not set
1111# CONFIG_CRYPTO_NULL is not set 1145# CONFIG_CRYPTO_NULL is not set
@@ -1177,6 +1211,11 @@ CONFIG_CRYPTO=y
1177# 1211#
1178# CONFIG_CRYPTO_DEFLATE is not set 1212# CONFIG_CRYPTO_DEFLATE is not set
1179# CONFIG_CRYPTO_LZO is not set 1213# CONFIG_CRYPTO_LZO is not set
1214
1215#
1216# Random Number Generation
1217#
1218# CONFIG_CRYPTO_ANSI_CPRNG is not set
1180CONFIG_CRYPTO_HW=y 1219CONFIG_CRYPTO_HW=y
1181# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1220# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1182# CONFIG_CRYPTO_DEV_TALITOS is not set 1221# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig
index da841a09755c..c62489394535 100644
--- a/arch/powerpc/configs/85xx/tqm8541_defconfig
+++ b/arch/powerpc/configs/85xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:39 2008 4# Sat Nov 8 12:40:21 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -106,7 +106,9 @@ CONFIG_SIGNALFD=y
106CONFIG_TIMERFD=y 106CONFIG_TIMERFD=y
107CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
108CONFIG_SHMEM=y 108CONFIG_SHMEM=y
109CONFIG_AIO=y
109CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y
110CONFIG_SLUB_DEBUG=y 112CONFIG_SLUB_DEBUG=y
111# CONFIG_SLAB is not set 113# CONFIG_SLAB is not set
112CONFIG_SLUB=y 114CONFIG_SLUB=y
@@ -119,10 +121,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
119CONFIG_HAVE_KPROBES=y 121CONFIG_HAVE_KPROBES=y
120CONFIG_HAVE_KRETPROBES=y 122CONFIG_HAVE_KRETPROBES=y
121CONFIG_HAVE_ARCH_TRACEHOOK=y 123CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_DMA_ATTRS is not set
123# CONFIG_USE_GENERIC_SMP_HELPERS is not set
124CONFIG_HAVE_CLK=y 124CONFIG_HAVE_CLK=y
125CONFIG_PROC_PAGE_MONITOR=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 127CONFIG_RT_MUTEXES=y
@@ -149,6 +148,7 @@ CONFIG_DEFAULT_AS=y
149# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
150CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
151CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_FREEZER is not set
152 152
153# 153#
154# Platform support 154# Platform support
@@ -184,15 +184,16 @@ CONFIG_MPIC=y
184# CONFIG_PPC_INDIRECT_IO is not set 184# CONFIG_PPC_INDIRECT_IO is not set
185# CONFIG_GENERIC_IOMAP is not set 185# CONFIG_GENERIC_IOMAP is not set
186# CONFIG_CPU_FREQ is not set 186# CONFIG_CPU_FREQ is not set
187# CONFIG_QUICC_ENGINE is not set
187CONFIG_CPM2=y 188CONFIG_CPM2=y
188# CONFIG_FSL_ULI1575 is not set 189# CONFIG_FSL_ULI1575 is not set
189CONFIG_CPM=y 190CONFIG_CPM=y
191# CONFIG_MPC8xxx_GPIO is not set
190 192
191# 193#
192# Kernel options 194# Kernel options
193# 195#
194# CONFIG_HIGHMEM is not set 196# CONFIG_HIGHMEM is not set
195# CONFIG_TICK_ONESHOT is not set
196# CONFIG_NO_HZ is not set 197# CONFIG_NO_HZ is not set
197# CONFIG_HIGH_RES_TIMERS is not set 198# CONFIG_HIGH_RES_TIMERS is not set
198CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 199CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -206,6 +207,8 @@ CONFIG_PREEMPT_NONE=y
206# CONFIG_PREEMPT_VOLUNTARY is not set 207# CONFIG_PREEMPT_VOLUNTARY is not set
207# CONFIG_PREEMPT is not set 208# CONFIG_PREEMPT is not set
208CONFIG_BINFMT_ELF=y 209CONFIG_BINFMT_ELF=y
210# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
211# CONFIG_HAVE_AOUT is not set
209# CONFIG_BINFMT_MISC is not set 212# CONFIG_BINFMT_MISC is not set
210CONFIG_MATH_EMULATION=y 213CONFIG_MATH_EMULATION=y
211# CONFIG_IOMMU_HELPER is not set 214# CONFIG_IOMMU_HELPER is not set
@@ -220,15 +223,15 @@ CONFIG_FLATMEM_MANUAL=y
220# CONFIG_SPARSEMEM_MANUAL is not set 223# CONFIG_SPARSEMEM_MANUAL is not set
221CONFIG_FLATMEM=y 224CONFIG_FLATMEM=y
222CONFIG_FLAT_NODE_MEM_MAP=y 225CONFIG_FLAT_NODE_MEM_MAP=y
223# CONFIG_SPARSEMEM_STATIC is not set
224# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
225CONFIG_PAGEFLAGS_EXTENDED=y 226CONFIG_PAGEFLAGS_EXTENDED=y
226CONFIG_SPLIT_PTLOCK_CPUS=4 227CONFIG_SPLIT_PTLOCK_CPUS=4
227CONFIG_MIGRATION=y 228CONFIG_MIGRATION=y
228# CONFIG_RESOURCES_64BIT is not set 229# CONFIG_RESOURCES_64BIT is not set
230# CONFIG_PHYS_ADDR_T_64BIT is not set
229CONFIG_ZONE_DMA_FLAG=1 231CONFIG_ZONE_DMA_FLAG=1
230CONFIG_BOUNCE=y 232CONFIG_BOUNCE=y
231CONFIG_VIRT_TO_BUS=y 233CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y
232CONFIG_FORCE_MAX_ZONEORDER=11 235CONFIG_FORCE_MAX_ZONEORDER=11
233# CONFIG_PROC_DEVICETREE is not set 236# CONFIG_PROC_DEVICETREE is not set
234# CONFIG_CMDLINE_BOOL is not set 237# CONFIG_CMDLINE_BOOL is not set
@@ -251,7 +254,7 @@ CONFIG_PCI_SYSCALL=y
251# CONFIG_PCIEPORTBUS is not set 254# CONFIG_PCIEPORTBUS is not set
252CONFIG_ARCH_SUPPORTS_MSI=y 255CONFIG_ARCH_SUPPORTS_MSI=y
253# CONFIG_PCI_MSI is not set 256# CONFIG_PCI_MSI is not set
254CONFIG_PCI_LEGACY=y 257# CONFIG_PCI_LEGACY is not set
255# CONFIG_HAS_RAPIDIO is not set 258# CONFIG_HAS_RAPIDIO is not set
256 259
257# 260#
@@ -318,6 +321,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
318# CONFIG_TIPC is not set 321# CONFIG_TIPC is not set
319# CONFIG_ATM is not set 322# CONFIG_ATM is not set
320# CONFIG_BRIDGE is not set 323# CONFIG_BRIDGE is not set
324# CONFIG_NET_DSA is not set
321# CONFIG_VLAN_8021Q is not set 325# CONFIG_VLAN_8021Q is not set
322# CONFIG_DECNET is not set 326# CONFIG_DECNET is not set
323# CONFIG_LLC2 is not set 327# CONFIG_LLC2 is not set
@@ -338,11 +342,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
338# CONFIG_IRDA is not set 342# CONFIG_IRDA is not set
339# CONFIG_BT is not set 343# CONFIG_BT is not set
340# CONFIG_AF_RXRPC is not set 344# CONFIG_AF_RXRPC is not set
341 345# CONFIG_PHONET is not set
342# 346CONFIG_WIRELESS=y
343# Wireless
344#
345# CONFIG_CFG80211 is not set 347# CONFIG_CFG80211 is not set
348CONFIG_WIRELESS_OLD_REGULATORY=y
346# CONFIG_WIRELESS_EXT is not set 349# CONFIG_WIRELESS_EXT is not set
347# CONFIG_MAC80211 is not set 350# CONFIG_MAC80211 is not set
348# CONFIG_IEEE80211 is not set 351# CONFIG_IEEE80211 is not set
@@ -469,18 +472,17 @@ CONFIG_MISC_DEVICES=y
469# CONFIG_HP_ILO is not set 472# CONFIG_HP_ILO is not set
470CONFIG_HAVE_IDE=y 473CONFIG_HAVE_IDE=y
471CONFIG_IDE=y 474CONFIG_IDE=y
472CONFIG_BLK_DEV_IDE=y
473 475
474# 476#
475# Please see Documentation/ide/ide.txt for help/info on IDE drives 477# Please see Documentation/ide/ide.txt for help/info on IDE drives
476# 478#
477CONFIG_IDE_TIMINGS=y 479CONFIG_IDE_TIMINGS=y
478# CONFIG_BLK_DEV_IDE_SATA is not set 480# CONFIG_BLK_DEV_IDE_SATA is not set
479CONFIG_BLK_DEV_IDEDISK=y 481CONFIG_IDE_GD=y
480# CONFIG_IDEDISK_MULTI_MODE is not set 482CONFIG_IDE_GD_ATA=y
483# CONFIG_IDE_GD_ATAPI is not set
481# CONFIG_BLK_DEV_IDECD is not set 484# CONFIG_BLK_DEV_IDECD is not set
482# CONFIG_BLK_DEV_IDETAPE is not set 485# CONFIG_BLK_DEV_IDETAPE is not set
483# CONFIG_BLK_DEV_IDEFLOPPY is not set
484# CONFIG_IDE_TASK_IOCTL is not set 486# CONFIG_IDE_TASK_IOCTL is not set
485CONFIG_IDE_PROC_FS=y 487CONFIG_IDE_PROC_FS=y
486 488
@@ -583,6 +585,9 @@ CONFIG_MII=y
583# CONFIG_IBM_NEW_EMAC_RGMII is not set 585# CONFIG_IBM_NEW_EMAC_RGMII is not set
584# CONFIG_IBM_NEW_EMAC_TAH is not set 586# CONFIG_IBM_NEW_EMAC_TAH is not set
585# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 587# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
588# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
589# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
590# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
586CONFIG_NET_PCI=y 591CONFIG_NET_PCI=y
587# CONFIG_PCNET32 is not set 592# CONFIG_PCNET32 is not set
588# CONFIG_AMD8111_ETH is not set 593# CONFIG_AMD8111_ETH is not set
@@ -603,6 +608,7 @@ CONFIG_E100=y
603# CONFIG_TLAN is not set 608# CONFIG_TLAN is not set
604# CONFIG_VIA_RHINE is not set 609# CONFIG_VIA_RHINE is not set
605# CONFIG_SC92031 is not set 610# CONFIG_SC92031 is not set
611# CONFIG_ATL2 is not set
606# CONFIG_FS_ENET is not set 612# CONFIG_FS_ENET is not set
607CONFIG_NETDEV_1000=y 613CONFIG_NETDEV_1000=y
608# CONFIG_ACENIC is not set 614# CONFIG_ACENIC is not set
@@ -625,18 +631,22 @@ CONFIG_GIANFAR=y
625# CONFIG_QLA3XXX is not set 631# CONFIG_QLA3XXX is not set
626# CONFIG_ATL1 is not set 632# CONFIG_ATL1 is not set
627# CONFIG_ATL1E is not set 633# CONFIG_ATL1E is not set
634# CONFIG_JME is not set
628CONFIG_NETDEV_10000=y 635CONFIG_NETDEV_10000=y
629# CONFIG_CHELSIO_T1 is not set 636# CONFIG_CHELSIO_T1 is not set
630# CONFIG_CHELSIO_T3 is not set 637# CONFIG_CHELSIO_T3 is not set
638# CONFIG_ENIC is not set
631# CONFIG_IXGBE is not set 639# CONFIG_IXGBE is not set
632# CONFIG_IXGB is not set 640# CONFIG_IXGB is not set
633# CONFIG_S2IO is not set 641# CONFIG_S2IO is not set
634# CONFIG_MYRI10GE is not set 642# CONFIG_MYRI10GE is not set
635# CONFIG_NETXEN_NIC is not set 643# CONFIG_NETXEN_NIC is not set
636# CONFIG_NIU is not set 644# CONFIG_NIU is not set
645# CONFIG_MLX4_EN is not set
637# CONFIG_MLX4_CORE is not set 646# CONFIG_MLX4_CORE is not set
638# CONFIG_TEHUTI is not set 647# CONFIG_TEHUTI is not set
639# CONFIG_BNX2X is not set 648# CONFIG_BNX2X is not set
649# CONFIG_QLGE is not set
640# CONFIG_SFC is not set 650# CONFIG_SFC is not set
641# CONFIG_TR is not set 651# CONFIG_TR is not set
642 652
@@ -715,12 +725,6 @@ CONFIG_SERIAL_CORE=y
715CONFIG_SERIAL_CORE_CONSOLE=y 725CONFIG_SERIAL_CORE_CONSOLE=y
716CONFIG_SERIAL_CPM=y 726CONFIG_SERIAL_CPM=y
717CONFIG_SERIAL_CPM_CONSOLE=y 727CONFIG_SERIAL_CPM_CONSOLE=y
718CONFIG_SERIAL_CPM_SCC1=y
719# CONFIG_SERIAL_CPM_SCC2 is not set
720# CONFIG_SERIAL_CPM_SCC3 is not set
721# CONFIG_SERIAL_CPM_SCC4 is not set
722# CONFIG_SERIAL_CPM_SMC1 is not set
723# CONFIG_SERIAL_CPM_SMC2 is not set
724# CONFIG_SERIAL_JSM is not set 728# CONFIG_SERIAL_JSM is not set
725# CONFIG_SERIAL_OF_PLATFORM is not set 729# CONFIG_SERIAL_OF_PLATFORM is not set
726CONFIG_UNIX98_PTYS=y 730CONFIG_UNIX98_PTYS=y
@@ -900,6 +904,17 @@ CONFIG_SSB_POSSIBLE=y
900# CONFIG_MFD_SM501 is not set 904# CONFIG_MFD_SM501 is not set
901# CONFIG_HTC_PASIC3 is not set 905# CONFIG_HTC_PASIC3 is not set
902# CONFIG_MFD_TMIO is not set 906# CONFIG_MFD_TMIO is not set
907# CONFIG_PMIC_DA903X is not set
908# CONFIG_MFD_WM8400 is not set
909# CONFIG_MFD_WM8350_I2C is not set
910
911#
912# Voltage and Current regulators
913#
914# CONFIG_REGULATOR is not set
915# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
916# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
917# CONFIG_REGULATOR_BQ24022 is not set
903 918
904# 919#
905# Multimedia devices 920# Multimedia devices
@@ -936,6 +951,12 @@ CONFIG_HID_SUPPORT=y
936CONFIG_HID=y 951CONFIG_HID=y
937# CONFIG_HID_DEBUG is not set 952# CONFIG_HID_DEBUG is not set
938# CONFIG_HIDRAW is not set 953# CONFIG_HIDRAW is not set
954# CONFIG_HID_PID is not set
955
956#
957# Special HID drivers
958#
959CONFIG_HID_COMPAT=y
939CONFIG_USB_SUPPORT=y 960CONFIG_USB_SUPPORT=y
940CONFIG_USB_ARCH_HAS_HCD=y 961CONFIG_USB_ARCH_HAS_HCD=y
941CONFIG_USB_ARCH_HAS_OHCI=y 962CONFIG_USB_ARCH_HAS_OHCI=y
@@ -952,6 +973,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
952# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 973# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
953# 974#
954# CONFIG_USB_GADGET is not set 975# CONFIG_USB_GADGET is not set
976# CONFIG_UWB is not set
955# CONFIG_MMC is not set 977# CONFIG_MMC is not set
956# CONFIG_MEMSTICK is not set 978# CONFIG_MEMSTICK is not set
957# CONFIG_NEW_LEDS is not set 979# CONFIG_NEW_LEDS is not set
@@ -961,6 +983,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
961# CONFIG_RTC_CLASS is not set 983# CONFIG_RTC_CLASS is not set
962# CONFIG_DMADEVICES is not set 984# CONFIG_DMADEVICES is not set
963# CONFIG_UIO is not set 985# CONFIG_UIO is not set
986# CONFIG_STAGING is not set
964 987
965# 988#
966# File systems 989# File systems
@@ -972,12 +995,13 @@ CONFIG_EXT3_FS=y
972CONFIG_EXT3_FS_XATTR=y 995CONFIG_EXT3_FS_XATTR=y
973# CONFIG_EXT3_FS_POSIX_ACL is not set 996# CONFIG_EXT3_FS_POSIX_ACL is not set
974# CONFIG_EXT3_FS_SECURITY is not set 997# CONFIG_EXT3_FS_SECURITY is not set
975# CONFIG_EXT4DEV_FS is not set 998# CONFIG_EXT4_FS is not set
976CONFIG_JBD=y 999CONFIG_JBD=y
977CONFIG_FS_MBCACHE=y 1000CONFIG_FS_MBCACHE=y
978# CONFIG_REISERFS_FS is not set 1001# CONFIG_REISERFS_FS is not set
979# CONFIG_JFS_FS is not set 1002# CONFIG_JFS_FS is not set
980# CONFIG_FS_POSIX_ACL is not set 1003# CONFIG_FS_POSIX_ACL is not set
1004CONFIG_FILE_LOCKING=y
981# CONFIG_XFS_FS is not set 1005# CONFIG_XFS_FS is not set
982# CONFIG_OCFS2_FS is not set 1006# CONFIG_OCFS2_FS is not set
983CONFIG_DNOTIFY=y 1007CONFIG_DNOTIFY=y
@@ -1007,6 +1031,7 @@ CONFIG_INOTIFY_USER=y
1007CONFIG_PROC_FS=y 1031CONFIG_PROC_FS=y
1008CONFIG_PROC_KCORE=y 1032CONFIG_PROC_KCORE=y
1009CONFIG_PROC_SYSCTL=y 1033CONFIG_PROC_SYSCTL=y
1034CONFIG_PROC_PAGE_MONITOR=y
1010CONFIG_SYSFS=y 1035CONFIG_SYSFS=y
1011CONFIG_TMPFS=y 1036CONFIG_TMPFS=y
1012# CONFIG_TMPFS_POSIX_ACL is not set 1037# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1052,6 +1077,7 @@ CONFIG_ROOT_NFS=y
1052CONFIG_LOCKD=y 1077CONFIG_LOCKD=y
1053CONFIG_NFS_COMMON=y 1078CONFIG_NFS_COMMON=y
1054CONFIG_SUNRPC=y 1079CONFIG_SUNRPC=y
1080# CONFIG_SUNRPC_REGISTER_V4 is not set
1055# CONFIG_RPCSEC_GSS_KRB5 is not set 1081# CONFIG_RPCSEC_GSS_KRB5 is not set
1056# CONFIG_RPCSEC_GSS_SPKM3 is not set 1082# CONFIG_RPCSEC_GSS_SPKM3 is not set
1057# CONFIG_SMB_FS is not set 1083# CONFIG_SMB_FS is not set
@@ -1084,7 +1110,6 @@ CONFIG_PARTITION_ADVANCED=y
1084# Library routines 1110# Library routines
1085# 1111#
1086CONFIG_BITREVERSE=y 1112CONFIG_BITREVERSE=y
1087# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1088# CONFIG_CRC_CCITT is not set 1113# CONFIG_CRC_CCITT is not set
1089# CONFIG_CRC16 is not set 1114# CONFIG_CRC16 is not set
1090# CONFIG_CRC_T10DIF is not set 1115# CONFIG_CRC_T10DIF is not set
@@ -1116,13 +1141,15 @@ CONFIG_FRAME_WARN=1024
1116# CONFIG_SLUB_STATS is not set 1141# CONFIG_SLUB_STATS is not set
1117# CONFIG_DEBUG_BUGVERBOSE is not set 1142# CONFIG_DEBUG_BUGVERBOSE is not set
1118# CONFIG_DEBUG_MEMORY_INIT is not set 1143# CONFIG_DEBUG_MEMORY_INIT is not set
1144# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1119# CONFIG_LATENCYTOP is not set 1145# CONFIG_LATENCYTOP is not set
1120CONFIG_SYSCTL_SYSCALL_CHECK=y 1146CONFIG_SYSCTL_SYSCALL_CHECK=y
1121CONFIG_HAVE_FTRACE=y 1147CONFIG_HAVE_FUNCTION_TRACER=y
1122CONFIG_HAVE_DYNAMIC_FTRACE=y 1148
1123# CONFIG_FTRACE is not set 1149#
1124# CONFIG_SCHED_TRACER is not set 1150# Tracers
1125# CONFIG_CONTEXT_SWITCH_TRACER is not set 1151#
1152# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1126# CONFIG_SAMPLES is not set 1153# CONFIG_SAMPLES is not set
1127CONFIG_HAVE_ARCH_KGDB=y 1154CONFIG_HAVE_ARCH_KGDB=y
1128# CONFIG_IRQSTACKS is not set 1155# CONFIG_IRQSTACKS is not set
@@ -1133,12 +1160,14 @@ CONFIG_HAVE_ARCH_KGDB=y
1133# 1160#
1134# CONFIG_KEYS is not set 1161# CONFIG_KEYS is not set
1135# CONFIG_SECURITY is not set 1162# CONFIG_SECURITY is not set
1163# CONFIG_SECURITYFS is not set
1136# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1164# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1137CONFIG_CRYPTO=y 1165CONFIG_CRYPTO=y
1138 1166
1139# 1167#
1140# Crypto core or helper 1168# Crypto core or helper
1141# 1169#
1170# CONFIG_CRYPTO_FIPS is not set
1142# CONFIG_CRYPTO_MANAGER is not set 1171# CONFIG_CRYPTO_MANAGER is not set
1143# CONFIG_CRYPTO_GF128MUL is not set 1172# CONFIG_CRYPTO_GF128MUL is not set
1144# CONFIG_CRYPTO_NULL is not set 1173# CONFIG_CRYPTO_NULL is not set
@@ -1210,6 +1239,11 @@ CONFIG_CRYPTO=y
1210# 1239#
1211# CONFIG_CRYPTO_DEFLATE is not set 1240# CONFIG_CRYPTO_DEFLATE is not set
1212# CONFIG_CRYPTO_LZO is not set 1241# CONFIG_CRYPTO_LZO is not set
1242
1243#
1244# Random Number Generation
1245#
1246# CONFIG_CRYPTO_ANSI_CPRNG is not set
1213CONFIG_CRYPTO_HW=y 1247CONFIG_CRYPTO_HW=y
1214# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1248# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1215# CONFIG_CRYPTO_DEV_TALITOS is not set 1249# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/85xx/tqm8548_defconfig b/arch/powerpc/configs/85xx/tqm8548_defconfig
index ca1234d26855..eef45b97dc3e 100644
--- a/arch/powerpc/configs/85xx/tqm8548_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8548_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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:40 2008 4# Sat Nov 8 12:40:22 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -107,7 +107,9 @@ CONFIG_SIGNALFD=y
107CONFIG_TIMERFD=y 107CONFIG_TIMERFD=y
108CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
109CONFIG_SHMEM=y 109CONFIG_SHMEM=y
110CONFIG_AIO=y
110CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_PCI_QUIRKS=y
111CONFIG_SLUB_DEBUG=y 113CONFIG_SLUB_DEBUG=y
112# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
113CONFIG_SLUB=y 115CONFIG_SLUB=y
@@ -121,10 +123,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
121CONFIG_HAVE_KPROBES=y 123CONFIG_HAVE_KPROBES=y
122CONFIG_HAVE_KRETPROBES=y 124CONFIG_HAVE_KRETPROBES=y
123CONFIG_HAVE_ARCH_TRACEHOOK=y 125CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_DMA_ATTRS is not set
125# CONFIG_USE_GENERIC_SMP_HELPERS is not set
126# CONFIG_HAVE_CLK is not set
127CONFIG_PROC_PAGE_MONITOR=y
128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
129CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
130CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
@@ -157,6 +155,7 @@ CONFIG_DEFAULT_AS=y
157# CONFIG_DEFAULT_NOOP is not set 155# CONFIG_DEFAULT_NOOP is not set
158CONFIG_DEFAULT_IOSCHED="anticipatory" 156CONFIG_DEFAULT_IOSCHED="anticipatory"
159CONFIG_CLASSIC_RCU=y 157CONFIG_CLASSIC_RCU=y
158# CONFIG_FREEZER is not set
160 159
161# 160#
162# Platform support 161# Platform support
@@ -192,8 +191,10 @@ CONFIG_MPIC=y
192# CONFIG_PPC_INDIRECT_IO is not set 191# CONFIG_PPC_INDIRECT_IO is not set
193# CONFIG_GENERIC_IOMAP is not set 192# CONFIG_GENERIC_IOMAP is not set
194# CONFIG_CPU_FREQ is not set 193# CONFIG_CPU_FREQ is not set
194# CONFIG_QUICC_ENGINE is not set
195# CONFIG_CPM2 is not set 195# CONFIG_CPM2 is not set
196# CONFIG_FSL_ULI1575 is not set 196# CONFIG_FSL_ULI1575 is not set
197# CONFIG_MPC8xxx_GPIO is not set
197 198
198# 199#
199# Kernel options 200# Kernel options
@@ -213,6 +214,8 @@ CONFIG_PREEMPT_NONE=y
213# CONFIG_PREEMPT_VOLUNTARY is not set 214# CONFIG_PREEMPT_VOLUNTARY is not set
214# CONFIG_PREEMPT is not set 215# CONFIG_PREEMPT is not set
215CONFIG_BINFMT_ELF=y 216CONFIG_BINFMT_ELF=y
217# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
218# CONFIG_HAVE_AOUT is not set
216CONFIG_BINFMT_MISC=y 219CONFIG_BINFMT_MISC=y
217CONFIG_MATH_EMULATION=y 220CONFIG_MATH_EMULATION=y
218# CONFIG_IOMMU_HELPER is not set 221# CONFIG_IOMMU_HELPER is not set
@@ -227,15 +230,15 @@ CONFIG_FLATMEM_MANUAL=y
227# CONFIG_SPARSEMEM_MANUAL is not set 230# CONFIG_SPARSEMEM_MANUAL is not set
228CONFIG_FLATMEM=y 231CONFIG_FLATMEM=y
229CONFIG_FLAT_NODE_MEM_MAP=y 232CONFIG_FLAT_NODE_MEM_MAP=y
230# CONFIG_SPARSEMEM_STATIC is not set
231# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
232CONFIG_PAGEFLAGS_EXTENDED=y 233CONFIG_PAGEFLAGS_EXTENDED=y
233CONFIG_SPLIT_PTLOCK_CPUS=4 234CONFIG_SPLIT_PTLOCK_CPUS=4
234CONFIG_MIGRATION=y 235CONFIG_MIGRATION=y
235# CONFIG_RESOURCES_64BIT is not set 236# CONFIG_RESOURCES_64BIT is not set
237# CONFIG_PHYS_ADDR_T_64BIT is not set
236CONFIG_ZONE_DMA_FLAG=1 238CONFIG_ZONE_DMA_FLAG=1
237CONFIG_BOUNCE=y 239CONFIG_BOUNCE=y
238CONFIG_VIRT_TO_BUS=y 240CONFIG_VIRT_TO_BUS=y
241CONFIG_UNEVICTABLE_LRU=y
239CONFIG_FORCE_MAX_ZONEORDER=11 242CONFIG_FORCE_MAX_ZONEORDER=11
240CONFIG_PROC_DEVICETREE=y 243CONFIG_PROC_DEVICETREE=y
241# CONFIG_CMDLINE_BOOL is not set 244# CONFIG_CMDLINE_BOOL is not set
@@ -260,7 +263,7 @@ CONFIG_PCIEAER=y
260# CONFIG_PCIEASPM is not set 263# CONFIG_PCIEASPM is not set
261CONFIG_ARCH_SUPPORTS_MSI=y 264CONFIG_ARCH_SUPPORTS_MSI=y
262# CONFIG_PCI_MSI is not set 265# CONFIG_PCI_MSI is not set
263CONFIG_PCI_LEGACY=y 266# CONFIG_PCI_LEGACY is not set
264# CONFIG_PCI_DEBUG is not set 267# CONFIG_PCI_DEBUG is not set
265# CONFIG_PCCARD is not set 268# CONFIG_PCCARD is not set
266# CONFIG_HOTPLUG_PCI is not set 269# CONFIG_HOTPLUG_PCI is not set
@@ -330,6 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
330# CONFIG_TIPC is not set 333# CONFIG_TIPC is not set
331# CONFIG_ATM is not set 334# CONFIG_ATM is not set
332# CONFIG_BRIDGE is not set 335# CONFIG_BRIDGE is not set
336# CONFIG_NET_DSA is not set
333# CONFIG_VLAN_8021Q is not set 337# CONFIG_VLAN_8021Q is not set
334# CONFIG_DECNET is not set 338# CONFIG_DECNET is not set
335# CONFIG_LLC2 is not set 339# CONFIG_LLC2 is not set
@@ -350,11 +354,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
350# CONFIG_IRDA is not set 354# CONFIG_IRDA is not set
351# CONFIG_BT is not set 355# CONFIG_BT is not set
352# CONFIG_AF_RXRPC is not set 356# CONFIG_AF_RXRPC is not set
353 357# CONFIG_PHONET is not set
354# 358CONFIG_WIRELESS=y
355# Wireless
356#
357# CONFIG_CFG80211 is not set 359# CONFIG_CFG80211 is not set
360CONFIG_WIRELESS_OLD_REGULATORY=y
358# CONFIG_WIRELESS_EXT is not set 361# CONFIG_WIRELESS_EXT is not set
359# CONFIG_MAC80211 is not set 362# CONFIG_MAC80211 is not set
360# CONFIG_IEEE80211 is not set 363# CONFIG_IEEE80211 is not set
@@ -458,6 +461,7 @@ CONFIG_MTD_NAND_IDS=y
458# CONFIG_MTD_NAND_NANDSIM is not set 461# CONFIG_MTD_NAND_NANDSIM is not set
459# CONFIG_MTD_NAND_PLATFORM is not set 462# CONFIG_MTD_NAND_PLATFORM is not set
460# CONFIG_MTD_NAND_FSL_ELBC is not set 463# CONFIG_MTD_NAND_FSL_ELBC is not set
464# CONFIG_MTD_NAND_FSL_UPM is not set
461# CONFIG_MTD_ONENAND is not set 465# CONFIG_MTD_ONENAND is not set
462 466
463# 467#
@@ -502,18 +506,17 @@ CONFIG_MISC_DEVICES=y
502# CONFIG_HP_ILO is not set 506# CONFIG_HP_ILO is not set
503CONFIG_HAVE_IDE=y 507CONFIG_HAVE_IDE=y
504CONFIG_IDE=y 508CONFIG_IDE=y
505CONFIG_BLK_DEV_IDE=y
506 509
507# 510#
508# Please see Documentation/ide/ide.txt for help/info on IDE drives 511# Please see Documentation/ide/ide.txt for help/info on IDE drives
509# 512#
510CONFIG_IDE_TIMINGS=y 513CONFIG_IDE_TIMINGS=y
511# CONFIG_BLK_DEV_IDE_SATA is not set 514# CONFIG_BLK_DEV_IDE_SATA is not set
512# CONFIG_BLK_DEV_IDEDISK is not set 515CONFIG_IDE_GD=y
513# CONFIG_IDEDISK_MULTI_MODE is not set 516CONFIG_IDE_GD_ATA=y
517# CONFIG_IDE_GD_ATAPI is not set
514# CONFIG_BLK_DEV_IDECD is not set 518# CONFIG_BLK_DEV_IDECD is not set
515# CONFIG_BLK_DEV_IDETAPE is not set 519# CONFIG_BLK_DEV_IDETAPE is not set
516# CONFIG_BLK_DEV_IDEFLOPPY is not set
517# CONFIG_IDE_TASK_IOCTL is not set 520# CONFIG_IDE_TASK_IOCTL is not set
518CONFIG_IDE_PROC_FS=y 521CONFIG_IDE_PROC_FS=y
519 522
@@ -616,13 +619,16 @@ CONFIG_MII=y
616# CONFIG_IBM_NEW_EMAC_RGMII is not set 619# CONFIG_IBM_NEW_EMAC_RGMII is not set
617# CONFIG_IBM_NEW_EMAC_TAH is not set 620# CONFIG_IBM_NEW_EMAC_TAH is not set
618# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 621# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
622# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
623# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
624# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
619# CONFIG_NET_PCI is not set 625# CONFIG_NET_PCI is not set
620# CONFIG_B44 is not set 626# CONFIG_B44 is not set
627# CONFIG_ATL2 is not set
621CONFIG_NETDEV_1000=y 628CONFIG_NETDEV_1000=y
622# CONFIG_ACENIC is not set 629# CONFIG_ACENIC is not set
623# CONFIG_DL2K is not set 630# CONFIG_DL2K is not set
624CONFIG_E1000=y 631CONFIG_E1000=y
625# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
626# CONFIG_E1000E is not set 632# CONFIG_E1000E is not set
627# CONFIG_IP1000 is not set 633# CONFIG_IP1000 is not set
628# CONFIG_IGB is not set 634# CONFIG_IGB is not set
@@ -640,18 +646,22 @@ CONFIG_GIANFAR=y
640# CONFIG_QLA3XXX is not set 646# CONFIG_QLA3XXX is not set
641# CONFIG_ATL1 is not set 647# CONFIG_ATL1 is not set
642# CONFIG_ATL1E is not set 648# CONFIG_ATL1E is not set
649# CONFIG_JME is not set
643CONFIG_NETDEV_10000=y 650CONFIG_NETDEV_10000=y
644# CONFIG_CHELSIO_T1 is not set 651# CONFIG_CHELSIO_T1 is not set
645# CONFIG_CHELSIO_T3 is not set 652# CONFIG_CHELSIO_T3 is not set
653# CONFIG_ENIC is not set
646# CONFIG_IXGBE is not set 654# CONFIG_IXGBE is not set
647# CONFIG_IXGB is not set 655# CONFIG_IXGB is not set
648# CONFIG_S2IO is not set 656# CONFIG_S2IO is not set
649# CONFIG_MYRI10GE is not set 657# CONFIG_MYRI10GE is not set
650# CONFIG_NETXEN_NIC is not set 658# CONFIG_NETXEN_NIC is not set
651# CONFIG_NIU is not set 659# CONFIG_NIU is not set
660# CONFIG_MLX4_EN is not set
652# CONFIG_MLX4_CORE is not set 661# CONFIG_MLX4_CORE is not set
653# CONFIG_TEHUTI is not set 662# CONFIG_TEHUTI is not set
654# CONFIG_BNX2X is not set 663# CONFIG_BNX2X is not set
664# CONFIG_QLGE is not set
655# CONFIG_SFC is not set 665# CONFIG_SFC is not set
656# CONFIG_TR is not set 666# CONFIG_TR is not set
657 667
@@ -885,6 +895,17 @@ CONFIG_SSB_POSSIBLE=y
885# CONFIG_MFD_SM501 is not set 895# CONFIG_MFD_SM501 is not set
886# CONFIG_HTC_PASIC3 is not set 896# CONFIG_HTC_PASIC3 is not set
887# CONFIG_MFD_TMIO is not set 897# CONFIG_MFD_TMIO is not set
898# CONFIG_PMIC_DA903X is not set
899# CONFIG_MFD_WM8400 is not set
900# CONFIG_MFD_WM8350_I2C is not set
901
902#
903# Voltage and Current regulators
904#
905# CONFIG_REGULATOR is not set
906# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
907# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
908# CONFIG_REGULATOR_BQ24022 is not set
888 909
889# 910#
890# Multimedia devices 911# Multimedia devices
@@ -921,6 +942,12 @@ CONFIG_HID_SUPPORT=y
921CONFIG_HID=y 942CONFIG_HID=y
922# CONFIG_HID_DEBUG is not set 943# CONFIG_HID_DEBUG is not set
923# CONFIG_HIDRAW is not set 944# CONFIG_HIDRAW is not set
945# CONFIG_HID_PID is not set
946
947#
948# Special HID drivers
949#
950CONFIG_HID_COMPAT=y
924CONFIG_USB_SUPPORT=y 951CONFIG_USB_SUPPORT=y
925CONFIG_USB_ARCH_HAS_HCD=y 952CONFIG_USB_ARCH_HAS_HCD=y
926CONFIG_USB_ARCH_HAS_OHCI=y 953CONFIG_USB_ARCH_HAS_OHCI=y
@@ -937,6 +964,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
937# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 964# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
938# 965#
939# CONFIG_USB_GADGET is not set 966# CONFIG_USB_GADGET is not set
967# CONFIG_UWB is not set
940# CONFIG_MMC is not set 968# CONFIG_MMC is not set
941# CONFIG_MEMSTICK is not set 969# CONFIG_MEMSTICK is not set
942# CONFIG_NEW_LEDS is not set 970# CONFIG_NEW_LEDS is not set
@@ -982,12 +1010,15 @@ CONFIG_RTC_DRV_DS1307=y
982# Platform RTC drivers 1010# Platform RTC drivers
983# 1011#
984# CONFIG_RTC_DRV_CMOS is not set 1012# CONFIG_RTC_DRV_CMOS is not set
1013# CONFIG_RTC_DRV_DS1286 is not set
985# CONFIG_RTC_DRV_DS1511 is not set 1014# CONFIG_RTC_DRV_DS1511 is not set
986# CONFIG_RTC_DRV_DS1553 is not set 1015# CONFIG_RTC_DRV_DS1553 is not set
987# CONFIG_RTC_DRV_DS1742 is not set 1016# CONFIG_RTC_DRV_DS1742 is not set
988# CONFIG_RTC_DRV_STK17TA8 is not set 1017# CONFIG_RTC_DRV_STK17TA8 is not set
989# CONFIG_RTC_DRV_M48T86 is not set 1018# CONFIG_RTC_DRV_M48T86 is not set
1019# CONFIG_RTC_DRV_M48T35 is not set
990# CONFIG_RTC_DRV_M48T59 is not set 1020# CONFIG_RTC_DRV_M48T59 is not set
1021# CONFIG_RTC_DRV_BQ4802 is not set
991# CONFIG_RTC_DRV_V3020 is not set 1022# CONFIG_RTC_DRV_V3020 is not set
992 1023
993# 1024#
@@ -996,6 +1027,7 @@ CONFIG_RTC_DRV_DS1307=y
996# CONFIG_RTC_DRV_PPC is not set 1027# CONFIG_RTC_DRV_PPC is not set
997# CONFIG_DMADEVICES is not set 1028# CONFIG_DMADEVICES is not set
998# CONFIG_UIO is not set 1029# CONFIG_UIO is not set
1030# CONFIG_STAGING is not set
999 1031
1000# 1032#
1001# File systems 1033# File systems
@@ -1007,12 +1039,13 @@ CONFIG_EXT3_FS=y
1007CONFIG_EXT3_FS_XATTR=y 1039CONFIG_EXT3_FS_XATTR=y
1008# CONFIG_EXT3_FS_POSIX_ACL is not set 1040# CONFIG_EXT3_FS_POSIX_ACL is not set
1009# CONFIG_EXT3_FS_SECURITY is not set 1041# CONFIG_EXT3_FS_SECURITY is not set
1010# CONFIG_EXT4DEV_FS is not set 1042# CONFIG_EXT4_FS is not set
1011CONFIG_JBD=y 1043CONFIG_JBD=y
1012CONFIG_FS_MBCACHE=y 1044CONFIG_FS_MBCACHE=y
1013# CONFIG_REISERFS_FS is not set 1045# CONFIG_REISERFS_FS is not set
1014# CONFIG_JFS_FS is not set 1046# CONFIG_JFS_FS is not set
1015# CONFIG_FS_POSIX_ACL is not set 1047# CONFIG_FS_POSIX_ACL is not set
1048CONFIG_FILE_LOCKING=y
1016# CONFIG_XFS_FS is not set 1049# CONFIG_XFS_FS is not set
1017# CONFIG_OCFS2_FS is not set 1050# CONFIG_OCFS2_FS is not set
1018CONFIG_DNOTIFY=y 1051CONFIG_DNOTIFY=y
@@ -1042,6 +1075,7 @@ CONFIG_INOTIFY_USER=y
1042CONFIG_PROC_FS=y 1075CONFIG_PROC_FS=y
1043CONFIG_PROC_KCORE=y 1076CONFIG_PROC_KCORE=y
1044CONFIG_PROC_SYSCTL=y 1077CONFIG_PROC_SYSCTL=y
1078CONFIG_PROC_PAGE_MONITOR=y
1045CONFIG_SYSFS=y 1079CONFIG_SYSFS=y
1046CONFIG_TMPFS=y 1080CONFIG_TMPFS=y
1047# CONFIG_TMPFS_POSIX_ACL is not set 1081# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1078,6 +1112,7 @@ CONFIG_ROOT_NFS=y
1078CONFIG_LOCKD=y 1112CONFIG_LOCKD=y
1079CONFIG_NFS_COMMON=y 1113CONFIG_NFS_COMMON=y
1080CONFIG_SUNRPC=y 1114CONFIG_SUNRPC=y
1115# CONFIG_SUNRPC_REGISTER_V4 is not set
1081# CONFIG_RPCSEC_GSS_KRB5 is not set 1116# CONFIG_RPCSEC_GSS_KRB5 is not set
1082# CONFIG_RPCSEC_GSS_SPKM3 is not set 1117# CONFIG_RPCSEC_GSS_SPKM3 is not set
1083# CONFIG_SMB_FS is not set 1118# CONFIG_SMB_FS is not set
@@ -1110,7 +1145,6 @@ CONFIG_PARTITION_ADVANCED=y
1110# Library routines 1145# Library routines
1111# 1146#
1112CONFIG_BITREVERSE=y 1147CONFIG_BITREVERSE=y
1113# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1114# CONFIG_CRC_CCITT is not set 1148# CONFIG_CRC_CCITT is not set
1115# CONFIG_CRC16 is not set 1149# CONFIG_CRC16 is not set
1116# CONFIG_CRC_T10DIF is not set 1150# CONFIG_CRC_T10DIF is not set
@@ -1162,15 +1196,23 @@ CONFIG_DEBUG_MUTEXES=y
1162# CONFIG_DEBUG_SG is not set 1196# CONFIG_DEBUG_SG is not set
1163# CONFIG_BOOT_PRINTK_DELAY is not set 1197# CONFIG_BOOT_PRINTK_DELAY is not set
1164# CONFIG_RCU_TORTURE_TEST is not set 1198# CONFIG_RCU_TORTURE_TEST is not set
1199# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1165# CONFIG_BACKTRACE_SELF_TEST is not set 1200# CONFIG_BACKTRACE_SELF_TEST is not set
1201# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1166# CONFIG_FAULT_INJECTION is not set 1202# CONFIG_FAULT_INJECTION is not set
1167# CONFIG_LATENCYTOP is not set 1203# CONFIG_LATENCYTOP is not set
1168CONFIG_SYSCTL_SYSCALL_CHECK=y 1204CONFIG_SYSCTL_SYSCALL_CHECK=y
1169CONFIG_HAVE_FTRACE=y 1205CONFIG_HAVE_FUNCTION_TRACER=y
1170CONFIG_HAVE_DYNAMIC_FTRACE=y 1206
1171# CONFIG_FTRACE is not set 1207#
1208# Tracers
1209#
1210# CONFIG_FUNCTION_TRACER is not set
1172# CONFIG_SCHED_TRACER is not set 1211# CONFIG_SCHED_TRACER is not set
1173# CONFIG_CONTEXT_SWITCH_TRACER is not set 1212# CONFIG_CONTEXT_SWITCH_TRACER is not set
1213# CONFIG_BOOT_TRACER is not set
1214# CONFIG_STACK_TRACER is not set
1215# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1174# CONFIG_SAMPLES is not set 1216# CONFIG_SAMPLES is not set
1175CONFIG_HAVE_ARCH_KGDB=y 1217CONFIG_HAVE_ARCH_KGDB=y
1176# CONFIG_KGDB is not set 1218# CONFIG_KGDB is not set
@@ -1179,6 +1221,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1179# CONFIG_DEBUG_PAGEALLOC is not set 1221# CONFIG_DEBUG_PAGEALLOC is not set
1180# CONFIG_CODE_PATCHING_SELFTEST is not set 1222# CONFIG_CODE_PATCHING_SELFTEST is not set
1181# CONFIG_FTR_FIXUP_SELFTEST is not set 1223# CONFIG_FTR_FIXUP_SELFTEST is not set
1224# CONFIG_MSI_BITMAP_SELFTEST is not set
1182# CONFIG_XMON is not set 1225# CONFIG_XMON is not set
1183# CONFIG_IRQSTACKS is not set 1226# CONFIG_IRQSTACKS is not set
1184# CONFIG_BDI_SWITCH is not set 1227# CONFIG_BDI_SWITCH is not set
@@ -1189,12 +1232,14 @@ CONFIG_HAVE_ARCH_KGDB=y
1189# 1232#
1190# CONFIG_KEYS is not set 1233# CONFIG_KEYS is not set
1191# CONFIG_SECURITY is not set 1234# CONFIG_SECURITY is not set
1235# CONFIG_SECURITYFS is not set
1192# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1236# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1193CONFIG_CRYPTO=y 1237CONFIG_CRYPTO=y
1194 1238
1195# 1239#
1196# Crypto core or helper 1240# Crypto core or helper
1197# 1241#
1242# CONFIG_CRYPTO_FIPS is not set
1198# CONFIG_CRYPTO_MANAGER is not set 1243# CONFIG_CRYPTO_MANAGER is not set
1199# CONFIG_CRYPTO_GF128MUL is not set 1244# CONFIG_CRYPTO_GF128MUL is not set
1200# CONFIG_CRYPTO_NULL is not set 1245# CONFIG_CRYPTO_NULL is not set
@@ -1267,6 +1312,11 @@ CONFIG_CRYPTO=y
1267# 1312#
1268# CONFIG_CRYPTO_DEFLATE is not set 1313# CONFIG_CRYPTO_DEFLATE is not set
1269# CONFIG_CRYPTO_LZO is not set 1314# CONFIG_CRYPTO_LZO is not set
1315
1316#
1317# Random Number Generation
1318#
1319# CONFIG_CRYPTO_ANSI_CPRNG is not set
1270CONFIG_CRYPTO_HW=y 1320CONFIG_CRYPTO_HW=y
1271# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1321# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1272# CONFIG_CRYPTO_DEV_TALITOS is not set 1322# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig
index dcf9cfe28b55..11b637e99a54 100644
--- a/arch/powerpc/configs/85xx/tqm8555_defconfig
+++ b/arch/powerpc/configs/85xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:42 2008 4# Sat Nov 8 12:40:23 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -106,7 +106,9 @@ CONFIG_SIGNALFD=y
106CONFIG_TIMERFD=y 106CONFIG_TIMERFD=y
107CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
108CONFIG_SHMEM=y 108CONFIG_SHMEM=y
109CONFIG_AIO=y
109CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y
110CONFIG_SLUB_DEBUG=y 112CONFIG_SLUB_DEBUG=y
111# CONFIG_SLAB is not set 113# CONFIG_SLAB is not set
112CONFIG_SLUB=y 114CONFIG_SLUB=y
@@ -119,10 +121,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
119CONFIG_HAVE_KPROBES=y 121CONFIG_HAVE_KPROBES=y
120CONFIG_HAVE_KRETPROBES=y 122CONFIG_HAVE_KRETPROBES=y
121CONFIG_HAVE_ARCH_TRACEHOOK=y 123CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_DMA_ATTRS is not set
123# CONFIG_USE_GENERIC_SMP_HELPERS is not set
124CONFIG_HAVE_CLK=y 124CONFIG_HAVE_CLK=y
125CONFIG_PROC_PAGE_MONITOR=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 127CONFIG_RT_MUTEXES=y
@@ -149,6 +148,7 @@ CONFIG_DEFAULT_AS=y
149# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
150CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
151CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_FREEZER is not set
152 152
153# 153#
154# Platform support 154# Platform support
@@ -184,15 +184,16 @@ CONFIG_MPIC=y
184# CONFIG_PPC_INDIRECT_IO is not set 184# CONFIG_PPC_INDIRECT_IO is not set
185# CONFIG_GENERIC_IOMAP is not set 185# CONFIG_GENERIC_IOMAP is not set
186# CONFIG_CPU_FREQ is not set 186# CONFIG_CPU_FREQ is not set
187# CONFIG_QUICC_ENGINE is not set
187CONFIG_CPM2=y 188CONFIG_CPM2=y
188# CONFIG_FSL_ULI1575 is not set 189# CONFIG_FSL_ULI1575 is not set
189CONFIG_CPM=y 190CONFIG_CPM=y
191# CONFIG_MPC8xxx_GPIO is not set
190 192
191# 193#
192# Kernel options 194# Kernel options
193# 195#
194# CONFIG_HIGHMEM is not set 196# CONFIG_HIGHMEM is not set
195# CONFIG_TICK_ONESHOT is not set
196# CONFIG_NO_HZ is not set 197# CONFIG_NO_HZ is not set
197# CONFIG_HIGH_RES_TIMERS is not set 198# CONFIG_HIGH_RES_TIMERS is not set
198CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 199CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -206,6 +207,8 @@ CONFIG_PREEMPT_NONE=y
206# CONFIG_PREEMPT_VOLUNTARY is not set 207# CONFIG_PREEMPT_VOLUNTARY is not set
207# CONFIG_PREEMPT is not set 208# CONFIG_PREEMPT is not set
208CONFIG_BINFMT_ELF=y 209CONFIG_BINFMT_ELF=y
210# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
211# CONFIG_HAVE_AOUT is not set
209# CONFIG_BINFMT_MISC is not set 212# CONFIG_BINFMT_MISC is not set
210CONFIG_MATH_EMULATION=y 213CONFIG_MATH_EMULATION=y
211# CONFIG_IOMMU_HELPER is not set 214# CONFIG_IOMMU_HELPER is not set
@@ -220,15 +223,15 @@ CONFIG_FLATMEM_MANUAL=y
220# CONFIG_SPARSEMEM_MANUAL is not set 223# CONFIG_SPARSEMEM_MANUAL is not set
221CONFIG_FLATMEM=y 224CONFIG_FLATMEM=y
222CONFIG_FLAT_NODE_MEM_MAP=y 225CONFIG_FLAT_NODE_MEM_MAP=y
223# CONFIG_SPARSEMEM_STATIC is not set
224# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
225CONFIG_PAGEFLAGS_EXTENDED=y 226CONFIG_PAGEFLAGS_EXTENDED=y
226CONFIG_SPLIT_PTLOCK_CPUS=4 227CONFIG_SPLIT_PTLOCK_CPUS=4
227CONFIG_MIGRATION=y 228CONFIG_MIGRATION=y
228# CONFIG_RESOURCES_64BIT is not set 229# CONFIG_RESOURCES_64BIT is not set
230# CONFIG_PHYS_ADDR_T_64BIT is not set
229CONFIG_ZONE_DMA_FLAG=1 231CONFIG_ZONE_DMA_FLAG=1
230CONFIG_BOUNCE=y 232CONFIG_BOUNCE=y
231CONFIG_VIRT_TO_BUS=y 233CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y
232CONFIG_FORCE_MAX_ZONEORDER=11 235CONFIG_FORCE_MAX_ZONEORDER=11
233# CONFIG_PROC_DEVICETREE is not set 236# CONFIG_PROC_DEVICETREE is not set
234# CONFIG_CMDLINE_BOOL is not set 237# CONFIG_CMDLINE_BOOL is not set
@@ -251,7 +254,7 @@ CONFIG_PCI_SYSCALL=y
251# CONFIG_PCIEPORTBUS is not set 254# CONFIG_PCIEPORTBUS is not set
252CONFIG_ARCH_SUPPORTS_MSI=y 255CONFIG_ARCH_SUPPORTS_MSI=y
253# CONFIG_PCI_MSI is not set 256# CONFIG_PCI_MSI is not set
254CONFIG_PCI_LEGACY=y 257# CONFIG_PCI_LEGACY is not set
255# CONFIG_HAS_RAPIDIO is not set 258# CONFIG_HAS_RAPIDIO is not set
256 259
257# 260#
@@ -318,6 +321,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
318# CONFIG_TIPC is not set 321# CONFIG_TIPC is not set
319# CONFIG_ATM is not set 322# CONFIG_ATM is not set
320# CONFIG_BRIDGE is not set 323# CONFIG_BRIDGE is not set
324# CONFIG_NET_DSA is not set
321# CONFIG_VLAN_8021Q is not set 325# CONFIG_VLAN_8021Q is not set
322# CONFIG_DECNET is not set 326# CONFIG_DECNET is not set
323# CONFIG_LLC2 is not set 327# CONFIG_LLC2 is not set
@@ -338,11 +342,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
338# CONFIG_IRDA is not set 342# CONFIG_IRDA is not set
339# CONFIG_BT is not set 343# CONFIG_BT is not set
340# CONFIG_AF_RXRPC is not set 344# CONFIG_AF_RXRPC is not set
341 345# CONFIG_PHONET is not set
342# 346CONFIG_WIRELESS=y
343# Wireless
344#
345# CONFIG_CFG80211 is not set 347# CONFIG_CFG80211 is not set
348CONFIG_WIRELESS_OLD_REGULATORY=y
346# CONFIG_WIRELESS_EXT is not set 349# CONFIG_WIRELESS_EXT is not set
347# CONFIG_MAC80211 is not set 350# CONFIG_MAC80211 is not set
348# CONFIG_IEEE80211 is not set 351# CONFIG_IEEE80211 is not set
@@ -469,18 +472,17 @@ CONFIG_MISC_DEVICES=y
469# CONFIG_HP_ILO is not set 472# CONFIG_HP_ILO is not set
470CONFIG_HAVE_IDE=y 473CONFIG_HAVE_IDE=y
471CONFIG_IDE=y 474CONFIG_IDE=y
472CONFIG_BLK_DEV_IDE=y
473 475
474# 476#
475# Please see Documentation/ide/ide.txt for help/info on IDE drives 477# Please see Documentation/ide/ide.txt for help/info on IDE drives
476# 478#
477CONFIG_IDE_TIMINGS=y 479CONFIG_IDE_TIMINGS=y
478# CONFIG_BLK_DEV_IDE_SATA is not set 480# CONFIG_BLK_DEV_IDE_SATA is not set
479CONFIG_BLK_DEV_IDEDISK=y 481CONFIG_IDE_GD=y
480# CONFIG_IDEDISK_MULTI_MODE is not set 482CONFIG_IDE_GD_ATA=y
483# CONFIG_IDE_GD_ATAPI is not set
481# CONFIG_BLK_DEV_IDECD is not set 484# CONFIG_BLK_DEV_IDECD is not set
482# CONFIG_BLK_DEV_IDETAPE is not set 485# CONFIG_BLK_DEV_IDETAPE is not set
483# CONFIG_BLK_DEV_IDEFLOPPY is not set
484# CONFIG_IDE_TASK_IOCTL is not set 486# CONFIG_IDE_TASK_IOCTL is not set
485CONFIG_IDE_PROC_FS=y 487CONFIG_IDE_PROC_FS=y
486 488
@@ -583,6 +585,9 @@ CONFIG_MII=y
583# CONFIG_IBM_NEW_EMAC_RGMII is not set 585# CONFIG_IBM_NEW_EMAC_RGMII is not set
584# CONFIG_IBM_NEW_EMAC_TAH is not set 586# CONFIG_IBM_NEW_EMAC_TAH is not set
585# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 587# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
588# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
589# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
590# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
586CONFIG_NET_PCI=y 591CONFIG_NET_PCI=y
587# CONFIG_PCNET32 is not set 592# CONFIG_PCNET32 is not set
588# CONFIG_AMD8111_ETH is not set 593# CONFIG_AMD8111_ETH is not set
@@ -603,6 +608,7 @@ CONFIG_E100=y
603# CONFIG_TLAN is not set 608# CONFIG_TLAN is not set
604# CONFIG_VIA_RHINE is not set 609# CONFIG_VIA_RHINE is not set
605# CONFIG_SC92031 is not set 610# CONFIG_SC92031 is not set
611# CONFIG_ATL2 is not set
606# CONFIG_FS_ENET is not set 612# CONFIG_FS_ENET is not set
607CONFIG_NETDEV_1000=y 613CONFIG_NETDEV_1000=y
608# CONFIG_ACENIC is not set 614# CONFIG_ACENIC is not set
@@ -625,18 +631,22 @@ CONFIG_GIANFAR=y
625# CONFIG_QLA3XXX is not set 631# CONFIG_QLA3XXX is not set
626# CONFIG_ATL1 is not set 632# CONFIG_ATL1 is not set
627# CONFIG_ATL1E is not set 633# CONFIG_ATL1E is not set
634# CONFIG_JME is not set
628CONFIG_NETDEV_10000=y 635CONFIG_NETDEV_10000=y
629# CONFIG_CHELSIO_T1 is not set 636# CONFIG_CHELSIO_T1 is not set
630# CONFIG_CHELSIO_T3 is not set 637# CONFIG_CHELSIO_T3 is not set
638# CONFIG_ENIC is not set
631# CONFIG_IXGBE is not set 639# CONFIG_IXGBE is not set
632# CONFIG_IXGB is not set 640# CONFIG_IXGB is not set
633# CONFIG_S2IO is not set 641# CONFIG_S2IO is not set
634# CONFIG_MYRI10GE is not set 642# CONFIG_MYRI10GE is not set
635# CONFIG_NETXEN_NIC is not set 643# CONFIG_NETXEN_NIC is not set
636# CONFIG_NIU is not set 644# CONFIG_NIU is not set
645# CONFIG_MLX4_EN is not set
637# CONFIG_MLX4_CORE is not set 646# CONFIG_MLX4_CORE is not set
638# CONFIG_TEHUTI is not set 647# CONFIG_TEHUTI is not set
639# CONFIG_BNX2X is not set 648# CONFIG_BNX2X is not set
649# CONFIG_QLGE is not set
640# CONFIG_SFC is not set 650# CONFIG_SFC is not set
641# CONFIG_TR is not set 651# CONFIG_TR is not set
642 652
@@ -715,12 +725,6 @@ CONFIG_SERIAL_CORE=y
715CONFIG_SERIAL_CORE_CONSOLE=y 725CONFIG_SERIAL_CORE_CONSOLE=y
716CONFIG_SERIAL_CPM=y 726CONFIG_SERIAL_CPM=y
717CONFIG_SERIAL_CPM_CONSOLE=y 727CONFIG_SERIAL_CPM_CONSOLE=y
718CONFIG_SERIAL_CPM_SCC1=y
719# CONFIG_SERIAL_CPM_SCC2 is not set
720# CONFIG_SERIAL_CPM_SCC3 is not set
721# CONFIG_SERIAL_CPM_SCC4 is not set
722# CONFIG_SERIAL_CPM_SMC1 is not set
723# CONFIG_SERIAL_CPM_SMC2 is not set
724# CONFIG_SERIAL_JSM is not set 728# CONFIG_SERIAL_JSM is not set
725# CONFIG_SERIAL_OF_PLATFORM is not set 729# CONFIG_SERIAL_OF_PLATFORM is not set
726CONFIG_UNIX98_PTYS=y 730CONFIG_UNIX98_PTYS=y
@@ -900,6 +904,17 @@ CONFIG_SSB_POSSIBLE=y
900# CONFIG_MFD_SM501 is not set 904# CONFIG_MFD_SM501 is not set
901# CONFIG_HTC_PASIC3 is not set 905# CONFIG_HTC_PASIC3 is not set
902# CONFIG_MFD_TMIO is not set 906# CONFIG_MFD_TMIO is not set
907# CONFIG_PMIC_DA903X is not set
908# CONFIG_MFD_WM8400 is not set
909# CONFIG_MFD_WM8350_I2C is not set
910
911#
912# Voltage and Current regulators
913#
914# CONFIG_REGULATOR is not set
915# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
916# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
917# CONFIG_REGULATOR_BQ24022 is not set
903 918
904# 919#
905# Multimedia devices 920# Multimedia devices
@@ -936,6 +951,12 @@ CONFIG_HID_SUPPORT=y
936CONFIG_HID=y 951CONFIG_HID=y
937# CONFIG_HID_DEBUG is not set 952# CONFIG_HID_DEBUG is not set
938# CONFIG_HIDRAW is not set 953# CONFIG_HIDRAW is not set
954# CONFIG_HID_PID is not set
955
956#
957# Special HID drivers
958#
959CONFIG_HID_COMPAT=y
939CONFIG_USB_SUPPORT=y 960CONFIG_USB_SUPPORT=y
940CONFIG_USB_ARCH_HAS_HCD=y 961CONFIG_USB_ARCH_HAS_HCD=y
941CONFIG_USB_ARCH_HAS_OHCI=y 962CONFIG_USB_ARCH_HAS_OHCI=y
@@ -952,6 +973,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
952# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 973# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
953# 974#
954# CONFIG_USB_GADGET is not set 975# CONFIG_USB_GADGET is not set
976# CONFIG_UWB is not set
955# CONFIG_MMC is not set 977# CONFIG_MMC is not set
956# CONFIG_MEMSTICK is not set 978# CONFIG_MEMSTICK is not set
957# CONFIG_NEW_LEDS is not set 979# CONFIG_NEW_LEDS is not set
@@ -961,6 +983,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
961# CONFIG_RTC_CLASS is not set 983# CONFIG_RTC_CLASS is not set
962# CONFIG_DMADEVICES is not set 984# CONFIG_DMADEVICES is not set
963# CONFIG_UIO is not set 985# CONFIG_UIO is not set
986# CONFIG_STAGING is not set
964 987
965# 988#
966# File systems 989# File systems
@@ -972,12 +995,13 @@ CONFIG_EXT3_FS=y
972CONFIG_EXT3_FS_XATTR=y 995CONFIG_EXT3_FS_XATTR=y
973# CONFIG_EXT3_FS_POSIX_ACL is not set 996# CONFIG_EXT3_FS_POSIX_ACL is not set
974# CONFIG_EXT3_FS_SECURITY is not set 997# CONFIG_EXT3_FS_SECURITY is not set
975# CONFIG_EXT4DEV_FS is not set 998# CONFIG_EXT4_FS is not set
976CONFIG_JBD=y 999CONFIG_JBD=y
977CONFIG_FS_MBCACHE=y 1000CONFIG_FS_MBCACHE=y
978# CONFIG_REISERFS_FS is not set 1001# CONFIG_REISERFS_FS is not set
979# CONFIG_JFS_FS is not set 1002# CONFIG_JFS_FS is not set
980# CONFIG_FS_POSIX_ACL is not set 1003# CONFIG_FS_POSIX_ACL is not set
1004CONFIG_FILE_LOCKING=y
981# CONFIG_XFS_FS is not set 1005# CONFIG_XFS_FS is not set
982# CONFIG_OCFS2_FS is not set 1006# CONFIG_OCFS2_FS is not set
983CONFIG_DNOTIFY=y 1007CONFIG_DNOTIFY=y
@@ -1007,6 +1031,7 @@ CONFIG_INOTIFY_USER=y
1007CONFIG_PROC_FS=y 1031CONFIG_PROC_FS=y
1008CONFIG_PROC_KCORE=y 1032CONFIG_PROC_KCORE=y
1009CONFIG_PROC_SYSCTL=y 1033CONFIG_PROC_SYSCTL=y
1034CONFIG_PROC_PAGE_MONITOR=y
1010CONFIG_SYSFS=y 1035CONFIG_SYSFS=y
1011CONFIG_TMPFS=y 1036CONFIG_TMPFS=y
1012# CONFIG_TMPFS_POSIX_ACL is not set 1037# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1052,6 +1077,7 @@ CONFIG_ROOT_NFS=y
1052CONFIG_LOCKD=y 1077CONFIG_LOCKD=y
1053CONFIG_NFS_COMMON=y 1078CONFIG_NFS_COMMON=y
1054CONFIG_SUNRPC=y 1079CONFIG_SUNRPC=y
1080# CONFIG_SUNRPC_REGISTER_V4 is not set
1055# CONFIG_RPCSEC_GSS_KRB5 is not set 1081# CONFIG_RPCSEC_GSS_KRB5 is not set
1056# CONFIG_RPCSEC_GSS_SPKM3 is not set 1082# CONFIG_RPCSEC_GSS_SPKM3 is not set
1057# CONFIG_SMB_FS is not set 1083# CONFIG_SMB_FS is not set
@@ -1084,7 +1110,6 @@ CONFIG_PARTITION_ADVANCED=y
1084# Library routines 1110# Library routines
1085# 1111#
1086CONFIG_BITREVERSE=y 1112CONFIG_BITREVERSE=y
1087# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1088# CONFIG_CRC_CCITT is not set 1113# CONFIG_CRC_CCITT is not set
1089# CONFIG_CRC16 is not set 1114# CONFIG_CRC16 is not set
1090# CONFIG_CRC_T10DIF is not set 1115# CONFIG_CRC_T10DIF is not set
@@ -1116,13 +1141,15 @@ CONFIG_FRAME_WARN=1024
1116# CONFIG_SLUB_STATS is not set 1141# CONFIG_SLUB_STATS is not set
1117# CONFIG_DEBUG_BUGVERBOSE is not set 1142# CONFIG_DEBUG_BUGVERBOSE is not set
1118# CONFIG_DEBUG_MEMORY_INIT is not set 1143# CONFIG_DEBUG_MEMORY_INIT is not set
1144# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1119# CONFIG_LATENCYTOP is not set 1145# CONFIG_LATENCYTOP is not set
1120CONFIG_SYSCTL_SYSCALL_CHECK=y 1146CONFIG_SYSCTL_SYSCALL_CHECK=y
1121CONFIG_HAVE_FTRACE=y 1147CONFIG_HAVE_FUNCTION_TRACER=y
1122CONFIG_HAVE_DYNAMIC_FTRACE=y 1148
1123# CONFIG_FTRACE is not set 1149#
1124# CONFIG_SCHED_TRACER is not set 1150# Tracers
1125# CONFIG_CONTEXT_SWITCH_TRACER is not set 1151#
1152# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1126# CONFIG_SAMPLES is not set 1153# CONFIG_SAMPLES is not set
1127CONFIG_HAVE_ARCH_KGDB=y 1154CONFIG_HAVE_ARCH_KGDB=y
1128# CONFIG_IRQSTACKS is not set 1155# CONFIG_IRQSTACKS is not set
@@ -1133,12 +1160,14 @@ CONFIG_HAVE_ARCH_KGDB=y
1133# 1160#
1134# CONFIG_KEYS is not set 1161# CONFIG_KEYS is not set
1135# CONFIG_SECURITY is not set 1162# CONFIG_SECURITY is not set
1163# CONFIG_SECURITYFS is not set
1136# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1164# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1137CONFIG_CRYPTO=y 1165CONFIG_CRYPTO=y
1138 1166
1139# 1167#
1140# Crypto core or helper 1168# Crypto core or helper
1141# 1169#
1170# CONFIG_CRYPTO_FIPS is not set
1142# CONFIG_CRYPTO_MANAGER is not set 1171# CONFIG_CRYPTO_MANAGER is not set
1143# CONFIG_CRYPTO_GF128MUL is not set 1172# CONFIG_CRYPTO_GF128MUL is not set
1144# CONFIG_CRYPTO_NULL is not set 1173# CONFIG_CRYPTO_NULL is not set
@@ -1210,6 +1239,11 @@ CONFIG_CRYPTO=y
1210# 1239#
1211# CONFIG_CRYPTO_DEFLATE is not set 1240# CONFIG_CRYPTO_DEFLATE is not set
1212# CONFIG_CRYPTO_LZO is not set 1241# CONFIG_CRYPTO_LZO is not set
1242
1243#
1244# Random Number Generation
1245#
1246# CONFIG_CRYPTO_ANSI_CPRNG is not set
1213CONFIG_CRYPTO_HW=y 1247CONFIG_CRYPTO_HW=y
1214# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1248# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1215# CONFIG_CRYPTO_DEV_TALITOS is not set 1249# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig
index 8d676629cdb1..2519169b6d4b 100644
--- a/arch/powerpc/configs/85xx/tqm8560_defconfig
+++ b/arch/powerpc/configs/85xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:43 2008 4# Sat Nov 8 12:40:25 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -106,7 +106,9 @@ CONFIG_SIGNALFD=y
106CONFIG_TIMERFD=y 106CONFIG_TIMERFD=y
107CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
108CONFIG_SHMEM=y 108CONFIG_SHMEM=y
109CONFIG_AIO=y
109CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y
110CONFIG_SLUB_DEBUG=y 112CONFIG_SLUB_DEBUG=y
111# CONFIG_SLAB is not set 113# CONFIG_SLAB is not set
112CONFIG_SLUB=y 114CONFIG_SLUB=y
@@ -119,10 +121,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
119CONFIG_HAVE_KPROBES=y 121CONFIG_HAVE_KPROBES=y
120CONFIG_HAVE_KRETPROBES=y 122CONFIG_HAVE_KRETPROBES=y
121CONFIG_HAVE_ARCH_TRACEHOOK=y 123CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_DMA_ATTRS is not set
123# CONFIG_USE_GENERIC_SMP_HELPERS is not set
124CONFIG_HAVE_CLK=y 124CONFIG_HAVE_CLK=y
125CONFIG_PROC_PAGE_MONITOR=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 127CONFIG_RT_MUTEXES=y
@@ -149,6 +148,7 @@ CONFIG_DEFAULT_AS=y
149# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
150CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
151CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_FREEZER is not set
152 152
153# 153#
154# Platform support 154# Platform support
@@ -184,15 +184,16 @@ CONFIG_MPIC=y
184# CONFIG_PPC_INDIRECT_IO is not set 184# CONFIG_PPC_INDIRECT_IO is not set
185# CONFIG_GENERIC_IOMAP is not set 185# CONFIG_GENERIC_IOMAP is not set
186# CONFIG_CPU_FREQ is not set 186# CONFIG_CPU_FREQ is not set
187# CONFIG_QUICC_ENGINE is not set
187CONFIG_CPM2=y 188CONFIG_CPM2=y
188# CONFIG_FSL_ULI1575 is not set 189# CONFIG_FSL_ULI1575 is not set
189CONFIG_CPM=y 190CONFIG_CPM=y
191# CONFIG_MPC8xxx_GPIO is not set
190 192
191# 193#
192# Kernel options 194# Kernel options
193# 195#
194# CONFIG_HIGHMEM is not set 196# CONFIG_HIGHMEM is not set
195# CONFIG_TICK_ONESHOT is not set
196# CONFIG_NO_HZ is not set 197# CONFIG_NO_HZ is not set
197# CONFIG_HIGH_RES_TIMERS is not set 198# CONFIG_HIGH_RES_TIMERS is not set
198CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 199CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -206,6 +207,8 @@ CONFIG_PREEMPT_NONE=y
206# CONFIG_PREEMPT_VOLUNTARY is not set 207# CONFIG_PREEMPT_VOLUNTARY is not set
207# CONFIG_PREEMPT is not set 208# CONFIG_PREEMPT is not set
208CONFIG_BINFMT_ELF=y 209CONFIG_BINFMT_ELF=y
210# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
211# CONFIG_HAVE_AOUT is not set
209# CONFIG_BINFMT_MISC is not set 212# CONFIG_BINFMT_MISC is not set
210CONFIG_MATH_EMULATION=y 213CONFIG_MATH_EMULATION=y
211# CONFIG_IOMMU_HELPER is not set 214# CONFIG_IOMMU_HELPER is not set
@@ -220,15 +223,15 @@ CONFIG_FLATMEM_MANUAL=y
220# CONFIG_SPARSEMEM_MANUAL is not set 223# CONFIG_SPARSEMEM_MANUAL is not set
221CONFIG_FLATMEM=y 224CONFIG_FLATMEM=y
222CONFIG_FLAT_NODE_MEM_MAP=y 225CONFIG_FLAT_NODE_MEM_MAP=y
223# CONFIG_SPARSEMEM_STATIC is not set
224# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
225CONFIG_PAGEFLAGS_EXTENDED=y 226CONFIG_PAGEFLAGS_EXTENDED=y
226CONFIG_SPLIT_PTLOCK_CPUS=4 227CONFIG_SPLIT_PTLOCK_CPUS=4
227CONFIG_MIGRATION=y 228CONFIG_MIGRATION=y
228# CONFIG_RESOURCES_64BIT is not set 229# CONFIG_RESOURCES_64BIT is not set
230# CONFIG_PHYS_ADDR_T_64BIT is not set
229CONFIG_ZONE_DMA_FLAG=1 231CONFIG_ZONE_DMA_FLAG=1
230CONFIG_BOUNCE=y 232CONFIG_BOUNCE=y
231CONFIG_VIRT_TO_BUS=y 233CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y
232CONFIG_FORCE_MAX_ZONEORDER=11 235CONFIG_FORCE_MAX_ZONEORDER=11
233# CONFIG_PROC_DEVICETREE is not set 236# CONFIG_PROC_DEVICETREE is not set
234# CONFIG_CMDLINE_BOOL is not set 237# CONFIG_CMDLINE_BOOL is not set
@@ -251,7 +254,7 @@ CONFIG_PCI_SYSCALL=y
251# CONFIG_PCIEPORTBUS is not set 254# CONFIG_PCIEPORTBUS is not set
252CONFIG_ARCH_SUPPORTS_MSI=y 255CONFIG_ARCH_SUPPORTS_MSI=y
253# CONFIG_PCI_MSI is not set 256# CONFIG_PCI_MSI is not set
254CONFIG_PCI_LEGACY=y 257# CONFIG_PCI_LEGACY is not set
255# CONFIG_HAS_RAPIDIO is not set 258# CONFIG_HAS_RAPIDIO is not set
256 259
257# 260#
@@ -318,6 +321,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
318# CONFIG_TIPC is not set 321# CONFIG_TIPC is not set
319# CONFIG_ATM is not set 322# CONFIG_ATM is not set
320# CONFIG_BRIDGE is not set 323# CONFIG_BRIDGE is not set
324# CONFIG_NET_DSA is not set
321# CONFIG_VLAN_8021Q is not set 325# CONFIG_VLAN_8021Q is not set
322# CONFIG_DECNET is not set 326# CONFIG_DECNET is not set
323# CONFIG_LLC2 is not set 327# CONFIG_LLC2 is not set
@@ -338,11 +342,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
338# CONFIG_IRDA is not set 342# CONFIG_IRDA is not set
339# CONFIG_BT is not set 343# CONFIG_BT is not set
340# CONFIG_AF_RXRPC is not set 344# CONFIG_AF_RXRPC is not set
341 345# CONFIG_PHONET is not set
342# 346CONFIG_WIRELESS=y
343# Wireless
344#
345# CONFIG_CFG80211 is not set 347# CONFIG_CFG80211 is not set
348CONFIG_WIRELESS_OLD_REGULATORY=y
346# CONFIG_WIRELESS_EXT is not set 349# CONFIG_WIRELESS_EXT is not set
347# CONFIG_MAC80211 is not set 350# CONFIG_MAC80211 is not set
348# CONFIG_IEEE80211 is not set 351# CONFIG_IEEE80211 is not set
@@ -469,18 +472,17 @@ CONFIG_MISC_DEVICES=y
469# CONFIG_HP_ILO is not set 472# CONFIG_HP_ILO is not set
470CONFIG_HAVE_IDE=y 473CONFIG_HAVE_IDE=y
471CONFIG_IDE=y 474CONFIG_IDE=y
472CONFIG_BLK_DEV_IDE=y
473 475
474# 476#
475# Please see Documentation/ide/ide.txt for help/info on IDE drives 477# Please see Documentation/ide/ide.txt for help/info on IDE drives
476# 478#
477CONFIG_IDE_TIMINGS=y 479CONFIG_IDE_TIMINGS=y
478# CONFIG_BLK_DEV_IDE_SATA is not set 480# CONFIG_BLK_DEV_IDE_SATA is not set
479CONFIG_BLK_DEV_IDEDISK=y 481CONFIG_IDE_GD=y
480# CONFIG_IDEDISK_MULTI_MODE is not set 482CONFIG_IDE_GD_ATA=y
483# CONFIG_IDE_GD_ATAPI is not set
481# CONFIG_BLK_DEV_IDECD is not set 484# CONFIG_BLK_DEV_IDECD is not set
482# CONFIG_BLK_DEV_IDETAPE is not set 485# CONFIG_BLK_DEV_IDETAPE is not set
483# CONFIG_BLK_DEV_IDEFLOPPY is not set
484# CONFIG_IDE_TASK_IOCTL is not set 486# CONFIG_IDE_TASK_IOCTL is not set
485CONFIG_IDE_PROC_FS=y 487CONFIG_IDE_PROC_FS=y
486 488
@@ -583,6 +585,9 @@ CONFIG_MII=y
583# CONFIG_IBM_NEW_EMAC_RGMII is not set 585# CONFIG_IBM_NEW_EMAC_RGMII is not set
584# CONFIG_IBM_NEW_EMAC_TAH is not set 586# CONFIG_IBM_NEW_EMAC_TAH is not set
585# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 587# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
588# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
589# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
590# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
586CONFIG_NET_PCI=y 591CONFIG_NET_PCI=y
587# CONFIG_PCNET32 is not set 592# CONFIG_PCNET32 is not set
588# CONFIG_AMD8111_ETH is not set 593# CONFIG_AMD8111_ETH is not set
@@ -603,6 +608,7 @@ CONFIG_E100=y
603# CONFIG_TLAN is not set 608# CONFIG_TLAN is not set
604# CONFIG_VIA_RHINE is not set 609# CONFIG_VIA_RHINE is not set
605# CONFIG_SC92031 is not set 610# CONFIG_SC92031 is not set
611# CONFIG_ATL2 is not set
606# CONFIG_FS_ENET is not set 612# CONFIG_FS_ENET is not set
607CONFIG_NETDEV_1000=y 613CONFIG_NETDEV_1000=y
608# CONFIG_ACENIC is not set 614# CONFIG_ACENIC is not set
@@ -625,18 +631,22 @@ CONFIG_GIANFAR=y
625# CONFIG_QLA3XXX is not set 631# CONFIG_QLA3XXX is not set
626# CONFIG_ATL1 is not set 632# CONFIG_ATL1 is not set
627# CONFIG_ATL1E is not set 633# CONFIG_ATL1E is not set
634# CONFIG_JME is not set
628CONFIG_NETDEV_10000=y 635CONFIG_NETDEV_10000=y
629# CONFIG_CHELSIO_T1 is not set 636# CONFIG_CHELSIO_T1 is not set
630# CONFIG_CHELSIO_T3 is not set 637# CONFIG_CHELSIO_T3 is not set
638# CONFIG_ENIC is not set
631# CONFIG_IXGBE is not set 639# CONFIG_IXGBE is not set
632# CONFIG_IXGB is not set 640# CONFIG_IXGB is not set
633# CONFIG_S2IO is not set 641# CONFIG_S2IO is not set
634# CONFIG_MYRI10GE is not set 642# CONFIG_MYRI10GE is not set
635# CONFIG_NETXEN_NIC is not set 643# CONFIG_NETXEN_NIC is not set
636# CONFIG_NIU is not set 644# CONFIG_NIU is not set
645# CONFIG_MLX4_EN is not set
637# CONFIG_MLX4_CORE is not set 646# CONFIG_MLX4_CORE is not set
638# CONFIG_TEHUTI is not set 647# CONFIG_TEHUTI is not set
639# CONFIG_BNX2X is not set 648# CONFIG_BNX2X is not set
649# CONFIG_QLGE is not set
640# CONFIG_SFC is not set 650# CONFIG_SFC is not set
641# CONFIG_TR is not set 651# CONFIG_TR is not set
642 652
@@ -715,12 +725,6 @@ CONFIG_SERIAL_CORE=y
715CONFIG_SERIAL_CORE_CONSOLE=y 725CONFIG_SERIAL_CORE_CONSOLE=y
716CONFIG_SERIAL_CPM=y 726CONFIG_SERIAL_CPM=y
717CONFIG_SERIAL_CPM_CONSOLE=y 727CONFIG_SERIAL_CPM_CONSOLE=y
718CONFIG_SERIAL_CPM_SCC1=y
719# CONFIG_SERIAL_CPM_SCC2 is not set
720# CONFIG_SERIAL_CPM_SCC3 is not set
721# CONFIG_SERIAL_CPM_SCC4 is not set
722# CONFIG_SERIAL_CPM_SMC1 is not set
723# CONFIG_SERIAL_CPM_SMC2 is not set
724# CONFIG_SERIAL_JSM is not set 728# CONFIG_SERIAL_JSM is not set
725# CONFIG_SERIAL_OF_PLATFORM is not set 729# CONFIG_SERIAL_OF_PLATFORM is not set
726CONFIG_UNIX98_PTYS=y 730CONFIG_UNIX98_PTYS=y
@@ -900,6 +904,17 @@ CONFIG_SSB_POSSIBLE=y
900# CONFIG_MFD_SM501 is not set 904# CONFIG_MFD_SM501 is not set
901# CONFIG_HTC_PASIC3 is not set 905# CONFIG_HTC_PASIC3 is not set
902# CONFIG_MFD_TMIO is not set 906# CONFIG_MFD_TMIO is not set
907# CONFIG_PMIC_DA903X is not set
908# CONFIG_MFD_WM8400 is not set
909# CONFIG_MFD_WM8350_I2C is not set
910
911#
912# Voltage and Current regulators
913#
914# CONFIG_REGULATOR is not set
915# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
916# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
917# CONFIG_REGULATOR_BQ24022 is not set
903 918
904# 919#
905# Multimedia devices 920# Multimedia devices
@@ -936,6 +951,12 @@ CONFIG_HID_SUPPORT=y
936CONFIG_HID=y 951CONFIG_HID=y
937# CONFIG_HID_DEBUG is not set 952# CONFIG_HID_DEBUG is not set
938# CONFIG_HIDRAW is not set 953# CONFIG_HIDRAW is not set
954# CONFIG_HID_PID is not set
955
956#
957# Special HID drivers
958#
959CONFIG_HID_COMPAT=y
939CONFIG_USB_SUPPORT=y 960CONFIG_USB_SUPPORT=y
940CONFIG_USB_ARCH_HAS_HCD=y 961CONFIG_USB_ARCH_HAS_HCD=y
941CONFIG_USB_ARCH_HAS_OHCI=y 962CONFIG_USB_ARCH_HAS_OHCI=y
@@ -952,6 +973,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
952# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 973# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
953# 974#
954# CONFIG_USB_GADGET is not set 975# CONFIG_USB_GADGET is not set
976# CONFIG_UWB is not set
955# CONFIG_MMC is not set 977# CONFIG_MMC is not set
956# CONFIG_MEMSTICK is not set 978# CONFIG_MEMSTICK is not set
957# CONFIG_NEW_LEDS is not set 979# CONFIG_NEW_LEDS is not set
@@ -961,6 +983,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
961# CONFIG_RTC_CLASS is not set 983# CONFIG_RTC_CLASS is not set
962# CONFIG_DMADEVICES is not set 984# CONFIG_DMADEVICES is not set
963# CONFIG_UIO is not set 985# CONFIG_UIO is not set
986# CONFIG_STAGING is not set
964 987
965# 988#
966# File systems 989# File systems
@@ -972,12 +995,13 @@ CONFIG_EXT3_FS=y
972CONFIG_EXT3_FS_XATTR=y 995CONFIG_EXT3_FS_XATTR=y
973# CONFIG_EXT3_FS_POSIX_ACL is not set 996# CONFIG_EXT3_FS_POSIX_ACL is not set
974# CONFIG_EXT3_FS_SECURITY is not set 997# CONFIG_EXT3_FS_SECURITY is not set
975# CONFIG_EXT4DEV_FS is not set 998# CONFIG_EXT4_FS is not set
976CONFIG_JBD=y 999CONFIG_JBD=y
977CONFIG_FS_MBCACHE=y 1000CONFIG_FS_MBCACHE=y
978# CONFIG_REISERFS_FS is not set 1001# CONFIG_REISERFS_FS is not set
979# CONFIG_JFS_FS is not set 1002# CONFIG_JFS_FS is not set
980# CONFIG_FS_POSIX_ACL is not set 1003# CONFIG_FS_POSIX_ACL is not set
1004CONFIG_FILE_LOCKING=y
981# CONFIG_XFS_FS is not set 1005# CONFIG_XFS_FS is not set
982# CONFIG_OCFS2_FS is not set 1006# CONFIG_OCFS2_FS is not set
983CONFIG_DNOTIFY=y 1007CONFIG_DNOTIFY=y
@@ -1007,6 +1031,7 @@ CONFIG_INOTIFY_USER=y
1007CONFIG_PROC_FS=y 1031CONFIG_PROC_FS=y
1008CONFIG_PROC_KCORE=y 1032CONFIG_PROC_KCORE=y
1009CONFIG_PROC_SYSCTL=y 1033CONFIG_PROC_SYSCTL=y
1034CONFIG_PROC_PAGE_MONITOR=y
1010CONFIG_SYSFS=y 1035CONFIG_SYSFS=y
1011CONFIG_TMPFS=y 1036CONFIG_TMPFS=y
1012# CONFIG_TMPFS_POSIX_ACL is not set 1037# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1052,6 +1077,7 @@ CONFIG_ROOT_NFS=y
1052CONFIG_LOCKD=y 1077CONFIG_LOCKD=y
1053CONFIG_NFS_COMMON=y 1078CONFIG_NFS_COMMON=y
1054CONFIG_SUNRPC=y 1079CONFIG_SUNRPC=y
1080# CONFIG_SUNRPC_REGISTER_V4 is not set
1055# CONFIG_RPCSEC_GSS_KRB5 is not set 1081# CONFIG_RPCSEC_GSS_KRB5 is not set
1056# CONFIG_RPCSEC_GSS_SPKM3 is not set 1082# CONFIG_RPCSEC_GSS_SPKM3 is not set
1057# CONFIG_SMB_FS is not set 1083# CONFIG_SMB_FS is not set
@@ -1084,7 +1110,6 @@ CONFIG_PARTITION_ADVANCED=y
1084# Library routines 1110# Library routines
1085# 1111#
1086CONFIG_BITREVERSE=y 1112CONFIG_BITREVERSE=y
1087# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1088# CONFIG_CRC_CCITT is not set 1113# CONFIG_CRC_CCITT is not set
1089# CONFIG_CRC16 is not set 1114# CONFIG_CRC16 is not set
1090# CONFIG_CRC_T10DIF is not set 1115# CONFIG_CRC_T10DIF is not set
@@ -1116,13 +1141,15 @@ CONFIG_FRAME_WARN=1024
1116# CONFIG_SLUB_STATS is not set 1141# CONFIG_SLUB_STATS is not set
1117# CONFIG_DEBUG_BUGVERBOSE is not set 1142# CONFIG_DEBUG_BUGVERBOSE is not set
1118# CONFIG_DEBUG_MEMORY_INIT is not set 1143# CONFIG_DEBUG_MEMORY_INIT is not set
1144# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1119# CONFIG_LATENCYTOP is not set 1145# CONFIG_LATENCYTOP is not set
1120CONFIG_SYSCTL_SYSCALL_CHECK=y 1146CONFIG_SYSCTL_SYSCALL_CHECK=y
1121CONFIG_HAVE_FTRACE=y 1147CONFIG_HAVE_FUNCTION_TRACER=y
1122CONFIG_HAVE_DYNAMIC_FTRACE=y 1148
1123# CONFIG_FTRACE is not set 1149#
1124# CONFIG_SCHED_TRACER is not set 1150# Tracers
1125# CONFIG_CONTEXT_SWITCH_TRACER is not set 1151#
1152# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1126# CONFIG_SAMPLES is not set 1153# CONFIG_SAMPLES is not set
1127CONFIG_HAVE_ARCH_KGDB=y 1154CONFIG_HAVE_ARCH_KGDB=y
1128# CONFIG_IRQSTACKS is not set 1155# CONFIG_IRQSTACKS is not set
@@ -1133,12 +1160,14 @@ CONFIG_HAVE_ARCH_KGDB=y
1133# 1160#
1134# CONFIG_KEYS is not set 1161# CONFIG_KEYS is not set
1135# CONFIG_SECURITY is not set 1162# CONFIG_SECURITY is not set
1163# CONFIG_SECURITYFS is not set
1136# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1164# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1137CONFIG_CRYPTO=y 1165CONFIG_CRYPTO=y
1138 1166
1139# 1167#
1140# Crypto core or helper 1168# Crypto core or helper
1141# 1169#
1170# CONFIG_CRYPTO_FIPS is not set
1142# CONFIG_CRYPTO_MANAGER is not set 1171# CONFIG_CRYPTO_MANAGER is not set
1143# CONFIG_CRYPTO_GF128MUL is not set 1172# CONFIG_CRYPTO_GF128MUL is not set
1144# CONFIG_CRYPTO_NULL is not set 1173# CONFIG_CRYPTO_NULL is not set
@@ -1210,6 +1239,11 @@ CONFIG_CRYPTO=y
1210# 1239#
1211# CONFIG_CRYPTO_DEFLATE is not set 1240# CONFIG_CRYPTO_DEFLATE is not set
1212# CONFIG_CRYPTO_LZO is not set 1241# CONFIG_CRYPTO_LZO is not set
1242
1243#
1244# Random Number Generation
1245#
1246# CONFIG_CRYPTO_ANSI_CPRNG is not set
1213CONFIG_CRYPTO_HW=y 1247CONFIG_CRYPTO_HW=y
1214# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1248# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1215# CONFIG_CRYPTO_DEV_TALITOS is not set 1249# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
index 312d7afbbe44..2da13e00a807 100644
--- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc610_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.26-rc5 3# Linux kernel version: 2.6.28-rc3
4# Wed Jun 11 12:06:53 2008 4# Sat Nov 8 12:40:30 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_PHYS_64BIT is not set
18CONFIG_ALTIVEC=y 19CONFIG_ALTIVEC=y
19CONFIG_PPC_STD_MMU=y 20CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y 21CONFIG_PPC_STD_MMU_32=y
@@ -23,7 +24,7 @@ CONFIG_SMP=y
23CONFIG_NR_CPUS=2 24CONFIG_NR_CPUS=2
24CONFIG_PPC32=y 25CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 28CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y
33# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 34# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
34CONFIG_IRQ_PER_CPU=y 35CONFIG_IRQ_PER_CPU=y
35CONFIG_STACKTRACE_SUPPORT=y 36CONFIG_STACKTRACE_SUPPORT=y
37CONFIG_HAVE_LATENCYTOP_SUPPORT=y
36CONFIG_LOCKDEP_SUPPORT=y 38CONFIG_LOCKDEP_SUPPORT=y
37CONFIG_RWSEM_XCHGADD_ALGORITHM=y 39CONFIG_RWSEM_XCHGADD_ALGORITHM=y
38CONFIG_GENERIC_LOCKBREAK=y 40CONFIG_GENERIC_LOCKBREAK=y
@@ -92,7 +94,6 @@ CONFIG_INITRAMFS_SOURCE=""
92CONFIG_SYSCTL=y 94CONFIG_SYSCTL=y
93CONFIG_EMBEDDED=y 95CONFIG_EMBEDDED=y
94CONFIG_SYSCTL_SYSCALL=y 96CONFIG_SYSCTL_SYSCALL=y
95CONFIG_SYSCTL_SYSCALL_CHECK=y
96CONFIG_KALLSYMS=y 97CONFIG_KALLSYMS=y
97# CONFIG_KALLSYMS_ALL is not set 98# CONFIG_KALLSYMS_ALL is not set
98# CONFIG_KALLSYMS_EXTRA_PASS is not set 99# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -109,7 +110,9 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 110CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 111CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 112CONFIG_SHMEM=y
113CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_PCI_QUIRKS=y
113CONFIG_SLAB=y 116CONFIG_SLAB=y
114# CONFIG_SLUB is not set 117# CONFIG_SLUB is not set
115# CONFIG_SLOB is not set 118# CONFIG_SLOB is not set
@@ -117,10 +120,13 @@ CONFIG_SLAB=y
117# CONFIG_MARKERS is not set 120# CONFIG_MARKERS is not set
118CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
119# CONFIG_KPROBES is not set 122# CONFIG_KPROBES is not set
123CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
124CONFIG_HAVE_IOREMAP_PROT=y
120CONFIG_HAVE_KPROBES=y 125CONFIG_HAVE_KPROBES=y
121CONFIG_HAVE_KRETPROBES=y 126CONFIG_HAVE_KRETPROBES=y
122# CONFIG_HAVE_DMA_ATTRS is not set 127CONFIG_HAVE_ARCH_TRACEHOOK=y
123CONFIG_PROC_PAGE_MONITOR=y 128CONFIG_USE_GENERIC_SMP_HELPERS=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 130CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 131CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set 132# CONFIG_TINY_SHMEM is not set
@@ -138,6 +144,7 @@ CONFIG_BLOCK=y
138# CONFIG_BLK_DEV_IO_TRACE is not set 144# CONFIG_BLK_DEV_IO_TRACE is not set
139# CONFIG_LSF is not set 145# CONFIG_LSF is not set
140# CONFIG_BLK_DEV_BSG is not set 146# CONFIG_BLK_DEV_BSG is not set
147# CONFIG_BLK_DEV_INTEGRITY is not set
141 148
142# 149#
143# IO Schedulers 150# IO Schedulers
@@ -152,6 +159,7 @@ CONFIG_DEFAULT_CFQ=y
152# CONFIG_DEFAULT_NOOP is not set 159# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="cfq" 160CONFIG_DEFAULT_IOSCHED="cfq"
154CONFIG_CLASSIC_RCU=y 161CONFIG_CLASSIC_RCU=y
162# CONFIG_FREEZER is not set
155 163
156# 164#
157# Platform support 165# Platform support
@@ -159,15 +167,16 @@ CONFIG_CLASSIC_RCU=y
159CONFIG_PPC_MULTIPLATFORM=y 167CONFIG_PPC_MULTIPLATFORM=y
160CONFIG_CLASSIC32=y 168CONFIG_CLASSIC32=y
161# CONFIG_PPC_CHRP is not set 169# CONFIG_PPC_CHRP is not set
170# CONFIG_MPC5121_ADS is not set
171# CONFIG_MPC5121_GENERIC is not set
172# CONFIG_PPC_MPC52xx is not set
162# CONFIG_PPC_PMAC is not set 173# CONFIG_PPC_PMAC is not set
163# CONFIG_PPC_82xx is not set
164# CONFIG_PPC_83xx is not set
165CONFIG_PPC_86xx=y
166# CONFIG_PPC_MPC512x is not set
167# CONFIG_PPC_MPC5121 is not set
168# CONFIG_PPC_CELL is not set 174# CONFIG_PPC_CELL is not set
169# CONFIG_PPC_CELL_NATIVE is not set 175# CONFIG_PPC_CELL_NATIVE is not set
176# CONFIG_PPC_82xx is not set
170# CONFIG_PQ2ADS is not set 177# CONFIG_PQ2ADS is not set
178# CONFIG_PPC_83xx is not set
179CONFIG_PPC_86xx=y
171# CONFIG_MPC8641_HPCN is not set 180# CONFIG_MPC8641_HPCN is not set
172# CONFIG_SBC8641D is not set 181# CONFIG_SBC8641D is not set
173# CONFIG_MPC8610_HPCD is not set 182# CONFIG_MPC8610_HPCD is not set
@@ -184,7 +193,10 @@ CONFIG_MPIC=y
184# CONFIG_PPC_INDIRECT_IO is not set 193# CONFIG_PPC_INDIRECT_IO is not set
185# CONFIG_GENERIC_IOMAP is not set 194# CONFIG_GENERIC_IOMAP is not set
186# CONFIG_CPU_FREQ is not set 195# CONFIG_CPU_FREQ is not set
196# CONFIG_TAU is not set
197# CONFIG_QUICC_ENGINE is not set
187# CONFIG_FSL_ULI1575 is not set 198# CONFIG_FSL_ULI1575 is not set
199# CONFIG_MPC8xxx_GPIO is not set
188 200
189# 201#
190# Kernel options 202# Kernel options
@@ -199,17 +211,20 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
199# CONFIG_HZ_300 is not set 211# CONFIG_HZ_300 is not set
200CONFIG_HZ_1000=y 212CONFIG_HZ_1000=y
201CONFIG_HZ=1000 213CONFIG_HZ=1000
202# CONFIG_SCHED_HRTICK is not set 214CONFIG_SCHED_HRTICK=y
203# CONFIG_PREEMPT_NONE is not set 215# CONFIG_PREEMPT_NONE is not set
204# CONFIG_PREEMPT_VOLUNTARY is not set 216# CONFIG_PREEMPT_VOLUNTARY is not set
205CONFIG_PREEMPT=y 217CONFIG_PREEMPT=y
206# CONFIG_PREEMPT_RCU is not set 218# CONFIG_PREEMPT_RCU is not set
207CONFIG_BINFMT_ELF=y 219CONFIG_BINFMT_ELF=y
220# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
221# CONFIG_HAVE_AOUT is not set
208CONFIG_BINFMT_MISC=m 222CONFIG_BINFMT_MISC=m
209# CONFIG_IOMMU_HELPER is not set 223# CONFIG_IOMMU_HELPER is not set
210CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
211CONFIG_ARCH_HAS_WALK_MEMORY=y 225CONFIG_ARCH_HAS_WALK_MEMORY=y
212CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set
213CONFIG_IRQ_ALL_CPUS=y 228CONFIG_IRQ_ALL_CPUS=y
214CONFIG_ARCH_FLATMEM_ENABLE=y 229CONFIG_ARCH_FLATMEM_ENABLE=y
215CONFIG_ARCH_POPULATES_NODE_MAP=y 230CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -219,17 +234,19 @@ CONFIG_FLATMEM_MANUAL=y
219# CONFIG_SPARSEMEM_MANUAL is not set 234# CONFIG_SPARSEMEM_MANUAL is not set
220CONFIG_FLATMEM=y 235CONFIG_FLATMEM=y
221CONFIG_FLAT_NODE_MEM_MAP=y 236CONFIG_FLAT_NODE_MEM_MAP=y
222# CONFIG_SPARSEMEM_STATIC is not set
223# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
224CONFIG_PAGEFLAGS_EXTENDED=y 237CONFIG_PAGEFLAGS_EXTENDED=y
225CONFIG_SPLIT_PTLOCK_CPUS=4 238CONFIG_SPLIT_PTLOCK_CPUS=4
239CONFIG_MIGRATION=y
226# CONFIG_RESOURCES_64BIT is not set 240# CONFIG_RESOURCES_64BIT is not set
241# CONFIG_PHYS_ADDR_T_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=1 242CONFIG_ZONE_DMA_FLAG=1
228CONFIG_BOUNCE=y 243CONFIG_BOUNCE=y
229CONFIG_VIRT_TO_BUS=y 244CONFIG_VIRT_TO_BUS=y
245CONFIG_UNEVICTABLE_LRU=y
230CONFIG_FORCE_MAX_ZONEORDER=11 246CONFIG_FORCE_MAX_ZONEORDER=11
231# CONFIG_PROC_DEVICETREE is not set 247# CONFIG_PROC_DEVICETREE is not set
232# CONFIG_CMDLINE_BOOL is not set 248# CONFIG_CMDLINE_BOOL is not set
249CONFIG_EXTRA_TARGETS=""
233# CONFIG_PM is not set 250# CONFIG_PM is not set
234CONFIG_SECCOMP=y 251CONFIG_SECCOMP=y
235CONFIG_ISA_DMA_API=y 252CONFIG_ISA_DMA_API=y
@@ -242,6 +259,7 @@ CONFIG_GENERIC_ISA_DMA=y
242CONFIG_PPC_INDIRECT_PCI=y 259CONFIG_PPC_INDIRECT_PCI=y
243CONFIG_FSL_SOC=y 260CONFIG_FSL_SOC=y
244CONFIG_FSL_PCI=y 261CONFIG_FSL_PCI=y
262CONFIG_PPC_PCI_CHOICE=y
245CONFIG_PCI=y 263CONFIG_PCI=y
246CONFIG_PCI_DOMAINS=y 264CONFIG_PCI_DOMAINS=y
247CONFIG_PCI_SYSCALL=y 265CONFIG_PCI_SYSCALL=y
@@ -250,7 +268,7 @@ CONFIG_PCIEAER=y
250# CONFIG_PCIEASPM is not set 268# CONFIG_PCIEASPM is not set
251CONFIG_ARCH_SUPPORTS_MSI=y 269CONFIG_ARCH_SUPPORTS_MSI=y
252# CONFIG_PCI_MSI is not set 270# CONFIG_PCI_MSI is not set
253CONFIG_PCI_LEGACY=y 271# CONFIG_PCI_LEGACY is not set
254CONFIG_PCI_DEBUG=y 272CONFIG_PCI_DEBUG=y
255# CONFIG_PCCARD is not set 273# CONFIG_PCCARD is not set
256# CONFIG_HOTPLUG_PCI is not set 274# CONFIG_HOTPLUG_PCI is not set
@@ -270,10 +288,6 @@ CONFIG_PAGE_OFFSET=0xc0000000
270CONFIG_KERNEL_START=0xc0000000 288CONFIG_KERNEL_START=0xc0000000
271CONFIG_PHYSICAL_START=0x00000000 289CONFIG_PHYSICAL_START=0x00000000
272CONFIG_TASK_SIZE=0xc0000000 290CONFIG_TASK_SIZE=0xc0000000
273
274#
275# Networking
276#
277CONFIG_NET=y 291CONFIG_NET=y
278 292
279# 293#
@@ -287,6 +301,7 @@ CONFIG_XFRM_USER=m
287# CONFIG_XFRM_SUB_POLICY is not set 301# CONFIG_XFRM_SUB_POLICY is not set
288# CONFIG_XFRM_MIGRATE is not set 302# CONFIG_XFRM_MIGRATE is not set
289# CONFIG_XFRM_STATISTICS is not set 303# CONFIG_XFRM_STATISTICS is not set
304CONFIG_XFRM_IPCOMP=m
290CONFIG_NET_KEY=m 305CONFIG_NET_KEY=m
291# CONFIG_NET_KEY_MIGRATE is not set 306# CONFIG_NET_KEY_MIGRATE is not set
292CONFIG_INET=y 307CONFIG_INET=y
@@ -325,7 +340,6 @@ CONFIG_INET_TCP_DIAG=y
325CONFIG_TCP_CONG_CUBIC=y 340CONFIG_TCP_CONG_CUBIC=y
326CONFIG_DEFAULT_TCP_CONG="cubic" 341CONFIG_DEFAULT_TCP_CONG="cubic"
327# CONFIG_TCP_MD5SIG is not set 342# CONFIG_TCP_MD5SIG is not set
328# CONFIG_IP_VS is not set
329CONFIG_IPV6=m 343CONFIG_IPV6=m
330# CONFIG_IPV6_PRIVACY is not set 344# CONFIG_IPV6_PRIVACY is not set
331# CONFIG_IPV6_ROUTER_PREF is not set 345# CONFIG_IPV6_ROUTER_PREF is not set
@@ -362,8 +376,8 @@ CONFIG_NETFILTER_XTABLES=m
362# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set 376# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
363# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 377# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
364# CONFIG_NETFILTER_XT_TARGET_MARK is not set 378# CONFIG_NETFILTER_XT_TARGET_MARK is not set
365# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
366# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 379# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
380# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
367# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set 381# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
368# CONFIG_NETFILTER_XT_TARGET_TRACE is not set 382# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
369# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 383# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
@@ -372,37 +386,39 @@ CONFIG_NETFILTER_XTABLES=m
372# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 386# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
373# CONFIG_NETFILTER_XT_MATCH_DSCP is not set 387# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
374# CONFIG_NETFILTER_XT_MATCH_ESP is not set 388# CONFIG_NETFILTER_XT_MATCH_ESP is not set
389# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
375# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set 390# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
376# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set 391# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
377# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set 392# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
378# CONFIG_NETFILTER_XT_MATCH_MAC is not set 393# CONFIG_NETFILTER_XT_MATCH_MAC is not set
379# CONFIG_NETFILTER_XT_MATCH_MARK is not set 394# CONFIG_NETFILTER_XT_MATCH_MARK is not set
395# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
380# CONFIG_NETFILTER_XT_MATCH_OWNER is not set 396# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
381# CONFIG_NETFILTER_XT_MATCH_POLICY is not set 397# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
382# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
383# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set 398# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
384# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set 399# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
385# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 400# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
386# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set 401# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
387# CONFIG_NETFILTER_XT_MATCH_REALM is not set 402# CONFIG_NETFILTER_XT_MATCH_REALM is not set
403# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
388# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 404# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
389# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 405# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
390# CONFIG_NETFILTER_XT_MATCH_STRING is not set 406# CONFIG_NETFILTER_XT_MATCH_STRING is not set
391# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set 407# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
392# CONFIG_NETFILTER_XT_MATCH_TIME is not set 408# CONFIG_NETFILTER_XT_MATCH_TIME is not set
393# CONFIG_NETFILTER_XT_MATCH_U32 is not set 409# CONFIG_NETFILTER_XT_MATCH_U32 is not set
394# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 410# CONFIG_IP_VS is not set
395 411
396# 412#
397# IP: Netfilter Configuration 413# IP: Netfilter Configuration
398# 414#
415# CONFIG_NF_DEFRAG_IPV4 is not set
399CONFIG_IP_NF_QUEUE=m 416CONFIG_IP_NF_QUEUE=m
400CONFIG_IP_NF_IPTABLES=m 417CONFIG_IP_NF_IPTABLES=m
401CONFIG_IP_NF_MATCH_RECENT=m 418CONFIG_IP_NF_MATCH_ADDRTYPE=m
402CONFIG_IP_NF_MATCH_ECN=m
403# CONFIG_IP_NF_MATCH_AH is not set 419# CONFIG_IP_NF_MATCH_AH is not set
420CONFIG_IP_NF_MATCH_ECN=m
404CONFIG_IP_NF_MATCH_TTL=m 421CONFIG_IP_NF_MATCH_TTL=m
405CONFIG_IP_NF_MATCH_ADDRTYPE=m
406CONFIG_IP_NF_FILTER=m 422CONFIG_IP_NF_FILTER=m
407CONFIG_IP_NF_TARGET_REJECT=m 423CONFIG_IP_NF_TARGET_REJECT=m
408CONFIG_IP_NF_TARGET_LOG=m 424CONFIG_IP_NF_TARGET_LOG=m
@@ -411,6 +427,7 @@ CONFIG_IP_NF_MANGLE=m
411CONFIG_IP_NF_TARGET_ECN=m 427CONFIG_IP_NF_TARGET_ECN=m
412# CONFIG_IP_NF_TARGET_TTL is not set 428# CONFIG_IP_NF_TARGET_TTL is not set
413CONFIG_IP_NF_RAW=m 429CONFIG_IP_NF_RAW=m
430# CONFIG_IP_NF_SECURITY is not set
414CONFIG_IP_NF_ARPTABLES=m 431CONFIG_IP_NF_ARPTABLES=m
415CONFIG_IP_NF_ARPFILTER=m 432CONFIG_IP_NF_ARPFILTER=m
416CONFIG_IP_NF_ARP_MANGLE=m 433CONFIG_IP_NF_ARP_MANGLE=m
@@ -420,24 +437,21 @@ CONFIG_IP_NF_ARP_MANGLE=m
420# 437#
421CONFIG_IP6_NF_QUEUE=m 438CONFIG_IP6_NF_QUEUE=m
422CONFIG_IP6_NF_IPTABLES=m 439CONFIG_IP6_NF_IPTABLES=m
423CONFIG_IP6_NF_MATCH_RT=m 440# CONFIG_IP6_NF_MATCH_AH is not set
424CONFIG_IP6_NF_MATCH_OPTS=m 441CONFIG_IP6_NF_MATCH_EUI64=m
425CONFIG_IP6_NF_MATCH_FRAG=m 442CONFIG_IP6_NF_MATCH_FRAG=m
443CONFIG_IP6_NF_MATCH_OPTS=m
426CONFIG_IP6_NF_MATCH_HL=m 444CONFIG_IP6_NF_MATCH_HL=m
427CONFIG_IP6_NF_MATCH_IPV6HEADER=m 445CONFIG_IP6_NF_MATCH_IPV6HEADER=m
428# CONFIG_IP6_NF_MATCH_AH is not set
429# CONFIG_IP6_NF_MATCH_MH is not set 446# CONFIG_IP6_NF_MATCH_MH is not set
430CONFIG_IP6_NF_MATCH_EUI64=m 447CONFIG_IP6_NF_MATCH_RT=m
431CONFIG_IP6_NF_FILTER=m
432CONFIG_IP6_NF_TARGET_LOG=m 448CONFIG_IP6_NF_TARGET_LOG=m
449CONFIG_IP6_NF_FILTER=m
433# CONFIG_IP6_NF_TARGET_REJECT is not set 450# CONFIG_IP6_NF_TARGET_REJECT is not set
434CONFIG_IP6_NF_MANGLE=m 451CONFIG_IP6_NF_MANGLE=m
435# CONFIG_IP6_NF_TARGET_HL is not set 452# CONFIG_IP6_NF_TARGET_HL is not set
436CONFIG_IP6_NF_RAW=m 453CONFIG_IP6_NF_RAW=m
437 454# CONFIG_IP6_NF_SECURITY is not set
438#
439# Bridge: Netfilter Configuration
440#
441# CONFIG_BRIDGE_NF_EBTABLES is not set 455# CONFIG_BRIDGE_NF_EBTABLES is not set
442# CONFIG_IP_DCCP is not set 456# CONFIG_IP_DCCP is not set
443CONFIG_IP_SCTP=m 457CONFIG_IP_SCTP=m
@@ -456,8 +470,11 @@ CONFIG_ATM_LANE=m
456CONFIG_ATM_MPOA=m 470CONFIG_ATM_MPOA=m
457CONFIG_ATM_BR2684=m 471CONFIG_ATM_BR2684=m
458# CONFIG_ATM_BR2684_IPFILTER is not set 472# CONFIG_ATM_BR2684_IPFILTER is not set
473CONFIG_STP=m
459CONFIG_BRIDGE=m 474CONFIG_BRIDGE=m
475# CONFIG_NET_DSA is not set
460CONFIG_VLAN_8021Q=m 476CONFIG_VLAN_8021Q=m
477# CONFIG_VLAN_8021Q_GVRP is not set
461# CONFIG_DECNET is not set 478# CONFIG_DECNET is not set
462CONFIG_LLC=m 479CONFIG_LLC=m
463# CONFIG_LLC2 is not set 480# CONFIG_LLC2 is not set
@@ -477,7 +494,7 @@ CONFIG_NET_SCH_HTB=m
477CONFIG_NET_SCH_HFSC=m 494CONFIG_NET_SCH_HFSC=m
478CONFIG_NET_SCH_ATM=m 495CONFIG_NET_SCH_ATM=m
479CONFIG_NET_SCH_PRIO=m 496CONFIG_NET_SCH_PRIO=m
480# CONFIG_NET_SCH_RR is not set 497# CONFIG_NET_SCH_MULTIQ is not set
481CONFIG_NET_SCH_RED=m 498CONFIG_NET_SCH_RED=m
482CONFIG_NET_SCH_SFQ=m 499CONFIG_NET_SCH_SFQ=m
483CONFIG_NET_SCH_TEQL=m 500CONFIG_NET_SCH_TEQL=m
@@ -515,12 +532,11 @@ CONFIG_NET_PKTGEN=m
515# CONFIG_IRDA is not set 532# CONFIG_IRDA is not set
516# CONFIG_BT is not set 533# CONFIG_BT is not set
517# CONFIG_AF_RXRPC is not set 534# CONFIG_AF_RXRPC is not set
535# CONFIG_PHONET is not set
518CONFIG_FIB_RULES=y 536CONFIG_FIB_RULES=y
519 537CONFIG_WIRELESS=y
520#
521# Wireless
522#
523# CONFIG_CFG80211 is not set 538# CONFIG_CFG80211 is not set
539CONFIG_WIRELESS_OLD_REGULATORY=y
524# CONFIG_WIRELESS_EXT is not set 540# CONFIG_WIRELESS_EXT is not set
525# CONFIG_MAC80211 is not set 541# CONFIG_MAC80211 is not set
526# CONFIG_IEEE80211 is not set 542# CONFIG_IEEE80211 is not set
@@ -646,12 +662,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
646# CONFIG_BLK_DEV_XIP is not set 662# CONFIG_BLK_DEV_XIP is not set
647# CONFIG_CDROM_PKTCDVD is not set 663# CONFIG_CDROM_PKTCDVD is not set
648# CONFIG_ATA_OVER_ETH is not set 664# CONFIG_ATA_OVER_ETH is not set
665# CONFIG_BLK_DEV_HD is not set
649CONFIG_MISC_DEVICES=y 666CONFIG_MISC_DEVICES=y
650# CONFIG_PHANTOM is not set 667# CONFIG_PHANTOM is not set
651# CONFIG_EEPROM_93CX6 is not set 668# CONFIG_EEPROM_93CX6 is not set
652# CONFIG_SGI_IOC4 is not set 669# CONFIG_SGI_IOC4 is not set
653# CONFIG_TIFM_CORE is not set 670# CONFIG_TIFM_CORE is not set
654# CONFIG_ENCLOSURE_SERVICES is not set 671# CONFIG_ENCLOSURE_SERVICES is not set
672# CONFIG_HP_ILO is not set
655CONFIG_HAVE_IDE=y 673CONFIG_HAVE_IDE=y
656# CONFIG_IDE is not set 674# CONFIG_IDE is not set
657 675
@@ -731,6 +749,7 @@ CONFIG_SCSI_LOWLEVEL=y
731# CONFIG_SCSI_NSP32 is not set 749# CONFIG_SCSI_NSP32 is not set
732# CONFIG_SCSI_DEBUG is not set 750# CONFIG_SCSI_DEBUG is not set
733# CONFIG_SCSI_SRP is not set 751# CONFIG_SCSI_SRP is not set
752# CONFIG_SCSI_DH is not set
734CONFIG_ATA=y 753CONFIG_ATA=y
735# CONFIG_ATA_NONSTANDARD is not set 754# CONFIG_ATA_NONSTANDARD is not set
736CONFIG_SATA_PMP=y 755CONFIG_SATA_PMP=y
@@ -798,12 +817,15 @@ CONFIG_SATA_SIL=y
798# 817#
799# IEEE 1394 (FireWire) support 818# IEEE 1394 (FireWire) support
800# 819#
820
821#
822# Enable only one of the two stacks, unless you know what you are doing
823#
801# CONFIG_FIREWIRE is not set 824# CONFIG_FIREWIRE is not set
802# CONFIG_IEEE1394 is not set 825# CONFIG_IEEE1394 is not set
803# CONFIG_I2O is not set 826# CONFIG_I2O is not set
804# CONFIG_MACINTOSH_DRIVERS is not set 827# CONFIG_MACINTOSH_DRIVERS is not set
805CONFIG_NETDEVICES=y 828CONFIG_NETDEVICES=y
806# CONFIG_NETDEVICES_MULTIQUEUE is not set
807CONFIG_DUMMY=m 829CONFIG_DUMMY=m
808CONFIG_BONDING=m 830CONFIG_BONDING=m
809# CONFIG_MACVLAN is not set 831# CONFIG_MACVLAN is not set
@@ -840,14 +862,17 @@ CONFIG_MII=y
840# CONFIG_IBM_NEW_EMAC_RGMII is not set 862# CONFIG_IBM_NEW_EMAC_RGMII is not set
841# CONFIG_IBM_NEW_EMAC_TAH is not set 863# CONFIG_IBM_NEW_EMAC_TAH is not set
842# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 864# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
865# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
866# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
867# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
843# CONFIG_NET_PCI is not set 868# CONFIG_NET_PCI is not set
844# CONFIG_B44 is not set 869# CONFIG_B44 is not set
870# CONFIG_ATL2 is not set
845CONFIG_NETDEV_1000=y 871CONFIG_NETDEV_1000=y
846# CONFIG_ACENIC is not set 872# CONFIG_ACENIC is not set
847# CONFIG_DL2K is not set 873# CONFIG_DL2K is not set
848# CONFIG_E1000 is not set 874# CONFIG_E1000 is not set
849# CONFIG_E1000E is not set 875# CONFIG_E1000E is not set
850# CONFIG_E1000E_ENABLED is not set
851# CONFIG_IP1000 is not set 876# CONFIG_IP1000 is not set
852# CONFIG_IGB is not set 877# CONFIG_IGB is not set
853# CONFIG_NS83820 is not set 878# CONFIG_NS83820 is not set
@@ -861,9 +886,11 @@ CONFIG_NETDEV_1000=y
861# CONFIG_TIGON3 is not set 886# CONFIG_TIGON3 is not set
862# CONFIG_BNX2 is not set 887# CONFIG_BNX2 is not set
863CONFIG_GIANFAR=y 888CONFIG_GIANFAR=y
864# CONFIG_GFAR_NAPI is not set 889# CONFIG_MV643XX_ETH is not set
865# CONFIG_QLA3XXX is not set 890# CONFIG_QLA3XXX is not set
866# CONFIG_ATL1 is not set 891# CONFIG_ATL1 is not set
892# CONFIG_ATL1E is not set
893# CONFIG_JME is not set
867# CONFIG_NETDEV_10000 is not set 894# CONFIG_NETDEV_10000 is not set
868# CONFIG_TR is not set 895# CONFIG_TR is not set
869 896
@@ -895,7 +922,7 @@ CONFIG_ATM_DRIVERS=y
895# CONFIG_ATM_AMBASSADOR is not set 922# CONFIG_ATM_AMBASSADOR is not set
896# CONFIG_ATM_HORIZON is not set 923# CONFIG_ATM_HORIZON is not set
897# CONFIG_ATM_IA is not set 924# CONFIG_ATM_IA is not set
898# CONFIG_ATM_FORE200E_MAYBE is not set 925# CONFIG_ATM_FORE200E is not set
899# CONFIG_ATM_HE is not set 926# CONFIG_ATM_HE is not set
900# CONFIG_FDDI is not set 927# CONFIG_FDDI is not set
901# CONFIG_HIPPI is not set 928# CONFIG_HIPPI is not set
@@ -928,7 +955,7 @@ CONFIG_NET_POLL_CONTROLLER=y
928# Input device support 955# Input device support
929# 956#
930CONFIG_INPUT=y 957CONFIG_INPUT=y
931# CONFIG_INPUT_FF_MEMLESS is not set 958CONFIG_INPUT_FF_MEMLESS=m
932# CONFIG_INPUT_POLLDEV is not set 959# CONFIG_INPUT_POLLDEV is not set
933 960
934# 961#
@@ -962,6 +989,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
962# Character devices 989# Character devices
963# 990#
964CONFIG_VT=y 991CONFIG_VT=y
992CONFIG_CONSOLE_TRANSLATIONS=y
965CONFIG_VT_CONSOLE=y 993CONFIG_VT_CONSOLE=y
966CONFIG_HW_CONSOLE=y 994CONFIG_HW_CONSOLE=y
967# CONFIG_VT_HW_CONSOLE_BINDING is not set 995# CONFIG_VT_HW_CONSOLE_BINDING is not set
@@ -1000,43 +1028,64 @@ CONFIG_DEVPORT=y
1000CONFIG_I2C=y 1028CONFIG_I2C=y
1001CONFIG_I2C_BOARDINFO=y 1029CONFIG_I2C_BOARDINFO=y
1002CONFIG_I2C_CHARDEV=y 1030CONFIG_I2C_CHARDEV=y
1031CONFIG_I2C_HELPER_AUTO=y
1003 1032
1004# 1033#
1005# I2C Hardware Bus support 1034# I2C Hardware Bus support
1006# 1035#
1036
1037#
1038# PC SMBus host controller drivers
1039#
1007# CONFIG_I2C_ALI1535 is not set 1040# CONFIG_I2C_ALI1535 is not set
1008# CONFIG_I2C_ALI1563 is not set 1041# CONFIG_I2C_ALI1563 is not set
1009# CONFIG_I2C_ALI15X3 is not set 1042# CONFIG_I2C_ALI15X3 is not set
1010# CONFIG_I2C_AMD756 is not set 1043# CONFIG_I2C_AMD756 is not set
1011# CONFIG_I2C_AMD8111 is not set 1044# CONFIG_I2C_AMD8111 is not set
1012# CONFIG_I2C_I801 is not set 1045# CONFIG_I2C_I801 is not set
1013# CONFIG_I2C_I810 is not set 1046# CONFIG_I2C_ISCH is not set
1014# CONFIG_I2C_PIIX4 is not set 1047# CONFIG_I2C_PIIX4 is not set
1015CONFIG_I2C_MPC=y
1016# CONFIG_I2C_NFORCE2 is not set 1048# CONFIG_I2C_NFORCE2 is not set
1017# CONFIG_I2C_OCORES is not set
1018# CONFIG_I2C_PARPORT_LIGHT is not set
1019# CONFIG_I2C_PROSAVAGE is not set
1020# CONFIG_I2C_SAVAGE4 is not set
1021# CONFIG_I2C_SIMTEC is not set
1022# CONFIG_I2C_SIS5595 is not set 1049# CONFIG_I2C_SIS5595 is not set
1023# CONFIG_I2C_SIS630 is not set 1050# CONFIG_I2C_SIS630 is not set
1024# CONFIG_I2C_SIS96X is not set 1051# CONFIG_I2C_SIS96X is not set
1025# CONFIG_I2C_TAOS_EVM is not set
1026# CONFIG_I2C_STUB is not set
1027# CONFIG_I2C_TINY_USB is not set
1028# CONFIG_I2C_VIA is not set 1052# CONFIG_I2C_VIA is not set
1029# CONFIG_I2C_VIAPRO is not set 1053# CONFIG_I2C_VIAPRO is not set
1054
1055#
1056# I2C system bus drivers (mostly embedded / system-on-chip)
1057#
1058CONFIG_I2C_MPC=y
1059# CONFIG_I2C_OCORES is not set
1060# CONFIG_I2C_SIMTEC is not set
1061
1062#
1063# External I2C/SMBus adapter drivers
1064#
1065# CONFIG_I2C_PARPORT_LIGHT is not set
1066# CONFIG_I2C_TAOS_EVM is not set
1067# CONFIG_I2C_TINY_USB is not set
1068
1069#
1070# Graphics adapter I2C/DDC channel drivers
1071#
1030# CONFIG_I2C_VOODOO3 is not set 1072# CONFIG_I2C_VOODOO3 is not set
1073
1074#
1075# Other I2C/SMBus bus drivers
1076#
1031# CONFIG_I2C_PCA_PLATFORM is not set 1077# CONFIG_I2C_PCA_PLATFORM is not set
1078# CONFIG_I2C_STUB is not set
1032 1079
1033# 1080#
1034# Miscellaneous I2C Chip support 1081# Miscellaneous I2C Chip support
1035# 1082#
1036CONFIG_DS1682=y 1083CONFIG_DS1682=y
1084# CONFIG_AT24 is not set
1037# CONFIG_SENSORS_EEPROM is not set 1085# CONFIG_SENSORS_EEPROM is not set
1038# CONFIG_SENSORS_PCF8574 is not set 1086# CONFIG_SENSORS_PCF8574 is not set
1039# CONFIG_PCF8575 is not set 1087# CONFIG_PCF8575 is not set
1088# CONFIG_SENSORS_PCA9539 is not set
1040# CONFIG_SENSORS_PCF8591 is not set 1089# CONFIG_SENSORS_PCF8591 is not set
1041# CONFIG_SENSORS_MAX6875 is not set 1090# CONFIG_SENSORS_MAX6875 is not set
1042# CONFIG_SENSORS_TSL2550 is not set 1091# CONFIG_SENSORS_TSL2550 is not set
@@ -1045,10 +1094,13 @@ CONFIG_DS1682=y
1045# CONFIG_I2C_DEBUG_BUS is not set 1094# CONFIG_I2C_DEBUG_BUS is not set
1046# CONFIG_I2C_DEBUG_CHIP is not set 1095# CONFIG_I2C_DEBUG_CHIP is not set
1047# CONFIG_SPI is not set 1096# CONFIG_SPI is not set
1097CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
1098# CONFIG_GPIOLIB is not set
1048# CONFIG_W1 is not set 1099# CONFIG_W1 is not set
1049# CONFIG_POWER_SUPPLY is not set 1100# CONFIG_POWER_SUPPLY is not set
1050CONFIG_HWMON=y 1101CONFIG_HWMON=y
1051# CONFIG_HWMON_VID is not set 1102# CONFIG_HWMON_VID is not set
1103# CONFIG_SENSORS_AD7414 is not set
1052# CONFIG_SENSORS_AD7418 is not set 1104# CONFIG_SENSORS_AD7418 is not set
1053# CONFIG_SENSORS_ADM1021 is not set 1105# CONFIG_SENSORS_ADM1021 is not set
1054# CONFIG_SENSORS_ADM1025 is not set 1106# CONFIG_SENSORS_ADM1025 is not set
@@ -1102,6 +1154,7 @@ CONFIG_SENSORS_LM92=y
1102# CONFIG_SENSORS_W83627EHF is not set 1154# CONFIG_SENSORS_W83627EHF is not set
1103# CONFIG_HWMON_DEBUG_CHIP is not set 1155# CONFIG_HWMON_DEBUG_CHIP is not set
1104# CONFIG_THERMAL is not set 1156# CONFIG_THERMAL is not set
1157# CONFIG_THERMAL_HWMON is not set
1105CONFIG_WATCHDOG=y 1158CONFIG_WATCHDOG=y
1106# CONFIG_WATCHDOG_NOWAYOUT is not set 1159# CONFIG_WATCHDOG_NOWAYOUT is not set
1107 1160
@@ -1109,6 +1162,8 @@ CONFIG_WATCHDOG=y
1109# Watchdog Device Drivers 1162# Watchdog Device Drivers
1110# 1163#
1111# CONFIG_SOFT_WATCHDOG is not set 1164# CONFIG_SOFT_WATCHDOG is not set
1165# CONFIG_ALIM7101_WDT is not set
1166# CONFIG_8xxx_WDT is not set
1112 1167
1113# 1168#
1114# PCI-based Watchdog Cards 1169# PCI-based Watchdog Cards
@@ -1130,8 +1185,21 @@ CONFIG_SSB_POSSIBLE=y
1130# 1185#
1131# Multifunction device drivers 1186# Multifunction device drivers
1132# 1187#
1188# CONFIG_MFD_CORE is not set
1133# CONFIG_MFD_SM501 is not set 1189# CONFIG_MFD_SM501 is not set
1134# CONFIG_HTC_PASIC3 is not set 1190# CONFIG_HTC_PASIC3 is not set
1191# CONFIG_MFD_TMIO is not set
1192# CONFIG_PMIC_DA903X is not set
1193# CONFIG_MFD_WM8400 is not set
1194# CONFIG_MFD_WM8350_I2C is not set
1195
1196#
1197# Voltage and Current regulators
1198#
1199# CONFIG_REGULATOR is not set
1200# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1201# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1202# CONFIG_REGULATOR_BQ24022 is not set
1135 1203
1136# 1204#
1137# Multimedia devices 1205# Multimedia devices
@@ -1171,10 +1239,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
1171CONFIG_VGA_CONSOLE=y 1239CONFIG_VGA_CONSOLE=y
1172# CONFIG_VGACON_SOFT_SCROLLBACK is not set 1240# CONFIG_VGACON_SOFT_SCROLLBACK is not set
1173CONFIG_DUMMY_CONSOLE=y 1241CONFIG_DUMMY_CONSOLE=y
1174
1175#
1176# Sound
1177#
1178# CONFIG_SOUND is not set 1242# CONFIG_SOUND is not set
1179CONFIG_HID_SUPPORT=y 1243CONFIG_HID_SUPPORT=y
1180CONFIG_HID=y 1244CONFIG_HID=y
@@ -1185,9 +1249,36 @@ CONFIG_HID=y
1185# USB Input Devices 1249# USB Input Devices
1186# 1250#
1187CONFIG_USB_HID=y 1251CONFIG_USB_HID=y
1188# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1252# CONFIG_HID_PID is not set
1189# CONFIG_HID_FF is not set
1190# CONFIG_USB_HIDDEV is not set 1253# CONFIG_USB_HIDDEV is not set
1254
1255#
1256# Special HID drivers
1257#
1258CONFIG_HID_COMPAT=y
1259CONFIG_HID_A4TECH=y
1260CONFIG_HID_APPLE=y
1261CONFIG_HID_BELKIN=y
1262CONFIG_HID_BRIGHT=y
1263CONFIG_HID_CHERRY=y
1264CONFIG_HID_CHICONY=y
1265CONFIG_HID_CYPRESS=y
1266CONFIG_HID_DELL=y
1267CONFIG_HID_EZKEY=y
1268CONFIG_HID_GYRATION=y
1269CONFIG_HID_LOGITECH=y
1270# CONFIG_LOGITECH_FF is not set
1271# CONFIG_LOGIRUMBLEPAD2_FF is not set
1272CONFIG_HID_MICROSOFT=y
1273CONFIG_HID_MONTEREY=y
1274CONFIG_HID_PANTHERLORD=y
1275# CONFIG_PANTHERLORD_FF is not set
1276CONFIG_HID_PETALYNX=y
1277CONFIG_HID_SAMSUNG=y
1278CONFIG_HID_SONY=y
1279CONFIG_HID_SUNPLUS=y
1280CONFIG_THRUSTMASTER_FF=m
1281CONFIG_ZEROPLUS_FF=m
1191CONFIG_USB_SUPPORT=y 1282CONFIG_USB_SUPPORT=y
1192CONFIG_USB_ARCH_HAS_HCD=y 1283CONFIG_USB_ARCH_HAS_HCD=y
1193CONFIG_USB_ARCH_HAS_OHCI=y 1284CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1205,6 +1296,9 @@ CONFIG_USB=y
1205# CONFIG_USB_OTG is not set 1296# CONFIG_USB_OTG is not set
1206# CONFIG_USB_OTG_WHITELIST is not set 1297# CONFIG_USB_OTG_WHITELIST is not set
1207# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1298# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1299# CONFIG_USB_MON is not set
1300# CONFIG_USB_WUSB is not set
1301# CONFIG_USB_WUSB_CBAF is not set
1208 1302
1209# 1303#
1210# USB Host Controller Drivers 1304# USB Host Controller Drivers
@@ -1225,6 +1319,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1225# CONFIG_USB_UHCI_HCD is not set 1319# CONFIG_USB_UHCI_HCD is not set
1226# CONFIG_USB_SL811_HCD is not set 1320# CONFIG_USB_SL811_HCD is not set
1227# CONFIG_USB_R8A66597_HCD is not set 1321# CONFIG_USB_R8A66597_HCD is not set
1322# CONFIG_USB_WHCI_HCD is not set
1323# CONFIG_USB_HWA_HCD is not set
1228 1324
1229# 1325#
1230# USB Device Class drivers 1326# USB Device Class drivers
@@ -1232,6 +1328,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1232# CONFIG_USB_ACM is not set 1328# CONFIG_USB_ACM is not set
1233# CONFIG_USB_PRINTER is not set 1329# CONFIG_USB_PRINTER is not set
1234# CONFIG_USB_WDM is not set 1330# CONFIG_USB_WDM is not set
1331# CONFIG_USB_TMC is not set
1235 1332
1236# 1333#
1237# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1334# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1261,7 +1358,6 @@ CONFIG_USB_STORAGE=y
1261# 1358#
1262# CONFIG_USB_MDC800 is not set 1359# CONFIG_USB_MDC800 is not set
1263# CONFIG_USB_MICROTEK is not set 1360# CONFIG_USB_MICROTEK is not set
1264# CONFIG_USB_MON is not set
1265 1361
1266# 1362#
1267# USB port drivers 1363# USB port drivers
@@ -1274,7 +1370,7 @@ CONFIG_USB_STORAGE=y
1274# CONFIG_USB_EMI62 is not set 1370# CONFIG_USB_EMI62 is not set
1275# CONFIG_USB_EMI26 is not set 1371# CONFIG_USB_EMI26 is not set
1276# CONFIG_USB_ADUTUX is not set 1372# CONFIG_USB_ADUTUX is not set
1277# CONFIG_USB_AUERSWALD is not set 1373# CONFIG_USB_SEVSEG is not set
1278# CONFIG_USB_RIO500 is not set 1374# CONFIG_USB_RIO500 is not set
1279# CONFIG_USB_LEGOTOWER is not set 1375# CONFIG_USB_LEGOTOWER is not set
1280# CONFIG_USB_LCD is not set 1376# CONFIG_USB_LCD is not set
@@ -1291,8 +1387,10 @@ CONFIG_USB_STORAGE=y
1291# CONFIG_USB_TRANCEVIBRATOR is not set 1387# CONFIG_USB_TRANCEVIBRATOR is not set
1292# CONFIG_USB_IOWARRIOR is not set 1388# CONFIG_USB_IOWARRIOR is not set
1293# CONFIG_USB_ISIGHTFW is not set 1389# CONFIG_USB_ISIGHTFW is not set
1390# CONFIG_USB_VST is not set
1294# CONFIG_USB_ATM is not set 1391# CONFIG_USB_ATM is not set
1295# CONFIG_USB_GADGET is not set 1392# CONFIG_USB_GADGET is not set
1393# CONFIG_UWB is not set
1296# CONFIG_MMC is not set 1394# CONFIG_MMC is not set
1297# CONFIG_MEMSTICK is not set 1395# CONFIG_MEMSTICK is not set
1298# CONFIG_NEW_LEDS is not set 1396# CONFIG_NEW_LEDS is not set
@@ -1325,6 +1423,7 @@ CONFIG_RTC_INTF_DEV=y
1325# CONFIG_RTC_DRV_PCF8583 is not set 1423# CONFIG_RTC_DRV_PCF8583 is not set
1326# CONFIG_RTC_DRV_M41T80 is not set 1424# CONFIG_RTC_DRV_M41T80 is not set
1327# CONFIG_RTC_DRV_S35390A is not set 1425# CONFIG_RTC_DRV_S35390A is not set
1426# CONFIG_RTC_DRV_FM3130 is not set
1328 1427
1329# 1428#
1330# SPI RTC drivers 1429# SPI RTC drivers
@@ -1334,12 +1433,15 @@ CONFIG_RTC_INTF_DEV=y
1334# Platform RTC drivers 1433# Platform RTC drivers
1335# 1434#
1336# CONFIG_RTC_DRV_CMOS is not set 1435# CONFIG_RTC_DRV_CMOS is not set
1436# CONFIG_RTC_DRV_DS1286 is not set
1337# CONFIG_RTC_DRV_DS1511 is not set 1437# CONFIG_RTC_DRV_DS1511 is not set
1338# CONFIG_RTC_DRV_DS1553 is not set 1438# CONFIG_RTC_DRV_DS1553 is not set
1339# CONFIG_RTC_DRV_DS1742 is not set 1439# CONFIG_RTC_DRV_DS1742 is not set
1340# CONFIG_RTC_DRV_STK17TA8 is not set 1440# CONFIG_RTC_DRV_STK17TA8 is not set
1341# CONFIG_RTC_DRV_M48T86 is not set 1441# CONFIG_RTC_DRV_M48T86 is not set
1442# CONFIG_RTC_DRV_M48T35 is not set
1342# CONFIG_RTC_DRV_M48T59 is not set 1443# CONFIG_RTC_DRV_M48T59 is not set
1444# CONFIG_RTC_DRV_BQ4802 is not set
1343# CONFIG_RTC_DRV_V3020 is not set 1445# CONFIG_RTC_DRV_V3020 is not set
1344 1446
1345# 1447#
@@ -1348,6 +1450,7 @@ CONFIG_RTC_INTF_DEV=y
1348# CONFIG_RTC_DRV_PPC is not set 1450# CONFIG_RTC_DRV_PPC is not set
1349# CONFIG_DMADEVICES is not set 1451# CONFIG_DMADEVICES is not set
1350# CONFIG_UIO is not set 1452# CONFIG_UIO is not set
1453# CONFIG_STAGING is not set
1351 1454
1352# 1455#
1353# File systems 1456# File systems
@@ -1361,12 +1464,13 @@ CONFIG_EXT3_FS=y
1361CONFIG_EXT3_FS_XATTR=y 1464CONFIG_EXT3_FS_XATTR=y
1362CONFIG_EXT3_FS_POSIX_ACL=y 1465CONFIG_EXT3_FS_POSIX_ACL=y
1363# CONFIG_EXT3_FS_SECURITY is not set 1466# CONFIG_EXT3_FS_SECURITY is not set
1364# CONFIG_EXT4DEV_FS is not set 1467# CONFIG_EXT4_FS is not set
1365CONFIG_JBD=y 1468CONFIG_JBD=y
1366CONFIG_FS_MBCACHE=y 1469CONFIG_FS_MBCACHE=y
1367# CONFIG_REISERFS_FS is not set 1470# CONFIG_REISERFS_FS is not set
1368# CONFIG_JFS_FS is not set 1471# CONFIG_JFS_FS is not set
1369CONFIG_FS_POSIX_ACL=y 1472CONFIG_FS_POSIX_ACL=y
1473CONFIG_FILE_LOCKING=y
1370# CONFIG_XFS_FS is not set 1474# CONFIG_XFS_FS is not set
1371# CONFIG_OCFS2_FS is not set 1475# CONFIG_OCFS2_FS is not set
1372CONFIG_DNOTIFY=y 1476CONFIG_DNOTIFY=y
@@ -1399,6 +1503,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1399CONFIG_PROC_FS=y 1503CONFIG_PROC_FS=y
1400CONFIG_PROC_KCORE=y 1504CONFIG_PROC_KCORE=y
1401CONFIG_PROC_SYSCTL=y 1505CONFIG_PROC_SYSCTL=y
1506CONFIG_PROC_PAGE_MONITOR=y
1402CONFIG_SYSFS=y 1507CONFIG_SYSFS=y
1403CONFIG_TMPFS=y 1508CONFIG_TMPFS=y
1404# CONFIG_TMPFS_POSIX_ACL is not set 1509# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1419,6 +1524,7 @@ CONFIG_TMPFS=y
1419# CONFIG_CRAMFS is not set 1524# CONFIG_CRAMFS is not set
1420# CONFIG_VXFS_FS is not set 1525# CONFIG_VXFS_FS is not set
1421# CONFIG_MINIX_FS is not set 1526# CONFIG_MINIX_FS is not set
1527# CONFIG_OMFS_FS is not set
1422# CONFIG_HPFS_FS is not set 1528# CONFIG_HPFS_FS is not set
1423# CONFIG_QNX4FS_FS is not set 1529# CONFIG_QNX4FS_FS is not set
1424# CONFIG_ROMFS_FS is not set 1530# CONFIG_ROMFS_FS is not set
@@ -1429,14 +1535,14 @@ CONFIG_NFS_FS=y
1429CONFIG_NFS_V3=y 1535CONFIG_NFS_V3=y
1430# CONFIG_NFS_V3_ACL is not set 1536# CONFIG_NFS_V3_ACL is not set
1431CONFIG_NFS_V4=y 1537CONFIG_NFS_V4=y
1432# CONFIG_NFSD is not set
1433CONFIG_ROOT_NFS=y 1538CONFIG_ROOT_NFS=y
1539# CONFIG_NFSD is not set
1434CONFIG_LOCKD=y 1540CONFIG_LOCKD=y
1435CONFIG_LOCKD_V4=y 1541CONFIG_LOCKD_V4=y
1436CONFIG_NFS_COMMON=y 1542CONFIG_NFS_COMMON=y
1437CONFIG_SUNRPC=y 1543CONFIG_SUNRPC=y
1438CONFIG_SUNRPC_GSS=y 1544CONFIG_SUNRPC_GSS=y
1439# CONFIG_SUNRPC_BIND34 is not set 1545# CONFIG_SUNRPC_REGISTER_V4 is not set
1440CONFIG_RPCSEC_GSS_KRB5=y 1546CONFIG_RPCSEC_GSS_KRB5=y
1441# CONFIG_RPCSEC_GSS_SPKM3 is not set 1547# CONFIG_RPCSEC_GSS_SPKM3 is not set
1442# CONFIG_SMB_FS is not set 1548# CONFIG_SMB_FS is not set
@@ -1502,9 +1608,9 @@ CONFIG_NLS_UTF8=m
1502# Library routines 1608# Library routines
1503# 1609#
1504CONFIG_BITREVERSE=y 1610CONFIG_BITREVERSE=y
1505# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1506CONFIG_CRC_CCITT=m 1611CONFIG_CRC_CCITT=m
1507# CONFIG_CRC16 is not set 1612# CONFIG_CRC16 is not set
1613# CONFIG_CRC_T10DIF is not set
1508# CONFIG_CRC_ITU_T is not set 1614# CONFIG_CRC_ITU_T is not set
1509CONFIG_CRC32=y 1615CONFIG_CRC32=y
1510# CONFIG_CRC7 is not set 1616# CONFIG_CRC7 is not set
@@ -1531,6 +1637,8 @@ CONFIG_MAGIC_SYSRQ=y
1531CONFIG_DEBUG_KERNEL=y 1637CONFIG_DEBUG_KERNEL=y
1532# CONFIG_DEBUG_SHIRQ is not set 1638# CONFIG_DEBUG_SHIRQ is not set
1533CONFIG_DETECT_SOFTLOCKUP=y 1639CONFIG_DETECT_SOFTLOCKUP=y
1640# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1641CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1534CONFIG_SCHED_DEBUG=y 1642CONFIG_SCHED_DEBUG=y
1535# CONFIG_SCHEDSTATS is not set 1643# CONFIG_SCHEDSTATS is not set
1536# CONFIG_TIMER_STATS is not set 1644# CONFIG_TIMER_STATS is not set
@@ -1547,20 +1655,42 @@ CONFIG_SCHED_DEBUG=y
1547CONFIG_DEBUG_INFO=y 1655CONFIG_DEBUG_INFO=y
1548# CONFIG_DEBUG_VM is not set 1656# CONFIG_DEBUG_VM is not set
1549# CONFIG_DEBUG_WRITECOUNT is not set 1657# CONFIG_DEBUG_WRITECOUNT is not set
1658# CONFIG_DEBUG_MEMORY_INIT is not set
1550# CONFIG_DEBUG_LIST is not set 1659# CONFIG_DEBUG_LIST is not set
1551# CONFIG_DEBUG_SG is not set 1660# CONFIG_DEBUG_SG is not set
1552# CONFIG_BOOT_PRINTK_DELAY is not set 1661# CONFIG_BOOT_PRINTK_DELAY is not set
1553# CONFIG_RCU_TORTURE_TEST is not set 1662# CONFIG_RCU_TORTURE_TEST is not set
1663# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1554# CONFIG_BACKTRACE_SELF_TEST is not set 1664# CONFIG_BACKTRACE_SELF_TEST is not set
1665# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1555# CONFIG_FAULT_INJECTION is not set 1666# CONFIG_FAULT_INJECTION is not set
1667# CONFIG_LATENCYTOP is not set
1668CONFIG_SYSCTL_SYSCALL_CHECK=y
1669CONFIG_HAVE_FUNCTION_TRACER=y
1670
1671#
1672# Tracers
1673#
1674# CONFIG_FUNCTION_TRACER is not set
1675# CONFIG_PREEMPT_TRACER is not set
1676# CONFIG_SCHED_TRACER is not set
1677# CONFIG_CONTEXT_SWITCH_TRACER is not set
1678# CONFIG_BOOT_TRACER is not set
1679# CONFIG_STACK_TRACER is not set
1680# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1556# CONFIG_SAMPLES is not set 1681# CONFIG_SAMPLES is not set
1682CONFIG_HAVE_ARCH_KGDB=y
1683# CONFIG_KGDB is not set
1557# CONFIG_DEBUG_STACKOVERFLOW is not set 1684# CONFIG_DEBUG_STACKOVERFLOW is not set
1558# CONFIG_DEBUG_STACK_USAGE is not set 1685# CONFIG_DEBUG_STACK_USAGE is not set
1559# CONFIG_DEBUG_PAGEALLOC is not set 1686# CONFIG_DEBUG_PAGEALLOC is not set
1560CONFIG_DEBUGGER=y 1687# CONFIG_CODE_PATCHING_SELFTEST is not set
1688# CONFIG_FTR_FIXUP_SELFTEST is not set
1689# CONFIG_MSI_BITMAP_SELFTEST is not set
1561# CONFIG_XMON is not set 1690# CONFIG_XMON is not set
1562# CONFIG_IRQSTACKS is not set 1691# CONFIG_IRQSTACKS is not set
1563# CONFIG_BDI_SWITCH is not set 1692# CONFIG_BDI_SWITCH is not set
1693# CONFIG_BOOTX_TEXT is not set
1564# CONFIG_PPC_EARLY_DEBUG is not set 1694# CONFIG_PPC_EARLY_DEBUG is not set
1565 1695
1566# 1696#
@@ -1568,9 +1698,9 @@ CONFIG_DEBUGGER=y
1568# 1698#
1569# CONFIG_KEYS is not set 1699# CONFIG_KEYS is not set
1570CONFIG_SECURITY=y 1700CONFIG_SECURITY=y
1701# CONFIG_SECURITYFS is not set
1571CONFIG_SECURITY_NETWORK=y 1702CONFIG_SECURITY_NETWORK=y
1572# CONFIG_SECURITY_NETWORK_XFRM is not set 1703# CONFIG_SECURITY_NETWORK_XFRM is not set
1573CONFIG_SECURITY_CAPABILITIES=y
1574# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1704# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1575# CONFIG_SECURITY_ROOTPLUG is not set 1705# CONFIG_SECURITY_ROOTPLUG is not set
1576CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 1706CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
@@ -1579,10 +1709,12 @@ CONFIG_CRYPTO=y
1579# 1709#
1580# Crypto core or helper 1710# Crypto core or helper
1581# 1711#
1712# CONFIG_CRYPTO_FIPS is not set
1582CONFIG_CRYPTO_ALGAPI=y 1713CONFIG_CRYPTO_ALGAPI=y
1583CONFIG_CRYPTO_AEAD=m 1714CONFIG_CRYPTO_AEAD=y
1584CONFIG_CRYPTO_BLKCIPHER=y 1715CONFIG_CRYPTO_BLKCIPHER=y
1585CONFIG_CRYPTO_HASH=y 1716CONFIG_CRYPTO_HASH=y
1717CONFIG_CRYPTO_RNG=y
1586CONFIG_CRYPTO_MANAGER=y 1718CONFIG_CRYPTO_MANAGER=y
1587# CONFIG_CRYPTO_GF128MUL is not set 1719# CONFIG_CRYPTO_GF128MUL is not set
1588CONFIG_CRYPTO_NULL=m 1720CONFIG_CRYPTO_NULL=m
@@ -1621,6 +1753,10 @@ CONFIG_CRYPTO_CRC32C=m
1621CONFIG_CRYPTO_MD4=m 1753CONFIG_CRYPTO_MD4=m
1622CONFIG_CRYPTO_MD5=y 1754CONFIG_CRYPTO_MD5=y
1623CONFIG_CRYPTO_MICHAEL_MIC=m 1755CONFIG_CRYPTO_MICHAEL_MIC=m
1756# CONFIG_CRYPTO_RMD128 is not set
1757# CONFIG_CRYPTO_RMD160 is not set
1758# CONFIG_CRYPTO_RMD256 is not set
1759# CONFIG_CRYPTO_RMD320 is not set
1624CONFIG_CRYPTO_SHA1=m 1760CONFIG_CRYPTO_SHA1=m
1625CONFIG_CRYPTO_SHA256=m 1761CONFIG_CRYPTO_SHA256=m
1626CONFIG_CRYPTO_SHA512=m 1762CONFIG_CRYPTO_SHA512=m
@@ -1652,6 +1788,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1652# 1788#
1653CONFIG_CRYPTO_DEFLATE=m 1789CONFIG_CRYPTO_DEFLATE=m
1654# CONFIG_CRYPTO_LZO is not set 1790# CONFIG_CRYPTO_LZO is not set
1791
1792#
1793# Random Number Generation
1794#
1795# CONFIG_CRYPTO_ANSI_CPRNG is not set
1655# CONFIG_CRYPTO_HW is not set 1796# CONFIG_CRYPTO_HW is not set
1656# CONFIG_PPC_CLOCK is not set 1797# CONFIG_PPC_CLOCK is not set
1657# CONFIG_VIRTUALIZATION is not set 1798# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
index c98c6ee44492..72854a10dfa1 100644
--- a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
+++ b/arch/powerpc/configs/86xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:10 2008 4# Sat Nov 8 12:40:28 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_PHYS_64BIT is not set
18CONFIG_ALTIVEC=y 19CONFIG_ALTIVEC=y
19CONFIG_PPC_STD_MMU=y 20CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y 21CONFIG_PPC_STD_MMU_32=y
@@ -22,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
22# CONFIG_SMP is not set 23# CONFIG_SMP is not set
23CONFIG_PPC32=y 24CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
26CONFIG_MMU=y 27CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -52,8 +53,6 @@ CONFIG_PPC_UDBG_16550=y
52CONFIG_AUDIT_ARCH=y 53CONFIG_AUDIT_ARCH=y
53CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
54CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
55CONFIG_HIBERNATE_32=y
56CONFIG_ARCH_HIBERNATION_POSSIBLE=y
57# CONFIG_PPC_DCR_NATIVE is not set 56# CONFIG_PPC_DCR_NATIVE is not set
58# CONFIG_PPC_DCR_MMIO is not set 57# CONFIG_PPC_DCR_MMIO is not set
59CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 58CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -99,7 +98,6 @@ CONFIG_HOTPLUG=y
99CONFIG_PRINTK=y 98CONFIG_PRINTK=y
100CONFIG_BUG=y 99CONFIG_BUG=y
101# CONFIG_ELF_CORE is not set 100# CONFIG_ELF_CORE is not set
102CONFIG_PCSPKR_PLATFORM=y
103CONFIG_COMPAT_BRK=y 101CONFIG_COMPAT_BRK=y
104CONFIG_BASE_FULL=y 102CONFIG_BASE_FULL=y
105CONFIG_FUTEX=y 103CONFIG_FUTEX=y
@@ -109,7 +107,9 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 107CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 109CONFIG_SHMEM=y
110CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_PCI_QUIRKS=y
113CONFIG_SLUB_DEBUG=y 113CONFIG_SLUB_DEBUG=y
114# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
115CONFIG_SLUB=y 115CONFIG_SLUB=y
@@ -123,10 +123,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
123CONFIG_HAVE_KPROBES=y 123CONFIG_HAVE_KPROBES=y
124CONFIG_HAVE_KRETPROBES=y 124CONFIG_HAVE_KRETPROBES=y
125CONFIG_HAVE_ARCH_TRACEHOOK=y 125CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_DMA_ATTRS is not set
127# CONFIG_USE_GENERIC_SMP_HELPERS is not set
128# CONFIG_HAVE_CLK is not set
129CONFIG_PROC_PAGE_MONITOR=y
130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
131CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
132CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
@@ -159,6 +155,7 @@ CONFIG_DEFAULT_DEADLINE=y
159# CONFIG_DEFAULT_NOOP is not set 155# CONFIG_DEFAULT_NOOP is not set
160CONFIG_DEFAULT_IOSCHED="deadline" 156CONFIG_DEFAULT_IOSCHED="deadline"
161CONFIG_CLASSIC_RCU=y 157CONFIG_CLASSIC_RCU=y
158# CONFIG_FREEZER is not set
162 159
163# 160#
164# Platform support 161# Platform support
@@ -166,10 +163,10 @@ CONFIG_CLASSIC_RCU=y
166CONFIG_PPC_MULTIPLATFORM=y 163CONFIG_PPC_MULTIPLATFORM=y
167CONFIG_CLASSIC32=y 164CONFIG_CLASSIC32=y
168# CONFIG_PPC_CHRP is not set 165# CONFIG_PPC_CHRP is not set
169# CONFIG_PPC_PMAC is not set
170# CONFIG_MPC5121_ADS is not set 166# CONFIG_MPC5121_ADS is not set
171# CONFIG_MPC5121_GENERIC is not set 167# CONFIG_MPC5121_GENERIC is not set
172# CONFIG_PPC_MPC52xx is not set 168# CONFIG_PPC_MPC52xx is not set
169# CONFIG_PPC_PMAC is not set
173# CONFIG_PPC_CELL is not set 170# CONFIG_PPC_CELL is not set
174# CONFIG_PPC_CELL_NATIVE is not set 171# CONFIG_PPC_CELL_NATIVE is not set
175# CONFIG_PPC_82xx is not set 172# CONFIG_PPC_82xx is not set
@@ -179,26 +176,24 @@ CONFIG_PPC_86xx=y
179# CONFIG_MPC8641_HPCN is not set 176# CONFIG_MPC8641_HPCN is not set
180# CONFIG_SBC8641D is not set 177# CONFIG_SBC8641D is not set
181CONFIG_MPC8610_HPCD=y 178CONFIG_MPC8610_HPCD=y
179# CONFIG_GEF_SBC610 is not set
182CONFIG_MPC8610=y 180CONFIG_MPC8610=y
183# CONFIG_EMBEDDED6xx is not set 181# CONFIG_EMBEDDED6xx is not set
184CONFIG_PPC_NATIVE=y
185# CONFIG_UDBG_RTAS_CONSOLE is not set
186# CONFIG_IPIC is not set 182# CONFIG_IPIC is not set
187CONFIG_MPIC=y 183CONFIG_MPIC=y
188# CONFIG_MPIC_WEIRD is not set 184# CONFIG_MPIC_WEIRD is not set
189CONFIG_PPC_I8259=y 185# CONFIG_PPC_I8259 is not set
190CONFIG_PPC_RTAS=y 186# CONFIG_PPC_RTAS is not set
191# CONFIG_RTAS_ERROR_LOGGING is not set
192CONFIG_RTAS_PROC=y
193# CONFIG_MMIO_NVRAM is not set 187# CONFIG_MMIO_NVRAM is not set
194CONFIG_PPC_MPC106=y 188# CONFIG_PPC_MPC106 is not set
195# CONFIG_PPC_970_NAP is not set 189# CONFIG_PPC_970_NAP is not set
196# CONFIG_PPC_INDIRECT_IO is not set 190# CONFIG_PPC_INDIRECT_IO is not set
197# CONFIG_GENERIC_IOMAP is not set 191# CONFIG_GENERIC_IOMAP is not set
198# CONFIG_CPU_FREQ is not set 192# CONFIG_CPU_FREQ is not set
199# CONFIG_PPC601_SYNC_FIX is not set
200# CONFIG_TAU is not set 193# CONFIG_TAU is not set
194# CONFIG_QUICC_ENGINE is not set
201CONFIG_FSL_ULI1575=y 195CONFIG_FSL_ULI1575=y
196# CONFIG_MPC8xxx_GPIO is not set
202 197
203# 198#
204# Kernel options 199# Kernel options
@@ -218,6 +213,8 @@ CONFIG_PREEMPT_NONE=y
218# CONFIG_PREEMPT_VOLUNTARY is not set 213# CONFIG_PREEMPT_VOLUNTARY is not set
219# CONFIG_PREEMPT is not set 214# CONFIG_PREEMPT is not set
220CONFIG_BINFMT_ELF=y 215CONFIG_BINFMT_ELF=y
216# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
217# CONFIG_HAVE_AOUT is not set
221# CONFIG_BINFMT_MISC is not set 218# CONFIG_BINFMT_MISC is not set
222# CONFIG_IOMMU_HELPER is not set 219# CONFIG_IOMMU_HELPER is not set
223CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 220CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -232,15 +229,15 @@ CONFIG_FLATMEM_MANUAL=y
232# CONFIG_SPARSEMEM_MANUAL is not set 229# CONFIG_SPARSEMEM_MANUAL is not set
233CONFIG_FLATMEM=y 230CONFIG_FLATMEM=y
234CONFIG_FLAT_NODE_MEM_MAP=y 231CONFIG_FLAT_NODE_MEM_MAP=y
235# CONFIG_SPARSEMEM_STATIC is not set
236# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
237CONFIG_PAGEFLAGS_EXTENDED=y 232CONFIG_PAGEFLAGS_EXTENDED=y
238CONFIG_SPLIT_PTLOCK_CPUS=4 233CONFIG_SPLIT_PTLOCK_CPUS=4
239CONFIG_MIGRATION=y 234CONFIG_MIGRATION=y
240# CONFIG_RESOURCES_64BIT is not set 235# CONFIG_RESOURCES_64BIT is not set
236# CONFIG_PHYS_ADDR_T_64BIT is not set
241CONFIG_ZONE_DMA_FLAG=1 237CONFIG_ZONE_DMA_FLAG=1
242CONFIG_BOUNCE=y 238CONFIG_BOUNCE=y
243CONFIG_VIRT_TO_BUS=y 239CONFIG_VIRT_TO_BUS=y
240CONFIG_UNEVICTABLE_LRU=y
244CONFIG_FORCE_MAX_ZONEORDER=12 241CONFIG_FORCE_MAX_ZONEORDER=12
245CONFIG_PROC_DEVICETREE=y 242CONFIG_PROC_DEVICETREE=y
246# CONFIG_CMDLINE_BOOL is not set 243# CONFIG_CMDLINE_BOOL is not set
@@ -252,7 +249,6 @@ CONFIG_ISA_DMA_API=y
252# 249#
253# Bus options 250# Bus options
254# 251#
255# CONFIG_ISA is not set
256CONFIG_ZONE_DMA=y 252CONFIG_ZONE_DMA=y
257CONFIG_GENERIC_ISA_DMA=y 253CONFIG_GENERIC_ISA_DMA=y
258CONFIG_PPC_INDIRECT_PCI=y 254CONFIG_PPC_INDIRECT_PCI=y
@@ -267,7 +263,7 @@ CONFIG_PCIEAER=y
267# CONFIG_PCIEASPM is not set 263# CONFIG_PCIEASPM is not set
268CONFIG_ARCH_SUPPORTS_MSI=y 264CONFIG_ARCH_SUPPORTS_MSI=y
269# CONFIG_PCI_MSI is not set 265# CONFIG_PCI_MSI is not set
270CONFIG_PCI_LEGACY=y 266# CONFIG_PCI_LEGACY is not set
271CONFIG_PCI_DEBUG=y 267CONFIG_PCI_DEBUG=y
272# CONFIG_PCCARD is not set 268# CONFIG_PCCARD is not set
273# CONFIG_HOTPLUG_PCI is not set 269# CONFIG_HOTPLUG_PCI is not set
@@ -353,6 +349,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
353# CONFIG_TIPC is not set 349# CONFIG_TIPC is not set
354# CONFIG_ATM is not set 350# CONFIG_ATM is not set
355# CONFIG_BRIDGE is not set 351# CONFIG_BRIDGE is not set
352# CONFIG_NET_DSA is not set
356# CONFIG_VLAN_8021Q is not set 353# CONFIG_VLAN_8021Q is not set
357# CONFIG_DECNET is not set 354# CONFIG_DECNET is not set
358# CONFIG_LLC2 is not set 355# CONFIG_LLC2 is not set
@@ -373,11 +370,10 @@ CONFIG_IPV6_NDISC_NODETYPE=y
373# CONFIG_IRDA is not set 370# CONFIG_IRDA is not set
374# CONFIG_BT is not set 371# CONFIG_BT is not set
375# CONFIG_AF_RXRPC is not set 372# CONFIG_AF_RXRPC is not set
376 373# CONFIG_PHONET is not set
377# 374CONFIG_WIRELESS=y
378# Wireless
379#
380# CONFIG_CFG80211 is not set 375# CONFIG_CFG80211 is not set
376CONFIG_WIRELESS_OLD_REGULATORY=y
381# CONFIG_WIRELESS_EXT is not set 377# CONFIG_WIRELESS_EXT is not set
382# CONFIG_MAC80211 is not set 378# CONFIG_MAC80211 is not set
383# CONFIG_IEEE80211 is not set 379# CONFIG_IEEE80211 is not set
@@ -493,7 +489,6 @@ CONFIG_OF_I2C=y
493# CONFIG_PARPORT is not set 489# CONFIG_PARPORT is not set
494CONFIG_BLK_DEV=y 490CONFIG_BLK_DEV=y
495# CONFIG_BLK_DEV_FD is not set 491# CONFIG_BLK_DEV_FD is not set
496# CONFIG_MAC_FLOPPY is not set
497# CONFIG_BLK_CPQ_DA is not set 492# CONFIG_BLK_CPQ_DA is not set
498# CONFIG_BLK_CPQ_CISS_DA is not set 493# CONFIG_BLK_CPQ_CISS_DA is not set
499# CONFIG_BLK_DEV_DAC960 is not set 494# CONFIG_BLK_DEV_DAC960 is not set
@@ -519,7 +514,54 @@ CONFIG_MISC_DEVICES=y
519# CONFIG_HP_ILO is not set 514# CONFIG_HP_ILO is not set
520CONFIG_HAVE_IDE=y 515CONFIG_HAVE_IDE=y
521CONFIG_IDE=y 516CONFIG_IDE=y
522# CONFIG_BLK_DEV_IDE is not set 517
518#
519# Please see Documentation/ide/ide.txt for help/info on IDE drives
520#
521# CONFIG_BLK_DEV_IDE_SATA is not set
522CONFIG_IDE_GD=y
523CONFIG_IDE_GD_ATA=y
524# CONFIG_IDE_GD_ATAPI is not set
525# CONFIG_BLK_DEV_IDECD is not set
526# CONFIG_BLK_DEV_IDETAPE is not set
527# CONFIG_BLK_DEV_IDESCSI is not set
528# CONFIG_IDE_TASK_IOCTL is not set
529CONFIG_IDE_PROC_FS=y
530
531#
532# IDE chipset support/bugfixes
533#
534# CONFIG_BLK_DEV_PLATFORM is not set
535
536#
537# PCI IDE chipsets support
538#
539# CONFIG_BLK_DEV_GENERIC is not set
540# CONFIG_BLK_DEV_OPTI621 is not set
541# CONFIG_BLK_DEV_AEC62XX is not set
542# CONFIG_BLK_DEV_ALI15X3 is not set
543# CONFIG_BLK_DEV_AMD74XX is not set
544# CONFIG_BLK_DEV_CMD64X is not set
545# CONFIG_BLK_DEV_TRIFLEX is not set
546# CONFIG_BLK_DEV_CS5520 is not set
547# CONFIG_BLK_DEV_CS5530 is not set
548# CONFIG_BLK_DEV_HPT366 is not set
549# CONFIG_BLK_DEV_JMICRON is not set
550# CONFIG_BLK_DEV_SC1200 is not set
551# CONFIG_BLK_DEV_PIIX is not set
552# CONFIG_BLK_DEV_IT8213 is not set
553# CONFIG_BLK_DEV_IT821X is not set
554# CONFIG_BLK_DEV_NS87415 is not set
555# CONFIG_BLK_DEV_PDC202XX_OLD is not set
556# CONFIG_BLK_DEV_PDC202XX_NEW is not set
557# CONFIG_BLK_DEV_SVWKS is not set
558# CONFIG_BLK_DEV_SIIMAGE is not set
559# CONFIG_BLK_DEV_SL82C105 is not set
560# CONFIG_BLK_DEV_SLC90E66 is not set
561# CONFIG_BLK_DEV_TRM290 is not set
562# CONFIG_BLK_DEV_VIA82CXXX is not set
563# CONFIG_BLK_DEV_TC86C001 is not set
564# CONFIG_BLK_DEV_IDEDMA is not set
523 565
524# 566#
525# SCSI device support 567# SCSI device support
@@ -595,8 +637,6 @@ CONFIG_SCSI_LOWLEVEL=y
595# CONFIG_SCSI_DC390T is not set 637# CONFIG_SCSI_DC390T is not set
596# CONFIG_SCSI_NSP32 is not set 638# CONFIG_SCSI_NSP32 is not set
597# CONFIG_SCSI_DEBUG is not set 639# CONFIG_SCSI_DEBUG is not set
598# CONFIG_SCSI_MESH is not set
599# CONFIG_SCSI_MAC53C94 is not set
600# CONFIG_SCSI_SRP is not set 640# CONFIG_SCSI_SRP is not set
601# CONFIG_SCSI_DH is not set 641# CONFIG_SCSI_DH is not set
602CONFIG_ATA=y 642CONFIG_ATA=y
@@ -685,8 +725,6 @@ CONFIG_DUMMY=y
685# CONFIG_PHYLIB is not set 725# CONFIG_PHYLIB is not set
686CONFIG_NET_ETHERNET=y 726CONFIG_NET_ETHERNET=y
687# CONFIG_MII is not set 727# CONFIG_MII is not set
688# CONFIG_MACE is not set
689# CONFIG_BMAC is not set
690# CONFIG_HAPPYMEAL is not set 728# CONFIG_HAPPYMEAL is not set
691# CONFIG_SUNGEM is not set 729# CONFIG_SUNGEM is not set
692# CONFIG_CASSINI is not set 730# CONFIG_CASSINI is not set
@@ -703,8 +741,12 @@ CONFIG_ULI526X=y
703# CONFIG_IBM_NEW_EMAC_RGMII is not set 741# CONFIG_IBM_NEW_EMAC_RGMII is not set
704# CONFIG_IBM_NEW_EMAC_TAH is not set 742# CONFIG_IBM_NEW_EMAC_TAH is not set
705# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 743# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
744# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
745# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
746# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
706# CONFIG_NET_PCI is not set 747# CONFIG_NET_PCI is not set
707# CONFIG_B44 is not set 748# CONFIG_B44 is not set
749# CONFIG_ATL2 is not set
708# CONFIG_NETDEV_1000 is not set 750# CONFIG_NETDEV_1000 is not set
709# CONFIG_NETDEV_10000 is not set 751# CONFIG_NETDEV_10000 is not set
710# CONFIG_TR is not set 752# CONFIG_TR is not set
@@ -796,13 +838,10 @@ CONFIG_SERIAL_8250_RSA=y
796# CONFIG_SERIAL_UARTLITE is not set 838# CONFIG_SERIAL_UARTLITE is not set
797CONFIG_SERIAL_CORE=y 839CONFIG_SERIAL_CORE=y
798CONFIG_SERIAL_CORE_CONSOLE=y 840CONFIG_SERIAL_CORE_CONSOLE=y
799# CONFIG_SERIAL_PMACZILOG is not set
800# CONFIG_SERIAL_JSM is not set 841# CONFIG_SERIAL_JSM is not set
801# CONFIG_SERIAL_OF_PLATFORM is not set 842# CONFIG_SERIAL_OF_PLATFORM is not set
802CONFIG_UNIX98_PTYS=y 843CONFIG_UNIX98_PTYS=y
803# CONFIG_LEGACY_PTYS is not set 844# CONFIG_LEGACY_PTYS is not set
804# CONFIG_BRIQ_PANEL is not set
805# CONFIG_HVC_RTAS is not set
806# CONFIG_IPMI_HANDLER is not set 845# CONFIG_IPMI_HANDLER is not set
807# CONFIG_HW_RANDOM is not set 846# CONFIG_HW_RANDOM is not set
808# CONFIG_NVRAM is not set 847# CONFIG_NVRAM is not set
@@ -839,12 +878,6 @@ CONFIG_I2C_HELPER_AUTO=y
839# CONFIG_I2C_VIAPRO is not set 878# CONFIG_I2C_VIAPRO is not set
840 879
841# 880#
842# Mac SMBus host controller drivers
843#
844# CONFIG_I2C_HYDRA is not set
845CONFIG_I2C_POWERMAC=y
846
847#
848# I2C system bus drivers (mostly embedded / system-on-chip) 881# I2C system bus drivers (mostly embedded / system-on-chip)
849# 882#
850CONFIG_I2C_MPC=y 883CONFIG_I2C_MPC=y
@@ -907,6 +940,17 @@ CONFIG_SSB_POSSIBLE=y
907# CONFIG_MFD_SM501 is not set 940# CONFIG_MFD_SM501 is not set
908# CONFIG_HTC_PASIC3 is not set 941# CONFIG_HTC_PASIC3 is not set
909# CONFIG_MFD_TMIO is not set 942# CONFIG_MFD_TMIO is not set
943# CONFIG_PMIC_DA903X is not set
944# CONFIG_MFD_WM8400 is not set
945# CONFIG_MFD_WM8350_I2C is not set
946
947#
948# Voltage and Current regulators
949#
950# CONFIG_REGULATOR is not set
951# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
952# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
953# CONFIG_REGULATOR_BQ24022 is not set
910 954
911# 955#
912# Multimedia devices 956# Multimedia devices
@@ -934,6 +978,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
934CONFIG_FB=y 978CONFIG_FB=y
935# CONFIG_FIRMWARE_EDID is not set 979# CONFIG_FIRMWARE_EDID is not set
936# CONFIG_FB_DDC is not set 980# CONFIG_FB_DDC is not set
981# CONFIG_FB_BOOT_VESA_SUPPORT is not set
937CONFIG_FB_CFB_FILLRECT=y 982CONFIG_FB_CFB_FILLRECT=y
938CONFIG_FB_CFB_COPYAREA=y 983CONFIG_FB_CFB_COPYAREA=y
939CONFIG_FB_CFB_IMAGEBLIT=y 984CONFIG_FB_CFB_IMAGEBLIT=y
@@ -956,9 +1001,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
956# CONFIG_FB_PM2 is not set 1001# CONFIG_FB_PM2 is not set
957# CONFIG_FB_CYBER2000 is not set 1002# CONFIG_FB_CYBER2000 is not set
958# CONFIG_FB_OF is not set 1003# CONFIG_FB_OF is not set
959# CONFIG_FB_CONTROL is not set
960# CONFIG_FB_PLATINUM is not set
961# CONFIG_FB_VALKYRIE is not set
962# CONFIG_FB_CT65550 is not set 1004# CONFIG_FB_CT65550 is not set
963# CONFIG_FB_ASILIANT is not set 1005# CONFIG_FB_ASILIANT is not set
964# CONFIG_FB_IMSTT is not set 1006# CONFIG_FB_IMSTT is not set
@@ -973,6 +1015,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
973# CONFIG_FB_S3 is not set 1015# CONFIG_FB_S3 is not set
974# CONFIG_FB_SAVAGE is not set 1016# CONFIG_FB_SAVAGE is not set
975# CONFIG_FB_SIS is not set 1017# CONFIG_FB_SIS is not set
1018# CONFIG_FB_VIA is not set
976# CONFIG_FB_NEOMAGIC is not set 1019# CONFIG_FB_NEOMAGIC is not set
977# CONFIG_FB_KYRO is not set 1020# CONFIG_FB_KYRO is not set
978# CONFIG_FB_3DFX is not set 1021# CONFIG_FB_3DFX is not set
@@ -985,6 +1028,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
985CONFIG_FB_FSL_DIU=y 1028CONFIG_FB_FSL_DIU=y
986# CONFIG_FB_IBM_GXT4500 is not set 1029# CONFIG_FB_IBM_GXT4500 is not set
987# CONFIG_FB_VIRTUAL is not set 1030# CONFIG_FB_VIRTUAL is not set
1031# CONFIG_FB_METRONOME is not set
988# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1032# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
989 1033
990# 1034#
@@ -1001,6 +1045,7 @@ CONFIG_DUMMY_CONSOLE=y
1001# CONFIG_FRAMEBUFFER_CONSOLE is not set 1045# CONFIG_FRAMEBUFFER_CONSOLE is not set
1002# CONFIG_LOGO is not set 1046# CONFIG_LOGO is not set
1003CONFIG_SOUND=y 1047CONFIG_SOUND=y
1048CONFIG_SOUND_OSS_CORE=y
1004CONFIG_SND=y 1049CONFIG_SND=y
1005CONFIG_SND_TIMER=y 1050CONFIG_SND_TIMER=y
1006CONFIG_SND_PCM=y 1051CONFIG_SND_PCM=y
@@ -1082,11 +1127,10 @@ CONFIG_SND_PCI=y
1082# CONFIG_SND_VX222 is not set 1127# CONFIG_SND_VX222 is not set
1083# CONFIG_SND_YMFPCI is not set 1128# CONFIG_SND_YMFPCI is not set
1084CONFIG_SND_PPC=y 1129CONFIG_SND_PPC=y
1085# CONFIG_SND_POWERMAC is not set
1086# CONFIG_SND_AOA is not set
1087CONFIG_SND_SOC=y 1130CONFIG_SND_SOC=y
1088CONFIG_SND_SOC_MPC8610=y 1131CONFIG_SND_SOC_MPC8610=y
1089CONFIG_SND_SOC_MPC8610_HPCD=y 1132CONFIG_SND_SOC_MPC8610_HPCD=y
1133# CONFIG_SND_SOC_ALL_CODECS is not set
1090CONFIG_SND_SOC_CS4270=y 1134CONFIG_SND_SOC_CS4270=y
1091CONFIG_SND_SOC_CS4270_VD33_ERRATA=y 1135CONFIG_SND_SOC_CS4270_VD33_ERRATA=y
1092# CONFIG_SOUND_PRIME is not set 1136# CONFIG_SOUND_PRIME is not set
@@ -1094,6 +1138,12 @@ CONFIG_HID_SUPPORT=y
1094CONFIG_HID=y 1138CONFIG_HID=y
1095# CONFIG_HID_DEBUG is not set 1139# CONFIG_HID_DEBUG is not set
1096# CONFIG_HIDRAW is not set 1140# CONFIG_HIDRAW is not set
1141# CONFIG_HID_PID is not set
1142
1143#
1144# Special HID drivers
1145#
1146CONFIG_HID_COMPAT=y
1097CONFIG_USB_SUPPORT=y 1147CONFIG_USB_SUPPORT=y
1098CONFIG_USB_ARCH_HAS_HCD=y 1148CONFIG_USB_ARCH_HAS_HCD=y
1099CONFIG_USB_ARCH_HAS_OHCI=y 1149CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1110,6 +1160,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1110# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1160# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1111# 1161#
1112# CONFIG_USB_GADGET is not set 1162# CONFIG_USB_GADGET is not set
1163# CONFIG_UWB is not set
1113# CONFIG_MMC is not set 1164# CONFIG_MMC is not set
1114# CONFIG_MEMSTICK is not set 1165# CONFIG_MEMSTICK is not set
1115# CONFIG_NEW_LEDS is not set 1166# CONFIG_NEW_LEDS is not set
@@ -1155,12 +1206,15 @@ CONFIG_RTC_INTF_DEV=y
1155# Platform RTC drivers 1206# Platform RTC drivers
1156# 1207#
1157CONFIG_RTC_DRV_CMOS=y 1208CONFIG_RTC_DRV_CMOS=y
1209# CONFIG_RTC_DRV_DS1286 is not set
1158# CONFIG_RTC_DRV_DS1511 is not set 1210# CONFIG_RTC_DRV_DS1511 is not set
1159# CONFIG_RTC_DRV_DS1553 is not set 1211# CONFIG_RTC_DRV_DS1553 is not set
1160# CONFIG_RTC_DRV_DS1742 is not set 1212# CONFIG_RTC_DRV_DS1742 is not set
1161# CONFIG_RTC_DRV_STK17TA8 is not set 1213# CONFIG_RTC_DRV_STK17TA8 is not set
1162# CONFIG_RTC_DRV_M48T86 is not set 1214# CONFIG_RTC_DRV_M48T86 is not set
1215# CONFIG_RTC_DRV_M48T35 is not set
1163# CONFIG_RTC_DRV_M48T59 is not set 1216# CONFIG_RTC_DRV_M48T59 is not set
1217# CONFIG_RTC_DRV_BQ4802 is not set
1164# CONFIG_RTC_DRV_V3020 is not set 1218# CONFIG_RTC_DRV_V3020 is not set
1165 1219
1166# 1220#
@@ -1169,6 +1223,7 @@ CONFIG_RTC_DRV_CMOS=y
1169# CONFIG_RTC_DRV_PPC is not set 1223# CONFIG_RTC_DRV_PPC is not set
1170# CONFIG_DMADEVICES is not set 1224# CONFIG_DMADEVICES is not set
1171# CONFIG_UIO is not set 1225# CONFIG_UIO is not set
1226# CONFIG_STAGING is not set
1172 1227
1173# 1228#
1174# File systems 1229# File systems
@@ -1180,12 +1235,13 @@ CONFIG_EXT3_FS=y
1180CONFIG_EXT3_FS_XATTR=y 1235CONFIG_EXT3_FS_XATTR=y
1181# CONFIG_EXT3_FS_POSIX_ACL is not set 1236# CONFIG_EXT3_FS_POSIX_ACL is not set
1182# CONFIG_EXT3_FS_SECURITY is not set 1237# CONFIG_EXT3_FS_SECURITY is not set
1183# CONFIG_EXT4DEV_FS is not set 1238# CONFIG_EXT4_FS is not set
1184CONFIG_JBD=y 1239CONFIG_JBD=y
1185CONFIG_FS_MBCACHE=y 1240CONFIG_FS_MBCACHE=y
1186# CONFIG_REISERFS_FS is not set 1241# CONFIG_REISERFS_FS is not set
1187# CONFIG_JFS_FS is not set 1242# CONFIG_JFS_FS is not set
1188# CONFIG_FS_POSIX_ACL is not set 1243# CONFIG_FS_POSIX_ACL is not set
1244CONFIG_FILE_LOCKING=y
1189# CONFIG_XFS_FS is not set 1245# CONFIG_XFS_FS is not set
1190# CONFIG_OCFS2_FS is not set 1246# CONFIG_OCFS2_FS is not set
1191# CONFIG_DNOTIFY is not set 1247# CONFIG_DNOTIFY is not set
@@ -1214,6 +1270,7 @@ CONFIG_FS_MBCACHE=y
1214CONFIG_PROC_FS=y 1270CONFIG_PROC_FS=y
1215CONFIG_PROC_KCORE=y 1271CONFIG_PROC_KCORE=y
1216CONFIG_PROC_SYSCTL=y 1272CONFIG_PROC_SYSCTL=y
1273CONFIG_PROC_PAGE_MONITOR=y
1217CONFIG_SYSFS=y 1274CONFIG_SYSFS=y
1218CONFIG_TMPFS=y 1275CONFIG_TMPFS=y
1219# CONFIG_TMPFS_POSIX_ACL is not set 1276# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1254,6 +1311,7 @@ CONFIG_LOCKD_V4=y
1254CONFIG_EXPORTFS=y 1311CONFIG_EXPORTFS=y
1255CONFIG_NFS_COMMON=y 1312CONFIG_NFS_COMMON=y
1256CONFIG_SUNRPC=y 1313CONFIG_SUNRPC=y
1314# CONFIG_SUNRPC_REGISTER_V4 is not set
1257# CONFIG_RPCSEC_GSS_KRB5 is not set 1315# CONFIG_RPCSEC_GSS_KRB5 is not set
1258# CONFIG_RPCSEC_GSS_SPKM3 is not set 1316# CONFIG_RPCSEC_GSS_SPKM3 is not set
1259# CONFIG_SMB_FS is not set 1317# CONFIG_SMB_FS is not set
@@ -1330,7 +1388,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1330# Library routines 1388# Library routines
1331# 1389#
1332CONFIG_BITREVERSE=y 1390CONFIG_BITREVERSE=y
1333# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1334# CONFIG_CRC_CCITT is not set 1391# CONFIG_CRC_CCITT is not set
1335# CONFIG_CRC16 is not set 1392# CONFIG_CRC16 is not set
1336CONFIG_CRC_T10DIF=y 1393CONFIG_CRC_T10DIF=y
@@ -1383,15 +1440,23 @@ CONFIG_DEBUG_INFO=y
1383# CONFIG_DEBUG_SG is not set 1440# CONFIG_DEBUG_SG is not set
1384# CONFIG_BOOT_PRINTK_DELAY is not set 1441# CONFIG_BOOT_PRINTK_DELAY is not set
1385# CONFIG_RCU_TORTURE_TEST is not set 1442# CONFIG_RCU_TORTURE_TEST is not set
1443# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1386# CONFIG_BACKTRACE_SELF_TEST is not set 1444# CONFIG_BACKTRACE_SELF_TEST is not set
1445# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1387# CONFIG_FAULT_INJECTION is not set 1446# CONFIG_FAULT_INJECTION is not set
1388# CONFIG_LATENCYTOP is not set 1447# CONFIG_LATENCYTOP is not set
1389CONFIG_SYSCTL_SYSCALL_CHECK=y 1448CONFIG_SYSCTL_SYSCALL_CHECK=y
1390CONFIG_HAVE_FTRACE=y 1449CONFIG_HAVE_FUNCTION_TRACER=y
1391CONFIG_HAVE_DYNAMIC_FTRACE=y 1450
1392# CONFIG_FTRACE is not set 1451#
1452# Tracers
1453#
1454# CONFIG_FUNCTION_TRACER is not set
1393# CONFIG_SCHED_TRACER is not set 1455# CONFIG_SCHED_TRACER is not set
1394# CONFIG_CONTEXT_SWITCH_TRACER is not set 1456# CONFIG_CONTEXT_SWITCH_TRACER is not set
1457# CONFIG_BOOT_TRACER is not set
1458# CONFIG_STACK_TRACER is not set
1459# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1395# CONFIG_SAMPLES is not set 1460# CONFIG_SAMPLES is not set
1396CONFIG_HAVE_ARCH_KGDB=y 1461CONFIG_HAVE_ARCH_KGDB=y
1397# CONFIG_KGDB is not set 1462# CONFIG_KGDB is not set
@@ -1400,6 +1465,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1400# CONFIG_DEBUG_PAGEALLOC is not set 1465# CONFIG_DEBUG_PAGEALLOC is not set
1401# CONFIG_CODE_PATCHING_SELFTEST is not set 1466# CONFIG_CODE_PATCHING_SELFTEST is not set
1402# CONFIG_FTR_FIXUP_SELFTEST is not set 1467# CONFIG_FTR_FIXUP_SELFTEST is not set
1468# CONFIG_MSI_BITMAP_SELFTEST is not set
1403# CONFIG_XMON is not set 1469# CONFIG_XMON is not set
1404# CONFIG_IRQSTACKS is not set 1470# CONFIG_IRQSTACKS is not set
1405# CONFIG_BDI_SWITCH is not set 1471# CONFIG_BDI_SWITCH is not set
@@ -1411,12 +1477,14 @@ CONFIG_HAVE_ARCH_KGDB=y
1411# 1477#
1412# CONFIG_KEYS is not set 1478# CONFIG_KEYS is not set
1413# CONFIG_SECURITY is not set 1479# CONFIG_SECURITY is not set
1480# CONFIG_SECURITYFS is not set
1414# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1481# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1415CONFIG_CRYPTO=y 1482CONFIG_CRYPTO=y
1416 1483
1417# 1484#
1418# Crypto core or helper 1485# Crypto core or helper
1419# 1486#
1487# CONFIG_CRYPTO_FIPS is not set
1420# CONFIG_CRYPTO_MANAGER is not set 1488# CONFIG_CRYPTO_MANAGER is not set
1421# CONFIG_CRYPTO_GF128MUL is not set 1489# CONFIG_CRYPTO_GF128MUL is not set
1422# CONFIG_CRYPTO_NULL is not set 1490# CONFIG_CRYPTO_NULL is not set
@@ -1489,6 +1557,11 @@ CONFIG_CRYPTO=y
1489# 1557#
1490# CONFIG_CRYPTO_DEFLATE is not set 1558# CONFIG_CRYPTO_DEFLATE is not set
1491# CONFIG_CRYPTO_LZO is not set 1559# CONFIG_CRYPTO_LZO is not set
1560
1561#
1562# Random Number Generation
1563#
1564# CONFIG_CRYPTO_ANSI_CPRNG is not set
1492CONFIG_CRYPTO_HW=y 1565CONFIG_CRYPTO_HW=y
1493# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1566# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1494# CONFIG_CRYPTO_DEV_TALITOS is not set 1567# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
index 444ddf98436d..41220ece603d 100644
--- a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/86xx/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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:11 2008 4# Sat Nov 8 12:40:29 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_PHYS_64BIT is not set
18CONFIG_ALTIVEC=y 19CONFIG_ALTIVEC=y
19CONFIG_PPC_STD_MMU=y 20CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y 21CONFIG_PPC_STD_MMU_32=y
@@ -23,7 +24,7 @@ CONFIG_SMP=y
23CONFIG_NR_CPUS=2 24CONFIG_NR_CPUS=2
24CONFIG_PPC32=y 25CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 28CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -100,7 +101,6 @@ CONFIG_HOTPLUG=y
100CONFIG_PRINTK=y 101CONFIG_PRINTK=y
101CONFIG_BUG=y 102CONFIG_BUG=y
102CONFIG_ELF_CORE=y 103CONFIG_ELF_CORE=y
103CONFIG_PCSPKR_PLATFORM=y
104CONFIG_COMPAT_BRK=y 104CONFIG_COMPAT_BRK=y
105CONFIG_BASE_FULL=y 105CONFIG_BASE_FULL=y
106CONFIG_FUTEX=y 106CONFIG_FUTEX=y
@@ -110,7 +110,9 @@ CONFIG_SIGNALFD=y
110CONFIG_TIMERFD=y 110CONFIG_TIMERFD=y
111CONFIG_EVENTFD=y 111CONFIG_EVENTFD=y
112CONFIG_SHMEM=y 112CONFIG_SHMEM=y
113CONFIG_AIO=y
113CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_PCI_QUIRKS=y
114CONFIG_SLUB_DEBUG=y 116CONFIG_SLUB_DEBUG=y
115# CONFIG_SLAB is not set 117# CONFIG_SLAB is not set
116CONFIG_SLUB=y 118CONFIG_SLUB=y
@@ -124,10 +126,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
124CONFIG_HAVE_KPROBES=y 126CONFIG_HAVE_KPROBES=y
125CONFIG_HAVE_KRETPROBES=y 127CONFIG_HAVE_KRETPROBES=y
126CONFIG_HAVE_ARCH_TRACEHOOK=y 128CONFIG_HAVE_ARCH_TRACEHOOK=y
127# CONFIG_HAVE_DMA_ATTRS is not set
128CONFIG_USE_GENERIC_SMP_HELPERS=y 129CONFIG_USE_GENERIC_SMP_HELPERS=y
129# CONFIG_HAVE_CLK is not set
130CONFIG_PROC_PAGE_MONITOR=y
131# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
132CONFIG_SLABINFO=y 131CONFIG_SLABINFO=y
133CONFIG_RT_MUTEXES=y 132CONFIG_RT_MUTEXES=y
@@ -161,6 +160,7 @@ CONFIG_DEFAULT_CFQ=y
161# CONFIG_DEFAULT_NOOP is not set 160# CONFIG_DEFAULT_NOOP is not set
162CONFIG_DEFAULT_IOSCHED="cfq" 161CONFIG_DEFAULT_IOSCHED="cfq"
163CONFIG_CLASSIC_RCU=y 162CONFIG_CLASSIC_RCU=y
163# CONFIG_FREEZER is not set
164 164
165# 165#
166# Platform support 166# Platform support
@@ -168,10 +168,10 @@ CONFIG_CLASSIC_RCU=y
168CONFIG_PPC_MULTIPLATFORM=y 168CONFIG_PPC_MULTIPLATFORM=y
169CONFIG_CLASSIC32=y 169CONFIG_CLASSIC32=y
170# CONFIG_PPC_CHRP is not set 170# CONFIG_PPC_CHRP is not set
171# CONFIG_PPC_PMAC is not set
172# CONFIG_MPC5121_ADS is not set 171# CONFIG_MPC5121_ADS is not set
173# CONFIG_MPC5121_GENERIC is not set 172# CONFIG_MPC5121_GENERIC is not set
174# CONFIG_PPC_MPC52xx is not set 173# CONFIG_PPC_MPC52xx is not set
174# CONFIG_PPC_PMAC is not set
175# CONFIG_PPC_CELL is not set 175# CONFIG_PPC_CELL is not set
176# CONFIG_PPC_CELL_NATIVE is not set 176# CONFIG_PPC_CELL_NATIVE is not set
177# CONFIG_PPC_82xx is not set 177# CONFIG_PPC_82xx is not set
@@ -181,25 +181,23 @@ CONFIG_PPC_86xx=y
181CONFIG_MPC8641_HPCN=y 181CONFIG_MPC8641_HPCN=y
182# CONFIG_SBC8641D is not set 182# CONFIG_SBC8641D is not set
183# CONFIG_MPC8610_HPCD is not set 183# CONFIG_MPC8610_HPCD is not set
184# CONFIG_GEF_SBC610 is not set
184CONFIG_MPC8641=y 185CONFIG_MPC8641=y
185CONFIG_PPC_NATIVE=y
186# CONFIG_UDBG_RTAS_CONSOLE is not set
187# CONFIG_IPIC is not set 186# CONFIG_IPIC is not set
188CONFIG_MPIC=y 187CONFIG_MPIC=y
189# CONFIG_MPIC_WEIRD is not set 188# CONFIG_MPIC_WEIRD is not set
190CONFIG_PPC_I8259=y 189CONFIG_PPC_I8259=y
191CONFIG_PPC_RTAS=y 190# CONFIG_PPC_RTAS is not set
192# CONFIG_RTAS_ERROR_LOGGING is not set
193CONFIG_RTAS_PROC=y
194# CONFIG_MMIO_NVRAM is not set 191# CONFIG_MMIO_NVRAM is not set
195CONFIG_PPC_MPC106=y 192# CONFIG_PPC_MPC106 is not set
196# CONFIG_PPC_970_NAP is not set 193# CONFIG_PPC_970_NAP is not set
197# CONFIG_PPC_INDIRECT_IO is not set 194# CONFIG_PPC_INDIRECT_IO is not set
198# CONFIG_GENERIC_IOMAP is not set 195# CONFIG_GENERIC_IOMAP is not set
199# CONFIG_CPU_FREQ is not set 196# CONFIG_CPU_FREQ is not set
200# CONFIG_PPC601_SYNC_FIX is not set
201# CONFIG_TAU is not set 197# CONFIG_TAU is not set
198# CONFIG_QUICC_ENGINE is not set
202CONFIG_FSL_ULI1575=y 199CONFIG_FSL_ULI1575=y
200# CONFIG_MPC8xxx_GPIO is not set
203 201
204# 202#
205# Kernel options 203# Kernel options
@@ -219,9 +217,10 @@ CONFIG_PREEMPT_NONE=y
219# CONFIG_PREEMPT_VOLUNTARY is not set 217# CONFIG_PREEMPT_VOLUNTARY is not set
220# CONFIG_PREEMPT is not set 218# CONFIG_PREEMPT is not set
221CONFIG_BINFMT_ELF=y 219CONFIG_BINFMT_ELF=y
220# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
221# CONFIG_HAVE_AOUT is not set
222CONFIG_BINFMT_MISC=m 222CONFIG_BINFMT_MISC=m
223# CONFIG_IOMMU_HELPER is not set 223# CONFIG_IOMMU_HELPER is not set
224# CONFIG_HOTPLUG_CPU is not set
225CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
226CONFIG_ARCH_HAS_WALK_MEMORY=y 225CONFIG_ARCH_HAS_WALK_MEMORY=y
227CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -235,15 +234,15 @@ CONFIG_FLATMEM_MANUAL=y
235# CONFIG_SPARSEMEM_MANUAL is not set 234# CONFIG_SPARSEMEM_MANUAL is not set
236CONFIG_FLATMEM=y 235CONFIG_FLATMEM=y
237CONFIG_FLAT_NODE_MEM_MAP=y 236CONFIG_FLAT_NODE_MEM_MAP=y
238# CONFIG_SPARSEMEM_STATIC is not set
239# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
240CONFIG_PAGEFLAGS_EXTENDED=y 237CONFIG_PAGEFLAGS_EXTENDED=y
241CONFIG_SPLIT_PTLOCK_CPUS=4 238CONFIG_SPLIT_PTLOCK_CPUS=4
242CONFIG_MIGRATION=y 239CONFIG_MIGRATION=y
243# CONFIG_RESOURCES_64BIT is not set 240# CONFIG_RESOURCES_64BIT is not set
241# CONFIG_PHYS_ADDR_T_64BIT is not set
244CONFIG_ZONE_DMA_FLAG=1 242CONFIG_ZONE_DMA_FLAG=1
245CONFIG_BOUNCE=y 243CONFIG_BOUNCE=y
246CONFIG_VIRT_TO_BUS=y 244CONFIG_VIRT_TO_BUS=y
245CONFIG_UNEVICTABLE_LRU=y
247CONFIG_FORCE_MAX_ZONEORDER=11 246CONFIG_FORCE_MAX_ZONEORDER=11
248CONFIG_PROC_DEVICETREE=y 247CONFIG_PROC_DEVICETREE=y
249# CONFIG_CMDLINE_BOOL is not set 248# CONFIG_CMDLINE_BOOL is not set
@@ -255,7 +254,6 @@ CONFIG_ISA_DMA_API=y
255# 254#
256# Bus options 255# Bus options
257# 256#
258# CONFIG_ISA is not set
259CONFIG_ZONE_DMA=y 257CONFIG_ZONE_DMA=y
260CONFIG_GENERIC_ISA_DMA=y 258CONFIG_GENERIC_ISA_DMA=y
261CONFIG_PPC_INDIRECT_PCI=y 259CONFIG_PPC_INDIRECT_PCI=y
@@ -268,7 +266,7 @@ CONFIG_PCI_SYSCALL=y
268# CONFIG_PCIEPORTBUS is not set 266# CONFIG_PCIEPORTBUS is not set
269CONFIG_ARCH_SUPPORTS_MSI=y 267CONFIG_ARCH_SUPPORTS_MSI=y
270# CONFIG_PCI_MSI is not set 268# CONFIG_PCI_MSI is not set
271CONFIG_PCI_LEGACY=y 269# CONFIG_PCI_LEGACY is not set
272# CONFIG_PCI_DEBUG is not set 270# CONFIG_PCI_DEBUG is not set
273# CONFIG_PCCARD is not set 271# CONFIG_PCCARD is not set
274# CONFIG_HOTPLUG_PCI is not set 272# CONFIG_HOTPLUG_PCI is not set
@@ -370,6 +368,7 @@ CONFIG_SCTP_HMAC_MD5=y
370# CONFIG_TIPC is not set 368# CONFIG_TIPC is not set
371# CONFIG_ATM is not set 369# CONFIG_ATM is not set
372# CONFIG_BRIDGE is not set 370# CONFIG_BRIDGE is not set
371# CONFIG_NET_DSA is not set
373# CONFIG_VLAN_8021Q is not set 372# CONFIG_VLAN_8021Q is not set
374# CONFIG_DECNET is not set 373# CONFIG_DECNET is not set
375# CONFIG_LLC2 is not set 374# CONFIG_LLC2 is not set
@@ -390,12 +389,11 @@ CONFIG_SCTP_HMAC_MD5=y
390# CONFIG_IRDA is not set 389# CONFIG_IRDA is not set
391# CONFIG_BT is not set 390# CONFIG_BT is not set
392# CONFIG_AF_RXRPC is not set 391# CONFIG_AF_RXRPC is not set
392# CONFIG_PHONET is not set
393CONFIG_FIB_RULES=y 393CONFIG_FIB_RULES=y
394 394CONFIG_WIRELESS=y
395#
396# Wireless
397#
398# CONFIG_CFG80211 is not set 395# CONFIG_CFG80211 is not set
396CONFIG_WIRELESS_OLD_REGULATORY=y
399# CONFIG_WIRELESS_EXT is not set 397# CONFIG_WIRELESS_EXT is not set
400# CONFIG_MAC80211 is not set 398# CONFIG_MAC80211 is not set
401# CONFIG_IEEE80211 is not set 399# CONFIG_IEEE80211 is not set
@@ -425,7 +423,6 @@ CONFIG_OF_I2C=y
425# CONFIG_PARPORT is not set 423# CONFIG_PARPORT is not set
426CONFIG_BLK_DEV=y 424CONFIG_BLK_DEV=y
427# CONFIG_BLK_DEV_FD is not set 425# CONFIG_BLK_DEV_FD is not set
428# CONFIG_MAC_FLOPPY is not set
429# CONFIG_BLK_CPQ_DA is not set 426# CONFIG_BLK_CPQ_DA is not set
430# CONFIG_BLK_CPQ_CISS_DA is not set 427# CONFIG_BLK_CPQ_CISS_DA is not set
431# CONFIG_BLK_DEV_DAC960 is not set 428# CONFIG_BLK_DEV_DAC960 is not set
@@ -528,8 +525,6 @@ CONFIG_SCSI_LOWLEVEL=y
528# CONFIG_SCSI_DC390T is not set 525# CONFIG_SCSI_DC390T is not set
529# CONFIG_SCSI_NSP32 is not set 526# CONFIG_SCSI_NSP32 is not set
530# CONFIG_SCSI_DEBUG is not set 527# CONFIG_SCSI_DEBUG is not set
531# CONFIG_SCSI_MESH is not set
532# CONFIG_SCSI_MAC53C94 is not set
533# CONFIG_SCSI_SRP is not set 528# CONFIG_SCSI_SRP is not set
534# CONFIG_SCSI_DH is not set 529# CONFIG_SCSI_DH is not set
535CONFIG_ATA=y 530CONFIG_ATA=y
@@ -634,8 +629,6 @@ CONFIG_VITESSE_PHY=y
634# CONFIG_MDIO_BITBANG is not set 629# CONFIG_MDIO_BITBANG is not set
635CONFIG_NET_ETHERNET=y 630CONFIG_NET_ETHERNET=y
636CONFIG_MII=y 631CONFIG_MII=y
637# CONFIG_MACE is not set
638# CONFIG_BMAC is not set
639# CONFIG_HAPPYMEAL is not set 632# CONFIG_HAPPYMEAL is not set
640# CONFIG_SUNGEM is not set 633# CONFIG_SUNGEM is not set
641# CONFIG_CASSINI is not set 634# CONFIG_CASSINI is not set
@@ -646,8 +639,12 @@ CONFIG_MII=y
646# CONFIG_IBM_NEW_EMAC_RGMII is not set 639# CONFIG_IBM_NEW_EMAC_RGMII is not set
647# CONFIG_IBM_NEW_EMAC_TAH is not set 640# CONFIG_IBM_NEW_EMAC_TAH is not set
648# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 641# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
642# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
643# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
644# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
649# CONFIG_NET_PCI is not set 645# CONFIG_NET_PCI is not set
650# CONFIG_B44 is not set 646# CONFIG_B44 is not set
647# CONFIG_ATL2 is not set
651CONFIG_NETDEV_1000=y 648CONFIG_NETDEV_1000=y
652# CONFIG_ACENIC is not set 649# CONFIG_ACENIC is not set
653# CONFIG_DL2K is not set 650# CONFIG_DL2K is not set
@@ -670,18 +667,22 @@ CONFIG_GIANFAR=y
670# CONFIG_QLA3XXX is not set 667# CONFIG_QLA3XXX is not set
671# CONFIG_ATL1 is not set 668# CONFIG_ATL1 is not set
672# CONFIG_ATL1E is not set 669# CONFIG_ATL1E is not set
670# CONFIG_JME is not set
673CONFIG_NETDEV_10000=y 671CONFIG_NETDEV_10000=y
674# CONFIG_CHELSIO_T1 is not set 672# CONFIG_CHELSIO_T1 is not set
675# CONFIG_CHELSIO_T3 is not set 673# CONFIG_CHELSIO_T3 is not set
674# CONFIG_ENIC is not set
676# CONFIG_IXGBE is not set 675# CONFIG_IXGBE is not set
677# CONFIG_IXGB is not set 676# CONFIG_IXGB is not set
678# CONFIG_S2IO is not set 677# CONFIG_S2IO is not set
679# CONFIG_MYRI10GE is not set 678# CONFIG_MYRI10GE is not set
680# CONFIG_NETXEN_NIC is not set 679# CONFIG_NETXEN_NIC is not set
681# CONFIG_NIU is not set 680# CONFIG_NIU is not set
681# CONFIG_MLX4_EN is not set
682# CONFIG_MLX4_CORE is not set 682# CONFIG_MLX4_CORE is not set
683# CONFIG_TEHUTI is not set 683# CONFIG_TEHUTI is not set
684# CONFIG_BNX2X is not set 684# CONFIG_BNX2X is not set
685# CONFIG_QLGE is not set
685# CONFIG_SFC is not set 686# CONFIG_SFC is not set
686# CONFIG_TR is not set 687# CONFIG_TR is not set
687 688
@@ -716,7 +717,7 @@ CONFIG_NETDEV_10000=y
716# Input device support 717# Input device support
717# 718#
718CONFIG_INPUT=y 719CONFIG_INPUT=y
719# CONFIG_INPUT_FF_MEMLESS is not set 720CONFIG_INPUT_FF_MEMLESS=m
720# CONFIG_INPUT_POLLDEV is not set 721# CONFIG_INPUT_POLLDEV is not set
721 722
722# 723#
@@ -781,14 +782,11 @@ CONFIG_SERIAL_8250_RSA=y
781# CONFIG_SERIAL_UARTLITE is not set 782# CONFIG_SERIAL_UARTLITE is not set
782CONFIG_SERIAL_CORE=y 783CONFIG_SERIAL_CORE=y
783CONFIG_SERIAL_CORE_CONSOLE=y 784CONFIG_SERIAL_CORE_CONSOLE=y
784# CONFIG_SERIAL_PMACZILOG is not set
785# CONFIG_SERIAL_JSM is not set 785# CONFIG_SERIAL_JSM is not set
786# CONFIG_SERIAL_OF_PLATFORM is not set 786# CONFIG_SERIAL_OF_PLATFORM is not set
787CONFIG_UNIX98_PTYS=y 787CONFIG_UNIX98_PTYS=y
788CONFIG_LEGACY_PTYS=y 788CONFIG_LEGACY_PTYS=y
789CONFIG_LEGACY_PTY_COUNT=256 789CONFIG_LEGACY_PTY_COUNT=256
790# CONFIG_BRIQ_PANEL is not set
791# CONFIG_HVC_RTAS is not set
792# CONFIG_IPMI_HANDLER is not set 790# CONFIG_IPMI_HANDLER is not set
793# CONFIG_HW_RANDOM is not set 791# CONFIG_HW_RANDOM is not set
794CONFIG_NVRAM=y 792CONFIG_NVRAM=y
@@ -825,12 +823,6 @@ CONFIG_I2C_HELPER_AUTO=y
825# CONFIG_I2C_VIAPRO is not set 823# CONFIG_I2C_VIAPRO is not set
826 824
827# 825#
828# Mac SMBus host controller drivers
829#
830# CONFIG_I2C_HYDRA is not set
831CONFIG_I2C_POWERMAC=y
832
833#
834# I2C system bus drivers (mostly embedded / system-on-chip) 826# I2C system bus drivers (mostly embedded / system-on-chip)
835# 827#
836CONFIG_I2C_MPC=y 828CONFIG_I2C_MPC=y
@@ -894,6 +886,17 @@ CONFIG_SSB_POSSIBLE=y
894# CONFIG_MFD_SM501 is not set 886# CONFIG_MFD_SM501 is not set
895# CONFIG_HTC_PASIC3 is not set 887# CONFIG_HTC_PASIC3 is not set
896# CONFIG_MFD_TMIO is not set 888# CONFIG_MFD_TMIO is not set
889# CONFIG_PMIC_DA903X is not set
890# CONFIG_MFD_WM8400 is not set
891# CONFIG_MFD_WM8350_I2C is not set
892
893#
894# Voltage and Current regulators
895#
896# CONFIG_REGULATOR is not set
897# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
898# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
899# CONFIG_REGULATOR_BQ24022 is not set
897 900
898# 901#
899# Multimedia devices 902# Multimedia devices
@@ -934,7 +937,6 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
934# CONFIG_DVB_USB is not set 937# CONFIG_DVB_USB is not set
935# CONFIG_DVB_TTUSB_BUDGET is not set 938# CONFIG_DVB_TTUSB_BUDGET is not set
936# CONFIG_DVB_TTUSB_DEC is not set 939# CONFIG_DVB_TTUSB_DEC is not set
937# CONFIG_DVB_CINERGYT2 is not set
938# CONFIG_DVB_SIANO_SMS1XXX is not set 940# CONFIG_DVB_SIANO_SMS1XXX is not set
939 941
940# 942#
@@ -952,6 +954,11 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
952# CONFIG_DVB_PLUTO2 is not set 954# CONFIG_DVB_PLUTO2 is not set
953 955
954# 956#
957# Supported SDMC DM1105 Adapters
958#
959# CONFIG_DVB_DM1105 is not set
960
961#
955# Supported DVB Frontends 962# Supported DVB Frontends
956# 963#
957 964
@@ -967,6 +974,8 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
967# CONFIG_DVB_CX24123 is not set 974# CONFIG_DVB_CX24123 is not set
968# CONFIG_DVB_MT312 is not set 975# CONFIG_DVB_MT312 is not set
969# CONFIG_DVB_S5H1420 is not set 976# CONFIG_DVB_S5H1420 is not set
977# CONFIG_DVB_STV0288 is not set
978# CONFIG_DVB_STB6000 is not set
970# CONFIG_DVB_STV0299 is not set 979# CONFIG_DVB_STV0299 is not set
971# CONFIG_DVB_TDA8083 is not set 980# CONFIG_DVB_TDA8083 is not set
972# CONFIG_DVB_TDA10086 is not set 981# CONFIG_DVB_TDA10086 is not set
@@ -974,6 +983,8 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
974# CONFIG_DVB_TUNER_ITD1000 is not set 983# CONFIG_DVB_TUNER_ITD1000 is not set
975# CONFIG_DVB_TDA826X is not set 984# CONFIG_DVB_TDA826X is not set
976# CONFIG_DVB_TUA6100 is not set 985# CONFIG_DVB_TUA6100 is not set
986# CONFIG_DVB_CX24116 is not set
987# CONFIG_DVB_SI21XX is not set
977 988
978# 989#
979# DVB-T (terrestrial) frontends 990# DVB-T (terrestrial) frontends
@@ -1026,6 +1037,13 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
1026# CONFIG_DVB_LNBP21 is not set 1037# CONFIG_DVB_LNBP21 is not set
1027# CONFIG_DVB_ISL6405 is not set 1038# CONFIG_DVB_ISL6405 is not set
1028# CONFIG_DVB_ISL6421 is not set 1039# CONFIG_DVB_ISL6421 is not set
1040# CONFIG_DVB_LGS8GL5 is not set
1041
1042#
1043# Tools to develop new frontends
1044#
1045# CONFIG_DVB_DUMMY_FE is not set
1046# CONFIG_DVB_AF9013 is not set
1029CONFIG_DAB=y 1047CONFIG_DAB=y
1030# CONFIG_USB_DABUSB is not set 1048# CONFIG_USB_DABUSB is not set
1031 1049
@@ -1051,6 +1069,7 @@ CONFIG_VGA_CONSOLE=y
1051# CONFIG_VGACON_SOFT_SCROLLBACK is not set 1069# CONFIG_VGACON_SOFT_SCROLLBACK is not set
1052CONFIG_DUMMY_CONSOLE=y 1070CONFIG_DUMMY_CONSOLE=y
1053CONFIG_SOUND=y 1071CONFIG_SOUND=y
1072CONFIG_SOUND_OSS_CORE=y
1054CONFIG_SND=y 1073CONFIG_SND=y
1055CONFIG_SND_TIMER=y 1074CONFIG_SND_TIMER=y
1056CONFIG_SND_PCM=y 1075CONFIG_SND_PCM=y
@@ -1135,8 +1154,6 @@ CONFIG_SND_INTEL8X0=y
1135# CONFIG_SND_VX222 is not set 1154# CONFIG_SND_VX222 is not set
1136# CONFIG_SND_YMFPCI is not set 1155# CONFIG_SND_YMFPCI is not set
1137CONFIG_SND_PPC=y 1156CONFIG_SND_PPC=y
1138# CONFIG_SND_POWERMAC is not set
1139# CONFIG_SND_AOA is not set
1140CONFIG_SND_USB=y 1157CONFIG_SND_USB=y
1141# CONFIG_SND_USB_AUDIO is not set 1158# CONFIG_SND_USB_AUDIO is not set
1142# CONFIG_SND_USB_USX2Y is not set 1159# CONFIG_SND_USB_USX2Y is not set
@@ -1153,9 +1170,36 @@ CONFIG_HID=y
1153# USB Input Devices 1170# USB Input Devices
1154# 1171#
1155CONFIG_USB_HID=y 1172CONFIG_USB_HID=y
1156# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1173# CONFIG_HID_PID is not set
1157# CONFIG_HID_FF is not set
1158# CONFIG_USB_HIDDEV is not set 1174# CONFIG_USB_HIDDEV is not set
1175
1176#
1177# Special HID drivers
1178#
1179CONFIG_HID_COMPAT=y
1180CONFIG_HID_A4TECH=y
1181CONFIG_HID_APPLE=y
1182CONFIG_HID_BELKIN=y
1183CONFIG_HID_BRIGHT=y
1184CONFIG_HID_CHERRY=y
1185CONFIG_HID_CHICONY=y
1186CONFIG_HID_CYPRESS=y
1187CONFIG_HID_DELL=y
1188CONFIG_HID_EZKEY=y
1189CONFIG_HID_GYRATION=y
1190CONFIG_HID_LOGITECH=y
1191# CONFIG_LOGITECH_FF is not set
1192# CONFIG_LOGIRUMBLEPAD2_FF is not set
1193CONFIG_HID_MICROSOFT=y
1194CONFIG_HID_MONTEREY=y
1195CONFIG_HID_PANTHERLORD=y
1196# CONFIG_PANTHERLORD_FF is not set
1197CONFIG_HID_PETALYNX=y
1198CONFIG_HID_SAMSUNG=y
1199CONFIG_HID_SONY=y
1200CONFIG_HID_SUNPLUS=y
1201CONFIG_THRUSTMASTER_FF=m
1202CONFIG_ZEROPLUS_FF=m
1159CONFIG_USB_SUPPORT=y 1203CONFIG_USB_SUPPORT=y
1160CONFIG_USB_ARCH_HAS_HCD=y 1204CONFIG_USB_ARCH_HAS_HCD=y
1161CONFIG_USB_ARCH_HAS_OHCI=y 1205CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1174,6 +1218,8 @@ CONFIG_USB_DEVICE_CLASS=y
1174# CONFIG_USB_OTG_WHITELIST is not set 1218# CONFIG_USB_OTG_WHITELIST is not set
1175# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1219# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1176CONFIG_USB_MON=y 1220CONFIG_USB_MON=y
1221# CONFIG_USB_WUSB is not set
1222# CONFIG_USB_WUSB_CBAF is not set
1177 1223
1178# 1224#
1179# USB Host Controller Drivers 1225# USB Host Controller Drivers
@@ -1197,6 +1243,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1197# CONFIG_USB_UHCI_HCD is not set 1243# CONFIG_USB_UHCI_HCD is not set
1198# CONFIG_USB_SL811_HCD is not set 1244# CONFIG_USB_SL811_HCD is not set
1199# CONFIG_USB_R8A66597_HCD is not set 1245# CONFIG_USB_R8A66597_HCD is not set
1246# CONFIG_USB_WHCI_HCD is not set
1247# CONFIG_USB_HWA_HCD is not set
1200 1248
1201# 1249#
1202# USB Device Class drivers 1250# USB Device Class drivers
@@ -1204,6 +1252,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1204# CONFIG_USB_ACM is not set 1252# CONFIG_USB_ACM is not set
1205# CONFIG_USB_PRINTER is not set 1253# CONFIG_USB_PRINTER is not set
1206# CONFIG_USB_WDM is not set 1254# CONFIG_USB_WDM is not set
1255# CONFIG_USB_TMC is not set
1207 1256
1208# 1257#
1209# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1258# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1225,7 +1274,6 @@ CONFIG_USB_STORAGE=y
1225# CONFIG_USB_STORAGE_ALAUDA is not set 1274# CONFIG_USB_STORAGE_ALAUDA is not set
1226# CONFIG_USB_STORAGE_ONETOUCH is not set 1275# CONFIG_USB_STORAGE_ONETOUCH is not set
1227# CONFIG_USB_STORAGE_KARMA is not set 1276# CONFIG_USB_STORAGE_KARMA is not set
1228# CONFIG_USB_STORAGE_SIERRA is not set
1229# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1277# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1230# CONFIG_USB_LIBUSUAL is not set 1278# CONFIG_USB_LIBUSUAL is not set
1231 1279
@@ -1246,6 +1294,7 @@ CONFIG_USB_STORAGE=y
1246# CONFIG_USB_EMI62 is not set 1294# CONFIG_USB_EMI62 is not set
1247# CONFIG_USB_EMI26 is not set 1295# CONFIG_USB_EMI26 is not set
1248# CONFIG_USB_ADUTUX is not set 1296# CONFIG_USB_ADUTUX is not set
1297# CONFIG_USB_SEVSEG is not set
1249# CONFIG_USB_RIO500 is not set 1298# CONFIG_USB_RIO500 is not set
1250# CONFIG_USB_LEGOTOWER is not set 1299# CONFIG_USB_LEGOTOWER is not set
1251# CONFIG_USB_LCD is not set 1300# CONFIG_USB_LCD is not set
@@ -1263,7 +1312,9 @@ CONFIG_USB_STORAGE=y
1263# CONFIG_USB_IOWARRIOR is not set 1312# CONFIG_USB_IOWARRIOR is not set
1264# CONFIG_USB_TEST is not set 1313# CONFIG_USB_TEST is not set
1265# CONFIG_USB_ISIGHTFW is not set 1314# CONFIG_USB_ISIGHTFW is not set
1315# CONFIG_USB_VST is not set
1266# CONFIG_USB_GADGET is not set 1316# CONFIG_USB_GADGET is not set
1317# CONFIG_UWB is not set
1267# CONFIG_MMC is not set 1318# CONFIG_MMC is not set
1268# CONFIG_MEMSTICK is not set 1319# CONFIG_MEMSTICK is not set
1269# CONFIG_NEW_LEDS is not set 1320# CONFIG_NEW_LEDS is not set
@@ -1309,12 +1360,15 @@ CONFIG_RTC_INTF_DEV=y
1309# Platform RTC drivers 1360# Platform RTC drivers
1310# 1361#
1311CONFIG_RTC_DRV_CMOS=y 1362CONFIG_RTC_DRV_CMOS=y
1363# CONFIG_RTC_DRV_DS1286 is not set
1312# CONFIG_RTC_DRV_DS1511 is not set 1364# CONFIG_RTC_DRV_DS1511 is not set
1313# CONFIG_RTC_DRV_DS1553 is not set 1365# CONFIG_RTC_DRV_DS1553 is not set
1314# CONFIG_RTC_DRV_DS1742 is not set 1366# CONFIG_RTC_DRV_DS1742 is not set
1315# CONFIG_RTC_DRV_STK17TA8 is not set 1367# CONFIG_RTC_DRV_STK17TA8 is not set
1316# CONFIG_RTC_DRV_M48T86 is not set 1368# CONFIG_RTC_DRV_M48T86 is not set
1369# CONFIG_RTC_DRV_M48T35 is not set
1317# CONFIG_RTC_DRV_M48T59 is not set 1370# CONFIG_RTC_DRV_M48T59 is not set
1371# CONFIG_RTC_DRV_BQ4802 is not set
1318# CONFIG_RTC_DRV_V3020 is not set 1372# CONFIG_RTC_DRV_V3020 is not set
1319 1373
1320# 1374#
@@ -1323,6 +1377,7 @@ CONFIG_RTC_DRV_CMOS=y
1323# CONFIG_RTC_DRV_PPC is not set 1377# CONFIG_RTC_DRV_PPC is not set
1324# CONFIG_DMADEVICES is not set 1378# CONFIG_DMADEVICES is not set
1325# CONFIG_UIO is not set 1379# CONFIG_UIO is not set
1380# CONFIG_STAGING is not set
1326 1381
1327# 1382#
1328# File systems 1383# File systems
@@ -1334,12 +1389,13 @@ CONFIG_EXT3_FS=y
1334CONFIG_EXT3_FS_XATTR=y 1389CONFIG_EXT3_FS_XATTR=y
1335# CONFIG_EXT3_FS_POSIX_ACL is not set 1390# CONFIG_EXT3_FS_POSIX_ACL is not set
1336# CONFIG_EXT3_FS_SECURITY is not set 1391# CONFIG_EXT3_FS_SECURITY is not set
1337# CONFIG_EXT4DEV_FS is not set 1392# CONFIG_EXT4_FS is not set
1338CONFIG_JBD=y 1393CONFIG_JBD=y
1339CONFIG_FS_MBCACHE=y 1394CONFIG_FS_MBCACHE=y
1340# CONFIG_REISERFS_FS is not set 1395# CONFIG_REISERFS_FS is not set
1341# CONFIG_JFS_FS is not set 1396# CONFIG_JFS_FS is not set
1342# CONFIG_FS_POSIX_ACL is not set 1397# CONFIG_FS_POSIX_ACL is not set
1398CONFIG_FILE_LOCKING=y
1343# CONFIG_XFS_FS is not set 1399# CONFIG_XFS_FS is not set
1344# CONFIG_OCFS2_FS is not set 1400# CONFIG_OCFS2_FS is not set
1345CONFIG_DNOTIFY=y 1401CONFIG_DNOTIFY=y
@@ -1377,6 +1433,7 @@ CONFIG_NTFS_FS=y
1377CONFIG_PROC_FS=y 1433CONFIG_PROC_FS=y
1378CONFIG_PROC_KCORE=y 1434CONFIG_PROC_KCORE=y
1379CONFIG_PROC_SYSCTL=y 1435CONFIG_PROC_SYSCTL=y
1436CONFIG_PROC_PAGE_MONITOR=y
1380CONFIG_SYSFS=y 1437CONFIG_SYSFS=y
1381CONFIG_TMPFS=y 1438CONFIG_TMPFS=y
1382# CONFIG_TMPFS_POSIX_ACL is not set 1439# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1421,6 +1478,7 @@ CONFIG_EXPORTFS=y
1421CONFIG_NFS_COMMON=y 1478CONFIG_NFS_COMMON=y
1422CONFIG_SUNRPC=y 1479CONFIG_SUNRPC=y
1423CONFIG_SUNRPC_GSS=y 1480CONFIG_SUNRPC_GSS=y
1481# CONFIG_SUNRPC_REGISTER_V4 is not set
1424CONFIG_RPCSEC_GSS_KRB5=y 1482CONFIG_RPCSEC_GSS_KRB5=y
1425# CONFIG_RPCSEC_GSS_SPKM3 is not set 1483# CONFIG_RPCSEC_GSS_SPKM3 is not set
1426# CONFIG_SMB_FS is not set 1484# CONFIG_SMB_FS is not set
@@ -1496,7 +1554,6 @@ CONFIG_NLS_UTF8=m
1496# Library routines 1554# Library routines
1497# 1555#
1498CONFIG_BITREVERSE=y 1556CONFIG_BITREVERSE=y
1499# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1500# CONFIG_CRC_CCITT is not set 1557# CONFIG_CRC_CCITT is not set
1501# CONFIG_CRC16 is not set 1558# CONFIG_CRC16 is not set
1502CONFIG_CRC_T10DIF=y 1559CONFIG_CRC_T10DIF=y
@@ -1550,15 +1607,23 @@ CONFIG_DEBUG_INFO=y
1550# CONFIG_DEBUG_SG is not set 1607# CONFIG_DEBUG_SG is not set
1551# CONFIG_BOOT_PRINTK_DELAY is not set 1608# CONFIG_BOOT_PRINTK_DELAY is not set
1552# CONFIG_RCU_TORTURE_TEST is not set 1609# CONFIG_RCU_TORTURE_TEST is not set
1610# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1553# CONFIG_BACKTRACE_SELF_TEST is not set 1611# CONFIG_BACKTRACE_SELF_TEST is not set
1612# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1554# CONFIG_FAULT_INJECTION is not set 1613# CONFIG_FAULT_INJECTION is not set
1555# CONFIG_LATENCYTOP is not set 1614# CONFIG_LATENCYTOP is not set
1556CONFIG_SYSCTL_SYSCALL_CHECK=y 1615CONFIG_SYSCTL_SYSCALL_CHECK=y
1557CONFIG_HAVE_FTRACE=y 1616CONFIG_HAVE_FUNCTION_TRACER=y
1558CONFIG_HAVE_DYNAMIC_FTRACE=y 1617
1559# CONFIG_FTRACE is not set 1618#
1619# Tracers
1620#
1621# CONFIG_FUNCTION_TRACER is not set
1560# CONFIG_SCHED_TRACER is not set 1622# CONFIG_SCHED_TRACER is not set
1561# CONFIG_CONTEXT_SWITCH_TRACER is not set 1623# CONFIG_CONTEXT_SWITCH_TRACER is not set
1624# CONFIG_BOOT_TRACER is not set
1625# CONFIG_STACK_TRACER is not set
1626# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1562# CONFIG_SAMPLES is not set 1627# CONFIG_SAMPLES is not set
1563CONFIG_HAVE_ARCH_KGDB=y 1628CONFIG_HAVE_ARCH_KGDB=y
1564# CONFIG_KGDB is not set 1629# CONFIG_KGDB is not set
@@ -1567,6 +1632,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1567# CONFIG_DEBUG_PAGEALLOC is not set 1632# CONFIG_DEBUG_PAGEALLOC is not set
1568# CONFIG_CODE_PATCHING_SELFTEST is not set 1633# CONFIG_CODE_PATCHING_SELFTEST is not set
1569# CONFIG_FTR_FIXUP_SELFTEST is not set 1634# CONFIG_FTR_FIXUP_SELFTEST is not set
1635# CONFIG_MSI_BITMAP_SELFTEST is not set
1570# CONFIG_XMON is not set 1636# CONFIG_XMON is not set
1571# CONFIG_IRQSTACKS is not set 1637# CONFIG_IRQSTACKS is not set
1572# CONFIG_BDI_SWITCH is not set 1638# CONFIG_BDI_SWITCH is not set
@@ -1578,15 +1644,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1578# 1644#
1579# CONFIG_KEYS is not set 1645# CONFIG_KEYS is not set
1580# CONFIG_SECURITY is not set 1646# CONFIG_SECURITY is not set
1647# CONFIG_SECURITYFS is not set
1581# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1648# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1582CONFIG_CRYPTO=y 1649CONFIG_CRYPTO=y
1583 1650
1584# 1651#
1585# Crypto core or helper 1652# Crypto core or helper
1586# 1653#
1654# CONFIG_CRYPTO_FIPS is not set
1587CONFIG_CRYPTO_ALGAPI=y 1655CONFIG_CRYPTO_ALGAPI=y
1656CONFIG_CRYPTO_AEAD=y
1588CONFIG_CRYPTO_BLKCIPHER=y 1657CONFIG_CRYPTO_BLKCIPHER=y
1589CONFIG_CRYPTO_HASH=y 1658CONFIG_CRYPTO_HASH=y
1659CONFIG_CRYPTO_RNG=y
1590CONFIG_CRYPTO_MANAGER=y 1660CONFIG_CRYPTO_MANAGER=y
1591# CONFIG_CRYPTO_GF128MUL is not set 1661# CONFIG_CRYPTO_GF128MUL is not set
1592# CONFIG_CRYPTO_NULL is not set 1662# CONFIG_CRYPTO_NULL is not set
@@ -1659,6 +1729,11 @@ CONFIG_CRYPTO_DES=y
1659# 1729#
1660# CONFIG_CRYPTO_DEFLATE is not set 1730# CONFIG_CRYPTO_DEFLATE is not set
1661# CONFIG_CRYPTO_LZO is not set 1731# CONFIG_CRYPTO_LZO is not set
1732
1733#
1734# Random Number Generation
1735#
1736# CONFIG_CRYPTO_ANSI_CPRNG is not set
1662CONFIG_CRYPTO_HW=y 1737CONFIG_CRYPTO_HW=y
1663# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1738# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1664# CONFIG_CRYPTO_DEV_TALITOS is not set 1739# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/86xx/sbc8641d_defconfig b/arch/powerpc/configs/86xx/sbc8641d_defconfig
index d900f8f376cf..a4342862f6ef 100644
--- a/arch/powerpc/configs/86xx/sbc8641d_defconfig
+++ b/arch/powerpc/configs/86xx/sbc8641d_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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:15 2008 4# Sat Nov 8 12:40:26 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_PHYS_64BIT is not set
18CONFIG_ALTIVEC=y 19CONFIG_ALTIVEC=y
19CONFIG_PPC_STD_MMU=y 20CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y 21CONFIG_PPC_STD_MMU_32=y
@@ -23,7 +24,7 @@ CONFIG_SMP=y
23CONFIG_NR_CPUS=2 24CONFIG_NR_CPUS=2
24CONFIG_PPC32=y 25CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 28CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -100,7 +101,6 @@ CONFIG_HOTPLUG=y
100CONFIG_PRINTK=y 101CONFIG_PRINTK=y
101CONFIG_BUG=y 102CONFIG_BUG=y
102CONFIG_ELF_CORE=y 103CONFIG_ELF_CORE=y
103CONFIG_PCSPKR_PLATFORM=y
104CONFIG_COMPAT_BRK=y 104CONFIG_COMPAT_BRK=y
105CONFIG_BASE_FULL=y 105CONFIG_BASE_FULL=y
106CONFIG_FUTEX=y 106CONFIG_FUTEX=y
@@ -110,7 +110,9 @@ CONFIG_SIGNALFD=y
110CONFIG_TIMERFD=y 110CONFIG_TIMERFD=y
111CONFIG_EVENTFD=y 111CONFIG_EVENTFD=y
112CONFIG_SHMEM=y 112CONFIG_SHMEM=y
113CONFIG_AIO=y
113CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_PCI_QUIRKS=y
114CONFIG_SLAB=y 116CONFIG_SLAB=y
115# CONFIG_SLUB is not set 117# CONFIG_SLUB is not set
116# CONFIG_SLOB is not set 118# CONFIG_SLOB is not set
@@ -123,10 +125,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
123CONFIG_HAVE_KPROBES=y 125CONFIG_HAVE_KPROBES=y
124CONFIG_HAVE_KRETPROBES=y 126CONFIG_HAVE_KRETPROBES=y
125CONFIG_HAVE_ARCH_TRACEHOOK=y 127CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_DMA_ATTRS is not set
127CONFIG_USE_GENERIC_SMP_HELPERS=y 128CONFIG_USE_GENERIC_SMP_HELPERS=y
128# CONFIG_HAVE_CLK is not set
129CONFIG_PROC_PAGE_MONITOR=y
130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
131CONFIG_SLABINFO=y 130CONFIG_SLABINFO=y
132CONFIG_RT_MUTEXES=y 131CONFIG_RT_MUTEXES=y
@@ -160,6 +159,7 @@ CONFIG_DEFAULT_CFQ=y
160# CONFIG_DEFAULT_NOOP is not set 159# CONFIG_DEFAULT_NOOP is not set
161CONFIG_DEFAULT_IOSCHED="cfq" 160CONFIG_DEFAULT_IOSCHED="cfq"
162CONFIG_CLASSIC_RCU=y 161CONFIG_CLASSIC_RCU=y
162# CONFIG_FREEZER is not set
163 163
164# 164#
165# Platform support 165# Platform support
@@ -167,10 +167,10 @@ CONFIG_CLASSIC_RCU=y
167CONFIG_PPC_MULTIPLATFORM=y 167CONFIG_PPC_MULTIPLATFORM=y
168CONFIG_CLASSIC32=y 168CONFIG_CLASSIC32=y
169# CONFIG_PPC_CHRP is not set 169# CONFIG_PPC_CHRP is not set
170# CONFIG_PPC_PMAC is not set
171# CONFIG_MPC5121_ADS is not set 170# CONFIG_MPC5121_ADS is not set
172# CONFIG_MPC5121_GENERIC is not set 171# CONFIG_MPC5121_GENERIC is not set
173# CONFIG_PPC_MPC52xx is not set 172# CONFIG_PPC_MPC52xx is not set
173# CONFIG_PPC_PMAC is not set
174# CONFIG_PPC_CELL is not set 174# CONFIG_PPC_CELL is not set
175# CONFIG_PPC_CELL_NATIVE is not set 175# CONFIG_PPC_CELL_NATIVE is not set
176# CONFIG_PPC_82xx is not set 176# CONFIG_PPC_82xx is not set
@@ -180,25 +180,23 @@ CONFIG_PPC_86xx=y
180# CONFIG_MPC8641_HPCN is not set 180# CONFIG_MPC8641_HPCN is not set
181CONFIG_SBC8641D=y 181CONFIG_SBC8641D=y
182# CONFIG_MPC8610_HPCD is not set 182# CONFIG_MPC8610_HPCD is not set
183# CONFIG_GEF_SBC610 is not set
183CONFIG_MPC8641=y 184CONFIG_MPC8641=y
184CONFIG_PPC_NATIVE=y
185# CONFIG_UDBG_RTAS_CONSOLE is not set
186# CONFIG_IPIC is not set 185# CONFIG_IPIC is not set
187CONFIG_MPIC=y 186CONFIG_MPIC=y
188# CONFIG_MPIC_WEIRD is not set 187# CONFIG_MPIC_WEIRD is not set
189CONFIG_PPC_I8259=y 188# CONFIG_PPC_I8259 is not set
190CONFIG_PPC_RTAS=y 189# CONFIG_PPC_RTAS is not set
191# CONFIG_RTAS_ERROR_LOGGING is not set
192CONFIG_RTAS_PROC=y
193# CONFIG_MMIO_NVRAM is not set 190# CONFIG_MMIO_NVRAM is not set
194CONFIG_PPC_MPC106=y 191# CONFIG_PPC_MPC106 is not set
195# CONFIG_PPC_970_NAP is not set 192# CONFIG_PPC_970_NAP is not set
196# CONFIG_PPC_INDIRECT_IO is not set 193# CONFIG_PPC_INDIRECT_IO is not set
197# CONFIG_GENERIC_IOMAP is not set 194# CONFIG_GENERIC_IOMAP is not set
198# CONFIG_CPU_FREQ is not set 195# CONFIG_CPU_FREQ is not set
199# CONFIG_PPC601_SYNC_FIX is not set
200# CONFIG_TAU is not set 196# CONFIG_TAU is not set
197# CONFIG_QUICC_ENGINE is not set
201# CONFIG_FSL_ULI1575 is not set 198# CONFIG_FSL_ULI1575 is not set
199# CONFIG_MPC8xxx_GPIO is not set
202 200
203# 201#
204# Kernel options 202# Kernel options
@@ -219,9 +217,10 @@ CONFIG_SCHED_HRTICK=y
219CONFIG_PREEMPT=y 217CONFIG_PREEMPT=y
220# CONFIG_PREEMPT_RCU is not set 218# CONFIG_PREEMPT_RCU is not set
221CONFIG_BINFMT_ELF=y 219CONFIG_BINFMT_ELF=y
220# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
221# CONFIG_HAVE_AOUT is not set
222CONFIG_BINFMT_MISC=m 222CONFIG_BINFMT_MISC=m
223# CONFIG_IOMMU_HELPER is not set 223# CONFIG_IOMMU_HELPER is not set
224# CONFIG_HOTPLUG_CPU is not set
225CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
226CONFIG_ARCH_HAS_WALK_MEMORY=y 225CONFIG_ARCH_HAS_WALK_MEMORY=y
227CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -235,15 +234,15 @@ CONFIG_FLATMEM_MANUAL=y
235# CONFIG_SPARSEMEM_MANUAL is not set 234# CONFIG_SPARSEMEM_MANUAL is not set
236CONFIG_FLATMEM=y 235CONFIG_FLATMEM=y
237CONFIG_FLAT_NODE_MEM_MAP=y 236CONFIG_FLAT_NODE_MEM_MAP=y
238# CONFIG_SPARSEMEM_STATIC is not set
239# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
240CONFIG_PAGEFLAGS_EXTENDED=y 237CONFIG_PAGEFLAGS_EXTENDED=y
241CONFIG_SPLIT_PTLOCK_CPUS=4 238CONFIG_SPLIT_PTLOCK_CPUS=4
242CONFIG_MIGRATION=y 239CONFIG_MIGRATION=y
243# CONFIG_RESOURCES_64BIT is not set 240# CONFIG_RESOURCES_64BIT is not set
241# CONFIG_PHYS_ADDR_T_64BIT is not set
244CONFIG_ZONE_DMA_FLAG=1 242CONFIG_ZONE_DMA_FLAG=1
245CONFIG_BOUNCE=y 243CONFIG_BOUNCE=y
246CONFIG_VIRT_TO_BUS=y 244CONFIG_VIRT_TO_BUS=y
245CONFIG_UNEVICTABLE_LRU=y
247CONFIG_FORCE_MAX_ZONEORDER=11 246CONFIG_FORCE_MAX_ZONEORDER=11
248# CONFIG_PROC_DEVICETREE is not set 247# CONFIG_PROC_DEVICETREE is not set
249# CONFIG_CMDLINE_BOOL is not set 248# CONFIG_CMDLINE_BOOL is not set
@@ -255,7 +254,6 @@ CONFIG_ISA_DMA_API=y
255# 254#
256# Bus options 255# Bus options
257# 256#
258# CONFIG_ISA is not set
259CONFIG_ZONE_DMA=y 257CONFIG_ZONE_DMA=y
260CONFIG_GENERIC_ISA_DMA=y 258CONFIG_GENERIC_ISA_DMA=y
261CONFIG_PPC_INDIRECT_PCI=y 259CONFIG_PPC_INDIRECT_PCI=y
@@ -270,7 +268,7 @@ CONFIG_PCIEAER=y
270# CONFIG_PCIEASPM is not set 268# CONFIG_PCIEASPM is not set
271CONFIG_ARCH_SUPPORTS_MSI=y 269CONFIG_ARCH_SUPPORTS_MSI=y
272# CONFIG_PCI_MSI is not set 270# CONFIG_PCI_MSI is not set
273CONFIG_PCI_LEGACY=y 271# CONFIG_PCI_LEGACY is not set
274# CONFIG_PCI_DEBUG is not set 272# CONFIG_PCI_DEBUG is not set
275# CONFIG_PCCARD is not set 273# CONFIG_PCCARD is not set
276# CONFIG_HOTPLUG_PCI is not set 274# CONFIG_HOTPLUG_PCI is not set
@@ -341,7 +339,6 @@ CONFIG_INET_TCP_DIAG=y
341CONFIG_TCP_CONG_CUBIC=y 339CONFIG_TCP_CONG_CUBIC=y
342CONFIG_DEFAULT_TCP_CONG="cubic" 340CONFIG_DEFAULT_TCP_CONG="cubic"
343# CONFIG_TCP_MD5SIG is not set 341# CONFIG_TCP_MD5SIG is not set
344# CONFIG_IP_VS is not set
345CONFIG_IPV6=m 342CONFIG_IPV6=m
346# CONFIG_IPV6_PRIVACY is not set 343# CONFIG_IPV6_PRIVACY is not set
347# CONFIG_IPV6_ROUTER_PREF is not set 344# CONFIG_IPV6_ROUTER_PREF is not set
@@ -378,8 +375,8 @@ CONFIG_NETFILTER_XTABLES=m
378# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set 375# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
379# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 376# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
380# CONFIG_NETFILTER_XT_TARGET_MARK is not set 377# CONFIG_NETFILTER_XT_TARGET_MARK is not set
381# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
382# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 378# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
379# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
383# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set 380# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
384# CONFIG_NETFILTER_XT_TARGET_TRACE is not set 381# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
385# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 382# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
@@ -388,37 +385,39 @@ CONFIG_NETFILTER_XTABLES=m
388# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 385# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
389# CONFIG_NETFILTER_XT_MATCH_DSCP is not set 386# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
390# CONFIG_NETFILTER_XT_MATCH_ESP is not set 387# CONFIG_NETFILTER_XT_MATCH_ESP is not set
388# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
391# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set 389# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
392# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set 390# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
393# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set 391# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
394# CONFIG_NETFILTER_XT_MATCH_MAC is not set 392# CONFIG_NETFILTER_XT_MATCH_MAC is not set
395# CONFIG_NETFILTER_XT_MATCH_MARK is not set 393# CONFIG_NETFILTER_XT_MATCH_MARK is not set
394# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
396# CONFIG_NETFILTER_XT_MATCH_OWNER is not set 395# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
397# CONFIG_NETFILTER_XT_MATCH_POLICY is not set 396# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
398# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
399# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set 397# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
400# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set 398# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
401# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 399# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
402# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set 400# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
403# CONFIG_NETFILTER_XT_MATCH_REALM is not set 401# CONFIG_NETFILTER_XT_MATCH_REALM is not set
402# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
404# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 403# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
405# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 404# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
406# CONFIG_NETFILTER_XT_MATCH_STRING is not set 405# CONFIG_NETFILTER_XT_MATCH_STRING is not set
407# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set 406# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
408# CONFIG_NETFILTER_XT_MATCH_TIME is not set 407# CONFIG_NETFILTER_XT_MATCH_TIME is not set
409# CONFIG_NETFILTER_XT_MATCH_U32 is not set 408# CONFIG_NETFILTER_XT_MATCH_U32 is not set
410# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 409# CONFIG_IP_VS is not set
411 410
412# 411#
413# IP: Netfilter Configuration 412# IP: Netfilter Configuration
414# 413#
414# CONFIG_NF_DEFRAG_IPV4 is not set
415CONFIG_IP_NF_QUEUE=m 415CONFIG_IP_NF_QUEUE=m
416CONFIG_IP_NF_IPTABLES=m 416CONFIG_IP_NF_IPTABLES=m
417CONFIG_IP_NF_MATCH_RECENT=m 417CONFIG_IP_NF_MATCH_ADDRTYPE=m
418CONFIG_IP_NF_MATCH_ECN=m
419# CONFIG_IP_NF_MATCH_AH is not set 418# CONFIG_IP_NF_MATCH_AH is not set
419CONFIG_IP_NF_MATCH_ECN=m
420CONFIG_IP_NF_MATCH_TTL=m 420CONFIG_IP_NF_MATCH_TTL=m
421CONFIG_IP_NF_MATCH_ADDRTYPE=m
422CONFIG_IP_NF_FILTER=m 421CONFIG_IP_NF_FILTER=m
423CONFIG_IP_NF_TARGET_REJECT=m 422CONFIG_IP_NF_TARGET_REJECT=m
424CONFIG_IP_NF_TARGET_LOG=m 423CONFIG_IP_NF_TARGET_LOG=m
@@ -437,25 +436,21 @@ CONFIG_IP_NF_ARP_MANGLE=m
437# 436#
438CONFIG_IP6_NF_QUEUE=m 437CONFIG_IP6_NF_QUEUE=m
439CONFIG_IP6_NF_IPTABLES=m 438CONFIG_IP6_NF_IPTABLES=m
440CONFIG_IP6_NF_MATCH_RT=m 439# CONFIG_IP6_NF_MATCH_AH is not set
441CONFIG_IP6_NF_MATCH_OPTS=m 440CONFIG_IP6_NF_MATCH_EUI64=m
442CONFIG_IP6_NF_MATCH_FRAG=m 441CONFIG_IP6_NF_MATCH_FRAG=m
442CONFIG_IP6_NF_MATCH_OPTS=m
443CONFIG_IP6_NF_MATCH_HL=m 443CONFIG_IP6_NF_MATCH_HL=m
444CONFIG_IP6_NF_MATCH_IPV6HEADER=m 444CONFIG_IP6_NF_MATCH_IPV6HEADER=m
445# CONFIG_IP6_NF_MATCH_AH is not set
446# CONFIG_IP6_NF_MATCH_MH is not set 445# CONFIG_IP6_NF_MATCH_MH is not set
447CONFIG_IP6_NF_MATCH_EUI64=m 446CONFIG_IP6_NF_MATCH_RT=m
448CONFIG_IP6_NF_FILTER=m
449CONFIG_IP6_NF_TARGET_LOG=m 447CONFIG_IP6_NF_TARGET_LOG=m
448CONFIG_IP6_NF_FILTER=m
450# CONFIG_IP6_NF_TARGET_REJECT is not set 449# CONFIG_IP6_NF_TARGET_REJECT is not set
451CONFIG_IP6_NF_MANGLE=m 450CONFIG_IP6_NF_MANGLE=m
452# CONFIG_IP6_NF_TARGET_HL is not set 451# CONFIG_IP6_NF_TARGET_HL is not set
453CONFIG_IP6_NF_RAW=m 452CONFIG_IP6_NF_RAW=m
454# CONFIG_IP6_NF_SECURITY is not set 453# CONFIG_IP6_NF_SECURITY is not set
455
456#
457# Bridge: Netfilter Configuration
458#
459# CONFIG_BRIDGE_NF_EBTABLES is not set 454# CONFIG_BRIDGE_NF_EBTABLES is not set
460# CONFIG_IP_DCCP is not set 455# CONFIG_IP_DCCP is not set
461CONFIG_IP_SCTP=m 456CONFIG_IP_SCTP=m
@@ -476,6 +471,7 @@ CONFIG_ATM_BR2684=m
476# CONFIG_ATM_BR2684_IPFILTER is not set 471# CONFIG_ATM_BR2684_IPFILTER is not set
477CONFIG_STP=m 472CONFIG_STP=m
478CONFIG_BRIDGE=m 473CONFIG_BRIDGE=m
474# CONFIG_NET_DSA is not set
479CONFIG_VLAN_8021Q=m 475CONFIG_VLAN_8021Q=m
480# CONFIG_VLAN_8021Q_GVRP is not set 476# CONFIG_VLAN_8021Q_GVRP is not set
481# CONFIG_DECNET is not set 477# CONFIG_DECNET is not set
@@ -497,6 +493,7 @@ CONFIG_NET_SCH_HTB=m
497CONFIG_NET_SCH_HFSC=m 493CONFIG_NET_SCH_HFSC=m
498CONFIG_NET_SCH_ATM=m 494CONFIG_NET_SCH_ATM=m
499CONFIG_NET_SCH_PRIO=m 495CONFIG_NET_SCH_PRIO=m
496# CONFIG_NET_SCH_MULTIQ is not set
500CONFIG_NET_SCH_RED=m 497CONFIG_NET_SCH_RED=m
501CONFIG_NET_SCH_SFQ=m 498CONFIG_NET_SCH_SFQ=m
502CONFIG_NET_SCH_TEQL=m 499CONFIG_NET_SCH_TEQL=m
@@ -534,12 +531,11 @@ CONFIG_NET_PKTGEN=m
534# CONFIG_IRDA is not set 531# CONFIG_IRDA is not set
535# CONFIG_BT is not set 532# CONFIG_BT is not set
536# CONFIG_AF_RXRPC is not set 533# CONFIG_AF_RXRPC is not set
534# CONFIG_PHONET is not set
537CONFIG_FIB_RULES=y 535CONFIG_FIB_RULES=y
538 536CONFIG_WIRELESS=y
539#
540# Wireless
541#
542# CONFIG_CFG80211 is not set 537# CONFIG_CFG80211 is not set
538CONFIG_WIRELESS_OLD_REGULATORY=y
543# CONFIG_WIRELESS_EXT is not set 539# CONFIG_WIRELESS_EXT is not set
544# CONFIG_MAC80211 is not set 540# CONFIG_MAC80211 is not set
545# CONFIG_IEEE80211 is not set 541# CONFIG_IEEE80211 is not set
@@ -649,7 +645,6 @@ CONFIG_OF_I2C=y
649# CONFIG_PARPORT is not set 645# CONFIG_PARPORT is not set
650CONFIG_BLK_DEV=y 646CONFIG_BLK_DEV=y
651# CONFIG_BLK_DEV_FD is not set 647# CONFIG_BLK_DEV_FD is not set
652# CONFIG_MAC_FLOPPY is not set
653# CONFIG_BLK_CPQ_DA is not set 648# CONFIG_BLK_CPQ_DA is not set
654# CONFIG_BLK_CPQ_CISS_DA is not set 649# CONFIG_BLK_CPQ_CISS_DA is not set
655# CONFIG_BLK_DEV_DAC960 is not set 650# CONFIG_BLK_DEV_DAC960 is not set
@@ -686,6 +681,7 @@ CONFIG_HAVE_IDE=y
686# CONFIG_ATA is not set 681# CONFIG_ATA is not set
687CONFIG_MD=y 682CONFIG_MD=y
688CONFIG_BLK_DEV_MD=y 683CONFIG_BLK_DEV_MD=y
684CONFIG_MD_AUTODETECT=y
689CONFIG_MD_LINEAR=y 685CONFIG_MD_LINEAR=y
690CONFIG_MD_RAID0=y 686CONFIG_MD_RAID0=y
691CONFIG_MD_RAID1=y 687CONFIG_MD_RAID1=y
@@ -742,8 +738,6 @@ CONFIG_BROADCOM_PHY=y
742# CONFIG_MDIO_BITBANG is not set 738# CONFIG_MDIO_BITBANG is not set
743CONFIG_NET_ETHERNET=y 739CONFIG_NET_ETHERNET=y
744CONFIG_MII=y 740CONFIG_MII=y
745# CONFIG_MACE is not set
746# CONFIG_BMAC is not set
747# CONFIG_HAPPYMEAL is not set 741# CONFIG_HAPPYMEAL is not set
748# CONFIG_SUNGEM is not set 742# CONFIG_SUNGEM is not set
749# CONFIG_CASSINI is not set 743# CONFIG_CASSINI is not set
@@ -754,8 +748,12 @@ CONFIG_MII=y
754# CONFIG_IBM_NEW_EMAC_RGMII is not set 748# CONFIG_IBM_NEW_EMAC_RGMII is not set
755# CONFIG_IBM_NEW_EMAC_TAH is not set 749# CONFIG_IBM_NEW_EMAC_TAH is not set
756# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 750# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
751# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
752# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
753# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
757# CONFIG_NET_PCI is not set 754# CONFIG_NET_PCI is not set
758# CONFIG_B44 is not set 755# CONFIG_B44 is not set
756# CONFIG_ATL2 is not set
759CONFIG_NETDEV_1000=y 757CONFIG_NETDEV_1000=y
760# CONFIG_ACENIC is not set 758# CONFIG_ACENIC is not set
761# CONFIG_DL2K is not set 759# CONFIG_DL2K is not set
@@ -778,6 +776,7 @@ CONFIG_GIANFAR=y
778# CONFIG_QLA3XXX is not set 776# CONFIG_QLA3XXX is not set
779# CONFIG_ATL1 is not set 777# CONFIG_ATL1 is not set
780# CONFIG_ATL1E is not set 778# CONFIG_ATL1E is not set
779# CONFIG_JME is not set
781# CONFIG_NETDEV_10000 is not set 780# CONFIG_NETDEV_10000 is not set
782# CONFIG_TR is not set 781# CONFIG_TR is not set
783 782
@@ -890,14 +889,11 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2
890# CONFIG_SERIAL_UARTLITE is not set 889# CONFIG_SERIAL_UARTLITE is not set
891CONFIG_SERIAL_CORE=y 890CONFIG_SERIAL_CORE=y
892CONFIG_SERIAL_CORE_CONSOLE=y 891CONFIG_SERIAL_CORE_CONSOLE=y
893# CONFIG_SERIAL_PMACZILOG is not set
894# CONFIG_SERIAL_JSM is not set 892# CONFIG_SERIAL_JSM is not set
895# CONFIG_SERIAL_OF_PLATFORM is not set 893# CONFIG_SERIAL_OF_PLATFORM is not set
896CONFIG_UNIX98_PTYS=y 894CONFIG_UNIX98_PTYS=y
897CONFIG_LEGACY_PTYS=y 895CONFIG_LEGACY_PTYS=y
898CONFIG_LEGACY_PTY_COUNT=256 896CONFIG_LEGACY_PTY_COUNT=256
899# CONFIG_BRIQ_PANEL is not set
900# CONFIG_HVC_RTAS is not set
901# CONFIG_IPMI_HANDLER is not set 897# CONFIG_IPMI_HANDLER is not set
902CONFIG_HW_RANDOM=m 898CONFIG_HW_RANDOM=m
903# CONFIG_NVRAM is not set 899# CONFIG_NVRAM is not set
@@ -935,12 +931,6 @@ CONFIG_I2C_HELPER_AUTO=y
935# CONFIG_I2C_VIAPRO is not set 931# CONFIG_I2C_VIAPRO is not set
936 932
937# 933#
938# Mac SMBus host controller drivers
939#
940# CONFIG_I2C_HYDRA is not set
941CONFIG_I2C_POWERMAC=y
942
943#
944# I2C system bus drivers (mostly embedded / system-on-chip) 934# I2C system bus drivers (mostly embedded / system-on-chip)
945# 935#
946CONFIG_I2C_MPC=y 936CONFIG_I2C_MPC=y
@@ -997,7 +987,6 @@ CONFIG_HWMON=y
997# CONFIG_SENSORS_ADM9240 is not set 987# CONFIG_SENSORS_ADM9240 is not set
998# CONFIG_SENSORS_ADT7470 is not set 988# CONFIG_SENSORS_ADT7470 is not set
999# CONFIG_SENSORS_ADT7473 is not set 989# CONFIG_SENSORS_ADT7473 is not set
1000# CONFIG_SENSORS_AMS is not set
1001# CONFIG_SENSORS_ATXP1 is not set 990# CONFIG_SENSORS_ATXP1 is not set
1002# CONFIG_SENSORS_DS1621 is not set 991# CONFIG_SENSORS_DS1621 is not set
1003# CONFIG_SENSORS_I5K_AMB is not set 992# CONFIG_SENSORS_I5K_AMB is not set
@@ -1052,7 +1041,6 @@ CONFIG_WATCHDOG=y
1052CONFIG_SOFT_WATCHDOG=m 1041CONFIG_SOFT_WATCHDOG=m
1053# CONFIG_ALIM7101_WDT is not set 1042# CONFIG_ALIM7101_WDT is not set
1054# CONFIG_8xxx_WDT is not set 1043# CONFIG_8xxx_WDT is not set
1055# CONFIG_WATCHDOG_RTAS is not set
1056 1044
1057# 1045#
1058# PCI-based Watchdog Cards 1046# PCI-based Watchdog Cards
@@ -1073,6 +1061,17 @@ CONFIG_SSB_POSSIBLE=y
1073# CONFIG_MFD_SM501 is not set 1061# CONFIG_MFD_SM501 is not set
1074# CONFIG_HTC_PASIC3 is not set 1062# CONFIG_HTC_PASIC3 is not set
1075# CONFIG_MFD_TMIO is not set 1063# CONFIG_MFD_TMIO is not set
1064# CONFIG_PMIC_DA903X is not set
1065# CONFIG_MFD_WM8400 is not set
1066# CONFIG_MFD_WM8350_I2C is not set
1067
1068#
1069# Voltage and Current regulators
1070#
1071# CONFIG_REGULATOR is not set
1072# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1073# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1074# CONFIG_REGULATOR_BQ24022 is not set
1076 1075
1077# 1076#
1078# Multimedia devices 1077# Multimedia devices
@@ -1116,6 +1115,12 @@ CONFIG_HID_SUPPORT=y
1116CONFIG_HID=y 1115CONFIG_HID=y
1117# CONFIG_HID_DEBUG is not set 1116# CONFIG_HID_DEBUG is not set
1118# CONFIG_HIDRAW is not set 1117# CONFIG_HIDRAW is not set
1118# CONFIG_HID_PID is not set
1119
1120#
1121# Special HID drivers
1122#
1123CONFIG_HID_COMPAT=y
1119CONFIG_USB_SUPPORT=y 1124CONFIG_USB_SUPPORT=y
1120CONFIG_USB_ARCH_HAS_HCD=y 1125CONFIG_USB_ARCH_HAS_HCD=y
1121CONFIG_USB_ARCH_HAS_OHCI=y 1126CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1132,6 +1137,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1132# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1137# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1133# 1138#
1134# CONFIG_USB_GADGET is not set 1139# CONFIG_USB_GADGET is not set
1140# CONFIG_UWB is not set
1135# CONFIG_MMC is not set 1141# CONFIG_MMC is not set
1136# CONFIG_MEMSTICK is not set 1142# CONFIG_MEMSTICK is not set
1137# CONFIG_NEW_LEDS is not set 1143# CONFIG_NEW_LEDS is not set
@@ -1141,6 +1147,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1141# CONFIG_RTC_CLASS is not set 1147# CONFIG_RTC_CLASS is not set
1142# CONFIG_DMADEVICES is not set 1148# CONFIG_DMADEVICES is not set
1143# CONFIG_UIO is not set 1149# CONFIG_UIO is not set
1150# CONFIG_STAGING is not set
1144 1151
1145# 1152#
1146# File systems 1153# File systems
@@ -1154,9 +1161,11 @@ CONFIG_EXT3_FS=y
1154CONFIG_EXT3_FS_XATTR=y 1161CONFIG_EXT3_FS_XATTR=y
1155CONFIG_EXT3_FS_POSIX_ACL=y 1162CONFIG_EXT3_FS_POSIX_ACL=y
1156# CONFIG_EXT3_FS_SECURITY is not set 1163# CONFIG_EXT3_FS_SECURITY is not set
1157# CONFIG_EXT4DEV_FS is not set 1164# CONFIG_EXT4_FS is not set
1158CONFIG_JBD=y 1165CONFIG_JBD=y
1159# CONFIG_JBD_DEBUG is not set 1166# CONFIG_JBD_DEBUG is not set
1167CONFIG_JBD2=m
1168# CONFIG_JBD2_DEBUG is not set
1160CONFIG_FS_MBCACHE=y 1169CONFIG_FS_MBCACHE=y
1161CONFIG_REISERFS_FS=m 1170CONFIG_REISERFS_FS=m
1162# CONFIG_REISERFS_CHECK is not set 1171# CONFIG_REISERFS_CHECK is not set
@@ -1166,12 +1175,14 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
1166# CONFIG_REISERFS_FS_SECURITY is not set 1175# CONFIG_REISERFS_FS_SECURITY is not set
1167# CONFIG_JFS_FS is not set 1176# CONFIG_JFS_FS is not set
1168CONFIG_FS_POSIX_ACL=y 1177CONFIG_FS_POSIX_ACL=y
1178CONFIG_FILE_LOCKING=y
1169# CONFIG_XFS_FS is not set 1179# CONFIG_XFS_FS is not set
1170CONFIG_OCFS2_FS=m 1180CONFIG_OCFS2_FS=m
1171CONFIG_OCFS2_FS_O2CB=m 1181CONFIG_OCFS2_FS_O2CB=m
1172CONFIG_OCFS2_FS_STATS=y 1182CONFIG_OCFS2_FS_STATS=y
1173CONFIG_OCFS2_DEBUG_MASKLOG=y 1183CONFIG_OCFS2_DEBUG_MASKLOG=y
1174# CONFIG_OCFS2_DEBUG_FS is not set 1184# CONFIG_OCFS2_DEBUG_FS is not set
1185# CONFIG_OCFS2_COMPAT_JBD is not set
1175CONFIG_DNOTIFY=y 1186CONFIG_DNOTIFY=y
1176CONFIG_INOTIFY=y 1187CONFIG_INOTIFY=y
1177CONFIG_INOTIFY_USER=y 1188CONFIG_INOTIFY_USER=y
@@ -1199,6 +1210,7 @@ CONFIG_AUTOFS4_FS=m
1199CONFIG_PROC_FS=y 1210CONFIG_PROC_FS=y
1200CONFIG_PROC_KCORE=y 1211CONFIG_PROC_KCORE=y
1201CONFIG_PROC_SYSCTL=y 1212CONFIG_PROC_SYSCTL=y
1213CONFIG_PROC_PAGE_MONITOR=y
1202CONFIG_SYSFS=y 1214CONFIG_SYSFS=y
1203CONFIG_TMPFS=y 1215CONFIG_TMPFS=y
1204# CONFIG_TMPFS_POSIX_ACL is not set 1216# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1237,6 +1249,7 @@ CONFIG_LOCKD_V4=y
1237CONFIG_NFS_COMMON=y 1249CONFIG_NFS_COMMON=y
1238CONFIG_SUNRPC=y 1250CONFIG_SUNRPC=y
1239CONFIG_SUNRPC_GSS=y 1251CONFIG_SUNRPC_GSS=y
1252# CONFIG_SUNRPC_REGISTER_V4 is not set
1240CONFIG_RPCSEC_GSS_KRB5=y 1253CONFIG_RPCSEC_GSS_KRB5=y
1241# CONFIG_RPCSEC_GSS_SPKM3 is not set 1254# CONFIG_RPCSEC_GSS_SPKM3 is not set
1242CONFIG_SMB_FS=m 1255CONFIG_SMB_FS=m
@@ -1257,7 +1270,6 @@ CONFIG_CIFS_POSIX=y
1257# Partition Types 1270# Partition Types
1258# 1271#
1259# CONFIG_PARTITION_ADVANCED is not set 1272# CONFIG_PARTITION_ADVANCED is not set
1260CONFIG_MAC_PARTITION=y
1261CONFIG_MSDOS_PARTITION=y 1273CONFIG_MSDOS_PARTITION=y
1262CONFIG_NLS=m 1274CONFIG_NLS=m
1263CONFIG_NLS_DEFAULT="iso8859-1" 1275CONFIG_NLS_DEFAULT="iso8859-1"
@@ -1305,7 +1317,6 @@ CONFIG_NLS_UTF8=m
1305# Library routines 1317# Library routines
1306# 1318#
1307CONFIG_BITREVERSE=y 1319CONFIG_BITREVERSE=y
1308# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1309CONFIG_CRC_CCITT=m 1320CONFIG_CRC_CCITT=m
1310# CONFIG_CRC16 is not set 1321# CONFIG_CRC16 is not set
1311# CONFIG_CRC_T10DIF is not set 1322# CONFIG_CRC_T10DIF is not set
@@ -1358,16 +1369,24 @@ CONFIG_DEBUG_INFO=y
1358# CONFIG_DEBUG_SG is not set 1369# CONFIG_DEBUG_SG is not set
1359# CONFIG_BOOT_PRINTK_DELAY is not set 1370# CONFIG_BOOT_PRINTK_DELAY is not set
1360# CONFIG_RCU_TORTURE_TEST is not set 1371# CONFIG_RCU_TORTURE_TEST is not set
1372# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1361# CONFIG_BACKTRACE_SELF_TEST is not set 1373# CONFIG_BACKTRACE_SELF_TEST is not set
1374# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1362# CONFIG_FAULT_INJECTION is not set 1375# CONFIG_FAULT_INJECTION is not set
1363# CONFIG_LATENCYTOP is not set 1376# CONFIG_LATENCYTOP is not set
1364CONFIG_SYSCTL_SYSCALL_CHECK=y 1377CONFIG_SYSCTL_SYSCALL_CHECK=y
1365CONFIG_HAVE_FTRACE=y 1378CONFIG_HAVE_FUNCTION_TRACER=y
1366CONFIG_HAVE_DYNAMIC_FTRACE=y 1379
1367# CONFIG_FTRACE is not set 1380#
1381# Tracers
1382#
1383# CONFIG_FUNCTION_TRACER is not set
1368# CONFIG_PREEMPT_TRACER is not set 1384# CONFIG_PREEMPT_TRACER is not set
1369# CONFIG_SCHED_TRACER is not set 1385# CONFIG_SCHED_TRACER is not set
1370# CONFIG_CONTEXT_SWITCH_TRACER is not set 1386# CONFIG_CONTEXT_SWITCH_TRACER is not set
1387# CONFIG_BOOT_TRACER is not set
1388# CONFIG_STACK_TRACER is not set
1389# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1371# CONFIG_SAMPLES is not set 1390# CONFIG_SAMPLES is not set
1372CONFIG_HAVE_ARCH_KGDB=y 1391CONFIG_HAVE_ARCH_KGDB=y
1373# CONFIG_KGDB is not set 1392# CONFIG_KGDB is not set
@@ -1376,6 +1395,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1376# CONFIG_DEBUG_PAGEALLOC is not set 1395# CONFIG_DEBUG_PAGEALLOC is not set
1377# CONFIG_CODE_PATCHING_SELFTEST is not set 1396# CONFIG_CODE_PATCHING_SELFTEST is not set
1378# CONFIG_FTR_FIXUP_SELFTEST is not set 1397# CONFIG_FTR_FIXUP_SELFTEST is not set
1398# CONFIG_MSI_BITMAP_SELFTEST is not set
1379# CONFIG_XMON is not set 1399# CONFIG_XMON is not set
1380# CONFIG_IRQSTACKS is not set 1400# CONFIG_IRQSTACKS is not set
1381# CONFIG_VIRQ_DEBUG is not set 1401# CONFIG_VIRQ_DEBUG is not set
@@ -1388,6 +1408,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1388# 1408#
1389# CONFIG_KEYS is not set 1409# CONFIG_KEYS is not set
1390CONFIG_SECURITY=y 1410CONFIG_SECURITY=y
1411# CONFIG_SECURITYFS is not set
1391CONFIG_SECURITY_NETWORK=y 1412CONFIG_SECURITY_NETWORK=y
1392# CONFIG_SECURITY_NETWORK_XFRM is not set 1413# CONFIG_SECURITY_NETWORK_XFRM is not set
1393# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1414# CONFIG_SECURITY_FILE_CAPABILITIES is not set
@@ -1397,10 +1418,12 @@ CONFIG_CRYPTO=y
1397# 1418#
1398# Crypto core or helper 1419# Crypto core or helper
1399# 1420#
1421# CONFIG_CRYPTO_FIPS is not set
1400CONFIG_CRYPTO_ALGAPI=y 1422CONFIG_CRYPTO_ALGAPI=y
1401CONFIG_CRYPTO_AEAD=m 1423CONFIG_CRYPTO_AEAD=y
1402CONFIG_CRYPTO_BLKCIPHER=y 1424CONFIG_CRYPTO_BLKCIPHER=y
1403CONFIG_CRYPTO_HASH=y 1425CONFIG_CRYPTO_HASH=y
1426CONFIG_CRYPTO_RNG=y
1404CONFIG_CRYPTO_MANAGER=y 1427CONFIG_CRYPTO_MANAGER=y
1405# CONFIG_CRYPTO_GF128MUL is not set 1428# CONFIG_CRYPTO_GF128MUL is not set
1406CONFIG_CRYPTO_NULL=m 1429CONFIG_CRYPTO_NULL=m
@@ -1474,6 +1497,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1474# 1497#
1475CONFIG_CRYPTO_DEFLATE=m 1498CONFIG_CRYPTO_DEFLATE=m
1476# CONFIG_CRYPTO_LZO is not set 1499# CONFIG_CRYPTO_LZO is not set
1500
1501#
1502# Random Number Generation
1503#
1504# CONFIG_CRYPTO_ANSI_CPRNG is not set
1477CONFIG_CRYPTO_HW=y 1505CONFIG_CRYPTO_HW=y
1478# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1506# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1479# CONFIG_CRYPTO_DEV_TALITOS is not set 1507# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig
index 63cd51fbb4b9..024f279af90a 100644
--- a/arch/powerpc/configs/adder875_defconfig
+++ b/arch/powerpc/configs/adder875_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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:00 2008 4# Sat Nov 8 12:39:32 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,7 +19,7 @@ CONFIG_8xx=y
19CONFIG_NOT_COHERENT_CACHE=y 19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32 21CONFIG_WORD_SIZE=32
22CONFIG_PPC_MERGE=y 22# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
23CONFIG_MMU=y 23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y 24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y 25CONFIG_GENERIC_TIME=y
@@ -102,6 +102,7 @@ CONFIG_SIGNALFD=y
102CONFIG_TIMERFD=y 102CONFIG_TIMERFD=y
103CONFIG_EVENTFD=y 103CONFIG_EVENTFD=y
104CONFIG_SHMEM=y 104CONFIG_SHMEM=y
105CONFIG_AIO=y
105# CONFIG_VM_EVENT_COUNTERS is not set 106# CONFIG_VM_EVENT_COUNTERS is not set
106CONFIG_SLUB_DEBUG=y 107CONFIG_SLUB_DEBUG=y
107# CONFIG_SLAB is not set 108# CONFIG_SLAB is not set
@@ -115,10 +116,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
115CONFIG_HAVE_KPROBES=y 116CONFIG_HAVE_KPROBES=y
116CONFIG_HAVE_KRETPROBES=y 117CONFIG_HAVE_KRETPROBES=y
117CONFIG_HAVE_ARCH_TRACEHOOK=y 118CONFIG_HAVE_ARCH_TRACEHOOK=y
118# CONFIG_HAVE_DMA_ATTRS is not set
119# CONFIG_USE_GENERIC_SMP_HELPERS is not set
120CONFIG_HAVE_CLK=y 119CONFIG_HAVE_CLK=y
121CONFIG_PROC_PAGE_MONITOR=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 120# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 121CONFIG_SLABINFO=y
124# CONFIG_TINY_SHMEM is not set 122# CONFIG_TINY_SHMEM is not set
@@ -144,6 +142,7 @@ CONFIG_DEFAULT_DEADLINE=y
144# CONFIG_DEFAULT_NOOP is not set 142# CONFIG_DEFAULT_NOOP is not set
145CONFIG_DEFAULT_IOSCHED="deadline" 143CONFIG_DEFAULT_IOSCHED="deadline"
146CONFIG_CLASSIC_RCU=y 144CONFIG_CLASSIC_RCU=y
145# CONFIG_FREEZER is not set
147 146
148# 147#
149# Platform support 148# Platform support
@@ -156,6 +155,7 @@ CONFIG_CPM1=y
156# CONFIG_MPC885ADS is not set 155# CONFIG_MPC885ADS is not set
157# CONFIG_PPC_EP88XC is not set 156# CONFIG_PPC_EP88XC is not set
158CONFIG_PPC_ADDER875=y 157CONFIG_PPC_ADDER875=y
158# CONFIG_PPC_MGSUVD is not set
159 159
160# 160#
161# MPC8xx CPM Options 161# MPC8xx CPM Options
@@ -184,6 +184,7 @@ CONFIG_NO_UCODE_PATCH=y
184# CONFIG_PPC_INDIRECT_IO is not set 184# CONFIG_PPC_INDIRECT_IO is not set
185# CONFIG_GENERIC_IOMAP is not set 185# CONFIG_GENERIC_IOMAP is not set
186# CONFIG_CPU_FREQ is not set 186# CONFIG_CPU_FREQ is not set
187# CONFIG_QUICC_ENGINE is not set
187# CONFIG_FSL_ULI1575 is not set 188# CONFIG_FSL_ULI1575 is not set
188CONFIG_CPM=y 189CONFIG_CPM=y
189 190
@@ -191,7 +192,6 @@ CONFIG_CPM=y
191# Kernel options 192# Kernel options
192# 193#
193# CONFIG_HIGHMEM is not set 194# CONFIG_HIGHMEM is not set
194# CONFIG_TICK_ONESHOT is not set
195# CONFIG_NO_HZ is not set 195# CONFIG_NO_HZ is not set
196# CONFIG_HIGH_RES_TIMERS is not set 196# CONFIG_HIGH_RES_TIMERS is not set
197CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 197CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -205,6 +205,8 @@ CONFIG_PREEMPT_NONE=y
205# CONFIG_PREEMPT_VOLUNTARY is not set 205# CONFIG_PREEMPT_VOLUNTARY is not set
206# CONFIG_PREEMPT is not set 206# CONFIG_PREEMPT is not set
207CONFIG_BINFMT_ELF=y 207CONFIG_BINFMT_ELF=y
208# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
209# CONFIG_HAVE_AOUT is not set
208# CONFIG_BINFMT_MISC is not set 210# CONFIG_BINFMT_MISC is not set
209# CONFIG_MATH_EMULATION is not set 211# CONFIG_MATH_EMULATION is not set
210# CONFIG_8XX_MINIMAL_FPEMU is not set 212# CONFIG_8XX_MINIMAL_FPEMU is not set
@@ -220,15 +222,15 @@ CONFIG_FLATMEM_MANUAL=y
220# CONFIG_SPARSEMEM_MANUAL is not set 222# CONFIG_SPARSEMEM_MANUAL is not set
221CONFIG_FLATMEM=y 223CONFIG_FLATMEM=y
222CONFIG_FLAT_NODE_MEM_MAP=y 224CONFIG_FLAT_NODE_MEM_MAP=y
223# CONFIG_SPARSEMEM_STATIC is not set
224# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
225CONFIG_PAGEFLAGS_EXTENDED=y 225CONFIG_PAGEFLAGS_EXTENDED=y
226CONFIG_SPLIT_PTLOCK_CPUS=4 226CONFIG_SPLIT_PTLOCK_CPUS=4
227CONFIG_MIGRATION=y 227CONFIG_MIGRATION=y
228# CONFIG_RESOURCES_64BIT is not set 228# CONFIG_RESOURCES_64BIT is not set
229# CONFIG_PHYS_ADDR_T_64BIT is not set
229CONFIG_ZONE_DMA_FLAG=1 230CONFIG_ZONE_DMA_FLAG=1
230CONFIG_BOUNCE=y 231CONFIG_BOUNCE=y
231CONFIG_VIRT_TO_BUS=y 232CONFIG_VIRT_TO_BUS=y
233CONFIG_UNEVICTABLE_LRU=y
232CONFIG_FORCE_MAX_ZONEORDER=11 234CONFIG_FORCE_MAX_ZONEORDER=11
233# CONFIG_PROC_DEVICETREE is not set 235# CONFIG_PROC_DEVICETREE is not set
234# CONFIG_CMDLINE_BOOL is not set 236# CONFIG_CMDLINE_BOOL is not set
@@ -310,6 +312,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
310# CONFIG_TIPC is not set 312# CONFIG_TIPC is not set
311# CONFIG_ATM is not set 313# CONFIG_ATM is not set
312# CONFIG_BRIDGE is not set 314# CONFIG_BRIDGE is not set
315# CONFIG_NET_DSA is not set
313# CONFIG_VLAN_8021Q is not set 316# CONFIG_VLAN_8021Q is not set
314# CONFIG_DECNET is not set 317# CONFIG_DECNET is not set
315# CONFIG_LLC2 is not set 318# CONFIG_LLC2 is not set
@@ -330,11 +333,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
330# CONFIG_IRDA is not set 333# CONFIG_IRDA is not set
331# CONFIG_BT is not set 334# CONFIG_BT is not set
332# CONFIG_AF_RXRPC is not set 335# CONFIG_AF_RXRPC is not set
333 336# CONFIG_PHONET is not set
334# 337CONFIG_WIRELESS=y
335# Wireless
336#
337# CONFIG_CFG80211 is not set 338# CONFIG_CFG80211 is not set
339CONFIG_WIRELESS_OLD_REGULATORY=y
338# CONFIG_WIRELESS_EXT is not set 340# CONFIG_WIRELESS_EXT is not set
339# CONFIG_MAC80211 is not set 341# CONFIG_MAC80211 is not set
340# CONFIG_IEEE80211 is not set 342# CONFIG_IEEE80211 is not set
@@ -476,6 +478,9 @@ CONFIG_MII=y
476# CONFIG_IBM_NEW_EMAC_RGMII is not set 478# CONFIG_IBM_NEW_EMAC_RGMII is not set
477# CONFIG_IBM_NEW_EMAC_TAH is not set 479# CONFIG_IBM_NEW_EMAC_TAH is not set
478# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 480# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
481# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
482# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
483# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
479# CONFIG_B44 is not set 484# CONFIG_B44 is not set
480CONFIG_FS_ENET=y 485CONFIG_FS_ENET=y
481# CONFIG_FS_ENET_HAS_SCC is not set 486# CONFIG_FS_ENET_HAS_SCC is not set
@@ -534,6 +539,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
534CONFIG_MOUSE_PS2_SYNAPTICS=y 539CONFIG_MOUSE_PS2_SYNAPTICS=y
535CONFIG_MOUSE_PS2_LIFEBOOK=y 540CONFIG_MOUSE_PS2_LIFEBOOK=y
536CONFIG_MOUSE_PS2_TRACKPOINT=y 541CONFIG_MOUSE_PS2_TRACKPOINT=y
542# CONFIG_MOUSE_PS2_ELANTECH is not set
537# CONFIG_MOUSE_PS2_TOUCHKIT is not set 543# CONFIG_MOUSE_PS2_TOUCHKIT is not set
538# CONFIG_MOUSE_SERIAL is not set 544# CONFIG_MOUSE_SERIAL is not set
539# CONFIG_MOUSE_VSXXXAA is not set 545# CONFIG_MOUSE_VSXXXAA is not set
@@ -573,12 +579,6 @@ CONFIG_SERIAL_CORE=y
573CONFIG_SERIAL_CORE_CONSOLE=y 579CONFIG_SERIAL_CORE_CONSOLE=y
574CONFIG_SERIAL_CPM=y 580CONFIG_SERIAL_CPM=y
575CONFIG_SERIAL_CPM_CONSOLE=y 581CONFIG_SERIAL_CPM_CONSOLE=y
576# CONFIG_SERIAL_CPM_SCC1 is not set
577# CONFIG_SERIAL_CPM_SCC2 is not set
578# CONFIG_SERIAL_CPM_SCC3 is not set
579# CONFIG_SERIAL_CPM_SCC4 is not set
580CONFIG_SERIAL_CPM_SMC1=y
581CONFIG_SERIAL_CPM_SMC2=y
582CONFIG_UNIX98_PTYS=y 582CONFIG_UNIX98_PTYS=y
583# CONFIG_LEGACY_PTYS is not set 583# CONFIG_LEGACY_PTYS is not set
584# CONFIG_IPMI_HANDLER is not set 584# CONFIG_IPMI_HANDLER is not set
@@ -614,6 +614,14 @@ CONFIG_SSB_POSSIBLE=y
614# CONFIG_MFD_TMIO is not set 614# CONFIG_MFD_TMIO is not set
615 615
616# 616#
617# Voltage and Current regulators
618#
619# CONFIG_REGULATOR is not set
620# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
621# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
622# CONFIG_REGULATOR_BQ24022 is not set
623
624#
617# Multimedia devices 625# Multimedia devices
618# 626#
619 627
@@ -652,16 +660,18 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
652# CONFIG_RTC_CLASS is not set 660# CONFIG_RTC_CLASS is not set
653# CONFIG_DMADEVICES is not set 661# CONFIG_DMADEVICES is not set
654# CONFIG_UIO is not set 662# CONFIG_UIO is not set
663# CONFIG_STAGING is not set
655 664
656# 665#
657# File systems 666# File systems
658# 667#
659# CONFIG_EXT2_FS is not set 668# CONFIG_EXT2_FS is not set
660# CONFIG_EXT3_FS is not set 669# CONFIG_EXT3_FS is not set
661# CONFIG_EXT4DEV_FS is not set 670# CONFIG_EXT4_FS is not set
662# CONFIG_REISERFS_FS is not set 671# CONFIG_REISERFS_FS is not set
663# CONFIG_JFS_FS is not set 672# CONFIG_JFS_FS is not set
664# CONFIG_FS_POSIX_ACL is not set 673# CONFIG_FS_POSIX_ACL is not set
674CONFIG_FILE_LOCKING=y
665# CONFIG_XFS_FS is not set 675# CONFIG_XFS_FS is not set
666# CONFIG_OCFS2_FS is not set 676# CONFIG_OCFS2_FS is not set
667# CONFIG_DNOTIFY is not set 677# CONFIG_DNOTIFY is not set
@@ -690,6 +700,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
690CONFIG_PROC_FS=y 700CONFIG_PROC_FS=y
691# CONFIG_PROC_KCORE is not set 701# CONFIG_PROC_KCORE is not set
692CONFIG_PROC_SYSCTL=y 702CONFIG_PROC_SYSCTL=y
703CONFIG_PROC_PAGE_MONITOR=y
693CONFIG_SYSFS=y 704CONFIG_SYSFS=y
694CONFIG_TMPFS=y 705CONFIG_TMPFS=y
695# CONFIG_TMPFS_POSIX_ACL is not set 706# CONFIG_TMPFS_POSIX_ACL is not set
@@ -727,6 +738,7 @@ CONFIG_LOCKD=y
727CONFIG_LOCKD_V4=y 738CONFIG_LOCKD_V4=y
728CONFIG_NFS_COMMON=y 739CONFIG_NFS_COMMON=y
729CONFIG_SUNRPC=y 740CONFIG_SUNRPC=y
741# CONFIG_SUNRPC_REGISTER_V4 is not set
730# CONFIG_RPCSEC_GSS_KRB5 is not set 742# CONFIG_RPCSEC_GSS_KRB5 is not set
731# CONFIG_RPCSEC_GSS_SPKM3 is not set 743# CONFIG_RPCSEC_GSS_SPKM3 is not set
732# CONFIG_SMB_FS is not set 744# CONFIG_SMB_FS is not set
@@ -762,7 +774,6 @@ CONFIG_MSDOS_PARTITION=y
762# 774#
763# Library routines 775# Library routines
764# 776#
765# CONFIG_GENERIC_FIND_FIRST_BIT is not set
766# CONFIG_CRC_CCITT is not set 777# CONFIG_CRC_CCITT is not set
767# CONFIG_CRC16 is not set 778# CONFIG_CRC16 is not set
768# CONFIG_CRC_T10DIF is not set 779# CONFIG_CRC_T10DIF is not set
@@ -812,14 +823,22 @@ CONFIG_DEBUG_INFO=y
812# CONFIG_DEBUG_SG is not set 823# CONFIG_DEBUG_SG is not set
813# CONFIG_BOOT_PRINTK_DELAY is not set 824# CONFIG_BOOT_PRINTK_DELAY is not set
814# CONFIG_RCU_TORTURE_TEST is not set 825# CONFIG_RCU_TORTURE_TEST is not set
826# CONFIG_RCU_CPU_STALL_DETECTOR is not set
815# CONFIG_BACKTRACE_SELF_TEST is not set 827# CONFIG_BACKTRACE_SELF_TEST is not set
828# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
816# CONFIG_FAULT_INJECTION is not set 829# CONFIG_FAULT_INJECTION is not set
817# CONFIG_LATENCYTOP is not set 830# CONFIG_LATENCYTOP is not set
818CONFIG_HAVE_FTRACE=y 831CONFIG_HAVE_FUNCTION_TRACER=y
819CONFIG_HAVE_DYNAMIC_FTRACE=y 832
820# CONFIG_FTRACE is not set 833#
834# Tracers
835#
836# CONFIG_FUNCTION_TRACER is not set
821# CONFIG_SCHED_TRACER is not set 837# CONFIG_SCHED_TRACER is not set
822# CONFIG_CONTEXT_SWITCH_TRACER is not set 838# CONFIG_CONTEXT_SWITCH_TRACER is not set
839# CONFIG_BOOT_TRACER is not set
840# CONFIG_STACK_TRACER is not set
841# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
823# CONFIG_SAMPLES is not set 842# CONFIG_SAMPLES is not set
824CONFIG_HAVE_ARCH_KGDB=y 843CONFIG_HAVE_ARCH_KGDB=y
825# CONFIG_KGDB is not set 844# CONFIG_KGDB is not set
@@ -828,6 +847,7 @@ CONFIG_HAVE_ARCH_KGDB=y
828# CONFIG_DEBUG_PAGEALLOC is not set 847# CONFIG_DEBUG_PAGEALLOC is not set
829# CONFIG_CODE_PATCHING_SELFTEST is not set 848# CONFIG_CODE_PATCHING_SELFTEST is not set
830# CONFIG_FTR_FIXUP_SELFTEST is not set 849# CONFIG_FTR_FIXUP_SELFTEST is not set
850# CONFIG_MSI_BITMAP_SELFTEST is not set
831# CONFIG_XMON is not set 851# CONFIG_XMON is not set
832# CONFIG_IRQSTACKS is not set 852# CONFIG_IRQSTACKS is not set
833# CONFIG_VIRQ_DEBUG is not set 853# CONFIG_VIRQ_DEBUG is not set
@@ -839,6 +859,7 @@ CONFIG_HAVE_ARCH_KGDB=y
839# 859#
840# CONFIG_KEYS is not set 860# CONFIG_KEYS is not set
841# CONFIG_SECURITY is not set 861# CONFIG_SECURITY is not set
862# CONFIG_SECURITYFS is not set
842# CONFIG_SECURITY_FILE_CAPABILITIES is not set 863# CONFIG_SECURITY_FILE_CAPABILITIES is not set
843# CONFIG_CRYPTO is not set 864# CONFIG_CRYPTO is not set
844CONFIG_PPC_CLOCK=y 865CONFIG_PPC_CLOCK=y
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig
index c16521ffb477..5078594cd1f5 100644
--- a/arch/powerpc/configs/c2k_defconfig
+++ b/arch/powerpc/configs/c2k_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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:02 2008 4# Sat Nov 8 12:39:34 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_CHECK_CACHE_COHERENCY=y 24CONFIG_CHECK_CACHE_COHERENCY=y
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -114,7 +114,9 @@ CONFIG_SIGNALFD=y
114CONFIG_TIMERFD=y 114CONFIG_TIMERFD=y
115CONFIG_EVENTFD=y 115CONFIG_EVENTFD=y
116CONFIG_SHMEM=y 116CONFIG_SHMEM=y
117CONFIG_AIO=y
117CONFIG_VM_EVENT_COUNTERS=y 118CONFIG_VM_EVENT_COUNTERS=y
119CONFIG_PCI_QUIRKS=y
118CONFIG_SLUB_DEBUG=y 120CONFIG_SLUB_DEBUG=y
119# CONFIG_SLAB is not set 121# CONFIG_SLAB is not set
120CONFIG_SLUB=y 122CONFIG_SLUB=y
@@ -130,10 +132,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
130CONFIG_HAVE_KPROBES=y 132CONFIG_HAVE_KPROBES=y
131CONFIG_HAVE_KRETPROBES=y 133CONFIG_HAVE_KRETPROBES=y
132CONFIG_HAVE_ARCH_TRACEHOOK=y 134CONFIG_HAVE_ARCH_TRACEHOOK=y
133# CONFIG_HAVE_DMA_ATTRS is not set
134# CONFIG_USE_GENERIC_SMP_HELPERS is not set
135# CONFIG_HAVE_CLK is not set
136CONFIG_PROC_PAGE_MONITOR=y
137# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 135# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
138CONFIG_SLABINFO=y 136CONFIG_SLABINFO=y
139CONFIG_RT_MUTEXES=y 137CONFIG_RT_MUTEXES=y
@@ -166,6 +164,7 @@ CONFIG_DEFAULT_CFQ=y
166# CONFIG_DEFAULT_NOOP is not set 164# CONFIG_DEFAULT_NOOP is not set
167CONFIG_DEFAULT_IOSCHED="cfq" 165CONFIG_DEFAULT_IOSCHED="cfq"
168CONFIG_CLASSIC_RCU=y 166CONFIG_CLASSIC_RCU=y
167# CONFIG_FREEZER is not set
169 168
170# 169#
171# Platform support 170# Platform support
@@ -227,7 +226,6 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=m
227# Kernel options 226# Kernel options
228# 227#
229CONFIG_HIGHMEM=y 228CONFIG_HIGHMEM=y
230# CONFIG_TICK_ONESHOT is not set
231# CONFIG_NO_HZ is not set 229# CONFIG_NO_HZ is not set
232# CONFIG_HIGH_RES_TIMERS is not set 230# CONFIG_HIGH_RES_TIMERS is not set
233CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 231CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -241,6 +239,8 @@ CONFIG_HZ=250
241CONFIG_PREEMPT_VOLUNTARY=y 239CONFIG_PREEMPT_VOLUNTARY=y
242# CONFIG_PREEMPT is not set 240# CONFIG_PREEMPT is not set
243CONFIG_BINFMT_ELF=y 241CONFIG_BINFMT_ELF=y
242# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
243# CONFIG_HAVE_AOUT is not set
244CONFIG_BINFMT_MISC=y 244CONFIG_BINFMT_MISC=y
245# CONFIG_IOMMU_HELPER is not set 245# CONFIG_IOMMU_HELPER is not set
246CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 246CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -255,15 +255,15 @@ CONFIG_FLATMEM_MANUAL=y
255# CONFIG_SPARSEMEM_MANUAL is not set 255# CONFIG_SPARSEMEM_MANUAL is not set
256CONFIG_FLATMEM=y 256CONFIG_FLATMEM=y
257CONFIG_FLAT_NODE_MEM_MAP=y 257CONFIG_FLAT_NODE_MEM_MAP=y
258# CONFIG_SPARSEMEM_STATIC is not set
259# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
260CONFIG_PAGEFLAGS_EXTENDED=y 258CONFIG_PAGEFLAGS_EXTENDED=y
261CONFIG_SPLIT_PTLOCK_CPUS=4 259CONFIG_SPLIT_PTLOCK_CPUS=4
262CONFIG_MIGRATION=y 260CONFIG_MIGRATION=y
263# CONFIG_RESOURCES_64BIT is not set 261# CONFIG_RESOURCES_64BIT is not set
262# CONFIG_PHYS_ADDR_T_64BIT is not set
264CONFIG_ZONE_DMA_FLAG=1 263CONFIG_ZONE_DMA_FLAG=1
265CONFIG_BOUNCE=y 264CONFIG_BOUNCE=y
266CONFIG_VIRT_TO_BUS=y 265CONFIG_VIRT_TO_BUS=y
266CONFIG_UNEVICTABLE_LRU=y
267CONFIG_FORCE_MAX_ZONEORDER=11 267CONFIG_FORCE_MAX_ZONEORDER=11
268# CONFIG_PROC_DEVICETREE is not set 268# CONFIG_PROC_DEVICETREE is not set
269# CONFIG_CMDLINE_BOOL is not set 269# CONFIG_CMDLINE_BOOL is not set
@@ -285,7 +285,7 @@ CONFIG_PCI_SYSCALL=y
285# CONFIG_PCIEPORTBUS is not set 285# CONFIG_PCIEPORTBUS is not set
286CONFIG_ARCH_SUPPORTS_MSI=y 286CONFIG_ARCH_SUPPORTS_MSI=y
287CONFIG_PCI_MSI=y 287CONFIG_PCI_MSI=y
288CONFIG_PCI_LEGACY=y 288# CONFIG_PCI_LEGACY is not set
289# CONFIG_PCI_DEBUG is not set 289# CONFIG_PCI_DEBUG is not set
290# CONFIG_PCCARD is not set 290# CONFIG_PCCARD is not set
291CONFIG_HOTPLUG_PCI=y 291CONFIG_HOTPLUG_PCI=y
@@ -361,36 +361,6 @@ CONFIG_INET_TCP_DIAG=y
361CONFIG_TCP_CONG_CUBIC=y 361CONFIG_TCP_CONG_CUBIC=y
362CONFIG_DEFAULT_TCP_CONG="cubic" 362CONFIG_DEFAULT_TCP_CONG="cubic"
363# CONFIG_TCP_MD5SIG is not set 363# CONFIG_TCP_MD5SIG is not set
364CONFIG_IP_VS=m
365# CONFIG_IP_VS_DEBUG is not set
366CONFIG_IP_VS_TAB_BITS=12
367
368#
369# IPVS transport protocol load balancing support
370#
371CONFIG_IP_VS_PROTO_TCP=y
372CONFIG_IP_VS_PROTO_UDP=y
373CONFIG_IP_VS_PROTO_ESP=y
374CONFIG_IP_VS_PROTO_AH=y
375
376#
377# IPVS scheduler
378#
379CONFIG_IP_VS_RR=m
380CONFIG_IP_VS_WRR=m
381CONFIG_IP_VS_LC=m
382CONFIG_IP_VS_WLC=m
383CONFIG_IP_VS_LBLC=m
384CONFIG_IP_VS_LBLCR=m
385CONFIG_IP_VS_DH=m
386CONFIG_IP_VS_SH=m
387CONFIG_IP_VS_SED=m
388CONFIG_IP_VS_NQ=m
389
390#
391# IPVS application helper
392#
393CONFIG_IP_VS_FTP=m
394CONFIG_IPV6=m 364CONFIG_IPV6=m
395CONFIG_IPV6_PRIVACY=y 365CONFIG_IPV6_PRIVACY=y
396# CONFIG_IPV6_ROUTER_PREF is not set 366# CONFIG_IPV6_ROUTER_PREF is not set
@@ -427,8 +397,8 @@ CONFIG_NETFILTER_XTABLES=m
427# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set 397# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
428# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 398# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
429# CONFIG_NETFILTER_XT_TARGET_MARK is not set 399# CONFIG_NETFILTER_XT_TARGET_MARK is not set
430# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
431# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 400# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
401# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
432# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set 402# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
433# CONFIG_NETFILTER_XT_TARGET_TRACE is not set 403# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
434# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set 404# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set
@@ -438,37 +408,70 @@ CONFIG_NETFILTER_XTABLES=m
438# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 408# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
439# CONFIG_NETFILTER_XT_MATCH_DSCP is not set 409# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
440# CONFIG_NETFILTER_XT_MATCH_ESP is not set 410# CONFIG_NETFILTER_XT_MATCH_ESP is not set
411# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
441# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set 412# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
442# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set 413# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
443# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set 414# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
444# CONFIG_NETFILTER_XT_MATCH_MAC is not set 415# CONFIG_NETFILTER_XT_MATCH_MAC is not set
445# CONFIG_NETFILTER_XT_MATCH_MARK is not set 416# CONFIG_NETFILTER_XT_MATCH_MARK is not set
417# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
446# CONFIG_NETFILTER_XT_MATCH_OWNER is not set 418# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
447# CONFIG_NETFILTER_XT_MATCH_POLICY is not set 419# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
448# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
449# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set 420# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
450# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set 421# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
451# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 422# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
452# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set 423# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
453# CONFIG_NETFILTER_XT_MATCH_REALM is not set 424# CONFIG_NETFILTER_XT_MATCH_REALM is not set
425# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
454# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 426# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
455# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 427# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
456# CONFIG_NETFILTER_XT_MATCH_STRING is not set 428# CONFIG_NETFILTER_XT_MATCH_STRING is not set
457# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set 429# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
458# CONFIG_NETFILTER_XT_MATCH_TIME is not set 430# CONFIG_NETFILTER_XT_MATCH_TIME is not set
459# CONFIG_NETFILTER_XT_MATCH_U32 is not set 431# CONFIG_NETFILTER_XT_MATCH_U32 is not set
460# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 432CONFIG_IP_VS=m
433# CONFIG_IP_VS_IPV6 is not set
434# CONFIG_IP_VS_DEBUG is not set
435CONFIG_IP_VS_TAB_BITS=12
436
437#
438# IPVS transport protocol load balancing support
439#
440CONFIG_IP_VS_PROTO_TCP=y
441CONFIG_IP_VS_PROTO_UDP=y
442CONFIG_IP_VS_PROTO_AH_ESP=y
443CONFIG_IP_VS_PROTO_ESP=y
444CONFIG_IP_VS_PROTO_AH=y
445
446#
447# IPVS scheduler
448#
449CONFIG_IP_VS_RR=m
450CONFIG_IP_VS_WRR=m
451CONFIG_IP_VS_LC=m
452CONFIG_IP_VS_WLC=m
453CONFIG_IP_VS_LBLC=m
454CONFIG_IP_VS_LBLCR=m
455CONFIG_IP_VS_DH=m
456CONFIG_IP_VS_SH=m
457CONFIG_IP_VS_SED=m
458CONFIG_IP_VS_NQ=m
459
460#
461# IPVS application helper
462#
463CONFIG_IP_VS_FTP=m
461 464
462# 465#
463# IP: Netfilter Configuration 466# IP: Netfilter Configuration
464# 467#
468# CONFIG_NF_DEFRAG_IPV4 is not set
465CONFIG_IP_NF_QUEUE=m 469CONFIG_IP_NF_QUEUE=m
466CONFIG_IP_NF_IPTABLES=m 470CONFIG_IP_NF_IPTABLES=m
467CONFIG_IP_NF_MATCH_RECENT=m 471CONFIG_IP_NF_MATCH_ADDRTYPE=m
468CONFIG_IP_NF_MATCH_ECN=m
469# CONFIG_IP_NF_MATCH_AH is not set 472# CONFIG_IP_NF_MATCH_AH is not set
473CONFIG_IP_NF_MATCH_ECN=m
470CONFIG_IP_NF_MATCH_TTL=m 474CONFIG_IP_NF_MATCH_TTL=m
471CONFIG_IP_NF_MATCH_ADDRTYPE=m
472CONFIG_IP_NF_FILTER=m 475CONFIG_IP_NF_FILTER=m
473CONFIG_IP_NF_TARGET_REJECT=m 476CONFIG_IP_NF_TARGET_REJECT=m
474CONFIG_IP_NF_TARGET_LOG=m 477CONFIG_IP_NF_TARGET_LOG=m
@@ -487,25 +490,21 @@ CONFIG_IP_NF_ARP_MANGLE=m
487# 490#
488# CONFIG_IP6_NF_QUEUE is not set 491# CONFIG_IP6_NF_QUEUE is not set
489CONFIG_IP6_NF_IPTABLES=m 492CONFIG_IP6_NF_IPTABLES=m
490CONFIG_IP6_NF_MATCH_RT=m 493# CONFIG_IP6_NF_MATCH_AH is not set
491CONFIG_IP6_NF_MATCH_OPTS=m 494CONFIG_IP6_NF_MATCH_EUI64=m
492CONFIG_IP6_NF_MATCH_FRAG=m 495CONFIG_IP6_NF_MATCH_FRAG=m
496CONFIG_IP6_NF_MATCH_OPTS=m
493CONFIG_IP6_NF_MATCH_HL=m 497CONFIG_IP6_NF_MATCH_HL=m
494CONFIG_IP6_NF_MATCH_IPV6HEADER=m 498CONFIG_IP6_NF_MATCH_IPV6HEADER=m
495# CONFIG_IP6_NF_MATCH_AH is not set
496# CONFIG_IP6_NF_MATCH_MH is not set 499# CONFIG_IP6_NF_MATCH_MH is not set
497CONFIG_IP6_NF_MATCH_EUI64=m 500CONFIG_IP6_NF_MATCH_RT=m
498CONFIG_IP6_NF_FILTER=m
499CONFIG_IP6_NF_TARGET_LOG=m 501CONFIG_IP6_NF_TARGET_LOG=m
502CONFIG_IP6_NF_FILTER=m
500# CONFIG_IP6_NF_TARGET_REJECT is not set 503# CONFIG_IP6_NF_TARGET_REJECT is not set
501CONFIG_IP6_NF_MANGLE=m 504CONFIG_IP6_NF_MANGLE=m
502# CONFIG_IP6_NF_TARGET_HL is not set 505# CONFIG_IP6_NF_TARGET_HL is not set
503CONFIG_IP6_NF_RAW=m 506CONFIG_IP6_NF_RAW=m
504# CONFIG_IP6_NF_SECURITY is not set 507# CONFIG_IP6_NF_SECURITY is not set
505
506#
507# Bridge: Netfilter Configuration
508#
509CONFIG_BRIDGE_NF_EBTABLES=m 508CONFIG_BRIDGE_NF_EBTABLES=m
510CONFIG_BRIDGE_EBT_BROUTE=m 509CONFIG_BRIDGE_EBT_BROUTE=m
511CONFIG_BRIDGE_EBT_T_FILTER=m 510CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -545,6 +544,7 @@ CONFIG_ATM_BR2684=m
545# CONFIG_ATM_BR2684_IPFILTER is not set 544# CONFIG_ATM_BR2684_IPFILTER is not set
546CONFIG_STP=m 545CONFIG_STP=m
547CONFIG_BRIDGE=m 546CONFIG_BRIDGE=m
547# CONFIG_NET_DSA is not set
548CONFIG_VLAN_8021Q=m 548CONFIG_VLAN_8021Q=m
549# CONFIG_VLAN_8021Q_GVRP is not set 549# CONFIG_VLAN_8021Q_GVRP is not set
550# CONFIG_DECNET is not set 550# CONFIG_DECNET is not set
@@ -566,6 +566,7 @@ CONFIG_NET_SCH_HTB=m
566CONFIG_NET_SCH_HFSC=m 566CONFIG_NET_SCH_HFSC=m
567CONFIG_NET_SCH_ATM=m 567CONFIG_NET_SCH_ATM=m
568CONFIG_NET_SCH_PRIO=m 568CONFIG_NET_SCH_PRIO=m
569# CONFIG_NET_SCH_MULTIQ is not set
569CONFIG_NET_SCH_RED=m 570CONFIG_NET_SCH_RED=m
570CONFIG_NET_SCH_SFQ=m 571CONFIG_NET_SCH_SFQ=m
571CONFIG_NET_SCH_TEQL=m 572CONFIG_NET_SCH_TEQL=m
@@ -627,12 +628,11 @@ CONFIG_BT_HCIBCM203X=m
627CONFIG_BT_HCIBFUSB=m 628CONFIG_BT_HCIBFUSB=m
628CONFIG_BT_HCIVHCI=m 629CONFIG_BT_HCIVHCI=m
629# CONFIG_AF_RXRPC is not set 630# CONFIG_AF_RXRPC is not set
631# CONFIG_PHONET is not set
630CONFIG_FIB_RULES=y 632CONFIG_FIB_RULES=y
631 633CONFIG_WIRELESS=y
632#
633# Wireless
634#
635# CONFIG_CFG80211 is not set 634# CONFIG_CFG80211 is not set
635CONFIG_WIRELESS_OLD_REGULATORY=y
636CONFIG_WIRELESS_EXT=y 636CONFIG_WIRELESS_EXT=y
637CONFIG_WIRELESS_EXT_SYSFS=y 637CONFIG_WIRELESS_EXT_SYSFS=y
638# CONFIG_MAC80211 is not set 638# CONFIG_MAC80211 is not set
@@ -910,8 +910,12 @@ CONFIG_MII=y
910# CONFIG_IBM_NEW_EMAC_RGMII is not set 910# CONFIG_IBM_NEW_EMAC_RGMII is not set
911# CONFIG_IBM_NEW_EMAC_TAH is not set 911# CONFIG_IBM_NEW_EMAC_TAH is not set
912# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 912# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
913# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
914# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
915# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
913# CONFIG_NET_PCI is not set 916# CONFIG_NET_PCI is not set
914# CONFIG_B44 is not set 917# CONFIG_B44 is not set
918# CONFIG_ATL2 is not set
915CONFIG_NETDEV_1000=y 919CONFIG_NETDEV_1000=y
916# CONFIG_ACENIC is not set 920# CONFIG_ACENIC is not set
917# CONFIG_DL2K is not set 921# CONFIG_DL2K is not set
@@ -933,6 +937,7 @@ CONFIG_MV643XX_ETH=y
933# CONFIG_QLA3XXX is not set 937# CONFIG_QLA3XXX is not set
934# CONFIG_ATL1 is not set 938# CONFIG_ATL1 is not set
935# CONFIG_ATL1E is not set 939# CONFIG_ATL1E is not set
940# CONFIG_JME is not set
936# CONFIG_NETDEV_10000 is not set 941# CONFIG_NETDEV_10000 is not set
937# CONFIG_TR is not set 942# CONFIG_TR is not set
938 943
@@ -998,6 +1003,7 @@ CONFIG_INPUT_MISC=y
998# CONFIG_INPUT_KEYSPAN_REMOTE is not set 1003# CONFIG_INPUT_KEYSPAN_REMOTE is not set
999# CONFIG_INPUT_POWERMATE is not set 1004# CONFIG_INPUT_POWERMATE is not set
1000# CONFIG_INPUT_YEALINK is not set 1005# CONFIG_INPUT_YEALINK is not set
1006# CONFIG_INPUT_CM109 is not set
1001CONFIG_INPUT_UINPUT=m 1007CONFIG_INPUT_UINPUT=m
1002 1008
1003# 1009#
@@ -1226,6 +1232,16 @@ CONFIG_SSB_POSSIBLE=y
1226# CONFIG_MFD_SM501 is not set 1232# CONFIG_MFD_SM501 is not set
1227# CONFIG_HTC_PASIC3 is not set 1233# CONFIG_HTC_PASIC3 is not set
1228# CONFIG_MFD_TMIO is not set 1234# CONFIG_MFD_TMIO is not set
1235# CONFIG_MFD_WM8400 is not set
1236# CONFIG_MFD_WM8350_I2C is not set
1237
1238#
1239# Voltage and Current regulators
1240#
1241# CONFIG_REGULATOR is not set
1242# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1243# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1244# CONFIG_REGULATOR_BQ24022 is not set
1229 1245
1230# 1246#
1231# Multimedia devices 1247# Multimedia devices
@@ -1283,6 +1299,8 @@ CONFIG_USB_DEVICEFS=y
1283CONFIG_USB_SUSPEND=y 1299CONFIG_USB_SUSPEND=y
1284# CONFIG_USB_OTG is not set 1300# CONFIG_USB_OTG is not set
1285CONFIG_USB_MON=y 1301CONFIG_USB_MON=y
1302# CONFIG_USB_WUSB is not set
1303# CONFIG_USB_WUSB_CBAF is not set
1286 1304
1287# 1305#
1288# USB Host Controller Drivers 1306# USB Host Controller Drivers
@@ -1305,6 +1323,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1305CONFIG_USB_UHCI_HCD=m 1323CONFIG_USB_UHCI_HCD=m
1306# CONFIG_USB_SL811_HCD is not set 1324# CONFIG_USB_SL811_HCD is not set
1307# CONFIG_USB_R8A66597_HCD is not set 1325# CONFIG_USB_R8A66597_HCD is not set
1326# CONFIG_USB_WHCI_HCD is not set
1327# CONFIG_USB_HWA_HCD is not set
1308 1328
1309# 1329#
1310# Enable Host or Gadget support to see Inventra options 1330# Enable Host or Gadget support to see Inventra options
@@ -1316,6 +1336,7 @@ CONFIG_USB_UHCI_HCD=m
1316CONFIG_USB_ACM=m 1336CONFIG_USB_ACM=m
1317CONFIG_USB_PRINTER=m 1337CONFIG_USB_PRINTER=m
1318# CONFIG_USB_WDM is not set 1338# CONFIG_USB_WDM is not set
1339# CONFIG_USB_TMC is not set
1319 1340
1320# 1341#
1321# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1342# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1337,7 +1358,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
1337# CONFIG_USB_STORAGE_ALAUDA is not set 1358# CONFIG_USB_STORAGE_ALAUDA is not set
1338# CONFIG_USB_STORAGE_ONETOUCH is not set 1359# CONFIG_USB_STORAGE_ONETOUCH is not set
1339# CONFIG_USB_STORAGE_KARMA is not set 1360# CONFIG_USB_STORAGE_KARMA is not set
1340# CONFIG_USB_STORAGE_SIERRA is not set
1341# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1361# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1342# CONFIG_USB_LIBUSUAL is not set 1362# CONFIG_USB_LIBUSUAL is not set
1343 1363
@@ -1413,6 +1433,7 @@ CONFIG_USB_SERIAL_OMNINET=m
1413CONFIG_USB_EMI62=m 1433CONFIG_USB_EMI62=m
1414# CONFIG_USB_EMI26 is not set 1434# CONFIG_USB_EMI26 is not set
1415# CONFIG_USB_ADUTUX is not set 1435# CONFIG_USB_ADUTUX is not set
1436# CONFIG_USB_SEVSEG is not set
1416CONFIG_USB_RIO500=m 1437CONFIG_USB_RIO500=m
1417CONFIG_USB_LEGOTOWER=m 1438CONFIG_USB_LEGOTOWER=m
1418CONFIG_USB_LCD=m 1439CONFIG_USB_LCD=m
@@ -1430,12 +1451,14 @@ CONFIG_USB_LED=m
1430# CONFIG_USB_IOWARRIOR is not set 1451# CONFIG_USB_IOWARRIOR is not set
1431CONFIG_USB_TEST=m 1452CONFIG_USB_TEST=m
1432# CONFIG_USB_ISIGHTFW is not set 1453# CONFIG_USB_ISIGHTFW is not set
1454# CONFIG_USB_VST is not set
1433CONFIG_USB_ATM=m 1455CONFIG_USB_ATM=m
1434CONFIG_USB_SPEEDTOUCH=m 1456CONFIG_USB_SPEEDTOUCH=m
1435# CONFIG_USB_CXACRU is not set 1457# CONFIG_USB_CXACRU is not set
1436# CONFIG_USB_UEAGLEATM is not set 1458# CONFIG_USB_UEAGLEATM is not set
1437# CONFIG_USB_XUSBATM is not set 1459# CONFIG_USB_XUSBATM is not set
1438# CONFIG_USB_GADGET is not set 1460# CONFIG_USB_GADGET is not set
1461# CONFIG_UWB is not set
1439# CONFIG_MMC is not set 1462# CONFIG_MMC is not set
1440# CONFIG_MEMSTICK is not set 1463# CONFIG_MEMSTICK is not set
1441# CONFIG_NEW_LEDS is not set 1464# CONFIG_NEW_LEDS is not set
@@ -1464,8 +1487,8 @@ CONFIG_DMADEVICES=y
1464# 1487#
1465# DMA Devices 1488# DMA Devices
1466# 1489#
1467# CONFIG_FSL_DMA is not set
1468# CONFIG_UIO is not set 1490# CONFIG_UIO is not set
1491# CONFIG_STAGING is not set
1469 1492
1470# 1493#
1471# File systems 1494# File systems
@@ -1475,12 +1498,13 @@ CONFIG_EXT3_FS=m
1475CONFIG_EXT3_FS_XATTR=y 1498CONFIG_EXT3_FS_XATTR=y
1476CONFIG_EXT3_FS_POSIX_ACL=y 1499CONFIG_EXT3_FS_POSIX_ACL=y
1477CONFIG_EXT3_FS_SECURITY=y 1500CONFIG_EXT3_FS_SECURITY=y
1478# CONFIG_EXT4DEV_FS is not set 1501# CONFIG_EXT4_FS is not set
1479CONFIG_JBD=m 1502CONFIG_JBD=m
1480CONFIG_FS_MBCACHE=m 1503CONFIG_FS_MBCACHE=m
1481# CONFIG_REISERFS_FS is not set 1504# CONFIG_REISERFS_FS is not set
1482# CONFIG_JFS_FS is not set 1505# CONFIG_JFS_FS is not set
1483CONFIG_FS_POSIX_ACL=y 1506CONFIG_FS_POSIX_ACL=y
1507CONFIG_FILE_LOCKING=y
1484# CONFIG_XFS_FS is not set 1508# CONFIG_XFS_FS is not set
1485# CONFIG_OCFS2_FS is not set 1509# CONFIG_OCFS2_FS is not set
1486CONFIG_DNOTIFY=y 1510CONFIG_DNOTIFY=y
@@ -1519,6 +1543,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
1519CONFIG_PROC_FS=y 1543CONFIG_PROC_FS=y
1520CONFIG_PROC_KCORE=y 1544CONFIG_PROC_KCORE=y
1521CONFIG_PROC_SYSCTL=y 1545CONFIG_PROC_SYSCTL=y
1546CONFIG_PROC_PAGE_MONITOR=y
1522CONFIG_SYSFS=y 1547CONFIG_SYSFS=y
1523CONFIG_TMPFS=y 1548CONFIG_TMPFS=y
1524# CONFIG_TMPFS_POSIX_ACL is not set 1549# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1570,12 +1595,14 @@ CONFIG_NFS_COMMON=y
1570CONFIG_SUNRPC=y 1595CONFIG_SUNRPC=y
1571CONFIG_SUNRPC_GSS=y 1596CONFIG_SUNRPC_GSS=y
1572CONFIG_SUNRPC_XPRT_RDMA=m 1597CONFIG_SUNRPC_XPRT_RDMA=m
1598# CONFIG_SUNRPC_REGISTER_V4 is not set
1573CONFIG_RPCSEC_GSS_KRB5=y 1599CONFIG_RPCSEC_GSS_KRB5=y
1574CONFIG_RPCSEC_GSS_SPKM3=m 1600CONFIG_RPCSEC_GSS_SPKM3=m
1575# CONFIG_SMB_FS is not set 1601# CONFIG_SMB_FS is not set
1576CONFIG_CIFS=m 1602CONFIG_CIFS=m
1577# CONFIG_CIFS_STATS is not set 1603# CONFIG_CIFS_STATS is not set
1578# CONFIG_CIFS_WEAK_PW_HASH is not set 1604# CONFIG_CIFS_WEAK_PW_HASH is not set
1605# CONFIG_CIFS_UPCALL is not set
1579CONFIG_CIFS_XATTR=y 1606CONFIG_CIFS_XATTR=y
1580CONFIG_CIFS_POSIX=y 1607CONFIG_CIFS_POSIX=y
1581# CONFIG_CIFS_DEBUG2 is not set 1608# CONFIG_CIFS_DEBUG2 is not set
@@ -1651,7 +1678,6 @@ CONFIG_NLS_UTF8=m
1651# Library routines 1678# Library routines
1652# 1679#
1653CONFIG_BITREVERSE=y 1680CONFIG_BITREVERSE=y
1654# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1655CONFIG_CRC_CCITT=m 1681CONFIG_CRC_CCITT=m
1656# CONFIG_CRC16 is not set 1682# CONFIG_CRC16 is not set
1657CONFIG_CRC_T10DIF=m 1683CONFIG_CRC_T10DIF=m
@@ -1707,17 +1733,25 @@ CONFIG_DEBUG_MEMORY_INIT=y
1707# CONFIG_DEBUG_SG is not set 1733# CONFIG_DEBUG_SG is not set
1708# CONFIG_BOOT_PRINTK_DELAY is not set 1734# CONFIG_BOOT_PRINTK_DELAY is not set
1709# CONFIG_RCU_TORTURE_TEST is not set 1735# CONFIG_RCU_TORTURE_TEST is not set
1736# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1710# CONFIG_KPROBES_SANITY_TEST is not set 1737# CONFIG_KPROBES_SANITY_TEST is not set
1711# CONFIG_BACKTRACE_SELF_TEST is not set 1738# CONFIG_BACKTRACE_SELF_TEST is not set
1739# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1712# CONFIG_LKDTM is not set 1740# CONFIG_LKDTM is not set
1713# CONFIG_FAULT_INJECTION is not set 1741# CONFIG_FAULT_INJECTION is not set
1714# CONFIG_LATENCYTOP is not set 1742# CONFIG_LATENCYTOP is not set
1715CONFIG_SYSCTL_SYSCALL_CHECK=y 1743CONFIG_SYSCTL_SYSCALL_CHECK=y
1716CONFIG_HAVE_FTRACE=y 1744CONFIG_HAVE_FUNCTION_TRACER=y
1717CONFIG_HAVE_DYNAMIC_FTRACE=y 1745
1718# CONFIG_FTRACE is not set 1746#
1747# Tracers
1748#
1749# CONFIG_FUNCTION_TRACER is not set
1719# CONFIG_SCHED_TRACER is not set 1750# CONFIG_SCHED_TRACER is not set
1720# CONFIG_CONTEXT_SWITCH_TRACER is not set 1751# CONFIG_CONTEXT_SWITCH_TRACER is not set
1752# CONFIG_BOOT_TRACER is not set
1753# CONFIG_STACK_TRACER is not set
1754# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1721# CONFIG_SAMPLES is not set 1755# CONFIG_SAMPLES is not set
1722CONFIG_HAVE_ARCH_KGDB=y 1756CONFIG_HAVE_ARCH_KGDB=y
1723# CONFIG_KGDB is not set 1757# CONFIG_KGDB is not set
@@ -1726,6 +1760,7 @@ CONFIG_DEBUG_STACK_USAGE=y
1726# CONFIG_DEBUG_PAGEALLOC is not set 1760# CONFIG_DEBUG_PAGEALLOC is not set
1727# CONFIG_CODE_PATCHING_SELFTEST is not set 1761# CONFIG_CODE_PATCHING_SELFTEST is not set
1728# CONFIG_FTR_FIXUP_SELFTEST is not set 1762# CONFIG_FTR_FIXUP_SELFTEST is not set
1763# CONFIG_MSI_BITMAP_SELFTEST is not set
1729# CONFIG_XMON is not set 1764# CONFIG_XMON is not set
1730# CONFIG_IRQSTACKS is not set 1765# CONFIG_IRQSTACKS is not set
1731# CONFIG_BDI_SWITCH is not set 1766# CONFIG_BDI_SWITCH is not set
@@ -1738,6 +1773,7 @@ CONFIG_BOOTX_TEXT=y
1738CONFIG_KEYS=y 1773CONFIG_KEYS=y
1739CONFIG_KEYS_DEBUG_PROC_KEYS=y 1774CONFIG_KEYS_DEBUG_PROC_KEYS=y
1740CONFIG_SECURITY=y 1775CONFIG_SECURITY=y
1776# CONFIG_SECURITYFS is not set
1741CONFIG_SECURITY_NETWORK=y 1777CONFIG_SECURITY_NETWORK=y
1742# CONFIG_SECURITY_NETWORK_XFRM is not set 1778# CONFIG_SECURITY_NETWORK_XFRM is not set
1743# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1779# CONFIG_SECURITY_FILE_CAPABILITIES is not set
@@ -1756,10 +1792,12 @@ CONFIG_CRYPTO=y
1756# 1792#
1757# Crypto core or helper 1793# Crypto core or helper
1758# 1794#
1795# CONFIG_CRYPTO_FIPS is not set
1759CONFIG_CRYPTO_ALGAPI=y 1796CONFIG_CRYPTO_ALGAPI=y
1760CONFIG_CRYPTO_AEAD=m 1797CONFIG_CRYPTO_AEAD=y
1761CONFIG_CRYPTO_BLKCIPHER=y 1798CONFIG_CRYPTO_BLKCIPHER=y
1762CONFIG_CRYPTO_HASH=y 1799CONFIG_CRYPTO_HASH=y
1800CONFIG_CRYPTO_RNG=y
1763CONFIG_CRYPTO_MANAGER=y 1801CONFIG_CRYPTO_MANAGER=y
1764# CONFIG_CRYPTO_GF128MUL is not set 1802# CONFIG_CRYPTO_GF128MUL is not set
1765CONFIG_CRYPTO_NULL=m 1803CONFIG_CRYPTO_NULL=m
@@ -1833,6 +1871,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1833# 1871#
1834CONFIG_CRYPTO_DEFLATE=m 1872CONFIG_CRYPTO_DEFLATE=m
1835# CONFIG_CRYPTO_LZO is not set 1873# CONFIG_CRYPTO_LZO is not set
1874
1875#
1876# Random Number Generation
1877#
1878# CONFIG_CRYPTO_ANSI_CPRNG is not set
1836CONFIG_CRYPTO_HW=y 1879CONFIG_CRYPTO_HW=y
1837# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1880# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1838# CONFIG_PPC_CLOCK is not set 1881# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index 2e0ef8c18227..63b3c2372ce8 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Tue Aug 26 13:12:40 2008 4# Tue Nov 11 19:35:37 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_SMP=y
23CONFIG_NR_CPUS=4 23CONFIG_NR_CPUS=4
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -108,7 +108,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 108CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 109CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 110CONFIG_SHMEM=y
111CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 112CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 114CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 115# CONFIG_SLAB is not set
114CONFIG_SLUB=y 116CONFIG_SLUB=y
@@ -122,10 +124,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
122CONFIG_HAVE_KPROBES=y 124CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y 125CONFIG_HAVE_KRETPROBES=y
124CONFIG_HAVE_ARCH_TRACEHOOK=y 126CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_DMA_ATTRS is not set
126CONFIG_USE_GENERIC_SMP_HELPERS=y 127CONFIG_USE_GENERIC_SMP_HELPERS=y
127# CONFIG_HAVE_CLK is not set
128CONFIG_PROC_PAGE_MONITOR=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 129CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 130CONFIG_RT_MUTEXES=y
@@ -159,6 +158,7 @@ CONFIG_DEFAULT_AS=y
159# CONFIG_DEFAULT_NOOP is not set 158# CONFIG_DEFAULT_NOOP is not set
160CONFIG_DEFAULT_IOSCHED="anticipatory" 159CONFIG_DEFAULT_IOSCHED="anticipatory"
161CONFIG_CLASSIC_RCU=y 160CONFIG_CLASSIC_RCU=y
161# CONFIG_FREEZER is not set
162 162
163# 163#
164# Platform support 164# Platform support
@@ -212,6 +212,8 @@ CONFIG_PREEMPT_NONE=y
212# CONFIG_PREEMPT_VOLUNTARY is not set 212# CONFIG_PREEMPT_VOLUNTARY is not set
213# CONFIG_PREEMPT is not set 213# CONFIG_PREEMPT is not set
214CONFIG_BINFMT_ELF=y 214CONFIG_BINFMT_ELF=y
215# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
216# CONFIG_HAVE_AOUT is not set
215CONFIG_BINFMT_MISC=y 217CONFIG_BINFMT_MISC=y
216# CONFIG_IOMMU_HELPER is not set 218# CONFIG_IOMMU_HELPER is not set
217CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 219CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -227,15 +229,15 @@ CONFIG_FLATMEM_MANUAL=y
227# CONFIG_SPARSEMEM_MANUAL is not set 229# CONFIG_SPARSEMEM_MANUAL is not set
228CONFIG_FLATMEM=y 230CONFIG_FLATMEM=y
229CONFIG_FLAT_NODE_MEM_MAP=y 231CONFIG_FLAT_NODE_MEM_MAP=y
230# CONFIG_SPARSEMEM_STATIC is not set
231# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
232CONFIG_PAGEFLAGS_EXTENDED=y 232CONFIG_PAGEFLAGS_EXTENDED=y
233CONFIG_SPLIT_PTLOCK_CPUS=4 233CONFIG_SPLIT_PTLOCK_CPUS=4
234# CONFIG_MIGRATION is not set 234# CONFIG_MIGRATION is not set
235# CONFIG_RESOURCES_64BIT is not set 235# CONFIG_RESOURCES_64BIT is not set
236# CONFIG_PHYS_ADDR_T_64BIT is not set
236CONFIG_ZONE_DMA_FLAG=1 237CONFIG_ZONE_DMA_FLAG=1
237CONFIG_BOUNCE=y 238CONFIG_BOUNCE=y
238CONFIG_VIRT_TO_BUS=y 239CONFIG_VIRT_TO_BUS=y
240CONFIG_UNEVICTABLE_LRU=y
239CONFIG_FORCE_MAX_ZONEORDER=11 241CONFIG_FORCE_MAX_ZONEORDER=11
240CONFIG_PROC_DEVICETREE=y 242CONFIG_PROC_DEVICETREE=y
241# CONFIG_CMDLINE_BOOL is not set 243# CONFIG_CMDLINE_BOOL is not set
@@ -310,7 +312,6 @@ CONFIG_INET_TCP_DIAG=y
310CONFIG_TCP_CONG_CUBIC=y 312CONFIG_TCP_CONG_CUBIC=y
311CONFIG_DEFAULT_TCP_CONG="cubic" 313CONFIG_DEFAULT_TCP_CONG="cubic"
312# CONFIG_TCP_MD5SIG is not set 314# CONFIG_TCP_MD5SIG is not set
313# CONFIG_IP_VS is not set
314# CONFIG_IPV6 is not set 315# CONFIG_IPV6 is not set
315# CONFIG_NETWORK_SECMARK is not set 316# CONFIG_NETWORK_SECMARK is not set
316CONFIG_NETFILTER=y 317CONFIG_NETFILTER=y
@@ -334,10 +335,12 @@ CONFIG_NETFILTER_XTABLES=m
334# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set 335# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
335# CONFIG_NETFILTER_XT_MATCH_MARK is not set 336# CONFIG_NETFILTER_XT_MATCH_MARK is not set
336# CONFIG_NETFILTER_XT_MATCH_STATE is not set 337# CONFIG_NETFILTER_XT_MATCH_STATE is not set
338# CONFIG_IP_VS is not set
337 339
338# 340#
339# IP: Netfilter Configuration 341# IP: Netfilter Configuration
340# 342#
343CONFIG_NF_DEFRAG_IPV4=m
341CONFIG_NF_CONNTRACK_IPV4=m 344CONFIG_NF_CONNTRACK_IPV4=m
342CONFIG_NF_CONNTRACK_PROC_COMPAT=y 345CONFIG_NF_CONNTRACK_PROC_COMPAT=y
343CONFIG_IP_NF_IPTABLES=m 346CONFIG_IP_NF_IPTABLES=m
@@ -361,6 +364,7 @@ CONFIG_NF_NAT_SIP=m
361# CONFIG_TIPC is not set 364# CONFIG_TIPC is not set
362# CONFIG_ATM is not set 365# CONFIG_ATM is not set
363# CONFIG_BRIDGE is not set 366# CONFIG_BRIDGE is not set
367# CONFIG_NET_DSA is not set
364# CONFIG_VLAN_8021Q is not set 368# CONFIG_VLAN_8021Q is not set
365# CONFIG_DECNET is not set 369# CONFIG_DECNET is not set
366# CONFIG_LLC2 is not set 370# CONFIG_LLC2 is not set
@@ -381,14 +385,8 @@ CONFIG_NF_NAT_SIP=m
381# CONFIG_IRDA is not set 385# CONFIG_IRDA is not set
382# CONFIG_BT is not set 386# CONFIG_BT is not set
383# CONFIG_AF_RXRPC is not set 387# CONFIG_AF_RXRPC is not set
384 388# CONFIG_PHONET is not set
385# 389# CONFIG_WIRELESS is not set
386# Wireless
387#
388# CONFIG_CFG80211 is not set
389# CONFIG_WIRELESS_EXT is not set
390# CONFIG_MAC80211 is not set
391# CONFIG_IEEE80211 is not set
392# CONFIG_RFKILL is not set 390# CONFIG_RFKILL is not set
393# CONFIG_NET_9P is not set 391# CONFIG_NET_9P is not set
394 392
@@ -443,19 +441,18 @@ CONFIG_MISC_DEVICES=y
443# CONFIG_HP_ILO is not set 441# CONFIG_HP_ILO is not set
444CONFIG_HAVE_IDE=y 442CONFIG_HAVE_IDE=y
445CONFIG_IDE=y 443CONFIG_IDE=y
446CONFIG_BLK_DEV_IDE=y
447 444
448# 445#
449# Please see Documentation/ide/ide.txt for help/info on IDE drives 446# Please see Documentation/ide/ide.txt for help/info on IDE drives
450# 447#
451CONFIG_IDE_TIMINGS=y 448CONFIG_IDE_TIMINGS=y
452# CONFIG_BLK_DEV_IDE_SATA is not set 449# CONFIG_BLK_DEV_IDE_SATA is not set
453CONFIG_BLK_DEV_IDEDISK=y 450CONFIG_IDE_GD=y
454CONFIG_IDEDISK_MULTI_MODE=y 451CONFIG_IDE_GD_ATA=y
452# CONFIG_IDE_GD_ATAPI is not set
455CONFIG_BLK_DEV_IDECD=y 453CONFIG_BLK_DEV_IDECD=y
456CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 454CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
457# CONFIG_BLK_DEV_IDETAPE is not set 455# CONFIG_BLK_DEV_IDETAPE is not set
458# CONFIG_BLK_DEV_IDEFLOPPY is not set
459# CONFIG_BLK_DEV_IDESCSI is not set 456# CONFIG_BLK_DEV_IDESCSI is not set
460# CONFIG_IDE_TASK_IOCTL is not set 457# CONFIG_IDE_TASK_IOCTL is not set
461CONFIG_IDE_PROC_FS=y 458CONFIG_IDE_PROC_FS=y
@@ -616,7 +613,23 @@ CONFIG_NETDEVICES=y
616# CONFIG_TUN is not set 613# CONFIG_TUN is not set
617# CONFIG_VETH is not set 614# CONFIG_VETH is not set
618# CONFIG_ARCNET is not set 615# CONFIG_ARCNET is not set
619# CONFIG_PHYLIB is not set 616CONFIG_PHYLIB=y
617
618#
619# MII PHY device drivers
620#
621# CONFIG_MARVELL_PHY is not set
622# CONFIG_DAVICOM_PHY is not set
623# CONFIG_QSEMI_PHY is not set
624# CONFIG_LXT_PHY is not set
625# CONFIG_CICADA_PHY is not set
626# CONFIG_VITESSE_PHY is not set
627# CONFIG_SMSC_PHY is not set
628# CONFIG_BROADCOM_PHY is not set
629# CONFIG_ICPLUS_PHY is not set
630# CONFIG_REALTEK_PHY is not set
631# CONFIG_FIXED_PHY is not set
632# CONFIG_MDIO_BITBANG is not set
620CONFIG_NET_ETHERNET=y 633CONFIG_NET_ETHERNET=y
621CONFIG_MII=y 634CONFIG_MII=y
622# CONFIG_HAPPYMEAL is not set 635# CONFIG_HAPPYMEAL is not set
@@ -641,6 +654,9 @@ CONFIG_DE4X5=y
641# CONFIG_IBM_NEW_EMAC_RGMII is not set 654# CONFIG_IBM_NEW_EMAC_RGMII is not set
642# CONFIG_IBM_NEW_EMAC_TAH is not set 655# CONFIG_IBM_NEW_EMAC_TAH is not set
643# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 656# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
657# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
658# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
659# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
644CONFIG_NET_PCI=y 660CONFIG_NET_PCI=y
645CONFIG_PCNET32=y 661CONFIG_PCNET32=y
646# CONFIG_AMD8111_ETH is not set 662# CONFIG_AMD8111_ETH is not set
@@ -669,6 +685,7 @@ CONFIG_8139TOO=y
669CONFIG_VIA_RHINE=y 685CONFIG_VIA_RHINE=y
670# CONFIG_VIA_RHINE_MMIO is not set 686# CONFIG_VIA_RHINE_MMIO is not set
671# CONFIG_SC92031 is not set 687# CONFIG_SC92031 is not set
688# CONFIG_ATL2 is not set
672CONFIG_NETDEV_1000=y 689CONFIG_NETDEV_1000=y
673# CONFIG_ACENIC is not set 690# CONFIG_ACENIC is not set
674# CONFIG_DL2K is not set 691# CONFIG_DL2K is not set
@@ -690,18 +707,22 @@ CONFIG_MV643XX_ETH=y
690# CONFIG_QLA3XXX is not set 707# CONFIG_QLA3XXX is not set
691# CONFIG_ATL1 is not set 708# CONFIG_ATL1 is not set
692# CONFIG_ATL1E is not set 709# CONFIG_ATL1E is not set
710# CONFIG_JME is not set
693CONFIG_NETDEV_10000=y 711CONFIG_NETDEV_10000=y
694# CONFIG_CHELSIO_T1 is not set 712# CONFIG_CHELSIO_T1 is not set
695# CONFIG_CHELSIO_T3 is not set 713# CONFIG_CHELSIO_T3 is not set
714# CONFIG_ENIC is not set
696# CONFIG_IXGBE is not set 715# CONFIG_IXGBE is not set
697# CONFIG_IXGB is not set 716# CONFIG_IXGB is not set
698# CONFIG_S2IO is not set 717# CONFIG_S2IO is not set
699# CONFIG_MYRI10GE is not set 718# CONFIG_MYRI10GE is not set
700# CONFIG_NETXEN_NIC is not set 719# CONFIG_NETXEN_NIC is not set
701# CONFIG_NIU is not set 720# CONFIG_NIU is not set
721# CONFIG_MLX4_EN is not set
702# CONFIG_MLX4_CORE is not set 722# CONFIG_MLX4_CORE is not set
703# CONFIG_TEHUTI is not set 723# CONFIG_TEHUTI is not set
704# CONFIG_BNX2X is not set 724# CONFIG_BNX2X is not set
725# CONFIG_QLGE is not set
705# CONFIG_SFC is not set 726# CONFIG_SFC is not set
706# CONFIG_TR is not set 727# CONFIG_TR is not set
707 728
@@ -777,6 +798,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
777CONFIG_MOUSE_PS2_SYNAPTICS=y 798CONFIG_MOUSE_PS2_SYNAPTICS=y
778CONFIG_MOUSE_PS2_LIFEBOOK=y 799CONFIG_MOUSE_PS2_LIFEBOOK=y
779CONFIG_MOUSE_PS2_TRACKPOINT=y 800CONFIG_MOUSE_PS2_TRACKPOINT=y
801# CONFIG_MOUSE_PS2_ELANTECH is not set
780# CONFIG_MOUSE_PS2_TOUCHKIT is not set 802# CONFIG_MOUSE_PS2_TOUCHKIT is not set
781# CONFIG_MOUSE_SERIAL is not set 803# CONFIG_MOUSE_SERIAL is not set
782# CONFIG_MOUSE_APPLETOUCH is not set 804# CONFIG_MOUSE_APPLETOUCH is not set
@@ -795,6 +817,7 @@ CONFIG_INPUT_MISC=y
795# CONFIG_INPUT_KEYSPAN_REMOTE is not set 817# CONFIG_INPUT_KEYSPAN_REMOTE is not set
796# CONFIG_INPUT_POWERMATE is not set 818# CONFIG_INPUT_POWERMATE is not set
797# CONFIG_INPUT_YEALINK is not set 819# CONFIG_INPUT_YEALINK is not set
820# CONFIG_INPUT_CM109 is not set
798CONFIG_INPUT_UINPUT=y 821CONFIG_INPUT_UINPUT=y
799 822
800# 823#
@@ -953,6 +976,17 @@ CONFIG_SSB_POSSIBLE=y
953# CONFIG_MFD_SM501 is not set 976# CONFIG_MFD_SM501 is not set
954# CONFIG_HTC_PASIC3 is not set 977# CONFIG_HTC_PASIC3 is not set
955# CONFIG_MFD_TMIO is not set 978# CONFIG_MFD_TMIO is not set
979# CONFIG_PMIC_DA903X is not set
980# CONFIG_MFD_WM8400 is not set
981# CONFIG_MFD_WM8350_I2C is not set
982
983#
984# Voltage and Current regulators
985#
986# CONFIG_REGULATOR is not set
987# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
988# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
989# CONFIG_REGULATOR_BQ24022 is not set
956 990
957# 991#
958# Multimedia devices 992# Multimedia devices
@@ -980,6 +1014,7 @@ CONFIG_SSB_POSSIBLE=y
980CONFIG_FB=y 1014CONFIG_FB=y
981CONFIG_FIRMWARE_EDID=y 1015CONFIG_FIRMWARE_EDID=y
982CONFIG_FB_DDC=y 1016CONFIG_FB_DDC=y
1017# CONFIG_FB_BOOT_VESA_SUPPORT is not set
983CONFIG_FB_CFB_FILLRECT=y 1018CONFIG_FB_CFB_FILLRECT=y
984CONFIG_FB_CFB_COPYAREA=y 1019CONFIG_FB_CFB_COPYAREA=y
985CONFIG_FB_CFB_IMAGEBLIT=y 1020CONFIG_FB_CFB_IMAGEBLIT=y
@@ -1028,6 +1063,7 @@ CONFIG_FB_ATY_BACKLIGHT=y
1028# CONFIG_FB_S3 is not set 1063# CONFIG_FB_S3 is not set
1029# CONFIG_FB_SAVAGE is not set 1064# CONFIG_FB_SAVAGE is not set
1030# CONFIG_FB_SIS is not set 1065# CONFIG_FB_SIS is not set
1066# CONFIG_FB_VIA is not set
1031# CONFIG_FB_NEOMAGIC is not set 1067# CONFIG_FB_NEOMAGIC is not set
1032# CONFIG_FB_KYRO is not set 1068# CONFIG_FB_KYRO is not set
1033CONFIG_FB_3DFX=y 1069CONFIG_FB_3DFX=y
@@ -1040,6 +1076,7 @@ CONFIG_FB_3DFX=y
1040# CONFIG_FB_CARMINE is not set 1076# CONFIG_FB_CARMINE is not set
1041# CONFIG_FB_IBM_GXT4500 is not set 1077# CONFIG_FB_IBM_GXT4500 is not set
1042# CONFIG_FB_VIRTUAL is not set 1078# CONFIG_FB_VIRTUAL is not set
1079# CONFIG_FB_METRONOME is not set
1043CONFIG_BACKLIGHT_LCD_SUPPORT=y 1080CONFIG_BACKLIGHT_LCD_SUPPORT=y
1044CONFIG_LCD_CLASS_DEVICE=m 1081CONFIG_LCD_CLASS_DEVICE=m
1045# CONFIG_LCD_ILI9320 is not set 1082# CONFIG_LCD_ILI9320 is not set
@@ -1083,9 +1120,36 @@ CONFIG_HID=y
1083# USB Input Devices 1120# USB Input Devices
1084# 1121#
1085CONFIG_USB_HID=y 1122CONFIG_USB_HID=y
1086# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1123# CONFIG_HID_PID is not set
1087# CONFIG_HID_FF is not set
1088# CONFIG_USB_HIDDEV is not set 1124# CONFIG_USB_HIDDEV is not set
1125
1126#
1127# Special HID drivers
1128#
1129CONFIG_HID_COMPAT=y
1130CONFIG_HID_A4TECH=y
1131CONFIG_HID_APPLE=y
1132CONFIG_HID_BELKIN=y
1133CONFIG_HID_BRIGHT=y
1134CONFIG_HID_CHERRY=y
1135CONFIG_HID_CHICONY=y
1136CONFIG_HID_CYPRESS=y
1137CONFIG_HID_DELL=y
1138CONFIG_HID_EZKEY=y
1139CONFIG_HID_GYRATION=y
1140CONFIG_HID_LOGITECH=y
1141# CONFIG_LOGITECH_FF is not set
1142# CONFIG_LOGIRUMBLEPAD2_FF is not set
1143CONFIG_HID_MICROSOFT=y
1144CONFIG_HID_MONTEREY=y
1145CONFIG_HID_PANTHERLORD=y
1146# CONFIG_PANTHERLORD_FF is not set
1147CONFIG_HID_PETALYNX=y
1148CONFIG_HID_SAMSUNG=y
1149CONFIG_HID_SONY=y
1150CONFIG_HID_SUNPLUS=y
1151# CONFIG_THRUSTMASTER_FF is not set
1152# CONFIG_ZEROPLUS_FF is not set
1089CONFIG_USB_SUPPORT=y 1153CONFIG_USB_SUPPORT=y
1090CONFIG_USB_ARCH_HAS_HCD=y 1154CONFIG_USB_ARCH_HAS_HCD=y
1091CONFIG_USB_ARCH_HAS_OHCI=y 1155CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1102,6 +1166,8 @@ CONFIG_USB_DEVICE_CLASS=y
1102# CONFIG_USB_DYNAMIC_MINORS is not set 1166# CONFIG_USB_DYNAMIC_MINORS is not set
1103# CONFIG_USB_OTG is not set 1167# CONFIG_USB_OTG is not set
1104CONFIG_USB_MON=y 1168CONFIG_USB_MON=y
1169# CONFIG_USB_WUSB is not set
1170# CONFIG_USB_WUSB_CBAF is not set
1105 1171
1106# 1172#
1107# USB Host Controller Drivers 1173# USB Host Controller Drivers
@@ -1121,6 +1187,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1121CONFIG_USB_UHCI_HCD=y 1187CONFIG_USB_UHCI_HCD=y
1122# CONFIG_USB_SL811_HCD is not set 1188# CONFIG_USB_SL811_HCD is not set
1123# CONFIG_USB_R8A66597_HCD is not set 1189# CONFIG_USB_R8A66597_HCD is not set
1190# CONFIG_USB_WHCI_HCD is not set
1191# CONFIG_USB_HWA_HCD is not set
1124 1192
1125# 1193#
1126# USB Device Class drivers 1194# USB Device Class drivers
@@ -1128,6 +1196,7 @@ CONFIG_USB_UHCI_HCD=y
1128# CONFIG_USB_ACM is not set 1196# CONFIG_USB_ACM is not set
1129# CONFIG_USB_PRINTER is not set 1197# CONFIG_USB_PRINTER is not set
1130# CONFIG_USB_WDM is not set 1198# CONFIG_USB_WDM is not set
1199# CONFIG_USB_TMC is not set
1131 1200
1132# 1201#
1133# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1202# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1149,7 +1218,6 @@ CONFIG_USB_STORAGE=m
1149# CONFIG_USB_STORAGE_ALAUDA is not set 1218# CONFIG_USB_STORAGE_ALAUDA is not set
1150# CONFIG_USB_STORAGE_ONETOUCH is not set 1219# CONFIG_USB_STORAGE_ONETOUCH is not set
1151# CONFIG_USB_STORAGE_KARMA is not set 1220# CONFIG_USB_STORAGE_KARMA is not set
1152# CONFIG_USB_STORAGE_SIERRA is not set
1153# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1221# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1154# CONFIG_USB_LIBUSUAL is not set 1222# CONFIG_USB_LIBUSUAL is not set
1155 1223
@@ -1170,6 +1238,7 @@ CONFIG_USB_STORAGE=m
1170# CONFIG_USB_EMI62 is not set 1238# CONFIG_USB_EMI62 is not set
1171# CONFIG_USB_EMI26 is not set 1239# CONFIG_USB_EMI26 is not set
1172# CONFIG_USB_ADUTUX is not set 1240# CONFIG_USB_ADUTUX is not set
1241# CONFIG_USB_SEVSEG is not set
1173# CONFIG_USB_RIO500 is not set 1242# CONFIG_USB_RIO500 is not set
1174# CONFIG_USB_LEGOTOWER is not set 1243# CONFIG_USB_LEGOTOWER is not set
1175# CONFIG_USB_LCD is not set 1244# CONFIG_USB_LCD is not set
@@ -1187,7 +1256,9 @@ CONFIG_USB_STORAGE=m
1187# CONFIG_USB_IOWARRIOR is not set 1256# CONFIG_USB_IOWARRIOR is not set
1188# CONFIG_USB_TEST is not set 1257# CONFIG_USB_TEST is not set
1189# CONFIG_USB_ISIGHTFW is not set 1258# CONFIG_USB_ISIGHTFW is not set
1259# CONFIG_USB_VST is not set
1190# CONFIG_USB_GADGET is not set 1260# CONFIG_USB_GADGET is not set
1261# CONFIG_UWB is not set
1191# CONFIG_MMC is not set 1262# CONFIG_MMC is not set
1192# CONFIG_MEMSTICK is not set 1263# CONFIG_MEMSTICK is not set
1193# CONFIG_NEW_LEDS is not set 1264# CONFIG_NEW_LEDS is not set
@@ -1197,6 +1268,7 @@ CONFIG_USB_STORAGE=m
1197# CONFIG_RTC_CLASS is not set 1268# CONFIG_RTC_CLASS is not set
1198# CONFIG_DMADEVICES is not set 1269# CONFIG_DMADEVICES is not set
1199# CONFIG_UIO is not set 1270# CONFIG_UIO is not set
1271# CONFIG_STAGING is not set
1200 1272
1201# 1273#
1202# File systems 1274# File systems
@@ -1208,12 +1280,18 @@ CONFIG_EXT3_FS=y
1208CONFIG_EXT3_FS_XATTR=y 1280CONFIG_EXT3_FS_XATTR=y
1209# CONFIG_EXT3_FS_POSIX_ACL is not set 1281# CONFIG_EXT3_FS_POSIX_ACL is not set
1210# CONFIG_EXT3_FS_SECURITY is not set 1282# CONFIG_EXT3_FS_SECURITY is not set
1211# CONFIG_EXT4DEV_FS is not set 1283CONFIG_EXT4_FS=y
1284# CONFIG_EXT4DEV_COMPAT is not set
1285CONFIG_EXT4_FS_XATTR=y
1286# CONFIG_EXT4_FS_POSIX_ACL is not set
1287# CONFIG_EXT4_FS_SECURITY is not set
1212CONFIG_JBD=y 1288CONFIG_JBD=y
1289CONFIG_JBD2=y
1213CONFIG_FS_MBCACHE=y 1290CONFIG_FS_MBCACHE=y
1214# CONFIG_REISERFS_FS is not set 1291# CONFIG_REISERFS_FS is not set
1215# CONFIG_JFS_FS is not set 1292# CONFIG_JFS_FS is not set
1216# CONFIG_FS_POSIX_ACL is not set 1293# CONFIG_FS_POSIX_ACL is not set
1294CONFIG_FILE_LOCKING=y
1217# CONFIG_XFS_FS is not set 1295# CONFIG_XFS_FS is not set
1218# CONFIG_OCFS2_FS is not set 1296# CONFIG_OCFS2_FS is not set
1219CONFIG_DNOTIFY=y 1297CONFIG_DNOTIFY=y
@@ -1248,6 +1326,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1248CONFIG_PROC_FS=y 1326CONFIG_PROC_FS=y
1249CONFIG_PROC_KCORE=y 1327CONFIG_PROC_KCORE=y
1250CONFIG_PROC_SYSCTL=y 1328CONFIG_PROC_SYSCTL=y
1329CONFIG_PROC_PAGE_MONITOR=y
1251CONFIG_SYSFS=y 1330CONFIG_SYSFS=y
1252CONFIG_TMPFS=y 1331CONFIG_TMPFS=y
1253# CONFIG_TMPFS_POSIX_ACL is not set 1332# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1349,9 +1428,8 @@ CONFIG_NLS_ISO8859_1=m
1349# Library routines 1428# Library routines
1350# 1429#
1351CONFIG_BITREVERSE=y 1430CONFIG_BITREVERSE=y
1352# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1353CONFIG_CRC_CCITT=m 1431CONFIG_CRC_CCITT=m
1354# CONFIG_CRC16 is not set 1432CONFIG_CRC16=y
1355CONFIG_CRC_T10DIF=y 1433CONFIG_CRC_T10DIF=y
1356# CONFIG_CRC_ITU_T is not set 1434# CONFIG_CRC_ITU_T is not set
1357CONFIG_CRC32=y 1435CONFIG_CRC32=y
@@ -1404,15 +1482,23 @@ CONFIG_DEBUG_MEMORY_INIT=y
1404# CONFIG_DEBUG_SG is not set 1482# CONFIG_DEBUG_SG is not set
1405# CONFIG_BOOT_PRINTK_DELAY is not set 1483# CONFIG_BOOT_PRINTK_DELAY is not set
1406# CONFIG_RCU_TORTURE_TEST is not set 1484# CONFIG_RCU_TORTURE_TEST is not set
1485# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1407# CONFIG_BACKTRACE_SELF_TEST is not set 1486# CONFIG_BACKTRACE_SELF_TEST is not set
1487# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1408# CONFIG_FAULT_INJECTION is not set 1488# CONFIG_FAULT_INJECTION is not set
1409# CONFIG_LATENCYTOP is not set 1489# CONFIG_LATENCYTOP is not set
1410CONFIG_SYSCTL_SYSCALL_CHECK=y 1490CONFIG_SYSCTL_SYSCALL_CHECK=y
1411CONFIG_HAVE_FTRACE=y 1491CONFIG_HAVE_FUNCTION_TRACER=y
1412CONFIG_HAVE_DYNAMIC_FTRACE=y 1492
1413# CONFIG_FTRACE is not set 1493#
1494# Tracers
1495#
1496# CONFIG_FUNCTION_TRACER is not set
1414# CONFIG_SCHED_TRACER is not set 1497# CONFIG_SCHED_TRACER is not set
1415# CONFIG_CONTEXT_SWITCH_TRACER is not set 1498# CONFIG_CONTEXT_SWITCH_TRACER is not set
1499# CONFIG_BOOT_TRACER is not set
1500# CONFIG_STACK_TRACER is not set
1501# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1416# CONFIG_SAMPLES is not set 1502# CONFIG_SAMPLES is not set
1417CONFIG_HAVE_ARCH_KGDB=y 1503CONFIG_HAVE_ARCH_KGDB=y
1418# CONFIG_KGDB is not set 1504# CONFIG_KGDB is not set
@@ -1421,6 +1507,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1421# CONFIG_DEBUG_PAGEALLOC is not set 1507# CONFIG_DEBUG_PAGEALLOC is not set
1422# CONFIG_CODE_PATCHING_SELFTEST is not set 1508# CONFIG_CODE_PATCHING_SELFTEST is not set
1423# CONFIG_FTR_FIXUP_SELFTEST is not set 1509# CONFIG_FTR_FIXUP_SELFTEST is not set
1510# CONFIG_MSI_BITMAP_SELFTEST is not set
1424CONFIG_XMON=y 1511CONFIG_XMON=y
1425CONFIG_XMON_DEFAULT=y 1512CONFIG_XMON_DEFAULT=y
1426CONFIG_XMON_DISASSEMBLY=y 1513CONFIG_XMON_DISASSEMBLY=y
@@ -1435,14 +1522,19 @@ CONFIG_IRQSTACKS=y
1435# 1522#
1436# CONFIG_KEYS is not set 1523# CONFIG_KEYS is not set
1437# CONFIG_SECURITY is not set 1524# CONFIG_SECURITY is not set
1525# CONFIG_SECURITYFS is not set
1438# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1526# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1439CONFIG_CRYPTO=y 1527CONFIG_CRYPTO=y
1440 1528
1441# 1529#
1442# Crypto core or helper 1530# Crypto core or helper
1443# 1531#
1532# CONFIG_CRYPTO_FIPS is not set
1444CONFIG_CRYPTO_ALGAPI=m 1533CONFIG_CRYPTO_ALGAPI=m
1534CONFIG_CRYPTO_AEAD=m
1445CONFIG_CRYPTO_BLKCIPHER=m 1535CONFIG_CRYPTO_BLKCIPHER=m
1536CONFIG_CRYPTO_HASH=m
1537CONFIG_CRYPTO_RNG=m
1446CONFIG_CRYPTO_MANAGER=m 1538CONFIG_CRYPTO_MANAGER=m
1447# CONFIG_CRYPTO_GF128MUL is not set 1539# CONFIG_CRYPTO_GF128MUL is not set
1448# CONFIG_CRYPTO_NULL is not set 1540# CONFIG_CRYPTO_NULL is not set
@@ -1515,6 +1607,11 @@ CONFIG_CRYPTO_ARC4=m
1515# 1607#
1516# CONFIG_CRYPTO_DEFLATE is not set 1608# CONFIG_CRYPTO_DEFLATE is not set
1517# CONFIG_CRYPTO_LZO is not set 1609# CONFIG_CRYPTO_LZO is not set
1610
1611#
1612# Random Number Generation
1613#
1614# CONFIG_CRYPTO_ANSI_CPRNG is not set
1518# CONFIG_CRYPTO_HW is not set 1615# CONFIG_CRYPTO_HW is not set
1519# CONFIG_PPC_CLOCK is not set 1616# CONFIG_PPC_CLOCK is not set
1520# CONFIG_VIRTUALIZATION is not set 1617# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig
index cd691f770810..a6f1cff564e6 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:03 2008 4# Sat Nov 8 12:39:36 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -48,13 +48,11 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
50CONFIG_OF=y 50CONFIG_OF=y
51CONFIG_PPC_UDBG_16550=y 51# CONFIG_PPC_UDBG_16550 is not set
52# CONFIG_GENERIC_TBSYNC is not set 52# CONFIG_GENERIC_TBSYNC is not set
53CONFIG_AUDIT_ARCH=y 53CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
55# CONFIG_DEFAULT_UIMAGE is not set 55# CONFIG_DEFAULT_UIMAGE is not set
56CONFIG_HIBERNATE_32=y
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
58# CONFIG_PPC_DCR_NATIVE is not set 56# CONFIG_PPC_DCR_NATIVE is not set
59# CONFIG_PPC_DCR_MMIO is not set 57# CONFIG_PPC_DCR_MMIO is not set
60CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 58CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -93,7 +91,6 @@ CONFIG_HOTPLUG=y
93CONFIG_PRINTK=y 91CONFIG_PRINTK=y
94CONFIG_BUG=y 92CONFIG_BUG=y
95CONFIG_ELF_CORE=y 93CONFIG_ELF_CORE=y
96CONFIG_PCSPKR_PLATFORM=y
97CONFIG_COMPAT_BRK=y 94CONFIG_COMPAT_BRK=y
98CONFIG_BASE_FULL=y 95CONFIG_BASE_FULL=y
99CONFIG_FUTEX=y 96CONFIG_FUTEX=y
@@ -103,7 +100,9 @@ CONFIG_SIGNALFD=y
103CONFIG_TIMERFD=y 100CONFIG_TIMERFD=y
104CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
105CONFIG_SHMEM=y 102CONFIG_SHMEM=y
103CONFIG_AIO=y
106CONFIG_VM_EVENT_COUNTERS=y 104CONFIG_VM_EVENT_COUNTERS=y
105CONFIG_PCI_QUIRKS=y
107CONFIG_SLAB=y 106CONFIG_SLAB=y
108# CONFIG_SLUB is not set 107# CONFIG_SLUB is not set
109# CONFIG_SLOB is not set 108# CONFIG_SLOB is not set
@@ -115,10 +114,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
115CONFIG_HAVE_KPROBES=y 114CONFIG_HAVE_KPROBES=y
116CONFIG_HAVE_KRETPROBES=y 115CONFIG_HAVE_KRETPROBES=y
117CONFIG_HAVE_ARCH_TRACEHOOK=y 116CONFIG_HAVE_ARCH_TRACEHOOK=y
118# CONFIG_HAVE_DMA_ATTRS is not set
119# CONFIG_USE_GENERIC_SMP_HELPERS is not set
120CONFIG_HAVE_CLK=y 117CONFIG_HAVE_CLK=y
121CONFIG_PROC_PAGE_MONITOR=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 118# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 119CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 120CONFIG_RT_MUTEXES=y
@@ -144,6 +140,7 @@ CONFIG_DEFAULT_DEADLINE=y
144# CONFIG_DEFAULT_NOOP is not set 140# CONFIG_DEFAULT_NOOP is not set
145CONFIG_DEFAULT_IOSCHED="deadline" 141CONFIG_DEFAULT_IOSCHED="deadline"
146CONFIG_CLASSIC_RCU=y 142CONFIG_CLASSIC_RCU=y
143# CONFIG_FREEZER is not set
147 144
148# 145#
149# Platform support 146# Platform support
@@ -151,39 +148,36 @@ CONFIG_CLASSIC_RCU=y
151CONFIG_PPC_MULTIPLATFORM=y 148CONFIG_PPC_MULTIPLATFORM=y
152CONFIG_CLASSIC32=y 149CONFIG_CLASSIC32=y
153# CONFIG_PPC_CHRP is not set 150# CONFIG_PPC_CHRP is not set
154# CONFIG_PPC_PMAC is not set
155# CONFIG_MPC5121_ADS is not set 151# CONFIG_MPC5121_ADS is not set
156# CONFIG_MPC5121_GENERIC is not set 152# CONFIG_MPC5121_GENERIC is not set
157# CONFIG_PPC_MPC52xx is not set 153# CONFIG_PPC_MPC52xx is not set
154# CONFIG_PPC_PMAC is not set
158# CONFIG_PPC_CELL is not set 155# CONFIG_PPC_CELL is not set
159# CONFIG_PPC_CELL_NATIVE is not set 156# CONFIG_PPC_CELL_NATIVE is not set
160CONFIG_PPC_82xx=y 157CONFIG_PPC_82xx=y
161# CONFIG_MPC8272_ADS is not set 158# CONFIG_MPC8272_ADS is not set
162# CONFIG_PQ2FADS is not set 159# CONFIG_PQ2FADS is not set
163CONFIG_EP8248E=y 160CONFIG_EP8248E=y
161# CONFIG_MGCOGE is not set
164# CONFIG_PQ2ADS is not set 162# CONFIG_PQ2ADS is not set
165CONFIG_8260=y 163CONFIG_8260=y
166CONFIG_8272=y 164CONFIG_8272=y
167# CONFIG_PPC_83xx is not set 165# CONFIG_PPC_83xx is not set
168# CONFIG_PPC_86xx is not set 166# CONFIG_PPC_86xx is not set
169# CONFIG_EMBEDDED6xx is not set 167# CONFIG_EMBEDDED6xx is not set
170CONFIG_PPC_NATIVE=y
171# CONFIG_UDBG_RTAS_CONSOLE is not set
172# CONFIG_IPIC is not set 168# CONFIG_IPIC is not set
173CONFIG_MPIC=y 169# CONFIG_MPIC is not set
174# CONFIG_MPIC_WEIRD is not set 170# CONFIG_MPIC_WEIRD is not set
175CONFIG_PPC_I8259=y 171# CONFIG_PPC_I8259 is not set
176CONFIG_PPC_RTAS=y 172# CONFIG_PPC_RTAS is not set
177# CONFIG_RTAS_ERROR_LOGGING is not set
178CONFIG_RTAS_PROC=y
179# CONFIG_MMIO_NVRAM is not set 173# CONFIG_MMIO_NVRAM is not set
180CONFIG_PPC_MPC106=y 174# CONFIG_PPC_MPC106 is not set
181# CONFIG_PPC_970_NAP is not set 175# CONFIG_PPC_970_NAP is not set
182# CONFIG_PPC_INDIRECT_IO is not set 176# CONFIG_PPC_INDIRECT_IO is not set
183# CONFIG_GENERIC_IOMAP is not set 177# CONFIG_GENERIC_IOMAP is not set
184# CONFIG_CPU_FREQ is not set 178# CONFIG_CPU_FREQ is not set
185# CONFIG_PPC601_SYNC_FIX is not set
186# CONFIG_TAU is not set 179# CONFIG_TAU is not set
180# CONFIG_QUICC_ENGINE is not set
187CONFIG_CPM2=y 181CONFIG_CPM2=y
188# CONFIG_FSL_ULI1575 is not set 182# CONFIG_FSL_ULI1575 is not set
189CONFIG_CPM=y 183CONFIG_CPM=y
@@ -192,7 +186,6 @@ CONFIG_CPM=y
192# Kernel options 186# Kernel options
193# 187#
194# CONFIG_HIGHMEM is not set 188# CONFIG_HIGHMEM is not set
195# CONFIG_TICK_ONESHOT is not set
196# CONFIG_NO_HZ is not set 189# CONFIG_NO_HZ is not set
197# CONFIG_HIGH_RES_TIMERS is not set 190# CONFIG_HIGH_RES_TIMERS is not set
198CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 191CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -206,6 +199,8 @@ CONFIG_PREEMPT_NONE=y
206# CONFIG_PREEMPT_VOLUNTARY is not set 199# CONFIG_PREEMPT_VOLUNTARY is not set
207# CONFIG_PREEMPT is not set 200# CONFIG_PREEMPT is not set
208CONFIG_BINFMT_ELF=y 201CONFIG_BINFMT_ELF=y
202# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
203# CONFIG_HAVE_AOUT is not set
209CONFIG_BINFMT_MISC=y 204CONFIG_BINFMT_MISC=y
210# CONFIG_IOMMU_HELPER is not set 205# CONFIG_IOMMU_HELPER is not set
211CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 206CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -215,15 +210,15 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
215CONFIG_ARCH_POPULATES_NODE_MAP=y 210CONFIG_ARCH_POPULATES_NODE_MAP=y
216CONFIG_FLATMEM=y 211CONFIG_FLATMEM=y
217CONFIG_FLAT_NODE_MEM_MAP=y 212CONFIG_FLAT_NODE_MEM_MAP=y
218# CONFIG_SPARSEMEM_STATIC is not set
219# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
220CONFIG_PAGEFLAGS_EXTENDED=y 213CONFIG_PAGEFLAGS_EXTENDED=y
221CONFIG_SPLIT_PTLOCK_CPUS=4 214CONFIG_SPLIT_PTLOCK_CPUS=4
222CONFIG_MIGRATION=y 215CONFIG_MIGRATION=y
223# CONFIG_RESOURCES_64BIT is not set 216# CONFIG_RESOURCES_64BIT is not set
217# CONFIG_PHYS_ADDR_T_64BIT is not set
224CONFIG_ZONE_DMA_FLAG=1 218CONFIG_ZONE_DMA_FLAG=1
225CONFIG_BOUNCE=y 219CONFIG_BOUNCE=y
226CONFIG_VIRT_TO_BUS=y 220CONFIG_VIRT_TO_BUS=y
221CONFIG_UNEVICTABLE_LRU=y
227CONFIG_FORCE_MAX_ZONEORDER=11 222CONFIG_FORCE_MAX_ZONEORDER=11
228CONFIG_PROC_DEVICETREE=y 223CONFIG_PROC_DEVICETREE=y
229# CONFIG_CMDLINE_BOOL is not set 224# CONFIG_CMDLINE_BOOL is not set
@@ -235,7 +230,6 @@ CONFIG_ISA_DMA_API=y
235# 230#
236# Bus options 231# Bus options
237# 232#
238# CONFIG_ISA is not set
239CONFIG_ZONE_DMA=y 233CONFIG_ZONE_DMA=y
240CONFIG_PPC_INDIRECT_PCI=y 234CONFIG_PPC_INDIRECT_PCI=y
241CONFIG_FSL_SOC=y 235CONFIG_FSL_SOC=y
@@ -247,7 +241,7 @@ CONFIG_PCI_8260=y
247# CONFIG_PCIEPORTBUS is not set 241# CONFIG_PCIEPORTBUS is not set
248CONFIG_ARCH_SUPPORTS_MSI=y 242CONFIG_ARCH_SUPPORTS_MSI=y
249# CONFIG_PCI_MSI is not set 243# CONFIG_PCI_MSI is not set
250CONFIG_PCI_LEGACY=y 244# CONFIG_PCI_LEGACY is not set
251# CONFIG_PCI_DEBUG is not set 245# CONFIG_PCI_DEBUG is not set
252# CONFIG_PCCARD is not set 246# CONFIG_PCCARD is not set
253# CONFIG_HOTPLUG_PCI is not set 247# CONFIG_HOTPLUG_PCI is not set
@@ -303,7 +297,6 @@ CONFIG_INET_TCP_DIAG=y
303# CONFIG_TCP_CONG_ADVANCED is not set 297# CONFIG_TCP_CONG_ADVANCED is not set
304CONFIG_TCP_CONG_CUBIC=y 298CONFIG_TCP_CONG_CUBIC=y
305CONFIG_DEFAULT_TCP_CONG="cubic" 299CONFIG_DEFAULT_TCP_CONG="cubic"
306# CONFIG_IP_VS is not set
307CONFIG_IPV6=y 300CONFIG_IPV6=y
308# CONFIG_IPV6_PRIVACY is not set 301# CONFIG_IPV6_PRIVACY is not set
309# CONFIG_IPV6_ROUTER_PREF is not set 302# CONFIG_IPV6_ROUTER_PREF is not set
@@ -330,10 +323,12 @@ CONFIG_NETFILTER_ADVANCED=y
330# CONFIG_NETFILTER_NETLINK_LOG is not set 323# CONFIG_NETFILTER_NETLINK_LOG is not set
331# CONFIG_NF_CONNTRACK is not set 324# CONFIG_NF_CONNTRACK is not set
332# CONFIG_NETFILTER_XTABLES is not set 325# CONFIG_NETFILTER_XTABLES is not set
326# CONFIG_IP_VS is not set
333 327
334# 328#
335# IP: Netfilter Configuration 329# IP: Netfilter Configuration
336# 330#
331# CONFIG_NF_DEFRAG_IPV4 is not set
337# CONFIG_IP_NF_QUEUE is not set 332# CONFIG_IP_NF_QUEUE is not set
338# CONFIG_IP_NF_IPTABLES is not set 333# CONFIG_IP_NF_IPTABLES is not set
339# CONFIG_IP_NF_ARPTABLES is not set 334# CONFIG_IP_NF_ARPTABLES is not set
@@ -360,11 +355,10 @@ CONFIG_NETFILTER_ADVANCED=y
360# CONFIG_CAN is not set 355# CONFIG_CAN is not set
361# CONFIG_IRDA is not set 356# CONFIG_IRDA is not set
362# CONFIG_BT is not set 357# CONFIG_BT is not set
363 358# CONFIG_PHONET is not set
364# 359CONFIG_WIRELESS=y
365# Wireless
366#
367# CONFIG_CFG80211 is not set 360# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y
368# CONFIG_WIRELESS_EXT is not set 362# CONFIG_WIRELESS_EXT is not set
369# CONFIG_MAC80211 is not set 363# CONFIG_MAC80211 is not set
370# CONFIG_IEEE80211 is not set 364# CONFIG_IEEE80211 is not set
@@ -469,7 +463,6 @@ CONFIG_OF_GPIO=y
469# CONFIG_PARPORT is not set 463# CONFIG_PARPORT is not set
470CONFIG_BLK_DEV=y 464CONFIG_BLK_DEV=y
471# CONFIG_BLK_DEV_FD is not set 465# CONFIG_BLK_DEV_FD is not set
472# CONFIG_MAC_FLOPPY is not set
473# CONFIG_BLK_CPQ_DA is not set 466# CONFIG_BLK_CPQ_DA is not set
474# CONFIG_BLK_CPQ_CISS_DA is not set 467# CONFIG_BLK_CPQ_CISS_DA is not set
475# CONFIG_BLK_DEV_DAC960 is not set 468# CONFIG_BLK_DEV_DAC960 is not set
@@ -534,8 +527,6 @@ CONFIG_MDIO_BITBANG=y
534# CONFIG_MDIO_OF_GPIO is not set 527# CONFIG_MDIO_OF_GPIO is not set
535CONFIG_NET_ETHERNET=y 528CONFIG_NET_ETHERNET=y
536CONFIG_MII=y 529CONFIG_MII=y
537# CONFIG_MACE is not set
538# CONFIG_BMAC is not set
539# CONFIG_HAPPYMEAL is not set 530# CONFIG_HAPPYMEAL is not set
540# CONFIG_SUNGEM is not set 531# CONFIG_SUNGEM is not set
541# CONFIG_CASSINI is not set 532# CONFIG_CASSINI is not set
@@ -546,8 +537,12 @@ CONFIG_MII=y
546# CONFIG_IBM_NEW_EMAC_RGMII is not set 537# CONFIG_IBM_NEW_EMAC_RGMII is not set
547# CONFIG_IBM_NEW_EMAC_TAH is not set 538# CONFIG_IBM_NEW_EMAC_TAH is not set
548# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 539# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
540# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
541# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
542# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
549# CONFIG_NET_PCI is not set 543# CONFIG_NET_PCI is not set
550# CONFIG_B44 is not set 544# CONFIG_B44 is not set
545# CONFIG_ATL2 is not set
551CONFIG_FS_ENET=y 546CONFIG_FS_ENET=y
552# CONFIG_FS_ENET_HAS_SCC is not set 547# CONFIG_FS_ENET_HAS_SCC is not set
553CONFIG_FS_ENET_HAS_FCC=y 548CONFIG_FS_ENET_HAS_FCC=y
@@ -570,18 +565,23 @@ CONFIG_NETDEV_1000=y
570# CONFIG_GIANFAR is not set 565# CONFIG_GIANFAR is not set
571# CONFIG_MV643XX_ETH is not set 566# CONFIG_MV643XX_ETH is not set
572# CONFIG_QLA3XXX is not set 567# CONFIG_QLA3XXX is not set
568# CONFIG_ATL1 is not set
569# CONFIG_JME is not set
573CONFIG_NETDEV_10000=y 570CONFIG_NETDEV_10000=y
574# CONFIG_CHELSIO_T1 is not set 571# CONFIG_CHELSIO_T1 is not set
575# CONFIG_CHELSIO_T3 is not set 572# CONFIG_CHELSIO_T3 is not set
573# CONFIG_ENIC is not set
576# CONFIG_IXGBE is not set 574# CONFIG_IXGBE is not set
577# CONFIG_IXGB is not set 575# CONFIG_IXGB is not set
578# CONFIG_S2IO is not set 576# CONFIG_S2IO is not set
579# CONFIG_MYRI10GE is not set 577# CONFIG_MYRI10GE is not set
580# CONFIG_NETXEN_NIC is not set 578# CONFIG_NETXEN_NIC is not set
581# CONFIG_NIU is not set 579# CONFIG_NIU is not set
580# CONFIG_MLX4_EN is not set
582# CONFIG_MLX4_CORE is not set 581# CONFIG_MLX4_CORE is not set
583# CONFIG_TEHUTI is not set 582# CONFIG_TEHUTI is not set
584# CONFIG_BNX2X is not set 583# CONFIG_BNX2X is not set
584# CONFIG_QLGE is not set
585# CONFIG_SFC is not set 585# CONFIG_SFC is not set
586# CONFIG_TR is not set 586# CONFIG_TR is not set
587 587
@@ -629,21 +629,12 @@ CONFIG_DEVKMEM=y
629# CONFIG_SERIAL_UARTLITE is not set 629# CONFIG_SERIAL_UARTLITE is not set
630CONFIG_SERIAL_CORE=y 630CONFIG_SERIAL_CORE=y
631CONFIG_SERIAL_CORE_CONSOLE=y 631CONFIG_SERIAL_CORE_CONSOLE=y
632# CONFIG_SERIAL_PMACZILOG is not set
633CONFIG_SERIAL_CPM=y 632CONFIG_SERIAL_CPM=y
634CONFIG_SERIAL_CPM_CONSOLE=y 633CONFIG_SERIAL_CPM_CONSOLE=y
635CONFIG_SERIAL_CPM_SCC1=y
636# CONFIG_SERIAL_CPM_SCC2 is not set
637# CONFIG_SERIAL_CPM_SCC3 is not set
638CONFIG_SERIAL_CPM_SCC4=y
639# CONFIG_SERIAL_CPM_SMC1 is not set
640# CONFIG_SERIAL_CPM_SMC2 is not set
641# CONFIG_SERIAL_JSM is not set 634# CONFIG_SERIAL_JSM is not set
642CONFIG_UNIX98_PTYS=y 635CONFIG_UNIX98_PTYS=y
643CONFIG_LEGACY_PTYS=y 636CONFIG_LEGACY_PTYS=y
644CONFIG_LEGACY_PTY_COUNT=256 637CONFIG_LEGACY_PTY_COUNT=256
645# CONFIG_BRIQ_PANEL is not set
646# CONFIG_HVC_RTAS is not set
647# CONFIG_IPMI_HANDLER is not set 638# CONFIG_IPMI_HANDLER is not set
648CONFIG_HW_RANDOM=y 639CONFIG_HW_RANDOM=y
649# CONFIG_NVRAM is not set 640# CONFIG_NVRAM is not set
@@ -693,6 +684,14 @@ CONFIG_SSB_POSSIBLE=y
693# CONFIG_MFD_TMIO is not set 684# CONFIG_MFD_TMIO is not set
694 685
695# 686#
687# Voltage and Current regulators
688#
689# CONFIG_REGULATOR is not set
690# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
691# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
692# CONFIG_REGULATOR_BQ24022 is not set
693
694#
696# Multimedia devices 695# Multimedia devices
697# 696#
698 697
@@ -732,6 +731,7 @@ CONFIG_DAB=y
732# CONFIG_RTC_CLASS is not set 731# CONFIG_RTC_CLASS is not set
733# CONFIG_DMADEVICES is not set 732# CONFIG_DMADEVICES is not set
734# CONFIG_UIO is not set 733# CONFIG_UIO is not set
734# CONFIG_STAGING is not set
735 735
736# 736#
737# File systems 737# File systems
@@ -741,10 +741,12 @@ CONFIG_EXT2_FS=y
741# CONFIG_EXT2_FS_XIP is not set 741# CONFIG_EXT2_FS_XIP is not set
742CONFIG_EXT3_FS=y 742CONFIG_EXT3_FS=y
743# CONFIG_EXT3_FS_XATTR is not set 743# CONFIG_EXT3_FS_XATTR is not set
744# CONFIG_EXT4_FS is not set
744CONFIG_JBD=y 745CONFIG_JBD=y
745# CONFIG_REISERFS_FS is not set 746# CONFIG_REISERFS_FS is not set
746# CONFIG_JFS_FS is not set 747# CONFIG_JFS_FS is not set
747# CONFIG_FS_POSIX_ACL is not set 748# CONFIG_FS_POSIX_ACL is not set
749CONFIG_FILE_LOCKING=y
748# CONFIG_XFS_FS is not set 750# CONFIG_XFS_FS is not set
749# CONFIG_OCFS2_FS is not set 751# CONFIG_OCFS2_FS is not set
750CONFIG_DNOTIFY=y 752CONFIG_DNOTIFY=y
@@ -774,6 +776,7 @@ CONFIG_AUTOFS4_FS=y
774CONFIG_PROC_FS=y 776CONFIG_PROC_FS=y
775CONFIG_PROC_KCORE=y 777CONFIG_PROC_KCORE=y
776CONFIG_PROC_SYSCTL=y 778CONFIG_PROC_SYSCTL=y
779CONFIG_PROC_PAGE_MONITOR=y
777CONFIG_SYSFS=y 780CONFIG_SYSFS=y
778CONFIG_TMPFS=y 781CONFIG_TMPFS=y
779# CONFIG_TMPFS_POSIX_ACL is not set 782# CONFIG_TMPFS_POSIX_ACL is not set
@@ -874,7 +877,6 @@ CONFIG_NLS_UTF8=y
874# 877#
875# Library routines 878# Library routines
876# 879#
877# CONFIG_GENERIC_FIND_FIRST_BIT is not set
878# CONFIG_CRC_CCITT is not set 880# CONFIG_CRC_CCITT is not set
879# CONFIG_CRC16 is not set 881# CONFIG_CRC16 is not set
880# CONFIG_CRC_T10DIF is not set 882# CONFIG_CRC_T10DIF is not set
@@ -924,15 +926,23 @@ CONFIG_DEBUG_INFO=y
924# CONFIG_DEBUG_SG is not set 926# CONFIG_DEBUG_SG is not set
925# CONFIG_BOOT_PRINTK_DELAY is not set 927# CONFIG_BOOT_PRINTK_DELAY is not set
926# CONFIG_RCU_TORTURE_TEST is not set 928# CONFIG_RCU_TORTURE_TEST is not set
929# CONFIG_RCU_CPU_STALL_DETECTOR is not set
927# CONFIG_BACKTRACE_SELF_TEST is not set 930# CONFIG_BACKTRACE_SELF_TEST is not set
931# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
928# CONFIG_FAULT_INJECTION is not set 932# CONFIG_FAULT_INJECTION is not set
929# CONFIG_LATENCYTOP is not set 933# CONFIG_LATENCYTOP is not set
930CONFIG_SYSCTL_SYSCALL_CHECK=y 934CONFIG_SYSCTL_SYSCALL_CHECK=y
931CONFIG_HAVE_FTRACE=y 935CONFIG_HAVE_FUNCTION_TRACER=y
932CONFIG_HAVE_DYNAMIC_FTRACE=y 936
933# CONFIG_FTRACE is not set 937#
938# Tracers
939#
940# CONFIG_FUNCTION_TRACER is not set
934# CONFIG_SCHED_TRACER is not set 941# CONFIG_SCHED_TRACER is not set
935# CONFIG_CONTEXT_SWITCH_TRACER is not set 942# CONFIG_CONTEXT_SWITCH_TRACER is not set
943# CONFIG_BOOT_TRACER is not set
944# CONFIG_STACK_TRACER is not set
945# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
936# CONFIG_SAMPLES is not set 946# CONFIG_SAMPLES is not set
937CONFIG_HAVE_ARCH_KGDB=y 947CONFIG_HAVE_ARCH_KGDB=y
938# CONFIG_DEBUG_STACKOVERFLOW is not set 948# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -940,6 +950,7 @@ CONFIG_HAVE_ARCH_KGDB=y
940# CONFIG_DEBUG_PAGEALLOC is not set 950# CONFIG_DEBUG_PAGEALLOC is not set
941# CONFIG_CODE_PATCHING_SELFTEST is not set 951# CONFIG_CODE_PATCHING_SELFTEST is not set
942# CONFIG_FTR_FIXUP_SELFTEST is not set 952# CONFIG_FTR_FIXUP_SELFTEST is not set
953# CONFIG_MSI_BITMAP_SELFTEST is not set
943# CONFIG_XMON is not set 954# CONFIG_XMON is not set
944# CONFIG_IRQSTACKS is not set 955# CONFIG_IRQSTACKS is not set
945CONFIG_BDI_SWITCH=y 956CONFIG_BDI_SWITCH=y
@@ -951,14 +962,19 @@ CONFIG_BDI_SWITCH=y
951# 962#
952# CONFIG_KEYS is not set 963# CONFIG_KEYS is not set
953# CONFIG_SECURITY is not set 964# CONFIG_SECURITY is not set
965# CONFIG_SECURITYFS is not set
954# CONFIG_SECURITY_FILE_CAPABILITIES is not set 966# CONFIG_SECURITY_FILE_CAPABILITIES is not set
955CONFIG_CRYPTO=y 967CONFIG_CRYPTO=y
956 968
957# 969#
958# Crypto core or helper 970# Crypto core or helper
959# 971#
972# CONFIG_CRYPTO_FIPS is not set
960CONFIG_CRYPTO_ALGAPI=y 973CONFIG_CRYPTO_ALGAPI=y
974CONFIG_CRYPTO_AEAD=y
961CONFIG_CRYPTO_BLKCIPHER=y 975CONFIG_CRYPTO_BLKCIPHER=y
976CONFIG_CRYPTO_HASH=y
977CONFIG_CRYPTO_RNG=y
962CONFIG_CRYPTO_MANAGER=y 978CONFIG_CRYPTO_MANAGER=y
963# CONFIG_CRYPTO_NULL is not set 979# CONFIG_CRYPTO_NULL is not set
964# CONFIG_CRYPTO_CRYPTD is not set 980# CONFIG_CRYPTO_CRYPTD is not set
@@ -1025,6 +1041,11 @@ CONFIG_CRYPTO_DES=y
1025# 1041#
1026# CONFIG_CRYPTO_DEFLATE is not set 1042# CONFIG_CRYPTO_DEFLATE is not set
1027# CONFIG_CRYPTO_LZO is not set 1043# CONFIG_CRYPTO_LZO is not set
1044
1045#
1046# Random Number Generation
1047#
1048# CONFIG_CRYPTO_ANSI_CPRNG is not set
1028# CONFIG_CRYPTO_HW is not set 1049# CONFIG_CRYPTO_HW is not set
1029CONFIG_PPC_CLOCK=y 1050CONFIG_PPC_CLOCK=y
1030CONFIG_PPC_LIB_RHEAP=y 1051CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig
index 480225be2f39..870d28976a44 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:04 2008 4# Sat Nov 8 12:39:37 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,7 +19,7 @@ CONFIG_8xx=y
19CONFIG_NOT_COHERENT_CACHE=y 19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32 21CONFIG_WORD_SIZE=32
22CONFIG_PPC_MERGE=y 22# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
23CONFIG_MMU=y 23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y 24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y 25CONFIG_GENERIC_TIME=y
@@ -101,6 +101,7 @@ CONFIG_SIGNALFD=y
101CONFIG_TIMERFD=y 101CONFIG_TIMERFD=y
102CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
103CONFIG_SHMEM=y 103CONFIG_SHMEM=y
104CONFIG_AIO=y
104# CONFIG_VM_EVENT_COUNTERS is not set 105# CONFIG_VM_EVENT_COUNTERS is not set
105CONFIG_SLUB_DEBUG=y 106CONFIG_SLUB_DEBUG=y
106# CONFIG_SLAB is not set 107# CONFIG_SLAB is not set
@@ -114,10 +115,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
114CONFIG_HAVE_KPROBES=y 115CONFIG_HAVE_KPROBES=y
115CONFIG_HAVE_KRETPROBES=y 116CONFIG_HAVE_KRETPROBES=y
116CONFIG_HAVE_ARCH_TRACEHOOK=y 117CONFIG_HAVE_ARCH_TRACEHOOK=y
117# CONFIG_HAVE_DMA_ATTRS is not set
118# CONFIG_USE_GENERIC_SMP_HELPERS is not set
119CONFIG_HAVE_CLK=y 118CONFIG_HAVE_CLK=y
120CONFIG_PROC_PAGE_MONITOR=y
121# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 119# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
122CONFIG_SLABINFO=y 120CONFIG_SLABINFO=y
123# CONFIG_TINY_SHMEM is not set 121# CONFIG_TINY_SHMEM is not set
@@ -143,6 +141,7 @@ CONFIG_DEFAULT_DEADLINE=y
143# CONFIG_DEFAULT_NOOP is not set 141# CONFIG_DEFAULT_NOOP is not set
144CONFIG_DEFAULT_IOSCHED="deadline" 142CONFIG_DEFAULT_IOSCHED="deadline"
145CONFIG_CLASSIC_RCU=y 143CONFIG_CLASSIC_RCU=y
144# CONFIG_FREEZER is not set
146 145
147# 146#
148# Platform support 147# Platform support
@@ -155,6 +154,7 @@ CONFIG_CPM1=y
155# CONFIG_MPC885ADS is not set 154# CONFIG_MPC885ADS is not set
156CONFIG_PPC_EP88XC=y 155CONFIG_PPC_EP88XC=y
157# CONFIG_PPC_ADDER875 is not set 156# CONFIG_PPC_ADDER875 is not set
157# CONFIG_PPC_MGSUVD is not set
158 158
159# 159#
160# MPC8xx CPM Options 160# MPC8xx CPM Options
@@ -183,6 +183,7 @@ CONFIG_NO_UCODE_PATCH=y
183# CONFIG_PPC_INDIRECT_IO is not set 183# CONFIG_PPC_INDIRECT_IO is not set
184# CONFIG_GENERIC_IOMAP is not set 184# CONFIG_GENERIC_IOMAP is not set
185# CONFIG_CPU_FREQ is not set 185# CONFIG_CPU_FREQ is not set
186# CONFIG_QUICC_ENGINE is not set
186# CONFIG_FSL_ULI1575 is not set 187# CONFIG_FSL_ULI1575 is not set
187CONFIG_CPM=y 188CONFIG_CPM=y
188 189
@@ -204,6 +205,8 @@ CONFIG_PREEMPT_NONE=y
204# CONFIG_PREEMPT_VOLUNTARY is not set 205# CONFIG_PREEMPT_VOLUNTARY is not set
205# CONFIG_PREEMPT is not set 206# CONFIG_PREEMPT is not set
206CONFIG_BINFMT_ELF=y 207CONFIG_BINFMT_ELF=y
208# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
209# CONFIG_HAVE_AOUT is not set
207# CONFIG_BINFMT_MISC is not set 210# CONFIG_BINFMT_MISC is not set
208# CONFIG_MATH_EMULATION is not set 211# CONFIG_MATH_EMULATION is not set
209CONFIG_8XX_MINIMAL_FPEMU=y 212CONFIG_8XX_MINIMAL_FPEMU=y
@@ -219,15 +222,15 @@ CONFIG_FLATMEM_MANUAL=y
219# CONFIG_SPARSEMEM_MANUAL is not set 222# CONFIG_SPARSEMEM_MANUAL is not set
220CONFIG_FLATMEM=y 223CONFIG_FLATMEM=y
221CONFIG_FLAT_NODE_MEM_MAP=y 224CONFIG_FLAT_NODE_MEM_MAP=y
222# CONFIG_SPARSEMEM_STATIC is not set
223# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
224CONFIG_PAGEFLAGS_EXTENDED=y 225CONFIG_PAGEFLAGS_EXTENDED=y
225CONFIG_SPLIT_PTLOCK_CPUS=4 226CONFIG_SPLIT_PTLOCK_CPUS=4
226CONFIG_MIGRATION=y 227CONFIG_MIGRATION=y
227# CONFIG_RESOURCES_64BIT is not set 228# CONFIG_RESOURCES_64BIT is not set
229# CONFIG_PHYS_ADDR_T_64BIT is not set
228CONFIG_ZONE_DMA_FLAG=1 230CONFIG_ZONE_DMA_FLAG=1
229CONFIG_BOUNCE=y 231CONFIG_BOUNCE=y
230CONFIG_VIRT_TO_BUS=y 232CONFIG_VIRT_TO_BUS=y
233CONFIG_UNEVICTABLE_LRU=y
231CONFIG_FORCE_MAX_ZONEORDER=11 234CONFIG_FORCE_MAX_ZONEORDER=11
232CONFIG_PROC_DEVICETREE=y 235CONFIG_PROC_DEVICETREE=y
233# CONFIG_CMDLINE_BOOL is not set 236# CONFIG_CMDLINE_BOOL is not set
@@ -309,6 +312,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
309# CONFIG_TIPC is not set 312# CONFIG_TIPC is not set
310# CONFIG_ATM is not set 313# CONFIG_ATM is not set
311# CONFIG_BRIDGE is not set 314# CONFIG_BRIDGE is not set
315# CONFIG_NET_DSA is not set
312# CONFIG_VLAN_8021Q is not set 316# CONFIG_VLAN_8021Q is not set
313# CONFIG_DECNET is not set 317# CONFIG_DECNET is not set
314# CONFIG_LLC2 is not set 318# CONFIG_LLC2 is not set
@@ -329,11 +333,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
329# CONFIG_IRDA is not set 333# CONFIG_IRDA is not set
330# CONFIG_BT is not set 334# CONFIG_BT is not set
331# CONFIG_AF_RXRPC is not set 335# CONFIG_AF_RXRPC is not set
332 336# CONFIG_PHONET is not set
333# 337CONFIG_WIRELESS=y
334# Wireless
335#
336# CONFIG_CFG80211 is not set 338# CONFIG_CFG80211 is not set
339CONFIG_WIRELESS_OLD_REGULATORY=y
337# CONFIG_WIRELESS_EXT is not set 340# CONFIG_WIRELESS_EXT is not set
338# CONFIG_MAC80211 is not set 341# CONFIG_MAC80211 is not set
339# CONFIG_IEEE80211 is not set 342# CONFIG_IEEE80211 is not set
@@ -475,6 +478,9 @@ CONFIG_MII=y
475# CONFIG_IBM_NEW_EMAC_RGMII is not set 478# CONFIG_IBM_NEW_EMAC_RGMII is not set
476# CONFIG_IBM_NEW_EMAC_TAH is not set 479# CONFIG_IBM_NEW_EMAC_TAH is not set
477# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 480# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
481# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
482# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
483# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
478# CONFIG_B44 is not set 484# CONFIG_B44 is not set
479CONFIG_FS_ENET=y 485CONFIG_FS_ENET=y
480# CONFIG_FS_ENET_HAS_SCC is not set 486# CONFIG_FS_ENET_HAS_SCC is not set
@@ -529,12 +535,6 @@ CONFIG_SERIAL_CORE=y
529CONFIG_SERIAL_CORE_CONSOLE=y 535CONFIG_SERIAL_CORE_CONSOLE=y
530CONFIG_SERIAL_CPM=y 536CONFIG_SERIAL_CPM=y
531CONFIG_SERIAL_CPM_CONSOLE=y 537CONFIG_SERIAL_CPM_CONSOLE=y
532# CONFIG_SERIAL_CPM_SCC1 is not set
533# CONFIG_SERIAL_CPM_SCC2 is not set
534# CONFIG_SERIAL_CPM_SCC3 is not set
535# CONFIG_SERIAL_CPM_SCC4 is not set
536CONFIG_SERIAL_CPM_SMC1=y
537CONFIG_SERIAL_CPM_SMC2=y
538CONFIG_UNIX98_PTYS=y 538CONFIG_UNIX98_PTYS=y
539# CONFIG_LEGACY_PTYS is not set 539# CONFIG_LEGACY_PTYS is not set
540# CONFIG_IPMI_HANDLER is not set 540# CONFIG_IPMI_HANDLER is not set
@@ -571,6 +571,14 @@ CONFIG_SSB_POSSIBLE=y
571# CONFIG_MFD_TMIO is not set 571# CONFIG_MFD_TMIO is not set
572 572
573# 573#
574# Voltage and Current regulators
575#
576# CONFIG_REGULATOR is not set
577# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
578# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
579# CONFIG_REGULATOR_BQ24022 is not set
580
581#
574# Multimedia devices 582# Multimedia devices
575# 583#
576 584
@@ -608,16 +616,18 @@ CONFIG_DAB=y
608# CONFIG_RTC_CLASS is not set 616# CONFIG_RTC_CLASS is not set
609# CONFIG_DMADEVICES is not set 617# CONFIG_DMADEVICES is not set
610# CONFIG_UIO is not set 618# CONFIG_UIO is not set
619# CONFIG_STAGING is not set
611 620
612# 621#
613# File systems 622# File systems
614# 623#
615# CONFIG_EXT2_FS is not set 624# CONFIG_EXT2_FS is not set
616# CONFIG_EXT3_FS is not set 625# CONFIG_EXT3_FS is not set
617# CONFIG_EXT4DEV_FS is not set 626# CONFIG_EXT4_FS is not set
618# CONFIG_REISERFS_FS is not set 627# CONFIG_REISERFS_FS is not set
619# CONFIG_JFS_FS is not set 628# CONFIG_JFS_FS is not set
620# CONFIG_FS_POSIX_ACL is not set 629# CONFIG_FS_POSIX_ACL is not set
630CONFIG_FILE_LOCKING=y
621# CONFIG_XFS_FS is not set 631# CONFIG_XFS_FS is not set
622# CONFIG_OCFS2_FS is not set 632# CONFIG_OCFS2_FS is not set
623# CONFIG_DNOTIFY is not set 633# CONFIG_DNOTIFY is not set
@@ -646,6 +656,7 @@ CONFIG_DAB=y
646CONFIG_PROC_FS=y 656CONFIG_PROC_FS=y
647# CONFIG_PROC_KCORE is not set 657# CONFIG_PROC_KCORE is not set
648CONFIG_PROC_SYSCTL=y 658CONFIG_PROC_SYSCTL=y
659CONFIG_PROC_PAGE_MONITOR=y
649CONFIG_SYSFS=y 660CONFIG_SYSFS=y
650CONFIG_TMPFS=y 661CONFIG_TMPFS=y
651# CONFIG_TMPFS_POSIX_ACL is not set 662# CONFIG_TMPFS_POSIX_ACL is not set
@@ -683,6 +694,7 @@ CONFIG_LOCKD=y
683CONFIG_LOCKD_V4=y 694CONFIG_LOCKD_V4=y
684CONFIG_NFS_COMMON=y 695CONFIG_NFS_COMMON=y
685CONFIG_SUNRPC=y 696CONFIG_SUNRPC=y
697# CONFIG_SUNRPC_REGISTER_V4 is not set
686# CONFIG_RPCSEC_GSS_KRB5 is not set 698# CONFIG_RPCSEC_GSS_KRB5 is not set
687# CONFIG_RPCSEC_GSS_SPKM3 is not set 699# CONFIG_RPCSEC_GSS_SPKM3 is not set
688# CONFIG_SMB_FS is not set 700# CONFIG_SMB_FS is not set
@@ -718,7 +730,6 @@ CONFIG_MSDOS_PARTITION=y
718# 730#
719# Library routines 731# Library routines
720# 732#
721# CONFIG_GENERIC_FIND_FIRST_BIT is not set
722# CONFIG_CRC_CCITT is not set 733# CONFIG_CRC_CCITT is not set
723# CONFIG_CRC16 is not set 734# CONFIG_CRC16 is not set
724# CONFIG_CRC_T10DIF is not set 735# CONFIG_CRC_T10DIF is not set
@@ -768,14 +779,22 @@ CONFIG_DEBUG_INFO=y
768# CONFIG_DEBUG_SG is not set 779# CONFIG_DEBUG_SG is not set
769# CONFIG_BOOT_PRINTK_DELAY is not set 780# CONFIG_BOOT_PRINTK_DELAY is not set
770# CONFIG_RCU_TORTURE_TEST is not set 781# CONFIG_RCU_TORTURE_TEST is not set
782# CONFIG_RCU_CPU_STALL_DETECTOR is not set
771# CONFIG_BACKTRACE_SELF_TEST is not set 783# CONFIG_BACKTRACE_SELF_TEST is not set
784# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
772# CONFIG_FAULT_INJECTION is not set 785# CONFIG_FAULT_INJECTION is not set
773# CONFIG_LATENCYTOP is not set 786# CONFIG_LATENCYTOP is not set
774CONFIG_HAVE_FTRACE=y 787CONFIG_HAVE_FUNCTION_TRACER=y
775CONFIG_HAVE_DYNAMIC_FTRACE=y 788
776# CONFIG_FTRACE is not set 789#
790# Tracers
791#
792# CONFIG_FUNCTION_TRACER is not set
777# CONFIG_SCHED_TRACER is not set 793# CONFIG_SCHED_TRACER is not set
778# CONFIG_CONTEXT_SWITCH_TRACER is not set 794# CONFIG_CONTEXT_SWITCH_TRACER is not set
795# CONFIG_BOOT_TRACER is not set
796# CONFIG_STACK_TRACER is not set
797# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
779# CONFIG_SAMPLES is not set 798# CONFIG_SAMPLES is not set
780CONFIG_HAVE_ARCH_KGDB=y 799CONFIG_HAVE_ARCH_KGDB=y
781# CONFIG_KGDB is not set 800# CONFIG_KGDB is not set
@@ -784,6 +803,7 @@ CONFIG_HAVE_ARCH_KGDB=y
784# CONFIG_DEBUG_PAGEALLOC is not set 803# CONFIG_DEBUG_PAGEALLOC is not set
785# CONFIG_CODE_PATCHING_SELFTEST is not set 804# CONFIG_CODE_PATCHING_SELFTEST is not set
786# CONFIG_FTR_FIXUP_SELFTEST is not set 805# CONFIG_FTR_FIXUP_SELFTEST is not set
806# CONFIG_MSI_BITMAP_SELFTEST is not set
787# CONFIG_XMON is not set 807# CONFIG_XMON is not set
788# CONFIG_IRQSTACKS is not set 808# CONFIG_IRQSTACKS is not set
789# CONFIG_BDI_SWITCH is not set 809# CONFIG_BDI_SWITCH is not set
@@ -794,6 +814,7 @@ CONFIG_HAVE_ARCH_KGDB=y
794# 814#
795# CONFIG_KEYS is not set 815# CONFIG_KEYS is not set
796# CONFIG_SECURITY is not set 816# CONFIG_SECURITY is not set
817# CONFIG_SECURITYFS is not set
797# CONFIG_SECURITY_FILE_CAPABILITIES is not set 818# CONFIG_SECURITY_FILE_CAPABILITIES is not set
798# CONFIG_CRYPTO is not set 819# CONFIG_CRYPTO is not set
799CONFIG_PPC_CLOCK=y 820CONFIG_PPC_CLOCK=y
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index cfa5d053ee5e..f85e71ccb989 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Tue Aug 26 13:15:06 2008 4# Tue Nov 11 19:36:30 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -21,7 +21,7 @@ CONFIG_SMP=y
21CONFIG_NR_CPUS=4 21CONFIG_NR_CPUS=4
22CONFIG_64BIT=y 22CONFIG_64BIT=y
23CONFIG_WORD_SIZE=64 23CONFIG_WORD_SIZE=64
24CONFIG_PPC_MERGE=y 24CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
25CONFIG_MMU=y 25CONFIG_MMU=y
26CONFIG_GENERIC_CMOS_UPDATE=y 26CONFIG_GENERIC_CMOS_UPDATE=y
27CONFIG_GENERIC_TIME=y 27CONFIG_GENERIC_TIME=y
@@ -112,7 +112,9 @@ CONFIG_SIGNALFD=y
112CONFIG_TIMERFD=y 112CONFIG_TIMERFD=y
113CONFIG_EVENTFD=y 113CONFIG_EVENTFD=y
114CONFIG_SHMEM=y 114CONFIG_SHMEM=y
115CONFIG_AIO=y
115CONFIG_VM_EVENT_COUNTERS=y 116CONFIG_VM_EVENT_COUNTERS=y
117CONFIG_PCI_QUIRKS=y
116CONFIG_SLUB_DEBUG=y 118CONFIG_SLUB_DEBUG=y
117# CONFIG_SLAB is not set 119# CONFIG_SLAB is not set
118CONFIG_SLUB=y 120CONFIG_SLUB=y
@@ -129,8 +131,6 @@ CONFIG_HAVE_KRETPROBES=y
129CONFIG_HAVE_ARCH_TRACEHOOK=y 131CONFIG_HAVE_ARCH_TRACEHOOK=y
130CONFIG_HAVE_DMA_ATTRS=y 132CONFIG_HAVE_DMA_ATTRS=y
131CONFIG_USE_GENERIC_SMP_HELPERS=y 133CONFIG_USE_GENERIC_SMP_HELPERS=y
132# CONFIG_HAVE_CLK is not set
133CONFIG_PROC_PAGE_MONITOR=y
134# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 134# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
135CONFIG_SLABINFO=y 135CONFIG_SLABINFO=y
136CONFIG_RT_MUTEXES=y 136CONFIG_RT_MUTEXES=y
@@ -163,6 +163,8 @@ CONFIG_DEFAULT_AS=y
163# CONFIG_DEFAULT_NOOP is not set 163# CONFIG_DEFAULT_NOOP is not set
164CONFIG_DEFAULT_IOSCHED="anticipatory" 164CONFIG_DEFAULT_IOSCHED="anticipatory"
165CONFIG_CLASSIC_RCU=y 165CONFIG_CLASSIC_RCU=y
166# CONFIG_FREEZER is not set
167CONFIG_PPC_MSI_BITMAP=y
166 168
167# 169#
168# Platform support 170# Platform support
@@ -233,6 +235,8 @@ CONFIG_PREEMPT_NONE=y
233# CONFIG_PREEMPT is not set 235# CONFIG_PREEMPT is not set
234CONFIG_BINFMT_ELF=y 236CONFIG_BINFMT_ELF=y
235CONFIG_COMPAT_BINFMT_ELF=y 237CONFIG_COMPAT_BINFMT_ELF=y
238# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
239# CONFIG_HAVE_AOUT is not set
236# CONFIG_BINFMT_MISC is not set 240# CONFIG_BINFMT_MISC is not set
237CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y 241CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
238CONFIG_IOMMU_VMERGE=y 242CONFIG_IOMMU_VMERGE=y
@@ -242,7 +246,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
242CONFIG_ARCH_HAS_WALK_MEMORY=y 246CONFIG_ARCH_HAS_WALK_MEMORY=y
243CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 247CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
244CONFIG_KEXEC=y 248CONFIG_KEXEC=y
245# CONFIG_CRASH_DUMP is not set
246CONFIG_IRQ_ALL_CPUS=y 249CONFIG_IRQ_ALL_CPUS=y
247# CONFIG_NUMA is not set 250# CONFIG_NUMA is not set
248CONFIG_ARCH_SELECT_MEMORY_MODEL=y 251CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -255,14 +258,15 @@ CONFIG_FLATMEM_MANUAL=y
255# CONFIG_SPARSEMEM_MANUAL is not set 258# CONFIG_SPARSEMEM_MANUAL is not set
256CONFIG_FLATMEM=y 259CONFIG_FLATMEM=y
257CONFIG_FLAT_NODE_MEM_MAP=y 260CONFIG_FLAT_NODE_MEM_MAP=y
258# CONFIG_SPARSEMEM_STATIC is not set
259CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 261CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
260CONFIG_PAGEFLAGS_EXTENDED=y 262CONFIG_PAGEFLAGS_EXTENDED=y
261CONFIG_SPLIT_PTLOCK_CPUS=4 263CONFIG_SPLIT_PTLOCK_CPUS=4
262# CONFIG_MIGRATION is not set 264# CONFIG_MIGRATION is not set
263CONFIG_RESOURCES_64BIT=y 265CONFIG_RESOURCES_64BIT=y
266CONFIG_PHYS_ADDR_T_64BIT=y
264CONFIG_ZONE_DMA_FLAG=1 267CONFIG_ZONE_DMA_FLAG=1
265CONFIG_BOUNCE=y 268CONFIG_BOUNCE=y
269CONFIG_UNEVICTABLE_LRU=y
266# CONFIG_PPC_HAS_HASH_64K is not set 270# CONFIG_PPC_HAS_HASH_64K is not set
267# CONFIG_PPC_64K_PAGES is not set 271# CONFIG_PPC_64K_PAGES is not set
268CONFIG_FORCE_MAX_ZONEORDER=13 272CONFIG_FORCE_MAX_ZONEORDER=13
@@ -292,6 +296,7 @@ CONFIG_PCI_MSI=y
292# CONFIG_PCCARD is not set 296# CONFIG_PCCARD is not set
293# CONFIG_HOTPLUG_PCI is not set 297# CONFIG_HOTPLUG_PCI is not set
294# CONFIG_HAS_RAPIDIO is not set 298# CONFIG_HAS_RAPIDIO is not set
299# CONFIG_RELOCATABLE is not set
295CONFIG_PAGE_OFFSET=0xc000000000000000 300CONFIG_PAGE_OFFSET=0xc000000000000000
296CONFIG_KERNEL_START=0xc000000000000000 301CONFIG_KERNEL_START=0xc000000000000000
297CONFIG_PHYSICAL_START=0x00000000 302CONFIG_PHYSICAL_START=0x00000000
@@ -336,7 +341,6 @@ CONFIG_INET_TCP_DIAG=y
336CONFIG_TCP_CONG_CUBIC=y 341CONFIG_TCP_CONG_CUBIC=y
337CONFIG_DEFAULT_TCP_CONG="cubic" 342CONFIG_DEFAULT_TCP_CONG="cubic"
338# CONFIG_TCP_MD5SIG is not set 343# CONFIG_TCP_MD5SIG is not set
339# CONFIG_IP_VS is not set
340# CONFIG_IPV6 is not set 344# CONFIG_IPV6 is not set
341# CONFIG_NETWORK_SECMARK is not set 345# CONFIG_NETWORK_SECMARK is not set
342CONFIG_NETFILTER=y 346CONFIG_NETFILTER=y
@@ -367,10 +371,12 @@ CONFIG_NF_CONNTRACK_IRC=m
367CONFIG_NF_CONNTRACK_TFTP=m 371CONFIG_NF_CONNTRACK_TFTP=m
368CONFIG_NF_CT_NETLINK=m 372CONFIG_NF_CT_NETLINK=m
369# CONFIG_NETFILTER_XTABLES is not set 373# CONFIG_NETFILTER_XTABLES is not set
374# CONFIG_IP_VS is not set
370 375
371# 376#
372# IP: Netfilter Configuration 377# IP: Netfilter Configuration
373# 378#
379CONFIG_NF_DEFRAG_IPV4=m
374CONFIG_NF_CONNTRACK_IPV4=m 380CONFIG_NF_CONNTRACK_IPV4=m
375CONFIG_NF_CONNTRACK_PROC_COMPAT=y 381CONFIG_NF_CONNTRACK_PROC_COMPAT=y
376CONFIG_IP_NF_QUEUE=m 382CONFIG_IP_NF_QUEUE=m
@@ -381,6 +387,7 @@ CONFIG_IP_NF_QUEUE=m
381# CONFIG_TIPC is not set 387# CONFIG_TIPC is not set
382# CONFIG_ATM is not set 388# CONFIG_ATM is not set
383# CONFIG_BRIDGE is not set 389# CONFIG_BRIDGE is not set
390# CONFIG_NET_DSA is not set
384# CONFIG_VLAN_8021Q is not set 391# CONFIG_VLAN_8021Q is not set
385# CONFIG_DECNET is not set 392# CONFIG_DECNET is not set
386CONFIG_LLC=y 393CONFIG_LLC=y
@@ -402,11 +409,10 @@ CONFIG_LLC=y
402# CONFIG_IRDA is not set 409# CONFIG_IRDA is not set
403# CONFIG_BT is not set 410# CONFIG_BT is not set
404# CONFIG_AF_RXRPC is not set 411# CONFIG_AF_RXRPC is not set
405 412# CONFIG_PHONET is not set
406# 413CONFIG_WIRELESS=y
407# Wireless
408#
409# CONFIG_CFG80211 is not set 414# CONFIG_CFG80211 is not set
415CONFIG_WIRELESS_OLD_REGULATORY=y
410# CONFIG_WIRELESS_EXT is not set 416# CONFIG_WIRELESS_EXT is not set
411# CONFIG_MAC80211 is not set 417# CONFIG_MAC80211 is not set
412# CONFIG_IEEE80211 is not set 418# CONFIG_IEEE80211 is not set
@@ -463,19 +469,18 @@ CONFIG_MISC_DEVICES=y
463# CONFIG_HP_ILO is not set 469# CONFIG_HP_ILO is not set
464CONFIG_HAVE_IDE=y 470CONFIG_HAVE_IDE=y
465CONFIG_IDE=y 471CONFIG_IDE=y
466CONFIG_BLK_DEV_IDE=y
467 472
468# 473#
469# Please see Documentation/ide/ide.txt for help/info on IDE drives 474# Please see Documentation/ide/ide.txt for help/info on IDE drives
470# 475#
471CONFIG_IDE_TIMINGS=y 476CONFIG_IDE_TIMINGS=y
472# CONFIG_BLK_DEV_IDE_SATA is not set 477# CONFIG_BLK_DEV_IDE_SATA is not set
473CONFIG_BLK_DEV_IDEDISK=y 478CONFIG_IDE_GD=y
474# CONFIG_IDEDISK_MULTI_MODE is not set 479CONFIG_IDE_GD_ATA=y
480# CONFIG_IDE_GD_ATAPI is not set
475CONFIG_BLK_DEV_IDECD=y 481CONFIG_BLK_DEV_IDECD=y
476CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 482CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
477# CONFIG_BLK_DEV_IDETAPE is not set 483# CONFIG_BLK_DEV_IDETAPE is not set
478# CONFIG_BLK_DEV_IDEFLOPPY is not set
479# CONFIG_BLK_DEV_IDESCSI is not set 484# CONFIG_BLK_DEV_IDESCSI is not set
480# CONFIG_IDE_TASK_IOCTL is not set 485# CONFIG_IDE_TASK_IOCTL is not set
481CONFIG_IDE_PROC_FS=y 486CONFIG_IDE_PROC_FS=y
@@ -658,6 +663,7 @@ CONFIG_SATA_SVW=y
658# CONFIG_PATA_SCH is not set 663# CONFIG_PATA_SCH is not set
659CONFIG_MD=y 664CONFIG_MD=y
660CONFIG_BLK_DEV_MD=y 665CONFIG_BLK_DEV_MD=y
666CONFIG_MD_AUTODETECT=y
661CONFIG_MD_LINEAR=y 667CONFIG_MD_LINEAR=y
662CONFIG_MD_RAID0=y 668CONFIG_MD_RAID0=y
663CONFIG_MD_RAID1=y 669CONFIG_MD_RAID1=y
@@ -744,14 +750,17 @@ CONFIG_SUNGEM=y
744# CONFIG_IBM_NEW_EMAC_RGMII is not set 750# CONFIG_IBM_NEW_EMAC_RGMII is not set
745# CONFIG_IBM_NEW_EMAC_TAH is not set 751# CONFIG_IBM_NEW_EMAC_TAH is not set
746# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 752# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
753# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
754# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
755# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
747# CONFIG_NET_PCI is not set 756# CONFIG_NET_PCI is not set
748# CONFIG_B44 is not set 757# CONFIG_B44 is not set
758# CONFIG_ATL2 is not set
749CONFIG_NETDEV_1000=y 759CONFIG_NETDEV_1000=y
750CONFIG_ACENIC=y 760CONFIG_ACENIC=y
751CONFIG_ACENIC_OMIT_TIGON_I=y 761CONFIG_ACENIC_OMIT_TIGON_I=y
752# CONFIG_DL2K is not set 762# CONFIG_DL2K is not set
753CONFIG_E1000=y 763CONFIG_E1000=y
754# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
755# CONFIG_E1000E is not set 764# CONFIG_E1000E is not set
756# CONFIG_IP1000 is not set 765# CONFIG_IP1000 is not set
757# CONFIG_IGB is not set 766# CONFIG_IGB is not set
@@ -768,18 +777,22 @@ CONFIG_TIGON3=y
768# CONFIG_QLA3XXX is not set 777# CONFIG_QLA3XXX is not set
769# CONFIG_ATL1 is not set 778# CONFIG_ATL1 is not set
770# CONFIG_ATL1E is not set 779# CONFIG_ATL1E is not set
780# CONFIG_JME is not set
771CONFIG_NETDEV_10000=y 781CONFIG_NETDEV_10000=y
772# CONFIG_CHELSIO_T1 is not set 782# CONFIG_CHELSIO_T1 is not set
773# CONFIG_CHELSIO_T3 is not set 783# CONFIG_CHELSIO_T3 is not set
784# CONFIG_ENIC is not set
774# CONFIG_IXGBE is not set 785# CONFIG_IXGBE is not set
775# CONFIG_IXGB is not set 786# CONFIG_IXGB is not set
776# CONFIG_S2IO is not set 787# CONFIG_S2IO is not set
777# CONFIG_MYRI10GE is not set 788# CONFIG_MYRI10GE is not set
778# CONFIG_NETXEN_NIC is not set 789# CONFIG_NETXEN_NIC is not set
779# CONFIG_NIU is not set 790# CONFIG_NIU is not set
791# CONFIG_MLX4_EN is not set
780# CONFIG_MLX4_CORE is not set 792# CONFIG_MLX4_CORE is not set
781# CONFIG_TEHUTI is not set 793# CONFIG_TEHUTI is not set
782# CONFIG_BNX2X is not set 794# CONFIG_BNX2X is not set
795# CONFIG_QLGE is not set
783# CONFIG_SFC is not set 796# CONFIG_SFC is not set
784CONFIG_TR=y 797CONFIG_TR=y
785CONFIG_IBMOL=y 798CONFIG_IBMOL=y
@@ -804,6 +817,7 @@ CONFIG_USB_USBNET=m
804# CONFIG_USB_NET_AX8817X is not set 817# CONFIG_USB_NET_AX8817X is not set
805CONFIG_USB_NET_CDCETHER=m 818CONFIG_USB_NET_CDCETHER=m
806# CONFIG_USB_NET_DM9601 is not set 819# CONFIG_USB_NET_DM9601 is not set
820# CONFIG_USB_NET_SMSC95XX is not set
807# CONFIG_USB_NET_GL620A is not set 821# CONFIG_USB_NET_GL620A is not set
808# CONFIG_USB_NET_NET1080 is not set 822# CONFIG_USB_NET_NET1080 is not set
809# CONFIG_USB_NET_PLUSB is not set 823# CONFIG_USB_NET_PLUSB is not set
@@ -1015,6 +1029,17 @@ CONFIG_SSB_POSSIBLE=y
1015# CONFIG_MFD_SM501 is not set 1029# CONFIG_MFD_SM501 is not set
1016# CONFIG_HTC_PASIC3 is not set 1030# CONFIG_HTC_PASIC3 is not set
1017# CONFIG_MFD_TMIO is not set 1031# CONFIG_MFD_TMIO is not set
1032# CONFIG_PMIC_DA903X is not set
1033# CONFIG_MFD_WM8400 is not set
1034# CONFIG_MFD_WM8350_I2C is not set
1035
1036#
1037# Voltage and Current regulators
1038#
1039# CONFIG_REGULATOR is not set
1040# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1041# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1042# CONFIG_REGULATOR_BQ24022 is not set
1018 1043
1019# 1044#
1020# Multimedia devices 1045# Multimedia devices
@@ -1044,6 +1069,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
1044CONFIG_FB=y 1069CONFIG_FB=y
1045CONFIG_FIRMWARE_EDID=y 1070CONFIG_FIRMWARE_EDID=y
1046CONFIG_FB_DDC=y 1071CONFIG_FB_DDC=y
1072# CONFIG_FB_BOOT_VESA_SUPPORT is not set
1047CONFIG_FB_CFB_FILLRECT=y 1073CONFIG_FB_CFB_FILLRECT=y
1048CONFIG_FB_CFB_COPYAREA=y 1074CONFIG_FB_CFB_COPYAREA=y
1049CONFIG_FB_CFB_IMAGEBLIT=y 1075CONFIG_FB_CFB_IMAGEBLIT=y
@@ -1085,6 +1111,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1085# CONFIG_FB_S3 is not set 1111# CONFIG_FB_S3 is not set
1086# CONFIG_FB_SAVAGE is not set 1112# CONFIG_FB_SAVAGE is not set
1087# CONFIG_FB_SIS is not set 1113# CONFIG_FB_SIS is not set
1114# CONFIG_FB_VIA is not set
1088# CONFIG_FB_NEOMAGIC is not set 1115# CONFIG_FB_NEOMAGIC is not set
1089# CONFIG_FB_KYRO is not set 1116# CONFIG_FB_KYRO is not set
1090# CONFIG_FB_3DFX is not set 1117# CONFIG_FB_3DFX is not set
@@ -1096,6 +1123,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1096# CONFIG_FB_CARMINE is not set 1123# CONFIG_FB_CARMINE is not set
1097# CONFIG_FB_IBM_GXT4500 is not set 1124# CONFIG_FB_IBM_GXT4500 is not set
1098# CONFIG_FB_VIRTUAL is not set 1125# CONFIG_FB_VIRTUAL is not set
1126# CONFIG_FB_METRONOME is not set
1099CONFIG_BACKLIGHT_LCD_SUPPORT=y 1127CONFIG_BACKLIGHT_LCD_SUPPORT=y
1100CONFIG_LCD_CLASS_DEVICE=m 1128CONFIG_LCD_CLASS_DEVICE=m
1101# CONFIG_LCD_ILI9320 is not set 1129# CONFIG_LCD_ILI9320 is not set
@@ -1124,6 +1152,7 @@ CONFIG_LOGO_LINUX_MONO=y
1124CONFIG_LOGO_LINUX_VGA16=y 1152CONFIG_LOGO_LINUX_VGA16=y
1125CONFIG_LOGO_LINUX_CLUT224=y 1153CONFIG_LOGO_LINUX_CLUT224=y
1126CONFIG_SOUND=m 1154CONFIG_SOUND=m
1155CONFIG_SOUND_OSS_CORE=y
1127CONFIG_SND=m 1156CONFIG_SND=m
1128CONFIG_SND_TIMER=m 1157CONFIG_SND_TIMER=m
1129CONFIG_SND_PCM=m 1158CONFIG_SND_PCM=m
@@ -1234,15 +1263,36 @@ CONFIG_HID=y
1234# USB Input Devices 1263# USB Input Devices
1235# 1264#
1236CONFIG_USB_HID=y 1265CONFIG_USB_HID=y
1237# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1238CONFIG_HID_FF=y
1239CONFIG_HID_PID=y 1266CONFIG_HID_PID=y
1267CONFIG_USB_HIDDEV=y
1268
1269#
1270# Special HID drivers
1271#
1272CONFIG_HID_COMPAT=y
1273CONFIG_HID_A4TECH=y
1274CONFIG_HID_APPLE=y
1275CONFIG_HID_BELKIN=y
1276CONFIG_HID_BRIGHT=y
1277CONFIG_HID_CHERRY=y
1278CONFIG_HID_CHICONY=y
1279CONFIG_HID_CYPRESS=y
1280CONFIG_HID_DELL=y
1281CONFIG_HID_EZKEY=y
1282CONFIG_HID_GYRATION=y
1283CONFIG_HID_LOGITECH=y
1240CONFIG_LOGITECH_FF=y 1284CONFIG_LOGITECH_FF=y
1241# CONFIG_LOGIRUMBLEPAD2_FF is not set 1285# CONFIG_LOGIRUMBLEPAD2_FF is not set
1286CONFIG_HID_MICROSOFT=y
1287CONFIG_HID_MONTEREY=y
1288CONFIG_HID_PANTHERLORD=y
1242# CONFIG_PANTHERLORD_FF is not set 1289# CONFIG_PANTHERLORD_FF is not set
1290CONFIG_HID_PETALYNX=y
1291CONFIG_HID_SAMSUNG=y
1292CONFIG_HID_SONY=y
1293CONFIG_HID_SUNPLUS=y
1243CONFIG_THRUSTMASTER_FF=y 1294CONFIG_THRUSTMASTER_FF=y
1244# CONFIG_ZEROPLUS_FF is not set 1295# CONFIG_ZEROPLUS_FF is not set
1245CONFIG_USB_HIDDEV=y
1246CONFIG_USB_SUPPORT=y 1296CONFIG_USB_SUPPORT=y
1247CONFIG_USB_ARCH_HAS_HCD=y 1297CONFIG_USB_ARCH_HAS_HCD=y
1248CONFIG_USB_ARCH_HAS_OHCI=y 1298CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1259,6 +1309,8 @@ CONFIG_USB_DEVICE_CLASS=y
1259# CONFIG_USB_DYNAMIC_MINORS is not set 1309# CONFIG_USB_DYNAMIC_MINORS is not set
1260# CONFIG_USB_OTG is not set 1310# CONFIG_USB_OTG is not set
1261CONFIG_USB_MON=y 1311CONFIG_USB_MON=y
1312# CONFIG_USB_WUSB is not set
1313# CONFIG_USB_WUSB_CBAF is not set
1262 1314
1263# 1315#
1264# USB Host Controller Drivers 1316# USB Host Controller Drivers
@@ -1281,6 +1333,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1281# CONFIG_USB_UHCI_HCD is not set 1333# CONFIG_USB_UHCI_HCD is not set
1282# CONFIG_USB_SL811_HCD is not set 1334# CONFIG_USB_SL811_HCD is not set
1283# CONFIG_USB_R8A66597_HCD is not set 1335# CONFIG_USB_R8A66597_HCD is not set
1336# CONFIG_USB_WHCI_HCD is not set
1337# CONFIG_USB_HWA_HCD is not set
1284 1338
1285# 1339#
1286# USB Device Class drivers 1340# USB Device Class drivers
@@ -1288,6 +1342,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1288CONFIG_USB_ACM=m 1342CONFIG_USB_ACM=m
1289CONFIG_USB_PRINTER=y 1343CONFIG_USB_PRINTER=y
1290# CONFIG_USB_WDM is not set 1344# CONFIG_USB_WDM is not set
1345# CONFIG_USB_TMC is not set
1291 1346
1292# 1347#
1293# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1348# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1309,7 +1364,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
1309# CONFIG_USB_STORAGE_ALAUDA is not set 1364# CONFIG_USB_STORAGE_ALAUDA is not set
1310# CONFIG_USB_STORAGE_ONETOUCH is not set 1365# CONFIG_USB_STORAGE_ONETOUCH is not set
1311# CONFIG_USB_STORAGE_KARMA is not set 1366# CONFIG_USB_STORAGE_KARMA is not set
1312# CONFIG_USB_STORAGE_SIERRA is not set
1313# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1367# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1314# CONFIG_USB_LIBUSUAL is not set 1368# CONFIG_USB_LIBUSUAL is not set
1315 1369
@@ -1385,6 +1439,7 @@ CONFIG_USB_SERIAL_OMNINET=m
1385# CONFIG_USB_EMI62 is not set 1439# CONFIG_USB_EMI62 is not set
1386# CONFIG_USB_EMI26 is not set 1440# CONFIG_USB_EMI26 is not set
1387# CONFIG_USB_ADUTUX is not set 1441# CONFIG_USB_ADUTUX is not set
1442# CONFIG_USB_SEVSEG is not set
1388# CONFIG_USB_RIO500 is not set 1443# CONFIG_USB_RIO500 is not set
1389# CONFIG_USB_LEGOTOWER is not set 1444# CONFIG_USB_LEGOTOWER is not set
1390# CONFIG_USB_LCD is not set 1445# CONFIG_USB_LCD is not set
@@ -1402,7 +1457,9 @@ CONFIG_USB_APPLEDISPLAY=m
1402# CONFIG_USB_IOWARRIOR is not set 1457# CONFIG_USB_IOWARRIOR is not set
1403# CONFIG_USB_TEST is not set 1458# CONFIG_USB_TEST is not set
1404# CONFIG_USB_ISIGHTFW is not set 1459# CONFIG_USB_ISIGHTFW is not set
1460# CONFIG_USB_VST is not set
1405# CONFIG_USB_GADGET is not set 1461# CONFIG_USB_GADGET is not set
1462# CONFIG_UWB is not set
1406# CONFIG_MMC is not set 1463# CONFIG_MMC is not set
1407# CONFIG_MEMSTICK is not set 1464# CONFIG_MEMSTICK is not set
1408# CONFIG_NEW_LEDS is not set 1465# CONFIG_NEW_LEDS is not set
@@ -1412,6 +1469,7 @@ CONFIG_USB_APPLEDISPLAY=m
1412# CONFIG_RTC_CLASS is not set 1469# CONFIG_RTC_CLASS is not set
1413# CONFIG_DMADEVICES is not set 1470# CONFIG_DMADEVICES is not set
1414# CONFIG_UIO is not set 1471# CONFIG_UIO is not set
1472# CONFIG_STAGING is not set
1415 1473
1416# 1474#
1417# File systems 1475# File systems
@@ -1421,14 +1479,20 @@ CONFIG_EXT2_FS_XATTR=y
1421CONFIG_EXT2_FS_POSIX_ACL=y 1479CONFIG_EXT2_FS_POSIX_ACL=y
1422CONFIG_EXT2_FS_SECURITY=y 1480CONFIG_EXT2_FS_SECURITY=y
1423CONFIG_EXT2_FS_XIP=y 1481CONFIG_EXT2_FS_XIP=y
1424CONFIG_FS_XIP=y
1425CONFIG_EXT3_FS=y 1482CONFIG_EXT3_FS=y
1426CONFIG_EXT3_FS_XATTR=y 1483CONFIG_EXT3_FS_XATTR=y
1427CONFIG_EXT3_FS_POSIX_ACL=y 1484CONFIG_EXT3_FS_POSIX_ACL=y
1428CONFIG_EXT3_FS_SECURITY=y 1485CONFIG_EXT3_FS_SECURITY=y
1429# CONFIG_EXT4DEV_FS is not set 1486CONFIG_EXT4_FS=y
1487# CONFIG_EXT4DEV_COMPAT is not set
1488CONFIG_EXT4_FS_XATTR=y
1489# CONFIG_EXT4_FS_POSIX_ACL is not set
1490# CONFIG_EXT4_FS_SECURITY is not set
1491CONFIG_FS_XIP=y
1430CONFIG_JBD=y 1492CONFIG_JBD=y
1431# CONFIG_JBD_DEBUG is not set 1493# CONFIG_JBD_DEBUG is not set
1494CONFIG_JBD2=y
1495# CONFIG_JBD2_DEBUG is not set
1432CONFIG_FS_MBCACHE=y 1496CONFIG_FS_MBCACHE=y
1433CONFIG_REISERFS_FS=y 1497CONFIG_REISERFS_FS=y
1434# CONFIG_REISERFS_CHECK is not set 1498# CONFIG_REISERFS_CHECK is not set
@@ -1438,6 +1502,7 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
1438CONFIG_REISERFS_FS_SECURITY=y 1502CONFIG_REISERFS_FS_SECURITY=y
1439# CONFIG_JFS_FS is not set 1503# CONFIG_JFS_FS is not set
1440CONFIG_FS_POSIX_ACL=y 1504CONFIG_FS_POSIX_ACL=y
1505CONFIG_FILE_LOCKING=y
1441CONFIG_XFS_FS=m 1506CONFIG_XFS_FS=m
1442# CONFIG_XFS_QUOTA is not set 1507# CONFIG_XFS_QUOTA is not set
1443CONFIG_XFS_POSIX_ACL=y 1508CONFIG_XFS_POSIX_ACL=y
@@ -1478,6 +1543,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1478CONFIG_PROC_FS=y 1543CONFIG_PROC_FS=y
1479CONFIG_PROC_KCORE=y 1544CONFIG_PROC_KCORE=y
1480CONFIG_PROC_SYSCTL=y 1545CONFIG_PROC_SYSCTL=y
1546CONFIG_PROC_PAGE_MONITOR=y
1481CONFIG_SYSFS=y 1547CONFIG_SYSFS=y
1482CONFIG_TMPFS=y 1548CONFIG_TMPFS=y
1483# CONFIG_TMPFS_POSIX_ACL is not set 1549# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1521,6 +1587,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1521CONFIG_NFS_COMMON=y 1587CONFIG_NFS_COMMON=y
1522CONFIG_SUNRPC=y 1588CONFIG_SUNRPC=y
1523CONFIG_SUNRPC_GSS=y 1589CONFIG_SUNRPC_GSS=y
1590# CONFIG_SUNRPC_REGISTER_V4 is not set
1524CONFIG_RPCSEC_GSS_KRB5=y 1591CONFIG_RPCSEC_GSS_KRB5=y
1525# CONFIG_RPCSEC_GSS_SPKM3 is not set 1592# CONFIG_RPCSEC_GSS_SPKM3 is not set
1526# CONFIG_SMB_FS is not set 1593# CONFIG_SMB_FS is not set
@@ -1601,9 +1668,8 @@ CONFIG_NLS_UTF8=y
1601# Library routines 1668# Library routines
1602# 1669#
1603CONFIG_BITREVERSE=y 1670CONFIG_BITREVERSE=y
1604# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1605CONFIG_CRC_CCITT=m 1671CONFIG_CRC_CCITT=m
1606# CONFIG_CRC16 is not set 1672CONFIG_CRC16=y
1607CONFIG_CRC_T10DIF=y 1673CONFIG_CRC_T10DIF=y
1608CONFIG_CRC_ITU_T=m 1674CONFIG_CRC_ITU_T=m
1609CONFIG_CRC32=y 1675CONFIG_CRC32=y
@@ -1657,19 +1723,26 @@ CONFIG_DEBUG_BUGVERBOSE=y
1657CONFIG_DEBUG_MEMORY_INIT=y 1723CONFIG_DEBUG_MEMORY_INIT=y
1658# CONFIG_DEBUG_LIST is not set 1724# CONFIG_DEBUG_LIST is not set
1659# CONFIG_DEBUG_SG is not set 1725# CONFIG_DEBUG_SG is not set
1660CONFIG_FRAME_POINTER=y
1661# CONFIG_BOOT_PRINTK_DELAY is not set 1726# CONFIG_BOOT_PRINTK_DELAY is not set
1662# CONFIG_RCU_TORTURE_TEST is not set 1727# CONFIG_RCU_TORTURE_TEST is not set
1728# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1663# CONFIG_BACKTRACE_SELF_TEST is not set 1729# CONFIG_BACKTRACE_SELF_TEST is not set
1730# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1664# CONFIG_FAULT_INJECTION is not set 1731# CONFIG_FAULT_INJECTION is not set
1665CONFIG_LATENCYTOP=y 1732CONFIG_LATENCYTOP=y
1666CONFIG_SYSCTL_SYSCALL_CHECK=y 1733CONFIG_SYSCTL_SYSCALL_CHECK=y
1667CONFIG_HAVE_FTRACE=y 1734CONFIG_HAVE_FUNCTION_TRACER=y
1668CONFIG_HAVE_DYNAMIC_FTRACE=y 1735
1669# CONFIG_FTRACE is not set 1736#
1737# Tracers
1738#
1739# CONFIG_FUNCTION_TRACER is not set
1670# CONFIG_IRQSOFF_TRACER is not set 1740# CONFIG_IRQSOFF_TRACER is not set
1671# CONFIG_SCHED_TRACER is not set 1741# CONFIG_SCHED_TRACER is not set
1672# CONFIG_CONTEXT_SWITCH_TRACER is not set 1742# CONFIG_CONTEXT_SWITCH_TRACER is not set
1743# CONFIG_BOOT_TRACER is not set
1744# CONFIG_STACK_TRACER is not set
1745CONFIG_DYNAMIC_PRINTK_DEBUG=y
1673# CONFIG_SAMPLES is not set 1746# CONFIG_SAMPLES is not set
1674CONFIG_HAVE_ARCH_KGDB=y 1747CONFIG_HAVE_ARCH_KGDB=y
1675# CONFIG_KGDB is not set 1748# CONFIG_KGDB is not set
@@ -1678,6 +1751,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1678# CONFIG_DEBUG_PAGEALLOC is not set 1751# CONFIG_DEBUG_PAGEALLOC is not set
1679# CONFIG_CODE_PATCHING_SELFTEST is not set 1752# CONFIG_CODE_PATCHING_SELFTEST is not set
1680# CONFIG_FTR_FIXUP_SELFTEST is not set 1753# CONFIG_FTR_FIXUP_SELFTEST is not set
1754# CONFIG_MSI_BITMAP_SELFTEST is not set
1681# CONFIG_XMON is not set 1755# CONFIG_XMON is not set
1682CONFIG_IRQSTACKS=y 1756CONFIG_IRQSTACKS=y
1683# CONFIG_VIRQ_DEBUG is not set 1757# CONFIG_VIRQ_DEBUG is not set
@@ -1689,16 +1763,19 @@ CONFIG_BOOTX_TEXT=y
1689# 1763#
1690# CONFIG_KEYS is not set 1764# CONFIG_KEYS is not set
1691# CONFIG_SECURITY is not set 1765# CONFIG_SECURITY is not set
1766# CONFIG_SECURITYFS is not set
1692# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1767# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1693CONFIG_CRYPTO=y 1768CONFIG_CRYPTO=y
1694 1769
1695# 1770#
1696# Crypto core or helper 1771# Crypto core or helper
1697# 1772#
1773# CONFIG_CRYPTO_FIPS is not set
1698CONFIG_CRYPTO_ALGAPI=y 1774CONFIG_CRYPTO_ALGAPI=y
1699CONFIG_CRYPTO_AEAD=m 1775CONFIG_CRYPTO_AEAD=y
1700CONFIG_CRYPTO_BLKCIPHER=y 1776CONFIG_CRYPTO_BLKCIPHER=y
1701CONFIG_CRYPTO_HASH=y 1777CONFIG_CRYPTO_HASH=y
1778CONFIG_CRYPTO_RNG=y
1702CONFIG_CRYPTO_MANAGER=y 1779CONFIG_CRYPTO_MANAGER=y
1703# CONFIG_CRYPTO_GF128MUL is not set 1780# CONFIG_CRYPTO_GF128MUL is not set
1704CONFIG_CRYPTO_NULL=m 1781CONFIG_CRYPTO_NULL=m
@@ -1772,6 +1849,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1772# 1849#
1773CONFIG_CRYPTO_DEFLATE=m 1850CONFIG_CRYPTO_DEFLATE=m
1774# CONFIG_CRYPTO_LZO is not set 1851# CONFIG_CRYPTO_LZO is not set
1852
1853#
1854# Random Number Generation
1855#
1856# CONFIG_CRYPTO_ANSI_CPRNG is not set
1775# CONFIG_CRYPTO_HW is not set 1857# CONFIG_CRYPTO_HW is not set
1776# CONFIG_PPC_CLOCK is not set 1858# CONFIG_PPC_CLOCK is not set
1777# CONFIG_VIRTUALIZATION is not set 1859# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index 2c3f13577f4b..f925c555508e 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Tue Aug 26 13:15:49 2008 4# Tue Nov 11 19:36:38 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -21,7 +21,7 @@ CONFIG_SMP=y
21CONFIG_NR_CPUS=32 21CONFIG_NR_CPUS=32
22CONFIG_64BIT=y 22CONFIG_64BIT=y
23CONFIG_WORD_SIZE=64 23CONFIG_WORD_SIZE=64
24CONFIG_PPC_MERGE=y 24CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
25CONFIG_MMU=y 25CONFIG_MMU=y
26CONFIG_GENERIC_CMOS_UPDATE=y 26CONFIG_GENERIC_CMOS_UPDATE=y
27CONFIG_GENERIC_TIME=y 27CONFIG_GENERIC_TIME=y
@@ -111,7 +111,9 @@ CONFIG_SIGNALFD=y
111CONFIG_TIMERFD=y 111CONFIG_TIMERFD=y
112CONFIG_EVENTFD=y 112CONFIG_EVENTFD=y
113CONFIG_SHMEM=y 113CONFIG_SHMEM=y
114CONFIG_AIO=y
114CONFIG_VM_EVENT_COUNTERS=y 115CONFIG_VM_EVENT_COUNTERS=y
116CONFIG_PCI_QUIRKS=y
115CONFIG_SLUB_DEBUG=y 117CONFIG_SLUB_DEBUG=y
116# CONFIG_SLAB is not set 118# CONFIG_SLAB is not set
117CONFIG_SLUB=y 119CONFIG_SLUB=y
@@ -127,8 +129,6 @@ CONFIG_HAVE_KRETPROBES=y
127CONFIG_HAVE_ARCH_TRACEHOOK=y 129CONFIG_HAVE_ARCH_TRACEHOOK=y
128CONFIG_HAVE_DMA_ATTRS=y 130CONFIG_HAVE_DMA_ATTRS=y
129CONFIG_USE_GENERIC_SMP_HELPERS=y 131CONFIG_USE_GENERIC_SMP_HELPERS=y
130# CONFIG_HAVE_CLK is not set
131CONFIG_PROC_PAGE_MONITOR=y
132# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 132# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
133CONFIG_SLABINFO=y 133CONFIG_SLABINFO=y
134CONFIG_RT_MUTEXES=y 134CONFIG_RT_MUTEXES=y
@@ -161,6 +161,7 @@ CONFIG_DEFAULT_AS=y
161# CONFIG_DEFAULT_NOOP is not set 161# CONFIG_DEFAULT_NOOP is not set
162CONFIG_DEFAULT_IOSCHED="anticipatory" 162CONFIG_DEFAULT_IOSCHED="anticipatory"
163CONFIG_CLASSIC_RCU=y 163CONFIG_CLASSIC_RCU=y
164# CONFIG_FREEZER is not set
164 165
165# 166#
166# Platform support 167# Platform support
@@ -219,6 +220,8 @@ CONFIG_PREEMPT_NONE=y
219# CONFIG_PREEMPT is not set 220# CONFIG_PREEMPT is not set
220CONFIG_BINFMT_ELF=y 221CONFIG_BINFMT_ELF=y
221CONFIG_COMPAT_BINFMT_ELF=y 222CONFIG_COMPAT_BINFMT_ELF=y
223# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
224# CONFIG_HAVE_AOUT is not set
222# CONFIG_BINFMT_MISC is not set 225# CONFIG_BINFMT_MISC is not set
223CONFIG_IOMMU_VMERGE=y 226CONFIG_IOMMU_VMERGE=y
224CONFIG_IOMMU_HELPER=y 227CONFIG_IOMMU_HELPER=y
@@ -226,7 +229,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
226CONFIG_ARCH_HAS_WALK_MEMORY=y 229CONFIG_ARCH_HAS_WALK_MEMORY=y
227CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 230CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
228# CONFIG_KEXEC is not set 231# CONFIG_KEXEC is not set
229# CONFIG_CRASH_DUMP is not set
230CONFIG_IRQ_ALL_CPUS=y 232CONFIG_IRQ_ALL_CPUS=y
231# CONFIG_NUMA is not set 233# CONFIG_NUMA is not set
232CONFIG_ARCH_SELECT_MEMORY_MODEL=y 234CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -239,14 +241,15 @@ CONFIG_FLATMEM_MANUAL=y
239# CONFIG_SPARSEMEM_MANUAL is not set 241# CONFIG_SPARSEMEM_MANUAL is not set
240CONFIG_FLATMEM=y 242CONFIG_FLATMEM=y
241CONFIG_FLAT_NODE_MEM_MAP=y 243CONFIG_FLAT_NODE_MEM_MAP=y
242# CONFIG_SPARSEMEM_STATIC is not set
243CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 244CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
244CONFIG_PAGEFLAGS_EXTENDED=y 245CONFIG_PAGEFLAGS_EXTENDED=y
245CONFIG_SPLIT_PTLOCK_CPUS=4 246CONFIG_SPLIT_PTLOCK_CPUS=4
246# CONFIG_MIGRATION is not set 247# CONFIG_MIGRATION is not set
247CONFIG_RESOURCES_64BIT=y 248CONFIG_RESOURCES_64BIT=y
249CONFIG_PHYS_ADDR_T_64BIT=y
248CONFIG_ZONE_DMA_FLAG=1 250CONFIG_ZONE_DMA_FLAG=1
249CONFIG_BOUNCE=y 251CONFIG_BOUNCE=y
252CONFIG_UNEVICTABLE_LRU=y
250# CONFIG_PPC_HAS_HASH_64K is not set 253# CONFIG_PPC_HAS_HASH_64K is not set
251# CONFIG_PPC_64K_PAGES is not set 254# CONFIG_PPC_64K_PAGES is not set
252CONFIG_FORCE_MAX_ZONEORDER=13 255CONFIG_FORCE_MAX_ZONEORDER=13
@@ -275,6 +278,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
275# CONFIG_PCCARD is not set 278# CONFIG_PCCARD is not set
276# CONFIG_HOTPLUG_PCI is not set 279# CONFIG_HOTPLUG_PCI is not set
277# CONFIG_HAS_RAPIDIO is not set 280# CONFIG_HAS_RAPIDIO is not set
281# CONFIG_RELOCATABLE is not set
278CONFIG_PAGE_OFFSET=0xc000000000000000 282CONFIG_PAGE_OFFSET=0xc000000000000000
279CONFIG_KERNEL_START=0xc000000000000000 283CONFIG_KERNEL_START=0xc000000000000000
280CONFIG_PHYSICAL_START=0x00000000 284CONFIG_PHYSICAL_START=0x00000000
@@ -319,7 +323,6 @@ CONFIG_INET_TCP_DIAG=y
319CONFIG_TCP_CONG_CUBIC=y 323CONFIG_TCP_CONG_CUBIC=y
320CONFIG_DEFAULT_TCP_CONG="cubic" 324CONFIG_DEFAULT_TCP_CONG="cubic"
321# CONFIG_TCP_MD5SIG is not set 325# CONFIG_TCP_MD5SIG is not set
322# CONFIG_IP_VS is not set
323# CONFIG_IPV6 is not set 326# CONFIG_IPV6 is not set
324# CONFIG_NETWORK_SECMARK is not set 327# CONFIG_NETWORK_SECMARK is not set
325CONFIG_NETFILTER=y 328CONFIG_NETFILTER=y
@@ -349,15 +352,17 @@ CONFIG_NF_CONNTRACK_IRC=m
349# CONFIG_NF_CONNTRACK_SIP is not set 352# CONFIG_NF_CONNTRACK_SIP is not set
350CONFIG_NF_CONNTRACK_TFTP=m 353CONFIG_NF_CONNTRACK_TFTP=m
351CONFIG_NF_CT_NETLINK=m 354CONFIG_NF_CT_NETLINK=m
355CONFIG_NETFILTER_TPROXY=m
352CONFIG_NETFILTER_XTABLES=m 356CONFIG_NETFILTER_XTABLES=m
353CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 357CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
354CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 358CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
355CONFIG_NETFILTER_XT_TARGET_DSCP=m 359CONFIG_NETFILTER_XT_TARGET_DSCP=m
356CONFIG_NETFILTER_XT_TARGET_MARK=m 360CONFIG_NETFILTER_XT_TARGET_MARK=m
357CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
358# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 361# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
362CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
359# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set 363# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
360CONFIG_NETFILTER_XT_TARGET_RATEEST=m 364CONFIG_NETFILTER_XT_TARGET_RATEEST=m
365CONFIG_NETFILTER_XT_TARGET_TPROXY=m
361# CONFIG_NETFILTER_XT_TARGET_TRACE is not set 366# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
362# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 367# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
363CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 368CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
@@ -369,40 +374,44 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
369# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 374# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
370CONFIG_NETFILTER_XT_MATCH_DSCP=m 375CONFIG_NETFILTER_XT_MATCH_DSCP=m
371# CONFIG_NETFILTER_XT_MATCH_ESP is not set 376# CONFIG_NETFILTER_XT_MATCH_ESP is not set
377# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
372# CONFIG_NETFILTER_XT_MATCH_HELPER is not set 378# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
373CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 379CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
374CONFIG_NETFILTER_XT_MATCH_LENGTH=m 380CONFIG_NETFILTER_XT_MATCH_LENGTH=m
375CONFIG_NETFILTER_XT_MATCH_LIMIT=m 381CONFIG_NETFILTER_XT_MATCH_LIMIT=m
376CONFIG_NETFILTER_XT_MATCH_MAC=m 382CONFIG_NETFILTER_XT_MATCH_MAC=m
377CONFIG_NETFILTER_XT_MATCH_MARK=m 383CONFIG_NETFILTER_XT_MATCH_MARK=m
384# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
378CONFIG_NETFILTER_XT_MATCH_OWNER=m 385CONFIG_NETFILTER_XT_MATCH_OWNER=m
379# CONFIG_NETFILTER_XT_MATCH_POLICY is not set 386# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
380# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
381CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 387CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
382# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 388# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
383CONFIG_NETFILTER_XT_MATCH_RATEEST=m 389CONFIG_NETFILTER_XT_MATCH_RATEEST=m
384CONFIG_NETFILTER_XT_MATCH_REALM=m 390CONFIG_NETFILTER_XT_MATCH_REALM=m
391CONFIG_NETFILTER_XT_MATCH_RECENT=m
392# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
385CONFIG_NETFILTER_XT_MATCH_SCTP=m 393CONFIG_NETFILTER_XT_MATCH_SCTP=m
394# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
386# CONFIG_NETFILTER_XT_MATCH_STATE is not set 395# CONFIG_NETFILTER_XT_MATCH_STATE is not set
387# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 396# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
388CONFIG_NETFILTER_XT_MATCH_STRING=m 397CONFIG_NETFILTER_XT_MATCH_STRING=m
389CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 398CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
390CONFIG_NETFILTER_XT_MATCH_TIME=m 399CONFIG_NETFILTER_XT_MATCH_TIME=m
391# CONFIG_NETFILTER_XT_MATCH_U32 is not set 400# CONFIG_NETFILTER_XT_MATCH_U32 is not set
392# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 401# CONFIG_IP_VS is not set
393 402
394# 403#
395# IP: Netfilter Configuration 404# IP: Netfilter Configuration
396# 405#
406CONFIG_NF_DEFRAG_IPV4=m
397CONFIG_NF_CONNTRACK_IPV4=m 407CONFIG_NF_CONNTRACK_IPV4=m
398CONFIG_NF_CONNTRACK_PROC_COMPAT=y 408CONFIG_NF_CONNTRACK_PROC_COMPAT=y
399CONFIG_IP_NF_QUEUE=m 409CONFIG_IP_NF_QUEUE=m
400CONFIG_IP_NF_IPTABLES=m 410CONFIG_IP_NF_IPTABLES=m
401CONFIG_IP_NF_MATCH_RECENT=m 411CONFIG_IP_NF_MATCH_ADDRTYPE=m
402CONFIG_IP_NF_MATCH_ECN=m
403# CONFIG_IP_NF_MATCH_AH is not set 412# CONFIG_IP_NF_MATCH_AH is not set
413CONFIG_IP_NF_MATCH_ECN=m
404CONFIG_IP_NF_MATCH_TTL=m 414CONFIG_IP_NF_MATCH_TTL=m
405CONFIG_IP_NF_MATCH_ADDRTYPE=m
406CONFIG_IP_NF_FILTER=m 415CONFIG_IP_NF_FILTER=m
407CONFIG_IP_NF_TARGET_REJECT=m 416CONFIG_IP_NF_TARGET_REJECT=m
408CONFIG_IP_NF_TARGET_LOG=m 417CONFIG_IP_NF_TARGET_LOG=m
@@ -410,8 +419,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
410CONFIG_NF_NAT=m 419CONFIG_NF_NAT=m
411CONFIG_NF_NAT_NEEDED=y 420CONFIG_NF_NAT_NEEDED=y
412CONFIG_IP_NF_TARGET_MASQUERADE=m 421CONFIG_IP_NF_TARGET_MASQUERADE=m
413CONFIG_IP_NF_TARGET_REDIRECT=m
414CONFIG_IP_NF_TARGET_NETMAP=m 422CONFIG_IP_NF_TARGET_NETMAP=m
423CONFIG_IP_NF_TARGET_REDIRECT=m
415# CONFIG_NF_NAT_SNMP_BASIC is not set 424# CONFIG_NF_NAT_SNMP_BASIC is not set
416CONFIG_NF_NAT_FTP=m 425CONFIG_NF_NAT_FTP=m
417CONFIG_NF_NAT_IRC=m 426CONFIG_NF_NAT_IRC=m
@@ -421,9 +430,9 @@ CONFIG_NF_NAT_TFTP=m
421# CONFIG_NF_NAT_H323 is not set 430# CONFIG_NF_NAT_H323 is not set
422# CONFIG_NF_NAT_SIP is not set 431# CONFIG_NF_NAT_SIP is not set
423CONFIG_IP_NF_MANGLE=m 432CONFIG_IP_NF_MANGLE=m
433CONFIG_IP_NF_TARGET_CLUSTERIP=m
424CONFIG_IP_NF_TARGET_ECN=m 434CONFIG_IP_NF_TARGET_ECN=m
425CONFIG_IP_NF_TARGET_TTL=m 435CONFIG_IP_NF_TARGET_TTL=m
426CONFIG_IP_NF_TARGET_CLUSTERIP=m
427CONFIG_IP_NF_RAW=m 436CONFIG_IP_NF_RAW=m
428CONFIG_IP_NF_ARPTABLES=m 437CONFIG_IP_NF_ARPTABLES=m
429CONFIG_IP_NF_ARPFILTER=m 438CONFIG_IP_NF_ARPFILTER=m
@@ -438,6 +447,7 @@ CONFIG_SCTP_HMAC_MD5=y
438# CONFIG_TIPC is not set 447# CONFIG_TIPC is not set
439# CONFIG_ATM is not set 448# CONFIG_ATM is not set
440# CONFIG_BRIDGE is not set 449# CONFIG_BRIDGE is not set
450# CONFIG_NET_DSA is not set
441# CONFIG_VLAN_8021Q is not set 451# CONFIG_VLAN_8021Q is not set
442# CONFIG_DECNET is not set 452# CONFIG_DECNET is not set
443CONFIG_LLC=y 453CONFIG_LLC=y
@@ -460,14 +470,8 @@ CONFIG_NET_CLS_ROUTE=y
460# CONFIG_IRDA is not set 470# CONFIG_IRDA is not set
461# CONFIG_BT is not set 471# CONFIG_BT is not set
462# CONFIG_AF_RXRPC is not set 472# CONFIG_AF_RXRPC is not set
463 473# CONFIG_PHONET is not set
464# 474# CONFIG_WIRELESS is not set
465# Wireless
466#
467# CONFIG_CFG80211 is not set
468# CONFIG_WIRELESS_EXT is not set
469# CONFIG_MAC80211 is not set
470# CONFIG_IEEE80211 is not set
471# CONFIG_RFKILL is not set 475# CONFIG_RFKILL is not set
472# CONFIG_NET_9P is not set 476# CONFIG_NET_9P is not set
473 477
@@ -597,6 +601,7 @@ CONFIG_SCSI_IBMVSCSI=m
597# CONFIG_ATA is not set 601# CONFIG_ATA is not set
598CONFIG_MD=y 602CONFIG_MD=y
599CONFIG_BLK_DEV_MD=y 603CONFIG_BLK_DEV_MD=y
604CONFIG_MD_AUTODETECT=y
600CONFIG_MD_LINEAR=y 605CONFIG_MD_LINEAR=y
601CONFIG_MD_RAID0=y 606CONFIG_MD_RAID0=y
602CONFIG_MD_RAID1=y 607CONFIG_MD_RAID1=y
@@ -647,6 +652,9 @@ CONFIG_MII=y
647# CONFIG_IBM_NEW_EMAC_RGMII is not set 652# CONFIG_IBM_NEW_EMAC_RGMII is not set
648# CONFIG_IBM_NEW_EMAC_TAH is not set 653# CONFIG_IBM_NEW_EMAC_TAH is not set
649# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 654# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
655# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
656# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
657# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
650CONFIG_NET_PCI=y 658CONFIG_NET_PCI=y
651CONFIG_PCNET32=y 659CONFIG_PCNET32=y
652# CONFIG_AMD8111_ETH is not set 660# CONFIG_AMD8111_ETH is not set
@@ -667,12 +675,12 @@ CONFIG_E100=y
667# CONFIG_TLAN is not set 675# CONFIG_TLAN is not set
668# CONFIG_VIA_RHINE is not set 676# CONFIG_VIA_RHINE is not set
669# CONFIG_SC92031 is not set 677# CONFIG_SC92031 is not set
678# CONFIG_ATL2 is not set
670CONFIG_NETDEV_1000=y 679CONFIG_NETDEV_1000=y
671CONFIG_ACENIC=m 680CONFIG_ACENIC=m
672# CONFIG_ACENIC_OMIT_TIGON_I is not set 681# CONFIG_ACENIC_OMIT_TIGON_I is not set
673# CONFIG_DL2K is not set 682# CONFIG_DL2K is not set
674CONFIG_E1000=m 683CONFIG_E1000=m
675# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
676# CONFIG_E1000E is not set 684# CONFIG_E1000E is not set
677# CONFIG_IP1000 is not set 685# CONFIG_IP1000 is not set
678# CONFIG_IGB is not set 686# CONFIG_IGB is not set
@@ -689,18 +697,22 @@ CONFIG_E1000=m
689# CONFIG_QLA3XXX is not set 697# CONFIG_QLA3XXX is not set
690# CONFIG_ATL1 is not set 698# CONFIG_ATL1 is not set
691# CONFIG_ATL1E is not set 699# CONFIG_ATL1E is not set
700# CONFIG_JME is not set
692CONFIG_NETDEV_10000=y 701CONFIG_NETDEV_10000=y
693# CONFIG_CHELSIO_T1 is not set 702# CONFIG_CHELSIO_T1 is not set
694# CONFIG_CHELSIO_T3 is not set 703# CONFIG_CHELSIO_T3 is not set
704# CONFIG_ENIC is not set
695# CONFIG_IXGBE is not set 705# CONFIG_IXGBE is not set
696# CONFIG_IXGB is not set 706# CONFIG_IXGB is not set
697# CONFIG_S2IO is not set 707# CONFIG_S2IO is not set
698# CONFIG_MYRI10GE is not set 708# CONFIG_MYRI10GE is not set
699# CONFIG_NETXEN_NIC is not set 709# CONFIG_NETXEN_NIC is not set
700# CONFIG_NIU is not set 710# CONFIG_NIU is not set
711# CONFIG_MLX4_EN is not set
701# CONFIG_MLX4_CORE is not set 712# CONFIG_MLX4_CORE is not set
702# CONFIG_TEHUTI is not set 713# CONFIG_TEHUTI is not set
703# CONFIG_BNX2X is not set 714# CONFIG_BNX2X is not set
715# CONFIG_QLGE is not set
704# CONFIG_SFC is not set 716# CONFIG_SFC is not set
705CONFIG_TR=y 717CONFIG_TR=y
706CONFIG_IBMOL=y 718CONFIG_IBMOL=y
@@ -838,6 +850,14 @@ CONFIG_SSB_POSSIBLE=y
838# CONFIG_MFD_TMIO is not set 850# CONFIG_MFD_TMIO is not set
839 851
840# 852#
853# Voltage and Current regulators
854#
855# CONFIG_REGULATOR is not set
856# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
857# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
858# CONFIG_REGULATOR_BQ24022 is not set
859
860#
841# Multimedia devices 861# Multimedia devices
842# 862#
843 863
@@ -877,6 +897,7 @@ CONFIG_DUMMY_CONSOLE=y
877# CONFIG_SOUND is not set 897# CONFIG_SOUND is not set
878# CONFIG_HID_SUPPORT is not set 898# CONFIG_HID_SUPPORT is not set
879# CONFIG_USB_SUPPORT is not set 899# CONFIG_USB_SUPPORT is not set
900# CONFIG_UWB is not set
880# CONFIG_MMC is not set 901# CONFIG_MMC is not set
881# CONFIG_MEMSTICK is not set 902# CONFIG_MEMSTICK is not set
882# CONFIG_NEW_LEDS is not set 903# CONFIG_NEW_LEDS is not set
@@ -886,6 +907,7 @@ CONFIG_DUMMY_CONSOLE=y
886# CONFIG_RTC_CLASS is not set 907# CONFIG_RTC_CLASS is not set
887# CONFIG_DMADEVICES is not set 908# CONFIG_DMADEVICES is not set
888# CONFIG_UIO is not set 909# CONFIG_UIO is not set
910# CONFIG_STAGING is not set
889 911
890# 912#
891# File systems 913# File systems
@@ -895,14 +917,20 @@ CONFIG_EXT2_FS_XATTR=y
895CONFIG_EXT2_FS_POSIX_ACL=y 917CONFIG_EXT2_FS_POSIX_ACL=y
896CONFIG_EXT2_FS_SECURITY=y 918CONFIG_EXT2_FS_SECURITY=y
897CONFIG_EXT2_FS_XIP=y 919CONFIG_EXT2_FS_XIP=y
898CONFIG_FS_XIP=y
899CONFIG_EXT3_FS=y 920CONFIG_EXT3_FS=y
900CONFIG_EXT3_FS_XATTR=y 921CONFIG_EXT3_FS_XATTR=y
901CONFIG_EXT3_FS_POSIX_ACL=y 922CONFIG_EXT3_FS_POSIX_ACL=y
902CONFIG_EXT3_FS_SECURITY=y 923CONFIG_EXT3_FS_SECURITY=y
903# CONFIG_EXT4DEV_FS is not set 924CONFIG_EXT4_FS=y
925# CONFIG_EXT4DEV_COMPAT is not set
926CONFIG_EXT4_FS_XATTR=y
927# CONFIG_EXT4_FS_POSIX_ACL is not set
928# CONFIG_EXT4_FS_SECURITY is not set
929CONFIG_FS_XIP=y
904CONFIG_JBD=y 930CONFIG_JBD=y
905# CONFIG_JBD_DEBUG is not set 931# CONFIG_JBD_DEBUG is not set
932CONFIG_JBD2=y
933# CONFIG_JBD2_DEBUG is not set
906CONFIG_FS_MBCACHE=y 934CONFIG_FS_MBCACHE=y
907CONFIG_REISERFS_FS=y 935CONFIG_REISERFS_FS=y
908# CONFIG_REISERFS_CHECK is not set 936# CONFIG_REISERFS_CHECK is not set
@@ -916,6 +944,7 @@ CONFIG_JFS_SECURITY=y
916# CONFIG_JFS_DEBUG is not set 944# CONFIG_JFS_DEBUG is not set
917# CONFIG_JFS_STATISTICS is not set 945# CONFIG_JFS_STATISTICS is not set
918CONFIG_FS_POSIX_ACL=y 946CONFIG_FS_POSIX_ACL=y
947CONFIG_FILE_LOCKING=y
919CONFIG_XFS_FS=m 948CONFIG_XFS_FS=m
920# CONFIG_XFS_QUOTA is not set 949# CONFIG_XFS_QUOTA is not set
921CONFIG_XFS_POSIX_ACL=y 950CONFIG_XFS_POSIX_ACL=y
@@ -958,6 +987,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
958CONFIG_PROC_FS=y 987CONFIG_PROC_FS=y
959CONFIG_PROC_KCORE=y 988CONFIG_PROC_KCORE=y
960CONFIG_PROC_SYSCTL=y 989CONFIG_PROC_SYSCTL=y
990CONFIG_PROC_PAGE_MONITOR=y
961CONFIG_SYSFS=y 991CONFIG_SYSFS=y
962CONFIG_TMPFS=y 992CONFIG_TMPFS=y
963CONFIG_TMPFS_POSIX_ACL=y 993CONFIG_TMPFS_POSIX_ACL=y
@@ -1001,6 +1031,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1001CONFIG_NFS_COMMON=y 1031CONFIG_NFS_COMMON=y
1002CONFIG_SUNRPC=y 1032CONFIG_SUNRPC=y
1003CONFIG_SUNRPC_GSS=y 1033CONFIG_SUNRPC_GSS=y
1034# CONFIG_SUNRPC_REGISTER_V4 is not set
1004CONFIG_RPCSEC_GSS_KRB5=y 1035CONFIG_RPCSEC_GSS_KRB5=y
1005CONFIG_RPCSEC_GSS_SPKM3=m 1036CONFIG_RPCSEC_GSS_SPKM3=m
1006# CONFIG_SMB_FS is not set 1037# CONFIG_SMB_FS is not set
@@ -1067,9 +1098,8 @@ CONFIG_DLM=m
1067# Library routines 1098# Library routines
1068# 1099#
1069CONFIG_BITREVERSE=y 1100CONFIG_BITREVERSE=y
1070# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1071CONFIG_CRC_CCITT=m 1101CONFIG_CRC_CCITT=m
1072# CONFIG_CRC16 is not set 1102CONFIG_CRC16=y
1073CONFIG_CRC_T10DIF=y 1103CONFIG_CRC_T10DIF=y
1074CONFIG_CRC_ITU_T=m 1104CONFIG_CRC_ITU_T=m
1075CONFIG_CRC32=y 1105CONFIG_CRC32=y
@@ -1127,19 +1157,26 @@ CONFIG_DEBUG_BUGVERBOSE=y
1127CONFIG_DEBUG_MEMORY_INIT=y 1157CONFIG_DEBUG_MEMORY_INIT=y
1128# CONFIG_DEBUG_LIST is not set 1158# CONFIG_DEBUG_LIST is not set
1129# CONFIG_DEBUG_SG is not set 1159# CONFIG_DEBUG_SG is not set
1130CONFIG_FRAME_POINTER=y
1131# CONFIG_BOOT_PRINTK_DELAY is not set 1160# CONFIG_BOOT_PRINTK_DELAY is not set
1132# CONFIG_RCU_TORTURE_TEST is not set 1161# CONFIG_RCU_TORTURE_TEST is not set
1162# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1133# CONFIG_BACKTRACE_SELF_TEST is not set 1163# CONFIG_BACKTRACE_SELF_TEST is not set
1164# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1134# CONFIG_FAULT_INJECTION is not set 1165# CONFIG_FAULT_INJECTION is not set
1135CONFIG_LATENCYTOP=y 1166CONFIG_LATENCYTOP=y
1136CONFIG_SYSCTL_SYSCALL_CHECK=y 1167CONFIG_SYSCTL_SYSCALL_CHECK=y
1137CONFIG_HAVE_FTRACE=y 1168CONFIG_HAVE_FUNCTION_TRACER=y
1138CONFIG_HAVE_DYNAMIC_FTRACE=y 1169
1139# CONFIG_FTRACE is not set 1170#
1171# Tracers
1172#
1173# CONFIG_FUNCTION_TRACER is not set
1140# CONFIG_IRQSOFF_TRACER is not set 1174# CONFIG_IRQSOFF_TRACER is not set
1141# CONFIG_SCHED_TRACER is not set 1175# CONFIG_SCHED_TRACER is not set
1142# CONFIG_CONTEXT_SWITCH_TRACER is not set 1176# CONFIG_CONTEXT_SWITCH_TRACER is not set
1177# CONFIG_BOOT_TRACER is not set
1178# CONFIG_STACK_TRACER is not set
1179CONFIG_DYNAMIC_PRINTK_DEBUG=y
1143# CONFIG_SAMPLES is not set 1180# CONFIG_SAMPLES is not set
1144CONFIG_HAVE_ARCH_KGDB=y 1181CONFIG_HAVE_ARCH_KGDB=y
1145# CONFIG_KGDB is not set 1182# CONFIG_KGDB is not set
@@ -1148,6 +1185,7 @@ CONFIG_DEBUG_STACK_USAGE=y
1148# CONFIG_DEBUG_PAGEALLOC is not set 1185# CONFIG_DEBUG_PAGEALLOC is not set
1149# CONFIG_CODE_PATCHING_SELFTEST is not set 1186# CONFIG_CODE_PATCHING_SELFTEST is not set
1150# CONFIG_FTR_FIXUP_SELFTEST is not set 1187# CONFIG_FTR_FIXUP_SELFTEST is not set
1188# CONFIG_MSI_BITMAP_SELFTEST is not set
1151# CONFIG_XMON is not set 1189# CONFIG_XMON is not set
1152CONFIG_IRQSTACKS=y 1190CONFIG_IRQSTACKS=y
1153# CONFIG_VIRQ_DEBUG is not set 1191# CONFIG_VIRQ_DEBUG is not set
@@ -1159,16 +1197,19 @@ CONFIG_IRQSTACKS=y
1159# 1197#
1160# CONFIG_KEYS is not set 1198# CONFIG_KEYS is not set
1161# CONFIG_SECURITY is not set 1199# CONFIG_SECURITY is not set
1200# CONFIG_SECURITYFS is not set
1162# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1201# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1163CONFIG_CRYPTO=y 1202CONFIG_CRYPTO=y
1164 1203
1165# 1204#
1166# Crypto core or helper 1205# Crypto core or helper
1167# 1206#
1207# CONFIG_CRYPTO_FIPS is not set
1168CONFIG_CRYPTO_ALGAPI=y 1208CONFIG_CRYPTO_ALGAPI=y
1169CONFIG_CRYPTO_AEAD=m 1209CONFIG_CRYPTO_AEAD=y
1170CONFIG_CRYPTO_BLKCIPHER=y 1210CONFIG_CRYPTO_BLKCIPHER=y
1171CONFIG_CRYPTO_HASH=y 1211CONFIG_CRYPTO_HASH=y
1212CONFIG_CRYPTO_RNG=y
1172CONFIG_CRYPTO_MANAGER=y 1213CONFIG_CRYPTO_MANAGER=y
1173# CONFIG_CRYPTO_GF128MUL is not set 1214# CONFIG_CRYPTO_GF128MUL is not set
1174CONFIG_CRYPTO_NULL=m 1215CONFIG_CRYPTO_NULL=m
@@ -1242,6 +1283,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1242# 1283#
1243CONFIG_CRYPTO_DEFLATE=m 1284CONFIG_CRYPTO_DEFLATE=m
1244# CONFIG_CRYPTO_LZO is not set 1285# CONFIG_CRYPTO_LZO is not set
1286
1287#
1288# Random Number Generation
1289#
1290# CONFIG_CRYPTO_ANSI_CPRNG is not set
1245# CONFIG_CRYPTO_HW is not set 1291# CONFIG_CRYPTO_HW is not set
1246# CONFIG_PPC_CLOCK is not set 1292# CONFIG_PPC_CLOCK is not set
1247# CONFIG_VIRTUALIZATION is not set 1293# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index 851b27e45cfc..54fa62481373 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.27 3# Linux kernel version: 2.6.28-rc3
4# Fri Oct 24 00:42:39 2008 4# Sat Nov 8 12:39:38 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -110,7 +110,9 @@ CONFIG_SIGNALFD=y
110CONFIG_TIMERFD=y 110CONFIG_TIMERFD=y
111CONFIG_EVENTFD=y 111CONFIG_EVENTFD=y
112CONFIG_SHMEM=y 112CONFIG_SHMEM=y
113CONFIG_AIO=y
113CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_PCI_QUIRKS=y
114CONFIG_SLUB_DEBUG=y 116CONFIG_SLUB_DEBUG=y
115# CONFIG_SLAB is not set 117# CONFIG_SLAB is not set
116CONFIG_SLUB=y 118CONFIG_SLUB=y
@@ -124,10 +126,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
124CONFIG_HAVE_KPROBES=y 126CONFIG_HAVE_KPROBES=y
125CONFIG_HAVE_KRETPROBES=y 127CONFIG_HAVE_KRETPROBES=y
126CONFIG_HAVE_ARCH_TRACEHOOK=y 128CONFIG_HAVE_ARCH_TRACEHOOK=y
127# CONFIG_HAVE_DMA_ATTRS is not set
128# CONFIG_USE_GENERIC_SMP_HELPERS is not set
129# CONFIG_HAVE_CLK is not set
130CONFIG_PROC_PAGE_MONITOR=y
131# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
132CONFIG_SLABINFO=y 130CONFIG_SLABINFO=y
133CONFIG_RT_MUTEXES=y 131CONFIG_RT_MUTEXES=y
@@ -160,6 +158,7 @@ CONFIG_DEFAULT_AS=y
160# CONFIG_DEFAULT_NOOP is not set 158# CONFIG_DEFAULT_NOOP is not set
161CONFIG_DEFAULT_IOSCHED="anticipatory" 159CONFIG_DEFAULT_IOSCHED="anticipatory"
162CONFIG_CLASSIC_RCU=y 160CONFIG_CLASSIC_RCU=y
161# CONFIG_FREEZER is not set
163 162
164# 163#
165# Platform support 164# Platform support
@@ -199,6 +198,7 @@ CONFIG_MPIC=y
199# CONFIG_GENERIC_IOMAP is not set 198# CONFIG_GENERIC_IOMAP is not set
200# CONFIG_CPU_FREQ is not set 199# CONFIG_CPU_FREQ is not set
201# CONFIG_TAU is not set 200# CONFIG_TAU is not set
201# CONFIG_QUICC_ENGINE is not set
202# CONFIG_FSL_ULI1575 is not set 202# CONFIG_FSL_ULI1575 is not set
203 203
204# 204#
@@ -219,6 +219,8 @@ CONFIG_PREEMPT_NONE=y
219# CONFIG_PREEMPT_VOLUNTARY is not set 219# CONFIG_PREEMPT_VOLUNTARY is not set
220# CONFIG_PREEMPT is not set 220# CONFIG_PREEMPT is not set
221CONFIG_BINFMT_ELF=y 221CONFIG_BINFMT_ELF=y
222# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
223# CONFIG_HAVE_AOUT is not set
222# CONFIG_BINFMT_MISC is not set 224# CONFIG_BINFMT_MISC is not set
223# CONFIG_IOMMU_HELPER is not set 225# CONFIG_IOMMU_HELPER is not set
224CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 226CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -233,15 +235,15 @@ CONFIG_FLATMEM_MANUAL=y
233# CONFIG_SPARSEMEM_MANUAL is not set 235# CONFIG_SPARSEMEM_MANUAL is not set
234CONFIG_FLATMEM=y 236CONFIG_FLATMEM=y
235CONFIG_FLAT_NODE_MEM_MAP=y 237CONFIG_FLAT_NODE_MEM_MAP=y
236# CONFIG_SPARSEMEM_STATIC is not set
237# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
238CONFIG_PAGEFLAGS_EXTENDED=y 238CONFIG_PAGEFLAGS_EXTENDED=y
239CONFIG_SPLIT_PTLOCK_CPUS=4 239CONFIG_SPLIT_PTLOCK_CPUS=4
240CONFIG_MIGRATION=y 240CONFIG_MIGRATION=y
241# CONFIG_RESOURCES_64BIT is not set 241# CONFIG_RESOURCES_64BIT is not set
242# CONFIG_PHYS_ADDR_T_64BIT is not set
242CONFIG_ZONE_DMA_FLAG=1 243CONFIG_ZONE_DMA_FLAG=1
243CONFIG_BOUNCE=y 244CONFIG_BOUNCE=y
244CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
246CONFIG_UNEVICTABLE_LRU=y
245CONFIG_FORCE_MAX_ZONEORDER=11 247CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_PROC_DEVICETREE=y 248CONFIG_PROC_DEVICETREE=y
247# CONFIG_CMDLINE_BOOL is not set 249# CONFIG_CMDLINE_BOOL is not set
@@ -263,7 +265,7 @@ CONFIG_PCI_SYSCALL=y
263# CONFIG_PCIEPORTBUS is not set 265# CONFIG_PCIEPORTBUS is not set
264CONFIG_ARCH_SUPPORTS_MSI=y 266CONFIG_ARCH_SUPPORTS_MSI=y
265# CONFIG_PCI_MSI is not set 267# CONFIG_PCI_MSI is not set
266CONFIG_PCI_LEGACY=y 268# CONFIG_PCI_LEGACY is not set
267# CONFIG_PCI_DEBUG is not set 269# CONFIG_PCI_DEBUG is not set
268# CONFIG_PCCARD is not set 270# CONFIG_PCCARD is not set
269# CONFIG_HOTPLUG_PCI is not set 271# CONFIG_HOTPLUG_PCI is not set
@@ -324,7 +326,6 @@ CONFIG_INET_TCP_DIAG=y
324CONFIG_TCP_CONG_CUBIC=y 326CONFIG_TCP_CONG_CUBIC=y
325CONFIG_DEFAULT_TCP_CONG="cubic" 327CONFIG_DEFAULT_TCP_CONG="cubic"
326# CONFIG_TCP_MD5SIG is not set 328# CONFIG_TCP_MD5SIG is not set
327# CONFIG_IP_VS is not set
328# CONFIG_IPV6 is not set 329# CONFIG_IPV6 is not set
329# CONFIG_NETWORK_SECMARK is not set 330# CONFIG_NETWORK_SECMARK is not set
330CONFIG_NETFILTER=y 331CONFIG_NETFILTER=y
@@ -354,13 +355,14 @@ CONFIG_NF_CONNTRACK_PPTP=m
354CONFIG_NF_CONNTRACK_SIP=m 355CONFIG_NF_CONNTRACK_SIP=m
355CONFIG_NF_CONNTRACK_TFTP=m 356CONFIG_NF_CONNTRACK_TFTP=m
356# CONFIG_NF_CT_NETLINK is not set 357# CONFIG_NF_CT_NETLINK is not set
358# CONFIG_NETFILTER_TPROXY is not set
357CONFIG_NETFILTER_XTABLES=m 359CONFIG_NETFILTER_XTABLES=m
358# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set 360# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
359# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set 361# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
360# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 362# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
361# CONFIG_NETFILTER_XT_TARGET_MARK is not set 363# CONFIG_NETFILTER_XT_TARGET_MARK is not set
362# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
363# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 364# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
365# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
364# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set 366# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
365# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set 367# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
366# CONFIG_NETFILTER_XT_TARGET_TRACE is not set 368# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
@@ -374,19 +376,21 @@ CONFIG_NETFILTER_XTABLES=m
374# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 376# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
375# CONFIG_NETFILTER_XT_MATCH_DSCP is not set 377# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
376# CONFIG_NETFILTER_XT_MATCH_ESP is not set 378# CONFIG_NETFILTER_XT_MATCH_ESP is not set
379# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
377# CONFIG_NETFILTER_XT_MATCH_HELPER is not set 380# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
378# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set 381# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
379# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set 382# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
380# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set 383# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
381CONFIG_NETFILTER_XT_MATCH_MAC=m 384CONFIG_NETFILTER_XT_MATCH_MAC=m
382# CONFIG_NETFILTER_XT_MATCH_MARK is not set 385# CONFIG_NETFILTER_XT_MATCH_MARK is not set
386# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
383# CONFIG_NETFILTER_XT_MATCH_OWNER is not set 387# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
384# CONFIG_NETFILTER_XT_MATCH_POLICY is not set 388# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
385# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
386CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 389CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
387# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 390# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
388# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set 391# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
389# CONFIG_NETFILTER_XT_MATCH_REALM is not set 392# CONFIG_NETFILTER_XT_MATCH_REALM is not set
393# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
390# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 394# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
391CONFIG_NETFILTER_XT_MATCH_STATE=m 395CONFIG_NETFILTER_XT_MATCH_STATE=m
392# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 396# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
@@ -394,20 +398,20 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
394# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set 398# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
395# CONFIG_NETFILTER_XT_MATCH_TIME is not set 399# CONFIG_NETFILTER_XT_MATCH_TIME is not set
396# CONFIG_NETFILTER_XT_MATCH_U32 is not set 400# CONFIG_NETFILTER_XT_MATCH_U32 is not set
397# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 401# CONFIG_IP_VS is not set
398 402
399# 403#
400# IP: Netfilter Configuration 404# IP: Netfilter Configuration
401# 405#
406CONFIG_NF_DEFRAG_IPV4=m
402CONFIG_NF_CONNTRACK_IPV4=m 407CONFIG_NF_CONNTRACK_IPV4=m
403CONFIG_NF_CONNTRACK_PROC_COMPAT=y 408CONFIG_NF_CONNTRACK_PROC_COMPAT=y
404# CONFIG_IP_NF_QUEUE is not set 409# CONFIG_IP_NF_QUEUE is not set
405CONFIG_IP_NF_IPTABLES=m 410CONFIG_IP_NF_IPTABLES=m
406CONFIG_IP_NF_MATCH_RECENT=m 411CONFIG_IP_NF_MATCH_ADDRTYPE=m
407# CONFIG_IP_NF_MATCH_ECN is not set
408# CONFIG_IP_NF_MATCH_AH is not set 412# CONFIG_IP_NF_MATCH_AH is not set
413# CONFIG_IP_NF_MATCH_ECN is not set
409# CONFIG_IP_NF_MATCH_TTL is not set 414# CONFIG_IP_NF_MATCH_TTL is not set
410CONFIG_IP_NF_MATCH_ADDRTYPE=m
411CONFIG_IP_NF_FILTER=m 415CONFIG_IP_NF_FILTER=m
412CONFIG_IP_NF_TARGET_REJECT=m 416CONFIG_IP_NF_TARGET_REJECT=m
413# CONFIG_IP_NF_TARGET_LOG is not set 417# CONFIG_IP_NF_TARGET_LOG is not set
@@ -415,8 +419,8 @@ CONFIG_IP_NF_TARGET_REJECT=m
415CONFIG_NF_NAT=m 419CONFIG_NF_NAT=m
416CONFIG_NF_NAT_NEEDED=y 420CONFIG_NF_NAT_NEEDED=y
417CONFIG_IP_NF_TARGET_MASQUERADE=m 421CONFIG_IP_NF_TARGET_MASQUERADE=m
418CONFIG_IP_NF_TARGET_REDIRECT=m
419# CONFIG_IP_NF_TARGET_NETMAP is not set 422# CONFIG_IP_NF_TARGET_NETMAP is not set
423CONFIG_IP_NF_TARGET_REDIRECT=m
420# CONFIG_NF_NAT_SNMP_BASIC is not set 424# CONFIG_NF_NAT_SNMP_BASIC is not set
421CONFIG_NF_NAT_PROTO_GRE=m 425CONFIG_NF_NAT_PROTO_GRE=m
422CONFIG_NF_NAT_PROTO_SCTP=m 426CONFIG_NF_NAT_PROTO_SCTP=m
@@ -428,9 +432,9 @@ CONFIG_NF_NAT_PPTP=m
428CONFIG_NF_NAT_H323=m 432CONFIG_NF_NAT_H323=m
429CONFIG_NF_NAT_SIP=m 433CONFIG_NF_NAT_SIP=m
430CONFIG_IP_NF_MANGLE=m 434CONFIG_IP_NF_MANGLE=m
435# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
431CONFIG_IP_NF_TARGET_ECN=m 436CONFIG_IP_NF_TARGET_ECN=m
432CONFIG_IP_NF_TARGET_TTL=m 437CONFIG_IP_NF_TARGET_TTL=m
433# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
434CONFIG_IP_NF_RAW=m 438CONFIG_IP_NF_RAW=m
435CONFIG_IP_NF_ARPTABLES=m 439CONFIG_IP_NF_ARPTABLES=m
436CONFIG_IP_NF_ARPFILTER=m 440CONFIG_IP_NF_ARPFILTER=m
@@ -440,6 +444,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
440# CONFIG_TIPC is not set 444# CONFIG_TIPC is not set
441# CONFIG_ATM is not set 445# CONFIG_ATM is not set
442# CONFIG_BRIDGE is not set 446# CONFIG_BRIDGE is not set
447# CONFIG_NET_DSA is not set
443# CONFIG_VLAN_8021Q is not set 448# CONFIG_VLAN_8021Q is not set
444# CONFIG_DECNET is not set 449# CONFIG_DECNET is not set
445# CONFIG_LLC2 is not set 450# CONFIG_LLC2 is not set
@@ -460,11 +465,10 @@ CONFIG_IP_NF_ARP_MANGLE=m
460# CONFIG_IRDA is not set 465# CONFIG_IRDA is not set
461# CONFIG_BT is not set 466# CONFIG_BT is not set
462# CONFIG_AF_RXRPC is not set 467# CONFIG_AF_RXRPC is not set
463 468# CONFIG_PHONET is not set
464# 469CONFIG_WIRELESS=y
465# Wireless
466#
467# CONFIG_CFG80211 is not set 470# CONFIG_CFG80211 is not set
471CONFIG_WIRELESS_OLD_REGULATORY=y
468CONFIG_WIRELESS_EXT=y 472CONFIG_WIRELESS_EXT=y
469CONFIG_WIRELESS_EXT_SYSFS=y 473CONFIG_WIRELESS_EXT_SYSFS=y
470# CONFIG_MAC80211 is not set 474# CONFIG_MAC80211 is not set
@@ -772,7 +776,7 @@ CONFIG_TUN=m
772# CONFIG_ARCNET is not set 776# CONFIG_ARCNET is not set
773# CONFIG_PHYLIB is not set 777# CONFIG_PHYLIB is not set
774CONFIG_NET_ETHERNET=y 778CONFIG_NET_ETHERNET=y
775# CONFIG_MII is not set 779CONFIG_MII=y
776# CONFIG_HAPPYMEAL is not set 780# CONFIG_HAPPYMEAL is not set
777# CONFIG_SUNGEM is not set 781# CONFIG_SUNGEM is not set
778# CONFIG_CASSINI is not set 782# CONFIG_CASSINI is not set
@@ -792,8 +796,12 @@ CONFIG_TULIP_MMIO=y
792# CONFIG_IBM_NEW_EMAC_RGMII is not set 796# CONFIG_IBM_NEW_EMAC_RGMII is not set
793# CONFIG_IBM_NEW_EMAC_TAH is not set 797# CONFIG_IBM_NEW_EMAC_TAH is not set
794# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 798# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
799# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
800# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
801# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
795# CONFIG_NET_PCI is not set 802# CONFIG_NET_PCI is not set
796# CONFIG_B44 is not set 803# CONFIG_B44 is not set
804# CONFIG_ATL2 is not set
797CONFIG_NETDEV_1000=y 805CONFIG_NETDEV_1000=y
798# CONFIG_ACENIC is not set 806# CONFIG_ACENIC is not set
799# CONFIG_DL2K is not set 807# CONFIG_DL2K is not set
@@ -816,18 +824,22 @@ CONFIG_R8169=y
816# CONFIG_QLA3XXX is not set 824# CONFIG_QLA3XXX is not set
817# CONFIG_ATL1 is not set 825# CONFIG_ATL1 is not set
818# CONFIG_ATL1E is not set 826# CONFIG_ATL1E is not set
827# CONFIG_JME is not set
819CONFIG_NETDEV_10000=y 828CONFIG_NETDEV_10000=y
820# CONFIG_CHELSIO_T1 is not set 829# CONFIG_CHELSIO_T1 is not set
821# CONFIG_CHELSIO_T3 is not set 830# CONFIG_CHELSIO_T3 is not set
831# CONFIG_ENIC is not set
822# CONFIG_IXGBE is not set 832# CONFIG_IXGBE is not set
823# CONFIG_IXGB is not set 833# CONFIG_IXGB is not set
824# CONFIG_S2IO is not set 834# CONFIG_S2IO is not set
825# CONFIG_MYRI10GE is not set 835# CONFIG_MYRI10GE is not set
826# CONFIG_NETXEN_NIC is not set 836# CONFIG_NETXEN_NIC is not set
827# CONFIG_NIU is not set 837# CONFIG_NIU is not set
838# CONFIG_MLX4_EN is not set
828# CONFIG_MLX4_CORE is not set 839# CONFIG_MLX4_CORE is not set
829# CONFIG_TEHUTI is not set 840# CONFIG_TEHUTI is not set
830# CONFIG_BNX2X is not set 841# CONFIG_BNX2X is not set
842# CONFIG_QLGE is not set
831# CONFIG_SFC is not set 843# CONFIG_SFC is not set
832# CONFIG_TR is not set 844# CONFIG_TR is not set
833 845
@@ -892,6 +904,7 @@ CONFIG_INPUT_MISC=y
892# CONFIG_INPUT_KEYSPAN_REMOTE is not set 904# CONFIG_INPUT_KEYSPAN_REMOTE is not set
893# CONFIG_INPUT_POWERMATE is not set 905# CONFIG_INPUT_POWERMATE is not set
894# CONFIG_INPUT_YEALINK is not set 906# CONFIG_INPUT_YEALINK is not set
907# CONFIG_INPUT_CM109 is not set
895CONFIG_INPUT_UINPUT=m 908CONFIG_INPUT_UINPUT=m
896 909
897# 910#
@@ -1091,6 +1104,17 @@ CONFIG_SSB_POSSIBLE=y
1091# CONFIG_MFD_SM501 is not set 1104# CONFIG_MFD_SM501 is not set
1092# CONFIG_HTC_PASIC3 is not set 1105# CONFIG_HTC_PASIC3 is not set
1093# CONFIG_MFD_TMIO is not set 1106# CONFIG_MFD_TMIO is not set
1107# CONFIG_PMIC_DA903X is not set
1108# CONFIG_MFD_WM8400 is not set
1109# CONFIG_MFD_WM8350_I2C is not set
1110
1111#
1112# Voltage and Current regulators
1113#
1114# CONFIG_REGULATOR is not set
1115# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1116# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1117# CONFIG_REGULATOR_BQ24022 is not set
1094 1118
1095# 1119#
1096# Multimedia devices 1120# Multimedia devices
@@ -1138,12 +1162,18 @@ CONFIG_HID=m
1138# USB Input Devices 1162# USB Input Devices
1139# 1163#
1140# CONFIG_USB_HID is not set 1164# CONFIG_USB_HID is not set
1165# CONFIG_HID_PID is not set
1141 1166
1142# 1167#
1143# USB HID Boot Protocol drivers 1168# USB HID Boot Protocol drivers
1144# 1169#
1145# CONFIG_USB_KBD is not set 1170# CONFIG_USB_KBD is not set
1146# CONFIG_USB_MOUSE is not set 1171# CONFIG_USB_MOUSE is not set
1172
1173#
1174# Special HID drivers
1175#
1176CONFIG_HID_COMPAT=y
1147CONFIG_USB_SUPPORT=y 1177CONFIG_USB_SUPPORT=y
1148CONFIG_USB_ARCH_HAS_HCD=y 1178CONFIG_USB_ARCH_HAS_HCD=y
1149CONFIG_USB_ARCH_HAS_OHCI=y 1179CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1160,6 +1190,8 @@ CONFIG_USB_DEVICE_CLASS=y
1160# CONFIG_USB_DYNAMIC_MINORS is not set 1190# CONFIG_USB_DYNAMIC_MINORS is not set
1161# CONFIG_USB_OTG is not set 1191# CONFIG_USB_OTG is not set
1162CONFIG_USB_MON=y 1192CONFIG_USB_MON=y
1193# CONFIG_USB_WUSB is not set
1194# CONFIG_USB_WUSB_CBAF is not set
1163 1195
1164# 1196#
1165# USB Host Controller Drivers 1197# USB Host Controller Drivers
@@ -1183,6 +1215,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1183# CONFIG_USB_UHCI_HCD is not set 1215# CONFIG_USB_UHCI_HCD is not set
1184# CONFIG_USB_SL811_HCD is not set 1216# CONFIG_USB_SL811_HCD is not set
1185# CONFIG_USB_R8A66597_HCD is not set 1217# CONFIG_USB_R8A66597_HCD is not set
1218# CONFIG_USB_WHCI_HCD is not set
1219# CONFIG_USB_HWA_HCD is not set
1186 1220
1187# 1221#
1188# USB Device Class drivers 1222# USB Device Class drivers
@@ -1190,6 +1224,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1190# CONFIG_USB_ACM is not set 1224# CONFIG_USB_ACM is not set
1191CONFIG_USB_PRINTER=m 1225CONFIG_USB_PRINTER=m
1192# CONFIG_USB_WDM is not set 1226# CONFIG_USB_WDM is not set
1227# CONFIG_USB_TMC is not set
1193 1228
1194# 1229#
1195# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1230# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1274,6 +1309,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
1274# CONFIG_USB_EMI62 is not set 1309# CONFIG_USB_EMI62 is not set
1275# CONFIG_USB_EMI26 is not set 1310# CONFIG_USB_EMI26 is not set
1276# CONFIG_USB_ADUTUX is not set 1311# CONFIG_USB_ADUTUX is not set
1312# CONFIG_USB_SEVSEG is not set
1277# CONFIG_USB_RIO500 is not set 1313# CONFIG_USB_RIO500 is not set
1278# CONFIG_USB_LEGOTOWER is not set 1314# CONFIG_USB_LEGOTOWER is not set
1279# CONFIG_USB_LCD is not set 1315# CONFIG_USB_LCD is not set
@@ -1291,7 +1327,9 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
1291# CONFIG_USB_IOWARRIOR is not set 1327# CONFIG_USB_IOWARRIOR is not set
1292# CONFIG_USB_TEST is not set 1328# CONFIG_USB_TEST is not set
1293# CONFIG_USB_ISIGHTFW is not set 1329# CONFIG_USB_ISIGHTFW is not set
1330# CONFIG_USB_VST is not set
1294# CONFIG_USB_GADGET is not set 1331# CONFIG_USB_GADGET is not set
1332# CONFIG_UWB is not set
1295# CONFIG_MMC is not set 1333# CONFIG_MMC is not set
1296# CONFIG_MEMSTICK is not set 1334# CONFIG_MEMSTICK is not set
1297# CONFIG_NEW_LEDS is not set 1335# CONFIG_NEW_LEDS is not set
@@ -1337,12 +1375,15 @@ CONFIG_RTC_DRV_RS5C372=y
1337# Platform RTC drivers 1375# Platform RTC drivers
1338# 1376#
1339# CONFIG_RTC_DRV_CMOS is not set 1377# CONFIG_RTC_DRV_CMOS is not set
1378# CONFIG_RTC_DRV_DS1286 is not set
1340# CONFIG_RTC_DRV_DS1511 is not set 1379# CONFIG_RTC_DRV_DS1511 is not set
1341# CONFIG_RTC_DRV_DS1553 is not set 1380# CONFIG_RTC_DRV_DS1553 is not set
1342# CONFIG_RTC_DRV_DS1742 is not set 1381# CONFIG_RTC_DRV_DS1742 is not set
1343# CONFIG_RTC_DRV_STK17TA8 is not set 1382# CONFIG_RTC_DRV_STK17TA8 is not set
1344# CONFIG_RTC_DRV_M48T86 is not set 1383# CONFIG_RTC_DRV_M48T86 is not set
1384# CONFIG_RTC_DRV_M48T35 is not set
1345# CONFIG_RTC_DRV_M48T59 is not set 1385# CONFIG_RTC_DRV_M48T59 is not set
1386# CONFIG_RTC_DRV_BQ4802 is not set
1346# CONFIG_RTC_DRV_V3020 is not set 1387# CONFIG_RTC_DRV_V3020 is not set
1347 1388
1348# 1389#
@@ -1351,6 +1392,7 @@ CONFIG_RTC_DRV_RS5C372=y
1351# CONFIG_RTC_DRV_PPC is not set 1392# CONFIG_RTC_DRV_PPC is not set
1352# CONFIG_DMADEVICES is not set 1393# CONFIG_DMADEVICES is not set
1353# CONFIG_UIO is not set 1394# CONFIG_UIO is not set
1395# CONFIG_STAGING is not set
1354 1396
1355# 1397#
1356# File systems 1398# File systems
@@ -1362,12 +1404,13 @@ CONFIG_EXT3_FS=y
1362CONFIG_EXT3_FS_XATTR=y 1404CONFIG_EXT3_FS_XATTR=y
1363# CONFIG_EXT3_FS_POSIX_ACL is not set 1405# CONFIG_EXT3_FS_POSIX_ACL is not set
1364# CONFIG_EXT3_FS_SECURITY is not set 1406# CONFIG_EXT3_FS_SECURITY is not set
1365# CONFIG_EXT4DEV_FS is not set 1407# CONFIG_EXT4_FS is not set
1366CONFIG_JBD=y 1408CONFIG_JBD=y
1367CONFIG_FS_MBCACHE=y 1409CONFIG_FS_MBCACHE=y
1368# CONFIG_REISERFS_FS is not set 1410# CONFIG_REISERFS_FS is not set
1369# CONFIG_JFS_FS is not set 1411# CONFIG_JFS_FS is not set
1370CONFIG_FS_POSIX_ACL=y 1412CONFIG_FS_POSIX_ACL=y
1413CONFIG_FILE_LOCKING=y
1371CONFIG_XFS_FS=m 1414CONFIG_XFS_FS=m
1372# CONFIG_XFS_QUOTA is not set 1415# CONFIG_XFS_QUOTA is not set
1373# CONFIG_XFS_POSIX_ACL is not set 1416# CONFIG_XFS_POSIX_ACL is not set
@@ -1409,6 +1452,7 @@ CONFIG_NTFS_FS=m
1409CONFIG_PROC_FS=y 1452CONFIG_PROC_FS=y
1410CONFIG_PROC_KCORE=y 1453CONFIG_PROC_KCORE=y
1411CONFIG_PROC_SYSCTL=y 1454CONFIG_PROC_SYSCTL=y
1455CONFIG_PROC_PAGE_MONITOR=y
1412CONFIG_SYSFS=y 1456CONFIG_SYSFS=y
1413CONFIG_TMPFS=y 1457CONFIG_TMPFS=y
1414# CONFIG_TMPFS_POSIX_ACL is not set 1458# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1452,6 +1496,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1452CONFIG_NFS_COMMON=y 1496CONFIG_NFS_COMMON=y
1453CONFIG_SUNRPC=y 1497CONFIG_SUNRPC=y
1454CONFIG_SUNRPC_GSS=y 1498CONFIG_SUNRPC_GSS=y
1499# CONFIG_SUNRPC_REGISTER_V4 is not set
1455CONFIG_RPCSEC_GSS_KRB5=y 1500CONFIG_RPCSEC_GSS_KRB5=y
1456# CONFIG_RPCSEC_GSS_SPKM3 is not set 1501# CONFIG_RPCSEC_GSS_SPKM3 is not set
1457# CONFIG_SMB_FS is not set 1502# CONFIG_SMB_FS is not set
@@ -1516,7 +1561,6 @@ CONFIG_NLS_UTF8=m
1516# Library routines 1561# Library routines
1517# 1562#
1518CONFIG_BITREVERSE=y 1563CONFIG_BITREVERSE=y
1519# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1520CONFIG_CRC_CCITT=m 1564CONFIG_CRC_CCITT=m
1521# CONFIG_CRC16 is not set 1565# CONFIG_CRC16 is not set
1522CONFIG_CRC_T10DIF=y 1566CONFIG_CRC_T10DIF=y
@@ -1572,15 +1616,23 @@ CONFIG_DEBUG_MEMORY_INIT=y
1572# CONFIG_DEBUG_SG is not set 1616# CONFIG_DEBUG_SG is not set
1573# CONFIG_BOOT_PRINTK_DELAY is not set 1617# CONFIG_BOOT_PRINTK_DELAY is not set
1574# CONFIG_RCU_TORTURE_TEST is not set 1618# CONFIG_RCU_TORTURE_TEST is not set
1619# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1575# CONFIG_BACKTRACE_SELF_TEST is not set 1620# CONFIG_BACKTRACE_SELF_TEST is not set
1621# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1576# CONFIG_FAULT_INJECTION is not set 1622# CONFIG_FAULT_INJECTION is not set
1577# CONFIG_LATENCYTOP is not set 1623# CONFIG_LATENCYTOP is not set
1578CONFIG_SYSCTL_SYSCALL_CHECK=y 1624CONFIG_SYSCTL_SYSCALL_CHECK=y
1579CONFIG_HAVE_FTRACE=y 1625CONFIG_HAVE_FUNCTION_TRACER=y
1580CONFIG_HAVE_DYNAMIC_FTRACE=y 1626
1581# CONFIG_FTRACE is not set 1627#
1628# Tracers
1629#
1630# CONFIG_FUNCTION_TRACER is not set
1582# CONFIG_SCHED_TRACER is not set 1631# CONFIG_SCHED_TRACER is not set
1583# CONFIG_CONTEXT_SWITCH_TRACER is not set 1632# CONFIG_CONTEXT_SWITCH_TRACER is not set
1633# CONFIG_BOOT_TRACER is not set
1634# CONFIG_STACK_TRACER is not set
1635# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1584# CONFIG_SAMPLES is not set 1636# CONFIG_SAMPLES is not set
1585CONFIG_HAVE_ARCH_KGDB=y 1637CONFIG_HAVE_ARCH_KGDB=y
1586# CONFIG_KGDB is not set 1638# CONFIG_KGDB is not set
@@ -1589,6 +1641,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1589# CONFIG_DEBUG_PAGEALLOC is not set 1641# CONFIG_DEBUG_PAGEALLOC is not set
1590# CONFIG_CODE_PATCHING_SELFTEST is not set 1642# CONFIG_CODE_PATCHING_SELFTEST is not set
1591# CONFIG_FTR_FIXUP_SELFTEST is not set 1643# CONFIG_FTR_FIXUP_SELFTEST is not set
1644# CONFIG_MSI_BITMAP_SELFTEST is not set
1592# CONFIG_XMON is not set 1645# CONFIG_XMON is not set
1593# CONFIG_IRQSTACKS is not set 1646# CONFIG_IRQSTACKS is not set
1594# CONFIG_BDI_SWITCH is not set 1647# CONFIG_BDI_SWITCH is not set
@@ -1600,15 +1653,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1600# 1653#
1601# CONFIG_KEYS is not set 1654# CONFIG_KEYS is not set
1602# CONFIG_SECURITY is not set 1655# CONFIG_SECURITY is not set
1656# CONFIG_SECURITYFS is not set
1603# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1657# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1604CONFIG_CRYPTO=y 1658CONFIG_CRYPTO=y
1605 1659
1606# 1660#
1607# Crypto core or helper 1661# Crypto core or helper
1608# 1662#
1663# CONFIG_CRYPTO_FIPS is not set
1609CONFIG_CRYPTO_ALGAPI=y 1664CONFIG_CRYPTO_ALGAPI=y
1665CONFIG_CRYPTO_AEAD=y
1610CONFIG_CRYPTO_BLKCIPHER=y 1666CONFIG_CRYPTO_BLKCIPHER=y
1611CONFIG_CRYPTO_HASH=m 1667CONFIG_CRYPTO_HASH=y
1668CONFIG_CRYPTO_RNG=y
1612CONFIG_CRYPTO_MANAGER=y 1669CONFIG_CRYPTO_MANAGER=y
1613# CONFIG_CRYPTO_GF128MUL is not set 1670# CONFIG_CRYPTO_GF128MUL is not set
1614# CONFIG_CRYPTO_NULL is not set 1671# CONFIG_CRYPTO_NULL is not set
@@ -1682,6 +1739,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1682# 1739#
1683CONFIG_CRYPTO_DEFLATE=m 1740CONFIG_CRYPTO_DEFLATE=m
1684# CONFIG_CRYPTO_LZO is not set 1741# CONFIG_CRYPTO_LZO is not set
1742
1743#
1744# Random Number Generation
1745#
1746# CONFIG_CRYPTO_ANSI_CPRNG is not set
1685CONFIG_CRYPTO_HW=y 1747CONFIG_CRYPTO_HW=y
1686# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1748# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1687# CONFIG_CRYPTO_DEV_TALITOS is not set 1749# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index 1a3b6423222b..045f1b008ce5 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Tue Aug 26 13:18:58 2008 4# Tue Nov 11 19:36:45 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -20,7 +20,7 @@ CONFIG_SMP=y
20CONFIG_NR_CPUS=4 20CONFIG_NR_CPUS=4
21CONFIG_64BIT=y 21CONFIG_64BIT=y
22CONFIG_WORD_SIZE=64 22CONFIG_WORD_SIZE=64
23CONFIG_PPC_MERGE=y 23CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
24CONFIG_MMU=y 24CONFIG_MMU=y
25CONFIG_GENERIC_CMOS_UPDATE=y 25CONFIG_GENERIC_CMOS_UPDATE=y
26CONFIG_GENERIC_TIME=y 26CONFIG_GENERIC_TIME=y
@@ -107,7 +107,9 @@ CONFIG_SIGNALFD=y
107CONFIG_TIMERFD=y 107CONFIG_TIMERFD=y
108CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
109CONFIG_SHMEM=y 109CONFIG_SHMEM=y
110CONFIG_AIO=y
110CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_PCI_QUIRKS=y
111CONFIG_SLUB_DEBUG=y 113CONFIG_SLUB_DEBUG=y
112# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
113CONFIG_SLUB=y 115CONFIG_SLUB=y
@@ -125,8 +127,6 @@ CONFIG_HAVE_KRETPROBES=y
125CONFIG_HAVE_ARCH_TRACEHOOK=y 127CONFIG_HAVE_ARCH_TRACEHOOK=y
126CONFIG_HAVE_DMA_ATTRS=y 128CONFIG_HAVE_DMA_ATTRS=y
127CONFIG_USE_GENERIC_SMP_HELPERS=y 129CONFIG_USE_GENERIC_SMP_HELPERS=y
128# CONFIG_HAVE_CLK is not set
129CONFIG_PROC_PAGE_MONITOR=y
130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
131CONFIG_SLABINFO=y 131CONFIG_SLABINFO=y
132CONFIG_RT_MUTEXES=y 132CONFIG_RT_MUTEXES=y
@@ -159,6 +159,8 @@ CONFIG_DEFAULT_AS=y
159# CONFIG_DEFAULT_NOOP is not set 159# CONFIG_DEFAULT_NOOP is not set
160CONFIG_DEFAULT_IOSCHED="anticipatory" 160CONFIG_DEFAULT_IOSCHED="anticipatory"
161CONFIG_CLASSIC_RCU=y 161CONFIG_CLASSIC_RCU=y
162# CONFIG_FREEZER is not set
163CONFIG_PPC_MSI_BITMAP=y
162 164
163# 165#
164# Platform support 166# Platform support
@@ -213,6 +215,8 @@ CONFIG_PREEMPT_NONE=y
213# CONFIG_PREEMPT is not set 215# CONFIG_PREEMPT is not set
214CONFIG_BINFMT_ELF=y 216CONFIG_BINFMT_ELF=y
215CONFIG_COMPAT_BINFMT_ELF=y 217CONFIG_COMPAT_BINFMT_ELF=y
218# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
219# CONFIG_HAVE_AOUT is not set
216# CONFIG_BINFMT_MISC is not set 220# CONFIG_BINFMT_MISC is not set
217CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y 221CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
218CONFIG_IOMMU_VMERGE=y 222CONFIG_IOMMU_VMERGE=y
@@ -221,7 +225,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
221CONFIG_ARCH_HAS_WALK_MEMORY=y 225CONFIG_ARCH_HAS_WALK_MEMORY=y
222CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
223CONFIG_KEXEC=y 227CONFIG_KEXEC=y
224# CONFIG_CRASH_DUMP is not set
225CONFIG_IRQ_ALL_CPUS=y 228CONFIG_IRQ_ALL_CPUS=y
226# CONFIG_NUMA is not set 229# CONFIG_NUMA is not set
227CONFIG_ARCH_SELECT_MEMORY_MODEL=y 230CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -234,14 +237,15 @@ CONFIG_FLATMEM_MANUAL=y
234# CONFIG_SPARSEMEM_MANUAL is not set 237# CONFIG_SPARSEMEM_MANUAL is not set
235CONFIG_FLATMEM=y 238CONFIG_FLATMEM=y
236CONFIG_FLAT_NODE_MEM_MAP=y 239CONFIG_FLAT_NODE_MEM_MAP=y
237# CONFIG_SPARSEMEM_STATIC is not set
238CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 240CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
239CONFIG_PAGEFLAGS_EXTENDED=y 241CONFIG_PAGEFLAGS_EXTENDED=y
240CONFIG_SPLIT_PTLOCK_CPUS=4 242CONFIG_SPLIT_PTLOCK_CPUS=4
241# CONFIG_MIGRATION is not set 243# CONFIG_MIGRATION is not set
242CONFIG_RESOURCES_64BIT=y 244CONFIG_RESOURCES_64BIT=y
245CONFIG_PHYS_ADDR_T_64BIT=y
243CONFIG_ZONE_DMA_FLAG=1 246CONFIG_ZONE_DMA_FLAG=1
244CONFIG_BOUNCE=y 247CONFIG_BOUNCE=y
248CONFIG_UNEVICTABLE_LRU=y
245# CONFIG_PPC_HAS_HASH_64K is not set 249# CONFIG_PPC_HAS_HASH_64K is not set
246# CONFIG_PPC_64K_PAGES is not set 250# CONFIG_PPC_64K_PAGES is not set
247CONFIG_FORCE_MAX_ZONEORDER=13 251CONFIG_FORCE_MAX_ZONEORDER=13
@@ -265,11 +269,12 @@ CONFIG_PCI_SYSCALL=y
265# CONFIG_PCIEPORTBUS is not set 269# CONFIG_PCIEPORTBUS is not set
266CONFIG_ARCH_SUPPORTS_MSI=y 270CONFIG_ARCH_SUPPORTS_MSI=y
267CONFIG_PCI_MSI=y 271CONFIG_PCI_MSI=y
268CONFIG_PCI_LEGACY=y 272# CONFIG_PCI_LEGACY is not set
269# CONFIG_PCI_DEBUG is not set 273# CONFIG_PCI_DEBUG is not set
270# CONFIG_PCCARD is not set 274# CONFIG_PCCARD is not set
271# CONFIG_HOTPLUG_PCI is not set 275# CONFIG_HOTPLUG_PCI is not set
272# CONFIG_HAS_RAPIDIO is not set 276# CONFIG_HAS_RAPIDIO is not set
277# CONFIG_RELOCATABLE is not set
273CONFIG_PAGE_OFFSET=0xc000000000000000 278CONFIG_PAGE_OFFSET=0xc000000000000000
274CONFIG_KERNEL_START=0xc000000000000000 279CONFIG_KERNEL_START=0xc000000000000000
275CONFIG_PHYSICAL_START=0x00000000 280CONFIG_PHYSICAL_START=0x00000000
@@ -323,6 +328,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
323# CONFIG_TIPC is not set 328# CONFIG_TIPC is not set
324# CONFIG_ATM is not set 329# CONFIG_ATM is not set
325# CONFIG_BRIDGE is not set 330# CONFIG_BRIDGE is not set
331# CONFIG_NET_DSA is not set
326# CONFIG_VLAN_8021Q is not set 332# CONFIG_VLAN_8021Q is not set
327# CONFIG_DECNET is not set 333# CONFIG_DECNET is not set
328# CONFIG_LLC2 is not set 334# CONFIG_LLC2 is not set
@@ -344,14 +350,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_IRDA is not set 350# CONFIG_IRDA is not set
345# CONFIG_BT is not set 351# CONFIG_BT is not set
346# CONFIG_AF_RXRPC is not set 352# CONFIG_AF_RXRPC is not set
347 353# CONFIG_PHONET is not set
348# 354# CONFIG_WIRELESS is not set
349# Wireless
350#
351# CONFIG_CFG80211 is not set
352# CONFIG_WIRELESS_EXT is not set
353# CONFIG_MAC80211 is not set
354# CONFIG_IEEE80211 is not set
355# CONFIG_RFKILL is not set 355# CONFIG_RFKILL is not set
356# CONFIG_NET_9P is not set 356# CONFIG_NET_9P is not set
357 357
@@ -402,19 +402,18 @@ CONFIG_MISC_DEVICES=y
402# CONFIG_HP_ILO is not set 402# CONFIG_HP_ILO is not set
403CONFIG_HAVE_IDE=y 403CONFIG_HAVE_IDE=y
404CONFIG_IDE=y 404CONFIG_IDE=y
405CONFIG_BLK_DEV_IDE=y
406 405
407# 406#
408# Please see Documentation/ide/ide.txt for help/info on IDE drives 407# Please see Documentation/ide/ide.txt for help/info on IDE drives
409# 408#
410CONFIG_IDE_TIMINGS=y 409CONFIG_IDE_TIMINGS=y
411# CONFIG_BLK_DEV_IDE_SATA is not set 410# CONFIG_BLK_DEV_IDE_SATA is not set
412CONFIG_BLK_DEV_IDEDISK=y 411CONFIG_IDE_GD=y
413# CONFIG_IDEDISK_MULTI_MODE is not set 412CONFIG_IDE_GD_ATA=y
413# CONFIG_IDE_GD_ATAPI is not set
414CONFIG_BLK_DEV_IDECD=y 414CONFIG_BLK_DEV_IDECD=y
415CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 415CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
416# CONFIG_BLK_DEV_IDETAPE is not set 416# CONFIG_BLK_DEV_IDETAPE is not set
417# CONFIG_BLK_DEV_IDEFLOPPY is not set
418# CONFIG_BLK_DEV_IDESCSI is not set 417# CONFIG_BLK_DEV_IDESCSI is not set
419CONFIG_IDE_TASK_IOCTL=y 418CONFIG_IDE_TASK_IOCTL=y
420CONFIG_IDE_PROC_FS=y 419CONFIG_IDE_PROC_FS=y
@@ -644,6 +643,9 @@ CONFIG_MII=y
644# CONFIG_IBM_NEW_EMAC_RGMII is not set 643# CONFIG_IBM_NEW_EMAC_RGMII is not set
645# CONFIG_IBM_NEW_EMAC_TAH is not set 644# CONFIG_IBM_NEW_EMAC_TAH is not set
646# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 645# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
646# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
647# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
648# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
647CONFIG_NET_PCI=y 649CONFIG_NET_PCI=y
648# CONFIG_PCNET32 is not set 650# CONFIG_PCNET32 is not set
649CONFIG_AMD8111_ETH=y 651CONFIG_AMD8111_ETH=y
@@ -664,11 +666,11 @@ CONFIG_AMD8111_ETH=y
664# CONFIG_TLAN is not set 666# CONFIG_TLAN is not set
665# CONFIG_VIA_RHINE is not set 667# CONFIG_VIA_RHINE is not set
666# CONFIG_SC92031 is not set 668# CONFIG_SC92031 is not set
669# CONFIG_ATL2 is not set
667CONFIG_NETDEV_1000=y 670CONFIG_NETDEV_1000=y
668# CONFIG_ACENIC is not set 671# CONFIG_ACENIC is not set
669# CONFIG_DL2K is not set 672# CONFIG_DL2K is not set
670CONFIG_E1000=y 673CONFIG_E1000=y
671# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
672# CONFIG_E1000E is not set 674# CONFIG_E1000E is not set
673# CONFIG_IP1000 is not set 675# CONFIG_IP1000 is not set
674# CONFIG_IGB is not set 676# CONFIG_IGB is not set
@@ -685,18 +687,22 @@ CONFIG_TIGON3=y
685# CONFIG_QLA3XXX is not set 687# CONFIG_QLA3XXX is not set
686# CONFIG_ATL1 is not set 688# CONFIG_ATL1 is not set
687# CONFIG_ATL1E is not set 689# CONFIG_ATL1E is not set
690# CONFIG_JME is not set
688CONFIG_NETDEV_10000=y 691CONFIG_NETDEV_10000=y
689# CONFIG_CHELSIO_T1 is not set 692# CONFIG_CHELSIO_T1 is not set
690# CONFIG_CHELSIO_T3 is not set 693# CONFIG_CHELSIO_T3 is not set
694# CONFIG_ENIC is not set
691# CONFIG_IXGBE is not set 695# CONFIG_IXGBE is not set
692# CONFIG_IXGB is not set 696# CONFIG_IXGB is not set
693# CONFIG_S2IO is not set 697# CONFIG_S2IO is not set
694# CONFIG_MYRI10GE is not set 698# CONFIG_MYRI10GE is not set
695# CONFIG_NETXEN_NIC is not set 699# CONFIG_NETXEN_NIC is not set
696# CONFIG_NIU is not set 700# CONFIG_NIU is not set
701# CONFIG_MLX4_EN is not set
697# CONFIG_MLX4_CORE is not set 702# CONFIG_MLX4_CORE is not set
698# CONFIG_TEHUTI is not set 703# CONFIG_TEHUTI is not set
699# CONFIG_BNX2X is not set 704# CONFIG_BNX2X is not set
705# CONFIG_QLGE is not set
700# CONFIG_SFC is not set 706# CONFIG_SFC is not set
701# CONFIG_TR is not set 707# CONFIG_TR is not set
702 708
@@ -895,6 +901,17 @@ CONFIG_SSB_POSSIBLE=y
895# CONFIG_MFD_SM501 is not set 901# CONFIG_MFD_SM501 is not set
896# CONFIG_HTC_PASIC3 is not set 902# CONFIG_HTC_PASIC3 is not set
897# CONFIG_MFD_TMIO is not set 903# CONFIG_MFD_TMIO is not set
904# CONFIG_PMIC_DA903X is not set
905# CONFIG_MFD_WM8400 is not set
906# CONFIG_MFD_WM8350_I2C is not set
907
908#
909# Voltage and Current regulators
910#
911# CONFIG_REGULATOR is not set
912# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
913# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
914# CONFIG_REGULATOR_BQ24022 is not set
898 915
899# 916#
900# Multimedia devices 917# Multimedia devices
@@ -942,9 +959,36 @@ CONFIG_HID=y
942# USB Input Devices 959# USB Input Devices
943# 960#
944CONFIG_USB_HID=y 961CONFIG_USB_HID=y
945# CONFIG_USB_HIDINPUT_POWERBOOK is not set 962# CONFIG_HID_PID is not set
946# CONFIG_HID_FF is not set
947# CONFIG_USB_HIDDEV is not set 963# CONFIG_USB_HIDDEV is not set
964
965#
966# Special HID drivers
967#
968CONFIG_HID_COMPAT=y
969CONFIG_HID_A4TECH=y
970CONFIG_HID_APPLE=y
971CONFIG_HID_BELKIN=y
972CONFIG_HID_BRIGHT=y
973CONFIG_HID_CHERRY=y
974CONFIG_HID_CHICONY=y
975CONFIG_HID_CYPRESS=y
976CONFIG_HID_DELL=y
977CONFIG_HID_EZKEY=y
978CONFIG_HID_GYRATION=y
979CONFIG_HID_LOGITECH=y
980# CONFIG_LOGITECH_FF is not set
981# CONFIG_LOGIRUMBLEPAD2_FF is not set
982CONFIG_HID_MICROSOFT=y
983CONFIG_HID_MONTEREY=y
984CONFIG_HID_PANTHERLORD=y
985# CONFIG_PANTHERLORD_FF is not set
986CONFIG_HID_PETALYNX=y
987CONFIG_HID_SAMSUNG=y
988CONFIG_HID_SONY=y
989CONFIG_HID_SUNPLUS=y
990# CONFIG_THRUSTMASTER_FF is not set
991# CONFIG_ZEROPLUS_FF is not set
948CONFIG_USB_SUPPORT=y 992CONFIG_USB_SUPPORT=y
949CONFIG_USB_ARCH_HAS_HCD=y 993CONFIG_USB_ARCH_HAS_HCD=y
950CONFIG_USB_ARCH_HAS_OHCI=y 994CONFIG_USB_ARCH_HAS_OHCI=y
@@ -961,6 +1005,8 @@ CONFIG_USB_DEVICE_CLASS=y
961# CONFIG_USB_DYNAMIC_MINORS is not set 1005# CONFIG_USB_DYNAMIC_MINORS is not set
962# CONFIG_USB_OTG is not set 1006# CONFIG_USB_OTG is not set
963CONFIG_USB_MON=y 1007CONFIG_USB_MON=y
1008# CONFIG_USB_WUSB is not set
1009# CONFIG_USB_WUSB_CBAF is not set
964 1010
965# 1011#
966# USB Host Controller Drivers 1012# USB Host Controller Drivers
@@ -980,6 +1026,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
980CONFIG_USB_UHCI_HCD=y 1026CONFIG_USB_UHCI_HCD=y
981# CONFIG_USB_SL811_HCD is not set 1027# CONFIG_USB_SL811_HCD is not set
982# CONFIG_USB_R8A66597_HCD is not set 1028# CONFIG_USB_R8A66597_HCD is not set
1029# CONFIG_USB_WHCI_HCD is not set
1030# CONFIG_USB_HWA_HCD is not set
983 1031
984# 1032#
985# USB Device Class drivers 1033# USB Device Class drivers
@@ -987,6 +1035,7 @@ CONFIG_USB_UHCI_HCD=y
987# CONFIG_USB_ACM is not set 1035# CONFIG_USB_ACM is not set
988# CONFIG_USB_PRINTER is not set 1036# CONFIG_USB_PRINTER is not set
989# CONFIG_USB_WDM is not set 1037# CONFIG_USB_WDM is not set
1038# CONFIG_USB_TMC is not set
990 1039
991# 1040#
992# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1041# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1070,6 +1119,7 @@ CONFIG_USB_SERIAL_TI=m
1070# CONFIG_USB_EMI62 is not set 1119# CONFIG_USB_EMI62 is not set
1071# CONFIG_USB_EMI26 is not set 1120# CONFIG_USB_EMI26 is not set
1072# CONFIG_USB_ADUTUX is not set 1121# CONFIG_USB_ADUTUX is not set
1122# CONFIG_USB_SEVSEG is not set
1073# CONFIG_USB_RIO500 is not set 1123# CONFIG_USB_RIO500 is not set
1074# CONFIG_USB_LEGOTOWER is not set 1124# CONFIG_USB_LEGOTOWER is not set
1075# CONFIG_USB_LCD is not set 1125# CONFIG_USB_LCD is not set
@@ -1087,7 +1137,9 @@ CONFIG_USB_SERIAL_TI=m
1087# CONFIG_USB_IOWARRIOR is not set 1137# CONFIG_USB_IOWARRIOR is not set
1088# CONFIG_USB_TEST is not set 1138# CONFIG_USB_TEST is not set
1089# CONFIG_USB_ISIGHTFW is not set 1139# CONFIG_USB_ISIGHTFW is not set
1140# CONFIG_USB_VST is not set
1090# CONFIG_USB_GADGET is not set 1141# CONFIG_USB_GADGET is not set
1142# CONFIG_UWB is not set
1091# CONFIG_MMC is not set 1143# CONFIG_MMC is not set
1092# CONFIG_MEMSTICK is not set 1144# CONFIG_MEMSTICK is not set
1093# CONFIG_NEW_LEDS is not set 1145# CONFIG_NEW_LEDS is not set
@@ -1097,6 +1149,7 @@ CONFIG_USB_SERIAL_TI=m
1097# CONFIG_RTC_CLASS is not set 1149# CONFIG_RTC_CLASS is not set
1098# CONFIG_DMADEVICES is not set 1150# CONFIG_DMADEVICES is not set
1099# CONFIG_UIO is not set 1151# CONFIG_UIO is not set
1152# CONFIG_STAGING is not set
1100 1153
1101# 1154#
1102# File systems 1155# File systems
@@ -1104,15 +1157,23 @@ CONFIG_USB_SERIAL_TI=m
1104CONFIG_EXT2_FS=y 1157CONFIG_EXT2_FS=y
1105# CONFIG_EXT2_FS_XATTR is not set 1158# CONFIG_EXT2_FS_XATTR is not set
1106CONFIG_EXT2_FS_XIP=y 1159CONFIG_EXT2_FS_XIP=y
1107CONFIG_FS_XIP=y
1108CONFIG_EXT3_FS=y 1160CONFIG_EXT3_FS=y
1109# CONFIG_EXT3_FS_XATTR is not set 1161# CONFIG_EXT3_FS_XATTR is not set
1110# CONFIG_EXT4DEV_FS is not set 1162CONFIG_EXT4_FS=y
1163# CONFIG_EXT4DEV_COMPAT is not set
1164CONFIG_EXT4_FS_XATTR=y
1165# CONFIG_EXT4_FS_POSIX_ACL is not set
1166# CONFIG_EXT4_FS_SECURITY is not set
1167CONFIG_FS_XIP=y
1111CONFIG_JBD=y 1168CONFIG_JBD=y
1112# CONFIG_JBD_DEBUG is not set 1169# CONFIG_JBD_DEBUG is not set
1170CONFIG_JBD2=y
1171# CONFIG_JBD2_DEBUG is not set
1172CONFIG_FS_MBCACHE=y
1113# CONFIG_REISERFS_FS is not set 1173# CONFIG_REISERFS_FS is not set
1114# CONFIG_JFS_FS is not set 1174# CONFIG_JFS_FS is not set
1115CONFIG_FS_POSIX_ACL=y 1175CONFIG_FS_POSIX_ACL=y
1176CONFIG_FILE_LOCKING=y
1116# CONFIG_XFS_FS is not set 1177# CONFIG_XFS_FS is not set
1117# CONFIG_GFS2_FS is not set 1178# CONFIG_GFS2_FS is not set
1118# CONFIG_OCFS2_FS is not set 1179# CONFIG_OCFS2_FS is not set
@@ -1146,6 +1207,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1146CONFIG_PROC_FS=y 1207CONFIG_PROC_FS=y
1147CONFIG_PROC_KCORE=y 1208CONFIG_PROC_KCORE=y
1148CONFIG_PROC_SYSCTL=y 1209CONFIG_PROC_SYSCTL=y
1210CONFIG_PROC_PAGE_MONITOR=y
1149CONFIG_SYSFS=y 1211CONFIG_SYSFS=y
1150CONFIG_TMPFS=y 1212CONFIG_TMPFS=y
1151# CONFIG_TMPFS_POSIX_ACL is not set 1213# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1185,6 +1247,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1185CONFIG_NFS_COMMON=y 1247CONFIG_NFS_COMMON=y
1186CONFIG_SUNRPC=y 1248CONFIG_SUNRPC=y
1187CONFIG_SUNRPC_GSS=y 1249CONFIG_SUNRPC_GSS=y
1250# CONFIG_SUNRPC_REGISTER_V4 is not set
1188CONFIG_RPCSEC_GSS_KRB5=y 1251CONFIG_RPCSEC_GSS_KRB5=y
1189# CONFIG_RPCSEC_GSS_SPKM3 is not set 1252# CONFIG_RPCSEC_GSS_SPKM3 is not set
1190# CONFIG_SMB_FS is not set 1253# CONFIG_SMB_FS is not set
@@ -1260,9 +1323,8 @@ CONFIG_NLS_UTF8=y
1260# Library routines 1323# Library routines
1261# 1324#
1262CONFIG_BITREVERSE=y 1325CONFIG_BITREVERSE=y
1263# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1264CONFIG_CRC_CCITT=y 1326CONFIG_CRC_CCITT=y
1265# CONFIG_CRC16 is not set 1327CONFIG_CRC16=y
1266CONFIG_CRC_T10DIF=y 1328CONFIG_CRC_T10DIF=y
1267# CONFIG_CRC_ITU_T is not set 1329# CONFIG_CRC_ITU_T is not set
1268CONFIG_CRC32=y 1330CONFIG_CRC32=y
@@ -1315,21 +1377,28 @@ CONFIG_DEBUG_BUGVERBOSE=y
1315CONFIG_DEBUG_MEMORY_INIT=y 1377CONFIG_DEBUG_MEMORY_INIT=y
1316# CONFIG_DEBUG_LIST is not set 1378# CONFIG_DEBUG_LIST is not set
1317# CONFIG_DEBUG_SG is not set 1379# CONFIG_DEBUG_SG is not set
1318CONFIG_FRAME_POINTER=y
1319# CONFIG_BOOT_PRINTK_DELAY is not set 1380# CONFIG_BOOT_PRINTK_DELAY is not set
1320# CONFIG_RCU_TORTURE_TEST is not set 1381# CONFIG_RCU_TORTURE_TEST is not set
1382# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1321# CONFIG_KPROBES_SANITY_TEST is not set 1383# CONFIG_KPROBES_SANITY_TEST is not set
1322# CONFIG_BACKTRACE_SELF_TEST is not set 1384# CONFIG_BACKTRACE_SELF_TEST is not set
1385# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1323# CONFIG_LKDTM is not set 1386# CONFIG_LKDTM is not set
1324# CONFIG_FAULT_INJECTION is not set 1387# CONFIG_FAULT_INJECTION is not set
1325CONFIG_LATENCYTOP=y 1388CONFIG_LATENCYTOP=y
1326# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1389# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1327CONFIG_HAVE_FTRACE=y 1390CONFIG_HAVE_FUNCTION_TRACER=y
1328CONFIG_HAVE_DYNAMIC_FTRACE=y 1391
1329# CONFIG_FTRACE is not set 1392#
1393# Tracers
1394#
1395# CONFIG_FUNCTION_TRACER is not set
1330# CONFIG_IRQSOFF_TRACER is not set 1396# CONFIG_IRQSOFF_TRACER is not set
1331# CONFIG_SCHED_TRACER is not set 1397# CONFIG_SCHED_TRACER is not set
1332# CONFIG_CONTEXT_SWITCH_TRACER is not set 1398# CONFIG_CONTEXT_SWITCH_TRACER is not set
1399# CONFIG_BOOT_TRACER is not set
1400# CONFIG_STACK_TRACER is not set
1401CONFIG_DYNAMIC_PRINTK_DEBUG=y
1333# CONFIG_SAMPLES is not set 1402# CONFIG_SAMPLES is not set
1334CONFIG_HAVE_ARCH_KGDB=y 1403CONFIG_HAVE_ARCH_KGDB=y
1335# CONFIG_KGDB is not set 1404# CONFIG_KGDB is not set
@@ -1338,6 +1407,7 @@ CONFIG_DEBUG_STACK_USAGE=y
1338# CONFIG_DEBUG_PAGEALLOC is not set 1407# CONFIG_DEBUG_PAGEALLOC is not set
1339# CONFIG_CODE_PATCHING_SELFTEST is not set 1408# CONFIG_CODE_PATCHING_SELFTEST is not set
1340# CONFIG_FTR_FIXUP_SELFTEST is not set 1409# CONFIG_FTR_FIXUP_SELFTEST is not set
1410# CONFIG_MSI_BITMAP_SELFTEST is not set
1341CONFIG_XMON=y 1411CONFIG_XMON=y
1342CONFIG_XMON_DEFAULT=y 1412CONFIG_XMON_DEFAULT=y
1343CONFIG_XMON_DISASSEMBLY=y 1413CONFIG_XMON_DISASSEMBLY=y
@@ -1352,14 +1422,19 @@ CONFIG_BOOTX_TEXT=y
1352# 1422#
1353# CONFIG_KEYS is not set 1423# CONFIG_KEYS is not set
1354# CONFIG_SECURITY is not set 1424# CONFIG_SECURITY is not set
1425# CONFIG_SECURITYFS is not set
1355# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1426# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1356CONFIG_CRYPTO=y 1427CONFIG_CRYPTO=y
1357 1428
1358# 1429#
1359# Crypto core or helper 1430# Crypto core or helper
1360# 1431#
1432# CONFIG_CRYPTO_FIPS is not set
1361CONFIG_CRYPTO_ALGAPI=y 1433CONFIG_CRYPTO_ALGAPI=y
1434CONFIG_CRYPTO_AEAD=y
1362CONFIG_CRYPTO_BLKCIPHER=y 1435CONFIG_CRYPTO_BLKCIPHER=y
1436CONFIG_CRYPTO_HASH=y
1437CONFIG_CRYPTO_RNG=y
1363CONFIG_CRYPTO_MANAGER=y 1438CONFIG_CRYPTO_MANAGER=y
1364# CONFIG_CRYPTO_GF128MUL is not set 1439# CONFIG_CRYPTO_GF128MUL is not set
1365# CONFIG_CRYPTO_NULL is not set 1440# CONFIG_CRYPTO_NULL is not set
@@ -1432,6 +1507,11 @@ CONFIG_CRYPTO_DES=y
1432# 1507#
1433# CONFIG_CRYPTO_DEFLATE is not set 1508# CONFIG_CRYPTO_DEFLATE is not set
1434# CONFIG_CRYPTO_LZO is not set 1509# CONFIG_CRYPTO_LZO is not set
1510
1511#
1512# Random Number Generation
1513#
1514# CONFIG_CRYPTO_ANSI_CPRNG is not set
1435# CONFIG_CRYPTO_HW is not set 1515# CONFIG_CRYPTO_HW is not set
1436# CONFIG_PPC_CLOCK is not set 1516# CONFIG_PPC_CLOCK is not set
1437# CONFIG_VIRTUALIZATION is not set 1517# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/mgcoge_defconfig b/arch/powerpc/configs/mgcoge_defconfig
index cc9eaba8c9c9..8d3c62324009 100644
--- a/arch/powerpc/configs/mgcoge_defconfig
+++ b/arch/powerpc/configs/mgcoge_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.26-rc2 3# Linux kernel version: 2.6.28-rc3
4# Thu May 22 08:18:47 2008 4# Sat Nov 8 12:39:38 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,13 +15,14 @@ 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_ALTIVEC 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
21# CONFIG_SMP is not set 22# CONFIG_SMP is not set
22CONFIG_PPC32=y 23CONFIG_PPC32=y
23CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
24CONFIG_PPC_MERGE=y 25# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
25CONFIG_MMU=y 26CONFIG_MMU=y
26CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
27CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -31,12 +32,14 @@ CONFIG_GENERIC_HARDIRQS=y
31# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 32# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
32CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
33CONFIG_STACKTRACE_SUPPORT=y 34CONFIG_STACKTRACE_SUPPORT=y
35CONFIG_HAVE_LATENCYTOP_SUPPORT=y
34CONFIG_LOCKDEP_SUPPORT=y 36CONFIG_LOCKDEP_SUPPORT=y
35CONFIG_RWSEM_XCHGADD_ALGORITHM=y 37CONFIG_RWSEM_XCHGADD_ALGORITHM=y
36CONFIG_ARCH_HAS_ILOG2_U32=y 38CONFIG_ARCH_HAS_ILOG2_U32=y
37CONFIG_GENERIC_HWEIGHT=y 39CONFIG_GENERIC_HWEIGHT=y
38CONFIG_GENERIC_CALIBRATE_DELAY=y 40CONFIG_GENERIC_CALIBRATE_DELAY=y
39CONFIG_GENERIC_FIND_NEXT_BIT=y 41CONFIG_GENERIC_FIND_NEXT_BIT=y
42CONFIG_GENERIC_GPIO=y
40# CONFIG_ARCH_NO_VIRT_TO_BUS is not set 43# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
41CONFIG_PPC=y 44CONFIG_PPC=y
42CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
@@ -45,11 +48,13 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
45CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
46CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
47CONFIG_OF=y 50CONFIG_OF=y
48# CONFIG_PPC_UDBG_16550 is not set 51CONFIG_PPC_UDBG_16550=y
49# CONFIG_GENERIC_TBSYNC is not set 52# CONFIG_GENERIC_TBSYNC is not set
50CONFIG_AUDIT_ARCH=y 53CONFIG_AUDIT_ARCH=y
51CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
52# CONFIG_DEFAULT_UIMAGE is not set 55# CONFIG_DEFAULT_UIMAGE is not set
56CONFIG_HIBERNATE_32=y
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
53# CONFIG_PPC_DCR_NATIVE is not set 58# CONFIG_PPC_DCR_NATIVE is not set
54# CONFIG_PPC_DCR_MMIO is not set 59# CONFIG_PPC_DCR_MMIO is not set
55CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 60CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -82,7 +87,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
82CONFIG_SYSCTL=y 87CONFIG_SYSCTL=y
83CONFIG_EMBEDDED=y 88CONFIG_EMBEDDED=y
84CONFIG_SYSCTL_SYSCALL=y 89CONFIG_SYSCTL_SYSCALL=y
85CONFIG_SYSCTL_SYSCALL_CHECK=y
86CONFIG_KALLSYMS=y 90CONFIG_KALLSYMS=y
87CONFIG_KALLSYMS_ALL=y 91CONFIG_KALLSYMS_ALL=y
88# CONFIG_KALLSYMS_EXTRA_PASS is not set 92# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -90,6 +94,7 @@ CONFIG_HOTPLUG=y
90CONFIG_PRINTK=y 94CONFIG_PRINTK=y
91CONFIG_BUG=y 95CONFIG_BUG=y
92CONFIG_ELF_CORE=y 96CONFIG_ELF_CORE=y
97CONFIG_PCSPKR_PLATFORM=y
93CONFIG_COMPAT_BRK=y 98CONFIG_COMPAT_BRK=y
94CONFIG_BASE_FULL=y 99CONFIG_BASE_FULL=y
95CONFIG_FUTEX=y 100CONFIG_FUTEX=y
@@ -99,17 +104,22 @@ CONFIG_SIGNALFD=y
99CONFIG_TIMERFD=y 104CONFIG_TIMERFD=y
100CONFIG_EVENTFD=y 105CONFIG_EVENTFD=y
101CONFIG_SHMEM=y 106CONFIG_SHMEM=y
107CONFIG_AIO=y
102CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
109CONFIG_PCI_QUIRKS=y
103CONFIG_SLAB=y 110CONFIG_SLAB=y
104# CONFIG_SLUB is not set 111# CONFIG_SLUB is not set
105# CONFIG_SLOB is not set 112# CONFIG_SLOB is not set
106# CONFIG_PROFILING is not set 113# CONFIG_PROFILING is not set
107# CONFIG_MARKERS is not set 114# CONFIG_MARKERS is not set
108CONFIG_HAVE_OPROFILE=y 115CONFIG_HAVE_OPROFILE=y
116CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
117CONFIG_HAVE_IOREMAP_PROT=y
109CONFIG_HAVE_KPROBES=y 118CONFIG_HAVE_KPROBES=y
110CONFIG_HAVE_KRETPROBES=y 119CONFIG_HAVE_KRETPROBES=y
111# CONFIG_HAVE_DMA_ATTRS is not set 120CONFIG_HAVE_ARCH_TRACEHOOK=y
112CONFIG_PROC_PAGE_MONITOR=y 121CONFIG_HAVE_CLK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
113CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
114CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
115# CONFIG_TINY_SHMEM is not set 125# CONFIG_TINY_SHMEM is not set
@@ -119,6 +129,7 @@ CONFIG_BLOCK=y
119# CONFIG_LBD is not set 129# CONFIG_LBD is not set
120# CONFIG_BLK_DEV_IO_TRACE is not set 130# CONFIG_BLK_DEV_IO_TRACE is not set
121# CONFIG_LSF is not set 131# CONFIG_LSF is not set
132# CONFIG_BLK_DEV_INTEGRITY is not set
122 133
123# 134#
124# IO Schedulers 135# IO Schedulers
@@ -133,18 +144,21 @@ CONFIG_DEFAULT_DEADLINE=y
133# CONFIG_DEFAULT_NOOP is not set 144# CONFIG_DEFAULT_NOOP is not set
134CONFIG_DEFAULT_IOSCHED="deadline" 145CONFIG_DEFAULT_IOSCHED="deadline"
135CONFIG_CLASSIC_RCU=y 146CONFIG_CLASSIC_RCU=y
147# CONFIG_FREEZER is not set
136 148
137# 149#
138# Platform support 150# Platform support
139# 151#
140# CONFIG_PPC_MULTIPLATFORM is not set 152CONFIG_PPC_MULTIPLATFORM=y
141CONFIG_PPC_82xx=y 153CONFIG_CLASSIC32=y
142# CONFIG_PPC_83xx is not set 154CONFIG_PPC_CHRP=y
143# CONFIG_PPC_86xx is not set 155# CONFIG_MPC5121_ADS is not set
144# CONFIG_PPC_MPC512x is not set 156# CONFIG_MPC5121_GENERIC is not set
145# CONFIG_PPC_MPC5121 is not set 157# CONFIG_PPC_MPC52xx is not set
158CONFIG_PPC_PMAC=y
146# CONFIG_PPC_CELL is not set 159# CONFIG_PPC_CELL is not set
147# CONFIG_PPC_CELL_NATIVE is not set 160# CONFIG_PPC_CELL_NATIVE is not set
161CONFIG_PPC_82xx=y
148# CONFIG_MPC8272_ADS is not set 162# CONFIG_MPC8272_ADS is not set
149# CONFIG_PQ2FADS is not set 163# CONFIG_PQ2FADS is not set
150# CONFIG_EP8248E is not set 164# CONFIG_EP8248E is not set
@@ -152,19 +166,28 @@ CONFIG_MGCOGE=y
152# CONFIG_PQ2ADS is not set 166# CONFIG_PQ2ADS is not set
153CONFIG_8260=y 167CONFIG_8260=y
154CONFIG_8272=y 168CONFIG_8272=y
169# CONFIG_PPC_83xx is not set
170# CONFIG_PPC_86xx is not set
171# CONFIG_EMBEDDED6xx is not set
172CONFIG_PPC_NATIVE=y
173# CONFIG_UDBG_RTAS_CONSOLE is not set
155# CONFIG_IPIC is not set 174# CONFIG_IPIC is not set
156# CONFIG_MPIC is not set 175CONFIG_MPIC=y
157# CONFIG_MPIC_WEIRD is not set 176# CONFIG_MPIC_WEIRD is not set
158# CONFIG_PPC_I8259 is not set 177CONFIG_PPC_I8259=y
159# CONFIG_PPC_RTAS is not set 178CONFIG_PPC_RTAS=y
179# CONFIG_RTAS_ERROR_LOGGING is not set
180CONFIG_RTAS_PROC=y
160# CONFIG_MMIO_NVRAM is not set 181# CONFIG_MMIO_NVRAM is not set
161# CONFIG_PPC_MPC106 is not set 182CONFIG_PPC_MPC106=y
162# CONFIG_PPC_970_NAP is not set 183# CONFIG_PPC_970_NAP is not set
163# CONFIG_PPC_INDIRECT_IO is not set 184# CONFIG_PPC_INDIRECT_IO is not set
164# CONFIG_GENERIC_IOMAP is not set 185# CONFIG_GENERIC_IOMAP is not set
165# CONFIG_CPU_FREQ is not set 186# CONFIG_CPU_FREQ is not set
187# CONFIG_PPC601_SYNC_FIX is not set
188# CONFIG_TAU is not set
189# CONFIG_QUICC_ENGINE is not set
166CONFIG_CPM2=y 190CONFIG_CPM2=y
167CONFIG_PPC_CPM_NEW_BINDING=y
168# CONFIG_FSL_ULI1575 is not set 191# CONFIG_FSL_ULI1575 is not set
169CONFIG_CPM=y 192CONFIG_CPM=y
170 193
@@ -172,7 +195,6 @@ CONFIG_CPM=y
172# Kernel options 195# Kernel options
173# 196#
174# CONFIG_HIGHMEM is not set 197# CONFIG_HIGHMEM is not set
175# CONFIG_TICK_ONESHOT is not set
176# CONFIG_NO_HZ is not set 198# CONFIG_NO_HZ is not set
177# CONFIG_HIGH_RES_TIMERS is not set 199# CONFIG_HIGH_RES_TIMERS is not set
178CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 200CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -186,6 +208,8 @@ CONFIG_PREEMPT_NONE=y
186# CONFIG_PREEMPT_VOLUNTARY is not set 208# CONFIG_PREEMPT_VOLUNTARY is not set
187# CONFIG_PREEMPT is not set 209# CONFIG_PREEMPT is not set
188CONFIG_BINFMT_ELF=y 210CONFIG_BINFMT_ELF=y
211# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
212# CONFIG_HAVE_AOUT is not set
189CONFIG_BINFMT_MISC=y 213CONFIG_BINFMT_MISC=y
190# CONFIG_IOMMU_HELPER is not set 214# CONFIG_IOMMU_HELPER is not set
191CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 215CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -195,17 +219,19 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
195CONFIG_ARCH_POPULATES_NODE_MAP=y 219CONFIG_ARCH_POPULATES_NODE_MAP=y
196CONFIG_FLATMEM=y 220CONFIG_FLATMEM=y
197CONFIG_FLAT_NODE_MEM_MAP=y 221CONFIG_FLAT_NODE_MEM_MAP=y
198# CONFIG_SPARSEMEM_STATIC is not set
199# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
200CONFIG_PAGEFLAGS_EXTENDED=y 222CONFIG_PAGEFLAGS_EXTENDED=y
201CONFIG_SPLIT_PTLOCK_CPUS=4 223CONFIG_SPLIT_PTLOCK_CPUS=4
224CONFIG_MIGRATION=y
202# CONFIG_RESOURCES_64BIT is not set 225# CONFIG_RESOURCES_64BIT is not set
226# CONFIG_PHYS_ADDR_T_64BIT is not set
203CONFIG_ZONE_DMA_FLAG=1 227CONFIG_ZONE_DMA_FLAG=1
204CONFIG_BOUNCE=y 228CONFIG_BOUNCE=y
205CONFIG_VIRT_TO_BUS=y 229CONFIG_VIRT_TO_BUS=y
230CONFIG_UNEVICTABLE_LRU=y
206CONFIG_FORCE_MAX_ZONEORDER=11 231CONFIG_FORCE_MAX_ZONEORDER=11
207CONFIG_PROC_DEVICETREE=y 232CONFIG_PROC_DEVICETREE=y
208# CONFIG_CMDLINE_BOOL is not set 233# CONFIG_CMDLINE_BOOL is not set
234CONFIG_EXTRA_TARGETS=""
209# CONFIG_PM is not set 235# CONFIG_PM is not set
210# CONFIG_SECCOMP is not set 236# CONFIG_SECCOMP is not set
211CONFIG_ISA_DMA_API=y 237CONFIG_ISA_DMA_API=y
@@ -213,13 +239,22 @@ CONFIG_ISA_DMA_API=y
213# 239#
214# Bus options 240# Bus options
215# 241#
242# CONFIG_ISA is not set
216CONFIG_ZONE_DMA=y 243CONFIG_ZONE_DMA=y
244CONFIG_PPC_INDIRECT_PCI=y
217CONFIG_FSL_SOC=y 245CONFIG_FSL_SOC=y
218# CONFIG_PCI is not set 246CONFIG_PPC_PCI_CHOICE=y
219# CONFIG_PCI_DOMAINS is not set 247CONFIG_PCI=y
220# CONFIG_PCI_SYSCALL is not set 248CONFIG_PCI_DOMAINS=y
221# CONFIG_ARCH_SUPPORTS_MSI is not set 249CONFIG_PCI_SYSCALL=y
250CONFIG_PCI_8260=y
251# CONFIG_PCIEPORTBUS is not set
252CONFIG_ARCH_SUPPORTS_MSI=y
253# CONFIG_PCI_MSI is not set
254# CONFIG_PCI_LEGACY is not set
255# CONFIG_PCI_DEBUG is not set
222# CONFIG_PCCARD is not set 256# CONFIG_PCCARD is not set
257# CONFIG_HOTPLUG_PCI is not set
223# CONFIG_HAS_RAPIDIO is not set 258# CONFIG_HAS_RAPIDIO is not set
224 259
225# 260#
@@ -235,10 +270,6 @@ CONFIG_PAGE_OFFSET=0xc0000000
235CONFIG_KERNEL_START=0xc0000000 270CONFIG_KERNEL_START=0xc0000000
236CONFIG_PHYSICAL_START=0x00000000 271CONFIG_PHYSICAL_START=0x00000000
237CONFIG_TASK_SIZE=0xc0000000 272CONFIG_TASK_SIZE=0xc0000000
238
239#
240# Networking
241#
242CONFIG_NET=y 273CONFIG_NET=y
243 274
244# 275#
@@ -276,7 +307,6 @@ CONFIG_INET_TCP_DIAG=y
276# CONFIG_TCP_CONG_ADVANCED is not set 307# CONFIG_TCP_CONG_ADVANCED is not set
277CONFIG_TCP_CONG_CUBIC=y 308CONFIG_TCP_CONG_CUBIC=y
278CONFIG_DEFAULT_TCP_CONG="cubic" 309CONFIG_DEFAULT_TCP_CONG="cubic"
279# CONFIG_IP_VS is not set
280# CONFIG_IPV6 is not set 310# CONFIG_IPV6 is not set
281# CONFIG_NETWORK_SECMARK is not set 311# CONFIG_NETWORK_SECMARK is not set
282CONFIG_NETFILTER=y 312CONFIG_NETFILTER=y
@@ -290,10 +320,12 @@ CONFIG_NETFILTER_ADVANCED=y
290# CONFIG_NETFILTER_NETLINK_LOG is not set 320# CONFIG_NETFILTER_NETLINK_LOG is not set
291# CONFIG_NF_CONNTRACK is not set 321# CONFIG_NF_CONNTRACK is not set
292# CONFIG_NETFILTER_XTABLES is not set 322# CONFIG_NETFILTER_XTABLES is not set
323# CONFIG_IP_VS is not set
293 324
294# 325#
295# IP: Netfilter Configuration 326# IP: Netfilter Configuration
296# 327#
328# CONFIG_NF_DEFRAG_IPV4 is not set
297# CONFIG_IP_NF_QUEUE is not set 329# CONFIG_IP_NF_QUEUE is not set
298# CONFIG_IP_NF_IPTABLES is not set 330# CONFIG_IP_NF_IPTABLES is not set
299# CONFIG_IP_NF_ARPTABLES is not set 331# CONFIG_IP_NF_ARPTABLES is not set
@@ -314,11 +346,10 @@ CONFIG_NETFILTER_ADVANCED=y
314# CONFIG_CAN is not set 346# CONFIG_CAN is not set
315# CONFIG_IRDA is not set 347# CONFIG_IRDA is not set
316# CONFIG_BT is not set 348# CONFIG_BT is not set
317 349# CONFIG_PHONET is not set
318# 350CONFIG_WIRELESS=y
319# Wireless
320#
321# CONFIG_CFG80211 is not set 351# CONFIG_CFG80211 is not set
352CONFIG_WIRELESS_OLD_REGULATORY=y
322# CONFIG_WIRELESS_EXT is not set 353# CONFIG_WIRELESS_EXT is not set
323# CONFIG_MAC80211 is not set 354# CONFIG_MAC80211 is not set
324# CONFIG_IEEE80211 is not set 355# CONFIG_IEEE80211 is not set
@@ -398,11 +429,13 @@ CONFIG_MTD_CFI_UTIL=y
398# CONFIG_MTD_COMPLEX_MAPPINGS is not set 429# CONFIG_MTD_COMPLEX_MAPPINGS is not set
399# CONFIG_MTD_PHYSMAP is not set 430# CONFIG_MTD_PHYSMAP is not set
400CONFIG_MTD_PHYSMAP_OF=y 431CONFIG_MTD_PHYSMAP_OF=y
432# CONFIG_MTD_INTEL_VR_NOR is not set
401# CONFIG_MTD_PLATRAM is not set 433# CONFIG_MTD_PLATRAM is not set
402 434
403# 435#
404# Self-contained MTD device drivers 436# Self-contained MTD device drivers
405# 437#
438# CONFIG_MTD_PMC551 is not set
406# CONFIG_MTD_SLRAM is not set 439# CONFIG_MTD_SLRAM is not set
407# CONFIG_MTD_PHRAM is not set 440# CONFIG_MTD_PHRAM is not set
408# CONFIG_MTD_MTDRAM is not set 441# CONFIG_MTD_MTDRAM is not set
@@ -422,19 +455,26 @@ CONFIG_MTD_PHYSMAP_OF=y
422# 455#
423# CONFIG_MTD_UBI is not set 456# CONFIG_MTD_UBI is not set
424CONFIG_OF_DEVICE=y 457CONFIG_OF_DEVICE=y
458CONFIG_OF_GPIO=y
425# CONFIG_PARPORT is not set 459# CONFIG_PARPORT is not set
426CONFIG_BLK_DEV=y 460CONFIG_BLK_DEV=y
427# CONFIG_BLK_DEV_FD is not set 461# CONFIG_BLK_DEV_FD is not set
462# CONFIG_MAC_FLOPPY is not set
463# CONFIG_BLK_CPQ_DA is not set
464# CONFIG_BLK_CPQ_CISS_DA is not set
465# CONFIG_BLK_DEV_DAC960 is not set
428# CONFIG_BLK_DEV_COW_COMMON is not set 466# CONFIG_BLK_DEV_COW_COMMON is not set
429CONFIG_BLK_DEV_LOOP=y 467CONFIG_BLK_DEV_LOOP=y
430# CONFIG_BLK_DEV_CRYPTOLOOP is not set 468# CONFIG_BLK_DEV_CRYPTOLOOP is not set
431# CONFIG_BLK_DEV_NBD is not set 469# CONFIG_BLK_DEV_NBD is not set
470# CONFIG_BLK_DEV_SX8 is not set
432CONFIG_BLK_DEV_RAM=y 471CONFIG_BLK_DEV_RAM=y
433CONFIG_BLK_DEV_RAM_COUNT=16 472CONFIG_BLK_DEV_RAM_COUNT=16
434CONFIG_BLK_DEV_RAM_SIZE=4096 473CONFIG_BLK_DEV_RAM_SIZE=4096
435# CONFIG_BLK_DEV_XIP is not set 474# CONFIG_BLK_DEV_XIP is not set
436# CONFIG_CDROM_PKTCDVD is not set 475# CONFIG_CDROM_PKTCDVD is not set
437# CONFIG_ATA_OVER_ETH is not set 476# CONFIG_ATA_OVER_ETH is not set
477# CONFIG_BLK_DEV_HD is not set
438# CONFIG_MISC_DEVICES is not set 478# CONFIG_MISC_DEVICES is not set
439CONFIG_HAVE_IDE=y 479CONFIG_HAVE_IDE=y
440# CONFIG_IDE is not set 480# CONFIG_IDE is not set
@@ -448,14 +488,25 @@ CONFIG_HAVE_IDE=y
448# CONFIG_SCSI_NETLINK is not set 488# CONFIG_SCSI_NETLINK is not set
449# CONFIG_ATA is not set 489# CONFIG_ATA is not set
450# CONFIG_MD is not set 490# CONFIG_MD is not set
491# CONFIG_FUSION is not set
492
493#
494# IEEE 1394 (FireWire) support
495#
496
497#
498# A new alternative FireWire stack is available with EXPERIMENTAL=y
499#
500# CONFIG_IEEE1394 is not set
501# CONFIG_I2O is not set
451# CONFIG_MACINTOSH_DRIVERS is not set 502# CONFIG_MACINTOSH_DRIVERS is not set
452CONFIG_NETDEVICES=y 503CONFIG_NETDEVICES=y
453# CONFIG_NETDEVICES_MULTIQUEUE is not set
454# CONFIG_DUMMY is not set 504# CONFIG_DUMMY is not set
455# CONFIG_BONDING is not set 505# CONFIG_BONDING is not set
456# CONFIG_EQUALIZER is not set 506# CONFIG_EQUALIZER is not set
457# CONFIG_TUN is not set 507# CONFIG_TUN is not set
458# CONFIG_VETH is not set 508# CONFIG_VETH is not set
509# CONFIG_ARCNET is not set
459CONFIG_PHYLIB=y 510CONFIG_PHYLIB=y
460 511
461# 512#
@@ -475,17 +526,31 @@ CONFIG_FIXED_PHY=y
475# CONFIG_MDIO_BITBANG is not set 526# CONFIG_MDIO_BITBANG is not set
476CONFIG_NET_ETHERNET=y 527CONFIG_NET_ETHERNET=y
477CONFIG_MII=y 528CONFIG_MII=y
529# CONFIG_MACE is not set
530# CONFIG_BMAC is not set
531# CONFIG_HAPPYMEAL is not set
532# CONFIG_SUNGEM is not set
533# CONFIG_CASSINI is not set
534# CONFIG_NET_VENDOR_3COM is not set
535# CONFIG_NET_TULIP is not set
536# CONFIG_HP100 is not set
478# CONFIG_IBM_NEW_EMAC_ZMII is not set 537# CONFIG_IBM_NEW_EMAC_ZMII is not set
479# CONFIG_IBM_NEW_EMAC_RGMII is not set 538# CONFIG_IBM_NEW_EMAC_RGMII is not set
480# CONFIG_IBM_NEW_EMAC_TAH is not set 539# CONFIG_IBM_NEW_EMAC_TAH is not set
481# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 540# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
541# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
542# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
543# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
544# CONFIG_NET_PCI is not set
482# CONFIG_B44 is not set 545# CONFIG_B44 is not set
546# CONFIG_ATL2 is not set
483CONFIG_FS_ENET=y 547CONFIG_FS_ENET=y
484CONFIG_FS_ENET_HAS_SCC=y 548CONFIG_FS_ENET_HAS_SCC=y
485# CONFIG_FS_ENET_HAS_FCC is not set 549# CONFIG_FS_ENET_HAS_FCC is not set
486# CONFIG_FS_ENET_MDIO_FCC is not set 550# CONFIG_FS_ENET_MDIO_FCC is not set
487# CONFIG_NETDEV_1000 is not set 551# CONFIG_NETDEV_1000 is not set
488# CONFIG_NETDEV_10000 is not set 552# CONFIG_NETDEV_10000 is not set
553# CONFIG_TR is not set
489 554
490# 555#
491# Wireless LAN 556# Wireless LAN
@@ -494,6 +559,7 @@ CONFIG_FS_ENET_HAS_SCC=y
494# CONFIG_WLAN_80211 is not set 559# CONFIG_WLAN_80211 is not set
495# CONFIG_IWLWIFI_LEDS is not set 560# CONFIG_IWLWIFI_LEDS is not set
496# CONFIG_WAN is not set 561# CONFIG_WAN is not set
562# CONFIG_FDDI is not set
497# CONFIG_PPP is not set 563# CONFIG_PPP is not set
498# CONFIG_SLIP is not set 564# CONFIG_SLIP is not set
499# CONFIG_NETPOLL is not set 565# CONFIG_NETPOLL is not set
@@ -530,29 +596,47 @@ CONFIG_DEVKMEM=y
530# CONFIG_SERIAL_UARTLITE is not set 596# CONFIG_SERIAL_UARTLITE is not set
531CONFIG_SERIAL_CORE=y 597CONFIG_SERIAL_CORE=y
532CONFIG_SERIAL_CORE_CONSOLE=y 598CONFIG_SERIAL_CORE_CONSOLE=y
599# CONFIG_SERIAL_PMACZILOG is not set
533CONFIG_SERIAL_CPM=y 600CONFIG_SERIAL_CPM=y
534CONFIG_SERIAL_CPM_CONSOLE=y 601CONFIG_SERIAL_CPM_CONSOLE=y
535# CONFIG_SERIAL_CPM_SCC1 is not set 602# CONFIG_SERIAL_JSM is not set
536# CONFIG_SERIAL_CPM_SCC2 is not set
537# CONFIG_SERIAL_CPM_SCC3 is not set
538# CONFIG_SERIAL_CPM_SCC4 is not set
539CONFIG_SERIAL_CPM_SMC1=y
540CONFIG_SERIAL_CPM_SMC2=y
541CONFIG_UNIX98_PTYS=y 603CONFIG_UNIX98_PTYS=y
542CONFIG_LEGACY_PTYS=y 604CONFIG_LEGACY_PTYS=y
543CONFIG_LEGACY_PTY_COUNT=256 605CONFIG_LEGACY_PTY_COUNT=256
606# CONFIG_BRIQ_PANEL is not set
607# CONFIG_HVC_RTAS is not set
544# CONFIG_IPMI_HANDLER is not set 608# CONFIG_IPMI_HANDLER is not set
545CONFIG_HW_RANDOM=y 609CONFIG_HW_RANDOM=y
546# CONFIG_NVRAM is not set 610# CONFIG_NVRAM is not set
547# CONFIG_GEN_RTC is not set 611# CONFIG_GEN_RTC is not set
548# CONFIG_R3964 is not set 612# CONFIG_R3964 is not set
613# CONFIG_APPLICOM is not set
549# CONFIG_RAW_DRIVER is not set 614# CONFIG_RAW_DRIVER is not set
615CONFIG_DEVPORT=y
550# CONFIG_I2C is not set 616# CONFIG_I2C is not set
551# CONFIG_SPI is not set 617# CONFIG_SPI is not set
618CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
619CONFIG_ARCH_REQUIRE_GPIOLIB=y
620CONFIG_GPIOLIB=y
621# CONFIG_DEBUG_GPIO is not set
622
623#
624# I2C GPIO expanders:
625#
626
627#
628# PCI GPIO expanders:
629#
630# CONFIG_GPIO_BT8XX is not set
631
632#
633# SPI GPIO expanders:
634#
552# CONFIG_W1 is not set 635# CONFIG_W1 is not set
553# CONFIG_POWER_SUPPLY is not set 636# CONFIG_POWER_SUPPLY is not set
554# CONFIG_HWMON is not set 637# CONFIG_HWMON is not set
555# CONFIG_THERMAL is not set 638# CONFIG_THERMAL is not set
639# CONFIG_THERMAL_HWMON is not set
556# CONFIG_WATCHDOG is not set 640# CONFIG_WATCHDOG is not set
557 641
558# 642#
@@ -564,8 +648,18 @@ CONFIG_SSB_POSSIBLE=y
564# 648#
565# Multifunction device drivers 649# Multifunction device drivers
566# 650#
651# CONFIG_MFD_CORE is not set
567# CONFIG_MFD_SM501 is not set 652# CONFIG_MFD_SM501 is not set
568# CONFIG_HTC_PASIC3 is not set 653# CONFIG_HTC_PASIC3 is not set
654# CONFIG_MFD_TMIO is not set
655
656#
657# Voltage and Current regulators
658#
659# CONFIG_REGULATOR is not set
660# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
661# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
662# CONFIG_REGULATOR_BQ24022 is not set
569 663
570# 664#
571# Multimedia devices 665# Multimedia devices
@@ -586,6 +680,8 @@ CONFIG_SSB_POSSIBLE=y
586# 680#
587# Graphics support 681# Graphics support
588# 682#
683# CONFIG_AGP is not set
684# CONFIG_DRM is not set
589# CONFIG_VGASTATE is not set 685# CONFIG_VGASTATE is not set
590# CONFIG_VIDEO_OUTPUT_CONTROL is not set 686# CONFIG_VIDEO_OUTPUT_CONTROL is not set
591# CONFIG_FB is not set 687# CONFIG_FB is not set
@@ -595,19 +691,17 @@ CONFIG_SSB_POSSIBLE=y
595# Display device support 691# Display device support
596# 692#
597# CONFIG_DISPLAY_SUPPORT is not set 693# CONFIG_DISPLAY_SUPPORT is not set
598
599#
600# Sound
601#
602# CONFIG_SOUND is not set 694# CONFIG_SOUND is not set
603# CONFIG_USB_SUPPORT is not set 695# CONFIG_USB_SUPPORT is not set
604# CONFIG_MMC is not set 696# CONFIG_MMC is not set
605# CONFIG_MEMSTICK is not set 697# CONFIG_MEMSTICK is not set
606# CONFIG_NEW_LEDS is not set 698# CONFIG_NEW_LEDS is not set
607# CONFIG_ACCESSIBILITY is not set 699# CONFIG_ACCESSIBILITY is not set
700# CONFIG_INFINIBAND is not set
608# CONFIG_RTC_CLASS is not set 701# CONFIG_RTC_CLASS is not set
609# CONFIG_DMADEVICES is not set 702# CONFIG_DMADEVICES is not set
610# CONFIG_UIO is not set 703# CONFIG_UIO is not set
704# CONFIG_STAGING is not set
611 705
612# 706#
613# File systems 707# File systems
@@ -617,11 +711,13 @@ CONFIG_EXT2_FS=y
617# CONFIG_EXT2_FS_XIP is not set 711# CONFIG_EXT2_FS_XIP is not set
618CONFIG_EXT3_FS=y 712CONFIG_EXT3_FS=y
619# CONFIG_EXT3_FS_XATTR is not set 713# CONFIG_EXT3_FS_XATTR is not set
714# CONFIG_EXT4_FS is not set
620CONFIG_JBD=y 715CONFIG_JBD=y
621# CONFIG_JBD_DEBUG is not set 716# CONFIG_JBD_DEBUG is not set
622# CONFIG_REISERFS_FS is not set 717# CONFIG_REISERFS_FS is not set
623# CONFIG_JFS_FS is not set 718# CONFIG_JFS_FS is not set
624# CONFIG_FS_POSIX_ACL is not set 719# CONFIG_FS_POSIX_ACL is not set
720CONFIG_FILE_LOCKING=y
625# CONFIG_XFS_FS is not set 721# CONFIG_XFS_FS is not set
626# CONFIG_OCFS2_FS is not set 722# CONFIG_OCFS2_FS is not set
627CONFIG_DNOTIFY=y 723CONFIG_DNOTIFY=y
@@ -651,6 +747,7 @@ CONFIG_AUTOFS4_FS=y
651CONFIG_PROC_FS=y 747CONFIG_PROC_FS=y
652CONFIG_PROC_KCORE=y 748CONFIG_PROC_KCORE=y
653CONFIG_PROC_SYSCTL=y 749CONFIG_PROC_SYSCTL=y
750CONFIG_PROC_PAGE_MONITOR=y
654CONFIG_SYSFS=y 751CONFIG_SYSFS=y
655CONFIG_TMPFS=y 752CONFIG_TMPFS=y
656# CONFIG_TMPFS_POSIX_ACL is not set 753# CONFIG_TMPFS_POSIX_ACL is not set
@@ -673,6 +770,7 @@ CONFIG_JFFS2_RTIME=y
673CONFIG_CRAMFS=y 770CONFIG_CRAMFS=y
674# CONFIG_VXFS_FS is not set 771# CONFIG_VXFS_FS is not set
675# CONFIG_MINIX_FS is not set 772# CONFIG_MINIX_FS is not set
773# CONFIG_OMFS_FS is not set
676# CONFIG_HPFS_FS is not set 774# CONFIG_HPFS_FS is not set
677# CONFIG_QNX4FS_FS is not set 775# CONFIG_QNX4FS_FS is not set
678# CONFIG_ROMFS_FS is not set 776# CONFIG_ROMFS_FS is not set
@@ -682,8 +780,8 @@ CONFIG_NETWORK_FILESYSTEMS=y
682CONFIG_NFS_FS=y 780CONFIG_NFS_FS=y
683CONFIG_NFS_V3=y 781CONFIG_NFS_V3=y
684# CONFIG_NFS_V3_ACL is not set 782# CONFIG_NFS_V3_ACL is not set
685# CONFIG_NFSD is not set
686CONFIG_ROOT_NFS=y 783CONFIG_ROOT_NFS=y
784# CONFIG_NFSD is not set
687CONFIG_LOCKD=y 785CONFIG_LOCKD=y
688CONFIG_LOCKD_V4=y 786CONFIG_LOCKD_V4=y
689CONFIG_NFS_COMMON=y 787CONFIG_NFS_COMMON=y
@@ -759,9 +857,9 @@ CONFIG_NLS_UTF8=y
759# Library routines 857# Library routines
760# 858#
761CONFIG_BITREVERSE=y 859CONFIG_BITREVERSE=y
762# CONFIG_GENERIC_FIND_FIRST_BIT is not set
763# CONFIG_CRC_CCITT is not set 860# CONFIG_CRC_CCITT is not set
764# CONFIG_CRC16 is not set 861# CONFIG_CRC16 is not set
862# CONFIG_CRC_T10DIF is not set
765# CONFIG_CRC_ITU_T is not set 863# CONFIG_CRC_ITU_T is not set
766CONFIG_CRC32=y 864CONFIG_CRC32=y
767# CONFIG_CRC7 is not set 865# CONFIG_CRC7 is not set
@@ -804,20 +902,41 @@ CONFIG_DEBUG_BUGVERBOSE=y
804CONFIG_DEBUG_INFO=y 902CONFIG_DEBUG_INFO=y
805# CONFIG_DEBUG_VM is not set 903# CONFIG_DEBUG_VM is not set
806# CONFIG_DEBUG_WRITECOUNT is not set 904# CONFIG_DEBUG_WRITECOUNT is not set
905# CONFIG_DEBUG_MEMORY_INIT is not set
807# CONFIG_DEBUG_LIST is not set 906# CONFIG_DEBUG_LIST is not set
808# CONFIG_DEBUG_SG is not set 907# CONFIG_DEBUG_SG is not set
809# CONFIG_BOOT_PRINTK_DELAY is not set 908# CONFIG_BOOT_PRINTK_DELAY is not set
909# CONFIG_RCU_TORTURE_TEST is not set
910# CONFIG_RCU_CPU_STALL_DETECTOR is not set
810# CONFIG_BACKTRACE_SELF_TEST is not set 911# CONFIG_BACKTRACE_SELF_TEST is not set
912# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
811# CONFIG_FAULT_INJECTION is not set 913# CONFIG_FAULT_INJECTION is not set
914# CONFIG_LATENCYTOP is not set
915CONFIG_SYSCTL_SYSCALL_CHECK=y
916CONFIG_HAVE_FUNCTION_TRACER=y
917
918#
919# Tracers
920#
921# CONFIG_FUNCTION_TRACER is not set
922# CONFIG_SCHED_TRACER is not set
923# CONFIG_CONTEXT_SWITCH_TRACER is not set
924# CONFIG_BOOT_TRACER is not set
925# CONFIG_STACK_TRACER is not set
926# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
812# CONFIG_SAMPLES is not set 927# CONFIG_SAMPLES is not set
928CONFIG_HAVE_ARCH_KGDB=y
813# CONFIG_DEBUG_STACKOVERFLOW is not set 929# CONFIG_DEBUG_STACKOVERFLOW is not set
814# CONFIG_DEBUG_STACK_USAGE is not set 930# CONFIG_DEBUG_STACK_USAGE is not set
815# CONFIG_DEBUG_PAGEALLOC is not set 931# CONFIG_DEBUG_PAGEALLOC is not set
816# CONFIG_DEBUGGER is not set 932# CONFIG_CODE_PATCHING_SELFTEST is not set
817# CONFIG_KGDB_CONSOLE is not set 933# CONFIG_FTR_FIXUP_SELFTEST is not set
934# CONFIG_MSI_BITMAP_SELFTEST is not set
935# CONFIG_XMON is not set
818# CONFIG_IRQSTACKS is not set 936# CONFIG_IRQSTACKS is not set
819# CONFIG_VIRQ_DEBUG is not set 937# CONFIG_VIRQ_DEBUG is not set
820CONFIG_BDI_SWITCH=y 938CONFIG_BDI_SWITCH=y
939# CONFIG_BOOTX_TEXT is not set
821# CONFIG_PPC_EARLY_DEBUG is not set 940# CONFIG_PPC_EARLY_DEBUG is not set
822 941
823# 942#
@@ -825,13 +944,19 @@ CONFIG_BDI_SWITCH=y
825# 944#
826# CONFIG_KEYS is not set 945# CONFIG_KEYS is not set
827# CONFIG_SECURITY is not set 946# CONFIG_SECURITY is not set
947# CONFIG_SECURITYFS is not set
948# CONFIG_SECURITY_FILE_CAPABILITIES is not set
828CONFIG_CRYPTO=y 949CONFIG_CRYPTO=y
829 950
830# 951#
831# Crypto core or helper 952# Crypto core or helper
832# 953#
954# CONFIG_CRYPTO_FIPS is not set
833CONFIG_CRYPTO_ALGAPI=y 955CONFIG_CRYPTO_ALGAPI=y
956CONFIG_CRYPTO_AEAD=y
834CONFIG_CRYPTO_BLKCIPHER=y 957CONFIG_CRYPTO_BLKCIPHER=y
958CONFIG_CRYPTO_HASH=y
959CONFIG_CRYPTO_RNG=y
835CONFIG_CRYPTO_MANAGER=y 960CONFIG_CRYPTO_MANAGER=y
836# CONFIG_CRYPTO_NULL is not set 961# CONFIG_CRYPTO_NULL is not set
837# CONFIG_CRYPTO_CRYPTD is not set 962# CONFIG_CRYPTO_CRYPTD is not set
@@ -865,6 +990,10 @@ CONFIG_CRYPTO_PCBC=y
865# CONFIG_CRYPTO_MD4 is not set 990# CONFIG_CRYPTO_MD4 is not set
866CONFIG_CRYPTO_MD5=y 991CONFIG_CRYPTO_MD5=y
867# CONFIG_CRYPTO_MICHAEL_MIC is not set 992# CONFIG_CRYPTO_MICHAEL_MIC is not set
993# CONFIG_CRYPTO_RMD128 is not set
994# CONFIG_CRYPTO_RMD160 is not set
995# CONFIG_CRYPTO_RMD256 is not set
996# CONFIG_CRYPTO_RMD320 is not set
868# CONFIG_CRYPTO_SHA1 is not set 997# CONFIG_CRYPTO_SHA1 is not set
869# CONFIG_CRYPTO_SHA256 is not set 998# CONFIG_CRYPTO_SHA256 is not set
870# CONFIG_CRYPTO_SHA512 is not set 999# CONFIG_CRYPTO_SHA512 is not set
@@ -894,7 +1023,12 @@ CONFIG_CRYPTO_DES=y
894# 1023#
895# CONFIG_CRYPTO_DEFLATE is not set 1024# CONFIG_CRYPTO_DEFLATE is not set
896# CONFIG_CRYPTO_LZO is not set 1025# CONFIG_CRYPTO_LZO is not set
1026
1027#
1028# Random Number Generation
1029#
1030# CONFIG_CRYPTO_ANSI_CPRNG is not set
897# CONFIG_CRYPTO_HW is not set 1031# CONFIG_CRYPTO_HW is not set
898# CONFIG_PPC_CLOCK is not set 1032CONFIG_PPC_CLOCK=y
899CONFIG_PPC_LIB_RHEAP=y 1033CONFIG_PPC_LIB_RHEAP=y
900# CONFIG_VIRTUALIZATION is not set 1034# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/mgsuvd_defconfig b/arch/powerpc/configs/mgsuvd_defconfig
index 3cd6ce4be827..fbaa67f7b0ef 100644
--- a/arch/powerpc/configs/mgsuvd_defconfig
+++ b/arch/powerpc/configs/mgsuvd_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.26-rc2 3# Linux kernel version: 2.6.28-rc3
4# Wed May 21 13:30:33 2008 4# Sat Nov 8 12:39:39 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,7 +19,7 @@ CONFIG_8xx=y
19CONFIG_NOT_COHERENT_CACHE=y 19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32 21CONFIG_WORD_SIZE=32
22CONFIG_PPC_MERGE=y 22# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
23CONFIG_MMU=y 23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y 24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y 25CONFIG_GENERIC_TIME=y
@@ -29,6 +29,7 @@ CONFIG_GENERIC_HARDIRQS=y
29# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set 29# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
30CONFIG_IRQ_PER_CPU=y 30CONFIG_IRQ_PER_CPU=y
31CONFIG_STACKTRACE_SUPPORT=y 31CONFIG_STACKTRACE_SUPPORT=y
32CONFIG_HAVE_LATENCYTOP_SUPPORT=y
32CONFIG_LOCKDEP_SUPPORT=y 33CONFIG_LOCKDEP_SUPPORT=y
33CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
34CONFIG_ARCH_HAS_ILOG2_U32=y 35CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -99,6 +100,7 @@ CONFIG_SIGNALFD=y
99CONFIG_TIMERFD=y 100CONFIG_TIMERFD=y
100CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
101CONFIG_SHMEM=y 102CONFIG_SHMEM=y
103CONFIG_AIO=y
102# CONFIG_VM_EVENT_COUNTERS is not set 104# CONFIG_VM_EVENT_COUNTERS is not set
103CONFIG_SLAB=y 105CONFIG_SLAB=y
104# CONFIG_SLUB is not set 106# CONFIG_SLUB is not set
@@ -106,10 +108,13 @@ CONFIG_SLAB=y
106# CONFIG_PROFILING is not set 108# CONFIG_PROFILING is not set
107# CONFIG_MARKERS is not set 109# CONFIG_MARKERS is not set
108CONFIG_HAVE_OPROFILE=y 110CONFIG_HAVE_OPROFILE=y
111CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
112CONFIG_HAVE_IOREMAP_PROT=y
109CONFIG_HAVE_KPROBES=y 113CONFIG_HAVE_KPROBES=y
110CONFIG_HAVE_KRETPROBES=y 114CONFIG_HAVE_KRETPROBES=y
111# CONFIG_HAVE_DMA_ATTRS is not set 115CONFIG_HAVE_ARCH_TRACEHOOK=y
112CONFIG_PROC_PAGE_MONITOR=y 116CONFIG_HAVE_CLK=y
117# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
113CONFIG_SLABINFO=y 118CONFIG_SLABINFO=y
114CONFIG_RT_MUTEXES=y 119CONFIG_RT_MUTEXES=y
115# CONFIG_TINY_SHMEM is not set 120# CONFIG_TINY_SHMEM is not set
@@ -120,6 +125,7 @@ CONFIG_BLOCK=y
120# CONFIG_BLK_DEV_IO_TRACE is not set 125# CONFIG_BLK_DEV_IO_TRACE is not set
121# CONFIG_LSF is not set 126# CONFIG_LSF is not set
122# CONFIG_BLK_DEV_BSG is not set 127# CONFIG_BLK_DEV_BSG is not set
128# CONFIG_BLK_DEV_INTEGRITY is not set
123 129
124# 130#
125# IO Schedulers 131# IO Schedulers
@@ -134,12 +140,11 @@ CONFIG_DEFAULT_AS=y
134# CONFIG_DEFAULT_NOOP is not set 140# CONFIG_DEFAULT_NOOP is not set
135CONFIG_DEFAULT_IOSCHED="anticipatory" 141CONFIG_DEFAULT_IOSCHED="anticipatory"
136CONFIG_CLASSIC_RCU=y 142CONFIG_CLASSIC_RCU=y
143# CONFIG_FREEZER is not set
137 144
138# 145#
139# Platform support 146# Platform support
140# 147#
141# CONFIG_PPC_MPC512x is not set
142# CONFIG_PPC_MPC5121 is not set
143# CONFIG_PPC_CELL is not set 148# CONFIG_PPC_CELL is not set
144# CONFIG_PPC_CELL_NATIVE is not set 149# CONFIG_PPC_CELL_NATIVE is not set
145CONFIG_CPM1=y 150CONFIG_CPM1=y
@@ -158,6 +163,7 @@ CONFIG_PPC_MGSUVD=y
158# Generic MPC8xx Options 163# Generic MPC8xx Options
159# 164#
160CONFIG_8xx_COPYBACK=y 165CONFIG_8xx_COPYBACK=y
166# CONFIG_8xx_GPIO is not set
161CONFIG_8xx_CPU6=y 167CONFIG_8xx_CPU6=y
162CONFIG_8xx_CPU15=y 168CONFIG_8xx_CPU15=y
163# CONFIG_NO_UCODE_PATCH is not set 169# CONFIG_NO_UCODE_PATCH is not set
@@ -177,7 +183,7 @@ CONFIG_UCODE_PATCH=y
177# CONFIG_PPC_INDIRECT_IO is not set 183# CONFIG_PPC_INDIRECT_IO is not set
178# CONFIG_GENERIC_IOMAP is not set 184# CONFIG_GENERIC_IOMAP is not set
179# CONFIG_CPU_FREQ is not set 185# CONFIG_CPU_FREQ is not set
180CONFIG_PPC_CPM_NEW_BINDING=y 186# CONFIG_QUICC_ENGINE is not set
181# CONFIG_FSL_ULI1575 is not set 187# CONFIG_FSL_ULI1575 is not set
182CONFIG_CPM=y 188CONFIG_CPM=y
183 189
@@ -185,7 +191,6 @@ CONFIG_CPM=y
185# Kernel options 191# Kernel options
186# 192#
187# CONFIG_HIGHMEM is not set 193# CONFIG_HIGHMEM is not set
188# CONFIG_TICK_ONESHOT is not set
189# CONFIG_NO_HZ is not set 194# CONFIG_NO_HZ is not set
190# CONFIG_HIGH_RES_TIMERS is not set 195# CONFIG_HIGH_RES_TIMERS is not set
191CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 196CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -199,6 +204,8 @@ CONFIG_PREEMPT_NONE=y
199# CONFIG_PREEMPT_VOLUNTARY is not set 204# CONFIG_PREEMPT_VOLUNTARY is not set
200# CONFIG_PREEMPT is not set 205# CONFIG_PREEMPT is not set
201CONFIG_BINFMT_ELF=y 206CONFIG_BINFMT_ELF=y
207# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
208# CONFIG_HAVE_AOUT is not set
202# CONFIG_BINFMT_MISC is not set 209# CONFIG_BINFMT_MISC is not set
203CONFIG_MATH_EMULATION=y 210CONFIG_MATH_EMULATION=y
204# CONFIG_IOMMU_HELPER is not set 211# CONFIG_IOMMU_HELPER is not set
@@ -213,17 +220,19 @@ CONFIG_FLATMEM_MANUAL=y
213# CONFIG_SPARSEMEM_MANUAL is not set 220# CONFIG_SPARSEMEM_MANUAL is not set
214CONFIG_FLATMEM=y 221CONFIG_FLATMEM=y
215CONFIG_FLAT_NODE_MEM_MAP=y 222CONFIG_FLAT_NODE_MEM_MAP=y
216# CONFIG_SPARSEMEM_STATIC is not set
217# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
218CONFIG_PAGEFLAGS_EXTENDED=y 223CONFIG_PAGEFLAGS_EXTENDED=y
219CONFIG_SPLIT_PTLOCK_CPUS=4 224CONFIG_SPLIT_PTLOCK_CPUS=4
225CONFIG_MIGRATION=y
220# CONFIG_RESOURCES_64BIT is not set 226# CONFIG_RESOURCES_64BIT is not set
227# CONFIG_PHYS_ADDR_T_64BIT is not set
221CONFIG_ZONE_DMA_FLAG=1 228CONFIG_ZONE_DMA_FLAG=1
222CONFIG_BOUNCE=y 229CONFIG_BOUNCE=y
223CONFIG_VIRT_TO_BUS=y 230CONFIG_VIRT_TO_BUS=y
231CONFIG_UNEVICTABLE_LRU=y
224CONFIG_FORCE_MAX_ZONEORDER=11 232CONFIG_FORCE_MAX_ZONEORDER=11
225# CONFIG_PROC_DEVICETREE is not set 233# CONFIG_PROC_DEVICETREE is not set
226# CONFIG_CMDLINE_BOOL is not set 234# CONFIG_CMDLINE_BOOL is not set
235CONFIG_EXTRA_TARGETS=""
227# CONFIG_PM is not set 236# CONFIG_PM is not set
228# CONFIG_SECCOMP is not set 237# CONFIG_SECCOMP is not set
229CONFIG_ISA_DMA_API=y 238CONFIG_ISA_DMA_API=y
@@ -255,10 +264,6 @@ CONFIG_PHYSICAL_START=0x00000000
255CONFIG_TASK_SIZE=0x80000000 264CONFIG_TASK_SIZE=0x80000000
256CONFIG_CONSISTENT_START=0xfd000000 265CONFIG_CONSISTENT_START=0xfd000000
257CONFIG_CONSISTENT_SIZE=0x00200000 266CONFIG_CONSISTENT_SIZE=0x00200000
258
259#
260# Networking
261#
262CONFIG_NET=y 267CONFIG_NET=y
263 268
264# 269#
@@ -309,6 +314,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
309# CONFIG_TIPC is not set 314# CONFIG_TIPC is not set
310# CONFIG_ATM is not set 315# CONFIG_ATM is not set
311# CONFIG_BRIDGE is not set 316# CONFIG_BRIDGE is not set
317# CONFIG_NET_DSA is not set
312# CONFIG_VLAN_8021Q is not set 318# CONFIG_VLAN_8021Q is not set
313# CONFIG_DECNET is not set 319# CONFIG_DECNET is not set
314# CONFIG_LLC2 is not set 320# CONFIG_LLC2 is not set
@@ -329,11 +335,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
329# CONFIG_IRDA is not set 335# CONFIG_IRDA is not set
330# CONFIG_BT is not set 336# CONFIG_BT is not set
331# CONFIG_AF_RXRPC is not set 337# CONFIG_AF_RXRPC is not set
332 338# CONFIG_PHONET is not set
333# 339CONFIG_WIRELESS=y
334# Wireless
335#
336# CONFIG_CFG80211 is not set 340# CONFIG_CFG80211 is not set
341CONFIG_WIRELESS_OLD_REGULATORY=y
337# CONFIG_WIRELESS_EXT is not set 342# CONFIG_WIRELESS_EXT is not set
338# CONFIG_MAC80211 is not set 343# CONFIG_MAC80211 is not set
339# CONFIG_IEEE80211 is not set 344# CONFIG_IEEE80211 is not set
@@ -447,6 +452,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
447# CONFIG_BLK_DEV_XIP is not set 452# CONFIG_BLK_DEV_XIP is not set
448# CONFIG_CDROM_PKTCDVD is not set 453# CONFIG_CDROM_PKTCDVD is not set
449# CONFIG_ATA_OVER_ETH is not set 454# CONFIG_ATA_OVER_ETH is not set
455# CONFIG_BLK_DEV_HD is not set
450# CONFIG_MISC_DEVICES is not set 456# CONFIG_MISC_DEVICES is not set
451CONFIG_HAVE_IDE=y 457CONFIG_HAVE_IDE=y
452# CONFIG_IDE is not set 458# CONFIG_IDE is not set
@@ -462,7 +468,6 @@ CONFIG_HAVE_IDE=y
462# CONFIG_MD is not set 468# CONFIG_MD is not set
463# CONFIG_MACINTOSH_DRIVERS is not set 469# CONFIG_MACINTOSH_DRIVERS is not set
464CONFIG_NETDEVICES=y 470CONFIG_NETDEVICES=y
465# CONFIG_NETDEVICES_MULTIQUEUE is not set
466# CONFIG_DUMMY is not set 471# CONFIG_DUMMY is not set
467# CONFIG_BONDING is not set 472# CONFIG_BONDING is not set
468# CONFIG_MACVLAN is not set 473# CONFIG_MACVLAN is not set
@@ -492,6 +497,9 @@ CONFIG_MII=y
492# CONFIG_IBM_NEW_EMAC_RGMII is not set 497# CONFIG_IBM_NEW_EMAC_RGMII is not set
493# CONFIG_IBM_NEW_EMAC_TAH is not set 498# CONFIG_IBM_NEW_EMAC_TAH is not set
494# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 499# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
500# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
501# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
502# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
495# CONFIG_B44 is not set 503# CONFIG_B44 is not set
496CONFIG_FS_ENET=y 504CONFIG_FS_ENET=y
497CONFIG_FS_ENET_HAS_SCC=y 505CONFIG_FS_ENET_HAS_SCC=y
@@ -546,12 +554,6 @@ CONFIG_SERIAL_CORE=y
546CONFIG_SERIAL_CORE_CONSOLE=y 554CONFIG_SERIAL_CORE_CONSOLE=y
547CONFIG_SERIAL_CPM=y 555CONFIG_SERIAL_CPM=y
548CONFIG_SERIAL_CPM_CONSOLE=y 556CONFIG_SERIAL_CPM_CONSOLE=y
549# CONFIG_SERIAL_CPM_SCC1 is not set
550# CONFIG_SERIAL_CPM_SCC2 is not set
551# CONFIG_SERIAL_CPM_SCC3 is not set
552# CONFIG_SERIAL_CPM_SCC4 is not set
553CONFIG_SERIAL_CPM_SMC1=y
554# CONFIG_SERIAL_CPM_SMC2 is not set
555CONFIG_UNIX98_PTYS=y 557CONFIG_UNIX98_PTYS=y
556# CONFIG_LEGACY_PTYS is not set 558# CONFIG_LEGACY_PTYS is not set
557# CONFIG_IPMI_HANDLER is not set 559# CONFIG_IPMI_HANDLER is not set
@@ -564,10 +566,13 @@ CONFIG_GEN_RTC=y
564# CONFIG_TCG_TPM is not set 566# CONFIG_TCG_TPM is not set
565# CONFIG_I2C is not set 567# CONFIG_I2C is not set
566# CONFIG_SPI is not set 568# CONFIG_SPI is not set
569CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
570# CONFIG_GPIOLIB is not set
567# CONFIG_W1 is not set 571# CONFIG_W1 is not set
568# CONFIG_POWER_SUPPLY is not set 572# CONFIG_POWER_SUPPLY is not set
569# CONFIG_HWMON is not set 573# CONFIG_HWMON is not set
570# CONFIG_THERMAL is not set 574# CONFIG_THERMAL is not set
575# CONFIG_THERMAL_HWMON is not set
571# CONFIG_WATCHDOG is not set 576# CONFIG_WATCHDOG is not set
572 577
573# 578#
@@ -579,8 +584,18 @@ CONFIG_SSB_POSSIBLE=y
579# 584#
580# Multifunction device drivers 585# Multifunction device drivers
581# 586#
587# CONFIG_MFD_CORE is not set
582# CONFIG_MFD_SM501 is not set 588# CONFIG_MFD_SM501 is not set
583# CONFIG_HTC_PASIC3 is not set 589# CONFIG_HTC_PASIC3 is not set
590# CONFIG_MFD_TMIO is not set
591
592#
593# Voltage and Current regulators
594#
595# CONFIG_REGULATOR is not set
596# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
597# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
598# CONFIG_REGULATOR_BQ24022 is not set
584 599
585# 600#
586# Multimedia devices 601# Multimedia devices
@@ -610,10 +625,6 @@ CONFIG_SSB_POSSIBLE=y
610# Display device support 625# Display device support
611# 626#
612# CONFIG_DISPLAY_SUPPORT is not set 627# CONFIG_DISPLAY_SUPPORT is not set
613
614#
615# Sound
616#
617# CONFIG_SOUND is not set 628# CONFIG_SOUND is not set
618# CONFIG_USB_SUPPORT is not set 629# CONFIG_USB_SUPPORT is not set
619# CONFIG_MMC is not set 630# CONFIG_MMC is not set
@@ -624,6 +635,7 @@ CONFIG_SSB_POSSIBLE=y
624# CONFIG_RTC_CLASS is not set 635# CONFIG_RTC_CLASS is not set
625# CONFIG_DMADEVICES is not set 636# CONFIG_DMADEVICES is not set
626# CONFIG_UIO is not set 637# CONFIG_UIO is not set
638# CONFIG_STAGING is not set
627 639
628# 640#
629# File systems 641# File systems
@@ -637,13 +649,14 @@ CONFIG_EXT3_FS=y
637CONFIG_EXT3_FS_XATTR=y 649CONFIG_EXT3_FS_XATTR=y
638# CONFIG_EXT3_FS_POSIX_ACL is not set 650# CONFIG_EXT3_FS_POSIX_ACL is not set
639# CONFIG_EXT3_FS_SECURITY is not set 651# CONFIG_EXT3_FS_SECURITY is not set
640# CONFIG_EXT4DEV_FS is not set 652# CONFIG_EXT4_FS is not set
641CONFIG_JBD=y 653CONFIG_JBD=y
642# CONFIG_JBD_DEBUG is not set 654# CONFIG_JBD_DEBUG is not set
643CONFIG_FS_MBCACHE=y 655CONFIG_FS_MBCACHE=y
644# CONFIG_REISERFS_FS is not set 656# CONFIG_REISERFS_FS is not set
645# CONFIG_JFS_FS is not set 657# CONFIG_JFS_FS is not set
646# CONFIG_FS_POSIX_ACL is not set 658# CONFIG_FS_POSIX_ACL is not set
659CONFIG_FILE_LOCKING=y
647# CONFIG_XFS_FS is not set 660# CONFIG_XFS_FS is not set
648# CONFIG_OCFS2_FS is not set 661# CONFIG_OCFS2_FS is not set
649CONFIG_DNOTIFY=y 662CONFIG_DNOTIFY=y
@@ -673,6 +686,7 @@ CONFIG_INOTIFY_USER=y
673CONFIG_PROC_FS=y 686CONFIG_PROC_FS=y
674# CONFIG_PROC_KCORE is not set 687# CONFIG_PROC_KCORE is not set
675CONFIG_PROC_SYSCTL=y 688CONFIG_PROC_SYSCTL=y
689CONFIG_PROC_PAGE_MONITOR=y
676CONFIG_SYSFS=y 690CONFIG_SYSFS=y
677CONFIG_TMPFS=y 691CONFIG_TMPFS=y
678# CONFIG_TMPFS_POSIX_ACL is not set 692# CONFIG_TMPFS_POSIX_ACL is not set
@@ -703,6 +717,7 @@ CONFIG_JFFS2_RTIME=y
703CONFIG_CRAMFS=y 717CONFIG_CRAMFS=y
704# CONFIG_VXFS_FS is not set 718# CONFIG_VXFS_FS is not set
705# CONFIG_MINIX_FS is not set 719# CONFIG_MINIX_FS is not set
720# CONFIG_OMFS_FS is not set
706# CONFIG_HPFS_FS is not set 721# CONFIG_HPFS_FS is not set
707# CONFIG_QNX4FS_FS is not set 722# CONFIG_QNX4FS_FS is not set
708# CONFIG_ROMFS_FS is not set 723# CONFIG_ROMFS_FS is not set
@@ -713,13 +728,13 @@ CONFIG_NFS_FS=y
713CONFIG_NFS_V3=y 728CONFIG_NFS_V3=y
714# CONFIG_NFS_V3_ACL is not set 729# CONFIG_NFS_V3_ACL is not set
715# CONFIG_NFS_V4 is not set 730# CONFIG_NFS_V4 is not set
716# CONFIG_NFSD is not set
717CONFIG_ROOT_NFS=y 731CONFIG_ROOT_NFS=y
732# CONFIG_NFSD is not set
718CONFIG_LOCKD=y 733CONFIG_LOCKD=y
719CONFIG_LOCKD_V4=y 734CONFIG_LOCKD_V4=y
720CONFIG_NFS_COMMON=y 735CONFIG_NFS_COMMON=y
721CONFIG_SUNRPC=y 736CONFIG_SUNRPC=y
722# CONFIG_SUNRPC_BIND34 is not set 737# CONFIG_SUNRPC_REGISTER_V4 is not set
723# CONFIG_RPCSEC_GSS_KRB5 is not set 738# CONFIG_RPCSEC_GSS_KRB5 is not set
724# CONFIG_RPCSEC_GSS_SPKM3 is not set 739# CONFIG_RPCSEC_GSS_SPKM3 is not set
725# CONFIG_SMB_FS is not set 740# CONFIG_SMB_FS is not set
@@ -756,9 +771,9 @@ CONFIG_MSDOS_PARTITION=y
756# Library routines 771# Library routines
757# 772#
758CONFIG_BITREVERSE=y 773CONFIG_BITREVERSE=y
759# CONFIG_GENERIC_FIND_FIRST_BIT is not set
760CONFIG_CRC_CCITT=y 774CONFIG_CRC_CCITT=y
761# CONFIG_CRC16 is not set 775# CONFIG_CRC16 is not set
776# CONFIG_CRC_T10DIF is not set
762# CONFIG_CRC_ITU_T is not set 777# CONFIG_CRC_ITU_T is not set
763CONFIG_CRC32=y 778CONFIG_CRC32=y
764# CONFIG_CRC7 is not set 779# CONFIG_CRC7 is not set
@@ -783,7 +798,17 @@ CONFIG_FRAME_WARN=1024
783CONFIG_DEBUG_FS=y 798CONFIG_DEBUG_FS=y
784# CONFIG_HEADERS_CHECK is not set 799# CONFIG_HEADERS_CHECK is not set
785# CONFIG_DEBUG_KERNEL is not set 800# CONFIG_DEBUG_KERNEL is not set
801# CONFIG_DEBUG_MEMORY_INIT is not set
802# CONFIG_RCU_CPU_STALL_DETECTOR is not set
803# CONFIG_LATENCYTOP is not set
804CONFIG_HAVE_FUNCTION_TRACER=y
805
806#
807# Tracers
808#
809# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
786# CONFIG_SAMPLES is not set 810# CONFIG_SAMPLES is not set
811CONFIG_HAVE_ARCH_KGDB=y
787# CONFIG_IRQSTACKS is not set 812# CONFIG_IRQSTACKS is not set
788# CONFIG_VIRQ_DEBUG is not set 813# CONFIG_VIRQ_DEBUG is not set
789# CONFIG_PPC_EARLY_DEBUG is not set 814# CONFIG_PPC_EARLY_DEBUG is not set
@@ -793,12 +818,14 @@ CONFIG_DEBUG_FS=y
793# 818#
794# CONFIG_KEYS is not set 819# CONFIG_KEYS is not set
795# CONFIG_SECURITY is not set 820# CONFIG_SECURITY is not set
821# CONFIG_SECURITYFS is not set
796# CONFIG_SECURITY_FILE_CAPABILITIES is not set 822# CONFIG_SECURITY_FILE_CAPABILITIES is not set
797CONFIG_CRYPTO=y 823CONFIG_CRYPTO=y
798 824
799# 825#
800# Crypto core or helper 826# Crypto core or helper
801# 827#
828# CONFIG_CRYPTO_FIPS is not set
802# CONFIG_CRYPTO_MANAGER is not set 829# CONFIG_CRYPTO_MANAGER is not set
803# CONFIG_CRYPTO_GF128MUL is not set 830# CONFIG_CRYPTO_GF128MUL is not set
804# CONFIG_CRYPTO_NULL is not set 831# CONFIG_CRYPTO_NULL is not set
@@ -836,6 +863,10 @@ CONFIG_CRYPTO=y
836# CONFIG_CRYPTO_MD4 is not set 863# CONFIG_CRYPTO_MD4 is not set
837# CONFIG_CRYPTO_MD5 is not set 864# CONFIG_CRYPTO_MD5 is not set
838# CONFIG_CRYPTO_MICHAEL_MIC is not set 865# CONFIG_CRYPTO_MICHAEL_MIC is not set
866# CONFIG_CRYPTO_RMD128 is not set
867# CONFIG_CRYPTO_RMD160 is not set
868# CONFIG_CRYPTO_RMD256 is not set
869# CONFIG_CRYPTO_RMD320 is not set
839# CONFIG_CRYPTO_SHA1 is not set 870# CONFIG_CRYPTO_SHA1 is not set
840# CONFIG_CRYPTO_SHA256 is not set 871# CONFIG_CRYPTO_SHA256 is not set
841# CONFIG_CRYPTO_SHA512 is not set 872# CONFIG_CRYPTO_SHA512 is not set
@@ -866,7 +897,13 @@ CONFIG_CRYPTO=y
866# 897#
867# CONFIG_CRYPTO_DEFLATE is not set 898# CONFIG_CRYPTO_DEFLATE is not set
868# CONFIG_CRYPTO_LZO is not set 899# CONFIG_CRYPTO_LZO is not set
900
901#
902# Random Number Generation
903#
904# CONFIG_CRYPTO_ANSI_CPRNG is not set
869CONFIG_CRYPTO_HW=y 905CONFIG_CRYPTO_HW=y
870# CONFIG_PPC_CLOCK is not set 906# CONFIG_CRYPTO_DEV_TALITOS is not set
907CONFIG_PPC_CLOCK=y
871CONFIG_PPC_LIB_RHEAP=y 908CONFIG_PPC_LIB_RHEAP=y
872# CONFIG_VIRTUALIZATION is not set 909# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index ab5199f26a24..f80b1ca43afb 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:06 2008 4# Sat Nov 8 12:39:40 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -104,7 +104,9 @@ CONFIG_SIGNALFD=y
104CONFIG_TIMERFD=y 104CONFIG_TIMERFD=y
105CONFIG_EVENTFD=y 105CONFIG_EVENTFD=y
106CONFIG_SHMEM=y 106CONFIG_SHMEM=y
107CONFIG_AIO=y
107CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
109CONFIG_PCI_QUIRKS=y
108CONFIG_SLUB_DEBUG=y 110CONFIG_SLUB_DEBUG=y
109# CONFIG_SLAB is not set 111# CONFIG_SLAB is not set
110CONFIG_SLUB=y 112CONFIG_SLUB=y
@@ -117,10 +119,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
117CONFIG_HAVE_KPROBES=y 119CONFIG_HAVE_KPROBES=y
118CONFIG_HAVE_KRETPROBES=y 120CONFIG_HAVE_KRETPROBES=y
119CONFIG_HAVE_ARCH_TRACEHOOK=y 121CONFIG_HAVE_ARCH_TRACEHOOK=y
120# CONFIG_HAVE_DMA_ATTRS is not set
121# CONFIG_USE_GENERIC_SMP_HELPERS is not set
122# CONFIG_HAVE_CLK is not set
123CONFIG_PROC_PAGE_MONITOR=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
@@ -147,6 +145,7 @@ CONFIG_DEFAULT_AS=y
147# CONFIG_DEFAULT_NOOP is not set 145# CONFIG_DEFAULT_NOOP is not set
148CONFIG_DEFAULT_IOSCHED="anticipatory" 146CONFIG_DEFAULT_IOSCHED="anticipatory"
149CONFIG_CLASSIC_RCU=y 147CONFIG_CLASSIC_RCU=y
148# CONFIG_FREEZER is not set
150 149
151# 150#
152# Platform support 151# Platform support
@@ -204,6 +203,8 @@ CONFIG_PREEMPT_NONE=y
204# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
205# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
206CONFIG_BINFMT_ELF=y 205CONFIG_BINFMT_ELF=y
206# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
207# CONFIG_HAVE_AOUT is not set
207CONFIG_BINFMT_MISC=y 208CONFIG_BINFMT_MISC=y
208# CONFIG_IOMMU_HELPER is not set 209# CONFIG_IOMMU_HELPER is not set
209CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 210CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -218,15 +219,15 @@ CONFIG_FLATMEM_MANUAL=y
218# CONFIG_SPARSEMEM_MANUAL is not set 219# CONFIG_SPARSEMEM_MANUAL is not set
219CONFIG_FLATMEM=y 220CONFIG_FLATMEM=y
220CONFIG_FLAT_NODE_MEM_MAP=y 221CONFIG_FLAT_NODE_MEM_MAP=y
221# CONFIG_SPARSEMEM_STATIC is not set
222# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
223CONFIG_PAGEFLAGS_EXTENDED=y 222CONFIG_PAGEFLAGS_EXTENDED=y
224CONFIG_SPLIT_PTLOCK_CPUS=4 223CONFIG_SPLIT_PTLOCK_CPUS=4
225CONFIG_MIGRATION=y 224CONFIG_MIGRATION=y
226# CONFIG_RESOURCES_64BIT is not set 225# CONFIG_RESOURCES_64BIT is not set
226# CONFIG_PHYS_ADDR_T_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=1 227CONFIG_ZONE_DMA_FLAG=1
228CONFIG_BOUNCE=y 228CONFIG_BOUNCE=y
229CONFIG_VIRT_TO_BUS=y 229CONFIG_VIRT_TO_BUS=y
230CONFIG_UNEVICTABLE_LRU=y
230CONFIG_FORCE_MAX_ZONEORDER=11 231CONFIG_FORCE_MAX_ZONEORDER=11
231CONFIG_PROC_DEVICETREE=y 232CONFIG_PROC_DEVICETREE=y
232# CONFIG_CMDLINE_BOOL is not set 233# CONFIG_CMDLINE_BOOL is not set
@@ -247,7 +248,7 @@ CONFIG_PCI_SYSCALL=y
247# CONFIG_PCIEPORTBUS is not set 248# CONFIG_PCIEPORTBUS is not set
248CONFIG_ARCH_SUPPORTS_MSI=y 249CONFIG_ARCH_SUPPORTS_MSI=y
249# CONFIG_PCI_MSI is not set 250# CONFIG_PCI_MSI is not set
250CONFIG_PCI_LEGACY=y 251# CONFIG_PCI_LEGACY is not set
251# CONFIG_PCCARD is not set 252# CONFIG_PCCARD is not set
252# CONFIG_HOTPLUG_PCI is not set 253# CONFIG_HOTPLUG_PCI is not set
253# CONFIG_HAS_RAPIDIO is not set 254# CONFIG_HAS_RAPIDIO is not set
@@ -315,6 +316,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
315# CONFIG_TIPC is not set 316# CONFIG_TIPC is not set
316# CONFIG_ATM is not set 317# CONFIG_ATM is not set
317# CONFIG_BRIDGE is not set 318# CONFIG_BRIDGE is not set
319# CONFIG_NET_DSA is not set
318# CONFIG_VLAN_8021Q is not set 320# CONFIG_VLAN_8021Q is not set
319# CONFIG_DECNET is not set 321# CONFIG_DECNET is not set
320# CONFIG_LLC2 is not set 322# CONFIG_LLC2 is not set
@@ -335,11 +337,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
335# CONFIG_IRDA is not set 337# CONFIG_IRDA is not set
336# CONFIG_BT is not set 338# CONFIG_BT is not set
337# CONFIG_AF_RXRPC is not set 339# CONFIG_AF_RXRPC is not set
338 340# CONFIG_PHONET is not set
339# 341CONFIG_WIRELESS=y
340# Wireless
341#
342# CONFIG_CFG80211 is not set 342# CONFIG_CFG80211 is not set
343CONFIG_WIRELESS_OLD_REGULATORY=y
343# CONFIG_WIRELESS_EXT is not set 344# CONFIG_WIRELESS_EXT is not set
344# CONFIG_MAC80211 is not set 345# CONFIG_MAC80211 is not set
345# CONFIG_IEEE80211 is not set 346# CONFIG_IEEE80211 is not set
@@ -576,6 +577,9 @@ CONFIG_MII=y
576# CONFIG_IBM_NEW_EMAC_RGMII is not set 577# CONFIG_IBM_NEW_EMAC_RGMII is not set
577# CONFIG_IBM_NEW_EMAC_TAH is not set 578# CONFIG_IBM_NEW_EMAC_TAH is not set
578# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 579# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
580# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
581# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
582# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
579CONFIG_NET_PCI=y 583CONFIG_NET_PCI=y
580# CONFIG_PCNET32 is not set 584# CONFIG_PCNET32 is not set
581# CONFIG_AMD8111_ETH is not set 585# CONFIG_AMD8111_ETH is not set
@@ -600,6 +604,7 @@ CONFIG_8139TOO=y
600# CONFIG_TLAN is not set 604# CONFIG_TLAN is not set
601# CONFIG_VIA_RHINE is not set 605# CONFIG_VIA_RHINE is not set
602# CONFIG_SC92031 is not set 606# CONFIG_SC92031 is not set
607# CONFIG_ATL2 is not set
603CONFIG_NETDEV_1000=y 608CONFIG_NETDEV_1000=y
604# CONFIG_ACENIC is not set 609# CONFIG_ACENIC is not set
605# CONFIG_DL2K is not set 610# CONFIG_DL2K is not set
@@ -622,18 +627,22 @@ CONFIG_TSI108_ETH=y
622# CONFIG_QLA3XXX is not set 627# CONFIG_QLA3XXX is not set
623# CONFIG_ATL1 is not set 628# CONFIG_ATL1 is not set
624# CONFIG_ATL1E is not set 629# CONFIG_ATL1E is not set
630# CONFIG_JME is not set
625CONFIG_NETDEV_10000=y 631CONFIG_NETDEV_10000=y
626# CONFIG_CHELSIO_T1 is not set 632# CONFIG_CHELSIO_T1 is not set
627# CONFIG_CHELSIO_T3 is not set 633# CONFIG_CHELSIO_T3 is not set
634# CONFIG_ENIC is not set
628# CONFIG_IXGBE is not set 635# CONFIG_IXGBE is not set
629# CONFIG_IXGB is not set 636# CONFIG_IXGB is not set
630# CONFIG_S2IO is not set 637# CONFIG_S2IO is not set
631# CONFIG_MYRI10GE is not set 638# CONFIG_MYRI10GE is not set
632# CONFIG_NETXEN_NIC is not set 639# CONFIG_NETXEN_NIC is not set
633# CONFIG_NIU is not set 640# CONFIG_NIU is not set
641# CONFIG_MLX4_EN is not set
634# CONFIG_MLX4_CORE is not set 642# CONFIG_MLX4_CORE is not set
635# CONFIG_TEHUTI is not set 643# CONFIG_TEHUTI is not set
636# CONFIG_BNX2X is not set 644# CONFIG_BNX2X is not set
645# CONFIG_QLGE is not set
637# CONFIG_SFC is not set 646# CONFIG_SFC is not set
638# CONFIG_TR is not set 647# CONFIG_TR is not set
639 648
@@ -767,6 +776,14 @@ CONFIG_SSB_POSSIBLE=y
767# CONFIG_MFD_TMIO is not set 776# CONFIG_MFD_TMIO is not set
768 777
769# 778#
779# Voltage and Current regulators
780#
781# CONFIG_REGULATOR is not set
782# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
783# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
784# CONFIG_REGULATOR_BQ24022 is not set
785
786#
770# Multimedia devices 787# Multimedia devices
771# 788#
772 789
@@ -801,6 +818,12 @@ CONFIG_HID_SUPPORT=y
801CONFIG_HID=y 818CONFIG_HID=y
802# CONFIG_HID_DEBUG is not set 819# CONFIG_HID_DEBUG is not set
803# CONFIG_HIDRAW is not set 820# CONFIG_HIDRAW is not set
821# CONFIG_HID_PID is not set
822
823#
824# Special HID drivers
825#
826CONFIG_HID_COMPAT=y
804CONFIG_USB_SUPPORT=y 827CONFIG_USB_SUPPORT=y
805CONFIG_USB_ARCH_HAS_HCD=y 828CONFIG_USB_ARCH_HAS_HCD=y
806CONFIG_USB_ARCH_HAS_OHCI=y 829CONFIG_USB_ARCH_HAS_OHCI=y
@@ -817,6 +840,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
817# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 840# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
818# 841#
819# CONFIG_USB_GADGET is not set 842# CONFIG_USB_GADGET is not set
843# CONFIG_UWB is not set
820# CONFIG_MMC is not set 844# CONFIG_MMC is not set
821# CONFIG_MEMSTICK is not set 845# CONFIG_MEMSTICK is not set
822# CONFIG_NEW_LEDS is not set 846# CONFIG_NEW_LEDS is not set
@@ -826,6 +850,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
826# CONFIG_RTC_CLASS is not set 850# CONFIG_RTC_CLASS is not set
827# CONFIG_DMADEVICES is not set 851# CONFIG_DMADEVICES is not set
828# CONFIG_UIO is not set 852# CONFIG_UIO is not set
853# CONFIG_STAGING is not set
829 854
830# 855#
831# File systems 856# File systems
@@ -837,12 +862,13 @@ CONFIG_EXT3_FS=y
837CONFIG_EXT3_FS_XATTR=y 862CONFIG_EXT3_FS_XATTR=y
838# CONFIG_EXT3_FS_POSIX_ACL is not set 863# CONFIG_EXT3_FS_POSIX_ACL is not set
839# CONFIG_EXT3_FS_SECURITY is not set 864# CONFIG_EXT3_FS_SECURITY is not set
840# CONFIG_EXT4DEV_FS is not set 865# CONFIG_EXT4_FS is not set
841CONFIG_JBD=y 866CONFIG_JBD=y
842CONFIG_FS_MBCACHE=y 867CONFIG_FS_MBCACHE=y
843# CONFIG_REISERFS_FS is not set 868# CONFIG_REISERFS_FS is not set
844# CONFIG_JFS_FS is not set 869# CONFIG_JFS_FS is not set
845# CONFIG_FS_POSIX_ACL is not set 870# CONFIG_FS_POSIX_ACL is not set
871CONFIG_FILE_LOCKING=y
846# CONFIG_XFS_FS is not set 872# CONFIG_XFS_FS is not set
847# CONFIG_OCFS2_FS is not set 873# CONFIG_OCFS2_FS is not set
848CONFIG_DNOTIFY=y 874CONFIG_DNOTIFY=y
@@ -872,6 +898,7 @@ CONFIG_INOTIFY_USER=y
872CONFIG_PROC_FS=y 898CONFIG_PROC_FS=y
873CONFIG_PROC_KCORE=y 899CONFIG_PROC_KCORE=y
874CONFIG_PROC_SYSCTL=y 900CONFIG_PROC_SYSCTL=y
901CONFIG_PROC_PAGE_MONITOR=y
875CONFIG_SYSFS=y 902CONFIG_SYSFS=y
876CONFIG_TMPFS=y 903CONFIG_TMPFS=y
877# CONFIG_TMPFS_POSIX_ACL is not set 904# CONFIG_TMPFS_POSIX_ACL is not set
@@ -906,6 +933,7 @@ CONFIG_ROOT_NFS=y
906CONFIG_LOCKD=y 933CONFIG_LOCKD=y
907CONFIG_NFS_COMMON=y 934CONFIG_NFS_COMMON=y
908CONFIG_SUNRPC=y 935CONFIG_SUNRPC=y
936# CONFIG_SUNRPC_REGISTER_V4 is not set
909# CONFIG_RPCSEC_GSS_KRB5 is not set 937# CONFIG_RPCSEC_GSS_KRB5 is not set
910# CONFIG_RPCSEC_GSS_SPKM3 is not set 938# CONFIG_RPCSEC_GSS_SPKM3 is not set
911# CONFIG_SMB_FS is not set 939# CONFIG_SMB_FS is not set
@@ -942,7 +970,6 @@ CONFIG_MSDOS_PARTITION=y
942# Library routines 970# Library routines
943# 971#
944CONFIG_BITREVERSE=y 972CONFIG_BITREVERSE=y
945# CONFIG_GENERIC_FIND_FIRST_BIT is not set
946# CONFIG_CRC_CCITT is not set 973# CONFIG_CRC_CCITT is not set
947# CONFIG_CRC16 is not set 974# CONFIG_CRC16 is not set
948CONFIG_CRC_T10DIF=y 975CONFIG_CRC_T10DIF=y
@@ -972,13 +999,15 @@ CONFIG_FRAME_WARN=1024
972# CONFIG_SLUB_STATS is not set 999# CONFIG_SLUB_STATS is not set
973# CONFIG_DEBUG_BUGVERBOSE is not set 1000# CONFIG_DEBUG_BUGVERBOSE is not set
974# CONFIG_DEBUG_MEMORY_INIT is not set 1001# CONFIG_DEBUG_MEMORY_INIT is not set
1002# CONFIG_RCU_CPU_STALL_DETECTOR is not set
975# CONFIG_LATENCYTOP is not set 1003# CONFIG_LATENCYTOP is not set
976CONFIG_SYSCTL_SYSCALL_CHECK=y 1004CONFIG_SYSCTL_SYSCALL_CHECK=y
977CONFIG_HAVE_FTRACE=y 1005CONFIG_HAVE_FUNCTION_TRACER=y
978CONFIG_HAVE_DYNAMIC_FTRACE=y 1006
979# CONFIG_FTRACE is not set 1007#
980# CONFIG_SCHED_TRACER is not set 1008# Tracers
981# CONFIG_CONTEXT_SWITCH_TRACER is not set 1009#
1010# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
982# CONFIG_SAMPLES is not set 1011# CONFIG_SAMPLES is not set
983CONFIG_HAVE_ARCH_KGDB=y 1012CONFIG_HAVE_ARCH_KGDB=y
984# CONFIG_IRQSTACKS is not set 1013# CONFIG_IRQSTACKS is not set
@@ -990,12 +1019,14 @@ CONFIG_HAVE_ARCH_KGDB=y
990# 1019#
991# CONFIG_KEYS is not set 1020# CONFIG_KEYS is not set
992# CONFIG_SECURITY is not set 1021# CONFIG_SECURITY is not set
1022# CONFIG_SECURITYFS is not set
993# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1023# CONFIG_SECURITY_FILE_CAPABILITIES is not set
994CONFIG_CRYPTO=y 1024CONFIG_CRYPTO=y
995 1025
996# 1026#
997# Crypto core or helper 1027# Crypto core or helper
998# 1028#
1029# CONFIG_CRYPTO_FIPS is not set
999# CONFIG_CRYPTO_MANAGER is not set 1030# CONFIG_CRYPTO_MANAGER is not set
1000# CONFIG_CRYPTO_GF128MUL is not set 1031# CONFIG_CRYPTO_GF128MUL is not set
1001# CONFIG_CRYPTO_NULL is not set 1032# CONFIG_CRYPTO_NULL is not set
@@ -1067,6 +1098,11 @@ CONFIG_CRYPTO=y
1067# 1098#
1068# CONFIG_CRYPTO_DEFLATE is not set 1099# CONFIG_CRYPTO_DEFLATE is not set
1069# CONFIG_CRYPTO_LZO is not set 1100# CONFIG_CRYPTO_LZO is not set
1101
1102#
1103# Random Number Generation
1104#
1105# CONFIG_CRYPTO_ANSI_CPRNG is not set
1070CONFIG_CRYPTO_HW=y 1106CONFIG_CRYPTO_HW=y
1071# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1107# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1072# CONFIG_PPC_CLOCK is not set 1108# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig
index ff6f7c475f47..c8f5dec1b696 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:07 2008 4# Sat Nov 8 12:39:41 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -48,13 +48,11 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
50CONFIG_OF=y 50CONFIG_OF=y
51CONFIG_PPC_UDBG_16550=y 51# CONFIG_PPC_UDBG_16550 is not set
52# CONFIG_GENERIC_TBSYNC is not set 52# CONFIG_GENERIC_TBSYNC is not set
53CONFIG_AUDIT_ARCH=y 53CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
55CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
56CONFIG_HIBERNATE_32=y
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
58# CONFIG_PPC_DCR_NATIVE is not set 56# CONFIG_PPC_DCR_NATIVE is not set
59# CONFIG_PPC_DCR_MMIO is not set 57# CONFIG_PPC_DCR_MMIO is not set
60CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 58CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -93,7 +91,6 @@ CONFIG_HOTPLUG=y
93CONFIG_PRINTK=y 91CONFIG_PRINTK=y
94CONFIG_BUG=y 92CONFIG_BUG=y
95CONFIG_ELF_CORE=y 93CONFIG_ELF_CORE=y
96CONFIG_PCSPKR_PLATFORM=y
97CONFIG_COMPAT_BRK=y 94CONFIG_COMPAT_BRK=y
98CONFIG_BASE_FULL=y 95CONFIG_BASE_FULL=y
99CONFIG_FUTEX=y 96CONFIG_FUTEX=y
@@ -103,7 +100,9 @@ CONFIG_SIGNALFD=y
103CONFIG_TIMERFD=y 100CONFIG_TIMERFD=y
104CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
105CONFIG_SHMEM=y 102CONFIG_SHMEM=y
103CONFIG_AIO=y
106CONFIG_VM_EVENT_COUNTERS=y 104CONFIG_VM_EVENT_COUNTERS=y
105CONFIG_PCI_QUIRKS=y
107CONFIG_SLUB_DEBUG=y 106CONFIG_SLUB_DEBUG=y
108# CONFIG_SLAB is not set 107# CONFIG_SLAB is not set
109CONFIG_SLUB=y 108CONFIG_SLUB=y
@@ -116,10 +115,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
116CONFIG_HAVE_KPROBES=y 115CONFIG_HAVE_KPROBES=y
117CONFIG_HAVE_KRETPROBES=y 116CONFIG_HAVE_KRETPROBES=y
118CONFIG_HAVE_ARCH_TRACEHOOK=y 117CONFIG_HAVE_ARCH_TRACEHOOK=y
119# CONFIG_HAVE_DMA_ATTRS is not set
120# CONFIG_USE_GENERIC_SMP_HELPERS is not set
121CONFIG_HAVE_CLK=y 118CONFIG_HAVE_CLK=y
122CONFIG_PROC_PAGE_MONITOR=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 119# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 120CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 121CONFIG_RT_MUTEXES=y
@@ -145,6 +141,7 @@ CONFIG_DEFAULT_AS=y
145# CONFIG_DEFAULT_NOOP is not set 141# CONFIG_DEFAULT_NOOP is not set
146CONFIG_DEFAULT_IOSCHED="anticipatory" 142CONFIG_DEFAULT_IOSCHED="anticipatory"
147CONFIG_CLASSIC_RCU=y 143CONFIG_CLASSIC_RCU=y
144# CONFIG_FREEZER is not set
148 145
149# 146#
150# Platform support 147# Platform support
@@ -152,16 +149,17 @@ CONFIG_CLASSIC_RCU=y
152CONFIG_PPC_MULTIPLATFORM=y 149CONFIG_PPC_MULTIPLATFORM=y
153CONFIG_CLASSIC32=y 150CONFIG_CLASSIC32=y
154# CONFIG_PPC_CHRP is not set 151# CONFIG_PPC_CHRP is not set
155# CONFIG_PPC_PMAC is not set
156# CONFIG_MPC5121_ADS is not set 152# CONFIG_MPC5121_ADS is not set
157# CONFIG_MPC5121_GENERIC is not set 153# CONFIG_MPC5121_GENERIC is not set
158# CONFIG_PPC_MPC52xx is not set 154# CONFIG_PPC_MPC52xx is not set
155# CONFIG_PPC_PMAC is not set
159# CONFIG_PPC_CELL is not set 156# CONFIG_PPC_CELL is not set
160# CONFIG_PPC_CELL_NATIVE is not set 157# CONFIG_PPC_CELL_NATIVE is not set
161CONFIG_PPC_82xx=y 158CONFIG_PPC_82xx=y
162CONFIG_MPC8272_ADS=y 159CONFIG_MPC8272_ADS=y
163# CONFIG_PQ2FADS is not set 160# CONFIG_PQ2FADS is not set
164# CONFIG_EP8248E is not set 161# CONFIG_EP8248E is not set
162# CONFIG_MGCOGE is not set
165CONFIG_PQ2ADS=y 163CONFIG_PQ2ADS=y
166CONFIG_8260=y 164CONFIG_8260=y
167CONFIG_8272=y 165CONFIG_8272=y
@@ -169,23 +167,19 @@ CONFIG_PQ2_ADS_PCI_PIC=y
169# CONFIG_PPC_83xx is not set 167# CONFIG_PPC_83xx is not set
170# CONFIG_PPC_86xx is not set 168# CONFIG_PPC_86xx is not set
171# CONFIG_EMBEDDED6xx is not set 169# CONFIG_EMBEDDED6xx is not set
172CONFIG_PPC_NATIVE=y
173# CONFIG_UDBG_RTAS_CONSOLE is not set
174# CONFIG_IPIC is not set 170# CONFIG_IPIC is not set
175CONFIG_MPIC=y 171# CONFIG_MPIC is not set
176# CONFIG_MPIC_WEIRD is not set 172# CONFIG_MPIC_WEIRD is not set
177CONFIG_PPC_I8259=y 173# CONFIG_PPC_I8259 is not set
178CONFIG_PPC_RTAS=y 174# CONFIG_PPC_RTAS is not set
179# CONFIG_RTAS_ERROR_LOGGING is not set
180CONFIG_RTAS_PROC=y
181# CONFIG_MMIO_NVRAM is not set 175# CONFIG_MMIO_NVRAM is not set
182CONFIG_PPC_MPC106=y 176# CONFIG_PPC_MPC106 is not set
183# CONFIG_PPC_970_NAP is not set 177# CONFIG_PPC_970_NAP is not set
184# CONFIG_PPC_INDIRECT_IO is not set 178# CONFIG_PPC_INDIRECT_IO is not set
185# CONFIG_GENERIC_IOMAP is not set 179# CONFIG_GENERIC_IOMAP is not set
186# CONFIG_CPU_FREQ is not set 180# CONFIG_CPU_FREQ is not set
187# CONFIG_PPC601_SYNC_FIX is not set
188# CONFIG_TAU is not set 181# CONFIG_TAU is not set
182# CONFIG_QUICC_ENGINE is not set
189CONFIG_CPM2=y 183CONFIG_CPM2=y
190# CONFIG_FSL_ULI1575 is not set 184# CONFIG_FSL_ULI1575 is not set
191CONFIG_CPM=y 185CONFIG_CPM=y
@@ -208,6 +202,8 @@ CONFIG_PREEMPT_NONE=y
208# CONFIG_PREEMPT_VOLUNTARY is not set 202# CONFIG_PREEMPT_VOLUNTARY is not set
209# CONFIG_PREEMPT is not set 203# CONFIG_PREEMPT is not set
210CONFIG_BINFMT_ELF=y 204CONFIG_BINFMT_ELF=y
205# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
206# CONFIG_HAVE_AOUT is not set
211CONFIG_BINFMT_MISC=y 207CONFIG_BINFMT_MISC=y
212# CONFIG_IOMMU_HELPER is not set 208# CONFIG_IOMMU_HELPER is not set
213CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 209CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -217,15 +213,15 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
217CONFIG_ARCH_POPULATES_NODE_MAP=y 213CONFIG_ARCH_POPULATES_NODE_MAP=y
218CONFIG_FLATMEM=y 214CONFIG_FLATMEM=y
219CONFIG_FLAT_NODE_MEM_MAP=y 215CONFIG_FLAT_NODE_MEM_MAP=y
220# CONFIG_SPARSEMEM_STATIC is not set
221# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
222CONFIG_PAGEFLAGS_EXTENDED=y 216CONFIG_PAGEFLAGS_EXTENDED=y
223CONFIG_SPLIT_PTLOCK_CPUS=4 217CONFIG_SPLIT_PTLOCK_CPUS=4
224CONFIG_MIGRATION=y 218CONFIG_MIGRATION=y
225# CONFIG_RESOURCES_64BIT is not set 219# CONFIG_RESOURCES_64BIT is not set
220# CONFIG_PHYS_ADDR_T_64BIT is not set
226CONFIG_ZONE_DMA_FLAG=1 221CONFIG_ZONE_DMA_FLAG=1
227CONFIG_BOUNCE=y 222CONFIG_BOUNCE=y
228CONFIG_VIRT_TO_BUS=y 223CONFIG_VIRT_TO_BUS=y
224CONFIG_UNEVICTABLE_LRU=y
229CONFIG_FORCE_MAX_ZONEORDER=11 225CONFIG_FORCE_MAX_ZONEORDER=11
230CONFIG_PROC_DEVICETREE=y 226CONFIG_PROC_DEVICETREE=y
231# CONFIG_CMDLINE_BOOL is not set 227# CONFIG_CMDLINE_BOOL is not set
@@ -237,7 +233,6 @@ CONFIG_ISA_DMA_API=y
237# 233#
238# Bus options 234# Bus options
239# 235#
240# CONFIG_ISA is not set
241CONFIG_ZONE_DMA=y 236CONFIG_ZONE_DMA=y
242CONFIG_PPC_INDIRECT_PCI=y 237CONFIG_PPC_INDIRECT_PCI=y
243CONFIG_FSL_SOC=y 238CONFIG_FSL_SOC=y
@@ -249,7 +244,7 @@ CONFIG_PCI_8260=y
249# CONFIG_PCIEPORTBUS is not set 244# CONFIG_PCIEPORTBUS is not set
250CONFIG_ARCH_SUPPORTS_MSI=y 245CONFIG_ARCH_SUPPORTS_MSI=y
251# CONFIG_PCI_MSI is not set 246# CONFIG_PCI_MSI is not set
252CONFIG_PCI_LEGACY=y 247# CONFIG_PCI_LEGACY is not set
253# CONFIG_PCI_DEBUG is not set 248# CONFIG_PCI_DEBUG is not set
254# CONFIG_PCCARD is not set 249# CONFIG_PCCARD is not set
255# CONFIG_HOTPLUG_PCI is not set 250# CONFIG_HOTPLUG_PCI is not set
@@ -305,7 +300,6 @@ CONFIG_INET_TCP_DIAG=y
305# CONFIG_TCP_CONG_ADVANCED is not set 300# CONFIG_TCP_CONG_ADVANCED is not set
306CONFIG_TCP_CONG_CUBIC=y 301CONFIG_TCP_CONG_CUBIC=y
307CONFIG_DEFAULT_TCP_CONG="cubic" 302CONFIG_DEFAULT_TCP_CONG="cubic"
308# CONFIG_IP_VS is not set
309CONFIG_IPV6=y 303CONFIG_IPV6=y
310# CONFIG_IPV6_PRIVACY is not set 304# CONFIG_IPV6_PRIVACY is not set
311# CONFIG_IPV6_ROUTER_PREF is not set 305# CONFIG_IPV6_ROUTER_PREF is not set
@@ -332,10 +326,12 @@ CONFIG_NETFILTER_ADVANCED=y
332# CONFIG_NETFILTER_NETLINK_LOG is not set 326# CONFIG_NETFILTER_NETLINK_LOG is not set
333# CONFIG_NF_CONNTRACK is not set 327# CONFIG_NF_CONNTRACK is not set
334# CONFIG_NETFILTER_XTABLES is not set 328# CONFIG_NETFILTER_XTABLES is not set
329# CONFIG_IP_VS is not set
335 330
336# 331#
337# IP: Netfilter Configuration 332# IP: Netfilter Configuration
338# 333#
334# CONFIG_NF_DEFRAG_IPV4 is not set
339# CONFIG_IP_NF_QUEUE is not set 335# CONFIG_IP_NF_QUEUE is not set
340# CONFIG_IP_NF_IPTABLES is not set 336# CONFIG_IP_NF_IPTABLES is not set
341# CONFIG_IP_NF_ARPTABLES is not set 337# CONFIG_IP_NF_ARPTABLES is not set
@@ -362,11 +358,10 @@ CONFIG_NETFILTER_ADVANCED=y
362# CONFIG_CAN is not set 358# CONFIG_CAN is not set
363# CONFIG_IRDA is not set 359# CONFIG_IRDA is not set
364# CONFIG_BT is not set 360# CONFIG_BT is not set
365 361# CONFIG_PHONET is not set
366# 362CONFIG_WIRELESS=y
367# Wireless
368#
369# CONFIG_CFG80211 is not set 363# CONFIG_CFG80211 is not set
364CONFIG_WIRELESS_OLD_REGULATORY=y
370# CONFIG_WIRELESS_EXT is not set 365# CONFIG_WIRELESS_EXT is not set
371# CONFIG_MAC80211 is not set 366# CONFIG_MAC80211 is not set
372# CONFIG_IEEE80211 is not set 367# CONFIG_IEEE80211 is not set
@@ -472,7 +467,6 @@ CONFIG_OF_GPIO=y
472# CONFIG_PARPORT is not set 467# CONFIG_PARPORT is not set
473CONFIG_BLK_DEV=y 468CONFIG_BLK_DEV=y
474# CONFIG_BLK_DEV_FD is not set 469# CONFIG_BLK_DEV_FD is not set
475# CONFIG_MAC_FLOPPY is not set
476# CONFIG_BLK_CPQ_DA is not set 470# CONFIG_BLK_CPQ_DA is not set
477# CONFIG_BLK_CPQ_CISS_DA is not set 471# CONFIG_BLK_CPQ_CISS_DA is not set
478# CONFIG_BLK_DEV_DAC960 is not set 472# CONFIG_BLK_DEV_DAC960 is not set
@@ -537,8 +531,6 @@ CONFIG_MDIO_BITBANG=y
537# CONFIG_MDIO_OF_GPIO is not set 531# CONFIG_MDIO_OF_GPIO is not set
538CONFIG_NET_ETHERNET=y 532CONFIG_NET_ETHERNET=y
539CONFIG_MII=y 533CONFIG_MII=y
540# CONFIG_MACE is not set
541# CONFIG_BMAC is not set
542# CONFIG_HAPPYMEAL is not set 534# CONFIG_HAPPYMEAL is not set
543# CONFIG_SUNGEM is not set 535# CONFIG_SUNGEM is not set
544# CONFIG_CASSINI is not set 536# CONFIG_CASSINI is not set
@@ -549,8 +541,12 @@ CONFIG_MII=y
549# CONFIG_IBM_NEW_EMAC_RGMII is not set 541# CONFIG_IBM_NEW_EMAC_RGMII is not set
550# CONFIG_IBM_NEW_EMAC_TAH is not set 542# CONFIG_IBM_NEW_EMAC_TAH is not set
551# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 543# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
544# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
545# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
546# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
552# CONFIG_NET_PCI is not set 547# CONFIG_NET_PCI is not set
553# CONFIG_B44 is not set 548# CONFIG_B44 is not set
549# CONFIG_ATL2 is not set
554CONFIG_FS_ENET=y 550CONFIG_FS_ENET=y
555# CONFIG_FS_ENET_HAS_SCC is not set 551# CONFIG_FS_ENET_HAS_SCC is not set
556CONFIG_FS_ENET_HAS_FCC=y 552CONFIG_FS_ENET_HAS_FCC=y
@@ -573,18 +569,23 @@ CONFIG_NETDEV_1000=y
573# CONFIG_GIANFAR is not set 569# CONFIG_GIANFAR is not set
574# CONFIG_MV643XX_ETH is not set 570# CONFIG_MV643XX_ETH is not set
575# CONFIG_QLA3XXX is not set 571# CONFIG_QLA3XXX is not set
572# CONFIG_ATL1 is not set
573# CONFIG_JME is not set
576CONFIG_NETDEV_10000=y 574CONFIG_NETDEV_10000=y
577# CONFIG_CHELSIO_T1 is not set 575# CONFIG_CHELSIO_T1 is not set
578# CONFIG_CHELSIO_T3 is not set 576# CONFIG_CHELSIO_T3 is not set
577# CONFIG_ENIC is not set
579# CONFIG_IXGBE is not set 578# CONFIG_IXGBE is not set
580# CONFIG_IXGB is not set 579# CONFIG_IXGB is not set
581# CONFIG_S2IO is not set 580# CONFIG_S2IO is not set
582# CONFIG_MYRI10GE is not set 581# CONFIG_MYRI10GE is not set
583# CONFIG_NETXEN_NIC is not set 582# CONFIG_NETXEN_NIC is not set
584# CONFIG_NIU is not set 583# CONFIG_NIU is not set
584# CONFIG_MLX4_EN is not set
585# CONFIG_MLX4_CORE is not set 585# CONFIG_MLX4_CORE is not set
586# CONFIG_TEHUTI is not set 586# CONFIG_TEHUTI is not set
587# CONFIG_BNX2X is not set 587# CONFIG_BNX2X is not set
588# CONFIG_QLGE is not set
588# CONFIG_SFC is not set 589# CONFIG_SFC is not set
589# CONFIG_TR is not set 590# CONFIG_TR is not set
590 591
@@ -645,6 +646,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
645CONFIG_MOUSE_PS2_SYNAPTICS=y 646CONFIG_MOUSE_PS2_SYNAPTICS=y
646CONFIG_MOUSE_PS2_LIFEBOOK=y 647CONFIG_MOUSE_PS2_LIFEBOOK=y
647CONFIG_MOUSE_PS2_TRACKPOINT=y 648CONFIG_MOUSE_PS2_TRACKPOINT=y
649# CONFIG_MOUSE_PS2_ELANTECH is not set
648# CONFIG_MOUSE_PS2_TOUCHKIT is not set 650# CONFIG_MOUSE_PS2_TOUCHKIT is not set
649# CONFIG_MOUSE_SERIAL is not set 651# CONFIG_MOUSE_SERIAL is not set
650# CONFIG_MOUSE_VSXXXAA is not set 652# CONFIG_MOUSE_VSXXXAA is not set
@@ -684,21 +686,12 @@ CONFIG_DEVKMEM=y
684# CONFIG_SERIAL_UARTLITE is not set 686# CONFIG_SERIAL_UARTLITE is not set
685CONFIG_SERIAL_CORE=y 687CONFIG_SERIAL_CORE=y
686CONFIG_SERIAL_CORE_CONSOLE=y 688CONFIG_SERIAL_CORE_CONSOLE=y
687# CONFIG_SERIAL_PMACZILOG is not set
688CONFIG_SERIAL_CPM=y 689CONFIG_SERIAL_CPM=y
689CONFIG_SERIAL_CPM_CONSOLE=y 690CONFIG_SERIAL_CPM_CONSOLE=y
690CONFIG_SERIAL_CPM_SCC1=y
691# CONFIG_SERIAL_CPM_SCC2 is not set
692# CONFIG_SERIAL_CPM_SCC3 is not set
693CONFIG_SERIAL_CPM_SCC4=y
694# CONFIG_SERIAL_CPM_SMC1 is not set
695# CONFIG_SERIAL_CPM_SMC2 is not set
696# CONFIG_SERIAL_JSM is not set 691# CONFIG_SERIAL_JSM is not set
697CONFIG_UNIX98_PTYS=y 692CONFIG_UNIX98_PTYS=y
698CONFIG_LEGACY_PTYS=y 693CONFIG_LEGACY_PTYS=y
699CONFIG_LEGACY_PTY_COUNT=256 694CONFIG_LEGACY_PTY_COUNT=256
700# CONFIG_BRIQ_PANEL is not set
701# CONFIG_HVC_RTAS is not set
702# CONFIG_IPMI_HANDLER is not set 695# CONFIG_IPMI_HANDLER is not set
703CONFIG_HW_RANDOM=y 696CONFIG_HW_RANDOM=y
704# CONFIG_NVRAM is not set 697# CONFIG_NVRAM is not set
@@ -748,6 +741,14 @@ CONFIG_SSB_POSSIBLE=y
748# CONFIG_MFD_TMIO is not set 741# CONFIG_MFD_TMIO is not set
749 742
750# 743#
744# Voltage and Current regulators
745#
746# CONFIG_REGULATOR is not set
747# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
748# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
749# CONFIG_REGULATOR_BQ24022 is not set
750
751#
751# Multimedia devices 752# Multimedia devices
752# 753#
753 754
@@ -788,6 +789,7 @@ CONFIG_DAB=y
788# CONFIG_RTC_CLASS is not set 789# CONFIG_RTC_CLASS is not set
789# CONFIG_DMADEVICES is not set 790# CONFIG_DMADEVICES is not set
790# CONFIG_UIO is not set 791# CONFIG_UIO is not set
792# CONFIG_STAGING is not set
791 793
792# 794#
793# File systems 795# File systems
@@ -799,11 +801,13 @@ CONFIG_EXT3_FS=y
799CONFIG_EXT3_FS_XATTR=y 801CONFIG_EXT3_FS_XATTR=y
800# CONFIG_EXT3_FS_POSIX_ACL is not set 802# CONFIG_EXT3_FS_POSIX_ACL is not set
801# CONFIG_EXT3_FS_SECURITY is not set 803# CONFIG_EXT3_FS_SECURITY is not set
804# CONFIG_EXT4_FS is not set
802CONFIG_JBD=y 805CONFIG_JBD=y
803CONFIG_FS_MBCACHE=y 806CONFIG_FS_MBCACHE=y
804# CONFIG_REISERFS_FS is not set 807# CONFIG_REISERFS_FS is not set
805# CONFIG_JFS_FS is not set 808# CONFIG_JFS_FS is not set
806CONFIG_FS_POSIX_ACL=y 809CONFIG_FS_POSIX_ACL=y
810CONFIG_FILE_LOCKING=y
807# CONFIG_XFS_FS is not set 811# CONFIG_XFS_FS is not set
808# CONFIG_OCFS2_FS is not set 812# CONFIG_OCFS2_FS is not set
809CONFIG_DNOTIFY=y 813CONFIG_DNOTIFY=y
@@ -833,6 +837,7 @@ CONFIG_AUTOFS4_FS=y
833CONFIG_PROC_FS=y 837CONFIG_PROC_FS=y
834CONFIG_PROC_KCORE=y 838CONFIG_PROC_KCORE=y
835CONFIG_PROC_SYSCTL=y 839CONFIG_PROC_SYSCTL=y
840CONFIG_PROC_PAGE_MONITOR=y
836CONFIG_SYSFS=y 841CONFIG_SYSFS=y
837CONFIG_TMPFS=y 842CONFIG_TMPFS=y
838# CONFIG_TMPFS_POSIX_ACL is not set 843# CONFIG_TMPFS_POSIX_ACL is not set
@@ -935,7 +940,6 @@ CONFIG_NLS_UTF8=y
935# Library routines 940# Library routines
936# 941#
937CONFIG_BITREVERSE=y 942CONFIG_BITREVERSE=y
938# CONFIG_GENERIC_FIND_FIRST_BIT is not set
939CONFIG_CRC_CCITT=y 943CONFIG_CRC_CCITT=y
940# CONFIG_CRC16 is not set 944# CONFIG_CRC16 is not set
941# CONFIG_CRC_T10DIF is not set 945# CONFIG_CRC_T10DIF is not set
@@ -989,15 +993,23 @@ CONFIG_DEBUG_INFO=y
989# CONFIG_DEBUG_SG is not set 993# CONFIG_DEBUG_SG is not set
990# CONFIG_BOOT_PRINTK_DELAY is not set 994# CONFIG_BOOT_PRINTK_DELAY is not set
991# CONFIG_RCU_TORTURE_TEST is not set 995# CONFIG_RCU_TORTURE_TEST is not set
996# CONFIG_RCU_CPU_STALL_DETECTOR is not set
992# CONFIG_BACKTRACE_SELF_TEST is not set 997# CONFIG_BACKTRACE_SELF_TEST is not set
998# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
993# CONFIG_FAULT_INJECTION is not set 999# CONFIG_FAULT_INJECTION is not set
994# CONFIG_LATENCYTOP is not set 1000# CONFIG_LATENCYTOP is not set
995CONFIG_SYSCTL_SYSCALL_CHECK=y 1001CONFIG_SYSCTL_SYSCALL_CHECK=y
996CONFIG_HAVE_FTRACE=y 1002CONFIG_HAVE_FUNCTION_TRACER=y
997CONFIG_HAVE_DYNAMIC_FTRACE=y 1003
998# CONFIG_FTRACE is not set 1004#
1005# Tracers
1006#
1007# CONFIG_FUNCTION_TRACER is not set
999# CONFIG_SCHED_TRACER is not set 1008# CONFIG_SCHED_TRACER is not set
1000# CONFIG_CONTEXT_SWITCH_TRACER is not set 1009# CONFIG_CONTEXT_SWITCH_TRACER is not set
1010# CONFIG_BOOT_TRACER is not set
1011# CONFIG_STACK_TRACER is not set
1012# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1001# CONFIG_SAMPLES is not set 1013# CONFIG_SAMPLES is not set
1002CONFIG_HAVE_ARCH_KGDB=y 1014CONFIG_HAVE_ARCH_KGDB=y
1003# CONFIG_DEBUG_STACKOVERFLOW is not set 1015# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1005,6 +1017,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1005# CONFIG_DEBUG_PAGEALLOC is not set 1017# CONFIG_DEBUG_PAGEALLOC is not set
1006# CONFIG_CODE_PATCHING_SELFTEST is not set 1018# CONFIG_CODE_PATCHING_SELFTEST is not set
1007# CONFIG_FTR_FIXUP_SELFTEST is not set 1019# CONFIG_FTR_FIXUP_SELFTEST is not set
1020# CONFIG_MSI_BITMAP_SELFTEST is not set
1008# CONFIG_XMON is not set 1021# CONFIG_XMON is not set
1009# CONFIG_IRQSTACKS is not set 1022# CONFIG_IRQSTACKS is not set
1010CONFIG_BDI_SWITCH=y 1023CONFIG_BDI_SWITCH=y
@@ -1016,14 +1029,19 @@ CONFIG_BDI_SWITCH=y
1016# 1029#
1017# CONFIG_KEYS is not set 1030# CONFIG_KEYS is not set
1018# CONFIG_SECURITY is not set 1031# CONFIG_SECURITY is not set
1032# CONFIG_SECURITYFS is not set
1019# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1033# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1020CONFIG_CRYPTO=y 1034CONFIG_CRYPTO=y
1021 1035
1022# 1036#
1023# Crypto core or helper 1037# Crypto core or helper
1024# 1038#
1039# CONFIG_CRYPTO_FIPS is not set
1025CONFIG_CRYPTO_ALGAPI=y 1040CONFIG_CRYPTO_ALGAPI=y
1041CONFIG_CRYPTO_AEAD=y
1026CONFIG_CRYPTO_BLKCIPHER=y 1042CONFIG_CRYPTO_BLKCIPHER=y
1043CONFIG_CRYPTO_HASH=y
1044CONFIG_CRYPTO_RNG=y
1027CONFIG_CRYPTO_MANAGER=y 1045CONFIG_CRYPTO_MANAGER=y
1028# CONFIG_CRYPTO_NULL is not set 1046# CONFIG_CRYPTO_NULL is not set
1029# CONFIG_CRYPTO_CRYPTD is not set 1047# CONFIG_CRYPTO_CRYPTD is not set
@@ -1090,6 +1108,11 @@ CONFIG_CRYPTO_DES=y
1090# 1108#
1091# CONFIG_CRYPTO_DEFLATE is not set 1109# CONFIG_CRYPTO_DEFLATE is not set
1092# CONFIG_CRYPTO_LZO is not set 1110# CONFIG_CRYPTO_LZO is not set
1111
1112#
1113# Random Number Generation
1114#
1115# CONFIG_CRYPTO_ANSI_CPRNG is not set
1093# CONFIG_CRYPTO_HW is not set 1116# CONFIG_CRYPTO_HW is not set
1094CONFIG_PPC_CLOCK=y 1117CONFIG_PPC_CLOCK=y
1095CONFIG_PPC_LIB_RHEAP=y 1118CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index 991c9bda12a9..15eb30c9b3f9 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 07:16:25 2008 4# Sat Nov 8 12:39:42 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
23# CONFIG_SMP is not set 23# CONFIG_SMP is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -55,8 +55,6 @@ CONFIG_AUDIT_ARCH=y
55CONFIG_GENERIC_BUG=y 55CONFIG_GENERIC_BUG=y
56CONFIG_DEFAULT_UIMAGE=y 56CONFIG_DEFAULT_UIMAGE=y
57CONFIG_REDBOOT=y 57CONFIG_REDBOOT=y
58CONFIG_HIBERNATE_32=y
59CONFIG_ARCH_HIBERNATION_POSSIBLE=y
60CONFIG_ARCH_SUSPEND_POSSIBLE=y 58CONFIG_ARCH_SUSPEND_POSSIBLE=y
61# CONFIG_PPC_DCR_NATIVE is not set 59# CONFIG_PPC_DCR_NATIVE is not set
62# CONFIG_PPC_DCR_MMIO is not set 60# CONFIG_PPC_DCR_MMIO is not set
@@ -101,7 +99,6 @@ CONFIG_HOTPLUG=y
101CONFIG_PRINTK=y 99CONFIG_PRINTK=y
102CONFIG_BUG=y 100CONFIG_BUG=y
103CONFIG_ELF_CORE=y 101CONFIG_ELF_CORE=y
104CONFIG_PCSPKR_PLATFORM=y
105CONFIG_COMPAT_BRK=y 102CONFIG_COMPAT_BRK=y
106CONFIG_BASE_FULL=y 103CONFIG_BASE_FULL=y
107CONFIG_FUTEX=y 104CONFIG_FUTEX=y
@@ -111,7 +108,9 @@ CONFIG_SIGNALFD=y
111CONFIG_TIMERFD=y 108CONFIG_TIMERFD=y
112CONFIG_EVENTFD=y 109CONFIG_EVENTFD=y
113CONFIG_SHMEM=y 110CONFIG_SHMEM=y
111CONFIG_AIO=y
114CONFIG_VM_EVENT_COUNTERS=y 112CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_PCI_QUIRKS=y
115CONFIG_SLAB=y 114CONFIG_SLAB=y
116# CONFIG_SLUB is not set 115# CONFIG_SLUB is not set
117# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
@@ -124,10 +123,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
124CONFIG_HAVE_KPROBES=y 123CONFIG_HAVE_KPROBES=y
125CONFIG_HAVE_KRETPROBES=y 124CONFIG_HAVE_KRETPROBES=y
126CONFIG_HAVE_ARCH_TRACEHOOK=y 125CONFIG_HAVE_ARCH_TRACEHOOK=y
127# CONFIG_HAVE_DMA_ATTRS is not set
128# CONFIG_USE_GENERIC_SMP_HELPERS is not set
129# CONFIG_HAVE_CLK is not set
130CONFIG_PROC_PAGE_MONITOR=y
131# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
132CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
133CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
@@ -160,6 +155,7 @@ CONFIG_DEFAULT_AS=y
160# CONFIG_DEFAULT_NOOP is not set 155# CONFIG_DEFAULT_NOOP is not set
161CONFIG_DEFAULT_IOSCHED="anticipatory" 156CONFIG_DEFAULT_IOSCHED="anticipatory"
162CONFIG_CLASSIC_RCU=y 157CONFIG_CLASSIC_RCU=y
158# CONFIG_FREEZER is not set
163 159
164# 160#
165# Platform support 161# Platform support
@@ -167,10 +163,10 @@ CONFIG_CLASSIC_RCU=y
167CONFIG_PPC_MULTIPLATFORM=y 163CONFIG_PPC_MULTIPLATFORM=y
168CONFIG_CLASSIC32=y 164CONFIG_CLASSIC32=y
169# CONFIG_PPC_CHRP is not set 165# CONFIG_PPC_CHRP is not set
170# CONFIG_PPC_PMAC is not set
171# CONFIG_MPC5121_ADS is not set 166# CONFIG_MPC5121_ADS is not set
172# CONFIG_MPC5121_GENERIC is not set 167# CONFIG_MPC5121_GENERIC is not set
173# CONFIG_PPC_MPC52xx is not set 168# CONFIG_PPC_MPC52xx is not set
169# CONFIG_PPC_PMAC is not set
174# CONFIG_PPC_CELL is not set 170# CONFIG_PPC_CELL is not set
175# CONFIG_PPC_CELL_NATIVE is not set 171# CONFIG_PPC_CELL_NATIVE is not set
176# CONFIG_PPC_82xx is not set 172# CONFIG_PPC_82xx is not set
@@ -193,31 +189,27 @@ CONFIG_PPC_MPC834x=y
193CONFIG_PPC_MPC837x=y 189CONFIG_PPC_MPC837x=y
194# CONFIG_PPC_86xx is not set 190# CONFIG_PPC_86xx is not set
195# CONFIG_EMBEDDED6xx is not set 191# CONFIG_EMBEDDED6xx is not set
196CONFIG_PPC_NATIVE=y
197# CONFIG_UDBG_RTAS_CONSOLE is not set
198CONFIG_IPIC=y 192CONFIG_IPIC=y
199CONFIG_MPIC=y 193# CONFIG_MPIC is not set
200# CONFIG_MPIC_WEIRD is not set 194# CONFIG_MPIC_WEIRD is not set
201CONFIG_PPC_I8259=y 195# CONFIG_PPC_I8259 is not set
202CONFIG_PPC_RTAS=y 196# CONFIG_PPC_RTAS is not set
203# CONFIG_RTAS_ERROR_LOGGING is not set
204CONFIG_RTAS_PROC=y
205# CONFIG_MMIO_NVRAM is not set 197# CONFIG_MMIO_NVRAM is not set
206CONFIG_PPC_MPC106=y 198# CONFIG_PPC_MPC106 is not set
207# CONFIG_PPC_970_NAP is not set 199# CONFIG_PPC_970_NAP is not set
208# CONFIG_PPC_INDIRECT_IO is not set 200# CONFIG_PPC_INDIRECT_IO is not set
209# CONFIG_GENERIC_IOMAP is not set 201# CONFIG_GENERIC_IOMAP is not set
210# CONFIG_CPU_FREQ is not set 202# CONFIG_CPU_FREQ is not set
211# CONFIG_PPC601_SYNC_FIX is not set
212# CONFIG_TAU is not set 203# CONFIG_TAU is not set
213CONFIG_QUICC_ENGINE=y 204CONFIG_QUICC_ENGINE=y
205CONFIG_QE_GPIO=y
214# CONFIG_FSL_ULI1575 is not set 206# CONFIG_FSL_ULI1575 is not set
207# CONFIG_MPC8xxx_GPIO is not set
215 208
216# 209#
217# Kernel options 210# Kernel options
218# 211#
219# CONFIG_HIGHMEM is not set 212# CONFIG_HIGHMEM is not set
220# CONFIG_TICK_ONESHOT is not set
221# CONFIG_NO_HZ is not set 213# CONFIG_NO_HZ is not set
222# CONFIG_HIGH_RES_TIMERS is not set 214# CONFIG_HIGH_RES_TIMERS is not set
223CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 215CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -231,6 +223,8 @@ CONFIG_PREEMPT_NONE=y
231# CONFIG_PREEMPT_VOLUNTARY is not set 223# CONFIG_PREEMPT_VOLUNTARY is not set
232# CONFIG_PREEMPT is not set 224# CONFIG_PREEMPT is not set
233CONFIG_BINFMT_ELF=y 225CONFIG_BINFMT_ELF=y
226# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
227# CONFIG_HAVE_AOUT is not set
234# CONFIG_BINFMT_MISC is not set 228# CONFIG_BINFMT_MISC is not set
235CONFIG_MATH_EMULATION=y 229CONFIG_MATH_EMULATION=y
236# CONFIG_IOMMU_HELPER is not set 230# CONFIG_IOMMU_HELPER is not set
@@ -246,15 +240,15 @@ CONFIG_FLATMEM_MANUAL=y
246# CONFIG_SPARSEMEM_MANUAL is not set 240# CONFIG_SPARSEMEM_MANUAL is not set
247CONFIG_FLATMEM=y 241CONFIG_FLATMEM=y
248CONFIG_FLAT_NODE_MEM_MAP=y 242CONFIG_FLAT_NODE_MEM_MAP=y
249# CONFIG_SPARSEMEM_STATIC is not set
250# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
251CONFIG_PAGEFLAGS_EXTENDED=y 243CONFIG_PAGEFLAGS_EXTENDED=y
252CONFIG_SPLIT_PTLOCK_CPUS=4 244CONFIG_SPLIT_PTLOCK_CPUS=4
253CONFIG_MIGRATION=y 245CONFIG_MIGRATION=y
254# CONFIG_RESOURCES_64BIT is not set 246# CONFIG_RESOURCES_64BIT is not set
247# CONFIG_PHYS_ADDR_T_64BIT is not set
255CONFIG_ZONE_DMA_FLAG=1 248CONFIG_ZONE_DMA_FLAG=1
256CONFIG_BOUNCE=y 249CONFIG_BOUNCE=y
257CONFIG_VIRT_TO_BUS=y 250CONFIG_VIRT_TO_BUS=y
251CONFIG_UNEVICTABLE_LRU=y
258CONFIG_FORCE_MAX_ZONEORDER=11 252CONFIG_FORCE_MAX_ZONEORDER=11
259CONFIG_PROC_DEVICETREE=y 253CONFIG_PROC_DEVICETREE=y
260# CONFIG_CMDLINE_BOOL is not set 254# CONFIG_CMDLINE_BOOL is not set
@@ -266,7 +260,6 @@ CONFIG_ISA_DMA_API=y
266# 260#
267# Bus options 261# Bus options
268# 262#
269# CONFIG_ISA is not set
270CONFIG_ZONE_DMA=y 263CONFIG_ZONE_DMA=y
271CONFIG_GENERIC_ISA_DMA=y 264CONFIG_GENERIC_ISA_DMA=y
272CONFIG_PPC_INDIRECT_PCI=y 265CONFIG_PPC_INDIRECT_PCI=y
@@ -281,7 +274,7 @@ CONFIG_PCI_SYSCALL=y
281# CONFIG_PCIEPORTBUS is not set 274# CONFIG_PCIEPORTBUS is not set
282CONFIG_ARCH_SUPPORTS_MSI=y 275CONFIG_ARCH_SUPPORTS_MSI=y
283# CONFIG_PCI_MSI is not set 276# CONFIG_PCI_MSI is not set
284CONFIG_PCI_LEGACY=y 277# CONFIG_PCI_LEGACY is not set
285# CONFIG_PCCARD is not set 278# CONFIG_PCCARD is not set
286# CONFIG_HOTPLUG_PCI is not set 279# CONFIG_HOTPLUG_PCI is not set
287# CONFIG_HAS_RAPIDIO is not set 280# CONFIG_HAS_RAPIDIO is not set
@@ -349,6 +342,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
349# CONFIG_TIPC is not set 342# CONFIG_TIPC is not set
350# CONFIG_ATM is not set 343# CONFIG_ATM is not set
351# CONFIG_BRIDGE is not set 344# CONFIG_BRIDGE is not set
345# CONFIG_NET_DSA is not set
352# CONFIG_VLAN_8021Q is not set 346# CONFIG_VLAN_8021Q is not set
353# CONFIG_DECNET is not set 347# CONFIG_DECNET is not set
354# CONFIG_LLC2 is not set 348# CONFIG_LLC2 is not set
@@ -369,11 +363,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
369# CONFIG_IRDA is not set 363# CONFIG_IRDA is not set
370# CONFIG_BT is not set 364# CONFIG_BT is not set
371# CONFIG_AF_RXRPC is not set 365# CONFIG_AF_RXRPC is not set
372 366# CONFIG_PHONET is not set
373# 367CONFIG_WIRELESS=y
374# Wireless
375#
376# CONFIG_CFG80211 is not set 368# CONFIG_CFG80211 is not set
369CONFIG_WIRELESS_OLD_REGULATORY=y
377# CONFIG_WIRELESS_EXT is not set 370# CONFIG_WIRELESS_EXT is not set
378# CONFIG_MAC80211 is not set 371# CONFIG_MAC80211 is not set
379# CONFIG_IEEE80211 is not set 372# CONFIG_IEEE80211 is not set
@@ -488,7 +481,6 @@ CONFIG_OF_I2C=y
488# CONFIG_PARPORT is not set 481# CONFIG_PARPORT is not set
489CONFIG_BLK_DEV=y 482CONFIG_BLK_DEV=y
490# CONFIG_BLK_DEV_FD is not set 483# CONFIG_BLK_DEV_FD is not set
491# CONFIG_MAC_FLOPPY is not set
492# CONFIG_BLK_CPQ_DA is not set 484# CONFIG_BLK_CPQ_DA is not set
493# CONFIG_BLK_CPQ_CISS_DA is not set 485# CONFIG_BLK_CPQ_CISS_DA is not set
494# CONFIG_BLK_DEV_DAC960 is not set 486# CONFIG_BLK_DEV_DAC960 is not set
@@ -590,8 +582,6 @@ CONFIG_SCSI_LOWLEVEL=y
590# CONFIG_SCSI_DC390T is not set 582# CONFIG_SCSI_DC390T is not set
591# CONFIG_SCSI_NSP32 is not set 583# CONFIG_SCSI_NSP32 is not set
592# CONFIG_SCSI_DEBUG is not set 584# CONFIG_SCSI_DEBUG is not set
593# CONFIG_SCSI_MESH is not set
594# CONFIG_SCSI_MAC53C94 is not set
595# CONFIG_SCSI_SRP is not set 585# CONFIG_SCSI_SRP is not set
596# CONFIG_SCSI_DH is not set 586# CONFIG_SCSI_DH is not set
597CONFIG_ATA=y 587CONFIG_ATA=y
@@ -696,8 +686,6 @@ CONFIG_ICPLUS_PHY=y
696# CONFIG_MDIO_BITBANG is not set 686# CONFIG_MDIO_BITBANG is not set
697CONFIG_NET_ETHERNET=y 687CONFIG_NET_ETHERNET=y
698CONFIG_MII=y 688CONFIG_MII=y
699# CONFIG_MACE is not set
700# CONFIG_BMAC is not set
701# CONFIG_HAPPYMEAL is not set 689# CONFIG_HAPPYMEAL is not set
702# CONFIG_SUNGEM is not set 690# CONFIG_SUNGEM is not set
703# CONFIG_CASSINI is not set 691# CONFIG_CASSINI is not set
@@ -708,8 +696,12 @@ CONFIG_MII=y
708# CONFIG_IBM_NEW_EMAC_RGMII is not set 696# CONFIG_IBM_NEW_EMAC_RGMII is not set
709# CONFIG_IBM_NEW_EMAC_TAH is not set 697# CONFIG_IBM_NEW_EMAC_TAH is not set
710# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 698# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
699# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
700# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
701# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
711# CONFIG_NET_PCI is not set 702# CONFIG_NET_PCI is not set
712# CONFIG_B44 is not set 703# CONFIG_B44 is not set
704# CONFIG_ATL2 is not set
713CONFIG_NETDEV_1000=y 705CONFIG_NETDEV_1000=y
714# CONFIG_ACENIC is not set 706# CONFIG_ACENIC is not set
715# CONFIG_DL2K is not set 707# CONFIG_DL2K is not set
@@ -736,18 +728,22 @@ CONFIG_UCC_GETH=y
736# CONFIG_QLA3XXX is not set 728# CONFIG_QLA3XXX is not set
737# CONFIG_ATL1 is not set 729# CONFIG_ATL1 is not set
738# CONFIG_ATL1E is not set 730# CONFIG_ATL1E is not set
731# CONFIG_JME is not set
739CONFIG_NETDEV_10000=y 732CONFIG_NETDEV_10000=y
740# CONFIG_CHELSIO_T1 is not set 733# CONFIG_CHELSIO_T1 is not set
741# CONFIG_CHELSIO_T3 is not set 734# CONFIG_CHELSIO_T3 is not set
735# CONFIG_ENIC is not set
742# CONFIG_IXGBE is not set 736# CONFIG_IXGBE is not set
743# CONFIG_IXGB is not set 737# CONFIG_IXGB is not set
744# CONFIG_S2IO is not set 738# CONFIG_S2IO is not set
745# CONFIG_MYRI10GE is not set 739# CONFIG_MYRI10GE is not set
746# CONFIG_NETXEN_NIC is not set 740# CONFIG_NETXEN_NIC is not set
747# CONFIG_NIU is not set 741# CONFIG_NIU is not set
742# CONFIG_MLX4_EN is not set
748# CONFIG_MLX4_CORE is not set 743# CONFIG_MLX4_CORE is not set
749# CONFIG_TEHUTI is not set 744# CONFIG_TEHUTI is not set
750# CONFIG_BNX2X is not set 745# CONFIG_BNX2X is not set
746# CONFIG_QLGE is not set
751# CONFIG_SFC is not set 747# CONFIG_SFC is not set
752# CONFIG_TR is not set 748# CONFIG_TR is not set
753 749
@@ -782,7 +778,7 @@ CONFIG_NETDEV_10000=y
782# Input device support 778# Input device support
783# 779#
784CONFIG_INPUT=y 780CONFIG_INPUT=y
785# CONFIG_INPUT_FF_MEMLESS is not set 781CONFIG_INPUT_FF_MEMLESS=m
786# CONFIG_INPUT_POLLDEV is not set 782# CONFIG_INPUT_POLLDEV is not set
787 783
788# 784#
@@ -833,15 +829,12 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
833# CONFIG_SERIAL_UARTLITE is not set 829# CONFIG_SERIAL_UARTLITE is not set
834CONFIG_SERIAL_CORE=y 830CONFIG_SERIAL_CORE=y
835CONFIG_SERIAL_CORE_CONSOLE=y 831CONFIG_SERIAL_CORE_CONSOLE=y
836# CONFIG_SERIAL_PMACZILOG is not set
837# CONFIG_SERIAL_JSM is not set 832# CONFIG_SERIAL_JSM is not set
838# CONFIG_SERIAL_OF_PLATFORM is not set 833# CONFIG_SERIAL_OF_PLATFORM is not set
839# CONFIG_SERIAL_QE is not set 834# CONFIG_SERIAL_QE is not set
840CONFIG_UNIX98_PTYS=y 835CONFIG_UNIX98_PTYS=y
841CONFIG_LEGACY_PTYS=y 836CONFIG_LEGACY_PTYS=y
842CONFIG_LEGACY_PTY_COUNT=256 837CONFIG_LEGACY_PTY_COUNT=256
843# CONFIG_BRIQ_PANEL is not set
844# CONFIG_HVC_RTAS is not set
845# CONFIG_IPMI_HANDLER is not set 838# CONFIG_IPMI_HANDLER is not set
846CONFIG_HW_RANDOM=y 839CONFIG_HW_RANDOM=y
847# CONFIG_NVRAM is not set 840# CONFIG_NVRAM is not set
@@ -880,12 +873,6 @@ CONFIG_I2C_HELPER_AUTO=y
880# CONFIG_I2C_VIAPRO is not set 873# CONFIG_I2C_VIAPRO is not set
881 874
882# 875#
883# Mac SMBus host controller drivers
884#
885# CONFIG_I2C_HYDRA is not set
886CONFIG_I2C_POWERMAC=y
887
888#
889# I2C system bus drivers (mostly embedded / system-on-chip) 876# I2C system bus drivers (mostly embedded / system-on-chip)
890# 877#
891# CONFIG_I2C_GPIO is not set 878# CONFIG_I2C_GPIO is not set
@@ -924,6 +911,7 @@ CONFIG_I2C_MPC=y
924# CONFIG_TPS65010 is not set 911# CONFIG_TPS65010 is not set
925# CONFIG_SENSORS_MAX6875 is not set 912# CONFIG_SENSORS_MAX6875 is not set
926# CONFIG_SENSORS_TSL2550 is not set 913# CONFIG_SENSORS_TSL2550 is not set
914# CONFIG_MCU_MPC8349EMITX is not set
927# CONFIG_I2C_DEBUG_CORE is not set 915# CONFIG_I2C_DEBUG_CORE is not set
928# CONFIG_I2C_DEBUG_ALGO is not set 916# CONFIG_I2C_DEBUG_ALGO is not set
929# CONFIG_I2C_DEBUG_BUS is not set 917# CONFIG_I2C_DEBUG_BUS is not set
@@ -963,7 +951,6 @@ CONFIG_HWMON=y
963# CONFIG_SENSORS_ADM9240 is not set 951# CONFIG_SENSORS_ADM9240 is not set
964# CONFIG_SENSORS_ADT7470 is not set 952# CONFIG_SENSORS_ADT7470 is not set
965# CONFIG_SENSORS_ADT7473 is not set 953# CONFIG_SENSORS_ADT7473 is not set
966# CONFIG_SENSORS_AMS is not set
967# CONFIG_SENSORS_ATXP1 is not set 954# CONFIG_SENSORS_ATXP1 is not set
968# CONFIG_SENSORS_DS1621 is not set 955# CONFIG_SENSORS_DS1621 is not set
969# CONFIG_SENSORS_I5K_AMB is not set 956# CONFIG_SENSORS_I5K_AMB is not set
@@ -1018,7 +1005,6 @@ CONFIG_WATCHDOG=y
1018# CONFIG_SOFT_WATCHDOG is not set 1005# CONFIG_SOFT_WATCHDOG is not set
1019# CONFIG_ALIM7101_WDT is not set 1006# CONFIG_ALIM7101_WDT is not set
1020# CONFIG_8xxx_WDT is not set 1007# CONFIG_8xxx_WDT is not set
1021# CONFIG_WATCHDOG_RTAS is not set
1022 1008
1023# 1009#
1024# PCI-based Watchdog Cards 1010# PCI-based Watchdog Cards
@@ -1044,6 +1030,17 @@ CONFIG_SSB_POSSIBLE=y
1044# CONFIG_MFD_SM501 is not set 1030# CONFIG_MFD_SM501 is not set
1045# CONFIG_HTC_PASIC3 is not set 1031# CONFIG_HTC_PASIC3 is not set
1046# CONFIG_MFD_TMIO is not set 1032# CONFIG_MFD_TMIO is not set
1033# CONFIG_PMIC_DA903X is not set
1034# CONFIG_MFD_WM8400 is not set
1035# CONFIG_MFD_WM8350_I2C is not set
1036
1037#
1038# Voltage and Current regulators
1039#
1040# CONFIG_REGULATOR is not set
1041# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1042# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1043# CONFIG_REGULATOR_BQ24022 is not set
1047 1044
1048# 1045#
1049# Multimedia devices 1046# Multimedia devices
@@ -1086,9 +1083,36 @@ CONFIG_HID=y
1086# USB Input Devices 1083# USB Input Devices
1087# 1084#
1088CONFIG_USB_HID=y 1085CONFIG_USB_HID=y
1089# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1086# CONFIG_HID_PID is not set
1090# CONFIG_HID_FF is not set
1091# CONFIG_USB_HIDDEV is not set 1087# CONFIG_USB_HIDDEV is not set
1088
1089#
1090# Special HID drivers
1091#
1092CONFIG_HID_COMPAT=y
1093CONFIG_HID_A4TECH=y
1094CONFIG_HID_APPLE=y
1095CONFIG_HID_BELKIN=y
1096CONFIG_HID_BRIGHT=y
1097CONFIG_HID_CHERRY=y
1098CONFIG_HID_CHICONY=y
1099CONFIG_HID_CYPRESS=y
1100CONFIG_HID_DELL=y
1101CONFIG_HID_EZKEY=y
1102CONFIG_HID_GYRATION=y
1103CONFIG_HID_LOGITECH=y
1104# CONFIG_LOGITECH_FF is not set
1105# CONFIG_LOGIRUMBLEPAD2_FF is not set
1106CONFIG_HID_MICROSOFT=y
1107CONFIG_HID_MONTEREY=y
1108CONFIG_HID_PANTHERLORD=y
1109# CONFIG_PANTHERLORD_FF is not set
1110CONFIG_HID_PETALYNX=y
1111CONFIG_HID_SAMSUNG=y
1112CONFIG_HID_SONY=y
1113CONFIG_HID_SUNPLUS=y
1114CONFIG_THRUSTMASTER_FF=m
1115CONFIG_ZEROPLUS_FF=m
1092CONFIG_USB_SUPPORT=y 1116CONFIG_USB_SUPPORT=y
1093CONFIG_USB_ARCH_HAS_HCD=y 1117CONFIG_USB_ARCH_HAS_HCD=y
1094CONFIG_USB_ARCH_HAS_OHCI=y 1118CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1107,6 +1131,8 @@ CONFIG_USB_DEVICE_CLASS=y
1107# CONFIG_USB_OTG_WHITELIST is not set 1131# CONFIG_USB_OTG_WHITELIST is not set
1108# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1132# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1109CONFIG_USB_MON=y 1133CONFIG_USB_MON=y
1134# CONFIG_USB_WUSB is not set
1135# CONFIG_USB_WUSB_CBAF is not set
1110 1136
1111# 1137#
1112# USB Host Controller Drivers 1138# USB Host Controller Drivers
@@ -1123,6 +1149,8 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1123# CONFIG_USB_UHCI_HCD is not set 1149# CONFIG_USB_UHCI_HCD is not set
1124# CONFIG_USB_SL811_HCD is not set 1150# CONFIG_USB_SL811_HCD is not set
1125# CONFIG_USB_R8A66597_HCD is not set 1151# CONFIG_USB_R8A66597_HCD is not set
1152# CONFIG_USB_WHCI_HCD is not set
1153# CONFIG_USB_HWA_HCD is not set
1126 1154
1127# 1155#
1128# USB Device Class drivers 1156# USB Device Class drivers
@@ -1130,6 +1158,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1130# CONFIG_USB_ACM is not set 1158# CONFIG_USB_ACM is not set
1131# CONFIG_USB_PRINTER is not set 1159# CONFIG_USB_PRINTER is not set
1132# CONFIG_USB_WDM is not set 1160# CONFIG_USB_WDM is not set
1161# CONFIG_USB_TMC is not set
1133 1162
1134# 1163#
1135# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1164# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1158,6 +1187,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1158# CONFIG_USB_EMI62 is not set 1187# CONFIG_USB_EMI62 is not set
1159# CONFIG_USB_EMI26 is not set 1188# CONFIG_USB_EMI26 is not set
1160# CONFIG_USB_ADUTUX is not set 1189# CONFIG_USB_ADUTUX is not set
1190# CONFIG_USB_SEVSEG is not set
1161# CONFIG_USB_RIO500 is not set 1191# CONFIG_USB_RIO500 is not set
1162# CONFIG_USB_LEGOTOWER is not set 1192# CONFIG_USB_LEGOTOWER is not set
1163# CONFIG_USB_LCD is not set 1193# CONFIG_USB_LCD is not set
@@ -1174,7 +1204,9 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1174# CONFIG_USB_TRANCEVIBRATOR is not set 1204# CONFIG_USB_TRANCEVIBRATOR is not set
1175# CONFIG_USB_IOWARRIOR is not set 1205# CONFIG_USB_IOWARRIOR is not set
1176# CONFIG_USB_ISIGHTFW is not set 1206# CONFIG_USB_ISIGHTFW is not set
1207# CONFIG_USB_VST is not set
1177# CONFIG_USB_GADGET is not set 1208# CONFIG_USB_GADGET is not set
1209# CONFIG_UWB is not set
1178# CONFIG_MMC is not set 1210# CONFIG_MMC is not set
1179# CONFIG_MEMSTICK is not set 1211# CONFIG_MEMSTICK is not set
1180# CONFIG_NEW_LEDS is not set 1212# CONFIG_NEW_LEDS is not set
@@ -1184,6 +1216,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1184# CONFIG_RTC_CLASS is not set 1216# CONFIG_RTC_CLASS is not set
1185# CONFIG_DMADEVICES is not set 1217# CONFIG_DMADEVICES is not set
1186# CONFIG_UIO is not set 1218# CONFIG_UIO is not set
1219# CONFIG_STAGING is not set
1187 1220
1188# 1221#
1189# File systems 1222# File systems
@@ -1195,12 +1228,13 @@ CONFIG_EXT3_FS=y
1195CONFIG_EXT3_FS_XATTR=y 1228CONFIG_EXT3_FS_XATTR=y
1196# CONFIG_EXT3_FS_POSIX_ACL is not set 1229# CONFIG_EXT3_FS_POSIX_ACL is not set
1197# CONFIG_EXT3_FS_SECURITY is not set 1230# CONFIG_EXT3_FS_SECURITY is not set
1198# CONFIG_EXT4DEV_FS is not set 1231# CONFIG_EXT4_FS is not set
1199CONFIG_JBD=y 1232CONFIG_JBD=y
1200CONFIG_FS_MBCACHE=y 1233CONFIG_FS_MBCACHE=y
1201# CONFIG_REISERFS_FS is not set 1234# CONFIG_REISERFS_FS is not set
1202# CONFIG_JFS_FS is not set 1235# CONFIG_JFS_FS is not set
1203# CONFIG_FS_POSIX_ACL is not set 1236# CONFIG_FS_POSIX_ACL is not set
1237CONFIG_FILE_LOCKING=y
1204# CONFIG_XFS_FS is not set 1238# CONFIG_XFS_FS is not set
1205# CONFIG_OCFS2_FS is not set 1239# CONFIG_OCFS2_FS is not set
1206CONFIG_DNOTIFY=y 1240CONFIG_DNOTIFY=y
@@ -1230,6 +1264,7 @@ CONFIG_INOTIFY_USER=y
1230CONFIG_PROC_FS=y 1264CONFIG_PROC_FS=y
1231CONFIG_PROC_KCORE=y 1265CONFIG_PROC_KCORE=y
1232CONFIG_PROC_SYSCTL=y 1266CONFIG_PROC_SYSCTL=y
1267CONFIG_PROC_PAGE_MONITOR=y
1233CONFIG_SYSFS=y 1268CONFIG_SYSFS=y
1234CONFIG_TMPFS=y 1269CONFIG_TMPFS=y
1235# CONFIG_TMPFS_POSIX_ACL is not set 1270# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1268,6 +1303,7 @@ CONFIG_LOCKD_V4=y
1268CONFIG_NFS_COMMON=y 1303CONFIG_NFS_COMMON=y
1269CONFIG_SUNRPC=y 1304CONFIG_SUNRPC=y
1270CONFIG_SUNRPC_GSS=y 1305CONFIG_SUNRPC_GSS=y
1306# CONFIG_SUNRPC_REGISTER_V4 is not set
1271CONFIG_RPCSEC_GSS_KRB5=y 1307CONFIG_RPCSEC_GSS_KRB5=y
1272# CONFIG_RPCSEC_GSS_SPKM3 is not set 1308# CONFIG_RPCSEC_GSS_SPKM3 is not set
1273# CONFIG_SMB_FS is not set 1309# CONFIG_SMB_FS is not set
@@ -1301,13 +1337,11 @@ CONFIG_MSDOS_PARTITION=y
1301# CONFIG_DLM is not set 1337# CONFIG_DLM is not set
1302CONFIG_UCC_FAST=y 1338CONFIG_UCC_FAST=y
1303CONFIG_UCC=y 1339CONFIG_UCC=y
1304CONFIG_QE_GPIO=y
1305 1340
1306# 1341#
1307# Library routines 1342# Library routines
1308# 1343#
1309CONFIG_BITREVERSE=y 1344CONFIG_BITREVERSE=y
1310# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1311# CONFIG_CRC_CCITT is not set 1345# CONFIG_CRC_CCITT is not set
1312# CONFIG_CRC16 is not set 1346# CONFIG_CRC16 is not set
1313CONFIG_CRC_T10DIF=y 1347CONFIG_CRC_T10DIF=y
@@ -1335,13 +1369,15 @@ CONFIG_FRAME_WARN=1024
1335# CONFIG_DEBUG_KERNEL is not set 1369# CONFIG_DEBUG_KERNEL is not set
1336# CONFIG_DEBUG_BUGVERBOSE is not set 1370# CONFIG_DEBUG_BUGVERBOSE is not set
1337# CONFIG_DEBUG_MEMORY_INIT is not set 1371# CONFIG_DEBUG_MEMORY_INIT is not set
1372# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1338# CONFIG_LATENCYTOP is not set 1373# CONFIG_LATENCYTOP is not set
1339CONFIG_SYSCTL_SYSCALL_CHECK=y 1374CONFIG_SYSCTL_SYSCALL_CHECK=y
1340CONFIG_HAVE_FTRACE=y 1375CONFIG_HAVE_FUNCTION_TRACER=y
1341CONFIG_HAVE_DYNAMIC_FTRACE=y 1376
1342# CONFIG_FTRACE is not set 1377#
1343# CONFIG_SCHED_TRACER is not set 1378# Tracers
1344# CONFIG_CONTEXT_SWITCH_TRACER is not set 1379#
1380# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1345# CONFIG_SAMPLES is not set 1381# CONFIG_SAMPLES is not set
1346CONFIG_HAVE_ARCH_KGDB=y 1382CONFIG_HAVE_ARCH_KGDB=y
1347# CONFIG_IRQSTACKS is not set 1383# CONFIG_IRQSTACKS is not set
@@ -1353,16 +1389,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1353# 1389#
1354# CONFIG_KEYS is not set 1390# CONFIG_KEYS is not set
1355# CONFIG_SECURITY is not set 1391# CONFIG_SECURITY is not set
1392# CONFIG_SECURITYFS is not set
1356# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1393# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1357CONFIG_CRYPTO=y 1394CONFIG_CRYPTO=y
1358 1395
1359# 1396#
1360# Crypto core or helper 1397# Crypto core or helper
1361# 1398#
1399# CONFIG_CRYPTO_FIPS is not set
1362CONFIG_CRYPTO_ALGAPI=y 1400CONFIG_CRYPTO_ALGAPI=y
1363CONFIG_CRYPTO_AEAD=y 1401CONFIG_CRYPTO_AEAD=y
1364CONFIG_CRYPTO_BLKCIPHER=y 1402CONFIG_CRYPTO_BLKCIPHER=y
1365CONFIG_CRYPTO_HASH=y 1403CONFIG_CRYPTO_HASH=y
1404CONFIG_CRYPTO_RNG=y
1366CONFIG_CRYPTO_MANAGER=y 1405CONFIG_CRYPTO_MANAGER=y
1367# CONFIG_CRYPTO_GF128MUL is not set 1406# CONFIG_CRYPTO_GF128MUL is not set
1368# CONFIG_CRYPTO_NULL is not set 1407# CONFIG_CRYPTO_NULL is not set
@@ -1435,6 +1474,11 @@ CONFIG_CRYPTO_DES=y
1435# 1474#
1436# CONFIG_CRYPTO_DEFLATE is not set 1475# CONFIG_CRYPTO_DEFLATE is not set
1437# CONFIG_CRYPTO_LZO is not set 1476# CONFIG_CRYPTO_LZO is not set
1477
1478#
1479# Random Number Generation
1480#
1481# CONFIG_CRYPTO_ANSI_CPRNG is not set
1438CONFIG_CRYPTO_HW=y 1482CONFIG_CRYPTO_HW=y
1439# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1483# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1440CONFIG_CRYPTO_DEV_TALITOS=y 1484CONFIG_CRYPTO_DEV_TALITOS=y
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index f0a13bebf50c..c87b53abc617 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 07:15:20 2008 4# Sat Nov 8 12:39:43 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_SPE=y
24# CONFIG_PPC_MM_SLICES is not set 24# CONFIG_PPC_MM_SLICES is not set
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -111,7 +111,9 @@ CONFIG_SIGNALFD=y
111CONFIG_TIMERFD=y 111CONFIG_TIMERFD=y
112CONFIG_EVENTFD=y 112CONFIG_EVENTFD=y
113CONFIG_SHMEM=y 113CONFIG_SHMEM=y
114CONFIG_AIO=y
114CONFIG_VM_EVENT_COUNTERS=y 115CONFIG_VM_EVENT_COUNTERS=y
116CONFIG_PCI_QUIRKS=y
115CONFIG_SLUB_DEBUG=y 117CONFIG_SLUB_DEBUG=y
116# CONFIG_SLAB is not set 118# CONFIG_SLAB is not set
117CONFIG_SLUB=y 119CONFIG_SLUB=y
@@ -125,10 +127,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
125CONFIG_HAVE_KPROBES=y 127CONFIG_HAVE_KPROBES=y
126CONFIG_HAVE_KRETPROBES=y 128CONFIG_HAVE_KRETPROBES=y
127CONFIG_HAVE_ARCH_TRACEHOOK=y 129CONFIG_HAVE_ARCH_TRACEHOOK=y
128# CONFIG_HAVE_DMA_ATTRS is not set
129# CONFIG_USE_GENERIC_SMP_HELPERS is not set
130CONFIG_HAVE_CLK=y 130CONFIG_HAVE_CLK=y
131CONFIG_PROC_PAGE_MONITOR=y
132# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 131# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
133CONFIG_SLABINFO=y 132CONFIG_SLABINFO=y
134CONFIG_RT_MUTEXES=y 133CONFIG_RT_MUTEXES=y
@@ -161,6 +160,7 @@ CONFIG_DEFAULT_CFQ=y
161# CONFIG_DEFAULT_NOOP is not set 160# CONFIG_DEFAULT_NOOP is not set
162CONFIG_DEFAULT_IOSCHED="cfq" 161CONFIG_DEFAULT_IOSCHED="cfq"
163CONFIG_CLASSIC_RCU=y 162CONFIG_CLASSIC_RCU=y
163# CONFIG_FREEZER is not set
164 164
165# 165#
166# Platform support 166# Platform support
@@ -197,9 +197,11 @@ CONFIG_PPC_I8259=y
197# CONFIG_GENERIC_IOMAP is not set 197# CONFIG_GENERIC_IOMAP is not set
198# CONFIG_CPU_FREQ is not set 198# CONFIG_CPU_FREQ is not set
199CONFIG_QUICC_ENGINE=y 199CONFIG_QUICC_ENGINE=y
200# CONFIG_QE_GPIO is not set
200CONFIG_CPM2=y 201CONFIG_CPM2=y
201CONFIG_FSL_ULI1575=y 202CONFIG_FSL_ULI1575=y
202CONFIG_CPM=y 203CONFIG_CPM=y
204# CONFIG_MPC8xxx_GPIO is not set
203 205
204# 206#
205# Kernel options 207# Kernel options
@@ -219,6 +221,8 @@ CONFIG_PREEMPT_NONE=y
219# CONFIG_PREEMPT_VOLUNTARY is not set 221# CONFIG_PREEMPT_VOLUNTARY is not set
220# CONFIG_PREEMPT is not set 222# CONFIG_PREEMPT is not set
221CONFIG_BINFMT_ELF=y 223CONFIG_BINFMT_ELF=y
224# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
225# CONFIG_HAVE_AOUT is not set
222CONFIG_BINFMT_MISC=m 226CONFIG_BINFMT_MISC=m
223CONFIG_MATH_EMULATION=y 227CONFIG_MATH_EMULATION=y
224# CONFIG_IOMMU_HELPER is not set 228# CONFIG_IOMMU_HELPER is not set
@@ -233,15 +237,15 @@ CONFIG_FLATMEM_MANUAL=y
233# CONFIG_SPARSEMEM_MANUAL is not set 237# CONFIG_SPARSEMEM_MANUAL is not set
234CONFIG_FLATMEM=y 238CONFIG_FLATMEM=y
235CONFIG_FLAT_NODE_MEM_MAP=y 239CONFIG_FLAT_NODE_MEM_MAP=y
236# CONFIG_SPARSEMEM_STATIC is not set
237# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
238CONFIG_PAGEFLAGS_EXTENDED=y 240CONFIG_PAGEFLAGS_EXTENDED=y
239CONFIG_SPLIT_PTLOCK_CPUS=4 241CONFIG_SPLIT_PTLOCK_CPUS=4
240CONFIG_MIGRATION=y 242CONFIG_MIGRATION=y
241# CONFIG_RESOURCES_64BIT is not set 243# CONFIG_RESOURCES_64BIT is not set
244# CONFIG_PHYS_ADDR_T_64BIT is not set
242CONFIG_ZONE_DMA_FLAG=1 245CONFIG_ZONE_DMA_FLAG=1
243CONFIG_BOUNCE=y 246CONFIG_BOUNCE=y
244CONFIG_VIRT_TO_BUS=y 247CONFIG_VIRT_TO_BUS=y
248CONFIG_UNEVICTABLE_LRU=y
245CONFIG_FORCE_MAX_ZONEORDER=11 249CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_PROC_DEVICETREE=y 250CONFIG_PROC_DEVICETREE=y
247# CONFIG_CMDLINE_BOOL is not set 251# CONFIG_CMDLINE_BOOL is not set
@@ -265,7 +269,7 @@ CONFIG_PCI_SYSCALL=y
265# CONFIG_PCIEPORTBUS is not set 269# CONFIG_PCIEPORTBUS is not set
266CONFIG_ARCH_SUPPORTS_MSI=y 270CONFIG_ARCH_SUPPORTS_MSI=y
267# CONFIG_PCI_MSI is not set 271# CONFIG_PCI_MSI is not set
268CONFIG_PCI_LEGACY=y 272# CONFIG_PCI_LEGACY is not set
269# CONFIG_PCI_DEBUG is not set 273# CONFIG_PCI_DEBUG is not set
270# CONFIG_PCCARD is not set 274# CONFIG_PCCARD is not set
271# CONFIG_HOTPLUG_PCI is not set 275# CONFIG_HOTPLUG_PCI is not set
@@ -367,6 +371,7 @@ CONFIG_SCTP_HMAC_MD5=y
367# CONFIG_TIPC is not set 371# CONFIG_TIPC is not set
368# CONFIG_ATM is not set 372# CONFIG_ATM is not set
369# CONFIG_BRIDGE is not set 373# CONFIG_BRIDGE is not set
374# CONFIG_NET_DSA is not set
370# CONFIG_VLAN_8021Q is not set 375# CONFIG_VLAN_8021Q is not set
371# CONFIG_DECNET is not set 376# CONFIG_DECNET is not set
372# CONFIG_LLC2 is not set 377# CONFIG_LLC2 is not set
@@ -387,12 +392,11 @@ CONFIG_SCTP_HMAC_MD5=y
387# CONFIG_IRDA is not set 392# CONFIG_IRDA is not set
388# CONFIG_BT is not set 393# CONFIG_BT is not set
389# CONFIG_AF_RXRPC is not set 394# CONFIG_AF_RXRPC is not set
395# CONFIG_PHONET is not set
390CONFIG_FIB_RULES=y 396CONFIG_FIB_RULES=y
391 397CONFIG_WIRELESS=y
392#
393# Wireless
394#
395# CONFIG_CFG80211 is not set 398# CONFIG_CFG80211 is not set
399CONFIG_WIRELESS_OLD_REGULATORY=y
396# CONFIG_WIRELESS_EXT is not set 400# CONFIG_WIRELESS_EXT is not set
397# CONFIG_MAC80211 is not set 401# CONFIG_MAC80211 is not set
398# CONFIG_IEEE80211 is not set 402# CONFIG_IEEE80211 is not set
@@ -639,8 +643,12 @@ CONFIG_MII=y
639# CONFIG_IBM_NEW_EMAC_RGMII is not set 643# CONFIG_IBM_NEW_EMAC_RGMII is not set
640# CONFIG_IBM_NEW_EMAC_TAH is not set 644# CONFIG_IBM_NEW_EMAC_TAH is not set
641# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 645# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
646# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
647# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
648# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
642# CONFIG_NET_PCI is not set 649# CONFIG_NET_PCI is not set
643# CONFIG_B44 is not set 650# CONFIG_B44 is not set
651# CONFIG_ATL2 is not set
644# CONFIG_FS_ENET is not set 652# CONFIG_FS_ENET is not set
645CONFIG_NETDEV_1000=y 653CONFIG_NETDEV_1000=y
646# CONFIG_ACENIC is not set 654# CONFIG_ACENIC is not set
@@ -664,18 +672,22 @@ CONFIG_GIANFAR=y
664# CONFIG_QLA3XXX is not set 672# CONFIG_QLA3XXX is not set
665# CONFIG_ATL1 is not set 673# CONFIG_ATL1 is not set
666# CONFIG_ATL1E is not set 674# CONFIG_ATL1E is not set
675# CONFIG_JME is not set
667CONFIG_NETDEV_10000=y 676CONFIG_NETDEV_10000=y
668# CONFIG_CHELSIO_T1 is not set 677# CONFIG_CHELSIO_T1 is not set
669# CONFIG_CHELSIO_T3 is not set 678# CONFIG_CHELSIO_T3 is not set
679# CONFIG_ENIC is not set
670# CONFIG_IXGBE is not set 680# CONFIG_IXGBE is not set
671# CONFIG_IXGB is not set 681# CONFIG_IXGB is not set
672# CONFIG_S2IO is not set 682# CONFIG_S2IO is not set
673# CONFIG_MYRI10GE is not set 683# CONFIG_MYRI10GE is not set
674# CONFIG_NETXEN_NIC is not set 684# CONFIG_NETXEN_NIC is not set
675# CONFIG_NIU is not set 685# CONFIG_NIU is not set
686# CONFIG_MLX4_EN is not set
676# CONFIG_MLX4_CORE is not set 687# CONFIG_MLX4_CORE is not set
677# CONFIG_TEHUTI is not set 688# CONFIG_TEHUTI is not set
678# CONFIG_BNX2X is not set 689# CONFIG_BNX2X is not set
690# CONFIG_QLGE is not set
679# CONFIG_SFC is not set 691# CONFIG_SFC is not set
680# CONFIG_TR is not set 692# CONFIG_TR is not set
681 693
@@ -710,7 +722,7 @@ CONFIG_NETDEV_10000=y
710# Input device support 722# Input device support
711# 723#
712CONFIG_INPUT=y 724CONFIG_INPUT=y
713# CONFIG_INPUT_FF_MEMLESS is not set 725CONFIG_INPUT_FF_MEMLESS=m
714# CONFIG_INPUT_POLLDEV is not set 726# CONFIG_INPUT_POLLDEV is not set
715 727
716# 728#
@@ -902,7 +914,19 @@ CONFIG_SSB_POSSIBLE=y
902# CONFIG_MFD_CORE is not set 914# CONFIG_MFD_CORE is not set
903# CONFIG_MFD_SM501 is not set 915# CONFIG_MFD_SM501 is not set
904# CONFIG_HTC_PASIC3 is not set 916# CONFIG_HTC_PASIC3 is not set
917# CONFIG_UCB1400_CORE is not set
905# CONFIG_MFD_TMIO is not set 918# CONFIG_MFD_TMIO is not set
919# CONFIG_PMIC_DA903X is not set
920# CONFIG_MFD_WM8400 is not set
921# CONFIG_MFD_WM8350_I2C is not set
922
923#
924# Voltage and Current regulators
925#
926# CONFIG_REGULATOR is not set
927# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
928# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
929# CONFIG_REGULATOR_BQ24022 is not set
906 930
907# 931#
908# Multimedia devices 932# Multimedia devices
@@ -943,7 +967,6 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
943# CONFIG_DVB_USB is not set 967# CONFIG_DVB_USB is not set
944# CONFIG_DVB_TTUSB_BUDGET is not set 968# CONFIG_DVB_TTUSB_BUDGET is not set
945# CONFIG_DVB_TTUSB_DEC is not set 969# CONFIG_DVB_TTUSB_DEC is not set
946# CONFIG_DVB_CINERGYT2 is not set
947# CONFIG_DVB_SIANO_SMS1XXX is not set 970# CONFIG_DVB_SIANO_SMS1XXX is not set
948 971
949# 972#
@@ -961,6 +984,11 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
961# CONFIG_DVB_PLUTO2 is not set 984# CONFIG_DVB_PLUTO2 is not set
962 985
963# 986#
987# Supported SDMC DM1105 Adapters
988#
989# CONFIG_DVB_DM1105 is not set
990
991#
964# Supported DVB Frontends 992# Supported DVB Frontends
965# 993#
966 994
@@ -976,6 +1004,8 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
976# CONFIG_DVB_CX24123 is not set 1004# CONFIG_DVB_CX24123 is not set
977# CONFIG_DVB_MT312 is not set 1005# CONFIG_DVB_MT312 is not set
978# CONFIG_DVB_S5H1420 is not set 1006# CONFIG_DVB_S5H1420 is not set
1007# CONFIG_DVB_STV0288 is not set
1008# CONFIG_DVB_STB6000 is not set
979# CONFIG_DVB_STV0299 is not set 1009# CONFIG_DVB_STV0299 is not set
980# CONFIG_DVB_TDA8083 is not set 1010# CONFIG_DVB_TDA8083 is not set
981# CONFIG_DVB_TDA10086 is not set 1011# CONFIG_DVB_TDA10086 is not set
@@ -983,6 +1013,8 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
983# CONFIG_DVB_TUNER_ITD1000 is not set 1013# CONFIG_DVB_TUNER_ITD1000 is not set
984# CONFIG_DVB_TDA826X is not set 1014# CONFIG_DVB_TDA826X is not set
985# CONFIG_DVB_TUA6100 is not set 1015# CONFIG_DVB_TUA6100 is not set
1016# CONFIG_DVB_CX24116 is not set
1017# CONFIG_DVB_SI21XX is not set
986 1018
987# 1019#
988# DVB-T (terrestrial) frontends 1020# DVB-T (terrestrial) frontends
@@ -1035,6 +1067,13 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
1035# CONFIG_DVB_LNBP21 is not set 1067# CONFIG_DVB_LNBP21 is not set
1036# CONFIG_DVB_ISL6405 is not set 1068# CONFIG_DVB_ISL6405 is not set
1037# CONFIG_DVB_ISL6421 is not set 1069# CONFIG_DVB_ISL6421 is not set
1070# CONFIG_DVB_LGS8GL5 is not set
1071
1072#
1073# Tools to develop new frontends
1074#
1075# CONFIG_DVB_DUMMY_FE is not set
1076# CONFIG_DVB_AF9013 is not set
1038CONFIG_DAB=y 1077CONFIG_DAB=y
1039# CONFIG_USB_DABUSB is not set 1078# CONFIG_USB_DABUSB is not set
1040 1079
@@ -1060,6 +1099,7 @@ CONFIG_VGA_CONSOLE=y
1060# CONFIG_VGACON_SOFT_SCROLLBACK is not set 1099# CONFIG_VGACON_SOFT_SCROLLBACK is not set
1061CONFIG_DUMMY_CONSOLE=y 1100CONFIG_DUMMY_CONSOLE=y
1062CONFIG_SOUND=y 1101CONFIG_SOUND=y
1102CONFIG_SOUND_OSS_CORE=y
1063CONFIG_SND=y 1103CONFIG_SND=y
1064CONFIG_SND_TIMER=y 1104CONFIG_SND_TIMER=y
1065CONFIG_SND_PCM=y 1105CONFIG_SND_PCM=y
@@ -1160,9 +1200,36 @@ CONFIG_HID=y
1160# USB Input Devices 1200# USB Input Devices
1161# 1201#
1162CONFIG_USB_HID=y 1202CONFIG_USB_HID=y
1163# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1203# CONFIG_HID_PID is not set
1164# CONFIG_HID_FF is not set
1165# CONFIG_USB_HIDDEV is not set 1204# CONFIG_USB_HIDDEV is not set
1205
1206#
1207# Special HID drivers
1208#
1209CONFIG_HID_COMPAT=y
1210CONFIG_HID_A4TECH=y
1211CONFIG_HID_APPLE=y
1212CONFIG_HID_BELKIN=y
1213CONFIG_HID_BRIGHT=y
1214CONFIG_HID_CHERRY=y
1215CONFIG_HID_CHICONY=y
1216CONFIG_HID_CYPRESS=y
1217CONFIG_HID_DELL=y
1218CONFIG_HID_EZKEY=y
1219CONFIG_HID_GYRATION=y
1220CONFIG_HID_LOGITECH=y
1221# CONFIG_LOGITECH_FF is not set
1222# CONFIG_LOGIRUMBLEPAD2_FF is not set
1223CONFIG_HID_MICROSOFT=y
1224CONFIG_HID_MONTEREY=y
1225CONFIG_HID_PANTHERLORD=y
1226# CONFIG_PANTHERLORD_FF is not set
1227CONFIG_HID_PETALYNX=y
1228CONFIG_HID_SAMSUNG=y
1229CONFIG_HID_SONY=y
1230CONFIG_HID_SUNPLUS=y
1231CONFIG_THRUSTMASTER_FF=m
1232CONFIG_ZEROPLUS_FF=m
1166CONFIG_USB_SUPPORT=y 1233CONFIG_USB_SUPPORT=y
1167CONFIG_USB_ARCH_HAS_HCD=y 1234CONFIG_USB_ARCH_HAS_HCD=y
1168CONFIG_USB_ARCH_HAS_OHCI=y 1235CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1181,6 +1248,8 @@ CONFIG_USB_DEVICE_CLASS=y
1181# CONFIG_USB_OTG_WHITELIST is not set 1248# CONFIG_USB_OTG_WHITELIST is not set
1182# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1249# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1183CONFIG_USB_MON=y 1250CONFIG_USB_MON=y
1251# CONFIG_USB_WUSB is not set
1252# CONFIG_USB_WUSB_CBAF is not set
1184 1253
1185# 1254#
1186# USB Host Controller Drivers 1255# USB Host Controller Drivers
@@ -1204,6 +1273,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1204# CONFIG_USB_UHCI_HCD is not set 1273# CONFIG_USB_UHCI_HCD is not set
1205# CONFIG_USB_SL811_HCD is not set 1274# CONFIG_USB_SL811_HCD is not set
1206# CONFIG_USB_R8A66597_HCD is not set 1275# CONFIG_USB_R8A66597_HCD is not set
1276# CONFIG_USB_WHCI_HCD is not set
1277# CONFIG_USB_HWA_HCD is not set
1207# CONFIG_USB_MUSB_HDRC is not set 1278# CONFIG_USB_MUSB_HDRC is not set
1208 1279
1209# 1280#
@@ -1212,6 +1283,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1212# CONFIG_USB_ACM is not set 1283# CONFIG_USB_ACM is not set
1213# CONFIG_USB_PRINTER is not set 1284# CONFIG_USB_PRINTER is not set
1214# CONFIG_USB_WDM is not set 1285# CONFIG_USB_WDM is not set
1286# CONFIG_USB_TMC is not set
1215 1287
1216# 1288#
1217# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1289# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1233,7 +1305,6 @@ CONFIG_USB_STORAGE=y
1233# CONFIG_USB_STORAGE_ALAUDA is not set 1305# CONFIG_USB_STORAGE_ALAUDA is not set
1234# CONFIG_USB_STORAGE_ONETOUCH is not set 1306# CONFIG_USB_STORAGE_ONETOUCH is not set
1235# CONFIG_USB_STORAGE_KARMA is not set 1307# CONFIG_USB_STORAGE_KARMA is not set
1236# CONFIG_USB_STORAGE_SIERRA is not set
1237# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1308# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1238# CONFIG_USB_LIBUSUAL is not set 1309# CONFIG_USB_LIBUSUAL is not set
1239 1310
@@ -1254,6 +1325,7 @@ CONFIG_USB_STORAGE=y
1254# CONFIG_USB_EMI62 is not set 1325# CONFIG_USB_EMI62 is not set
1255# CONFIG_USB_EMI26 is not set 1326# CONFIG_USB_EMI26 is not set
1256# CONFIG_USB_ADUTUX is not set 1327# CONFIG_USB_ADUTUX is not set
1328# CONFIG_USB_SEVSEG is not set
1257# CONFIG_USB_RIO500 is not set 1329# CONFIG_USB_RIO500 is not set
1258# CONFIG_USB_LEGOTOWER is not set 1330# CONFIG_USB_LEGOTOWER is not set
1259# CONFIG_USB_LCD is not set 1331# CONFIG_USB_LCD is not set
@@ -1271,7 +1343,9 @@ CONFIG_USB_STORAGE=y
1271# CONFIG_USB_IOWARRIOR is not set 1343# CONFIG_USB_IOWARRIOR is not set
1272# CONFIG_USB_TEST is not set 1344# CONFIG_USB_TEST is not set
1273# CONFIG_USB_ISIGHTFW is not set 1345# CONFIG_USB_ISIGHTFW is not set
1346# CONFIG_USB_VST is not set
1274# CONFIG_USB_GADGET is not set 1347# CONFIG_USB_GADGET is not set
1348# CONFIG_UWB is not set
1275# CONFIG_MMC is not set 1349# CONFIG_MMC is not set
1276# CONFIG_MEMSTICK is not set 1350# CONFIG_MEMSTICK is not set
1277# CONFIG_NEW_LEDS is not set 1351# CONFIG_NEW_LEDS is not set
@@ -1324,12 +1398,15 @@ CONFIG_RTC_INTF_DEV=y
1324# Platform RTC drivers 1398# Platform RTC drivers
1325# 1399#
1326CONFIG_RTC_DRV_CMOS=y 1400CONFIG_RTC_DRV_CMOS=y
1401# CONFIG_RTC_DRV_DS1286 is not set
1327# CONFIG_RTC_DRV_DS1511 is not set 1402# CONFIG_RTC_DRV_DS1511 is not set
1328# CONFIG_RTC_DRV_DS1553 is not set 1403# CONFIG_RTC_DRV_DS1553 is not set
1329# CONFIG_RTC_DRV_DS1742 is not set 1404# CONFIG_RTC_DRV_DS1742 is not set
1330# CONFIG_RTC_DRV_STK17TA8 is not set 1405# CONFIG_RTC_DRV_STK17TA8 is not set
1331# CONFIG_RTC_DRV_M48T86 is not set 1406# CONFIG_RTC_DRV_M48T86 is not set
1407# CONFIG_RTC_DRV_M48T35 is not set
1332# CONFIG_RTC_DRV_M48T59 is not set 1408# CONFIG_RTC_DRV_M48T59 is not set
1409# CONFIG_RTC_DRV_BQ4802 is not set
1333# CONFIG_RTC_DRV_V3020 is not set 1410# CONFIG_RTC_DRV_V3020 is not set
1334 1411
1335# 1412#
@@ -1350,6 +1427,7 @@ CONFIG_DMA_ENGINE=y
1350# CONFIG_NET_DMA is not set 1427# CONFIG_NET_DMA is not set
1351# CONFIG_DMATEST is not set 1428# CONFIG_DMATEST is not set
1352# CONFIG_UIO is not set 1429# CONFIG_UIO is not set
1430# CONFIG_STAGING is not set
1353 1431
1354# 1432#
1355# File systems 1433# File systems
@@ -1361,13 +1439,14 @@ CONFIG_EXT3_FS=y
1361CONFIG_EXT3_FS_XATTR=y 1439CONFIG_EXT3_FS_XATTR=y
1362# CONFIG_EXT3_FS_POSIX_ACL is not set 1440# CONFIG_EXT3_FS_POSIX_ACL is not set
1363# CONFIG_EXT3_FS_SECURITY is not set 1441# CONFIG_EXT3_FS_SECURITY is not set
1364# CONFIG_EXT4DEV_FS is not set 1442# CONFIG_EXT4_FS is not set
1365CONFIG_JBD=y 1443CONFIG_JBD=y
1366# CONFIG_JBD_DEBUG is not set 1444# CONFIG_JBD_DEBUG is not set
1367CONFIG_FS_MBCACHE=y 1445CONFIG_FS_MBCACHE=y
1368# CONFIG_REISERFS_FS is not set 1446# CONFIG_REISERFS_FS is not set
1369# CONFIG_JFS_FS is not set 1447# CONFIG_JFS_FS is not set
1370# CONFIG_FS_POSIX_ACL is not set 1448# CONFIG_FS_POSIX_ACL is not set
1449CONFIG_FILE_LOCKING=y
1371# CONFIG_XFS_FS is not set 1450# CONFIG_XFS_FS is not set
1372# CONFIG_OCFS2_FS is not set 1451# CONFIG_OCFS2_FS is not set
1373CONFIG_DNOTIFY=y 1452CONFIG_DNOTIFY=y
@@ -1405,6 +1484,7 @@ CONFIG_NTFS_FS=y
1405CONFIG_PROC_FS=y 1484CONFIG_PROC_FS=y
1406CONFIG_PROC_KCORE=y 1485CONFIG_PROC_KCORE=y
1407CONFIG_PROC_SYSCTL=y 1486CONFIG_PROC_SYSCTL=y
1487CONFIG_PROC_PAGE_MONITOR=y
1408CONFIG_SYSFS=y 1488CONFIG_SYSFS=y
1409CONFIG_TMPFS=y 1489CONFIG_TMPFS=y
1410# CONFIG_TMPFS_POSIX_ACL is not set 1490# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1449,6 +1529,7 @@ CONFIG_EXPORTFS=y
1449CONFIG_NFS_COMMON=y 1529CONFIG_NFS_COMMON=y
1450CONFIG_SUNRPC=y 1530CONFIG_SUNRPC=y
1451CONFIG_SUNRPC_GSS=y 1531CONFIG_SUNRPC_GSS=y
1532# CONFIG_SUNRPC_REGISTER_V4 is not set
1452CONFIG_RPCSEC_GSS_KRB5=y 1533CONFIG_RPCSEC_GSS_KRB5=y
1453# CONFIG_RPCSEC_GSS_SPKM3 is not set 1534# CONFIG_RPCSEC_GSS_SPKM3 is not set
1454# CONFIG_SMB_FS is not set 1535# CONFIG_SMB_FS is not set
@@ -1519,13 +1600,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1519# CONFIG_NLS_KOI8_U is not set 1600# CONFIG_NLS_KOI8_U is not set
1520CONFIG_NLS_UTF8=m 1601CONFIG_NLS_UTF8=m
1521# CONFIG_DLM is not set 1602# CONFIG_DLM is not set
1522# CONFIG_QE_GPIO is not set
1523 1603
1524# 1604#
1525# Library routines 1605# Library routines
1526# 1606#
1527CONFIG_BITREVERSE=y 1607CONFIG_BITREVERSE=y
1528# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1529# CONFIG_CRC_CCITT is not set 1608# CONFIG_CRC_CCITT is not set
1530# CONFIG_CRC16 is not set 1609# CONFIG_CRC16 is not set
1531CONFIG_CRC_T10DIF=y 1610CONFIG_CRC_T10DIF=y
@@ -1579,15 +1658,23 @@ CONFIG_DEBUG_INFO=y
1579# CONFIG_DEBUG_SG is not set 1658# CONFIG_DEBUG_SG is not set
1580# CONFIG_BOOT_PRINTK_DELAY is not set 1659# CONFIG_BOOT_PRINTK_DELAY is not set
1581# CONFIG_RCU_TORTURE_TEST is not set 1660# CONFIG_RCU_TORTURE_TEST is not set
1661# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1582# CONFIG_BACKTRACE_SELF_TEST is not set 1662# CONFIG_BACKTRACE_SELF_TEST is not set
1663# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1583# CONFIG_FAULT_INJECTION is not set 1664# CONFIG_FAULT_INJECTION is not set
1584# CONFIG_LATENCYTOP is not set 1665# CONFIG_LATENCYTOP is not set
1585CONFIG_SYSCTL_SYSCALL_CHECK=y 1666CONFIG_SYSCTL_SYSCALL_CHECK=y
1586CONFIG_HAVE_FTRACE=y 1667CONFIG_HAVE_FUNCTION_TRACER=y
1587CONFIG_HAVE_DYNAMIC_FTRACE=y 1668
1588# CONFIG_FTRACE is not set 1669#
1670# Tracers
1671#
1672# CONFIG_FUNCTION_TRACER is not set
1589# CONFIG_SCHED_TRACER is not set 1673# CONFIG_SCHED_TRACER is not set
1590# CONFIG_CONTEXT_SWITCH_TRACER is not set 1674# CONFIG_CONTEXT_SWITCH_TRACER is not set
1675# CONFIG_BOOT_TRACER is not set
1676# CONFIG_STACK_TRACER is not set
1677# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1591# CONFIG_SAMPLES is not set 1678# CONFIG_SAMPLES is not set
1592CONFIG_HAVE_ARCH_KGDB=y 1679CONFIG_HAVE_ARCH_KGDB=y
1593# CONFIG_KGDB is not set 1680# CONFIG_KGDB is not set
@@ -1596,6 +1683,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1596# CONFIG_DEBUG_PAGEALLOC is not set 1683# CONFIG_DEBUG_PAGEALLOC is not set
1597# CONFIG_CODE_PATCHING_SELFTEST is not set 1684# CONFIG_CODE_PATCHING_SELFTEST is not set
1598# CONFIG_FTR_FIXUP_SELFTEST is not set 1685# CONFIG_FTR_FIXUP_SELFTEST is not set
1686# CONFIG_MSI_BITMAP_SELFTEST is not set
1599# CONFIG_XMON is not set 1687# CONFIG_XMON is not set
1600# CONFIG_IRQSTACKS is not set 1688# CONFIG_IRQSTACKS is not set
1601CONFIG_VIRQ_DEBUG=y 1689CONFIG_VIRQ_DEBUG=y
@@ -1607,15 +1695,19 @@ CONFIG_VIRQ_DEBUG=y
1607# 1695#
1608# CONFIG_KEYS is not set 1696# CONFIG_KEYS is not set
1609# CONFIG_SECURITY is not set 1697# CONFIG_SECURITY is not set
1698# CONFIG_SECURITYFS is not set
1610# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1699# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1611CONFIG_CRYPTO=y 1700CONFIG_CRYPTO=y
1612 1701
1613# 1702#
1614# Crypto core or helper 1703# Crypto core or helper
1615# 1704#
1705# CONFIG_CRYPTO_FIPS is not set
1616CONFIG_CRYPTO_ALGAPI=y 1706CONFIG_CRYPTO_ALGAPI=y
1707CONFIG_CRYPTO_AEAD=y
1617CONFIG_CRYPTO_BLKCIPHER=y 1708CONFIG_CRYPTO_BLKCIPHER=y
1618CONFIG_CRYPTO_HASH=y 1709CONFIG_CRYPTO_HASH=y
1710CONFIG_CRYPTO_RNG=y
1619CONFIG_CRYPTO_MANAGER=y 1711CONFIG_CRYPTO_MANAGER=y
1620# CONFIG_CRYPTO_GF128MUL is not set 1712# CONFIG_CRYPTO_GF128MUL is not set
1621# CONFIG_CRYPTO_NULL is not set 1713# CONFIG_CRYPTO_NULL is not set
@@ -1688,6 +1780,11 @@ CONFIG_CRYPTO_DES=y
1688# 1780#
1689# CONFIG_CRYPTO_DEFLATE is not set 1781# CONFIG_CRYPTO_DEFLATE is not set
1690# CONFIG_CRYPTO_LZO is not set 1782# CONFIG_CRYPTO_LZO is not set
1783
1784#
1785# Random Number Generation
1786#
1787# CONFIG_CRYPTO_ANSI_CPRNG is not set
1691CONFIG_CRYPTO_HW=y 1788CONFIG_CRYPTO_HW=y
1692# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1789# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1693# CONFIG_CRYPTO_DEV_TALITOS is not set 1790# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig
index 1501c4336b3d..8272b1ac71f9 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:11 2008 4# Sat Nov 8 12:39:43 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,7 +19,7 @@ CONFIG_8xx=y
19CONFIG_NOT_COHERENT_CACHE=y 19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32 21CONFIG_WORD_SIZE=32
22CONFIG_PPC_MERGE=y 22# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
23CONFIG_MMU=y 23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y 24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y 25CONFIG_GENERIC_TIME=y
@@ -99,6 +99,7 @@ CONFIG_SIGNALFD=y
99CONFIG_TIMERFD=y 99CONFIG_TIMERFD=y
100CONFIG_EVENTFD=y 100CONFIG_EVENTFD=y
101CONFIG_SHMEM=y 101CONFIG_SHMEM=y
102CONFIG_AIO=y
102# CONFIG_VM_EVENT_COUNTERS is not set 103# CONFIG_VM_EVENT_COUNTERS is not set
103CONFIG_SLUB_DEBUG=y 104CONFIG_SLUB_DEBUG=y
104# CONFIG_SLAB is not set 105# CONFIG_SLAB is not set
@@ -112,10 +113,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
112CONFIG_HAVE_KPROBES=y 113CONFIG_HAVE_KPROBES=y
113CONFIG_HAVE_KRETPROBES=y 114CONFIG_HAVE_KRETPROBES=y
114CONFIG_HAVE_ARCH_TRACEHOOK=y 115CONFIG_HAVE_ARCH_TRACEHOOK=y
115# CONFIG_HAVE_DMA_ATTRS is not set
116# CONFIG_USE_GENERIC_SMP_HELPERS is not set
117CONFIG_HAVE_CLK=y 116CONFIG_HAVE_CLK=y
118CONFIG_PROC_PAGE_MONITOR=y
119# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 117# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
120CONFIG_SLABINFO=y 118CONFIG_SLABINFO=y
121CONFIG_RT_MUTEXES=y 119CONFIG_RT_MUTEXES=y
@@ -142,6 +140,7 @@ CONFIG_DEFAULT_AS=y
142# CONFIG_DEFAULT_NOOP is not set 140# CONFIG_DEFAULT_NOOP is not set
143CONFIG_DEFAULT_IOSCHED="anticipatory" 141CONFIG_DEFAULT_IOSCHED="anticipatory"
144CONFIG_CLASSIC_RCU=y 142CONFIG_CLASSIC_RCU=y
143# CONFIG_FREEZER is not set
145 144
146# 145#
147# Platform support 146# Platform support
@@ -154,6 +153,7 @@ CONFIG_MPC86XADS=y
154# CONFIG_MPC885ADS is not set 153# CONFIG_MPC885ADS is not set
155# CONFIG_PPC_EP88XC is not set 154# CONFIG_PPC_EP88XC is not set
156# CONFIG_PPC_ADDER875 is not set 155# CONFIG_PPC_ADDER875 is not set
156# CONFIG_PPC_MGSUVD is not set
157 157
158# 158#
159# MPC8xx CPM Options 159# MPC8xx CPM Options
@@ -182,6 +182,7 @@ CONFIG_NO_UCODE_PATCH=y
182# CONFIG_PPC_INDIRECT_IO is not set 182# CONFIG_PPC_INDIRECT_IO is not set
183# CONFIG_GENERIC_IOMAP is not set 183# CONFIG_GENERIC_IOMAP is not set
184# CONFIG_CPU_FREQ is not set 184# CONFIG_CPU_FREQ is not set
185# CONFIG_QUICC_ENGINE is not set
185# CONFIG_FSL_ULI1575 is not set 186# CONFIG_FSL_ULI1575 is not set
186CONFIG_CPM=y 187CONFIG_CPM=y
187 188
@@ -203,6 +204,8 @@ CONFIG_PREEMPT_NONE=y
203# CONFIG_PREEMPT_VOLUNTARY is not set 204# CONFIG_PREEMPT_VOLUNTARY is not set
204# CONFIG_PREEMPT is not set 205# CONFIG_PREEMPT is not set
205CONFIG_BINFMT_ELF=y 206CONFIG_BINFMT_ELF=y
207# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
208# CONFIG_HAVE_AOUT is not set
206# CONFIG_BINFMT_MISC is not set 209# CONFIG_BINFMT_MISC is not set
207CONFIG_MATH_EMULATION=y 210CONFIG_MATH_EMULATION=y
208# CONFIG_IOMMU_HELPER is not set 211# CONFIG_IOMMU_HELPER is not set
@@ -217,15 +220,15 @@ CONFIG_FLATMEM_MANUAL=y
217# CONFIG_SPARSEMEM_MANUAL is not set 220# CONFIG_SPARSEMEM_MANUAL is not set
218CONFIG_FLATMEM=y 221CONFIG_FLATMEM=y
219CONFIG_FLAT_NODE_MEM_MAP=y 222CONFIG_FLAT_NODE_MEM_MAP=y
220# CONFIG_SPARSEMEM_STATIC is not set
221# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
222CONFIG_PAGEFLAGS_EXTENDED=y 223CONFIG_PAGEFLAGS_EXTENDED=y
223CONFIG_SPLIT_PTLOCK_CPUS=4 224CONFIG_SPLIT_PTLOCK_CPUS=4
224CONFIG_MIGRATION=y 225CONFIG_MIGRATION=y
225# CONFIG_RESOURCES_64BIT is not set 226# CONFIG_RESOURCES_64BIT is not set
227# CONFIG_PHYS_ADDR_T_64BIT is not set
226CONFIG_ZONE_DMA_FLAG=1 228CONFIG_ZONE_DMA_FLAG=1
227CONFIG_BOUNCE=y 229CONFIG_BOUNCE=y
228CONFIG_VIRT_TO_BUS=y 230CONFIG_VIRT_TO_BUS=y
231CONFIG_UNEVICTABLE_LRU=y
229CONFIG_FORCE_MAX_ZONEORDER=11 232CONFIG_FORCE_MAX_ZONEORDER=11
230# CONFIG_PROC_DEVICETREE is not set 233# CONFIG_PROC_DEVICETREE is not set
231# CONFIG_CMDLINE_BOOL is not set 234# CONFIG_CMDLINE_BOOL is not set
@@ -311,6 +314,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
311# CONFIG_TIPC is not set 314# CONFIG_TIPC is not set
312# CONFIG_ATM is not set 315# CONFIG_ATM is not set
313# CONFIG_BRIDGE is not set 316# CONFIG_BRIDGE is not set
317# CONFIG_NET_DSA is not set
314# CONFIG_VLAN_8021Q is not set 318# CONFIG_VLAN_8021Q is not set
315# CONFIG_DECNET is not set 319# CONFIG_DECNET is not set
316# CONFIG_LLC2 is not set 320# CONFIG_LLC2 is not set
@@ -331,11 +335,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
331# CONFIG_IRDA is not set 335# CONFIG_IRDA is not set
332# CONFIG_BT is not set 336# CONFIG_BT is not set
333# CONFIG_AF_RXRPC is not set 337# CONFIG_AF_RXRPC is not set
334 338# CONFIG_PHONET is not set
335# 339CONFIG_WIRELESS=y
336# Wireless
337#
338# CONFIG_CFG80211 is not set 340# CONFIG_CFG80211 is not set
341CONFIG_WIRELESS_OLD_REGULATORY=y
339# CONFIG_WIRELESS_EXT is not set 342# CONFIG_WIRELESS_EXT is not set
340# CONFIG_MAC80211 is not set 343# CONFIG_MAC80211 is not set
341# CONFIG_IEEE80211 is not set 344# CONFIG_IEEE80211 is not set
@@ -412,6 +415,9 @@ CONFIG_MII=y
412# CONFIG_IBM_NEW_EMAC_RGMII is not set 415# CONFIG_IBM_NEW_EMAC_RGMII is not set
413# CONFIG_IBM_NEW_EMAC_TAH is not set 416# CONFIG_IBM_NEW_EMAC_TAH is not set
414# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 417# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
418# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
419# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
420# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
415# CONFIG_B44 is not set 421# CONFIG_B44 is not set
416CONFIG_FS_ENET=y 422CONFIG_FS_ENET=y
417CONFIG_FS_ENET_HAS_SCC=y 423CONFIG_FS_ENET_HAS_SCC=y
@@ -471,6 +477,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
471CONFIG_MOUSE_PS2_SYNAPTICS=y 477CONFIG_MOUSE_PS2_SYNAPTICS=y
472CONFIG_MOUSE_PS2_LIFEBOOK=y 478CONFIG_MOUSE_PS2_LIFEBOOK=y
473CONFIG_MOUSE_PS2_TRACKPOINT=y 479CONFIG_MOUSE_PS2_TRACKPOINT=y
480# CONFIG_MOUSE_PS2_ELANTECH is not set
474# CONFIG_MOUSE_PS2_TOUCHKIT is not set 481# CONFIG_MOUSE_PS2_TOUCHKIT is not set
475# CONFIG_MOUSE_SERIAL is not set 482# CONFIG_MOUSE_SERIAL is not set
476# CONFIG_MOUSE_VSXXXAA is not set 483# CONFIG_MOUSE_VSXXXAA is not set
@@ -510,12 +517,6 @@ CONFIG_SERIAL_CORE=y
510CONFIG_SERIAL_CORE_CONSOLE=y 517CONFIG_SERIAL_CORE_CONSOLE=y
511CONFIG_SERIAL_CPM=y 518CONFIG_SERIAL_CPM=y
512CONFIG_SERIAL_CPM_CONSOLE=y 519CONFIG_SERIAL_CPM_CONSOLE=y
513# CONFIG_SERIAL_CPM_SCC1 is not set
514# CONFIG_SERIAL_CPM_SCC2 is not set
515# CONFIG_SERIAL_CPM_SCC3 is not set
516# CONFIG_SERIAL_CPM_SCC4 is not set
517CONFIG_SERIAL_CPM_SMC1=y
518CONFIG_SERIAL_CPM_SMC2=y
519CONFIG_UNIX98_PTYS=y 520CONFIG_UNIX98_PTYS=y
520# CONFIG_LEGACY_PTYS is not set 521# CONFIG_LEGACY_PTYS is not set
521# CONFIG_IPMI_HANDLER is not set 522# CONFIG_IPMI_HANDLER is not set
@@ -564,6 +565,14 @@ CONFIG_SSB_POSSIBLE=y
564# CONFIG_MFD_TMIO is not set 565# CONFIG_MFD_TMIO is not set
565 566
566# 567#
568# Voltage and Current regulators
569#
570# CONFIG_REGULATOR is not set
571# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
572# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
573# CONFIG_REGULATOR_BQ24022 is not set
574
575#
567# Multimedia devices 576# Multimedia devices
568# 577#
569 578
@@ -596,6 +605,12 @@ CONFIG_HID_SUPPORT=y
596CONFIG_HID=y 605CONFIG_HID=y
597# CONFIG_HID_DEBUG is not set 606# CONFIG_HID_DEBUG is not set
598# CONFIG_HIDRAW is not set 607# CONFIG_HIDRAW is not set
608# CONFIG_HID_PID is not set
609
610#
611# Special HID drivers
612#
613CONFIG_HID_COMPAT=y
599CONFIG_USB_SUPPORT=y 614CONFIG_USB_SUPPORT=y
600# CONFIG_USB_ARCH_HAS_HCD is not set 615# CONFIG_USB_ARCH_HAS_HCD is not set
601# CONFIG_USB_ARCH_HAS_OHCI is not set 616# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -619,6 +634,7 @@ CONFIG_USB_SUPPORT=y
619# CONFIG_RTC_CLASS is not set 634# CONFIG_RTC_CLASS is not set
620# CONFIG_DMADEVICES is not set 635# CONFIG_DMADEVICES is not set
621# CONFIG_UIO is not set 636# CONFIG_UIO is not set
637# CONFIG_STAGING is not set
622 638
623# 639#
624# File systems 640# File systems
@@ -632,12 +648,13 @@ CONFIG_EXT3_FS=y
632CONFIG_EXT3_FS_XATTR=y 648CONFIG_EXT3_FS_XATTR=y
633# CONFIG_EXT3_FS_POSIX_ACL is not set 649# CONFIG_EXT3_FS_POSIX_ACL is not set
634# CONFIG_EXT3_FS_SECURITY is not set 650# CONFIG_EXT3_FS_SECURITY is not set
635# CONFIG_EXT4DEV_FS is not set 651# CONFIG_EXT4_FS is not set
636CONFIG_JBD=y 652CONFIG_JBD=y
637CONFIG_FS_MBCACHE=y 653CONFIG_FS_MBCACHE=y
638# CONFIG_REISERFS_FS is not set 654# CONFIG_REISERFS_FS is not set
639# CONFIG_JFS_FS is not set 655# CONFIG_JFS_FS is not set
640# CONFIG_FS_POSIX_ACL is not set 656# CONFIG_FS_POSIX_ACL is not set
657CONFIG_FILE_LOCKING=y
641# CONFIG_XFS_FS is not set 658# CONFIG_XFS_FS is not set
642# CONFIG_OCFS2_FS is not set 659# CONFIG_OCFS2_FS is not set
643CONFIG_DNOTIFY=y 660CONFIG_DNOTIFY=y
@@ -667,6 +684,7 @@ CONFIG_INOTIFY_USER=y
667CONFIG_PROC_FS=y 684CONFIG_PROC_FS=y
668# CONFIG_PROC_KCORE is not set 685# CONFIG_PROC_KCORE is not set
669CONFIG_PROC_SYSCTL=y 686CONFIG_PROC_SYSCTL=y
687CONFIG_PROC_PAGE_MONITOR=y
670CONFIG_SYSFS=y 688CONFIG_SYSFS=y
671CONFIG_TMPFS=y 689CONFIG_TMPFS=y
672# CONFIG_TMPFS_POSIX_ACL is not set 690# CONFIG_TMPFS_POSIX_ACL is not set
@@ -703,6 +721,7 @@ CONFIG_LOCKD=y
703CONFIG_LOCKD_V4=y 721CONFIG_LOCKD_V4=y
704CONFIG_NFS_COMMON=y 722CONFIG_NFS_COMMON=y
705CONFIG_SUNRPC=y 723CONFIG_SUNRPC=y
724# CONFIG_SUNRPC_REGISTER_V4 is not set
706# CONFIG_RPCSEC_GSS_KRB5 is not set 725# CONFIG_RPCSEC_GSS_KRB5 is not set
707# CONFIG_RPCSEC_GSS_SPKM3 is not set 726# CONFIG_RPCSEC_GSS_SPKM3 is not set
708# CONFIG_SMB_FS is not set 727# CONFIG_SMB_FS is not set
@@ -739,7 +758,6 @@ CONFIG_MSDOS_PARTITION=y
739# Library routines 758# Library routines
740# 759#
741CONFIG_BITREVERSE=y 760CONFIG_BITREVERSE=y
742# CONFIG_GENERIC_FIND_FIRST_BIT is not set
743CONFIG_CRC_CCITT=y 761CONFIG_CRC_CCITT=y
744# CONFIG_CRC16 is not set 762# CONFIG_CRC16 is not set
745# CONFIG_CRC_T10DIF is not set 763# CONFIG_CRC_T10DIF is not set
@@ -769,12 +787,14 @@ CONFIG_FRAME_WARN=1024
769# CONFIG_SLUB_DEBUG_ON is not set 787# CONFIG_SLUB_DEBUG_ON is not set
770# CONFIG_SLUB_STATS is not set 788# CONFIG_SLUB_STATS is not set
771# CONFIG_DEBUG_MEMORY_INIT is not set 789# CONFIG_DEBUG_MEMORY_INIT is not set
790# CONFIG_RCU_CPU_STALL_DETECTOR is not set
772# CONFIG_LATENCYTOP is not set 791# CONFIG_LATENCYTOP is not set
773CONFIG_HAVE_FTRACE=y 792CONFIG_HAVE_FUNCTION_TRACER=y
774CONFIG_HAVE_DYNAMIC_FTRACE=y 793
775# CONFIG_FTRACE is not set 794#
776# CONFIG_SCHED_TRACER is not set 795# Tracers
777# CONFIG_CONTEXT_SWITCH_TRACER is not set 796#
797# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
778# CONFIG_SAMPLES is not set 798# CONFIG_SAMPLES is not set
779CONFIG_HAVE_ARCH_KGDB=y 799CONFIG_HAVE_ARCH_KGDB=y
780# CONFIG_IRQSTACKS is not set 800# CONFIG_IRQSTACKS is not set
@@ -785,12 +805,14 @@ CONFIG_HAVE_ARCH_KGDB=y
785# 805#
786# CONFIG_KEYS is not set 806# CONFIG_KEYS is not set
787# CONFIG_SECURITY is not set 807# CONFIG_SECURITY is not set
808# CONFIG_SECURITYFS is not set
788# CONFIG_SECURITY_FILE_CAPABILITIES is not set 809# CONFIG_SECURITY_FILE_CAPABILITIES is not set
789CONFIG_CRYPTO=y 810CONFIG_CRYPTO=y
790 811
791# 812#
792# Crypto core or helper 813# Crypto core or helper
793# 814#
815# CONFIG_CRYPTO_FIPS is not set
794# CONFIG_CRYPTO_MANAGER is not set 816# CONFIG_CRYPTO_MANAGER is not set
795# CONFIG_CRYPTO_GF128MUL is not set 817# CONFIG_CRYPTO_GF128MUL is not set
796# CONFIG_CRYPTO_NULL is not set 818# CONFIG_CRYPTO_NULL is not set
@@ -862,6 +884,11 @@ CONFIG_CRYPTO=y
862# 884#
863# CONFIG_CRYPTO_DEFLATE is not set 885# CONFIG_CRYPTO_DEFLATE is not set
864# CONFIG_CRYPTO_LZO is not set 886# CONFIG_CRYPTO_LZO is not set
887
888#
889# Random Number Generation
890#
891# CONFIG_CRYPTO_ANSI_CPRNG is not set
865CONFIG_CRYPTO_HW=y 892CONFIG_CRYPTO_HW=y
866# CONFIG_CRYPTO_DEV_TALITOS is not set 893# CONFIG_CRYPTO_DEV_TALITOS is not set
867CONFIG_PPC_CLOCK=y 894CONFIG_PPC_CLOCK=y
diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig
index 9d4be820cf1f..1736bbc281ec 100644
--- a/arch/powerpc/configs/mpc86xx_defconfig
+++ b/arch/powerpc/configs/mpc86xx_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.27-rc5 3# Linux kernel version: 2.6.28-rc3
4# Tue Sep 23 23:28:38 2008 4# Sat Nov 8 12:39:44 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_PHYS_64BIT is not set
18CONFIG_ALTIVEC=y 19CONFIG_ALTIVEC=y
19CONFIG_PPC_STD_MMU=y 20CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y 21CONFIG_PPC_STD_MMU_32=y
@@ -23,7 +24,7 @@ CONFIG_SMP=y
23CONFIG_NR_CPUS=2 24CONFIG_NR_CPUS=2
24CONFIG_PPC32=y 25CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 28CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -109,7 +110,9 @@ CONFIG_SIGNALFD=y
109CONFIG_TIMERFD=y 110CONFIG_TIMERFD=y
110CONFIG_EVENTFD=y 111CONFIG_EVENTFD=y
111CONFIG_SHMEM=y 112CONFIG_SHMEM=y
113CONFIG_AIO=y
112CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_PCI_QUIRKS=y
113CONFIG_SLUB_DEBUG=y 116CONFIG_SLUB_DEBUG=y
114# CONFIG_SLAB is not set 117# CONFIG_SLAB is not set
115CONFIG_SLUB=y 118CONFIG_SLUB=y
@@ -123,10 +126,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
123CONFIG_HAVE_KPROBES=y 126CONFIG_HAVE_KPROBES=y
124CONFIG_HAVE_KRETPROBES=y 127CONFIG_HAVE_KRETPROBES=y
125CONFIG_HAVE_ARCH_TRACEHOOK=y 128CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_DMA_ATTRS is not set
127CONFIG_USE_GENERIC_SMP_HELPERS=y 129CONFIG_USE_GENERIC_SMP_HELPERS=y
128# CONFIG_HAVE_CLK is not set
129CONFIG_PROC_PAGE_MONITOR=y
130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
131CONFIG_SLABINFO=y 131CONFIG_SLABINFO=y
132CONFIG_RT_MUTEXES=y 132CONFIG_RT_MUTEXES=y
@@ -160,7 +160,7 @@ CONFIG_DEFAULT_CFQ=y
160# CONFIG_DEFAULT_NOOP is not set 160# CONFIG_DEFAULT_NOOP is not set
161CONFIG_DEFAULT_IOSCHED="cfq" 161CONFIG_DEFAULT_IOSCHED="cfq"
162CONFIG_CLASSIC_RCU=y 162CONFIG_CLASSIC_RCU=y
163# CONFIG_MPC8xxx_GPIO is not set 163# CONFIG_FREEZER is not set
164 164
165# 165#
166# Platform support 166# Platform support
@@ -196,7 +196,9 @@ CONFIG_PPC_I8259=y
196# CONFIG_GENERIC_IOMAP is not set 196# CONFIG_GENERIC_IOMAP is not set
197# CONFIG_CPU_FREQ is not set 197# CONFIG_CPU_FREQ is not set
198# CONFIG_TAU is not set 198# CONFIG_TAU is not set
199# CONFIG_QUICC_ENGINE is not set
199CONFIG_FSL_ULI1575=y 200CONFIG_FSL_ULI1575=y
201# CONFIG_MPC8xxx_GPIO is not set
200 202
201# 203#
202# Kernel options 204# Kernel options
@@ -216,6 +218,8 @@ CONFIG_PREEMPT_NONE=y
216# CONFIG_PREEMPT_VOLUNTARY is not set 218# CONFIG_PREEMPT_VOLUNTARY is not set
217# CONFIG_PREEMPT is not set 219# CONFIG_PREEMPT is not set
218CONFIG_BINFMT_ELF=y 220CONFIG_BINFMT_ELF=y
221# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
222# CONFIG_HAVE_AOUT is not set
219CONFIG_BINFMT_MISC=m 223CONFIG_BINFMT_MISC=m
220# CONFIG_IOMMU_HELPER is not set 224# CONFIG_IOMMU_HELPER is not set
221CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 225CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -231,15 +235,15 @@ CONFIG_FLATMEM_MANUAL=y
231# CONFIG_SPARSEMEM_MANUAL is not set 235# CONFIG_SPARSEMEM_MANUAL is not set
232CONFIG_FLATMEM=y 236CONFIG_FLATMEM=y
233CONFIG_FLAT_NODE_MEM_MAP=y 237CONFIG_FLAT_NODE_MEM_MAP=y
234# CONFIG_SPARSEMEM_STATIC is not set
235# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
236CONFIG_PAGEFLAGS_EXTENDED=y 238CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 239CONFIG_SPLIT_PTLOCK_CPUS=4
238CONFIG_MIGRATION=y 240CONFIG_MIGRATION=y
239# CONFIG_RESOURCES_64BIT is not set 241# CONFIG_RESOURCES_64BIT is not set
242# CONFIG_PHYS_ADDR_T_64BIT is not set
240CONFIG_ZONE_DMA_FLAG=1 243CONFIG_ZONE_DMA_FLAG=1
241CONFIG_BOUNCE=y 244CONFIG_BOUNCE=y
242CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
246CONFIG_UNEVICTABLE_LRU=y
243CONFIG_FORCE_MAX_ZONEORDER=11 247CONFIG_FORCE_MAX_ZONEORDER=11
244CONFIG_PROC_DEVICETREE=y 248CONFIG_PROC_DEVICETREE=y
245# CONFIG_CMDLINE_BOOL is not set 249# CONFIG_CMDLINE_BOOL is not set
@@ -263,7 +267,7 @@ CONFIG_PCI_SYSCALL=y
263# CONFIG_PCIEPORTBUS is not set 267# CONFIG_PCIEPORTBUS is not set
264CONFIG_ARCH_SUPPORTS_MSI=y 268CONFIG_ARCH_SUPPORTS_MSI=y
265# CONFIG_PCI_MSI is not set 269# CONFIG_PCI_MSI is not set
266CONFIG_PCI_LEGACY=y 270# CONFIG_PCI_LEGACY is not set
267# CONFIG_PCI_DEBUG is not set 271# CONFIG_PCI_DEBUG is not set
268# CONFIG_PCCARD is not set 272# CONFIG_PCCARD is not set
269# CONFIG_HOTPLUG_PCI is not set 273# CONFIG_HOTPLUG_PCI is not set
@@ -365,6 +369,7 @@ CONFIG_SCTP_HMAC_MD5=y
365# CONFIG_TIPC is not set 369# CONFIG_TIPC is not set
366# CONFIG_ATM is not set 370# CONFIG_ATM is not set
367# CONFIG_BRIDGE is not set 371# CONFIG_BRIDGE is not set
372# CONFIG_NET_DSA is not set
368# CONFIG_VLAN_8021Q is not set 373# CONFIG_VLAN_8021Q is not set
369# CONFIG_DECNET is not set 374# CONFIG_DECNET is not set
370# CONFIG_LLC2 is not set 375# CONFIG_LLC2 is not set
@@ -385,12 +390,11 @@ CONFIG_SCTP_HMAC_MD5=y
385# CONFIG_IRDA is not set 390# CONFIG_IRDA is not set
386# CONFIG_BT is not set 391# CONFIG_BT is not set
387# CONFIG_AF_RXRPC is not set 392# CONFIG_AF_RXRPC is not set
393# CONFIG_PHONET is not set
388CONFIG_FIB_RULES=y 394CONFIG_FIB_RULES=y
389 395CONFIG_WIRELESS=y
390#
391# Wireless
392#
393# CONFIG_CFG80211 is not set 396# CONFIG_CFG80211 is not set
397CONFIG_WIRELESS_OLD_REGULATORY=y
394# CONFIG_WIRELESS_EXT is not set 398# CONFIG_WIRELESS_EXT is not set
395# CONFIG_MAC80211 is not set 399# CONFIG_MAC80211 is not set
396# CONFIG_IEEE80211 is not set 400# CONFIG_IEEE80211 is not set
@@ -636,8 +640,12 @@ CONFIG_MII=y
636# CONFIG_IBM_NEW_EMAC_RGMII is not set 640# CONFIG_IBM_NEW_EMAC_RGMII is not set
637# CONFIG_IBM_NEW_EMAC_TAH is not set 641# CONFIG_IBM_NEW_EMAC_TAH is not set
638# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 642# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
643# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
644# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
645# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
639# CONFIG_NET_PCI is not set 646# CONFIG_NET_PCI is not set
640# CONFIG_B44 is not set 647# CONFIG_B44 is not set
648# CONFIG_ATL2 is not set
641CONFIG_NETDEV_1000=y 649CONFIG_NETDEV_1000=y
642# CONFIG_ACENIC is not set 650# CONFIG_ACENIC is not set
643# CONFIG_DL2K is not set 651# CONFIG_DL2K is not set
@@ -660,18 +668,22 @@ CONFIG_GIANFAR=y
660# CONFIG_QLA3XXX is not set 668# CONFIG_QLA3XXX is not set
661# CONFIG_ATL1 is not set 669# CONFIG_ATL1 is not set
662# CONFIG_ATL1E is not set 670# CONFIG_ATL1E is not set
671# CONFIG_JME is not set
663CONFIG_NETDEV_10000=y 672CONFIG_NETDEV_10000=y
664# CONFIG_CHELSIO_T1 is not set 673# CONFIG_CHELSIO_T1 is not set
665# CONFIG_CHELSIO_T3 is not set 674# CONFIG_CHELSIO_T3 is not set
675# CONFIG_ENIC is not set
666# CONFIG_IXGBE is not set 676# CONFIG_IXGBE is not set
667# CONFIG_IXGB is not set 677# CONFIG_IXGB is not set
668# CONFIG_S2IO is not set 678# CONFIG_S2IO is not set
669# CONFIG_MYRI10GE is not set 679# CONFIG_MYRI10GE is not set
670# CONFIG_NETXEN_NIC is not set 680# CONFIG_NETXEN_NIC is not set
671# CONFIG_NIU is not set 681# CONFIG_NIU is not set
682# CONFIG_MLX4_EN is not set
672# CONFIG_MLX4_CORE is not set 683# CONFIG_MLX4_CORE is not set
673# CONFIG_TEHUTI is not set 684# CONFIG_TEHUTI is not set
674# CONFIG_BNX2X is not set 685# CONFIG_BNX2X is not set
686# CONFIG_QLGE is not set
675# CONFIG_SFC is not set 687# CONFIG_SFC is not set
676# CONFIG_TR is not set 688# CONFIG_TR is not set
677 689
@@ -706,7 +718,7 @@ CONFIG_NETDEV_10000=y
706# Input device support 718# Input device support
707# 719#
708CONFIG_INPUT=y 720CONFIG_INPUT=y
709# CONFIG_INPUT_FF_MEMLESS is not set 721CONFIG_INPUT_FF_MEMLESS=m
710# CONFIG_INPUT_POLLDEV is not set 722# CONFIG_INPUT_POLLDEV is not set
711 723
712# 724#
@@ -875,6 +887,17 @@ CONFIG_SSB_POSSIBLE=y
875# CONFIG_MFD_SM501 is not set 887# CONFIG_MFD_SM501 is not set
876# CONFIG_HTC_PASIC3 is not set 888# CONFIG_HTC_PASIC3 is not set
877# CONFIG_MFD_TMIO is not set 889# CONFIG_MFD_TMIO is not set
890# CONFIG_PMIC_DA903X is not set
891# CONFIG_MFD_WM8400 is not set
892# CONFIG_MFD_WM8350_I2C is not set
893
894#
895# Voltage and Current regulators
896#
897# CONFIG_REGULATOR is not set
898# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
899# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
900# CONFIG_REGULATOR_BQ24022 is not set
878 901
879# 902#
880# Multimedia devices 903# Multimedia devices
@@ -915,7 +938,6 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
915# CONFIG_DVB_USB is not set 938# CONFIG_DVB_USB is not set
916# CONFIG_DVB_TTUSB_BUDGET is not set 939# CONFIG_DVB_TTUSB_BUDGET is not set
917# CONFIG_DVB_TTUSB_DEC is not set 940# CONFIG_DVB_TTUSB_DEC is not set
918# CONFIG_DVB_CINERGYT2 is not set
919# CONFIG_DVB_SIANO_SMS1XXX is not set 941# CONFIG_DVB_SIANO_SMS1XXX is not set
920 942
921# 943#
@@ -933,6 +955,11 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
933# CONFIG_DVB_PLUTO2 is not set 955# CONFIG_DVB_PLUTO2 is not set
934 956
935# 957#
958# Supported SDMC DM1105 Adapters
959#
960# CONFIG_DVB_DM1105 is not set
961
962#
936# Supported DVB Frontends 963# Supported DVB Frontends
937# 964#
938 965
@@ -948,6 +975,8 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
948# CONFIG_DVB_CX24123 is not set 975# CONFIG_DVB_CX24123 is not set
949# CONFIG_DVB_MT312 is not set 976# CONFIG_DVB_MT312 is not set
950# CONFIG_DVB_S5H1420 is not set 977# CONFIG_DVB_S5H1420 is not set
978# CONFIG_DVB_STV0288 is not set
979# CONFIG_DVB_STB6000 is not set
951# CONFIG_DVB_STV0299 is not set 980# CONFIG_DVB_STV0299 is not set
952# CONFIG_DVB_TDA8083 is not set 981# CONFIG_DVB_TDA8083 is not set
953# CONFIG_DVB_TDA10086 is not set 982# CONFIG_DVB_TDA10086 is not set
@@ -955,6 +984,8 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
955# CONFIG_DVB_TUNER_ITD1000 is not set 984# CONFIG_DVB_TUNER_ITD1000 is not set
956# CONFIG_DVB_TDA826X is not set 985# CONFIG_DVB_TDA826X is not set
957# CONFIG_DVB_TUA6100 is not set 986# CONFIG_DVB_TUA6100 is not set
987# CONFIG_DVB_CX24116 is not set
988# CONFIG_DVB_SI21XX is not set
958 989
959# 990#
960# DVB-T (terrestrial) frontends 991# DVB-T (terrestrial) frontends
@@ -1007,6 +1038,13 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
1007# CONFIG_DVB_LNBP21 is not set 1038# CONFIG_DVB_LNBP21 is not set
1008# CONFIG_DVB_ISL6405 is not set 1039# CONFIG_DVB_ISL6405 is not set
1009# CONFIG_DVB_ISL6421 is not set 1040# CONFIG_DVB_ISL6421 is not set
1041# CONFIG_DVB_LGS8GL5 is not set
1042
1043#
1044# Tools to develop new frontends
1045#
1046# CONFIG_DVB_DUMMY_FE is not set
1047# CONFIG_DVB_AF9013 is not set
1010CONFIG_DAB=y 1048CONFIG_DAB=y
1011# CONFIG_USB_DABUSB is not set 1049# CONFIG_USB_DABUSB is not set
1012 1050
@@ -1032,6 +1070,7 @@ CONFIG_VGA_CONSOLE=y
1032# CONFIG_VGACON_SOFT_SCROLLBACK is not set 1070# CONFIG_VGACON_SOFT_SCROLLBACK is not set
1033CONFIG_DUMMY_CONSOLE=y 1071CONFIG_DUMMY_CONSOLE=y
1034CONFIG_SOUND=y 1072CONFIG_SOUND=y
1073CONFIG_SOUND_OSS_CORE=y
1035CONFIG_SND=y 1074CONFIG_SND=y
1036CONFIG_SND_TIMER=y 1075CONFIG_SND_TIMER=y
1037CONFIG_SND_PCM=y 1076CONFIG_SND_PCM=y
@@ -1132,9 +1171,36 @@ CONFIG_HID=y
1132# USB Input Devices 1171# USB Input Devices
1133# 1172#
1134CONFIG_USB_HID=y 1173CONFIG_USB_HID=y
1135# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1174# CONFIG_HID_PID is not set
1136# CONFIG_HID_FF is not set
1137# CONFIG_USB_HIDDEV is not set 1175# CONFIG_USB_HIDDEV is not set
1176
1177#
1178# Special HID drivers
1179#
1180CONFIG_HID_COMPAT=y
1181CONFIG_HID_A4TECH=y
1182CONFIG_HID_APPLE=y
1183CONFIG_HID_BELKIN=y
1184CONFIG_HID_BRIGHT=y
1185CONFIG_HID_CHERRY=y
1186CONFIG_HID_CHICONY=y
1187CONFIG_HID_CYPRESS=y
1188CONFIG_HID_DELL=y
1189CONFIG_HID_EZKEY=y
1190CONFIG_HID_GYRATION=y
1191CONFIG_HID_LOGITECH=y
1192# CONFIG_LOGITECH_FF is not set
1193# CONFIG_LOGIRUMBLEPAD2_FF is not set
1194CONFIG_HID_MICROSOFT=y
1195CONFIG_HID_MONTEREY=y
1196CONFIG_HID_PANTHERLORD=y
1197# CONFIG_PANTHERLORD_FF is not set
1198CONFIG_HID_PETALYNX=y
1199CONFIG_HID_SAMSUNG=y
1200CONFIG_HID_SONY=y
1201CONFIG_HID_SUNPLUS=y
1202CONFIG_THRUSTMASTER_FF=m
1203CONFIG_ZEROPLUS_FF=m
1138CONFIG_USB_SUPPORT=y 1204CONFIG_USB_SUPPORT=y
1139CONFIG_USB_ARCH_HAS_HCD=y 1205CONFIG_USB_ARCH_HAS_HCD=y
1140CONFIG_USB_ARCH_HAS_OHCI=y 1206CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1153,6 +1219,8 @@ CONFIG_USB_DEVICE_CLASS=y
1153# CONFIG_USB_OTG_WHITELIST is not set 1219# CONFIG_USB_OTG_WHITELIST is not set
1154# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1220# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1155CONFIG_USB_MON=y 1221CONFIG_USB_MON=y
1222# CONFIG_USB_WUSB is not set
1223# CONFIG_USB_WUSB_CBAF is not set
1156 1224
1157# 1225#
1158# USB Host Controller Drivers 1226# USB Host Controller Drivers
@@ -1176,6 +1244,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1176# CONFIG_USB_UHCI_HCD is not set 1244# CONFIG_USB_UHCI_HCD is not set
1177# CONFIG_USB_SL811_HCD is not set 1245# CONFIG_USB_SL811_HCD is not set
1178# CONFIG_USB_R8A66597_HCD is not set 1246# CONFIG_USB_R8A66597_HCD is not set
1247# CONFIG_USB_WHCI_HCD is not set
1248# CONFIG_USB_HWA_HCD is not set
1179 1249
1180# 1250#
1181# USB Device Class drivers 1251# USB Device Class drivers
@@ -1183,6 +1253,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1183# CONFIG_USB_ACM is not set 1253# CONFIG_USB_ACM is not set
1184# CONFIG_USB_PRINTER is not set 1254# CONFIG_USB_PRINTER is not set
1185# CONFIG_USB_WDM is not set 1255# CONFIG_USB_WDM is not set
1256# CONFIG_USB_TMC is not set
1186 1257
1187# 1258#
1188# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1259# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1204,7 +1275,6 @@ CONFIG_USB_STORAGE=y
1204# CONFIG_USB_STORAGE_ALAUDA is not set 1275# CONFIG_USB_STORAGE_ALAUDA is not set
1205# CONFIG_USB_STORAGE_ONETOUCH is not set 1276# CONFIG_USB_STORAGE_ONETOUCH is not set
1206# CONFIG_USB_STORAGE_KARMA is not set 1277# CONFIG_USB_STORAGE_KARMA is not set
1207# CONFIG_USB_STORAGE_SIERRA is not set
1208# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1278# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1209# CONFIG_USB_LIBUSUAL is not set 1279# CONFIG_USB_LIBUSUAL is not set
1210 1280
@@ -1225,6 +1295,7 @@ CONFIG_USB_STORAGE=y
1225# CONFIG_USB_EMI62 is not set 1295# CONFIG_USB_EMI62 is not set
1226# CONFIG_USB_EMI26 is not set 1296# CONFIG_USB_EMI26 is not set
1227# CONFIG_USB_ADUTUX is not set 1297# CONFIG_USB_ADUTUX is not set
1298# CONFIG_USB_SEVSEG is not set
1228# CONFIG_USB_RIO500 is not set 1299# CONFIG_USB_RIO500 is not set
1229# CONFIG_USB_LEGOTOWER is not set 1300# CONFIG_USB_LEGOTOWER is not set
1230# CONFIG_USB_LCD is not set 1301# CONFIG_USB_LCD is not set
@@ -1242,7 +1313,9 @@ CONFIG_USB_STORAGE=y
1242# CONFIG_USB_IOWARRIOR is not set 1313# CONFIG_USB_IOWARRIOR is not set
1243# CONFIG_USB_TEST is not set 1314# CONFIG_USB_TEST is not set
1244# CONFIG_USB_ISIGHTFW is not set 1315# CONFIG_USB_ISIGHTFW is not set
1316# CONFIG_USB_VST is not set
1245# CONFIG_USB_GADGET is not set 1317# CONFIG_USB_GADGET is not set
1318# CONFIG_UWB is not set
1246# CONFIG_MMC is not set 1319# CONFIG_MMC is not set
1247# CONFIG_MEMSTICK is not set 1320# CONFIG_MEMSTICK is not set
1248# CONFIG_NEW_LEDS is not set 1321# CONFIG_NEW_LEDS is not set
@@ -1288,12 +1361,15 @@ CONFIG_RTC_INTF_DEV=y
1288# Platform RTC drivers 1361# Platform RTC drivers
1289# 1362#
1290CONFIG_RTC_DRV_CMOS=y 1363CONFIG_RTC_DRV_CMOS=y
1364# CONFIG_RTC_DRV_DS1286 is not set
1291# CONFIG_RTC_DRV_DS1511 is not set 1365# CONFIG_RTC_DRV_DS1511 is not set
1292# CONFIG_RTC_DRV_DS1553 is not set 1366# CONFIG_RTC_DRV_DS1553 is not set
1293# CONFIG_RTC_DRV_DS1742 is not set 1367# CONFIG_RTC_DRV_DS1742 is not set
1294# CONFIG_RTC_DRV_STK17TA8 is not set 1368# CONFIG_RTC_DRV_STK17TA8 is not set
1295# CONFIG_RTC_DRV_M48T86 is not set 1369# CONFIG_RTC_DRV_M48T86 is not set
1370# CONFIG_RTC_DRV_M48T35 is not set
1296# CONFIG_RTC_DRV_M48T59 is not set 1371# CONFIG_RTC_DRV_M48T59 is not set
1372# CONFIG_RTC_DRV_BQ4802 is not set
1297# CONFIG_RTC_DRV_V3020 is not set 1373# CONFIG_RTC_DRV_V3020 is not set
1298 1374
1299# 1375#
@@ -1302,6 +1378,7 @@ CONFIG_RTC_DRV_CMOS=y
1302# CONFIG_RTC_DRV_PPC is not set 1378# CONFIG_RTC_DRV_PPC is not set
1303# CONFIG_DMADEVICES is not set 1379# CONFIG_DMADEVICES is not set
1304# CONFIG_UIO is not set 1380# CONFIG_UIO is not set
1381# CONFIG_STAGING is not set
1305 1382
1306# 1383#
1307# File systems 1384# File systems
@@ -1313,12 +1390,13 @@ CONFIG_EXT3_FS=y
1313CONFIG_EXT3_FS_XATTR=y 1390CONFIG_EXT3_FS_XATTR=y
1314# CONFIG_EXT3_FS_POSIX_ACL is not set 1391# CONFIG_EXT3_FS_POSIX_ACL is not set
1315# CONFIG_EXT3_FS_SECURITY is not set 1392# CONFIG_EXT3_FS_SECURITY is not set
1316# CONFIG_EXT4DEV_FS is not set 1393# CONFIG_EXT4_FS is not set
1317CONFIG_JBD=y 1394CONFIG_JBD=y
1318CONFIG_FS_MBCACHE=y 1395CONFIG_FS_MBCACHE=y
1319# CONFIG_REISERFS_FS is not set 1396# CONFIG_REISERFS_FS is not set
1320# CONFIG_JFS_FS is not set 1397# CONFIG_JFS_FS is not set
1321# CONFIG_FS_POSIX_ACL is not set 1398# CONFIG_FS_POSIX_ACL is not set
1399CONFIG_FILE_LOCKING=y
1322# CONFIG_XFS_FS is not set 1400# CONFIG_XFS_FS is not set
1323# CONFIG_OCFS2_FS is not set 1401# CONFIG_OCFS2_FS is not set
1324CONFIG_DNOTIFY=y 1402CONFIG_DNOTIFY=y
@@ -1356,6 +1434,7 @@ CONFIG_NTFS_FS=y
1356CONFIG_PROC_FS=y 1434CONFIG_PROC_FS=y
1357CONFIG_PROC_KCORE=y 1435CONFIG_PROC_KCORE=y
1358CONFIG_PROC_SYSCTL=y 1436CONFIG_PROC_SYSCTL=y
1437CONFIG_PROC_PAGE_MONITOR=y
1359CONFIG_SYSFS=y 1438CONFIG_SYSFS=y
1360CONFIG_TMPFS=y 1439CONFIG_TMPFS=y
1361# CONFIG_TMPFS_POSIX_ACL is not set 1440# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1400,6 +1479,7 @@ CONFIG_EXPORTFS=y
1400CONFIG_NFS_COMMON=y 1479CONFIG_NFS_COMMON=y
1401CONFIG_SUNRPC=y 1480CONFIG_SUNRPC=y
1402CONFIG_SUNRPC_GSS=y 1481CONFIG_SUNRPC_GSS=y
1482# CONFIG_SUNRPC_REGISTER_V4 is not set
1403CONFIG_RPCSEC_GSS_KRB5=y 1483CONFIG_RPCSEC_GSS_KRB5=y
1404# CONFIG_RPCSEC_GSS_SPKM3 is not set 1484# CONFIG_RPCSEC_GSS_SPKM3 is not set
1405# CONFIG_SMB_FS is not set 1485# CONFIG_SMB_FS is not set
@@ -1475,7 +1555,6 @@ CONFIG_NLS_UTF8=m
1475# Library routines 1555# Library routines
1476# 1556#
1477CONFIG_BITREVERSE=y 1557CONFIG_BITREVERSE=y
1478# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1479# CONFIG_CRC_CCITT is not set 1558# CONFIG_CRC_CCITT is not set
1480# CONFIG_CRC16 is not set 1559# CONFIG_CRC16 is not set
1481CONFIG_CRC_T10DIF=y 1560CONFIG_CRC_T10DIF=y
@@ -1529,15 +1608,23 @@ CONFIG_DEBUG_INFO=y
1529# CONFIG_DEBUG_SG is not set 1608# CONFIG_DEBUG_SG is not set
1530# CONFIG_BOOT_PRINTK_DELAY is not set 1609# CONFIG_BOOT_PRINTK_DELAY is not set
1531# CONFIG_RCU_TORTURE_TEST is not set 1610# CONFIG_RCU_TORTURE_TEST is not set
1611# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1532# CONFIG_BACKTRACE_SELF_TEST is not set 1612# CONFIG_BACKTRACE_SELF_TEST is not set
1613# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1533# CONFIG_FAULT_INJECTION is not set 1614# CONFIG_FAULT_INJECTION is not set
1534# CONFIG_LATENCYTOP is not set 1615# CONFIG_LATENCYTOP is not set
1535CONFIG_SYSCTL_SYSCALL_CHECK=y 1616CONFIG_SYSCTL_SYSCALL_CHECK=y
1536CONFIG_HAVE_FTRACE=y 1617CONFIG_HAVE_FUNCTION_TRACER=y
1537CONFIG_HAVE_DYNAMIC_FTRACE=y 1618
1538# CONFIG_FTRACE is not set 1619#
1620# Tracers
1621#
1622# CONFIG_FUNCTION_TRACER is not set
1539# CONFIG_SCHED_TRACER is not set 1623# CONFIG_SCHED_TRACER is not set
1540# CONFIG_CONTEXT_SWITCH_TRACER is not set 1624# CONFIG_CONTEXT_SWITCH_TRACER is not set
1625# CONFIG_BOOT_TRACER is not set
1626# CONFIG_STACK_TRACER is not set
1627# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1541# CONFIG_SAMPLES is not set 1628# CONFIG_SAMPLES is not set
1542CONFIG_HAVE_ARCH_KGDB=y 1629CONFIG_HAVE_ARCH_KGDB=y
1543# CONFIG_KGDB is not set 1630# CONFIG_KGDB is not set
@@ -1558,15 +1645,19 @@ CONFIG_HAVE_ARCH_KGDB=y
1558# 1645#
1559# CONFIG_KEYS is not set 1646# CONFIG_KEYS is not set
1560# CONFIG_SECURITY is not set 1647# CONFIG_SECURITY is not set
1648# CONFIG_SECURITYFS is not set
1561# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1649# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1562CONFIG_CRYPTO=y 1650CONFIG_CRYPTO=y
1563 1651
1564# 1652#
1565# Crypto core or helper 1653# Crypto core or helper
1566# 1654#
1655# CONFIG_CRYPTO_FIPS is not set
1567CONFIG_CRYPTO_ALGAPI=y 1656CONFIG_CRYPTO_ALGAPI=y
1657CONFIG_CRYPTO_AEAD=y
1568CONFIG_CRYPTO_BLKCIPHER=y 1658CONFIG_CRYPTO_BLKCIPHER=y
1569CONFIG_CRYPTO_HASH=y 1659CONFIG_CRYPTO_HASH=y
1660CONFIG_CRYPTO_RNG=y
1570CONFIG_CRYPTO_MANAGER=y 1661CONFIG_CRYPTO_MANAGER=y
1571# CONFIG_CRYPTO_GF128MUL is not set 1662# CONFIG_CRYPTO_GF128MUL is not set
1572# CONFIG_CRYPTO_NULL is not set 1663# CONFIG_CRYPTO_NULL is not set
@@ -1639,6 +1730,11 @@ CONFIG_CRYPTO_DES=y
1639# 1730#
1640# CONFIG_CRYPTO_DEFLATE is not set 1731# CONFIG_CRYPTO_DEFLATE is not set
1641# CONFIG_CRYPTO_LZO is not set 1732# CONFIG_CRYPTO_LZO is not set
1733
1734#
1735# Random Number Generation
1736#
1737# CONFIG_CRYPTO_ANSI_CPRNG is not set
1642CONFIG_CRYPTO_HW=y 1738CONFIG_CRYPTO_HW=y
1643# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1739# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1644# CONFIG_CRYPTO_DEV_TALITOS is not set 1740# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index fc3f6dc58126..a4283b6a43d2 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:12 2008 4# Sat Nov 8 12:39:46 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,7 +19,7 @@ CONFIG_8xx=y
19CONFIG_NOT_COHERENT_CACHE=y 19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32 21CONFIG_WORD_SIZE=32
22CONFIG_PPC_MERGE=y 22# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
23CONFIG_MMU=y 23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y 24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y 25CONFIG_GENERIC_TIME=y
@@ -101,6 +101,7 @@ CONFIG_SIGNALFD=y
101CONFIG_TIMERFD=y 101CONFIG_TIMERFD=y
102CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
103CONFIG_SHMEM=y 103CONFIG_SHMEM=y
104CONFIG_AIO=y
104# CONFIG_VM_EVENT_COUNTERS is not set 105# CONFIG_VM_EVENT_COUNTERS is not set
105CONFIG_SLUB_DEBUG=y 106CONFIG_SLUB_DEBUG=y
106# CONFIG_SLAB is not set 107# CONFIG_SLAB is not set
@@ -114,10 +115,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
114CONFIG_HAVE_KPROBES=y 115CONFIG_HAVE_KPROBES=y
115CONFIG_HAVE_KRETPROBES=y 116CONFIG_HAVE_KRETPROBES=y
116CONFIG_HAVE_ARCH_TRACEHOOK=y 117CONFIG_HAVE_ARCH_TRACEHOOK=y
117# CONFIG_HAVE_DMA_ATTRS is not set
118# CONFIG_USE_GENERIC_SMP_HELPERS is not set
119CONFIG_HAVE_CLK=y 118CONFIG_HAVE_CLK=y
120CONFIG_PROC_PAGE_MONITOR=y
121# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 119# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
122CONFIG_SLABINFO=y 120CONFIG_SLABINFO=y
123# CONFIG_TINY_SHMEM is not set 121# CONFIG_TINY_SHMEM is not set
@@ -143,6 +141,7 @@ CONFIG_DEFAULT_DEADLINE=y
143# CONFIG_DEFAULT_NOOP is not set 141# CONFIG_DEFAULT_NOOP is not set
144CONFIG_DEFAULT_IOSCHED="deadline" 142CONFIG_DEFAULT_IOSCHED="deadline"
145CONFIG_CLASSIC_RCU=y 143CONFIG_CLASSIC_RCU=y
144# CONFIG_FREEZER is not set
146 145
147# 146#
148# Platform support 147# Platform support
@@ -155,6 +154,7 @@ CONFIG_CPM1=y
155CONFIG_MPC885ADS=y 154CONFIG_MPC885ADS=y
156# CONFIG_PPC_EP88XC is not set 155# CONFIG_PPC_EP88XC is not set
157# CONFIG_PPC_ADDER875 is not set 156# CONFIG_PPC_ADDER875 is not set
157# CONFIG_PPC_MGSUVD is not set
158 158
159# 159#
160# Freescale Ethernet driver platform-specific options 160# Freescale Ethernet driver platform-specific options
@@ -190,6 +190,7 @@ CONFIG_NO_UCODE_PATCH=y
190# CONFIG_PPC_INDIRECT_IO is not set 190# CONFIG_PPC_INDIRECT_IO is not set
191# CONFIG_GENERIC_IOMAP is not set 191# CONFIG_GENERIC_IOMAP is not set
192# CONFIG_CPU_FREQ is not set 192# CONFIG_CPU_FREQ is not set
193# CONFIG_QUICC_ENGINE is not set
193# CONFIG_FSL_ULI1575 is not set 194# CONFIG_FSL_ULI1575 is not set
194CONFIG_CPM=y 195CONFIG_CPM=y
195 196
@@ -211,6 +212,8 @@ CONFIG_PREEMPT_NONE=y
211# CONFIG_PREEMPT_VOLUNTARY is not set 212# CONFIG_PREEMPT_VOLUNTARY is not set
212# CONFIG_PREEMPT is not set 213# CONFIG_PREEMPT is not set
213CONFIG_BINFMT_ELF=y 214CONFIG_BINFMT_ELF=y
215# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
216# CONFIG_HAVE_AOUT is not set
214# CONFIG_BINFMT_MISC is not set 217# CONFIG_BINFMT_MISC is not set
215# CONFIG_MATH_EMULATION is not set 218# CONFIG_MATH_EMULATION is not set
216CONFIG_8XX_MINIMAL_FPEMU=y 219CONFIG_8XX_MINIMAL_FPEMU=y
@@ -226,15 +229,15 @@ CONFIG_FLATMEM_MANUAL=y
226# CONFIG_SPARSEMEM_MANUAL is not set 229# CONFIG_SPARSEMEM_MANUAL is not set
227CONFIG_FLATMEM=y 230CONFIG_FLATMEM=y
228CONFIG_FLAT_NODE_MEM_MAP=y 231CONFIG_FLAT_NODE_MEM_MAP=y
229# CONFIG_SPARSEMEM_STATIC is not set
230# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
231CONFIG_PAGEFLAGS_EXTENDED=y 232CONFIG_PAGEFLAGS_EXTENDED=y
232CONFIG_SPLIT_PTLOCK_CPUS=4 233CONFIG_SPLIT_PTLOCK_CPUS=4
233CONFIG_MIGRATION=y 234CONFIG_MIGRATION=y
234# CONFIG_RESOURCES_64BIT is not set 235# CONFIG_RESOURCES_64BIT is not set
236# CONFIG_PHYS_ADDR_T_64BIT is not set
235CONFIG_ZONE_DMA_FLAG=1 237CONFIG_ZONE_DMA_FLAG=1
236CONFIG_BOUNCE=y 238CONFIG_BOUNCE=y
237CONFIG_VIRT_TO_BUS=y 239CONFIG_VIRT_TO_BUS=y
240CONFIG_UNEVICTABLE_LRU=y
238CONFIG_FORCE_MAX_ZONEORDER=11 241CONFIG_FORCE_MAX_ZONEORDER=11
239CONFIG_PROC_DEVICETREE=y 242CONFIG_PROC_DEVICETREE=y
240# CONFIG_CMDLINE_BOOL is not set 243# CONFIG_CMDLINE_BOOL is not set
@@ -316,6 +319,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
316# CONFIG_TIPC is not set 319# CONFIG_TIPC is not set
317# CONFIG_ATM is not set 320# CONFIG_ATM is not set
318# CONFIG_BRIDGE is not set 321# CONFIG_BRIDGE is not set
322# CONFIG_NET_DSA is not set
319# CONFIG_VLAN_8021Q is not set 323# CONFIG_VLAN_8021Q is not set
320# CONFIG_DECNET is not set 324# CONFIG_DECNET is not set
321# CONFIG_LLC2 is not set 325# CONFIG_LLC2 is not set
@@ -336,11 +340,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
336# CONFIG_IRDA is not set 340# CONFIG_IRDA is not set
337# CONFIG_BT is not set 341# CONFIG_BT is not set
338# CONFIG_AF_RXRPC is not set 342# CONFIG_AF_RXRPC is not set
339 343# CONFIG_PHONET is not set
340# 344CONFIG_WIRELESS=y
341# Wireless
342#
343# CONFIG_CFG80211 is not set 345# CONFIG_CFG80211 is not set
346CONFIG_WIRELESS_OLD_REGULATORY=y
344# CONFIG_WIRELESS_EXT is not set 347# CONFIG_WIRELESS_EXT is not set
345# CONFIG_MAC80211 is not set 348# CONFIG_MAC80211 is not set
346# CONFIG_IEEE80211 is not set 349# CONFIG_IEEE80211 is not set
@@ -486,6 +489,9 @@ CONFIG_MII=y
486# CONFIG_IBM_NEW_EMAC_RGMII is not set 489# CONFIG_IBM_NEW_EMAC_RGMII is not set
487# CONFIG_IBM_NEW_EMAC_TAH is not set 490# CONFIG_IBM_NEW_EMAC_TAH is not set
488# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 491# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
492# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
493# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
494# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
489# CONFIG_B44 is not set 495# CONFIG_B44 is not set
490CONFIG_FS_ENET=y 496CONFIG_FS_ENET=y
491# CONFIG_FS_ENET_HAS_SCC is not set 497# CONFIG_FS_ENET_HAS_SCC is not set
@@ -540,12 +546,6 @@ CONFIG_SERIAL_CORE=y
540CONFIG_SERIAL_CORE_CONSOLE=y 546CONFIG_SERIAL_CORE_CONSOLE=y
541CONFIG_SERIAL_CPM=y 547CONFIG_SERIAL_CPM=y
542CONFIG_SERIAL_CPM_CONSOLE=y 548CONFIG_SERIAL_CPM_CONSOLE=y
543# CONFIG_SERIAL_CPM_SCC1 is not set
544# CONFIG_SERIAL_CPM_SCC2 is not set
545# CONFIG_SERIAL_CPM_SCC3 is not set
546# CONFIG_SERIAL_CPM_SCC4 is not set
547CONFIG_SERIAL_CPM_SMC1=y
548CONFIG_SERIAL_CPM_SMC2=y
549CONFIG_UNIX98_PTYS=y 549CONFIG_UNIX98_PTYS=y
550# CONFIG_LEGACY_PTYS is not set 550# CONFIG_LEGACY_PTYS is not set
551# CONFIG_IPMI_HANDLER is not set 551# CONFIG_IPMI_HANDLER is not set
@@ -582,6 +582,14 @@ CONFIG_SSB_POSSIBLE=y
582# CONFIG_MFD_TMIO is not set 582# CONFIG_MFD_TMIO is not set
583 583
584# 584#
585# Voltage and Current regulators
586#
587# CONFIG_REGULATOR is not set
588# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
589# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
590# CONFIG_REGULATOR_BQ24022 is not set
591
592#
585# Multimedia devices 593# Multimedia devices
586# 594#
587 595
@@ -619,16 +627,18 @@ CONFIG_DAB=y
619# CONFIG_RTC_CLASS is not set 627# CONFIG_RTC_CLASS is not set
620# CONFIG_DMADEVICES is not set 628# CONFIG_DMADEVICES is not set
621# CONFIG_UIO is not set 629# CONFIG_UIO is not set
630# CONFIG_STAGING is not set
622 631
623# 632#
624# File systems 633# File systems
625# 634#
626# CONFIG_EXT2_FS is not set 635# CONFIG_EXT2_FS is not set
627# CONFIG_EXT3_FS is not set 636# CONFIG_EXT3_FS is not set
628# CONFIG_EXT4DEV_FS is not set 637# CONFIG_EXT4_FS is not set
629# CONFIG_REISERFS_FS is not set 638# CONFIG_REISERFS_FS is not set
630# CONFIG_JFS_FS is not set 639# CONFIG_JFS_FS is not set
631# CONFIG_FS_POSIX_ACL is not set 640# CONFIG_FS_POSIX_ACL is not set
641CONFIG_FILE_LOCKING=y
632# CONFIG_XFS_FS is not set 642# CONFIG_XFS_FS is not set
633# CONFIG_OCFS2_FS is not set 643# CONFIG_OCFS2_FS is not set
634# CONFIG_DNOTIFY is not set 644# CONFIG_DNOTIFY is not set
@@ -657,6 +667,7 @@ CONFIG_DAB=y
657CONFIG_PROC_FS=y 667CONFIG_PROC_FS=y
658# CONFIG_PROC_KCORE is not set 668# CONFIG_PROC_KCORE is not set
659CONFIG_PROC_SYSCTL=y 669CONFIG_PROC_SYSCTL=y
670CONFIG_PROC_PAGE_MONITOR=y
660CONFIG_SYSFS=y 671CONFIG_SYSFS=y
661CONFIG_TMPFS=y 672CONFIG_TMPFS=y
662# CONFIG_TMPFS_POSIX_ACL is not set 673# CONFIG_TMPFS_POSIX_ACL is not set
@@ -694,6 +705,7 @@ CONFIG_LOCKD=y
694CONFIG_LOCKD_V4=y 705CONFIG_LOCKD_V4=y
695CONFIG_NFS_COMMON=y 706CONFIG_NFS_COMMON=y
696CONFIG_SUNRPC=y 707CONFIG_SUNRPC=y
708# CONFIG_SUNRPC_REGISTER_V4 is not set
697# CONFIG_RPCSEC_GSS_KRB5 is not set 709# CONFIG_RPCSEC_GSS_KRB5 is not set
698# CONFIG_RPCSEC_GSS_SPKM3 is not set 710# CONFIG_RPCSEC_GSS_SPKM3 is not set
699# CONFIG_SMB_FS is not set 711# CONFIG_SMB_FS is not set
@@ -729,7 +741,6 @@ CONFIG_MSDOS_PARTITION=y
729# 741#
730# Library routines 742# Library routines
731# 743#
732# CONFIG_GENERIC_FIND_FIRST_BIT is not set
733# CONFIG_CRC_CCITT is not set 744# CONFIG_CRC_CCITT is not set
734# CONFIG_CRC16 is not set 745# CONFIG_CRC16 is not set
735# CONFIG_CRC_T10DIF is not set 746# CONFIG_CRC_T10DIF is not set
@@ -779,14 +790,22 @@ CONFIG_DEBUG_INFO=y
779# CONFIG_DEBUG_SG is not set 790# CONFIG_DEBUG_SG is not set
780# CONFIG_BOOT_PRINTK_DELAY is not set 791# CONFIG_BOOT_PRINTK_DELAY is not set
781# CONFIG_RCU_TORTURE_TEST is not set 792# CONFIG_RCU_TORTURE_TEST is not set
793# CONFIG_RCU_CPU_STALL_DETECTOR is not set
782# CONFIG_BACKTRACE_SELF_TEST is not set 794# CONFIG_BACKTRACE_SELF_TEST is not set
795# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
783# CONFIG_FAULT_INJECTION is not set 796# CONFIG_FAULT_INJECTION is not set
784# CONFIG_LATENCYTOP is not set 797# CONFIG_LATENCYTOP is not set
785CONFIG_HAVE_FTRACE=y 798CONFIG_HAVE_FUNCTION_TRACER=y
786CONFIG_HAVE_DYNAMIC_FTRACE=y 799
787# CONFIG_FTRACE is not set 800#
801# Tracers
802#
803# CONFIG_FUNCTION_TRACER is not set
788# CONFIG_SCHED_TRACER is not set 804# CONFIG_SCHED_TRACER is not set
789# CONFIG_CONTEXT_SWITCH_TRACER is not set 805# CONFIG_CONTEXT_SWITCH_TRACER is not set
806# CONFIG_BOOT_TRACER is not set
807# CONFIG_STACK_TRACER is not set
808# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
790# CONFIG_SAMPLES is not set 809# CONFIG_SAMPLES is not set
791CONFIG_HAVE_ARCH_KGDB=y 810CONFIG_HAVE_ARCH_KGDB=y
792# CONFIG_KGDB is not set 811# CONFIG_KGDB is not set
@@ -795,6 +814,7 @@ CONFIG_HAVE_ARCH_KGDB=y
795# CONFIG_DEBUG_PAGEALLOC is not set 814# CONFIG_DEBUG_PAGEALLOC is not set
796# CONFIG_CODE_PATCHING_SELFTEST is not set 815# CONFIG_CODE_PATCHING_SELFTEST is not set
797# CONFIG_FTR_FIXUP_SELFTEST is not set 816# CONFIG_FTR_FIXUP_SELFTEST is not set
817# CONFIG_MSI_BITMAP_SELFTEST is not set
798# CONFIG_XMON is not set 818# CONFIG_XMON is not set
799# CONFIG_IRQSTACKS is not set 819# CONFIG_IRQSTACKS is not set
800# CONFIG_BDI_SWITCH is not set 820# CONFIG_BDI_SWITCH is not set
@@ -805,6 +825,7 @@ CONFIG_HAVE_ARCH_KGDB=y
805# 825#
806# CONFIG_KEYS is not set 826# CONFIG_KEYS is not set
807# CONFIG_SECURITY is not set 827# CONFIG_SECURITY is not set
828# CONFIG_SECURITYFS is not set
808# CONFIG_SECURITY_FILE_CAPABILITIES is not set 829# CONFIG_SECURITY_FILE_CAPABILITIES is not set
809# CONFIG_CRYPTO is not set 830# CONFIG_CRYPTO is not set
810CONFIG_PPC_CLOCK=y 831CONFIG_PPC_CLOCK=y
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 80481f270133..de9b121820a6 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Tue Aug 26 13:20:26 2008 4# Tue Nov 11 19:36:51 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -110,7 +110,9 @@ CONFIG_SIGNALFD=y
110CONFIG_TIMERFD=y 110CONFIG_TIMERFD=y
111CONFIG_EVENTFD=y 111CONFIG_EVENTFD=y
112CONFIG_SHMEM=y 112CONFIG_SHMEM=y
113CONFIG_AIO=y
113CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_PCI_QUIRKS=y
114CONFIG_SLUB_DEBUG=y 116CONFIG_SLUB_DEBUG=y
115# CONFIG_SLAB is not set 117# CONFIG_SLAB is not set
116CONFIG_SLUB=y 118CONFIG_SLUB=y
@@ -125,10 +127,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
125CONFIG_HAVE_KPROBES=y 127CONFIG_HAVE_KPROBES=y
126CONFIG_HAVE_KRETPROBES=y 128CONFIG_HAVE_KRETPROBES=y
127CONFIG_HAVE_ARCH_TRACEHOOK=y 129CONFIG_HAVE_ARCH_TRACEHOOK=y
128# CONFIG_HAVE_DMA_ATTRS is not set
129# CONFIG_USE_GENERIC_SMP_HELPERS is not set
130# CONFIG_HAVE_CLK is not set
131CONFIG_PROC_PAGE_MONITOR=y
132# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
133CONFIG_SLABINFO=y 131CONFIG_SLABINFO=y
134CONFIG_RT_MUTEXES=y 132CONFIG_RT_MUTEXES=y
@@ -161,6 +159,7 @@ CONFIG_DEFAULT_AS=y
161# CONFIG_DEFAULT_NOOP is not set 159# CONFIG_DEFAULT_NOOP is not set
162CONFIG_DEFAULT_IOSCHED="anticipatory" 160CONFIG_DEFAULT_IOSCHED="anticipatory"
163CONFIG_CLASSIC_RCU=y 161CONFIG_CLASSIC_RCU=y
162CONFIG_FREEZER=y
164 163
165# 164#
166# Platform support 165# Platform support
@@ -232,6 +231,8 @@ CONFIG_PREEMPT_NONE=y
232# CONFIG_PREEMPT_VOLUNTARY is not set 231# CONFIG_PREEMPT_VOLUNTARY is not set
233# CONFIG_PREEMPT is not set 232# CONFIG_PREEMPT is not set
234CONFIG_BINFMT_ELF=y 233CONFIG_BINFMT_ELF=y
234# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
235# CONFIG_HAVE_AOUT is not set
235CONFIG_BINFMT_MISC=m 236CONFIG_BINFMT_MISC=m
236# CONFIG_IOMMU_HELPER is not set 237# CONFIG_IOMMU_HELPER is not set
237CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 238CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -246,15 +247,15 @@ CONFIG_FLATMEM_MANUAL=y
246# CONFIG_SPARSEMEM_MANUAL is not set 247# CONFIG_SPARSEMEM_MANUAL is not set
247CONFIG_FLATMEM=y 248CONFIG_FLATMEM=y
248CONFIG_FLAT_NODE_MEM_MAP=y 249CONFIG_FLAT_NODE_MEM_MAP=y
249# CONFIG_SPARSEMEM_STATIC is not set
250# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
251CONFIG_PAGEFLAGS_EXTENDED=y 250CONFIG_PAGEFLAGS_EXTENDED=y
252CONFIG_SPLIT_PTLOCK_CPUS=4 251CONFIG_SPLIT_PTLOCK_CPUS=4
253# CONFIG_MIGRATION is not set 252# CONFIG_MIGRATION is not set
254# CONFIG_RESOURCES_64BIT is not set 253# CONFIG_RESOURCES_64BIT is not set
254# CONFIG_PHYS_ADDR_T_64BIT is not set
255CONFIG_ZONE_DMA_FLAG=1 255CONFIG_ZONE_DMA_FLAG=1
256CONFIG_BOUNCE=y 256CONFIG_BOUNCE=y
257CONFIG_VIRT_TO_BUS=y 257CONFIG_VIRT_TO_BUS=y
258CONFIG_UNEVICTABLE_LRU=y
258CONFIG_FORCE_MAX_ZONEORDER=11 259CONFIG_FORCE_MAX_ZONEORDER=11
259CONFIG_PROC_DEVICETREE=y 260CONFIG_PROC_DEVICETREE=y
260# CONFIG_CMDLINE_BOOL is not set 261# CONFIG_CMDLINE_BOOL is not set
@@ -362,7 +363,6 @@ CONFIG_INET_TCP_DIAG=y
362CONFIG_TCP_CONG_CUBIC=y 363CONFIG_TCP_CONG_CUBIC=y
363CONFIG_DEFAULT_TCP_CONG="cubic" 364CONFIG_DEFAULT_TCP_CONG="cubic"
364# CONFIG_TCP_MD5SIG is not set 365# CONFIG_TCP_MD5SIG is not set
365# CONFIG_IP_VS is not set
366# CONFIG_IPV6 is not set 366# CONFIG_IPV6 is not set
367# CONFIG_NETWORK_SECMARK is not set 367# CONFIG_NETWORK_SECMARK is not set
368CONFIG_NETFILTER=y 368CONFIG_NETFILTER=y
@@ -392,13 +392,14 @@ CONFIG_NF_CONNTRACK_IRC=m
392# CONFIG_NF_CONNTRACK_SIP is not set 392# CONFIG_NF_CONNTRACK_SIP is not set
393CONFIG_NF_CONNTRACK_TFTP=m 393CONFIG_NF_CONNTRACK_TFTP=m
394CONFIG_NF_CT_NETLINK=m 394CONFIG_NF_CT_NETLINK=m
395# CONFIG_NETFILTER_TPROXY is not set
395CONFIG_NETFILTER_XTABLES=m 396CONFIG_NETFILTER_XTABLES=m
396CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 397CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
397# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set 398# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
398# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 399# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
399CONFIG_NETFILTER_XT_TARGET_MARK=m 400CONFIG_NETFILTER_XT_TARGET_MARK=m
400CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
401CONFIG_NETFILTER_XT_TARGET_NFLOG=m 401CONFIG_NETFILTER_XT_TARGET_NFLOG=m
402CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
402CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 403CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
403CONFIG_NETFILTER_XT_TARGET_RATEEST=m 404CONFIG_NETFILTER_XT_TARGET_RATEEST=m
404CONFIG_NETFILTER_XT_TARGET_TRACE=m 405CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -412,19 +413,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
412CONFIG_NETFILTER_XT_MATCH_DCCP=m 413CONFIG_NETFILTER_XT_MATCH_DCCP=m
413CONFIG_NETFILTER_XT_MATCH_DSCP=m 414CONFIG_NETFILTER_XT_MATCH_DSCP=m
414CONFIG_NETFILTER_XT_MATCH_ESP=m 415CONFIG_NETFILTER_XT_MATCH_ESP=m
416# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
415CONFIG_NETFILTER_XT_MATCH_HELPER=m 417CONFIG_NETFILTER_XT_MATCH_HELPER=m
416CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 418CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
417CONFIG_NETFILTER_XT_MATCH_LENGTH=m 419CONFIG_NETFILTER_XT_MATCH_LENGTH=m
418CONFIG_NETFILTER_XT_MATCH_LIMIT=m 420CONFIG_NETFILTER_XT_MATCH_LIMIT=m
419CONFIG_NETFILTER_XT_MATCH_MAC=m 421CONFIG_NETFILTER_XT_MATCH_MAC=m
420CONFIG_NETFILTER_XT_MATCH_MARK=m 422CONFIG_NETFILTER_XT_MATCH_MARK=m
423CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
421CONFIG_NETFILTER_XT_MATCH_OWNER=m 424CONFIG_NETFILTER_XT_MATCH_OWNER=m
422CONFIG_NETFILTER_XT_MATCH_POLICY=m 425CONFIG_NETFILTER_XT_MATCH_POLICY=m
423CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
424CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 426CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
425# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 427# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
426CONFIG_NETFILTER_XT_MATCH_RATEEST=m 428CONFIG_NETFILTER_XT_MATCH_RATEEST=m
427CONFIG_NETFILTER_XT_MATCH_REALM=m 429CONFIG_NETFILTER_XT_MATCH_REALM=m
430CONFIG_NETFILTER_XT_MATCH_RECENT=m
431# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
428CONFIG_NETFILTER_XT_MATCH_SCTP=m 432CONFIG_NETFILTER_XT_MATCH_SCTP=m
429# CONFIG_NETFILTER_XT_MATCH_STATE is not set 433# CONFIG_NETFILTER_XT_MATCH_STATE is not set
430# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 434# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
@@ -432,20 +436,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
432CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 436CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
433CONFIG_NETFILTER_XT_MATCH_TIME=m 437CONFIG_NETFILTER_XT_MATCH_TIME=m
434CONFIG_NETFILTER_XT_MATCH_U32=m 438CONFIG_NETFILTER_XT_MATCH_U32=m
435# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 439# CONFIG_IP_VS is not set
436 440
437# 441#
438# IP: Netfilter Configuration 442# IP: Netfilter Configuration
439# 443#
444CONFIG_NF_DEFRAG_IPV4=m
440CONFIG_NF_CONNTRACK_IPV4=m 445CONFIG_NF_CONNTRACK_IPV4=m
441CONFIG_NF_CONNTRACK_PROC_COMPAT=y 446CONFIG_NF_CONNTRACK_PROC_COMPAT=y
442# CONFIG_IP_NF_QUEUE is not set 447# CONFIG_IP_NF_QUEUE is not set
443CONFIG_IP_NF_IPTABLES=m 448CONFIG_IP_NF_IPTABLES=m
444CONFIG_IP_NF_MATCH_RECENT=m 449CONFIG_IP_NF_MATCH_ADDRTYPE=m
445CONFIG_IP_NF_MATCH_ECN=m
446CONFIG_IP_NF_MATCH_AH=m 450CONFIG_IP_NF_MATCH_AH=m
451CONFIG_IP_NF_MATCH_ECN=m
447CONFIG_IP_NF_MATCH_TTL=m 452CONFIG_IP_NF_MATCH_TTL=m
448CONFIG_IP_NF_MATCH_ADDRTYPE=m
449CONFIG_IP_NF_FILTER=m 453CONFIG_IP_NF_FILTER=m
450CONFIG_IP_NF_TARGET_REJECT=m 454CONFIG_IP_NF_TARGET_REJECT=m
451CONFIG_IP_NF_TARGET_LOG=m 455CONFIG_IP_NF_TARGET_LOG=m
@@ -453,8 +457,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
453CONFIG_NF_NAT=m 457CONFIG_NF_NAT=m
454CONFIG_NF_NAT_NEEDED=y 458CONFIG_NF_NAT_NEEDED=y
455CONFIG_IP_NF_TARGET_MASQUERADE=m 459CONFIG_IP_NF_TARGET_MASQUERADE=m
456CONFIG_IP_NF_TARGET_REDIRECT=m
457CONFIG_IP_NF_TARGET_NETMAP=m 460CONFIG_IP_NF_TARGET_NETMAP=m
461CONFIG_IP_NF_TARGET_REDIRECT=m
458# CONFIG_NF_NAT_SNMP_BASIC is not set 462# CONFIG_NF_NAT_SNMP_BASIC is not set
459CONFIG_NF_NAT_PROTO_DCCP=m 463CONFIG_NF_NAT_PROTO_DCCP=m
460CONFIG_NF_NAT_FTP=m 464CONFIG_NF_NAT_FTP=m
@@ -465,9 +469,9 @@ CONFIG_NF_NAT_TFTP=m
465# CONFIG_NF_NAT_H323 is not set 469# CONFIG_NF_NAT_H323 is not set
466# CONFIG_NF_NAT_SIP is not set 470# CONFIG_NF_NAT_SIP is not set
467CONFIG_IP_NF_MANGLE=m 471CONFIG_IP_NF_MANGLE=m
472# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
468CONFIG_IP_NF_TARGET_ECN=m 473CONFIG_IP_NF_TARGET_ECN=m
469CONFIG_IP_NF_TARGET_TTL=m 474CONFIG_IP_NF_TARGET_TTL=m
470# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
471CONFIG_IP_NF_RAW=m 475CONFIG_IP_NF_RAW=m
472CONFIG_IP_NF_ARPTABLES=m 476CONFIG_IP_NF_ARPTABLES=m
473CONFIG_IP_NF_ARPFILTER=m 477CONFIG_IP_NF_ARPFILTER=m
@@ -494,6 +498,7 @@ CONFIG_IP_DCCP_TFRC_LIB=m
494# CONFIG_TIPC is not set 498# CONFIG_TIPC is not set
495# CONFIG_ATM is not set 499# CONFIG_ATM is not set
496# CONFIG_BRIDGE is not set 500# CONFIG_BRIDGE is not set
501# CONFIG_NET_DSA is not set
497# CONFIG_VLAN_8021Q is not set 502# CONFIG_VLAN_8021Q is not set
498# CONFIG_DECNET is not set 503# CONFIG_DECNET is not set
499# CONFIG_LLC2 is not set 504# CONFIG_LLC2 is not set
@@ -585,12 +590,11 @@ CONFIG_BT_HCIBFUSB=m
585# CONFIG_BT_HCIBTUART is not set 590# CONFIG_BT_HCIBTUART is not set
586# CONFIG_BT_HCIVHCI is not set 591# CONFIG_BT_HCIVHCI is not set
587# CONFIG_AF_RXRPC is not set 592# CONFIG_AF_RXRPC is not set
588 593# CONFIG_PHONET is not set
589# 594CONFIG_WIRELESS=y
590# Wireless
591#
592CONFIG_CFG80211=m 595CONFIG_CFG80211=m
593CONFIG_NL80211=y 596CONFIG_NL80211=y
597CONFIG_WIRELESS_OLD_REGULATORY=y
594CONFIG_WIRELESS_EXT=y 598CONFIG_WIRELESS_EXT=y
595CONFIG_WIRELESS_EXT_SYSFS=y 599CONFIG_WIRELESS_EXT_SYSFS=y
596CONFIG_MAC80211=m 600CONFIG_MAC80211=m
@@ -599,7 +603,9 @@ CONFIG_MAC80211=m
599# Rate control algorithm selection 603# Rate control algorithm selection
600# 604#
601CONFIG_MAC80211_RC_PID=y 605CONFIG_MAC80211_RC_PID=y
606# CONFIG_MAC80211_RC_MINSTREL is not set
602CONFIG_MAC80211_RC_DEFAULT_PID=y 607CONFIG_MAC80211_RC_DEFAULT_PID=y
608# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
603CONFIG_MAC80211_RC_DEFAULT="pid" 609CONFIG_MAC80211_RC_DEFAULT="pid"
604# CONFIG_MAC80211_MESH is not set 610# CONFIG_MAC80211_MESH is not set
605CONFIG_MAC80211_LEDS=y 611CONFIG_MAC80211_LEDS=y
@@ -663,7 +669,6 @@ CONFIG_MISC_DEVICES=y
663# CONFIG_HP_ILO is not set 669# CONFIG_HP_ILO is not set
664CONFIG_HAVE_IDE=y 670CONFIG_HAVE_IDE=y
665CONFIG_IDE=y 671CONFIG_IDE=y
666CONFIG_BLK_DEV_IDE=y
667 672
668# 673#
669# Please see Documentation/ide/ide.txt for help/info on IDE drives 674# Please see Documentation/ide/ide.txt for help/info on IDE drives
@@ -671,14 +676,14 @@ CONFIG_BLK_DEV_IDE=y
671CONFIG_IDE_TIMINGS=y 676CONFIG_IDE_TIMINGS=y
672CONFIG_IDE_ATAPI=y 677CONFIG_IDE_ATAPI=y
673# CONFIG_BLK_DEV_IDE_SATA is not set 678# CONFIG_BLK_DEV_IDE_SATA is not set
674CONFIG_BLK_DEV_IDEDISK=y 679CONFIG_IDE_GD=y
675# CONFIG_IDEDISK_MULTI_MODE is not set 680CONFIG_IDE_GD_ATA=y
681# CONFIG_IDE_GD_ATAPI is not set
676CONFIG_BLK_DEV_IDECS=m 682CONFIG_BLK_DEV_IDECS=m
677# CONFIG_BLK_DEV_DELKIN is not set 683# CONFIG_BLK_DEV_DELKIN is not set
678CONFIG_BLK_DEV_IDECD=y 684CONFIG_BLK_DEV_IDECD=y
679CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 685CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
680# CONFIG_BLK_DEV_IDETAPE is not set 686# CONFIG_BLK_DEV_IDETAPE is not set
681CONFIG_BLK_DEV_IDEFLOPPY=y
682CONFIG_BLK_DEV_IDESCSI=y 687CONFIG_BLK_DEV_IDESCSI=y
683# CONFIG_IDE_TASK_IOCTL is not set 688# CONFIG_IDE_TASK_IOCTL is not set
684CONFIG_IDE_PROC_FS=y 689CONFIG_IDE_PROC_FS=y
@@ -899,6 +904,9 @@ CONFIG_SUNGEM=y
899# CONFIG_IBM_NEW_EMAC_RGMII is not set 904# CONFIG_IBM_NEW_EMAC_RGMII is not set
900# CONFIG_IBM_NEW_EMAC_TAH is not set 905# CONFIG_IBM_NEW_EMAC_TAH is not set
901# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 906# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
907# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
908# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
909# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
902CONFIG_NET_PCI=y 910CONFIG_NET_PCI=y
903CONFIG_PCNET32=y 911CONFIG_PCNET32=y
904# CONFIG_AMD8111_ETH is not set 912# CONFIG_AMD8111_ETH is not set
@@ -919,6 +927,7 @@ CONFIG_PCNET32=y
919# CONFIG_TLAN is not set 927# CONFIG_TLAN is not set
920# CONFIG_VIA_RHINE is not set 928# CONFIG_VIA_RHINE is not set
921# CONFIG_SC92031 is not set 929# CONFIG_SC92031 is not set
930# CONFIG_ATL2 is not set
922CONFIG_NETDEV_1000=y 931CONFIG_NETDEV_1000=y
923# CONFIG_ACENIC is not set 932# CONFIG_ACENIC is not set
924# CONFIG_DL2K is not set 933# CONFIG_DL2K is not set
@@ -940,18 +949,22 @@ CONFIG_NETDEV_1000=y
940# CONFIG_QLA3XXX is not set 949# CONFIG_QLA3XXX is not set
941# CONFIG_ATL1 is not set 950# CONFIG_ATL1 is not set
942# CONFIG_ATL1E is not set 951# CONFIG_ATL1E is not set
952# CONFIG_JME is not set
943CONFIG_NETDEV_10000=y 953CONFIG_NETDEV_10000=y
944# CONFIG_CHELSIO_T1 is not set 954# CONFIG_CHELSIO_T1 is not set
945# CONFIG_CHELSIO_T3 is not set 955# CONFIG_CHELSIO_T3 is not set
956# CONFIG_ENIC is not set
946# CONFIG_IXGBE is not set 957# CONFIG_IXGBE is not set
947# CONFIG_IXGB is not set 958# CONFIG_IXGB is not set
948# CONFIG_S2IO is not set 959# CONFIG_S2IO is not set
949# CONFIG_MYRI10GE is not set 960# CONFIG_MYRI10GE is not set
950# CONFIG_NETXEN_NIC is not set 961# CONFIG_NETXEN_NIC is not set
951# CONFIG_NIU is not set 962# CONFIG_NIU is not set
963# CONFIG_MLX4_EN is not set
952# CONFIG_MLX4_CORE is not set 964# CONFIG_MLX4_CORE is not set
953# CONFIG_TEHUTI is not set 965# CONFIG_TEHUTI is not set
954# CONFIG_BNX2X is not set 966# CONFIG_BNX2X is not set
967# CONFIG_QLGE is not set
955# CONFIG_SFC is not set 968# CONFIG_SFC is not set
956# CONFIG_TR is not set 969# CONFIG_TR is not set
957 970
@@ -964,6 +977,7 @@ CONFIG_WLAN_80211=y
964# CONFIG_IPW2100 is not set 977# CONFIG_IPW2100 is not set
965# CONFIG_IPW2200 is not set 978# CONFIG_IPW2200 is not set
966# CONFIG_LIBERTAS is not set 979# CONFIG_LIBERTAS is not set
980# CONFIG_LIBERTAS_THINFIRM is not set
967# CONFIG_AIRO is not set 981# CONFIG_AIRO is not set
968CONFIG_HERMES=m 982CONFIG_HERMES=m
969CONFIG_APPLE_AIRPORT=m 983CONFIG_APPLE_AIRPORT=m
@@ -1023,6 +1037,7 @@ CONFIG_USB_USBNET=m
1023CONFIG_USB_NET_AX8817X=m 1037CONFIG_USB_NET_AX8817X=m
1024CONFIG_USB_NET_CDCETHER=m 1038CONFIG_USB_NET_CDCETHER=m
1025# CONFIG_USB_NET_DM9601 is not set 1039# CONFIG_USB_NET_DM9601 is not set
1040# CONFIG_USB_NET_SMSC95XX is not set
1026# CONFIG_USB_NET_GL620A is not set 1041# CONFIG_USB_NET_GL620A is not set
1027CONFIG_USB_NET_NET1080=m 1042CONFIG_USB_NET_NET1080=m
1028# CONFIG_USB_NET_PLUSB is not set 1043# CONFIG_USB_NET_PLUSB is not set
@@ -1239,6 +1254,7 @@ CONFIG_POWER_SUPPLY=y
1239CONFIG_APM_POWER=y 1254CONFIG_APM_POWER=y
1240# CONFIG_BATTERY_DS2760 is not set 1255# CONFIG_BATTERY_DS2760 is not set
1241CONFIG_BATTERY_PMU=y 1256CONFIG_BATTERY_PMU=y
1257# CONFIG_BATTERY_BQ27x00 is not set
1242# CONFIG_HWMON is not set 1258# CONFIG_HWMON is not set
1243# CONFIG_THERMAL is not set 1259# CONFIG_THERMAL is not set
1244# CONFIG_THERMAL_HWMON is not set 1260# CONFIG_THERMAL_HWMON is not set
@@ -1266,6 +1282,17 @@ CONFIG_SSB_DRIVER_PCICORE=y
1266# CONFIG_MFD_SM501 is not set 1282# CONFIG_MFD_SM501 is not set
1267# CONFIG_HTC_PASIC3 is not set 1283# CONFIG_HTC_PASIC3 is not set
1268# CONFIG_MFD_TMIO is not set 1284# CONFIG_MFD_TMIO is not set
1285# CONFIG_PMIC_DA903X is not set
1286# CONFIG_MFD_WM8400 is not set
1287# CONFIG_MFD_WM8350_I2C is not set
1288
1289#
1290# Voltage and Current regulators
1291#
1292# CONFIG_REGULATOR is not set
1293# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1294# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1295# CONFIG_REGULATOR_BQ24022 is not set
1269 1296
1270# 1297#
1271# Multimedia devices 1298# Multimedia devices
@@ -1301,6 +1328,7 @@ CONFIG_VGASTATE=y
1301CONFIG_FB=y 1328CONFIG_FB=y
1302# CONFIG_FIRMWARE_EDID is not set 1329# CONFIG_FIRMWARE_EDID is not set
1303CONFIG_FB_DDC=y 1330CONFIG_FB_DDC=y
1331# CONFIG_FB_BOOT_VESA_SUPPORT is not set
1304CONFIG_FB_CFB_FILLRECT=y 1332CONFIG_FB_CFB_FILLRECT=y
1305CONFIG_FB_CFB_COPYAREA=y 1333CONFIG_FB_CFB_COPYAREA=y
1306CONFIG_FB_CFB_IMAGEBLIT=y 1334CONFIG_FB_CFB_IMAGEBLIT=y
@@ -1357,6 +1385,7 @@ CONFIG_FB_ATY_BACKLIGHT=y
1357# CONFIG_FB_S3 is not set 1385# CONFIG_FB_S3 is not set
1358# CONFIG_FB_SAVAGE is not set 1386# CONFIG_FB_SAVAGE is not set
1359# CONFIG_FB_SIS is not set 1387# CONFIG_FB_SIS is not set
1388# CONFIG_FB_VIA is not set
1360# CONFIG_FB_NEOMAGIC is not set 1389# CONFIG_FB_NEOMAGIC is not set
1361# CONFIG_FB_KYRO is not set 1390# CONFIG_FB_KYRO is not set
1362CONFIG_FB_3DFX=y 1391CONFIG_FB_3DFX=y
@@ -1369,6 +1398,7 @@ CONFIG_FB_3DFX=y
1369# CONFIG_FB_CARMINE is not set 1398# CONFIG_FB_CARMINE is not set
1370# CONFIG_FB_IBM_GXT4500 is not set 1399# CONFIG_FB_IBM_GXT4500 is not set
1371# CONFIG_FB_VIRTUAL is not set 1400# CONFIG_FB_VIRTUAL is not set
1401# CONFIG_FB_METRONOME is not set
1372CONFIG_BACKLIGHT_LCD_SUPPORT=y 1402CONFIG_BACKLIGHT_LCD_SUPPORT=y
1373CONFIG_LCD_CLASS_DEVICE=m 1403CONFIG_LCD_CLASS_DEVICE=m
1374# CONFIG_LCD_ILI9320 is not set 1404# CONFIG_LCD_ILI9320 is not set
@@ -1401,6 +1431,7 @@ CONFIG_LOGO_LINUX_MONO=y
1401CONFIG_LOGO_LINUX_VGA16=y 1431CONFIG_LOGO_LINUX_VGA16=y
1402CONFIG_LOGO_LINUX_CLUT224=y 1432CONFIG_LOGO_LINUX_CLUT224=y
1403CONFIG_SOUND=m 1433CONFIG_SOUND=m
1434CONFIG_SOUND_OSS_CORE=y
1404CONFIG_SND=m 1435CONFIG_SND=m
1405CONFIG_SND_TIMER=m 1436CONFIG_SND_TIMER=m
1406CONFIG_SND_PCM=m 1437CONFIG_SND_PCM=m
@@ -1514,9 +1545,36 @@ CONFIG_HID=y
1514# USB Input Devices 1545# USB Input Devices
1515# 1546#
1516CONFIG_USB_HID=y 1547CONFIG_USB_HID=y
1517CONFIG_USB_HIDINPUT_POWERBOOK=y 1548# CONFIG_HID_PID is not set
1518# CONFIG_HID_FF is not set
1519# CONFIG_USB_HIDDEV is not set 1549# CONFIG_USB_HIDDEV is not set
1550
1551#
1552# Special HID drivers
1553#
1554CONFIG_HID_COMPAT=y
1555CONFIG_HID_A4TECH=y
1556CONFIG_HID_APPLE=y
1557CONFIG_HID_BELKIN=y
1558CONFIG_HID_BRIGHT=y
1559CONFIG_HID_CHERRY=y
1560CONFIG_HID_CHICONY=y
1561CONFIG_HID_CYPRESS=y
1562CONFIG_HID_DELL=y
1563CONFIG_HID_EZKEY=y
1564CONFIG_HID_GYRATION=y
1565CONFIG_HID_LOGITECH=y
1566# CONFIG_LOGITECH_FF is not set
1567# CONFIG_LOGIRUMBLEPAD2_FF is not set
1568CONFIG_HID_MICROSOFT=y
1569CONFIG_HID_MONTEREY=y
1570CONFIG_HID_PANTHERLORD=y
1571# CONFIG_PANTHERLORD_FF is not set
1572CONFIG_HID_PETALYNX=y
1573CONFIG_HID_SAMSUNG=y
1574CONFIG_HID_SONY=y
1575CONFIG_HID_SUNPLUS=y
1576# CONFIG_THRUSTMASTER_FF is not set
1577# CONFIG_ZEROPLUS_FF is not set
1520CONFIG_USB_SUPPORT=y 1578CONFIG_USB_SUPPORT=y
1521CONFIG_USB_ARCH_HAS_HCD=y 1579CONFIG_USB_ARCH_HAS_HCD=y
1522CONFIG_USB_ARCH_HAS_OHCI=y 1580CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1534,6 +1592,8 @@ CONFIG_USB_DYNAMIC_MINORS=y
1534# CONFIG_USB_SUSPEND is not set 1592# CONFIG_USB_SUSPEND is not set
1535# CONFIG_USB_OTG is not set 1593# CONFIG_USB_OTG is not set
1536CONFIG_USB_MON=y 1594CONFIG_USB_MON=y
1595# CONFIG_USB_WUSB is not set
1596# CONFIG_USB_WUSB_CBAF is not set
1537 1597
1538# 1598#
1539# USB Host Controller Drivers 1599# USB Host Controller Drivers
@@ -1553,6 +1613,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1553# CONFIG_USB_UHCI_HCD is not set 1613# CONFIG_USB_UHCI_HCD is not set
1554# CONFIG_USB_SL811_HCD is not set 1614# CONFIG_USB_SL811_HCD is not set
1555# CONFIG_USB_R8A66597_HCD is not set 1615# CONFIG_USB_R8A66597_HCD is not set
1616# CONFIG_USB_WHCI_HCD is not set
1617# CONFIG_USB_HWA_HCD is not set
1556 1618
1557# 1619#
1558# USB Device Class drivers 1620# USB Device Class drivers
@@ -1560,6 +1622,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1560CONFIG_USB_ACM=m 1622CONFIG_USB_ACM=m
1561CONFIG_USB_PRINTER=m 1623CONFIG_USB_PRINTER=m
1562# CONFIG_USB_WDM is not set 1624# CONFIG_USB_WDM is not set
1625# CONFIG_USB_TMC is not set
1563 1626
1564# 1627#
1565# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1628# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1581,7 +1644,6 @@ CONFIG_USB_STORAGE=m
1581# CONFIG_USB_STORAGE_ALAUDA is not set 1644# CONFIG_USB_STORAGE_ALAUDA is not set
1582CONFIG_USB_STORAGE_ONETOUCH=y 1645CONFIG_USB_STORAGE_ONETOUCH=y
1583# CONFIG_USB_STORAGE_KARMA is not set 1646# CONFIG_USB_STORAGE_KARMA is not set
1584# CONFIG_USB_STORAGE_SIERRA is not set
1585# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1647# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1586# CONFIG_USB_LIBUSUAL is not set 1648# CONFIG_USB_LIBUSUAL is not set
1587 1649
@@ -1656,6 +1718,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1656# CONFIG_USB_EMI62 is not set 1718# CONFIG_USB_EMI62 is not set
1657# CONFIG_USB_EMI26 is not set 1719# CONFIG_USB_EMI26 is not set
1658# CONFIG_USB_ADUTUX is not set 1720# CONFIG_USB_ADUTUX is not set
1721# CONFIG_USB_SEVSEG is not set
1659# CONFIG_USB_RIO500 is not set 1722# CONFIG_USB_RIO500 is not set
1660# CONFIG_USB_LEGOTOWER is not set 1723# CONFIG_USB_LEGOTOWER is not set
1661# CONFIG_USB_LCD is not set 1724# CONFIG_USB_LCD is not set
@@ -1673,7 +1736,9 @@ CONFIG_USB_APPLEDISPLAY=m
1673# CONFIG_USB_IOWARRIOR is not set 1736# CONFIG_USB_IOWARRIOR is not set
1674# CONFIG_USB_TEST is not set 1737# CONFIG_USB_TEST is not set
1675# CONFIG_USB_ISIGHTFW is not set 1738# CONFIG_USB_ISIGHTFW is not set
1739# CONFIG_USB_VST is not set
1676# CONFIG_USB_GADGET is not set 1740# CONFIG_USB_GADGET is not set
1741# CONFIG_UWB is not set
1677# CONFIG_MMC is not set 1742# CONFIG_MMC is not set
1678# CONFIG_MEMSTICK is not set 1743# CONFIG_MEMSTICK is not set
1679CONFIG_NEW_LEDS=y 1744CONFIG_NEW_LEDS=y
@@ -1692,6 +1757,7 @@ CONFIG_LEDS_TRIGGERS=y
1692# CONFIG_LEDS_TRIGGER_TIMER is not set 1757# CONFIG_LEDS_TRIGGER_TIMER is not set
1693CONFIG_LEDS_TRIGGER_IDE_DISK=y 1758CONFIG_LEDS_TRIGGER_IDE_DISK=y
1694# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set 1759# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
1760# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
1695CONFIG_LEDS_TRIGGER_DEFAULT_ON=y 1761CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
1696# CONFIG_ACCESSIBILITY is not set 1762# CONFIG_ACCESSIBILITY is not set
1697# CONFIG_INFINIBAND is not set 1763# CONFIG_INFINIBAND is not set
@@ -1699,6 +1765,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
1699# CONFIG_RTC_CLASS is not set 1765# CONFIG_RTC_CLASS is not set
1700# CONFIG_DMADEVICES is not set 1766# CONFIG_DMADEVICES is not set
1701# CONFIG_UIO is not set 1767# CONFIG_UIO is not set
1768# CONFIG_STAGING is not set
1702 1769
1703# 1770#
1704# File systems 1771# File systems
@@ -1710,12 +1777,18 @@ CONFIG_EXT3_FS=y
1710CONFIG_EXT3_FS_XATTR=y 1777CONFIG_EXT3_FS_XATTR=y
1711CONFIG_EXT3_FS_POSIX_ACL=y 1778CONFIG_EXT3_FS_POSIX_ACL=y
1712# CONFIG_EXT3_FS_SECURITY is not set 1779# CONFIG_EXT3_FS_SECURITY is not set
1713# CONFIG_EXT4DEV_FS is not set 1780CONFIG_EXT4_FS=y
1781# CONFIG_EXT4DEV_COMPAT is not set
1782CONFIG_EXT4_FS_XATTR=y
1783# CONFIG_EXT4_FS_POSIX_ACL is not set
1784# CONFIG_EXT4_FS_SECURITY is not set
1714CONFIG_JBD=y 1785CONFIG_JBD=y
1786CONFIG_JBD2=y
1715CONFIG_FS_MBCACHE=y 1787CONFIG_FS_MBCACHE=y
1716# CONFIG_REISERFS_FS is not set 1788# CONFIG_REISERFS_FS is not set
1717# CONFIG_JFS_FS is not set 1789# CONFIG_JFS_FS is not set
1718CONFIG_FS_POSIX_ACL=y 1790CONFIG_FS_POSIX_ACL=y
1791CONFIG_FILE_LOCKING=y
1719# CONFIG_XFS_FS is not set 1792# CONFIG_XFS_FS is not set
1720# CONFIG_GFS2_FS is not set 1793# CONFIG_GFS2_FS is not set
1721# CONFIG_OCFS2_FS is not set 1794# CONFIG_OCFS2_FS is not set
@@ -1752,6 +1825,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1752CONFIG_PROC_FS=y 1825CONFIG_PROC_FS=y
1753CONFIG_PROC_KCORE=y 1826CONFIG_PROC_KCORE=y
1754CONFIG_PROC_SYSCTL=y 1827CONFIG_PROC_SYSCTL=y
1828CONFIG_PROC_PAGE_MONITOR=y
1755CONFIG_SYSFS=y 1829CONFIG_SYSFS=y
1756CONFIG_TMPFS=y 1830CONFIG_TMPFS=y
1757# CONFIG_TMPFS_POSIX_ACL is not set 1831# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1794,6 +1868,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1794CONFIG_NFS_COMMON=y 1868CONFIG_NFS_COMMON=y
1795CONFIG_SUNRPC=y 1869CONFIG_SUNRPC=y
1796CONFIG_SUNRPC_GSS=y 1870CONFIG_SUNRPC_GSS=y
1871# CONFIG_SUNRPC_REGISTER_V4 is not set
1797CONFIG_RPCSEC_GSS_KRB5=y 1872CONFIG_RPCSEC_GSS_KRB5=y
1798# CONFIG_RPCSEC_GSS_SPKM3 is not set 1873# CONFIG_RPCSEC_GSS_SPKM3 is not set
1799CONFIG_SMB_FS=m 1874CONFIG_SMB_FS=m
@@ -1870,7 +1945,6 @@ CONFIG_NLS_UTF8=m
1870# Library routines 1945# Library routines
1871# 1946#
1872CONFIG_BITREVERSE=y 1947CONFIG_BITREVERSE=y
1873# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1874CONFIG_CRC_CCITT=y 1948CONFIG_CRC_CCITT=y
1875CONFIG_CRC16=y 1949CONFIG_CRC16=y
1876CONFIG_CRC_T10DIF=y 1950CONFIG_CRC_T10DIF=y
@@ -1927,18 +2001,25 @@ CONFIG_DEBUG_BUGVERBOSE=y
1927CONFIG_DEBUG_MEMORY_INIT=y 2001CONFIG_DEBUG_MEMORY_INIT=y
1928# CONFIG_DEBUG_LIST is not set 2002# CONFIG_DEBUG_LIST is not set
1929# CONFIG_DEBUG_SG is not set 2003# CONFIG_DEBUG_SG is not set
1930CONFIG_FRAME_POINTER=y
1931# CONFIG_BOOT_PRINTK_DELAY is not set 2004# CONFIG_BOOT_PRINTK_DELAY is not set
1932# CONFIG_RCU_TORTURE_TEST is not set 2005# CONFIG_RCU_TORTURE_TEST is not set
2006# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1933# CONFIG_BACKTRACE_SELF_TEST is not set 2007# CONFIG_BACKTRACE_SELF_TEST is not set
2008# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1934# CONFIG_FAULT_INJECTION is not set 2009# CONFIG_FAULT_INJECTION is not set
1935CONFIG_LATENCYTOP=y 2010CONFIG_LATENCYTOP=y
1936CONFIG_SYSCTL_SYSCALL_CHECK=y 2011CONFIG_SYSCTL_SYSCALL_CHECK=y
1937CONFIG_HAVE_FTRACE=y 2012CONFIG_HAVE_FUNCTION_TRACER=y
1938CONFIG_HAVE_DYNAMIC_FTRACE=y 2013
1939# CONFIG_FTRACE is not set 2014#
2015# Tracers
2016#
2017# CONFIG_FUNCTION_TRACER is not set
1940# CONFIG_SCHED_TRACER is not set 2018# CONFIG_SCHED_TRACER is not set
1941# CONFIG_CONTEXT_SWITCH_TRACER is not set 2019# CONFIG_CONTEXT_SWITCH_TRACER is not set
2020# CONFIG_BOOT_TRACER is not set
2021# CONFIG_STACK_TRACER is not set
2022# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1942# CONFIG_SAMPLES is not set 2023# CONFIG_SAMPLES is not set
1943CONFIG_HAVE_ARCH_KGDB=y 2024CONFIG_HAVE_ARCH_KGDB=y
1944# CONFIG_KGDB is not set 2025# CONFIG_KGDB is not set
@@ -1946,6 +2027,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1946# CONFIG_DEBUG_STACK_USAGE is not set 2027# CONFIG_DEBUG_STACK_USAGE is not set
1947# CONFIG_CODE_PATCHING_SELFTEST is not set 2028# CONFIG_CODE_PATCHING_SELFTEST is not set
1948# CONFIG_FTR_FIXUP_SELFTEST is not set 2029# CONFIG_FTR_FIXUP_SELFTEST is not set
2030# CONFIG_MSI_BITMAP_SELFTEST is not set
1949CONFIG_XMON=y 2031CONFIG_XMON=y
1950CONFIG_XMON_DEFAULT=y 2032CONFIG_XMON_DEFAULT=y
1951CONFIG_XMON_DISASSEMBLY=y 2033CONFIG_XMON_DISASSEMBLY=y
@@ -1960,16 +2042,19 @@ CONFIG_BOOTX_TEXT=y
1960# 2042#
1961# CONFIG_KEYS is not set 2043# CONFIG_KEYS is not set
1962# CONFIG_SECURITY is not set 2044# CONFIG_SECURITY is not set
2045# CONFIG_SECURITYFS is not set
1963# CONFIG_SECURITY_FILE_CAPABILITIES is not set 2046# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1964CONFIG_CRYPTO=y 2047CONFIG_CRYPTO=y
1965 2048
1966# 2049#
1967# Crypto core or helper 2050# Crypto core or helper
1968# 2051#
2052# CONFIG_CRYPTO_FIPS is not set
1969CONFIG_CRYPTO_ALGAPI=y 2053CONFIG_CRYPTO_ALGAPI=y
1970CONFIG_CRYPTO_AEAD=y 2054CONFIG_CRYPTO_AEAD=y
1971CONFIG_CRYPTO_BLKCIPHER=y 2055CONFIG_CRYPTO_BLKCIPHER=y
1972CONFIG_CRYPTO_HASH=y 2056CONFIG_CRYPTO_HASH=y
2057CONFIG_CRYPTO_RNG=y
1973CONFIG_CRYPTO_MANAGER=y 2058CONFIG_CRYPTO_MANAGER=y
1974# CONFIG_CRYPTO_GF128MUL is not set 2059# CONFIG_CRYPTO_GF128MUL is not set
1975CONFIG_CRYPTO_NULL=m 2060CONFIG_CRYPTO_NULL=m
@@ -2043,6 +2128,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
2043# 2128#
2044CONFIG_CRYPTO_DEFLATE=m 2129CONFIG_CRYPTO_DEFLATE=m
2045# CONFIG_CRYPTO_LZO is not set 2130# CONFIG_CRYPTO_LZO is not set
2131
2132#
2133# Random Number Generation
2134#
2135# CONFIG_CRYPTO_ANSI_CPRNG is not set
2046CONFIG_CRYPTO_HW=y 2136CONFIG_CRYPTO_HW=y
2047# CONFIG_CRYPTO_DEV_HIFN_795X is not set 2137# CONFIG_CRYPTO_DEV_HIFN_795X is not set
2048# CONFIG_PPC_CLOCK is not set 2138# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index fc5930caeb5f..069ae1bbac29 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Tue Aug 26 13:22:03 2008 4# Tue Nov 11 19:36:56 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -22,7 +22,7 @@ CONFIG_SMP=y
22CONFIG_NR_CPUS=32 22CONFIG_NR_CPUS=32
23CONFIG_64BIT=y 23CONFIG_64BIT=y
24CONFIG_WORD_SIZE=64 24CONFIG_WORD_SIZE=64
25CONFIG_PPC_MERGE=y 25CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -87,6 +87,7 @@ CONFIG_LOG_BUF_SHIFT=17
87CONFIG_CGROUPS=y 87CONFIG_CGROUPS=y
88# CONFIG_CGROUP_DEBUG is not set 88# CONFIG_CGROUP_DEBUG is not set
89# CONFIG_CGROUP_NS is not set 89# CONFIG_CGROUP_NS is not set
90# CONFIG_CGROUP_FREEZER is not set
90# CONFIG_CGROUP_DEVICE is not set 91# CONFIG_CGROUP_DEVICE is not set
91CONFIG_CPUSETS=y 92CONFIG_CPUSETS=y
92# CONFIG_GROUP_SCHED is not set 93# CONFIG_GROUP_SCHED is not set
@@ -124,12 +125,15 @@ CONFIG_SIGNALFD=y
124CONFIG_TIMERFD=y 125CONFIG_TIMERFD=y
125CONFIG_EVENTFD=y 126CONFIG_EVENTFD=y
126CONFIG_SHMEM=y 127CONFIG_SHMEM=y
128CONFIG_AIO=y
127CONFIG_VM_EVENT_COUNTERS=y 129CONFIG_VM_EVENT_COUNTERS=y
130CONFIG_PCI_QUIRKS=y
128CONFIG_SLUB_DEBUG=y 131CONFIG_SLUB_DEBUG=y
129# CONFIG_SLAB is not set 132# CONFIG_SLAB is not set
130CONFIG_SLUB=y 133CONFIG_SLUB=y
131# CONFIG_SLOB is not set 134# CONFIG_SLOB is not set
132CONFIG_PROFILING=y 135CONFIG_PROFILING=y
136CONFIG_TRACEPOINTS=y
133CONFIG_MARKERS=y 137CONFIG_MARKERS=y
134CONFIG_OPROFILE=y 138CONFIG_OPROFILE=y
135CONFIG_HAVE_OPROFILE=y 139CONFIG_HAVE_OPROFILE=y
@@ -141,8 +145,6 @@ CONFIG_HAVE_KRETPROBES=y
141CONFIG_HAVE_ARCH_TRACEHOOK=y 145CONFIG_HAVE_ARCH_TRACEHOOK=y
142CONFIG_HAVE_DMA_ATTRS=y 146CONFIG_HAVE_DMA_ATTRS=y
143CONFIG_USE_GENERIC_SMP_HELPERS=y 147CONFIG_USE_GENERIC_SMP_HELPERS=y
144# CONFIG_HAVE_CLK is not set
145CONFIG_PROC_PAGE_MONITOR=y
146# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 148# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
147CONFIG_SLABINFO=y 149CONFIG_SLABINFO=y
148CONFIG_RT_MUTEXES=y 150CONFIG_RT_MUTEXES=y
@@ -175,6 +177,8 @@ CONFIG_DEFAULT_AS=y
175# CONFIG_DEFAULT_NOOP is not set 177# CONFIG_DEFAULT_NOOP is not set
176CONFIG_DEFAULT_IOSCHED="anticipatory" 178CONFIG_DEFAULT_IOSCHED="anticipatory"
177CONFIG_CLASSIC_RCU=y 179CONFIG_CLASSIC_RCU=y
180# CONFIG_FREEZER is not set
181CONFIG_PPC_MSI_BITMAP=y
178 182
179# 183#
180# Platform support 184# Platform support
@@ -294,6 +298,8 @@ CONFIG_PREEMPT_NONE=y
294# CONFIG_PREEMPT is not set 298# CONFIG_PREEMPT is not set
295CONFIG_BINFMT_ELF=y 299CONFIG_BINFMT_ELF=y
296CONFIG_COMPAT_BINFMT_ELF=y 300CONFIG_COMPAT_BINFMT_ELF=y
301# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
302# CONFIG_HAVE_AOUT is not set
297CONFIG_BINFMT_MISC=m 303CONFIG_BINFMT_MISC=m
298CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y 304CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
299CONFIG_IOMMU_VMERGE=y 305CONFIG_IOMMU_VMERGE=y
@@ -303,7 +309,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
303CONFIG_ARCH_HAS_WALK_MEMORY=y 309CONFIG_ARCH_HAS_WALK_MEMORY=y
304CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 310CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
305CONFIG_KEXEC=y 311CONFIG_KEXEC=y
306# CONFIG_CRASH_DUMP is not set
307# CONFIG_PHYP_DUMP is not set 312# CONFIG_PHYP_DUMP is not set
308CONFIG_IRQ_ALL_CPUS=y 313CONFIG_IRQ_ALL_CPUS=y
309# CONFIG_NUMA is not set 314# CONFIG_NUMA is not set
@@ -318,7 +323,6 @@ CONFIG_SELECT_MEMORY_MODEL=y
318CONFIG_SPARSEMEM_MANUAL=y 323CONFIG_SPARSEMEM_MANUAL=y
319CONFIG_SPARSEMEM=y 324CONFIG_SPARSEMEM=y
320CONFIG_HAVE_MEMORY_PRESENT=y 325CONFIG_HAVE_MEMORY_PRESENT=y
321# CONFIG_SPARSEMEM_STATIC is not set
322CONFIG_SPARSEMEM_EXTREME=y 326CONFIG_SPARSEMEM_EXTREME=y
323CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 327CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
324CONFIG_SPARSEMEM_VMEMMAP=y 328CONFIG_SPARSEMEM_VMEMMAP=y
@@ -329,8 +333,10 @@ CONFIG_PAGEFLAGS_EXTENDED=y
329CONFIG_SPLIT_PTLOCK_CPUS=4 333CONFIG_SPLIT_PTLOCK_CPUS=4
330CONFIG_MIGRATION=y 334CONFIG_MIGRATION=y
331CONFIG_RESOURCES_64BIT=y 335CONFIG_RESOURCES_64BIT=y
336CONFIG_PHYS_ADDR_T_64BIT=y
332CONFIG_ZONE_DMA_FLAG=1 337CONFIG_ZONE_DMA_FLAG=1
333CONFIG_BOUNCE=y 338CONFIG_BOUNCE=y
339CONFIG_UNEVICTABLE_LRU=y
334CONFIG_ARCH_MEMORY_PROBE=y 340CONFIG_ARCH_MEMORY_PROBE=y
335CONFIG_PPC_HAS_HASH_64K=y 341CONFIG_PPC_HAS_HASH_64K=y
336# CONFIG_PPC_64K_PAGES is not set 342# CONFIG_PPC_64K_PAGES is not set
@@ -379,6 +385,7 @@ CONFIG_HOTPLUG_PCI=m
379CONFIG_HOTPLUG_PCI_RPA=m 385CONFIG_HOTPLUG_PCI_RPA=m
380CONFIG_HOTPLUG_PCI_RPA_DLPAR=m 386CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
381# CONFIG_HAS_RAPIDIO is not set 387# CONFIG_HAS_RAPIDIO is not set
388# CONFIG_RELOCATABLE is not set
382CONFIG_PAGE_OFFSET=0xc000000000000000 389CONFIG_PAGE_OFFSET=0xc000000000000000
383CONFIG_KERNEL_START=0xc000000000000000 390CONFIG_KERNEL_START=0xc000000000000000
384CONFIG_PHYSICAL_START=0x00000000 391CONFIG_PHYSICAL_START=0x00000000
@@ -426,7 +433,6 @@ CONFIG_INET_TCP_DIAG=y
426CONFIG_TCP_CONG_CUBIC=y 433CONFIG_TCP_CONG_CUBIC=y
427CONFIG_DEFAULT_TCP_CONG="cubic" 434CONFIG_DEFAULT_TCP_CONG="cubic"
428# CONFIG_TCP_MD5SIG is not set 435# CONFIG_TCP_MD5SIG is not set
429# CONFIG_IP_VS is not set
430# CONFIG_IPV6 is not set 436# CONFIG_IPV6 is not set
431# CONFIG_NETWORK_SECMARK is not set 437# CONFIG_NETWORK_SECMARK is not set
432CONFIG_NETFILTER=y 438CONFIG_NETFILTER=y
@@ -457,15 +463,17 @@ CONFIG_NF_CONNTRACK_PPTP=m
457CONFIG_NF_CONNTRACK_SIP=m 463CONFIG_NF_CONNTRACK_SIP=m
458CONFIG_NF_CONNTRACK_TFTP=m 464CONFIG_NF_CONNTRACK_TFTP=m
459CONFIG_NF_CT_NETLINK=m 465CONFIG_NF_CT_NETLINK=m
466CONFIG_NETFILTER_TPROXY=m
460CONFIG_NETFILTER_XTABLES=m 467CONFIG_NETFILTER_XTABLES=m
461CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 468CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
462CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 469CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
463CONFIG_NETFILTER_XT_TARGET_DSCP=m 470CONFIG_NETFILTER_XT_TARGET_DSCP=m
464CONFIG_NETFILTER_XT_TARGET_MARK=m 471CONFIG_NETFILTER_XT_TARGET_MARK=m
465CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
466CONFIG_NETFILTER_XT_TARGET_NFLOG=m 472CONFIG_NETFILTER_XT_TARGET_NFLOG=m
473CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
467CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 474CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
468CONFIG_NETFILTER_XT_TARGET_RATEEST=m 475CONFIG_NETFILTER_XT_TARGET_RATEEST=m
476CONFIG_NETFILTER_XT_TARGET_TPROXY=m
469CONFIG_NETFILTER_XT_TARGET_TRACE=m 477CONFIG_NETFILTER_XT_TARGET_TRACE=m
470CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 478CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
471CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 479CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
@@ -477,40 +485,44 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
477CONFIG_NETFILTER_XT_MATCH_DCCP=m 485CONFIG_NETFILTER_XT_MATCH_DCCP=m
478CONFIG_NETFILTER_XT_MATCH_DSCP=m 486CONFIG_NETFILTER_XT_MATCH_DSCP=m
479CONFIG_NETFILTER_XT_MATCH_ESP=m 487CONFIG_NETFILTER_XT_MATCH_ESP=m
488CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
480CONFIG_NETFILTER_XT_MATCH_HELPER=m 489CONFIG_NETFILTER_XT_MATCH_HELPER=m
481CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 490CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
482CONFIG_NETFILTER_XT_MATCH_LENGTH=m 491CONFIG_NETFILTER_XT_MATCH_LENGTH=m
483CONFIG_NETFILTER_XT_MATCH_LIMIT=m 492CONFIG_NETFILTER_XT_MATCH_LIMIT=m
484CONFIG_NETFILTER_XT_MATCH_MAC=m 493CONFIG_NETFILTER_XT_MATCH_MAC=m
485CONFIG_NETFILTER_XT_MATCH_MARK=m 494CONFIG_NETFILTER_XT_MATCH_MARK=m
495CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
486CONFIG_NETFILTER_XT_MATCH_OWNER=m 496CONFIG_NETFILTER_XT_MATCH_OWNER=m
487CONFIG_NETFILTER_XT_MATCH_POLICY=m 497CONFIG_NETFILTER_XT_MATCH_POLICY=m
488CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
489CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 498CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
490CONFIG_NETFILTER_XT_MATCH_QUOTA=m 499CONFIG_NETFILTER_XT_MATCH_QUOTA=m
491CONFIG_NETFILTER_XT_MATCH_RATEEST=m 500CONFIG_NETFILTER_XT_MATCH_RATEEST=m
492CONFIG_NETFILTER_XT_MATCH_REALM=m 501CONFIG_NETFILTER_XT_MATCH_REALM=m
502CONFIG_NETFILTER_XT_MATCH_RECENT=m
503# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
493CONFIG_NETFILTER_XT_MATCH_SCTP=m 504CONFIG_NETFILTER_XT_MATCH_SCTP=m
505CONFIG_NETFILTER_XT_MATCH_SOCKET=m
494CONFIG_NETFILTER_XT_MATCH_STATE=m 506CONFIG_NETFILTER_XT_MATCH_STATE=m
495CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 507CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
496CONFIG_NETFILTER_XT_MATCH_STRING=m 508CONFIG_NETFILTER_XT_MATCH_STRING=m
497CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 509CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
498# CONFIG_NETFILTER_XT_MATCH_TIME is not set 510# CONFIG_NETFILTER_XT_MATCH_TIME is not set
499CONFIG_NETFILTER_XT_MATCH_U32=m 511CONFIG_NETFILTER_XT_MATCH_U32=m
500CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 512# CONFIG_IP_VS is not set
501 513
502# 514#
503# IP: Netfilter Configuration 515# IP: Netfilter Configuration
504# 516#
517CONFIG_NF_DEFRAG_IPV4=m
505CONFIG_NF_CONNTRACK_IPV4=m 518CONFIG_NF_CONNTRACK_IPV4=m
506CONFIG_NF_CONNTRACK_PROC_COMPAT=y 519CONFIG_NF_CONNTRACK_PROC_COMPAT=y
507CONFIG_IP_NF_QUEUE=m 520CONFIG_IP_NF_QUEUE=m
508CONFIG_IP_NF_IPTABLES=m 521CONFIG_IP_NF_IPTABLES=m
509CONFIG_IP_NF_MATCH_RECENT=m 522CONFIG_IP_NF_MATCH_ADDRTYPE=m
510CONFIG_IP_NF_MATCH_ECN=m
511CONFIG_IP_NF_MATCH_AH=m 523CONFIG_IP_NF_MATCH_AH=m
524CONFIG_IP_NF_MATCH_ECN=m
512CONFIG_IP_NF_MATCH_TTL=m 525CONFIG_IP_NF_MATCH_TTL=m
513CONFIG_IP_NF_MATCH_ADDRTYPE=m
514CONFIG_IP_NF_FILTER=m 526CONFIG_IP_NF_FILTER=m
515CONFIG_IP_NF_TARGET_REJECT=m 527CONFIG_IP_NF_TARGET_REJECT=m
516CONFIG_IP_NF_TARGET_LOG=m 528CONFIG_IP_NF_TARGET_LOG=m
@@ -518,8 +530,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
518CONFIG_NF_NAT=m 530CONFIG_NF_NAT=m
519CONFIG_NF_NAT_NEEDED=y 531CONFIG_NF_NAT_NEEDED=y
520CONFIG_IP_NF_TARGET_MASQUERADE=m 532CONFIG_IP_NF_TARGET_MASQUERADE=m
521CONFIG_IP_NF_TARGET_REDIRECT=m
522CONFIG_IP_NF_TARGET_NETMAP=m 533CONFIG_IP_NF_TARGET_NETMAP=m
534CONFIG_IP_NF_TARGET_REDIRECT=m
523CONFIG_NF_NAT_SNMP_BASIC=m 535CONFIG_NF_NAT_SNMP_BASIC=m
524CONFIG_NF_NAT_PROTO_GRE=m 536CONFIG_NF_NAT_PROTO_GRE=m
525CONFIG_NF_NAT_PROTO_SCTP=m 537CONFIG_NF_NAT_PROTO_SCTP=m
@@ -531,9 +543,9 @@ CONFIG_NF_NAT_PPTP=m
531CONFIG_NF_NAT_H323=m 543CONFIG_NF_NAT_H323=m
532CONFIG_NF_NAT_SIP=m 544CONFIG_NF_NAT_SIP=m
533CONFIG_IP_NF_MANGLE=m 545CONFIG_IP_NF_MANGLE=m
546CONFIG_IP_NF_TARGET_CLUSTERIP=m
534CONFIG_IP_NF_TARGET_ECN=m 547CONFIG_IP_NF_TARGET_ECN=m
535CONFIG_IP_NF_TARGET_TTL=m 548CONFIG_IP_NF_TARGET_TTL=m
536CONFIG_IP_NF_TARGET_CLUSTERIP=m
537CONFIG_IP_NF_RAW=m 549CONFIG_IP_NF_RAW=m
538CONFIG_IP_NF_ARPTABLES=m 550CONFIG_IP_NF_ARPTABLES=m
539CONFIG_IP_NF_ARPFILTER=m 551CONFIG_IP_NF_ARPFILTER=m
@@ -543,6 +555,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
543# CONFIG_TIPC is not set 555# CONFIG_TIPC is not set
544# CONFIG_ATM is not set 556# CONFIG_ATM is not set
545# CONFIG_BRIDGE is not set 557# CONFIG_BRIDGE is not set
558# CONFIG_NET_DSA is not set
546# CONFIG_VLAN_8021Q is not set 559# CONFIG_VLAN_8021Q is not set
547# CONFIG_DECNET is not set 560# CONFIG_DECNET is not set
548CONFIG_LLC=y 561CONFIG_LLC=y
@@ -565,11 +578,10 @@ CONFIG_NET_CLS_ROUTE=y
565# CONFIG_IRDA is not set 578# CONFIG_IRDA is not set
566# CONFIG_BT is not set 579# CONFIG_BT is not set
567# CONFIG_AF_RXRPC is not set 580# CONFIG_AF_RXRPC is not set
568 581# CONFIG_PHONET is not set
569# 582CONFIG_WIRELESS=y
570# Wireless
571#
572# CONFIG_CFG80211 is not set 583# CONFIG_CFG80211 is not set
584CONFIG_WIRELESS_OLD_REGULATORY=y
573# CONFIG_WIRELESS_EXT is not set 585# CONFIG_WIRELESS_EXT is not set
574# CONFIG_MAC80211 is not set 586# CONFIG_MAC80211 is not set
575# CONFIG_IEEE80211 is not set 587# CONFIG_IEEE80211 is not set
@@ -624,21 +636,20 @@ CONFIG_MISC_DEVICES=y
624# CONFIG_HP_ILO is not set 636# CONFIG_HP_ILO is not set
625CONFIG_HAVE_IDE=y 637CONFIG_HAVE_IDE=y
626CONFIG_IDE=y 638CONFIG_IDE=y
627CONFIG_BLK_DEV_IDE=y
628 639
629# 640#
630# Please see Documentation/ide/ide.txt for help/info on IDE drives 641# Please see Documentation/ide/ide.txt for help/info on IDE drives
631# 642#
632CONFIG_IDE_TIMINGS=y 643CONFIG_IDE_TIMINGS=y
633# CONFIG_BLK_DEV_IDE_SATA is not set 644# CONFIG_BLK_DEV_IDE_SATA is not set
634CONFIG_BLK_DEV_IDEDISK=y 645CONFIG_IDE_GD=y
635# CONFIG_IDEDISK_MULTI_MODE is not set 646CONFIG_IDE_GD_ATA=y
647# CONFIG_IDE_GD_ATAPI is not set
636# CONFIG_BLK_DEV_IDECS is not set 648# CONFIG_BLK_DEV_IDECS is not set
637# CONFIG_BLK_DEV_DELKIN is not set 649# CONFIG_BLK_DEV_DELKIN is not set
638CONFIG_BLK_DEV_IDECD=y 650CONFIG_BLK_DEV_IDECD=y
639CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 651CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
640# CONFIG_BLK_DEV_IDETAPE is not set 652# CONFIG_BLK_DEV_IDETAPE is not set
641# CONFIG_BLK_DEV_IDEFLOPPY is not set
642# CONFIG_BLK_DEV_IDESCSI is not set 653# CONFIG_BLK_DEV_IDESCSI is not set
643# CONFIG_IDE_TASK_IOCTL is not set 654# CONFIG_IDE_TASK_IOCTL is not set
644CONFIG_IDE_PROC_FS=y 655CONFIG_IDE_PROC_FS=y
@@ -835,6 +846,7 @@ CONFIG_SATA_SVW=y
835# CONFIG_PATA_SCH is not set 846# CONFIG_PATA_SCH is not set
836CONFIG_MD=y 847CONFIG_MD=y
837CONFIG_BLK_DEV_MD=y 848CONFIG_BLK_DEV_MD=y
849CONFIG_MD_AUTODETECT=y
838CONFIG_MD_LINEAR=y 850CONFIG_MD_LINEAR=y
839CONFIG_MD_RAID0=y 851CONFIG_MD_RAID0=y
840CONFIG_MD_RAID1=y 852CONFIG_MD_RAID1=y
@@ -926,6 +938,9 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
926CONFIG_IBM_NEW_EMAC_RGMII=y 938CONFIG_IBM_NEW_EMAC_RGMII=y
927CONFIG_IBM_NEW_EMAC_TAH=y 939CONFIG_IBM_NEW_EMAC_TAH=y
928CONFIG_IBM_NEW_EMAC_EMAC4=y 940CONFIG_IBM_NEW_EMAC_EMAC4=y
941# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
942# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
943# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
929CONFIG_NET_PCI=y 944CONFIG_NET_PCI=y
930CONFIG_PCNET32=y 945CONFIG_PCNET32=y
931# CONFIG_AMD8111_ETH is not set 946# CONFIG_AMD8111_ETH is not set
@@ -946,12 +961,12 @@ CONFIG_E100=y
946# CONFIG_TLAN is not set 961# CONFIG_TLAN is not set
947# CONFIG_VIA_RHINE is not set 962# CONFIG_VIA_RHINE is not set
948# CONFIG_SC92031 is not set 963# CONFIG_SC92031 is not set
964# CONFIG_ATL2 is not set
949CONFIG_NETDEV_1000=y 965CONFIG_NETDEV_1000=y
950CONFIG_ACENIC=y 966CONFIG_ACENIC=y
951CONFIG_ACENIC_OMIT_TIGON_I=y 967CONFIG_ACENIC_OMIT_TIGON_I=y
952# CONFIG_DL2K is not set 968# CONFIG_DL2K is not set
953CONFIG_E1000=y 969CONFIG_E1000=y
954# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
955# CONFIG_E1000E is not set 970# CONFIG_E1000E is not set
956# CONFIG_IP1000 is not set 971# CONFIG_IP1000 is not set
957# CONFIG_IGB is not set 972# CONFIG_IGB is not set
@@ -969,10 +984,12 @@ CONFIG_SPIDER_NET=m
969# CONFIG_QLA3XXX is not set 984# CONFIG_QLA3XXX is not set
970# CONFIG_ATL1 is not set 985# CONFIG_ATL1 is not set
971# CONFIG_ATL1E is not set 986# CONFIG_ATL1E is not set
987# CONFIG_JME is not set
972CONFIG_NETDEV_10000=y 988CONFIG_NETDEV_10000=y
973# CONFIG_CHELSIO_T1 is not set 989# CONFIG_CHELSIO_T1 is not set
974# CONFIG_CHELSIO_T3 is not set 990# CONFIG_CHELSIO_T3 is not set
975CONFIG_EHEA=m 991CONFIG_EHEA=m
992# CONFIG_ENIC is not set
976# CONFIG_IXGBE is not set 993# CONFIG_IXGBE is not set
977CONFIG_IXGB=m 994CONFIG_IXGB=m
978# CONFIG_S2IO is not set 995# CONFIG_S2IO is not set
@@ -980,9 +997,11 @@ CONFIG_IXGB=m
980# CONFIG_NETXEN_NIC is not set 997# CONFIG_NETXEN_NIC is not set
981# CONFIG_NIU is not set 998# CONFIG_NIU is not set
982CONFIG_PASEMI_MAC=y 999CONFIG_PASEMI_MAC=y
1000# CONFIG_MLX4_EN is not set
983# CONFIG_MLX4_CORE is not set 1001# CONFIG_MLX4_CORE is not set
984# CONFIG_TEHUTI is not set 1002# CONFIG_TEHUTI is not set
985# CONFIG_BNX2X is not set 1003# CONFIG_BNX2X is not set
1004# CONFIG_QLGE is not set
986# CONFIG_SFC is not set 1005# CONFIG_SFC is not set
987CONFIG_TR=y 1006CONFIG_TR=y
988CONFIG_IBMOL=y 1007CONFIG_IBMOL=y
@@ -1065,6 +1084,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
1065CONFIG_MOUSE_PS2_SYNAPTICS=y 1084CONFIG_MOUSE_PS2_SYNAPTICS=y
1066CONFIG_MOUSE_PS2_LIFEBOOK=y 1085CONFIG_MOUSE_PS2_LIFEBOOK=y
1067CONFIG_MOUSE_PS2_TRACKPOINT=y 1086CONFIG_MOUSE_PS2_TRACKPOINT=y
1087# CONFIG_MOUSE_PS2_ELANTECH is not set
1068# CONFIG_MOUSE_PS2_TOUCHKIT is not set 1088# CONFIG_MOUSE_PS2_TOUCHKIT is not set
1069# CONFIG_MOUSE_SERIAL is not set 1089# CONFIG_MOUSE_SERIAL is not set
1070# CONFIG_MOUSE_APPLETOUCH is not set 1090# CONFIG_MOUSE_APPLETOUCH is not set
@@ -1080,6 +1100,7 @@ CONFIG_INPUT_PCSPKR=m
1080# CONFIG_INPUT_KEYSPAN_REMOTE is not set 1100# CONFIG_INPUT_KEYSPAN_REMOTE is not set
1081# CONFIG_INPUT_POWERMATE is not set 1101# CONFIG_INPUT_POWERMATE is not set
1082# CONFIG_INPUT_YEALINK is not set 1102# CONFIG_INPUT_YEALINK is not set
1103# CONFIG_INPUT_CM109 is not set
1083# CONFIG_INPUT_UINPUT is not set 1104# CONFIG_INPUT_UINPUT is not set
1084 1105
1085# 1106#
@@ -1255,6 +1276,17 @@ CONFIG_SSB_POSSIBLE=y
1255# CONFIG_MFD_SM501 is not set 1276# CONFIG_MFD_SM501 is not set
1256# CONFIG_HTC_PASIC3 is not set 1277# CONFIG_HTC_PASIC3 is not set
1257# CONFIG_MFD_TMIO is not set 1278# CONFIG_MFD_TMIO is not set
1279# CONFIG_PMIC_DA903X is not set
1280# CONFIG_MFD_WM8400 is not set
1281# CONFIG_MFD_WM8350_I2C is not set
1282
1283#
1284# Voltage and Current regulators
1285#
1286# CONFIG_REGULATOR is not set
1287# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1288# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1289# CONFIG_REGULATOR_BQ24022 is not set
1258 1290
1259# 1291#
1260# Multimedia devices 1292# Multimedia devices
@@ -1282,6 +1314,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
1282CONFIG_FB=y 1314CONFIG_FB=y
1283CONFIG_FIRMWARE_EDID=y 1315CONFIG_FIRMWARE_EDID=y
1284CONFIG_FB_DDC=y 1316CONFIG_FB_DDC=y
1317# CONFIG_FB_BOOT_VESA_SUPPORT is not set
1285CONFIG_FB_CFB_FILLRECT=y 1318CONFIG_FB_CFB_FILLRECT=y
1286CONFIG_FB_CFB_COPYAREA=y 1319CONFIG_FB_CFB_COPYAREA=y
1287CONFIG_FB_CFB_IMAGEBLIT=y 1320CONFIG_FB_CFB_IMAGEBLIT=y
@@ -1326,6 +1359,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1326# CONFIG_FB_S3 is not set 1359# CONFIG_FB_S3 is not set
1327# CONFIG_FB_SAVAGE is not set 1360# CONFIG_FB_SAVAGE is not set
1328# CONFIG_FB_SIS is not set 1361# CONFIG_FB_SIS is not set
1362# CONFIG_FB_VIA is not set
1329# CONFIG_FB_NEOMAGIC is not set 1363# CONFIG_FB_NEOMAGIC is not set
1330# CONFIG_FB_KYRO is not set 1364# CONFIG_FB_KYRO is not set
1331# CONFIG_FB_3DFX is not set 1365# CONFIG_FB_3DFX is not set
@@ -1337,6 +1371,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1337# CONFIG_FB_CARMINE is not set 1371# CONFIG_FB_CARMINE is not set
1338CONFIG_FB_IBM_GXT4500=y 1372CONFIG_FB_IBM_GXT4500=y
1339# CONFIG_FB_VIRTUAL is not set 1373# CONFIG_FB_VIRTUAL is not set
1374# CONFIG_FB_METRONOME is not set
1340CONFIG_BACKLIGHT_LCD_SUPPORT=y 1375CONFIG_BACKLIGHT_LCD_SUPPORT=y
1341CONFIG_LCD_CLASS_DEVICE=y 1376CONFIG_LCD_CLASS_DEVICE=y
1342# CONFIG_LCD_ILI9320 is not set 1377# CONFIG_LCD_ILI9320 is not set
@@ -1370,6 +1405,7 @@ CONFIG_LOGO_LINUX_MONO=y
1370CONFIG_LOGO_LINUX_VGA16=y 1405CONFIG_LOGO_LINUX_VGA16=y
1371CONFIG_LOGO_LINUX_CLUT224=y 1406CONFIG_LOGO_LINUX_CLUT224=y
1372CONFIG_SOUND=m 1407CONFIG_SOUND=m
1408CONFIG_SOUND_OSS_CORE=y
1373CONFIG_SND=m 1409CONFIG_SND=m
1374CONFIG_SND_TIMER=m 1410CONFIG_SND_TIMER=m
1375CONFIG_SND_PCM=m 1411CONFIG_SND_PCM=m
@@ -1481,9 +1517,36 @@ CONFIG_HID=y
1481# USB Input Devices 1517# USB Input Devices
1482# 1518#
1483CONFIG_USB_HID=y 1519CONFIG_USB_HID=y
1484# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1520# CONFIG_HID_PID is not set
1485# CONFIG_HID_FF is not set
1486CONFIG_USB_HIDDEV=y 1521CONFIG_USB_HIDDEV=y
1522
1523#
1524# Special HID drivers
1525#
1526CONFIG_HID_COMPAT=y
1527CONFIG_HID_A4TECH=y
1528CONFIG_HID_APPLE=y
1529CONFIG_HID_BELKIN=y
1530CONFIG_HID_BRIGHT=y
1531CONFIG_HID_CHERRY=y
1532CONFIG_HID_CHICONY=y
1533CONFIG_HID_CYPRESS=y
1534CONFIG_HID_DELL=y
1535CONFIG_HID_EZKEY=y
1536CONFIG_HID_GYRATION=y
1537CONFIG_HID_LOGITECH=y
1538# CONFIG_LOGITECH_FF is not set
1539# CONFIG_LOGIRUMBLEPAD2_FF is not set
1540CONFIG_HID_MICROSOFT=y
1541CONFIG_HID_MONTEREY=y
1542CONFIG_HID_PANTHERLORD=y
1543# CONFIG_PANTHERLORD_FF is not set
1544CONFIG_HID_PETALYNX=y
1545CONFIG_HID_SAMSUNG=y
1546CONFIG_HID_SONY=y
1547CONFIG_HID_SUNPLUS=y
1548# CONFIG_THRUSTMASTER_FF is not set
1549# CONFIG_ZEROPLUS_FF is not set
1487CONFIG_USB_SUPPORT=y 1550CONFIG_USB_SUPPORT=y
1488CONFIG_USB_ARCH_HAS_HCD=y 1551CONFIG_USB_ARCH_HAS_HCD=y
1489CONFIG_USB_ARCH_HAS_OHCI=y 1552CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1500,6 +1563,8 @@ CONFIG_USB_DEVICE_CLASS=y
1500# CONFIG_USB_DYNAMIC_MINORS is not set 1563# CONFIG_USB_DYNAMIC_MINORS is not set
1501# CONFIG_USB_OTG is not set 1564# CONFIG_USB_OTG is not set
1502# CONFIG_USB_MON is not set 1565# CONFIG_USB_MON is not set
1566# CONFIG_USB_WUSB is not set
1567# CONFIG_USB_WUSB_CBAF is not set
1503 1568
1504# 1569#
1505# USB Host Controller Drivers 1570# USB Host Controller Drivers
@@ -1520,6 +1585,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1520# CONFIG_USB_UHCI_HCD is not set 1585# CONFIG_USB_UHCI_HCD is not set
1521# CONFIG_USB_SL811_HCD is not set 1586# CONFIG_USB_SL811_HCD is not set
1522# CONFIG_USB_R8A66597_HCD is not set 1587# CONFIG_USB_R8A66597_HCD is not set
1588# CONFIG_USB_WHCI_HCD is not set
1589# CONFIG_USB_HWA_HCD is not set
1523 1590
1524# 1591#
1525# USB Device Class drivers 1592# USB Device Class drivers
@@ -1527,6 +1594,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1527# CONFIG_USB_ACM is not set 1594# CONFIG_USB_ACM is not set
1528# CONFIG_USB_PRINTER is not set 1595# CONFIG_USB_PRINTER is not set
1529# CONFIG_USB_WDM is not set 1596# CONFIG_USB_WDM is not set
1597# CONFIG_USB_TMC is not set
1530 1598
1531# 1599#
1532# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1600# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1548,7 +1616,6 @@ CONFIG_USB_STORAGE=m
1548# CONFIG_USB_STORAGE_ALAUDA is not set 1616# CONFIG_USB_STORAGE_ALAUDA is not set
1549# CONFIG_USB_STORAGE_ONETOUCH is not set 1617# CONFIG_USB_STORAGE_ONETOUCH is not set
1550# CONFIG_USB_STORAGE_KARMA is not set 1618# CONFIG_USB_STORAGE_KARMA is not set
1551# CONFIG_USB_STORAGE_SIERRA is not set
1552# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1619# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1553# CONFIG_USB_LIBUSUAL is not set 1620# CONFIG_USB_LIBUSUAL is not set
1554 1621
@@ -1569,6 +1636,7 @@ CONFIG_USB_STORAGE=m
1569# CONFIG_USB_EMI62 is not set 1636# CONFIG_USB_EMI62 is not set
1570# CONFIG_USB_EMI26 is not set 1637# CONFIG_USB_EMI26 is not set
1571# CONFIG_USB_ADUTUX is not set 1638# CONFIG_USB_ADUTUX is not set
1639# CONFIG_USB_SEVSEG is not set
1572# CONFIG_USB_RIO500 is not set 1640# CONFIG_USB_RIO500 is not set
1573# CONFIG_USB_LEGOTOWER is not set 1641# CONFIG_USB_LEGOTOWER is not set
1574# CONFIG_USB_LCD is not set 1642# CONFIG_USB_LCD is not set
@@ -1586,7 +1654,9 @@ CONFIG_USB_APPLEDISPLAY=m
1586# CONFIG_USB_IOWARRIOR is not set 1654# CONFIG_USB_IOWARRIOR is not set
1587# CONFIG_USB_TEST is not set 1655# CONFIG_USB_TEST is not set
1588# CONFIG_USB_ISIGHTFW is not set 1656# CONFIG_USB_ISIGHTFW is not set
1657# CONFIG_USB_VST is not set
1589# CONFIG_USB_GADGET is not set 1658# CONFIG_USB_GADGET is not set
1659# CONFIG_UWB is not set
1590# CONFIG_MMC is not set 1660# CONFIG_MMC is not set
1591# CONFIG_MEMSTICK is not set 1661# CONFIG_MEMSTICK is not set
1592# CONFIG_NEW_LEDS is not set 1662# CONFIG_NEW_LEDS is not set
@@ -1656,12 +1726,15 @@ CONFIG_RTC_DRV_DS1307=y
1656# Platform RTC drivers 1726# Platform RTC drivers
1657# 1727#
1658# CONFIG_RTC_DRV_CMOS is not set 1728# CONFIG_RTC_DRV_CMOS is not set
1729# CONFIG_RTC_DRV_DS1286 is not set
1659# CONFIG_RTC_DRV_DS1511 is not set 1730# CONFIG_RTC_DRV_DS1511 is not set
1660# CONFIG_RTC_DRV_DS1553 is not set 1731# CONFIG_RTC_DRV_DS1553 is not set
1661# CONFIG_RTC_DRV_DS1742 is not set 1732# CONFIG_RTC_DRV_DS1742 is not set
1662# CONFIG_RTC_DRV_STK17TA8 is not set 1733# CONFIG_RTC_DRV_STK17TA8 is not set
1663# CONFIG_RTC_DRV_M48T86 is not set 1734# CONFIG_RTC_DRV_M48T86 is not set
1735# CONFIG_RTC_DRV_M48T35 is not set
1664# CONFIG_RTC_DRV_M48T59 is not set 1736# CONFIG_RTC_DRV_M48T59 is not set
1737# CONFIG_RTC_DRV_BQ4802 is not set
1665# CONFIG_RTC_DRV_V3020 is not set 1738# CONFIG_RTC_DRV_V3020 is not set
1666 1739
1667# 1740#
@@ -1670,6 +1743,7 @@ CONFIG_RTC_DRV_DS1307=y
1670CONFIG_RTC_DRV_PPC=y 1743CONFIG_RTC_DRV_PPC=y
1671# CONFIG_DMADEVICES is not set 1744# CONFIG_DMADEVICES is not set
1672# CONFIG_UIO is not set 1745# CONFIG_UIO is not set
1746# CONFIG_STAGING is not set
1673 1747
1674# 1748#
1675# File systems 1749# File systems
@@ -1679,14 +1753,20 @@ CONFIG_EXT2_FS_XATTR=y
1679CONFIG_EXT2_FS_POSIX_ACL=y 1753CONFIG_EXT2_FS_POSIX_ACL=y
1680CONFIG_EXT2_FS_SECURITY=y 1754CONFIG_EXT2_FS_SECURITY=y
1681CONFIG_EXT2_FS_XIP=y 1755CONFIG_EXT2_FS_XIP=y
1682CONFIG_FS_XIP=y
1683CONFIG_EXT3_FS=y 1756CONFIG_EXT3_FS=y
1684CONFIG_EXT3_FS_XATTR=y 1757CONFIG_EXT3_FS_XATTR=y
1685CONFIG_EXT3_FS_POSIX_ACL=y 1758CONFIG_EXT3_FS_POSIX_ACL=y
1686CONFIG_EXT3_FS_SECURITY=y 1759CONFIG_EXT3_FS_SECURITY=y
1687# CONFIG_EXT4DEV_FS is not set 1760CONFIG_EXT4_FS=y
1761# CONFIG_EXT4DEV_COMPAT is not set
1762CONFIG_EXT4_FS_XATTR=y
1763CONFIG_EXT4_FS_POSIX_ACL=y
1764CONFIG_EXT4_FS_SECURITY=y
1765CONFIG_FS_XIP=y
1688CONFIG_JBD=y 1766CONFIG_JBD=y
1689# CONFIG_JBD_DEBUG is not set 1767# CONFIG_JBD_DEBUG is not set
1768CONFIG_JBD2=y
1769# CONFIG_JBD2_DEBUG is not set
1690CONFIG_FS_MBCACHE=y 1770CONFIG_FS_MBCACHE=y
1691CONFIG_REISERFS_FS=y 1771CONFIG_REISERFS_FS=y
1692# CONFIG_REISERFS_CHECK is not set 1772# CONFIG_REISERFS_CHECK is not set
@@ -1700,6 +1780,7 @@ CONFIG_JFS_SECURITY=y
1700# CONFIG_JFS_DEBUG is not set 1780# CONFIG_JFS_DEBUG is not set
1701# CONFIG_JFS_STATISTICS is not set 1781# CONFIG_JFS_STATISTICS is not set
1702CONFIG_FS_POSIX_ACL=y 1782CONFIG_FS_POSIX_ACL=y
1783CONFIG_FILE_LOCKING=y
1703CONFIG_XFS_FS=m 1784CONFIG_XFS_FS=m
1704# CONFIG_XFS_QUOTA is not set 1785# CONFIG_XFS_QUOTA is not set
1705CONFIG_XFS_POSIX_ACL=y 1786CONFIG_XFS_POSIX_ACL=y
@@ -1740,6 +1821,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1740CONFIG_PROC_FS=y 1821CONFIG_PROC_FS=y
1741CONFIG_PROC_KCORE=y 1822CONFIG_PROC_KCORE=y
1742CONFIG_PROC_SYSCTL=y 1823CONFIG_PROC_SYSCTL=y
1824CONFIG_PROC_PAGE_MONITOR=y
1743CONFIG_SYSFS=y 1825CONFIG_SYSFS=y
1744CONFIG_TMPFS=y 1826CONFIG_TMPFS=y
1745# CONFIG_TMPFS_POSIX_ACL is not set 1827# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1785,6 +1867,7 @@ CONFIG_NFS_COMMON=y
1785CONFIG_SUNRPC=y 1867CONFIG_SUNRPC=y
1786CONFIG_SUNRPC_GSS=y 1868CONFIG_SUNRPC_GSS=y
1787CONFIG_SUNRPC_XPRT_RDMA=m 1869CONFIG_SUNRPC_XPRT_RDMA=m
1870# CONFIG_SUNRPC_REGISTER_V4 is not set
1788CONFIG_RPCSEC_GSS_KRB5=y 1871CONFIG_RPCSEC_GSS_KRB5=y
1789CONFIG_RPCSEC_GSS_SPKM3=m 1872CONFIG_RPCSEC_GSS_SPKM3=m
1790# CONFIG_SMB_FS is not set 1873# CONFIG_SMB_FS is not set
@@ -1866,9 +1949,8 @@ CONFIG_NLS_UTF8=m
1866# Library routines 1949# Library routines
1867# 1950#
1868CONFIG_BITREVERSE=y 1951CONFIG_BITREVERSE=y
1869# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1870CONFIG_CRC_CCITT=m 1952CONFIG_CRC_CCITT=m
1871# CONFIG_CRC16 is not set 1953CONFIG_CRC16=y
1872CONFIG_CRC_T10DIF=y 1954CONFIG_CRC_T10DIF=y
1873CONFIG_CRC_ITU_T=m 1955CONFIG_CRC_ITU_T=m
1874CONFIG_CRC32=y 1956CONFIG_CRC32=y
@@ -1929,22 +2011,31 @@ CONFIG_DEBUG_BUGVERBOSE=y
1929CONFIG_DEBUG_MEMORY_INIT=y 2011CONFIG_DEBUG_MEMORY_INIT=y
1930# CONFIG_DEBUG_LIST is not set 2012# CONFIG_DEBUG_LIST is not set
1931# CONFIG_DEBUG_SG is not set 2013# CONFIG_DEBUG_SG is not set
1932CONFIG_FRAME_POINTER=y
1933# CONFIG_BOOT_PRINTK_DELAY is not set 2014# CONFIG_BOOT_PRINTK_DELAY is not set
1934# CONFIG_RCU_TORTURE_TEST is not set 2015# CONFIG_RCU_TORTURE_TEST is not set
2016# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1935# CONFIG_BACKTRACE_SELF_TEST is not set 2017# CONFIG_BACKTRACE_SELF_TEST is not set
2018# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1936# CONFIG_FAULT_INJECTION is not set 2019# CONFIG_FAULT_INJECTION is not set
1937CONFIG_LATENCYTOP=y 2020CONFIG_LATENCYTOP=y
1938CONFIG_SYSCTL_SYSCALL_CHECK=y 2021CONFIG_SYSCTL_SYSCALL_CHECK=y
1939CONFIG_HAVE_FTRACE=y 2022CONFIG_NOP_TRACER=y
1940CONFIG_HAVE_DYNAMIC_FTRACE=y 2023CONFIG_HAVE_FUNCTION_TRACER=y
1941CONFIG_TRACER_MAX_TRACE=y 2024CONFIG_TRACER_MAX_TRACE=y
2025CONFIG_RING_BUFFER=y
1942CONFIG_TRACING=y 2026CONFIG_TRACING=y
1943# CONFIG_FTRACE is not set 2027
2028#
2029# Tracers
2030#
2031# CONFIG_FUNCTION_TRACER is not set
1944CONFIG_IRQSOFF_TRACER=y 2032CONFIG_IRQSOFF_TRACER=y
1945CONFIG_SCHED_TRACER=y 2033CONFIG_SCHED_TRACER=y
1946CONFIG_CONTEXT_SWITCH_TRACER=y 2034CONFIG_CONTEXT_SWITCH_TRACER=y
2035# CONFIG_BOOT_TRACER is not set
2036# CONFIG_STACK_TRACER is not set
1947# CONFIG_FTRACE_STARTUP_TEST is not set 2037# CONFIG_FTRACE_STARTUP_TEST is not set
2038CONFIG_DYNAMIC_PRINTK_DEBUG=y
1948# CONFIG_SAMPLES is not set 2039# CONFIG_SAMPLES is not set
1949CONFIG_HAVE_ARCH_KGDB=y 2040CONFIG_HAVE_ARCH_KGDB=y
1950# CONFIG_KGDB is not set 2041# CONFIG_KGDB is not set
@@ -1954,6 +2045,7 @@ CONFIG_DEBUG_STACK_USAGE=y
1954# CONFIG_HCALL_STATS is not set 2045# CONFIG_HCALL_STATS is not set
1955# CONFIG_CODE_PATCHING_SELFTEST is not set 2046# CONFIG_CODE_PATCHING_SELFTEST is not set
1956# CONFIG_FTR_FIXUP_SELFTEST is not set 2047# CONFIG_FTR_FIXUP_SELFTEST is not set
2048# CONFIG_MSI_BITMAP_SELFTEST is not set
1957CONFIG_XMON=y 2049CONFIG_XMON=y
1958# CONFIG_XMON_DEFAULT is not set 2050# CONFIG_XMON_DEFAULT is not set
1959CONFIG_XMON_DISASSEMBLY=y 2051CONFIG_XMON_DISASSEMBLY=y
@@ -1968,6 +2060,7 @@ CONFIG_BOOTX_TEXT=y
1968# 2060#
1969# CONFIG_KEYS is not set 2061# CONFIG_KEYS is not set
1970# CONFIG_SECURITY is not set 2062# CONFIG_SECURITY is not set
2063# CONFIG_SECURITYFS is not set
1971# CONFIG_SECURITY_FILE_CAPABILITIES is not set 2064# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1972CONFIG_XOR_BLOCKS=y 2065CONFIG_XOR_BLOCKS=y
1973CONFIG_ASYNC_CORE=y 2066CONFIG_ASYNC_CORE=y
@@ -1978,10 +2071,12 @@ CONFIG_CRYPTO=y
1978# 2071#
1979# Crypto core or helper 2072# Crypto core or helper
1980# 2073#
2074# CONFIG_CRYPTO_FIPS is not set
1981CONFIG_CRYPTO_ALGAPI=y 2075CONFIG_CRYPTO_ALGAPI=y
1982CONFIG_CRYPTO_AEAD=m 2076CONFIG_CRYPTO_AEAD=y
1983CONFIG_CRYPTO_BLKCIPHER=y 2077CONFIG_CRYPTO_BLKCIPHER=y
1984CONFIG_CRYPTO_HASH=y 2078CONFIG_CRYPTO_HASH=y
2079CONFIG_CRYPTO_RNG=y
1985CONFIG_CRYPTO_MANAGER=y 2080CONFIG_CRYPTO_MANAGER=y
1986CONFIG_CRYPTO_GF128MUL=m 2081CONFIG_CRYPTO_GF128MUL=m
1987CONFIG_CRYPTO_NULL=m 2082CONFIG_CRYPTO_NULL=m
@@ -2055,6 +2150,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
2055# 2150#
2056CONFIG_CRYPTO_DEFLATE=m 2151CONFIG_CRYPTO_DEFLATE=m
2057CONFIG_CRYPTO_LZO=m 2152CONFIG_CRYPTO_LZO=m
2153
2154#
2155# Random Number Generation
2156#
2157# CONFIG_CRYPTO_ANSI_CPRNG is not set
2058# CONFIG_CRYPTO_HW is not set 2158# CONFIG_CRYPTO_HW is not set
2059# CONFIG_PPC_CLOCK is not set 2159# CONFIG_PPC_CLOCK is not set
2060# CONFIG_VIRTUALIZATION is not set 2160# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index 3c6dbdef56eb..01f05ec5abf3 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Tue Aug 26 13:29:50 2008 4# Tue Nov 11 19:37:01 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
23# CONFIG_SMP is not set 23# CONFIG_SMP is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -89,6 +89,7 @@ CONFIG_LOG_BUF_SHIFT=17
89CONFIG_CGROUPS=y 89CONFIG_CGROUPS=y
90# CONFIG_CGROUP_DEBUG is not set 90# CONFIG_CGROUP_DEBUG is not set
91CONFIG_CGROUP_NS=y 91CONFIG_CGROUP_NS=y
92# CONFIG_CGROUP_FREEZER is not set
92CONFIG_CGROUP_DEVICE=y 93CONFIG_CGROUP_DEVICE=y
93CONFIG_GROUP_SCHED=y 94CONFIG_GROUP_SCHED=y
94CONFIG_FAIR_GROUP_SCHED=y 95CONFIG_FAIR_GROUP_SCHED=y
@@ -128,12 +129,15 @@ CONFIG_SIGNALFD=y
128CONFIG_TIMERFD=y 129CONFIG_TIMERFD=y
129CONFIG_EVENTFD=y 130CONFIG_EVENTFD=y
130CONFIG_SHMEM=y 131CONFIG_SHMEM=y
132CONFIG_AIO=y
131CONFIG_VM_EVENT_COUNTERS=y 133CONFIG_VM_EVENT_COUNTERS=y
134CONFIG_PCI_QUIRKS=y
132CONFIG_SLUB_DEBUG=y 135CONFIG_SLUB_DEBUG=y
133# CONFIG_SLAB is not set 136# CONFIG_SLAB is not set
134CONFIG_SLUB=y 137CONFIG_SLUB=y
135# CONFIG_SLOB is not set 138# CONFIG_SLOB is not set
136CONFIG_PROFILING=y 139CONFIG_PROFILING=y
140CONFIG_TRACEPOINTS=y
137CONFIG_MARKERS=y 141CONFIG_MARKERS=y
138CONFIG_OPROFILE=m 142CONFIG_OPROFILE=m
139CONFIG_HAVE_OPROFILE=y 143CONFIG_HAVE_OPROFILE=y
@@ -144,10 +148,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
144CONFIG_HAVE_KPROBES=y 148CONFIG_HAVE_KPROBES=y
145CONFIG_HAVE_KRETPROBES=y 149CONFIG_HAVE_KRETPROBES=y
146CONFIG_HAVE_ARCH_TRACEHOOK=y 150CONFIG_HAVE_ARCH_TRACEHOOK=y
147# CONFIG_HAVE_DMA_ATTRS is not set
148# CONFIG_USE_GENERIC_SMP_HELPERS is not set
149CONFIG_HAVE_CLK=y 151CONFIG_HAVE_CLK=y
150CONFIG_PROC_PAGE_MONITOR=y
151# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 152# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
152CONFIG_SLABINFO=y 153CONFIG_SLABINFO=y
153CONFIG_RT_MUTEXES=y 154CONFIG_RT_MUTEXES=y
@@ -180,6 +181,8 @@ CONFIG_DEFAULT_CFQ=y
180# CONFIG_DEFAULT_NOOP is not set 181# CONFIG_DEFAULT_NOOP is not set
181CONFIG_DEFAULT_IOSCHED="cfq" 182CONFIG_DEFAULT_IOSCHED="cfq"
182CONFIG_CLASSIC_RCU=y 183CONFIG_CLASSIC_RCU=y
184CONFIG_FREEZER=y
185CONFIG_PPC_MSI_BITMAP=y
183 186
184# 187#
185# Platform support 188# Platform support
@@ -202,6 +205,7 @@ CONFIG_PPC_82xx=y
202CONFIG_MPC8272_ADS=y 205CONFIG_MPC8272_ADS=y
203CONFIG_PQ2FADS=y 206CONFIG_PQ2FADS=y
204CONFIG_EP8248E=y 207CONFIG_EP8248E=y
208CONFIG_MGCOGE=y
205CONFIG_PQ2ADS=y 209CONFIG_PQ2ADS=y
206CONFIG_8260=y 210CONFIG_8260=y
207CONFIG_8272=y 211CONFIG_8272=y
@@ -226,6 +230,7 @@ CONFIG_PPC_86xx=y
226CONFIG_MPC8641_HPCN=y 230CONFIG_MPC8641_HPCN=y
227CONFIG_SBC8641D=y 231CONFIG_SBC8641D=y
228CONFIG_MPC8610_HPCD=y 232CONFIG_MPC8610_HPCD=y
233CONFIG_GEF_SBC610=y
229CONFIG_MPC8641=y 234CONFIG_MPC8641=y
230CONFIG_MPC8610=y 235CONFIG_MPC8610=y
231# CONFIG_EMBEDDED6xx is not set 236# CONFIG_EMBEDDED6xx is not set
@@ -268,6 +273,7 @@ CONFIG_TAU=y
268# CONFIG_TAU_INT is not set 273# CONFIG_TAU_INT is not set
269CONFIG_TAU_AVERAGE=y 274CONFIG_TAU_AVERAGE=y
270CONFIG_QUICC_ENGINE=y 275CONFIG_QUICC_ENGINE=y
276CONFIG_QE_GPIO=y
271CONFIG_CPM2=y 277CONFIG_CPM2=y
272CONFIG_FSL_ULI1575=y 278CONFIG_FSL_ULI1575=y
273CONFIG_CPM=y 279CONFIG_CPM=y
@@ -275,6 +281,7 @@ CONFIG_PPC_BESTCOMM=y
275CONFIG_PPC_BESTCOMM_ATA=m 281CONFIG_PPC_BESTCOMM_ATA=m
276CONFIG_PPC_BESTCOMM_FEC=m 282CONFIG_PPC_BESTCOMM_FEC=m
277CONFIG_PPC_BESTCOMM_GEN_BD=m 283CONFIG_PPC_BESTCOMM_GEN_BD=m
284CONFIG_MPC8xxx_GPIO=y
278 285
279# 286#
280# Kernel options 287# Kernel options
@@ -294,6 +301,8 @@ CONFIG_SCHED_HRTICK=y
294CONFIG_PREEMPT_VOLUNTARY=y 301CONFIG_PREEMPT_VOLUNTARY=y
295# CONFIG_PREEMPT is not set 302# CONFIG_PREEMPT is not set
296CONFIG_BINFMT_ELF=y 303CONFIG_BINFMT_ELF=y
304# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
305# CONFIG_HAVE_AOUT is not set
297CONFIG_BINFMT_MISC=y 306CONFIG_BINFMT_MISC=y
298# CONFIG_MATH_EMULATION is not set 307# CONFIG_MATH_EMULATION is not set
299# CONFIG_IOMMU_HELPER is not set 308# CONFIG_IOMMU_HELPER is not set
@@ -309,15 +318,15 @@ CONFIG_FLATMEM_MANUAL=y
309# CONFIG_SPARSEMEM_MANUAL is not set 318# CONFIG_SPARSEMEM_MANUAL is not set
310CONFIG_FLATMEM=y 319CONFIG_FLATMEM=y
311CONFIG_FLAT_NODE_MEM_MAP=y 320CONFIG_FLAT_NODE_MEM_MAP=y
312# CONFIG_SPARSEMEM_STATIC is not set
313# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
314CONFIG_PAGEFLAGS_EXTENDED=y 321CONFIG_PAGEFLAGS_EXTENDED=y
315CONFIG_SPLIT_PTLOCK_CPUS=4 322CONFIG_SPLIT_PTLOCK_CPUS=4
316# CONFIG_MIGRATION is not set 323# CONFIG_MIGRATION is not set
317CONFIG_RESOURCES_64BIT=y 324CONFIG_RESOURCES_64BIT=y
325# CONFIG_PHYS_ADDR_T_64BIT is not set
318CONFIG_ZONE_DMA_FLAG=1 326CONFIG_ZONE_DMA_FLAG=1
319CONFIG_BOUNCE=y 327CONFIG_BOUNCE=y
320CONFIG_VIRT_TO_BUS=y 328CONFIG_VIRT_TO_BUS=y
329CONFIG_UNEVICTABLE_LRU=y
321CONFIG_FORCE_MAX_ZONEORDER=11 330CONFIG_FORCE_MAX_ZONEORDER=11
322CONFIG_PROC_DEVICETREE=y 331CONFIG_PROC_DEVICETREE=y
323# CONFIG_CMDLINE_BOOL is not set 332# CONFIG_CMDLINE_BOOL is not set
@@ -359,7 +368,7 @@ CONFIG_PCIEASPM=y
359# CONFIG_PCIEASPM_DEBUG is not set 368# CONFIG_PCIEASPM_DEBUG is not set
360CONFIG_ARCH_SUPPORTS_MSI=y 369CONFIG_ARCH_SUPPORTS_MSI=y
361CONFIG_PCI_MSI=y 370CONFIG_PCI_MSI=y
362CONFIG_PCI_LEGACY=y 371# CONFIG_PCI_LEGACY is not set
363# CONFIG_PCI_DEBUG is not set 372# CONFIG_PCI_DEBUG is not set
364CONFIG_PCCARD=y 373CONFIG_PCCARD=y
365# CONFIG_PCMCIA_DEBUG is not set 374# CONFIG_PCMCIA_DEBUG is not set
@@ -466,7 +475,6 @@ CONFIG_DEFAULT_CUBIC=y
466# CONFIG_DEFAULT_RENO is not set 475# CONFIG_DEFAULT_RENO is not set
467CONFIG_DEFAULT_TCP_CONG="cubic" 476CONFIG_DEFAULT_TCP_CONG="cubic"
468CONFIG_TCP_MD5SIG=y 477CONFIG_TCP_MD5SIG=y
469# CONFIG_IP_VS is not set
470CONFIG_IPV6=m 478CONFIG_IPV6=m
471CONFIG_IPV6_PRIVACY=y 479CONFIG_IPV6_PRIVACY=y
472CONFIG_IPV6_ROUTER_PREF=y 480CONFIG_IPV6_ROUTER_PREF=y
@@ -521,18 +529,20 @@ CONFIG_NF_CONNTRACK_SANE=m
521CONFIG_NF_CONNTRACK_SIP=m 529CONFIG_NF_CONNTRACK_SIP=m
522CONFIG_NF_CONNTRACK_TFTP=m 530CONFIG_NF_CONNTRACK_TFTP=m
523CONFIG_NF_CT_NETLINK=m 531CONFIG_NF_CT_NETLINK=m
532CONFIG_NETFILTER_TPROXY=m
524CONFIG_NETFILTER_XTABLES=m 533CONFIG_NETFILTER_XTABLES=m
525CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 534CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
526CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 535CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
536CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
527CONFIG_NETFILTER_XT_TARGET_DSCP=m 537CONFIG_NETFILTER_XT_TARGET_DSCP=m
528CONFIG_NETFILTER_XT_TARGET_MARK=m 538CONFIG_NETFILTER_XT_TARGET_MARK=m
529CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
530CONFIG_NETFILTER_XT_TARGET_NFLOG=m 539CONFIG_NETFILTER_XT_TARGET_NFLOG=m
540CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
531CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 541CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
532CONFIG_NETFILTER_XT_TARGET_RATEEST=m 542CONFIG_NETFILTER_XT_TARGET_RATEEST=m
543CONFIG_NETFILTER_XT_TARGET_TPROXY=m
533CONFIG_NETFILTER_XT_TARGET_TRACE=m 544CONFIG_NETFILTER_XT_TARGET_TRACE=m
534CONFIG_NETFILTER_XT_TARGET_SECMARK=m 545CONFIG_NETFILTER_XT_TARGET_SECMARK=m
535CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
536CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 546CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
537CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 547CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
538CONFIG_NETFILTER_XT_MATCH_COMMENT=m 548CONFIG_NETFILTER_XT_MATCH_COMMENT=m
@@ -543,41 +553,45 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
543CONFIG_NETFILTER_XT_MATCH_DCCP=m 553CONFIG_NETFILTER_XT_MATCH_DCCP=m
544CONFIG_NETFILTER_XT_MATCH_DSCP=m 554CONFIG_NETFILTER_XT_MATCH_DSCP=m
545CONFIG_NETFILTER_XT_MATCH_ESP=m 555CONFIG_NETFILTER_XT_MATCH_ESP=m
556CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
546CONFIG_NETFILTER_XT_MATCH_HELPER=m 557CONFIG_NETFILTER_XT_MATCH_HELPER=m
547CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 558CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
548CONFIG_NETFILTER_XT_MATCH_LENGTH=m 559CONFIG_NETFILTER_XT_MATCH_LENGTH=m
549CONFIG_NETFILTER_XT_MATCH_LIMIT=m 560CONFIG_NETFILTER_XT_MATCH_LIMIT=m
550CONFIG_NETFILTER_XT_MATCH_MAC=m 561CONFIG_NETFILTER_XT_MATCH_MAC=m
551CONFIG_NETFILTER_XT_MATCH_MARK=m 562CONFIG_NETFILTER_XT_MATCH_MARK=m
563CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
552CONFIG_NETFILTER_XT_MATCH_OWNER=m 564CONFIG_NETFILTER_XT_MATCH_OWNER=m
553CONFIG_NETFILTER_XT_MATCH_POLICY=m 565CONFIG_NETFILTER_XT_MATCH_POLICY=m
554CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
555CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m 566CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
556CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 567CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
557CONFIG_NETFILTER_XT_MATCH_QUOTA=m 568CONFIG_NETFILTER_XT_MATCH_QUOTA=m
558CONFIG_NETFILTER_XT_MATCH_RATEEST=m 569CONFIG_NETFILTER_XT_MATCH_RATEEST=m
559CONFIG_NETFILTER_XT_MATCH_REALM=m 570CONFIG_NETFILTER_XT_MATCH_REALM=m
571CONFIG_NETFILTER_XT_MATCH_RECENT=m
572# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
560CONFIG_NETFILTER_XT_MATCH_SCTP=m 573CONFIG_NETFILTER_XT_MATCH_SCTP=m
574CONFIG_NETFILTER_XT_MATCH_SOCKET=m
561CONFIG_NETFILTER_XT_MATCH_STATE=m 575CONFIG_NETFILTER_XT_MATCH_STATE=m
562CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 576CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
563CONFIG_NETFILTER_XT_MATCH_STRING=m 577CONFIG_NETFILTER_XT_MATCH_STRING=m
564CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 578CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
565CONFIG_NETFILTER_XT_MATCH_TIME=m 579CONFIG_NETFILTER_XT_MATCH_TIME=m
566CONFIG_NETFILTER_XT_MATCH_U32=m 580CONFIG_NETFILTER_XT_MATCH_U32=m
567CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 581# CONFIG_IP_VS is not set
568 582
569# 583#
570# IP: Netfilter Configuration 584# IP: Netfilter Configuration
571# 585#
586CONFIG_NF_DEFRAG_IPV4=m
572CONFIG_NF_CONNTRACK_IPV4=m 587CONFIG_NF_CONNTRACK_IPV4=m
573# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set 588# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
574CONFIG_IP_NF_QUEUE=m 589CONFIG_IP_NF_QUEUE=m
575CONFIG_IP_NF_IPTABLES=m 590CONFIG_IP_NF_IPTABLES=m
576CONFIG_IP_NF_MATCH_RECENT=m 591CONFIG_IP_NF_MATCH_ADDRTYPE=m
577CONFIG_IP_NF_MATCH_ECN=m
578CONFIG_IP_NF_MATCH_AH=m 592CONFIG_IP_NF_MATCH_AH=m
593CONFIG_IP_NF_MATCH_ECN=m
579CONFIG_IP_NF_MATCH_TTL=m 594CONFIG_IP_NF_MATCH_TTL=m
580CONFIG_IP_NF_MATCH_ADDRTYPE=m
581CONFIG_IP_NF_FILTER=m 595CONFIG_IP_NF_FILTER=m
582CONFIG_IP_NF_TARGET_REJECT=m 596CONFIG_IP_NF_TARGET_REJECT=m
583CONFIG_IP_NF_TARGET_LOG=m 597CONFIG_IP_NF_TARGET_LOG=m
@@ -585,8 +599,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
585CONFIG_NF_NAT=m 599CONFIG_NF_NAT=m
586CONFIG_NF_NAT_NEEDED=y 600CONFIG_NF_NAT_NEEDED=y
587CONFIG_IP_NF_TARGET_MASQUERADE=m 601CONFIG_IP_NF_TARGET_MASQUERADE=m
588CONFIG_IP_NF_TARGET_REDIRECT=m
589CONFIG_IP_NF_TARGET_NETMAP=m 602CONFIG_IP_NF_TARGET_NETMAP=m
603CONFIG_IP_NF_TARGET_REDIRECT=m
590CONFIG_NF_NAT_SNMP_BASIC=m 604CONFIG_NF_NAT_SNMP_BASIC=m
591CONFIG_NF_NAT_PROTO_DCCP=m 605CONFIG_NF_NAT_PROTO_DCCP=m
592CONFIG_NF_NAT_PROTO_GRE=m 606CONFIG_NF_NAT_PROTO_GRE=m
@@ -600,9 +614,9 @@ CONFIG_NF_NAT_PPTP=m
600CONFIG_NF_NAT_H323=m 614CONFIG_NF_NAT_H323=m
601CONFIG_NF_NAT_SIP=m 615CONFIG_NF_NAT_SIP=m
602CONFIG_IP_NF_MANGLE=m 616CONFIG_IP_NF_MANGLE=m
617CONFIG_IP_NF_TARGET_CLUSTERIP=m
603CONFIG_IP_NF_TARGET_ECN=m 618CONFIG_IP_NF_TARGET_ECN=m
604CONFIG_IP_NF_TARGET_TTL=m 619CONFIG_IP_NF_TARGET_TTL=m
605CONFIG_IP_NF_TARGET_CLUSTERIP=m
606CONFIG_IP_NF_RAW=m 620CONFIG_IP_NF_RAW=m
607CONFIG_IP_NF_SECURITY=m 621CONFIG_IP_NF_SECURITY=m
608CONFIG_IP_NF_ARPTABLES=m 622CONFIG_IP_NF_ARPTABLES=m
@@ -615,16 +629,16 @@ CONFIG_IP_NF_ARP_MANGLE=m
615CONFIG_NF_CONNTRACK_IPV6=m 629CONFIG_NF_CONNTRACK_IPV6=m
616CONFIG_IP6_NF_QUEUE=m 630CONFIG_IP6_NF_QUEUE=m
617CONFIG_IP6_NF_IPTABLES=m 631CONFIG_IP6_NF_IPTABLES=m
618CONFIG_IP6_NF_MATCH_RT=m 632CONFIG_IP6_NF_MATCH_AH=m
619CONFIG_IP6_NF_MATCH_OPTS=m 633CONFIG_IP6_NF_MATCH_EUI64=m
620CONFIG_IP6_NF_MATCH_FRAG=m 634CONFIG_IP6_NF_MATCH_FRAG=m
635CONFIG_IP6_NF_MATCH_OPTS=m
621CONFIG_IP6_NF_MATCH_HL=m 636CONFIG_IP6_NF_MATCH_HL=m
622CONFIG_IP6_NF_MATCH_IPV6HEADER=m 637CONFIG_IP6_NF_MATCH_IPV6HEADER=m
623CONFIG_IP6_NF_MATCH_AH=m
624CONFIG_IP6_NF_MATCH_MH=m 638CONFIG_IP6_NF_MATCH_MH=m
625CONFIG_IP6_NF_MATCH_EUI64=m 639CONFIG_IP6_NF_MATCH_RT=m
626CONFIG_IP6_NF_FILTER=m
627CONFIG_IP6_NF_TARGET_LOG=m 640CONFIG_IP6_NF_TARGET_LOG=m
641CONFIG_IP6_NF_FILTER=m
628CONFIG_IP6_NF_TARGET_REJECT=m 642CONFIG_IP6_NF_TARGET_REJECT=m
629CONFIG_IP6_NF_MANGLE=m 643CONFIG_IP6_NF_MANGLE=m
630CONFIG_IP6_NF_TARGET_HL=m 644CONFIG_IP6_NF_TARGET_HL=m
@@ -635,10 +649,6 @@ CONFIG_IP6_NF_SECURITY=m
635# DECnet: Netfilter Configuration 649# DECnet: Netfilter Configuration
636# 650#
637# CONFIG_DECNET_NF_GRABULATOR is not set 651# CONFIG_DECNET_NF_GRABULATOR is not set
638
639#
640# Bridge: Netfilter Configuration
641#
642CONFIG_BRIDGE_NF_EBTABLES=m 652CONFIG_BRIDGE_NF_EBTABLES=m
643CONFIG_BRIDGE_EBT_BROUTE=m 653CONFIG_BRIDGE_EBT_BROUTE=m
644CONFIG_BRIDGE_EBT_T_FILTER=m 654CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -698,6 +708,7 @@ CONFIG_ATM_BR2684=m
698# CONFIG_ATM_BR2684_IPFILTER is not set 708# CONFIG_ATM_BR2684_IPFILTER is not set
699CONFIG_STP=m 709CONFIG_STP=m
700CONFIG_BRIDGE=m 710CONFIG_BRIDGE=m
711# CONFIG_NET_DSA is not set
701CONFIG_VLAN_8021Q=m 712CONFIG_VLAN_8021Q=m
702# CONFIG_VLAN_8021Q_GVRP is not set 713# CONFIG_VLAN_8021Q_GVRP is not set
703CONFIG_DECNET=m 714CONFIG_DECNET=m
@@ -727,6 +738,7 @@ CONFIG_NET_SCH_HTB=m
727CONFIG_NET_SCH_HFSC=m 738CONFIG_NET_SCH_HFSC=m
728CONFIG_NET_SCH_ATM=m 739CONFIG_NET_SCH_ATM=m
729CONFIG_NET_SCH_PRIO=m 740CONFIG_NET_SCH_PRIO=m
741CONFIG_NET_SCH_MULTIQ=m
730CONFIG_NET_SCH_RED=m 742CONFIG_NET_SCH_RED=m
731CONFIG_NET_SCH_SFQ=m 743CONFIG_NET_SCH_SFQ=m
732CONFIG_NET_SCH_TEQL=m 744CONFIG_NET_SCH_TEQL=m
@@ -767,6 +779,7 @@ CONFIG_NET_ACT_IPT=m
767CONFIG_NET_ACT_NAT=m 779CONFIG_NET_ACT_NAT=m
768CONFIG_NET_ACT_PEDIT=m 780CONFIG_NET_ACT_PEDIT=m
769CONFIG_NET_ACT_SIMP=m 781CONFIG_NET_ACT_SIMP=m
782CONFIG_NET_ACT_SKBEDIT=m
770CONFIG_NET_CLS_IND=y 783CONFIG_NET_CLS_IND=y
771CONFIG_NET_SCH_FIFO=y 784CONFIG_NET_SCH_FIFO=y
772 785
@@ -853,13 +866,12 @@ CONFIG_BT_HCIBLUECARD=m
853CONFIG_BT_HCIBTUART=m 866CONFIG_BT_HCIBTUART=m
854CONFIG_BT_HCIVHCI=m 867CONFIG_BT_HCIVHCI=m
855# CONFIG_AF_RXRPC is not set 868# CONFIG_AF_RXRPC is not set
869# CONFIG_PHONET is not set
856CONFIG_FIB_RULES=y 870CONFIG_FIB_RULES=y
857 871CONFIG_WIRELESS=y
858#
859# Wireless
860#
861CONFIG_CFG80211=m 872CONFIG_CFG80211=m
862CONFIG_NL80211=y 873CONFIG_NL80211=y
874CONFIG_WIRELESS_OLD_REGULATORY=y
863CONFIG_WIRELESS_EXT=y 875CONFIG_WIRELESS_EXT=y
864CONFIG_WIRELESS_EXT_SYSFS=y 876CONFIG_WIRELESS_EXT_SYSFS=y
865CONFIG_MAC80211=m 877CONFIG_MAC80211=m
@@ -868,7 +880,9 @@ CONFIG_MAC80211=m
868# Rate control algorithm selection 880# Rate control algorithm selection
869# 881#
870CONFIG_MAC80211_RC_PID=y 882CONFIG_MAC80211_RC_PID=y
883# CONFIG_MAC80211_RC_MINSTREL is not set
871CONFIG_MAC80211_RC_DEFAULT_PID=y 884CONFIG_MAC80211_RC_DEFAULT_PID=y
885# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
872CONFIG_MAC80211_RC_DEFAULT="pid" 886CONFIG_MAC80211_RC_DEFAULT="pid"
873CONFIG_MAC80211_MESH=y 887CONFIG_MAC80211_MESH=y
874CONFIG_MAC80211_LEDS=y 888CONFIG_MAC80211_LEDS=y
@@ -917,7 +931,7 @@ CONFIG_PARPORT_SERIAL=m
917CONFIG_PARPORT_1284=y 931CONFIG_PARPORT_1284=y
918CONFIG_PARPORT_NOT_PC=y 932CONFIG_PARPORT_NOT_PC=y
919CONFIG_PNP=y 933CONFIG_PNP=y
920# CONFIG_PNP_DEBUG is not set 934CONFIG_PNP_DEBUG_MESSAGES=y
921 935
922# 936#
923# Protocols 937# Protocols
@@ -958,22 +972,20 @@ CONFIG_ENCLOSURE_SERVICES=m
958# CONFIG_HP_ILO is not set 972# CONFIG_HP_ILO is not set
959CONFIG_HAVE_IDE=y 973CONFIG_HAVE_IDE=y
960CONFIG_IDE=y 974CONFIG_IDE=y
961CONFIG_BLK_DEV_IDE=y
962 975
963# 976#
964# Please see Documentation/ide/ide.txt for help/info on IDE drives 977# Please see Documentation/ide/ide.txt for help/info on IDE drives
965# 978#
966CONFIG_IDE_TIMINGS=y 979CONFIG_IDE_TIMINGS=y
967CONFIG_IDE_ATAPI=y
968# CONFIG_BLK_DEV_IDE_SATA is not set 980# CONFIG_BLK_DEV_IDE_SATA is not set
969CONFIG_BLK_DEV_IDEDISK=y 981CONFIG_IDE_GD=y
970CONFIG_IDEDISK_MULTI_MODE=y 982CONFIG_IDE_GD_ATA=y
983# CONFIG_IDE_GD_ATAPI is not set
971# CONFIG_BLK_DEV_IDECS is not set 984# CONFIG_BLK_DEV_IDECS is not set
972# CONFIG_BLK_DEV_DELKIN is not set 985# CONFIG_BLK_DEV_DELKIN is not set
973CONFIG_BLK_DEV_IDECD=m 986CONFIG_BLK_DEV_IDECD=m
974CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 987CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
975# CONFIG_BLK_DEV_IDETAPE is not set 988# CONFIG_BLK_DEV_IDETAPE is not set
976CONFIG_BLK_DEV_IDEFLOPPY=m
977# CONFIG_BLK_DEV_IDESCSI is not set 989# CONFIG_BLK_DEV_IDESCSI is not set
978CONFIG_IDE_TASK_IOCTL=y 990CONFIG_IDE_TASK_IOCTL=y
979CONFIG_IDE_PROC_FS=y 991CONFIG_IDE_PROC_FS=y
@@ -1201,6 +1213,7 @@ CONFIG_PATA_OF_PLATFORM=m
1201CONFIG_PATA_SCH=m 1213CONFIG_PATA_SCH=m
1202CONFIG_MD=y 1214CONFIG_MD=y
1203CONFIG_BLK_DEV_MD=y 1215CONFIG_BLK_DEV_MD=y
1216CONFIG_MD_AUTODETECT=y
1204CONFIG_MD_LINEAR=m 1217CONFIG_MD_LINEAR=m
1205CONFIG_MD_RAID0=m 1218CONFIG_MD_RAID0=m
1206CONFIG_MD_RAID1=m 1219CONFIG_MD_RAID1=m
@@ -1332,6 +1345,9 @@ CONFIG_NE2000=m
1332# CONFIG_IBM_NEW_EMAC_RGMII is not set 1345# CONFIG_IBM_NEW_EMAC_RGMII is not set
1333# CONFIG_IBM_NEW_EMAC_TAH is not set 1346# CONFIG_IBM_NEW_EMAC_TAH is not set
1334# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 1347# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
1348# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
1349# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
1350# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
1335CONFIG_NET_PCI=y 1351CONFIG_NET_PCI=y
1336CONFIG_PCNET32=m 1352CONFIG_PCNET32=m
1337CONFIG_AMD8111_ETH=m 1353CONFIG_AMD8111_ETH=m
@@ -1370,13 +1386,13 @@ CONFIG_DE600=m
1370CONFIG_DE620=m 1386CONFIG_DE620=m
1371CONFIG_FEC_MPC52xx=m 1387CONFIG_FEC_MPC52xx=m
1372CONFIG_FEC_MPC52xx_MDIO=y 1388CONFIG_FEC_MPC52xx_MDIO=y
1389# CONFIG_ATL2 is not set
1373# CONFIG_FS_ENET is not set 1390# CONFIG_FS_ENET is not set
1374CONFIG_NETDEV_1000=y 1391CONFIG_NETDEV_1000=y
1375CONFIG_ACENIC=m 1392CONFIG_ACENIC=m
1376# CONFIG_ACENIC_OMIT_TIGON_I is not set 1393# CONFIG_ACENIC_OMIT_TIGON_I is not set
1377CONFIG_DL2K=m 1394CONFIG_DL2K=m
1378CONFIG_E1000=m 1395CONFIG_E1000=m
1379# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
1380CONFIG_E1000E=m 1396CONFIG_E1000E=m
1381CONFIG_IP1000=m 1397CONFIG_IP1000=m
1382CONFIG_IGB=m 1398CONFIG_IGB=m
@@ -1400,19 +1416,23 @@ CONFIG_MV643XX_ETH=m
1400CONFIG_QLA3XXX=m 1416CONFIG_QLA3XXX=m
1401CONFIG_ATL1=m 1417CONFIG_ATL1=m
1402# CONFIG_ATL1E is not set 1418# CONFIG_ATL1E is not set
1419# CONFIG_JME is not set
1403CONFIG_NETDEV_10000=y 1420CONFIG_NETDEV_10000=y
1404CONFIG_CHELSIO_T1=m 1421CONFIG_CHELSIO_T1=m
1405CONFIG_CHELSIO_T1_1G=y 1422CONFIG_CHELSIO_T1_1G=y
1406CONFIG_CHELSIO_T3=m 1423CONFIG_CHELSIO_T3=m
1424# CONFIG_ENIC is not set
1407CONFIG_IXGBE=m 1425CONFIG_IXGBE=m
1408CONFIG_IXGB=m 1426CONFIG_IXGB=m
1409CONFIG_S2IO=m 1427CONFIG_S2IO=m
1410CONFIG_MYRI10GE=m 1428CONFIG_MYRI10GE=m
1411CONFIG_NETXEN_NIC=m 1429CONFIG_NETXEN_NIC=m
1412CONFIG_NIU=m 1430CONFIG_NIU=m
1431# CONFIG_MLX4_EN is not set
1413# CONFIG_MLX4_CORE is not set 1432# CONFIG_MLX4_CORE is not set
1414CONFIG_TEHUTI=m 1433CONFIG_TEHUTI=m
1415CONFIG_BNX2X=m 1434CONFIG_BNX2X=m
1435CONFIG_QLGE=m
1416CONFIG_SFC=m 1436CONFIG_SFC=m
1417# CONFIG_TR is not set 1437# CONFIG_TR is not set
1418 1438
@@ -1434,6 +1454,7 @@ CONFIG_USB_USBNET=m
1434CONFIG_USB_NET_AX8817X=m 1454CONFIG_USB_NET_AX8817X=m
1435CONFIG_USB_NET_CDCETHER=m 1455CONFIG_USB_NET_CDCETHER=m
1436CONFIG_USB_NET_DM9601=m 1456CONFIG_USB_NET_DM9601=m
1457CONFIG_USB_NET_SMSC95XX=m
1437CONFIG_USB_NET_GL620A=m 1458CONFIG_USB_NET_GL620A=m
1438CONFIG_USB_NET_NET1080=m 1459CONFIG_USB_NET_NET1080=m
1439CONFIG_USB_NET_PLUSB=m 1460CONFIG_USB_NET_PLUSB=m
@@ -1546,6 +1567,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
1546CONFIG_MOUSE_PS2_SYNAPTICS=y 1567CONFIG_MOUSE_PS2_SYNAPTICS=y
1547CONFIG_MOUSE_PS2_LIFEBOOK=y 1568CONFIG_MOUSE_PS2_LIFEBOOK=y
1548CONFIG_MOUSE_PS2_TRACKPOINT=y 1569CONFIG_MOUSE_PS2_TRACKPOINT=y
1570# CONFIG_MOUSE_PS2_ELANTECH is not set
1549# CONFIG_MOUSE_PS2_TOUCHKIT is not set 1571# CONFIG_MOUSE_PS2_TOUCHKIT is not set
1550CONFIG_MOUSE_SERIAL=m 1572CONFIG_MOUSE_SERIAL=m
1551CONFIG_MOUSE_APPLETOUCH=m 1573CONFIG_MOUSE_APPLETOUCH=m
@@ -1598,6 +1620,7 @@ CONFIG_INPUT_ATI_REMOTE2=m
1598CONFIG_INPUT_KEYSPAN_REMOTE=m 1620CONFIG_INPUT_KEYSPAN_REMOTE=m
1599CONFIG_INPUT_POWERMATE=m 1621CONFIG_INPUT_POWERMATE=m
1600CONFIG_INPUT_YEALINK=m 1622CONFIG_INPUT_YEALINK=m
1623CONFIG_INPUT_CM109=m
1601CONFIG_INPUT_UINPUT=m 1624CONFIG_INPUT_UINPUT=m
1602 1625
1603# 1626#
@@ -1787,6 +1810,7 @@ CONFIG_SENSORS_PCF8591=m
1787# CONFIG_TPS65010 is not set 1810# CONFIG_TPS65010 is not set
1788CONFIG_SENSORS_MAX6875=m 1811CONFIG_SENSORS_MAX6875=m
1789CONFIG_SENSORS_TSL2550=m 1812CONFIG_SENSORS_TSL2550=m
1813CONFIG_MCU_MPC8349EMITX=m
1790# CONFIG_I2C_DEBUG_CORE is not set 1814# CONFIG_I2C_DEBUG_CORE is not set
1791# CONFIG_I2C_DEBUG_ALGO is not set 1815# CONFIG_I2C_DEBUG_ALGO is not set
1792# CONFIG_I2C_DEBUG_BUS is not set 1816# CONFIG_I2C_DEBUG_BUS is not set
@@ -1837,6 +1861,7 @@ CONFIG_POWER_SUPPLY=m
1837CONFIG_APM_POWER=m 1861CONFIG_APM_POWER=m
1838# CONFIG_BATTERY_DS2760 is not set 1862# CONFIG_BATTERY_DS2760 is not set
1839CONFIG_BATTERY_PMU=m 1863CONFIG_BATTERY_PMU=m
1864# CONFIG_BATTERY_BQ27x00 is not set
1840CONFIG_HWMON=m 1865CONFIG_HWMON=m
1841CONFIG_HWMON_VID=m 1866CONFIG_HWMON_VID=m
1842# CONFIG_SENSORS_AD7414 is not set 1867# CONFIG_SENSORS_AD7414 is not set
@@ -1946,8 +1971,21 @@ CONFIG_SSB_DRIVER_PCICORE=y
1946# 1971#
1947# CONFIG_MFD_CORE is not set 1972# CONFIG_MFD_CORE is not set
1948CONFIG_MFD_SM501=m 1973CONFIG_MFD_SM501=m
1974CONFIG_MFD_SM501_GPIO=y
1949# CONFIG_HTC_PASIC3 is not set 1975# CONFIG_HTC_PASIC3 is not set
1976# CONFIG_UCB1400_CORE is not set
1950# CONFIG_MFD_TMIO is not set 1977# CONFIG_MFD_TMIO is not set
1978# CONFIG_PMIC_DA903X is not set
1979# CONFIG_MFD_WM8400 is not set
1980# CONFIG_MFD_WM8350_I2C is not set
1981
1982#
1983# Voltage and Current regulators
1984#
1985# CONFIG_REGULATOR is not set
1986# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1987# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1988# CONFIG_REGULATOR_BQ24022 is not set
1951 1989
1952# 1990#
1953# Multimedia devices 1991# Multimedia devices
@@ -1999,6 +2037,7 @@ CONFIG_VIDEO_TVEEPROM=m
1999CONFIG_VIDEO_TUNER=m 2037CONFIG_VIDEO_TUNER=m
2000CONFIG_VIDEO_CAPTURE_DRIVERS=y 2038CONFIG_VIDEO_CAPTURE_DRIVERS=y
2001# CONFIG_VIDEO_ADV_DEBUG is not set 2039# CONFIG_VIDEO_ADV_DEBUG is not set
2040# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
2002# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set 2041# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
2003CONFIG_VIDEO_IR_I2C=m 2042CONFIG_VIDEO_IR_I2C=m
2004 2043
@@ -2079,14 +2118,12 @@ CONFIG_VIDEO_CPIA_USB=m
2079CONFIG_VIDEO_CPIA2=m 2118CONFIG_VIDEO_CPIA2=m
2080CONFIG_VIDEO_SAA5246A=m 2119CONFIG_VIDEO_SAA5246A=m
2081CONFIG_VIDEO_SAA5249=m 2120CONFIG_VIDEO_SAA5249=m
2082CONFIG_TUNER_3036=m
2083# CONFIG_VIDEO_STRADIS is not set 2121# CONFIG_VIDEO_STRADIS is not set
2084# CONFIG_VIDEO_ZORAN is not set 2122# CONFIG_VIDEO_ZORAN is not set
2085CONFIG_VIDEO_SAA7134=m 2123CONFIG_VIDEO_SAA7134=m
2086CONFIG_VIDEO_SAA7134_ALSA=m 2124CONFIG_VIDEO_SAA7134_ALSA=m
2087CONFIG_VIDEO_SAA7134_DVB=m 2125CONFIG_VIDEO_SAA7134_DVB=m
2088CONFIG_VIDEO_MXB=m 2126CONFIG_VIDEO_MXB=m
2089CONFIG_VIDEO_DPC=m
2090CONFIG_VIDEO_HEXIUM_ORION=m 2127CONFIG_VIDEO_HEXIUM_ORION=m
2091CONFIG_VIDEO_HEXIUM_GEMINI=m 2128CONFIG_VIDEO_HEXIUM_GEMINI=m
2092CONFIG_VIDEO_CX88=m 2129CONFIG_VIDEO_CX88=m
@@ -2100,10 +2137,40 @@ CONFIG_VIDEO_IVTV=m
2100CONFIG_VIDEO_FB_IVTV=m 2137CONFIG_VIDEO_FB_IVTV=m
2101CONFIG_VIDEO_CX18=m 2138CONFIG_VIDEO_CX18=m
2102# CONFIG_VIDEO_CAFE_CCIC is not set 2139# CONFIG_VIDEO_CAFE_CCIC is not set
2140CONFIG_SOC_CAMERA=m
2141CONFIG_SOC_CAMERA_MT9M001=m
2142# CONFIG_MT9M001_PCA9536_SWITCH is not set
2143# CONFIG_SOC_CAMERA_MT9M111 is not set
2144CONFIG_SOC_CAMERA_MT9V022=m
2145# CONFIG_MT9V022_PCA9536_SWITCH is not set
2146# CONFIG_SOC_CAMERA_PLATFORM is not set
2147# CONFIG_VIDEO_SH_MOBILE_CEU is not set
2103CONFIG_V4L_USB_DRIVERS=y 2148CONFIG_V4L_USB_DRIVERS=y
2104CONFIG_USB_VIDEO_CLASS=m 2149CONFIG_USB_VIDEO_CLASS=m
2105CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y 2150CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
2106CONFIG_USB_GSPCA=m 2151CONFIG_USB_GSPCA=m
2152# CONFIG_USB_M5602 is not set
2153# CONFIG_USB_GSPCA_CONEX is not set
2154# CONFIG_USB_GSPCA_ETOMS is not set
2155# CONFIG_USB_GSPCA_FINEPIX is not set
2156# CONFIG_USB_GSPCA_MARS is not set
2157# CONFIG_USB_GSPCA_OV519 is not set
2158# CONFIG_USB_GSPCA_PAC207 is not set
2159# CONFIG_USB_GSPCA_PAC7311 is not set
2160# CONFIG_USB_GSPCA_SONIXB is not set
2161# CONFIG_USB_GSPCA_SONIXJ is not set
2162# CONFIG_USB_GSPCA_SPCA500 is not set
2163# CONFIG_USB_GSPCA_SPCA501 is not set
2164# CONFIG_USB_GSPCA_SPCA505 is not set
2165# CONFIG_USB_GSPCA_SPCA506 is not set
2166# CONFIG_USB_GSPCA_SPCA508 is not set
2167# CONFIG_USB_GSPCA_SPCA561 is not set
2168# CONFIG_USB_GSPCA_STK014 is not set
2169# CONFIG_USB_GSPCA_SUNPLUS is not set
2170# CONFIG_USB_GSPCA_T613 is not set
2171# CONFIG_USB_GSPCA_TV8532 is not set
2172# CONFIG_USB_GSPCA_VC032X is not set
2173# CONFIG_USB_GSPCA_ZC3XX is not set
2107CONFIG_VIDEO_PVRUSB2=m 2174CONFIG_VIDEO_PVRUSB2=m
2108CONFIG_VIDEO_PVRUSB2_SYSFS=y 2175CONFIG_VIDEO_PVRUSB2_SYSFS=y
2109CONFIG_VIDEO_PVRUSB2_DVB=y 2176CONFIG_VIDEO_PVRUSB2_DVB=y
@@ -2130,13 +2197,6 @@ CONFIG_USB_PWC=m
2130CONFIG_USB_ZR364XX=m 2197CONFIG_USB_ZR364XX=m
2131CONFIG_USB_STKWEBCAM=m 2198CONFIG_USB_STKWEBCAM=m
2132# CONFIG_USB_S2255 is not set 2199# CONFIG_USB_S2255 is not set
2133CONFIG_SOC_CAMERA=m
2134CONFIG_SOC_CAMERA_MT9M001=m
2135# CONFIG_MT9M001_PCA9536_SWITCH is not set
2136CONFIG_SOC_CAMERA_MT9V022=m
2137# CONFIG_MT9V022_PCA9536_SWITCH is not set
2138# CONFIG_SOC_CAMERA_PLATFORM is not set
2139# CONFIG_VIDEO_SH_MOBILE_CEU is not set
2140CONFIG_RADIO_ADAPTERS=y 2200CONFIG_RADIO_ADAPTERS=y
2141# CONFIG_RADIO_CADET is not set 2201# CONFIG_RADIO_CADET is not set
2142# CONFIG_RADIO_RTRACK is not set 2202# CONFIG_RADIO_RTRACK is not set
@@ -2154,6 +2214,7 @@ CONFIG_RADIO_MAESTRO=m
2154# CONFIG_RADIO_ZOLTRIX is not set 2214# CONFIG_RADIO_ZOLTRIX is not set
2155CONFIG_USB_DSBR=m 2215CONFIG_USB_DSBR=m
2156CONFIG_USB_SI470X=m 2216CONFIG_USB_SI470X=m
2217CONFIG_USB_MR800=m
2157CONFIG_DVB_CAPTURE_DRIVERS=y 2218CONFIG_DVB_CAPTURE_DRIVERS=y
2158 2219
2159# 2220#
@@ -2194,16 +2255,12 @@ CONFIG_DVB_USB_OPERA1=m
2194CONFIG_DVB_USB_AF9005=m 2255CONFIG_DVB_USB_AF9005=m
2195CONFIG_DVB_USB_AF9005_REMOTE=m 2256CONFIG_DVB_USB_AF9005_REMOTE=m
2196# CONFIG_DVB_USB_DW2102 is not set 2257# CONFIG_DVB_USB_DW2102 is not set
2258# CONFIG_DVB_USB_CINERGY_T2 is not set
2197# CONFIG_DVB_USB_ANYSEE is not set 2259# CONFIG_DVB_USB_ANYSEE is not set
2260# CONFIG_DVB_USB_DTV5100 is not set
2261# CONFIG_DVB_USB_AF9015 is not set
2198CONFIG_DVB_TTUSB_BUDGET=m 2262CONFIG_DVB_TTUSB_BUDGET=m
2199CONFIG_DVB_TTUSB_DEC=m 2263CONFIG_DVB_TTUSB_DEC=m
2200CONFIG_DVB_CINERGYT2=m
2201CONFIG_DVB_CINERGYT2_TUNING=y
2202CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT=32
2203CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512
2204CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250
2205CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y
2206CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100
2207# CONFIG_DVB_SIANO_SMS1XXX is not set 2264# CONFIG_DVB_SIANO_SMS1XXX is not set
2208 2265
2209# 2266#
@@ -2225,6 +2282,11 @@ CONFIG_DVB_BT8XX=m
2225CONFIG_DVB_PLUTO2=m 2282CONFIG_DVB_PLUTO2=m
2226 2283
2227# 2284#
2285# Supported SDMC DM1105 Adapters
2286#
2287CONFIG_DVB_DM1105=m
2288
2289#
2228# Supported DVB Frontends 2290# Supported DVB Frontends
2229# 2291#
2230 2292
@@ -2240,6 +2302,8 @@ CONFIG_DVB_CX24110=m
2240CONFIG_DVB_CX24123=m 2302CONFIG_DVB_CX24123=m
2241CONFIG_DVB_MT312=m 2303CONFIG_DVB_MT312=m
2242CONFIG_DVB_S5H1420=m 2304CONFIG_DVB_S5H1420=m
2305CONFIG_DVB_STV0288=m
2306CONFIG_DVB_STB6000=m
2243CONFIG_DVB_STV0299=m 2307CONFIG_DVB_STV0299=m
2244CONFIG_DVB_TDA8083=m 2308CONFIG_DVB_TDA8083=m
2245CONFIG_DVB_TDA10086=m 2309CONFIG_DVB_TDA10086=m
@@ -2247,6 +2311,8 @@ CONFIG_DVB_VES1X93=m
2247CONFIG_DVB_TUNER_ITD1000=m 2311CONFIG_DVB_TUNER_ITD1000=m
2248CONFIG_DVB_TDA826X=m 2312CONFIG_DVB_TDA826X=m
2249CONFIG_DVB_TUA6100=m 2313CONFIG_DVB_TUA6100=m
2314CONFIG_DVB_CX24116=m
2315CONFIG_DVB_SI21XX=m
2250 2316
2251# 2317#
2252# DVB-T (terrestrial) frontends 2318# DVB-T (terrestrial) frontends
@@ -2299,6 +2365,13 @@ CONFIG_DVB_TUNER_DIB0070=m
2299CONFIG_DVB_LNBP21=m 2365CONFIG_DVB_LNBP21=m
2300CONFIG_DVB_ISL6405=m 2366CONFIG_DVB_ISL6405=m
2301CONFIG_DVB_ISL6421=m 2367CONFIG_DVB_ISL6421=m
2368CONFIG_DVB_LGS8GL5=m
2369
2370#
2371# Tools to develop new frontends
2372#
2373# CONFIG_DVB_DUMMY_FE is not set
2374# CONFIG_DVB_AF9013 is not set
2302CONFIG_DAB=y 2375CONFIG_DAB=y
2303CONFIG_USB_DABUSB=m 2376CONFIG_USB_DABUSB=m
2304 2377
@@ -2320,6 +2393,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
2320CONFIG_FB=y 2393CONFIG_FB=y
2321# CONFIG_FIRMWARE_EDID is not set 2394# CONFIG_FIRMWARE_EDID is not set
2322CONFIG_FB_DDC=y 2395CONFIG_FB_DDC=y
2396# CONFIG_FB_BOOT_VESA_SUPPORT is not set
2323CONFIG_FB_CFB_FILLRECT=y 2397CONFIG_FB_CFB_FILLRECT=y
2324CONFIG_FB_CFB_COPYAREA=y 2398CONFIG_FB_CFB_COPYAREA=y
2325CONFIG_FB_CFB_IMAGEBLIT=y 2399CONFIG_FB_CFB_IMAGEBLIT=y
@@ -2382,6 +2456,7 @@ CONFIG_FB_SAVAGE=m
2382CONFIG_FB_SAVAGE_I2C=y 2456CONFIG_FB_SAVAGE_I2C=y
2383CONFIG_FB_SAVAGE_ACCEL=y 2457CONFIG_FB_SAVAGE_ACCEL=y
2384# CONFIG_FB_SIS is not set 2458# CONFIG_FB_SIS is not set
2459# CONFIG_FB_VIA is not set
2385CONFIG_FB_NEOMAGIC=m 2460CONFIG_FB_NEOMAGIC=m
2386CONFIG_FB_KYRO=m 2461CONFIG_FB_KYRO=m
2387CONFIG_FB_3DFX=m 2462CONFIG_FB_3DFX=m
@@ -2397,6 +2472,7 @@ CONFIG_FB_TRIDENT_ACCEL=y
2397CONFIG_FB_SM501=m 2472CONFIG_FB_SM501=m
2398CONFIG_FB_IBM_GXT4500=y 2473CONFIG_FB_IBM_GXT4500=y
2399# CONFIG_FB_VIRTUAL is not set 2474# CONFIG_FB_VIRTUAL is not set
2475# CONFIG_FB_METRONOME is not set
2400CONFIG_BACKLIGHT_LCD_SUPPORT=y 2476CONFIG_BACKLIGHT_LCD_SUPPORT=y
2401CONFIG_LCD_CLASS_DEVICE=m 2477CONFIG_LCD_CLASS_DEVICE=m
2402# CONFIG_LCD_ILI9320 is not set 2478# CONFIG_LCD_ILI9320 is not set
@@ -2432,6 +2508,7 @@ CONFIG_LOGO=y
2432# CONFIG_LOGO_LINUX_VGA16 is not set 2508# CONFIG_LOGO_LINUX_VGA16 is not set
2433CONFIG_LOGO_LINUX_CLUT224=y 2509CONFIG_LOGO_LINUX_CLUT224=y
2434CONFIG_SOUND=m 2510CONFIG_SOUND=m
2511CONFIG_SOUND_OSS_CORE=y
2435CONFIG_SND=m 2512CONFIG_SND=m
2436CONFIG_SND_TIMER=m 2513CONFIG_SND_TIMER=m
2437CONFIG_SND_PCM=m 2514CONFIG_SND_PCM=m
@@ -2594,15 +2671,36 @@ CONFIG_HIDRAW=y
2594# USB Input Devices 2671# USB Input Devices
2595# 2672#
2596CONFIG_USB_HID=y 2673CONFIG_USB_HID=y
2597CONFIG_USB_HIDINPUT_POWERBOOK=y
2598CONFIG_HID_FF=y
2599CONFIG_HID_PID=y 2674CONFIG_HID_PID=y
2675CONFIG_USB_HIDDEV=y
2676
2677#
2678# Special HID drivers
2679#
2680CONFIG_HID_COMPAT=y
2681CONFIG_HID_A4TECH=y
2682CONFIG_HID_APPLE=y
2683CONFIG_HID_BELKIN=y
2684CONFIG_HID_BRIGHT=y
2685CONFIG_HID_CHERRY=y
2686CONFIG_HID_CHICONY=y
2687CONFIG_HID_CYPRESS=y
2688CONFIG_HID_DELL=y
2689CONFIG_HID_EZKEY=y
2690CONFIG_HID_GYRATION=y
2691CONFIG_HID_LOGITECH=y
2600CONFIG_LOGITECH_FF=y 2692CONFIG_LOGITECH_FF=y
2601CONFIG_LOGIRUMBLEPAD2_FF=y 2693CONFIG_LOGIRUMBLEPAD2_FF=y
2694CONFIG_HID_MICROSOFT=y
2695CONFIG_HID_MONTEREY=y
2696CONFIG_HID_PANTHERLORD=y
2602CONFIG_PANTHERLORD_FF=y 2697CONFIG_PANTHERLORD_FF=y
2698CONFIG_HID_PETALYNX=y
2699CONFIG_HID_SAMSUNG=y
2700CONFIG_HID_SONY=y
2701CONFIG_HID_SUNPLUS=y
2603CONFIG_THRUSTMASTER_FF=y 2702CONFIG_THRUSTMASTER_FF=y
2604CONFIG_ZEROPLUS_FF=y 2703CONFIG_ZEROPLUS_FF=y
2605CONFIG_USB_HIDDEV=y
2606CONFIG_USB_SUPPORT=y 2704CONFIG_USB_SUPPORT=y
2607CONFIG_USB_ARCH_HAS_HCD=y 2705CONFIG_USB_ARCH_HAS_HCD=y
2608CONFIG_USB_ARCH_HAS_OHCI=y 2706CONFIG_USB_ARCH_HAS_OHCI=y
@@ -2620,6 +2718,8 @@ CONFIG_USB_DEVICEFS=y
2620CONFIG_USB_SUSPEND=y 2718CONFIG_USB_SUSPEND=y
2621# CONFIG_USB_OTG is not set 2719# CONFIG_USB_OTG is not set
2622CONFIG_USB_MON=y 2720CONFIG_USB_MON=y
2721# CONFIG_USB_WUSB is not set
2722# CONFIG_USB_WUSB_CBAF is not set
2623 2723
2624# 2724#
2625# USB Host Controller Drivers 2725# USB Host Controller Drivers
@@ -2647,6 +2747,8 @@ CONFIG_USB_U132_HCD=m
2647CONFIG_USB_SL811_HCD=m 2747CONFIG_USB_SL811_HCD=m
2648# CONFIG_USB_SL811_CS is not set 2748# CONFIG_USB_SL811_CS is not set
2649# CONFIG_USB_R8A66597_HCD is not set 2749# CONFIG_USB_R8A66597_HCD is not set
2750# CONFIG_USB_WHCI_HCD is not set
2751# CONFIG_USB_HWA_HCD is not set
2650# CONFIG_USB_MUSB_HDRC is not set 2752# CONFIG_USB_MUSB_HDRC is not set
2651 2753
2652# 2754#
@@ -2655,6 +2757,7 @@ CONFIG_USB_SL811_HCD=m
2655CONFIG_USB_ACM=m 2757CONFIG_USB_ACM=m
2656CONFIG_USB_PRINTER=m 2758CONFIG_USB_PRINTER=m
2657CONFIG_USB_WDM=m 2759CONFIG_USB_WDM=m
2760# CONFIG_USB_TMC is not set
2658 2761
2659# 2762#
2660# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 2763# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -2676,7 +2779,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
2676CONFIG_USB_STORAGE_ALAUDA=y 2779CONFIG_USB_STORAGE_ALAUDA=y
2677CONFIG_USB_STORAGE_ONETOUCH=y 2780CONFIG_USB_STORAGE_ONETOUCH=y
2678CONFIG_USB_STORAGE_KARMA=y 2781CONFIG_USB_STORAGE_KARMA=y
2679# CONFIG_USB_STORAGE_SIERRA is not set
2680CONFIG_USB_STORAGE_CYPRESS_ATACB=y 2782CONFIG_USB_STORAGE_CYPRESS_ATACB=y
2681# CONFIG_USB_LIBUSUAL is not set 2783# CONFIG_USB_LIBUSUAL is not set
2682 2784
@@ -2741,6 +2843,7 @@ CONFIG_USB_SERIAL_DEBUG=m
2741CONFIG_USB_EMI62=m 2843CONFIG_USB_EMI62=m
2742CONFIG_USB_EMI26=m 2844CONFIG_USB_EMI26=m
2743CONFIG_USB_ADUTUX=m 2845CONFIG_USB_ADUTUX=m
2846CONFIG_USB_SEVSEG=m
2744# CONFIG_USB_RIO500 is not set 2847# CONFIG_USB_RIO500 is not set
2745CONFIG_USB_LEGOTOWER=m 2848CONFIG_USB_LEGOTOWER=m
2746CONFIG_USB_LCD=m 2849CONFIG_USB_LCD=m
@@ -2762,12 +2865,14 @@ CONFIG_USB_TRANCEVIBRATOR=m
2762CONFIG_USB_IOWARRIOR=m 2865CONFIG_USB_IOWARRIOR=m
2763# CONFIG_USB_TEST is not set 2866# CONFIG_USB_TEST is not set
2764CONFIG_USB_ISIGHTFW=m 2867CONFIG_USB_ISIGHTFW=m
2868CONFIG_USB_VST=m
2765CONFIG_USB_ATM=m 2869CONFIG_USB_ATM=m
2766CONFIG_USB_SPEEDTOUCH=m 2870CONFIG_USB_SPEEDTOUCH=m
2767CONFIG_USB_CXACRU=m 2871CONFIG_USB_CXACRU=m
2768CONFIG_USB_UEAGLEATM=m 2872CONFIG_USB_UEAGLEATM=m
2769CONFIG_USB_XUSBATM=m 2873CONFIG_USB_XUSBATM=m
2770# CONFIG_USB_GADGET is not set 2874# CONFIG_USB_GADGET is not set
2875# CONFIG_UWB is not set
2771# CONFIG_MMC is not set 2876# CONFIG_MMC is not set
2772# CONFIG_MEMSTICK is not set 2877# CONFIG_MEMSTICK is not set
2773CONFIG_NEW_LEDS=y 2878CONFIG_NEW_LEDS=y
@@ -2787,6 +2892,7 @@ CONFIG_LEDS_TRIGGERS=y
2787CONFIG_LEDS_TRIGGER_TIMER=m 2892CONFIG_LEDS_TRIGGER_TIMER=m
2788CONFIG_LEDS_TRIGGER_IDE_DISK=y 2893CONFIG_LEDS_TRIGGER_IDE_DISK=y
2789CONFIG_LEDS_TRIGGER_HEARTBEAT=m 2894CONFIG_LEDS_TRIGGER_HEARTBEAT=m
2895CONFIG_LEDS_TRIGGER_BACKLIGHT=m
2790CONFIG_LEDS_TRIGGER_DEFAULT_ON=m 2896CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
2791CONFIG_ACCESSIBILITY=y 2897CONFIG_ACCESSIBILITY=y
2792CONFIG_A11Y_BRAILLE_CONSOLE=y 2898CONFIG_A11Y_BRAILLE_CONSOLE=y
@@ -2837,12 +2943,15 @@ CONFIG_RTC_DRV_FM3130=m
2837# Platform RTC drivers 2943# Platform RTC drivers
2838# 2944#
2839CONFIG_RTC_DRV_CMOS=y 2945CONFIG_RTC_DRV_CMOS=y
2946# CONFIG_RTC_DRV_DS1286 is not set
2840CONFIG_RTC_DRV_DS1511=m 2947CONFIG_RTC_DRV_DS1511=m
2841CONFIG_RTC_DRV_DS1553=m 2948CONFIG_RTC_DRV_DS1553=m
2842CONFIG_RTC_DRV_DS1742=m 2949CONFIG_RTC_DRV_DS1742=m
2843CONFIG_RTC_DRV_STK17TA8=m 2950CONFIG_RTC_DRV_STK17TA8=m
2844# CONFIG_RTC_DRV_M48T86 is not set 2951# CONFIG_RTC_DRV_M48T86 is not set
2952CONFIG_RTC_DRV_M48T35=m
2845CONFIG_RTC_DRV_M48T59=m 2953CONFIG_RTC_DRV_M48T59=m
2954# CONFIG_RTC_DRV_BQ4802 is not set
2846CONFIG_RTC_DRV_V3020=m 2955CONFIG_RTC_DRV_V3020=m
2847 2956
2848# 2957#
@@ -2862,7 +2971,10 @@ CONFIG_KS0108_DELAY=2
2862CONFIG_UIO=m 2971CONFIG_UIO=m
2863CONFIG_UIO_CIF=m 2972CONFIG_UIO_CIF=m
2864CONFIG_UIO_PDRV=m 2973CONFIG_UIO_PDRV=m
2974CONFIG_UIO_PDRV_GENIRQ=m
2865CONFIG_UIO_SMX=m 2975CONFIG_UIO_SMX=m
2976# CONFIG_UIO_SERCOS3 is not set
2977# CONFIG_STAGING is not set
2866 2978
2867# 2979#
2868# File systems 2980# File systems
@@ -2872,20 +2984,21 @@ CONFIG_EXT2_FS_XATTR=y
2872CONFIG_EXT2_FS_POSIX_ACL=y 2984CONFIG_EXT2_FS_POSIX_ACL=y
2873CONFIG_EXT2_FS_SECURITY=y 2985CONFIG_EXT2_FS_SECURITY=y
2874CONFIG_EXT2_FS_XIP=y 2986CONFIG_EXT2_FS_XIP=y
2875CONFIG_FS_XIP=y
2876CONFIG_EXT3_FS=m 2987CONFIG_EXT3_FS=m
2877CONFIG_EXT3_FS_XATTR=y 2988CONFIG_EXT3_FS_XATTR=y
2878CONFIG_EXT3_FS_POSIX_ACL=y 2989CONFIG_EXT3_FS_POSIX_ACL=y
2879CONFIG_EXT3_FS_SECURITY=y 2990CONFIG_EXT3_FS_SECURITY=y
2880CONFIG_EXT4DEV_FS=m 2991CONFIG_EXT4_FS=y
2881CONFIG_EXT4DEV_FS_XATTR=y 2992# CONFIG_EXT4DEV_COMPAT is not set
2882CONFIG_EXT4DEV_FS_POSIX_ACL=y 2993CONFIG_EXT4_FS_XATTR=y
2883CONFIG_EXT4DEV_FS_SECURITY=y 2994# CONFIG_EXT4_FS_POSIX_ACL is not set
2995# CONFIG_EXT4_FS_SECURITY is not set
2996CONFIG_FS_XIP=y
2884CONFIG_JBD=m 2997CONFIG_JBD=m
2885# CONFIG_JBD_DEBUG is not set 2998# CONFIG_JBD_DEBUG is not set
2886CONFIG_JBD2=m 2999CONFIG_JBD2=y
2887CONFIG_JBD2_DEBUG=y 3000CONFIG_JBD2_DEBUG=y
2888CONFIG_FS_MBCACHE=m 3001CONFIG_FS_MBCACHE=y
2889CONFIG_REISERFS_FS=m 3002CONFIG_REISERFS_FS=m
2890# CONFIG_REISERFS_CHECK is not set 3003# CONFIG_REISERFS_CHECK is not set
2891CONFIG_REISERFS_PROC_INFO=y 3004CONFIG_REISERFS_PROC_INFO=y
@@ -2898,6 +3011,7 @@ CONFIG_JFS_SECURITY=y
2898# CONFIG_JFS_DEBUG is not set 3011# CONFIG_JFS_DEBUG is not set
2899# CONFIG_JFS_STATISTICS is not set 3012# CONFIG_JFS_STATISTICS is not set
2900CONFIG_FS_POSIX_ACL=y 3013CONFIG_FS_POSIX_ACL=y
3014CONFIG_FILE_LOCKING=y
2901CONFIG_XFS_FS=m 3015CONFIG_XFS_FS=m
2902CONFIG_XFS_QUOTA=y 3016CONFIG_XFS_QUOTA=y
2903CONFIG_XFS_POSIX_ACL=y 3017CONFIG_XFS_POSIX_ACL=y
@@ -2911,6 +3025,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
2911CONFIG_OCFS2_FS_STATS=y 3025CONFIG_OCFS2_FS_STATS=y
2912# CONFIG_OCFS2_DEBUG_MASKLOG is not set 3026# CONFIG_OCFS2_DEBUG_MASKLOG is not set
2913# CONFIG_OCFS2_DEBUG_FS is not set 3027# CONFIG_OCFS2_DEBUG_FS is not set
3028# CONFIG_OCFS2_COMPAT_JBD is not set
2914CONFIG_DNOTIFY=y 3029CONFIG_DNOTIFY=y
2915CONFIG_INOTIFY=y 3030CONFIG_INOTIFY=y
2916CONFIG_INOTIFY_USER=y 3031CONFIG_INOTIFY_USER=y
@@ -2950,6 +3065,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
2950CONFIG_PROC_FS=y 3065CONFIG_PROC_FS=y
2951CONFIG_PROC_KCORE=y 3066CONFIG_PROC_KCORE=y
2952CONFIG_PROC_SYSCTL=y 3067CONFIG_PROC_SYSCTL=y
3068CONFIG_PROC_PAGE_MONITOR=y
2953CONFIG_SYSFS=y 3069CONFIG_SYSFS=y
2954CONFIG_TMPFS=y 3070CONFIG_TMPFS=y
2955CONFIG_TMPFS_POSIX_ACL=y 3071CONFIG_TMPFS_POSIX_ACL=y
@@ -2996,17 +3112,18 @@ CONFIG_NFS_ACL_SUPPORT=m
2996CONFIG_NFS_COMMON=y 3112CONFIG_NFS_COMMON=y
2997CONFIG_SUNRPC=m 3113CONFIG_SUNRPC=m
2998CONFIG_SUNRPC_GSS=m 3114CONFIG_SUNRPC_GSS=m
3115# CONFIG_SUNRPC_REGISTER_V4 is not set
2999CONFIG_RPCSEC_GSS_KRB5=m 3116CONFIG_RPCSEC_GSS_KRB5=m
3000CONFIG_RPCSEC_GSS_SPKM3=m 3117CONFIG_RPCSEC_GSS_SPKM3=m
3001# CONFIG_SMB_FS is not set 3118# CONFIG_SMB_FS is not set
3002CONFIG_CIFS=m 3119CONFIG_CIFS=m
3003# CONFIG_CIFS_STATS is not set 3120# CONFIG_CIFS_STATS is not set
3004CONFIG_CIFS_WEAK_PW_HASH=y 3121CONFIG_CIFS_WEAK_PW_HASH=y
3122CONFIG_CIFS_UPCALL=y
3005CONFIG_CIFS_XATTR=y 3123CONFIG_CIFS_XATTR=y
3006CONFIG_CIFS_POSIX=y 3124CONFIG_CIFS_POSIX=y
3007# CONFIG_CIFS_DEBUG2 is not set 3125# CONFIG_CIFS_DEBUG2 is not set
3008CONFIG_CIFS_EXPERIMENTAL=y 3126CONFIG_CIFS_EXPERIMENTAL=y
3009CONFIG_CIFS_UPCALL=y
3010CONFIG_CIFS_DFS_UPCALL=y 3127CONFIG_CIFS_DFS_UPCALL=y
3011CONFIG_NCP_FS=m 3128CONFIG_NCP_FS=m
3012CONFIG_NCPFS_PACKET_SIGNING=y 3129CONFIG_NCPFS_PACKET_SIGNING=y
@@ -3084,15 +3201,13 @@ CONFIG_NLS_KOI8_U=m
3084CONFIG_NLS_UTF8=m 3201CONFIG_NLS_UTF8=m
3085CONFIG_DLM=m 3202CONFIG_DLM=m
3086CONFIG_DLM_DEBUG=y 3203CONFIG_DLM_DEBUG=y
3087CONFIG_QE_GPIO=y
3088 3204
3089# 3205#
3090# Library routines 3206# Library routines
3091# 3207#
3092CONFIG_BITREVERSE=y 3208CONFIG_BITREVERSE=y
3093# CONFIG_GENERIC_FIND_FIRST_BIT is not set
3094CONFIG_CRC_CCITT=m 3209CONFIG_CRC_CCITT=m
3095CONFIG_CRC16=m 3210CONFIG_CRC16=y
3096CONFIG_CRC_T10DIF=y 3211CONFIG_CRC_T10DIF=y
3097CONFIG_CRC_ITU_T=m 3212CONFIG_CRC_ITU_T=m
3098CONFIG_CRC32=y 3213CONFIG_CRC32=y
@@ -3157,28 +3272,38 @@ CONFIG_DEBUG_SG=y
3157CONFIG_FRAME_POINTER=y 3272CONFIG_FRAME_POINTER=y
3158CONFIG_BOOT_PRINTK_DELAY=y 3273CONFIG_BOOT_PRINTK_DELAY=y
3159# CONFIG_RCU_TORTURE_TEST is not set 3274# CONFIG_RCU_TORTURE_TEST is not set
3275# CONFIG_RCU_CPU_STALL_DETECTOR is not set
3160# CONFIG_KPROBES_SANITY_TEST is not set 3276# CONFIG_KPROBES_SANITY_TEST is not set
3161# CONFIG_BACKTRACE_SELF_TEST is not set 3277# CONFIG_BACKTRACE_SELF_TEST is not set
3278# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
3162# CONFIG_LKDTM is not set 3279# CONFIG_LKDTM is not set
3163CONFIG_FAULT_INJECTION=y 3280CONFIG_FAULT_INJECTION=y
3164CONFIG_FAILSLAB=y 3281CONFIG_FAILSLAB=y
3165CONFIG_FAIL_PAGE_ALLOC=y 3282CONFIG_FAIL_PAGE_ALLOC=y
3166CONFIG_FAIL_MAKE_REQUEST=y 3283CONFIG_FAIL_MAKE_REQUEST=y
3284CONFIG_FAIL_IO_TIMEOUT=y
3167CONFIG_FAULT_INJECTION_DEBUG_FS=y 3285CONFIG_FAULT_INJECTION_DEBUG_FS=y
3168CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y 3286CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
3169CONFIG_LATENCYTOP=y 3287CONFIG_LATENCYTOP=y
3170CONFIG_SYSCTL_SYSCALL_CHECK=y 3288CONFIG_SYSCTL_SYSCALL_CHECK=y
3171CONFIG_HAVE_FTRACE=y 3289CONFIG_NOP_TRACER=y
3172CONFIG_HAVE_DYNAMIC_FTRACE=y 3290CONFIG_HAVE_FUNCTION_TRACER=y
3173CONFIG_TRACER_MAX_TRACE=y 3291CONFIG_TRACER_MAX_TRACE=y
3292CONFIG_RING_BUFFER=y
3174CONFIG_TRACING=y 3293CONFIG_TRACING=y
3175CONFIG_FTRACE=y 3294
3295#
3296# Tracers
3297#
3298CONFIG_FUNCTION_TRACER=y
3176CONFIG_SCHED_TRACER=y 3299CONFIG_SCHED_TRACER=y
3177CONFIG_CONTEXT_SWITCH_TRACER=y 3300CONFIG_CONTEXT_SWITCH_TRACER=y
3178CONFIG_DYNAMIC_FTRACE=y 3301# CONFIG_BOOT_TRACER is not set
3302CONFIG_STACK_TRACER=y
3179# CONFIG_FTRACE_STARTUP_TEST is not set 3303# CONFIG_FTRACE_STARTUP_TEST is not set
3180# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set 3304# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
3181# CONFIG_BUILD_DOCSRC is not set 3305# CONFIG_BUILD_DOCSRC is not set
3306CONFIG_DYNAMIC_PRINTK_DEBUG=y
3182# CONFIG_SAMPLES is not set 3307# CONFIG_SAMPLES is not set
3183CONFIG_HAVE_ARCH_KGDB=y 3308CONFIG_HAVE_ARCH_KGDB=y
3184# CONFIG_KGDB is not set 3309# CONFIG_KGDB is not set
@@ -3186,6 +3311,7 @@ CONFIG_DEBUG_STACKOVERFLOW=y
3186CONFIG_DEBUG_STACK_USAGE=y 3311CONFIG_DEBUG_STACK_USAGE=y
3187# CONFIG_CODE_PATCHING_SELFTEST is not set 3312# CONFIG_CODE_PATCHING_SELFTEST is not set
3188# CONFIG_FTR_FIXUP_SELFTEST is not set 3313# CONFIG_FTR_FIXUP_SELFTEST is not set
3314# CONFIG_MSI_BITMAP_SELFTEST is not set
3189CONFIG_XMON=y 3315CONFIG_XMON=y
3190# CONFIG_XMON_DEFAULT is not set 3316# CONFIG_XMON_DEFAULT is not set
3191CONFIG_XMON_DISASSEMBLY=y 3317CONFIG_XMON_DISASSEMBLY=y
@@ -3202,6 +3328,7 @@ CONFIG_BOOTX_TEXT=y
3202CONFIG_KEYS=y 3328CONFIG_KEYS=y
3203CONFIG_KEYS_DEBUG_PROC_KEYS=y 3329CONFIG_KEYS_DEBUG_PROC_KEYS=y
3204CONFIG_SECURITY=y 3330CONFIG_SECURITY=y
3331# CONFIG_SECURITYFS is not set
3205CONFIG_SECURITY_NETWORK=y 3332CONFIG_SECURITY_NETWORK=y
3206CONFIG_SECURITY_NETWORK_XFRM=y 3333CONFIG_SECURITY_NETWORK_XFRM=y
3207CONFIG_SECURITY_FILE_CAPABILITIES=y 3334CONFIG_SECURITY_FILE_CAPABILITIES=y
@@ -3226,10 +3353,12 @@ CONFIG_CRYPTO=y
3226# 3353#
3227# Crypto core or helper 3354# Crypto core or helper
3228# 3355#
3356# CONFIG_CRYPTO_FIPS is not set
3229CONFIG_CRYPTO_ALGAPI=y 3357CONFIG_CRYPTO_ALGAPI=y
3230CONFIG_CRYPTO_AEAD=m 3358CONFIG_CRYPTO_AEAD=y
3231CONFIG_CRYPTO_BLKCIPHER=m 3359CONFIG_CRYPTO_BLKCIPHER=y
3232CONFIG_CRYPTO_HASH=y 3360CONFIG_CRYPTO_HASH=y
3361CONFIG_CRYPTO_RNG=y
3233CONFIG_CRYPTO_MANAGER=y 3362CONFIG_CRYPTO_MANAGER=y
3234CONFIG_CRYPTO_GF128MUL=m 3363CONFIG_CRYPTO_GF128MUL=m
3235CONFIG_CRYPTO_NULL=m 3364CONFIG_CRYPTO_NULL=m
@@ -3303,6 +3432,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
3303# 3432#
3304CONFIG_CRYPTO_DEFLATE=m 3433CONFIG_CRYPTO_DEFLATE=m
3305CONFIG_CRYPTO_LZO=m 3434CONFIG_CRYPTO_LZO=m
3435
3436#
3437# Random Number Generation
3438#
3439# CONFIG_CRYPTO_ANSI_CPRNG is not set
3306CONFIG_CRYPTO_HW=y 3440CONFIG_CRYPTO_HW=y
3307CONFIG_CRYPTO_DEV_HIFN_795X=m 3441CONFIG_CRYPTO_DEV_HIFN_795X=m
3308CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y 3442CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig
index 7e17862c38b8..228099d77c3b 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:13 2008 4# Sat Nov 8 12:39:47 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -48,13 +48,11 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
50CONFIG_OF=y 50CONFIG_OF=y
51CONFIG_PPC_UDBG_16550=y 51# CONFIG_PPC_UDBG_16550 is not set
52# CONFIG_GENERIC_TBSYNC is not set 52# CONFIG_GENERIC_TBSYNC is not set
53CONFIG_AUDIT_ARCH=y 53CONFIG_AUDIT_ARCH=y
54CONFIG_GENERIC_BUG=y 54CONFIG_GENERIC_BUG=y
55CONFIG_DEFAULT_UIMAGE=y 55CONFIG_DEFAULT_UIMAGE=y
56CONFIG_HIBERNATE_32=y
57CONFIG_ARCH_HIBERNATION_POSSIBLE=y
58# CONFIG_PPC_DCR_NATIVE is not set 56# CONFIG_PPC_DCR_NATIVE is not set
59# CONFIG_PPC_DCR_MMIO is not set 57# CONFIG_PPC_DCR_MMIO is not set
60CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 58CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -94,7 +92,6 @@ CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y 92CONFIG_PRINTK=y
95CONFIG_BUG=y 93CONFIG_BUG=y
96CONFIG_ELF_CORE=y 94CONFIG_ELF_CORE=y
97CONFIG_PCSPKR_PLATFORM=y
98CONFIG_COMPAT_BRK=y 95CONFIG_COMPAT_BRK=y
99CONFIG_BASE_FULL=y 96CONFIG_BASE_FULL=y
100CONFIG_FUTEX=y 97CONFIG_FUTEX=y
@@ -104,7 +101,9 @@ CONFIG_SIGNALFD=y
104CONFIG_TIMERFD=y 101CONFIG_TIMERFD=y
105CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
106CONFIG_SHMEM=y 103CONFIG_SHMEM=y
104CONFIG_AIO=y
107CONFIG_VM_EVENT_COUNTERS=y 105CONFIG_VM_EVENT_COUNTERS=y
106CONFIG_PCI_QUIRKS=y
108CONFIG_SLUB_DEBUG=y 107CONFIG_SLUB_DEBUG=y
109# CONFIG_SLAB is not set 108# CONFIG_SLAB is not set
110CONFIG_SLUB=y 109CONFIG_SLUB=y
@@ -117,10 +116,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
117CONFIG_HAVE_KPROBES=y 116CONFIG_HAVE_KPROBES=y
118CONFIG_HAVE_KRETPROBES=y 117CONFIG_HAVE_KRETPROBES=y
119CONFIG_HAVE_ARCH_TRACEHOOK=y 118CONFIG_HAVE_ARCH_TRACEHOOK=y
120# CONFIG_HAVE_DMA_ATTRS is not set
121# CONFIG_USE_GENERIC_SMP_HELPERS is not set
122CONFIG_HAVE_CLK=y 119CONFIG_HAVE_CLK=y
123CONFIG_PROC_PAGE_MONITOR=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 120# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 121CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 122CONFIG_RT_MUTEXES=y
@@ -146,6 +142,7 @@ CONFIG_DEFAULT_AS=y
146# CONFIG_DEFAULT_NOOP is not set 142# CONFIG_DEFAULT_NOOP is not set
147CONFIG_DEFAULT_IOSCHED="anticipatory" 143CONFIG_DEFAULT_IOSCHED="anticipatory"
148CONFIG_CLASSIC_RCU=y 144CONFIG_CLASSIC_RCU=y
145# CONFIG_FREEZER is not set
149 146
150# 147#
151# Platform support 148# Platform support
@@ -153,39 +150,36 @@ CONFIG_CLASSIC_RCU=y
153CONFIG_PPC_MULTIPLATFORM=y 150CONFIG_PPC_MULTIPLATFORM=y
154CONFIG_CLASSIC32=y 151CONFIG_CLASSIC32=y
155# CONFIG_PPC_CHRP is not set 152# CONFIG_PPC_CHRP is not set
156# CONFIG_PPC_PMAC is not set
157# CONFIG_MPC5121_ADS is not set 153# CONFIG_MPC5121_ADS is not set
158# CONFIG_MPC5121_GENERIC is not set 154# CONFIG_MPC5121_GENERIC is not set
159# CONFIG_PPC_MPC52xx is not set 155# CONFIG_PPC_MPC52xx is not set
156# CONFIG_PPC_PMAC is not set
160# CONFIG_PPC_CELL is not set 157# CONFIG_PPC_CELL is not set
161# CONFIG_PPC_CELL_NATIVE is not set 158# CONFIG_PPC_CELL_NATIVE is not set
162CONFIG_PPC_82xx=y 159CONFIG_PPC_82xx=y
163# CONFIG_MPC8272_ADS is not set 160# CONFIG_MPC8272_ADS is not set
164CONFIG_PQ2FADS=y 161CONFIG_PQ2FADS=y
165# CONFIG_EP8248E is not set 162# CONFIG_EP8248E is not set
163# CONFIG_MGCOGE is not set
166CONFIG_PQ2ADS=y 164CONFIG_PQ2ADS=y
167CONFIG_8260=y 165CONFIG_8260=y
168CONFIG_PQ2_ADS_PCI_PIC=y 166CONFIG_PQ2_ADS_PCI_PIC=y
169# CONFIG_PPC_83xx is not set 167# CONFIG_PPC_83xx is not set
170# CONFIG_PPC_86xx is not set 168# CONFIG_PPC_86xx is not set
171# CONFIG_EMBEDDED6xx is not set 169# CONFIG_EMBEDDED6xx is not set
172CONFIG_PPC_NATIVE=y
173# CONFIG_UDBG_RTAS_CONSOLE is not set
174# CONFIG_IPIC is not set 170# CONFIG_IPIC is not set
175CONFIG_MPIC=y 171# CONFIG_MPIC is not set
176# CONFIG_MPIC_WEIRD is not set 172# CONFIG_MPIC_WEIRD is not set
177CONFIG_PPC_I8259=y 173# CONFIG_PPC_I8259 is not set
178CONFIG_PPC_RTAS=y 174# CONFIG_PPC_RTAS is not set
179# CONFIG_RTAS_ERROR_LOGGING is not set
180CONFIG_RTAS_PROC=y
181# CONFIG_MMIO_NVRAM is not set 175# CONFIG_MMIO_NVRAM is not set
182CONFIG_PPC_MPC106=y 176# CONFIG_PPC_MPC106 is not set
183# CONFIG_PPC_970_NAP is not set 177# CONFIG_PPC_970_NAP is not set
184# CONFIG_PPC_INDIRECT_IO is not set 178# CONFIG_PPC_INDIRECT_IO is not set
185# CONFIG_GENERIC_IOMAP is not set 179# CONFIG_GENERIC_IOMAP is not set
186# CONFIG_CPU_FREQ is not set 180# CONFIG_CPU_FREQ is not set
187# CONFIG_PPC601_SYNC_FIX is not set
188# CONFIG_TAU is not set 181# CONFIG_TAU is not set
182# CONFIG_QUICC_ENGINE is not set
189CONFIG_CPM2=y 183CONFIG_CPM2=y
190# CONFIG_FSL_ULI1575 is not set 184# CONFIG_FSL_ULI1575 is not set
191CONFIG_CPM=y 185CONFIG_CPM=y
@@ -208,6 +202,8 @@ CONFIG_PREEMPT_NONE=y
208# CONFIG_PREEMPT_VOLUNTARY is not set 202# CONFIG_PREEMPT_VOLUNTARY is not set
209# CONFIG_PREEMPT is not set 203# CONFIG_PREEMPT is not set
210CONFIG_BINFMT_ELF=y 204CONFIG_BINFMT_ELF=y
205# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
206# CONFIG_HAVE_AOUT is not set
211CONFIG_BINFMT_MISC=y 207CONFIG_BINFMT_MISC=y
212# CONFIG_IOMMU_HELPER is not set 208# CONFIG_IOMMU_HELPER is not set
213CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 209CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -217,15 +213,15 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
217CONFIG_ARCH_POPULATES_NODE_MAP=y 213CONFIG_ARCH_POPULATES_NODE_MAP=y
218CONFIG_FLATMEM=y 214CONFIG_FLATMEM=y
219CONFIG_FLAT_NODE_MEM_MAP=y 215CONFIG_FLAT_NODE_MEM_MAP=y
220# CONFIG_SPARSEMEM_STATIC is not set
221# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
222CONFIG_PAGEFLAGS_EXTENDED=y 216CONFIG_PAGEFLAGS_EXTENDED=y
223CONFIG_SPLIT_PTLOCK_CPUS=4 217CONFIG_SPLIT_PTLOCK_CPUS=4
224CONFIG_MIGRATION=y 218CONFIG_MIGRATION=y
225# CONFIG_RESOURCES_64BIT is not set 219# CONFIG_RESOURCES_64BIT is not set
220# CONFIG_PHYS_ADDR_T_64BIT is not set
226CONFIG_ZONE_DMA_FLAG=1 221CONFIG_ZONE_DMA_FLAG=1
227CONFIG_BOUNCE=y 222CONFIG_BOUNCE=y
228CONFIG_VIRT_TO_BUS=y 223CONFIG_VIRT_TO_BUS=y
224CONFIG_UNEVICTABLE_LRU=y
229CONFIG_FORCE_MAX_ZONEORDER=11 225CONFIG_FORCE_MAX_ZONEORDER=11
230CONFIG_PROC_DEVICETREE=y 226CONFIG_PROC_DEVICETREE=y
231# CONFIG_CMDLINE_BOOL is not set 227# CONFIG_CMDLINE_BOOL is not set
@@ -237,7 +233,6 @@ CONFIG_ISA_DMA_API=y
237# 233#
238# Bus options 234# Bus options
239# 235#
240# CONFIG_ISA is not set
241CONFIG_ZONE_DMA=y 236CONFIG_ZONE_DMA=y
242CONFIG_PPC_INDIRECT_PCI=y 237CONFIG_PPC_INDIRECT_PCI=y
243CONFIG_FSL_SOC=y 238CONFIG_FSL_SOC=y
@@ -250,7 +245,7 @@ CONFIG_PCI_8260=y
250# CONFIG_PCIEPORTBUS is not set 245# CONFIG_PCIEPORTBUS is not set
251CONFIG_ARCH_SUPPORTS_MSI=y 246CONFIG_ARCH_SUPPORTS_MSI=y
252# CONFIG_PCI_MSI is not set 247# CONFIG_PCI_MSI is not set
253CONFIG_PCI_LEGACY=y 248# CONFIG_PCI_LEGACY is not set
254# CONFIG_PCI_DEBUG is not set 249# CONFIG_PCI_DEBUG is not set
255# CONFIG_PCCARD is not set 250# CONFIG_PCCARD is not set
256# CONFIG_HOTPLUG_PCI is not set 251# CONFIG_HOTPLUG_PCI is not set
@@ -306,7 +301,6 @@ CONFIG_INET_TCP_DIAG=y
306# CONFIG_TCP_CONG_ADVANCED is not set 301# CONFIG_TCP_CONG_ADVANCED is not set
307CONFIG_TCP_CONG_CUBIC=y 302CONFIG_TCP_CONG_CUBIC=y
308CONFIG_DEFAULT_TCP_CONG="cubic" 303CONFIG_DEFAULT_TCP_CONG="cubic"
309# CONFIG_IP_VS is not set
310CONFIG_IPV6=y 304CONFIG_IPV6=y
311# CONFIG_IPV6_PRIVACY is not set 305# CONFIG_IPV6_PRIVACY is not set
312# CONFIG_IPV6_ROUTER_PREF is not set 306# CONFIG_IPV6_ROUTER_PREF is not set
@@ -333,10 +327,12 @@ CONFIG_NETFILTER_ADVANCED=y
333# CONFIG_NETFILTER_NETLINK_LOG is not set 327# CONFIG_NETFILTER_NETLINK_LOG is not set
334# CONFIG_NF_CONNTRACK is not set 328# CONFIG_NF_CONNTRACK is not set
335# CONFIG_NETFILTER_XTABLES is not set 329# CONFIG_NETFILTER_XTABLES is not set
330# CONFIG_IP_VS is not set
336 331
337# 332#
338# IP: Netfilter Configuration 333# IP: Netfilter Configuration
339# 334#
335# CONFIG_NF_DEFRAG_IPV4 is not set
340# CONFIG_IP_NF_QUEUE is not set 336# CONFIG_IP_NF_QUEUE is not set
341# CONFIG_IP_NF_IPTABLES is not set 337# CONFIG_IP_NF_IPTABLES is not set
342# CONFIG_IP_NF_ARPTABLES is not set 338# CONFIG_IP_NF_ARPTABLES is not set
@@ -363,11 +359,10 @@ CONFIG_NETFILTER_ADVANCED=y
363# CONFIG_CAN is not set 359# CONFIG_CAN is not set
364# CONFIG_IRDA is not set 360# CONFIG_IRDA is not set
365# CONFIG_BT is not set 361# CONFIG_BT is not set
366 362# CONFIG_PHONET is not set
367# 363CONFIG_WIRELESS=y
368# Wireless
369#
370# CONFIG_CFG80211 is not set 364# CONFIG_CFG80211 is not set
365CONFIG_WIRELESS_OLD_REGULATORY=y
371# CONFIG_WIRELESS_EXT is not set 366# CONFIG_WIRELESS_EXT is not set
372# CONFIG_MAC80211 is not set 367# CONFIG_MAC80211 is not set
373# CONFIG_IEEE80211 is not set 368# CONFIG_IEEE80211 is not set
@@ -473,7 +468,6 @@ CONFIG_OF_GPIO=y
473# CONFIG_PARPORT is not set 468# CONFIG_PARPORT is not set
474CONFIG_BLK_DEV=y 469CONFIG_BLK_DEV=y
475# CONFIG_BLK_DEV_FD is not set 470# CONFIG_BLK_DEV_FD is not set
476# CONFIG_MAC_FLOPPY is not set
477# CONFIG_BLK_CPQ_DA is not set 471# CONFIG_BLK_CPQ_DA is not set
478# CONFIG_BLK_CPQ_CISS_DA is not set 472# CONFIG_BLK_CPQ_CISS_DA is not set
479# CONFIG_BLK_DEV_DAC960 is not set 473# CONFIG_BLK_DEV_DAC960 is not set
@@ -494,17 +488,16 @@ CONFIG_MISC_DEVICES=y
494# CONFIG_HP_ILO is not set 488# CONFIG_HP_ILO is not set
495CONFIG_HAVE_IDE=y 489CONFIG_HAVE_IDE=y
496CONFIG_IDE=y 490CONFIG_IDE=y
497CONFIG_BLK_DEV_IDE=y
498 491
499# 492#
500# Please see Documentation/ide/ide.txt for help/info on IDE drives 493# Please see Documentation/ide/ide.txt for help/info on IDE drives
501# 494#
502# CONFIG_BLK_DEV_IDE_SATA is not set 495# CONFIG_BLK_DEV_IDE_SATA is not set
503CONFIG_BLK_DEV_IDEDISK=y 496CONFIG_IDE_GD=y
504# CONFIG_IDEDISK_MULTI_MODE is not set 497CONFIG_IDE_GD_ATA=y
498# CONFIG_IDE_GD_ATAPI is not set
505# CONFIG_BLK_DEV_IDECD is not set 499# CONFIG_BLK_DEV_IDECD is not set
506# CONFIG_BLK_DEV_IDETAPE is not set 500# CONFIG_BLK_DEV_IDETAPE is not set
507# CONFIG_BLK_DEV_IDEFLOPPY is not set
508# CONFIG_IDE_TASK_IOCTL is not set 501# CONFIG_IDE_TASK_IOCTL is not set
509CONFIG_IDE_PROC_FS=y 502CONFIG_IDE_PROC_FS=y
510 503
@@ -539,7 +532,6 @@ CONFIG_IDE_PROC_FS=y
539# CONFIG_BLK_DEV_TRM290 is not set 532# CONFIG_BLK_DEV_TRM290 is not set
540# CONFIG_BLK_DEV_VIA82CXXX is not set 533# CONFIG_BLK_DEV_VIA82CXXX is not set
541# CONFIG_BLK_DEV_TC86C001 is not set 534# CONFIG_BLK_DEV_TC86C001 is not set
542# CONFIG_BLK_DEV_IDE_PMAC is not set
543# CONFIG_BLK_DEV_IDEDMA is not set 535# CONFIG_BLK_DEV_IDEDMA is not set
544 536
545# 537#
@@ -590,8 +582,6 @@ CONFIG_MDIO_BITBANG=y
590# CONFIG_MDIO_OF_GPIO is not set 582# CONFIG_MDIO_OF_GPIO is not set
591CONFIG_NET_ETHERNET=y 583CONFIG_NET_ETHERNET=y
592CONFIG_MII=y 584CONFIG_MII=y
593# CONFIG_MACE is not set
594# CONFIG_BMAC is not set
595# CONFIG_HAPPYMEAL is not set 585# CONFIG_HAPPYMEAL is not set
596# CONFIG_SUNGEM is not set 586# CONFIG_SUNGEM is not set
597# CONFIG_CASSINI is not set 587# CONFIG_CASSINI is not set
@@ -602,8 +592,12 @@ CONFIG_MII=y
602# CONFIG_IBM_NEW_EMAC_RGMII is not set 592# CONFIG_IBM_NEW_EMAC_RGMII is not set
603# CONFIG_IBM_NEW_EMAC_TAH is not set 593# CONFIG_IBM_NEW_EMAC_TAH is not set
604# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 594# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
595# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
596# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
597# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
605# CONFIG_NET_PCI is not set 598# CONFIG_NET_PCI is not set
606# CONFIG_B44 is not set 599# CONFIG_B44 is not set
600# CONFIG_ATL2 is not set
607CONFIG_FS_ENET=y 601CONFIG_FS_ENET=y
608# CONFIG_FS_ENET_HAS_SCC is not set 602# CONFIG_FS_ENET_HAS_SCC is not set
609CONFIG_FS_ENET_HAS_FCC=y 603CONFIG_FS_ENET_HAS_FCC=y
@@ -626,18 +620,23 @@ CONFIG_NETDEV_1000=y
626# CONFIG_GIANFAR is not set 620# CONFIG_GIANFAR is not set
627# CONFIG_MV643XX_ETH is not set 621# CONFIG_MV643XX_ETH is not set
628# CONFIG_QLA3XXX is not set 622# CONFIG_QLA3XXX is not set
623# CONFIG_ATL1 is not set
624# CONFIG_JME is not set
629CONFIG_NETDEV_10000=y 625CONFIG_NETDEV_10000=y
630# CONFIG_CHELSIO_T1 is not set 626# CONFIG_CHELSIO_T1 is not set
631# CONFIG_CHELSIO_T3 is not set 627# CONFIG_CHELSIO_T3 is not set
628# CONFIG_ENIC is not set
632# CONFIG_IXGBE is not set 629# CONFIG_IXGBE is not set
633# CONFIG_IXGB is not set 630# CONFIG_IXGB is not set
634# CONFIG_S2IO is not set 631# CONFIG_S2IO is not set
635# CONFIG_MYRI10GE is not set 632# CONFIG_MYRI10GE is not set
636# CONFIG_NETXEN_NIC is not set 633# CONFIG_NETXEN_NIC is not set
637# CONFIG_NIU is not set 634# CONFIG_NIU is not set
635# CONFIG_MLX4_EN is not set
638# CONFIG_MLX4_CORE is not set 636# CONFIG_MLX4_CORE is not set
639# CONFIG_TEHUTI is not set 637# CONFIG_TEHUTI is not set
640# CONFIG_BNX2X is not set 638# CONFIG_BNX2X is not set
639# CONFIG_QLGE is not set
641# CONFIG_SFC is not set 640# CONFIG_SFC is not set
642# CONFIG_TR is not set 641# CONFIG_TR is not set
643 642
@@ -698,6 +697,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
698CONFIG_MOUSE_PS2_SYNAPTICS=y 697CONFIG_MOUSE_PS2_SYNAPTICS=y
699CONFIG_MOUSE_PS2_LIFEBOOK=y 698CONFIG_MOUSE_PS2_LIFEBOOK=y
700CONFIG_MOUSE_PS2_TRACKPOINT=y 699CONFIG_MOUSE_PS2_TRACKPOINT=y
700# CONFIG_MOUSE_PS2_ELANTECH is not set
701# CONFIG_MOUSE_PS2_TOUCHKIT is not set 701# CONFIG_MOUSE_PS2_TOUCHKIT is not set
702# CONFIG_MOUSE_SERIAL is not set 702# CONFIG_MOUSE_SERIAL is not set
703# CONFIG_MOUSE_APPLETOUCH is not set 703# CONFIG_MOUSE_APPLETOUCH is not set
@@ -739,21 +739,12 @@ CONFIG_DEVKMEM=y
739# CONFIG_SERIAL_UARTLITE is not set 739# CONFIG_SERIAL_UARTLITE is not set
740CONFIG_SERIAL_CORE=y 740CONFIG_SERIAL_CORE=y
741CONFIG_SERIAL_CORE_CONSOLE=y 741CONFIG_SERIAL_CORE_CONSOLE=y
742# CONFIG_SERIAL_PMACZILOG is not set
743CONFIG_SERIAL_CPM=y 742CONFIG_SERIAL_CPM=y
744CONFIG_SERIAL_CPM_CONSOLE=y 743CONFIG_SERIAL_CPM_CONSOLE=y
745CONFIG_SERIAL_CPM_SCC1=y
746# CONFIG_SERIAL_CPM_SCC2 is not set
747# CONFIG_SERIAL_CPM_SCC3 is not set
748CONFIG_SERIAL_CPM_SCC4=y
749# CONFIG_SERIAL_CPM_SMC1 is not set
750# CONFIG_SERIAL_CPM_SMC2 is not set
751# CONFIG_SERIAL_JSM is not set 744# CONFIG_SERIAL_JSM is not set
752CONFIG_UNIX98_PTYS=y 745CONFIG_UNIX98_PTYS=y
753CONFIG_LEGACY_PTYS=y 746CONFIG_LEGACY_PTYS=y
754CONFIG_LEGACY_PTY_COUNT=256 747CONFIG_LEGACY_PTY_COUNT=256
755# CONFIG_BRIQ_PANEL is not set
756# CONFIG_HVC_RTAS is not set
757# CONFIG_IPMI_HANDLER is not set 748# CONFIG_IPMI_HANDLER is not set
758CONFIG_HW_RANDOM=y 749CONFIG_HW_RANDOM=y
759# CONFIG_NVRAM is not set 750# CONFIG_NVRAM is not set
@@ -803,6 +794,14 @@ CONFIG_SSB_POSSIBLE=y
803# CONFIG_MFD_TMIO is not set 794# CONFIG_MFD_TMIO is not set
804 795
805# 796#
797# Voltage and Current regulators
798#
799# CONFIG_REGULATOR is not set
800# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
801# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
802# CONFIG_REGULATOR_BQ24022 is not set
803
804#
806# Multimedia devices 805# Multimedia devices
807# 806#
808 807
@@ -850,20 +849,22 @@ CONFIG_USB_ARCH_HAS_EHCI=y
850CONFIG_USB_GADGET=y 849CONFIG_USB_GADGET=y
851# CONFIG_USB_GADGET_DEBUG is not set 850# CONFIG_USB_GADGET_DEBUG is not set
852# CONFIG_USB_GADGET_DEBUG_FILES is not set 851# CONFIG_USB_GADGET_DEBUG_FILES is not set
852CONFIG_USB_GADGET_VBUS_DRAW=2
853CONFIG_USB_GADGET_SELECTED=y 853CONFIG_USB_GADGET_SELECTED=y
854# CONFIG_USB_GADGET_AMD5536UDC is not set 854# CONFIG_USB_GADGET_AT91 is not set
855# CONFIG_USB_GADGET_ATMEL_USBA is not set 855# CONFIG_USB_GADGET_ATMEL_USBA is not set
856# CONFIG_USB_GADGET_FSL_USB2 is not set 856# CONFIG_USB_GADGET_FSL_USB2 is not set
857# CONFIG_USB_GADGET_NET2280 is not set 857# CONFIG_USB_GADGET_LH7A40X is not set
858# CONFIG_USB_GADGET_OMAP is not set
858# CONFIG_USB_GADGET_PXA25X is not set 859# CONFIG_USB_GADGET_PXA25X is not set
860# CONFIG_USB_GADGET_PXA27X is not set
861# CONFIG_USB_GADGET_S3C2410 is not set
859CONFIG_USB_GADGET_M66592=y 862CONFIG_USB_GADGET_M66592=y
860CONFIG_USB_M66592=y 863CONFIG_USB_M66592=y
861# CONFIG_USB_GADGET_PXA27X is not set 864# CONFIG_USB_GADGET_AMD5536UDC is not set
865# CONFIG_USB_GADGET_FSL_QE is not set
866# CONFIG_USB_GADGET_NET2280 is not set
862# CONFIG_USB_GADGET_GOKU is not set 867# CONFIG_USB_GADGET_GOKU is not set
863# CONFIG_USB_GADGET_LH7A40X is not set
864# CONFIG_USB_GADGET_OMAP is not set
865# CONFIG_USB_GADGET_S3C2410 is not set
866# CONFIG_USB_GADGET_AT91 is not set
867# CONFIG_USB_GADGET_DUMMY_HCD is not set 868# CONFIG_USB_GADGET_DUMMY_HCD is not set
868CONFIG_USB_GADGET_DUALSPEED=y 869CONFIG_USB_GADGET_DUALSPEED=y
869# CONFIG_USB_ZERO is not set 870# CONFIG_USB_ZERO is not set
@@ -883,6 +884,7 @@ CONFIG_USB_ETH_RNDIS=y
883# CONFIG_RTC_CLASS is not set 884# CONFIG_RTC_CLASS is not set
884# CONFIG_DMADEVICES is not set 885# CONFIG_DMADEVICES is not set
885# CONFIG_UIO is not set 886# CONFIG_UIO is not set
887# CONFIG_STAGING is not set
886 888
887# 889#
888# File systems 890# File systems
@@ -894,11 +896,13 @@ CONFIG_EXT3_FS=y
894CONFIG_EXT3_FS_XATTR=y 896CONFIG_EXT3_FS_XATTR=y
895# CONFIG_EXT3_FS_POSIX_ACL is not set 897# CONFIG_EXT3_FS_POSIX_ACL is not set
896# CONFIG_EXT3_FS_SECURITY is not set 898# CONFIG_EXT3_FS_SECURITY is not set
899# CONFIG_EXT4_FS is not set
897CONFIG_JBD=y 900CONFIG_JBD=y
898CONFIG_FS_MBCACHE=y 901CONFIG_FS_MBCACHE=y
899# CONFIG_REISERFS_FS is not set 902# CONFIG_REISERFS_FS is not set
900# CONFIG_JFS_FS is not set 903# CONFIG_JFS_FS is not set
901CONFIG_FS_POSIX_ACL=y 904CONFIG_FS_POSIX_ACL=y
905CONFIG_FILE_LOCKING=y
902# CONFIG_XFS_FS is not set 906# CONFIG_XFS_FS is not set
903# CONFIG_OCFS2_FS is not set 907# CONFIG_OCFS2_FS is not set
904CONFIG_DNOTIFY=y 908CONFIG_DNOTIFY=y
@@ -928,6 +932,7 @@ CONFIG_AUTOFS4_FS=y
928CONFIG_PROC_FS=y 932CONFIG_PROC_FS=y
929CONFIG_PROC_KCORE=y 933CONFIG_PROC_KCORE=y
930CONFIG_PROC_SYSCTL=y 934CONFIG_PROC_SYSCTL=y
935CONFIG_PROC_PAGE_MONITOR=y
931CONFIG_SYSFS=y 936CONFIG_SYSFS=y
932CONFIG_TMPFS=y 937CONFIG_TMPFS=y
933# CONFIG_TMPFS_POSIX_ACL is not set 938# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1030,7 +1035,6 @@ CONFIG_NLS_UTF8=y
1030# Library routines 1035# Library routines
1031# 1036#
1032CONFIG_BITREVERSE=y 1037CONFIG_BITREVERSE=y
1033# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1034CONFIG_CRC_CCITT=y 1038CONFIG_CRC_CCITT=y
1035# CONFIG_CRC16 is not set 1039# CONFIG_CRC16 is not set
1036# CONFIG_CRC_T10DIF is not set 1040# CONFIG_CRC_T10DIF is not set
@@ -1084,15 +1088,23 @@ CONFIG_DEBUG_INFO=y
1084# CONFIG_DEBUG_SG is not set 1088# CONFIG_DEBUG_SG is not set
1085# CONFIG_BOOT_PRINTK_DELAY is not set 1089# CONFIG_BOOT_PRINTK_DELAY is not set
1086# CONFIG_RCU_TORTURE_TEST is not set 1090# CONFIG_RCU_TORTURE_TEST is not set
1091# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1087# CONFIG_BACKTRACE_SELF_TEST is not set 1092# CONFIG_BACKTRACE_SELF_TEST is not set
1093# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1088# CONFIG_FAULT_INJECTION is not set 1094# CONFIG_FAULT_INJECTION is not set
1089# CONFIG_LATENCYTOP is not set 1095# CONFIG_LATENCYTOP is not set
1090CONFIG_SYSCTL_SYSCALL_CHECK=y 1096CONFIG_SYSCTL_SYSCALL_CHECK=y
1091CONFIG_HAVE_FTRACE=y 1097CONFIG_HAVE_FUNCTION_TRACER=y
1092CONFIG_HAVE_DYNAMIC_FTRACE=y 1098
1093# CONFIG_FTRACE is not set 1099#
1100# Tracers
1101#
1102# CONFIG_FUNCTION_TRACER is not set
1094# CONFIG_SCHED_TRACER is not set 1103# CONFIG_SCHED_TRACER is not set
1095# CONFIG_CONTEXT_SWITCH_TRACER is not set 1104# CONFIG_CONTEXT_SWITCH_TRACER is not set
1105# CONFIG_BOOT_TRACER is not set
1106# CONFIG_STACK_TRACER is not set
1107# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1096# CONFIG_SAMPLES is not set 1108# CONFIG_SAMPLES is not set
1097CONFIG_HAVE_ARCH_KGDB=y 1109CONFIG_HAVE_ARCH_KGDB=y
1098# CONFIG_DEBUG_STACKOVERFLOW is not set 1110# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1100,6 +1112,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1100# CONFIG_DEBUG_PAGEALLOC is not set 1112# CONFIG_DEBUG_PAGEALLOC is not set
1101# CONFIG_CODE_PATCHING_SELFTEST is not set 1113# CONFIG_CODE_PATCHING_SELFTEST is not set
1102# CONFIG_FTR_FIXUP_SELFTEST is not set 1114# CONFIG_FTR_FIXUP_SELFTEST is not set
1115# CONFIG_MSI_BITMAP_SELFTEST is not set
1103# CONFIG_XMON is not set 1116# CONFIG_XMON is not set
1104# CONFIG_IRQSTACKS is not set 1117# CONFIG_IRQSTACKS is not set
1105CONFIG_BDI_SWITCH=y 1118CONFIG_BDI_SWITCH=y
@@ -1111,14 +1124,19 @@ CONFIG_BDI_SWITCH=y
1111# 1124#
1112# CONFIG_KEYS is not set 1125# CONFIG_KEYS is not set
1113# CONFIG_SECURITY is not set 1126# CONFIG_SECURITY is not set
1127# CONFIG_SECURITYFS is not set
1114# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1128# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1115CONFIG_CRYPTO=y 1129CONFIG_CRYPTO=y
1116 1130
1117# 1131#
1118# Crypto core or helper 1132# Crypto core or helper
1119# 1133#
1134# CONFIG_CRYPTO_FIPS is not set
1120CONFIG_CRYPTO_ALGAPI=y 1135CONFIG_CRYPTO_ALGAPI=y
1136CONFIG_CRYPTO_AEAD=y
1121CONFIG_CRYPTO_BLKCIPHER=y 1137CONFIG_CRYPTO_BLKCIPHER=y
1138CONFIG_CRYPTO_HASH=y
1139CONFIG_CRYPTO_RNG=y
1122CONFIG_CRYPTO_MANAGER=y 1140CONFIG_CRYPTO_MANAGER=y
1123# CONFIG_CRYPTO_NULL is not set 1141# CONFIG_CRYPTO_NULL is not set
1124# CONFIG_CRYPTO_CRYPTD is not set 1142# CONFIG_CRYPTO_CRYPTD is not set
@@ -1185,6 +1203,11 @@ CONFIG_CRYPTO_DES=y
1185# 1203#
1186# CONFIG_CRYPTO_DEFLATE is not set 1204# CONFIG_CRYPTO_DEFLATE is not set
1187# CONFIG_CRYPTO_LZO is not set 1205# CONFIG_CRYPTO_LZO is not set
1206
1207#
1208# Random Number Generation
1209#
1210# CONFIG_CRYPTO_ANSI_CPRNG is not set
1188CONFIG_CRYPTO_HW=y 1211CONFIG_CRYPTO_HW=y
1189# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1212# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1190# CONFIG_CRYPTO_DEV_TALITOS is not set 1213# CONFIG_CRYPTO_DEV_TALITOS is not set
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig
index 01b54eac1ff6..6046dc0cbd82 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:14 2008 4# Sat Nov 8 12:39:48 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -24,7 +24,7 @@ CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_CHECK_CACHE_COHERENCY=y 24CONFIG_CHECK_CACHE_COHERENCY=y
25CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 26CONFIG_WORD_SIZE=32
27CONFIG_PPC_MERGE=y 27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
28CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y 29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y 30CONFIG_GENERIC_TIME=y
@@ -110,7 +110,9 @@ CONFIG_SIGNALFD=y
110CONFIG_TIMERFD=y 110CONFIG_TIMERFD=y
111CONFIG_EVENTFD=y 111CONFIG_EVENTFD=y
112CONFIG_SHMEM=y 112CONFIG_SHMEM=y
113CONFIG_AIO=y
113CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_PCI_QUIRKS=y
114CONFIG_SLUB_DEBUG=y 116CONFIG_SLUB_DEBUG=y
115# CONFIG_SLAB is not set 117# CONFIG_SLAB is not set
116CONFIG_SLUB=y 118CONFIG_SLUB=y
@@ -123,10 +125,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
123CONFIG_HAVE_KPROBES=y 125CONFIG_HAVE_KPROBES=y
124CONFIG_HAVE_KRETPROBES=y 126CONFIG_HAVE_KRETPROBES=y
125CONFIG_HAVE_ARCH_TRACEHOOK=y 127CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_DMA_ATTRS is not set
127# CONFIG_USE_GENERIC_SMP_HELPERS is not set
128# CONFIG_HAVE_CLK is not set
129CONFIG_PROC_PAGE_MONITOR=y
130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
131CONFIG_SLABINFO=y 129CONFIG_SLABINFO=y
132CONFIG_RT_MUTEXES=y 130CONFIG_RT_MUTEXES=y
@@ -153,6 +151,7 @@ CONFIG_DEFAULT_AS=y
153# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
155CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_FREEZER is not set
156 155
157# 156#
158# Platform support 157# Platform support
@@ -210,6 +209,8 @@ CONFIG_PREEMPT_NONE=y
210# CONFIG_PREEMPT_VOLUNTARY is not set 209# CONFIG_PREEMPT_VOLUNTARY is not set
211# CONFIG_PREEMPT is not set 210# CONFIG_PREEMPT is not set
212CONFIG_BINFMT_ELF=y 211CONFIG_BINFMT_ELF=y
212# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
213# CONFIG_HAVE_AOUT is not set
213CONFIG_BINFMT_MISC=y 214CONFIG_BINFMT_MISC=y
214# CONFIG_IOMMU_HELPER is not set 215# CONFIG_IOMMU_HELPER is not set
215CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 216CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -224,15 +225,15 @@ CONFIG_FLATMEM_MANUAL=y
224# CONFIG_SPARSEMEM_MANUAL is not set 225# CONFIG_SPARSEMEM_MANUAL is not set
225CONFIG_FLATMEM=y 226CONFIG_FLATMEM=y
226CONFIG_FLAT_NODE_MEM_MAP=y 227CONFIG_FLAT_NODE_MEM_MAP=y
227# CONFIG_SPARSEMEM_STATIC is not set
228# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
229CONFIG_PAGEFLAGS_EXTENDED=y 228CONFIG_PAGEFLAGS_EXTENDED=y
230CONFIG_SPLIT_PTLOCK_CPUS=4 229CONFIG_SPLIT_PTLOCK_CPUS=4
231CONFIG_MIGRATION=y 230CONFIG_MIGRATION=y
232# CONFIG_RESOURCES_64BIT is not set 231# CONFIG_RESOURCES_64BIT is not set
232# CONFIG_PHYS_ADDR_T_64BIT is not set
233CONFIG_ZONE_DMA_FLAG=1 233CONFIG_ZONE_DMA_FLAG=1
234CONFIG_BOUNCE=y 234CONFIG_BOUNCE=y
235CONFIG_VIRT_TO_BUS=y 235CONFIG_VIRT_TO_BUS=y
236CONFIG_UNEVICTABLE_LRU=y
236CONFIG_FORCE_MAX_ZONEORDER=11 237CONFIG_FORCE_MAX_ZONEORDER=11
237CONFIG_PROC_DEVICETREE=y 238CONFIG_PROC_DEVICETREE=y
238# CONFIG_CMDLINE_BOOL is not set 239# CONFIG_CMDLINE_BOOL is not set
@@ -253,7 +254,7 @@ CONFIG_PCI_SYSCALL=y
253# CONFIG_PCIEPORTBUS is not set 254# CONFIG_PCIEPORTBUS is not set
254CONFIG_ARCH_SUPPORTS_MSI=y 255CONFIG_ARCH_SUPPORTS_MSI=y
255# CONFIG_PCI_MSI is not set 256# CONFIG_PCI_MSI is not set
256CONFIG_PCI_LEGACY=y 257# CONFIG_PCI_LEGACY is not set
257# CONFIG_PCCARD is not set 258# CONFIG_PCCARD is not set
258# CONFIG_HOTPLUG_PCI is not set 259# CONFIG_HOTPLUG_PCI is not set
259# CONFIG_HAS_RAPIDIO is not set 260# CONFIG_HAS_RAPIDIO is not set
@@ -323,6 +324,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
323# CONFIG_TIPC is not set 324# CONFIG_TIPC is not set
324# CONFIG_ATM is not set 325# CONFIG_ATM is not set
325# CONFIG_BRIDGE is not set 326# CONFIG_BRIDGE is not set
327# CONFIG_NET_DSA is not set
326# CONFIG_VLAN_8021Q is not set 328# CONFIG_VLAN_8021Q is not set
327# CONFIG_DECNET is not set 329# CONFIG_DECNET is not set
328# CONFIG_LLC2 is not set 330# CONFIG_LLC2 is not set
@@ -343,11 +345,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
343# CONFIG_IRDA is not set 345# CONFIG_IRDA is not set
344# CONFIG_BT is not set 346# CONFIG_BT is not set
345# CONFIG_AF_RXRPC is not set 347# CONFIG_AF_RXRPC is not set
346 348# CONFIG_PHONET is not set
347# 349CONFIG_WIRELESS=y
348# Wireless
349#
350# CONFIG_CFG80211 is not set 350# CONFIG_CFG80211 is not set
351CONFIG_WIRELESS_OLD_REGULATORY=y
351# CONFIG_WIRELESS_EXT is not set 352# CONFIG_WIRELESS_EXT is not set
352# CONFIG_MAC80211 is not set 353# CONFIG_MAC80211 is not set
353# CONFIG_IEEE80211 is not set 354# CONFIG_IEEE80211 is not set
@@ -478,17 +479,16 @@ CONFIG_MISC_DEVICES=y
478# CONFIG_HP_ILO is not set 479# CONFIG_HP_ILO is not set
479CONFIG_HAVE_IDE=y 480CONFIG_HAVE_IDE=y
480CONFIG_IDE=y 481CONFIG_IDE=y
481CONFIG_BLK_DEV_IDE=y
482 482
483# 483#
484# Please see Documentation/ide/ide.txt for help/info on IDE drives 484# Please see Documentation/ide/ide.txt for help/info on IDE drives
485# 485#
486# CONFIG_BLK_DEV_IDE_SATA is not set 486# CONFIG_BLK_DEV_IDE_SATA is not set
487CONFIG_BLK_DEV_IDEDISK=y 487CONFIG_IDE_GD=y
488# CONFIG_IDEDISK_MULTI_MODE is not set 488CONFIG_IDE_GD_ATA=y
489# CONFIG_IDE_GD_ATAPI is not set
489# CONFIG_BLK_DEV_IDECD is not set 490# CONFIG_BLK_DEV_IDECD is not set
490# CONFIG_BLK_DEV_IDETAPE is not set 491# CONFIG_BLK_DEV_IDETAPE is not set
491# CONFIG_BLK_DEV_IDEFLOPPY is not set
492# CONFIG_BLK_DEV_IDESCSI is not set 492# CONFIG_BLK_DEV_IDESCSI is not set
493# CONFIG_IDE_TASK_IOCTL is not set 493# CONFIG_IDE_TASK_IOCTL is not set
494CONFIG_IDE_PROC_FS=y 494CONFIG_IDE_PROC_FS=y
@@ -721,6 +721,9 @@ CONFIG_MII=y
721# CONFIG_IBM_NEW_EMAC_RGMII is not set 721# CONFIG_IBM_NEW_EMAC_RGMII is not set
722# CONFIG_IBM_NEW_EMAC_TAH is not set 722# CONFIG_IBM_NEW_EMAC_TAH is not set
723# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 723# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
724# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
725# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
726# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
724CONFIG_NET_PCI=y 727CONFIG_NET_PCI=y
725# CONFIG_PCNET32 is not set 728# CONFIG_PCNET32 is not set
726# CONFIG_AMD8111_ETH is not set 729# CONFIG_AMD8111_ETH is not set
@@ -745,11 +748,11 @@ CONFIG_8139TOO=y
745# CONFIG_TLAN is not set 748# CONFIG_TLAN is not set
746# CONFIG_VIA_RHINE is not set 749# CONFIG_VIA_RHINE is not set
747# CONFIG_SC92031 is not set 750# CONFIG_SC92031 is not set
751# CONFIG_ATL2 is not set
748CONFIG_NETDEV_1000=y 752CONFIG_NETDEV_1000=y
749# CONFIG_ACENIC is not set 753# CONFIG_ACENIC is not set
750# CONFIG_DL2K is not set 754# CONFIG_DL2K is not set
751CONFIG_E1000=y 755CONFIG_E1000=y
752# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
753# CONFIG_E1000E is not set 756# CONFIG_E1000E is not set
754# CONFIG_IP1000 is not set 757# CONFIG_IP1000 is not set
755# CONFIG_IGB is not set 758# CONFIG_IGB is not set
@@ -767,18 +770,22 @@ CONFIG_MV643XX_ETH=y
767# CONFIG_QLA3XXX is not set 770# CONFIG_QLA3XXX is not set
768# CONFIG_ATL1 is not set 771# CONFIG_ATL1 is not set
769# CONFIG_ATL1E is not set 772# CONFIG_ATL1E is not set
773# CONFIG_JME is not set
770CONFIG_NETDEV_10000=y 774CONFIG_NETDEV_10000=y
771# CONFIG_CHELSIO_T1 is not set 775# CONFIG_CHELSIO_T1 is not set
772# CONFIG_CHELSIO_T3 is not set 776# CONFIG_CHELSIO_T3 is not set
777# CONFIG_ENIC is not set
773# CONFIG_IXGBE is not set 778# CONFIG_IXGBE is not set
774# CONFIG_IXGB is not set 779# CONFIG_IXGB is not set
775# CONFIG_S2IO is not set 780# CONFIG_S2IO is not set
776# CONFIG_MYRI10GE is not set 781# CONFIG_MYRI10GE is not set
777# CONFIG_NETXEN_NIC is not set 782# CONFIG_NETXEN_NIC is not set
778# CONFIG_NIU is not set 783# CONFIG_NIU is not set
784# CONFIG_MLX4_EN is not set
779# CONFIG_MLX4_CORE is not set 785# CONFIG_MLX4_CORE is not set
780# CONFIG_TEHUTI is not set 786# CONFIG_TEHUTI is not set
781# CONFIG_BNX2X is not set 787# CONFIG_BNX2X is not set
788# CONFIG_QLGE is not set
782# CONFIG_SFC is not set 789# CONFIG_SFC is not set
783# CONFIG_TR is not set 790# CONFIG_TR is not set
784 791
@@ -813,7 +820,7 @@ CONFIG_NETDEV_10000=y
813# Input device support 820# Input device support
814# 821#
815CONFIG_INPUT=y 822CONFIG_INPUT=y
816# CONFIG_INPUT_FF_MEMLESS is not set 823CONFIG_INPUT_FF_MEMLESS=y
817# CONFIG_INPUT_POLLDEV is not set 824# CONFIG_INPUT_POLLDEV is not set
818 825
819# 826#
@@ -1025,6 +1032,17 @@ CONFIG_SSB_POSSIBLE=y
1025# CONFIG_MFD_SM501 is not set 1032# CONFIG_MFD_SM501 is not set
1026# CONFIG_HTC_PASIC3 is not set 1033# CONFIG_HTC_PASIC3 is not set
1027# CONFIG_MFD_TMIO is not set 1034# CONFIG_MFD_TMIO is not set
1035# CONFIG_PMIC_DA903X is not set
1036# CONFIG_MFD_WM8400 is not set
1037# CONFIG_MFD_WM8350_I2C is not set
1038
1039#
1040# Voltage and Current regulators
1041#
1042# CONFIG_REGULATOR is not set
1043# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1044# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1045# CONFIG_REGULATOR_BQ24022 is not set
1028 1046
1029# 1047#
1030# Multimedia devices 1048# Multimedia devices
@@ -1073,9 +1091,36 @@ CONFIG_HID=y
1073# USB Input Devices 1091# USB Input Devices
1074# 1092#
1075CONFIG_USB_HID=y 1093CONFIG_USB_HID=y
1076# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1094# CONFIG_HID_PID is not set
1077# CONFIG_HID_FF is not set
1078# CONFIG_USB_HIDDEV is not set 1095# CONFIG_USB_HIDDEV is not set
1096
1097#
1098# Special HID drivers
1099#
1100CONFIG_HID_COMPAT=y
1101CONFIG_HID_A4TECH=y
1102CONFIG_HID_APPLE=y
1103CONFIG_HID_BELKIN=y
1104CONFIG_HID_BRIGHT=y
1105CONFIG_HID_CHERRY=y
1106CONFIG_HID_CHICONY=y
1107CONFIG_HID_CYPRESS=y
1108CONFIG_HID_DELL=y
1109CONFIG_HID_EZKEY=y
1110CONFIG_HID_GYRATION=y
1111CONFIG_HID_LOGITECH=y
1112# CONFIG_LOGITECH_FF is not set
1113# CONFIG_LOGIRUMBLEPAD2_FF is not set
1114CONFIG_HID_MICROSOFT=y
1115CONFIG_HID_MONTEREY=y
1116CONFIG_HID_PANTHERLORD=y
1117# CONFIG_PANTHERLORD_FF is not set
1118CONFIG_HID_PETALYNX=y
1119CONFIG_HID_SAMSUNG=y
1120CONFIG_HID_SONY=y
1121CONFIG_HID_SUNPLUS=y
1122CONFIG_THRUSTMASTER_FF=y
1123CONFIG_ZEROPLUS_FF=y
1079CONFIG_USB_SUPPORT=y 1124CONFIG_USB_SUPPORT=y
1080CONFIG_USB_ARCH_HAS_HCD=y 1125CONFIG_USB_ARCH_HAS_HCD=y
1081CONFIG_USB_ARCH_HAS_OHCI=y 1126CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1092,6 +1137,8 @@ CONFIG_USB_DEVICEFS=y
1092# CONFIG_USB_DYNAMIC_MINORS is not set 1137# CONFIG_USB_DYNAMIC_MINORS is not set
1093# CONFIG_USB_OTG is not set 1138# CONFIG_USB_OTG is not set
1094CONFIG_USB_MON=y 1139CONFIG_USB_MON=y
1140# CONFIG_USB_WUSB is not set
1141# CONFIG_USB_WUSB_CBAF is not set
1095 1142
1096# 1143#
1097# USB Host Controller Drivers 1144# USB Host Controller Drivers
@@ -1111,6 +1158,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1111# CONFIG_USB_UHCI_HCD is not set 1158# CONFIG_USB_UHCI_HCD is not set
1112# CONFIG_USB_SL811_HCD is not set 1159# CONFIG_USB_SL811_HCD is not set
1113# CONFIG_USB_R8A66597_HCD is not set 1160# CONFIG_USB_R8A66597_HCD is not set
1161# CONFIG_USB_WHCI_HCD is not set
1162# CONFIG_USB_HWA_HCD is not set
1114 1163
1115# 1164#
1116# USB Device Class drivers 1165# USB Device Class drivers
@@ -1118,6 +1167,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1118# CONFIG_USB_ACM is not set 1167# CONFIG_USB_ACM is not set
1119# CONFIG_USB_PRINTER is not set 1168# CONFIG_USB_PRINTER is not set
1120# CONFIG_USB_WDM is not set 1169# CONFIG_USB_WDM is not set
1170# CONFIG_USB_TMC is not set
1121 1171
1122# 1172#
1123# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1173# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1146,6 +1196,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1146# CONFIG_USB_EMI62 is not set 1196# CONFIG_USB_EMI62 is not set
1147# CONFIG_USB_EMI26 is not set 1197# CONFIG_USB_EMI26 is not set
1148# CONFIG_USB_ADUTUX is not set 1198# CONFIG_USB_ADUTUX is not set
1199# CONFIG_USB_SEVSEG is not set
1149# CONFIG_USB_RIO500 is not set 1200# CONFIG_USB_RIO500 is not set
1150# CONFIG_USB_LEGOTOWER is not set 1201# CONFIG_USB_LEGOTOWER is not set
1151# CONFIG_USB_LCD is not set 1202# CONFIG_USB_LCD is not set
@@ -1163,7 +1214,9 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1163# CONFIG_USB_IOWARRIOR is not set 1214# CONFIG_USB_IOWARRIOR is not set
1164# CONFIG_USB_TEST is not set 1215# CONFIG_USB_TEST is not set
1165# CONFIG_USB_ISIGHTFW is not set 1216# CONFIG_USB_ISIGHTFW is not set
1217# CONFIG_USB_VST is not set
1166# CONFIG_USB_GADGET is not set 1218# CONFIG_USB_GADGET is not set
1219# CONFIG_UWB is not set
1167# CONFIG_MMC is not set 1220# CONFIG_MMC is not set
1168# CONFIG_MEMSTICK is not set 1221# CONFIG_MEMSTICK is not set
1169# CONFIG_NEW_LEDS is not set 1222# CONFIG_NEW_LEDS is not set
@@ -1209,12 +1262,15 @@ CONFIG_RTC_DRV_MAX6900=y
1209# Platform RTC drivers 1262# Platform RTC drivers
1210# 1263#
1211# CONFIG_RTC_DRV_CMOS is not set 1264# CONFIG_RTC_DRV_CMOS is not set
1265# CONFIG_RTC_DRV_DS1286 is not set
1212# CONFIG_RTC_DRV_DS1511 is not set 1266# CONFIG_RTC_DRV_DS1511 is not set
1213# CONFIG_RTC_DRV_DS1553 is not set 1267# CONFIG_RTC_DRV_DS1553 is not set
1214# CONFIG_RTC_DRV_DS1742 is not set 1268# CONFIG_RTC_DRV_DS1742 is not set
1215# CONFIG_RTC_DRV_STK17TA8 is not set 1269# CONFIG_RTC_DRV_STK17TA8 is not set
1216# CONFIG_RTC_DRV_M48T86 is not set 1270# CONFIG_RTC_DRV_M48T86 is not set
1271# CONFIG_RTC_DRV_M48T35 is not set
1217# CONFIG_RTC_DRV_M48T59 is not set 1272# CONFIG_RTC_DRV_M48T59 is not set
1273# CONFIG_RTC_DRV_BQ4802 is not set
1218# CONFIG_RTC_DRV_V3020 is not set 1274# CONFIG_RTC_DRV_V3020 is not set
1219 1275
1220# 1276#
@@ -1223,6 +1279,7 @@ CONFIG_RTC_DRV_MAX6900=y
1223# CONFIG_RTC_DRV_PPC is not set 1279# CONFIG_RTC_DRV_PPC is not set
1224# CONFIG_DMADEVICES is not set 1280# CONFIG_DMADEVICES is not set
1225# CONFIG_UIO is not set 1281# CONFIG_UIO is not set
1282# CONFIG_STAGING is not set
1226 1283
1227# 1284#
1228# File systems 1285# File systems
@@ -1234,12 +1291,13 @@ CONFIG_EXT3_FS=y
1234CONFIG_EXT3_FS_XATTR=y 1291CONFIG_EXT3_FS_XATTR=y
1235# CONFIG_EXT3_FS_POSIX_ACL is not set 1292# CONFIG_EXT3_FS_POSIX_ACL is not set
1236# CONFIG_EXT3_FS_SECURITY is not set 1293# CONFIG_EXT3_FS_SECURITY is not set
1237# CONFIG_EXT4DEV_FS is not set 1294# CONFIG_EXT4_FS is not set
1238CONFIG_JBD=y 1295CONFIG_JBD=y
1239CONFIG_FS_MBCACHE=y 1296CONFIG_FS_MBCACHE=y
1240# CONFIG_REISERFS_FS is not set 1297# CONFIG_REISERFS_FS is not set
1241# CONFIG_JFS_FS is not set 1298# CONFIG_JFS_FS is not set
1242# CONFIG_FS_POSIX_ACL is not set 1299# CONFIG_FS_POSIX_ACL is not set
1300CONFIG_FILE_LOCKING=y
1243# CONFIG_XFS_FS is not set 1301# CONFIG_XFS_FS is not set
1244# CONFIG_OCFS2_FS is not set 1302# CONFIG_OCFS2_FS is not set
1245CONFIG_DNOTIFY=y 1303CONFIG_DNOTIFY=y
@@ -1269,6 +1327,7 @@ CONFIG_INOTIFY_USER=y
1269CONFIG_PROC_FS=y 1327CONFIG_PROC_FS=y
1270CONFIG_PROC_KCORE=y 1328CONFIG_PROC_KCORE=y
1271CONFIG_PROC_SYSCTL=y 1329CONFIG_PROC_SYSCTL=y
1330CONFIG_PROC_PAGE_MONITOR=y
1272CONFIG_SYSFS=y 1331CONFIG_SYSFS=y
1273CONFIG_TMPFS=y 1332CONFIG_TMPFS=y
1274# CONFIG_TMPFS_POSIX_ACL is not set 1333# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1304,6 +1363,7 @@ CONFIG_ROOT_NFS=y
1304CONFIG_LOCKD=y 1363CONFIG_LOCKD=y
1305CONFIG_NFS_COMMON=y 1364CONFIG_NFS_COMMON=y
1306CONFIG_SUNRPC=y 1365CONFIG_SUNRPC=y
1366# CONFIG_SUNRPC_REGISTER_V4 is not set
1307# CONFIG_RPCSEC_GSS_KRB5 is not set 1367# CONFIG_RPCSEC_GSS_KRB5 is not set
1308# CONFIG_RPCSEC_GSS_SPKM3 is not set 1368# CONFIG_RPCSEC_GSS_SPKM3 is not set
1309# CONFIG_SMB_FS is not set 1369# CONFIG_SMB_FS is not set
@@ -1340,7 +1400,6 @@ CONFIG_MSDOS_PARTITION=y
1340# Library routines 1400# Library routines
1341# 1401#
1342CONFIG_BITREVERSE=y 1402CONFIG_BITREVERSE=y
1343# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1344# CONFIG_CRC_CCITT is not set 1403# CONFIG_CRC_CCITT is not set
1345# CONFIG_CRC16 is not set 1404# CONFIG_CRC16 is not set
1346CONFIG_CRC_T10DIF=y 1405CONFIG_CRC_T10DIF=y
@@ -1370,13 +1429,15 @@ CONFIG_FRAME_WARN=1024
1370# CONFIG_SLUB_STATS is not set 1429# CONFIG_SLUB_STATS is not set
1371CONFIG_DEBUG_BUGVERBOSE=y 1430CONFIG_DEBUG_BUGVERBOSE=y
1372CONFIG_DEBUG_MEMORY_INIT=y 1431CONFIG_DEBUG_MEMORY_INIT=y
1432# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1373# CONFIG_LATENCYTOP is not set 1433# CONFIG_LATENCYTOP is not set
1374CONFIG_SYSCTL_SYSCALL_CHECK=y 1434CONFIG_SYSCTL_SYSCALL_CHECK=y
1375CONFIG_HAVE_FTRACE=y 1435CONFIG_HAVE_FUNCTION_TRACER=y
1376CONFIG_HAVE_DYNAMIC_FTRACE=y 1436
1377# CONFIG_FTRACE is not set 1437#
1378# CONFIG_SCHED_TRACER is not set 1438# Tracers
1379# CONFIG_CONTEXT_SWITCH_TRACER is not set 1439#
1440# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1380# CONFIG_SAMPLES is not set 1441# CONFIG_SAMPLES is not set
1381CONFIG_HAVE_ARCH_KGDB=y 1442CONFIG_HAVE_ARCH_KGDB=y
1382# CONFIG_IRQSTACKS is not set 1443# CONFIG_IRQSTACKS is not set
@@ -1388,12 +1449,14 @@ CONFIG_HAVE_ARCH_KGDB=y
1388# 1449#
1389# CONFIG_KEYS is not set 1450# CONFIG_KEYS is not set
1390# CONFIG_SECURITY is not set 1451# CONFIG_SECURITY is not set
1452# CONFIG_SECURITYFS is not set
1391# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1453# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1392CONFIG_CRYPTO=y 1454CONFIG_CRYPTO=y
1393 1455
1394# 1456#
1395# Crypto core or helper 1457# Crypto core or helper
1396# 1458#
1459# CONFIG_CRYPTO_FIPS is not set
1397# CONFIG_CRYPTO_MANAGER is not set 1460# CONFIG_CRYPTO_MANAGER is not set
1398# CONFIG_CRYPTO_GF128MUL is not set 1461# CONFIG_CRYPTO_GF128MUL is not set
1399# CONFIG_CRYPTO_NULL is not set 1462# CONFIG_CRYPTO_NULL is not set
@@ -1465,6 +1528,11 @@ CONFIG_CRYPTO=y
1465# 1528#
1466# CONFIG_CRYPTO_DEFLATE is not set 1529# CONFIG_CRYPTO_DEFLATE is not set
1467# CONFIG_CRYPTO_LZO is not set 1530# CONFIG_CRYPTO_LZO is not set
1531
1532#
1533# Random Number Generation
1534#
1535# CONFIG_CRYPTO_ANSI_CPRNG is not set
1468CONFIG_CRYPTO_HW=y 1536CONFIG_CRYPTO_HW=y
1469# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1537# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1470# CONFIG_PPC_CLOCK is not set 1538# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index e77c5e7a0be2..1e520ab65118 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Tue Aug 26 13:31:07 2008 4# Tue Nov 11 19:37:06 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -22,7 +22,7 @@ CONFIG_SMP=y
22CONFIG_NR_CPUS=128 22CONFIG_NR_CPUS=128
23CONFIG_64BIT=y 23CONFIG_64BIT=y
24CONFIG_WORD_SIZE=64 24CONFIG_WORD_SIZE=64
25CONFIG_PPC_MERGE=y 25CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -86,6 +86,7 @@ CONFIG_LOG_BUF_SHIFT=17
86CONFIG_CGROUPS=y 86CONFIG_CGROUPS=y
87# CONFIG_CGROUP_DEBUG is not set 87# CONFIG_CGROUP_DEBUG is not set
88CONFIG_CGROUP_NS=y 88CONFIG_CGROUP_NS=y
89CONFIG_CGROUP_FREEZER=y
89CONFIG_CGROUP_DEVICE=y 90CONFIG_CGROUP_DEVICE=y
90CONFIG_CPUSETS=y 91CONFIG_CPUSETS=y
91# CONFIG_GROUP_SCHED is not set 92# CONFIG_GROUP_SCHED is not set
@@ -123,12 +124,15 @@ CONFIG_SIGNALFD=y
123CONFIG_TIMERFD=y 124CONFIG_TIMERFD=y
124CONFIG_EVENTFD=y 125CONFIG_EVENTFD=y
125CONFIG_SHMEM=y 126CONFIG_SHMEM=y
127CONFIG_AIO=y
126CONFIG_VM_EVENT_COUNTERS=y 128CONFIG_VM_EVENT_COUNTERS=y
129CONFIG_PCI_QUIRKS=y
127CONFIG_SLUB_DEBUG=y 130CONFIG_SLUB_DEBUG=y
128# CONFIG_SLAB is not set 131# CONFIG_SLAB is not set
129CONFIG_SLUB=y 132CONFIG_SLUB=y
130# CONFIG_SLOB is not set 133# CONFIG_SLOB is not set
131CONFIG_PROFILING=y 134CONFIG_PROFILING=y
135CONFIG_TRACEPOINTS=y
132CONFIG_MARKERS=y 136CONFIG_MARKERS=y
133CONFIG_OPROFILE=y 137CONFIG_OPROFILE=y
134CONFIG_HAVE_OPROFILE=y 138CONFIG_HAVE_OPROFILE=y
@@ -141,8 +145,6 @@ CONFIG_HAVE_KRETPROBES=y
141CONFIG_HAVE_ARCH_TRACEHOOK=y 145CONFIG_HAVE_ARCH_TRACEHOOK=y
142CONFIG_HAVE_DMA_ATTRS=y 146CONFIG_HAVE_DMA_ATTRS=y
143CONFIG_USE_GENERIC_SMP_HELPERS=y 147CONFIG_USE_GENERIC_SMP_HELPERS=y
144# CONFIG_HAVE_CLK is not set
145CONFIG_PROC_PAGE_MONITOR=y
146# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 148# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
147CONFIG_SLABINFO=y 149CONFIG_SLABINFO=y
148CONFIG_RT_MUTEXES=y 150CONFIG_RT_MUTEXES=y
@@ -175,6 +177,8 @@ CONFIG_DEFAULT_AS=y
175# CONFIG_DEFAULT_NOOP is not set 177# CONFIG_DEFAULT_NOOP is not set
176CONFIG_DEFAULT_IOSCHED="anticipatory" 178CONFIG_DEFAULT_IOSCHED="anticipatory"
177CONFIG_CLASSIC_RCU=y 179CONFIG_CLASSIC_RCU=y
180CONFIG_FREEZER=y
181CONFIG_PPC_MSI_BITMAP=y
178 182
179# 183#
180# Platform support 184# Platform support
@@ -237,6 +241,8 @@ CONFIG_PREEMPT_NONE=y
237# CONFIG_PREEMPT is not set 241# CONFIG_PREEMPT is not set
238CONFIG_BINFMT_ELF=y 242CONFIG_BINFMT_ELF=y
239CONFIG_COMPAT_BINFMT_ELF=y 243CONFIG_COMPAT_BINFMT_ELF=y
244# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
245# CONFIG_HAVE_AOUT is not set
240CONFIG_BINFMT_MISC=m 246CONFIG_BINFMT_MISC=m
241CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y 247CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
242CONFIG_IOMMU_VMERGE=y 248CONFIG_IOMMU_VMERGE=y
@@ -246,7 +252,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
246CONFIG_ARCH_HAS_WALK_MEMORY=y 252CONFIG_ARCH_HAS_WALK_MEMORY=y
247CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 253CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
248CONFIG_KEXEC=y 254CONFIG_KEXEC=y
249# CONFIG_CRASH_DUMP is not set
250# CONFIG_PHYP_DUMP is not set 255# CONFIG_PHYP_DUMP is not set
251CONFIG_IRQ_ALL_CPUS=y 256CONFIG_IRQ_ALL_CPUS=y
252CONFIG_NUMA=y 257CONFIG_NUMA=y
@@ -262,7 +267,6 @@ CONFIG_SPARSEMEM_MANUAL=y
262CONFIG_SPARSEMEM=y 267CONFIG_SPARSEMEM=y
263CONFIG_NEED_MULTIPLE_NODES=y 268CONFIG_NEED_MULTIPLE_NODES=y
264CONFIG_HAVE_MEMORY_PRESENT=y 269CONFIG_HAVE_MEMORY_PRESENT=y
265# CONFIG_SPARSEMEM_STATIC is not set
266CONFIG_SPARSEMEM_EXTREME=y 270CONFIG_SPARSEMEM_EXTREME=y
267CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 271CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
268CONFIG_SPARSEMEM_VMEMMAP=y 272CONFIG_SPARSEMEM_VMEMMAP=y
@@ -271,8 +275,10 @@ CONFIG_PAGEFLAGS_EXTENDED=y
271CONFIG_SPLIT_PTLOCK_CPUS=4 275CONFIG_SPLIT_PTLOCK_CPUS=4
272CONFIG_MIGRATION=y 276CONFIG_MIGRATION=y
273CONFIG_RESOURCES_64BIT=y 277CONFIG_RESOURCES_64BIT=y
278CONFIG_PHYS_ADDR_T_64BIT=y
274CONFIG_ZONE_DMA_FLAG=1 279CONFIG_ZONE_DMA_FLAG=1
275CONFIG_BOUNCE=y 280CONFIG_BOUNCE=y
281CONFIG_UNEVICTABLE_LRU=y
276CONFIG_NODES_SPAN_OTHER_NODES=y 282CONFIG_NODES_SPAN_OTHER_NODES=y
277# CONFIG_PPC_HAS_HASH_64K is not set 283# CONFIG_PPC_HAS_HASH_64K is not set
278# CONFIG_PPC_64K_PAGES is not set 284# CONFIG_PPC_64K_PAGES is not set
@@ -307,6 +313,7 @@ CONFIG_HOTPLUG_PCI=m
307CONFIG_HOTPLUG_PCI_RPA=m 313CONFIG_HOTPLUG_PCI_RPA=m
308CONFIG_HOTPLUG_PCI_RPA_DLPAR=m 314CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
309# CONFIG_HAS_RAPIDIO is not set 315# CONFIG_HAS_RAPIDIO is not set
316# CONFIG_RELOCATABLE is not set
310CONFIG_PAGE_OFFSET=0xc000000000000000 317CONFIG_PAGE_OFFSET=0xc000000000000000
311CONFIG_KERNEL_START=0xc000000000000000 318CONFIG_KERNEL_START=0xc000000000000000
312CONFIG_PHYSICAL_START=0x00000000 319CONFIG_PHYSICAL_START=0x00000000
@@ -351,7 +358,6 @@ CONFIG_INET_TCP_DIAG=y
351CONFIG_TCP_CONG_CUBIC=y 358CONFIG_TCP_CONG_CUBIC=y
352CONFIG_DEFAULT_TCP_CONG="cubic" 359CONFIG_DEFAULT_TCP_CONG="cubic"
353# CONFIG_TCP_MD5SIG is not set 360# CONFIG_TCP_MD5SIG is not set
354# CONFIG_IP_VS is not set
355# CONFIG_IPV6 is not set 361# CONFIG_IPV6 is not set
356# CONFIG_NETWORK_SECMARK is not set 362# CONFIG_NETWORK_SECMARK is not set
357CONFIG_NETFILTER=y 363CONFIG_NETFILTER=y
@@ -383,9 +389,10 @@ CONFIG_NF_CONNTRACK_TFTP=m
383CONFIG_NF_CT_NETLINK=m 389CONFIG_NF_CT_NETLINK=m
384CONFIG_NETFILTER_XTABLES=m 390CONFIG_NETFILTER_XTABLES=m
385CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 391CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
392CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
386CONFIG_NETFILTER_XT_TARGET_MARK=m 393CONFIG_NETFILTER_XT_TARGET_MARK=m
387CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
388CONFIG_NETFILTER_XT_TARGET_NFLOG=m 394CONFIG_NETFILTER_XT_TARGET_NFLOG=m
395CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
389CONFIG_NETFILTER_XT_TARGET_RATEEST=m 396CONFIG_NETFILTER_XT_TARGET_RATEEST=m
390CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 397CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
391CONFIG_NETFILTER_XT_MATCH_COMMENT=m 398CONFIG_NETFILTER_XT_MATCH_COMMENT=m
@@ -396,19 +403,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
396CONFIG_NETFILTER_XT_MATCH_DCCP=m 403CONFIG_NETFILTER_XT_MATCH_DCCP=m
397CONFIG_NETFILTER_XT_MATCH_DSCP=m 404CONFIG_NETFILTER_XT_MATCH_DSCP=m
398CONFIG_NETFILTER_XT_MATCH_ESP=m 405CONFIG_NETFILTER_XT_MATCH_ESP=m
406CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
399CONFIG_NETFILTER_XT_MATCH_HELPER=m 407CONFIG_NETFILTER_XT_MATCH_HELPER=m
400CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 408CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
401CONFIG_NETFILTER_XT_MATCH_LENGTH=m 409CONFIG_NETFILTER_XT_MATCH_LENGTH=m
402CONFIG_NETFILTER_XT_MATCH_LIMIT=m 410CONFIG_NETFILTER_XT_MATCH_LIMIT=m
403CONFIG_NETFILTER_XT_MATCH_MAC=m 411CONFIG_NETFILTER_XT_MATCH_MAC=m
404CONFIG_NETFILTER_XT_MATCH_MARK=m 412CONFIG_NETFILTER_XT_MATCH_MARK=m
413CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
405CONFIG_NETFILTER_XT_MATCH_OWNER=m 414CONFIG_NETFILTER_XT_MATCH_OWNER=m
406CONFIG_NETFILTER_XT_MATCH_POLICY=m 415CONFIG_NETFILTER_XT_MATCH_POLICY=m
407CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
408CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 416CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
409CONFIG_NETFILTER_XT_MATCH_QUOTA=m 417CONFIG_NETFILTER_XT_MATCH_QUOTA=m
410CONFIG_NETFILTER_XT_MATCH_RATEEST=m 418CONFIG_NETFILTER_XT_MATCH_RATEEST=m
411CONFIG_NETFILTER_XT_MATCH_REALM=m 419CONFIG_NETFILTER_XT_MATCH_REALM=m
420CONFIG_NETFILTER_XT_MATCH_RECENT=m
421# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
412CONFIG_NETFILTER_XT_MATCH_SCTP=m 422CONFIG_NETFILTER_XT_MATCH_SCTP=m
413CONFIG_NETFILTER_XT_MATCH_STATE=m 423CONFIG_NETFILTER_XT_MATCH_STATE=m
414CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 424CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -416,20 +426,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
416CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 426CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
417CONFIG_NETFILTER_XT_MATCH_TIME=m 427CONFIG_NETFILTER_XT_MATCH_TIME=m
418CONFIG_NETFILTER_XT_MATCH_U32=m 428CONFIG_NETFILTER_XT_MATCH_U32=m
419CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 429# CONFIG_IP_VS is not set
420 430
421# 431#
422# IP: Netfilter Configuration 432# IP: Netfilter Configuration
423# 433#
434CONFIG_NF_DEFRAG_IPV4=m
424CONFIG_NF_CONNTRACK_IPV4=m 435CONFIG_NF_CONNTRACK_IPV4=m
425CONFIG_NF_CONNTRACK_PROC_COMPAT=y 436CONFIG_NF_CONNTRACK_PROC_COMPAT=y
426CONFIG_IP_NF_QUEUE=m 437CONFIG_IP_NF_QUEUE=m
427CONFIG_IP_NF_IPTABLES=m 438CONFIG_IP_NF_IPTABLES=m
428CONFIG_IP_NF_MATCH_RECENT=m 439CONFIG_IP_NF_MATCH_ADDRTYPE=m
429CONFIG_IP_NF_MATCH_ECN=m
430CONFIG_IP_NF_MATCH_AH=m 440CONFIG_IP_NF_MATCH_AH=m
441CONFIG_IP_NF_MATCH_ECN=m
431CONFIG_IP_NF_MATCH_TTL=m 442CONFIG_IP_NF_MATCH_TTL=m
432CONFIG_IP_NF_MATCH_ADDRTYPE=m
433CONFIG_IP_NF_FILTER=m 443CONFIG_IP_NF_FILTER=m
434CONFIG_IP_NF_TARGET_REJECT=m 444CONFIG_IP_NF_TARGET_REJECT=m
435CONFIG_IP_NF_TARGET_LOG=m 445CONFIG_IP_NF_TARGET_LOG=m
@@ -437,8 +447,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
437CONFIG_NF_NAT=m 447CONFIG_NF_NAT=m
438CONFIG_NF_NAT_NEEDED=y 448CONFIG_NF_NAT_NEEDED=y
439CONFIG_IP_NF_TARGET_MASQUERADE=m 449CONFIG_IP_NF_TARGET_MASQUERADE=m
440CONFIG_IP_NF_TARGET_REDIRECT=m
441CONFIG_IP_NF_TARGET_NETMAP=m 450CONFIG_IP_NF_TARGET_NETMAP=m
451CONFIG_IP_NF_TARGET_REDIRECT=m
442CONFIG_NF_NAT_SNMP_BASIC=m 452CONFIG_NF_NAT_SNMP_BASIC=m
443CONFIG_NF_NAT_PROTO_UDPLITE=m 453CONFIG_NF_NAT_PROTO_UDPLITE=m
444CONFIG_NF_NAT_FTP=m 454CONFIG_NF_NAT_FTP=m
@@ -456,6 +466,7 @@ CONFIG_NF_NAT_TFTP=m
456# CONFIG_TIPC is not set 466# CONFIG_TIPC is not set
457# CONFIG_ATM is not set 467# CONFIG_ATM is not set
458# CONFIG_BRIDGE is not set 468# CONFIG_BRIDGE is not set
469# CONFIG_NET_DSA is not set
459# CONFIG_VLAN_8021Q is not set 470# CONFIG_VLAN_8021Q is not set
460# CONFIG_DECNET is not set 471# CONFIG_DECNET is not set
461CONFIG_LLC=y 472CONFIG_LLC=y
@@ -479,14 +490,8 @@ CONFIG_NET_CLS_ROUTE=y
479# CONFIG_IRDA is not set 490# CONFIG_IRDA is not set
480# CONFIG_BT is not set 491# CONFIG_BT is not set
481# CONFIG_AF_RXRPC is not set 492# CONFIG_AF_RXRPC is not set
482 493# CONFIG_PHONET is not set
483# 494# CONFIG_WIRELESS is not set
484# Wireless
485#
486# CONFIG_CFG80211 is not set
487# CONFIG_WIRELESS_EXT is not set
488# CONFIG_MAC80211 is not set
489# CONFIG_IEEE80211 is not set
490# CONFIG_RFKILL is not set 495# CONFIG_RFKILL is not set
491# CONFIG_NET_9P is not set 496# CONFIG_NET_9P is not set
492 497
@@ -546,19 +551,18 @@ CONFIG_MISC_DEVICES=y
546# CONFIG_HP_ILO is not set 551# CONFIG_HP_ILO is not set
547CONFIG_HAVE_IDE=y 552CONFIG_HAVE_IDE=y
548CONFIG_IDE=y 553CONFIG_IDE=y
549CONFIG_BLK_DEV_IDE=y
550 554
551# 555#
552# Please see Documentation/ide/ide.txt for help/info on IDE drives 556# Please see Documentation/ide/ide.txt for help/info on IDE drives
553# 557#
554CONFIG_IDE_TIMINGS=y 558CONFIG_IDE_TIMINGS=y
555# CONFIG_BLK_DEV_IDE_SATA is not set 559# CONFIG_BLK_DEV_IDE_SATA is not set
556CONFIG_BLK_DEV_IDEDISK=y 560CONFIG_IDE_GD=y
557# CONFIG_IDEDISK_MULTI_MODE is not set 561CONFIG_IDE_GD_ATA=y
562# CONFIG_IDE_GD_ATAPI is not set
558CONFIG_BLK_DEV_IDECD=y 563CONFIG_BLK_DEV_IDECD=y
559CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 564CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
560# CONFIG_BLK_DEV_IDETAPE is not set 565# CONFIG_BLK_DEV_IDETAPE is not set
561# CONFIG_BLK_DEV_IDEFLOPPY is not set
562# CONFIG_BLK_DEV_IDESCSI is not set 566# CONFIG_BLK_DEV_IDESCSI is not set
563# CONFIG_IDE_TASK_IOCTL is not set 567# CONFIG_IDE_TASK_IOCTL is not set
564CONFIG_IDE_PROC_FS=y 568CONFIG_IDE_PROC_FS=y
@@ -696,6 +700,7 @@ CONFIG_SATA_PMP=y
696# CONFIG_ATA_SFF is not set 700# CONFIG_ATA_SFF is not set
697CONFIG_MD=y 701CONFIG_MD=y
698CONFIG_BLK_DEV_MD=y 702CONFIG_BLK_DEV_MD=y
703CONFIG_MD_AUTODETECT=y
699CONFIG_MD_LINEAR=y 704CONFIG_MD_LINEAR=y
700CONFIG_MD_RAID0=y 705CONFIG_MD_RAID0=y
701CONFIG_MD_RAID1=y 706CONFIG_MD_RAID1=y
@@ -765,6 +770,9 @@ CONFIG_IBMVETH=y
765# CONFIG_IBM_NEW_EMAC_RGMII is not set 770# CONFIG_IBM_NEW_EMAC_RGMII is not set
766# CONFIG_IBM_NEW_EMAC_TAH is not set 771# CONFIG_IBM_NEW_EMAC_TAH is not set
767# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 772# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
773# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
774# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
775# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
768CONFIG_NET_PCI=y 776CONFIG_NET_PCI=y
769CONFIG_PCNET32=y 777CONFIG_PCNET32=y
770# CONFIG_AMD8111_ETH is not set 778# CONFIG_AMD8111_ETH is not set
@@ -786,12 +794,12 @@ CONFIG_E100=y
786# CONFIG_VIA_RHINE is not set 794# CONFIG_VIA_RHINE is not set
787# CONFIG_SC92031 is not set 795# CONFIG_SC92031 is not set
788# CONFIG_NET_POCKET is not set 796# CONFIG_NET_POCKET is not set
797# CONFIG_ATL2 is not set
789CONFIG_NETDEV_1000=y 798CONFIG_NETDEV_1000=y
790CONFIG_ACENIC=y 799CONFIG_ACENIC=y
791CONFIG_ACENIC_OMIT_TIGON_I=y 800CONFIG_ACENIC_OMIT_TIGON_I=y
792# CONFIG_DL2K is not set 801# CONFIG_DL2K is not set
793CONFIG_E1000=y 802CONFIG_E1000=y
794# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
795# CONFIG_E1000E is not set 803# CONFIG_E1000E is not set
796# CONFIG_IP1000 is not set 804# CONFIG_IP1000 is not set
797# CONFIG_IGB is not set 805# CONFIG_IGB is not set
@@ -808,19 +816,23 @@ CONFIG_TIGON3=y
808# CONFIG_QLA3XXX is not set 816# CONFIG_QLA3XXX is not set
809# CONFIG_ATL1 is not set 817# CONFIG_ATL1 is not set
810# CONFIG_ATL1E is not set 818# CONFIG_ATL1E is not set
819# CONFIG_JME is not set
811CONFIG_NETDEV_10000=y 820CONFIG_NETDEV_10000=y
812# CONFIG_CHELSIO_T1 is not set 821# CONFIG_CHELSIO_T1 is not set
813# CONFIG_CHELSIO_T3 is not set 822# CONFIG_CHELSIO_T3 is not set
814CONFIG_EHEA=y 823CONFIG_EHEA=y
824# CONFIG_ENIC is not set
815# CONFIG_IXGBE is not set 825# CONFIG_IXGBE is not set
816CONFIG_IXGB=m 826CONFIG_IXGB=m
817CONFIG_S2IO=m 827CONFIG_S2IO=m
818# CONFIG_MYRI10GE is not set 828# CONFIG_MYRI10GE is not set
819# CONFIG_NETXEN_NIC is not set 829# CONFIG_NETXEN_NIC is not set
820# CONFIG_NIU is not set 830# CONFIG_NIU is not set
831# CONFIG_MLX4_EN is not set
821# CONFIG_MLX4_CORE is not set 832# CONFIG_MLX4_CORE is not set
822# CONFIG_TEHUTI is not set 833# CONFIG_TEHUTI is not set
823# CONFIG_BNX2X is not set 834# CONFIG_BNX2X is not set
835# CONFIG_QLGE is not set
824# CONFIG_SFC is not set 836# CONFIG_SFC is not set
825CONFIG_TR=y 837CONFIG_TR=y
826CONFIG_IBMOL=y 838CONFIG_IBMOL=y
@@ -902,6 +914,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
902CONFIG_MOUSE_PS2_SYNAPTICS=y 914CONFIG_MOUSE_PS2_SYNAPTICS=y
903CONFIG_MOUSE_PS2_LIFEBOOK=y 915CONFIG_MOUSE_PS2_LIFEBOOK=y
904CONFIG_MOUSE_PS2_TRACKPOINT=y 916CONFIG_MOUSE_PS2_TRACKPOINT=y
917# CONFIG_MOUSE_PS2_ELANTECH is not set
905# CONFIG_MOUSE_PS2_TOUCHKIT is not set 918# CONFIG_MOUSE_PS2_TOUCHKIT is not set
906# CONFIG_MOUSE_SERIAL is not set 919# CONFIG_MOUSE_SERIAL is not set
907# CONFIG_MOUSE_APPLETOUCH is not set 920# CONFIG_MOUSE_APPLETOUCH is not set
@@ -917,6 +930,7 @@ CONFIG_INPUT_PCSPKR=m
917# CONFIG_INPUT_KEYSPAN_REMOTE is not set 930# CONFIG_INPUT_KEYSPAN_REMOTE is not set
918# CONFIG_INPUT_POWERMATE is not set 931# CONFIG_INPUT_POWERMATE is not set
919# CONFIG_INPUT_YEALINK is not set 932# CONFIG_INPUT_YEALINK is not set
933# CONFIG_INPUT_CM109 is not set
920# CONFIG_INPUT_UINPUT is not set 934# CONFIG_INPUT_UINPUT is not set
921 935
922# 936#
@@ -1076,6 +1090,17 @@ CONFIG_SSB_POSSIBLE=y
1076# CONFIG_MFD_SM501 is not set 1090# CONFIG_MFD_SM501 is not set
1077# CONFIG_HTC_PASIC3 is not set 1091# CONFIG_HTC_PASIC3 is not set
1078# CONFIG_MFD_TMIO is not set 1092# CONFIG_MFD_TMIO is not set
1093# CONFIG_PMIC_DA903X is not set
1094# CONFIG_MFD_WM8400 is not set
1095# CONFIG_MFD_WM8350_I2C is not set
1096
1097#
1098# Voltage and Current regulators
1099#
1100# CONFIG_REGULATOR is not set
1101# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1102# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1103# CONFIG_REGULATOR_BQ24022 is not set
1079 1104
1080# 1105#
1081# Multimedia devices 1106# Multimedia devices
@@ -1103,6 +1128,7 @@ CONFIG_SSB_POSSIBLE=y
1103CONFIG_FB=y 1128CONFIG_FB=y
1104CONFIG_FIRMWARE_EDID=y 1129CONFIG_FIRMWARE_EDID=y
1105CONFIG_FB_DDC=y 1130CONFIG_FB_DDC=y
1131# CONFIG_FB_BOOT_VESA_SUPPORT is not set
1106CONFIG_FB_CFB_FILLRECT=y 1132CONFIG_FB_CFB_FILLRECT=y
1107CONFIG_FB_CFB_COPYAREA=y 1133CONFIG_FB_CFB_COPYAREA=y
1108CONFIG_FB_CFB_IMAGEBLIT=y 1134CONFIG_FB_CFB_IMAGEBLIT=y
@@ -1146,6 +1172,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1146# CONFIG_FB_S3 is not set 1172# CONFIG_FB_S3 is not set
1147# CONFIG_FB_SAVAGE is not set 1173# CONFIG_FB_SAVAGE is not set
1148# CONFIG_FB_SIS is not set 1174# CONFIG_FB_SIS is not set
1175# CONFIG_FB_VIA is not set
1149# CONFIG_FB_NEOMAGIC is not set 1176# CONFIG_FB_NEOMAGIC is not set
1150# CONFIG_FB_KYRO is not set 1177# CONFIG_FB_KYRO is not set
1151# CONFIG_FB_3DFX is not set 1178# CONFIG_FB_3DFX is not set
@@ -1157,6 +1184,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1157# CONFIG_FB_CARMINE is not set 1184# CONFIG_FB_CARMINE is not set
1158CONFIG_FB_IBM_GXT4500=y 1185CONFIG_FB_IBM_GXT4500=y
1159# CONFIG_FB_VIRTUAL is not set 1186# CONFIG_FB_VIRTUAL is not set
1187# CONFIG_FB_METRONOME is not set
1160CONFIG_BACKLIGHT_LCD_SUPPORT=y 1188CONFIG_BACKLIGHT_LCD_SUPPORT=y
1161CONFIG_LCD_CLASS_DEVICE=m 1189CONFIG_LCD_CLASS_DEVICE=m
1162# CONFIG_LCD_ILI9320 is not set 1190# CONFIG_LCD_ILI9320 is not set
@@ -1198,9 +1226,36 @@ CONFIG_HID=y
1198# USB Input Devices 1226# USB Input Devices
1199# 1227#
1200CONFIG_USB_HID=y 1228CONFIG_USB_HID=y
1201# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1229# CONFIG_HID_PID is not set
1202# CONFIG_HID_FF is not set
1203CONFIG_USB_HIDDEV=y 1230CONFIG_USB_HIDDEV=y
1231
1232#
1233# Special HID drivers
1234#
1235CONFIG_HID_COMPAT=y
1236CONFIG_HID_A4TECH=y
1237CONFIG_HID_APPLE=y
1238CONFIG_HID_BELKIN=y
1239CONFIG_HID_BRIGHT=y
1240CONFIG_HID_CHERRY=y
1241CONFIG_HID_CHICONY=y
1242CONFIG_HID_CYPRESS=y
1243CONFIG_HID_DELL=y
1244CONFIG_HID_EZKEY=y
1245CONFIG_HID_GYRATION=y
1246CONFIG_HID_LOGITECH=y
1247# CONFIG_LOGITECH_FF is not set
1248# CONFIG_LOGIRUMBLEPAD2_FF is not set
1249CONFIG_HID_MICROSOFT=y
1250CONFIG_HID_MONTEREY=y
1251CONFIG_HID_PANTHERLORD=y
1252# CONFIG_PANTHERLORD_FF is not set
1253CONFIG_HID_PETALYNX=y
1254CONFIG_HID_SAMSUNG=y
1255CONFIG_HID_SONY=y
1256CONFIG_HID_SUNPLUS=y
1257# CONFIG_THRUSTMASTER_FF is not set
1258# CONFIG_ZEROPLUS_FF is not set
1204CONFIG_USB_SUPPORT=y 1259CONFIG_USB_SUPPORT=y
1205CONFIG_USB_ARCH_HAS_HCD=y 1260CONFIG_USB_ARCH_HAS_HCD=y
1206CONFIG_USB_ARCH_HAS_OHCI=y 1261CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1217,6 +1272,8 @@ CONFIG_USB_DEVICE_CLASS=y
1217# CONFIG_USB_DYNAMIC_MINORS is not set 1272# CONFIG_USB_DYNAMIC_MINORS is not set
1218# CONFIG_USB_OTG is not set 1273# CONFIG_USB_OTG is not set
1219CONFIG_USB_MON=y 1274CONFIG_USB_MON=y
1275# CONFIG_USB_WUSB is not set
1276# CONFIG_USB_WUSB_CBAF is not set
1220 1277
1221# 1278#
1222# USB Host Controller Drivers 1279# USB Host Controller Drivers
@@ -1236,6 +1293,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1236# CONFIG_USB_UHCI_HCD is not set 1293# CONFIG_USB_UHCI_HCD is not set
1237# CONFIG_USB_SL811_HCD is not set 1294# CONFIG_USB_SL811_HCD is not set
1238# CONFIG_USB_R8A66597_HCD is not set 1295# CONFIG_USB_R8A66597_HCD is not set
1296# CONFIG_USB_WHCI_HCD is not set
1297# CONFIG_USB_HWA_HCD is not set
1239 1298
1240# 1299#
1241# USB Device Class drivers 1300# USB Device Class drivers
@@ -1243,6 +1302,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1243# CONFIG_USB_ACM is not set 1302# CONFIG_USB_ACM is not set
1244# CONFIG_USB_PRINTER is not set 1303# CONFIG_USB_PRINTER is not set
1245# CONFIG_USB_WDM is not set 1304# CONFIG_USB_WDM is not set
1305# CONFIG_USB_TMC is not set
1246 1306
1247# 1307#
1248# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1308# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1264,7 +1324,6 @@ CONFIG_USB_STORAGE=y
1264# CONFIG_USB_STORAGE_ALAUDA is not set 1324# CONFIG_USB_STORAGE_ALAUDA is not set
1265CONFIG_USB_STORAGE_ONETOUCH=y 1325CONFIG_USB_STORAGE_ONETOUCH=y
1266# CONFIG_USB_STORAGE_KARMA is not set 1326# CONFIG_USB_STORAGE_KARMA is not set
1267# CONFIG_USB_STORAGE_SIERRA is not set
1268# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1327# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1269# CONFIG_USB_LIBUSUAL is not set 1328# CONFIG_USB_LIBUSUAL is not set
1270 1329
@@ -1286,6 +1345,7 @@ CONFIG_USB_STORAGE_ONETOUCH=y
1286# CONFIG_USB_EMI62 is not set 1345# CONFIG_USB_EMI62 is not set
1287# CONFIG_USB_EMI26 is not set 1346# CONFIG_USB_EMI26 is not set
1288# CONFIG_USB_ADUTUX is not set 1347# CONFIG_USB_ADUTUX is not set
1348# CONFIG_USB_SEVSEG is not set
1289# CONFIG_USB_RIO500 is not set 1349# CONFIG_USB_RIO500 is not set
1290# CONFIG_USB_LEGOTOWER is not set 1350# CONFIG_USB_LEGOTOWER is not set
1291# CONFIG_USB_LCD is not set 1351# CONFIG_USB_LCD is not set
@@ -1303,7 +1363,9 @@ CONFIG_USB_STORAGE_ONETOUCH=y
1303# CONFIG_USB_IOWARRIOR is not set 1363# CONFIG_USB_IOWARRIOR is not set
1304# CONFIG_USB_TEST is not set 1364# CONFIG_USB_TEST is not set
1305# CONFIG_USB_ISIGHTFW is not set 1365# CONFIG_USB_ISIGHTFW is not set
1366# CONFIG_USB_VST is not set
1306# CONFIG_USB_GADGET is not set 1367# CONFIG_USB_GADGET is not set
1368# CONFIG_UWB is not set
1307# CONFIG_MMC is not set 1369# CONFIG_MMC is not set
1308# CONFIG_MEMSTICK is not set 1370# CONFIG_MEMSTICK is not set
1309# CONFIG_NEW_LEDS is not set 1371# CONFIG_NEW_LEDS is not set
@@ -1331,6 +1393,7 @@ CONFIG_INFINIBAND_SRP=m
1331# CONFIG_DMADEVICES is not set 1393# CONFIG_DMADEVICES is not set
1332# CONFIG_AUXDISPLAY is not set 1394# CONFIG_AUXDISPLAY is not set
1333# CONFIG_UIO is not set 1395# CONFIG_UIO is not set
1396# CONFIG_STAGING is not set
1334 1397
1335# 1398#
1336# File systems 1399# File systems
@@ -1340,14 +1403,20 @@ CONFIG_EXT2_FS_XATTR=y
1340CONFIG_EXT2_FS_POSIX_ACL=y 1403CONFIG_EXT2_FS_POSIX_ACL=y
1341CONFIG_EXT2_FS_SECURITY=y 1404CONFIG_EXT2_FS_SECURITY=y
1342CONFIG_EXT2_FS_XIP=y 1405CONFIG_EXT2_FS_XIP=y
1343CONFIG_FS_XIP=y
1344CONFIG_EXT3_FS=y 1406CONFIG_EXT3_FS=y
1345CONFIG_EXT3_FS_XATTR=y 1407CONFIG_EXT3_FS_XATTR=y
1346CONFIG_EXT3_FS_POSIX_ACL=y 1408CONFIG_EXT3_FS_POSIX_ACL=y
1347CONFIG_EXT3_FS_SECURITY=y 1409CONFIG_EXT3_FS_SECURITY=y
1348# CONFIG_EXT4DEV_FS is not set 1410CONFIG_EXT4_FS=y
1411# CONFIG_EXT4DEV_COMPAT is not set
1412CONFIG_EXT4_FS_XATTR=y
1413CONFIG_EXT4_FS_POSIX_ACL=y
1414CONFIG_EXT4_FS_SECURITY=y
1415CONFIG_FS_XIP=y
1349CONFIG_JBD=y 1416CONFIG_JBD=y
1350# CONFIG_JBD_DEBUG is not set 1417# CONFIG_JBD_DEBUG is not set
1418CONFIG_JBD2=y
1419# CONFIG_JBD2_DEBUG is not set
1351CONFIG_FS_MBCACHE=y 1420CONFIG_FS_MBCACHE=y
1352CONFIG_REISERFS_FS=y 1421CONFIG_REISERFS_FS=y
1353# CONFIG_REISERFS_CHECK is not set 1422# CONFIG_REISERFS_CHECK is not set
@@ -1361,6 +1430,7 @@ CONFIG_JFS_SECURITY=y
1361# CONFIG_JFS_DEBUG is not set 1430# CONFIG_JFS_DEBUG is not set
1362# CONFIG_JFS_STATISTICS is not set 1431# CONFIG_JFS_STATISTICS is not set
1363CONFIG_FS_POSIX_ACL=y 1432CONFIG_FS_POSIX_ACL=y
1433CONFIG_FILE_LOCKING=y
1364CONFIG_XFS_FS=m 1434CONFIG_XFS_FS=m
1365# CONFIG_XFS_QUOTA is not set 1435# CONFIG_XFS_QUOTA is not set
1366CONFIG_XFS_POSIX_ACL=y 1436CONFIG_XFS_POSIX_ACL=y
@@ -1372,6 +1442,7 @@ CONFIG_OCFS2_FS_O2CB=m
1372CONFIG_OCFS2_FS_STATS=y 1442CONFIG_OCFS2_FS_STATS=y
1373CONFIG_OCFS2_DEBUG_MASKLOG=y 1443CONFIG_OCFS2_DEBUG_MASKLOG=y
1374# CONFIG_OCFS2_DEBUG_FS is not set 1444# CONFIG_OCFS2_DEBUG_FS is not set
1445# CONFIG_OCFS2_COMPAT_JBD is not set
1375CONFIG_DNOTIFY=y 1446CONFIG_DNOTIFY=y
1376CONFIG_INOTIFY=y 1447CONFIG_INOTIFY=y
1377CONFIG_INOTIFY_USER=y 1448CONFIG_INOTIFY_USER=y
@@ -1405,6 +1476,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1405CONFIG_PROC_FS=y 1476CONFIG_PROC_FS=y
1406CONFIG_PROC_KCORE=y 1477CONFIG_PROC_KCORE=y
1407CONFIG_PROC_SYSCTL=y 1478CONFIG_PROC_SYSCTL=y
1479CONFIG_PROC_PAGE_MONITOR=y
1408CONFIG_SYSFS=y 1480CONFIG_SYSFS=y
1409CONFIG_TMPFS=y 1481CONFIG_TMPFS=y
1410# CONFIG_TMPFS_POSIX_ACL is not set 1482# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1449,6 +1521,7 @@ CONFIG_NFS_COMMON=y
1449CONFIG_SUNRPC=y 1521CONFIG_SUNRPC=y
1450CONFIG_SUNRPC_GSS=y 1522CONFIG_SUNRPC_GSS=y
1451CONFIG_SUNRPC_XPRT_RDMA=m 1523CONFIG_SUNRPC_XPRT_RDMA=m
1524# CONFIG_SUNRPC_REGISTER_V4 is not set
1452CONFIG_RPCSEC_GSS_KRB5=y 1525CONFIG_RPCSEC_GSS_KRB5=y
1453CONFIG_RPCSEC_GSS_SPKM3=m 1526CONFIG_RPCSEC_GSS_SPKM3=m
1454# CONFIG_SMB_FS is not set 1527# CONFIG_SMB_FS is not set
@@ -1514,9 +1587,8 @@ CONFIG_NLS_ISO8859_1=y
1514# Library routines 1587# Library routines
1515# 1588#
1516CONFIG_BITREVERSE=y 1589CONFIG_BITREVERSE=y
1517# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1518CONFIG_CRC_CCITT=m 1590CONFIG_CRC_CCITT=m
1519# CONFIG_CRC16 is not set 1591CONFIG_CRC16=y
1520CONFIG_CRC_T10DIF=y 1592CONFIG_CRC_T10DIF=y
1521CONFIG_CRC_ITU_T=m 1593CONFIG_CRC_ITU_T=m
1522CONFIG_CRC32=y 1594CONFIG_CRC32=y
@@ -1580,21 +1652,31 @@ CONFIG_DEBUG_MEMORY_INIT=y
1580CONFIG_FRAME_POINTER=y 1652CONFIG_FRAME_POINTER=y
1581# CONFIG_BOOT_PRINTK_DELAY is not set 1653# CONFIG_BOOT_PRINTK_DELAY is not set
1582# CONFIG_RCU_TORTURE_TEST is not set 1654# CONFIG_RCU_TORTURE_TEST is not set
1655# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1583# CONFIG_KPROBES_SANITY_TEST is not set 1656# CONFIG_KPROBES_SANITY_TEST is not set
1584# CONFIG_BACKTRACE_SELF_TEST is not set 1657# CONFIG_BACKTRACE_SELF_TEST is not set
1658# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1585# CONFIG_LKDTM is not set 1659# CONFIG_LKDTM is not set
1586# CONFIG_FAULT_INJECTION is not set 1660# CONFIG_FAULT_INJECTION is not set
1587CONFIG_LATENCYTOP=y 1661CONFIG_LATENCYTOP=y
1588CONFIG_SYSCTL_SYSCALL_CHECK=y 1662CONFIG_SYSCTL_SYSCALL_CHECK=y
1589CONFIG_HAVE_FTRACE=y 1663CONFIG_NOP_TRACER=y
1590CONFIG_HAVE_DYNAMIC_FTRACE=y 1664CONFIG_HAVE_FUNCTION_TRACER=y
1591CONFIG_TRACER_MAX_TRACE=y 1665CONFIG_TRACER_MAX_TRACE=y
1666CONFIG_RING_BUFFER=y
1592CONFIG_TRACING=y 1667CONFIG_TRACING=y
1593# CONFIG_FTRACE is not set 1668
1669#
1670# Tracers
1671#
1672CONFIG_FUNCTION_TRACER=y
1594CONFIG_IRQSOFF_TRACER=y 1673CONFIG_IRQSOFF_TRACER=y
1595CONFIG_SCHED_TRACER=y 1674CONFIG_SCHED_TRACER=y
1596CONFIG_CONTEXT_SWITCH_TRACER=y 1675CONFIG_CONTEXT_SWITCH_TRACER=y
1676# CONFIG_BOOT_TRACER is not set
1677CONFIG_STACK_TRACER=y
1597# CONFIG_FTRACE_STARTUP_TEST is not set 1678# CONFIG_FTRACE_STARTUP_TEST is not set
1679CONFIG_DYNAMIC_PRINTK_DEBUG=y
1598# CONFIG_SAMPLES is not set 1680# CONFIG_SAMPLES is not set
1599CONFIG_HAVE_ARCH_KGDB=y 1681CONFIG_HAVE_ARCH_KGDB=y
1600# CONFIG_KGDB is not set 1682# CONFIG_KGDB is not set
@@ -1604,6 +1686,7 @@ CONFIG_DEBUG_STACKOVERFLOW=y
1604CONFIG_HCALL_STATS=y 1686CONFIG_HCALL_STATS=y
1605# CONFIG_CODE_PATCHING_SELFTEST is not set 1687# CONFIG_CODE_PATCHING_SELFTEST is not set
1606# CONFIG_FTR_FIXUP_SELFTEST is not set 1688# CONFIG_FTR_FIXUP_SELFTEST is not set
1689# CONFIG_MSI_BITMAP_SELFTEST is not set
1607CONFIG_XMON=y 1690CONFIG_XMON=y
1608CONFIG_XMON_DEFAULT=y 1691CONFIG_XMON_DEFAULT=y
1609CONFIG_XMON_DISASSEMBLY=y 1692CONFIG_XMON_DISASSEMBLY=y
@@ -1618,16 +1701,19 @@ CONFIG_VIRQ_DEBUG=y
1618# 1701#
1619# CONFIG_KEYS is not set 1702# CONFIG_KEYS is not set
1620# CONFIG_SECURITY is not set 1703# CONFIG_SECURITY is not set
1704# CONFIG_SECURITYFS is not set
1621# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1705# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1622CONFIG_CRYPTO=y 1706CONFIG_CRYPTO=y
1623 1707
1624# 1708#
1625# Crypto core or helper 1709# Crypto core or helper
1626# 1710#
1711# CONFIG_CRYPTO_FIPS is not set
1627CONFIG_CRYPTO_ALGAPI=y 1712CONFIG_CRYPTO_ALGAPI=y
1628CONFIG_CRYPTO_AEAD=m 1713CONFIG_CRYPTO_AEAD=y
1629CONFIG_CRYPTO_BLKCIPHER=y 1714CONFIG_CRYPTO_BLKCIPHER=y
1630CONFIG_CRYPTO_HASH=y 1715CONFIG_CRYPTO_HASH=y
1716CONFIG_CRYPTO_RNG=y
1631CONFIG_CRYPTO_MANAGER=y 1717CONFIG_CRYPTO_MANAGER=y
1632CONFIG_CRYPTO_GF128MUL=m 1718CONFIG_CRYPTO_GF128MUL=m
1633CONFIG_CRYPTO_NULL=m 1719CONFIG_CRYPTO_NULL=m
@@ -1701,6 +1787,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1701# 1787#
1702CONFIG_CRYPTO_DEFLATE=m 1788CONFIG_CRYPTO_DEFLATE=m
1703CONFIG_CRYPTO_LZO=m 1789CONFIG_CRYPTO_LZO=m
1790
1791#
1792# Random Number Generation
1793#
1794# CONFIG_CRYPTO_ANSI_CPRNG is not set
1704# CONFIG_CRYPTO_HW is not set 1795# CONFIG_CRYPTO_HW is not set
1705# CONFIG_PPC_CLOCK is not set 1796# CONFIG_PPC_CLOCK is not set
1706# CONFIG_VIRTUALIZATION is not set 1797# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig
index 4340cc1c5b6a..b3f5671972a9 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Thu Aug 21 00:52:16 2008 4# Sat Nov 8 12:39:48 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -102,7 +102,9 @@ CONFIG_SIGNALFD=y
102CONFIG_TIMERFD=y 102CONFIG_TIMERFD=y
103CONFIG_EVENTFD=y 103CONFIG_EVENTFD=y
104CONFIG_SHMEM=y 104CONFIG_SHMEM=y
105CONFIG_AIO=y
105CONFIG_VM_EVENT_COUNTERS=y 106CONFIG_VM_EVENT_COUNTERS=y
107CONFIG_PCI_QUIRKS=y
106CONFIG_SLUB_DEBUG=y 108CONFIG_SLUB_DEBUG=y
107# CONFIG_SLAB is not set 109# CONFIG_SLAB is not set
108CONFIG_SLUB=y 110CONFIG_SLUB=y
@@ -115,10 +117,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
115CONFIG_HAVE_KPROBES=y 117CONFIG_HAVE_KPROBES=y
116CONFIG_HAVE_KRETPROBES=y 118CONFIG_HAVE_KRETPROBES=y
117CONFIG_HAVE_ARCH_TRACEHOOK=y 119CONFIG_HAVE_ARCH_TRACEHOOK=y
118# CONFIG_HAVE_DMA_ATTRS is not set
119# CONFIG_USE_GENERIC_SMP_HELPERS is not set
120# CONFIG_HAVE_CLK is not set
121CONFIG_PROC_PAGE_MONITOR=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 120# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 121CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 122CONFIG_RT_MUTEXES=y
@@ -151,6 +149,7 @@ CONFIG_DEFAULT_CFQ=y
151# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="cfq" 150CONFIG_DEFAULT_IOSCHED="cfq"
153CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_FREEZER is not set
154 153
155# 154#
156# Platform support 155# Platform support
@@ -190,13 +189,13 @@ CONFIG_MPIC=y
190# CONFIG_GENERIC_IOMAP is not set 189# CONFIG_GENERIC_IOMAP is not set
191# CONFIG_CPU_FREQ is not set 190# CONFIG_CPU_FREQ is not set
192# CONFIG_TAU is not set 191# CONFIG_TAU is not set
192# CONFIG_QUICC_ENGINE is not set
193# CONFIG_FSL_ULI1575 is not set 193# CONFIG_FSL_ULI1575 is not set
194 194
195# 195#
196# Kernel options 196# Kernel options
197# 197#
198# CONFIG_HIGHMEM is not set 198# CONFIG_HIGHMEM is not set
199# CONFIG_TICK_ONESHOT is not set
200# CONFIG_NO_HZ is not set 199# CONFIG_NO_HZ is not set
201# CONFIG_HIGH_RES_TIMERS is not set 200# CONFIG_HIGH_RES_TIMERS is not set
202CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 201CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -210,6 +209,8 @@ CONFIG_PREEMPT_NONE=y
210# CONFIG_PREEMPT_VOLUNTARY is not set 209# CONFIG_PREEMPT_VOLUNTARY is not set
211# CONFIG_PREEMPT is not set 210# CONFIG_PREEMPT is not set
212CONFIG_BINFMT_ELF=y 211CONFIG_BINFMT_ELF=y
212# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
213# CONFIG_HAVE_AOUT is not set
213CONFIG_BINFMT_MISC=y 214CONFIG_BINFMT_MISC=y
214# CONFIG_IOMMU_HELPER is not set 215# CONFIG_IOMMU_HELPER is not set
215CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 216CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -224,15 +225,15 @@ CONFIG_FLATMEM_MANUAL=y
224# CONFIG_SPARSEMEM_MANUAL is not set 225# CONFIG_SPARSEMEM_MANUAL is not set
225CONFIG_FLATMEM=y 226CONFIG_FLATMEM=y
226CONFIG_FLAT_NODE_MEM_MAP=y 227CONFIG_FLAT_NODE_MEM_MAP=y
227# CONFIG_SPARSEMEM_STATIC is not set
228# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
229CONFIG_PAGEFLAGS_EXTENDED=y 228CONFIG_PAGEFLAGS_EXTENDED=y
230CONFIG_SPLIT_PTLOCK_CPUS=4 229CONFIG_SPLIT_PTLOCK_CPUS=4
231CONFIG_MIGRATION=y 230CONFIG_MIGRATION=y
232# CONFIG_RESOURCES_64BIT is not set 231# CONFIG_RESOURCES_64BIT is not set
232# CONFIG_PHYS_ADDR_T_64BIT is not set
233CONFIG_ZONE_DMA_FLAG=1 233CONFIG_ZONE_DMA_FLAG=1
234CONFIG_BOUNCE=y 234CONFIG_BOUNCE=y
235CONFIG_VIRT_TO_BUS=y 235CONFIG_VIRT_TO_BUS=y
236CONFIG_UNEVICTABLE_LRU=y
236CONFIG_FORCE_MAX_ZONEORDER=11 237CONFIG_FORCE_MAX_ZONEORDER=11
237CONFIG_PROC_DEVICETREE=y 238CONFIG_PROC_DEVICETREE=y
238CONFIG_CMDLINE_BOOL=y 239CONFIG_CMDLINE_BOOL=y
@@ -255,7 +256,7 @@ CONFIG_PCI_SYSCALL=y
255# CONFIG_PCIEPORTBUS is not set 256# CONFIG_PCIEPORTBUS is not set
256CONFIG_ARCH_SUPPORTS_MSI=y 257CONFIG_ARCH_SUPPORTS_MSI=y
257# CONFIG_PCI_MSI is not set 258# CONFIG_PCI_MSI is not set
258CONFIG_PCI_LEGACY=y 259# CONFIG_PCI_LEGACY is not set
259# CONFIG_PCCARD is not set 260# CONFIG_PCCARD is not set
260# CONFIG_HOTPLUG_PCI is not set 261# CONFIG_HOTPLUG_PCI is not set
261# CONFIG_HAS_RAPIDIO is not set 262# CONFIG_HAS_RAPIDIO is not set
@@ -318,6 +319,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
318# CONFIG_TIPC is not set 319# CONFIG_TIPC is not set
319# CONFIG_ATM is not set 320# CONFIG_ATM is not set
320# CONFIG_BRIDGE is not set 321# CONFIG_BRIDGE is not set
322# CONFIG_NET_DSA is not set
321# CONFIG_VLAN_8021Q is not set 323# CONFIG_VLAN_8021Q is not set
322# CONFIG_DECNET is not set 324# CONFIG_DECNET is not set
323# CONFIG_LLC2 is not set 325# CONFIG_LLC2 is not set
@@ -338,11 +340,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
338# CONFIG_IRDA is not set 340# CONFIG_IRDA is not set
339# CONFIG_BT is not set 341# CONFIG_BT is not set
340# CONFIG_AF_RXRPC is not set 342# CONFIG_AF_RXRPC is not set
341 343# CONFIG_PHONET is not set
342# 344CONFIG_WIRELESS=y
343# Wireless
344#
345# CONFIG_CFG80211 is not set 345# CONFIG_CFG80211 is not set
346CONFIG_WIRELESS_OLD_REGULATORY=y
346# CONFIG_WIRELESS_EXT is not set 347# CONFIG_WIRELESS_EXT is not set
347# CONFIG_MAC80211 is not set 348# CONFIG_MAC80211 is not set
348# CONFIG_IEEE80211 is not set 349# CONFIG_IEEE80211 is not set
@@ -471,18 +472,17 @@ CONFIG_MISC_DEVICES=y
471# CONFIG_HP_ILO is not set 472# CONFIG_HP_ILO is not set
472CONFIG_HAVE_IDE=y 473CONFIG_HAVE_IDE=y
473CONFIG_IDE=y 474CONFIG_IDE=y
474CONFIG_BLK_DEV_IDE=y
475 475
476# 476#
477# Please see Documentation/ide/ide.txt for help/info on IDE drives 477# Please see Documentation/ide/ide.txt for help/info on IDE drives
478# 478#
479CONFIG_IDE_TIMINGS=y 479CONFIG_IDE_TIMINGS=y
480# CONFIG_BLK_DEV_IDE_SATA is not set 480# CONFIG_BLK_DEV_IDE_SATA is not set
481CONFIG_BLK_DEV_IDEDISK=y 481CONFIG_IDE_GD=y
482CONFIG_IDEDISK_MULTI_MODE=y 482CONFIG_IDE_GD_ATA=y
483# CONFIG_IDE_GD_ATAPI is not set
483# CONFIG_BLK_DEV_IDECD is not set 484# CONFIG_BLK_DEV_IDECD is not set
484# CONFIG_BLK_DEV_IDETAPE is not set 485# CONFIG_BLK_DEV_IDETAPE is not set
485# CONFIG_BLK_DEV_IDEFLOPPY is not set
486# CONFIG_BLK_DEV_IDESCSI is not set 486# CONFIG_BLK_DEV_IDESCSI is not set
487# CONFIG_IDE_TASK_IOCTL is not set 487# CONFIG_IDE_TASK_IOCTL is not set
488CONFIG_IDE_PROC_FS=y 488CONFIG_IDE_PROC_FS=y
@@ -605,6 +605,7 @@ CONFIG_SCSI_LOWLEVEL=y
605# CONFIG_ATA is not set 605# CONFIG_ATA is not set
606CONFIG_MD=y 606CONFIG_MD=y
607CONFIG_BLK_DEV_MD=y 607CONFIG_BLK_DEV_MD=y
608CONFIG_MD_AUTODETECT=y
608CONFIG_MD_LINEAR=y 609CONFIG_MD_LINEAR=y
609CONFIG_MD_RAID0=y 610CONFIG_MD_RAID0=y
610CONFIG_MD_RAID1=y 611CONFIG_MD_RAID1=y
@@ -636,6 +637,7 @@ CONFIG_DUMMY=m
636# CONFIG_VETH is not set 637# CONFIG_VETH is not set
637# CONFIG_ARCNET is not set 638# CONFIG_ARCNET is not set
638# CONFIG_NET_ETHERNET is not set 639# CONFIG_NET_ETHERNET is not set
640CONFIG_MII=y
639CONFIG_NETDEV_1000=y 641CONFIG_NETDEV_1000=y
640# CONFIG_ACENIC is not set 642# CONFIG_ACENIC is not set
641# CONFIG_DL2K is not set 643# CONFIG_DL2K is not set
@@ -658,6 +660,7 @@ CONFIG_R8169=y
658# CONFIG_QLA3XXX is not set 660# CONFIG_QLA3XXX is not set
659# CONFIG_ATL1 is not set 661# CONFIG_ATL1 is not set
660# CONFIG_ATL1E is not set 662# CONFIG_ATL1E is not set
663# CONFIG_JME is not set
661# CONFIG_NETDEV_10000 is not set 664# CONFIG_NETDEV_10000 is not set
662# CONFIG_TR is not set 665# CONFIG_TR is not set
663 666
@@ -827,6 +830,17 @@ CONFIG_SSB_POSSIBLE=y
827# CONFIG_MFD_SM501 is not set 830# CONFIG_MFD_SM501 is not set
828# CONFIG_HTC_PASIC3 is not set 831# CONFIG_HTC_PASIC3 is not set
829# CONFIG_MFD_TMIO is not set 832# CONFIG_MFD_TMIO is not set
833# CONFIG_PMIC_DA903X is not set
834# CONFIG_MFD_WM8400 is not set
835# CONFIG_MFD_WM8350_I2C is not set
836
837#
838# Voltage and Current regulators
839#
840# CONFIG_REGULATOR is not set
841# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
842# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
843# CONFIG_REGULATOR_BQ24022 is not set
830 844
831# 845#
832# Multimedia devices 846# Multimedia devices
@@ -877,6 +891,8 @@ CONFIG_USB_DEVICE_CLASS=y
877# CONFIG_USB_OTG_WHITELIST is not set 891# CONFIG_USB_OTG_WHITELIST is not set
878# CONFIG_USB_OTG_BLACKLIST_HUB is not set 892# CONFIG_USB_OTG_BLACKLIST_HUB is not set
879# CONFIG_USB_MON is not set 893# CONFIG_USB_MON is not set
894# CONFIG_USB_WUSB is not set
895# CONFIG_USB_WUSB_CBAF is not set
880 896
881# 897#
882# USB Host Controller Drivers 898# USB Host Controller Drivers
@@ -897,6 +913,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
897# CONFIG_USB_UHCI_HCD is not set 913# CONFIG_USB_UHCI_HCD is not set
898# CONFIG_USB_SL811_HCD is not set 914# CONFIG_USB_SL811_HCD is not set
899# CONFIG_USB_R8A66597_HCD is not set 915# CONFIG_USB_R8A66597_HCD is not set
916# CONFIG_USB_WHCI_HCD is not set
917# CONFIG_USB_HWA_HCD is not set
900 918
901# 919#
902# USB Device Class drivers 920# USB Device Class drivers
@@ -904,6 +922,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
904# CONFIG_USB_ACM is not set 922# CONFIG_USB_ACM is not set
905# CONFIG_USB_PRINTER is not set 923# CONFIG_USB_PRINTER is not set
906# CONFIG_USB_WDM is not set 924# CONFIG_USB_WDM is not set
925# CONFIG_USB_TMC is not set
907 926
908# 927#
909# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 928# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -924,7 +943,6 @@ CONFIG_USB_STORAGE=y
924# CONFIG_USB_STORAGE_JUMPSHOT is not set 943# CONFIG_USB_STORAGE_JUMPSHOT is not set
925# CONFIG_USB_STORAGE_ALAUDA is not set 944# CONFIG_USB_STORAGE_ALAUDA is not set
926# CONFIG_USB_STORAGE_KARMA is not set 945# CONFIG_USB_STORAGE_KARMA is not set
927# CONFIG_USB_STORAGE_SIERRA is not set
928# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 946# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
929# CONFIG_USB_LIBUSUAL is not set 947# CONFIG_USB_LIBUSUAL is not set
930 948
@@ -945,6 +963,7 @@ CONFIG_USB_STORAGE=y
945# CONFIG_USB_EMI62 is not set 963# CONFIG_USB_EMI62 is not set
946# CONFIG_USB_EMI26 is not set 964# CONFIG_USB_EMI26 is not set
947# CONFIG_USB_ADUTUX is not set 965# CONFIG_USB_ADUTUX is not set
966# CONFIG_USB_SEVSEG is not set
948# CONFIG_USB_RIO500 is not set 967# CONFIG_USB_RIO500 is not set
949# CONFIG_USB_LEGOTOWER is not set 968# CONFIG_USB_LEGOTOWER is not set
950# CONFIG_USB_LCD is not set 969# CONFIG_USB_LCD is not set
@@ -962,7 +981,9 @@ CONFIG_USB_STORAGE=y
962# CONFIG_USB_IOWARRIOR is not set 981# CONFIG_USB_IOWARRIOR is not set
963# CONFIG_USB_TEST is not set 982# CONFIG_USB_TEST is not set
964# CONFIG_USB_ISIGHTFW is not set 983# CONFIG_USB_ISIGHTFW is not set
984# CONFIG_USB_VST is not set
965# CONFIG_USB_GADGET is not set 985# CONFIG_USB_GADGET is not set
986# CONFIG_UWB is not set
966# CONFIG_MMC is not set 987# CONFIG_MMC is not set
967# CONFIG_MEMSTICK is not set 988# CONFIG_MEMSTICK is not set
968# CONFIG_NEW_LEDS is not set 989# CONFIG_NEW_LEDS is not set
@@ -1008,12 +1029,15 @@ CONFIG_RTC_DRV_DS1307=y
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_DS1286 is not set
1011# CONFIG_RTC_DRV_DS1511 is not set 1033# CONFIG_RTC_DRV_DS1511 is not set
1012# CONFIG_RTC_DRV_DS1553 is not set 1034# CONFIG_RTC_DRV_DS1553 is not set
1013# CONFIG_RTC_DRV_DS1742 is not set 1035# CONFIG_RTC_DRV_DS1742 is not set
1014# CONFIG_RTC_DRV_STK17TA8 is not set 1036# CONFIG_RTC_DRV_STK17TA8 is not set
1015# CONFIG_RTC_DRV_M48T86 is not set 1037# CONFIG_RTC_DRV_M48T86 is not set
1038# CONFIG_RTC_DRV_M48T35 is not set
1016# CONFIG_RTC_DRV_M48T59 is not set 1039# CONFIG_RTC_DRV_M48T59 is not set
1040# CONFIG_RTC_DRV_BQ4802 is not set
1017# CONFIG_RTC_DRV_V3020 is not set 1041# CONFIG_RTC_DRV_V3020 is not set
1018 1042
1019# 1043#
@@ -1022,6 +1046,7 @@ CONFIG_RTC_DRV_DS1307=y
1022# CONFIG_RTC_DRV_PPC is not set 1046# CONFIG_RTC_DRV_PPC is not set
1023# CONFIG_DMADEVICES is not set 1047# CONFIG_DMADEVICES is not set
1024# CONFIG_UIO is not set 1048# CONFIG_UIO is not set
1049# CONFIG_STAGING is not set
1025 1050
1026# 1051#
1027# File systems 1052# File systems
@@ -1033,12 +1058,13 @@ CONFIG_EXT3_FS=y
1033CONFIG_EXT3_FS_XATTR=y 1058CONFIG_EXT3_FS_XATTR=y
1034# CONFIG_EXT3_FS_POSIX_ACL is not set 1059# CONFIG_EXT3_FS_POSIX_ACL is not set
1035# CONFIG_EXT3_FS_SECURITY is not set 1060# CONFIG_EXT3_FS_SECURITY is not set
1036# CONFIG_EXT4DEV_FS is not set 1061# CONFIG_EXT4_FS is not set
1037CONFIG_JBD=y 1062CONFIG_JBD=y
1038CONFIG_FS_MBCACHE=y 1063CONFIG_FS_MBCACHE=y
1039# CONFIG_REISERFS_FS is not set 1064# CONFIG_REISERFS_FS is not set
1040# CONFIG_JFS_FS is not set 1065# CONFIG_JFS_FS is not set
1041# CONFIG_FS_POSIX_ACL is not set 1066# CONFIG_FS_POSIX_ACL is not set
1067CONFIG_FILE_LOCKING=y
1042CONFIG_XFS_FS=m 1068CONFIG_XFS_FS=m
1043# CONFIG_XFS_QUOTA is not set 1069# CONFIG_XFS_QUOTA is not set
1044# CONFIG_XFS_POSIX_ACL is not set 1070# CONFIG_XFS_POSIX_ACL is not set
@@ -1072,6 +1098,7 @@ CONFIG_INOTIFY_USER=y
1072CONFIG_PROC_FS=y 1098CONFIG_PROC_FS=y
1073CONFIG_PROC_KCORE=y 1099CONFIG_PROC_KCORE=y
1074CONFIG_PROC_SYSCTL=y 1100CONFIG_PROC_SYSCTL=y
1101CONFIG_PROC_PAGE_MONITOR=y
1075CONFIG_SYSFS=y 1102CONFIG_SYSFS=y
1076CONFIG_TMPFS=y 1103CONFIG_TMPFS=y
1077# CONFIG_TMPFS_POSIX_ACL is not set 1104# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1177,7 +1204,6 @@ CONFIG_NLS_UTF8=y
1177# Library routines 1204# Library routines
1178# 1205#
1179CONFIG_BITREVERSE=y 1206CONFIG_BITREVERSE=y
1180# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1181# CONFIG_CRC_CCITT is not set 1207# CONFIG_CRC_CCITT is not set
1182# CONFIG_CRC16 is not set 1208# CONFIG_CRC16 is not set
1183CONFIG_CRC_T10DIF=y 1209CONFIG_CRC_T10DIF=y
@@ -1209,13 +1235,15 @@ CONFIG_FRAME_WARN=1024
1209# CONFIG_SLUB_STATS is not set 1235# CONFIG_SLUB_STATS is not set
1210# CONFIG_DEBUG_BUGVERBOSE is not set 1236# CONFIG_DEBUG_BUGVERBOSE is not set
1211# CONFIG_DEBUG_MEMORY_INIT is not set 1237# CONFIG_DEBUG_MEMORY_INIT is not set
1238# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1212# CONFIG_LATENCYTOP is not set 1239# CONFIG_LATENCYTOP is not set
1213CONFIG_SYSCTL_SYSCALL_CHECK=y 1240CONFIG_SYSCTL_SYSCALL_CHECK=y
1214CONFIG_HAVE_FTRACE=y 1241CONFIG_HAVE_FUNCTION_TRACER=y
1215CONFIG_HAVE_DYNAMIC_FTRACE=y 1242
1216# CONFIG_FTRACE is not set 1243#
1217# CONFIG_SCHED_TRACER is not set 1244# Tracers
1218# CONFIG_CONTEXT_SWITCH_TRACER is not set 1245#
1246# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1219# CONFIG_SAMPLES is not set 1247# CONFIG_SAMPLES is not set
1220CONFIG_HAVE_ARCH_KGDB=y 1248CONFIG_HAVE_ARCH_KGDB=y
1221# CONFIG_IRQSTACKS is not set 1249# CONFIG_IRQSTACKS is not set
@@ -1227,6 +1255,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1227# 1255#
1228# CONFIG_KEYS is not set 1256# CONFIG_KEYS is not set
1229# CONFIG_SECURITY is not set 1257# CONFIG_SECURITY is not set
1258# CONFIG_SECURITYFS is not set
1230# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1259# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1231CONFIG_XOR_BLOCKS=y 1260CONFIG_XOR_BLOCKS=y
1232CONFIG_ASYNC_CORE=y 1261CONFIG_ASYNC_CORE=y
diff --git a/arch/powerpc/include/asm/immap_cpm2.h b/arch/powerpc/include/asm/immap_cpm2.h
index 4080bab0468c..d4f069bf0e57 100644
--- a/arch/powerpc/include/asm/immap_cpm2.h
+++ b/arch/powerpc/include/asm/immap_cpm2.h
@@ -554,14 +554,11 @@ typedef struct usb_ctlr {
554 u8 usb_usadr; 554 u8 usb_usadr;
555 u8 usb_uscom; 555 u8 usb_uscom;
556 u8 res1[1]; 556 u8 res1[1];
557 u16 usb_usep1; 557 __be16 usb_usep[4];
558 u16 usb_usep2;
559 u16 usb_usep3;
560 u16 usb_usep4;
561 u8 res2[4]; 558 u8 res2[4];
562 u16 usb_usber; 559 __be16 usb_usber;
563 u8 res3[2]; 560 u8 res3[2];
564 u16 usb_usbmr; 561 __be16 usb_usbmr;
565 u8 usb_usbs; 562 u8 usb_usbs;
566 u8 res4[7]; 563 u8 res4[7];
567} usb_cpm2_t; 564} usb_cpm2_t;
diff --git a/arch/powerpc/include/asm/immap_qe.h b/arch/powerpc/include/asm/immap_qe.h
index 3c2fced3ac22..c346d0bcd230 100644
--- a/arch/powerpc/include/asm/immap_qe.h
+++ b/arch/powerpc/include/asm/immap_qe.h
@@ -215,10 +215,7 @@ struct usb_ctlr {
215 u8 usb_usadr; 215 u8 usb_usadr;
216 u8 usb_uscom; 216 u8 usb_uscom;
217 u8 res1[1]; 217 u8 res1[1];
218 __be16 usb_usep1; 218 __be16 usb_usep[4];
219 __be16 usb_usep2;
220 __be16 usb_usep3;
221 __be16 usb_usep4;
222 u8 res2[4]; 219 u8 res2[4];
223 __be16 usb_usber; 220 __be16 usb_usber;
224 u8 res3[2]; 221 u8 res3[2];
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index 6a9b4bf0d173..bdc8b0e860e5 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -470,6 +470,8 @@ _GLOBAL(_tlbil_pid)
470 mfspr r3,SPRN_MMUCSR0 470 mfspr r3,SPRN_MMUCSR0
471 andi. r3,r3,MMUCSR0_TLBFI@l 471 andi. r3,r3,MMUCSR0_TLBFI@l
472 bne 1b 472 bne 1b
473 msync
474 isync
473 blr 475 blr
474 476
475/* 477/*
@@ -486,6 +488,8 @@ _GLOBAL(_tlbil_va)
486 rlwinm r4,r4,0,1,31 488 rlwinm r4,r4,0,1,31
487 mtspr SPRN_MAS1,r4 489 mtspr SPRN_MAS1,r4
488 tlbwe 490 tlbwe
491 msync
492 isync
489 blr 493 blr
490#endif /* CONFIG_FSL_BOOKE */ 494#endif /* CONFIG_FSL_BOOKE */
491 495
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index a6a43103655e..b13abf305996 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -941,9 +941,21 @@ long sys_swapcontext(struct ucontext __user *old_ctx,
941#ifdef CONFIG_PPC64 941#ifdef CONFIG_PPC64
942 unsigned long new_msr = 0; 942 unsigned long new_msr = 0;
943 943
944 if (new_ctx && 944 if (new_ctx) {
945 get_user(new_msr, &new_ctx->uc_mcontext.mc_gregs[PT_MSR])) 945 struct mcontext __user *mcp;
946 return -EFAULT; 946 u32 cmcp;
947
948 /*
949 * Get pointer to the real mcontext. No need for
950 * access_ok since we are dealing with compat
951 * pointers.
952 */
953 if (__get_user(cmcp, &new_ctx->uc_regs))
954 return -EFAULT;
955 mcp = (struct mcontext __user *)(u64)cmcp;
956 if (__get_user(new_msr, &mcp->mc_gregs[PT_MSR]))
957 return -EFAULT;
958 }
947 /* 959 /*
948 * Check that the context is not smaller than the original 960 * Check that the context is not smaller than the original
949 * size (with VMX but without VSX) 961 * size (with VMX but without VSX)
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index ed500ef799b7..08844fc24a2e 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -61,22 +61,25 @@ STACK_SIZE = 1 << STACK_SHIFT
61 61
62#ifdef CONFIG_TRACE_IRQFLAGS 62#ifdef CONFIG_TRACE_IRQFLAGS
63 .macro TRACE_IRQS_ON 63 .macro TRACE_IRQS_ON
64 l %r1,BASED(.Ltrace_irq_on) 64 basr %r2,%r0
65 l %r1,BASED(.Ltrace_irq_on_caller)
65 basr %r14,%r1 66 basr %r14,%r1
66 .endm 67 .endm
67 68
68 .macro TRACE_IRQS_OFF 69 .macro TRACE_IRQS_OFF
69 l %r1,BASED(.Ltrace_irq_off) 70 basr %r2,%r0
71 l %r1,BASED(.Ltrace_irq_off_caller)
70 basr %r14,%r1 72 basr %r14,%r1
71 .endm 73 .endm
72 74
73 .macro TRACE_IRQS_CHECK 75 .macro TRACE_IRQS_CHECK
76 basr %r2,%r0
74 tm SP_PSW(%r15),0x03 # irqs enabled? 77 tm SP_PSW(%r15),0x03 # irqs enabled?
75 jz 0f 78 jz 0f
76 l %r1,BASED(.Ltrace_irq_on) 79 l %r1,BASED(.Ltrace_irq_on_caller)
77 basr %r14,%r1 80 basr %r14,%r1
78 j 1f 81 j 1f
790: l %r1,BASED(.Ltrace_irq_off) 820: l %r1,BASED(.Ltrace_irq_off_caller)
80 basr %r14,%r1 83 basr %r14,%r1
811: 841:
82 .endm 85 .endm
@@ -1113,9 +1116,12 @@ cleanup_io_leave_insn:
1113.Lschedtail: .long schedule_tail 1116.Lschedtail: .long schedule_tail
1114.Lsysc_table: .long sys_call_table 1117.Lsysc_table: .long sys_call_table
1115#ifdef CONFIG_TRACE_IRQFLAGS 1118#ifdef CONFIG_TRACE_IRQFLAGS
1116.Ltrace_irq_on: .long trace_hardirqs_on 1119.Ltrace_irq_on_caller:
1117.Ltrace_irq_off: 1120 .long trace_hardirqs_on_caller
1118 .long trace_hardirqs_off 1121.Ltrace_irq_off_caller:
1122 .long trace_hardirqs_off_caller
1123#endif
1124#ifdef CONFIG_LOCKDEP
1119.Llockdep_sys_exit: 1125.Llockdep_sys_exit:
1120 .long lockdep_sys_exit 1126 .long lockdep_sys_exit
1121#endif 1127#endif
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index d7ce150453f2..41aca06682aa 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -61,19 +61,22 @@ _TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \
61 61
62#ifdef CONFIG_TRACE_IRQFLAGS 62#ifdef CONFIG_TRACE_IRQFLAGS
63 .macro TRACE_IRQS_ON 63 .macro TRACE_IRQS_ON
64 brasl %r14,trace_hardirqs_on 64 basr %r2,%r0
65 brasl %r14,trace_hardirqs_on_caller
65 .endm 66 .endm
66 67
67 .macro TRACE_IRQS_OFF 68 .macro TRACE_IRQS_OFF
68 brasl %r14,trace_hardirqs_off 69 basr %r2,%r0
70 brasl %r14,trace_hardirqs_off_caller
69 .endm 71 .endm
70 72
71 .macro TRACE_IRQS_CHECK 73 .macro TRACE_IRQS_CHECK
74 basr %r2,%r0
72 tm SP_PSW(%r15),0x03 # irqs enabled? 75 tm SP_PSW(%r15),0x03 # irqs enabled?
73 jz 0f 76 jz 0f
74 brasl %r14,trace_hardirqs_on 77 brasl %r14,trace_hardirqs_on_caller
75 j 1f 78 j 1f
760: brasl %r14,trace_hardirqs_off 790: brasl %r14,trace_hardirqs_off_caller
771: 801:
78 .endm 81 .endm
79#else 82#else
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index 3e2c05cb6a87..04f8c67a6101 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -136,9 +136,12 @@ static void default_idle(void)
136 return; 136 return;
137 } 137 }
138 trace_hardirqs_on(); 138 trace_hardirqs_on();
139 /* Don't trace preempt off for idle. */
140 stop_critical_timings();
139 /* Wait for external, I/O or machine check interrupt. */ 141 /* Wait for external, I/O or machine check interrupt. */
140 __load_psw_mask(psw_kernel_bits | PSW_MASK_WAIT | 142 __load_psw_mask(psw_kernel_bits | PSW_MASK_WAIT |
141 PSW_MASK_IO | PSW_MASK_EXT); 143 PSW_MASK_IO | PSW_MASK_EXT);
144 start_critical_timings();
142} 145}
143 146
144void cpu_idle(void) 147void cpu_idle(void)
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 62122bad1e33..400b040df7fa 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -604,13 +604,13 @@ setup_memory(void)
604 if (memory_chunk[i].type != CHUNK_READ_WRITE) 604 if (memory_chunk[i].type != CHUNK_READ_WRITE)
605 continue; 605 continue;
606 start_chunk = PFN_DOWN(memory_chunk[i].addr); 606 start_chunk = PFN_DOWN(memory_chunk[i].addr);
607 end_chunk = start_chunk + PFN_DOWN(memory_chunk[i].size) - 1; 607 end_chunk = start_chunk + PFN_DOWN(memory_chunk[i].size);
608 end_chunk = min(end_chunk, end_pfn); 608 end_chunk = min(end_chunk, end_pfn);
609 if (start_chunk >= end_chunk) 609 if (start_chunk >= end_chunk)
610 continue; 610 continue;
611 add_active_range(0, start_chunk, end_chunk); 611 add_active_range(0, start_chunk, end_chunk);
612 pfn = max(start_chunk, start_pfn); 612 pfn = max(start_chunk, start_pfn);
613 for (; pfn <= end_chunk; pfn++) 613 for (; pfn < end_chunk; pfn++)
614 page_set_storage_key(PFN_PHYS(pfn), PAGE_DEFAULT_KEY); 614 page_set_storage_key(PFN_PHYS(pfn), PAGE_DEFAULT_KEY);
615 } 615 }
616 616
diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c
index 5fdb799062b7..4fe952e557ac 100644
--- a/arch/s390/kernel/sys_s390.c
+++ b/arch/s390/kernel/sys_s390.c
@@ -198,7 +198,7 @@ asmlinkage long s390x_newuname(struct new_utsname __user *name)
198{ 198{
199 int ret = sys_newuname(name); 199 int ret = sys_newuname(name);
200 200
201 if (current->personality == PER_LINUX32 && !ret) { 201 if (personality(current->personality) == PER_LINUX32 && !ret) {
202 ret = copy_to_user(name->machine, "s390\0\0\0\0", 8); 202 ret = copy_to_user(name->machine, "s390\0\0\0\0", 8);
203 if (ret) ret = -EFAULT; 203 if (ret) ret = -EFAULT;
204 } 204 }
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 632b13e10053..a947899dcba1 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -65,18 +65,21 @@ static int machine_has_topology_irq;
65static struct timer_list topology_timer; 65static struct timer_list topology_timer;
66static void set_topology_timer(void); 66static void set_topology_timer(void);
67static DECLARE_WORK(topology_work, topology_work_fn); 67static DECLARE_WORK(topology_work, topology_work_fn);
68/* topology_lock protects the core linked list */
69static DEFINE_SPINLOCK(topology_lock);
68 70
69cpumask_t cpu_core_map[NR_CPUS]; 71cpumask_t cpu_core_map[NR_CPUS];
70 72
71cpumask_t cpu_coregroup_map(unsigned int cpu) 73cpumask_t cpu_coregroup_map(unsigned int cpu)
72{ 74{
73 struct core_info *core = &core_info; 75 struct core_info *core = &core_info;
76 unsigned long flags;
74 cpumask_t mask; 77 cpumask_t mask;
75 78
76 cpus_clear(mask); 79 cpus_clear(mask);
77 if (!machine_has_topology) 80 if (!machine_has_topology)
78 return cpu_present_map; 81 return cpu_present_map;
79 mutex_lock(&smp_cpu_state_mutex); 82 spin_lock_irqsave(&topology_lock, flags);
80 while (core) { 83 while (core) {
81 if (cpu_isset(cpu, core->mask)) { 84 if (cpu_isset(cpu, core->mask)) {
82 mask = core->mask; 85 mask = core->mask;
@@ -84,7 +87,7 @@ cpumask_t cpu_coregroup_map(unsigned int cpu)
84 } 87 }
85 core = core->next; 88 core = core->next;
86 } 89 }
87 mutex_unlock(&smp_cpu_state_mutex); 90 spin_unlock_irqrestore(&topology_lock, flags);
88 if (cpus_empty(mask)) 91 if (cpus_empty(mask))
89 mask = cpumask_of_cpu(cpu); 92 mask = cpumask_of_cpu(cpu);
90 return mask; 93 return mask;
@@ -133,7 +136,7 @@ static void tl_to_cores(struct tl_info *info)
133 union tl_entry *tle, *end; 136 union tl_entry *tle, *end;
134 struct core_info *core = &core_info; 137 struct core_info *core = &core_info;
135 138
136 mutex_lock(&smp_cpu_state_mutex); 139 spin_lock_irq(&topology_lock);
137 clear_cores(); 140 clear_cores();
138 tle = info->tle; 141 tle = info->tle;
139 end = (union tl_entry *)((unsigned long)info + info->length); 142 end = (union tl_entry *)((unsigned long)info + info->length);
@@ -157,7 +160,7 @@ static void tl_to_cores(struct tl_info *info)
157 } 160 }
158 tle = next_tle(tle); 161 tle = next_tle(tle);
159 } 162 }
160 mutex_unlock(&smp_cpu_state_mutex); 163 spin_unlock_irq(&topology_lock);
161} 164}
162 165
163static void topology_update_polarization_simple(void) 166static void topology_update_polarization_simple(void)
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index 436c28539577..65eaae34e753 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -293,6 +293,10 @@ __ioremap_mode(unsigned long offset, unsigned long size, unsigned long flags)
293 */ 293 */
294#define xlate_dev_kmem_ptr(p) p 294#define xlate_dev_kmem_ptr(p) p
295 295
296#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
297int valid_phys_addr_range(unsigned long addr, size_t size);
298int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);
299
296#endif /* __KERNEL__ */ 300#endif /* __KERNEL__ */
297 301
298#endif /* __ASM_SH_IO_H */ 302#endif /* __ASM_SH_IO_H */
diff --git a/arch/sh/include/asm/pgtable.h b/arch/sh/include/asm/pgtable.h
index 52220d70a096..b517ae08b9c0 100644
--- a/arch/sh/include/asm/pgtable.h
+++ b/arch/sh/include/asm/pgtable.h
@@ -148,6 +148,12 @@ extern void paging_init(void);
148extern void page_table_range_init(unsigned long start, unsigned long end, 148extern void page_table_range_init(unsigned long start, unsigned long end,
149 pgd_t *pgd); 149 pgd_t *pgd);
150 150
151#if !defined(CONFIG_CACHE_OFF) && defined(CONFIG_CPU_SH4) && defined(CONFIG_MMU)
152extern void kmap_coherent_init(void);
153#else
154#define kmap_coherent_init() do { } while (0)
155#endif
156
151#include <asm-generic/pgtable.h> 157#include <asm-generic/pgtable.h>
152 158
153#endif /* __ASM_SH_PGTABLE_H */ 159#endif /* __ASM_SH_PGTABLE_H */
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
index a7412cede534..6d9e6972cfc9 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
@@ -119,17 +119,17 @@ static struct plat_sci_port sci_platform_data[] = {
119 },{ 119 },{
120 .mapbase = 0xa4e30000, 120 .mapbase = 0xa4e30000,
121 .flags = UPF_BOOT_AUTOCONF, 121 .flags = UPF_BOOT_AUTOCONF,
122 .type = PORT_SCI, 122 .type = PORT_SCIFA,
123 .irqs = { 56, 56, 56, 56 }, 123 .irqs = { 56, 56, 56, 56 },
124 },{ 124 },{
125 .mapbase = 0xa4e40000, 125 .mapbase = 0xa4e40000,
126 .flags = UPF_BOOT_AUTOCONF, 126 .flags = UPF_BOOT_AUTOCONF,
127 .type = PORT_SCI, 127 .type = PORT_SCIFA,
128 .irqs = { 88, 88, 88, 88 }, 128 .irqs = { 88, 88, 88, 88 },
129 },{ 129 },{
130 .mapbase = 0xa4e50000, 130 .mapbase = 0xa4e50000,
131 .flags = UPF_BOOT_AUTOCONF, 131 .flags = UPF_BOOT_AUTOCONF,
132 .type = PORT_SCI, 132 .type = PORT_SCIFA,
133 .irqs = { 109, 109, 109, 109 }, 133 .irqs = { 109, 109, 109, 109 },
134 }, { 134 }, {
135 .flags = 0, 135 .flags = 0,
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c
index 6b7d166694e2..a952dcf9999d 100644
--- a/arch/sh/kernel/early_printk.c
+++ b/arch/sh/kernel/early_printk.c
@@ -75,6 +75,7 @@ static struct console bios_console = {
75#endif 75#endif
76 76
77static struct uart_port scif_port = { 77static struct uart_port scif_port = {
78 .type = PORT_SCIF,
78 .mapbase = CONFIG_EARLY_SCIF_CONSOLE_PORT, 79 .mapbase = CONFIG_EARLY_SCIF_CONSOLE_PORT,
79 .membase = (char __iomem *)CONFIG_EARLY_SCIF_CONSOLE_PORT, 80 .membase = (char __iomem *)CONFIG_EARLY_SCIF_CONSOLE_PORT,
80}; 81};
@@ -84,9 +85,9 @@ static void scif_sercon_putc(int c)
84 while (((sci_in(&scif_port, SCFDR) & EPK_FIFO_BITS) >= EPK_FIFO_SIZE)) 85 while (((sci_in(&scif_port, SCFDR) & EPK_FIFO_BITS) >= EPK_FIFO_SIZE))
85 ; 86 ;
86 87
87 sci_out(&scif_port, SCxTDR, c);
88 sci_in(&scif_port, SCxSR); 88 sci_in(&scif_port, SCxSR);
89 sci_out(&scif_port, SCxSR, 0xf3 & ~(0x20 | 0x40)); 89 sci_out(&scif_port, SCxSR, 0xf3 & ~(0x20 | 0x40));
90 sci_out(&scif_port, SCxTDR, c);
90 91
91 while ((sci_in(&scif_port, SCxSR) & 0x40) == 0) 92 while ((sci_in(&scif_port, SCxSR) & 0x40) == 0)
92 ; 93 ;
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c
index aaaf90d06b85..3c61ddd4d43e 100644
--- a/arch/sh/kernel/timers/timer-tmu.c
+++ b/arch/sh/kernel/timers/timer-tmu.c
@@ -120,7 +120,7 @@ static void tmu_set_mode(enum clock_event_mode mode,
120{ 120{
121 switch (mode) { 121 switch (mode) {
122 case CLOCK_EVT_MODE_PERIODIC: 122 case CLOCK_EVT_MODE_PERIODIC:
123 ctrl_outl(ctrl_inl(TMU0_TCNT), TMU0_TCOR); 123 ctrl_outl(tmu_latest_interval[TMU0], TMU0_TCOR);
124 break; 124 break;
125 case CLOCK_EVT_MODE_ONESHOT: 125 case CLOCK_EVT_MODE_ONESHOT:
126 ctrl_outl(0, TMU0_TCOR); 126 ctrl_outl(0, TMU0_TCOR);
diff --git a/arch/sh/lib/copy_page.S b/arch/sh/lib/copy_page.S
index 5d12e657be34..43de7e8e4e17 100644
--- a/arch/sh/lib/copy_page.S
+++ b/arch/sh/lib/copy_page.S
@@ -80,6 +80,11 @@ ENTRY(copy_page)
80 .section __ex_table, "a"; \ 80 .section __ex_table, "a"; \
81 .long 9999b, 6000f ; \ 81 .long 9999b, 6000f ; \
82 .previous 82 .previous
83#define EX_NO_POP(...) \
84 9999: __VA_ARGS__ ; \
85 .section __ex_table, "a"; \
86 .long 9999b, 6005f ; \
87 .previous
83ENTRY(__copy_user) 88ENTRY(__copy_user)
84 ! Check if small number of bytes 89 ! Check if small number of bytes
85 mov #11,r0 90 mov #11,r0
@@ -139,9 +144,9 @@ EX( mov.b r1,@r4 )
139 bt 1f 144 bt 1f
140 145
1412: 1462:
142EX( mov.b @r5+,r0 ) 147EX_NO_POP( mov.b @r5+,r0 )
143 dt r6 148 dt r6
144EX( mov.b r0,@r4 ) 149EX_NO_POP( mov.b r0,@r4 )
145 bf/s 2b 150 bf/s 2b
146 add #1,r4 151 add #1,r4
147 152
@@ -150,7 +155,7 @@ EX( mov.b r0,@r4 )
150 155
151# Exception handler: 156# Exception handler:
152.section .fixup, "ax" 157.section .fixup, "ax"
1536000: 1586005:
154 mov.l 8000f,r1 159 mov.l 8000f,r1
155 mov r3,r0 160 mov r3,r0
156 jmp @r1 161 jmp @r1
diff --git a/arch/sh/mm/Makefile_32 b/arch/sh/mm/Makefile_32
index 70e0906023cc..f066e76da204 100644
--- a/arch/sh/mm/Makefile_32
+++ b/arch/sh/mm/Makefile_32
@@ -2,7 +2,7 @@
2# Makefile for the Linux SuperH-specific parts of the memory manager. 2# Makefile for the Linux SuperH-specific parts of the memory manager.
3# 3#
4 4
5obj-y := init.o extable_32.o consistent.o 5obj-y := init.o extable_32.o consistent.o mmap.o
6 6
7ifndef CONFIG_CACHE_OFF 7ifndef CONFIG_CACHE_OFF
8cache-$(CONFIG_CPU_SH2) := cache-sh2.o 8cache-$(CONFIG_CPU_SH2) := cache-sh2.o
diff --git a/arch/sh/mm/Makefile_64 b/arch/sh/mm/Makefile_64
index 0d92a8a3ac9a..9481d0f54efd 100644
--- a/arch/sh/mm/Makefile_64
+++ b/arch/sh/mm/Makefile_64
@@ -2,7 +2,7 @@
2# Makefile for the Linux SuperH-specific parts of the memory manager. 2# Makefile for the Linux SuperH-specific parts of the memory manager.
3# 3#
4 4
5obj-y := init.o consistent.o 5obj-y := init.o consistent.o mmap.o
6 6
7mmu-y := tlb-nommu.o pg-nommu.o extable_32.o 7mmu-y := tlb-nommu.o pg-nommu.o extable_32.o
8mmu-$(CONFIG_MMU) := fault_64.o ioremap_64.o tlbflush_64.o tlb-sh5.o \ 8mmu-$(CONFIG_MMU) := fault_64.o ioremap_64.o tlbflush_64.o tlb-sh5.o \
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 4abf00031dae..6cbef8caeb56 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -137,6 +137,7 @@ void __init page_table_range_init(unsigned long start, unsigned long end,
137void __init paging_init(void) 137void __init paging_init(void)
138{ 138{
139 unsigned long max_zone_pfns[MAX_NR_ZONES]; 139 unsigned long max_zone_pfns[MAX_NR_ZONES];
140 unsigned long vaddr;
140 int nid; 141 int nid;
141 142
142 /* We don't need to map the kernel through the TLB, as 143 /* We don't need to map the kernel through the TLB, as
@@ -148,10 +149,15 @@ void __init paging_init(void)
148 * check for a null value. */ 149 * check for a null value. */
149 set_TTB(swapper_pg_dir); 150 set_TTB(swapper_pg_dir);
150 151
151 /* Populate the relevant portions of swapper_pg_dir so that 152 /*
153 * Populate the relevant portions of swapper_pg_dir so that
152 * we can use the fixmap entries without calling kmalloc. 154 * we can use the fixmap entries without calling kmalloc.
153 * pte's will be filled in by __set_fixmap(). */ 155 * pte's will be filled in by __set_fixmap().
154 page_table_range_init(FIXADDR_START, FIXADDR_TOP, swapper_pg_dir); 156 */
157 vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK;
158 page_table_range_init(vaddr, 0, swapper_pg_dir);
159
160 kmap_coherent_init();
155 161
156 memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); 162 memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
157 163
diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
new file mode 100644
index 000000000000..8837d511710a
--- /dev/null
+++ b/arch/sh/mm/mmap.c
@@ -0,0 +1,31 @@
1/*
2 * arch/sh/mm/mmap.c
3 *
4 * Copyright (C) 2008 Paul Mundt
5 *
6 * This file is subject to the terms and conditions of the GNU General Public
7 * License. See the file "COPYING" in the main directory of this archive
8 * for more details.
9 */
10#include <linux/io.h>
11#include <linux/mm.h>
12#include <asm/page.h>
13
14/*
15 * You really shouldn't be using read() or write() on /dev/mem. This
16 * might go away in the future.
17 */
18int valid_phys_addr_range(unsigned long addr, size_t count)
19{
20 if (addr < __MEMORY_START)
21 return 0;
22 if (addr + count > __pa(high_memory))
23 return 0;
24
25 return 1;
26}
27
28int valid_mmap_phys_addr_range(unsigned long pfn, size_t size)
29{
30 return 1;
31}
diff --git a/arch/sh/mm/pg-sh4.c b/arch/sh/mm/pg-sh4.c
index 38870e0fc182..2fe14da1f839 100644
--- a/arch/sh/mm/pg-sh4.c
+++ b/arch/sh/mm/pg-sh4.c
@@ -7,6 +7,7 @@
7 * Released under the terms of the GNU GPL v2.0. 7 * Released under the terms of the GNU GPL v2.0.
8 */ 8 */
9#include <linux/mm.h> 9#include <linux/mm.h>
10#include <linux/init.h>
10#include <linux/mutex.h> 11#include <linux/mutex.h>
11#include <linux/fs.h> 12#include <linux/fs.h>
12#include <linux/highmem.h> 13#include <linux/highmem.h>
@@ -16,6 +17,20 @@
16 17
17#define CACHE_ALIAS (current_cpu_data.dcache.alias_mask) 18#define CACHE_ALIAS (current_cpu_data.dcache.alias_mask)
18 19
20#define kmap_get_fixmap_pte(vaddr) \
21 pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr)), (vaddr))
22
23static pte_t *kmap_coherent_pte;
24
25void __init kmap_coherent_init(void)
26{
27 unsigned long vaddr;
28
29 /* cache the first coherent kmap pte */
30 vaddr = __fix_to_virt(FIX_CMAP_BEGIN);
31 kmap_coherent_pte = kmap_get_fixmap_pte(vaddr);
32}
33
19static inline void *kmap_coherent(struct page *page, unsigned long addr) 34static inline void *kmap_coherent(struct page *page, unsigned long addr)
20{ 35{
21 enum fixed_addresses idx; 36 enum fixed_addresses idx;
@@ -34,6 +49,8 @@ static inline void *kmap_coherent(struct page *page, unsigned long addr)
34 49
35 update_mmu_cache(NULL, vaddr, pte); 50 update_mmu_cache(NULL, vaddr, pte);
36 51
52 set_pte(kmap_coherent_pte - (FIX_CMAP_END - idx), pte);
53
37 return (void *)vaddr; 54 return (void *)vaddr;
38} 55}
39 56
diff --git a/arch/sparc/include/asm/termbits.h b/arch/sparc/include/asm/termbits.h
index d6ca3e2754f5..d72dfed1f9d7 100644
--- a/arch/sparc/include/asm/termbits.h
+++ b/arch/sparc/include/asm/termbits.h
@@ -29,10 +29,11 @@ struct termios {
29 tcflag_t c_cflag; /* control mode flags */ 29 tcflag_t c_cflag; /* control mode flags */
30 tcflag_t c_lflag; /* local mode flags */ 30 tcflag_t c_lflag; /* local mode flags */
31 cc_t c_line; /* line discipline */ 31 cc_t c_line; /* line discipline */
32#ifndef __KERNEL__
32 cc_t c_cc[NCCS]; /* control characters */ 33 cc_t c_cc[NCCS]; /* control characters */
33#ifdef __KERNEL__ 34#else
35 cc_t c_cc[NCCS+2]; /* kernel needs 2 more to hold vmin/vtime */
34#define SIZEOF_USER_TERMIOS sizeof (struct termios) - (2*sizeof (cc_t)) 36#define SIZEOF_USER_TERMIOS sizeof (struct termios) - (2*sizeof (cc_t))
35 cc_t _x_cc[2]; /* We need them to hold vmin/vtime */
36#endif 37#endif
37}; 38};
38 39
@@ -42,8 +43,7 @@ struct termios2 {
42 tcflag_t c_cflag; /* control mode flags */ 43 tcflag_t c_cflag; /* control mode flags */
43 tcflag_t c_lflag; /* local mode flags */ 44 tcflag_t c_lflag; /* local mode flags */
44 cc_t c_line; /* line discipline */ 45 cc_t c_line; /* line discipline */
45 cc_t c_cc[NCCS]; /* control characters */ 46 cc_t c_cc[NCCS+2]; /* control characters */
46 cc_t _x_cc[2]; /* padding to match ktermios */
47 speed_t c_ispeed; /* input speed */ 47 speed_t c_ispeed; /* input speed */
48 speed_t c_ospeed; /* output speed */ 48 speed_t c_ospeed; /* output speed */
49}; 49};
@@ -54,8 +54,7 @@ struct ktermios {
54 tcflag_t c_cflag; /* control mode flags */ 54 tcflag_t c_cflag; /* control mode flags */
55 tcflag_t c_lflag; /* local mode flags */ 55 tcflag_t c_lflag; /* local mode flags */
56 cc_t c_line; /* line discipline */ 56 cc_t c_line; /* line discipline */
57 cc_t c_cc[NCCS]; /* control characters */ 57 cc_t c_cc[NCCS+2]; /* control characters */
58 cc_t _x_cc[2]; /* We need them to hold vmin/vtime */
59 speed_t c_ispeed; /* input speed */ 58 speed_t c_ispeed; /* input speed */
60 speed_t c_ospeed; /* output speed */ 59 speed_t c_ospeed; /* output speed */
61}; 60};
diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S
index 2fe2c117e772..2d325fd84579 100644
--- a/arch/sparc/kernel/head.S
+++ b/arch/sparc/kernel/head.S
@@ -465,7 +465,6 @@ gokernel:
465 mov %o7, %g4 ! Save %o7 465 mov %o7, %g4 ! Save %o7
466 466
467 /* Jump to it, and pray... */ 467 /* Jump to it, and pray... */
468 __INIT
469current_pc: 468current_pc:
470 call 1f 469 call 1f
471 nop 470 nop
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c
index 0837bd52e28f..0a83bd737654 100644
--- a/arch/sparc/kernel/of_device.c
+++ b/arch/sparc/kernel/of_device.c
@@ -563,9 +563,9 @@ build_resources:
563 op->dev.parent = parent; 563 op->dev.parent = parent;
564 op->dev.bus = &of_platform_bus_type; 564 op->dev.bus = &of_platform_bus_type;
565 if (!parent) 565 if (!parent)
566 strcpy(op->dev.bus_id, "root"); 566 dev_set_name(&op->dev, "root");
567 else 567 else
568 sprintf(op->dev.bus_id, "%08x", dp->node); 568 dev_set_name(&op->dev, "%08x", dp->node);
569 569
570 if (of_device_register(op)) { 570 if (of_device_register(op)) {
571 printk("%s: Could not register of device.\n", 571 printk("%s: Could not register of device.\n",
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 82cab5cc8070..05d19a3e590f 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.26 3# Linux kernel version: 2.6.28-rc4
4# Fri Jul 18 00:47:07 2008 4# Mon Nov 10 12:35:09 2008
5# 5#
6CONFIG_SPARC=y 6CONFIG_SPARC=y
7CONFIG_SPARC64=y 7CONFIG_SPARC64=y
@@ -62,7 +62,6 @@ CONFIG_SYSCTL=y
62# CONFIG_EMBEDDED is not set 62# CONFIG_EMBEDDED is not set
63CONFIG_UID16=y 63CONFIG_UID16=y
64CONFIG_SYSCTL_SYSCALL=y 64CONFIG_SYSCTL_SYSCALL=y
65CONFIG_SYSCTL_SYSCALL_CHECK=y
66CONFIG_KALLSYMS=y 65CONFIG_KALLSYMS=y
67# CONFIG_KALLSYMS_ALL is not set 66# CONFIG_KALLSYMS_ALL is not set
68# CONFIG_KALLSYMS_EXTRA_PASS is not set 67# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -79,7 +78,9 @@ CONFIG_SIGNALFD=y
79CONFIG_TIMERFD=y 78CONFIG_TIMERFD=y
80CONFIG_EVENTFD=y 79CONFIG_EVENTFD=y
81CONFIG_SHMEM=y 80CONFIG_SHMEM=y
81CONFIG_AIO=y
82CONFIG_VM_EVENT_COUNTERS=y 82CONFIG_VM_EVENT_COUNTERS=y
83CONFIG_PCI_QUIRKS=y
83CONFIG_SLUB_DEBUG=y 84CONFIG_SLUB_DEBUG=y
84# CONFIG_SLAB is not set 85# CONFIG_SLAB is not set
85CONFIG_SLUB=y 86CONFIG_SLUB=y
@@ -92,9 +93,9 @@ CONFIG_KPROBES=y
92CONFIG_KRETPROBES=y 93CONFIG_KRETPROBES=y
93CONFIG_HAVE_KPROBES=y 94CONFIG_HAVE_KPROBES=y
94CONFIG_HAVE_KRETPROBES=y 95CONFIG_HAVE_KRETPROBES=y
95# CONFIG_HAVE_DMA_ATTRS is not set 96CONFIG_HAVE_ARCH_TRACEHOOK=y
96CONFIG_USE_GENERIC_SMP_HELPERS=y 97CONFIG_USE_GENERIC_SMP_HELPERS=y
97CONFIG_PROC_PAGE_MONITOR=y 98# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
98CONFIG_SLABINFO=y 99CONFIG_SLABINFO=y
99CONFIG_RT_MUTEXES=y 100CONFIG_RT_MUTEXES=y
100# CONFIG_TINY_SHMEM is not set 101# CONFIG_TINY_SHMEM is not set
@@ -126,6 +127,7 @@ CONFIG_DEFAULT_AS=y
126# CONFIG_DEFAULT_NOOP is not set 127# CONFIG_DEFAULT_NOOP is not set
127CONFIG_DEFAULT_IOSCHED="anticipatory" 128CONFIG_DEFAULT_IOSCHED="anticipatory"
128CONFIG_CLASSIC_RCU=y 129CONFIG_CLASSIC_RCU=y
130# CONFIG_FREEZER is not set
129 131
130# 132#
131# Processor type and features 133# Processor type and features
@@ -138,7 +140,7 @@ CONFIG_HZ_100=y
138# CONFIG_HZ_300 is not set 140# CONFIG_HZ_300 is not set
139# CONFIG_HZ_1000 is not set 141# CONFIG_HZ_1000 is not set
140CONFIG_HZ=100 142CONFIG_HZ=100
141# CONFIG_SCHED_HRTICK is not set 143CONFIG_SCHED_HRTICK=y
142CONFIG_HOTPLUG_CPU=y 144CONFIG_HOTPLUG_CPU=y
143CONFIG_GENERIC_HARDIRQS=y 145CONFIG_GENERIC_HARDIRQS=y
144CONFIG_TICK_ONESHOT=y 146CONFIG_TICK_ONESHOT=y
@@ -148,6 +150,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
148CONFIG_SMP=y 150CONFIG_SMP=y
149CONFIG_NR_CPUS=64 151CONFIG_NR_CPUS=64
150# CONFIG_CPU_FREQ is not set 152# CONFIG_CPU_FREQ is not set
153CONFIG_US3_MC=y
151CONFIG_RWSEM_XCHGADD_ALGORITHM=y 154CONFIG_RWSEM_XCHGADD_ALGORITHM=y
152CONFIG_GENERIC_FIND_NEXT_BIT=y 155CONFIG_GENERIC_FIND_NEXT_BIT=y
153CONFIG_GENERIC_HWEIGHT=y 156CONFIG_GENERIC_HWEIGHT=y
@@ -169,7 +172,6 @@ CONFIG_SPARSEMEM_MANUAL=y
169CONFIG_SPARSEMEM=y 172CONFIG_SPARSEMEM=y
170CONFIG_NEED_MULTIPLE_NODES=y 173CONFIG_NEED_MULTIPLE_NODES=y
171CONFIG_HAVE_MEMORY_PRESENT=y 174CONFIG_HAVE_MEMORY_PRESENT=y
172# CONFIG_SPARSEMEM_STATIC is not set
173CONFIG_SPARSEMEM_EXTREME=y 175CONFIG_SPARSEMEM_EXTREME=y
174CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 176CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
175CONFIG_SPARSEMEM_VMEMMAP=y 177CONFIG_SPARSEMEM_VMEMMAP=y
@@ -177,8 +179,10 @@ CONFIG_PAGEFLAGS_EXTENDED=y
177CONFIG_SPLIT_PTLOCK_CPUS=4 179CONFIG_SPLIT_PTLOCK_CPUS=4
178CONFIG_MIGRATION=y 180CONFIG_MIGRATION=y
179CONFIG_RESOURCES_64BIT=y 181CONFIG_RESOURCES_64BIT=y
182CONFIG_PHYS_ADDR_T_64BIT=y
180CONFIG_ZONE_DMA_FLAG=0 183CONFIG_ZONE_DMA_FLAG=0
181CONFIG_NR_QUICK=1 184CONFIG_NR_QUICK=1
185CONFIG_UNEVICTABLE_LRU=y
182CONFIG_SBUS=y 186CONFIG_SBUS=y
183CONFIG_SBUSCHAR=y 187CONFIG_SBUSCHAR=y
184CONFIG_SUN_AUXIO=y 188CONFIG_SUN_AUXIO=y
@@ -198,6 +202,8 @@ CONFIG_SUN_OPENPROMFS=m
198# 202#
199CONFIG_BINFMT_ELF=y 203CONFIG_BINFMT_ELF=y
200CONFIG_COMPAT_BINFMT_ELF=y 204CONFIG_COMPAT_BINFMT_ELF=y
205# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
206# CONFIG_HAVE_AOUT is not set
201CONFIG_BINFMT_MISC=m 207CONFIG_BINFMT_MISC=m
202CONFIG_COMPAT=y 208CONFIG_COMPAT=y
203CONFIG_SYSVIPC_COMPAT=y 209CONFIG_SYSVIPC_COMPAT=y
@@ -207,10 +213,6 @@ CONFIG_SCHED_MC=y
207CONFIG_PREEMPT_VOLUNTARY=y 213CONFIG_PREEMPT_VOLUNTARY=y
208# CONFIG_PREEMPT is not set 214# CONFIG_PREEMPT is not set
209# CONFIG_CMDLINE_BOOL is not set 215# CONFIG_CMDLINE_BOOL is not set
210
211#
212# Networking
213#
214CONFIG_NET=y 216CONFIG_NET=y
215 217
216# 218#
@@ -224,6 +226,7 @@ CONFIG_XFRM_USER=m
224# CONFIG_XFRM_SUB_POLICY is not set 226# CONFIG_XFRM_SUB_POLICY is not set
225CONFIG_XFRM_MIGRATE=y 227CONFIG_XFRM_MIGRATE=y
226# CONFIG_XFRM_STATISTICS is not set 228# CONFIG_XFRM_STATISTICS is not set
229CONFIG_XFRM_IPCOMP=y
227CONFIG_NET_KEY=m 230CONFIG_NET_KEY=m
228CONFIG_NET_KEY_MIGRATE=y 231CONFIG_NET_KEY_MIGRATE=y
229CONFIG_INET=y 232CONFIG_INET=y
@@ -299,7 +302,9 @@ CONFIG_IP_DCCP_TFRC_LIB=m
299# CONFIG_TIPC is not set 302# CONFIG_TIPC is not set
300# CONFIG_ATM is not set 303# CONFIG_ATM is not set
301# CONFIG_BRIDGE is not set 304# CONFIG_BRIDGE is not set
305# CONFIG_NET_DSA is not set
302CONFIG_VLAN_8021Q=m 306CONFIG_VLAN_8021Q=m
307# CONFIG_VLAN_8021Q_GVRP is not set
303# CONFIG_DECNET is not set 308# CONFIG_DECNET is not set
304# CONFIG_LLC2 is not set 309# CONFIG_LLC2 is not set
305# CONFIG_IPX is not set 310# CONFIG_IPX is not set
@@ -320,11 +325,10 @@ CONFIG_NET_TCPPROBE=m
320# CONFIG_IRDA is not set 325# CONFIG_IRDA is not set
321# CONFIG_BT is not set 326# CONFIG_BT is not set
322# CONFIG_AF_RXRPC is not set 327# CONFIG_AF_RXRPC is not set
323 328# CONFIG_PHONET is not set
324# 329CONFIG_WIRELESS=y
325# Wireless
326#
327# CONFIG_CFG80211 is not set 330# CONFIG_CFG80211 is not set
331CONFIG_WIRELESS_OLD_REGULATORY=y
328# CONFIG_WIRELESS_EXT is not set 332# CONFIG_WIRELESS_EXT is not set
329# CONFIG_MAC80211 is not set 333# CONFIG_MAC80211 is not set
330# CONFIG_IEEE80211 is not set 334# CONFIG_IEEE80211 is not set
@@ -375,21 +379,21 @@ CONFIG_MISC_DEVICES=y
375# CONFIG_SGI_IOC4 is not set 379# CONFIG_SGI_IOC4 is not set
376# CONFIG_TIFM_CORE is not set 380# CONFIG_TIFM_CORE is not set
377# CONFIG_ENCLOSURE_SERVICES is not set 381# CONFIG_ENCLOSURE_SERVICES is not set
382# CONFIG_HP_ILO is not set
378CONFIG_HAVE_IDE=y 383CONFIG_HAVE_IDE=y
379CONFIG_IDE=y 384CONFIG_IDE=y
380CONFIG_BLK_DEV_IDE=y
381 385
382# 386#
383# Please see Documentation/ide/ide.txt for help/info on IDE drives 387# Please see Documentation/ide/ide.txt for help/info on IDE drives
384# 388#
385CONFIG_IDE_TIMINGS=y 389CONFIG_IDE_TIMINGS=y
386# CONFIG_BLK_DEV_IDE_SATA is not set 390# CONFIG_BLK_DEV_IDE_SATA is not set
387CONFIG_BLK_DEV_IDEDISK=y 391CONFIG_IDE_GD=y
388# CONFIG_IDEDISK_MULTI_MODE is not set 392CONFIG_IDE_GD_ATA=y
393# CONFIG_IDE_GD_ATAPI is not set
389CONFIG_BLK_DEV_IDECD=y 394CONFIG_BLK_DEV_IDECD=y
390CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 395CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
391# CONFIG_BLK_DEV_IDETAPE is not set 396# CONFIG_BLK_DEV_IDETAPE is not set
392# CONFIG_BLK_DEV_IDEFLOPPY is not set
393# CONFIG_BLK_DEV_IDESCSI is not set 397# CONFIG_BLK_DEV_IDESCSI is not set
394# CONFIG_IDE_TASK_IOCTL is not set 398# CONFIG_IDE_TASK_IOCTL is not set
395CONFIG_IDE_PROC_FS=y 399CONFIG_IDE_PROC_FS=y
@@ -413,10 +417,8 @@ CONFIG_BLK_DEV_ALI15X3=y
413# CONFIG_BLK_DEV_AMD74XX is not set 417# CONFIG_BLK_DEV_AMD74XX is not set
414# CONFIG_BLK_DEV_CMD64X is not set 418# CONFIG_BLK_DEV_CMD64X is not set
415# CONFIG_BLK_DEV_TRIFLEX is not set 419# CONFIG_BLK_DEV_TRIFLEX is not set
416# CONFIG_BLK_DEV_CY82C693 is not set
417# CONFIG_BLK_DEV_CS5520 is not set 420# CONFIG_BLK_DEV_CS5520 is not set
418# CONFIG_BLK_DEV_CS5530 is not set 421# CONFIG_BLK_DEV_CS5530 is not set
419# CONFIG_BLK_DEV_HPT34X is not set
420# CONFIG_BLK_DEV_HPT366 is not set 422# CONFIG_BLK_DEV_HPT366 is not set
421# CONFIG_BLK_DEV_JMICRON is not set 423# CONFIG_BLK_DEV_JMICRON is not set
422# CONFIG_BLK_DEV_SC1200 is not set 424# CONFIG_BLK_DEV_SC1200 is not set
@@ -540,7 +542,6 @@ CONFIG_DM_ZERO=m
540# CONFIG_IEEE1394 is not set 542# CONFIG_IEEE1394 is not set
541# CONFIG_I2O is not set 543# CONFIG_I2O is not set
542CONFIG_NETDEVICES=y 544CONFIG_NETDEVICES=y
543# CONFIG_NETDEVICES_MULTIQUEUE is not set
544# CONFIG_DUMMY is not set 545# CONFIG_DUMMY is not set
545# CONFIG_BONDING is not set 546# CONFIG_BONDING is not set
546# CONFIG_MACVLAN is not set 547# CONFIG_MACVLAN is not set
@@ -548,7 +549,22 @@ CONFIG_NETDEVICES=y
548# CONFIG_TUN is not set 549# CONFIG_TUN is not set
549# CONFIG_VETH is not set 550# CONFIG_VETH is not set
550# CONFIG_ARCNET is not set 551# CONFIG_ARCNET is not set
551# CONFIG_PHYLIB is not set 552CONFIG_PHYLIB=m
553
554#
555# MII PHY device drivers
556#
557# CONFIG_MARVELL_PHY is not set
558# CONFIG_DAVICOM_PHY is not set
559# CONFIG_QSEMI_PHY is not set
560# CONFIG_LXT_PHY is not set
561# CONFIG_CICADA_PHY is not set
562# CONFIG_VITESSE_PHY is not set
563# CONFIG_SMSC_PHY is not set
564# CONFIG_BROADCOM_PHY is not set
565# CONFIG_ICPLUS_PHY is not set
566# CONFIG_REALTEK_PHY is not set
567# CONFIG_MDIO_BITBANG is not set
552CONFIG_NET_ETHERNET=y 568CONFIG_NET_ETHERNET=y
553CONFIG_MII=m 569CONFIG_MII=m
554# CONFIG_SUNLANCE is not set 570# CONFIG_SUNLANCE is not set
@@ -565,6 +581,9 @@ CONFIG_SUNVNET=m
565# CONFIG_IBM_NEW_EMAC_RGMII is not set 581# CONFIG_IBM_NEW_EMAC_RGMII is not set
566# CONFIG_IBM_NEW_EMAC_TAH is not set 582# CONFIG_IBM_NEW_EMAC_TAH is not set
567# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 583# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
584# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
585# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
586# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
568CONFIG_NET_PCI=y 587CONFIG_NET_PCI=y
569# CONFIG_PCNET32 is not set 588# CONFIG_PCNET32 is not set
570# CONFIG_AMD8111_ETH is not set 589# CONFIG_AMD8111_ETH is not set
@@ -582,16 +601,15 @@ CONFIG_NET_PCI=y
582# CONFIG_SIS900 is not set 601# CONFIG_SIS900 is not set
583# CONFIG_EPIC100 is not set 602# CONFIG_EPIC100 is not set
584# CONFIG_SUNDANCE is not set 603# CONFIG_SUNDANCE is not set
604# CONFIG_TLAN is not set
585# CONFIG_VIA_RHINE is not set 605# CONFIG_VIA_RHINE is not set
586# CONFIG_SC92031 is not set 606# CONFIG_SC92031 is not set
607# CONFIG_ATL2 is not set
587CONFIG_NETDEV_1000=y 608CONFIG_NETDEV_1000=y
588# CONFIG_ACENIC is not set 609# CONFIG_ACENIC is not set
589# CONFIG_DL2K is not set 610# CONFIG_DL2K is not set
590CONFIG_E1000=m 611CONFIG_E1000=m
591CONFIG_E1000_NAPI=y
592# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
593# CONFIG_E1000E is not set 612# CONFIG_E1000E is not set
594# CONFIG_E1000E_ENABLED is not set
595# CONFIG_IP1000 is not set 613# CONFIG_IP1000 is not set
596# CONFIG_IGB is not set 614# CONFIG_IGB is not set
597# CONFIG_MYRI_SBUS is not set 615# CONFIG_MYRI_SBUS is not set
@@ -607,18 +625,23 @@ CONFIG_TIGON3=m
607CONFIG_BNX2=m 625CONFIG_BNX2=m
608# CONFIG_QLA3XXX is not set 626# CONFIG_QLA3XXX is not set
609# CONFIG_ATL1 is not set 627# CONFIG_ATL1 is not set
628# CONFIG_ATL1E is not set
629# CONFIG_JME is not set
610CONFIG_NETDEV_10000=y 630CONFIG_NETDEV_10000=y
611# CONFIG_CHELSIO_T1 is not set 631# CONFIG_CHELSIO_T1 is not set
612# CONFIG_CHELSIO_T3 is not set 632# CONFIG_CHELSIO_T3 is not set
633# CONFIG_ENIC is not set
613# CONFIG_IXGBE is not set 634# CONFIG_IXGBE is not set
614# CONFIG_IXGB is not set 635# CONFIG_IXGB is not set
615# CONFIG_S2IO is not set 636# CONFIG_S2IO is not set
616# CONFIG_MYRI10GE is not set 637# CONFIG_MYRI10GE is not set
617# CONFIG_NETXEN_NIC is not set 638# CONFIG_NETXEN_NIC is not set
618CONFIG_NIU=m 639CONFIG_NIU=m
640# CONFIG_MLX4_EN is not set
619# CONFIG_MLX4_CORE is not set 641# CONFIG_MLX4_CORE is not set
620# CONFIG_TEHUTI is not set 642# CONFIG_TEHUTI is not set
621# CONFIG_BNX2X is not set 643# CONFIG_BNX2X is not set
644# CONFIG_QLGE is not set
622# CONFIG_SFC is not set 645# CONFIG_SFC is not set
623# CONFIG_TR is not set 646# CONFIG_TR is not set
624 647
@@ -694,9 +717,11 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
694CONFIG_MOUSE_PS2_SYNAPTICS=y 717CONFIG_MOUSE_PS2_SYNAPTICS=y
695CONFIG_MOUSE_PS2_LIFEBOOK=y 718CONFIG_MOUSE_PS2_LIFEBOOK=y
696CONFIG_MOUSE_PS2_TRACKPOINT=y 719CONFIG_MOUSE_PS2_TRACKPOINT=y
720# CONFIG_MOUSE_PS2_ELANTECH is not set
697# CONFIG_MOUSE_PS2_TOUCHKIT is not set 721# CONFIG_MOUSE_PS2_TOUCHKIT is not set
698CONFIG_MOUSE_SERIAL=y 722CONFIG_MOUSE_SERIAL=y
699# CONFIG_MOUSE_APPLETOUCH is not set 723# CONFIG_MOUSE_APPLETOUCH is not set
724# CONFIG_MOUSE_BCM5974 is not set
700# CONFIG_MOUSE_VSXXXAA is not set 725# CONFIG_MOUSE_VSXXXAA is not set
701# CONFIG_INPUT_JOYSTICK is not set 726# CONFIG_INPUT_JOYSTICK is not set
702# CONFIG_INPUT_TABLET is not set 727# CONFIG_INPUT_TABLET is not set
@@ -708,6 +733,7 @@ CONFIG_INPUT_SPARCSPKR=y
708# CONFIG_INPUT_KEYSPAN_REMOTE is not set 733# CONFIG_INPUT_KEYSPAN_REMOTE is not set
709# CONFIG_INPUT_POWERMATE is not set 734# CONFIG_INPUT_POWERMATE is not set
710# CONFIG_INPUT_YEALINK is not set 735# CONFIG_INPUT_YEALINK is not set
736# CONFIG_INPUT_CM109 is not set
711# CONFIG_INPUT_UINPUT is not set 737# CONFIG_INPUT_UINPUT is not set
712 738
713# 739#
@@ -725,6 +751,7 @@ CONFIG_SERIO_RAW=m
725# Character devices 751# Character devices
726# 752#
727CONFIG_VT=y 753CONFIG_VT=y
754CONFIG_CONSOLE_TRANSLATIONS=y
728CONFIG_VT_CONSOLE=y 755CONFIG_VT_CONSOLE=y
729CONFIG_HW_CONSOLE=y 756CONFIG_HW_CONSOLE=y
730# CONFIG_VT_HW_CONSOLE_BINDING is not set 757# CONFIG_VT_HW_CONSOLE_BINDING is not set
@@ -735,6 +762,7 @@ CONFIG_HW_CONSOLE=y
735# 762#
736# Serial drivers 763# Serial drivers
737# 764#
765# CONFIG_SERIAL_8250 is not set
738 766
739# 767#
740# Non-8250 serial port support 768# Non-8250 serial port support
@@ -762,6 +790,7 @@ CONFIG_DEVPORT=y
762CONFIG_I2C=y 790CONFIG_I2C=y
763CONFIG_I2C_BOARDINFO=y 791CONFIG_I2C_BOARDINFO=y
764# CONFIG_I2C_CHARDEV is not set 792# CONFIG_I2C_CHARDEV is not set
793CONFIG_I2C_HELPER_AUTO=y
765CONFIG_I2C_ALGOBIT=y 794CONFIG_I2C_ALGOBIT=y
766 795
767# 796#
@@ -827,10 +856,13 @@ CONFIG_I2C_ALGOBIT=y
827# CONFIG_I2C_DEBUG_BUS is not set 856# CONFIG_I2C_DEBUG_BUS is not set
828# CONFIG_I2C_DEBUG_CHIP is not set 857# CONFIG_I2C_DEBUG_CHIP is not set
829# CONFIG_SPI is not set 858# CONFIG_SPI is not set
859CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
860# CONFIG_GPIOLIB is not set
830# CONFIG_W1 is not set 861# CONFIG_W1 is not set
831# CONFIG_POWER_SUPPLY is not set 862# CONFIG_POWER_SUPPLY is not set
832CONFIG_HWMON=y 863CONFIG_HWMON=y
833# CONFIG_HWMON_VID is not set 864# CONFIG_HWMON_VID is not set
865# CONFIG_SENSORS_AD7414 is not set
834# CONFIG_SENSORS_AD7418 is not set 866# CONFIG_SENSORS_AD7418 is not set
835# CONFIG_SENSORS_ADM1021 is not set 867# CONFIG_SENSORS_ADM1021 is not set
836# CONFIG_SENSORS_ADM1025 is not set 868# CONFIG_SENSORS_ADM1025 is not set
@@ -882,6 +914,7 @@ CONFIG_HWMON=y
882# CONFIG_SENSORS_W83L786NG is not set 914# CONFIG_SENSORS_W83L786NG is not set
883# CONFIG_SENSORS_W83627HF is not set 915# CONFIG_SENSORS_W83627HF is not set
884# CONFIG_SENSORS_W83627EHF is not set 916# CONFIG_SENSORS_W83627EHF is not set
917# CONFIG_SENSORS_ULTRA45 is not set
885# CONFIG_HWMON_DEBUG_CHIP is not set 918# CONFIG_HWMON_DEBUG_CHIP is not set
886# CONFIG_THERMAL is not set 919# CONFIG_THERMAL is not set
887# CONFIG_THERMAL_HWMON is not set 920# CONFIG_THERMAL_HWMON is not set
@@ -896,8 +929,14 @@ CONFIG_SSB_POSSIBLE=y
896# 929#
897# Multifunction device drivers 930# Multifunction device drivers
898# 931#
932# CONFIG_MFD_CORE is not set
899# CONFIG_MFD_SM501 is not set 933# CONFIG_MFD_SM501 is not set
900# CONFIG_HTC_PASIC3 is not set 934# CONFIG_HTC_PASIC3 is not set
935# CONFIG_MFD_TMIO is not set
936# CONFIG_PMIC_DA903X is not set
937# CONFIG_MFD_WM8400 is not set
938# CONFIG_MFD_WM8350_I2C is not set
939# CONFIG_REGULATOR is not set
901 940
902# 941#
903# Multimedia devices 942# Multimedia devices
@@ -924,6 +963,7 @@ CONFIG_SSB_POSSIBLE=y
924CONFIG_FB=y 963CONFIG_FB=y
925# CONFIG_FIRMWARE_EDID is not set 964# CONFIG_FIRMWARE_EDID is not set
926CONFIG_FB_DDC=y 965CONFIG_FB_DDC=y
966# CONFIG_FB_BOOT_VESA_SUPPORT is not set
927CONFIG_FB_CFB_FILLRECT=y 967CONFIG_FB_CFB_FILLRECT=y
928CONFIG_FB_CFB_COPYAREA=y 968CONFIG_FB_CFB_COPYAREA=y
929CONFIG_FB_CFB_IMAGEBLIT=y 969CONFIG_FB_CFB_IMAGEBLIT=y
@@ -975,6 +1015,7 @@ CONFIG_FB_ATY_GX=y
975# CONFIG_FB_S3 is not set 1015# CONFIG_FB_S3 is not set
976# CONFIG_FB_SAVAGE is not set 1016# CONFIG_FB_SAVAGE is not set
977# CONFIG_FB_SIS is not set 1017# CONFIG_FB_SIS is not set
1018# CONFIG_FB_VIA is not set
978# CONFIG_FB_NEOMAGIC is not set 1019# CONFIG_FB_NEOMAGIC is not set
979# CONFIG_FB_KYRO is not set 1020# CONFIG_FB_KYRO is not set
980# CONFIG_FB_3DFX is not set 1021# CONFIG_FB_3DFX is not set
@@ -983,7 +1024,10 @@ CONFIG_FB_ATY_GX=y
983# CONFIG_FB_TRIDENT is not set 1024# CONFIG_FB_TRIDENT is not set
984# CONFIG_FB_ARK is not set 1025# CONFIG_FB_ARK is not set
985# CONFIG_FB_PM3 is not set 1026# CONFIG_FB_PM3 is not set
1027# CONFIG_FB_CARMINE is not set
986# CONFIG_FB_VIRTUAL is not set 1028# CONFIG_FB_VIRTUAL is not set
1029# CONFIG_FB_METRONOME is not set
1030# CONFIG_FB_MB862XX is not set
987# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1031# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
988 1032
989# 1033#
@@ -1015,6 +1059,7 @@ CONFIG_LOGO=y
1015# CONFIG_LOGO_LINUX_CLUT224 is not set 1059# CONFIG_LOGO_LINUX_CLUT224 is not set
1016CONFIG_LOGO_SUN_CLUT224=y 1060CONFIG_LOGO_SUN_CLUT224=y
1017CONFIG_SOUND=m 1061CONFIG_SOUND=m
1062CONFIG_SOUND_OSS_CORE=y
1018CONFIG_SND=m 1063CONFIG_SND=m
1019CONFIG_SND_TIMER=m 1064CONFIG_SND_TIMER=m
1020CONFIG_SND_PCM=m 1065CONFIG_SND_PCM=m
@@ -1120,9 +1165,36 @@ CONFIG_HID=y
1120# USB Input Devices 1165# USB Input Devices
1121# 1166#
1122CONFIG_USB_HID=y 1167CONFIG_USB_HID=y
1123# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1168# CONFIG_HID_PID is not set
1124# CONFIG_HID_FF is not set
1125CONFIG_USB_HIDDEV=y 1169CONFIG_USB_HIDDEV=y
1170
1171#
1172# Special HID drivers
1173#
1174CONFIG_HID_COMPAT=y
1175CONFIG_HID_A4TECH=y
1176CONFIG_HID_APPLE=y
1177CONFIG_HID_BELKIN=y
1178CONFIG_HID_BRIGHT=y
1179CONFIG_HID_CHERRY=y
1180CONFIG_HID_CHICONY=y
1181CONFIG_HID_CYPRESS=y
1182CONFIG_HID_DELL=y
1183CONFIG_HID_EZKEY=y
1184CONFIG_HID_GYRATION=y
1185CONFIG_HID_LOGITECH=y
1186# CONFIG_LOGITECH_FF is not set
1187# CONFIG_LOGIRUMBLEPAD2_FF is not set
1188CONFIG_HID_MICROSOFT=y
1189CONFIG_HID_MONTEREY=y
1190CONFIG_HID_PANTHERLORD=y
1191# CONFIG_PANTHERLORD_FF is not set
1192CONFIG_HID_PETALYNX=y
1193CONFIG_HID_SAMSUNG=y
1194CONFIG_HID_SONY=y
1195CONFIG_HID_SUNPLUS=y
1196# CONFIG_THRUSTMASTER_FF is not set
1197# CONFIG_ZEROPLUS_FF is not set
1126CONFIG_USB_SUPPORT=y 1198CONFIG_USB_SUPPORT=y
1127CONFIG_USB_ARCH_HAS_HCD=y 1199CONFIG_USB_ARCH_HAS_HCD=y
1128CONFIG_USB_ARCH_HAS_OHCI=y 1200CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1138,6 +1210,9 @@ CONFIG_USB_DEVICEFS=y
1138# CONFIG_USB_DEVICE_CLASS is not set 1210# CONFIG_USB_DEVICE_CLASS is not set
1139# CONFIG_USB_DYNAMIC_MINORS is not set 1211# CONFIG_USB_DYNAMIC_MINORS is not set
1140# CONFIG_USB_OTG is not set 1212# CONFIG_USB_OTG is not set
1213# CONFIG_USB_MON is not set
1214# CONFIG_USB_WUSB is not set
1215# CONFIG_USB_WUSB_CBAF is not set
1141 1216
1142# 1217#
1143# USB Host Controller Drivers 1218# USB Host Controller Drivers
@@ -1155,6 +1230,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1155CONFIG_USB_UHCI_HCD=m 1230CONFIG_USB_UHCI_HCD=m
1156# CONFIG_USB_SL811_HCD is not set 1231# CONFIG_USB_SL811_HCD is not set
1157# CONFIG_USB_R8A66597_HCD is not set 1232# CONFIG_USB_R8A66597_HCD is not set
1233# CONFIG_USB_WHCI_HCD is not set
1234# CONFIG_USB_HWA_HCD is not set
1158 1235
1159# 1236#
1160# USB Device Class drivers 1237# USB Device Class drivers
@@ -1162,6 +1239,7 @@ CONFIG_USB_UHCI_HCD=m
1162# CONFIG_USB_ACM is not set 1239# CONFIG_USB_ACM is not set
1163# CONFIG_USB_PRINTER is not set 1240# CONFIG_USB_PRINTER is not set
1164# CONFIG_USB_WDM is not set 1241# CONFIG_USB_WDM is not set
1242# CONFIG_USB_TMC is not set
1165 1243
1166# 1244#
1167# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1245# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1191,7 +1269,6 @@ CONFIG_USB_STORAGE=m
1191# 1269#
1192# CONFIG_USB_MDC800 is not set 1270# CONFIG_USB_MDC800 is not set
1193# CONFIG_USB_MICROTEK is not set 1271# CONFIG_USB_MICROTEK is not set
1194# CONFIG_USB_MON is not set
1195 1272
1196# 1273#
1197# USB port drivers 1274# USB port drivers
@@ -1204,7 +1281,7 @@ CONFIG_USB_STORAGE=m
1204# CONFIG_USB_EMI62 is not set 1281# CONFIG_USB_EMI62 is not set
1205# CONFIG_USB_EMI26 is not set 1282# CONFIG_USB_EMI26 is not set
1206# CONFIG_USB_ADUTUX is not set 1283# CONFIG_USB_ADUTUX is not set
1207# CONFIG_USB_AUERSWALD is not set 1284# CONFIG_USB_SEVSEG is not set
1208# CONFIG_USB_RIO500 is not set 1285# CONFIG_USB_RIO500 is not set
1209# CONFIG_USB_LEGOTOWER is not set 1286# CONFIG_USB_LEGOTOWER is not set
1210# CONFIG_USB_LCD is not set 1287# CONFIG_USB_LCD is not set
@@ -1222,21 +1299,80 @@ CONFIG_USB_STORAGE=m
1222# CONFIG_USB_IOWARRIOR is not set 1299# CONFIG_USB_IOWARRIOR is not set
1223# CONFIG_USB_TEST is not set 1300# CONFIG_USB_TEST is not set
1224# CONFIG_USB_ISIGHTFW is not set 1301# CONFIG_USB_ISIGHTFW is not set
1302# CONFIG_USB_VST is not set
1225# CONFIG_USB_GADGET is not set 1303# CONFIG_USB_GADGET is not set
1304# CONFIG_UWB is not set
1226# CONFIG_MMC is not set 1305# CONFIG_MMC is not set
1227# CONFIG_MEMSTICK is not set 1306# CONFIG_MEMSTICK is not set
1228# CONFIG_NEW_LEDS is not set 1307# CONFIG_NEW_LEDS is not set
1229# CONFIG_ACCESSIBILITY is not set 1308# CONFIG_ACCESSIBILITY is not set
1230# CONFIG_INFINIBAND is not set 1309# CONFIG_INFINIBAND is not set
1231# CONFIG_RTC_CLASS is not set 1310CONFIG_RTC_LIB=y
1311CONFIG_RTC_CLASS=y
1312CONFIG_RTC_HCTOSYS=y
1313CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1314# CONFIG_RTC_DEBUG is not set
1315
1316#
1317# RTC interfaces
1318#
1319CONFIG_RTC_INTF_SYSFS=y
1320CONFIG_RTC_INTF_PROC=y
1321CONFIG_RTC_INTF_DEV=y
1322# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
1323# CONFIG_RTC_DRV_TEST is not set
1324
1325#
1326# I2C RTC drivers
1327#
1328# CONFIG_RTC_DRV_DS1307 is not set
1329# CONFIG_RTC_DRV_DS1374 is not set
1330# CONFIG_RTC_DRV_DS1672 is not set
1331# CONFIG_RTC_DRV_MAX6900 is not set
1332# CONFIG_RTC_DRV_RS5C372 is not set
1333# CONFIG_RTC_DRV_ISL1208 is not set
1334# CONFIG_RTC_DRV_X1205 is not set
1335# CONFIG_RTC_DRV_PCF8563 is not set
1336# CONFIG_RTC_DRV_PCF8583 is not set
1337# CONFIG_RTC_DRV_M41T80 is not set
1338# CONFIG_RTC_DRV_S35390A is not set
1339# CONFIG_RTC_DRV_FM3130 is not set
1340
1341#
1342# SPI RTC drivers
1343#
1344
1345#
1346# Platform RTC drivers
1347#
1348CONFIG_RTC_DRV_CMOS=y
1349# CONFIG_RTC_DRV_DS1286 is not set
1350# CONFIG_RTC_DRV_DS1511 is not set
1351# CONFIG_RTC_DRV_DS1553 is not set
1352# CONFIG_RTC_DRV_DS1742 is not set
1353# CONFIG_RTC_DRV_STK17TA8 is not set
1354# CONFIG_RTC_DRV_M48T86 is not set
1355# CONFIG_RTC_DRV_M48T35 is not set
1356CONFIG_RTC_DRV_M48T59=y
1357CONFIG_RTC_DRV_BQ4802=y
1358# CONFIG_RTC_DRV_V3020 is not set
1359
1360#
1361# on-CPU RTC drivers
1362#
1363CONFIG_RTC_DRV_SUN4V=y
1364CONFIG_RTC_DRV_STARFIRE=y
1365# CONFIG_DMADEVICES is not set
1232# CONFIG_UIO is not set 1366# CONFIG_UIO is not set
1367# CONFIG_STAGING is not set
1368CONFIG_STAGING_EXCLUDE_BUILD=y
1233 1369
1234# 1370#
1235# Misc Linux/SPARC drivers 1371# Misc Linux/SPARC drivers
1236# 1372#
1237CONFIG_SUN_OPENPROMIO=y 1373CONFIG_SUN_OPENPROMIO=y
1238# CONFIG_OBP_FLASH is not set 1374# CONFIG_OBP_FLASH is not set
1239# CONFIG_SUN_BPP is not set 1375# CONFIG_TADPOLE_TS102_UCTRL is not set
1240# CONFIG_BBC_I2C is not set 1376# CONFIG_BBC_I2C is not set
1241# CONFIG_ENVCTRL is not set 1377# CONFIG_ENVCTRL is not set
1242# CONFIG_DISPLAY7SEG is not set 1378# CONFIG_DISPLAY7SEG is not set
@@ -1253,13 +1389,14 @@ CONFIG_EXT3_FS=y
1253CONFIG_EXT3_FS_XATTR=y 1389CONFIG_EXT3_FS_XATTR=y
1254CONFIG_EXT3_FS_POSIX_ACL=y 1390CONFIG_EXT3_FS_POSIX_ACL=y
1255CONFIG_EXT3_FS_SECURITY=y 1391CONFIG_EXT3_FS_SECURITY=y
1256# CONFIG_EXT4DEV_FS is not set 1392# CONFIG_EXT4_FS is not set
1257CONFIG_JBD=y 1393CONFIG_JBD=y
1258# CONFIG_JBD_DEBUG is not set 1394# CONFIG_JBD_DEBUG is not set
1259CONFIG_FS_MBCACHE=y 1395CONFIG_FS_MBCACHE=y
1260# CONFIG_REISERFS_FS is not set 1396# CONFIG_REISERFS_FS is not set
1261# CONFIG_JFS_FS is not set 1397# CONFIG_JFS_FS is not set
1262CONFIG_FS_POSIX_ACL=y 1398CONFIG_FS_POSIX_ACL=y
1399CONFIG_FILE_LOCKING=y
1263# CONFIG_XFS_FS is not set 1400# CONFIG_XFS_FS is not set
1264# CONFIG_GFS2_FS is not set 1401# CONFIG_GFS2_FS is not set
1265# CONFIG_OCFS2_FS is not set 1402# CONFIG_OCFS2_FS is not set
@@ -1290,6 +1427,7 @@ CONFIG_INOTIFY_USER=y
1290CONFIG_PROC_FS=y 1427CONFIG_PROC_FS=y
1291CONFIG_PROC_KCORE=y 1428CONFIG_PROC_KCORE=y
1292CONFIG_PROC_SYSCTL=y 1429CONFIG_PROC_SYSCTL=y
1430CONFIG_PROC_PAGE_MONITOR=y
1293CONFIG_SYSFS=y 1431CONFIG_SYSFS=y
1294CONFIG_TMPFS=y 1432CONFIG_TMPFS=y
1295# CONFIG_TMPFS_POSIX_ACL is not set 1433# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1311,6 +1449,7 @@ CONFIG_HUGETLB_PAGE=y
1311# CONFIG_CRAMFS is not set 1449# CONFIG_CRAMFS is not set
1312# CONFIG_VXFS_FS is not set 1450# CONFIG_VXFS_FS is not set
1313# CONFIG_MINIX_FS is not set 1451# CONFIG_MINIX_FS is not set
1452# CONFIG_OMFS_FS is not set
1314# CONFIG_HPFS_FS is not set 1453# CONFIG_HPFS_FS is not set
1315# CONFIG_QNX4FS_FS is not set 1454# CONFIG_QNX4FS_FS is not set
1316# CONFIG_ROMFS_FS is not set 1455# CONFIG_ROMFS_FS is not set
@@ -1388,6 +1527,8 @@ CONFIG_DEBUG_FS=y
1388CONFIG_DEBUG_KERNEL=y 1527CONFIG_DEBUG_KERNEL=y
1389# CONFIG_DEBUG_SHIRQ is not set 1528# CONFIG_DEBUG_SHIRQ is not set
1390CONFIG_DETECT_SOFTLOCKUP=y 1529CONFIG_DETECT_SOFTLOCKUP=y
1530# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1531CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1391# CONFIG_SCHED_DEBUG is not set 1532# CONFIG_SCHED_DEBUG is not set
1392CONFIG_SCHEDSTATS=y 1533CONFIG_SCHEDSTATS=y
1393# CONFIG_TIMER_STATS is not set 1534# CONFIG_TIMER_STATS is not set
@@ -1408,20 +1549,30 @@ CONFIG_DEBUG_BUGVERBOSE=y
1408# CONFIG_DEBUG_INFO is not set 1549# CONFIG_DEBUG_INFO is not set
1409# CONFIG_DEBUG_VM is not set 1550# CONFIG_DEBUG_VM is not set
1410# CONFIG_DEBUG_WRITECOUNT is not set 1551# CONFIG_DEBUG_WRITECOUNT is not set
1552CONFIG_DEBUG_MEMORY_INIT=y
1411# CONFIG_DEBUG_LIST is not set 1553# CONFIG_DEBUG_LIST is not set
1412# CONFIG_DEBUG_SG is not set 1554# CONFIG_DEBUG_SG is not set
1413# CONFIG_BOOT_PRINTK_DELAY is not set 1555# CONFIG_BOOT_PRINTK_DELAY is not set
1414# CONFIG_RCU_TORTURE_TEST is not set 1556# CONFIG_RCU_TORTURE_TEST is not set
1557# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1415# CONFIG_KPROBES_SANITY_TEST is not set 1558# CONFIG_KPROBES_SANITY_TEST is not set
1416# CONFIG_BACKTRACE_SELF_TEST is not set 1559# CONFIG_BACKTRACE_SELF_TEST is not set
1560# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1417# CONFIG_LKDTM is not set 1561# CONFIG_LKDTM is not set
1418# CONFIG_FAULT_INJECTION is not set 1562# CONFIG_FAULT_INJECTION is not set
1419CONFIG_HAVE_FTRACE=y 1563CONFIG_SYSCTL_SYSCALL_CHECK=y
1420CONFIG_HAVE_DYNAMIC_FTRACE=y 1564CONFIG_HAVE_FUNCTION_TRACER=y
1421# CONFIG_FTRACE is not set 1565
1566#
1567# Tracers
1568#
1569# CONFIG_FUNCTION_TRACER is not set
1422# CONFIG_IRQSOFF_TRACER is not set 1570# CONFIG_IRQSOFF_TRACER is not set
1423# CONFIG_SCHED_TRACER is not set 1571# CONFIG_SCHED_TRACER is not set
1424# CONFIG_CONTEXT_SWITCH_TRACER is not set 1572# CONFIG_CONTEXT_SWITCH_TRACER is not set
1573# CONFIG_BOOT_TRACER is not set
1574# CONFIG_STACK_TRACER is not set
1575# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1425# CONFIG_SAMPLES is not set 1576# CONFIG_SAMPLES is not set
1426CONFIG_HAVE_ARCH_KGDB=y 1577CONFIG_HAVE_ARCH_KGDB=y
1427# CONFIG_KGDB is not set 1578# CONFIG_KGDB is not set
@@ -1436,6 +1587,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1436CONFIG_KEYS=y 1587CONFIG_KEYS=y
1437# CONFIG_KEYS_DEBUG_PROC_KEYS is not set 1588# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
1438# CONFIG_SECURITY is not set 1589# CONFIG_SECURITY is not set
1590# CONFIG_SECURITYFS is not set
1439# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1591# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1440CONFIG_XOR_BLOCKS=m 1592CONFIG_XOR_BLOCKS=m
1441CONFIG_ASYNC_CORE=m 1593CONFIG_ASYNC_CORE=m
@@ -1446,10 +1598,12 @@ CONFIG_CRYPTO=y
1446# 1598#
1447# Crypto core or helper 1599# Crypto core or helper
1448# 1600#
1601# CONFIG_CRYPTO_FIPS is not set
1449CONFIG_CRYPTO_ALGAPI=y 1602CONFIG_CRYPTO_ALGAPI=y
1450CONFIG_CRYPTO_AEAD=y 1603CONFIG_CRYPTO_AEAD=y
1451CONFIG_CRYPTO_BLKCIPHER=y 1604CONFIG_CRYPTO_BLKCIPHER=y
1452CONFIG_CRYPTO_HASH=y 1605CONFIG_CRYPTO_HASH=y
1606CONFIG_CRYPTO_RNG=y
1453CONFIG_CRYPTO_MANAGER=y 1607CONFIG_CRYPTO_MANAGER=y
1454CONFIG_CRYPTO_GF128MUL=m 1608CONFIG_CRYPTO_GF128MUL=m
1455CONFIG_CRYPTO_NULL=m 1609CONFIG_CRYPTO_NULL=m
@@ -1523,6 +1677,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1523# 1677#
1524CONFIG_CRYPTO_DEFLATE=y 1678CONFIG_CRYPTO_DEFLATE=y
1525# CONFIG_CRYPTO_LZO is not set 1679# CONFIG_CRYPTO_LZO is not set
1680
1681#
1682# Random Number Generation
1683#
1684# CONFIG_CRYPTO_ANSI_CPRNG is not set
1526CONFIG_CRYPTO_HW=y 1685CONFIG_CRYPTO_HW=y
1527# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1686# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1528 1687
@@ -1530,7 +1689,6 @@ CONFIG_CRYPTO_HW=y
1530# Library routines 1689# Library routines
1531# 1690#
1532CONFIG_BITREVERSE=y 1691CONFIG_BITREVERSE=y
1533# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1534CONFIG_CRC_CCITT=m 1692CONFIG_CRC_CCITT=m
1535CONFIG_CRC16=m 1693CONFIG_CRC16=m
1536# CONFIG_CRC_T10DIF is not set 1694# CONFIG_CRC_T10DIF is not set
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ac22bb7719f7..fd2de7019537 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -960,7 +960,7 @@ config ARCH_PHYS_ADDR_T_64BIT
960config NUMA 960config NUMA
961 bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)" 961 bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
962 depends on SMP 962 depends on SMP
963 depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL) 963 depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && BROKEN)
964 default n if X86_PC 964 default n if X86_PC
965 default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP) 965 default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP)
966 help 966 help
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 8d676d8ecde9..9830681446ad 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -113,7 +113,6 @@ static inline void acpi_disable_pci(void)
113 acpi_pci_disabled = 1; 113 acpi_pci_disabled = 1;
114 acpi_noirq_set(); 114 acpi_noirq_set();
115} 115}
116extern int acpi_irq_balance_set(char *str);
117 116
118/* routines for saving/restoring kernel state */ 117/* routines for saving/restoring kernel state */
119extern int acpi_save_state_mem(void); 118extern int acpi_save_state_mem(void);
diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h
index e4a552d44465..0b500c5b6446 100644
--- a/arch/x86/include/asm/iommu.h
+++ b/arch/x86/include/asm/iommu.h
@@ -6,7 +6,6 @@ extern void no_iommu_init(void);
6extern struct dma_mapping_ops nommu_dma_ops; 6extern struct dma_mapping_ops nommu_dma_ops;
7extern int force_iommu, no_iommu; 7extern int force_iommu, no_iommu;
8extern int iommu_detected; 8extern int iommu_detected;
9extern int dmar_disabled;
10 9
11extern unsigned long iommu_nr_pages(unsigned long addr, unsigned long len); 10extern unsigned long iommu_nr_pages(unsigned long addr, unsigned long len);
12 11
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 8c1f76abae9e..4c51a2f8fd31 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1343,7 +1343,6 @@ static void __init acpi_process_madt(void)
1343 error = acpi_parse_madt_ioapic_entries(); 1343 error = acpi_parse_madt_ioapic_entries();
1344 if (!error) { 1344 if (!error) {
1345 acpi_irq_model = ACPI_IRQ_MODEL_IOAPIC; 1345 acpi_irq_model = ACPI_IRQ_MODEL_IOAPIC;
1346 acpi_irq_balance_set(NULL);
1347 acpi_ioapic = 1; 1346 acpi_ioapic = 1;
1348 1347
1349 smp_found_config = 1; 1348 smp_found_config = 1;
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index 331b318304eb..e4899e0e8787 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -537,7 +537,7 @@ static void dma_ops_free_addresses(struct dma_ops_domain *dom,
537 address >>= PAGE_SHIFT; 537 address >>= PAGE_SHIFT;
538 iommu_area_free(dom->bitmap, address, pages); 538 iommu_area_free(dom->bitmap, address, pages);
539 539
540 if (address + pages >= dom->next_bit) 540 if (address >= dom->next_bit)
541 dom->need_flush = true; 541 dom->need_flush = true;
542} 542}
543 543
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index 0cdcda35a05f..30ae2701b3df 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -121,7 +121,7 @@ u16 amd_iommu_last_bdf; /* largest PCI device id we have
121LIST_HEAD(amd_iommu_unity_map); /* a list of required unity mappings 121LIST_HEAD(amd_iommu_unity_map); /* a list of required unity mappings
122 we find in ACPI */ 122 we find in ACPI */
123unsigned amd_iommu_aperture_order = 26; /* size of aperture in power of 2 */ 123unsigned amd_iommu_aperture_order = 26; /* size of aperture in power of 2 */
124int amd_iommu_isolate; /* if 1, device isolation is enabled */ 124int amd_iommu_isolate = 1; /* if 1, device isolation is enabled */
125bool amd_iommu_unmap_flush; /* if true, flush on every unmap */ 125bool amd_iommu_unmap_flush; /* if true, flush on every unmap */
126 126
127LIST_HEAD(amd_iommu_list); /* list of all AMD IOMMUs in the 127LIST_HEAD(amd_iommu_list); /* list of all AMD IOMMUs in the
@@ -1213,7 +1213,9 @@ static int __init parse_amd_iommu_options(char *str)
1213 for (; *str; ++str) { 1213 for (; *str; ++str) {
1214 if (strncmp(str, "isolate", 7) == 0) 1214 if (strncmp(str, "isolate", 7) == 0)
1215 amd_iommu_isolate = 1; 1215 amd_iommu_isolate = 1;
1216 if (strncmp(str, "fullflush", 11) == 0) 1216 if (strncmp(str, "share", 5) == 0)
1217 amd_iommu_isolate = 0;
1218 if (strncmp(str, "fullflush", 9) == 0)
1217 amd_iommu_unmap_flush = true; 1219 amd_iommu_unmap_flush = true;
1218 } 1220 }
1219 1221
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 3ce029ffaa55..1b894b72c0f5 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -188,20 +188,6 @@ static void __init ati_bugs_contd(int num, int slot, int func)
188} 188}
189#endif 189#endif
190 190
191#ifdef CONFIG_DMAR
192static void __init intel_g33_dmar(int num, int slot, int func)
193{
194 struct acpi_table_header *dmar_tbl;
195 acpi_status status;
196
197 status = acpi_get_table(ACPI_SIG_DMAR, 0, &dmar_tbl);
198 if (ACPI_SUCCESS(status)) {
199 printk(KERN_INFO "BIOS BUG: DMAR advertised on Intel G31/G33 chipset -- ignoring\n");
200 dmar_disabled = 1;
201 }
202}
203#endif
204
205#define QFLAG_APPLY_ONCE 0x1 191#define QFLAG_APPLY_ONCE 0x1
206#define QFLAG_APPLIED 0x2 192#define QFLAG_APPLIED 0x2
207#define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED) 193#define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED)
@@ -225,10 +211,6 @@ static struct chipset early_qrk[] __initdata = {
225 PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs }, 211 PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs },
226 { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, 212 { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS,
227 PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs_contd }, 213 PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs_contd },
228#ifdef CONFIG_DMAR
229 { PCI_VENDOR_ID_INTEL, 0x29c0,
230 PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, intel_g33_dmar },
231#endif
232 {} 214 {}
233}; 215};
234 216
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 77017e834cf7..067d8de913f6 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -322,7 +322,7 @@ static int hpet_next_event(unsigned long delta,
322 * what we wrote hit the chip before we compare it to the 322 * what we wrote hit the chip before we compare it to the
323 * counter. 323 * counter.
324 */ 324 */
325 WARN_ON((u32)hpet_readl(HPET_T0_CMP) != cnt); 325 WARN_ON_ONCE((u32)hpet_readl(HPET_Tn_CMP(timer)) != cnt);
326 326
327 return (s32)((u32)hpet_readl(HPET_COUNTER) - cnt) >= 0 ? -ETIME : 0; 327 return (s32)((u32)hpet_readl(HPET_COUNTER) - cnt) >= 0 ? -ETIME : 0;
328} 328}
@@ -445,7 +445,7 @@ static int hpet_setup_irq(struct hpet_dev *dev)
445{ 445{
446 446
447 if (request_irq(dev->irq, hpet_interrupt_handler, 447 if (request_irq(dev->irq, hpet_interrupt_handler,
448 IRQF_SHARED|IRQF_NOBALANCING, dev->name, dev)) 448 IRQF_DISABLED|IRQF_NOBALANCING, dev->name, dev))
449 return -1; 449 return -1;
450 450
451 disable_irq(dev->irq); 451 disable_irq(dev->irq);
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index 774ac4991568..1c9cc431ea4f 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -128,7 +128,7 @@ static int kvm_register_clock(char *txt)
128} 128}
129 129
130#ifdef CONFIG_X86_LOCAL_APIC 130#ifdef CONFIG_X86_LOCAL_APIC
131static void kvm_setup_secondary_clock(void) 131static void __devinit kvm_setup_secondary_clock(void)
132{ 132{
133 /* 133 /*
134 * Now that the first cpu already had this clocksource initialized, 134 * Now that the first cpu already had this clocksource initialized,
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index ce3251ce5504..b81125f0bdee 100644
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -20,6 +20,8 @@ if VIRTUALIZATION
20config KVM 20config KVM
21 tristate "Kernel-based Virtual Machine (KVM) support" 21 tristate "Kernel-based Virtual Machine (KVM) support"
22 depends on HAVE_KVM 22 depends on HAVE_KVM
23 # for device assignment:
24 depends on PCI
23 select PREEMPT_NOTIFIERS 25 select PREEMPT_NOTIFIERS
24 select MMU_NOTIFIER 26 select MMU_NOTIFIER
25 select ANON_INODES 27 select ANON_INODES
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index 8772dc946823..59ebd37ad79e 100644
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -548,8 +548,10 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm)
548 mutex_lock(&kvm->lock); 548 mutex_lock(&kvm->lock);
549 pit->irq_source_id = kvm_request_irq_source_id(kvm); 549 pit->irq_source_id = kvm_request_irq_source_id(kvm);
550 mutex_unlock(&kvm->lock); 550 mutex_unlock(&kvm->lock);
551 if (pit->irq_source_id < 0) 551 if (pit->irq_source_id < 0) {
552 kfree(pit);
552 return NULL; 553 return NULL;
554 }
553 555
554 mutex_init(&pit->pit_state.lock); 556 mutex_init(&pit->pit_state.lock);
555 mutex_lock(&pit->pit_state.lock); 557 mutex_lock(&pit->pit_state.lock);
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 2a5e64881d9b..f1983d9477cd 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -314,7 +314,7 @@ static int mmu_topup_memory_caches(struct kvm_vcpu *vcpu)
314 if (r) 314 if (r)
315 goto out; 315 goto out;
316 r = mmu_topup_memory_cache(&vcpu->arch.mmu_rmap_desc_cache, 316 r = mmu_topup_memory_cache(&vcpu->arch.mmu_rmap_desc_cache,
317 rmap_desc_cache, 1); 317 rmap_desc_cache, 4);
318 if (r) 318 if (r)
319 goto out; 319 goto out;
320 r = mmu_topup_memory_cache_page(&vcpu->arch.mmu_page_cache, 8); 320 r = mmu_topup_memory_cache_page(&vcpu->arch.mmu_page_cache, 8);
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 2643b430d83a..d06b4dc0e2ea 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -3564,7 +3564,8 @@ static int __init vmx_init(void)
3564 bypass_guest_pf = 0; 3564 bypass_guest_pf = 0;
3565 kvm_mmu_set_base_ptes(VMX_EPT_READABLE_MASK | 3565 kvm_mmu_set_base_ptes(VMX_EPT_READABLE_MASK |
3566 VMX_EPT_WRITABLE_MASK | 3566 VMX_EPT_WRITABLE_MASK |
3567 VMX_EPT_DEFAULT_MT << VMX_EPT_MT_EPTE_SHIFT); 3567 VMX_EPT_DEFAULT_MT << VMX_EPT_MT_EPTE_SHIFT |
3568 VMX_EPT_IGMT_BIT);
3568 kvm_mmu_set_mask_ptes(0ull, 0ull, 0ull, 0ull, 3569 kvm_mmu_set_mask_ptes(0ull, 0ull, 0ull, 0ull,
3569 VMX_EPT_EXECUTABLE_MASK); 3570 VMX_EPT_EXECUTABLE_MASK);
3570 kvm_enable_tdp(); 3571 kvm_enable_tdp();
diff --git a/arch/x86/kvm/vmx.h b/arch/x86/kvm/vmx.h
index 3e010d21fdd7..ec5edc339da6 100644
--- a/arch/x86/kvm/vmx.h
+++ b/arch/x86/kvm/vmx.h
@@ -352,6 +352,7 @@ enum vmcs_field {
352#define VMX_EPT_READABLE_MASK 0x1ull 352#define VMX_EPT_READABLE_MASK 0x1ull
353#define VMX_EPT_WRITABLE_MASK 0x2ull 353#define VMX_EPT_WRITABLE_MASK 0x2ull
354#define VMX_EPT_EXECUTABLE_MASK 0x4ull 354#define VMX_EPT_EXECUTABLE_MASK 0x4ull
355#define VMX_EPT_IGMT_BIT (1ull << 6)
355 356
356#define VMX_EPT_IDENTITY_PAGETABLE_ADDR 0xfffbc000ul 357#define VMX_EPT_IDENTITY_PAGETABLE_ADDR 0xfffbc000ul
357 358
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-20 07:55:52 -0500