aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-02-01 12:53:26 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-01 12:53:26 -0500
commitde8696203e64f19ea26f8e096ac8a796e78216b3 (patch)
treed932f2f04d6c81c75c5104ae86b1e5d47e6591e3 /arch
parent807a96cd0e5f5311e7f7a1030b43aab624cd7d9f (diff)
parent0dc23d704874e892c3fb5f2c0e4dfbef3c9c6edf (diff)
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap1/devices.c2
-rw-r--r--arch/arm/mach-omap1/mcbsp.c98
-rw-r--r--arch/arm/mach-omap2/devices.c11
-rw-r--r--arch/arm/mach-omap2/id.c6
-rw-r--r--arch/arm/mach-omap2/irq.c1
-rw-r--r--arch/arm/mach-omap2/mcbsp.c145
-rw-r--r--arch/arm/mach-omap2/sleep24xx.S3
-rw-r--r--arch/arm/mach-omap2/timer-gp.c3
-rw-r--r--arch/arm/plat-omap/devices.c7
-rw-r--r--arch/arm/plat-omap/dma.c5
-rw-r--r--arch/arm/plat-omap/include/mach/cpu.h1
-rw-r--r--arch/arm/plat-omap/include/mach/mcbsp.h6
-rw-r--r--arch/arm/plat-omap/include/mach/mmc.h10
-rw-r--r--arch/arm/plat-omap/mcbsp.c52
-rw-r--r--arch/m68k/include/asm/cacheflush_no.h11
-rw-r--r--arch/m68k/include/asm/dma-mapping_no.h4
-rw-r--r--arch/m68k/include/asm/system_no.h2
-rw-r--r--arch/m68knommu/Kconfig27
-rw-r--r--arch/m68knommu/Makefile1
-rw-r--r--arch/m68knommu/kernel/Makefile1
-rw-r--r--arch/m68knommu/kernel/comempci.c980
-rw-r--r--arch/m68knommu/kernel/signal.c15
-rw-r--r--arch/m68knommu/kernel/syscalltable.S2
-rw-r--r--arch/m68knommu/platform/5307/config.c2
-rw-r--r--arch/m68knommu/platform/532x/config.c8
-rw-r--r--arch/m68knommu/platform/coldfire/entry.S15
-rw-r--r--arch/powerpc/Kconfig4
-rw-r--r--arch/powerpc/boot/cuboot-warp.c43
-rw-r--r--arch/powerpc/boot/dts/haleakala.dts5
-rw-r--r--arch/powerpc/boot/dts/kilauea.dts5
-rw-r--r--arch/powerpc/boot/dts/makalu.dts5
-rw-r--r--arch/powerpc/boot/dts/mpc8313erdb.dts2
-rw-r--r--arch/powerpc/boot/dts/mpc8572ds.dts2
-rw-r--r--arch/powerpc/boot/dts/warp.dts42
-rw-r--r--arch/powerpc/configs/40x/acadia_defconfig76
-rw-r--r--arch/powerpc/configs/40x/ep405_defconfig87
-rw-r--r--arch/powerpc/configs/40x/hcu4_defconfig78
-rw-r--r--arch/powerpc/configs/40x/kilauea_defconfig76
-rw-r--r--arch/powerpc/configs/40x/makalu_defconfig76
-rw-r--r--arch/powerpc/configs/40x/virtex_defconfig53
-rw-r--r--arch/powerpc/configs/40x/walnut_defconfig84
-rw-r--r--arch/powerpc/configs/44x/arches_defconfig60
-rw-r--r--arch/powerpc/configs/44x/bamboo_defconfig76
-rw-r--r--arch/powerpc/configs/44x/canyonlands_defconfig60
-rw-r--r--arch/powerpc/configs/44x/ebony_defconfig84
-rw-r--r--arch/powerpc/configs/44x/katmai_defconfig76
-rw-r--r--arch/powerpc/configs/44x/rainier_defconfig83
-rw-r--r--arch/powerpc/configs/44x/sam440ep_defconfig77
-rw-r--r--arch/powerpc/configs/44x/sequoia_defconfig83
-rw-r--r--arch/powerpc/configs/44x/taishan_defconfig83
-rw-r--r--arch/powerpc/configs/44x/virtex5_defconfig53
-rw-r--r--arch/powerpc/configs/44x/warp_defconfig138
-rw-r--r--arch/powerpc/configs/83xx/asp8347_defconfig91
-rw-r--r--arch/powerpc/configs/83xx/mpc8313_rdb_defconfig103
-rw-r--r--arch/powerpc/configs/83xx/mpc8315_rdb_defconfig103
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_mds_defconfig86
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_rdb_defconfig89
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itx_defconfig100
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig98
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_mds_defconfig84
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_mds_defconfig93
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_rdk_defconfig88
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_mds_defconfig84
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_rdb_defconfig90
-rw-r--r--arch/powerpc/configs/83xx/sbc834x_defconfig74
-rw-r--r--arch/powerpc/configs/85xx/ksi8560_defconfig79
-rw-r--r--arch/powerpc/configs/85xx/mpc8536_ds_defconfig111
-rw-r--r--arch/powerpc/configs/85xx/mpc8540_ads_defconfig66
-rw-r--r--arch/powerpc/configs/85xx/mpc8544_ds_defconfig111
-rw-r--r--arch/powerpc/configs/85xx/mpc8560_ads_defconfig73
-rw-r--r--arch/powerpc/configs/85xx/mpc8568mds_defconfig86
-rw-r--r--arch/powerpc/configs/85xx/mpc8572_ds_defconfig80
-rw-r--r--arch/powerpc/configs/85xx/mpc85xx_cds_defconfig69
-rw-r--r--arch/powerpc/configs/85xx/sbc8548_defconfig60
-rw-r--r--arch/powerpc/configs/85xx/sbc8560_defconfig66
-rw-r--r--arch/powerpc/configs/85xx/stx_gp3_defconfig88
-rw-r--r--arch/powerpc/configs/85xx/tqm8540_defconfig81
-rw-r--r--arch/powerpc/configs/85xx/tqm8541_defconfig88
-rw-r--r--arch/powerpc/configs/85xx/tqm8548_defconfig84
-rw-r--r--arch/powerpc/configs/85xx/tqm8555_defconfig88
-rw-r--r--arch/powerpc/configs/85xx/tqm8560_defconfig88
-rw-r--r--arch/powerpc/configs/86xx/gef_sbc610_defconfig136
-rw-r--r--arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig83
-rw-r--r--arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig111
-rw-r--r--arch/powerpc/configs/86xx/sbc8641d_defconfig102
-rw-r--r--arch/powerpc/configs/adder875_defconfig65
-rw-r--r--arch/powerpc/configs/c2k_defconfig118
-rw-r--r--arch/powerpc/configs/ep8248e_defconfig77
-rw-r--r--arch/powerpc/configs/ep88xc_defconfig65
-rw-r--r--arch/powerpc/configs/linkstation_defconfig110
-rw-r--r--arch/powerpc/configs/mgcoge_defconfig74
-rw-r--r--arch/powerpc/configs/mgsuvd_defconfig63
-rw-r--r--arch/powerpc/configs/mpc7448_hpc2_defconfig71
-rw-r--r--arch/powerpc/configs/mpc8272_ads_defconfig77
-rw-r--r--arch/powerpc/configs/mpc83xx_defconfig107
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig120
-rw-r--r--arch/powerpc/configs/mpc866_ads_defconfig64
-rw-r--r--arch/powerpc/configs/mpc86xx_defconfig143
-rw-r--r--arch/powerpc/configs/mpc885_ads_defconfig65
-rw-r--r--arch/powerpc/configs/ppc40x_defconfig77
-rw-r--r--arch/powerpc/configs/ppc44x_defconfig79
-rw-r--r--arch/powerpc/configs/pq2fads_defconfig87
-rw-r--r--arch/powerpc/configs/prpmc2800_defconfig96
-rw-r--r--arch/powerpc/configs/storcenter_defconfig85
-rw-r--r--arch/powerpc/kernel/vio.c7
-rw-r--r--arch/powerpc/mm/ppc_mmu_32.c6
-rw-r--r--arch/powerpc/platforms/44x/Makefile1
-rw-r--r--arch/powerpc/platforms/44x/warp-nand.c135
-rw-r--r--arch/powerpc/platforms/83xx/mpc831x_rdb.c1
-rw-r--r--arch/powerpc/platforms/pseries/phyp_dump.c26
110 files changed, 4489 insertions, 3192 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 77382d8b6b2f..ba5d7c08dc17 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -181,7 +181,7 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
181 } 181 }
182 size = OMAP1_MMC_SIZE; 182 size = OMAP1_MMC_SIZE;
183 183
184 omap_mmc_add(i, base, size, irq, mmc_data[i]); 184 omap_mmc_add("mmci-omap", i, base, size, irq, mmc_data[i]);
185 }; 185 };
186} 186}
187 187
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c
index ca7a0cc1707c..575ba31295cf 100644
--- a/arch/arm/mach-omap1/mcbsp.c
+++ b/arch/arm/mach-omap1/mcbsp.c
@@ -28,81 +28,8 @@
28#define DPS_RSTCT2_PER_EN (1 << 0) 28#define DPS_RSTCT2_PER_EN (1 << 0)
29#define DSP_RSTCT2_WD_PER_EN (1 << 1) 29#define DSP_RSTCT2_WD_PER_EN (1 << 1)
30 30
31struct mcbsp_internal_clk {
32 struct clk clk;
33 struct clk **childs;
34 int n_childs;
35};
36
37#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) 31#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX)
38static void omap_mcbsp_clk_init(struct mcbsp_internal_clk *mclk) 32const char *clk_names[] = { "dsp_ck", "api_ck", "dspxor_ck" };
39{
40 const char *clk_names[] = { "dsp_ck", "api_ck", "dspxor_ck" };
41 int i;
42
43 mclk->n_childs = ARRAY_SIZE(clk_names);
44 mclk->childs = kzalloc(mclk->n_childs * sizeof(struct clk *),
45 GFP_KERNEL);
46
47 for (i = 0; i < mclk->n_childs; i++) {
48 /* We fake a platform device to get correct device id */
49 struct platform_device pdev;
50
51 pdev.dev.bus = &platform_bus_type;
52 pdev.id = mclk->clk.id;
53 mclk->childs[i] = clk_get(&pdev.dev, clk_names[i]);
54 if (IS_ERR(mclk->childs[i]))
55 printk(KERN_ERR "Could not get clock %s (%d).\n",
56 clk_names[i], mclk->clk.id);
57 }
58}
59
60static int omap_mcbsp_clk_enable(struct clk *clk)
61{
62 struct mcbsp_internal_clk *mclk = container_of(clk,
63 struct mcbsp_internal_clk, clk);
64 int i;
65
66 for (i = 0; i < mclk->n_childs; i++)
67 clk_enable(mclk->childs[i]);
68 return 0;
69}
70
71static void omap_mcbsp_clk_disable(struct clk *clk)
72{
73 struct mcbsp_internal_clk *mclk = container_of(clk,
74 struct mcbsp_internal_clk, clk);
75 int i;
76
77 for (i = 0; i < mclk->n_childs; i++)
78 clk_disable(mclk->childs[i]);
79}
80
81static struct mcbsp_internal_clk omap_mcbsp_clks[] = {
82 {
83 .clk = {
84 .name = "mcbsp_clk",
85 .id = 1,
86 .enable = omap_mcbsp_clk_enable,
87 .disable = omap_mcbsp_clk_disable,
88 },
89 },
90 {
91 .clk = {
92 .name = "mcbsp_clk",
93 .id = 3,
94 .enable = omap_mcbsp_clk_enable,
95 .disable = omap_mcbsp_clk_disable,
96 },
97 },
98};
99
100#define omap_mcbsp_clks_size ARRAY_SIZE(omap_mcbsp_clks)
101#else
102#define omap_mcbsp_clks_size 0
103static struct mcbsp_internal_clk __initdata *omap_mcbsp_clks;
104static inline void omap_mcbsp_clk_init(struct mcbsp_internal_clk *mclk)
105{ }
106#endif 33#endif
107 34
108static void omap1_mcbsp_request(unsigned int id) 35static void omap1_mcbsp_request(unsigned int id)
@@ -167,8 +94,9 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {
167 .rx_irq = INT_McBSP1RX, 94 .rx_irq = INT_McBSP1RX,
168 .tx_irq = INT_McBSP1TX, 95 .tx_irq = INT_McBSP1TX,
169 .ops = &omap1_mcbsp_ops, 96 .ops = &omap1_mcbsp_ops,
170 .clk_name = "mcbsp_clk", 97 .clk_names = clk_names,
171 }, 98 .num_clks = 3,
99 },
172 { 100 {
173 .phys_base = OMAP1510_MCBSP2_BASE, 101 .phys_base = OMAP1510_MCBSP2_BASE,
174 .dma_rx_sync = OMAP_DMA_MCBSP2_RX, 102 .dma_rx_sync = OMAP_DMA_MCBSP2_RX,
@@ -184,7 +112,8 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {
184 .rx_irq = INT_McBSP3RX, 112 .rx_irq = INT_McBSP3RX,
185 .tx_irq = INT_McBSP3TX, 113 .tx_irq = INT_McBSP3TX,
186 .ops = &omap1_mcbsp_ops, 114 .ops = &omap1_mcbsp_ops,
187 .clk_name = "mcbsp_clk", 115 .clk_names = clk_names,
116 .num_clks = 3,
188 }, 117 },
189}; 118};
190#define OMAP15XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap15xx_mcbsp_pdata) 119#define OMAP15XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap15xx_mcbsp_pdata)
@@ -202,7 +131,8 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {
202 .rx_irq = INT_McBSP1RX, 131 .rx_irq = INT_McBSP1RX,
203 .tx_irq = INT_McBSP1TX, 132 .tx_irq = INT_McBSP1TX,
204 .ops = &omap1_mcbsp_ops, 133 .ops = &omap1_mcbsp_ops,
205 .clk_name = "mcbsp_clk", 134 .clk_names = clk_names,
135 .num_clks = 3,
206 }, 136 },
207 { 137 {
208 .phys_base = OMAP1610_MCBSP2_BASE, 138 .phys_base = OMAP1610_MCBSP2_BASE,
@@ -219,7 +149,8 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {
219 .rx_irq = INT_McBSP3RX, 149 .rx_irq = INT_McBSP3RX,
220 .tx_irq = INT_McBSP3TX, 150 .tx_irq = INT_McBSP3TX,
221 .ops = &omap1_mcbsp_ops, 151 .ops = &omap1_mcbsp_ops,
222 .clk_name = "mcbsp_clk", 152 .clk_names = clk_names,
153 .num_clks = 3,
223 }, 154 },
224}; 155};
225#define OMAP16XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap16xx_mcbsp_pdata) 156#define OMAP16XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap16xx_mcbsp_pdata)
@@ -230,15 +161,6 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {
230 161
231int __init omap1_mcbsp_init(void) 162int __init omap1_mcbsp_init(void)
232{ 163{
233 int i;
234
235 for (i = 0; i < omap_mcbsp_clks_size; i++) {
236 if (cpu_is_omap15xx() || cpu_is_omap16xx()) {
237 omap_mcbsp_clk_init(&omap_mcbsp_clks[i]);
238 clk_register(&omap_mcbsp_clks[i].clk);
239 }
240 }
241
242 if (cpu_is_omap730()) 164 if (cpu_is_omap730())
243 omap_mcbsp_count = OMAP730_MCBSP_PDATA_SZ; 165 omap_mcbsp_count = OMAP730_MCBSP_PDATA_SZ;
244 if (cpu_is_omap15xx()) 166 if (cpu_is_omap15xx())
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 9d7216ff6c9f..ce03fa750775 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -421,6 +421,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
421 int nr_controllers) 421 int nr_controllers)
422{ 422{
423 int i; 423 int i;
424 char *name;
424 425
425 for (i = 0; i < nr_controllers; i++) { 426 for (i = 0; i < nr_controllers; i++) {
426 unsigned long base, size; 427 unsigned long base, size;
@@ -450,12 +451,14 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
450 continue; 451 continue;
451 } 452 }
452 453
453 if (cpu_is_omap2420()) 454 if (cpu_is_omap2420()) {
454 size = OMAP2420_MMC_SIZE; 455 size = OMAP2420_MMC_SIZE;
455 else 456 name = "mmci-omap";
457 } else {
456 size = HSMMC_SIZE; 458 size = HSMMC_SIZE;
457 459 name = "mmci-omap-hs";
458 omap_mmc_add(i, base, size, irq, mmc_data[i]); 460 }
461 omap_mmc_add(name, i, base, size, irq, mmc_data[i]);
459 }; 462 };
460} 463}
461 464
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index b0f8e7d62798..b52a02fc7cd6 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -172,9 +172,13 @@ void __init omap34xx_check_revision(void)
172 omap_revision = OMAP3430_REV_ES3_0; 172 omap_revision = OMAP3430_REV_ES3_0;
173 rev_name = "ES3.0"; 173 rev_name = "ES3.0";
174 break; 174 break;
175 case 4:
176 omap_revision = OMAP3430_REV_ES3_1;
177 rev_name = "ES3.1";
178 break;
175 default: 179 default:
176 /* Use the latest known revision as default */ 180 /* Use the latest known revision as default */
177 omap_revision = OMAP3430_REV_ES3_0; 181 omap_revision = OMAP3430_REV_ES3_1;
178 rev_name = "Unknown revision\n"; 182 rev_name = "Unknown revision\n";
179 } 183 }
180 } 184 }
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index 636e2821af7d..9ba20d985dda 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -134,6 +134,7 @@ static struct irq_chip omap_irq_chip = {
134 .ack = omap_mask_ack_irq, 134 .ack = omap_mask_ack_irq,
135 .mask = omap_mask_irq, 135 .mask = omap_mask_irq,
136 .unmask = omap_unmask_irq, 136 .unmask = omap_unmask_irq,
137 .disable = omap_mask_irq,
137}; 138};
138 139
139static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank) 140static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank)
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index e20023c9d15d..a9e631fc1134 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -24,106 +24,7 @@
24#include <mach/cpu.h> 24#include <mach/cpu.h>
25#include <mach/mcbsp.h> 25#include <mach/mcbsp.h>
26 26
27struct mcbsp_internal_clk { 27const char *clk_names[] = { "mcbsp_ick", "mcbsp_fck" };
28 struct clk clk;
29 struct clk **childs;
30 int n_childs;
31};
32
33#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
34static void omap_mcbsp_clk_init(struct mcbsp_internal_clk *mclk)
35{
36 const char *clk_names[] = { "mcbsp_ick", "mcbsp_fck" };
37 int i;
38
39 mclk->n_childs = ARRAY_SIZE(clk_names);
40 mclk->childs = kzalloc(mclk->n_childs * sizeof(struct clk *),
41 GFP_KERNEL);
42
43 for (i = 0; i < mclk->n_childs; i++) {
44 /* We fake a platform device to get correct device id */
45 struct platform_device pdev;
46
47 pdev.dev.bus = &platform_bus_type;
48 pdev.id = mclk->clk.id;
49 mclk->childs[i] = clk_get(&pdev.dev, clk_names[i]);
50 if (IS_ERR(mclk->childs[i]))
51 printk(KERN_ERR "Could not get clock %s (%d).\n",
52 clk_names[i], mclk->clk.id);
53 }
54}
55
56static int omap_mcbsp_clk_enable(struct clk *clk)
57{
58 struct mcbsp_internal_clk *mclk = container_of(clk,
59 struct mcbsp_internal_clk, clk);
60 int i;
61
62 for (i = 0; i < mclk->n_childs; i++)
63 clk_enable(mclk->childs[i]);
64 return 0;
65}
66
67static void omap_mcbsp_clk_disable(struct clk *clk)
68{
69 struct mcbsp_internal_clk *mclk = container_of(clk,
70 struct mcbsp_internal_clk, clk);
71 int i;
72
73 for (i = 0; i < mclk->n_childs; i++)
74 clk_disable(mclk->childs[i]);
75}
76
77static struct mcbsp_internal_clk omap_mcbsp_clks[] = {
78 {
79 .clk = {
80 .name = "mcbsp_clk",
81 .id = 1,
82 .enable = omap_mcbsp_clk_enable,
83 .disable = omap_mcbsp_clk_disable,
84 },
85 },
86 {
87 .clk = {
88 .name = "mcbsp_clk",
89 .id = 2,
90 .enable = omap_mcbsp_clk_enable,
91 .disable = omap_mcbsp_clk_disable,
92 },
93 },
94 {
95 .clk = {
96 .name = "mcbsp_clk",
97 .id = 3,
98 .enable = omap_mcbsp_clk_enable,
99 .disable = omap_mcbsp_clk_disable,
100 },
101 },
102 {
103 .clk = {
104 .name = "mcbsp_clk",
105 .id = 4,
106 .enable = omap_mcbsp_clk_enable,
107 .disable = omap_mcbsp_clk_disable,
108 },
109 },
110 {
111 .clk = {
112 .name = "mcbsp_clk",
113 .id = 5,
114 .enable = omap_mcbsp_clk_enable,
115 .disable = omap_mcbsp_clk_disable,
116 },
117 },
118};
119
120#define omap_mcbsp_clks_size ARRAY_SIZE(omap_mcbsp_clks)
121#else
122#define omap_mcbsp_clks_size 0
123static struct mcbsp_internal_clk __initdata *omap_mcbsp_clks;
124static inline void omap_mcbsp_clk_init(struct clk *clk)
125{ }
126#endif
127 28
128static void omap2_mcbsp2_mux_setup(void) 29static void omap2_mcbsp2_mux_setup(void)
129{ 30{
@@ -156,7 +57,8 @@ static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {
156 .rx_irq = INT_24XX_MCBSP1_IRQ_RX, 57 .rx_irq = INT_24XX_MCBSP1_IRQ_RX,
157 .tx_irq = INT_24XX_MCBSP1_IRQ_TX, 58 .tx_irq = INT_24XX_MCBSP1_IRQ_TX,
158 .ops = &omap2_mcbsp_ops, 59 .ops = &omap2_mcbsp_ops,
159 .clk_name = "mcbsp_clk", 60 .clk_names = clk_names,
61 .num_clks = 2,
160 }, 62 },
161 { 63 {
162 .phys_base = OMAP24XX_MCBSP2_BASE, 64 .phys_base = OMAP24XX_MCBSP2_BASE,
@@ -165,7 +67,8 @@ static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {
165 .rx_irq = INT_24XX_MCBSP2_IRQ_RX, 67 .rx_irq = INT_24XX_MCBSP2_IRQ_RX,
166 .tx_irq = INT_24XX_MCBSP2_IRQ_TX, 68 .tx_irq = INT_24XX_MCBSP2_IRQ_TX,
167 .ops = &omap2_mcbsp_ops, 69 .ops = &omap2_mcbsp_ops,
168 .clk_name = "mcbsp_clk", 70 .clk_names = clk_names,
71 .num_clks = 2,
169 }, 72 },
170}; 73};
171#define OMAP2420_MCBSP_PDATA_SZ ARRAY_SIZE(omap2420_mcbsp_pdata) 74#define OMAP2420_MCBSP_PDATA_SZ ARRAY_SIZE(omap2420_mcbsp_pdata)
@@ -183,7 +86,8 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
183 .rx_irq = INT_24XX_MCBSP1_IRQ_RX, 86 .rx_irq = INT_24XX_MCBSP1_IRQ_RX,
184 .tx_irq = INT_24XX_MCBSP1_IRQ_TX, 87 .tx_irq = INT_24XX_MCBSP1_IRQ_TX,
185 .ops = &omap2_mcbsp_ops, 88 .ops = &omap2_mcbsp_ops,
186 .clk_name = "mcbsp_clk", 89 .clk_names = clk_names,
90 .num_clks = 2,
187 }, 91 },
188 { 92 {
189 .phys_base = OMAP24XX_MCBSP2_BASE, 93 .phys_base = OMAP24XX_MCBSP2_BASE,
@@ -192,7 +96,8 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
192 .rx_irq = INT_24XX_MCBSP2_IRQ_RX, 96 .rx_irq = INT_24XX_MCBSP2_IRQ_RX,
193 .tx_irq = INT_24XX_MCBSP2_IRQ_TX, 97 .tx_irq = INT_24XX_MCBSP2_IRQ_TX,
194 .ops = &omap2_mcbsp_ops, 98 .ops = &omap2_mcbsp_ops,
195 .clk_name = "mcbsp_clk", 99 .clk_names = clk_names,
100 .num_clks = 2,
196 }, 101 },
197 { 102 {
198 .phys_base = OMAP2430_MCBSP3_BASE, 103 .phys_base = OMAP2430_MCBSP3_BASE,
@@ -201,7 +106,8 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
201 .rx_irq = INT_24XX_MCBSP3_IRQ_RX, 106 .rx_irq = INT_24XX_MCBSP3_IRQ_RX,
202 .tx_irq = INT_24XX_MCBSP3_IRQ_TX, 107 .tx_irq = INT_24XX_MCBSP3_IRQ_TX,
203 .ops = &omap2_mcbsp_ops, 108 .ops = &omap2_mcbsp_ops,
204 .clk_name = "mcbsp_clk", 109 .clk_names = clk_names,
110 .num_clks = 2,
205 }, 111 },
206 { 112 {
207 .phys_base = OMAP2430_MCBSP4_BASE, 113 .phys_base = OMAP2430_MCBSP4_BASE,
@@ -210,7 +116,8 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
210 .rx_irq = INT_24XX_MCBSP4_IRQ_RX, 116 .rx_irq = INT_24XX_MCBSP4_IRQ_RX,
211 .tx_irq = INT_24XX_MCBSP4_IRQ_TX, 117 .tx_irq = INT_24XX_MCBSP4_IRQ_TX,
212 .ops = &omap2_mcbsp_ops, 118 .ops = &omap2_mcbsp_ops,
213 .clk_name = "mcbsp_clk", 119 .clk_names = clk_names,
120 .num_clks = 2,
214 }, 121 },
215 { 122 {
216 .phys_base = OMAP2430_MCBSP5_BASE, 123 .phys_base = OMAP2430_MCBSP5_BASE,
@@ -219,7 +126,8 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
219 .rx_irq = INT_24XX_MCBSP5_IRQ_RX, 126 .rx_irq = INT_24XX_MCBSP5_IRQ_RX,
220 .tx_irq = INT_24XX_MCBSP5_IRQ_TX, 127 .tx_irq = INT_24XX_MCBSP5_IRQ_TX,
221 .ops = &omap2_mcbsp_ops, 128 .ops = &omap2_mcbsp_ops,
222 .clk_name = "mcbsp_clk", 129 .clk_names = clk_names,
130 .num_clks = 2,
223 }, 131 },
224}; 132};
225#define OMAP2430_MCBSP_PDATA_SZ ARRAY_SIZE(omap2430_mcbsp_pdata) 133#define OMAP2430_MCBSP_PDATA_SZ ARRAY_SIZE(omap2430_mcbsp_pdata)
@@ -237,7 +145,8 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
237 .rx_irq = INT_24XX_MCBSP1_IRQ_RX, 145 .rx_irq = INT_24XX_MCBSP1_IRQ_RX,
238 .tx_irq = INT_24XX_MCBSP1_IRQ_TX, 146 .tx_irq = INT_24XX_MCBSP1_IRQ_TX,
239 .ops = &omap2_mcbsp_ops, 147 .ops = &omap2_mcbsp_ops,
240 .clk_name = "mcbsp_clk", 148 .clk_names = clk_names,
149 .num_clks = 2,
241 }, 150 },
242 { 151 {
243 .phys_base = OMAP34XX_MCBSP2_BASE, 152 .phys_base = OMAP34XX_MCBSP2_BASE,
@@ -246,7 +155,8 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
246 .rx_irq = INT_24XX_MCBSP2_IRQ_RX, 155 .rx_irq = INT_24XX_MCBSP2_IRQ_RX,
247 .tx_irq = INT_24XX_MCBSP2_IRQ_TX, 156 .tx_irq = INT_24XX_MCBSP2_IRQ_TX,
248 .ops = &omap2_mcbsp_ops, 157 .ops = &omap2_mcbsp_ops,
249 .clk_name = "mcbsp_clk", 158 .clk_names = clk_names,
159 .num_clks = 2,
250 }, 160 },
251 { 161 {
252 .phys_base = OMAP34XX_MCBSP3_BASE, 162 .phys_base = OMAP34XX_MCBSP3_BASE,
@@ -255,7 +165,8 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
255 .rx_irq = INT_24XX_MCBSP3_IRQ_RX, 165 .rx_irq = INT_24XX_MCBSP3_IRQ_RX,
256 .tx_irq = INT_24XX_MCBSP3_IRQ_TX, 166 .tx_irq = INT_24XX_MCBSP3_IRQ_TX,
257 .ops = &omap2_mcbsp_ops, 167 .ops = &omap2_mcbsp_ops,
258 .clk_name = "mcbsp_clk", 168 .clk_names = clk_names,
169 .num_clks = 2,
259 }, 170 },
260 { 171 {
261 .phys_base = OMAP34XX_MCBSP4_BASE, 172 .phys_base = OMAP34XX_MCBSP4_BASE,
@@ -264,7 +175,8 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
264 .rx_irq = INT_24XX_MCBSP4_IRQ_RX, 175 .rx_irq = INT_24XX_MCBSP4_IRQ_RX,
265 .tx_irq = INT_24XX_MCBSP4_IRQ_TX, 176 .tx_irq = INT_24XX_MCBSP4_IRQ_TX,
266 .ops = &omap2_mcbsp_ops, 177 .ops = &omap2_mcbsp_ops,
267 .clk_name = "mcbsp_clk", 178 .clk_names = clk_names,
179 .num_clks = 2,
268 }, 180 },
269 { 181 {
270 .phys_base = OMAP34XX_MCBSP5_BASE, 182 .phys_base = OMAP34XX_MCBSP5_BASE,
@@ -273,7 +185,8 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
273 .rx_irq = INT_24XX_MCBSP5_IRQ_RX, 185 .rx_irq = INT_24XX_MCBSP5_IRQ_RX,
274 .tx_irq = INT_24XX_MCBSP5_IRQ_TX, 186 .tx_irq = INT_24XX_MCBSP5_IRQ_TX,
275 .ops = &omap2_mcbsp_ops, 187 .ops = &omap2_mcbsp_ops,
276 .clk_name = "mcbsp_clk", 188 .clk_names = clk_names,
189 .num_clks = 2,
277 }, 190 },
278}; 191};
279#define OMAP34XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap34xx_mcbsp_pdata) 192#define OMAP34XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap34xx_mcbsp_pdata)
@@ -284,14 +197,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
284 197
285static int __init omap2_mcbsp_init(void) 198static int __init omap2_mcbsp_init(void)
286{ 199{
287 int i;
288
289 for (i = 0; i < omap_mcbsp_clks_size; i++) {
290 /* Once we call clk_get inside init, we do not register it */
291 omap_mcbsp_clk_init(&omap_mcbsp_clks[i]);
292 clk_register(&omap_mcbsp_clks[i].clk);
293 }
294
295 if (cpu_is_omap2420()) 200 if (cpu_is_omap2420())
296 omap_mcbsp_count = OMAP2420_MCBSP_PDATA_SZ; 201 omap_mcbsp_count = OMAP2420_MCBSP_PDATA_SZ;
297 if (cpu_is_omap2430()) 202 if (cpu_is_omap2430())
diff --git a/arch/arm/mach-omap2/sleep24xx.S b/arch/arm/mach-omap2/sleep24xx.S
index 43336b93b21c..bf9e96105e11 100644
--- a/arch/arm/mach-omap2/sleep24xx.S
+++ b/arch/arm/mach-omap2/sleep24xx.S
@@ -93,9 +93,8 @@ ENTRY(omap24xx_cpu_suspend)
93 orr r4, r4, #0x40 @ enable self refresh on idle req 93 orr r4, r4, #0x40 @ enable self refresh on idle req
94 mov r5, #0x2000 @ set delay (DPLL relock + DLL relock) 94 mov r5, #0x2000 @ set delay (DPLL relock + DLL relock)
95 str r4, [r2] @ make it so 95 str r4, [r2] @ make it so
96 mov r2, #0
97 nop 96 nop
98 mcr p15, 0, r2, c7, c0, 4 @ wait for interrupt 97 mcr p15, 0, r3, c7, c0, 4 @ wait for interrupt
99 nop 98 nop
100loop: 99loop:
101 subs r5, r5, #0x1 @ awake, wait just a bit 100 subs r5, r5, #0x1 @ awake, wait just a bit
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index ae6036300f60..9fc13a2cc3f4 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -118,7 +118,8 @@ static void __init omap2_gp_clockevent_init(void)
118 clockevent_gpt.max_delta_ns = 118 clockevent_gpt.max_delta_ns =
119 clockevent_delta2ns(0xffffffff, &clockevent_gpt); 119 clockevent_delta2ns(0xffffffff, &clockevent_gpt);
120 clockevent_gpt.min_delta_ns = 120 clockevent_gpt.min_delta_ns =
121 clockevent_delta2ns(1, &clockevent_gpt); 121 clockevent_delta2ns(3, &clockevent_gpt);
122 /* Timer internal resynch latency. */
122 123
123 clockevent_gpt.cpumask = cpumask_of(0); 124 clockevent_gpt.cpumask = cpumask_of(0);
124 clockevents_register_device(&clockevent_gpt); 125 clockevents_register_device(&clockevent_gpt);
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index ac15c23fd5da..208dbb121f47 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -200,14 +200,15 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
200/* 200/*
201 * Register MMC devices. Called from mach-omap1 and mach-omap2 device init. 201 * Register MMC devices. Called from mach-omap1 and mach-omap2 device init.
202 */ 202 */
203int __init omap_mmc_add(int id, unsigned long base, unsigned long size, 203int __init omap_mmc_add(const char *name, int id, unsigned long base,
204 unsigned int irq, struct omap_mmc_platform_data *data) 204 unsigned long size, unsigned int irq,
205 struct omap_mmc_platform_data *data)
205{ 206{
206 struct platform_device *pdev; 207 struct platform_device *pdev;
207 struct resource res[OMAP_MMC_NR_RES]; 208 struct resource res[OMAP_MMC_NR_RES];
208 int ret; 209 int ret;
209 210
210 pdev = platform_device_alloc("mmci-omap", id); 211 pdev = platform_device_alloc(name, id);
211 if (!pdev) 212 if (!pdev)
212 return -ENOMEM; 213 return -ENOMEM;
213 214
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index e77373c39f8c..47ec77af4ccb 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -709,6 +709,7 @@ int omap_request_dma(int dev_id, const char *dev_name,
709 chan->dev_name = dev_name; 709 chan->dev_name = dev_name;
710 chan->callback = callback; 710 chan->callback = callback;
711 chan->data = data; 711 chan->data = data;
712 chan->flags = 0;
712 713
713#ifndef CONFIG_ARCH_OMAP1 714#ifndef CONFIG_ARCH_OMAP1
714 if (cpu_class_is_omap2()) { 715 if (cpu_class_is_omap2()) {
@@ -1888,11 +1889,11 @@ static int omap2_dma_handle_ch(int ch)
1888 status = dma_read(CSR(ch)); 1889 status = dma_read(CSR(ch));
1889 } 1890 }
1890 1891
1892 dma_write(status, CSR(ch));
1893
1891 if (likely(dma_chan[ch].callback != NULL)) 1894 if (likely(dma_chan[ch].callback != NULL))
1892 dma_chan[ch].callback(ch, status, dma_chan[ch].data); 1895 dma_chan[ch].callback(ch, status, dma_chan[ch].data);
1893 1896
1894 dma_write(status, CSR(ch));
1895
1896 return 0; 1897 return 0;
1897} 1898}
1898 1899
diff --git a/arch/arm/plat-omap/include/mach/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h
index b2062f1175de..a8e1178a9468 100644
--- a/arch/arm/plat-omap/include/mach/cpu.h
+++ b/arch/arm/plat-omap/include/mach/cpu.h
@@ -339,6 +339,7 @@ IS_OMAP_TYPE(3430, 0x3430)
339#define OMAP3430_REV_ES2_0 0x34301034 339#define OMAP3430_REV_ES2_0 0x34301034
340#define OMAP3430_REV_ES2_1 0x34302034 340#define OMAP3430_REV_ES2_1 0x34302034
341#define OMAP3430_REV_ES3_0 0x34303034 341#define OMAP3430_REV_ES3_0 0x34303034
342#define OMAP3430_REV_ES3_1 0x34304034
342 343
343/* 344/*
344 * omap_chip bits 345 * omap_chip bits
diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h
index eef873db3d48..113c2466c86a 100644
--- a/arch/arm/plat-omap/include/mach/mcbsp.h
+++ b/arch/arm/plat-omap/include/mach/mcbsp.h
@@ -344,7 +344,8 @@ struct omap_mcbsp_platform_data {
344 u8 dma_rx_sync, dma_tx_sync; 344 u8 dma_rx_sync, dma_tx_sync;
345 u16 rx_irq, tx_irq; 345 u16 rx_irq, tx_irq;
346 struct omap_mcbsp_ops *ops; 346 struct omap_mcbsp_ops *ops;
347 char const *clk_name; 347 char const **clk_names;
348 int num_clks;
348}; 349};
349 350
350struct omap_mcbsp { 351struct omap_mcbsp {
@@ -376,7 +377,8 @@ struct omap_mcbsp {
376 /* Protect the field .free, while checking if the mcbsp is in use */ 377 /* Protect the field .free, while checking if the mcbsp is in use */
377 spinlock_t lock; 378 spinlock_t lock;
378 struct omap_mcbsp_platform_data *pdata; 379 struct omap_mcbsp_platform_data *pdata;
379 struct clk *clk; 380 struct clk **clks;
381 int num_clks;
380}; 382};
381extern struct omap_mcbsp **mcbsp_ptr; 383extern struct omap_mcbsp **mcbsp_ptr;
382extern int omap_mcbsp_count; 384extern int omap_mcbsp_count;
diff --git a/arch/arm/plat-omap/include/mach/mmc.h b/arch/arm/plat-omap/include/mach/mmc.h
index 031250f02805..73a9e15031b1 100644
--- a/arch/arm/plat-omap/include/mach/mmc.h
+++ b/arch/arm/plat-omap/include/mach/mmc.h
@@ -115,8 +115,9 @@ void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
115 int nr_controllers); 115 int nr_controllers);
116void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, 116void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
117 int nr_controllers); 117 int nr_controllers);
118int omap_mmc_add(int id, unsigned long base, unsigned long size, 118int omap_mmc_add(const char *name, int id, unsigned long base,
119 unsigned int irq, struct omap_mmc_platform_data *data); 119 unsigned long size, unsigned int irq,
120 struct omap_mmc_platform_data *data);
120#else 121#else
121static inline void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, 122static inline void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
122 int nr_controllers) 123 int nr_controllers)
@@ -126,8 +127,9 @@ static inline void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
126 int nr_controllers) 127 int nr_controllers)
127{ 128{
128} 129}
129static inline int omap_mmc_add(int id, unsigned long base, unsigned long size, 130static inline int omap_mmc_add(const char *name, int id, unsigned long base,
130 unsigned int irq, struct omap_mmc_platform_data *data) 131 unsigned long size, unsigned int irq,
132 struct omap_mmc_platform_data *data)
131{ 133{
132 return 0; 134 return 0;
133} 135}
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index f2401a831f99..e5842e30e534 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -214,6 +214,7 @@ EXPORT_SYMBOL(omap_mcbsp_set_io_type);
214int omap_mcbsp_request(unsigned int id) 214int omap_mcbsp_request(unsigned int id)
215{ 215{
216 struct omap_mcbsp *mcbsp; 216 struct omap_mcbsp *mcbsp;
217 int i;
217 int err; 218 int err;
218 219
219 if (!omap_mcbsp_check_valid_id(id)) { 220 if (!omap_mcbsp_check_valid_id(id)) {
@@ -225,7 +226,8 @@ int omap_mcbsp_request(unsigned int id)
225 if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->request) 226 if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->request)
226 mcbsp->pdata->ops->request(id); 227 mcbsp->pdata->ops->request(id);
227 228
228 clk_enable(mcbsp->clk); 229 for (i = 0; i < mcbsp->num_clks; i++)
230 clk_enable(mcbsp->clks[i]);
229 231
230 spin_lock(&mcbsp->lock); 232 spin_lock(&mcbsp->lock);
231 if (!mcbsp->free) { 233 if (!mcbsp->free) {
@@ -276,6 +278,7 @@ EXPORT_SYMBOL(omap_mcbsp_request);
276void omap_mcbsp_free(unsigned int id) 278void omap_mcbsp_free(unsigned int id)
277{ 279{
278 struct omap_mcbsp *mcbsp; 280 struct omap_mcbsp *mcbsp;
281 int i;
279 282
280 if (!omap_mcbsp_check_valid_id(id)) { 283 if (!omap_mcbsp_check_valid_id(id)) {
281 printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); 284 printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
@@ -286,7 +289,8 @@ void omap_mcbsp_free(unsigned int id)
286 if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free) 289 if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free)
287 mcbsp->pdata->ops->free(id); 290 mcbsp->pdata->ops->free(id);
288 291
289 clk_disable(mcbsp->clk); 292 for (i = mcbsp->num_clks - 1; i >= 0; i--)
293 clk_disable(mcbsp->clks[i]);
290 294
291 spin_lock(&mcbsp->lock); 295 spin_lock(&mcbsp->lock);
292 if (mcbsp->free) { 296 if (mcbsp->free) {
@@ -872,6 +876,7 @@ static int __devinit omap_mcbsp_probe(struct platform_device *pdev)
872 struct omap_mcbsp_platform_data *pdata = pdev->dev.platform_data; 876 struct omap_mcbsp_platform_data *pdata = pdev->dev.platform_data;
873 struct omap_mcbsp *mcbsp; 877 struct omap_mcbsp *mcbsp;
874 int id = pdev->id - 1; 878 int id = pdev->id - 1;
879 int i;
875 int ret = 0; 880 int ret = 0;
876 881
877 if (!pdata) { 882 if (!pdata) {
@@ -916,14 +921,25 @@ static int __devinit omap_mcbsp_probe(struct platform_device *pdev)
916 mcbsp->dma_rx_sync = pdata->dma_rx_sync; 921 mcbsp->dma_rx_sync = pdata->dma_rx_sync;
917 mcbsp->dma_tx_sync = pdata->dma_tx_sync; 922 mcbsp->dma_tx_sync = pdata->dma_tx_sync;
918 923
919 if (pdata->clk_name) 924 if (pdata->num_clks) {
920 mcbsp->clk = clk_get(&pdev->dev, pdata->clk_name); 925 mcbsp->num_clks = pdata->num_clks;
921 if (IS_ERR(mcbsp->clk)) { 926 mcbsp->clks = kzalloc(mcbsp->num_clks * sizeof(struct clk *),
922 dev_err(&pdev->dev, 927 GFP_KERNEL);
923 "Invalid clock configuration for McBSP%d.\n", 928 if (!mcbsp->clks) {
924 mcbsp->id); 929 ret = -ENOMEM;
925 ret = PTR_ERR(mcbsp->clk); 930 goto exit;
926 goto err_clk; 931 }
932 for (i = 0; i < mcbsp->num_clks; i++) {
933 mcbsp->clks[i] = clk_get(&pdev->dev, pdata->clk_names[i]);
934 if (IS_ERR(mcbsp->clks[i])) {
935 dev_err(&pdev->dev,
936 "Invalid %s configuration for McBSP%d.\n",
937 pdata->clk_names[i], mcbsp->id);
938 ret = PTR_ERR(mcbsp->clks[i]);
939 goto err_clk;
940 }
941 }
942
927 } 943 }
928 944
929 mcbsp->pdata = pdata; 945 mcbsp->pdata = pdata;
@@ -932,6 +948,9 @@ static int __devinit omap_mcbsp_probe(struct platform_device *pdev)
932 return 0; 948 return 0;
933 949
934err_clk: 950err_clk:
951 while (i--)
952 clk_put(mcbsp->clks[i]);
953 kfree(mcbsp->clks);
935 iounmap(mcbsp->io_base); 954 iounmap(mcbsp->io_base);
936err_ioremap: 955err_ioremap:
937 mcbsp->free = 0; 956 mcbsp->free = 0;
@@ -942,6 +961,7 @@ exit:
942static int __devexit omap_mcbsp_remove(struct platform_device *pdev) 961static int __devexit omap_mcbsp_remove(struct platform_device *pdev)
943{ 962{
944 struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); 963 struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev);
964 int i;
945 965
946 platform_set_drvdata(pdev, NULL); 966 platform_set_drvdata(pdev, NULL);
947 if (mcbsp) { 967 if (mcbsp) {
@@ -950,12 +970,18 @@ static int __devexit omap_mcbsp_remove(struct platform_device *pdev)
950 mcbsp->pdata->ops->free) 970 mcbsp->pdata->ops->free)
951 mcbsp->pdata->ops->free(mcbsp->id); 971 mcbsp->pdata->ops->free(mcbsp->id);
952 972
953 clk_disable(mcbsp->clk); 973 for (i = mcbsp->num_clks - 1; i >= 0; i--) {
954 clk_put(mcbsp->clk); 974 clk_disable(mcbsp->clks[i]);
975 clk_put(mcbsp->clks[i]);
976 }
955 977
956 iounmap(mcbsp->io_base); 978 iounmap(mcbsp->io_base);
957 979
958 mcbsp->clk = NULL; 980 if (mcbsp->num_clks) {
981 kfree(mcbsp->clks);
982 mcbsp->clks = NULL;
983 mcbsp->num_clks = 0;
984 }
959 mcbsp->free = 0; 985 mcbsp->free = 0;
960 mcbsp->dev = NULL; 986 mcbsp->dev = NULL;
961 } 987 }
diff --git a/arch/m68k/include/asm/cacheflush_no.h b/arch/m68k/include/asm/cacheflush_no.h
index 87e5dc0413b4..c65f00a94553 100644
--- a/arch/m68k/include/asm/cacheflush_no.h
+++ b/arch/m68k/include/asm/cacheflush_no.h
@@ -51,13 +51,20 @@ static inline void __flush_cache_all(void)
51 "movec %%d0,%%CACR\n\t" 51 "movec %%d0,%%CACR\n\t"
52 : : : "d0", "a0" ); 52 : : : "d0", "a0" );
53#endif /* CONFIG_M5407 */ 53#endif /* CONFIG_M5407 */
54#if defined(CONFIG_M527x) || defined(CONFIG_M528x) 54#if defined(CONFIG_M523x) || defined(CONFIG_M527x)
55 __asm__ __volatile__ (
56 "movel #0x81400100, %%d0\n\t"
57 "movec %%d0, %%CACR\n\t"
58 "nop\n\t"
59 : : : "d0" );
60#endif /* CONFIG_M523x || CONFIG_M527x */
61#if defined(CONFIG_M528x)
55 __asm__ __volatile__ ( 62 __asm__ __volatile__ (
56 "movel #0x81000200, %%d0\n\t" 63 "movel #0x81000200, %%d0\n\t"
57 "movec %%d0, %%CACR\n\t" 64 "movec %%d0, %%CACR\n\t"
58 "nop\n\t" 65 "nop\n\t"
59 : : : "d0" ); 66 : : : "d0" );
60#endif /* CONFIG_M527x || CONFIG_M528x */ 67#endif /* CONFIG_M528x */
61#if defined(CONFIG_M5206) || defined(CONFIG_M5206e) || defined(CONFIG_M5272) 68#if defined(CONFIG_M5206) || defined(CONFIG_M5206e) || defined(CONFIG_M5272)
62 __asm__ __volatile__ ( 69 __asm__ __volatile__ (
63 "movel #0x81000100, %%d0\n\t" 70 "movel #0x81000100, %%d0\n\t"
diff --git a/arch/m68k/include/asm/dma-mapping_no.h b/arch/m68k/include/asm/dma-mapping_no.h
index 6aeab18e58bd..1748f2bca940 100644
--- a/arch/m68k/include/asm/dma-mapping_no.h
+++ b/arch/m68k/include/asm/dma-mapping_no.h
@@ -1,10 +1,6 @@
1#ifndef _M68KNOMMU_DMA_MAPPING_H 1#ifndef _M68KNOMMU_DMA_MAPPING_H
2#define _M68KNOMMU_DMA_MAPPING_H 2#define _M68KNOMMU_DMA_MAPPING_H
3 3
4#ifdef CONFIG_PCI
5#include <asm-generic/dma-mapping.h>
6#else
7#include <asm-generic/dma-mapping-broken.h> 4#include <asm-generic/dma-mapping-broken.h>
8#endif
9 5
10#endif /* _M68KNOMMU_DMA_MAPPING_H */ 6#endif /* _M68KNOMMU_DMA_MAPPING_H */
diff --git a/arch/m68k/include/asm/system_no.h b/arch/m68k/include/asm/system_no.h
index 40f49de69821..4496c0aa8379 100644
--- a/arch/m68k/include/asm/system_no.h
+++ b/arch/m68k/include/asm/system_no.h
@@ -230,7 +230,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
230 jmp 0xf0000400; \ 230 jmp 0xf0000400; \
231 "); \ 231 "); \
232}) 232})
233#elif defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \ 233#elif defined(CONFIG_NETtel) || \
234 defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA) 234 defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA)
235#define HARD_RESET_NOW() ({ \ 235#define HARD_RESET_NOW() ({ \
236 asm(" \ 236 asm(" \
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 76b66feb74df..4beb59dfc6ec 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -14,6 +14,10 @@ config MMU
14 bool 14 bool
15 default n 15 default n
16 16
17config NO_DMA
18 bool
19 default y
20
17config FPU 21config FPU
18 bool 22 bool
19 default n 23 default n
@@ -398,12 +402,6 @@ config M5307C3
398 help 402 help
399 Support for the Motorola M5307C3 board. 403 Support for the Motorola M5307C3 board.
400 404
401config eLIA
402 bool "Moreton Bay eLIA board support"
403 depends on M5307
404 help
405 Support for the Moreton Bay eLIA board.
406
407config SECUREEDGEMP3 405config SECUREEDGEMP3
408 bool "SnapGear SecureEdge/MP3 platform support" 406 bool "SnapGear SecureEdge/MP3 platform support"
409 depends on M5307 407 depends on M5307
@@ -697,25 +695,8 @@ config ISA_DMA_API
697 depends on !M5272 695 depends on !M5272
698 default y 696 default y
699 697
700menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
701
702config PCI
703 bool "PCI support"
704 help
705 Support for PCI bus.
706
707config COMEMPCI
708 bool "CO-MEM lite PCI controller support"
709 depends on (M5307 || M5407)
710
711source "drivers/pci/Kconfig"
712
713source "drivers/pcmcia/Kconfig" 698source "drivers/pcmcia/Kconfig"
714 699
715source "drivers/pci/hotplug/Kconfig"
716
717endmenu
718
719menu "Executable file formats" 700menu "Executable file formats"
720 701
721source "fs/Kconfig.binfmt" 702source "fs/Kconfig.binfmt"
diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile
index b63bbcf874ff..fd0fb303d885 100644
--- a/arch/m68knommu/Makefile
+++ b/arch/m68knommu/Makefile
@@ -41,7 +41,6 @@ board-$(CONFIG_M5271EVB) := M5271EVB
41board-$(CONFIG_M5275EVB) := M5275EVB 41board-$(CONFIG_M5275EVB) := M5275EVB
42board-$(CONFIG_M5282EVB) := M5282EVB 42board-$(CONFIG_M5282EVB) := M5282EVB
43board-$(CONFIG_ELITE) := eLITE 43board-$(CONFIG_ELITE) := eLITE
44board-$(CONFIG_eLIA) := eLIA
45board-$(CONFIG_NETtel) := NETtel 44board-$(CONFIG_NETtel) := NETtel
46board-$(CONFIG_SECUREEDGEMP3) := MP3 45board-$(CONFIG_SECUREEDGEMP3) := MP3
47board-$(CONFIG_CLEOPATRA) := CLEOPATRA 46board-$(CONFIG_CLEOPATRA) := CLEOPATRA
diff --git a/arch/m68knommu/kernel/Makefile b/arch/m68knommu/kernel/Makefile
index f0eab3dedb5a..37c3fc074c0a 100644
--- a/arch/m68knommu/kernel/Makefile
+++ b/arch/m68knommu/kernel/Makefile
@@ -8,4 +8,3 @@ obj-y += dma.o entry.o init_task.o irq.o m68k_ksyms.o process.o ptrace.o \
8 setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o 8 setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o
9 9
10obj-$(CONFIG_MODULES) += module.o 10obj-$(CONFIG_MODULES) += module.o
11obj-$(CONFIG_COMEMPCI) += comempci.o
diff --git a/arch/m68knommu/kernel/comempci.c b/arch/m68knommu/kernel/comempci.c
deleted file mode 100644
index 0a68b5a85f86..000000000000
--- a/arch/m68knommu/kernel/comempci.c
+++ /dev/null
@@ -1,980 +0,0 @@
1/*****************************************************************************/
2
3/*
4 * comemlite.c -- PCI access code for embedded CO-MEM Lite PCI controller.
5 *
6 * (C) Copyright 1999-2003, Greg Ungerer (gerg@snapgear.com).
7 * (C) Copyright 2000, Lineo (www.lineo.com)
8 */
9
10/*****************************************************************************/
11
12#include <linux/kernel.h>
13#include <linux/types.h>
14#include <linux/pci.h>
15#include <linux/ptrace.h>
16#include <linux/spinlock.h>
17#include <linux/interrupt.h>
18#include <linux/sched.h>
19#include <asm/coldfire.h>
20#include <asm/mcfsim.h>
21#include <asm/irq.h>
22#include <asm/anchor.h>
23
24#ifdef CONFIG_eLIA
25#include <asm/elia.h>
26#endif
27
28/*****************************************************************************/
29
30/*
31 * Debug configuration defines. DEBUGRES sets debugging output for
32 * the resource allocation phase. DEBUGPCI traces on pcibios_ function
33 * calls, and DEBUGIO traces all accesses to devices on the PCI bus.
34 */
35/*#define DEBUGRES 1*/
36/*#define DEBUGPCI 1*/
37/*#define DEBUGIO 1*/
38
39/*****************************************************************************/
40
41/*
42 * PCI markers for bus present and active slots.
43 */
44int pci_bus_is_present = 0;
45unsigned long pci_slotmask = 0;
46
47/*
48 * We may or may not need to swap the bytes of PCI bus tranfers.
49 * The endianess is re-roder automatically by the CO-MEM, but it
50 * will get the wrong byte order for a pure data stream.
51 */
52#define pci_byteswap 0
53
54
55/*
56 * Resource tracking. The CO-MEM part creates a virtual address
57 * space that all the PCI devices live in - it is not in any way
58 * directly mapped into the ColdFire address space. So we can
59 * really assign any resources we like to devices, as long as
60 * they do not clash with other PCI devices.
61 */
62unsigned int pci_iobase = PCIBIOS_MIN_IO; /* Arbitrary start address */
63unsigned int pci_membase = PCIBIOS_MIN_MEM; /* Arbitrary start address */
64
65#define PCI_MINIO 0x100 /* 256 byte minimum I/O */
66#define PCI_MINMEM 0x00010000 /* 64k minimum chunk */
67
68/*
69 * The CO-MEM's shared memory segment is visible inside the PCI
70 * memory address space. We need to keep track of the address that
71 * this is mapped at, to setup the bus masters pointers.
72 */
73unsigned int pci_shmemaddr;
74
75/*****************************************************************************/
76
77void pci_interrupt(int irq, void *id, struct pt_regs *fp);
78
79/*****************************************************************************/
80
81/*
82 * Some platforms have custom ways of reseting the PCI bus.
83 */
84
85void pci_resetbus(void)
86{
87#ifdef CONFIG_eLIA
88 int i;
89
90#ifdef DEBUGPCI
91 printk(KERN_DEBUG "pci_resetbus()\n");
92#endif
93
94 *((volatile unsigned short *) (MCF_MBAR+MCFSIM_PADDR)) |= eLIA_PCIRESET;
95 for (i = 0; (i < 1000); i++) {
96 *((volatile unsigned short *) (MCF_MBAR + MCFSIM_PADAT)) =
97 (ppdata | eLIA_PCIRESET);
98 }
99
100
101 *((volatile unsigned short *) (MCF_MBAR + MCFSIM_PADAT)) = ppdata;
102#endif
103}
104
105/*****************************************************************************/
106
107int pcibios_assign_resource_slot(int slot)
108{
109 volatile unsigned long *rp;
110 volatile unsigned char *ip;
111 unsigned int idsel, addr, val, align, i;
112 int bar;
113
114#ifdef DEBUGPCI
115 printk(KERN_INFO "pcibios_assign_resource_slot(slot=%x)\n", slot);
116#endif
117
118 rp = (volatile unsigned long *) COMEM_BASE;
119 idsel = COMEM_DA_ADDR(0x1 << (slot + 16));
120
121 /* Try to assign resource to each BAR */
122 for (bar = 0; (bar < 6); bar++) {
123 addr = COMEM_PCIBUS + PCI_BASE_ADDRESS_0 + (bar * 4);
124 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_CFGRD | idsel;
125 val = rp[LREG(addr)];
126#ifdef DEBUGRES
127 printk(KERN_DEBUG "-----------------------------------"
128 "-------------------------------------\n");
129 printk(KERN_DEBUG "BAR[%d]: read=%08x ", bar, val);
130#endif
131
132 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_CFGWR | idsel;
133 rp[LREG(addr)] = 0xffffffff;
134
135 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_CFGRD | idsel;
136 val = rp[LREG(addr)];
137#ifdef DEBUGRES
138 printk(KERN_DEBUG "write=%08x ", val);
139#endif
140 if (val == 0) {
141#ifdef DEBUGRES
142 printk(KERN_DEBUG "\n");
143#endif
144 continue;
145 }
146
147 /* Determine space required by BAR */
148 /* FIXME: this should go backwords from 0x80000000... */
149 for (i = 0; (i < 32); i++) {
150 if ((0x1 << i) & (val & 0xfffffffc))
151 break;
152 }
153
154#ifdef DEBUGRES
155 printk(KERN_DEBUG "size=%08x(%d)\n", (0x1 << i), i);
156#endif
157 i = 0x1 << i;
158
159 /* Assign a resource */
160 if (val & PCI_BASE_ADDRESS_SPACE_IO) {
161 if (i < PCI_MINIO)
162 i = PCI_MINIO;
163#ifdef DEBUGRES
164 printk(KERN_DEBUG "BAR[%d]: IO size=%08x iobase=%08x\n",
165 bar, i, pci_iobase);
166#endif
167 if (i > 0xffff) {
168 /* Invalid size?? */
169 val = 0 | PCI_BASE_ADDRESS_SPACE_IO;
170#ifdef DEBUGRES
171 printk(KERN_DEBUG "BAR[%d]: too big for IO??\n", bar);
172#endif
173 } else {
174 /* Check for un-alignment */
175 if ((align = pci_iobase % i))
176 pci_iobase += (i - align);
177 val = pci_iobase | PCI_BASE_ADDRESS_SPACE_IO;
178 pci_iobase += i;
179 }
180 } else {
181 if (i < PCI_MINMEM)
182 i = PCI_MINMEM;
183#ifdef DEBUGRES
184 printk(KERN_DEBUG "BAR[%d]: MEMORY size=%08x membase=%08x\n",
185 bar, i, pci_membase);
186#endif
187 /* Check for un-alignment */
188 if ((align = pci_membase % i))
189 pci_membase += (i - align);
190 val = pci_membase | PCI_BASE_ADDRESS_SPACE_MEMORY;
191 pci_membase += i;
192 }
193
194 /* Write resource back into BAR register */
195 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_CFGWR | idsel;
196 rp[LREG(addr)] = val;
197#ifdef DEBUGRES
198 printk(KERN_DEBUG "BAR[%d]: assigned bar=%08x\n", bar, val);
199#endif
200 }
201
202#ifdef DEBUGRES
203 printk(KERN_DEBUG "-----------------------------------"
204 "-------------------------------------\n");
205#endif
206
207 /* Assign IRQ if one is wanted... */
208 ip = (volatile unsigned char *) (COMEM_BASE + COMEM_PCIBUS);
209 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_CFGRD | idsel;
210
211 addr = (PCI_INTERRUPT_PIN & 0xfc) + (~PCI_INTERRUPT_PIN & 0x03);
212 if (ip[addr]) {
213 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_CFGWR | idsel;
214 addr = (PCI_INTERRUPT_LINE & 0xfc)+(~PCI_INTERRUPT_LINE & 0x03);
215 ip[addr] = 25;
216#ifdef DEBUGRES
217 printk(KERN_DEBUG "IRQ LINE=25\n");
218#endif
219 }
220
221 return(0);
222}
223
224/*****************************************************************************/
225
226int pcibios_enable_slot(int slot)
227{
228 volatile unsigned long *rp;
229 volatile unsigned short *wp;
230 unsigned int idsel, addr;
231 unsigned short cmd;
232
233#ifdef DEBUGPCI
234 printk(KERN_DEBUG "pcibios_enbale_slot(slot=%x)\n", slot);
235#endif
236
237 rp = (volatile unsigned long *) COMEM_BASE;
238 wp = (volatile unsigned short *) COMEM_BASE;
239 idsel = COMEM_DA_ADDR(0x1 << (slot + 16));
240
241 /* Get current command settings */
242 addr = COMEM_PCIBUS + PCI_COMMAND;
243 addr = (addr & ~0x3) + (~addr & 0x02);
244 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_CFGRD | idsel;
245 cmd = wp[WREG(addr)];
246 /*val = ((val & 0xff) << 8) | ((val >> 8) & 0xff);*/
247
248 /* Enable I/O and memory accesses to this device */
249 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_CFGWR | idsel;
250 cmd |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
251 wp[WREG(addr)] = cmd;
252
253 return(0);
254}
255
256/*****************************************************************************/
257
258void pcibios_assign_resources(void)
259{
260 volatile unsigned long *rp;
261 unsigned long sel, id;
262 int slot;
263
264 rp = (volatile unsigned long *) COMEM_BASE;
265
266 /*
267 * Do a quick scan of the PCI bus and see what is here.
268 */
269 for (slot = COMEM_MINDEV; (slot <= COMEM_MAXDEV); slot++) {
270 sel = COMEM_DA_CFGRD | COMEM_DA_ADDR(0x1 << (slot + 16));
271 rp[LREG(COMEM_DAHBASE)] = sel;
272 rp[LREG(COMEM_PCIBUS)] = 0; /* Clear bus */
273 id = rp[LREG(COMEM_PCIBUS)];
274 if ((id != 0) && ((id & 0xffff0000) != (sel & 0xffff0000))) {
275 printk(KERN_INFO "PCI: slot=%d id=%08x\n", slot, (int) id);
276 pci_slotmask |= 0x1 << slot;
277 pcibios_assign_resource_slot(slot);
278 pcibios_enable_slot(slot);
279 }
280 }
281}
282
283/*****************************************************************************/
284
285int pcibios_init(void)
286{
287 volatile unsigned long *rp;
288 unsigned long sel, id;
289 int slot;
290
291#ifdef DEBUGPCI
292 printk(KERN_DEBUG "pcibios_init()\n");
293#endif
294
295 pci_resetbus();
296
297 /*
298 * Do some sort of basic check to see if the CO-MEM part
299 * is present... This works ok, but I think we really need
300 * something better...
301 */
302 rp = (volatile unsigned long *) COMEM_BASE;
303 if ((rp[LREG(COMEM_LBUSCFG)] & 0xff) != 0x50) {
304 printk(KERN_INFO "PCI: no PCI bus present\n");
305 return(0);
306 }
307
308#ifdef COMEM_BRIDGEDEV
309 /*
310 * Setup the PCI bridge device first. It needs resources too,
311 * so that bus masters can get to its shared memory.
312 */
313 slot = COMEM_BRIDGEDEV;
314 sel = COMEM_DA_CFGRD | COMEM_DA_ADDR(0x1 << (slot + 16));
315 rp[LREG(COMEM_DAHBASE)] = sel;
316 rp[LREG(COMEM_PCIBUS)] = 0; /* Clear bus */
317 id = rp[LREG(COMEM_PCIBUS)];
318 if ((id == 0) || ((id & 0xffff0000) == (sel & 0xffff0000))) {
319 printk(KERN_INFO "PCI: no PCI bus bridge present\n");
320 return(0);
321 }
322
323 printk(KERN_INFO "PCI: bridge device at slot=%d id=%08x\n", slot, (int) id);
324 pci_slotmask |= 0x1 << slot;
325 pci_shmemaddr = pci_membase;
326 pcibios_assign_resource_slot(slot);
327 pcibios_enable_slot(slot);
328#endif
329
330 pci_bus_is_present = 1;
331
332 /* Get PCI irq for local vectoring */
333 if (request_irq(COMEM_IRQ, pci_interrupt, 0, "PCI bridge", NULL)) {
334 printk(KERN_WARNING "PCI: failed to acquire interrupt %d\n", COMEM_IRQ);
335 } else {
336 mcf_autovector(COMEM_IRQ);
337 }
338
339 pcibios_assign_resources();
340
341 return(0);
342}
343
344/*****************************************************************************/
345
346char *pcibios_setup(char *option)
347{
348 /* Nothing for us to handle. */
349 return(option);
350}
351/*****************************************************************************/
352
353void pcibios_fixup_bus(struct pci_bus *b)
354{
355}
356
357/*****************************************************************************/
358
359void pcibios_align_resource(void *data, struct resource *res,
360 resource_size_t size, resource_size_t align)
361{
362}
363
364/*****************************************************************************/
365
366int pcibios_enable_device(struct pci_dev *dev, int mask)
367{
368 int slot;
369
370 slot = PCI_SLOT(dev->devfn);
371 if ((dev->bus == 0) && (pci_slotmask & (1 << slot)))
372 pcibios_enable_slot(slot);
373 return(0);
374}
375
376/*****************************************************************************/
377
378/*
379 * Local routines to interrcept the standard I/O and vector handling
380 * code. Don't include this 'till now - initialization code above needs
381 * access to the real code too.
382 */
383#include <asm/mcfpci.h>
384
385/*****************************************************************************/
386
387void pci_outb(unsigned char val, unsigned int addr)
388{
389 volatile unsigned long *rp;
390 volatile unsigned char *bp;
391
392#ifdef DEBUGIO
393 printk(KERN_DEBUG "pci_outb(val=%02x,addr=%x)\n", val, addr);
394#endif
395
396 rp = (volatile unsigned long *) COMEM_BASE;
397 bp = (volatile unsigned char *) COMEM_BASE;
398 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IOWR | COMEM_DA_ADDR(addr);
399 addr = (addr & ~0x3) + (~addr & 0x03);
400 bp[(COMEM_PCIBUS + COMEM_DA_OFFSET(addr))] = val;
401}
402
403/*****************************************************************************/
404
405void pci_outw(unsigned short val, unsigned int addr)
406{
407 volatile unsigned long *rp;
408 volatile unsigned short *sp;
409
410#ifdef DEBUGIO
411 printk(KERN_DEBUG "pci_outw(val=%04x,addr=%x)\n", val, addr);
412#endif
413
414 rp = (volatile unsigned long *) COMEM_BASE;
415 sp = (volatile unsigned short *) COMEM_BASE;
416 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IOWR | COMEM_DA_ADDR(addr);
417 addr = (addr & ~0x3) + (~addr & 0x02);
418 if (pci_byteswap)
419 val = ((val & 0xff) << 8) | ((val >> 8) & 0xff);
420 sp[WREG(COMEM_PCIBUS + COMEM_DA_OFFSET(addr))] = val;
421}
422
423/*****************************************************************************/
424
425void pci_outl(unsigned int val, unsigned int addr)
426{
427 volatile unsigned long *rp;
428 volatile unsigned int *lp;
429
430#ifdef DEBUGIO
431 printk(KERN_DEBUG "pci_outl(val=%08x,addr=%x)\n", val, addr);
432#endif
433
434 rp = (volatile unsigned long *) COMEM_BASE;
435 lp = (volatile unsigned int *) COMEM_BASE;
436 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IOWR | COMEM_DA_ADDR(addr);
437
438 if (pci_byteswap)
439 val = (val << 24) | ((val & 0x0000ff00) << 8) |
440 ((val & 0x00ff0000) >> 8) | (val >> 24);
441
442 lp[LREG(COMEM_PCIBUS + COMEM_DA_OFFSET(addr))] = val;
443}
444
445/*****************************************************************************/
446
447unsigned long pci_blmask[] = {
448 0x000000e0,
449 0x000000d0,
450 0x000000b0,
451 0x00000070
452};
453
454unsigned char pci_inb(unsigned int addr)
455{
456 volatile unsigned long *rp;
457 volatile unsigned char *bp;
458 unsigned long r;
459 unsigned char val;
460
461#ifdef DEBUGIO
462 printk(KERN_DEBUG "pci_inb(addr=%x)\n", addr);
463#endif
464
465 rp = (volatile unsigned long *) COMEM_BASE;
466 bp = (volatile unsigned char *) COMEM_BASE;
467
468 r = COMEM_DA_IORD | COMEM_DA_ADDR(addr) | pci_blmask[(addr & 0x3)];
469 rp[LREG(COMEM_DAHBASE)] = r;
470
471 addr = (addr & ~0x3) + (~addr & 0x3);
472 val = bp[(COMEM_PCIBUS + COMEM_DA_OFFSET(addr))];
473 return(val);
474}
475
476/*****************************************************************************/
477
478unsigned long pci_bwmask[] = {
479 0x000000c0,
480 0x000000c0,
481 0x00000030,
482 0x00000030
483};
484
485unsigned short pci_inw(unsigned int addr)
486{
487 volatile unsigned long *rp;
488 volatile unsigned short *sp;
489 unsigned long r;
490 unsigned short val;
491
492#ifdef DEBUGIO
493 printk(KERN_DEBUG "pci_inw(addr=%x)", addr);
494#endif
495
496 rp = (volatile unsigned long *) COMEM_BASE;
497 r = COMEM_DA_IORD | COMEM_DA_ADDR(addr) | pci_bwmask[(addr & 0x3)];
498 rp[LREG(COMEM_DAHBASE)] = r;
499
500 sp = (volatile unsigned short *) COMEM_BASE;
501 addr = (addr & ~0x3) + (~addr & 0x02);
502 val = sp[WREG(COMEM_PCIBUS + COMEM_DA_OFFSET(addr))];
503 if (pci_byteswap)
504 val = ((val & 0xff) << 8) | ((val >> 8) & 0xff);
505#ifdef DEBUGIO
506 printk(KERN_DEBUG "=%04x\n", val);
507#endif
508 return(val);
509}
510
511/*****************************************************************************/
512
513unsigned int pci_inl(unsigned int addr)
514{
515 volatile unsigned long *rp;
516 volatile unsigned int *lp;
517 unsigned int val;
518
519#ifdef DEBUGIO
520 printk(KERN_DEBUG "pci_inl(addr=%x)", addr);
521#endif
522
523 rp = (volatile unsigned long *) COMEM_BASE;
524 lp = (volatile unsigned int *) COMEM_BASE;
525 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IORD | COMEM_DA_ADDR(addr);
526 val = lp[LREG(COMEM_PCIBUS + COMEM_DA_OFFSET(addr))];
527
528 if (pci_byteswap)
529 val = (val << 24) | ((val & 0x0000ff00) << 8) |
530 ((val & 0x00ff0000) >> 8) | (val >> 24);
531
532#ifdef DEBUGIO
533 printk(KERN_DEBUG "=%08x\n", val);
534#endif
535 return(val);
536}
537
538/*****************************************************************************/
539
540void pci_outsb(void *addr, void *buf, int len)
541{
542 volatile unsigned long *rp;
543 volatile unsigned char *bp;
544 unsigned char *dp = (unsigned char *) buf;
545 unsigned int a = (unsigned int) addr;
546
547#ifdef DEBUGIO
548 printk(KERN_DEBUG "pci_outsb(addr=%x,buf=%x,len=%d)\n", (int)addr, (int)buf, len);
549#endif
550
551 rp = (volatile unsigned long *) COMEM_BASE;
552 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IOWR | COMEM_DA_ADDR(a);
553
554 a = (a & ~0x3) + (~a & 0x03);
555 bp = (volatile unsigned char *)
556 (COMEM_BASE + COMEM_PCIBUS + COMEM_DA_OFFSET(a));
557
558 while (len--)
559 *bp = *dp++;
560}
561
562/*****************************************************************************/
563
564void pci_outsw(void *addr, void *buf, int len)
565{
566 volatile unsigned long *rp;
567 volatile unsigned short *wp;
568 unsigned short w, *dp = (unsigned short *) buf;
569 unsigned int a = (unsigned int) addr;
570
571#ifdef DEBUGIO
572 printk(KERN_DEBUG "pci_outsw(addr=%x,buf=%x,len=%d)\n", (int)addr, (int)buf, len);
573#endif
574
575 rp = (volatile unsigned long *) COMEM_BASE;
576 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IOWR | COMEM_DA_ADDR(a);
577
578 a = (a & ~0x3) + (~a & 0x2);
579 wp = (volatile unsigned short *)
580 (COMEM_BASE + COMEM_PCIBUS + COMEM_DA_OFFSET(a));
581
582 while (len--) {
583 w = *dp++;
584 if (pci_byteswap)
585 w = ((w & 0xff) << 8) | ((w >> 8) & 0xff);
586 *wp = w;
587 }
588}
589
590/*****************************************************************************/
591
592void pci_outsl(void *addr, void *buf, int len)
593{
594 volatile unsigned long *rp;
595 volatile unsigned long *lp;
596 unsigned long l, *dp = (unsigned long *) buf;
597 unsigned int a = (unsigned int) addr;
598
599#ifdef DEBUGIO
600 printk(KERN_DEBUG "pci_outsl(addr=%x,buf=%x,len=%d)\n", (int)addr, (int)buf, len);
601#endif
602
603 rp = (volatile unsigned long *) COMEM_BASE;
604 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IOWR | COMEM_DA_ADDR(a);
605
606 lp = (volatile unsigned long *)
607 (COMEM_BASE + COMEM_PCIBUS + COMEM_DA_OFFSET(a));
608
609 while (len--) {
610 l = *dp++;
611 if (pci_byteswap)
612 l = (l << 24) | ((l & 0x0000ff00) << 8) |
613 ((l & 0x00ff0000) >> 8) | (l >> 24);
614 *lp = l;
615 }
616}
617
618/*****************************************************************************/
619
620void pci_insb(void *addr, void *buf, int len)
621{
622 volatile unsigned long *rp;
623 volatile unsigned char *bp;
624 unsigned char *dp = (unsigned char *) buf;
625 unsigned int a = (unsigned int) addr;
626
627#ifdef DEBUGIO
628 printk(KERN_DEBUG "pci_insb(addr=%x,buf=%x,len=%d)\n", (int)addr, (int)buf, len);
629#endif
630
631 rp = (volatile unsigned long *) COMEM_BASE;
632 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IORD | COMEM_DA_ADDR(a);
633
634 a = (a & ~0x3) + (~a & 0x03);
635 bp = (volatile unsigned char *)
636 (COMEM_BASE + COMEM_PCIBUS + COMEM_DA_OFFSET(a));
637
638 while (len--)
639 *dp++ = *bp;
640}
641
642/*****************************************************************************/
643
644void pci_insw(void *addr, void *buf, int len)
645{
646 volatile unsigned long *rp;
647 volatile unsigned short *wp;
648 unsigned short w, *dp = (unsigned short *) buf;
649 unsigned int a = (unsigned int) addr;
650
651#ifdef DEBUGIO
652 printk(KERN_DEBUG "pci_insw(addr=%x,buf=%x,len=%d)\n", (int)addr, (int)buf, len);
653#endif
654
655 rp = (volatile unsigned long *) COMEM_BASE;
656 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IORD | COMEM_DA_ADDR(a);
657
658 a = (a & ~0x3) + (~a & 0x2);
659 wp = (volatile unsigned short *)
660 (COMEM_BASE + COMEM_PCIBUS + COMEM_DA_OFFSET(a));
661
662 while (len--) {
663 w = *wp;
664 if (pci_byteswap)
665 w = ((w & 0xff) << 8) | ((w >> 8) & 0xff);
666 *dp++ = w;
667 }
668}
669
670/*****************************************************************************/
671
672void pci_insl(void *addr, void *buf, int len)
673{
674 volatile unsigned long *rp;
675 volatile unsigned long *lp;
676 unsigned long l, *dp = (unsigned long *) buf;
677 unsigned int a = (unsigned int) addr;
678
679#ifdef DEBUGIO
680 printk(KERN_DEBUG "pci_insl(addr=%x,buf=%x,len=%d)\n", (int)addr, (int)buf, len);
681#endif
682
683 rp = (volatile unsigned long *) COMEM_BASE;
684 rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IORD | COMEM_DA_ADDR(a);
685
686 lp = (volatile unsigned long *)
687 (COMEM_BASE + COMEM_PCIBUS + COMEM_DA_OFFSET(a));
688
689 while (len--) {
690 l = *lp;
691 if (pci_byteswap)
692 l = (l << 24) | ((l & 0x0000ff00) << 8) |
693 ((l & 0x00ff0000) >> 8) | (l >> 24);
694 *dp++ = l;
695 }
696}
697
698/*****************************************************************************/
699
700struct pci_localirqlist {
701 void (*handler)(int, void *, struct pt_regs *);
702 const char *device;
703 void *dev_id;
704};
705
706struct pci_localirqlist pci_irqlist[COMEM_MAXPCI];
707
708/*****************************************************************************/
709
710int pci_request_irq(unsigned int irq,
711 void (*handler)(int, void *, struct pt_regs *),
712 unsigned long flags, const char *device, void *dev_id)
713{
714 int i;
715
716#ifdef DEBUGIO
717 printk(KERN_DEBUG "pci_request_irq(irq=%d,handler=%x,flags=%x,device=%s,"
718 "dev_id=%x)\n", irq, (int) handler, (int) flags, device,
719 (int) dev_id);
720#endif
721
722 /* Check if this interrupt handler is already lodged */
723 for (i = 0; (i < COMEM_MAXPCI); i++) {
724 if (pci_irqlist[i].handler == handler)
725 return(0);
726 }
727
728 /* Find a free spot to put this handler */
729 for (i = 0; (i < COMEM_MAXPCI); i++) {
730 if (pci_irqlist[i].handler == 0) {
731 pci_irqlist[i].handler = handler;
732 pci_irqlist[i].device = device;
733 pci_irqlist[i].dev_id = dev_id;
734 return(0);
735 }
736 }
737
738 /* Couldn't fit?? */
739 return(1);
740}
741
742/*****************************************************************************/
743
744void pci_free_irq(unsigned int irq, void *dev_id)
745{
746 int i;
747
748#ifdef DEBUGIO
749 printk(KERN_DEBUG "pci_free_irq(irq=%d,dev_id=%x)\n", irq, (int) dev_id);
750#endif
751
752 if (dev_id == (void *) NULL)
753 return;
754
755 /* Check if this interrupt handler is lodged */
756 for (i = 0; (i < COMEM_MAXPCI); i++) {
757 if (pci_irqlist[i].dev_id == dev_id) {
758 pci_irqlist[i].handler = NULL;
759 pci_irqlist[i].device = NULL;
760 pci_irqlist[i].dev_id = NULL;
761 break;
762 }
763 }
764}
765
766/*****************************************************************************/
767
768void pci_interrupt(int irq, void *id, struct pt_regs *fp)
769{
770 int i;
771
772#ifdef DEBUGIO
773 printk(KERN_DEBUG "pci_interrupt(irq=%d,id=%x,fp=%x)\n", irq, (int) id, (int) fp);
774#endif
775
776 for (i = 0; (i < COMEM_MAXPCI); i++) {
777 if (pci_irqlist[i].handler)
778 (*pci_irqlist[i].handler)(irq,pci_irqlist[i].dev_id,fp);
779 }
780}
781
782/*****************************************************************************/
783
784/*
785 * The shared memory region is broken up into contiguous 512 byte
786 * regions for easy allocation... This is not an optimal solution
787 * but it makes allocation and freeing regions really easy.
788 */
789
790#define PCI_MEMSLOTSIZE 512
791#define PCI_MEMSLOTS (COMEM_SHMEMSIZE / PCI_MEMSLOTSIZE)
792
793char pci_shmemmap[PCI_MEMSLOTS];
794
795
796void *pci_bmalloc(int size)
797{
798 int i, j, nrslots;
799
800#ifdef DEBUGIO
801 printk(KERN_DEBUG "pci_bmalloc(size=%d)\n", size);
802#endif
803
804 if (size <= 0)
805 return((void *) NULL);
806
807 nrslots = (size - 1) / PCI_MEMSLOTSIZE;
808
809 for (i = 0; (i < (PCI_MEMSLOTS-nrslots)); i++) {
810 if (pci_shmemmap[i] == 0) {
811 for (j = i+1; (j < (i+nrslots)); j++) {
812 if (pci_shmemmap[j])
813 goto restart;
814 }
815
816 for (j = i; (j <= i+nrslots); j++)
817 pci_shmemmap[j] = 1;
818 break;
819 }
820restart:
821 }
822
823 return((void *) (COMEM_BASE + COMEM_SHMEM + (i * PCI_MEMSLOTSIZE)));
824}
825
826/*****************************************************************************/
827
828void pci_bmfree(void *mp, int size)
829{
830 int i, j, nrslots;
831
832#ifdef DEBUGIO
833 printk(KERN_DEBUG "pci_bmfree(mp=%x,size=%d)\n", (int) mp, size);
834#endif
835
836 nrslots = size / PCI_MEMSLOTSIZE;
837 i = (((unsigned long) mp) - (COMEM_BASE + COMEM_SHMEM)) /
838 PCI_MEMSLOTSIZE;
839
840 for (j = i; (j < (i+nrslots)); j++)
841 pci_shmemmap[j] = 0;
842}
843
844/*****************************************************************************/
845
846unsigned long pci_virt_to_bus(volatile void *address)
847{
848 unsigned long l;
849
850#ifdef DEBUGIO
851 printk(KERN_DEBUG "pci_virt_to_bus(address=%x)", (int) address);
852#endif
853
854 l = ((unsigned long) address) - COMEM_BASE;
855#ifdef DEBUGIO
856 printk(KERN_DEBUG "=%x\n", (int) (l+pci_shmemaddr));
857#endif
858 return(l + pci_shmemaddr);
859}
860
861/*****************************************************************************/
862
863void *pci_bus_to_virt(unsigned long address)
864{
865 unsigned long l;
866
867#ifdef DEBUGIO
868 printk(KERN_DEBUG "pci_bus_to_virt(address=%x)", (int) address);
869#endif
870
871 l = address - pci_shmemaddr;
872#ifdef DEBUGIO
873 printk(KERN_DEBUG "=%x\n", (int) (address + COMEM_BASE));
874#endif
875 return((void *) (address + COMEM_BASE));
876}
877
878/*****************************************************************************/
879
880void pci_bmcpyto(void *dst, void *src, int len)
881{
882 unsigned long *dp, *sp, val;
883 unsigned char *dcp, *scp;
884 int i, j;
885
886#ifdef DEBUGIO
887 printk(KERN_DEBUG "pci_bmcpyto(dst=%x,src=%x,len=%d)\n", (int)dst, (int)src, len);
888#endif
889
890 dp = (unsigned long *) dst;
891 sp = (unsigned long *) src;
892 i = len >> 2;
893
894#if 0
895 printk(KERN_INFO "DATA:");
896 scp = (unsigned char *) sp;
897 for (i = 0; (i < len); i++) {
898 if ((i % 16) == 0) printk(KERN_INFO "\n%04x: ", i);
899 printk(KERN_INFO "%02x ", *scp++);
900 }
901 printk(KERN_INFO "\n");
902#endif
903
904 for (j = 0; (i >= 0); i--, j++) {
905 val = *sp++;
906 val = (val << 24) | ((val & 0x0000ff00) << 8) |
907 ((val & 0x00ff0000) >> 8) | (val >> 24);
908 *dp++ = val;
909 }
910
911 if (len & 0x3) {
912 dcp = (unsigned char *) dp;
913 scp = ((unsigned char *) sp) + 3;
914 for (i = 0; (i < (len & 0x3)); i++)
915 *dcp++ = *scp--;
916 }
917}
918
919/*****************************************************************************/
920
921void pci_bmcpyfrom(void *dst, void *src, int len)
922{
923 unsigned long *dp, *sp, val;
924 unsigned char *dcp, *scp;
925 int i;
926
927#ifdef DEBUGIO
928 printk(KERN_DEBUG "pci_bmcpyfrom(dst=%x,src=%x,len=%d)\n",(int)dst,(int)src,len);
929#endif
930
931 dp = (unsigned long *) dst;
932 sp = (unsigned long *) src;
933 i = len >> 2;
934
935 for (; (i >= 0); i--) {
936 val = *sp++;
937 val = (val << 24) | ((val & 0x0000ff00) << 8) |
938 ((val & 0x00ff0000) >> 8) | (val >> 24);
939 *dp++ = val;
940 }
941
942 if (len & 0x3) {
943 dcp = ((unsigned char *) dp) + 3;
944 scp = (unsigned char *) sp;
945 for (i = 0; (i < (len & 0x3)); i++)
946 *dcp++ = *scp--;
947 }
948
949#if 0
950 printk(KERN_INFO "DATA:");
951 dcp = (unsigned char *) dst;
952 for (i = 0; (i < len); i++) {
953 if ((i % 16) == 0) printk(KERN_INFO "\n%04x: ", i);
954 printk(KERN_INFO "%02x ", *dcp++);
955 }
956 printk(KERN_INFO "\n");
957#endif
958}
959
960/*****************************************************************************/
961
962void *pci_alloc_consistent(struct pci_dev *dev, size_t size, dma_addr_t *dma_addr)
963{
964 void *mp;
965 if ((mp = pci_bmalloc(size)) != NULL) {
966 dma_addr = mp - (COMEM_BASE + COMEM_SHMEM);
967 return(mp);
968 }
969 *dma_addr = (dma_addr_t) NULL;
970 return(NULL);
971}
972
973/*****************************************************************************/
974
975void pci_free_consistent(struct pci_dev *dev, size_t size, void *cpu_addr, dma_addr_t dma_addr)
976{
977 pci_bmfree(cpu_addr, size);
978}
979
980/*****************************************************************************/
diff --git a/arch/m68knommu/kernel/signal.c b/arch/m68knommu/kernel/signal.c
index bbfcae9e52b4..5ab6a04af14e 100644
--- a/arch/m68knommu/kernel/signal.c
+++ b/arch/m68knommu/kernel/signal.c
@@ -279,6 +279,9 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext *usc, void *fp,
279 struct sigcontext context; 279 struct sigcontext context;
280 int err = 0; 280 int err = 0;
281 281
282 /* Always make any pending restarted system calls return -EINTR */
283 current_thread_info()->restart_block.fn = do_no_restart_syscall;
284
282 /* get previous context */ 285 /* get previous context */
283 if (copy_from_user(&context, usc, sizeof(context))) 286 if (copy_from_user(&context, usc, sizeof(context)))
284 goto badframe; 287 goto badframe;
@@ -316,6 +319,9 @@ rt_restore_ucontext(struct pt_regs *regs, struct switch_stack *sw,
316 unsigned long usp; 319 unsigned long usp;
317 int err; 320 int err;
318 321
322 /* Always make any pending restarted system calls return -EINTR */
323 current_thread_info()->restart_block.fn = do_no_restart_syscall;
324
319 err = __get_user(temp, &uc->uc_mcontext.version); 325 err = __get_user(temp, &uc->uc_mcontext.version);
320 if (temp != MCONTEXT_VERSION) 326 if (temp != MCONTEXT_VERSION)
321 goto badframe; 327 goto badframe;
@@ -692,6 +698,15 @@ handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler)
692 regs->d0 = -EINTR; 698 regs->d0 = -EINTR;
693 break; 699 break;
694 700
701 case -ERESTART_RESTARTBLOCK:
702 if (!has_handler) {
703 regs->d0 = __NR_restart_syscall;
704 regs->pc -= 2;
705 break;
706 }
707 regs->d0 = -EINTR;
708 break;
709
695 case -ERESTARTSYS: 710 case -ERESTARTSYS:
696 if (has_handler && !(ka->sa.sa_flags & SA_RESTART)) { 711 if (has_handler && !(ka->sa.sa_flags & SA_RESTART)) {
697 regs->d0 = -EINTR; 712 regs->d0 = -EINTR;
diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S
index 5c3e3f62194a..1017e76f3711 100644
--- a/arch/m68knommu/kernel/syscalltable.S
+++ b/arch/m68knommu/kernel/syscalltable.S
@@ -18,7 +18,7 @@
18.text 18.text
19ALIGN 19ALIGN
20ENTRY(sys_call_table) 20ENTRY(sys_call_table)
21 .long sys_ni_syscall /* 0 - old "setup()" system call*/ 21 .long sys_restart_syscall /* 0 - old "setup()" system call */
22 .long sys_exit 22 .long sys_exit
23 .long sys_fork 23 .long sys_fork
24 .long sys_read 24 .long sys_read
diff --git a/arch/m68knommu/platform/5307/config.c b/arch/m68knommu/platform/5307/config.c
index 11cff6625dcc..724faf05852a 100644
--- a/arch/m68knommu/platform/5307/config.c
+++ b/arch/m68knommu/platform/5307/config.c
@@ -123,7 +123,7 @@ void __init config_BSP(char *commandp, int size)
123{ 123{
124 mcf_setimr(MCFSIM_IMR_MASKALL); 124 mcf_setimr(MCFSIM_IMR_MASKALL);
125 125
126#if defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \ 126#if defined(CONFIG_NETtel) || \
127 defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA) 127 defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA)
128 /* Copy command line from FLASH to local buffer... */ 128 /* Copy command line from FLASH to local buffer... */
129 memcpy(commandp, (char *) 0xf0004000, size); 129 memcpy(commandp, (char *) 0xf0004000, size);
diff --git a/arch/m68knommu/platform/532x/config.c b/arch/m68knommu/platform/532x/config.c
index 4f44b632045b..a347623d6ee6 100644
--- a/arch/m68knommu/platform/532x/config.c
+++ b/arch/m68knommu/platform/532x/config.c
@@ -41,15 +41,15 @@ extern unsigned int mcf_timerlevel;
41 41
42static struct mcf_platform_uart m532x_uart_platform[] = { 42static struct mcf_platform_uart m532x_uart_platform[] = {
43 { 43 {
44 .mapbase = MCF_MBAR + MCFUART_BASE1, 44 .mapbase = MCFUART_BASE1,
45 .irq = MCFINT_VECBASE + MCFINT_UART0, 45 .irq = MCFINT_VECBASE + MCFINT_UART0,
46 }, 46 },
47 { 47 {
48 .mapbase = MCF_MBAR + MCFUART_BASE2, 48 .mapbase = MCFUART_BASE2,
49 .irq = MCFINT_VECBASE + MCFINT_UART1, 49 .irq = MCFINT_VECBASE + MCFINT_UART1,
50 }, 50 },
51 { 51 {
52 .mapbase = MCF_MBAR + MCFUART_BASE3, 52 .mapbase = MCFUART_BASE3,
53 .irq = MCFINT_VECBASE + MCFINT_UART2, 53 .irq = MCFINT_VECBASE + MCFINT_UART2,
54 }, 54 },
55 { }, 55 { },
@@ -108,7 +108,7 @@ void mcf_settimericr(unsigned int timer, unsigned int level)
108 default: irq = 32; icr = MCFSIM_ICR_TIMER1; break; 108 default: irq = 32; icr = MCFSIM_ICR_TIMER1; break;
109 } 109 }
110 110
111 icrp = (volatile unsigned char *) (MCF_MBAR + icr); 111 icrp = (volatile unsigned char *) (icr);
112 *icrp = level; 112 *icrp = level;
113 mcf_enable_irq0(irq); 113 mcf_enable_irq0(irq);
114 } 114 }
diff --git a/arch/m68knommu/platform/coldfire/entry.S b/arch/m68knommu/platform/coldfire/entry.S
index 1e3c0dcbd7ac..3b471c0da24a 100644
--- a/arch/m68knommu/platform/coldfire/entry.S
+++ b/arch/m68knommu/platform/coldfire/entry.S
@@ -215,19 +215,8 @@ ENTRY(fasthandler)
215 RESTORE_LOCAL 215 RESTORE_LOCAL
216 216
217ENTRY(ret_from_interrupt) 217ENTRY(ret_from_interrupt)
218 moveb %sp@(PT_SR),%d0 218 /* the fasthandler is confusing me, haven't seen any user */
219 andl #0x7,%d0 219 jmp ret_from_exception
220 jeq 1f
221
222 RESTORE_ALL
223
2241:
225 /* check if we need to do software interrupts */
226 movel irq_stat+CPUSTAT_SOFTIRQ_PENDING,%d0
227 jeq ret_from_exception
228
229 pea ret_from_exception
230 jmp do_softirq
231 220
232/* 221/*
233 * Beware - when entering resume, prev (the current task) is 222 * Beware - when entering resume, prev (the current task) is
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index e39b73bc0ff8..74cc312c347c 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -876,10 +876,6 @@ source "drivers/Kconfig"
876 876
877source "fs/Kconfig" 877source "fs/Kconfig"
878 878
879# XXX source "arch/ppc/8xx_io/Kconfig"
880
881# XXX source "arch/ppc/8260_io/Kconfig"
882
883source "arch/powerpc/sysdev/qe_lib/Kconfig" 879source "arch/powerpc/sysdev/qe_lib/Kconfig"
884 880
885source "lib/Kconfig" 881source "lib/Kconfig"
diff --git a/arch/powerpc/boot/cuboot-warp.c b/arch/powerpc/boot/cuboot-warp.c
index 21780210057d..806df693fea6 100644
--- a/arch/powerpc/boot/cuboot-warp.c
+++ b/arch/powerpc/boot/cuboot-warp.c
@@ -18,57 +18,14 @@
18 18
19static bd_t bd; 19static bd_t bd;
20 20
21static void warp_fixup_one_nor(u32 from, u32 to)
22{
23 void *devp;
24 char name[50];
25 u32 v[2];
26
27 sprintf(name, "/plb/opb/ebc/nor_flash@0,0/partition@%x", from);
28
29 devp = finddevice(name);
30 if (!devp)
31 return;
32
33 if (getprop(devp, "reg", v, sizeof(v)) == sizeof(v)) {
34 v[0] = to;
35 setprop(devp, "reg", v, sizeof(v));
36
37 printf("NOR 64M fixup %x -> %x\r\n", from, to);
38 }
39}
40
41
42static void warp_fixups(void) 21static void warp_fixups(void)
43{ 22{
44 ibm440ep_fixup_clocks(66000000, 11059200, 50000000); 23 ibm440ep_fixup_clocks(66000000, 11059200, 50000000);
45 ibm4xx_sdram_fixup_memsize(); 24 ibm4xx_sdram_fixup_memsize();
46 ibm4xx_fixup_ebc_ranges("/plb/opb/ebc"); 25 ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
47 dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr); 26 dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
48
49 /* Fixup for 64M flash on Rev A boards. */
50 if (bd.bi_flashsize == 0x4000000) {
51 void *devp;
52 u32 v[3];
53
54 devp = finddevice("/plb/opb/ebc/nor_flash@0,0");
55 if (!devp)
56 return;
57
58 /* Fixup the size */
59 if (getprop(devp, "reg", v, sizeof(v)) == sizeof(v)) {
60 v[2] = bd.bi_flashsize;
61 setprop(devp, "reg", v, sizeof(v));
62 }
63
64 /* Fixup parition offsets */
65 warp_fixup_one_nor(0x300000, 0x3f00000);
66 warp_fixup_one_nor(0x340000, 0x3f40000);
67 warp_fixup_one_nor(0x380000, 0x3f80000);
68 }
69} 27}
70 28
71
72void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, 29void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
73 unsigned long r6, unsigned long r7) 30 unsigned long r6, unsigned long r7)
74{ 31{
diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts
index 513bc43a71af..5b2a4947bf82 100644
--- a/arch/powerpc/boot/dts/haleakala.dts
+++ b/arch/powerpc/boot/dts/haleakala.dts
@@ -89,8 +89,11 @@
89 clock-frequency = <0>; /* Filled in by U-Boot */ 89 clock-frequency = <0>; /* Filled in by U-Boot */
90 90
91 SDRAM0: memory-controller { 91 SDRAM0: memory-controller {
92 compatible = "ibm,sdram-405exr"; 92 compatible = "ibm,sdram-405exr", "ibm,sdram-4xx-ddr2";
93 dcr-reg = <0x010 0x002>; 93 dcr-reg = <0x010 0x002>;
94 interrupt-parent = <&UIC2>;
95 interrupts = <0x5 0x4 /* ECC DED Error */
96 0x6 0x4>; /* ECC SEC Error */
94 }; 97 };
95 98
96 MAL0: mcmal { 99 MAL0: mcmal {
diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts
index dececc4b5ff2..2804444812e5 100644
--- a/arch/powerpc/boot/dts/kilauea.dts
+++ b/arch/powerpc/boot/dts/kilauea.dts
@@ -90,8 +90,11 @@
90 clock-frequency = <0>; /* Filled in by U-Boot */ 90 clock-frequency = <0>; /* Filled in by U-Boot */
91 91
92 SDRAM0: memory-controller { 92 SDRAM0: memory-controller {
93 compatible = "ibm,sdram-405ex"; 93 compatible = "ibm,sdram-405ex", "ibm,sdram-4xx-ddr2";
94 dcr-reg = <0x010 0x002>; 94 dcr-reg = <0x010 0x002>;
95 interrupt-parent = <&UIC2>;
96 interrupts = <0x5 0x4 /* ECC DED Error */
97 0x6 0x4>; /* ECC SEC Error */
95 }; 98 };
96 99
97 MAL0: mcmal { 100 MAL0: mcmal {
diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts
index 945508c7e7d8..ffc246e72670 100644
--- a/arch/powerpc/boot/dts/makalu.dts
+++ b/arch/powerpc/boot/dts/makalu.dts
@@ -90,8 +90,11 @@
90 clock-frequency = <0>; /* Filled in by U-Boot */ 90 clock-frequency = <0>; /* Filled in by U-Boot */
91 91
92 SDRAM0: memory-controller { 92 SDRAM0: memory-controller {
93 compatible = "ibm,sdram-405ex"; 93 compatible = "ibm,sdram-405ex", "ibm,sdram-4xx-ddr2";
94 dcr-reg = <0x010 0x002>; 94 dcr-reg = <0x010 0x002>;
95 interrupt-parent = <&UIC2>;
96 interrupts = <0x5 0x4 /* ECC DED Error */
97 0x6 0x4 /* ECC SEC Error */ >;
95 }; 98 };
96 99
97 MAL0: mcmal { 100 MAL0: mcmal {
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index d4df8b6857a4..909a89cab9ac 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -185,7 +185,7 @@
185 cell-index = <0>; 185 cell-index = <0>;
186 device_type = "network"; 186 device_type = "network";
187 model = "eTSEC"; 187 model = "eTSEC";
188 compatible = "gianfar", "simple-bus"; 188 compatible = "gianfar";
189 reg = <0x24000 0x1000>; 189 reg = <0x24000 0x1000>;
190 local-mac-address = [ 00 00 00 00 00 00 ]; 190 local-mac-address = [ 00 00 00 00 00 00 ];
191 interrupts = <37 0x8 36 0x8 35 0x8>; 191 interrupts = <37 0x8 36 0x8 35 0x8>;
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts
index 3dcc001b8ed3..359c3b727420 100644
--- a/arch/powerpc/boot/dts/mpc8572ds.dts
+++ b/arch/powerpc/boot/dts/mpc8572ds.dts
@@ -89,7 +89,7 @@
89 89
90 ramdisk@0 { 90 ramdisk@0 {
91 reg = <0x0 0x03000000>; 91 reg = <0x0 0x03000000>;
92 readl-only; 92 read-only;
93 }; 93 };
94 94
95 diagnostic@3000000 { 95 diagnostic@3000000 {
diff --git a/arch/powerpc/boot/dts/warp.dts b/arch/powerpc/boot/dts/warp.dts
index f4e4ba69eef7..7e183ff9a317 100644
--- a/arch/powerpc/boot/dts/warp.dts
+++ b/arch/powerpc/boot/dts/warp.dts
@@ -149,12 +149,17 @@
149 reg = <0x00000002 0x00004000 0x00000A00>; 149 reg = <0x00000002 0x00004000 0x00000A00>;
150 }; 150 };
151 151
152 nor_flash@0,0 { 152 nor@0,0 {
153 compatible = "amd,s29gl032a", "cfi-flash"; 153 compatible = "amd,s29gl032a", "cfi-flash";
154 bank-width = <2>; 154 bank-width = <2>;
155 reg = <0x00000000 0x00000000 0x00400000>; 155 reg = <0x00000000 0x00000000 0x00400000>;
156 #address-cells = <1>; 156 #address-cells = <1>;
157 #size-cells = <1>; 157 #size-cells = <1>;
158
159 partition@0 {
160 label = "splash";
161 reg = <0x00000000 0x00020000>;
162 };
158 partition@300000 { 163 partition@300000 {
159 label = "fpga"; 164 label = "fpga";
160 reg = <0x0300000 0x00040000>; 165 reg = <0x0300000 0x00040000>;
@@ -168,6 +173,41 @@
168 reg = <0x0380000 0x00080000>; 173 reg = <0x0380000 0x00080000>;
169 }; 174 };
170 }; 175 };
176
177 ndfc@1,0 {
178 compatible = "ibm,ndfc";
179 reg = <0x00000001 0x00000000 0x00002000>;
180 ccr = <0x00001000>;
181 bank-settings = <0x80002222>;
182 #address-cells = <1>;
183 #size-cells = <1>;
184
185 nand {
186 #address-cells = <1>;
187 #size-cells = <1>;
188
189 partition@0 {
190 label = "kernel";
191 reg = <0x00000000 0x00200000>;
192 };
193 partition@200000 {
194 label = "root";
195 reg = <0x00200000 0x03E00000>;
196 };
197 partition@40000000 {
198 label = "persistent";
199 reg = <0x04000000 0x04000000>;
200 };
201 partition@80000000 {
202 label = "persistent1";
203 reg = <0x08000000 0x04000000>;
204 };
205 partition@C0000000 {
206 label = "persistent2";
207 reg = <0x0C000000 0x04000000>;
208 };
209 };
210 };
171 }; 211 };
172 212
173 UART0: serial@ef600300 { 213 UART0: serial@ef600300 {
diff --git a/arch/powerpc/configs/40x/acadia_defconfig b/arch/powerpc/configs/40x/acadia_defconfig
index 25572cc837ca..a32ec8d323a0 100644
--- a/arch/powerpc/configs/40x/acadia_defconfig
+++ b/arch/powerpc/configs/40x/acadia_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.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 08:49:18 2008 4# Tue Jan 20 08:17:46 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_40x=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_4xx=y 17CONFIG_4xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -71,12 +72,12 @@ CONFIG_POSIX_MQUEUE=y
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75CONFIG_GROUP_SCHED=y 75CONFIG_GROUP_SCHED=y
76# CONFIG_FAIR_GROUP_SCHED is not set 76# CONFIG_FAIR_GROUP_SCHED is not set
77# CONFIG_RT_GROUP_SCHED is not set 77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y 78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set 79# CONFIG_CGROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -89,6 +90,7 @@ CONFIG_EMBEDDED=y
89CONFIG_SYSCTL_SYSCALL=y 90CONFIG_SYSCTL_SYSCALL=y
90CONFIG_KALLSYMS=y 91CONFIG_KALLSYMS=y
91CONFIG_KALLSYMS_ALL=y 92CONFIG_KALLSYMS_ALL=y
93CONFIG_KALLSYMS_STRIP_GENERATED=y
92CONFIG_KALLSYMS_EXTRA_PASS=y 94CONFIG_KALLSYMS_EXTRA_PASS=y
93CONFIG_HOTPLUG=y 95CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y 96CONFIG_PRINTK=y
@@ -111,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 113CONFIG_SLUB=y
112# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -122,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 127CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 133CONFIG_BLOCK=y
135CONFIG_LBD=y 134CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
140 138
@@ -151,6 +149,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
155# CONFIG_PPC4xx_PCI_EXPRESS is not set 157# CONFIG_PPC4xx_PCI_EXPRESS is not set
156 158
@@ -182,6 +184,7 @@ CONFIG_405EZ=y
182# CONFIG_GENERIC_IOMAP is not set 184# CONFIG_GENERIC_IOMAP is not set
183# CONFIG_CPU_FREQ is not set 185# CONFIG_CPU_FREQ is not set
184# CONFIG_FSL_ULI1575 is not set 186# CONFIG_FSL_ULI1575 is not set
187# CONFIG_SIMPLE_GPIO is not set
185 188
186# 189#
187# Kernel options 190# Kernel options
@@ -205,6 +208,7 @@ CONFIG_BINFMT_ELF=y
205# CONFIG_BINFMT_MISC is not set 208# CONFIG_BINFMT_MISC is not set
206# CONFIG_MATH_EMULATION is not set 209# CONFIG_MATH_EMULATION is not set
207# CONFIG_IOMMU_HELPER is not set 210# CONFIG_IOMMU_HELPER is not set
211CONFIG_PPC_NEED_DMA_SYNC_OPS=y
208CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 212CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
209CONFIG_ARCH_HAS_WALK_MEMORY=y 213CONFIG_ARCH_HAS_WALK_MEMORY=y
210CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 214CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -219,12 +223,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
219CONFIG_PAGEFLAGS_EXTENDED=y 223CONFIG_PAGEFLAGS_EXTENDED=y
220CONFIG_SPLIT_PTLOCK_CPUS=4 224CONFIG_SPLIT_PTLOCK_CPUS=4
221CONFIG_MIGRATION=y 225CONFIG_MIGRATION=y
222# CONFIG_RESOURCES_64BIT is not set
223# CONFIG_PHYS_ADDR_T_64BIT is not set 226# CONFIG_PHYS_ADDR_T_64BIT is not set
224CONFIG_ZONE_DMA_FLAG=1 227CONFIG_ZONE_DMA_FLAG=1
225CONFIG_BOUNCE=y 228CONFIG_BOUNCE=y
226CONFIG_VIRT_TO_BUS=y 229CONFIG_VIRT_TO_BUS=y
227CONFIG_UNEVICTABLE_LRU=y 230CONFIG_UNEVICTABLE_LRU=y
231CONFIG_PPC_4K_PAGES=y
232# CONFIG_PPC_16K_PAGES is not set
233# CONFIG_PPC_64K_PAGES is not set
228CONFIG_FORCE_MAX_ZONEORDER=11 234CONFIG_FORCE_MAX_ZONEORDER=11
229CONFIG_PROC_DEVICETREE=y 235CONFIG_PROC_DEVICETREE=y
230# CONFIG_CMDLINE_BOOL is not set 236# CONFIG_CMDLINE_BOOL is not set
@@ -248,6 +254,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
248# CONFIG_PCI_MSI is not set 254# CONFIG_PCI_MSI is not set
249CONFIG_PCI_LEGACY=y 255CONFIG_PCI_LEGACY=y
250# CONFIG_PCI_DEBUG is not set 256# CONFIG_PCI_DEBUG is not set
257# CONFIG_PCI_STUB is not set
251# CONFIG_PCCARD is not set 258# CONFIG_PCCARD is not set
252# CONFIG_HOTPLUG_PCI is not set 259# CONFIG_HOTPLUG_PCI is not set
253# CONFIG_HAS_RAPIDIO is not set 260# CONFIG_HAS_RAPIDIO is not set
@@ -272,6 +279,7 @@ CONFIG_NET=y
272# 279#
273# Networking options 280# Networking options
274# 281#
282CONFIG_COMPAT_NET_DEV_OPS=y
275CONFIG_PACKET=y 283CONFIG_PACKET=y
276# CONFIG_PACKET_MMAP is not set 284# CONFIG_PACKET_MMAP is not set
277CONFIG_UNIX=y 285CONFIG_UNIX=y
@@ -322,6 +330,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
322# CONFIG_ECONET is not set 330# CONFIG_ECONET is not set
323# CONFIG_WAN_ROUTER is not set 331# CONFIG_WAN_ROUTER is not set
324# CONFIG_NET_SCHED is not set 332# CONFIG_NET_SCHED is not set
333# CONFIG_DCB is not set
325 334
326# 335#
327# Network testing 336# Network testing
@@ -334,6 +343,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
334# CONFIG_AF_RXRPC is not set 343# CONFIG_AF_RXRPC is not set
335# CONFIG_PHONET is not set 344# CONFIG_PHONET is not set
336# CONFIG_WIRELESS is not set 345# CONFIG_WIRELESS is not set
346# CONFIG_WIMAX is not set
337# CONFIG_RFKILL is not set 347# CONFIG_RFKILL is not set
338# CONFIG_NET_9P is not set 348# CONFIG_NET_9P is not set
339 349
@@ -359,6 +369,7 @@ CONFIG_MTD=y
359# CONFIG_MTD_DEBUG is not set 369# CONFIG_MTD_DEBUG is not set
360# CONFIG_MTD_CONCAT is not set 370# CONFIG_MTD_CONCAT is not set
361CONFIG_MTD_PARTITIONS=y 371CONFIG_MTD_PARTITIONS=y
372# CONFIG_MTD_TESTS is not set
362# CONFIG_MTD_REDBOOT_PARTS is not set 373# CONFIG_MTD_REDBOOT_PARTS is not set
363CONFIG_MTD_CMDLINE_PARTS=y 374CONFIG_MTD_CMDLINE_PARTS=y
364CONFIG_MTD_OF_PARTS=y 375CONFIG_MTD_OF_PARTS=y
@@ -431,6 +442,12 @@ CONFIG_MTD_PHYSMAP_OF=y
431# CONFIG_MTD_ONENAND is not set 442# CONFIG_MTD_ONENAND is not set
432 443
433# 444#
445# LPDDR flash memory drivers
446#
447# CONFIG_MTD_LPDDR is not set
448# CONFIG_MTD_QINFO_PROBE is not set
449
450#
434# UBI - Unsorted block images 451# UBI - Unsorted block images
435# 452#
436# CONFIG_MTD_UBI is not set 453# CONFIG_MTD_UBI is not set
@@ -524,6 +541,10 @@ CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR=y
524# CONFIG_WLAN_PRE80211 is not set 541# CONFIG_WLAN_PRE80211 is not set
525# CONFIG_WLAN_80211 is not set 542# CONFIG_WLAN_80211 is not set
526# CONFIG_IWLWIFI_LEDS is not set 543# CONFIG_IWLWIFI_LEDS is not set
544
545#
546# Enable WiMAX (Networking options) to see the WiMAX drivers
547#
527# CONFIG_WAN is not set 548# CONFIG_WAN is not set
528# CONFIG_FDDI is not set 549# CONFIG_FDDI is not set
529# CONFIG_HIPPI is not set 550# CONFIG_HIPPI is not set
@@ -576,9 +597,12 @@ CONFIG_SERIAL_CORE=y
576CONFIG_SERIAL_CORE_CONSOLE=y 597CONFIG_SERIAL_CORE_CONSOLE=y
577# CONFIG_SERIAL_JSM is not set 598# CONFIG_SERIAL_JSM is not set
578CONFIG_SERIAL_OF_PLATFORM=y 599CONFIG_SERIAL_OF_PLATFORM=y
600# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
579CONFIG_UNIX98_PTYS=y 601CONFIG_UNIX98_PTYS=y
602# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
580CONFIG_LEGACY_PTYS=y 603CONFIG_LEGACY_PTYS=y
581CONFIG_LEGACY_PTY_COUNT=256 604CONFIG_LEGACY_PTY_COUNT=256
605# CONFIG_HVC_UDBG is not set
582# CONFIG_IPMI_HANDLER is not set 606# CONFIG_IPMI_HANDLER is not set
583# CONFIG_HW_RANDOM is not set 607# CONFIG_HW_RANDOM is not set
584# CONFIG_NVRAM is not set 608# CONFIG_NVRAM is not set
@@ -597,11 +621,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
597# CONFIG_HWMON is not set 621# CONFIG_HWMON is not set
598CONFIG_THERMAL=y 622CONFIG_THERMAL=y
599# CONFIG_WATCHDOG is not set 623# CONFIG_WATCHDOG is not set
624CONFIG_SSB_POSSIBLE=y
600 625
601# 626#
602# Sonics Silicon Backplane 627# Sonics Silicon Backplane
603# 628#
604CONFIG_SSB_POSSIBLE=y
605# CONFIG_SSB is not set 629# CONFIG_SSB is not set
606 630
607# 631#
@@ -611,7 +635,7 @@ CONFIG_SSB_POSSIBLE=y
611# CONFIG_MFD_SM501 is not set 635# CONFIG_MFD_SM501 is not set
612# CONFIG_HTC_PASIC3 is not set 636# CONFIG_HTC_PASIC3 is not set
613# CONFIG_MFD_TMIO is not set 637# CONFIG_MFD_TMIO is not set
614# CONFIG_MFD_WM8400 is not set 638# CONFIG_REGULATOR is not set
615 639
616# 640#
617# Multimedia devices 641# Multimedia devices
@@ -670,7 +694,9 @@ CONFIG_EXT2_FS=y
670# CONFIG_FS_POSIX_ACL is not set 694# CONFIG_FS_POSIX_ACL is not set
671CONFIG_FILE_LOCKING=y 695CONFIG_FILE_LOCKING=y
672# CONFIG_XFS_FS is not set 696# CONFIG_XFS_FS is not set
697# CONFIG_GFS2_FS is not set
673# CONFIG_OCFS2_FS is not set 698# CONFIG_OCFS2_FS is not set
699# CONFIG_BTRFS_FS is not set
674CONFIG_DNOTIFY=y 700CONFIG_DNOTIFY=y
675CONFIG_INOTIFY=y 701CONFIG_INOTIFY=y
676CONFIG_INOTIFY_USER=y 702CONFIG_INOTIFY_USER=y
@@ -704,10 +730,7 @@ CONFIG_TMPFS=y
704# CONFIG_TMPFS_POSIX_ACL is not set 730# CONFIG_TMPFS_POSIX_ACL is not set
705# CONFIG_HUGETLB_PAGE is not set 731# CONFIG_HUGETLB_PAGE is not set
706# CONFIG_CONFIGFS_FS is not set 732# CONFIG_CONFIGFS_FS is not set
707 733CONFIG_MISC_FILESYSTEMS=y
708#
709# Miscellaneous filesystems
710#
711# CONFIG_ADFS_FS is not set 734# CONFIG_ADFS_FS is not set
712# CONFIG_AFFS_FS is not set 735# CONFIG_AFFS_FS is not set
713# CONFIG_HFS_FS is not set 736# CONFIG_HFS_FS is not set
@@ -717,6 +740,7 @@ CONFIG_TMPFS=y
717# CONFIG_EFS_FS is not set 740# CONFIG_EFS_FS is not set
718# CONFIG_JFFS2_FS is not set 741# CONFIG_JFFS2_FS is not set
719CONFIG_CRAMFS=y 742CONFIG_CRAMFS=y
743# CONFIG_SQUASHFS is not set
720# CONFIG_VXFS_FS is not set 744# CONFIG_VXFS_FS is not set
721# CONFIG_MINIX_FS is not set 745# CONFIG_MINIX_FS is not set
722# CONFIG_OMFS_FS is not set 746# CONFIG_OMFS_FS is not set
@@ -757,6 +781,7 @@ CONFIG_MSDOS_PARTITION=y
757# Library routines 781# Library routines
758# 782#
759CONFIG_BITREVERSE=y 783CONFIG_BITREVERSE=y
784CONFIG_GENERIC_FIND_LAST_BIT=y
760# CONFIG_CRC_CCITT is not set 785# CONFIG_CRC_CCITT is not set
761# CONFIG_CRC16 is not set 786# CONFIG_CRC16 is not set
762# CONFIG_CRC_T10DIF is not set 787# CONFIG_CRC_T10DIF is not set
@@ -807,6 +832,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
807# CONFIG_DEBUG_MEMORY_INIT is not set 832# CONFIG_DEBUG_MEMORY_INIT is not set
808# CONFIG_DEBUG_LIST is not set 833# CONFIG_DEBUG_LIST is not set
809# CONFIG_DEBUG_SG is not set 834# CONFIG_DEBUG_SG is not set
835# CONFIG_DEBUG_NOTIFIERS is not set
810# CONFIG_BOOT_PRINTK_DELAY is not set 836# CONFIG_BOOT_PRINTK_DELAY is not set
811# CONFIG_RCU_TORTURE_TEST is not set 837# CONFIG_RCU_TORTURE_TEST is not set
812# CONFIG_RCU_CPU_STALL_DETECTOR is not set 838# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -815,18 +841,24 @@ CONFIG_DEBUG_BUGVERBOSE=y
815# CONFIG_FAULT_INJECTION is not set 841# CONFIG_FAULT_INJECTION is not set
816# CONFIG_LATENCYTOP is not set 842# CONFIG_LATENCYTOP is not set
817CONFIG_SYSCTL_SYSCALL_CHECK=y 843CONFIG_SYSCTL_SYSCALL_CHECK=y
818CONFIG_NOP_TRACER=y 844CONFIG_HAVE_FUNCTION_TRACER=y
819CONFIG_HAVE_FTRACE=y
820CONFIG_HAVE_DYNAMIC_FTRACE=y 845CONFIG_HAVE_DYNAMIC_FTRACE=y
821# CONFIG_FTRACE is not set 846CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
847
848#
849# Tracers
850#
851# CONFIG_FUNCTION_TRACER is not set
822# CONFIG_SCHED_TRACER is not set 852# CONFIG_SCHED_TRACER is not set
823# CONFIG_CONTEXT_SWITCH_TRACER is not set 853# CONFIG_CONTEXT_SWITCH_TRACER is not set
824# CONFIG_BOOT_TRACER is not set 854# CONFIG_BOOT_TRACER is not set
855# CONFIG_TRACE_BRANCH_PROFILING is not set
825# CONFIG_STACK_TRACER is not set 856# CONFIG_STACK_TRACER is not set
826# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 857# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
827# CONFIG_SAMPLES is not set 858# CONFIG_SAMPLES is not set
828CONFIG_HAVE_ARCH_KGDB=y 859CONFIG_HAVE_ARCH_KGDB=y
829# CONFIG_KGDB is not set 860# CONFIG_KGDB is not set
861CONFIG_PRINT_STACK_DEPTH=64
830# CONFIG_DEBUG_STACKOVERFLOW is not set 862# CONFIG_DEBUG_STACKOVERFLOW is not set
831# CONFIG_DEBUG_STACK_USAGE is not set 863# CONFIG_DEBUG_STACK_USAGE is not set
832# CONFIG_DEBUG_PAGEALLOC is not set 864# CONFIG_DEBUG_PAGEALLOC is not set
@@ -853,11 +885,15 @@ CONFIG_CRYPTO=y
853# 885#
854# CONFIG_CRYPTO_FIPS is not set 886# CONFIG_CRYPTO_FIPS is not set
855CONFIG_CRYPTO_ALGAPI=y 887CONFIG_CRYPTO_ALGAPI=y
856CONFIG_CRYPTO_AEAD=y 888CONFIG_CRYPTO_ALGAPI2=y
889CONFIG_CRYPTO_AEAD2=y
857CONFIG_CRYPTO_BLKCIPHER=y 890CONFIG_CRYPTO_BLKCIPHER=y
891CONFIG_CRYPTO_BLKCIPHER2=y
858CONFIG_CRYPTO_HASH=y 892CONFIG_CRYPTO_HASH=y
859CONFIG_CRYPTO_RNG=y 893CONFIG_CRYPTO_HASH2=y
894CONFIG_CRYPTO_RNG2=y
860CONFIG_CRYPTO_MANAGER=y 895CONFIG_CRYPTO_MANAGER=y
896CONFIG_CRYPTO_MANAGER2=y
861# CONFIG_CRYPTO_GF128MUL is not set 897# CONFIG_CRYPTO_GF128MUL is not set
862# CONFIG_CRYPTO_NULL is not set 898# CONFIG_CRYPTO_NULL is not set
863# CONFIG_CRYPTO_CRYPTD is not set 899# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/40x/ep405_defconfig b/arch/powerpc/configs/40x/ep405_defconfig
index b80ba7aa3129..4e9d85f39da0 100644
--- a/arch/powerpc/configs/40x/ep405_defconfig
+++ b/arch/powerpc/configs/40x/ep405_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 08:49:20 2008 4# Tue Jan 20 08:17:48 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_40x=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_4xx=y 17CONFIG_4xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -71,12 +72,12 @@ CONFIG_POSIX_MQUEUE=y
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75CONFIG_GROUP_SCHED=y 75CONFIG_GROUP_SCHED=y
76CONFIG_FAIR_GROUP_SCHED=y 76CONFIG_FAIR_GROUP_SCHED=y
77# CONFIG_RT_GROUP_SCHED is not set 77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y 78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set 79# CONFIG_CGROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -89,6 +90,7 @@ CONFIG_EMBEDDED=y
89CONFIG_SYSCTL_SYSCALL=y 90CONFIG_SYSCTL_SYSCALL=y
90CONFIG_KALLSYMS=y 91CONFIG_KALLSYMS=y
91CONFIG_KALLSYMS_ALL=y 92CONFIG_KALLSYMS_ALL=y
93CONFIG_KALLSYMS_STRIP_GENERATED=y
92CONFIG_KALLSYMS_EXTRA_PASS=y 94CONFIG_KALLSYMS_EXTRA_PASS=y
93CONFIG_HOTPLUG=y 95CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y 96CONFIG_PRINTK=y
@@ -111,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 113CONFIG_SLUB=y
112# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -122,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 127CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 133CONFIG_BLOCK=y
135CONFIG_LBD=y 134CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
140 138
@@ -151,6 +149,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
155# CONFIG_PPC4xx_PCI_EXPRESS is not set 157# CONFIG_PPC4xx_PCI_EXPRESS is not set
156 158
@@ -184,6 +186,7 @@ CONFIG_IBM405_ERR51=y
184# CONFIG_GENERIC_IOMAP is not set 186# CONFIG_GENERIC_IOMAP is not set
185# CONFIG_CPU_FREQ is not set 187# CONFIG_CPU_FREQ is not set
186# CONFIG_FSL_ULI1575 is not set 188# CONFIG_FSL_ULI1575 is not set
189# CONFIG_SIMPLE_GPIO is not set
187 190
188# 191#
189# Kernel options 192# Kernel options
@@ -207,6 +210,7 @@ CONFIG_BINFMT_ELF=y
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
209# CONFIG_IOMMU_HELPER is not set 212# CONFIG_IOMMU_HELPER is not set
213CONFIG_PPC_NEED_DMA_SYNC_OPS=y
210CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 214CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
211CONFIG_ARCH_HAS_WALK_MEMORY=y 215CONFIG_ARCH_HAS_WALK_MEMORY=y
212CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 216CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -221,12 +225,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
221CONFIG_PAGEFLAGS_EXTENDED=y 225CONFIG_PAGEFLAGS_EXTENDED=y
222CONFIG_SPLIT_PTLOCK_CPUS=4 226CONFIG_SPLIT_PTLOCK_CPUS=4
223CONFIG_MIGRATION=y 227CONFIG_MIGRATION=y
224# CONFIG_RESOURCES_64BIT is not set
225# CONFIG_PHYS_ADDR_T_64BIT is not set 228# CONFIG_PHYS_ADDR_T_64BIT is not set
226CONFIG_ZONE_DMA_FLAG=1 229CONFIG_ZONE_DMA_FLAG=1
227CONFIG_BOUNCE=y 230CONFIG_BOUNCE=y
228CONFIG_VIRT_TO_BUS=y 231CONFIG_VIRT_TO_BUS=y
229CONFIG_UNEVICTABLE_LRU=y 232CONFIG_UNEVICTABLE_LRU=y
233CONFIG_PPC_4K_PAGES=y
234# CONFIG_PPC_16K_PAGES is not set
235# CONFIG_PPC_64K_PAGES is not set
230CONFIG_FORCE_MAX_ZONEORDER=11 236CONFIG_FORCE_MAX_ZONEORDER=11
231CONFIG_PROC_DEVICETREE=y 237CONFIG_PROC_DEVICETREE=y
232# CONFIG_CMDLINE_BOOL is not set 238# CONFIG_CMDLINE_BOOL is not set
@@ -250,6 +256,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
250# CONFIG_PCI_MSI is not set 256# CONFIG_PCI_MSI is not set
251CONFIG_PCI_LEGACY=y 257CONFIG_PCI_LEGACY=y
252# CONFIG_PCI_DEBUG is not set 258# CONFIG_PCI_DEBUG is not set
259# CONFIG_PCI_STUB is not set
253# CONFIG_PCCARD is not set 260# CONFIG_PCCARD is not set
254# CONFIG_HOTPLUG_PCI is not set 261# CONFIG_HOTPLUG_PCI is not set
255# CONFIG_HAS_RAPIDIO is not set 262# CONFIG_HAS_RAPIDIO is not set
@@ -274,6 +281,7 @@ CONFIG_NET=y
274# 281#
275# Networking options 282# Networking options
276# 283#
284CONFIG_COMPAT_NET_DEV_OPS=y
277CONFIG_PACKET=y 285CONFIG_PACKET=y
278# CONFIG_PACKET_MMAP is not set 286# CONFIG_PACKET_MMAP is not set
279CONFIG_UNIX=y 287CONFIG_UNIX=y
@@ -324,6 +332,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
324# CONFIG_ECONET is not set 332# CONFIG_ECONET is not set
325# CONFIG_WAN_ROUTER is not set 333# CONFIG_WAN_ROUTER is not set
326# CONFIG_NET_SCHED is not set 334# CONFIG_NET_SCHED is not set
335# CONFIG_DCB is not set
327 336
328# 337#
329# Network testing 338# Network testing
@@ -336,6 +345,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
336# CONFIG_AF_RXRPC is not set 345# CONFIG_AF_RXRPC is not set
337# CONFIG_PHONET is not set 346# CONFIG_PHONET is not set
338# CONFIG_WIRELESS is not set 347# CONFIG_WIRELESS is not set
348# CONFIG_WIMAX is not set
339# CONFIG_RFKILL is not set 349# CONFIG_RFKILL is not set
340# CONFIG_NET_9P is not set 350# CONFIG_NET_9P is not set
341 351
@@ -361,6 +371,7 @@ CONFIG_MTD=y
361# CONFIG_MTD_DEBUG is not set 371# CONFIG_MTD_DEBUG is not set
362# CONFIG_MTD_CONCAT is not set 372# CONFIG_MTD_CONCAT is not set
363CONFIG_MTD_PARTITIONS=y 373CONFIG_MTD_PARTITIONS=y
374# CONFIG_MTD_TESTS is not set
364# CONFIG_MTD_REDBOOT_PARTS is not set 375# CONFIG_MTD_REDBOOT_PARTS is not set
365CONFIG_MTD_CMDLINE_PARTS=y 376CONFIG_MTD_CMDLINE_PARTS=y
366CONFIG_MTD_OF_PARTS=y 377CONFIG_MTD_OF_PARTS=y
@@ -433,6 +444,12 @@ CONFIG_MTD_PHYSMAP_OF=y
433# CONFIG_MTD_ONENAND is not set 444# CONFIG_MTD_ONENAND is not set
434 445
435# 446#
447# LPDDR flash memory drivers
448#
449# CONFIG_MTD_LPDDR is not set
450# CONFIG_MTD_QINFO_PROBE is not set
451
452#
436# UBI - Unsorted block images 453# UBI - Unsorted block images
437# 454#
438# CONFIG_MTD_UBI is not set 455# CONFIG_MTD_UBI is not set
@@ -464,6 +481,7 @@ CONFIG_MISC_DEVICES=y
464# CONFIG_TIFM_CORE is not set 481# CONFIG_TIFM_CORE is not set
465# CONFIG_ENCLOSURE_SERVICES is not set 482# CONFIG_ENCLOSURE_SERVICES is not set
466# CONFIG_HP_ILO is not set 483# CONFIG_HP_ILO is not set
484# CONFIG_C2PORT is not set
467CONFIG_HAVE_IDE=y 485CONFIG_HAVE_IDE=y
468# CONFIG_IDE is not set 486# CONFIG_IDE is not set
469 487
@@ -546,6 +564,7 @@ CONFIG_NETDEV_1000=y
546# CONFIG_JME is not set 564# CONFIG_JME is not set
547CONFIG_NETDEV_10000=y 565CONFIG_NETDEV_10000=y
548# CONFIG_CHELSIO_T1 is not set 566# CONFIG_CHELSIO_T1 is not set
567CONFIG_CHELSIO_T3_DEPENDS=y
549# CONFIG_CHELSIO_T3 is not set 568# CONFIG_CHELSIO_T3 is not set
550# CONFIG_ENIC is not set 569# CONFIG_ENIC is not set
551# CONFIG_IXGBE is not set 570# CONFIG_IXGBE is not set
@@ -570,6 +589,10 @@ CONFIG_NETDEV_10000=y
570# CONFIG_IWLWIFI_LEDS is not set 589# CONFIG_IWLWIFI_LEDS is not set
571 590
572# 591#
592# Enable WiMAX (Networking options) to see the WiMAX drivers
593#
594
595#
573# USB Network Adapters 596# USB Network Adapters
574# 597#
575# CONFIG_USB_CATC is not set 598# CONFIG_USB_CATC is not set
@@ -629,9 +652,12 @@ CONFIG_SERIAL_CORE=y
629CONFIG_SERIAL_CORE_CONSOLE=y 652CONFIG_SERIAL_CORE_CONSOLE=y
630# CONFIG_SERIAL_JSM is not set 653# CONFIG_SERIAL_JSM is not set
631CONFIG_SERIAL_OF_PLATFORM=y 654CONFIG_SERIAL_OF_PLATFORM=y
655# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
632CONFIG_UNIX98_PTYS=y 656CONFIG_UNIX98_PTYS=y
657# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
633CONFIG_LEGACY_PTYS=y 658CONFIG_LEGACY_PTYS=y
634CONFIG_LEGACY_PTY_COUNT=256 659CONFIG_LEGACY_PTY_COUNT=256
660# CONFIG_HVC_UDBG is not set
635# CONFIG_IPMI_HANDLER is not set 661# CONFIG_IPMI_HANDLER is not set
636# CONFIG_HW_RANDOM is not set 662# CONFIG_HW_RANDOM is not set
637# CONFIG_NVRAM is not set 663# CONFIG_NVRAM is not set
@@ -650,11 +676,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
650# CONFIG_HWMON is not set 676# CONFIG_HWMON is not set
651CONFIG_THERMAL=y 677CONFIG_THERMAL=y
652# CONFIG_WATCHDOG is not set 678# CONFIG_WATCHDOG is not set
679CONFIG_SSB_POSSIBLE=y
653 680
654# 681#
655# Sonics Silicon Backplane 682# Sonics Silicon Backplane
656# 683#
657CONFIG_SSB_POSSIBLE=y
658# CONFIG_SSB is not set 684# CONFIG_SSB is not set
659 685
660# 686#
@@ -664,7 +690,7 @@ CONFIG_SSB_POSSIBLE=y
664# CONFIG_MFD_SM501 is not set 690# CONFIG_MFD_SM501 is not set
665# CONFIG_HTC_PASIC3 is not set 691# CONFIG_HTC_PASIC3 is not set
666# CONFIG_MFD_TMIO is not set 692# CONFIG_MFD_TMIO is not set
667# CONFIG_MFD_WM8400 is not set 693# CONFIG_REGULATOR is not set
668 694
669# 695#
670# Multimedia devices 696# Multimedia devices
@@ -723,6 +749,7 @@ CONFIG_USB_MON=y
723# 749#
724# CONFIG_USB_C67X00_HCD is not set 750# CONFIG_USB_C67X00_HCD is not set
725# CONFIG_USB_EHCI_HCD is not set 751# CONFIG_USB_EHCI_HCD is not set
752# CONFIG_USB_OXU210HP_HCD is not set
726# CONFIG_USB_ISP116X_HCD is not set 753# CONFIG_USB_ISP116X_HCD is not set
727# CONFIG_USB_ISP1760_HCD is not set 754# CONFIG_USB_ISP1760_HCD is not set
728CONFIG_USB_OHCI_HCD=y 755CONFIG_USB_OHCI_HCD=y
@@ -748,11 +775,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
748# CONFIG_USB_TMC is not set 775# CONFIG_USB_TMC is not set
749 776
750# 777#
751# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 778# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
752# 779#
753 780
754# 781#
755# may also be needed; see USB_STORAGE Help for more information 782# see USB_STORAGE Help for more information
756# 783#
757# CONFIG_USB_LIBUSUAL is not set 784# CONFIG_USB_LIBUSUAL is not set
758 785
@@ -791,6 +818,10 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
791# CONFIG_USB_ISIGHTFW is not set 818# CONFIG_USB_ISIGHTFW is not set
792# CONFIG_USB_VST is not set 819# CONFIG_USB_VST is not set
793# CONFIG_USB_GADGET is not set 820# CONFIG_USB_GADGET is not set
821
822#
823# OTG and related infrastructure
824#
794# CONFIG_UWB is not set 825# CONFIG_UWB is not set
795# CONFIG_MMC is not set 826# CONFIG_MMC is not set
796# CONFIG_MEMSTICK is not set 827# CONFIG_MEMSTICK is not set
@@ -816,7 +847,9 @@ CONFIG_EXT2_FS=y
816# CONFIG_FS_POSIX_ACL is not set 847# CONFIG_FS_POSIX_ACL is not set
817CONFIG_FILE_LOCKING=y 848CONFIG_FILE_LOCKING=y
818# CONFIG_XFS_FS is not set 849# CONFIG_XFS_FS is not set
850# CONFIG_GFS2_FS is not set
819# CONFIG_OCFS2_FS is not set 851# CONFIG_OCFS2_FS is not set
852# CONFIG_BTRFS_FS is not set
820CONFIG_DNOTIFY=y 853CONFIG_DNOTIFY=y
821CONFIG_INOTIFY=y 854CONFIG_INOTIFY=y
822CONFIG_INOTIFY_USER=y 855CONFIG_INOTIFY_USER=y
@@ -850,10 +883,7 @@ CONFIG_TMPFS=y
850# CONFIG_TMPFS_POSIX_ACL is not set 883# CONFIG_TMPFS_POSIX_ACL is not set
851# CONFIG_HUGETLB_PAGE is not set 884# CONFIG_HUGETLB_PAGE is not set
852# CONFIG_CONFIGFS_FS is not set 885# CONFIG_CONFIGFS_FS is not set
853 886CONFIG_MISC_FILESYSTEMS=y
854#
855# Miscellaneous filesystems
856#
857# CONFIG_ADFS_FS is not set 887# CONFIG_ADFS_FS is not set
858# CONFIG_AFFS_FS is not set 888# CONFIG_AFFS_FS is not set
859# CONFIG_HFS_FS is not set 889# CONFIG_HFS_FS is not set
@@ -863,6 +893,7 @@ CONFIG_TMPFS=y
863# CONFIG_EFS_FS is not set 893# CONFIG_EFS_FS is not set
864# CONFIG_JFFS2_FS is not set 894# CONFIG_JFFS2_FS is not set
865CONFIG_CRAMFS=y 895CONFIG_CRAMFS=y
896# CONFIG_SQUASHFS is not set
866# CONFIG_VXFS_FS is not set 897# CONFIG_VXFS_FS is not set
867# CONFIG_MINIX_FS is not set 898# CONFIG_MINIX_FS is not set
868# CONFIG_OMFS_FS is not set 899# CONFIG_OMFS_FS is not set
@@ -903,6 +934,7 @@ CONFIG_MSDOS_PARTITION=y
903# Library routines 934# Library routines
904# 935#
905CONFIG_BITREVERSE=y 936CONFIG_BITREVERSE=y
937CONFIG_GENERIC_FIND_LAST_BIT=y
906# CONFIG_CRC_CCITT is not set 938# CONFIG_CRC_CCITT is not set
907# CONFIG_CRC16 is not set 939# CONFIG_CRC16 is not set
908# CONFIG_CRC_T10DIF is not set 940# CONFIG_CRC_T10DIF is not set
@@ -953,6 +985,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
953# CONFIG_DEBUG_MEMORY_INIT is not set 985# CONFIG_DEBUG_MEMORY_INIT is not set
954# CONFIG_DEBUG_LIST is not set 986# CONFIG_DEBUG_LIST is not set
955# CONFIG_DEBUG_SG is not set 987# CONFIG_DEBUG_SG is not set
988# CONFIG_DEBUG_NOTIFIERS is not set
956# CONFIG_BOOT_PRINTK_DELAY is not set 989# CONFIG_BOOT_PRINTK_DELAY is not set
957# CONFIG_RCU_TORTURE_TEST is not set 990# CONFIG_RCU_TORTURE_TEST is not set
958# CONFIG_RCU_CPU_STALL_DETECTOR is not set 991# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -961,18 +994,24 @@ CONFIG_DEBUG_BUGVERBOSE=y
961# CONFIG_FAULT_INJECTION is not set 994# CONFIG_FAULT_INJECTION is not set
962# CONFIG_LATENCYTOP is not set 995# CONFIG_LATENCYTOP is not set
963CONFIG_SYSCTL_SYSCALL_CHECK=y 996CONFIG_SYSCTL_SYSCALL_CHECK=y
964CONFIG_NOP_TRACER=y 997CONFIG_HAVE_FUNCTION_TRACER=y
965CONFIG_HAVE_FTRACE=y
966CONFIG_HAVE_DYNAMIC_FTRACE=y 998CONFIG_HAVE_DYNAMIC_FTRACE=y
967# CONFIG_FTRACE is not set 999CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1000
1001#
1002# Tracers
1003#
1004# CONFIG_FUNCTION_TRACER is not set
968# CONFIG_SCHED_TRACER is not set 1005# CONFIG_SCHED_TRACER is not set
969# CONFIG_CONTEXT_SWITCH_TRACER is not set 1006# CONFIG_CONTEXT_SWITCH_TRACER is not set
970# CONFIG_BOOT_TRACER is not set 1007# CONFIG_BOOT_TRACER is not set
1008# CONFIG_TRACE_BRANCH_PROFILING is not set
971# CONFIG_STACK_TRACER is not set 1009# CONFIG_STACK_TRACER is not set
972# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1010# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
973# CONFIG_SAMPLES is not set 1011# CONFIG_SAMPLES is not set
974CONFIG_HAVE_ARCH_KGDB=y 1012CONFIG_HAVE_ARCH_KGDB=y
975# CONFIG_KGDB is not set 1013# CONFIG_KGDB is not set
1014CONFIG_PRINT_STACK_DEPTH=64
976# CONFIG_DEBUG_STACKOVERFLOW is not set 1015# CONFIG_DEBUG_STACKOVERFLOW is not set
977# CONFIG_DEBUG_STACK_USAGE is not set 1016# CONFIG_DEBUG_STACK_USAGE is not set
978# CONFIG_DEBUG_PAGEALLOC is not set 1017# CONFIG_DEBUG_PAGEALLOC is not set
@@ -999,11 +1038,15 @@ CONFIG_CRYPTO=y
999# 1038#
1000# CONFIG_CRYPTO_FIPS is not set 1039# CONFIG_CRYPTO_FIPS is not set
1001CONFIG_CRYPTO_ALGAPI=y 1040CONFIG_CRYPTO_ALGAPI=y
1002CONFIG_CRYPTO_AEAD=y 1041CONFIG_CRYPTO_ALGAPI2=y
1042CONFIG_CRYPTO_AEAD2=y
1003CONFIG_CRYPTO_BLKCIPHER=y 1043CONFIG_CRYPTO_BLKCIPHER=y
1044CONFIG_CRYPTO_BLKCIPHER2=y
1004CONFIG_CRYPTO_HASH=y 1045CONFIG_CRYPTO_HASH=y
1005CONFIG_CRYPTO_RNG=y 1046CONFIG_CRYPTO_HASH2=y
1047CONFIG_CRYPTO_RNG2=y
1006CONFIG_CRYPTO_MANAGER=y 1048CONFIG_CRYPTO_MANAGER=y
1049CONFIG_CRYPTO_MANAGER2=y
1007# CONFIG_CRYPTO_GF128MUL is not set 1050# CONFIG_CRYPTO_GF128MUL is not set
1008# CONFIG_CRYPTO_NULL is not set 1051# CONFIG_CRYPTO_NULL is not set
1009# CONFIG_CRYPTO_CRYPTD is not set 1052# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/40x/hcu4_defconfig b/arch/powerpc/configs/40x/hcu4_defconfig
index 45dcb824503f..8c019d79bf2a 100644
--- a/arch/powerpc/configs/40x/hcu4_defconfig
+++ b/arch/powerpc/configs/40x/hcu4_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.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 08:49:22 2008 4# Tue Jan 20 08:17:50 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_40x=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_4xx=y 17CONFIG_4xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -71,12 +72,12 @@ CONFIG_POSIX_MQUEUE=y
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75CONFIG_GROUP_SCHED=y 75CONFIG_GROUP_SCHED=y
76CONFIG_FAIR_GROUP_SCHED=y 76CONFIG_FAIR_GROUP_SCHED=y
77# CONFIG_RT_GROUP_SCHED is not set 77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y 78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set 79# CONFIG_CGROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -89,6 +90,7 @@ CONFIG_EMBEDDED=y
89CONFIG_SYSCTL_SYSCALL=y 90CONFIG_SYSCTL_SYSCALL=y
90CONFIG_KALLSYMS=y 91CONFIG_KALLSYMS=y
91CONFIG_KALLSYMS_ALL=y 92CONFIG_KALLSYMS_ALL=y
93CONFIG_KALLSYMS_STRIP_GENERATED=y
92CONFIG_KALLSYMS_EXTRA_PASS=y 94CONFIG_KALLSYMS_EXTRA_PASS=y
93CONFIG_HOTPLUG=y 95CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y 96CONFIG_PRINTK=y
@@ -111,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 113CONFIG_SLUB=y
112# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -122,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 127CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 133CONFIG_BLOCK=y
135CONFIG_LBD=y 134CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
140 138
@@ -151,6 +149,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
155# CONFIG_PPC4xx_PCI_EXPRESS is not set 157# CONFIG_PPC4xx_PCI_EXPRESS is not set
156 158
@@ -182,6 +184,7 @@ CONFIG_405GPR=y
182# CONFIG_GENERIC_IOMAP is not set 184# CONFIG_GENERIC_IOMAP is not set
183# CONFIG_CPU_FREQ is not set 185# CONFIG_CPU_FREQ is not set
184# CONFIG_FSL_ULI1575 is not set 186# CONFIG_FSL_ULI1575 is not set
187# CONFIG_SIMPLE_GPIO is not set
185 188
186# 189#
187# Kernel options 190# Kernel options
@@ -205,6 +208,7 @@ CONFIG_BINFMT_ELF=y
205# CONFIG_BINFMT_MISC is not set 208# CONFIG_BINFMT_MISC is not set
206# CONFIG_MATH_EMULATION is not set 209# CONFIG_MATH_EMULATION is not set
207# CONFIG_IOMMU_HELPER is not set 210# CONFIG_IOMMU_HELPER is not set
211CONFIG_PPC_NEED_DMA_SYNC_OPS=y
208CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 212CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
209CONFIG_ARCH_HAS_WALK_MEMORY=y 213CONFIG_ARCH_HAS_WALK_MEMORY=y
210CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 214CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -219,12 +223,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
219CONFIG_PAGEFLAGS_EXTENDED=y 223CONFIG_PAGEFLAGS_EXTENDED=y
220CONFIG_SPLIT_PTLOCK_CPUS=4 224CONFIG_SPLIT_PTLOCK_CPUS=4
221CONFIG_MIGRATION=y 225CONFIG_MIGRATION=y
222CONFIG_RESOURCES_64BIT=y
223# CONFIG_PHYS_ADDR_T_64BIT is not set 226# CONFIG_PHYS_ADDR_T_64BIT is not set
224CONFIG_ZONE_DMA_FLAG=1 227CONFIG_ZONE_DMA_FLAG=1
225CONFIG_BOUNCE=y 228CONFIG_BOUNCE=y
226CONFIG_VIRT_TO_BUS=y 229CONFIG_VIRT_TO_BUS=y
227CONFIG_UNEVICTABLE_LRU=y 230CONFIG_UNEVICTABLE_LRU=y
231CONFIG_PPC_4K_PAGES=y
232# CONFIG_PPC_16K_PAGES is not set
233# CONFIG_PPC_64K_PAGES is not set
228CONFIG_FORCE_MAX_ZONEORDER=11 234CONFIG_FORCE_MAX_ZONEORDER=11
229CONFIG_PROC_DEVICETREE=y 235CONFIG_PROC_DEVICETREE=y
230# CONFIG_CMDLINE_BOOL is not set 236# CONFIG_CMDLINE_BOOL is not set
@@ -248,6 +254,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
248# CONFIG_PCI_MSI is not set 254# CONFIG_PCI_MSI is not set
249# CONFIG_PCI_LEGACY is not set 255# CONFIG_PCI_LEGACY is not set
250# CONFIG_PCI_DEBUG is not set 256# CONFIG_PCI_DEBUG is not set
257# CONFIG_PCI_STUB is not set
251# CONFIG_PCCARD is not set 258# CONFIG_PCCARD is not set
252# CONFIG_HOTPLUG_PCI is not set 259# CONFIG_HOTPLUG_PCI is not set
253# CONFIG_HAS_RAPIDIO is not set 260# CONFIG_HAS_RAPIDIO is not set
@@ -272,6 +279,7 @@ CONFIG_NET=y
272# 279#
273# Networking options 280# Networking options
274# 281#
282CONFIG_COMPAT_NET_DEV_OPS=y
275CONFIG_PACKET=y 283CONFIG_PACKET=y
276# CONFIG_PACKET_MMAP is not set 284# CONFIG_PACKET_MMAP is not set
277CONFIG_UNIX=y 285CONFIG_UNIX=y
@@ -322,6 +330,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
322# CONFIG_ECONET is not set 330# CONFIG_ECONET is not set
323# CONFIG_WAN_ROUTER is not set 331# CONFIG_WAN_ROUTER is not set
324# CONFIG_NET_SCHED is not set 332# CONFIG_NET_SCHED is not set
333# CONFIG_DCB is not set
325 334
326# 335#
327# Network testing 336# Network testing
@@ -334,6 +343,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
334# CONFIG_AF_RXRPC is not set 343# CONFIG_AF_RXRPC is not set
335# CONFIG_PHONET is not set 344# CONFIG_PHONET is not set
336# CONFIG_WIRELESS is not set 345# CONFIG_WIRELESS is not set
346# CONFIG_WIMAX is not set
337# CONFIG_RFKILL is not set 347# CONFIG_RFKILL is not set
338# CONFIG_NET_9P is not set 348# CONFIG_NET_9P is not set
339 349
@@ -359,6 +369,7 @@ CONFIG_MTD=y
359# CONFIG_MTD_DEBUG is not set 369# CONFIG_MTD_DEBUG is not set
360# CONFIG_MTD_CONCAT is not set 370# CONFIG_MTD_CONCAT is not set
361CONFIG_MTD_PARTITIONS=y 371CONFIG_MTD_PARTITIONS=y
372# CONFIG_MTD_TESTS is not set
362# CONFIG_MTD_REDBOOT_PARTS is not set 373# CONFIG_MTD_REDBOOT_PARTS is not set
363CONFIG_MTD_CMDLINE_PARTS=y 374CONFIG_MTD_CMDLINE_PARTS=y
364CONFIG_MTD_OF_PARTS=y 375CONFIG_MTD_OF_PARTS=y
@@ -431,6 +442,12 @@ CONFIG_MTD_PHYSMAP_OF=y
431# CONFIG_MTD_ONENAND is not set 442# CONFIG_MTD_ONENAND is not set
432 443
433# 444#
445# LPDDR flash memory drivers
446#
447# CONFIG_MTD_LPDDR is not set
448# CONFIG_MTD_QINFO_PROBE is not set
449
450#
434# UBI - Unsorted block images 451# UBI - Unsorted block images
435# 452#
436# CONFIG_MTD_UBI is not set 453# CONFIG_MTD_UBI is not set
@@ -461,6 +478,7 @@ CONFIG_MISC_DEVICES=y
461# CONFIG_TIFM_CORE is not set 478# CONFIG_TIFM_CORE is not set
462# CONFIG_ENCLOSURE_SERVICES is not set 479# CONFIG_ENCLOSURE_SERVICES is not set
463# CONFIG_HP_ILO is not set 480# CONFIG_HP_ILO is not set
481# CONFIG_C2PORT is not set
464CONFIG_HAVE_IDE=y 482CONFIG_HAVE_IDE=y
465# CONFIG_IDE is not set 483# CONFIG_IDE is not set
466 484
@@ -543,6 +561,7 @@ CONFIG_NETDEV_1000=y
543# CONFIG_JME is not set 561# CONFIG_JME is not set
544CONFIG_NETDEV_10000=y 562CONFIG_NETDEV_10000=y
545# CONFIG_CHELSIO_T1 is not set 563# CONFIG_CHELSIO_T1 is not set
564CONFIG_CHELSIO_T3_DEPENDS=y
546# CONFIG_CHELSIO_T3 is not set 565# CONFIG_CHELSIO_T3 is not set
547# CONFIG_ENIC is not set 566# CONFIG_ENIC is not set
548# CONFIG_IXGBE is not set 567# CONFIG_IXGBE is not set
@@ -565,6 +584,10 @@ CONFIG_NETDEV_10000=y
565# CONFIG_WLAN_PRE80211 is not set 584# CONFIG_WLAN_PRE80211 is not set
566# CONFIG_WLAN_80211 is not set 585# CONFIG_WLAN_80211 is not set
567# CONFIG_IWLWIFI_LEDS is not set 586# CONFIG_IWLWIFI_LEDS is not set
587
588#
589# Enable WiMAX (Networking options) to see the WiMAX drivers
590#
568# CONFIG_WAN is not set 591# CONFIG_WAN is not set
569# CONFIG_FDDI is not set 592# CONFIG_FDDI is not set
570# CONFIG_HIPPI is not set 593# CONFIG_HIPPI is not set
@@ -617,9 +640,12 @@ CONFIG_SERIAL_CORE=y
617CONFIG_SERIAL_CORE_CONSOLE=y 640CONFIG_SERIAL_CORE_CONSOLE=y
618# CONFIG_SERIAL_JSM is not set 641# CONFIG_SERIAL_JSM is not set
619CONFIG_SERIAL_OF_PLATFORM=y 642CONFIG_SERIAL_OF_PLATFORM=y
643# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
620CONFIG_UNIX98_PTYS=y 644CONFIG_UNIX98_PTYS=y
645# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
621CONFIG_LEGACY_PTYS=y 646CONFIG_LEGACY_PTYS=y
622CONFIG_LEGACY_PTY_COUNT=256 647CONFIG_LEGACY_PTY_COUNT=256
648# CONFIG_HVC_UDBG is not set
623# CONFIG_IPMI_HANDLER is not set 649# CONFIG_IPMI_HANDLER is not set
624# CONFIG_HW_RANDOM is not set 650# CONFIG_HW_RANDOM is not set
625# CONFIG_NVRAM is not set 651# CONFIG_NVRAM is not set
@@ -639,11 +665,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
639# CONFIG_THERMAL is not set 665# CONFIG_THERMAL is not set
640# CONFIG_THERMAL_HWMON is not set 666# CONFIG_THERMAL_HWMON is not set
641# CONFIG_WATCHDOG is not set 667# CONFIG_WATCHDOG is not set
668CONFIG_SSB_POSSIBLE=y
642 669
643# 670#
644# Sonics Silicon Backplane 671# Sonics Silicon Backplane
645# 672#
646CONFIG_SSB_POSSIBLE=y
647# CONFIG_SSB is not set 673# CONFIG_SSB is not set
648 674
649# 675#
@@ -653,7 +679,7 @@ CONFIG_SSB_POSSIBLE=y
653# CONFIG_MFD_SM501 is not set 679# CONFIG_MFD_SM501 is not set
654# CONFIG_HTC_PASIC3 is not set 680# CONFIG_HTC_PASIC3 is not set
655# CONFIG_MFD_TMIO is not set 681# CONFIG_MFD_TMIO is not set
656# CONFIG_MFD_WM8400 is not set 682# CONFIG_REGULATOR is not set
657 683
658# 684#
659# Multimedia devices 685# Multimedia devices
@@ -712,7 +738,9 @@ CONFIG_EXT2_FS=y
712# CONFIG_FS_POSIX_ACL is not set 738# CONFIG_FS_POSIX_ACL is not set
713CONFIG_FILE_LOCKING=y 739CONFIG_FILE_LOCKING=y
714# CONFIG_XFS_FS is not set 740# CONFIG_XFS_FS is not set
741# CONFIG_GFS2_FS is not set
715# CONFIG_OCFS2_FS is not set 742# CONFIG_OCFS2_FS is not set
743# CONFIG_BTRFS_FS is not set
716CONFIG_DNOTIFY=y 744CONFIG_DNOTIFY=y
717CONFIG_INOTIFY=y 745CONFIG_INOTIFY=y
718CONFIG_INOTIFY_USER=y 746CONFIG_INOTIFY_USER=y
@@ -746,10 +774,7 @@ CONFIG_TMPFS=y
746# CONFIG_TMPFS_POSIX_ACL is not set 774# CONFIG_TMPFS_POSIX_ACL is not set
747# CONFIG_HUGETLB_PAGE is not set 775# CONFIG_HUGETLB_PAGE is not set
748# CONFIG_CONFIGFS_FS is not set 776# CONFIG_CONFIGFS_FS is not set
749 777CONFIG_MISC_FILESYSTEMS=y
750#
751# Miscellaneous filesystems
752#
753# CONFIG_ADFS_FS is not set 778# CONFIG_ADFS_FS is not set
754# CONFIG_AFFS_FS is not set 779# CONFIG_AFFS_FS is not set
755# CONFIG_HFS_FS is not set 780# CONFIG_HFS_FS is not set
@@ -759,6 +784,7 @@ CONFIG_TMPFS=y
759# CONFIG_EFS_FS is not set 784# CONFIG_EFS_FS is not set
760# CONFIG_JFFS2_FS is not set 785# CONFIG_JFFS2_FS is not set
761CONFIG_CRAMFS=y 786CONFIG_CRAMFS=y
787# CONFIG_SQUASHFS is not set
762# CONFIG_VXFS_FS is not set 788# CONFIG_VXFS_FS is not set
763# CONFIG_MINIX_FS is not set 789# CONFIG_MINIX_FS is not set
764# CONFIG_OMFS_FS is not set 790# CONFIG_OMFS_FS is not set
@@ -799,6 +825,7 @@ CONFIG_MSDOS_PARTITION=y
799# Library routines 825# Library routines
800# 826#
801CONFIG_BITREVERSE=y 827CONFIG_BITREVERSE=y
828CONFIG_GENERIC_FIND_LAST_BIT=y
802# CONFIG_CRC_CCITT is not set 829# CONFIG_CRC_CCITT is not set
803# CONFIG_CRC16 is not set 830# CONFIG_CRC16 is not set
804# CONFIG_CRC_T10DIF is not set 831# CONFIG_CRC_T10DIF is not set
@@ -849,6 +876,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
849# CONFIG_DEBUG_MEMORY_INIT is not set 876# CONFIG_DEBUG_MEMORY_INIT is not set
850# CONFIG_DEBUG_LIST is not set 877# CONFIG_DEBUG_LIST is not set
851# CONFIG_DEBUG_SG is not set 878# CONFIG_DEBUG_SG is not set
879# CONFIG_DEBUG_NOTIFIERS is not set
852# CONFIG_BOOT_PRINTK_DELAY is not set 880# CONFIG_BOOT_PRINTK_DELAY is not set
853# CONFIG_RCU_TORTURE_TEST is not set 881# CONFIG_RCU_TORTURE_TEST is not set
854# CONFIG_RCU_CPU_STALL_DETECTOR is not set 882# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -857,18 +885,24 @@ CONFIG_DEBUG_BUGVERBOSE=y
857# CONFIG_FAULT_INJECTION is not set 885# CONFIG_FAULT_INJECTION is not set
858# CONFIG_LATENCYTOP is not set 886# CONFIG_LATENCYTOP is not set
859CONFIG_SYSCTL_SYSCALL_CHECK=y 887CONFIG_SYSCTL_SYSCALL_CHECK=y
860CONFIG_NOP_TRACER=y 888CONFIG_HAVE_FUNCTION_TRACER=y
861CONFIG_HAVE_FTRACE=y
862CONFIG_HAVE_DYNAMIC_FTRACE=y 889CONFIG_HAVE_DYNAMIC_FTRACE=y
863# CONFIG_FTRACE is not set 890CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
891
892#
893# Tracers
894#
895# CONFIG_FUNCTION_TRACER is not set
864# CONFIG_SCHED_TRACER is not set 896# CONFIG_SCHED_TRACER is not set
865# CONFIG_CONTEXT_SWITCH_TRACER is not set 897# CONFIG_CONTEXT_SWITCH_TRACER is not set
866# CONFIG_BOOT_TRACER is not set 898# CONFIG_BOOT_TRACER is not set
899# CONFIG_TRACE_BRANCH_PROFILING is not set
867# CONFIG_STACK_TRACER is not set 900# CONFIG_STACK_TRACER is not set
868# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 901# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
869# CONFIG_SAMPLES is not set 902# CONFIG_SAMPLES is not set
870CONFIG_HAVE_ARCH_KGDB=y 903CONFIG_HAVE_ARCH_KGDB=y
871# CONFIG_KGDB is not set 904# CONFIG_KGDB is not set
905CONFIG_PRINT_STACK_DEPTH=64
872# CONFIG_DEBUG_STACKOVERFLOW is not set 906# CONFIG_DEBUG_STACKOVERFLOW is not set
873# CONFIG_DEBUG_STACK_USAGE is not set 907# CONFIG_DEBUG_STACK_USAGE is not set
874# CONFIG_DEBUG_PAGEALLOC is not set 908# CONFIG_DEBUG_PAGEALLOC is not set
@@ -895,11 +929,15 @@ CONFIG_CRYPTO=y
895# 929#
896# CONFIG_CRYPTO_FIPS is not set 930# CONFIG_CRYPTO_FIPS is not set
897CONFIG_CRYPTO_ALGAPI=y 931CONFIG_CRYPTO_ALGAPI=y
898CONFIG_CRYPTO_AEAD=y 932CONFIG_CRYPTO_ALGAPI2=y
933CONFIG_CRYPTO_AEAD2=y
899CONFIG_CRYPTO_BLKCIPHER=y 934CONFIG_CRYPTO_BLKCIPHER=y
935CONFIG_CRYPTO_BLKCIPHER2=y
900CONFIG_CRYPTO_HASH=y 936CONFIG_CRYPTO_HASH=y
901CONFIG_CRYPTO_RNG=y 937CONFIG_CRYPTO_HASH2=y
938CONFIG_CRYPTO_RNG2=y
902CONFIG_CRYPTO_MANAGER=y 939CONFIG_CRYPTO_MANAGER=y
940CONFIG_CRYPTO_MANAGER2=y
903# CONFIG_CRYPTO_GF128MUL is not set 941# CONFIG_CRYPTO_GF128MUL is not set
904# CONFIG_CRYPTO_NULL is not set 942# CONFIG_CRYPTO_NULL is not set
905# CONFIG_CRYPTO_CRYPTD is not set 943# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/40x/kilauea_defconfig b/arch/powerpc/configs/40x/kilauea_defconfig
index e2f3695d9d0b..9917a09bad3a 100644
--- a/arch/powerpc/configs/40x/kilauea_defconfig
+++ b/arch/powerpc/configs/40x/kilauea_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 08:49:23 2008 4# Tue Jan 20 08:17:52 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_40x=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_4xx=y 17CONFIG_4xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -71,12 +72,12 @@ CONFIG_POSIX_MQUEUE=y
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75CONFIG_GROUP_SCHED=y 75CONFIG_GROUP_SCHED=y
76# CONFIG_FAIR_GROUP_SCHED is not set 76# CONFIG_FAIR_GROUP_SCHED is not set
77# CONFIG_RT_GROUP_SCHED is not set 77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y 78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set 79# CONFIG_CGROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -89,6 +90,7 @@ CONFIG_EMBEDDED=y
89CONFIG_SYSCTL_SYSCALL=y 90CONFIG_SYSCTL_SYSCALL=y
90CONFIG_KALLSYMS=y 91CONFIG_KALLSYMS=y
91CONFIG_KALLSYMS_ALL=y 92CONFIG_KALLSYMS_ALL=y
93CONFIG_KALLSYMS_STRIP_GENERATED=y
92CONFIG_KALLSYMS_EXTRA_PASS=y 94CONFIG_KALLSYMS_EXTRA_PASS=y
93CONFIG_HOTPLUG=y 95CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y 96CONFIG_PRINTK=y
@@ -111,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 113CONFIG_SLUB=y
112# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -122,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 127CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 133CONFIG_BLOCK=y
135CONFIG_LBD=y 134CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
140 138
@@ -151,6 +149,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
155CONFIG_PPC4xx_PCI_EXPRESS=y 157CONFIG_PPC4xx_PCI_EXPRESS=y
156 158
@@ -182,6 +184,7 @@ CONFIG_405EX=y
182# CONFIG_GENERIC_IOMAP is not set 184# CONFIG_GENERIC_IOMAP is not set
183# CONFIG_CPU_FREQ is not set 185# CONFIG_CPU_FREQ is not set
184# CONFIG_FSL_ULI1575 is not set 186# CONFIG_FSL_ULI1575 is not set
187# CONFIG_SIMPLE_GPIO is not set
185 188
186# 189#
187# Kernel options 190# Kernel options
@@ -205,6 +208,7 @@ CONFIG_BINFMT_ELF=y
205# CONFIG_BINFMT_MISC is not set 208# CONFIG_BINFMT_MISC is not set
206# CONFIG_MATH_EMULATION is not set 209# CONFIG_MATH_EMULATION is not set
207# CONFIG_IOMMU_HELPER is not set 210# CONFIG_IOMMU_HELPER is not set
211CONFIG_PPC_NEED_DMA_SYNC_OPS=y
208CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 212CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
209CONFIG_ARCH_HAS_WALK_MEMORY=y 213CONFIG_ARCH_HAS_WALK_MEMORY=y
210CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 214CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -219,12 +223,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
219CONFIG_PAGEFLAGS_EXTENDED=y 223CONFIG_PAGEFLAGS_EXTENDED=y
220CONFIG_SPLIT_PTLOCK_CPUS=4 224CONFIG_SPLIT_PTLOCK_CPUS=4
221CONFIG_MIGRATION=y 225CONFIG_MIGRATION=y
222# CONFIG_RESOURCES_64BIT is not set
223# CONFIG_PHYS_ADDR_T_64BIT is not set 226# CONFIG_PHYS_ADDR_T_64BIT is not set
224CONFIG_ZONE_DMA_FLAG=1 227CONFIG_ZONE_DMA_FLAG=1
225CONFIG_BOUNCE=y 228CONFIG_BOUNCE=y
226CONFIG_VIRT_TO_BUS=y 229CONFIG_VIRT_TO_BUS=y
227CONFIG_UNEVICTABLE_LRU=y 230CONFIG_UNEVICTABLE_LRU=y
231CONFIG_PPC_4K_PAGES=y
232# CONFIG_PPC_16K_PAGES is not set
233# CONFIG_PPC_64K_PAGES is not set
228CONFIG_FORCE_MAX_ZONEORDER=11 234CONFIG_FORCE_MAX_ZONEORDER=11
229CONFIG_PROC_DEVICETREE=y 235CONFIG_PROC_DEVICETREE=y
230# CONFIG_CMDLINE_BOOL is not set 236# CONFIG_CMDLINE_BOOL is not set
@@ -248,6 +254,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
248# CONFIG_PCI_MSI is not set 254# CONFIG_PCI_MSI is not set
249CONFIG_PCI_LEGACY=y 255CONFIG_PCI_LEGACY=y
250# CONFIG_PCI_DEBUG is not set 256# CONFIG_PCI_DEBUG is not set
257# CONFIG_PCI_STUB is not set
251# CONFIG_PCCARD is not set 258# CONFIG_PCCARD is not set
252# CONFIG_HOTPLUG_PCI is not set 259# CONFIG_HOTPLUG_PCI is not set
253# CONFIG_HAS_RAPIDIO is not set 260# CONFIG_HAS_RAPIDIO is not set
@@ -272,6 +279,7 @@ CONFIG_NET=y
272# 279#
273# Networking options 280# Networking options
274# 281#
282CONFIG_COMPAT_NET_DEV_OPS=y
275CONFIG_PACKET=y 283CONFIG_PACKET=y
276# CONFIG_PACKET_MMAP is not set 284# CONFIG_PACKET_MMAP is not set
277CONFIG_UNIX=y 285CONFIG_UNIX=y
@@ -322,6 +330,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
322# CONFIG_ECONET is not set 330# CONFIG_ECONET is not set
323# CONFIG_WAN_ROUTER is not set 331# CONFIG_WAN_ROUTER is not set
324# CONFIG_NET_SCHED is not set 332# CONFIG_NET_SCHED is not set
333# CONFIG_DCB is not set
325 334
326# 335#
327# Network testing 336# Network testing
@@ -334,6 +343,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
334# CONFIG_AF_RXRPC is not set 343# CONFIG_AF_RXRPC is not set
335# CONFIG_PHONET is not set 344# CONFIG_PHONET is not set
336# CONFIG_WIRELESS is not set 345# CONFIG_WIRELESS is not set
346# CONFIG_WIMAX is not set
337# CONFIG_RFKILL is not set 347# CONFIG_RFKILL is not set
338# CONFIG_NET_9P is not set 348# CONFIG_NET_9P is not set
339 349
@@ -359,6 +369,7 @@ CONFIG_MTD=y
359# CONFIG_MTD_DEBUG is not set 369# CONFIG_MTD_DEBUG is not set
360# CONFIG_MTD_CONCAT is not set 370# CONFIG_MTD_CONCAT is not set
361CONFIG_MTD_PARTITIONS=y 371CONFIG_MTD_PARTITIONS=y
372# CONFIG_MTD_TESTS is not set
362# CONFIG_MTD_REDBOOT_PARTS is not set 373# CONFIG_MTD_REDBOOT_PARTS is not set
363CONFIG_MTD_CMDLINE_PARTS=y 374CONFIG_MTD_CMDLINE_PARTS=y
364CONFIG_MTD_OF_PARTS=y 375CONFIG_MTD_OF_PARTS=y
@@ -431,6 +442,12 @@ CONFIG_MTD_PHYSMAP_OF=y
431# CONFIG_MTD_ONENAND is not set 442# CONFIG_MTD_ONENAND is not set
432 443
433# 444#
445# LPDDR flash memory drivers
446#
447# CONFIG_MTD_LPDDR is not set
448# CONFIG_MTD_QINFO_PROBE is not set
449
450#
434# UBI - Unsorted block images 451# UBI - Unsorted block images
435# 452#
436# CONFIG_MTD_UBI is not set 453# CONFIG_MTD_UBI is not set
@@ -524,6 +541,10 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y
524# CONFIG_WLAN_PRE80211 is not set 541# CONFIG_WLAN_PRE80211 is not set
525# CONFIG_WLAN_80211 is not set 542# CONFIG_WLAN_80211 is not set
526# CONFIG_IWLWIFI_LEDS is not set 543# CONFIG_IWLWIFI_LEDS is not set
544
545#
546# Enable WiMAX (Networking options) to see the WiMAX drivers
547#
527# CONFIG_WAN is not set 548# CONFIG_WAN is not set
528# CONFIG_FDDI is not set 549# CONFIG_FDDI is not set
529# CONFIG_HIPPI is not set 550# CONFIG_HIPPI is not set
@@ -576,9 +597,12 @@ CONFIG_SERIAL_CORE=y
576CONFIG_SERIAL_CORE_CONSOLE=y 597CONFIG_SERIAL_CORE_CONSOLE=y
577# CONFIG_SERIAL_JSM is not set 598# CONFIG_SERIAL_JSM is not set
578CONFIG_SERIAL_OF_PLATFORM=y 599CONFIG_SERIAL_OF_PLATFORM=y
600# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
579CONFIG_UNIX98_PTYS=y 601CONFIG_UNIX98_PTYS=y
602# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
580CONFIG_LEGACY_PTYS=y 603CONFIG_LEGACY_PTYS=y
581CONFIG_LEGACY_PTY_COUNT=256 604CONFIG_LEGACY_PTY_COUNT=256
605# CONFIG_HVC_UDBG is not set
582# CONFIG_IPMI_HANDLER is not set 606# CONFIG_IPMI_HANDLER is not set
583# CONFIG_HW_RANDOM is not set 607# CONFIG_HW_RANDOM is not set
584# CONFIG_NVRAM is not set 608# CONFIG_NVRAM is not set
@@ -597,11 +621,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
597# CONFIG_HWMON is not set 621# CONFIG_HWMON is not set
598CONFIG_THERMAL=y 622CONFIG_THERMAL=y
599# CONFIG_WATCHDOG is not set 623# CONFIG_WATCHDOG is not set
624CONFIG_SSB_POSSIBLE=y
600 625
601# 626#
602# Sonics Silicon Backplane 627# Sonics Silicon Backplane
603# 628#
604CONFIG_SSB_POSSIBLE=y
605# CONFIG_SSB is not set 629# CONFIG_SSB is not set
606 630
607# 631#
@@ -611,7 +635,7 @@ CONFIG_SSB_POSSIBLE=y
611# CONFIG_MFD_SM501 is not set 635# CONFIG_MFD_SM501 is not set
612# CONFIG_HTC_PASIC3 is not set 636# CONFIG_HTC_PASIC3 is not set
613# CONFIG_MFD_TMIO is not set 637# CONFIG_MFD_TMIO is not set
614# CONFIG_MFD_WM8400 is not set 638# CONFIG_REGULATOR is not set
615 639
616# 640#
617# Multimedia devices 641# Multimedia devices
@@ -670,7 +694,9 @@ CONFIG_EXT2_FS=y
670# CONFIG_FS_POSIX_ACL is not set 694# CONFIG_FS_POSIX_ACL is not set
671CONFIG_FILE_LOCKING=y 695CONFIG_FILE_LOCKING=y
672# CONFIG_XFS_FS is not set 696# CONFIG_XFS_FS is not set
697# CONFIG_GFS2_FS is not set
673# CONFIG_OCFS2_FS is not set 698# CONFIG_OCFS2_FS is not set
699# CONFIG_BTRFS_FS is not set
674CONFIG_DNOTIFY=y 700CONFIG_DNOTIFY=y
675CONFIG_INOTIFY=y 701CONFIG_INOTIFY=y
676CONFIG_INOTIFY_USER=y 702CONFIG_INOTIFY_USER=y
@@ -704,10 +730,7 @@ CONFIG_TMPFS=y
704# CONFIG_TMPFS_POSIX_ACL is not set 730# CONFIG_TMPFS_POSIX_ACL is not set
705# CONFIG_HUGETLB_PAGE is not set 731# CONFIG_HUGETLB_PAGE is not set
706# CONFIG_CONFIGFS_FS is not set 732# CONFIG_CONFIGFS_FS is not set
707 733CONFIG_MISC_FILESYSTEMS=y
708#
709# Miscellaneous filesystems
710#
711# CONFIG_ADFS_FS is not set 734# CONFIG_ADFS_FS is not set
712# CONFIG_AFFS_FS is not set 735# CONFIG_AFFS_FS is not set
713# CONFIG_HFS_FS is not set 736# CONFIG_HFS_FS is not set
@@ -717,6 +740,7 @@ CONFIG_TMPFS=y
717# CONFIG_EFS_FS is not set 740# CONFIG_EFS_FS is not set
718# CONFIG_JFFS2_FS is not set 741# CONFIG_JFFS2_FS is not set
719CONFIG_CRAMFS=y 742CONFIG_CRAMFS=y
743# CONFIG_SQUASHFS is not set
720# CONFIG_VXFS_FS is not set 744# CONFIG_VXFS_FS is not set
721# CONFIG_MINIX_FS is not set 745# CONFIG_MINIX_FS is not set
722# CONFIG_OMFS_FS is not set 746# CONFIG_OMFS_FS is not set
@@ -757,6 +781,7 @@ CONFIG_MSDOS_PARTITION=y
757# Library routines 781# Library routines
758# 782#
759CONFIG_BITREVERSE=y 783CONFIG_BITREVERSE=y
784CONFIG_GENERIC_FIND_LAST_BIT=y
760# CONFIG_CRC_CCITT is not set 785# CONFIG_CRC_CCITT is not set
761# CONFIG_CRC16 is not set 786# CONFIG_CRC16 is not set
762# CONFIG_CRC_T10DIF is not set 787# CONFIG_CRC_T10DIF is not set
@@ -807,6 +832,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
807# CONFIG_DEBUG_MEMORY_INIT is not set 832# CONFIG_DEBUG_MEMORY_INIT is not set
808# CONFIG_DEBUG_LIST is not set 833# CONFIG_DEBUG_LIST is not set
809# CONFIG_DEBUG_SG is not set 834# CONFIG_DEBUG_SG is not set
835# CONFIG_DEBUG_NOTIFIERS is not set
810# CONFIG_BOOT_PRINTK_DELAY is not set 836# CONFIG_BOOT_PRINTK_DELAY is not set
811# CONFIG_RCU_TORTURE_TEST is not set 837# CONFIG_RCU_TORTURE_TEST is not set
812# CONFIG_RCU_CPU_STALL_DETECTOR is not set 838# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -815,18 +841,24 @@ CONFIG_DEBUG_BUGVERBOSE=y
815# CONFIG_FAULT_INJECTION is not set 841# CONFIG_FAULT_INJECTION is not set
816# CONFIG_LATENCYTOP is not set 842# CONFIG_LATENCYTOP is not set
817CONFIG_SYSCTL_SYSCALL_CHECK=y 843CONFIG_SYSCTL_SYSCALL_CHECK=y
818CONFIG_NOP_TRACER=y 844CONFIG_HAVE_FUNCTION_TRACER=y
819CONFIG_HAVE_FTRACE=y
820CONFIG_HAVE_DYNAMIC_FTRACE=y 845CONFIG_HAVE_DYNAMIC_FTRACE=y
821# CONFIG_FTRACE is not set 846CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
847
848#
849# Tracers
850#
851# CONFIG_FUNCTION_TRACER is not set
822# CONFIG_SCHED_TRACER is not set 852# CONFIG_SCHED_TRACER is not set
823# CONFIG_CONTEXT_SWITCH_TRACER is not set 853# CONFIG_CONTEXT_SWITCH_TRACER is not set
824# CONFIG_BOOT_TRACER is not set 854# CONFIG_BOOT_TRACER is not set
855# CONFIG_TRACE_BRANCH_PROFILING is not set
825# CONFIG_STACK_TRACER is not set 856# CONFIG_STACK_TRACER is not set
826# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 857# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
827# CONFIG_SAMPLES is not set 858# CONFIG_SAMPLES is not set
828CONFIG_HAVE_ARCH_KGDB=y 859CONFIG_HAVE_ARCH_KGDB=y
829# CONFIG_KGDB is not set 860# CONFIG_KGDB is not set
861CONFIG_PRINT_STACK_DEPTH=64
830# CONFIG_DEBUG_STACKOVERFLOW is not set 862# CONFIG_DEBUG_STACKOVERFLOW is not set
831# CONFIG_DEBUG_STACK_USAGE is not set 863# CONFIG_DEBUG_STACK_USAGE is not set
832# CONFIG_DEBUG_PAGEALLOC is not set 864# CONFIG_DEBUG_PAGEALLOC is not set
@@ -853,11 +885,15 @@ CONFIG_CRYPTO=y
853# 885#
854# CONFIG_CRYPTO_FIPS is not set 886# CONFIG_CRYPTO_FIPS is not set
855CONFIG_CRYPTO_ALGAPI=y 887CONFIG_CRYPTO_ALGAPI=y
856CONFIG_CRYPTO_AEAD=y 888CONFIG_CRYPTO_ALGAPI2=y
889CONFIG_CRYPTO_AEAD2=y
857CONFIG_CRYPTO_BLKCIPHER=y 890CONFIG_CRYPTO_BLKCIPHER=y
891CONFIG_CRYPTO_BLKCIPHER2=y
858CONFIG_CRYPTO_HASH=y 892CONFIG_CRYPTO_HASH=y
859CONFIG_CRYPTO_RNG=y 893CONFIG_CRYPTO_HASH2=y
894CONFIG_CRYPTO_RNG2=y
860CONFIG_CRYPTO_MANAGER=y 895CONFIG_CRYPTO_MANAGER=y
896CONFIG_CRYPTO_MANAGER2=y
861# CONFIG_CRYPTO_GF128MUL is not set 897# CONFIG_CRYPTO_GF128MUL is not set
862# CONFIG_CRYPTO_NULL is not set 898# CONFIG_CRYPTO_NULL is not set
863# CONFIG_CRYPTO_CRYPTD is not set 899# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/40x/makalu_defconfig b/arch/powerpc/configs/40x/makalu_defconfig
index 413c778ecd7c..58bf2ac2e0dd 100644
--- a/arch/powerpc/configs/40x/makalu_defconfig
+++ b/arch/powerpc/configs/40x/makalu_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 08:49:25 2008 4# Tue Jan 20 08:17:53 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_40x=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_4xx=y 17CONFIG_4xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -71,12 +72,12 @@ CONFIG_POSIX_MQUEUE=y
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75CONFIG_GROUP_SCHED=y 75CONFIG_GROUP_SCHED=y
76# CONFIG_FAIR_GROUP_SCHED is not set 76# CONFIG_FAIR_GROUP_SCHED is not set
77# CONFIG_RT_GROUP_SCHED is not set 77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y 78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set 79# CONFIG_CGROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -89,6 +90,7 @@ CONFIG_EMBEDDED=y
89CONFIG_SYSCTL_SYSCALL=y 90CONFIG_SYSCTL_SYSCALL=y
90CONFIG_KALLSYMS=y 91CONFIG_KALLSYMS=y
91CONFIG_KALLSYMS_ALL=y 92CONFIG_KALLSYMS_ALL=y
93CONFIG_KALLSYMS_STRIP_GENERATED=y
92CONFIG_KALLSYMS_EXTRA_PASS=y 94CONFIG_KALLSYMS_EXTRA_PASS=y
93CONFIG_HOTPLUG=y 95CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y 96CONFIG_PRINTK=y
@@ -111,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 113CONFIG_SLUB=y
112# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -122,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 127CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 133CONFIG_BLOCK=y
135CONFIG_LBD=y 134CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
140 138
@@ -151,6 +149,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
155CONFIG_PPC4xx_PCI_EXPRESS=y 157CONFIG_PPC4xx_PCI_EXPRESS=y
156 158
@@ -182,6 +184,7 @@ CONFIG_405EX=y
182# CONFIG_GENERIC_IOMAP is not set 184# CONFIG_GENERIC_IOMAP is not set
183# CONFIG_CPU_FREQ is not set 185# CONFIG_CPU_FREQ is not set
184# CONFIG_FSL_ULI1575 is not set 186# CONFIG_FSL_ULI1575 is not set
187# CONFIG_SIMPLE_GPIO is not set
185 188
186# 189#
187# Kernel options 190# Kernel options
@@ -205,6 +208,7 @@ CONFIG_BINFMT_ELF=y
205# CONFIG_BINFMT_MISC is not set 208# CONFIG_BINFMT_MISC is not set
206# CONFIG_MATH_EMULATION is not set 209# CONFIG_MATH_EMULATION is not set
207# CONFIG_IOMMU_HELPER is not set 210# CONFIG_IOMMU_HELPER is not set
211CONFIG_PPC_NEED_DMA_SYNC_OPS=y
208CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 212CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
209CONFIG_ARCH_HAS_WALK_MEMORY=y 213CONFIG_ARCH_HAS_WALK_MEMORY=y
210CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 214CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -219,12 +223,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
219CONFIG_PAGEFLAGS_EXTENDED=y 223CONFIG_PAGEFLAGS_EXTENDED=y
220CONFIG_SPLIT_PTLOCK_CPUS=4 224CONFIG_SPLIT_PTLOCK_CPUS=4
221CONFIG_MIGRATION=y 225CONFIG_MIGRATION=y
222# CONFIG_RESOURCES_64BIT is not set
223# CONFIG_PHYS_ADDR_T_64BIT is not set 226# CONFIG_PHYS_ADDR_T_64BIT is not set
224CONFIG_ZONE_DMA_FLAG=1 227CONFIG_ZONE_DMA_FLAG=1
225CONFIG_BOUNCE=y 228CONFIG_BOUNCE=y
226CONFIG_VIRT_TO_BUS=y 229CONFIG_VIRT_TO_BUS=y
227CONFIG_UNEVICTABLE_LRU=y 230CONFIG_UNEVICTABLE_LRU=y
231CONFIG_PPC_4K_PAGES=y
232# CONFIG_PPC_16K_PAGES is not set
233# CONFIG_PPC_64K_PAGES is not set
228CONFIG_FORCE_MAX_ZONEORDER=11 234CONFIG_FORCE_MAX_ZONEORDER=11
229CONFIG_PROC_DEVICETREE=y 235CONFIG_PROC_DEVICETREE=y
230# CONFIG_CMDLINE_BOOL is not set 236# CONFIG_CMDLINE_BOOL is not set
@@ -248,6 +254,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
248# CONFIG_PCI_MSI is not set 254# CONFIG_PCI_MSI is not set
249CONFIG_PCI_LEGACY=y 255CONFIG_PCI_LEGACY=y
250# CONFIG_PCI_DEBUG is not set 256# CONFIG_PCI_DEBUG is not set
257# CONFIG_PCI_STUB is not set
251# CONFIG_PCCARD is not set 258# CONFIG_PCCARD is not set
252# CONFIG_HOTPLUG_PCI is not set 259# CONFIG_HOTPLUG_PCI is not set
253# CONFIG_HAS_RAPIDIO is not set 260# CONFIG_HAS_RAPIDIO is not set
@@ -272,6 +279,7 @@ CONFIG_NET=y
272# 279#
273# Networking options 280# Networking options
274# 281#
282CONFIG_COMPAT_NET_DEV_OPS=y
275CONFIG_PACKET=y 283CONFIG_PACKET=y
276# CONFIG_PACKET_MMAP is not set 284# CONFIG_PACKET_MMAP is not set
277CONFIG_UNIX=y 285CONFIG_UNIX=y
@@ -322,6 +330,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
322# CONFIG_ECONET is not set 330# CONFIG_ECONET is not set
323# CONFIG_WAN_ROUTER is not set 331# CONFIG_WAN_ROUTER is not set
324# CONFIG_NET_SCHED is not set 332# CONFIG_NET_SCHED is not set
333# CONFIG_DCB is not set
325 334
326# 335#
327# Network testing 336# Network testing
@@ -334,6 +343,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
334# CONFIG_AF_RXRPC is not set 343# CONFIG_AF_RXRPC is not set
335# CONFIG_PHONET is not set 344# CONFIG_PHONET is not set
336# CONFIG_WIRELESS is not set 345# CONFIG_WIRELESS is not set
346# CONFIG_WIMAX is not set
337# CONFIG_RFKILL is not set 347# CONFIG_RFKILL is not set
338# CONFIG_NET_9P is not set 348# CONFIG_NET_9P is not set
339 349
@@ -359,6 +369,7 @@ CONFIG_MTD=y
359# CONFIG_MTD_DEBUG is not set 369# CONFIG_MTD_DEBUG is not set
360# CONFIG_MTD_CONCAT is not set 370# CONFIG_MTD_CONCAT is not set
361CONFIG_MTD_PARTITIONS=y 371CONFIG_MTD_PARTITIONS=y
372# CONFIG_MTD_TESTS is not set
362# CONFIG_MTD_REDBOOT_PARTS is not set 373# CONFIG_MTD_REDBOOT_PARTS is not set
363CONFIG_MTD_CMDLINE_PARTS=y 374CONFIG_MTD_CMDLINE_PARTS=y
364CONFIG_MTD_OF_PARTS=y 375CONFIG_MTD_OF_PARTS=y
@@ -431,6 +442,12 @@ CONFIG_MTD_PHYSMAP_OF=y
431# CONFIG_MTD_ONENAND is not set 442# CONFIG_MTD_ONENAND is not set
432 443
433# 444#
445# LPDDR flash memory drivers
446#
447# CONFIG_MTD_LPDDR is not set
448# CONFIG_MTD_QINFO_PROBE is not set
449
450#
434# UBI - Unsorted block images 451# UBI - Unsorted block images
435# 452#
436# CONFIG_MTD_UBI is not set 453# CONFIG_MTD_UBI is not set
@@ -524,6 +541,10 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y
524# CONFIG_WLAN_PRE80211 is not set 541# CONFIG_WLAN_PRE80211 is not set
525# CONFIG_WLAN_80211 is not set 542# CONFIG_WLAN_80211 is not set
526# CONFIG_IWLWIFI_LEDS is not set 543# CONFIG_IWLWIFI_LEDS is not set
544
545#
546# Enable WiMAX (Networking options) to see the WiMAX drivers
547#
527# CONFIG_WAN is not set 548# CONFIG_WAN is not set
528# CONFIG_FDDI is not set 549# CONFIG_FDDI is not set
529# CONFIG_HIPPI is not set 550# CONFIG_HIPPI is not set
@@ -576,9 +597,12 @@ CONFIG_SERIAL_CORE=y
576CONFIG_SERIAL_CORE_CONSOLE=y 597CONFIG_SERIAL_CORE_CONSOLE=y
577# CONFIG_SERIAL_JSM is not set 598# CONFIG_SERIAL_JSM is not set
578CONFIG_SERIAL_OF_PLATFORM=y 599CONFIG_SERIAL_OF_PLATFORM=y
600# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
579CONFIG_UNIX98_PTYS=y 601CONFIG_UNIX98_PTYS=y
602# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
580CONFIG_LEGACY_PTYS=y 603CONFIG_LEGACY_PTYS=y
581CONFIG_LEGACY_PTY_COUNT=256 604CONFIG_LEGACY_PTY_COUNT=256
605# CONFIG_HVC_UDBG is not set
582# CONFIG_IPMI_HANDLER is not set 606# CONFIG_IPMI_HANDLER is not set
583# CONFIG_HW_RANDOM is not set 607# CONFIG_HW_RANDOM is not set
584# CONFIG_NVRAM is not set 608# CONFIG_NVRAM is not set
@@ -597,11 +621,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
597# CONFIG_HWMON is not set 621# CONFIG_HWMON is not set
598CONFIG_THERMAL=y 622CONFIG_THERMAL=y
599# CONFIG_WATCHDOG is not set 623# CONFIG_WATCHDOG is not set
624CONFIG_SSB_POSSIBLE=y
600 625
601# 626#
602# Sonics Silicon Backplane 627# Sonics Silicon Backplane
603# 628#
604CONFIG_SSB_POSSIBLE=y
605# CONFIG_SSB is not set 629# CONFIG_SSB is not set
606 630
607# 631#
@@ -611,7 +635,7 @@ CONFIG_SSB_POSSIBLE=y
611# CONFIG_MFD_SM501 is not set 635# CONFIG_MFD_SM501 is not set
612# CONFIG_HTC_PASIC3 is not set 636# CONFIG_HTC_PASIC3 is not set
613# CONFIG_MFD_TMIO is not set 637# CONFIG_MFD_TMIO is not set
614# CONFIG_MFD_WM8400 is not set 638# CONFIG_REGULATOR is not set
615 639
616# 640#
617# Multimedia devices 641# Multimedia devices
@@ -670,7 +694,9 @@ CONFIG_EXT2_FS=y
670# CONFIG_FS_POSIX_ACL is not set 694# CONFIG_FS_POSIX_ACL is not set
671CONFIG_FILE_LOCKING=y 695CONFIG_FILE_LOCKING=y
672# CONFIG_XFS_FS is not set 696# CONFIG_XFS_FS is not set
697# CONFIG_GFS2_FS is not set
673# CONFIG_OCFS2_FS is not set 698# CONFIG_OCFS2_FS is not set
699# CONFIG_BTRFS_FS is not set
674CONFIG_DNOTIFY=y 700CONFIG_DNOTIFY=y
675CONFIG_INOTIFY=y 701CONFIG_INOTIFY=y
676CONFIG_INOTIFY_USER=y 702CONFIG_INOTIFY_USER=y
@@ -704,10 +730,7 @@ CONFIG_TMPFS=y
704# CONFIG_TMPFS_POSIX_ACL is not set 730# CONFIG_TMPFS_POSIX_ACL is not set
705# CONFIG_HUGETLB_PAGE is not set 731# CONFIG_HUGETLB_PAGE is not set
706# CONFIG_CONFIGFS_FS is not set 732# CONFIG_CONFIGFS_FS is not set
707 733CONFIG_MISC_FILESYSTEMS=y
708#
709# Miscellaneous filesystems
710#
711# CONFIG_ADFS_FS is not set 734# CONFIG_ADFS_FS is not set
712# CONFIG_AFFS_FS is not set 735# CONFIG_AFFS_FS is not set
713# CONFIG_HFS_FS is not set 736# CONFIG_HFS_FS is not set
@@ -717,6 +740,7 @@ CONFIG_TMPFS=y
717# CONFIG_EFS_FS is not set 740# CONFIG_EFS_FS is not set
718# CONFIG_JFFS2_FS is not set 741# CONFIG_JFFS2_FS is not set
719CONFIG_CRAMFS=y 742CONFIG_CRAMFS=y
743# CONFIG_SQUASHFS is not set
720# CONFIG_VXFS_FS is not set 744# CONFIG_VXFS_FS is not set
721# CONFIG_MINIX_FS is not set 745# CONFIG_MINIX_FS is not set
722# CONFIG_OMFS_FS is not set 746# CONFIG_OMFS_FS is not set
@@ -757,6 +781,7 @@ CONFIG_MSDOS_PARTITION=y
757# Library routines 781# Library routines
758# 782#
759CONFIG_BITREVERSE=y 783CONFIG_BITREVERSE=y
784CONFIG_GENERIC_FIND_LAST_BIT=y
760# CONFIG_CRC_CCITT is not set 785# CONFIG_CRC_CCITT is not set
761# CONFIG_CRC16 is not set 786# CONFIG_CRC16 is not set
762# CONFIG_CRC_T10DIF is not set 787# CONFIG_CRC_T10DIF is not set
@@ -807,6 +832,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
807# CONFIG_DEBUG_MEMORY_INIT is not set 832# CONFIG_DEBUG_MEMORY_INIT is not set
808# CONFIG_DEBUG_LIST is not set 833# CONFIG_DEBUG_LIST is not set
809# CONFIG_DEBUG_SG is not set 834# CONFIG_DEBUG_SG is not set
835# CONFIG_DEBUG_NOTIFIERS is not set
810# CONFIG_BOOT_PRINTK_DELAY is not set 836# CONFIG_BOOT_PRINTK_DELAY is not set
811# CONFIG_RCU_TORTURE_TEST is not set 837# CONFIG_RCU_TORTURE_TEST is not set
812# CONFIG_RCU_CPU_STALL_DETECTOR is not set 838# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -815,18 +841,24 @@ CONFIG_DEBUG_BUGVERBOSE=y
815# CONFIG_FAULT_INJECTION is not set 841# CONFIG_FAULT_INJECTION is not set
816# CONFIG_LATENCYTOP is not set 842# CONFIG_LATENCYTOP is not set
817CONFIG_SYSCTL_SYSCALL_CHECK=y 843CONFIG_SYSCTL_SYSCALL_CHECK=y
818CONFIG_NOP_TRACER=y 844CONFIG_HAVE_FUNCTION_TRACER=y
819CONFIG_HAVE_FTRACE=y
820CONFIG_HAVE_DYNAMIC_FTRACE=y 845CONFIG_HAVE_DYNAMIC_FTRACE=y
821# CONFIG_FTRACE is not set 846CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
847
848#
849# Tracers
850#
851# CONFIG_FUNCTION_TRACER is not set
822# CONFIG_SCHED_TRACER is not set 852# CONFIG_SCHED_TRACER is not set
823# CONFIG_CONTEXT_SWITCH_TRACER is not set 853# CONFIG_CONTEXT_SWITCH_TRACER is not set
824# CONFIG_BOOT_TRACER is not set 854# CONFIG_BOOT_TRACER is not set
855# CONFIG_TRACE_BRANCH_PROFILING is not set
825# CONFIG_STACK_TRACER is not set 856# CONFIG_STACK_TRACER is not set
826# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 857# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
827# CONFIG_SAMPLES is not set 858# CONFIG_SAMPLES is not set
828CONFIG_HAVE_ARCH_KGDB=y 859CONFIG_HAVE_ARCH_KGDB=y
829# CONFIG_KGDB is not set 860# CONFIG_KGDB is not set
861CONFIG_PRINT_STACK_DEPTH=64
830# CONFIG_DEBUG_STACKOVERFLOW is not set 862# CONFIG_DEBUG_STACKOVERFLOW is not set
831# CONFIG_DEBUG_STACK_USAGE is not set 863# CONFIG_DEBUG_STACK_USAGE is not set
832# CONFIG_DEBUG_PAGEALLOC is not set 864# CONFIG_DEBUG_PAGEALLOC is not set
@@ -853,11 +885,15 @@ CONFIG_CRYPTO=y
853# 885#
854# CONFIG_CRYPTO_FIPS is not set 886# CONFIG_CRYPTO_FIPS is not set
855CONFIG_CRYPTO_ALGAPI=y 887CONFIG_CRYPTO_ALGAPI=y
856CONFIG_CRYPTO_AEAD=y 888CONFIG_CRYPTO_ALGAPI2=y
889CONFIG_CRYPTO_AEAD2=y
857CONFIG_CRYPTO_BLKCIPHER=y 890CONFIG_CRYPTO_BLKCIPHER=y
891CONFIG_CRYPTO_BLKCIPHER2=y
858CONFIG_CRYPTO_HASH=y 892CONFIG_CRYPTO_HASH=y
859CONFIG_CRYPTO_RNG=y 893CONFIG_CRYPTO_HASH2=y
894CONFIG_CRYPTO_RNG2=y
860CONFIG_CRYPTO_MANAGER=y 895CONFIG_CRYPTO_MANAGER=y
896CONFIG_CRYPTO_MANAGER2=y
861# CONFIG_CRYPTO_GF128MUL is not set 897# CONFIG_CRYPTO_GF128MUL is not set
862# CONFIG_CRYPTO_NULL is not set 898# CONFIG_CRYPTO_NULL is not set
863# CONFIG_CRYPTO_CRYPTD is not set 899# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/40x/virtex_defconfig b/arch/powerpc/configs/40x/virtex_defconfig
index 9a9350ded292..b6888384dd74 100644
--- a/arch/powerpc/configs/40x/virtex_defconfig
+++ b/arch/powerpc/configs/40x/virtex_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.28-rc4 3# Linux kernel version: 2.6.29-rc2
4# Fri Nov 14 10:49:16 2008 4# Tue Jan 20 08:17:55 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_40x=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_4xx=y 17CONFIG_4xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -41,7 +42,7 @@ CONFIG_GENERIC_GPIO=y
41CONFIG_PPC=y 42CONFIG_PPC=y
42CONFIG_EARLY_PRINTK=y 43CONFIG_EARLY_PRINTK=y
43CONFIG_GENERIC_NVRAM=y 44CONFIG_GENERIC_NVRAM=y
44CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 45CONFIG_SCHED_OMIT_FRAME_POINTER=y
45CONFIG_ARCH_MAY_HAVE_PC_FDC=y 46CONFIG_ARCH_MAY_HAVE_PC_FDC=y
46CONFIG_PPC_OF=y 47CONFIG_PPC_OF=y
47CONFIG_OF=y 48CONFIG_OF=y
@@ -74,8 +75,8 @@ CONFIG_POSIX_MQUEUE=y
74CONFIG_IKCONFIG=y 75CONFIG_IKCONFIG=y
75CONFIG_IKCONFIG_PROC=y 76CONFIG_IKCONFIG_PROC=y
76CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
77# CONFIG_CGROUPS is not set
78# CONFIG_GROUP_SCHED is not set 78# CONFIG_GROUP_SCHED is not set
79# CONFIG_CGROUPS is not set
79CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
81# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
@@ -113,7 +114,6 @@ CONFIG_SLAB=y
113# CONFIG_SLUB is not set 114# CONFIG_SLUB is not set
114# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 116# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
118# CONFIG_KPROBES is not set 118# CONFIG_KPROBES is not set
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -124,7 +124,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
127# CONFIG_TINY_SHMEM is not set
128CONFIG_BASE_SMALL=0 127CONFIG_BASE_SMALL=0
129CONFIG_MODULES=y 128CONFIG_MODULES=y
130# CONFIG_MODULE_FORCE_LOAD is not set 129# CONFIG_MODULE_FORCE_LOAD is not set
@@ -132,11 +131,9 @@ CONFIG_MODULE_UNLOAD=y
132CONFIG_MODULE_FORCE_UNLOAD=y 131CONFIG_MODULE_FORCE_UNLOAD=y
133CONFIG_MODVERSIONS=y 132CONFIG_MODVERSIONS=y
134# CONFIG_MODULE_SRCVERSION_ALL is not set 133# CONFIG_MODULE_SRCVERSION_ALL is not set
135CONFIG_KMOD=y
136CONFIG_BLOCK=y 134CONFIG_BLOCK=y
137# CONFIG_LBD is not set 135# CONFIG_LBD is not set
138# CONFIG_BLK_DEV_IO_TRACE is not set 136# CONFIG_BLK_DEV_IO_TRACE is not set
139# CONFIG_LSF is not set
140# CONFIG_BLK_DEV_BSG is not set 137# CONFIG_BLK_DEV_BSG is not set
141# CONFIG_BLK_DEV_INTEGRITY is not set 138# CONFIG_BLK_DEV_INTEGRITY is not set
142 139
@@ -153,6 +150,10 @@ CONFIG_DEFAULT_CFQ=y
153# CONFIG_DEFAULT_NOOP is not set 150# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="cfq" 151CONFIG_DEFAULT_IOSCHED="cfq"
155CONFIG_CLASSIC_RCU=y 152CONFIG_CLASSIC_RCU=y
153# CONFIG_TREE_RCU is not set
154# CONFIG_PREEMPT_RCU is not set
155# CONFIG_TREE_RCU_TRACE is not set
156# CONFIG_PREEMPT_RCU_TRACE is not set
156# CONFIG_FREEZER is not set 157# CONFIG_FREEZER is not set
157# CONFIG_PPC4xx_PCI_EXPRESS is not set 158# CONFIG_PPC4xx_PCI_EXPRESS is not set
158 159
@@ -188,6 +189,7 @@ CONFIG_IBM405_ERR51=y
188# CONFIG_GENERIC_IOMAP is not set 189# CONFIG_GENERIC_IOMAP is not set
189# CONFIG_CPU_FREQ is not set 190# CONFIG_CPU_FREQ is not set
190# CONFIG_FSL_ULI1575 is not set 191# CONFIG_FSL_ULI1575 is not set
192# CONFIG_SIMPLE_GPIO is not set
191 193
192# 194#
193# Kernel options 195# Kernel options
@@ -205,13 +207,13 @@ CONFIG_HZ=250
205# CONFIG_PREEMPT_NONE is not set 207# CONFIG_PREEMPT_NONE is not set
206# CONFIG_PREEMPT_VOLUNTARY is not set 208# CONFIG_PREEMPT_VOLUNTARY is not set
207CONFIG_PREEMPT=y 209CONFIG_PREEMPT=y
208# CONFIG_PREEMPT_RCU is not set
209CONFIG_BINFMT_ELF=y 210CONFIG_BINFMT_ELF=y
210# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 211# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
211# CONFIG_HAVE_AOUT is not set 212# CONFIG_HAVE_AOUT is not set
212# CONFIG_BINFMT_MISC is not set 213# CONFIG_BINFMT_MISC is not set
213CONFIG_MATH_EMULATION=y 214CONFIG_MATH_EMULATION=y
214# CONFIG_IOMMU_HELPER is not set 215# CONFIG_IOMMU_HELPER is not set
216CONFIG_PPC_NEED_DMA_SYNC_OPS=y
215CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 217CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
216CONFIG_ARCH_HAS_WALK_MEMORY=y 218CONFIG_ARCH_HAS_WALK_MEMORY=y
217CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 219CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -226,12 +228,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
226CONFIG_PAGEFLAGS_EXTENDED=y 228CONFIG_PAGEFLAGS_EXTENDED=y
227CONFIG_SPLIT_PTLOCK_CPUS=4 229CONFIG_SPLIT_PTLOCK_CPUS=4
228CONFIG_MIGRATION=y 230CONFIG_MIGRATION=y
229CONFIG_RESOURCES_64BIT=y
230# CONFIG_PHYS_ADDR_T_64BIT is not set 231# CONFIG_PHYS_ADDR_T_64BIT is not set
231CONFIG_ZONE_DMA_FLAG=1 232CONFIG_ZONE_DMA_FLAG=1
232CONFIG_BOUNCE=y 233CONFIG_BOUNCE=y
233CONFIG_VIRT_TO_BUS=y 234CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y 235CONFIG_UNEVICTABLE_LRU=y
236CONFIG_PPC_4K_PAGES=y
237# CONFIG_PPC_16K_PAGES is not set
238# CONFIG_PPC_64K_PAGES is not set
235CONFIG_FORCE_MAX_ZONEORDER=11 239CONFIG_FORCE_MAX_ZONEORDER=11
236CONFIG_PROC_DEVICETREE=y 240CONFIG_PROC_DEVICETREE=y
237CONFIG_CMDLINE_BOOL=y 241CONFIG_CMDLINE_BOOL=y
@@ -256,6 +260,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
256# CONFIG_PCI_MSI is not set 260# CONFIG_PCI_MSI is not set
257CONFIG_PCI_LEGACY=y 261CONFIG_PCI_LEGACY=y
258# CONFIG_PCI_DEBUG is not set 262# CONFIG_PCI_DEBUG is not set
263# CONFIG_PCI_STUB is not set
259# CONFIG_PCCARD is not set 264# CONFIG_PCCARD is not set
260# CONFIG_HOTPLUG_PCI is not set 265# CONFIG_HOTPLUG_PCI is not set
261# CONFIG_HAS_RAPIDIO is not set 266# CONFIG_HAS_RAPIDIO is not set
@@ -280,6 +285,8 @@ CONFIG_NET=y
280# 285#
281# Networking options 286# Networking options
282# 287#
288# CONFIG_NET_NS is not set
289CONFIG_COMPAT_NET_DEV_OPS=y
283CONFIG_PACKET=y 290CONFIG_PACKET=y
284# CONFIG_PACKET_MMAP is not set 291# CONFIG_PACKET_MMAP is not set
285CONFIG_UNIX=y 292CONFIG_UNIX=y
@@ -423,6 +430,7 @@ CONFIG_IP_NF_MANGLE=m
423# CONFIG_ECONET is not set 430# CONFIG_ECONET is not set
424# CONFIG_WAN_ROUTER is not set 431# CONFIG_WAN_ROUTER is not set
425# CONFIG_NET_SCHED is not set 432# CONFIG_NET_SCHED is not set
433# CONFIG_DCB is not set
426 434
427# 435#
428# Network testing 436# Network testing
@@ -438,8 +446,9 @@ CONFIG_WIRELESS=y
438# CONFIG_CFG80211 is not set 446# CONFIG_CFG80211 is not set
439CONFIG_WIRELESS_OLD_REGULATORY=y 447CONFIG_WIRELESS_OLD_REGULATORY=y
440# CONFIG_WIRELESS_EXT is not set 448# CONFIG_WIRELESS_EXT is not set
449# CONFIG_LIB80211 is not set
441# CONFIG_MAC80211 is not set 450# CONFIG_MAC80211 is not set
442# CONFIG_IEEE80211 is not set 451# CONFIG_WIMAX is not set
443# CONFIG_RFKILL is not set 452# CONFIG_RFKILL is not set
444# CONFIG_NET_9P is not set 453# CONFIG_NET_9P is not set
445 454
@@ -574,6 +583,10 @@ CONFIG_NETDEV_1000=y
574# CONFIG_WLAN_PRE80211 is not set 583# CONFIG_WLAN_PRE80211 is not set
575# CONFIG_WLAN_80211 is not set 584# CONFIG_WLAN_80211 is not set
576# CONFIG_IWLWIFI_LEDS is not set 585# CONFIG_IWLWIFI_LEDS is not set
586
587#
588# Enable WiMAX (Networking options) to see the WiMAX drivers
589#
577# CONFIG_WAN is not set 590# CONFIG_WAN is not set
578# CONFIG_FDDI is not set 591# CONFIG_FDDI is not set
579# CONFIG_HIPPI is not set 592# CONFIG_HIPPI is not set
@@ -674,9 +687,12 @@ CONFIG_SERIAL_CORE=y
674CONFIG_SERIAL_CORE_CONSOLE=y 687CONFIG_SERIAL_CORE_CONSOLE=y
675# CONFIG_SERIAL_JSM is not set 688# CONFIG_SERIAL_JSM is not set
676# CONFIG_SERIAL_OF_PLATFORM is not set 689# CONFIG_SERIAL_OF_PLATFORM is not set
690# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
677CONFIG_UNIX98_PTYS=y 691CONFIG_UNIX98_PTYS=y
692# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
678CONFIG_LEGACY_PTYS=y 693CONFIG_LEGACY_PTYS=y
679CONFIG_LEGACY_PTY_COUNT=256 694CONFIG_LEGACY_PTY_COUNT=256
695# CONFIG_HVC_UDBG is not set
680# CONFIG_IPMI_HANDLER is not set 696# CONFIG_IPMI_HANDLER is not set
681CONFIG_HW_RANDOM=m 697CONFIG_HW_RANDOM=m
682# CONFIG_NVRAM is not set 698# CONFIG_NVRAM is not set
@@ -854,7 +870,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
854# CONFIG_DMADEVICES is not set 870# CONFIG_DMADEVICES is not set
855# CONFIG_UIO is not set 871# CONFIG_UIO is not set
856# CONFIG_STAGING is not set 872# CONFIG_STAGING is not set
857CONFIG_STAGING_EXCLUDE_BUILD=y
858 873
859# 874#
860# File systems 875# File systems
@@ -870,6 +885,7 @@ CONFIG_EXT2_FS=y
870CONFIG_FILE_LOCKING=y 885CONFIG_FILE_LOCKING=y
871# CONFIG_XFS_FS is not set 886# CONFIG_XFS_FS is not set
872# CONFIG_OCFS2_FS is not set 887# CONFIG_OCFS2_FS is not set
888# CONFIG_BTRFS_FS is not set
873CONFIG_DNOTIFY=y 889CONFIG_DNOTIFY=y
874CONFIG_INOTIFY=y 890CONFIG_INOTIFY=y
875CONFIG_INOTIFY_USER=y 891CONFIG_INOTIFY_USER=y
@@ -906,10 +922,7 @@ CONFIG_TMPFS=y
906# CONFIG_TMPFS_POSIX_ACL is not set 922# CONFIG_TMPFS_POSIX_ACL is not set
907# CONFIG_HUGETLB_PAGE is not set 923# CONFIG_HUGETLB_PAGE is not set
908# CONFIG_CONFIGFS_FS is not set 924# CONFIG_CONFIGFS_FS is not set
909 925CONFIG_MISC_FILESYSTEMS=y
910#
911# Miscellaneous filesystems
912#
913# CONFIG_ADFS_FS is not set 926# CONFIG_ADFS_FS is not set
914# CONFIG_AFFS_FS is not set 927# CONFIG_AFFS_FS is not set
915# CONFIG_HFS_FS is not set 928# CONFIG_HFS_FS is not set
@@ -918,6 +931,7 @@ CONFIG_TMPFS=y
918# CONFIG_BFS_FS is not set 931# CONFIG_BFS_FS is not set
919# CONFIG_EFS_FS is not set 932# CONFIG_EFS_FS is not set
920CONFIG_CRAMFS=y 933CONFIG_CRAMFS=y
934# CONFIG_SQUASHFS is not set
921# CONFIG_VXFS_FS is not set 935# CONFIG_VXFS_FS is not set
922# CONFIG_MINIX_FS is not set 936# CONFIG_MINIX_FS is not set
923# CONFIG_OMFS_FS is not set 937# CONFIG_OMFS_FS is not set
@@ -997,6 +1011,7 @@ CONFIG_NLS_UTF8=m
997# Library routines 1011# Library routines
998# 1012#
999CONFIG_BITREVERSE=y 1013CONFIG_BITREVERSE=y
1014CONFIG_GENERIC_FIND_LAST_BIT=y
1000CONFIG_CRC_CCITT=y 1015CONFIG_CRC_CCITT=y
1001# CONFIG_CRC16 is not set 1016# CONFIG_CRC16 is not set
1002# CONFIG_CRC_T10DIF is not set 1017# CONFIG_CRC_T10DIF is not set
@@ -1046,6 +1061,7 @@ CONFIG_DEBUG_INFO=y
1046CONFIG_DEBUG_MEMORY_INIT=y 1061CONFIG_DEBUG_MEMORY_INIT=y
1047# CONFIG_DEBUG_LIST is not set 1062# CONFIG_DEBUG_LIST is not set
1048# CONFIG_DEBUG_SG is not set 1063# CONFIG_DEBUG_SG is not set
1064# CONFIG_DEBUG_NOTIFIERS is not set
1049# CONFIG_BOOT_PRINTK_DELAY is not set 1065# CONFIG_BOOT_PRINTK_DELAY is not set
1050# CONFIG_RCU_TORTURE_TEST is not set 1066# CONFIG_RCU_TORTURE_TEST is not set
1051# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1067# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1055,6 +1071,8 @@ CONFIG_DEBUG_MEMORY_INIT=y
1055# CONFIG_LATENCYTOP is not set 1071# CONFIG_LATENCYTOP is not set
1056CONFIG_SYSCTL_SYSCALL_CHECK=y 1072CONFIG_SYSCTL_SYSCALL_CHECK=y
1057CONFIG_HAVE_FUNCTION_TRACER=y 1073CONFIG_HAVE_FUNCTION_TRACER=y
1074CONFIG_HAVE_DYNAMIC_FTRACE=y
1075CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1058 1076
1059# 1077#
1060# Tracers 1078# Tracers
@@ -1064,11 +1082,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1064# CONFIG_SCHED_TRACER is not set 1082# CONFIG_SCHED_TRACER is not set
1065# CONFIG_CONTEXT_SWITCH_TRACER is not set 1083# CONFIG_CONTEXT_SWITCH_TRACER is not set
1066# CONFIG_BOOT_TRACER is not set 1084# CONFIG_BOOT_TRACER is not set
1085# CONFIG_TRACE_BRANCH_PROFILING is not set
1067# CONFIG_STACK_TRACER is not set 1086# CONFIG_STACK_TRACER is not set
1068# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1087# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1069# CONFIG_SAMPLES is not set 1088# CONFIG_SAMPLES is not set
1070CONFIG_HAVE_ARCH_KGDB=y 1089CONFIG_HAVE_ARCH_KGDB=y
1071# CONFIG_KGDB is not set 1090# CONFIG_KGDB is not set
1091CONFIG_PRINT_STACK_DEPTH=64
1072# CONFIG_DEBUG_STACKOVERFLOW is not set 1092# CONFIG_DEBUG_STACKOVERFLOW is not set
1073# CONFIG_DEBUG_STACK_USAGE is not set 1093# CONFIG_DEBUG_STACK_USAGE is not set
1074# CONFIG_DEBUG_PAGEALLOC is not set 1094# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1094,6 +1114,7 @@ CONFIG_CRYPTO=y
1094# 1114#
1095# CONFIG_CRYPTO_FIPS is not set 1115# CONFIG_CRYPTO_FIPS is not set
1096# CONFIG_CRYPTO_MANAGER is not set 1116# CONFIG_CRYPTO_MANAGER is not set
1117# CONFIG_CRYPTO_MANAGER2 is not set
1097# CONFIG_CRYPTO_GF128MUL is not set 1118# CONFIG_CRYPTO_GF128MUL is not set
1098# CONFIG_CRYPTO_NULL is not set 1119# CONFIG_CRYPTO_NULL is not set
1099# CONFIG_CRYPTO_CRYPTD is not set 1120# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/40x/walnut_defconfig b/arch/powerpc/configs/40x/walnut_defconfig
index 5820e0a4fc55..5ab29dddd21c 100644
--- a/arch/powerpc/configs/40x/walnut_defconfig
+++ b/arch/powerpc/configs/40x/walnut_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 08:49:27 2008 4# Tue Jan 20 08:17:57 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_40x=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_4xx=y 17CONFIG_4xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -71,12 +72,12 @@ CONFIG_POSIX_MQUEUE=y
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75CONFIG_GROUP_SCHED=y 75CONFIG_GROUP_SCHED=y
76CONFIG_FAIR_GROUP_SCHED=y 76CONFIG_FAIR_GROUP_SCHED=y
77# CONFIG_RT_GROUP_SCHED is not set 77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y 78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set 79# CONFIG_CGROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -89,6 +90,7 @@ CONFIG_EMBEDDED=y
89CONFIG_SYSCTL_SYSCALL=y 90CONFIG_SYSCTL_SYSCALL=y
90CONFIG_KALLSYMS=y 91CONFIG_KALLSYMS=y
91CONFIG_KALLSYMS_ALL=y 92CONFIG_KALLSYMS_ALL=y
93CONFIG_KALLSYMS_STRIP_GENERATED=y
92CONFIG_KALLSYMS_EXTRA_PASS=y 94CONFIG_KALLSYMS_EXTRA_PASS=y
93CONFIG_HOTPLUG=y 95CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y 96CONFIG_PRINTK=y
@@ -111,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 113CONFIG_SLUB=y
112# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -122,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 127CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 133CONFIG_BLOCK=y
135CONFIG_LBD=y 134CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
140 138
@@ -151,6 +149,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
155# CONFIG_PPC4xx_PCI_EXPRESS is not set 157# CONFIG_PPC4xx_PCI_EXPRESS is not set
156 158
@@ -185,6 +187,7 @@ CONFIG_IBM405_ERR51=y
185# CONFIG_CPU_FREQ is not set 187# CONFIG_CPU_FREQ is not set
186# CONFIG_FSL_ULI1575 is not set 188# CONFIG_FSL_ULI1575 is not set
187CONFIG_OF_RTC=y 189CONFIG_OF_RTC=y
190# CONFIG_SIMPLE_GPIO is not set
188 191
189# 192#
190# Kernel options 193# Kernel options
@@ -208,6 +211,7 @@ CONFIG_BINFMT_ELF=y
208# CONFIG_BINFMT_MISC is not set 211# CONFIG_BINFMT_MISC is not set
209# CONFIG_MATH_EMULATION is not set 212# CONFIG_MATH_EMULATION is not set
210# CONFIG_IOMMU_HELPER is not set 213# CONFIG_IOMMU_HELPER is not set
214CONFIG_PPC_NEED_DMA_SYNC_OPS=y
211CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 215CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
212CONFIG_ARCH_HAS_WALK_MEMORY=y 216CONFIG_ARCH_HAS_WALK_MEMORY=y
213CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 217CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -222,12 +226,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
222CONFIG_PAGEFLAGS_EXTENDED=y 226CONFIG_PAGEFLAGS_EXTENDED=y
223CONFIG_SPLIT_PTLOCK_CPUS=4 227CONFIG_SPLIT_PTLOCK_CPUS=4
224CONFIG_MIGRATION=y 228CONFIG_MIGRATION=y
225CONFIG_RESOURCES_64BIT=y
226# CONFIG_PHYS_ADDR_T_64BIT is not set 229# CONFIG_PHYS_ADDR_T_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=1 230CONFIG_ZONE_DMA_FLAG=1
228CONFIG_BOUNCE=y 231CONFIG_BOUNCE=y
229CONFIG_VIRT_TO_BUS=y 232CONFIG_VIRT_TO_BUS=y
230CONFIG_UNEVICTABLE_LRU=y 233CONFIG_UNEVICTABLE_LRU=y
234CONFIG_PPC_4K_PAGES=y
235# CONFIG_PPC_16K_PAGES is not set
236# CONFIG_PPC_64K_PAGES is not set
231CONFIG_FORCE_MAX_ZONEORDER=11 237CONFIG_FORCE_MAX_ZONEORDER=11
232CONFIG_PROC_DEVICETREE=y 238CONFIG_PROC_DEVICETREE=y
233# CONFIG_CMDLINE_BOOL is not set 239# CONFIG_CMDLINE_BOOL is not set
@@ -251,6 +257,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
251# CONFIG_PCI_MSI is not set 257# CONFIG_PCI_MSI is not set
252# CONFIG_PCI_LEGACY is not set 258# CONFIG_PCI_LEGACY is not set
253# CONFIG_PCI_DEBUG is not set 259# CONFIG_PCI_DEBUG is not set
260# CONFIG_PCI_STUB is not set
254# CONFIG_PCCARD is not set 261# CONFIG_PCCARD is not set
255# CONFIG_HOTPLUG_PCI is not set 262# CONFIG_HOTPLUG_PCI is not set
256# CONFIG_HAS_RAPIDIO is not set 263# CONFIG_HAS_RAPIDIO is not set
@@ -275,6 +282,7 @@ CONFIG_NET=y
275# 282#
276# Networking options 283# Networking options
277# 284#
285CONFIG_COMPAT_NET_DEV_OPS=y
278CONFIG_PACKET=y 286CONFIG_PACKET=y
279# CONFIG_PACKET_MMAP is not set 287# CONFIG_PACKET_MMAP is not set
280CONFIG_UNIX=y 288CONFIG_UNIX=y
@@ -325,6 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
325# CONFIG_ECONET is not set 333# CONFIG_ECONET is not set
326# CONFIG_WAN_ROUTER is not set 334# CONFIG_WAN_ROUTER is not set
327# CONFIG_NET_SCHED is not set 335# CONFIG_NET_SCHED is not set
336# CONFIG_DCB is not set
328 337
329# 338#
330# Network testing 339# Network testing
@@ -337,6 +346,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
337# CONFIG_AF_RXRPC is not set 346# CONFIG_AF_RXRPC is not set
338# CONFIG_PHONET is not set 347# CONFIG_PHONET is not set
339# CONFIG_WIRELESS is not set 348# CONFIG_WIRELESS is not set
349# CONFIG_WIMAX is not set
340# CONFIG_RFKILL is not set 350# CONFIG_RFKILL is not set
341# CONFIG_NET_9P is not set 351# CONFIG_NET_9P is not set
342 352
@@ -362,6 +372,7 @@ CONFIG_MTD=y
362# CONFIG_MTD_DEBUG is not set 372# CONFIG_MTD_DEBUG is not set
363# CONFIG_MTD_CONCAT is not set 373# CONFIG_MTD_CONCAT is not set
364CONFIG_MTD_PARTITIONS=y 374CONFIG_MTD_PARTITIONS=y
375# CONFIG_MTD_TESTS is not set
365# CONFIG_MTD_REDBOOT_PARTS is not set 376# CONFIG_MTD_REDBOOT_PARTS is not set
366CONFIG_MTD_CMDLINE_PARTS=y 377CONFIG_MTD_CMDLINE_PARTS=y
367CONFIG_MTD_OF_PARTS=y 378CONFIG_MTD_OF_PARTS=y
@@ -434,6 +445,12 @@ CONFIG_MTD_PHYSMAP_OF=y
434# CONFIG_MTD_ONENAND is not set 445# CONFIG_MTD_ONENAND is not set
435 446
436# 447#
448# LPDDR flash memory drivers
449#
450# CONFIG_MTD_LPDDR is not set
451# CONFIG_MTD_QINFO_PROBE is not set
452
453#
437# UBI - Unsorted block images 454# UBI - Unsorted block images
438# 455#
439# CONFIG_MTD_UBI is not set 456# CONFIG_MTD_UBI is not set
@@ -464,6 +481,7 @@ CONFIG_MISC_DEVICES=y
464# CONFIG_TIFM_CORE is not set 481# CONFIG_TIFM_CORE is not set
465# CONFIG_ENCLOSURE_SERVICES is not set 482# CONFIG_ENCLOSURE_SERVICES is not set
466# CONFIG_HP_ILO is not set 483# CONFIG_HP_ILO is not set
484# CONFIG_C2PORT is not set
467CONFIG_HAVE_IDE=y 485CONFIG_HAVE_IDE=y
468# CONFIG_IDE is not set 486# CONFIG_IDE is not set
469 487
@@ -546,6 +564,7 @@ CONFIG_NETDEV_1000=y
546# CONFIG_JME is not set 564# CONFIG_JME is not set
547CONFIG_NETDEV_10000=y 565CONFIG_NETDEV_10000=y
548# CONFIG_CHELSIO_T1 is not set 566# CONFIG_CHELSIO_T1 is not set
567CONFIG_CHELSIO_T3_DEPENDS=y
549# CONFIG_CHELSIO_T3 is not set 568# CONFIG_CHELSIO_T3 is not set
550# CONFIG_ENIC is not set 569# CONFIG_ENIC is not set
551# CONFIG_IXGBE is not set 570# CONFIG_IXGBE is not set
@@ -568,6 +587,10 @@ CONFIG_NETDEV_10000=y
568# CONFIG_WLAN_PRE80211 is not set 587# CONFIG_WLAN_PRE80211 is not set
569# CONFIG_WLAN_80211 is not set 588# CONFIG_WLAN_80211 is not set
570# CONFIG_IWLWIFI_LEDS is not set 589# CONFIG_IWLWIFI_LEDS is not set
590
591#
592# Enable WiMAX (Networking options) to see the WiMAX drivers
593#
571# CONFIG_WAN is not set 594# CONFIG_WAN is not set
572# CONFIG_FDDI is not set 595# CONFIG_FDDI is not set
573# CONFIG_HIPPI is not set 596# CONFIG_HIPPI is not set
@@ -620,9 +643,12 @@ CONFIG_SERIAL_CORE=y
620CONFIG_SERIAL_CORE_CONSOLE=y 643CONFIG_SERIAL_CORE_CONSOLE=y
621# CONFIG_SERIAL_JSM is not set 644# CONFIG_SERIAL_JSM is not set
622CONFIG_SERIAL_OF_PLATFORM=y 645CONFIG_SERIAL_OF_PLATFORM=y
646# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
623CONFIG_UNIX98_PTYS=y 647CONFIG_UNIX98_PTYS=y
648# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
624CONFIG_LEGACY_PTYS=y 649CONFIG_LEGACY_PTYS=y
625CONFIG_LEGACY_PTY_COUNT=256 650CONFIG_LEGACY_PTY_COUNT=256
651# CONFIG_HVC_UDBG is not set
626# CONFIG_IPMI_HANDLER is not set 652# CONFIG_IPMI_HANDLER is not set
627# CONFIG_HW_RANDOM is not set 653# CONFIG_HW_RANDOM is not set
628# CONFIG_NVRAM is not set 654# CONFIG_NVRAM is not set
@@ -641,11 +667,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
641# CONFIG_HWMON is not set 667# CONFIG_HWMON is not set
642CONFIG_THERMAL=y 668CONFIG_THERMAL=y
643# CONFIG_WATCHDOG is not set 669# CONFIG_WATCHDOG is not set
670CONFIG_SSB_POSSIBLE=y
644 671
645# 672#
646# Sonics Silicon Backplane 673# Sonics Silicon Backplane
647# 674#
648CONFIG_SSB_POSSIBLE=y
649# CONFIG_SSB is not set 675# CONFIG_SSB is not set
650 676
651# 677#
@@ -655,7 +681,7 @@ CONFIG_SSB_POSSIBLE=y
655# CONFIG_MFD_SM501 is not set 681# CONFIG_MFD_SM501 is not set
656# CONFIG_HTC_PASIC3 is not set 682# CONFIG_HTC_PASIC3 is not set
657# CONFIG_MFD_TMIO is not set 683# CONFIG_MFD_TMIO is not set
658# CONFIG_MFD_WM8400 is not set 684# CONFIG_REGULATOR is not set
659 685
660# 686#
661# Multimedia devices 687# Multimedia devices
@@ -701,9 +727,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
701# 727#
702 728
703# 729#
704# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 730# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
705# 731#
706# CONFIG_USB_GADGET is not set 732# CONFIG_USB_GADGET is not set
733
734#
735# OTG and related infrastructure
736#
707# CONFIG_UWB is not set 737# CONFIG_UWB is not set
708# CONFIG_MMC is not set 738# CONFIG_MMC is not set
709# CONFIG_MEMSTICK is not set 739# CONFIG_MEMSTICK is not set
@@ -729,7 +759,9 @@ CONFIG_EXT2_FS=y
729# CONFIG_FS_POSIX_ACL is not set 759# CONFIG_FS_POSIX_ACL is not set
730CONFIG_FILE_LOCKING=y 760CONFIG_FILE_LOCKING=y
731# CONFIG_XFS_FS is not set 761# CONFIG_XFS_FS is not set
762# CONFIG_GFS2_FS is not set
732# CONFIG_OCFS2_FS is not set 763# CONFIG_OCFS2_FS is not set
764# CONFIG_BTRFS_FS is not set
733CONFIG_DNOTIFY=y 765CONFIG_DNOTIFY=y
734CONFIG_INOTIFY=y 766CONFIG_INOTIFY=y
735CONFIG_INOTIFY_USER=y 767CONFIG_INOTIFY_USER=y
@@ -763,10 +795,7 @@ CONFIG_TMPFS=y
763# CONFIG_TMPFS_POSIX_ACL is not set 795# CONFIG_TMPFS_POSIX_ACL is not set
764# CONFIG_HUGETLB_PAGE is not set 796# CONFIG_HUGETLB_PAGE is not set
765# CONFIG_CONFIGFS_FS is not set 797# CONFIG_CONFIGFS_FS is not set
766 798CONFIG_MISC_FILESYSTEMS=y
767#
768# Miscellaneous filesystems
769#
770# CONFIG_ADFS_FS is not set 799# CONFIG_ADFS_FS is not set
771# CONFIG_AFFS_FS is not set 800# CONFIG_AFFS_FS is not set
772# CONFIG_HFS_FS is not set 801# CONFIG_HFS_FS is not set
@@ -776,6 +805,7 @@ CONFIG_TMPFS=y
776# CONFIG_EFS_FS is not set 805# CONFIG_EFS_FS is not set
777# CONFIG_JFFS2_FS is not set 806# CONFIG_JFFS2_FS is not set
778CONFIG_CRAMFS=y 807CONFIG_CRAMFS=y
808# CONFIG_SQUASHFS is not set
779# CONFIG_VXFS_FS is not set 809# CONFIG_VXFS_FS is not set
780# CONFIG_MINIX_FS is not set 810# CONFIG_MINIX_FS is not set
781# CONFIG_OMFS_FS is not set 811# CONFIG_OMFS_FS is not set
@@ -816,6 +846,7 @@ CONFIG_MSDOS_PARTITION=y
816# Library routines 846# Library routines
817# 847#
818CONFIG_BITREVERSE=y 848CONFIG_BITREVERSE=y
849CONFIG_GENERIC_FIND_LAST_BIT=y
819# CONFIG_CRC_CCITT is not set 850# CONFIG_CRC_CCITT is not set
820# CONFIG_CRC16 is not set 851# CONFIG_CRC16 is not set
821# CONFIG_CRC_T10DIF is not set 852# CONFIG_CRC_T10DIF is not set
@@ -866,6 +897,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
866# CONFIG_DEBUG_MEMORY_INIT is not set 897# CONFIG_DEBUG_MEMORY_INIT is not set
867# CONFIG_DEBUG_LIST is not set 898# CONFIG_DEBUG_LIST is not set
868# CONFIG_DEBUG_SG is not set 899# CONFIG_DEBUG_SG is not set
900# CONFIG_DEBUG_NOTIFIERS is not set
869# CONFIG_BOOT_PRINTK_DELAY is not set 901# CONFIG_BOOT_PRINTK_DELAY is not set
870# CONFIG_RCU_TORTURE_TEST is not set 902# CONFIG_RCU_TORTURE_TEST is not set
871# CONFIG_RCU_CPU_STALL_DETECTOR is not set 903# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -874,18 +906,24 @@ CONFIG_DEBUG_BUGVERBOSE=y
874# CONFIG_FAULT_INJECTION is not set 906# CONFIG_FAULT_INJECTION is not set
875# CONFIG_LATENCYTOP is not set 907# CONFIG_LATENCYTOP is not set
876CONFIG_SYSCTL_SYSCALL_CHECK=y 908CONFIG_SYSCTL_SYSCALL_CHECK=y
877CONFIG_NOP_TRACER=y 909CONFIG_HAVE_FUNCTION_TRACER=y
878CONFIG_HAVE_FTRACE=y
879CONFIG_HAVE_DYNAMIC_FTRACE=y 910CONFIG_HAVE_DYNAMIC_FTRACE=y
880# CONFIG_FTRACE is not set 911CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
912
913#
914# Tracers
915#
916# CONFIG_FUNCTION_TRACER is not set
881# CONFIG_SCHED_TRACER is not set 917# CONFIG_SCHED_TRACER is not set
882# CONFIG_CONTEXT_SWITCH_TRACER is not set 918# CONFIG_CONTEXT_SWITCH_TRACER is not set
883# CONFIG_BOOT_TRACER is not set 919# CONFIG_BOOT_TRACER is not set
920# CONFIG_TRACE_BRANCH_PROFILING is not set
884# CONFIG_STACK_TRACER is not set 921# CONFIG_STACK_TRACER is not set
885# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 922# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
886# CONFIG_SAMPLES is not set 923# CONFIG_SAMPLES is not set
887CONFIG_HAVE_ARCH_KGDB=y 924CONFIG_HAVE_ARCH_KGDB=y
888# CONFIG_KGDB is not set 925# CONFIG_KGDB is not set
926CONFIG_PRINT_STACK_DEPTH=64
889# CONFIG_DEBUG_STACKOVERFLOW is not set 927# CONFIG_DEBUG_STACKOVERFLOW is not set
890# CONFIG_DEBUG_STACK_USAGE is not set 928# CONFIG_DEBUG_STACK_USAGE is not set
891# CONFIG_DEBUG_PAGEALLOC is not set 929# CONFIG_DEBUG_PAGEALLOC is not set
@@ -912,11 +950,15 @@ CONFIG_CRYPTO=y
912# 950#
913# CONFIG_CRYPTO_FIPS is not set 951# CONFIG_CRYPTO_FIPS is not set
914CONFIG_CRYPTO_ALGAPI=y 952CONFIG_CRYPTO_ALGAPI=y
915CONFIG_CRYPTO_AEAD=y 953CONFIG_CRYPTO_ALGAPI2=y
954CONFIG_CRYPTO_AEAD2=y
916CONFIG_CRYPTO_BLKCIPHER=y 955CONFIG_CRYPTO_BLKCIPHER=y
956CONFIG_CRYPTO_BLKCIPHER2=y
917CONFIG_CRYPTO_HASH=y 957CONFIG_CRYPTO_HASH=y
918CONFIG_CRYPTO_RNG=y 958CONFIG_CRYPTO_HASH2=y
959CONFIG_CRYPTO_RNG2=y
919CONFIG_CRYPTO_MANAGER=y 960CONFIG_CRYPTO_MANAGER=y
961CONFIG_CRYPTO_MANAGER2=y
920# CONFIG_CRYPTO_GF128MUL is not set 962# CONFIG_CRYPTO_GF128MUL is not set
921# CONFIG_CRYPTO_NULL is not set 963# CONFIG_CRYPTO_NULL is not set
922# CONFIG_CRYPTO_CRYPTD is not set 964# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/44x/arches_defconfig b/arch/powerpc/configs/44x/arches_defconfig
index 082158d591c5..1d72b0ac3f25 100644
--- a/arch/powerpc/configs/44x/arches_defconfig
+++ b/arch/powerpc/configs/44x/arches_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.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:04 2008 4# Tue Jan 20 08:22:31 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,6 +19,7 @@ CONFIG_4xx=y
19CONFIG_BOOKE=y 19CONFIG_BOOKE=y
20CONFIG_PTE_64BIT=y 20CONFIG_PTE_64BIT=y
21CONFIG_PHYS_64BIT=y 21CONFIG_PHYS_64BIT=y
22CONFIG_PPC_MMU_NOHASH=y
22# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y 24CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 25CONFIG_PPC32=y
@@ -44,7 +45,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 45CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
50CONFIG_OF=y 51CONFIG_OF=y
@@ -75,8 +76,8 @@ CONFIG_POSIX_MQUEUE=y
75# CONFIG_AUDIT is not set 76# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 77# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79# CONFIG_GROUP_SCHED is not set 79# CONFIG_GROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -111,7 +112,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 112CONFIG_SLUB=y
112# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 114# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 115CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set 116# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -122,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 126CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 132CONFIG_BLOCK=y
135CONFIG_LBD=y 133CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
140 137
@@ -151,6 +148,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
155CONFIG_PPC4xx_PCI_EXPRESS=y 156CONFIG_PPC4xx_PCI_EXPRESS=y
156 157
@@ -188,6 +189,7 @@ CONFIG_460EX=y
188# CONFIG_GENERIC_IOMAP is not set 189# CONFIG_GENERIC_IOMAP is not set
189# CONFIG_CPU_FREQ is not set 190# CONFIG_CPU_FREQ is not set
190# CONFIG_FSL_ULI1575 is not set 191# CONFIG_FSL_ULI1575 is not set
192# CONFIG_SIMPLE_GPIO is not set
191 193
192# 194#
193# Kernel options 195# Kernel options
@@ -212,6 +214,7 @@ CONFIG_BINFMT_ELF=y
212# CONFIG_BINFMT_MISC is not set 214# CONFIG_BINFMT_MISC is not set
213# CONFIG_MATH_EMULATION is not set 215# CONFIG_MATH_EMULATION is not set
214# CONFIG_IOMMU_HELPER is not set 216# CONFIG_IOMMU_HELPER is not set
217CONFIG_PPC_NEED_DMA_SYNC_OPS=y
215CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 218CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
216CONFIG_ARCH_HAS_WALK_MEMORY=y 219CONFIG_ARCH_HAS_WALK_MEMORY=y
217CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 220CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -226,12 +229,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
226CONFIG_PAGEFLAGS_EXTENDED=y 229CONFIG_PAGEFLAGS_EXTENDED=y
227CONFIG_SPLIT_PTLOCK_CPUS=4 230CONFIG_SPLIT_PTLOCK_CPUS=4
228CONFIG_MIGRATION=y 231CONFIG_MIGRATION=y
229CONFIG_RESOURCES_64BIT=y
230CONFIG_PHYS_ADDR_T_64BIT=y 232CONFIG_PHYS_ADDR_T_64BIT=y
231CONFIG_ZONE_DMA_FLAG=1 233CONFIG_ZONE_DMA_FLAG=1
232CONFIG_BOUNCE=y 234CONFIG_BOUNCE=y
233CONFIG_VIRT_TO_BUS=y 235CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y 236CONFIG_UNEVICTABLE_LRU=y
237CONFIG_PPC_4K_PAGES=y
238# CONFIG_PPC_16K_PAGES is not set
239# CONFIG_PPC_64K_PAGES is not set
235CONFIG_FORCE_MAX_ZONEORDER=11 240CONFIG_FORCE_MAX_ZONEORDER=11
236CONFIG_PROC_DEVICETREE=y 241CONFIG_PROC_DEVICETREE=y
237CONFIG_CMDLINE_BOOL=y 242CONFIG_CMDLINE_BOOL=y
@@ -255,6 +260,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
255# CONFIG_PCI_MSI is not set 260# CONFIG_PCI_MSI is not set
256CONFIG_PCI_LEGACY=y 261CONFIG_PCI_LEGACY=y
257# CONFIG_PCI_DEBUG is not set 262# CONFIG_PCI_DEBUG is not set
263# CONFIG_PCI_STUB is not set
258# CONFIG_PCCARD is not set 264# CONFIG_PCCARD is not set
259# CONFIG_HOTPLUG_PCI is not set 265# CONFIG_HOTPLUG_PCI is not set
260# CONFIG_HAS_RAPIDIO is not set 266# CONFIG_HAS_RAPIDIO is not set
@@ -279,6 +285,7 @@ CONFIG_NET=y
279# 285#
280# Networking options 286# Networking options
281# 287#
288CONFIG_COMPAT_NET_DEV_OPS=y
282CONFIG_PACKET=y 289CONFIG_PACKET=y
283# CONFIG_PACKET_MMAP is not set 290# CONFIG_PACKET_MMAP is not set
284CONFIG_UNIX=y 291CONFIG_UNIX=y
@@ -329,6 +336,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
329# CONFIG_ECONET is not set 336# CONFIG_ECONET is not set
330# CONFIG_WAN_ROUTER is not set 337# CONFIG_WAN_ROUTER is not set
331# CONFIG_NET_SCHED is not set 338# CONFIG_NET_SCHED is not set
339# CONFIG_DCB is not set
332 340
333# 341#
334# Network testing 342# Network testing
@@ -341,6 +349,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
341# CONFIG_AF_RXRPC is not set 349# CONFIG_AF_RXRPC is not set
342# CONFIG_PHONET is not set 350# CONFIG_PHONET is not set
343# CONFIG_WIRELESS is not set 351# CONFIG_WIRELESS is not set
352# CONFIG_WIMAX is not set
344# CONFIG_RFKILL is not set 353# CONFIG_RFKILL is not set
345# CONFIG_NET_9P is not set 354# CONFIG_NET_9P is not set
346 355
@@ -453,6 +462,10 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y
453# CONFIG_WLAN_PRE80211 is not set 462# CONFIG_WLAN_PRE80211 is not set
454# CONFIG_WLAN_80211 is not set 463# CONFIG_WLAN_80211 is not set
455# CONFIG_IWLWIFI_LEDS is not set 464# CONFIG_IWLWIFI_LEDS is not set
465
466#
467# Enable WiMAX (Networking options) to see the WiMAX drivers
468#
456# CONFIG_WAN is not set 469# CONFIG_WAN is not set
457# CONFIG_FDDI is not set 470# CONFIG_FDDI is not set
458# CONFIG_HIPPI is not set 471# CONFIG_HIPPI is not set
@@ -505,9 +518,12 @@ CONFIG_SERIAL_CORE=y
505CONFIG_SERIAL_CORE_CONSOLE=y 518CONFIG_SERIAL_CORE_CONSOLE=y
506# CONFIG_SERIAL_JSM is not set 519# CONFIG_SERIAL_JSM is not set
507CONFIG_SERIAL_OF_PLATFORM=y 520CONFIG_SERIAL_OF_PLATFORM=y
521# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
508CONFIG_UNIX98_PTYS=y 522CONFIG_UNIX98_PTYS=y
523# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
509CONFIG_LEGACY_PTYS=y 524CONFIG_LEGACY_PTYS=y
510CONFIG_LEGACY_PTY_COUNT=256 525CONFIG_LEGACY_PTY_COUNT=256
526# CONFIG_HVC_UDBG is not set
511# CONFIG_IPMI_HANDLER is not set 527# CONFIG_IPMI_HANDLER is not set
512# CONFIG_HW_RANDOM is not set 528# CONFIG_HW_RANDOM is not set
513# CONFIG_NVRAM is not set 529# CONFIG_NVRAM is not set
@@ -527,11 +543,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
527# CONFIG_THERMAL is not set 543# CONFIG_THERMAL is not set
528# CONFIG_THERMAL_HWMON is not set 544# CONFIG_THERMAL_HWMON is not set
529# CONFIG_WATCHDOG is not set 545# CONFIG_WATCHDOG is not set
546CONFIG_SSB_POSSIBLE=y
530 547
531# 548#
532# Sonics Silicon Backplane 549# Sonics Silicon Backplane
533# 550#
534CONFIG_SSB_POSSIBLE=y
535# CONFIG_SSB is not set 551# CONFIG_SSB is not set
536 552
537# 553#
@@ -541,7 +557,7 @@ CONFIG_SSB_POSSIBLE=y
541# CONFIG_MFD_SM501 is not set 557# CONFIG_MFD_SM501 is not set
542# CONFIG_HTC_PASIC3 is not set 558# CONFIG_HTC_PASIC3 is not set
543# CONFIG_MFD_TMIO is not set 559# CONFIG_MFD_TMIO is not set
544# CONFIG_MFD_WM8400 is not set 560# CONFIG_REGULATOR is not set
545 561
546# 562#
547# Multimedia devices 563# Multimedia devices
@@ -600,7 +616,9 @@ CONFIG_EXT2_FS=y
600# CONFIG_FS_POSIX_ACL is not set 616# CONFIG_FS_POSIX_ACL is not set
601CONFIG_FILE_LOCKING=y 617CONFIG_FILE_LOCKING=y
602# CONFIG_XFS_FS is not set 618# CONFIG_XFS_FS is not set
619# CONFIG_GFS2_FS is not set
603# CONFIG_OCFS2_FS is not set 620# CONFIG_OCFS2_FS is not set
621# CONFIG_BTRFS_FS is not set
604CONFIG_DNOTIFY=y 622CONFIG_DNOTIFY=y
605CONFIG_INOTIFY=y 623CONFIG_INOTIFY=y
606CONFIG_INOTIFY_USER=y 624CONFIG_INOTIFY_USER=y
@@ -634,10 +652,7 @@ CONFIG_TMPFS=y
634# CONFIG_TMPFS_POSIX_ACL is not set 652# CONFIG_TMPFS_POSIX_ACL is not set
635# CONFIG_HUGETLB_PAGE is not set 653# CONFIG_HUGETLB_PAGE is not set
636# CONFIG_CONFIGFS_FS is not set 654# CONFIG_CONFIGFS_FS is not set
637 655CONFIG_MISC_FILESYSTEMS=y
638#
639# Miscellaneous filesystems
640#
641# CONFIG_ADFS_FS is not set 656# CONFIG_ADFS_FS is not set
642# CONFIG_AFFS_FS is not set 657# CONFIG_AFFS_FS is not set
643# CONFIG_HFS_FS is not set 658# CONFIG_HFS_FS is not set
@@ -646,6 +661,7 @@ CONFIG_TMPFS=y
646# CONFIG_BFS_FS is not set 661# CONFIG_BFS_FS is not set
647# CONFIG_EFS_FS is not set 662# CONFIG_EFS_FS is not set
648CONFIG_CRAMFS=y 663CONFIG_CRAMFS=y
664# CONFIG_SQUASHFS is not set
649# CONFIG_VXFS_FS is not set 665# CONFIG_VXFS_FS is not set
650# CONFIG_MINIX_FS is not set 666# CONFIG_MINIX_FS is not set
651# CONFIG_OMFS_FS is not set 667# CONFIG_OMFS_FS is not set
@@ -686,6 +702,7 @@ CONFIG_MSDOS_PARTITION=y
686# Library routines 702# Library routines
687# 703#
688CONFIG_BITREVERSE=y 704CONFIG_BITREVERSE=y
705CONFIG_GENERIC_FIND_LAST_BIT=y
689# CONFIG_CRC_CCITT is not set 706# CONFIG_CRC_CCITT is not set
690# CONFIG_CRC16 is not set 707# CONFIG_CRC16 is not set
691# CONFIG_CRC_T10DIF is not set 708# CONFIG_CRC_T10DIF is not set
@@ -736,6 +753,7 @@ CONFIG_SCHED_DEBUG=y
736# CONFIG_DEBUG_MEMORY_INIT is not set 753# CONFIG_DEBUG_MEMORY_INIT is not set
737# CONFIG_DEBUG_LIST is not set 754# CONFIG_DEBUG_LIST is not set
738# CONFIG_DEBUG_SG is not set 755# CONFIG_DEBUG_SG is not set
756# CONFIG_DEBUG_NOTIFIERS is not set
739# CONFIG_BOOT_PRINTK_DELAY is not set 757# CONFIG_BOOT_PRINTK_DELAY is not set
740# CONFIG_RCU_TORTURE_TEST is not set 758# CONFIG_RCU_TORTURE_TEST is not set
741# CONFIG_RCU_CPU_STALL_DETECTOR is not set 759# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -744,18 +762,24 @@ CONFIG_SCHED_DEBUG=y
744# CONFIG_FAULT_INJECTION is not set 762# CONFIG_FAULT_INJECTION is not set
745# CONFIG_LATENCYTOP is not set 763# CONFIG_LATENCYTOP is not set
746CONFIG_SYSCTL_SYSCALL_CHECK=y 764CONFIG_SYSCTL_SYSCALL_CHECK=y
747CONFIG_NOP_TRACER=y 765CONFIG_HAVE_FUNCTION_TRACER=y
748CONFIG_HAVE_FTRACE=y
749CONFIG_HAVE_DYNAMIC_FTRACE=y 766CONFIG_HAVE_DYNAMIC_FTRACE=y
750# CONFIG_FTRACE is not set 767CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
768
769#
770# Tracers
771#
772# CONFIG_FUNCTION_TRACER is not set
751# CONFIG_SCHED_TRACER is not set 773# CONFIG_SCHED_TRACER is not set
752# CONFIG_CONTEXT_SWITCH_TRACER is not set 774# CONFIG_CONTEXT_SWITCH_TRACER is not set
753# CONFIG_BOOT_TRACER is not set 775# CONFIG_BOOT_TRACER is not set
776# CONFIG_TRACE_BRANCH_PROFILING is not set
754# CONFIG_STACK_TRACER is not set 777# CONFIG_STACK_TRACER is not set
755# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 778# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
756# CONFIG_SAMPLES is not set 779# CONFIG_SAMPLES is not set
757CONFIG_HAVE_ARCH_KGDB=y 780CONFIG_HAVE_ARCH_KGDB=y
758# CONFIG_KGDB is not set 781# CONFIG_KGDB is not set
782CONFIG_PRINT_STACK_DEPTH=64
759# CONFIG_DEBUG_STACKOVERFLOW is not set 783# CONFIG_DEBUG_STACKOVERFLOW is not set
760# CONFIG_DEBUG_STACK_USAGE is not set 784# CONFIG_DEBUG_STACK_USAGE is not set
761# CONFIG_DEBUG_PAGEALLOC is not set 785# CONFIG_DEBUG_PAGEALLOC is not set
diff --git a/arch/powerpc/configs/44x/bamboo_defconfig b/arch/powerpc/configs/44x/bamboo_defconfig
index f47c2f3420f6..959bdc43a491 100644
--- a/arch/powerpc/configs/44x/bamboo_defconfig
+++ b/arch/powerpc/configs/44x/bamboo_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:06 2008 4# Tue Jan 20 08:22:33 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,6 +19,7 @@ CONFIG_4xx=y
19CONFIG_BOOKE=y 19CONFIG_BOOKE=y
20CONFIG_PTE_64BIT=y 20CONFIG_PTE_64BIT=y
21CONFIG_PHYS_64BIT=y 21CONFIG_PHYS_64BIT=y
22CONFIG_PPC_MMU_NOHASH=y
22# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y 24CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 25CONFIG_PPC32=y
@@ -44,7 +45,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 45CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
50CONFIG_OF=y 51CONFIG_OF=y
@@ -75,12 +76,12 @@ CONFIG_POSIX_MQUEUE=y
75# CONFIG_AUDIT is not set 76# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 77# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 79CONFIG_GROUP_SCHED=y
80CONFIG_FAIR_GROUP_SCHED=y 80CONFIG_FAIR_GROUP_SCHED=y
81# CONFIG_RT_GROUP_SCHED is not set 81# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 82CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 83# CONFIG_CGROUP_SCHED is not set
84# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 85CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 86CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 87# CONFIG_RELAY is not set
@@ -115,7 +116,6 @@ CONFIG_SLUB_DEBUG=y
115CONFIG_SLUB=y 116CONFIG_SLUB=y
116# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set 118# CONFIG_PROFILING is not set
118# CONFIG_MARKERS is not set
119CONFIG_HAVE_OPROFILE=y 119CONFIG_HAVE_OPROFILE=y
120# CONFIG_KPROBES is not set 120# CONFIG_KPROBES is not set
121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -126,7 +126,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
129# CONFIG_TINY_SHMEM is not set
130CONFIG_BASE_SMALL=0 129CONFIG_BASE_SMALL=0
131CONFIG_MODULES=y 130CONFIG_MODULES=y
132# CONFIG_MODULE_FORCE_LOAD is not set 131# CONFIG_MODULE_FORCE_LOAD is not set
@@ -134,11 +133,9 @@ CONFIG_MODULE_UNLOAD=y
134# CONFIG_MODULE_FORCE_UNLOAD is not set 133# CONFIG_MODULE_FORCE_UNLOAD is not set
135# CONFIG_MODVERSIONS is not set 134# CONFIG_MODVERSIONS is not set
136# CONFIG_MODULE_SRCVERSION_ALL is not set 135# CONFIG_MODULE_SRCVERSION_ALL is not set
137CONFIG_KMOD=y
138CONFIG_BLOCK=y 136CONFIG_BLOCK=y
139CONFIG_LBD=y 137CONFIG_LBD=y
140# CONFIG_BLK_DEV_IO_TRACE is not set 138# CONFIG_BLK_DEV_IO_TRACE is not set
141# CONFIG_LSF is not set
142# CONFIG_BLK_DEV_BSG is not set 139# CONFIG_BLK_DEV_BSG is not set
143# CONFIG_BLK_DEV_INTEGRITY is not set 140# CONFIG_BLK_DEV_INTEGRITY is not set
144 141
@@ -155,6 +152,10 @@ CONFIG_DEFAULT_AS=y
155# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
156CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
157CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_TREE_RCU is not set
156# CONFIG_PREEMPT_RCU is not set
157# CONFIG_TREE_RCU_TRACE is not set
158# CONFIG_PREEMPT_RCU_TRACE is not set
158# CONFIG_FREEZER is not set 159# CONFIG_FREEZER is not set
159# CONFIG_PPC4xx_PCI_EXPRESS is not set 160# CONFIG_PPC4xx_PCI_EXPRESS is not set
160 161
@@ -193,6 +194,7 @@ CONFIG_IBM440EP_ERR42=y
193# CONFIG_GENERIC_IOMAP is not set 194# CONFIG_GENERIC_IOMAP is not set
194# CONFIG_CPU_FREQ is not set 195# CONFIG_CPU_FREQ is not set
195# CONFIG_FSL_ULI1575 is not set 196# CONFIG_FSL_ULI1575 is not set
197# CONFIG_SIMPLE_GPIO is not set
196 198
197# 199#
198# Kernel options 200# Kernel options
@@ -216,6 +218,7 @@ CONFIG_BINFMT_ELF=y
216# CONFIG_BINFMT_MISC is not set 218# CONFIG_BINFMT_MISC is not set
217# CONFIG_MATH_EMULATION is not set 219# CONFIG_MATH_EMULATION is not set
218# CONFIG_IOMMU_HELPER is not set 220# CONFIG_IOMMU_HELPER is not set
221CONFIG_PPC_NEED_DMA_SYNC_OPS=y
219CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 222CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
220CONFIG_ARCH_HAS_WALK_MEMORY=y 223CONFIG_ARCH_HAS_WALK_MEMORY=y
221CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -230,12 +233,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
230CONFIG_PAGEFLAGS_EXTENDED=y 233CONFIG_PAGEFLAGS_EXTENDED=y
231CONFIG_SPLIT_PTLOCK_CPUS=4 234CONFIG_SPLIT_PTLOCK_CPUS=4
232CONFIG_MIGRATION=y 235CONFIG_MIGRATION=y
233CONFIG_RESOURCES_64BIT=y
234CONFIG_PHYS_ADDR_T_64BIT=y 236CONFIG_PHYS_ADDR_T_64BIT=y
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
238CONFIG_UNEVICTABLE_LRU=y 240CONFIG_UNEVICTABLE_LRU=y
241CONFIG_PPC_4K_PAGES=y
242# CONFIG_PPC_16K_PAGES is not set
243# CONFIG_PPC_64K_PAGES is not set
239CONFIG_FORCE_MAX_ZONEORDER=11 244CONFIG_FORCE_MAX_ZONEORDER=11
240CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
241CONFIG_CMDLINE_BOOL=y 246CONFIG_CMDLINE_BOOL=y
@@ -259,6 +264,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
259# CONFIG_PCI_MSI is not set 264# CONFIG_PCI_MSI is not set
260CONFIG_PCI_LEGACY=y 265CONFIG_PCI_LEGACY=y
261# CONFIG_PCI_DEBUG is not set 266# CONFIG_PCI_DEBUG is not set
267# CONFIG_PCI_STUB is not set
262# CONFIG_PCCARD is not set 268# CONFIG_PCCARD is not set
263# CONFIG_HOTPLUG_PCI is not set 269# CONFIG_HOTPLUG_PCI is not set
264# CONFIG_HAS_RAPIDIO is not set 270# CONFIG_HAS_RAPIDIO is not set
@@ -283,6 +289,7 @@ CONFIG_NET=y
283# 289#
284# Networking options 290# Networking options
285# 291#
292CONFIG_COMPAT_NET_DEV_OPS=y
286CONFIG_PACKET=y 293CONFIG_PACKET=y
287# CONFIG_PACKET_MMAP is not set 294# CONFIG_PACKET_MMAP is not set
288CONFIG_UNIX=y 295CONFIG_UNIX=y
@@ -333,6 +340,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
333# CONFIG_ECONET is not set 340# CONFIG_ECONET is not set
334# CONFIG_WAN_ROUTER is not set 341# CONFIG_WAN_ROUTER is not set
335# CONFIG_NET_SCHED is not set 342# CONFIG_NET_SCHED is not set
343# CONFIG_DCB is not set
336 344
337# 345#
338# Network testing 346# Network testing
@@ -345,6 +353,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_AF_RXRPC is not set 353# CONFIG_AF_RXRPC is not set
346# CONFIG_PHONET is not set 354# CONFIG_PHONET is not set
347# CONFIG_WIRELESS is not set 355# CONFIG_WIRELESS is not set
356# CONFIG_WIMAX is not set
348# CONFIG_RFKILL is not set 357# CONFIG_RFKILL is not set
349# CONFIG_NET_9P is not set 358# CONFIG_NET_9P is not set
350 359
@@ -394,6 +403,7 @@ CONFIG_MISC_DEVICES=y
394# CONFIG_TIFM_CORE is not set 403# CONFIG_TIFM_CORE is not set
395# CONFIG_ENCLOSURE_SERVICES is not set 404# CONFIG_ENCLOSURE_SERVICES is not set
396# CONFIG_HP_ILO is not set 405# CONFIG_HP_ILO is not set
406# CONFIG_C2PORT is not set
397CONFIG_HAVE_IDE=y 407CONFIG_HAVE_IDE=y
398# CONFIG_IDE is not set 408# CONFIG_IDE is not set
399 409
@@ -476,6 +486,7 @@ CONFIG_NETDEV_1000=y
476# CONFIG_JME is not set 486# CONFIG_JME is not set
477CONFIG_NETDEV_10000=y 487CONFIG_NETDEV_10000=y
478# CONFIG_CHELSIO_T1 is not set 488# CONFIG_CHELSIO_T1 is not set
489CONFIG_CHELSIO_T3_DEPENDS=y
479# CONFIG_CHELSIO_T3 is not set 490# CONFIG_CHELSIO_T3 is not set
480# CONFIG_ENIC is not set 491# CONFIG_ENIC is not set
481# CONFIG_IXGBE is not set 492# CONFIG_IXGBE is not set
@@ -498,6 +509,10 @@ CONFIG_NETDEV_10000=y
498# CONFIG_WLAN_PRE80211 is not set 509# CONFIG_WLAN_PRE80211 is not set
499# CONFIG_WLAN_80211 is not set 510# CONFIG_WLAN_80211 is not set
500# CONFIG_IWLWIFI_LEDS is not set 511# CONFIG_IWLWIFI_LEDS is not set
512
513#
514# Enable WiMAX (Networking options) to see the WiMAX drivers
515#
501# CONFIG_WAN is not set 516# CONFIG_WAN is not set
502# CONFIG_FDDI is not set 517# CONFIG_FDDI is not set
503# CONFIG_HIPPI is not set 518# CONFIG_HIPPI is not set
@@ -550,9 +565,12 @@ CONFIG_SERIAL_CORE=y
550CONFIG_SERIAL_CORE_CONSOLE=y 565CONFIG_SERIAL_CORE_CONSOLE=y
551# CONFIG_SERIAL_JSM is not set 566# CONFIG_SERIAL_JSM is not set
552CONFIG_SERIAL_OF_PLATFORM=y 567CONFIG_SERIAL_OF_PLATFORM=y
568# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
553CONFIG_UNIX98_PTYS=y 569CONFIG_UNIX98_PTYS=y
570# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
554CONFIG_LEGACY_PTYS=y 571CONFIG_LEGACY_PTYS=y
555CONFIG_LEGACY_PTY_COUNT=256 572CONFIG_LEGACY_PTY_COUNT=256
573# CONFIG_HVC_UDBG is not set
556# CONFIG_IPMI_HANDLER is not set 574# CONFIG_IPMI_HANDLER is not set
557# CONFIG_HW_RANDOM is not set 575# CONFIG_HW_RANDOM is not set
558# CONFIG_NVRAM is not set 576# CONFIG_NVRAM is not set
@@ -571,11 +589,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
571# CONFIG_HWMON is not set 589# CONFIG_HWMON is not set
572CONFIG_THERMAL=y 590CONFIG_THERMAL=y
573# CONFIG_WATCHDOG is not set 591# CONFIG_WATCHDOG is not set
592CONFIG_SSB_POSSIBLE=y
574 593
575# 594#
576# Sonics Silicon Backplane 595# Sonics Silicon Backplane
577# 596#
578CONFIG_SSB_POSSIBLE=y
579# CONFIG_SSB is not set 597# CONFIG_SSB is not set
580 598
581# 599#
@@ -585,7 +603,7 @@ CONFIG_SSB_POSSIBLE=y
585# CONFIG_MFD_SM501 is not set 603# CONFIG_MFD_SM501 is not set
586# CONFIG_HTC_PASIC3 is not set 604# CONFIG_HTC_PASIC3 is not set
587# CONFIG_MFD_TMIO is not set 605# CONFIG_MFD_TMIO is not set
588# CONFIG_MFD_WM8400 is not set 606# CONFIG_REGULATOR is not set
589 607
590# 608#
591# Multimedia devices 609# Multimedia devices
@@ -631,9 +649,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
631# 649#
632 650
633# 651#
634# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 652# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
635# 653#
636# CONFIG_USB_GADGET is not set 654# CONFIG_USB_GADGET is not set
655
656#
657# OTG and related infrastructure
658#
637# CONFIG_UWB is not set 659# CONFIG_UWB is not set
638# CONFIG_MMC is not set 660# CONFIG_MMC is not set
639# CONFIG_MEMSTICK is not set 661# CONFIG_MEMSTICK is not set
@@ -659,7 +681,9 @@ CONFIG_EXT2_FS=y
659# CONFIG_FS_POSIX_ACL is not set 681# CONFIG_FS_POSIX_ACL is not set
660CONFIG_FILE_LOCKING=y 682CONFIG_FILE_LOCKING=y
661# CONFIG_XFS_FS is not set 683# CONFIG_XFS_FS is not set
684# CONFIG_GFS2_FS is not set
662# CONFIG_OCFS2_FS is not set 685# CONFIG_OCFS2_FS is not set
686# CONFIG_BTRFS_FS is not set
663CONFIG_DNOTIFY=y 687CONFIG_DNOTIFY=y
664CONFIG_INOTIFY=y 688CONFIG_INOTIFY=y
665CONFIG_INOTIFY_USER=y 689CONFIG_INOTIFY_USER=y
@@ -693,10 +717,7 @@ CONFIG_TMPFS=y
693# CONFIG_TMPFS_POSIX_ACL is not set 717# CONFIG_TMPFS_POSIX_ACL is not set
694# CONFIG_HUGETLB_PAGE is not set 718# CONFIG_HUGETLB_PAGE is not set
695# CONFIG_CONFIGFS_FS is not set 719# CONFIG_CONFIGFS_FS is not set
696 720CONFIG_MISC_FILESYSTEMS=y
697#
698# Miscellaneous filesystems
699#
700# CONFIG_ADFS_FS is not set 721# CONFIG_ADFS_FS is not set
701# CONFIG_AFFS_FS is not set 722# CONFIG_AFFS_FS is not set
702# CONFIG_HFS_FS is not set 723# CONFIG_HFS_FS is not set
@@ -705,6 +726,7 @@ CONFIG_TMPFS=y
705# CONFIG_BFS_FS is not set 726# CONFIG_BFS_FS is not set
706# CONFIG_EFS_FS is not set 727# CONFIG_EFS_FS is not set
707CONFIG_CRAMFS=y 728CONFIG_CRAMFS=y
729# CONFIG_SQUASHFS is not set
708# CONFIG_VXFS_FS is not set 730# CONFIG_VXFS_FS is not set
709# CONFIG_MINIX_FS is not set 731# CONFIG_MINIX_FS is not set
710# CONFIG_OMFS_FS is not set 732# CONFIG_OMFS_FS is not set
@@ -745,6 +767,7 @@ CONFIG_MSDOS_PARTITION=y
745# Library routines 767# Library routines
746# 768#
747CONFIG_BITREVERSE=y 769CONFIG_BITREVERSE=y
770CONFIG_GENERIC_FIND_LAST_BIT=y
748# CONFIG_CRC_CCITT is not set 771# CONFIG_CRC_CCITT is not set
749# CONFIG_CRC16 is not set 772# CONFIG_CRC16 is not set
750# CONFIG_CRC_T10DIF is not set 773# CONFIG_CRC_T10DIF is not set
@@ -795,6 +818,7 @@ CONFIG_SCHED_DEBUG=y
795# CONFIG_DEBUG_MEMORY_INIT is not set 818# CONFIG_DEBUG_MEMORY_INIT is not set
796# CONFIG_DEBUG_LIST is not set 819# CONFIG_DEBUG_LIST is not set
797# CONFIG_DEBUG_SG is not set 820# CONFIG_DEBUG_SG is not set
821# CONFIG_DEBUG_NOTIFIERS is not set
798# CONFIG_BOOT_PRINTK_DELAY is not set 822# CONFIG_BOOT_PRINTK_DELAY is not set
799# CONFIG_RCU_TORTURE_TEST is not set 823# CONFIG_RCU_TORTURE_TEST is not set
800# CONFIG_RCU_CPU_STALL_DETECTOR is not set 824# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -803,18 +827,24 @@ CONFIG_SCHED_DEBUG=y
803# CONFIG_FAULT_INJECTION is not set 827# CONFIG_FAULT_INJECTION is not set
804# CONFIG_LATENCYTOP is not set 828# CONFIG_LATENCYTOP is not set
805CONFIG_SYSCTL_SYSCALL_CHECK=y 829CONFIG_SYSCTL_SYSCALL_CHECK=y
806CONFIG_NOP_TRACER=y 830CONFIG_HAVE_FUNCTION_TRACER=y
807CONFIG_HAVE_FTRACE=y
808CONFIG_HAVE_DYNAMIC_FTRACE=y 831CONFIG_HAVE_DYNAMIC_FTRACE=y
809# CONFIG_FTRACE is not set 832CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
833
834#
835# Tracers
836#
837# CONFIG_FUNCTION_TRACER is not set
810# CONFIG_SCHED_TRACER is not set 838# CONFIG_SCHED_TRACER is not set
811# CONFIG_CONTEXT_SWITCH_TRACER is not set 839# CONFIG_CONTEXT_SWITCH_TRACER is not set
812# CONFIG_BOOT_TRACER is not set 840# CONFIG_BOOT_TRACER is not set
841# CONFIG_TRACE_BRANCH_PROFILING is not set
813# CONFIG_STACK_TRACER is not set 842# CONFIG_STACK_TRACER is not set
814# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 843# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
815# CONFIG_SAMPLES is not set 844# CONFIG_SAMPLES is not set
816CONFIG_HAVE_ARCH_KGDB=y 845CONFIG_HAVE_ARCH_KGDB=y
817# CONFIG_KGDB is not set 846# CONFIG_KGDB is not set
847CONFIG_PRINT_STACK_DEPTH=64
818# CONFIG_DEBUG_STACKOVERFLOW is not set 848# CONFIG_DEBUG_STACKOVERFLOW is not set
819# CONFIG_DEBUG_STACK_USAGE is not set 849# CONFIG_DEBUG_STACK_USAGE is not set
820# CONFIG_DEBUG_PAGEALLOC is not set 850# CONFIG_DEBUG_PAGEALLOC is not set
@@ -841,11 +871,15 @@ CONFIG_CRYPTO=y
841# 871#
842# CONFIG_CRYPTO_FIPS is not set 872# CONFIG_CRYPTO_FIPS is not set
843CONFIG_CRYPTO_ALGAPI=y 873CONFIG_CRYPTO_ALGAPI=y
844CONFIG_CRYPTO_AEAD=y 874CONFIG_CRYPTO_ALGAPI2=y
875CONFIG_CRYPTO_AEAD2=y
845CONFIG_CRYPTO_BLKCIPHER=y 876CONFIG_CRYPTO_BLKCIPHER=y
877CONFIG_CRYPTO_BLKCIPHER2=y
846CONFIG_CRYPTO_HASH=y 878CONFIG_CRYPTO_HASH=y
847CONFIG_CRYPTO_RNG=y 879CONFIG_CRYPTO_HASH2=y
880CONFIG_CRYPTO_RNG2=y
848CONFIG_CRYPTO_MANAGER=y 881CONFIG_CRYPTO_MANAGER=y
882CONFIG_CRYPTO_MANAGER2=y
849# CONFIG_CRYPTO_GF128MUL is not set 883# CONFIG_CRYPTO_GF128MUL is not set
850# CONFIG_CRYPTO_NULL is not set 884# CONFIG_CRYPTO_NULL is not set
851# CONFIG_CRYPTO_CRYPTD is not set 885# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/44x/canyonlands_defconfig b/arch/powerpc/configs/44x/canyonlands_defconfig
index 0694756ac759..81cdcc4b9278 100644
--- a/arch/powerpc/configs/44x/canyonlands_defconfig
+++ b/arch/powerpc/configs/44x/canyonlands_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.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:08 2008 4# Tue Jan 20 08:22:35 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,6 +19,7 @@ CONFIG_4xx=y
19CONFIG_BOOKE=y 19CONFIG_BOOKE=y
20CONFIG_PTE_64BIT=y 20CONFIG_PTE_64BIT=y
21CONFIG_PHYS_64BIT=y 21CONFIG_PHYS_64BIT=y
22CONFIG_PPC_MMU_NOHASH=y
22# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y 24CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 25CONFIG_PPC32=y
@@ -44,7 +45,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 45CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
50CONFIG_OF=y 51CONFIG_OF=y
@@ -75,8 +76,8 @@ CONFIG_POSIX_MQUEUE=y
75# CONFIG_AUDIT is not set 76# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 77# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79# CONFIG_GROUP_SCHED is not set 79# CONFIG_GROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -111,7 +112,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 112CONFIG_SLUB=y
112# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 114# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 115CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set 116# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -122,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 126CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 132CONFIG_BLOCK=y
135CONFIG_LBD=y 133CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
140 137
@@ -151,6 +148,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
155CONFIG_PPC4xx_PCI_EXPRESS=y 156CONFIG_PPC4xx_PCI_EXPRESS=y
156 157
@@ -188,6 +189,7 @@ CONFIG_460EX=y
188# CONFIG_GENERIC_IOMAP is not set 189# CONFIG_GENERIC_IOMAP is not set
189# CONFIG_CPU_FREQ is not set 190# CONFIG_CPU_FREQ is not set
190# CONFIG_FSL_ULI1575 is not set 191# CONFIG_FSL_ULI1575 is not set
192# CONFIG_SIMPLE_GPIO is not set
191 193
192# 194#
193# Kernel options 195# Kernel options
@@ -212,6 +214,7 @@ CONFIG_BINFMT_ELF=y
212# CONFIG_BINFMT_MISC is not set 214# CONFIG_BINFMT_MISC is not set
213# CONFIG_MATH_EMULATION is not set 215# CONFIG_MATH_EMULATION is not set
214# CONFIG_IOMMU_HELPER is not set 216# CONFIG_IOMMU_HELPER is not set
217CONFIG_PPC_NEED_DMA_SYNC_OPS=y
215CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 218CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
216CONFIG_ARCH_HAS_WALK_MEMORY=y 219CONFIG_ARCH_HAS_WALK_MEMORY=y
217CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 220CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -226,12 +229,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
226CONFIG_PAGEFLAGS_EXTENDED=y 229CONFIG_PAGEFLAGS_EXTENDED=y
227CONFIG_SPLIT_PTLOCK_CPUS=4 230CONFIG_SPLIT_PTLOCK_CPUS=4
228CONFIG_MIGRATION=y 231CONFIG_MIGRATION=y
229CONFIG_RESOURCES_64BIT=y
230CONFIG_PHYS_ADDR_T_64BIT=y 232CONFIG_PHYS_ADDR_T_64BIT=y
231CONFIG_ZONE_DMA_FLAG=1 233CONFIG_ZONE_DMA_FLAG=1
232CONFIG_BOUNCE=y 234CONFIG_BOUNCE=y
233CONFIG_VIRT_TO_BUS=y 235CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y 236CONFIG_UNEVICTABLE_LRU=y
237CONFIG_PPC_4K_PAGES=y
238# CONFIG_PPC_16K_PAGES is not set
239# CONFIG_PPC_64K_PAGES is not set
235CONFIG_FORCE_MAX_ZONEORDER=11 240CONFIG_FORCE_MAX_ZONEORDER=11
236CONFIG_PROC_DEVICETREE=y 241CONFIG_PROC_DEVICETREE=y
237CONFIG_CMDLINE_BOOL=y 242CONFIG_CMDLINE_BOOL=y
@@ -255,6 +260,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
255# CONFIG_PCI_MSI is not set 260# CONFIG_PCI_MSI is not set
256CONFIG_PCI_LEGACY=y 261CONFIG_PCI_LEGACY=y
257# CONFIG_PCI_DEBUG is not set 262# CONFIG_PCI_DEBUG is not set
263# CONFIG_PCI_STUB is not set
258# CONFIG_PCCARD is not set 264# CONFIG_PCCARD is not set
259# CONFIG_HOTPLUG_PCI is not set 265# CONFIG_HOTPLUG_PCI is not set
260# CONFIG_HAS_RAPIDIO is not set 266# CONFIG_HAS_RAPIDIO is not set
@@ -279,6 +285,7 @@ CONFIG_NET=y
279# 285#
280# Networking options 286# Networking options
281# 287#
288CONFIG_COMPAT_NET_DEV_OPS=y
282CONFIG_PACKET=y 289CONFIG_PACKET=y
283# CONFIG_PACKET_MMAP is not set 290# CONFIG_PACKET_MMAP is not set
284CONFIG_UNIX=y 291CONFIG_UNIX=y
@@ -329,6 +336,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
329# CONFIG_ECONET is not set 336# CONFIG_ECONET is not set
330# CONFIG_WAN_ROUTER is not set 337# CONFIG_WAN_ROUTER is not set
331# CONFIG_NET_SCHED is not set 338# CONFIG_NET_SCHED is not set
339# CONFIG_DCB is not set
332 340
333# 341#
334# Network testing 342# Network testing
@@ -341,6 +349,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
341# CONFIG_AF_RXRPC is not set 349# CONFIG_AF_RXRPC is not set
342# CONFIG_PHONET is not set 350# CONFIG_PHONET is not set
343# CONFIG_WIRELESS is not set 351# CONFIG_WIRELESS is not set
352# CONFIG_WIMAX is not set
344# CONFIG_RFKILL is not set 353# CONFIG_RFKILL is not set
345# CONFIG_NET_9P is not set 354# CONFIG_NET_9P is not set
346 355
@@ -453,6 +462,10 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y
453# CONFIG_WLAN_PRE80211 is not set 462# CONFIG_WLAN_PRE80211 is not set
454# CONFIG_WLAN_80211 is not set 463# CONFIG_WLAN_80211 is not set
455# CONFIG_IWLWIFI_LEDS is not set 464# CONFIG_IWLWIFI_LEDS is not set
465
466#
467# Enable WiMAX (Networking options) to see the WiMAX drivers
468#
456# CONFIG_WAN is not set 469# CONFIG_WAN is not set
457# CONFIG_FDDI is not set 470# CONFIG_FDDI is not set
458# CONFIG_HIPPI is not set 471# CONFIG_HIPPI is not set
@@ -505,9 +518,12 @@ CONFIG_SERIAL_CORE=y
505CONFIG_SERIAL_CORE_CONSOLE=y 518CONFIG_SERIAL_CORE_CONSOLE=y
506# CONFIG_SERIAL_JSM is not set 519# CONFIG_SERIAL_JSM is not set
507CONFIG_SERIAL_OF_PLATFORM=y 520CONFIG_SERIAL_OF_PLATFORM=y
521# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
508CONFIG_UNIX98_PTYS=y 522CONFIG_UNIX98_PTYS=y
523# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
509CONFIG_LEGACY_PTYS=y 524CONFIG_LEGACY_PTYS=y
510CONFIG_LEGACY_PTY_COUNT=256 525CONFIG_LEGACY_PTY_COUNT=256
526# CONFIG_HVC_UDBG is not set
511# CONFIG_IPMI_HANDLER is not set 527# CONFIG_IPMI_HANDLER is not set
512# CONFIG_HW_RANDOM is not set 528# CONFIG_HW_RANDOM is not set
513# CONFIG_NVRAM is not set 529# CONFIG_NVRAM is not set
@@ -527,11 +543,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
527# CONFIG_THERMAL is not set 543# CONFIG_THERMAL is not set
528# CONFIG_THERMAL_HWMON is not set 544# CONFIG_THERMAL_HWMON is not set
529# CONFIG_WATCHDOG is not set 545# CONFIG_WATCHDOG is not set
546CONFIG_SSB_POSSIBLE=y
530 547
531# 548#
532# Sonics Silicon Backplane 549# Sonics Silicon Backplane
533# 550#
534CONFIG_SSB_POSSIBLE=y
535# CONFIG_SSB is not set 551# CONFIG_SSB is not set
536 552
537# 553#
@@ -541,7 +557,7 @@ CONFIG_SSB_POSSIBLE=y
541# CONFIG_MFD_SM501 is not set 557# CONFIG_MFD_SM501 is not set
542# CONFIG_HTC_PASIC3 is not set 558# CONFIG_HTC_PASIC3 is not set
543# CONFIG_MFD_TMIO is not set 559# CONFIG_MFD_TMIO is not set
544# CONFIG_MFD_WM8400 is not set 560# CONFIG_REGULATOR is not set
545 561
546# 562#
547# Multimedia devices 563# Multimedia devices
@@ -600,7 +616,9 @@ CONFIG_EXT2_FS=y
600# CONFIG_FS_POSIX_ACL is not set 616# CONFIG_FS_POSIX_ACL is not set
601CONFIG_FILE_LOCKING=y 617CONFIG_FILE_LOCKING=y
602# CONFIG_XFS_FS is not set 618# CONFIG_XFS_FS is not set
619# CONFIG_GFS2_FS is not set
603# CONFIG_OCFS2_FS is not set 620# CONFIG_OCFS2_FS is not set
621# CONFIG_BTRFS_FS is not set
604CONFIG_DNOTIFY=y 622CONFIG_DNOTIFY=y
605CONFIG_INOTIFY=y 623CONFIG_INOTIFY=y
606CONFIG_INOTIFY_USER=y 624CONFIG_INOTIFY_USER=y
@@ -634,10 +652,7 @@ CONFIG_TMPFS=y
634# CONFIG_TMPFS_POSIX_ACL is not set 652# CONFIG_TMPFS_POSIX_ACL is not set
635# CONFIG_HUGETLB_PAGE is not set 653# CONFIG_HUGETLB_PAGE is not set
636# CONFIG_CONFIGFS_FS is not set 654# CONFIG_CONFIGFS_FS is not set
637 655CONFIG_MISC_FILESYSTEMS=y
638#
639# Miscellaneous filesystems
640#
641# CONFIG_ADFS_FS is not set 656# CONFIG_ADFS_FS is not set
642# CONFIG_AFFS_FS is not set 657# CONFIG_AFFS_FS is not set
643# CONFIG_HFS_FS is not set 658# CONFIG_HFS_FS is not set
@@ -646,6 +661,7 @@ CONFIG_TMPFS=y
646# CONFIG_BFS_FS is not set 661# CONFIG_BFS_FS is not set
647# CONFIG_EFS_FS is not set 662# CONFIG_EFS_FS is not set
648CONFIG_CRAMFS=y 663CONFIG_CRAMFS=y
664# CONFIG_SQUASHFS is not set
649# CONFIG_VXFS_FS is not set 665# CONFIG_VXFS_FS is not set
650# CONFIG_MINIX_FS is not set 666# CONFIG_MINIX_FS is not set
651# CONFIG_OMFS_FS is not set 667# CONFIG_OMFS_FS is not set
@@ -686,6 +702,7 @@ CONFIG_MSDOS_PARTITION=y
686# Library routines 702# Library routines
687# 703#
688CONFIG_BITREVERSE=y 704CONFIG_BITREVERSE=y
705CONFIG_GENERIC_FIND_LAST_BIT=y
689# CONFIG_CRC_CCITT is not set 706# CONFIG_CRC_CCITT is not set
690# CONFIG_CRC16 is not set 707# CONFIG_CRC16 is not set
691# CONFIG_CRC_T10DIF is not set 708# CONFIG_CRC_T10DIF is not set
@@ -736,6 +753,7 @@ CONFIG_SCHED_DEBUG=y
736# CONFIG_DEBUG_MEMORY_INIT is not set 753# CONFIG_DEBUG_MEMORY_INIT is not set
737# CONFIG_DEBUG_LIST is not set 754# CONFIG_DEBUG_LIST is not set
738# CONFIG_DEBUG_SG is not set 755# CONFIG_DEBUG_SG is not set
756# CONFIG_DEBUG_NOTIFIERS is not set
739# CONFIG_BOOT_PRINTK_DELAY is not set 757# CONFIG_BOOT_PRINTK_DELAY is not set
740# CONFIG_RCU_TORTURE_TEST is not set 758# CONFIG_RCU_TORTURE_TEST is not set
741# CONFIG_RCU_CPU_STALL_DETECTOR is not set 759# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -744,18 +762,24 @@ CONFIG_SCHED_DEBUG=y
744# CONFIG_FAULT_INJECTION is not set 762# CONFIG_FAULT_INJECTION is not set
745# CONFIG_LATENCYTOP is not set 763# CONFIG_LATENCYTOP is not set
746CONFIG_SYSCTL_SYSCALL_CHECK=y 764CONFIG_SYSCTL_SYSCALL_CHECK=y
747CONFIG_NOP_TRACER=y 765CONFIG_HAVE_FUNCTION_TRACER=y
748CONFIG_HAVE_FTRACE=y
749CONFIG_HAVE_DYNAMIC_FTRACE=y 766CONFIG_HAVE_DYNAMIC_FTRACE=y
750# CONFIG_FTRACE is not set 767CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
768
769#
770# Tracers
771#
772# CONFIG_FUNCTION_TRACER is not set
751# CONFIG_SCHED_TRACER is not set 773# CONFIG_SCHED_TRACER is not set
752# CONFIG_CONTEXT_SWITCH_TRACER is not set 774# CONFIG_CONTEXT_SWITCH_TRACER is not set
753# CONFIG_BOOT_TRACER is not set 775# CONFIG_BOOT_TRACER is not set
776# CONFIG_TRACE_BRANCH_PROFILING is not set
754# CONFIG_STACK_TRACER is not set 777# CONFIG_STACK_TRACER is not set
755# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 778# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
756# CONFIG_SAMPLES is not set 779# CONFIG_SAMPLES is not set
757CONFIG_HAVE_ARCH_KGDB=y 780CONFIG_HAVE_ARCH_KGDB=y
758# CONFIG_KGDB is not set 781# CONFIG_KGDB is not set
782CONFIG_PRINT_STACK_DEPTH=64
759# CONFIG_DEBUG_STACKOVERFLOW is not set 783# CONFIG_DEBUG_STACKOVERFLOW is not set
760# CONFIG_DEBUG_STACK_USAGE is not set 784# CONFIG_DEBUG_STACK_USAGE is not set
761# CONFIG_DEBUG_PAGEALLOC is not set 785# CONFIG_DEBUG_PAGEALLOC is not set
diff --git a/arch/powerpc/configs/44x/ebony_defconfig b/arch/powerpc/configs/44x/ebony_defconfig
index c9937578ef7f..be64aa644d15 100644
--- a/arch/powerpc/configs/44x/ebony_defconfig
+++ b/arch/powerpc/configs/44x/ebony_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:09 2008 4# Tue Jan 20 08:22:36 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -18,6 +18,7 @@ CONFIG_4xx=y
18CONFIG_BOOKE=y 18CONFIG_BOOKE=y
19CONFIG_PTE_64BIT=y 19CONFIG_PTE_64BIT=y
20CONFIG_PHYS_64BIT=y 20CONFIG_PHYS_64BIT=y
21CONFIG_PPC_MMU_NOHASH=y
21# CONFIG_PPC_MM_SLICES is not set 22# CONFIG_PPC_MM_SLICES is not set
22CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 24CONFIG_PPC32=y
@@ -43,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
43CONFIG_PPC=y 44CONFIG_PPC=y
44CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
45CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
46CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
47CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
48CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
49CONFIG_OF=y 50CONFIG_OF=y
@@ -74,12 +75,12 @@ CONFIG_POSIX_MQUEUE=y
74# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
75# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
76CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
77# CONFIG_CGROUPS is not set
78CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
79CONFIG_FAIR_GROUP_SCHED=y 79CONFIG_FAIR_GROUP_SCHED=y
80# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
81CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
82# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
83CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
84CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
85# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -92,6 +93,7 @@ CONFIG_EMBEDDED=y
92CONFIG_SYSCTL_SYSCALL=y 93CONFIG_SYSCTL_SYSCALL=y
93CONFIG_KALLSYMS=y 94CONFIG_KALLSYMS=y
94CONFIG_KALLSYMS_ALL=y 95CONFIG_KALLSYMS_ALL=y
96CONFIG_KALLSYMS_STRIP_GENERATED=y
95CONFIG_KALLSYMS_EXTRA_PASS=y 97CONFIG_KALLSYMS_EXTRA_PASS=y
96CONFIG_HOTPLUG=y 98CONFIG_HOTPLUG=y
97CONFIG_PRINTK=y 99CONFIG_PRINTK=y
@@ -114,7 +116,6 @@ CONFIG_SLUB_DEBUG=y
114CONFIG_SLUB=y 116CONFIG_SLUB=y
115# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
116# CONFIG_PROFILING is not set 118# CONFIG_PROFILING is not set
117# CONFIG_MARKERS is not set
118CONFIG_HAVE_OPROFILE=y 119CONFIG_HAVE_OPROFILE=y
119# CONFIG_KPROBES is not set 120# CONFIG_KPROBES is not set
120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -125,7 +126,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
126CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
127CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
128# CONFIG_TINY_SHMEM is not set
129CONFIG_BASE_SMALL=0 129CONFIG_BASE_SMALL=0
130CONFIG_MODULES=y 130CONFIG_MODULES=y
131# CONFIG_MODULE_FORCE_LOAD is not set 131# CONFIG_MODULE_FORCE_LOAD is not set
@@ -133,11 +133,9 @@ CONFIG_MODULE_UNLOAD=y
133# CONFIG_MODULE_FORCE_UNLOAD is not set 133# CONFIG_MODULE_FORCE_UNLOAD is not set
134# CONFIG_MODVERSIONS is not set 134# CONFIG_MODVERSIONS is not set
135# CONFIG_MODULE_SRCVERSION_ALL is not set 135# CONFIG_MODULE_SRCVERSION_ALL is not set
136CONFIG_KMOD=y
137CONFIG_BLOCK=y 136CONFIG_BLOCK=y
138CONFIG_LBD=y 137CONFIG_LBD=y
139# CONFIG_BLK_DEV_IO_TRACE is not set 138# CONFIG_BLK_DEV_IO_TRACE is not set
140# CONFIG_LSF is not set
141# CONFIG_BLK_DEV_BSG is not set 139# CONFIG_BLK_DEV_BSG is not set
142# CONFIG_BLK_DEV_INTEGRITY is not set 140# CONFIG_BLK_DEV_INTEGRITY is not set
143 141
@@ -154,6 +152,10 @@ 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_TREE_RCU is not set
156# CONFIG_PREEMPT_RCU is not set
157# CONFIG_TREE_RCU_TRACE is not set
158# CONFIG_PREEMPT_RCU_TRACE is not set
157# CONFIG_FREEZER is not set 159# CONFIG_FREEZER is not set
158# CONFIG_PPC4xx_PCI_EXPRESS is not set 160# CONFIG_PPC4xx_PCI_EXPRESS is not set
159 161
@@ -192,6 +194,7 @@ CONFIG_440GP=y
192# CONFIG_CPU_FREQ is not set 194# CONFIG_CPU_FREQ is not set
193# CONFIG_FSL_ULI1575 is not set 195# CONFIG_FSL_ULI1575 is not set
194CONFIG_OF_RTC=y 196CONFIG_OF_RTC=y
197# CONFIG_SIMPLE_GPIO is not set
195 198
196# 199#
197# Kernel options 200# Kernel options
@@ -215,6 +218,7 @@ CONFIG_BINFMT_ELF=y
215# CONFIG_BINFMT_MISC is not set 218# CONFIG_BINFMT_MISC is not set
216CONFIG_MATH_EMULATION=y 219CONFIG_MATH_EMULATION=y
217# CONFIG_IOMMU_HELPER is not set 220# CONFIG_IOMMU_HELPER is not set
221CONFIG_PPC_NEED_DMA_SYNC_OPS=y
218CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 222CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
219CONFIG_ARCH_HAS_WALK_MEMORY=y 223CONFIG_ARCH_HAS_WALK_MEMORY=y
220CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -229,12 +233,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
229CONFIG_PAGEFLAGS_EXTENDED=y 233CONFIG_PAGEFLAGS_EXTENDED=y
230CONFIG_SPLIT_PTLOCK_CPUS=4 234CONFIG_SPLIT_PTLOCK_CPUS=4
231CONFIG_MIGRATION=y 235CONFIG_MIGRATION=y
232CONFIG_RESOURCES_64BIT=y
233CONFIG_PHYS_ADDR_T_64BIT=y 236CONFIG_PHYS_ADDR_T_64BIT=y
234CONFIG_ZONE_DMA_FLAG=1 237CONFIG_ZONE_DMA_FLAG=1
235CONFIG_BOUNCE=y 238CONFIG_BOUNCE=y
236CONFIG_VIRT_TO_BUS=y 239CONFIG_VIRT_TO_BUS=y
237CONFIG_UNEVICTABLE_LRU=y 240CONFIG_UNEVICTABLE_LRU=y
241CONFIG_PPC_4K_PAGES=y
242# CONFIG_PPC_16K_PAGES is not set
243# CONFIG_PPC_64K_PAGES is not set
238CONFIG_FORCE_MAX_ZONEORDER=11 244CONFIG_FORCE_MAX_ZONEORDER=11
239CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
240# CONFIG_CMDLINE_BOOL is not set 246# CONFIG_CMDLINE_BOOL is not set
@@ -257,6 +263,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
257# CONFIG_PCI_MSI is not set 263# CONFIG_PCI_MSI is not set
258CONFIG_PCI_LEGACY=y 264CONFIG_PCI_LEGACY=y
259# CONFIG_PCI_DEBUG is not set 265# CONFIG_PCI_DEBUG is not set
266# CONFIG_PCI_STUB is not set
260# CONFIG_PCCARD is not set 267# CONFIG_PCCARD is not set
261# CONFIG_HOTPLUG_PCI is not set 268# CONFIG_HOTPLUG_PCI is not set
262# CONFIG_HAS_RAPIDIO is not set 269# CONFIG_HAS_RAPIDIO is not set
@@ -281,6 +288,7 @@ CONFIG_NET=y
281# 288#
282# Networking options 289# Networking options
283# 290#
291CONFIG_COMPAT_NET_DEV_OPS=y
284CONFIG_PACKET=y 292CONFIG_PACKET=y
285# CONFIG_PACKET_MMAP is not set 293# CONFIG_PACKET_MMAP is not set
286CONFIG_UNIX=y 294CONFIG_UNIX=y
@@ -331,6 +339,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
331# CONFIG_ECONET is not set 339# CONFIG_ECONET is not set
332# CONFIG_WAN_ROUTER is not set 340# CONFIG_WAN_ROUTER is not set
333# CONFIG_NET_SCHED is not set 341# CONFIG_NET_SCHED is not set
342# CONFIG_DCB is not set
334 343
335# 344#
336# Network testing 345# Network testing
@@ -343,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
343# CONFIG_AF_RXRPC is not set 352# CONFIG_AF_RXRPC is not set
344# CONFIG_PHONET is not set 353# CONFIG_PHONET is not set
345# CONFIG_WIRELESS is not set 354# CONFIG_WIRELESS is not set
355# CONFIG_WIMAX is not set
346# CONFIG_RFKILL is not set 356# CONFIG_RFKILL is not set
347# CONFIG_NET_9P is not set 357# CONFIG_NET_9P is not set
348 358
@@ -368,6 +378,7 @@ CONFIG_MTD=y
368# CONFIG_MTD_DEBUG is not set 378# CONFIG_MTD_DEBUG is not set
369# CONFIG_MTD_CONCAT is not set 379# CONFIG_MTD_CONCAT is not set
370CONFIG_MTD_PARTITIONS=y 380CONFIG_MTD_PARTITIONS=y
381# CONFIG_MTD_TESTS is not set
371# CONFIG_MTD_REDBOOT_PARTS is not set 382# CONFIG_MTD_REDBOOT_PARTS is not set
372# CONFIG_MTD_CMDLINE_PARTS is not set 383# CONFIG_MTD_CMDLINE_PARTS is not set
373CONFIG_MTD_OF_PARTS=y 384CONFIG_MTD_OF_PARTS=y
@@ -439,6 +450,12 @@ CONFIG_MTD_PHYSMAP_OF=y
439# CONFIG_MTD_ONENAND is not set 450# CONFIG_MTD_ONENAND is not set
440 451
441# 452#
453# LPDDR flash memory drivers
454#
455# CONFIG_MTD_LPDDR is not set
456# CONFIG_MTD_QINFO_PROBE is not set
457
458#
442# UBI - Unsorted block images 459# UBI - Unsorted block images
443# 460#
444# CONFIG_MTD_UBI is not set 461# CONFIG_MTD_UBI is not set
@@ -469,6 +486,7 @@ CONFIG_MISC_DEVICES=y
469# CONFIG_TIFM_CORE is not set 486# CONFIG_TIFM_CORE is not set
470# CONFIG_ENCLOSURE_SERVICES is not set 487# CONFIG_ENCLOSURE_SERVICES is not set
471# CONFIG_HP_ILO is not set 488# CONFIG_HP_ILO is not set
489# CONFIG_C2PORT is not set
472CONFIG_HAVE_IDE=y 490CONFIG_HAVE_IDE=y
473# CONFIG_IDE is not set 491# CONFIG_IDE is not set
474 492
@@ -551,6 +569,7 @@ CONFIG_NETDEV_1000=y
551# CONFIG_JME is not set 569# CONFIG_JME is not set
552CONFIG_NETDEV_10000=y 570CONFIG_NETDEV_10000=y
553# CONFIG_CHELSIO_T1 is not set 571# CONFIG_CHELSIO_T1 is not set
572CONFIG_CHELSIO_T3_DEPENDS=y
554# CONFIG_CHELSIO_T3 is not set 573# CONFIG_CHELSIO_T3 is not set
555# CONFIG_ENIC is not set 574# CONFIG_ENIC is not set
556# CONFIG_IXGBE is not set 575# CONFIG_IXGBE is not set
@@ -573,6 +592,10 @@ CONFIG_NETDEV_10000=y
573# CONFIG_WLAN_PRE80211 is not set 592# CONFIG_WLAN_PRE80211 is not set
574# CONFIG_WLAN_80211 is not set 593# CONFIG_WLAN_80211 is not set
575# CONFIG_IWLWIFI_LEDS is not set 594# CONFIG_IWLWIFI_LEDS is not set
595
596#
597# Enable WiMAX (Networking options) to see the WiMAX drivers
598#
576# CONFIG_WAN is not set 599# CONFIG_WAN is not set
577# CONFIG_FDDI is not set 600# CONFIG_FDDI is not set
578# CONFIG_HIPPI is not set 601# CONFIG_HIPPI is not set
@@ -625,9 +648,12 @@ CONFIG_SERIAL_CORE=y
625CONFIG_SERIAL_CORE_CONSOLE=y 648CONFIG_SERIAL_CORE_CONSOLE=y
626# CONFIG_SERIAL_JSM is not set 649# CONFIG_SERIAL_JSM is not set
627CONFIG_SERIAL_OF_PLATFORM=y 650CONFIG_SERIAL_OF_PLATFORM=y
651# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
628CONFIG_UNIX98_PTYS=y 652CONFIG_UNIX98_PTYS=y
653# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
629CONFIG_LEGACY_PTYS=y 654CONFIG_LEGACY_PTYS=y
630CONFIG_LEGACY_PTY_COUNT=256 655CONFIG_LEGACY_PTY_COUNT=256
656# CONFIG_HVC_UDBG is not set
631# CONFIG_IPMI_HANDLER is not set 657# CONFIG_IPMI_HANDLER is not set
632# CONFIG_HW_RANDOM is not set 658# CONFIG_HW_RANDOM is not set
633# CONFIG_NVRAM is not set 659# CONFIG_NVRAM is not set
@@ -646,11 +672,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
646# CONFIG_HWMON is not set 672# CONFIG_HWMON is not set
647CONFIG_THERMAL=y 673CONFIG_THERMAL=y
648# CONFIG_WATCHDOG is not set 674# CONFIG_WATCHDOG is not set
675CONFIG_SSB_POSSIBLE=y
649 676
650# 677#
651# Sonics Silicon Backplane 678# Sonics Silicon Backplane
652# 679#
653CONFIG_SSB_POSSIBLE=y
654# CONFIG_SSB is not set 680# CONFIG_SSB is not set
655 681
656# 682#
@@ -660,7 +686,7 @@ CONFIG_SSB_POSSIBLE=y
660# CONFIG_MFD_SM501 is not set 686# CONFIG_MFD_SM501 is not set
661# CONFIG_HTC_PASIC3 is not set 687# CONFIG_HTC_PASIC3 is not set
662# CONFIG_MFD_TMIO is not set 688# CONFIG_MFD_TMIO is not set
663# CONFIG_MFD_WM8400 is not set 689# CONFIG_REGULATOR is not set
664 690
665# 691#
666# Multimedia devices 692# Multimedia devices
@@ -706,9 +732,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
706# 732#
707 733
708# 734#
709# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 735# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
710# 736#
711# CONFIG_USB_GADGET is not set 737# CONFIG_USB_GADGET is not set
738
739#
740# OTG and related infrastructure
741#
712# CONFIG_UWB is not set 742# CONFIG_UWB is not set
713# CONFIG_MMC is not set 743# CONFIG_MMC is not set
714# CONFIG_MEMSTICK is not set 744# CONFIG_MEMSTICK is not set
@@ -734,7 +764,9 @@ CONFIG_EXT2_FS=y
734# CONFIG_FS_POSIX_ACL is not set 764# CONFIG_FS_POSIX_ACL is not set
735CONFIG_FILE_LOCKING=y 765CONFIG_FILE_LOCKING=y
736# CONFIG_XFS_FS is not set 766# CONFIG_XFS_FS is not set
767# CONFIG_GFS2_FS is not set
737# CONFIG_OCFS2_FS is not set 768# CONFIG_OCFS2_FS is not set
769# CONFIG_BTRFS_FS is not set
738CONFIG_DNOTIFY=y 770CONFIG_DNOTIFY=y
739CONFIG_INOTIFY=y 771CONFIG_INOTIFY=y
740CONFIG_INOTIFY_USER=y 772CONFIG_INOTIFY_USER=y
@@ -768,10 +800,7 @@ CONFIG_TMPFS=y
768# CONFIG_TMPFS_POSIX_ACL is not set 800# CONFIG_TMPFS_POSIX_ACL is not set
769# CONFIG_HUGETLB_PAGE is not set 801# CONFIG_HUGETLB_PAGE is not set
770# CONFIG_CONFIGFS_FS is not set 802# CONFIG_CONFIGFS_FS is not set
771 803CONFIG_MISC_FILESYSTEMS=y
772#
773# Miscellaneous filesystems
774#
775# CONFIG_ADFS_FS is not set 804# CONFIG_ADFS_FS is not set
776# CONFIG_AFFS_FS is not set 805# CONFIG_AFFS_FS is not set
777# CONFIG_HFS_FS is not set 806# CONFIG_HFS_FS is not set
@@ -791,6 +820,7 @@ CONFIG_JFFS2_ZLIB=y
791CONFIG_JFFS2_RTIME=y 820CONFIG_JFFS2_RTIME=y
792# CONFIG_JFFS2_RUBIN is not set 821# CONFIG_JFFS2_RUBIN is not set
793CONFIG_CRAMFS=y 822CONFIG_CRAMFS=y
823# CONFIG_SQUASHFS is not set
794# CONFIG_VXFS_FS is not set 824# CONFIG_VXFS_FS is not set
795# CONFIG_MINIX_FS is not set 825# CONFIG_MINIX_FS is not set
796# CONFIG_OMFS_FS is not set 826# CONFIG_OMFS_FS is not set
@@ -831,6 +861,7 @@ CONFIG_MSDOS_PARTITION=y
831# Library routines 861# Library routines
832# 862#
833CONFIG_BITREVERSE=y 863CONFIG_BITREVERSE=y
864CONFIG_GENERIC_FIND_LAST_BIT=y
834# CONFIG_CRC_CCITT is not set 865# CONFIG_CRC_CCITT is not set
835# CONFIG_CRC16 is not set 866# CONFIG_CRC16 is not set
836# CONFIG_CRC_T10DIF is not set 867# CONFIG_CRC_T10DIF is not set
@@ -882,6 +913,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
882# CONFIG_DEBUG_MEMORY_INIT is not set 913# CONFIG_DEBUG_MEMORY_INIT is not set
883# CONFIG_DEBUG_LIST is not set 914# CONFIG_DEBUG_LIST is not set
884# CONFIG_DEBUG_SG is not set 915# CONFIG_DEBUG_SG is not set
916# CONFIG_DEBUG_NOTIFIERS is not set
885# CONFIG_BOOT_PRINTK_DELAY is not set 917# CONFIG_BOOT_PRINTK_DELAY is not set
886# CONFIG_RCU_TORTURE_TEST is not set 918# CONFIG_RCU_TORTURE_TEST is not set
887# CONFIG_RCU_CPU_STALL_DETECTOR is not set 919# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -890,18 +922,24 @@ CONFIG_DEBUG_BUGVERBOSE=y
890# CONFIG_FAULT_INJECTION is not set 922# CONFIG_FAULT_INJECTION is not set
891# CONFIG_LATENCYTOP is not set 923# CONFIG_LATENCYTOP is not set
892CONFIG_SYSCTL_SYSCALL_CHECK=y 924CONFIG_SYSCTL_SYSCALL_CHECK=y
893CONFIG_NOP_TRACER=y 925CONFIG_HAVE_FUNCTION_TRACER=y
894CONFIG_HAVE_FTRACE=y
895CONFIG_HAVE_DYNAMIC_FTRACE=y 926CONFIG_HAVE_DYNAMIC_FTRACE=y
896# CONFIG_FTRACE is not set 927CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
928
929#
930# Tracers
931#
932# CONFIG_FUNCTION_TRACER is not set
897# CONFIG_SCHED_TRACER is not set 933# CONFIG_SCHED_TRACER is not set
898# CONFIG_CONTEXT_SWITCH_TRACER is not set 934# CONFIG_CONTEXT_SWITCH_TRACER is not set
899# CONFIG_BOOT_TRACER is not set 935# CONFIG_BOOT_TRACER is not set
936# CONFIG_TRACE_BRANCH_PROFILING is not set
900# CONFIG_STACK_TRACER is not set 937# CONFIG_STACK_TRACER is not set
901# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 938# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
902# CONFIG_SAMPLES is not set 939# CONFIG_SAMPLES is not set
903CONFIG_HAVE_ARCH_KGDB=y 940CONFIG_HAVE_ARCH_KGDB=y
904# CONFIG_KGDB is not set 941# CONFIG_KGDB is not set
942CONFIG_PRINT_STACK_DEPTH=64
905# CONFIG_DEBUG_STACKOVERFLOW is not set 943# CONFIG_DEBUG_STACKOVERFLOW is not set
906# CONFIG_DEBUG_STACK_USAGE is not set 944# CONFIG_DEBUG_STACK_USAGE is not set
907# CONFIG_DEBUG_PAGEALLOC is not set 945# CONFIG_DEBUG_PAGEALLOC is not set
@@ -928,11 +966,15 @@ CONFIG_CRYPTO=y
928# 966#
929# CONFIG_CRYPTO_FIPS is not set 967# CONFIG_CRYPTO_FIPS is not set
930CONFIG_CRYPTO_ALGAPI=y 968CONFIG_CRYPTO_ALGAPI=y
931CONFIG_CRYPTO_AEAD=y 969CONFIG_CRYPTO_ALGAPI2=y
970CONFIG_CRYPTO_AEAD2=y
932CONFIG_CRYPTO_BLKCIPHER=y 971CONFIG_CRYPTO_BLKCIPHER=y
972CONFIG_CRYPTO_BLKCIPHER2=y
933CONFIG_CRYPTO_HASH=y 973CONFIG_CRYPTO_HASH=y
934CONFIG_CRYPTO_RNG=y 974CONFIG_CRYPTO_HASH2=y
975CONFIG_CRYPTO_RNG2=y
935CONFIG_CRYPTO_MANAGER=y 976CONFIG_CRYPTO_MANAGER=y
977CONFIG_CRYPTO_MANAGER2=y
936# CONFIG_CRYPTO_GF128MUL is not set 978# CONFIG_CRYPTO_GF128MUL is not set
937# CONFIG_CRYPTO_NULL is not set 979# CONFIG_CRYPTO_NULL is not set
938# CONFIG_CRYPTO_CRYPTD is not set 980# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/44x/katmai_defconfig b/arch/powerpc/configs/44x/katmai_defconfig
index e326ee8bd195..f67250b24ec5 100644
--- a/arch/powerpc/configs/44x/katmai_defconfig
+++ b/arch/powerpc/configs/44x/katmai_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.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:11 2008 4# Tue Jan 20 08:22:38 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -18,6 +18,7 @@ CONFIG_4xx=y
18CONFIG_BOOKE=y 18CONFIG_BOOKE=y
19CONFIG_PTE_64BIT=y 19CONFIG_PTE_64BIT=y
20CONFIG_PHYS_64BIT=y 20CONFIG_PHYS_64BIT=y
21CONFIG_PPC_MMU_NOHASH=y
21# CONFIG_PPC_MM_SLICES is not set 22# CONFIG_PPC_MM_SLICES is not set
22CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 24CONFIG_PPC32=y
@@ -43,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
43CONFIG_PPC=y 44CONFIG_PPC=y
44CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
45CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
46CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
47CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
48CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
49CONFIG_OF=y 50CONFIG_OF=y
@@ -74,8 +75,8 @@ CONFIG_POSIX_MQUEUE=y
74# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
75# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
76CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
77# CONFIG_CGROUPS is not set
78# CONFIG_GROUP_SCHED is not set 78# CONFIG_GROUP_SCHED is not set
79# CONFIG_CGROUPS is not set
79CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
81# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
@@ -110,7 +111,6 @@ CONFIG_SLUB_DEBUG=y
110CONFIG_SLUB=y 111CONFIG_SLUB=y
111# CONFIG_SLOB is not set 112# CONFIG_SLOB is not set
112# CONFIG_PROFILING is not set 113# CONFIG_PROFILING is not set
113# CONFIG_MARKERS is not set
114CONFIG_HAVE_OPROFILE=y 114CONFIG_HAVE_OPROFILE=y
115# CONFIG_KPROBES is not set 115# CONFIG_KPROBES is not set
116CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 116CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -121,7 +121,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
121# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 121# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
122CONFIG_SLABINFO=y 122CONFIG_SLABINFO=y
123CONFIG_RT_MUTEXES=y 123CONFIG_RT_MUTEXES=y
124# CONFIG_TINY_SHMEM is not set
125CONFIG_BASE_SMALL=0 124CONFIG_BASE_SMALL=0
126CONFIG_MODULES=y 125CONFIG_MODULES=y
127# CONFIG_MODULE_FORCE_LOAD is not set 126# CONFIG_MODULE_FORCE_LOAD is not set
@@ -129,11 +128,9 @@ CONFIG_MODULE_UNLOAD=y
129# CONFIG_MODULE_FORCE_UNLOAD is not set 128# CONFIG_MODULE_FORCE_UNLOAD is not set
130# CONFIG_MODVERSIONS is not set 129# CONFIG_MODVERSIONS is not set
131# CONFIG_MODULE_SRCVERSION_ALL is not set 130# CONFIG_MODULE_SRCVERSION_ALL is not set
132CONFIG_KMOD=y
133CONFIG_BLOCK=y 131CONFIG_BLOCK=y
134CONFIG_LBD=y 132CONFIG_LBD=y
135# CONFIG_BLK_DEV_IO_TRACE is not set 133# CONFIG_BLK_DEV_IO_TRACE is not set
136# CONFIG_LSF is not set
137# CONFIG_BLK_DEV_BSG is not set 134# CONFIG_BLK_DEV_BSG is not set
138# CONFIG_BLK_DEV_INTEGRITY is not set 135# CONFIG_BLK_DEV_INTEGRITY is not set
139 136
@@ -150,6 +147,10 @@ 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_TREE_RCU is not set
151# CONFIG_PREEMPT_RCU is not set
152# CONFIG_TREE_RCU_TRACE is not set
153# CONFIG_PREEMPT_RCU_TRACE is not set
153# CONFIG_FREEZER is not set 154# CONFIG_FREEZER is not set
154CONFIG_PPC4xx_PCI_EXPRESS=y 155CONFIG_PPC4xx_PCI_EXPRESS=y
155 156
@@ -187,6 +188,7 @@ CONFIG_440SPe=y
187# CONFIG_GENERIC_IOMAP is not set 188# CONFIG_GENERIC_IOMAP is not set
188# CONFIG_CPU_FREQ is not set 189# CONFIG_CPU_FREQ is not set
189# CONFIG_FSL_ULI1575 is not set 190# CONFIG_FSL_ULI1575 is not set
191# CONFIG_SIMPLE_GPIO is not set
190 192
191# 193#
192# Kernel options 194# Kernel options
@@ -210,6 +212,7 @@ CONFIG_BINFMT_ELF=y
210# CONFIG_BINFMT_MISC is not set 212# CONFIG_BINFMT_MISC is not set
211# CONFIG_MATH_EMULATION is not set 213# CONFIG_MATH_EMULATION is not set
212# CONFIG_IOMMU_HELPER is not set 214# CONFIG_IOMMU_HELPER is not set
215CONFIG_PPC_NEED_DMA_SYNC_OPS=y
213CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 216CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
214CONFIG_ARCH_HAS_WALK_MEMORY=y 217CONFIG_ARCH_HAS_WALK_MEMORY=y
215CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 218CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -224,12 +227,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
224CONFIG_PAGEFLAGS_EXTENDED=y 227CONFIG_PAGEFLAGS_EXTENDED=y
225CONFIG_SPLIT_PTLOCK_CPUS=4 228CONFIG_SPLIT_PTLOCK_CPUS=4
226CONFIG_MIGRATION=y 229CONFIG_MIGRATION=y
227CONFIG_RESOURCES_64BIT=y
228CONFIG_PHYS_ADDR_T_64BIT=y 230CONFIG_PHYS_ADDR_T_64BIT=y
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
232CONFIG_UNEVICTABLE_LRU=y 234CONFIG_UNEVICTABLE_LRU=y
235CONFIG_PPC_4K_PAGES=y
236# CONFIG_PPC_16K_PAGES is not set
237# CONFIG_PPC_64K_PAGES is not set
233CONFIG_FORCE_MAX_ZONEORDER=11 238CONFIG_FORCE_MAX_ZONEORDER=11
234CONFIG_PROC_DEVICETREE=y 239CONFIG_PROC_DEVICETREE=y
235CONFIG_CMDLINE_BOOL=y 240CONFIG_CMDLINE_BOOL=y
@@ -253,6 +258,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
253# CONFIG_PCI_MSI is not set 258# CONFIG_PCI_MSI is not set
254CONFIG_PCI_LEGACY=y 259CONFIG_PCI_LEGACY=y
255# CONFIG_PCI_DEBUG is not set 260# CONFIG_PCI_DEBUG is not set
261# CONFIG_PCI_STUB is not set
256# CONFIG_PCCARD is not set 262# CONFIG_PCCARD is not set
257# CONFIG_HOTPLUG_PCI is not set 263# CONFIG_HOTPLUG_PCI is not set
258# CONFIG_HAS_RAPIDIO is not set 264# CONFIG_HAS_RAPIDIO is not set
@@ -277,6 +283,7 @@ CONFIG_NET=y
277# 283#
278# Networking options 284# Networking options
279# 285#
286CONFIG_COMPAT_NET_DEV_OPS=y
280CONFIG_PACKET=y 287CONFIG_PACKET=y
281# CONFIG_PACKET_MMAP is not set 288# CONFIG_PACKET_MMAP is not set
282CONFIG_UNIX=y 289CONFIG_UNIX=y
@@ -327,6 +334,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
327# CONFIG_ECONET is not set 334# CONFIG_ECONET is not set
328# CONFIG_WAN_ROUTER is not set 335# CONFIG_WAN_ROUTER is not set
329# CONFIG_NET_SCHED is not set 336# CONFIG_NET_SCHED is not set
337# CONFIG_DCB is not set
330 338
331# 339#
332# Network testing 340# Network testing
@@ -339,6 +347,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
339# CONFIG_AF_RXRPC is not set 347# CONFIG_AF_RXRPC is not set
340# CONFIG_PHONET is not set 348# CONFIG_PHONET is not set
341# CONFIG_WIRELESS is not set 349# CONFIG_WIRELESS is not set
350# CONFIG_WIMAX is not set
342# CONFIG_RFKILL is not set 351# CONFIG_RFKILL is not set
343# CONFIG_NET_9P is not set 352# CONFIG_NET_9P is not set
344 353
@@ -388,6 +397,7 @@ CONFIG_MISC_DEVICES=y
388# CONFIG_TIFM_CORE is not set 397# CONFIG_TIFM_CORE is not set
389# CONFIG_ENCLOSURE_SERVICES is not set 398# CONFIG_ENCLOSURE_SERVICES is not set
390# CONFIG_HP_ILO is not set 399# CONFIG_HP_ILO is not set
400# CONFIG_C2PORT is not set
391CONFIG_HAVE_IDE=y 401CONFIG_HAVE_IDE=y
392# CONFIG_IDE is not set 402# CONFIG_IDE is not set
393 403
@@ -472,6 +482,7 @@ CONFIG_NETDEV_1000=y
472# CONFIG_JME is not set 482# CONFIG_JME is not set
473CONFIG_NETDEV_10000=y 483CONFIG_NETDEV_10000=y
474# CONFIG_CHELSIO_T1 is not set 484# CONFIG_CHELSIO_T1 is not set
485CONFIG_CHELSIO_T3_DEPENDS=y
475# CONFIG_CHELSIO_T3 is not set 486# CONFIG_CHELSIO_T3 is not set
476# CONFIG_ENIC is not set 487# CONFIG_ENIC is not set
477# CONFIG_IXGBE is not set 488# CONFIG_IXGBE is not set
@@ -494,6 +505,10 @@ CONFIG_NETDEV_10000=y
494# CONFIG_WLAN_PRE80211 is not set 505# CONFIG_WLAN_PRE80211 is not set
495# CONFIG_WLAN_80211 is not set 506# CONFIG_WLAN_80211 is not set
496# CONFIG_IWLWIFI_LEDS is not set 507# CONFIG_IWLWIFI_LEDS is not set
508
509#
510# Enable WiMAX (Networking options) to see the WiMAX drivers
511#
497# CONFIG_WAN is not set 512# CONFIG_WAN is not set
498# CONFIG_FDDI is not set 513# CONFIG_FDDI is not set
499# CONFIG_HIPPI is not set 514# CONFIG_HIPPI is not set
@@ -546,9 +561,12 @@ CONFIG_SERIAL_CORE=y
546CONFIG_SERIAL_CORE_CONSOLE=y 561CONFIG_SERIAL_CORE_CONSOLE=y
547# CONFIG_SERIAL_JSM is not set 562# CONFIG_SERIAL_JSM is not set
548CONFIG_SERIAL_OF_PLATFORM=y 563CONFIG_SERIAL_OF_PLATFORM=y
564# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
549CONFIG_UNIX98_PTYS=y 565CONFIG_UNIX98_PTYS=y
566# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
550CONFIG_LEGACY_PTYS=y 567CONFIG_LEGACY_PTYS=y
551CONFIG_LEGACY_PTY_COUNT=256 568CONFIG_LEGACY_PTY_COUNT=256
569# CONFIG_HVC_UDBG is not set
552# CONFIG_IPMI_HANDLER is not set 570# CONFIG_IPMI_HANDLER is not set
553# CONFIG_HW_RANDOM is not set 571# CONFIG_HW_RANDOM is not set
554# CONFIG_NVRAM is not set 572# CONFIG_NVRAM is not set
@@ -568,11 +586,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
568# CONFIG_THERMAL is not set 586# CONFIG_THERMAL is not set
569# CONFIG_THERMAL_HWMON is not set 587# CONFIG_THERMAL_HWMON is not set
570# CONFIG_WATCHDOG is not set 588# CONFIG_WATCHDOG is not set
589CONFIG_SSB_POSSIBLE=y
571 590
572# 591#
573# Sonics Silicon Backplane 592# Sonics Silicon Backplane
574# 593#
575CONFIG_SSB_POSSIBLE=y
576# CONFIG_SSB is not set 594# CONFIG_SSB is not set
577 595
578# 596#
@@ -582,7 +600,7 @@ CONFIG_SSB_POSSIBLE=y
582# CONFIG_MFD_SM501 is not set 600# CONFIG_MFD_SM501 is not set
583# CONFIG_HTC_PASIC3 is not set 601# CONFIG_HTC_PASIC3 is not set
584# CONFIG_MFD_TMIO is not set 602# CONFIG_MFD_TMIO is not set
585# CONFIG_MFD_WM8400 is not set 603# CONFIG_REGULATOR is not set
586 604
587# 605#
588# Multimedia devices 606# Multimedia devices
@@ -628,9 +646,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
628# 646#
629 647
630# 648#
631# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 649# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
632# 650#
633# CONFIG_USB_GADGET is not set 651# CONFIG_USB_GADGET is not set
652
653#
654# OTG and related infrastructure
655#
634# CONFIG_UWB is not set 656# CONFIG_UWB is not set
635# CONFIG_MMC is not set 657# CONFIG_MMC is not set
636# CONFIG_MEMSTICK is not set 658# CONFIG_MEMSTICK is not set
@@ -656,7 +678,9 @@ CONFIG_EXT2_FS=y
656# CONFIG_FS_POSIX_ACL is not set 678# CONFIG_FS_POSIX_ACL is not set
657CONFIG_FILE_LOCKING=y 679CONFIG_FILE_LOCKING=y
658# CONFIG_XFS_FS is not set 680# CONFIG_XFS_FS is not set
681# CONFIG_GFS2_FS is not set
659# CONFIG_OCFS2_FS is not set 682# CONFIG_OCFS2_FS is not set
683# CONFIG_BTRFS_FS is not set
660CONFIG_DNOTIFY=y 684CONFIG_DNOTIFY=y
661CONFIG_INOTIFY=y 685CONFIG_INOTIFY=y
662CONFIG_INOTIFY_USER=y 686CONFIG_INOTIFY_USER=y
@@ -690,10 +714,7 @@ CONFIG_TMPFS=y
690# CONFIG_TMPFS_POSIX_ACL is not set 714# CONFIG_TMPFS_POSIX_ACL is not set
691# CONFIG_HUGETLB_PAGE is not set 715# CONFIG_HUGETLB_PAGE is not set
692# CONFIG_CONFIGFS_FS is not set 716# CONFIG_CONFIGFS_FS is not set
693 717CONFIG_MISC_FILESYSTEMS=y
694#
695# Miscellaneous filesystems
696#
697# CONFIG_ADFS_FS is not set 718# CONFIG_ADFS_FS is not set
698# CONFIG_AFFS_FS is not set 719# CONFIG_AFFS_FS is not set
699# CONFIG_HFS_FS is not set 720# CONFIG_HFS_FS is not set
@@ -702,6 +723,7 @@ CONFIG_TMPFS=y
702# CONFIG_BFS_FS is not set 723# CONFIG_BFS_FS is not set
703# CONFIG_EFS_FS is not set 724# CONFIG_EFS_FS is not set
704CONFIG_CRAMFS=y 725CONFIG_CRAMFS=y
726# CONFIG_SQUASHFS is not set
705# CONFIG_VXFS_FS is not set 727# CONFIG_VXFS_FS is not set
706# CONFIG_MINIX_FS is not set 728# CONFIG_MINIX_FS is not set
707# CONFIG_OMFS_FS is not set 729# CONFIG_OMFS_FS is not set
@@ -742,6 +764,7 @@ CONFIG_MSDOS_PARTITION=y
742# Library routines 764# Library routines
743# 765#
744CONFIG_BITREVERSE=y 766CONFIG_BITREVERSE=y
767CONFIG_GENERIC_FIND_LAST_BIT=y
745# CONFIG_CRC_CCITT is not set 768# CONFIG_CRC_CCITT is not set
746# CONFIG_CRC16 is not set 769# CONFIG_CRC16 is not set
747# CONFIG_CRC_T10DIF is not set 770# CONFIG_CRC_T10DIF is not set
@@ -792,6 +815,7 @@ CONFIG_SCHED_DEBUG=y
792# CONFIG_DEBUG_MEMORY_INIT is not set 815# CONFIG_DEBUG_MEMORY_INIT is not set
793# CONFIG_DEBUG_LIST is not set 816# CONFIG_DEBUG_LIST is not set
794# CONFIG_DEBUG_SG is not set 817# CONFIG_DEBUG_SG is not set
818# CONFIG_DEBUG_NOTIFIERS is not set
795# CONFIG_BOOT_PRINTK_DELAY is not set 819# CONFIG_BOOT_PRINTK_DELAY is not set
796# CONFIG_RCU_TORTURE_TEST is not set 820# CONFIG_RCU_TORTURE_TEST is not set
797# CONFIG_RCU_CPU_STALL_DETECTOR is not set 821# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -800,18 +824,24 @@ CONFIG_SCHED_DEBUG=y
800# CONFIG_FAULT_INJECTION is not set 824# CONFIG_FAULT_INJECTION is not set
801# CONFIG_LATENCYTOP is not set 825# CONFIG_LATENCYTOP is not set
802CONFIG_SYSCTL_SYSCALL_CHECK=y 826CONFIG_SYSCTL_SYSCALL_CHECK=y
803CONFIG_NOP_TRACER=y 827CONFIG_HAVE_FUNCTION_TRACER=y
804CONFIG_HAVE_FTRACE=y
805CONFIG_HAVE_DYNAMIC_FTRACE=y 828CONFIG_HAVE_DYNAMIC_FTRACE=y
806# CONFIG_FTRACE is not set 829CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
830
831#
832# Tracers
833#
834# CONFIG_FUNCTION_TRACER is not set
807# CONFIG_SCHED_TRACER is not set 835# CONFIG_SCHED_TRACER is not set
808# CONFIG_CONTEXT_SWITCH_TRACER is not set 836# CONFIG_CONTEXT_SWITCH_TRACER is not set
809# CONFIG_BOOT_TRACER is not set 837# CONFIG_BOOT_TRACER is not set
838# CONFIG_TRACE_BRANCH_PROFILING is not set
810# CONFIG_STACK_TRACER is not set 839# CONFIG_STACK_TRACER is not set
811# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 840# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
812# CONFIG_SAMPLES is not set 841# CONFIG_SAMPLES is not set
813CONFIG_HAVE_ARCH_KGDB=y 842CONFIG_HAVE_ARCH_KGDB=y
814# CONFIG_KGDB is not set 843# CONFIG_KGDB is not set
844CONFIG_PRINT_STACK_DEPTH=64
815# CONFIG_DEBUG_STACKOVERFLOW is not set 845# CONFIG_DEBUG_STACKOVERFLOW is not set
816# CONFIG_DEBUG_STACK_USAGE is not set 846# CONFIG_DEBUG_STACK_USAGE is not set
817# CONFIG_DEBUG_PAGEALLOC is not set 847# CONFIG_DEBUG_PAGEALLOC is not set
@@ -837,11 +867,15 @@ CONFIG_CRYPTO=y
837# 867#
838# CONFIG_CRYPTO_FIPS is not set 868# CONFIG_CRYPTO_FIPS is not set
839CONFIG_CRYPTO_ALGAPI=y 869CONFIG_CRYPTO_ALGAPI=y
840CONFIG_CRYPTO_AEAD=y 870CONFIG_CRYPTO_ALGAPI2=y
871CONFIG_CRYPTO_AEAD2=y
841CONFIG_CRYPTO_BLKCIPHER=y 872CONFIG_CRYPTO_BLKCIPHER=y
873CONFIG_CRYPTO_BLKCIPHER2=y
842CONFIG_CRYPTO_HASH=y 874CONFIG_CRYPTO_HASH=y
843CONFIG_CRYPTO_RNG=y 875CONFIG_CRYPTO_HASH2=y
876CONFIG_CRYPTO_RNG2=y
844CONFIG_CRYPTO_MANAGER=y 877CONFIG_CRYPTO_MANAGER=y
878CONFIG_CRYPTO_MANAGER2=y
845# CONFIG_CRYPTO_GF128MUL is not set 879# CONFIG_CRYPTO_GF128MUL is not set
846# CONFIG_CRYPTO_NULL is not set 880# CONFIG_CRYPTO_NULL is not set
847# CONFIG_CRYPTO_CRYPTD is not set 881# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/44x/rainier_defconfig b/arch/powerpc/configs/44x/rainier_defconfig
index 927f829e2087..9348c12bd7a6 100644
--- a/arch/powerpc/configs/44x/rainier_defconfig
+++ b/arch/powerpc/configs/44x/rainier_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:13 2008 4# Tue Jan 20 08:22:41 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -18,6 +18,7 @@ CONFIG_4xx=y
18CONFIG_BOOKE=y 18CONFIG_BOOKE=y
19CONFIG_PTE_64BIT=y 19CONFIG_PTE_64BIT=y
20CONFIG_PHYS_64BIT=y 20CONFIG_PHYS_64BIT=y
21CONFIG_PPC_MMU_NOHASH=y
21# CONFIG_PPC_MM_SLICES is not set 22# CONFIG_PPC_MM_SLICES is not set
22CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 24CONFIG_PPC32=y
@@ -43,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
43CONFIG_PPC=y 44CONFIG_PPC=y
44CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
45CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
46CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
47CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
48CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
49CONFIG_OF=y 50CONFIG_OF=y
@@ -74,12 +75,12 @@ CONFIG_POSIX_MQUEUE=y
74# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
75# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
76CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
77# CONFIG_CGROUPS is not set
78CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
79CONFIG_FAIR_GROUP_SCHED=y 79CONFIG_FAIR_GROUP_SCHED=y
80# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
81CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
82# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
83CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
84CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
85# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -114,7 +115,6 @@ CONFIG_SLUB_DEBUG=y
114CONFIG_SLUB=y 115CONFIG_SLUB=y
115# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
116# CONFIG_PROFILING is not set 117# CONFIG_PROFILING is not set
117# CONFIG_MARKERS is not set
118CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
119# CONFIG_KPROBES is not set 119# CONFIG_KPROBES is not set
120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -125,7 +125,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
126CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
127CONFIG_RT_MUTEXES=y 127CONFIG_RT_MUTEXES=y
128# CONFIG_TINY_SHMEM is not set
129CONFIG_BASE_SMALL=0 128CONFIG_BASE_SMALL=0
130CONFIG_MODULES=y 129CONFIG_MODULES=y
131# CONFIG_MODULE_FORCE_LOAD is not set 130# CONFIG_MODULE_FORCE_LOAD is not set
@@ -133,11 +132,9 @@ CONFIG_MODULE_UNLOAD=y
133# CONFIG_MODULE_FORCE_UNLOAD is not set 132# CONFIG_MODULE_FORCE_UNLOAD is not set
134# CONFIG_MODVERSIONS is not set 133# CONFIG_MODVERSIONS is not set
135# CONFIG_MODULE_SRCVERSION_ALL is not set 134# CONFIG_MODULE_SRCVERSION_ALL is not set
136CONFIG_KMOD=y
137CONFIG_BLOCK=y 135CONFIG_BLOCK=y
138CONFIG_LBD=y 136CONFIG_LBD=y
139# CONFIG_BLK_DEV_IO_TRACE is not set 137# CONFIG_BLK_DEV_IO_TRACE is not set
140# CONFIG_LSF is not set
141# CONFIG_BLK_DEV_BSG is not set 138# CONFIG_BLK_DEV_BSG is not set
142# CONFIG_BLK_DEV_INTEGRITY is not set 139# CONFIG_BLK_DEV_INTEGRITY is not set
143 140
@@ -154,6 +151,10 @@ CONFIG_DEFAULT_AS=y
154# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
155CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
156CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_TREE_RCU is not set
155# CONFIG_PREEMPT_RCU is not set
156# CONFIG_TREE_RCU_TRACE is not set
157# CONFIG_PREEMPT_RCU_TRACE is not set
157# CONFIG_FREEZER is not set 158# CONFIG_FREEZER is not set
158# CONFIG_PPC4xx_PCI_EXPRESS is not set 159# CONFIG_PPC4xx_PCI_EXPRESS is not set
159 160
@@ -191,6 +192,7 @@ CONFIG_440GRX=y
191# CONFIG_GENERIC_IOMAP is not set 192# CONFIG_GENERIC_IOMAP is not set
192# CONFIG_CPU_FREQ is not set 193# CONFIG_CPU_FREQ is not set
193# CONFIG_FSL_ULI1575 is not set 194# CONFIG_FSL_ULI1575 is not set
195# CONFIG_SIMPLE_GPIO is not set
194 196
195# 197#
196# Kernel options 198# Kernel options
@@ -214,6 +216,7 @@ CONFIG_BINFMT_ELF=y
214# CONFIG_BINFMT_MISC is not set 216# CONFIG_BINFMT_MISC is not set
215CONFIG_MATH_EMULATION=y 217CONFIG_MATH_EMULATION=y
216# CONFIG_IOMMU_HELPER is not set 218# CONFIG_IOMMU_HELPER is not set
219CONFIG_PPC_NEED_DMA_SYNC_OPS=y
217CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 220CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
218CONFIG_ARCH_HAS_WALK_MEMORY=y 221CONFIG_ARCH_HAS_WALK_MEMORY=y
219CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 222CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -228,12 +231,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
228CONFIG_PAGEFLAGS_EXTENDED=y 231CONFIG_PAGEFLAGS_EXTENDED=y
229CONFIG_SPLIT_PTLOCK_CPUS=4 232CONFIG_SPLIT_PTLOCK_CPUS=4
230CONFIG_MIGRATION=y 233CONFIG_MIGRATION=y
231CONFIG_RESOURCES_64BIT=y
232CONFIG_PHYS_ADDR_T_64BIT=y 234CONFIG_PHYS_ADDR_T_64BIT=y
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
236CONFIG_UNEVICTABLE_LRU=y 238CONFIG_UNEVICTABLE_LRU=y
239CONFIG_PPC_4K_PAGES=y
240# CONFIG_PPC_16K_PAGES is not set
241# CONFIG_PPC_64K_PAGES is not set
237CONFIG_FORCE_MAX_ZONEORDER=11 242CONFIG_FORCE_MAX_ZONEORDER=11
238CONFIG_PROC_DEVICETREE=y 243CONFIG_PROC_DEVICETREE=y
239CONFIG_CMDLINE_BOOL=y 244CONFIG_CMDLINE_BOOL=y
@@ -257,6 +262,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
257# CONFIG_PCI_MSI is not set 262# CONFIG_PCI_MSI is not set
258CONFIG_PCI_LEGACY=y 263CONFIG_PCI_LEGACY=y
259# CONFIG_PCI_DEBUG is not set 264# CONFIG_PCI_DEBUG is not set
265# CONFIG_PCI_STUB is not set
260# CONFIG_PCCARD is not set 266# CONFIG_PCCARD is not set
261# CONFIG_HOTPLUG_PCI is not set 267# CONFIG_HOTPLUG_PCI is not set
262# CONFIG_HAS_RAPIDIO is not set 268# CONFIG_HAS_RAPIDIO is not set
@@ -281,6 +287,7 @@ CONFIG_NET=y
281# 287#
282# Networking options 288# Networking options
283# 289#
290CONFIG_COMPAT_NET_DEV_OPS=y
284CONFIG_PACKET=y 291CONFIG_PACKET=y
285# CONFIG_PACKET_MMAP is not set 292# CONFIG_PACKET_MMAP is not set
286CONFIG_UNIX=y 293CONFIG_UNIX=y
@@ -331,6 +338,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
331# CONFIG_ECONET is not set 338# CONFIG_ECONET is not set
332# CONFIG_WAN_ROUTER is not set 339# CONFIG_WAN_ROUTER is not set
333# CONFIG_NET_SCHED is not set 340# CONFIG_NET_SCHED is not set
341# CONFIG_DCB is not set
334 342
335# 343#
336# Network testing 344# Network testing
@@ -343,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
343# CONFIG_AF_RXRPC is not set 351# CONFIG_AF_RXRPC is not set
344# CONFIG_PHONET is not set 352# CONFIG_PHONET is not set
345# CONFIG_WIRELESS is not set 353# CONFIG_WIRELESS is not set
354# CONFIG_WIMAX is not set
346# CONFIG_RFKILL is not set 355# CONFIG_RFKILL is not set
347# CONFIG_NET_9P is not set 356# CONFIG_NET_9P is not set
348 357
@@ -368,6 +377,7 @@ CONFIG_MTD=y
368# CONFIG_MTD_DEBUG is not set 377# CONFIG_MTD_DEBUG is not set
369# CONFIG_MTD_CONCAT is not set 378# CONFIG_MTD_CONCAT is not set
370CONFIG_MTD_PARTITIONS=y 379CONFIG_MTD_PARTITIONS=y
380# CONFIG_MTD_TESTS is not set
371# CONFIG_MTD_REDBOOT_PARTS is not set 381# CONFIG_MTD_REDBOOT_PARTS is not set
372CONFIG_MTD_CMDLINE_PARTS=y 382CONFIG_MTD_CMDLINE_PARTS=y
373CONFIG_MTD_OF_PARTS=y 383CONFIG_MTD_OF_PARTS=y
@@ -440,6 +450,12 @@ CONFIG_MTD_PHYSMAP_OF=y
440# CONFIG_MTD_ONENAND is not set 450# CONFIG_MTD_ONENAND is not set
441 451
442# 452#
453# LPDDR flash memory drivers
454#
455# CONFIG_MTD_LPDDR is not set
456# CONFIG_MTD_QINFO_PROBE is not set
457
458#
443# UBI - Unsorted block images 459# UBI - Unsorted block images
444# 460#
445# CONFIG_MTD_UBI is not set 461# CONFIG_MTD_UBI is not set
@@ -470,6 +486,7 @@ CONFIG_MISC_DEVICES=y
470# CONFIG_TIFM_CORE is not set 486# CONFIG_TIFM_CORE is not set
471# CONFIG_ENCLOSURE_SERVICES is not set 487# CONFIG_ENCLOSURE_SERVICES is not set
472# CONFIG_HP_ILO is not set 488# CONFIG_HP_ILO is not set
489# CONFIG_C2PORT is not set
473CONFIG_HAVE_IDE=y 490CONFIG_HAVE_IDE=y
474# CONFIG_IDE is not set 491# CONFIG_IDE is not set
475 492
@@ -532,6 +549,7 @@ CONFIG_NETDEV_1000=y
532# CONFIG_JME is not set 549# CONFIG_JME is not set
533CONFIG_NETDEV_10000=y 550CONFIG_NETDEV_10000=y
534# CONFIG_CHELSIO_T1 is not set 551# CONFIG_CHELSIO_T1 is not set
552CONFIG_CHELSIO_T3_DEPENDS=y
535# CONFIG_CHELSIO_T3 is not set 553# CONFIG_CHELSIO_T3 is not set
536# CONFIG_ENIC is not set 554# CONFIG_ENIC is not set
537# CONFIG_IXGBE is not set 555# CONFIG_IXGBE is not set
@@ -554,6 +572,10 @@ CONFIG_NETDEV_10000=y
554# CONFIG_WLAN_PRE80211 is not set 572# CONFIG_WLAN_PRE80211 is not set
555# CONFIG_WLAN_80211 is not set 573# CONFIG_WLAN_80211 is not set
556# CONFIG_IWLWIFI_LEDS is not set 574# CONFIG_IWLWIFI_LEDS is not set
575
576#
577# Enable WiMAX (Networking options) to see the WiMAX drivers
578#
557# CONFIG_WAN is not set 579# CONFIG_WAN is not set
558# CONFIG_FDDI is not set 580# CONFIG_FDDI is not set
559# CONFIG_HIPPI is not set 581# CONFIG_HIPPI is not set
@@ -606,9 +628,12 @@ CONFIG_SERIAL_CORE=y
606CONFIG_SERIAL_CORE_CONSOLE=y 628CONFIG_SERIAL_CORE_CONSOLE=y
607# CONFIG_SERIAL_JSM is not set 629# CONFIG_SERIAL_JSM is not set
608CONFIG_SERIAL_OF_PLATFORM=y 630CONFIG_SERIAL_OF_PLATFORM=y
631# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
609CONFIG_UNIX98_PTYS=y 632CONFIG_UNIX98_PTYS=y
633# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
610CONFIG_LEGACY_PTYS=y 634CONFIG_LEGACY_PTYS=y
611CONFIG_LEGACY_PTY_COUNT=256 635CONFIG_LEGACY_PTY_COUNT=256
636# CONFIG_HVC_UDBG is not set
612# CONFIG_IPMI_HANDLER is not set 637# CONFIG_IPMI_HANDLER is not set
613# CONFIG_HW_RANDOM is not set 638# CONFIG_HW_RANDOM is not set
614# CONFIG_NVRAM is not set 639# CONFIG_NVRAM is not set
@@ -627,11 +652,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
627# CONFIG_HWMON is not set 652# CONFIG_HWMON is not set
628CONFIG_THERMAL=y 653CONFIG_THERMAL=y
629# CONFIG_WATCHDOG is not set 654# CONFIG_WATCHDOG is not set
655CONFIG_SSB_POSSIBLE=y
630 656
631# 657#
632# Sonics Silicon Backplane 658# Sonics Silicon Backplane
633# 659#
634CONFIG_SSB_POSSIBLE=y
635# CONFIG_SSB is not set 660# CONFIG_SSB is not set
636 661
637# 662#
@@ -641,7 +666,7 @@ CONFIG_SSB_POSSIBLE=y
641# CONFIG_MFD_SM501 is not set 666# CONFIG_MFD_SM501 is not set
642# CONFIG_HTC_PASIC3 is not set 667# CONFIG_HTC_PASIC3 is not set
643# CONFIG_MFD_TMIO is not set 668# CONFIG_MFD_TMIO is not set
644# CONFIG_MFD_WM8400 is not set 669# CONFIG_REGULATOR is not set
645 670
646# 671#
647# Multimedia devices 672# Multimedia devices
@@ -687,9 +712,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
687# 712#
688 713
689# 714#
690# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 715# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
691# 716#
692# CONFIG_USB_GADGET is not set 717# CONFIG_USB_GADGET is not set
718
719#
720# OTG and related infrastructure
721#
693# CONFIG_UWB is not set 722# CONFIG_UWB is not set
694# CONFIG_MMC is not set 723# CONFIG_MMC is not set
695# CONFIG_MEMSTICK is not set 724# CONFIG_MEMSTICK is not set
@@ -715,7 +744,9 @@ CONFIG_EXT2_FS=y
715# CONFIG_FS_POSIX_ACL is not set 744# CONFIG_FS_POSIX_ACL is not set
716CONFIG_FILE_LOCKING=y 745CONFIG_FILE_LOCKING=y
717# CONFIG_XFS_FS is not set 746# CONFIG_XFS_FS is not set
747# CONFIG_GFS2_FS is not set
718# CONFIG_OCFS2_FS is not set 748# CONFIG_OCFS2_FS is not set
749# CONFIG_BTRFS_FS is not set
719CONFIG_DNOTIFY=y 750CONFIG_DNOTIFY=y
720CONFIG_INOTIFY=y 751CONFIG_INOTIFY=y
721CONFIG_INOTIFY_USER=y 752CONFIG_INOTIFY_USER=y
@@ -749,10 +780,7 @@ CONFIG_TMPFS=y
749# CONFIG_TMPFS_POSIX_ACL is not set 780# CONFIG_TMPFS_POSIX_ACL is not set
750# CONFIG_HUGETLB_PAGE is not set 781# CONFIG_HUGETLB_PAGE is not set
751# CONFIG_CONFIGFS_FS is not set 782# CONFIG_CONFIGFS_FS is not set
752 783CONFIG_MISC_FILESYSTEMS=y
753#
754# Miscellaneous filesystems
755#
756# CONFIG_ADFS_FS is not set 784# CONFIG_ADFS_FS is not set
757# CONFIG_AFFS_FS is not set 785# CONFIG_AFFS_FS is not set
758# CONFIG_HFS_FS is not set 786# CONFIG_HFS_FS is not set
@@ -772,6 +800,7 @@ CONFIG_JFFS2_ZLIB=y
772CONFIG_JFFS2_RTIME=y 800CONFIG_JFFS2_RTIME=y
773# CONFIG_JFFS2_RUBIN is not set 801# CONFIG_JFFS2_RUBIN is not set
774CONFIG_CRAMFS=y 802CONFIG_CRAMFS=y
803# CONFIG_SQUASHFS is not set
775# CONFIG_VXFS_FS is not set 804# CONFIG_VXFS_FS is not set
776# CONFIG_MINIX_FS is not set 805# CONFIG_MINIX_FS is not set
777# CONFIG_OMFS_FS is not set 806# CONFIG_OMFS_FS is not set
@@ -812,6 +841,7 @@ CONFIG_MSDOS_PARTITION=y
812# Library routines 841# Library routines
813# 842#
814CONFIG_BITREVERSE=y 843CONFIG_BITREVERSE=y
844CONFIG_GENERIC_FIND_LAST_BIT=y
815# CONFIG_CRC_CCITT is not set 845# CONFIG_CRC_CCITT is not set
816# CONFIG_CRC16 is not set 846# CONFIG_CRC16 is not set
817# CONFIG_CRC_T10DIF is not set 847# CONFIG_CRC_T10DIF is not set
@@ -863,6 +893,7 @@ CONFIG_SCHED_DEBUG=y
863# CONFIG_DEBUG_MEMORY_INIT is not set 893# CONFIG_DEBUG_MEMORY_INIT is not set
864# CONFIG_DEBUG_LIST is not set 894# CONFIG_DEBUG_LIST is not set
865# CONFIG_DEBUG_SG is not set 895# CONFIG_DEBUG_SG is not set
896# CONFIG_DEBUG_NOTIFIERS is not set
866# CONFIG_BOOT_PRINTK_DELAY is not set 897# CONFIG_BOOT_PRINTK_DELAY is not set
867# CONFIG_RCU_TORTURE_TEST is not set 898# CONFIG_RCU_TORTURE_TEST is not set
868# CONFIG_RCU_CPU_STALL_DETECTOR is not set 899# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -871,18 +902,24 @@ CONFIG_SCHED_DEBUG=y
871# CONFIG_FAULT_INJECTION is not set 902# CONFIG_FAULT_INJECTION is not set
872# CONFIG_LATENCYTOP is not set 903# CONFIG_LATENCYTOP is not set
873CONFIG_SYSCTL_SYSCALL_CHECK=y 904CONFIG_SYSCTL_SYSCALL_CHECK=y
874CONFIG_NOP_TRACER=y 905CONFIG_HAVE_FUNCTION_TRACER=y
875CONFIG_HAVE_FTRACE=y
876CONFIG_HAVE_DYNAMIC_FTRACE=y 906CONFIG_HAVE_DYNAMIC_FTRACE=y
877# CONFIG_FTRACE is not set 907CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
908
909#
910# Tracers
911#
912# CONFIG_FUNCTION_TRACER is not set
878# CONFIG_SCHED_TRACER is not set 913# CONFIG_SCHED_TRACER is not set
879# CONFIG_CONTEXT_SWITCH_TRACER is not set 914# CONFIG_CONTEXT_SWITCH_TRACER is not set
880# CONFIG_BOOT_TRACER is not set 915# CONFIG_BOOT_TRACER is not set
916# CONFIG_TRACE_BRANCH_PROFILING is not set
881# CONFIG_STACK_TRACER is not set 917# CONFIG_STACK_TRACER is not set
882# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 918# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
883# CONFIG_SAMPLES is not set 919# CONFIG_SAMPLES is not set
884CONFIG_HAVE_ARCH_KGDB=y 920CONFIG_HAVE_ARCH_KGDB=y
885# CONFIG_KGDB is not set 921# CONFIG_KGDB is not set
922CONFIG_PRINT_STACK_DEPTH=64
886# CONFIG_DEBUG_STACKOVERFLOW is not set 923# CONFIG_DEBUG_STACKOVERFLOW is not set
887# CONFIG_DEBUG_STACK_USAGE is not set 924# CONFIG_DEBUG_STACK_USAGE is not set
888# CONFIG_DEBUG_PAGEALLOC is not set 925# CONFIG_DEBUG_PAGEALLOC is not set
@@ -922,11 +959,15 @@ CONFIG_CRYPTO=y
922# 959#
923# CONFIG_CRYPTO_FIPS is not set 960# CONFIG_CRYPTO_FIPS is not set
924CONFIG_CRYPTO_ALGAPI=y 961CONFIG_CRYPTO_ALGAPI=y
925CONFIG_CRYPTO_AEAD=y 962CONFIG_CRYPTO_ALGAPI2=y
963CONFIG_CRYPTO_AEAD2=y
926CONFIG_CRYPTO_BLKCIPHER=y 964CONFIG_CRYPTO_BLKCIPHER=y
965CONFIG_CRYPTO_BLKCIPHER2=y
927CONFIG_CRYPTO_HASH=y 966CONFIG_CRYPTO_HASH=y
928CONFIG_CRYPTO_RNG=y 967CONFIG_CRYPTO_HASH2=y
968CONFIG_CRYPTO_RNG2=y
929CONFIG_CRYPTO_MANAGER=y 969CONFIG_CRYPTO_MANAGER=y
970CONFIG_CRYPTO_MANAGER2=y
930# CONFIG_CRYPTO_GF128MUL is not set 971# CONFIG_CRYPTO_GF128MUL is not set
931# CONFIG_CRYPTO_NULL is not set 972# CONFIG_CRYPTO_NULL is not set
932# CONFIG_CRYPTO_CRYPTD is not set 973# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/44x/sam440ep_defconfig b/arch/powerpc/configs/44x/sam440ep_defconfig
index ce28cd6f0d4f..70d5c3fa3283 100644
--- a/arch/powerpc/configs/44x/sam440ep_defconfig
+++ b/arch/powerpc/configs/44x/sam440ep_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.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:15 2008 4# Tue Jan 20 08:22:42 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,6 +19,7 @@ CONFIG_4xx=y
19CONFIG_BOOKE=y 19CONFIG_BOOKE=y
20CONFIG_PTE_64BIT=y 20CONFIG_PTE_64BIT=y
21CONFIG_PHYS_64BIT=y 21CONFIG_PHYS_64BIT=y
22CONFIG_PPC_MMU_NOHASH=y
22# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y 24CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 25CONFIG_PPC32=y
@@ -44,7 +45,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 45CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
50CONFIG_OF=y 51CONFIG_OF=y
@@ -76,12 +77,12 @@ CONFIG_POSIX_MQUEUE=y
76CONFIG_IKCONFIG=y 77CONFIG_IKCONFIG=y
77# CONFIG_IKCONFIG_PROC is not set 78# CONFIG_IKCONFIG_PROC is not set
78CONFIG_LOG_BUF_SHIFT=14 79CONFIG_LOG_BUF_SHIFT=14
79# CONFIG_CGROUPS is not set
80CONFIG_GROUP_SCHED=y 80CONFIG_GROUP_SCHED=y
81CONFIG_FAIR_GROUP_SCHED=y 81CONFIG_FAIR_GROUP_SCHED=y
82# CONFIG_RT_GROUP_SCHED is not set 82# CONFIG_RT_GROUP_SCHED is not set
83CONFIG_USER_SCHED=y 83CONFIG_USER_SCHED=y
84# CONFIG_CGROUP_SCHED is not set 84# CONFIG_CGROUP_SCHED is not set
85# CONFIG_CGROUPS is not set
85CONFIG_SYSFS_DEPRECATED=y 86CONFIG_SYSFS_DEPRECATED=y
86CONFIG_SYSFS_DEPRECATED_V2=y 87CONFIG_SYSFS_DEPRECATED_V2=y
87# CONFIG_RELAY is not set 88# CONFIG_RELAY is not set
@@ -115,7 +116,6 @@ CONFIG_SLUB_DEBUG=y
115CONFIG_SLUB=y 116CONFIG_SLUB=y
116# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set 118# CONFIG_PROFILING is not set
118# CONFIG_MARKERS is not set
119CONFIG_HAVE_OPROFILE=y 119CONFIG_HAVE_OPROFILE=y
120# CONFIG_KPROBES is not set 120# CONFIG_KPROBES is not set
121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -126,7 +126,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
129# CONFIG_TINY_SHMEM is not set
130CONFIG_BASE_SMALL=0 129CONFIG_BASE_SMALL=0
131CONFIG_MODULES=y 130CONFIG_MODULES=y
132# CONFIG_MODULE_FORCE_LOAD is not set 131# CONFIG_MODULE_FORCE_LOAD is not set
@@ -134,11 +133,9 @@ CONFIG_MODULE_UNLOAD=y
134# CONFIG_MODULE_FORCE_UNLOAD is not set 133# CONFIG_MODULE_FORCE_UNLOAD is not set
135# CONFIG_MODVERSIONS is not set 134# CONFIG_MODVERSIONS is not set
136# CONFIG_MODULE_SRCVERSION_ALL is not set 135# CONFIG_MODULE_SRCVERSION_ALL is not set
137CONFIG_KMOD=y
138CONFIG_BLOCK=y 136CONFIG_BLOCK=y
139# CONFIG_LBD is not set 137# CONFIG_LBD is not set
140# CONFIG_BLK_DEV_IO_TRACE is not set 138# CONFIG_BLK_DEV_IO_TRACE is not set
141# CONFIG_LSF is not set
142# CONFIG_BLK_DEV_BSG is not set 139# CONFIG_BLK_DEV_BSG is not set
143# CONFIG_BLK_DEV_INTEGRITY is not set 140# CONFIG_BLK_DEV_INTEGRITY is not set
144 141
@@ -155,6 +152,10 @@ CONFIG_DEFAULT_AS=y
155# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
156CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
157CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_TREE_RCU is not set
156# CONFIG_PREEMPT_RCU is not set
157# CONFIG_TREE_RCU_TRACE is not set
158# CONFIG_PREEMPT_RCU_TRACE is not set
158# CONFIG_FREEZER is not set 159# CONFIG_FREEZER is not set
159# CONFIG_PPC4xx_PCI_EXPRESS is not set 160# CONFIG_PPC4xx_PCI_EXPRESS is not set
160 161
@@ -193,6 +194,7 @@ CONFIG_IBM440EP_ERR42=y
193# CONFIG_GENERIC_IOMAP is not set 194# CONFIG_GENERIC_IOMAP is not set
194# CONFIG_CPU_FREQ is not set 195# CONFIG_CPU_FREQ is not set
195# CONFIG_FSL_ULI1575 is not set 196# CONFIG_FSL_ULI1575 is not set
197# CONFIG_SIMPLE_GPIO is not set
196 198
197# 199#
198# Kernel options 200# Kernel options
@@ -216,6 +218,7 @@ CONFIG_BINFMT_ELF=y
216# CONFIG_BINFMT_MISC is not set 218# CONFIG_BINFMT_MISC is not set
217# CONFIG_MATH_EMULATION is not set 219# CONFIG_MATH_EMULATION is not set
218# CONFIG_IOMMU_HELPER is not set 220# CONFIG_IOMMU_HELPER is not set
221CONFIG_PPC_NEED_DMA_SYNC_OPS=y
219CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 222CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
220CONFIG_ARCH_HAS_WALK_MEMORY=y 223CONFIG_ARCH_HAS_WALK_MEMORY=y
221CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -230,12 +233,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
230CONFIG_PAGEFLAGS_EXTENDED=y 233CONFIG_PAGEFLAGS_EXTENDED=y
231CONFIG_SPLIT_PTLOCK_CPUS=4 234CONFIG_SPLIT_PTLOCK_CPUS=4
232CONFIG_MIGRATION=y 235CONFIG_MIGRATION=y
233CONFIG_RESOURCES_64BIT=y
234CONFIG_PHYS_ADDR_T_64BIT=y 236CONFIG_PHYS_ADDR_T_64BIT=y
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
238CONFIG_UNEVICTABLE_LRU=y 240CONFIG_UNEVICTABLE_LRU=y
241CONFIG_PPC_4K_PAGES=y
242# CONFIG_PPC_16K_PAGES is not set
243# CONFIG_PPC_64K_PAGES is not set
239CONFIG_FORCE_MAX_ZONEORDER=11 244CONFIG_FORCE_MAX_ZONEORDER=11
240CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
241CONFIG_CMDLINE_BOOL=y 246CONFIG_CMDLINE_BOOL=y
@@ -258,6 +263,7 @@ CONFIG_PCI_SYSCALL=y
258CONFIG_ARCH_SUPPORTS_MSI=y 263CONFIG_ARCH_SUPPORTS_MSI=y
259# CONFIG_PCI_MSI is not set 264# CONFIG_PCI_MSI is not set
260CONFIG_PCI_LEGACY=y 265CONFIG_PCI_LEGACY=y
266# CONFIG_PCI_STUB is not set
261# CONFIG_PCCARD is not set 267# CONFIG_PCCARD is not set
262# CONFIG_HOTPLUG_PCI is not set 268# CONFIG_HOTPLUG_PCI is not set
263# CONFIG_HAS_RAPIDIO is not set 269# CONFIG_HAS_RAPIDIO is not set
@@ -282,6 +288,7 @@ CONFIG_NET=y
282# 288#
283# Networking options 289# Networking options
284# 290#
291CONFIG_COMPAT_NET_DEV_OPS=y
285CONFIG_PACKET=y 292CONFIG_PACKET=y
286# CONFIG_PACKET_MMAP is not set 293# CONFIG_PACKET_MMAP is not set
287CONFIG_UNIX=y 294CONFIG_UNIX=y
@@ -332,6 +339,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
332# CONFIG_ECONET is not set 339# CONFIG_ECONET is not set
333# CONFIG_WAN_ROUTER is not set 340# CONFIG_WAN_ROUTER is not set
334# CONFIG_NET_SCHED is not set 341# CONFIG_NET_SCHED is not set
342# CONFIG_DCB is not set
335 343
336# 344#
337# Network testing 345# Network testing
@@ -344,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_AF_RXRPC is not set 352# CONFIG_AF_RXRPC is not set
345# CONFIG_PHONET is not set 353# CONFIG_PHONET is not set
346# CONFIG_WIRELESS is not set 354# CONFIG_WIRELESS is not set
355# CONFIG_WIMAX is not set
347# CONFIG_RFKILL is not set 356# CONFIG_RFKILL is not set
348# CONFIG_NET_9P is not set 357# CONFIG_NET_9P is not set
349 358
@@ -551,6 +560,10 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
551# CONFIG_IWLWIFI_LEDS is not set 560# CONFIG_IWLWIFI_LEDS is not set
552 561
553# 562#
563# Enable WiMAX (Networking options) to see the WiMAX drivers
564#
565
566#
554# USB Network Adapters 567# USB Network Adapters
555# 568#
556# CONFIG_USB_CATC is not set 569# CONFIG_USB_CATC is not set
@@ -605,6 +618,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
605CONFIG_MOUSE_PS2_SYNAPTICS=y 618CONFIG_MOUSE_PS2_SYNAPTICS=y
606CONFIG_MOUSE_PS2_LIFEBOOK=y 619CONFIG_MOUSE_PS2_LIFEBOOK=y
607CONFIG_MOUSE_PS2_TRACKPOINT=y 620CONFIG_MOUSE_PS2_TRACKPOINT=y
621# CONFIG_MOUSE_PS2_ELANTECH is not set
608# CONFIG_MOUSE_PS2_TOUCHKIT is not set 622# CONFIG_MOUSE_PS2_TOUCHKIT is not set
609# CONFIG_MOUSE_SERIAL is not set 623# CONFIG_MOUSE_SERIAL is not set
610# CONFIG_MOUSE_APPLETOUCH is not set 624# CONFIG_MOUSE_APPLETOUCH is not set
@@ -661,9 +675,12 @@ CONFIG_SERIAL_CORE=y
661CONFIG_SERIAL_CORE_CONSOLE=y 675CONFIG_SERIAL_CORE_CONSOLE=y
662# CONFIG_SERIAL_JSM is not set 676# CONFIG_SERIAL_JSM is not set
663CONFIG_SERIAL_OF_PLATFORM=y 677CONFIG_SERIAL_OF_PLATFORM=y
678# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
664CONFIG_UNIX98_PTYS=y 679CONFIG_UNIX98_PTYS=y
680# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
665CONFIG_LEGACY_PTYS=y 681CONFIG_LEGACY_PTYS=y
666CONFIG_LEGACY_PTY_COUNT=256 682CONFIG_LEGACY_PTY_COUNT=256
683# CONFIG_HVC_UDBG is not set
667# CONFIG_IPMI_HANDLER is not set 684# CONFIG_IPMI_HANDLER is not set
668# CONFIG_HW_RANDOM is not set 685# CONFIG_HW_RANDOM is not set
669# CONFIG_NVRAM is not set 686# CONFIG_NVRAM is not set
@@ -751,11 +768,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
751# CONFIG_THERMAL is not set 768# CONFIG_THERMAL is not set
752# CONFIG_THERMAL_HWMON is not set 769# CONFIG_THERMAL_HWMON is not set
753# CONFIG_WATCHDOG is not set 770# CONFIG_WATCHDOG is not set
771CONFIG_SSB_POSSIBLE=y
754 772
755# 773#
756# Sonics Silicon Backplane 774# Sonics Silicon Backplane
757# 775#
758CONFIG_SSB_POSSIBLE=y
759# CONFIG_SSB is not set 776# CONFIG_SSB is not set
760 777
761# 778#
@@ -764,9 +781,13 @@ CONFIG_SSB_POSSIBLE=y
764# CONFIG_MFD_CORE is not set 781# CONFIG_MFD_CORE is not set
765# CONFIG_MFD_SM501 is not set 782# CONFIG_MFD_SM501 is not set
766# CONFIG_HTC_PASIC3 is not set 783# CONFIG_HTC_PASIC3 is not set
784# CONFIG_TWL4030_CORE is not set
767# CONFIG_MFD_TMIO is not set 785# CONFIG_MFD_TMIO is not set
786# CONFIG_PMIC_DA903X is not set
768# CONFIG_MFD_WM8400 is not set 787# CONFIG_MFD_WM8400 is not set
769# CONFIG_MFD_WM8350_I2C is not set 788# CONFIG_MFD_WM8350_I2C is not set
789# CONFIG_MFD_PCF50633 is not set
790# CONFIG_REGULATOR is not set
770 791
771# 792#
772# Multimedia devices 793# Multimedia devices
@@ -848,12 +869,13 @@ CONFIG_FB_RADEON_BACKLIGHT=y
848# CONFIG_FB_IBM_GXT4500 is not set 869# CONFIG_FB_IBM_GXT4500 is not set
849# CONFIG_FB_VIRTUAL is not set 870# CONFIG_FB_VIRTUAL is not set
850# CONFIG_FB_METRONOME is not set 871# CONFIG_FB_METRONOME is not set
872# CONFIG_FB_MB862XX is not set
851CONFIG_BACKLIGHT_LCD_SUPPORT=y 873CONFIG_BACKLIGHT_LCD_SUPPORT=y
852CONFIG_LCD_CLASS_DEVICE=y 874CONFIG_LCD_CLASS_DEVICE=y
853# CONFIG_LCD_ILI9320 is not set 875# CONFIG_LCD_ILI9320 is not set
854# CONFIG_LCD_PLATFORM is not set 876# CONFIG_LCD_PLATFORM is not set
855CONFIG_BACKLIGHT_CLASS_DEVICE=y 877CONFIG_BACKLIGHT_CLASS_DEVICE=y
856# CONFIG_BACKLIGHT_CORGI is not set 878CONFIG_BACKLIGHT_GENERIC=y
857 879
858# 880#
859# Display device support 881# Display device support
@@ -894,11 +916,9 @@ CONFIG_HID_COMPAT=y
894CONFIG_HID_A4TECH=y 916CONFIG_HID_A4TECH=y
895CONFIG_HID_APPLE=y 917CONFIG_HID_APPLE=y
896CONFIG_HID_BELKIN=y 918CONFIG_HID_BELKIN=y
897CONFIG_HID_BRIGHT=y
898CONFIG_HID_CHERRY=y 919CONFIG_HID_CHERRY=y
899CONFIG_HID_CHICONY=y 920CONFIG_HID_CHICONY=y
900CONFIG_HID_CYPRESS=y 921CONFIG_HID_CYPRESS=y
901CONFIG_HID_DELL=y
902CONFIG_HID_EZKEY=y 922CONFIG_HID_EZKEY=y
903CONFIG_HID_GYRATION=y 923CONFIG_HID_GYRATION=y
904CONFIG_HID_LOGITECH=y 924CONFIG_HID_LOGITECH=y
@@ -906,12 +926,15 @@ CONFIG_HID_LOGITECH=y
906# CONFIG_LOGIRUMBLEPAD2_FF is not set 926# CONFIG_LOGIRUMBLEPAD2_FF is not set
907CONFIG_HID_MICROSOFT=y 927CONFIG_HID_MICROSOFT=y
908CONFIG_HID_MONTEREY=y 928CONFIG_HID_MONTEREY=y
929# CONFIG_HID_NTRIG is not set
909CONFIG_HID_PANTHERLORD=y 930CONFIG_HID_PANTHERLORD=y
910# CONFIG_PANTHERLORD_FF is not set 931# CONFIG_PANTHERLORD_FF is not set
911CONFIG_HID_PETALYNX=y 932CONFIG_HID_PETALYNX=y
912CONFIG_HID_SAMSUNG=y 933CONFIG_HID_SAMSUNG=y
913CONFIG_HID_SONY=y 934CONFIG_HID_SONY=y
914CONFIG_HID_SUNPLUS=y 935CONFIG_HID_SUNPLUS=y
936# CONFIG_GREENASIA_FF is not set
937# CONFIG_HID_TOPSEED is not set
915CONFIG_THRUSTMASTER_FF=m 938CONFIG_THRUSTMASTER_FF=m
916CONFIG_ZEROPLUS_FF=m 939CONFIG_ZEROPLUS_FF=m
917CONFIG_USB_SUPPORT=y 940CONFIG_USB_SUPPORT=y
@@ -943,6 +966,7 @@ CONFIG_USB_EHCI_HCD=m
943# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 966# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
944# CONFIG_USB_EHCI_TT_NEWSCHED is not set 967# CONFIG_USB_EHCI_TT_NEWSCHED is not set
945CONFIG_USB_EHCI_HCD_PPC_OF=y 968CONFIG_USB_EHCI_HCD_PPC_OF=y
969# CONFIG_USB_OXU210HP_HCD is not set
946# CONFIG_USB_ISP116X_HCD is not set 970# CONFIG_USB_ISP116X_HCD is not set
947# CONFIG_USB_ISP1760_HCD is not set 971# CONFIG_USB_ISP1760_HCD is not set
948CONFIG_USB_OHCI_HCD=y 972CONFIG_USB_OHCI_HCD=y
@@ -968,18 +992,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
968# CONFIG_USB_TMC is not set 992# CONFIG_USB_TMC is not set
969 993
970# 994#
971# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 995# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
972# 996#
973 997
974# 998#
975# may also be needed; see USB_STORAGE Help for more information 999# see USB_STORAGE Help for more information
976# 1000#
977CONFIG_USB_STORAGE=m 1001CONFIG_USB_STORAGE=m
978# CONFIG_USB_STORAGE_DEBUG is not set 1002# CONFIG_USB_STORAGE_DEBUG is not set
979# CONFIG_USB_STORAGE_DATAFAB is not set 1003# CONFIG_USB_STORAGE_DATAFAB is not set
980# CONFIG_USB_STORAGE_FREECOM is not set 1004# CONFIG_USB_STORAGE_FREECOM is not set
981# CONFIG_USB_STORAGE_ISD200 is not set 1005# CONFIG_USB_STORAGE_ISD200 is not set
982# CONFIG_USB_STORAGE_DPCM is not set
983# CONFIG_USB_STORAGE_USBAT is not set 1006# CONFIG_USB_STORAGE_USBAT is not set
984# CONFIG_USB_STORAGE_SDDR09 is not set 1007# CONFIG_USB_STORAGE_SDDR09 is not set
985# CONFIG_USB_STORAGE_SDDR55 is not set 1008# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1027,6 +1050,10 @@ CONFIG_USB_STORAGE=m
1027# CONFIG_USB_ISIGHTFW is not set 1050# CONFIG_USB_ISIGHTFW is not set
1028# CONFIG_USB_VST is not set 1051# CONFIG_USB_VST is not set
1029# CONFIG_USB_GADGET is not set 1052# CONFIG_USB_GADGET is not set
1053
1054#
1055# OTG and related infrastructure
1056#
1030# CONFIG_UWB is not set 1057# CONFIG_UWB is not set
1031# CONFIG_MMC is not set 1058# CONFIG_MMC is not set
1032# CONFIG_MEMSTICK is not set 1059# CONFIG_MEMSTICK is not set
@@ -1065,6 +1092,7 @@ CONFIG_RTC_DRV_M41T80=y
1065CONFIG_RTC_DRV_M41T80_WDT=y 1092CONFIG_RTC_DRV_M41T80_WDT=y
1066# CONFIG_RTC_DRV_S35390A is not set 1093# CONFIG_RTC_DRV_S35390A is not set
1067# CONFIG_RTC_DRV_FM3130 is not set 1094# CONFIG_RTC_DRV_FM3130 is not set
1095# CONFIG_RTC_DRV_RX8581 is not set
1068 1096
1069# 1097#
1070# SPI RTC drivers 1098# SPI RTC drivers
@@ -1117,6 +1145,7 @@ CONFIG_FS_POSIX_ACL=y
1117CONFIG_FILE_LOCKING=y 1145CONFIG_FILE_LOCKING=y
1118# CONFIG_XFS_FS is not set 1146# CONFIG_XFS_FS is not set
1119# CONFIG_OCFS2_FS is not set 1147# CONFIG_OCFS2_FS is not set
1148# CONFIG_BTRFS_FS is not set
1120CONFIG_DNOTIFY=y 1149CONFIG_DNOTIFY=y
1121CONFIG_INOTIFY=y 1150CONFIG_INOTIFY=y
1122CONFIG_INOTIFY_USER=y 1151CONFIG_INOTIFY_USER=y
@@ -1156,10 +1185,7 @@ CONFIG_TMPFS=y
1156# CONFIG_TMPFS_POSIX_ACL is not set 1185# CONFIG_TMPFS_POSIX_ACL is not set
1157# CONFIG_HUGETLB_PAGE is not set 1186# CONFIG_HUGETLB_PAGE is not set
1158# CONFIG_CONFIGFS_FS is not set 1187# CONFIG_CONFIGFS_FS is not set
1159 1188CONFIG_MISC_FILESYSTEMS=y
1160#
1161# Miscellaneous filesystems
1162#
1163# CONFIG_ADFS_FS is not set 1189# CONFIG_ADFS_FS is not set
1164CONFIG_AFFS_FS=m 1190CONFIG_AFFS_FS=m
1165# CONFIG_HFS_FS is not set 1191# CONFIG_HFS_FS is not set
@@ -1168,6 +1194,7 @@ CONFIG_AFFS_FS=m
1168# CONFIG_BFS_FS is not set 1194# CONFIG_BFS_FS is not set
1169# CONFIG_EFS_FS is not set 1195# CONFIG_EFS_FS is not set
1170# CONFIG_CRAMFS is not set 1196# CONFIG_CRAMFS is not set
1197# CONFIG_SQUASHFS is not set
1171# CONFIG_VXFS_FS is not set 1198# CONFIG_VXFS_FS is not set
1172# CONFIG_MINIX_FS is not set 1199# CONFIG_MINIX_FS is not set
1173# CONFIG_OMFS_FS is not set 1200# CONFIG_OMFS_FS is not set
@@ -1245,6 +1272,7 @@ CONFIG_NLS_ISO8859_1=y
1245# Library routines 1272# Library routines
1246# 1273#
1247CONFIG_BITREVERSE=y 1274CONFIG_BITREVERSE=y
1275CONFIG_GENERIC_FIND_LAST_BIT=y
1248# CONFIG_CRC_CCITT is not set 1276# CONFIG_CRC_CCITT is not set
1249# CONFIG_CRC16 is not set 1277# CONFIG_CRC16 is not set
1250CONFIG_CRC_T10DIF=y 1278CONFIG_CRC_T10DIF=y
@@ -1278,12 +1306,17 @@ CONFIG_MAGIC_SYSRQ=y
1278# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1306# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1279# CONFIG_LATENCYTOP is not set 1307# CONFIG_LATENCYTOP is not set
1280CONFIG_SYSCTL_SYSCALL_CHECK=y 1308CONFIG_SYSCTL_SYSCALL_CHECK=y
1281CONFIG_NOP_TRACER=y 1309CONFIG_HAVE_FUNCTION_TRACER=y
1282CONFIG_HAVE_FTRACE=y
1283CONFIG_HAVE_DYNAMIC_FTRACE=y 1310CONFIG_HAVE_DYNAMIC_FTRACE=y
1311CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1312
1313#
1314# Tracers
1315#
1284# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1316# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1285# CONFIG_SAMPLES is not set 1317# CONFIG_SAMPLES is not set
1286CONFIG_HAVE_ARCH_KGDB=y 1318CONFIG_HAVE_ARCH_KGDB=y
1319CONFIG_PRINT_STACK_DEPTH=64
1287# CONFIG_IRQSTACKS is not set 1320# CONFIG_IRQSTACKS is not set
1288# CONFIG_PPC_EARLY_DEBUG is not set 1321# CONFIG_PPC_EARLY_DEBUG is not set
1289 1322
diff --git a/arch/powerpc/configs/44x/sequoia_defconfig b/arch/powerpc/configs/44x/sequoia_defconfig
index 562beeaab53d..a921fe3c3711 100644
--- a/arch/powerpc/configs/44x/sequoia_defconfig
+++ b/arch/powerpc/configs/44x/sequoia_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:16 2008 4# Tue Jan 20 08:22:45 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,6 +19,7 @@ CONFIG_4xx=y
19CONFIG_BOOKE=y 19CONFIG_BOOKE=y
20CONFIG_PTE_64BIT=y 20CONFIG_PTE_64BIT=y
21CONFIG_PHYS_64BIT=y 21CONFIG_PHYS_64BIT=y
22CONFIG_PPC_MMU_NOHASH=y
22# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y 24CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 25CONFIG_PPC32=y
@@ -44,7 +45,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 45CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
50CONFIG_OF=y 51CONFIG_OF=y
@@ -75,12 +76,12 @@ CONFIG_POSIX_MQUEUE=y
75# CONFIG_AUDIT is not set 76# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 77# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 79CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 80# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 81# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 82CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 83# CONFIG_CGROUP_SCHED is not set
84# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 85CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 86CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 87# CONFIG_RELAY is not set
@@ -115,7 +116,6 @@ CONFIG_SLUB_DEBUG=y
115CONFIG_SLUB=y 116CONFIG_SLUB=y
116# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set 118# CONFIG_PROFILING is not set
118# CONFIG_MARKERS is not set
119CONFIG_HAVE_OPROFILE=y 119CONFIG_HAVE_OPROFILE=y
120# CONFIG_KPROBES is not set 120# CONFIG_KPROBES is not set
121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -126,7 +126,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
129# CONFIG_TINY_SHMEM is not set
130CONFIG_BASE_SMALL=0 129CONFIG_BASE_SMALL=0
131CONFIG_MODULES=y 130CONFIG_MODULES=y
132# CONFIG_MODULE_FORCE_LOAD is not set 131# CONFIG_MODULE_FORCE_LOAD is not set
@@ -134,11 +133,9 @@ CONFIG_MODULE_UNLOAD=y
134# CONFIG_MODULE_FORCE_UNLOAD is not set 133# CONFIG_MODULE_FORCE_UNLOAD is not set
135# CONFIG_MODVERSIONS is not set 134# CONFIG_MODVERSIONS is not set
136# CONFIG_MODULE_SRCVERSION_ALL is not set 135# CONFIG_MODULE_SRCVERSION_ALL is not set
137CONFIG_KMOD=y
138CONFIG_BLOCK=y 136CONFIG_BLOCK=y
139CONFIG_LBD=y 137CONFIG_LBD=y
140# CONFIG_BLK_DEV_IO_TRACE is not set 138# CONFIG_BLK_DEV_IO_TRACE is not set
141# CONFIG_LSF is not set
142# CONFIG_BLK_DEV_BSG is not set 139# CONFIG_BLK_DEV_BSG is not set
143# CONFIG_BLK_DEV_INTEGRITY is not set 140# CONFIG_BLK_DEV_INTEGRITY is not set
144 141
@@ -155,6 +152,10 @@ CONFIG_DEFAULT_AS=y
155# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
156CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
157CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_TREE_RCU is not set
156# CONFIG_PREEMPT_RCU is not set
157# CONFIG_TREE_RCU_TRACE is not set
158# CONFIG_PREEMPT_RCU_TRACE is not set
158# CONFIG_FREEZER is not set 159# CONFIG_FREEZER is not set
159# CONFIG_PPC4xx_PCI_EXPRESS is not set 160# CONFIG_PPC4xx_PCI_EXPRESS is not set
160 161
@@ -192,6 +193,7 @@ CONFIG_440EPX=y
192# CONFIG_GENERIC_IOMAP is not set 193# CONFIG_GENERIC_IOMAP is not set
193# CONFIG_CPU_FREQ is not set 194# CONFIG_CPU_FREQ is not set
194# CONFIG_FSL_ULI1575 is not set 195# CONFIG_FSL_ULI1575 is not set
196# CONFIG_SIMPLE_GPIO is not set
195 197
196# 198#
197# Kernel options 199# Kernel options
@@ -216,6 +218,7 @@ CONFIG_BINFMT_ELF=y
216# CONFIG_BINFMT_MISC is not set 218# CONFIG_BINFMT_MISC is not set
217# CONFIG_MATH_EMULATION is not set 219# CONFIG_MATH_EMULATION is not set
218# CONFIG_IOMMU_HELPER is not set 220# CONFIG_IOMMU_HELPER is not set
221CONFIG_PPC_NEED_DMA_SYNC_OPS=y
219CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 222CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
220CONFIG_ARCH_HAS_WALK_MEMORY=y 223CONFIG_ARCH_HAS_WALK_MEMORY=y
221CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -230,12 +233,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
230CONFIG_PAGEFLAGS_EXTENDED=y 233CONFIG_PAGEFLAGS_EXTENDED=y
231CONFIG_SPLIT_PTLOCK_CPUS=4 234CONFIG_SPLIT_PTLOCK_CPUS=4
232CONFIG_MIGRATION=y 235CONFIG_MIGRATION=y
233CONFIG_RESOURCES_64BIT=y
234CONFIG_PHYS_ADDR_T_64BIT=y 236CONFIG_PHYS_ADDR_T_64BIT=y
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
238CONFIG_UNEVICTABLE_LRU=y 240CONFIG_UNEVICTABLE_LRU=y
241CONFIG_PPC_4K_PAGES=y
242# CONFIG_PPC_16K_PAGES is not set
243# CONFIG_PPC_64K_PAGES is not set
239CONFIG_FORCE_MAX_ZONEORDER=11 244CONFIG_FORCE_MAX_ZONEORDER=11
240CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
241CONFIG_CMDLINE_BOOL=y 246CONFIG_CMDLINE_BOOL=y
@@ -259,6 +264,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
259# CONFIG_PCI_MSI is not set 264# CONFIG_PCI_MSI is not set
260CONFIG_PCI_LEGACY=y 265CONFIG_PCI_LEGACY=y
261# CONFIG_PCI_DEBUG is not set 266# CONFIG_PCI_DEBUG is not set
267# CONFIG_PCI_STUB is not set
262# CONFIG_PCCARD is not set 268# CONFIG_PCCARD is not set
263# CONFIG_HOTPLUG_PCI is not set 269# CONFIG_HOTPLUG_PCI is not set
264# CONFIG_HAS_RAPIDIO is not set 270# CONFIG_HAS_RAPIDIO is not set
@@ -283,6 +289,7 @@ CONFIG_NET=y
283# 289#
284# Networking options 290# Networking options
285# 291#
292CONFIG_COMPAT_NET_DEV_OPS=y
286CONFIG_PACKET=y 293CONFIG_PACKET=y
287# CONFIG_PACKET_MMAP is not set 294# CONFIG_PACKET_MMAP is not set
288CONFIG_UNIX=y 295CONFIG_UNIX=y
@@ -333,6 +340,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
333# CONFIG_ECONET is not set 340# CONFIG_ECONET is not set
334# CONFIG_WAN_ROUTER is not set 341# CONFIG_WAN_ROUTER is not set
335# CONFIG_NET_SCHED is not set 342# CONFIG_NET_SCHED is not set
343# CONFIG_DCB is not set
336 344
337# 345#
338# Network testing 346# Network testing
@@ -345,6 +353,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_AF_RXRPC is not set 353# CONFIG_AF_RXRPC is not set
346# CONFIG_PHONET is not set 354# CONFIG_PHONET is not set
347# CONFIG_WIRELESS is not set 355# CONFIG_WIRELESS is not set
356# CONFIG_WIMAX is not set
348# CONFIG_RFKILL is not set 357# CONFIG_RFKILL is not set
349# CONFIG_NET_9P is not set 358# CONFIG_NET_9P is not set
350 359
@@ -370,6 +379,7 @@ CONFIG_MTD=y
370# CONFIG_MTD_DEBUG is not set 379# CONFIG_MTD_DEBUG is not set
371# CONFIG_MTD_CONCAT is not set 380# CONFIG_MTD_CONCAT is not set
372CONFIG_MTD_PARTITIONS=y 381CONFIG_MTD_PARTITIONS=y
382# CONFIG_MTD_TESTS is not set
373# CONFIG_MTD_REDBOOT_PARTS is not set 383# CONFIG_MTD_REDBOOT_PARTS is not set
374CONFIG_MTD_CMDLINE_PARTS=y 384CONFIG_MTD_CMDLINE_PARTS=y
375CONFIG_MTD_OF_PARTS=y 385CONFIG_MTD_OF_PARTS=y
@@ -442,6 +452,12 @@ CONFIG_MTD_PHYSMAP_OF=y
442# CONFIG_MTD_ONENAND is not set 452# CONFIG_MTD_ONENAND is not set
443 453
444# 454#
455# LPDDR flash memory drivers
456#
457# CONFIG_MTD_LPDDR is not set
458# CONFIG_MTD_QINFO_PROBE is not set
459
460#
445# UBI - Unsorted block images 461# UBI - Unsorted block images
446# 462#
447# CONFIG_MTD_UBI is not set 463# CONFIG_MTD_UBI is not set
@@ -472,6 +488,7 @@ CONFIG_MISC_DEVICES=y
472# CONFIG_TIFM_CORE is not set 488# CONFIG_TIFM_CORE is not set
473# CONFIG_ENCLOSURE_SERVICES is not set 489# CONFIG_ENCLOSURE_SERVICES is not set
474# CONFIG_HP_ILO is not set 490# CONFIG_HP_ILO is not set
491# CONFIG_C2PORT is not set
475CONFIG_HAVE_IDE=y 492CONFIG_HAVE_IDE=y
476# CONFIG_IDE is not set 493# CONFIG_IDE is not set
477 494
@@ -554,6 +571,7 @@ CONFIG_NETDEV_1000=y
554# CONFIG_JME is not set 571# CONFIG_JME is not set
555CONFIG_NETDEV_10000=y 572CONFIG_NETDEV_10000=y
556# CONFIG_CHELSIO_T1 is not set 573# CONFIG_CHELSIO_T1 is not set
574CONFIG_CHELSIO_T3_DEPENDS=y
557# CONFIG_CHELSIO_T3 is not set 575# CONFIG_CHELSIO_T3 is not set
558# CONFIG_ENIC is not set 576# CONFIG_ENIC is not set
559# CONFIG_IXGBE is not set 577# CONFIG_IXGBE is not set
@@ -576,6 +594,10 @@ CONFIG_NETDEV_10000=y
576# CONFIG_WLAN_PRE80211 is not set 594# CONFIG_WLAN_PRE80211 is not set
577# CONFIG_WLAN_80211 is not set 595# CONFIG_WLAN_80211 is not set
578# CONFIG_IWLWIFI_LEDS is not set 596# CONFIG_IWLWIFI_LEDS is not set
597
598#
599# Enable WiMAX (Networking options) to see the WiMAX drivers
600#
579# CONFIG_WAN is not set 601# CONFIG_WAN is not set
580# CONFIG_FDDI is not set 602# CONFIG_FDDI is not set
581# CONFIG_HIPPI is not set 603# CONFIG_HIPPI is not set
@@ -628,9 +650,12 @@ CONFIG_SERIAL_CORE=y
628CONFIG_SERIAL_CORE_CONSOLE=y 650CONFIG_SERIAL_CORE_CONSOLE=y
629# CONFIG_SERIAL_JSM is not set 651# CONFIG_SERIAL_JSM is not set
630CONFIG_SERIAL_OF_PLATFORM=y 652CONFIG_SERIAL_OF_PLATFORM=y
653# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
631CONFIG_UNIX98_PTYS=y 654CONFIG_UNIX98_PTYS=y
655# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
632CONFIG_LEGACY_PTYS=y 656CONFIG_LEGACY_PTYS=y
633CONFIG_LEGACY_PTY_COUNT=256 657CONFIG_LEGACY_PTY_COUNT=256
658# CONFIG_HVC_UDBG is not set
634# CONFIG_IPMI_HANDLER is not set 659# CONFIG_IPMI_HANDLER is not set
635# CONFIG_HW_RANDOM is not set 660# CONFIG_HW_RANDOM is not set
636# CONFIG_NVRAM is not set 661# CONFIG_NVRAM is not set
@@ -649,11 +674,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
649# CONFIG_HWMON is not set 674# CONFIG_HWMON is not set
650CONFIG_THERMAL=y 675CONFIG_THERMAL=y
651# CONFIG_WATCHDOG is not set 676# CONFIG_WATCHDOG is not set
677CONFIG_SSB_POSSIBLE=y
652 678
653# 679#
654# Sonics Silicon Backplane 680# Sonics Silicon Backplane
655# 681#
656CONFIG_SSB_POSSIBLE=y
657# CONFIG_SSB is not set 682# CONFIG_SSB is not set
658 683
659# 684#
@@ -663,7 +688,7 @@ CONFIG_SSB_POSSIBLE=y
663# CONFIG_MFD_SM501 is not set 688# CONFIG_MFD_SM501 is not set
664# CONFIG_HTC_PASIC3 is not set 689# CONFIG_HTC_PASIC3 is not set
665# CONFIG_MFD_TMIO is not set 690# CONFIG_MFD_TMIO is not set
666# CONFIG_MFD_WM8400 is not set 691# CONFIG_REGULATOR is not set
667 692
668# 693#
669# Multimedia devices 694# Multimedia devices
@@ -709,9 +734,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
709# 734#
710 735
711# 736#
712# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 737# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
713# 738#
714# CONFIG_USB_GADGET is not set 739# CONFIG_USB_GADGET is not set
740
741#
742# OTG and related infrastructure
743#
715# CONFIG_UWB is not set 744# CONFIG_UWB is not set
716# CONFIG_MMC is not set 745# CONFIG_MMC is not set
717# CONFIG_MEMSTICK is not set 746# CONFIG_MEMSTICK is not set
@@ -737,7 +766,9 @@ CONFIG_EXT2_FS=y
737# CONFIG_FS_POSIX_ACL is not set 766# CONFIG_FS_POSIX_ACL is not set
738CONFIG_FILE_LOCKING=y 767CONFIG_FILE_LOCKING=y
739# CONFIG_XFS_FS is not set 768# CONFIG_XFS_FS is not set
769# CONFIG_GFS2_FS is not set
740# CONFIG_OCFS2_FS is not set 770# CONFIG_OCFS2_FS is not set
771# CONFIG_BTRFS_FS is not set
741CONFIG_DNOTIFY=y 772CONFIG_DNOTIFY=y
742CONFIG_INOTIFY=y 773CONFIG_INOTIFY=y
743CONFIG_INOTIFY_USER=y 774CONFIG_INOTIFY_USER=y
@@ -771,10 +802,7 @@ CONFIG_TMPFS=y
771# CONFIG_TMPFS_POSIX_ACL is not set 802# CONFIG_TMPFS_POSIX_ACL is not set
772# CONFIG_HUGETLB_PAGE is not set 803# CONFIG_HUGETLB_PAGE is not set
773# CONFIG_CONFIGFS_FS is not set 804# CONFIG_CONFIGFS_FS is not set
774 805CONFIG_MISC_FILESYSTEMS=y
775#
776# Miscellaneous filesystems
777#
778# CONFIG_ADFS_FS is not set 806# CONFIG_ADFS_FS is not set
779# CONFIG_AFFS_FS is not set 807# CONFIG_AFFS_FS is not set
780# CONFIG_HFS_FS is not set 808# CONFIG_HFS_FS is not set
@@ -794,6 +822,7 @@ CONFIG_JFFS2_ZLIB=y
794CONFIG_JFFS2_RTIME=y 822CONFIG_JFFS2_RTIME=y
795# CONFIG_JFFS2_RUBIN is not set 823# CONFIG_JFFS2_RUBIN is not set
796CONFIG_CRAMFS=y 824CONFIG_CRAMFS=y
825# CONFIG_SQUASHFS is not set
797# CONFIG_VXFS_FS is not set 826# CONFIG_VXFS_FS is not set
798# CONFIG_MINIX_FS is not set 827# CONFIG_MINIX_FS is not set
799# CONFIG_OMFS_FS is not set 828# CONFIG_OMFS_FS is not set
@@ -834,6 +863,7 @@ CONFIG_MSDOS_PARTITION=y
834# Library routines 863# Library routines
835# 864#
836CONFIG_BITREVERSE=y 865CONFIG_BITREVERSE=y
866CONFIG_GENERIC_FIND_LAST_BIT=y
837# CONFIG_CRC_CCITT is not set 867# CONFIG_CRC_CCITT is not set
838# CONFIG_CRC16 is not set 868# CONFIG_CRC16 is not set
839# CONFIG_CRC_T10DIF is not set 869# CONFIG_CRC_T10DIF is not set
@@ -885,6 +915,7 @@ CONFIG_SCHED_DEBUG=y
885# CONFIG_DEBUG_MEMORY_INIT is not set 915# CONFIG_DEBUG_MEMORY_INIT is not set
886# CONFIG_DEBUG_LIST is not set 916# CONFIG_DEBUG_LIST is not set
887# CONFIG_DEBUG_SG is not set 917# CONFIG_DEBUG_SG is not set
918# CONFIG_DEBUG_NOTIFIERS is not set
888# CONFIG_BOOT_PRINTK_DELAY is not set 919# CONFIG_BOOT_PRINTK_DELAY is not set
889# CONFIG_RCU_TORTURE_TEST is not set 920# CONFIG_RCU_TORTURE_TEST is not set
890# CONFIG_RCU_CPU_STALL_DETECTOR is not set 921# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -893,18 +924,24 @@ CONFIG_SCHED_DEBUG=y
893# CONFIG_FAULT_INJECTION is not set 924# CONFIG_FAULT_INJECTION is not set
894# CONFIG_LATENCYTOP is not set 925# CONFIG_LATENCYTOP is not set
895CONFIG_SYSCTL_SYSCALL_CHECK=y 926CONFIG_SYSCTL_SYSCALL_CHECK=y
896CONFIG_NOP_TRACER=y 927CONFIG_HAVE_FUNCTION_TRACER=y
897CONFIG_HAVE_FTRACE=y
898CONFIG_HAVE_DYNAMIC_FTRACE=y 928CONFIG_HAVE_DYNAMIC_FTRACE=y
899# CONFIG_FTRACE is not set 929CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
930
931#
932# Tracers
933#
934# CONFIG_FUNCTION_TRACER is not set
900# CONFIG_SCHED_TRACER is not set 935# CONFIG_SCHED_TRACER is not set
901# CONFIG_CONTEXT_SWITCH_TRACER is not set 936# CONFIG_CONTEXT_SWITCH_TRACER is not set
902# CONFIG_BOOT_TRACER is not set 937# CONFIG_BOOT_TRACER is not set
938# CONFIG_TRACE_BRANCH_PROFILING is not set
903# CONFIG_STACK_TRACER is not set 939# CONFIG_STACK_TRACER is not set
904# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 940# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
905# CONFIG_SAMPLES is not set 941# CONFIG_SAMPLES is not set
906CONFIG_HAVE_ARCH_KGDB=y 942CONFIG_HAVE_ARCH_KGDB=y
907# CONFIG_KGDB is not set 943# CONFIG_KGDB is not set
944CONFIG_PRINT_STACK_DEPTH=64
908# CONFIG_DEBUG_STACKOVERFLOW is not set 945# CONFIG_DEBUG_STACKOVERFLOW is not set
909# CONFIG_DEBUG_STACK_USAGE is not set 946# CONFIG_DEBUG_STACK_USAGE is not set
910# CONFIG_DEBUG_PAGEALLOC is not set 947# CONFIG_DEBUG_PAGEALLOC is not set
@@ -944,11 +981,15 @@ CONFIG_CRYPTO=y
944# 981#
945# CONFIG_CRYPTO_FIPS is not set 982# CONFIG_CRYPTO_FIPS is not set
946CONFIG_CRYPTO_ALGAPI=y 983CONFIG_CRYPTO_ALGAPI=y
947CONFIG_CRYPTO_AEAD=y 984CONFIG_CRYPTO_ALGAPI2=y
985CONFIG_CRYPTO_AEAD2=y
948CONFIG_CRYPTO_BLKCIPHER=y 986CONFIG_CRYPTO_BLKCIPHER=y
987CONFIG_CRYPTO_BLKCIPHER2=y
949CONFIG_CRYPTO_HASH=y 988CONFIG_CRYPTO_HASH=y
950CONFIG_CRYPTO_RNG=y 989CONFIG_CRYPTO_HASH2=y
990CONFIG_CRYPTO_RNG2=y
951CONFIG_CRYPTO_MANAGER=y 991CONFIG_CRYPTO_MANAGER=y
992CONFIG_CRYPTO_MANAGER2=y
952# CONFIG_CRYPTO_GF128MUL is not set 993# CONFIG_CRYPTO_GF128MUL is not set
953# CONFIG_CRYPTO_NULL is not set 994# CONFIG_CRYPTO_NULL is not set
954# CONFIG_CRYPTO_CRYPTD is not set 995# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/44x/taishan_defconfig b/arch/powerpc/configs/44x/taishan_defconfig
index 427bb6a11be5..826700872d26 100644
--- a/arch/powerpc/configs/44x/taishan_defconfig
+++ b/arch/powerpc/configs/44x/taishan_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:18 2008 4# Tue Jan 20 08:22:47 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -18,6 +18,7 @@ CONFIG_4xx=y
18CONFIG_BOOKE=y 18CONFIG_BOOKE=y
19CONFIG_PTE_64BIT=y 19CONFIG_PTE_64BIT=y
20CONFIG_PHYS_64BIT=y 20CONFIG_PHYS_64BIT=y
21CONFIG_PPC_MMU_NOHASH=y
21# CONFIG_PPC_MM_SLICES is not set 22# CONFIG_PPC_MM_SLICES is not set
22CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 24CONFIG_PPC32=y
@@ -43,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
43CONFIG_PPC=y 44CONFIG_PPC=y
44CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
45CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
46CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
47CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
48CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
49CONFIG_OF=y 50CONFIG_OF=y
@@ -74,12 +75,12 @@ CONFIG_POSIX_MQUEUE=y
74# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
75# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
76CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
77# CONFIG_CGROUPS is not set
78CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
79CONFIG_FAIR_GROUP_SCHED=y 79CONFIG_FAIR_GROUP_SCHED=y
80# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
81CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
82# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
83CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
84CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
85# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -114,7 +115,6 @@ CONFIG_SLUB_DEBUG=y
114CONFIG_SLUB=y 115CONFIG_SLUB=y
115# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
116# CONFIG_PROFILING is not set 117# CONFIG_PROFILING is not set
117# CONFIG_MARKERS is not set
118CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
119# CONFIG_KPROBES is not set 119# CONFIG_KPROBES is not set
120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -125,7 +125,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
126CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
127CONFIG_RT_MUTEXES=y 127CONFIG_RT_MUTEXES=y
128# CONFIG_TINY_SHMEM is not set
129CONFIG_BASE_SMALL=0 128CONFIG_BASE_SMALL=0
130CONFIG_MODULES=y 129CONFIG_MODULES=y
131# CONFIG_MODULE_FORCE_LOAD is not set 130# CONFIG_MODULE_FORCE_LOAD is not set
@@ -133,11 +132,9 @@ CONFIG_MODULE_UNLOAD=y
133# CONFIG_MODULE_FORCE_UNLOAD is not set 132# CONFIG_MODULE_FORCE_UNLOAD is not set
134# CONFIG_MODVERSIONS is not set 133# CONFIG_MODVERSIONS is not set
135# CONFIG_MODULE_SRCVERSION_ALL is not set 134# CONFIG_MODULE_SRCVERSION_ALL is not set
136CONFIG_KMOD=y
137CONFIG_BLOCK=y 135CONFIG_BLOCK=y
138CONFIG_LBD=y 136CONFIG_LBD=y
139# CONFIG_BLK_DEV_IO_TRACE is not set 137# CONFIG_BLK_DEV_IO_TRACE is not set
140# CONFIG_LSF is not set
141# CONFIG_BLK_DEV_BSG is not set 138# CONFIG_BLK_DEV_BSG is not set
142# CONFIG_BLK_DEV_INTEGRITY is not set 139# CONFIG_BLK_DEV_INTEGRITY is not set
143 140
@@ -154,6 +151,10 @@ CONFIG_DEFAULT_AS=y
154# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
155CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
156CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_TREE_RCU is not set
155# CONFIG_PREEMPT_RCU is not set
156# CONFIG_TREE_RCU_TRACE is not set
157# CONFIG_PREEMPT_RCU_TRACE is not set
157# CONFIG_FREEZER is not set 158# CONFIG_FREEZER is not set
158# CONFIG_PPC4xx_PCI_EXPRESS is not set 159# CONFIG_PPC4xx_PCI_EXPRESS is not set
159 160
@@ -191,6 +192,7 @@ CONFIG_440GX=y
191# CONFIG_GENERIC_IOMAP is not set 192# CONFIG_GENERIC_IOMAP is not set
192# CONFIG_CPU_FREQ is not set 193# CONFIG_CPU_FREQ is not set
193# CONFIG_FSL_ULI1575 is not set 194# CONFIG_FSL_ULI1575 is not set
195# CONFIG_SIMPLE_GPIO is not set
194 196
195# 197#
196# Kernel options 198# Kernel options
@@ -214,6 +216,7 @@ CONFIG_BINFMT_ELF=y
214# CONFIG_BINFMT_MISC is not set 216# CONFIG_BINFMT_MISC is not set
215# CONFIG_MATH_EMULATION is not set 217# CONFIG_MATH_EMULATION is not set
216# CONFIG_IOMMU_HELPER is not set 218# CONFIG_IOMMU_HELPER is not set
219CONFIG_PPC_NEED_DMA_SYNC_OPS=y
217CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 220CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
218CONFIG_ARCH_HAS_WALK_MEMORY=y 221CONFIG_ARCH_HAS_WALK_MEMORY=y
219CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 222CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -228,12 +231,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
228CONFIG_PAGEFLAGS_EXTENDED=y 231CONFIG_PAGEFLAGS_EXTENDED=y
229CONFIG_SPLIT_PTLOCK_CPUS=4 232CONFIG_SPLIT_PTLOCK_CPUS=4
230CONFIG_MIGRATION=y 233CONFIG_MIGRATION=y
231CONFIG_RESOURCES_64BIT=y
232CONFIG_PHYS_ADDR_T_64BIT=y 234CONFIG_PHYS_ADDR_T_64BIT=y
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
236CONFIG_UNEVICTABLE_LRU=y 238CONFIG_UNEVICTABLE_LRU=y
239CONFIG_PPC_4K_PAGES=y
240# CONFIG_PPC_16K_PAGES is not set
241# CONFIG_PPC_64K_PAGES is not set
237CONFIG_FORCE_MAX_ZONEORDER=11 242CONFIG_FORCE_MAX_ZONEORDER=11
238CONFIG_PROC_DEVICETREE=y 243CONFIG_PROC_DEVICETREE=y
239CONFIG_CMDLINE_BOOL=y 244CONFIG_CMDLINE_BOOL=y
@@ -257,6 +262,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
257# CONFIG_PCI_MSI is not set 262# CONFIG_PCI_MSI is not set
258CONFIG_PCI_LEGACY=y 263CONFIG_PCI_LEGACY=y
259# CONFIG_PCI_DEBUG is not set 264# CONFIG_PCI_DEBUG is not set
265# CONFIG_PCI_STUB is not set
260# CONFIG_PCCARD is not set 266# CONFIG_PCCARD is not set
261# CONFIG_HOTPLUG_PCI is not set 267# CONFIG_HOTPLUG_PCI is not set
262# CONFIG_HAS_RAPIDIO is not set 268# CONFIG_HAS_RAPIDIO is not set
@@ -281,6 +287,7 @@ CONFIG_NET=y
281# 287#
282# Networking options 288# Networking options
283# 289#
290CONFIG_COMPAT_NET_DEV_OPS=y
284CONFIG_PACKET=y 291CONFIG_PACKET=y
285# CONFIG_PACKET_MMAP is not set 292# CONFIG_PACKET_MMAP is not set
286CONFIG_UNIX=y 293CONFIG_UNIX=y
@@ -331,6 +338,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
331# CONFIG_ECONET is not set 338# CONFIG_ECONET is not set
332# CONFIG_WAN_ROUTER is not set 339# CONFIG_WAN_ROUTER is not set
333# CONFIG_NET_SCHED is not set 340# CONFIG_NET_SCHED is not set
341# CONFIG_DCB is not set
334 342
335# 343#
336# Network testing 344# Network testing
@@ -343,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
343# CONFIG_AF_RXRPC is not set 351# CONFIG_AF_RXRPC is not set
344# CONFIG_PHONET is not set 352# CONFIG_PHONET is not set
345# CONFIG_WIRELESS is not set 353# CONFIG_WIRELESS is not set
354# CONFIG_WIMAX is not set
346# CONFIG_RFKILL is not set 355# CONFIG_RFKILL is not set
347# CONFIG_NET_9P is not set 356# CONFIG_NET_9P is not set
348 357
@@ -368,6 +377,7 @@ CONFIG_MTD=y
368# CONFIG_MTD_DEBUG is not set 377# CONFIG_MTD_DEBUG is not set
369# CONFIG_MTD_CONCAT is not set 378# CONFIG_MTD_CONCAT is not set
370CONFIG_MTD_PARTITIONS=y 379CONFIG_MTD_PARTITIONS=y
380# CONFIG_MTD_TESTS is not set
371# CONFIG_MTD_REDBOOT_PARTS is not set 381# CONFIG_MTD_REDBOOT_PARTS is not set
372CONFIG_MTD_CMDLINE_PARTS=y 382CONFIG_MTD_CMDLINE_PARTS=y
373# CONFIG_MTD_OF_PARTS is not set 383# CONFIG_MTD_OF_PARTS is not set
@@ -440,6 +450,12 @@ CONFIG_MTD_PHYSMAP_OF=y
440# CONFIG_MTD_ONENAND is not set 450# CONFIG_MTD_ONENAND is not set
441 451
442# 452#
453# LPDDR flash memory drivers
454#
455# CONFIG_MTD_LPDDR is not set
456# CONFIG_MTD_QINFO_PROBE is not set
457
458#
443# UBI - Unsorted block images 459# UBI - Unsorted block images
444# 460#
445# CONFIG_MTD_UBI is not set 461# CONFIG_MTD_UBI is not set
@@ -470,6 +486,7 @@ CONFIG_MISC_DEVICES=y
470# CONFIG_TIFM_CORE is not set 486# CONFIG_TIFM_CORE is not set
471# CONFIG_ENCLOSURE_SERVICES is not set 487# CONFIG_ENCLOSURE_SERVICES is not set
472# CONFIG_HP_ILO is not set 488# CONFIG_HP_ILO is not set
489# CONFIG_C2PORT is not set
473CONFIG_HAVE_IDE=y 490CONFIG_HAVE_IDE=y
474# CONFIG_IDE is not set 491# CONFIG_IDE is not set
475 492
@@ -554,6 +571,7 @@ CONFIG_NETDEV_1000=y
554# CONFIG_JME is not set 571# CONFIG_JME is not set
555CONFIG_NETDEV_10000=y 572CONFIG_NETDEV_10000=y
556# CONFIG_CHELSIO_T1 is not set 573# CONFIG_CHELSIO_T1 is not set
574CONFIG_CHELSIO_T3_DEPENDS=y
557# CONFIG_CHELSIO_T3 is not set 575# CONFIG_CHELSIO_T3 is not set
558# CONFIG_ENIC is not set 576# CONFIG_ENIC is not set
559# CONFIG_IXGBE is not set 577# CONFIG_IXGBE is not set
@@ -576,6 +594,10 @@ CONFIG_NETDEV_10000=y
576# CONFIG_WLAN_PRE80211 is not set 594# CONFIG_WLAN_PRE80211 is not set
577# CONFIG_WLAN_80211 is not set 595# CONFIG_WLAN_80211 is not set
578# CONFIG_IWLWIFI_LEDS is not set 596# CONFIG_IWLWIFI_LEDS is not set
597
598#
599# Enable WiMAX (Networking options) to see the WiMAX drivers
600#
579# CONFIG_WAN is not set 601# CONFIG_WAN is not set
580# CONFIG_FDDI is not set 602# CONFIG_FDDI is not set
581# CONFIG_HIPPI is not set 603# CONFIG_HIPPI is not set
@@ -628,9 +650,12 @@ CONFIG_SERIAL_CORE=y
628CONFIG_SERIAL_CORE_CONSOLE=y 650CONFIG_SERIAL_CORE_CONSOLE=y
629# CONFIG_SERIAL_JSM is not set 651# CONFIG_SERIAL_JSM is not set
630CONFIG_SERIAL_OF_PLATFORM=y 652CONFIG_SERIAL_OF_PLATFORM=y
653# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
631CONFIG_UNIX98_PTYS=y 654CONFIG_UNIX98_PTYS=y
655# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
632CONFIG_LEGACY_PTYS=y 656CONFIG_LEGACY_PTYS=y
633CONFIG_LEGACY_PTY_COUNT=256 657CONFIG_LEGACY_PTY_COUNT=256
658# CONFIG_HVC_UDBG is not set
634# CONFIG_IPMI_HANDLER is not set 659# CONFIG_IPMI_HANDLER is not set
635# CONFIG_HW_RANDOM is not set 660# CONFIG_HW_RANDOM is not set
636# CONFIG_NVRAM is not set 661# CONFIG_NVRAM is not set
@@ -649,11 +674,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
649# CONFIG_HWMON is not set 674# CONFIG_HWMON is not set
650CONFIG_THERMAL=y 675CONFIG_THERMAL=y
651# CONFIG_WATCHDOG is not set 676# CONFIG_WATCHDOG is not set
677CONFIG_SSB_POSSIBLE=y
652 678
653# 679#
654# Sonics Silicon Backplane 680# Sonics Silicon Backplane
655# 681#
656CONFIG_SSB_POSSIBLE=y
657# CONFIG_SSB is not set 682# CONFIG_SSB is not set
658 683
659# 684#
@@ -663,7 +688,7 @@ CONFIG_SSB_POSSIBLE=y
663# CONFIG_MFD_SM501 is not set 688# CONFIG_MFD_SM501 is not set
664# CONFIG_HTC_PASIC3 is not set 689# CONFIG_HTC_PASIC3 is not set
665# CONFIG_MFD_TMIO is not set 690# CONFIG_MFD_TMIO is not set
666# CONFIG_MFD_WM8400 is not set 691# CONFIG_REGULATOR is not set
667 692
668# 693#
669# Multimedia devices 694# Multimedia devices
@@ -709,9 +734,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
709# 734#
710 735
711# 736#
712# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 737# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
713# 738#
714# CONFIG_USB_GADGET is not set 739# CONFIG_USB_GADGET is not set
740
741#
742# OTG and related infrastructure
743#
715# CONFIG_UWB is not set 744# CONFIG_UWB is not set
716# CONFIG_MMC is not set 745# CONFIG_MMC is not set
717# CONFIG_MEMSTICK is not set 746# CONFIG_MEMSTICK is not set
@@ -737,7 +766,9 @@ CONFIG_EXT2_FS=y
737# CONFIG_FS_POSIX_ACL is not set 766# CONFIG_FS_POSIX_ACL is not set
738CONFIG_FILE_LOCKING=y 767CONFIG_FILE_LOCKING=y
739# CONFIG_XFS_FS is not set 768# CONFIG_XFS_FS is not set
769# CONFIG_GFS2_FS is not set
740# CONFIG_OCFS2_FS is not set 770# CONFIG_OCFS2_FS is not set
771# CONFIG_BTRFS_FS is not set
741CONFIG_DNOTIFY=y 772CONFIG_DNOTIFY=y
742CONFIG_INOTIFY=y 773CONFIG_INOTIFY=y
743CONFIG_INOTIFY_USER=y 774CONFIG_INOTIFY_USER=y
@@ -771,10 +802,7 @@ CONFIG_TMPFS=y
771# CONFIG_TMPFS_POSIX_ACL is not set 802# CONFIG_TMPFS_POSIX_ACL is not set
772# CONFIG_HUGETLB_PAGE is not set 803# CONFIG_HUGETLB_PAGE is not set
773# CONFIG_CONFIGFS_FS is not set 804# CONFIG_CONFIGFS_FS is not set
774 805CONFIG_MISC_FILESYSTEMS=y
775#
776# Miscellaneous filesystems
777#
778# CONFIG_ADFS_FS is not set 806# CONFIG_ADFS_FS is not set
779# CONFIG_AFFS_FS is not set 807# CONFIG_AFFS_FS is not set
780# CONFIG_HFS_FS is not set 808# CONFIG_HFS_FS is not set
@@ -784,6 +812,7 @@ CONFIG_TMPFS=y
784# CONFIG_EFS_FS is not set 812# CONFIG_EFS_FS is not set
785# CONFIG_JFFS2_FS is not set 813# CONFIG_JFFS2_FS is not set
786CONFIG_CRAMFS=y 814CONFIG_CRAMFS=y
815# CONFIG_SQUASHFS is not set
787# CONFIG_VXFS_FS is not set 816# CONFIG_VXFS_FS is not set
788# CONFIG_MINIX_FS is not set 817# CONFIG_MINIX_FS is not set
789# CONFIG_OMFS_FS is not set 818# CONFIG_OMFS_FS is not set
@@ -824,6 +853,7 @@ CONFIG_MSDOS_PARTITION=y
824# Library routines 853# Library routines
825# 854#
826CONFIG_BITREVERSE=y 855CONFIG_BITREVERSE=y
856CONFIG_GENERIC_FIND_LAST_BIT=y
827# CONFIG_CRC_CCITT is not set 857# CONFIG_CRC_CCITT is not set
828# CONFIG_CRC16 is not set 858# CONFIG_CRC16 is not set
829# CONFIG_CRC_T10DIF is not set 859# CONFIG_CRC_T10DIF is not set
@@ -874,6 +904,7 @@ CONFIG_SCHED_DEBUG=y
874# CONFIG_DEBUG_MEMORY_INIT is not set 904# CONFIG_DEBUG_MEMORY_INIT is not set
875# CONFIG_DEBUG_LIST is not set 905# CONFIG_DEBUG_LIST is not set
876# CONFIG_DEBUG_SG is not set 906# CONFIG_DEBUG_SG is not set
907# CONFIG_DEBUG_NOTIFIERS is not set
877# CONFIG_BOOT_PRINTK_DELAY is not set 908# CONFIG_BOOT_PRINTK_DELAY is not set
878# CONFIG_RCU_TORTURE_TEST is not set 909# CONFIG_RCU_TORTURE_TEST is not set
879# CONFIG_RCU_CPU_STALL_DETECTOR is not set 910# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -882,18 +913,24 @@ CONFIG_SCHED_DEBUG=y
882# CONFIG_FAULT_INJECTION is not set 913# CONFIG_FAULT_INJECTION is not set
883# CONFIG_LATENCYTOP is not set 914# CONFIG_LATENCYTOP is not set
884CONFIG_SYSCTL_SYSCALL_CHECK=y 915CONFIG_SYSCTL_SYSCALL_CHECK=y
885CONFIG_NOP_TRACER=y 916CONFIG_HAVE_FUNCTION_TRACER=y
886CONFIG_HAVE_FTRACE=y
887CONFIG_HAVE_DYNAMIC_FTRACE=y 917CONFIG_HAVE_DYNAMIC_FTRACE=y
888# CONFIG_FTRACE is not set 918CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
919
920#
921# Tracers
922#
923# CONFIG_FUNCTION_TRACER is not set
889# CONFIG_SCHED_TRACER is not set 924# CONFIG_SCHED_TRACER is not set
890# CONFIG_CONTEXT_SWITCH_TRACER is not set 925# CONFIG_CONTEXT_SWITCH_TRACER is not set
891# CONFIG_BOOT_TRACER is not set 926# CONFIG_BOOT_TRACER is not set
927# CONFIG_TRACE_BRANCH_PROFILING is not set
892# CONFIG_STACK_TRACER is not set 928# CONFIG_STACK_TRACER is not set
893# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 929# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
894# CONFIG_SAMPLES is not set 930# CONFIG_SAMPLES is not set
895CONFIG_HAVE_ARCH_KGDB=y 931CONFIG_HAVE_ARCH_KGDB=y
896# CONFIG_KGDB is not set 932# CONFIG_KGDB is not set
933CONFIG_PRINT_STACK_DEPTH=64
897# CONFIG_DEBUG_STACKOVERFLOW is not set 934# CONFIG_DEBUG_STACKOVERFLOW is not set
898# CONFIG_DEBUG_STACK_USAGE is not set 935# CONFIG_DEBUG_STACK_USAGE is not set
899# CONFIG_DEBUG_PAGEALLOC is not set 936# CONFIG_DEBUG_PAGEALLOC is not set
@@ -920,11 +957,15 @@ CONFIG_CRYPTO=y
920# 957#
921# CONFIG_CRYPTO_FIPS is not set 958# CONFIG_CRYPTO_FIPS is not set
922CONFIG_CRYPTO_ALGAPI=y 959CONFIG_CRYPTO_ALGAPI=y
923CONFIG_CRYPTO_AEAD=y 960CONFIG_CRYPTO_ALGAPI2=y
961CONFIG_CRYPTO_AEAD2=y
924CONFIG_CRYPTO_BLKCIPHER=y 962CONFIG_CRYPTO_BLKCIPHER=y
963CONFIG_CRYPTO_BLKCIPHER2=y
925CONFIG_CRYPTO_HASH=y 964CONFIG_CRYPTO_HASH=y
926CONFIG_CRYPTO_RNG=y 965CONFIG_CRYPTO_HASH2=y
966CONFIG_CRYPTO_RNG2=y
927CONFIG_CRYPTO_MANAGER=y 967CONFIG_CRYPTO_MANAGER=y
968CONFIG_CRYPTO_MANAGER2=y
928# CONFIG_CRYPTO_GF128MUL is not set 969# CONFIG_CRYPTO_GF128MUL is not set
929# CONFIG_CRYPTO_NULL is not set 970# CONFIG_CRYPTO_NULL is not set
930# CONFIG_CRYPTO_CRYPTD is not set 971# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/44x/virtex5_defconfig b/arch/powerpc/configs/44x/virtex5_defconfig
index 7513d360e0b0..15aab1ca6384 100644
--- a/arch/powerpc/configs/44x/virtex5_defconfig
+++ b/arch/powerpc/configs/44x/virtex5_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.28-rc4 3# Linux kernel version: 2.6.29-rc2
4# Fri Nov 14 10:31:16 2008 4# Tue Jan 20 08:22:49 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -18,6 +18,7 @@ CONFIG_4xx=y
18CONFIG_BOOKE=y 18CONFIG_BOOKE=y
19CONFIG_PTE_64BIT=y 19CONFIG_PTE_64BIT=y
20CONFIG_PHYS_64BIT=y 20CONFIG_PHYS_64BIT=y
21CONFIG_PPC_MMU_NOHASH=y
21# CONFIG_PPC_MM_SLICES is not set 22# CONFIG_PPC_MM_SLICES is not set
22CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 24CONFIG_PPC32=y
@@ -44,7 +45,7 @@ CONFIG_GENERIC_GPIO=y
44CONFIG_PPC=y 45CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
50CONFIG_OF=y 51CONFIG_OF=y
@@ -77,8 +78,8 @@ CONFIG_POSIX_MQUEUE=y
77CONFIG_IKCONFIG=y 78CONFIG_IKCONFIG=y
78CONFIG_IKCONFIG_PROC=y 79CONFIG_IKCONFIG_PROC=y
79CONFIG_LOG_BUF_SHIFT=14 80CONFIG_LOG_BUF_SHIFT=14
80# CONFIG_CGROUPS is not set
81# CONFIG_GROUP_SCHED is not set 81# CONFIG_GROUP_SCHED is not set
82# CONFIG_CGROUPS is not set
82CONFIG_SYSFS_DEPRECATED=y 83CONFIG_SYSFS_DEPRECATED=y
83CONFIG_SYSFS_DEPRECATED_V2=y 84CONFIG_SYSFS_DEPRECATED_V2=y
84# CONFIG_RELAY is not set 85# CONFIG_RELAY is not set
@@ -116,7 +117,6 @@ CONFIG_SLAB=y
116# CONFIG_SLUB is not set 117# CONFIG_SLUB is not set
117# CONFIG_SLOB is not set 118# CONFIG_SLOB is not set
118# CONFIG_PROFILING is not set 119# CONFIG_PROFILING is not set
119# CONFIG_MARKERS is not set
120CONFIG_HAVE_OPROFILE=y 120CONFIG_HAVE_OPROFILE=y
121# CONFIG_KPROBES is not set 121# CONFIG_KPROBES is not set
122CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 122CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -127,7 +127,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
127# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 127# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
128CONFIG_SLABINFO=y 128CONFIG_SLABINFO=y
129CONFIG_RT_MUTEXES=y 129CONFIG_RT_MUTEXES=y
130# CONFIG_TINY_SHMEM is not set
131CONFIG_BASE_SMALL=0 130CONFIG_BASE_SMALL=0
132CONFIG_MODULES=y 131CONFIG_MODULES=y
133# CONFIG_MODULE_FORCE_LOAD is not set 132# CONFIG_MODULE_FORCE_LOAD is not set
@@ -135,11 +134,9 @@ CONFIG_MODULE_UNLOAD=y
135CONFIG_MODULE_FORCE_UNLOAD=y 134CONFIG_MODULE_FORCE_UNLOAD=y
136CONFIG_MODVERSIONS=y 135CONFIG_MODVERSIONS=y
137# CONFIG_MODULE_SRCVERSION_ALL is not set 136# CONFIG_MODULE_SRCVERSION_ALL is not set
138CONFIG_KMOD=y
139CONFIG_BLOCK=y 137CONFIG_BLOCK=y
140# CONFIG_LBD is not set 138# CONFIG_LBD is not set
141# CONFIG_BLK_DEV_IO_TRACE is not set 139# CONFIG_BLK_DEV_IO_TRACE is not set
142# CONFIG_LSF is not set
143# CONFIG_BLK_DEV_BSG is not set 140# CONFIG_BLK_DEV_BSG is not set
144# CONFIG_BLK_DEV_INTEGRITY is not set 141# CONFIG_BLK_DEV_INTEGRITY is not set
145 142
@@ -156,6 +153,10 @@ CONFIG_DEFAULT_CFQ=y
156# CONFIG_DEFAULT_NOOP is not set 153# CONFIG_DEFAULT_NOOP is not set
157CONFIG_DEFAULT_IOSCHED="cfq" 154CONFIG_DEFAULT_IOSCHED="cfq"
158CONFIG_CLASSIC_RCU=y 155CONFIG_CLASSIC_RCU=y
156# CONFIG_TREE_RCU is not set
157# CONFIG_PREEMPT_RCU is not set
158# CONFIG_TREE_RCU_TRACE is not set
159# CONFIG_PREEMPT_RCU_TRACE is not set
159# CONFIG_FREEZER is not set 160# CONFIG_FREEZER is not set
160# CONFIG_PPC4xx_PCI_EXPRESS is not set 161# CONFIG_PPC4xx_PCI_EXPRESS is not set
161 162
@@ -194,6 +195,7 @@ CONFIG_XILINX_VIRTEX_5_FXT=y
194# CONFIG_GENERIC_IOMAP is not set 195# CONFIG_GENERIC_IOMAP is not set
195# CONFIG_CPU_FREQ is not set 196# CONFIG_CPU_FREQ is not set
196# CONFIG_FSL_ULI1575 is not set 197# CONFIG_FSL_ULI1575 is not set
198# CONFIG_SIMPLE_GPIO is not set
197 199
198# 200#
199# Kernel options 201# Kernel options
@@ -211,13 +213,13 @@ CONFIG_HZ=250
211# CONFIG_PREEMPT_NONE is not set 213# CONFIG_PREEMPT_NONE is not set
212# CONFIG_PREEMPT_VOLUNTARY is not set 214# CONFIG_PREEMPT_VOLUNTARY is not set
213CONFIG_PREEMPT=y 215CONFIG_PREEMPT=y
214# CONFIG_PREEMPT_RCU is not set
215CONFIG_BINFMT_ELF=y 216CONFIG_BINFMT_ELF=y
216# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 217# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
217# CONFIG_HAVE_AOUT is not set 218# CONFIG_HAVE_AOUT is not set
218# CONFIG_BINFMT_MISC is not set 219# CONFIG_BINFMT_MISC is not set
219CONFIG_MATH_EMULATION=y 220CONFIG_MATH_EMULATION=y
220# CONFIG_IOMMU_HELPER is not set 221# CONFIG_IOMMU_HELPER is not set
222CONFIG_PPC_NEED_DMA_SYNC_OPS=y
221CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 223CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
222CONFIG_ARCH_HAS_WALK_MEMORY=y 224CONFIG_ARCH_HAS_WALK_MEMORY=y
223CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 225CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -232,12 +234,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
232CONFIG_PAGEFLAGS_EXTENDED=y 234CONFIG_PAGEFLAGS_EXTENDED=y
233CONFIG_SPLIT_PTLOCK_CPUS=4 235CONFIG_SPLIT_PTLOCK_CPUS=4
234CONFIG_MIGRATION=y 236CONFIG_MIGRATION=y
235CONFIG_RESOURCES_64BIT=y
236CONFIG_PHYS_ADDR_T_64BIT=y 237CONFIG_PHYS_ADDR_T_64BIT=y
237CONFIG_ZONE_DMA_FLAG=1 238CONFIG_ZONE_DMA_FLAG=1
238CONFIG_BOUNCE=y 239CONFIG_BOUNCE=y
239CONFIG_VIRT_TO_BUS=y 240CONFIG_VIRT_TO_BUS=y
240CONFIG_UNEVICTABLE_LRU=y 241CONFIG_UNEVICTABLE_LRU=y
242CONFIG_PPC_4K_PAGES=y
243# CONFIG_PPC_16K_PAGES is not set
244# CONFIG_PPC_64K_PAGES is not set
241CONFIG_FORCE_MAX_ZONEORDER=11 245CONFIG_FORCE_MAX_ZONEORDER=11
242CONFIG_PROC_DEVICETREE=y 246CONFIG_PROC_DEVICETREE=y
243CONFIG_CMDLINE_BOOL=y 247CONFIG_CMDLINE_BOOL=y
@@ -261,6 +265,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
261# CONFIG_PCI_MSI is not set 265# CONFIG_PCI_MSI is not set
262CONFIG_PCI_LEGACY=y 266CONFIG_PCI_LEGACY=y
263# CONFIG_PCI_DEBUG is not set 267# CONFIG_PCI_DEBUG is not set
268# CONFIG_PCI_STUB is not set
264# CONFIG_PCCARD is not set 269# CONFIG_PCCARD is not set
265# CONFIG_HOTPLUG_PCI is not set 270# CONFIG_HOTPLUG_PCI is not set
266# CONFIG_HAS_RAPIDIO is not set 271# CONFIG_HAS_RAPIDIO is not set
@@ -285,6 +290,8 @@ CONFIG_NET=y
285# 290#
286# Networking options 291# Networking options
287# 292#
293# CONFIG_NET_NS is not set
294CONFIG_COMPAT_NET_DEV_OPS=y
288CONFIG_PACKET=y 295CONFIG_PACKET=y
289# CONFIG_PACKET_MMAP is not set 296# CONFIG_PACKET_MMAP is not set
290CONFIG_UNIX=y 297CONFIG_UNIX=y
@@ -428,6 +435,7 @@ CONFIG_IP_NF_MANGLE=m
428# CONFIG_ECONET is not set 435# CONFIG_ECONET is not set
429# CONFIG_WAN_ROUTER is not set 436# CONFIG_WAN_ROUTER is not set
430# CONFIG_NET_SCHED is not set 437# CONFIG_NET_SCHED is not set
438# CONFIG_DCB is not set
431 439
432# 440#
433# Network testing 441# Network testing
@@ -443,8 +451,9 @@ CONFIG_WIRELESS=y
443# CONFIG_CFG80211 is not set 451# CONFIG_CFG80211 is not set
444CONFIG_WIRELESS_OLD_REGULATORY=y 452CONFIG_WIRELESS_OLD_REGULATORY=y
445# CONFIG_WIRELESS_EXT is not set 453# CONFIG_WIRELESS_EXT is not set
454# CONFIG_LIB80211 is not set
446# CONFIG_MAC80211 is not set 455# CONFIG_MAC80211 is not set
447# CONFIG_IEEE80211 is not set 456# CONFIG_WIMAX is not set
448# CONFIG_RFKILL is not set 457# CONFIG_RFKILL is not set
449# CONFIG_NET_9P is not set 458# CONFIG_NET_9P is not set
450 459
@@ -579,6 +588,10 @@ CONFIG_NETDEV_1000=y
579# CONFIG_WLAN_PRE80211 is not set 588# CONFIG_WLAN_PRE80211 is not set
580# CONFIG_WLAN_80211 is not set 589# CONFIG_WLAN_80211 is not set
581# CONFIG_IWLWIFI_LEDS is not set 590# CONFIG_IWLWIFI_LEDS is not set
591
592#
593# Enable WiMAX (Networking options) to see the WiMAX drivers
594#
582# CONFIG_WAN is not set 595# CONFIG_WAN is not set
583# CONFIG_FDDI is not set 596# CONFIG_FDDI is not set
584# CONFIG_HIPPI is not set 597# CONFIG_HIPPI is not set
@@ -679,9 +692,12 @@ CONFIG_SERIAL_CORE=y
679CONFIG_SERIAL_CORE_CONSOLE=y 692CONFIG_SERIAL_CORE_CONSOLE=y
680# CONFIG_SERIAL_JSM is not set 693# CONFIG_SERIAL_JSM is not set
681# CONFIG_SERIAL_OF_PLATFORM is not set 694# CONFIG_SERIAL_OF_PLATFORM is not set
695# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
682CONFIG_UNIX98_PTYS=y 696CONFIG_UNIX98_PTYS=y
697# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
683CONFIG_LEGACY_PTYS=y 698CONFIG_LEGACY_PTYS=y
684CONFIG_LEGACY_PTY_COUNT=256 699CONFIG_LEGACY_PTY_COUNT=256
700# CONFIG_HVC_UDBG is not set
685# CONFIG_IPMI_HANDLER is not set 701# CONFIG_IPMI_HANDLER is not set
686CONFIG_HW_RANDOM=m 702CONFIG_HW_RANDOM=m
687# CONFIG_NVRAM is not set 703# CONFIG_NVRAM is not set
@@ -859,7 +875,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
859# CONFIG_DMADEVICES is not set 875# CONFIG_DMADEVICES is not set
860# CONFIG_UIO is not set 876# CONFIG_UIO is not set
861# CONFIG_STAGING is not set 877# CONFIG_STAGING is not set
862CONFIG_STAGING_EXCLUDE_BUILD=y
863 878
864# 879#
865# File systems 880# File systems
@@ -875,6 +890,7 @@ CONFIG_EXT2_FS=y
875CONFIG_FILE_LOCKING=y 890CONFIG_FILE_LOCKING=y
876# CONFIG_XFS_FS is not set 891# CONFIG_XFS_FS is not set
877# CONFIG_OCFS2_FS is not set 892# CONFIG_OCFS2_FS is not set
893# CONFIG_BTRFS_FS is not set
878CONFIG_DNOTIFY=y 894CONFIG_DNOTIFY=y
879CONFIG_INOTIFY=y 895CONFIG_INOTIFY=y
880CONFIG_INOTIFY_USER=y 896CONFIG_INOTIFY_USER=y
@@ -911,10 +927,7 @@ CONFIG_TMPFS=y
911# CONFIG_TMPFS_POSIX_ACL is not set 927# CONFIG_TMPFS_POSIX_ACL is not set
912# CONFIG_HUGETLB_PAGE is not set 928# CONFIG_HUGETLB_PAGE is not set
913# CONFIG_CONFIGFS_FS is not set 929# CONFIG_CONFIGFS_FS is not set
914 930CONFIG_MISC_FILESYSTEMS=y
915#
916# Miscellaneous filesystems
917#
918# CONFIG_ADFS_FS is not set 931# CONFIG_ADFS_FS is not set
919# CONFIG_AFFS_FS is not set 932# CONFIG_AFFS_FS is not set
920# CONFIG_HFS_FS is not set 933# CONFIG_HFS_FS is not set
@@ -923,6 +936,7 @@ CONFIG_TMPFS=y
923# CONFIG_BFS_FS is not set 936# CONFIG_BFS_FS is not set
924# CONFIG_EFS_FS is not set 937# CONFIG_EFS_FS is not set
925CONFIG_CRAMFS=y 938CONFIG_CRAMFS=y
939# CONFIG_SQUASHFS is not set
926# CONFIG_VXFS_FS is not set 940# CONFIG_VXFS_FS is not set
927# CONFIG_MINIX_FS is not set 941# CONFIG_MINIX_FS is not set
928# CONFIG_OMFS_FS is not set 942# CONFIG_OMFS_FS is not set
@@ -1002,6 +1016,7 @@ CONFIG_NLS_UTF8=m
1002# Library routines 1016# Library routines
1003# 1017#
1004CONFIG_BITREVERSE=y 1018CONFIG_BITREVERSE=y
1019CONFIG_GENERIC_FIND_LAST_BIT=y
1005CONFIG_CRC_CCITT=y 1020CONFIG_CRC_CCITT=y
1006# CONFIG_CRC16 is not set 1021# CONFIG_CRC16 is not set
1007# CONFIG_CRC_T10DIF is not set 1022# CONFIG_CRC_T10DIF is not set
@@ -1051,6 +1066,7 @@ CONFIG_DEBUG_INFO=y
1051CONFIG_DEBUG_MEMORY_INIT=y 1066CONFIG_DEBUG_MEMORY_INIT=y
1052# CONFIG_DEBUG_LIST is not set 1067# CONFIG_DEBUG_LIST is not set
1053# CONFIG_DEBUG_SG is not set 1068# CONFIG_DEBUG_SG is not set
1069# CONFIG_DEBUG_NOTIFIERS is not set
1054# CONFIG_BOOT_PRINTK_DELAY is not set 1070# CONFIG_BOOT_PRINTK_DELAY is not set
1055# CONFIG_RCU_TORTURE_TEST is not set 1071# CONFIG_RCU_TORTURE_TEST is not set
1056# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1072# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1060,6 +1076,8 @@ CONFIG_DEBUG_MEMORY_INIT=y
1060# CONFIG_LATENCYTOP is not set 1076# CONFIG_LATENCYTOP is not set
1061CONFIG_SYSCTL_SYSCALL_CHECK=y 1077CONFIG_SYSCTL_SYSCALL_CHECK=y
1062CONFIG_HAVE_FUNCTION_TRACER=y 1078CONFIG_HAVE_FUNCTION_TRACER=y
1079CONFIG_HAVE_DYNAMIC_FTRACE=y
1080CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1063 1081
1064# 1082#
1065# Tracers 1083# Tracers
@@ -1069,11 +1087,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1069# CONFIG_SCHED_TRACER is not set 1087# CONFIG_SCHED_TRACER is not set
1070# CONFIG_CONTEXT_SWITCH_TRACER is not set 1088# CONFIG_CONTEXT_SWITCH_TRACER is not set
1071# CONFIG_BOOT_TRACER is not set 1089# CONFIG_BOOT_TRACER is not set
1090# CONFIG_TRACE_BRANCH_PROFILING is not set
1072# CONFIG_STACK_TRACER is not set 1091# CONFIG_STACK_TRACER is not set
1073# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1092# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1074# CONFIG_SAMPLES is not set 1093# CONFIG_SAMPLES is not set
1075CONFIG_HAVE_ARCH_KGDB=y 1094CONFIG_HAVE_ARCH_KGDB=y
1076# CONFIG_KGDB is not set 1095# CONFIG_KGDB is not set
1096CONFIG_PRINT_STACK_DEPTH=64
1077# CONFIG_DEBUG_STACKOVERFLOW is not set 1097# CONFIG_DEBUG_STACKOVERFLOW is not set
1078# CONFIG_DEBUG_STACK_USAGE is not set 1098# CONFIG_DEBUG_STACK_USAGE is not set
1079# CONFIG_DEBUG_PAGEALLOC is not set 1099# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1099,6 +1119,7 @@ CONFIG_CRYPTO=y
1099# 1119#
1100# CONFIG_CRYPTO_FIPS is not set 1120# CONFIG_CRYPTO_FIPS is not set
1101# CONFIG_CRYPTO_MANAGER is not set 1121# CONFIG_CRYPTO_MANAGER is not set
1122# CONFIG_CRYPTO_MANAGER2 is not set
1102# CONFIG_CRYPTO_GF128MUL is not set 1123# CONFIG_CRYPTO_GF128MUL is not set
1103# CONFIG_CRYPTO_NULL is not set 1124# CONFIG_CRYPTO_NULL is not set
1104# CONFIG_CRYPTO_CRYPTD is not set 1125# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/44x/warp_defconfig b/arch/powerpc/configs/44x/warp_defconfig
index 031ac6d4212f..3b77f092abe1 100644
--- a/arch/powerpc/configs/44x/warp_defconfig
+++ b/arch/powerpc/configs/44x/warp_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:22 2008 4# Fri Jan 23 07:57:16 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,6 +19,7 @@ CONFIG_4xx=y
19CONFIG_BOOKE=y 19CONFIG_BOOKE=y
20CONFIG_PTE_64BIT=y 20CONFIG_PTE_64BIT=y
21CONFIG_PHYS_64BIT=y 21CONFIG_PHYS_64BIT=y
22CONFIG_PPC_MMU_NOHASH=y
22# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y 24CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 25CONFIG_PPC32=y
@@ -44,7 +45,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 45CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
50CONFIG_OF=y 51CONFIG_OF=y
@@ -75,12 +76,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 76# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 77# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 79CONFIG_GROUP_SCHED=y
80CONFIG_FAIR_GROUP_SCHED=y 80CONFIG_FAIR_GROUP_SCHED=y
81# CONFIG_RT_GROUP_SCHED is not set 81# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 82CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 83# CONFIG_CGROUP_SCHED is not set
84# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 85CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 86CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 87# CONFIG_RELAY is not set
@@ -113,7 +114,6 @@ CONFIG_SLAB=y
113# CONFIG_SLUB is not set 114# CONFIG_SLUB is not set
114# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 116# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
118# CONFIG_KPROBES is not set 118# CONFIG_KPROBES is not set
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -124,7 +124,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
127# CONFIG_TINY_SHMEM is not set
128CONFIG_BASE_SMALL=0 127CONFIG_BASE_SMALL=0
129CONFIG_MODULES=y 128CONFIG_MODULES=y
130# CONFIG_MODULE_FORCE_LOAD is not set 129# CONFIG_MODULE_FORCE_LOAD is not set
@@ -132,11 +131,9 @@ CONFIG_MODULE_UNLOAD=y
132# CONFIG_MODULE_FORCE_UNLOAD is not set 131# CONFIG_MODULE_FORCE_UNLOAD is not set
133# CONFIG_MODVERSIONS is not set 132# CONFIG_MODVERSIONS is not set
134# CONFIG_MODULE_SRCVERSION_ALL is not set 133# CONFIG_MODULE_SRCVERSION_ALL is not set
135CONFIG_KMOD=y
136CONFIG_BLOCK=y 134CONFIG_BLOCK=y
137# CONFIG_LBD is not set 135# CONFIG_LBD is not set
138# CONFIG_BLK_DEV_IO_TRACE is not set 136# CONFIG_BLK_DEV_IO_TRACE is not set
139# CONFIG_LSF is not set
140# CONFIG_BLK_DEV_BSG is not set 137# CONFIG_BLK_DEV_BSG is not set
141# CONFIG_BLK_DEV_INTEGRITY is not set 138# CONFIG_BLK_DEV_INTEGRITY is not set
142 139
@@ -153,6 +150,10 @@ CONFIG_DEFAULT_AS=y
153# CONFIG_DEFAULT_NOOP is not set 150# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="anticipatory" 151CONFIG_DEFAULT_IOSCHED="anticipatory"
155CONFIG_CLASSIC_RCU=y 152CONFIG_CLASSIC_RCU=y
153# CONFIG_TREE_RCU is not set
154# CONFIG_PREEMPT_RCU is not set
155# CONFIG_TREE_RCU_TRACE is not set
156# CONFIG_PREEMPT_RCU_TRACE is not set
156# CONFIG_FREEZER is not set 157# CONFIG_FREEZER is not set
157 158
158# 159#
@@ -190,6 +191,7 @@ CONFIG_IBM440EP_ERR42=y
190# CONFIG_GENERIC_IOMAP is not set 191# CONFIG_GENERIC_IOMAP is not set
191# CONFIG_CPU_FREQ is not set 192# CONFIG_CPU_FREQ is not set
192# CONFIG_FSL_ULI1575 is not set 193# CONFIG_FSL_ULI1575 is not set
194# CONFIG_SIMPLE_GPIO is not set
193 195
194# 196#
195# Kernel options 197# Kernel options
@@ -213,6 +215,7 @@ CONFIG_BINFMT_ELF=y
213# CONFIG_BINFMT_MISC is not set 215# CONFIG_BINFMT_MISC is not set
214# CONFIG_MATH_EMULATION is not set 216# CONFIG_MATH_EMULATION is not set
215# CONFIG_IOMMU_HELPER is not set 217# CONFIG_IOMMU_HELPER is not set
218CONFIG_PPC_NEED_DMA_SYNC_OPS=y
216CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 219CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
217CONFIG_ARCH_HAS_WALK_MEMORY=y 220CONFIG_ARCH_HAS_WALK_MEMORY=y
218CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 221CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -227,12 +230,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
227CONFIG_PAGEFLAGS_EXTENDED=y 230CONFIG_PAGEFLAGS_EXTENDED=y
228CONFIG_SPLIT_PTLOCK_CPUS=4 231CONFIG_SPLIT_PTLOCK_CPUS=4
229CONFIG_MIGRATION=y 232CONFIG_MIGRATION=y
230CONFIG_RESOURCES_64BIT=y
231CONFIG_PHYS_ADDR_T_64BIT=y 233CONFIG_PHYS_ADDR_T_64BIT=y
232CONFIG_ZONE_DMA_FLAG=1 234CONFIG_ZONE_DMA_FLAG=1
233CONFIG_BOUNCE=y 235CONFIG_BOUNCE=y
234CONFIG_VIRT_TO_BUS=y 236CONFIG_VIRT_TO_BUS=y
235CONFIG_UNEVICTABLE_LRU=y 237CONFIG_UNEVICTABLE_LRU=y
238CONFIG_PPC_4K_PAGES=y
239# CONFIG_PPC_16K_PAGES is not set
240# CONFIG_PPC_64K_PAGES is not set
236CONFIG_FORCE_MAX_ZONEORDER=11 241CONFIG_FORCE_MAX_ZONEORDER=11
237CONFIG_PROC_DEVICETREE=y 242CONFIG_PROC_DEVICETREE=y
238CONFIG_CMDLINE_BOOL=y 243CONFIG_CMDLINE_BOOL=y
@@ -273,6 +278,7 @@ CONFIG_NET=y
273# 278#
274# Networking options 279# Networking options
275# 280#
281CONFIG_COMPAT_NET_DEV_OPS=y
276CONFIG_PACKET=y 282CONFIG_PACKET=y
277# CONFIG_PACKET_MMAP is not set 283# CONFIG_PACKET_MMAP is not set
278CONFIG_UNIX=y 284CONFIG_UNIX=y
@@ -348,6 +354,7 @@ CONFIG_VLAN_8021Q=y
348# CONFIG_ECONET is not set 354# CONFIG_ECONET is not set
349# CONFIG_WAN_ROUTER is not set 355# CONFIG_WAN_ROUTER is not set
350# CONFIG_NET_SCHED is not set 356# CONFIG_NET_SCHED is not set
357# CONFIG_DCB is not set
351 358
352# 359#
353# Network testing 360# Network testing
@@ -360,6 +367,7 @@ CONFIG_VLAN_8021Q=y
360# CONFIG_AF_RXRPC is not set 367# CONFIG_AF_RXRPC is not set
361# CONFIG_PHONET is not set 368# CONFIG_PHONET is not set
362# CONFIG_WIRELESS is not set 369# CONFIG_WIRELESS is not set
370# CONFIG_WIMAX is not set
363# CONFIG_RFKILL is not set 371# CONFIG_RFKILL is not set
364# CONFIG_NET_9P is not set 372# CONFIG_NET_9P is not set
365 373
@@ -380,8 +388,9 @@ CONFIG_MTD=y
380# CONFIG_MTD_DEBUG is not set 388# CONFIG_MTD_DEBUG is not set
381# CONFIG_MTD_CONCAT is not set 389# CONFIG_MTD_CONCAT is not set
382CONFIG_MTD_PARTITIONS=y 390CONFIG_MTD_PARTITIONS=y
391# CONFIG_MTD_TESTS is not set
383# CONFIG_MTD_REDBOOT_PARTS is not set 392# CONFIG_MTD_REDBOOT_PARTS is not set
384# CONFIG_MTD_CMDLINE_PARTS is not set 393CONFIG_MTD_CMDLINE_PARTS=y
385CONFIG_MTD_OF_PARTS=y 394CONFIG_MTD_OF_PARTS=y
386# CONFIG_MTD_AR7_PARTS is not set 395# CONFIG_MTD_AR7_PARTS is not set
387 396
@@ -396,7 +405,7 @@ CONFIG_MTD_BLOCK=y
396# CONFIG_INFTL is not set 405# CONFIG_INFTL is not set
397# CONFIG_RFD_FTL is not set 406# CONFIG_RFD_FTL is not set
398# CONFIG_SSFDC is not set 407# CONFIG_SSFDC is not set
399CONFIG_MTD_OOPS=m 408# CONFIG_MTD_OOPS is not set
400 409
401# 410#
402# RAM/ROM/Flash chip drivers 411# RAM/ROM/Flash chip drivers
@@ -450,6 +459,7 @@ CONFIG_MTD_NAND=y
450CONFIG_MTD_NAND_ECC_SMC=y 459CONFIG_MTD_NAND_ECC_SMC=y
451# CONFIG_MTD_NAND_MUSEUM_IDS is not set 460# CONFIG_MTD_NAND_MUSEUM_IDS is not set
452CONFIG_MTD_NAND_IDS=y 461CONFIG_MTD_NAND_IDS=y
462CONFIG_MTD_NAND_NDFC=y
453# CONFIG_MTD_NAND_DISKONCHIP is not set 463# CONFIG_MTD_NAND_DISKONCHIP is not set
454# CONFIG_MTD_NAND_NANDSIM is not set 464# CONFIG_MTD_NAND_NANDSIM is not set
455# CONFIG_MTD_NAND_PLATFORM is not set 465# CONFIG_MTD_NAND_PLATFORM is not set
@@ -458,6 +468,12 @@ CONFIG_MTD_NAND_IDS=y
458# CONFIG_MTD_ONENAND is not set 468# CONFIG_MTD_ONENAND is not set
459 469
460# 470#
471# LPDDR flash memory drivers
472#
473# CONFIG_MTD_LPDDR is not set
474# CONFIG_MTD_QINFO_PROBE is not set
475
476#
461# UBI - Unsorted block images 477# UBI - Unsorted block images
462# 478#
463# CONFIG_MTD_UBI is not set 479# CONFIG_MTD_UBI is not set
@@ -480,7 +496,9 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
480# CONFIG_BLK_DEV_HD is not set 496# CONFIG_BLK_DEV_HD is not set
481CONFIG_MISC_DEVICES=y 497CONFIG_MISC_DEVICES=y
482# CONFIG_EEPROM_93CX6 is not set 498# CONFIG_EEPROM_93CX6 is not set
499# CONFIG_ICS932S401 is not set
483# CONFIG_ENCLOSURE_SERVICES is not set 500# CONFIG_ENCLOSURE_SERVICES is not set
501# CONFIG_C2PORT is not set
484CONFIG_HAVE_IDE=y 502CONFIG_HAVE_IDE=y
485# CONFIG_IDE is not set 503# CONFIG_IDE is not set
486 504
@@ -562,6 +580,10 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
562# CONFIG_IWLWIFI_LEDS is not set 580# CONFIG_IWLWIFI_LEDS is not set
563 581
564# 582#
583# Enable WiMAX (Networking options) to see the WiMAX drivers
584#
585
586#
565# USB Network Adapters 587# USB Network Adapters
566# 588#
567# CONFIG_USB_CATC is not set 589# CONFIG_USB_CATC is not set
@@ -616,9 +638,12 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
616CONFIG_SERIAL_CORE=y 638CONFIG_SERIAL_CORE=y
617CONFIG_SERIAL_CORE_CONSOLE=y 639CONFIG_SERIAL_CORE_CONSOLE=y
618# CONFIG_SERIAL_OF_PLATFORM is not set 640# CONFIG_SERIAL_OF_PLATFORM is not set
641# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
619CONFIG_UNIX98_PTYS=y 642CONFIG_UNIX98_PTYS=y
643# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
620CONFIG_LEGACY_PTYS=y 644CONFIG_LEGACY_PTYS=y
621CONFIG_LEGACY_PTY_COUNT=256 645CONFIG_LEGACY_PTY_COUNT=256
646# CONFIG_HVC_UDBG is not set
622# CONFIG_IPMI_HANDLER is not set 647# CONFIG_IPMI_HANDLER is not set
623CONFIG_HW_RANDOM=y 648CONFIG_HW_RANDOM=y
624# CONFIG_NVRAM is not set 649# CONFIG_NVRAM is not set
@@ -638,7 +663,7 @@ CONFIG_I2C_HELPER_AUTO=y
638# 663#
639# I2C system bus drivers (mostly embedded / system-on-chip) 664# I2C system bus drivers (mostly embedded / system-on-chip)
640# 665#
641# CONFIG_I2C_IBM_IIC is not set 666CONFIG_I2C_IBM_IIC=y
642# CONFIG_I2C_MPC is not set 667# CONFIG_I2C_MPC is not set
643# CONFIG_I2C_OCORES is not set 668# CONFIG_I2C_OCORES is not set
644# CONFIG_I2C_SIMTEC is not set 669# CONFIG_I2C_SIMTEC is not set
@@ -660,7 +685,7 @@ CONFIG_I2C_HELPER_AUTO=y
660# Miscellaneous I2C Chip support 685# Miscellaneous I2C Chip support
661# 686#
662# CONFIG_DS1682 is not set 687# CONFIG_DS1682 is not set
663# CONFIG_EEPROM_AT24 is not set 688CONFIG_EEPROM_AT24=y
664CONFIG_EEPROM_LEGACY=y 689CONFIG_EEPROM_LEGACY=y
665# CONFIG_SENSORS_PCF8574 is not set 690# CONFIG_SENSORS_PCF8574 is not set
666# CONFIG_PCF8575 is not set 691# CONFIG_PCF8575 is not set
@@ -679,7 +704,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
679# CONFIG_POWER_SUPPLY is not set 704# CONFIG_POWER_SUPPLY is not set
680CONFIG_HWMON=y 705CONFIG_HWMON=y
681# CONFIG_HWMON_VID is not set 706# CONFIG_HWMON_VID is not set
682# CONFIG_SENSORS_AD7414 is not set 707CONFIG_SENSORS_AD7414=y
683# CONFIG_SENSORS_AD7418 is not set 708# CONFIG_SENSORS_AD7418 is not set
684# CONFIG_SENSORS_ADM1021 is not set 709# CONFIG_SENSORS_ADM1021 is not set
685# CONFIG_SENSORS_ADM1025 is not set 710# CONFIG_SENSORS_ADM1025 is not set
@@ -687,8 +712,10 @@ CONFIG_HWMON=y
687# CONFIG_SENSORS_ADM1029 is not set 712# CONFIG_SENSORS_ADM1029 is not set
688# CONFIG_SENSORS_ADM1031 is not set 713# CONFIG_SENSORS_ADM1031 is not set
689# CONFIG_SENSORS_ADM9240 is not set 714# CONFIG_SENSORS_ADM9240 is not set
715# CONFIG_SENSORS_ADT7462 is not set
690# CONFIG_SENSORS_ADT7470 is not set 716# CONFIG_SENSORS_ADT7470 is not set
691# CONFIG_SENSORS_ADT7473 is not set 717# CONFIG_SENSORS_ADT7473 is not set
718# CONFIG_SENSORS_ADT7475 is not set
692# CONFIG_SENSORS_ATXP1 is not set 719# CONFIG_SENSORS_ATXP1 is not set
693# CONFIG_SENSORS_DS1621 is not set 720# CONFIG_SENSORS_DS1621 is not set
694# CONFIG_SENSORS_F71805F is not set 721# CONFIG_SENSORS_F71805F is not set
@@ -708,6 +735,7 @@ CONFIG_HWMON=y
708# CONFIG_SENSORS_LM90 is not set 735# CONFIG_SENSORS_LM90 is not set
709# CONFIG_SENSORS_LM92 is not set 736# CONFIG_SENSORS_LM92 is not set
710# CONFIG_SENSORS_LM93 is not set 737# CONFIG_SENSORS_LM93 is not set
738# CONFIG_SENSORS_LTC4245 is not set
711# CONFIG_SENSORS_MAX1619 is not set 739# CONFIG_SENSORS_MAX1619 is not set
712# CONFIG_SENSORS_MAX6650 is not set 740# CONFIG_SENSORS_MAX6650 is not set
713# CONFIG_SENSORS_PC87360 is not set 741# CONFIG_SENSORS_PC87360 is not set
@@ -729,13 +757,26 @@ CONFIG_HWMON=y
729# CONFIG_SENSORS_W83627EHF is not set 757# CONFIG_SENSORS_W83627EHF is not set
730# CONFIG_HWMON_DEBUG_CHIP is not set 758# CONFIG_HWMON_DEBUG_CHIP is not set
731CONFIG_THERMAL=y 759CONFIG_THERMAL=y
732# CONFIG_THERMAL_HWMON is not set 760CONFIG_THERMAL_HWMON=y
733# CONFIG_WATCHDOG is not set 761CONFIG_WATCHDOG=y
762# CONFIG_WATCHDOG_NOWAYOUT is not set
734 763
735# 764#
736# Sonics Silicon Backplane 765# Watchdog Device Drivers
766#
767# CONFIG_SOFT_WATCHDOG is not set
768CONFIG_PIKA_WDT=y
769# CONFIG_BOOKE_WDT is not set
770
771#
772# USB-based Watchdog Cards
737# 773#
774# CONFIG_USBPCWATCHDOG is not set
738CONFIG_SSB_POSSIBLE=y 775CONFIG_SSB_POSSIBLE=y
776
777#
778# Sonics Silicon Backplane
779#
739# CONFIG_SSB is not set 780# CONFIG_SSB is not set
740 781
741# 782#
@@ -744,9 +785,13 @@ CONFIG_SSB_POSSIBLE=y
744# CONFIG_MFD_CORE is not set 785# CONFIG_MFD_CORE is not set
745# CONFIG_MFD_SM501 is not set 786# CONFIG_MFD_SM501 is not set
746# CONFIG_HTC_PASIC3 is not set 787# CONFIG_HTC_PASIC3 is not set
788# CONFIG_TWL4030_CORE is not set
747# CONFIG_MFD_TMIO is not set 789# CONFIG_MFD_TMIO is not set
790# CONFIG_PMIC_DA903X is not set
748# CONFIG_MFD_WM8400 is not set 791# CONFIG_MFD_WM8400 is not set
749# CONFIG_MFD_WM8350_I2C is not set 792# CONFIG_MFD_WM8350_I2C is not set
793# CONFIG_MFD_PCF50633 is not set
794# CONFIG_REGULATOR is not set
750 795
751# 796#
752# Multimedia devices 797# Multimedia devices
@@ -802,6 +847,7 @@ CONFIG_USB_MON=y
802# USB Host Controller Drivers 847# USB Host Controller Drivers
803# 848#
804# CONFIG_USB_C67X00_HCD is not set 849# CONFIG_USB_C67X00_HCD is not set
850# CONFIG_USB_OXU210HP_HCD is not set
805# CONFIG_USB_ISP116X_HCD is not set 851# CONFIG_USB_ISP116X_HCD is not set
806# CONFIG_USB_ISP1760_HCD is not set 852# CONFIG_USB_ISP1760_HCD is not set
807CONFIG_USB_OHCI_HCD=y 853CONFIG_USB_OHCI_HCD=y
@@ -824,18 +870,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
824# CONFIG_USB_TMC is not set 870# CONFIG_USB_TMC is not set
825 871
826# 872#
827# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 873# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
828# 874#
829 875
830# 876#
831# may also be needed; see USB_STORAGE Help for more information 877# see USB_STORAGE Help for more information
832# 878#
833CONFIG_USB_STORAGE=y 879CONFIG_USB_STORAGE=y
834# CONFIG_USB_STORAGE_DEBUG is not set 880# CONFIG_USB_STORAGE_DEBUG is not set
835# CONFIG_USB_STORAGE_DATAFAB is not set 881# CONFIG_USB_STORAGE_DATAFAB is not set
836# CONFIG_USB_STORAGE_FREECOM is not set 882# CONFIG_USB_STORAGE_FREECOM is not set
837# CONFIG_USB_STORAGE_ISD200 is not set 883# CONFIG_USB_STORAGE_ISD200 is not set
838# CONFIG_USB_STORAGE_DPCM is not set
839# CONFIG_USB_STORAGE_USBAT is not set 884# CONFIG_USB_STORAGE_USBAT is not set
840# CONFIG_USB_STORAGE_SDDR09 is not set 885# CONFIG_USB_STORAGE_SDDR09 is not set
841# CONFIG_USB_STORAGE_SDDR55 is not set 886# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -880,14 +925,18 @@ CONFIG_USB_STORAGE=y
880# CONFIG_USB_ISIGHTFW is not set 925# CONFIG_USB_ISIGHTFW is not set
881# CONFIG_USB_VST is not set 926# CONFIG_USB_VST is not set
882# CONFIG_USB_GADGET is not set 927# CONFIG_USB_GADGET is not set
883CONFIG_MMC=m 928
929#
930# OTG and related infrastructure
931#
932CONFIG_MMC=y
884# CONFIG_MMC_DEBUG is not set 933# CONFIG_MMC_DEBUG is not set
885# CONFIG_MMC_UNSAFE_RESUME is not set 934# CONFIG_MMC_UNSAFE_RESUME is not set
886 935
887# 936#
888# MMC/SD/SDIO Card Drivers 937# MMC/SD/SDIO Card Drivers
889# 938#
890CONFIG_MMC_BLOCK=m 939CONFIG_MMC_BLOCK=y
891CONFIG_MMC_BLOCK_BOUNCE=y 940CONFIG_MMC_BLOCK_BOUNCE=y
892# CONFIG_SDIO_UART is not set 941# CONFIG_SDIO_UART is not set
893# CONFIG_MMC_TEST is not set 942# CONFIG_MMC_TEST is not set
@@ -898,7 +947,18 @@ CONFIG_MMC_BLOCK_BOUNCE=y
898# CONFIG_MMC_SDHCI is not set 947# CONFIG_MMC_SDHCI is not set
899# CONFIG_MMC_WBSD is not set 948# CONFIG_MMC_WBSD is not set
900# CONFIG_MEMSTICK is not set 949# CONFIG_MEMSTICK is not set
901# CONFIG_NEW_LEDS is not set 950CONFIG_NEW_LEDS=y
951CONFIG_LEDS_CLASS=y
952
953#
954# LED drivers
955#
956# CONFIG_LEDS_PCA955X is not set
957
958#
959# LED Triggers
960#
961# CONFIG_LEDS_TRIGGERS is not set
902# CONFIG_ACCESSIBILITY is not set 962# CONFIG_ACCESSIBILITY is not set
903# CONFIG_EDAC is not set 963# CONFIG_EDAC is not set
904# CONFIG_RTC_CLASS is not set 964# CONFIG_RTC_CLASS is not set
@@ -912,14 +972,18 @@ CONFIG_MMC_BLOCK_BOUNCE=y
912CONFIG_EXT2_FS=y 972CONFIG_EXT2_FS=y
913# CONFIG_EXT2_FS_XATTR is not set 973# CONFIG_EXT2_FS_XATTR is not set
914# CONFIG_EXT2_FS_XIP is not set 974# CONFIG_EXT2_FS_XIP is not set
915# CONFIG_EXT3_FS is not set 975CONFIG_EXT3_FS=y
976# CONFIG_EXT3_FS_XATTR is not set
916# CONFIG_EXT4_FS is not set 977# CONFIG_EXT4_FS is not set
978CONFIG_JBD=y
979# CONFIG_JBD_DEBUG is not set
917# CONFIG_REISERFS_FS is not set 980# CONFIG_REISERFS_FS is not set
918# CONFIG_JFS_FS is not set 981# CONFIG_JFS_FS is not set
919# CONFIG_FS_POSIX_ACL is not set 982# CONFIG_FS_POSIX_ACL is not set
920CONFIG_FILE_LOCKING=y 983CONFIG_FILE_LOCKING=y
921# CONFIG_XFS_FS is not set 984# CONFIG_XFS_FS is not set
922# CONFIG_OCFS2_FS is not set 985# CONFIG_OCFS2_FS is not set
986# CONFIG_BTRFS_FS is not set
923CONFIG_DNOTIFY=y 987CONFIG_DNOTIFY=y
924CONFIG_INOTIFY=y 988CONFIG_INOTIFY=y
925CONFIG_INOTIFY_USER=y 989CONFIG_INOTIFY_USER=y
@@ -952,13 +1016,11 @@ CONFIG_PROC_KCORE=y
952CONFIG_PROC_SYSCTL=y 1016CONFIG_PROC_SYSCTL=y
953CONFIG_PROC_PAGE_MONITOR=y 1017CONFIG_PROC_PAGE_MONITOR=y
954CONFIG_SYSFS=y 1018CONFIG_SYSFS=y
955# CONFIG_TMPFS is not set 1019CONFIG_TMPFS=y
1020# CONFIG_TMPFS_POSIX_ACL is not set
956# CONFIG_HUGETLB_PAGE is not set 1021# CONFIG_HUGETLB_PAGE is not set
957# CONFIG_CONFIGFS_FS is not set 1022# CONFIG_CONFIGFS_FS is not set
958 1023CONFIG_MISC_FILESYSTEMS=y
959#
960# Miscellaneous filesystems
961#
962# CONFIG_ADFS_FS is not set 1024# CONFIG_ADFS_FS is not set
963# CONFIG_AFFS_FS is not set 1025# CONFIG_AFFS_FS is not set
964# CONFIG_HFS_FS is not set 1026# CONFIG_HFS_FS is not set
@@ -978,6 +1040,7 @@ CONFIG_JFFS2_ZLIB=y
978CONFIG_JFFS2_RTIME=y 1040CONFIG_JFFS2_RTIME=y
979# CONFIG_JFFS2_RUBIN is not set 1041# CONFIG_JFFS2_RUBIN is not set
980CONFIG_CRAMFS=y 1042CONFIG_CRAMFS=y
1043# CONFIG_SQUASHFS is not set
981# CONFIG_VXFS_FS is not set 1044# CONFIG_VXFS_FS is not set
982# CONFIG_MINIX_FS is not set 1045# CONFIG_MINIX_FS is not set
983# CONFIG_OMFS_FS is not set 1046# CONFIG_OMFS_FS is not set
@@ -1057,6 +1120,7 @@ CONFIG_NLS_UTF8=y
1057# Library routines 1120# Library routines
1058# 1121#
1059CONFIG_BITREVERSE=y 1122CONFIG_BITREVERSE=y
1123CONFIG_GENERIC_FIND_LAST_BIT=y
1060CONFIG_CRC_CCITT=y 1124CONFIG_CRC_CCITT=y
1061# CONFIG_CRC16 is not set 1125# CONFIG_CRC16 is not set
1062CONFIG_CRC_T10DIF=y 1126CONFIG_CRC_T10DIF=y
@@ -1107,6 +1171,7 @@ CONFIG_DEBUG_INFO=y
1107# CONFIG_DEBUG_MEMORY_INIT is not set 1171# CONFIG_DEBUG_MEMORY_INIT is not set
1108# CONFIG_DEBUG_LIST is not set 1172# CONFIG_DEBUG_LIST is not set
1109# CONFIG_DEBUG_SG is not set 1173# CONFIG_DEBUG_SG is not set
1174# CONFIG_DEBUG_NOTIFIERS is not set
1110# CONFIG_BOOT_PRINTK_DELAY is not set 1175# CONFIG_BOOT_PRINTK_DELAY is not set
1111# CONFIG_RCU_TORTURE_TEST is not set 1176# CONFIG_RCU_TORTURE_TEST is not set
1112# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1177# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1115,18 +1180,24 @@ CONFIG_DEBUG_INFO=y
1115# CONFIG_FAULT_INJECTION is not set 1180# CONFIG_FAULT_INJECTION is not set
1116# CONFIG_LATENCYTOP is not set 1181# CONFIG_LATENCYTOP is not set
1117CONFIG_SYSCTL_SYSCALL_CHECK=y 1182CONFIG_SYSCTL_SYSCALL_CHECK=y
1118CONFIG_NOP_TRACER=y 1183CONFIG_HAVE_FUNCTION_TRACER=y
1119CONFIG_HAVE_FTRACE=y
1120CONFIG_HAVE_DYNAMIC_FTRACE=y 1184CONFIG_HAVE_DYNAMIC_FTRACE=y
1121# CONFIG_FTRACE is not set 1185CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1186
1187#
1188# Tracers
1189#
1190# CONFIG_FUNCTION_TRACER is not set
1122# CONFIG_SCHED_TRACER is not set 1191# CONFIG_SCHED_TRACER is not set
1123# CONFIG_CONTEXT_SWITCH_TRACER is not set 1192# CONFIG_CONTEXT_SWITCH_TRACER is not set
1124# CONFIG_BOOT_TRACER is not set 1193# CONFIG_BOOT_TRACER is not set
1194# CONFIG_TRACE_BRANCH_PROFILING is not set
1125# CONFIG_STACK_TRACER is not set 1195# CONFIG_STACK_TRACER is not set
1126# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1196# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1127# CONFIG_SAMPLES is not set 1197# CONFIG_SAMPLES is not set
1128CONFIG_HAVE_ARCH_KGDB=y 1198CONFIG_HAVE_ARCH_KGDB=y
1129# CONFIG_KGDB is not set 1199# CONFIG_KGDB is not set
1200CONFIG_PRINT_STACK_DEPTH=64
1130# CONFIG_DEBUG_STACKOVERFLOW is not set 1201# CONFIG_DEBUG_STACKOVERFLOW is not set
1131# CONFIG_DEBUG_STACK_USAGE is not set 1202# CONFIG_DEBUG_STACK_USAGE is not set
1132# CONFIG_DEBUG_PAGEALLOC is not set 1203# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1134,7 +1205,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1134# CONFIG_FTR_FIXUP_SELFTEST is not set 1205# CONFIG_FTR_FIXUP_SELFTEST is not set
1135# CONFIG_MSI_BITMAP_SELFTEST is not set 1206# CONFIG_MSI_BITMAP_SELFTEST is not set
1136# CONFIG_XMON is not set 1207# CONFIG_XMON is not set
1137# CONFIG_IRQSTACKS is not set 1208CONFIG_IRQSTACKS=y
1138# CONFIG_VIRQ_DEBUG is not set 1209# CONFIG_VIRQ_DEBUG is not set
1139CONFIG_BDI_SWITCH=y 1210CONFIG_BDI_SWITCH=y
1140# CONFIG_PPC_EARLY_DEBUG is not set 1211# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1153,6 +1224,7 @@ CONFIG_CRYPTO=y
1153# 1224#
1154# CONFIG_CRYPTO_FIPS is not set 1225# CONFIG_CRYPTO_FIPS is not set
1155# CONFIG_CRYPTO_MANAGER is not set 1226# CONFIG_CRYPTO_MANAGER is not set
1227# CONFIG_CRYPTO_MANAGER2 is not set
1156# CONFIG_CRYPTO_GF128MUL is not set 1228# CONFIG_CRYPTO_GF128MUL is not set
1157# CONFIG_CRYPTO_NULL is not set 1229# CONFIG_CRYPTO_NULL is not set
1158# CONFIG_CRYPTO_CRYPTD is not set 1230# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig
index b3d9d1a8dfaf..fc4a39a40e72 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:49 2008 4# Mon Jan 26 15:35:47 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -76,12 +76,12 @@ CONFIG_SYSVIPC_SYSCTL=y
76# CONFIG_AUDIT is not set 76# CONFIG_AUDIT is not set
77# CONFIG_IKCONFIG is not set 77# CONFIG_IKCONFIG is not set
78CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
79# CONFIG_CGROUPS is not set
80CONFIG_GROUP_SCHED=y 79CONFIG_GROUP_SCHED=y
81# CONFIG_FAIR_GROUP_SCHED is not set 80# CONFIG_FAIR_GROUP_SCHED is not set
82# CONFIG_RT_GROUP_SCHED is not set 81# CONFIG_RT_GROUP_SCHED is not set
83CONFIG_USER_SCHED=y 82CONFIG_USER_SCHED=y
84# CONFIG_CGROUP_SCHED is not set 83# CONFIG_CGROUP_SCHED is not set
84# CONFIG_CGROUPS is not set
85CONFIG_SYSFS_DEPRECATED=y 85CONFIG_SYSFS_DEPRECATED=y
86CONFIG_SYSFS_DEPRECATED_V2=y 86CONFIG_SYSFS_DEPRECATED_V2=y
87# CONFIG_RELAY is not set 87# CONFIG_RELAY is not set
@@ -114,7 +114,6 @@ CONFIG_SLUB_DEBUG=y
114CONFIG_SLUB=y 114CONFIG_SLUB=y
115# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
116# CONFIG_PROFILING is not set 116# CONFIG_PROFILING is not set
117# CONFIG_MARKERS is not set
118CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
120CONFIG_HAVE_IOREMAP_PROT=y 119CONFIG_HAVE_IOREMAP_PROT=y
@@ -124,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
127# CONFIG_TINY_SHMEM is not set
128CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
129CONFIG_MODULES=y 127CONFIG_MODULES=y
130# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -132,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
132# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
133# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
134# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
135CONFIG_KMOD=y
136CONFIG_BLOCK=y 133CONFIG_BLOCK=y
137# CONFIG_LBD is not set 134# CONFIG_LBD is not set
138# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
139# CONFIG_LSF is not set
140# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
141# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
142 138
@@ -153,6 +149,10 @@ CONFIG_DEFAULT_AS=y
153# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
155CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
156# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
157 157
158# 158#
@@ -199,6 +199,8 @@ CONFIG_IPIC=y
199# CONFIG_QUICC_ENGINE is not set 199# CONFIG_QUICC_ENGINE is not set
200# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
201# CONFIG_MPC8xxx_GPIO is not set 201# CONFIG_MPC8xxx_GPIO is not set
202# CONFIG_SIMPLE_GPIO is not set
203# CONFIG_MCU_MPC8349EMITX is not set
202 204
203# 205#
204# Kernel options 206# Kernel options
@@ -226,6 +228,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
226CONFIG_ARCH_HAS_WALK_MEMORY=y 228CONFIG_ARCH_HAS_WALK_MEMORY=y
227CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 229CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
228# CONFIG_KEXEC is not set 230# CONFIG_KEXEC is not set
231# CONFIG_CRASH_DUMP is not set
229CONFIG_ARCH_FLATMEM_ENABLE=y 232CONFIG_ARCH_FLATMEM_ENABLE=y
230CONFIG_ARCH_POPULATES_NODE_MAP=y 233CONFIG_ARCH_POPULATES_NODE_MAP=y
231CONFIG_SELECT_MEMORY_MODEL=y 234CONFIG_SELECT_MEMORY_MODEL=y
@@ -237,12 +240,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
237CONFIG_PAGEFLAGS_EXTENDED=y 240CONFIG_PAGEFLAGS_EXTENDED=y
238CONFIG_SPLIT_PTLOCK_CPUS=4 241CONFIG_SPLIT_PTLOCK_CPUS=4
239CONFIG_MIGRATION=y 242CONFIG_MIGRATION=y
240# CONFIG_RESOURCES_64BIT is not set
241# CONFIG_PHYS_ADDR_T_64BIT is not set 243# CONFIG_PHYS_ADDR_T_64BIT is not set
242CONFIG_ZONE_DMA_FLAG=1 244CONFIG_ZONE_DMA_FLAG=1
243CONFIG_BOUNCE=y 245CONFIG_BOUNCE=y
244CONFIG_VIRT_TO_BUS=y 246CONFIG_VIRT_TO_BUS=y
245CONFIG_UNEVICTABLE_LRU=y 247CONFIG_UNEVICTABLE_LRU=y
248CONFIG_PPC_4K_PAGES=y
249# CONFIG_PPC_16K_PAGES is not set
250# CONFIG_PPC_64K_PAGES is not set
246CONFIG_FORCE_MAX_ZONEORDER=11 251CONFIG_FORCE_MAX_ZONEORDER=11
247CONFIG_PROC_DEVICETREE=y 252CONFIG_PROC_DEVICETREE=y
248# CONFIG_CMDLINE_BOOL is not set 253# CONFIG_CMDLINE_BOOL is not set
@@ -267,6 +272,7 @@ CONFIG_PCI_SYSCALL=y
267CONFIG_ARCH_SUPPORTS_MSI=y 272CONFIG_ARCH_SUPPORTS_MSI=y
268# CONFIG_PCI_MSI is not set 273# CONFIG_PCI_MSI is not set
269# CONFIG_PCI_LEGACY is not set 274# CONFIG_PCI_LEGACY is not set
275# CONFIG_PCI_STUB is not set
270# CONFIG_PCCARD is not set 276# CONFIG_PCCARD is not set
271# CONFIG_HOTPLUG_PCI is not set 277# CONFIG_HOTPLUG_PCI is not set
272# CONFIG_HAS_RAPIDIO is not set 278# CONFIG_HAS_RAPIDIO is not set
@@ -289,6 +295,7 @@ CONFIG_NET=y
289# 295#
290# Networking options 296# Networking options
291# 297#
298CONFIG_COMPAT_NET_DEV_OPS=y
292CONFIG_PACKET=y 299CONFIG_PACKET=y
293# CONFIG_PACKET_MMAP is not set 300# CONFIG_PACKET_MMAP is not set
294CONFIG_UNIX=y 301CONFIG_UNIX=y
@@ -345,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
347# CONFIG_NET_SCHED is not set 354# CONFIG_NET_SCHED is not set
355# CONFIG_DCB is not set
348 356
349# 357#
350# Network testing 358# Network testing
@@ -360,8 +368,9 @@ CONFIG_WIRELESS=y
360# CONFIG_CFG80211 is not set 368# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y 369CONFIG_WIRELESS_OLD_REGULATORY=y
362# CONFIG_WIRELESS_EXT is not set 370# CONFIG_WIRELESS_EXT is not set
371# CONFIG_LIB80211 is not set
363# CONFIG_MAC80211 is not set 372# CONFIG_MAC80211 is not set
364# CONFIG_IEEE80211 is not set 373# CONFIG_WIMAX is not set
365# CONFIG_RFKILL is not set 374# CONFIG_RFKILL is not set
366# CONFIG_NET_9P is not set 375# CONFIG_NET_9P is not set
367 376
@@ -382,6 +391,7 @@ CONFIG_MTD=y
382# CONFIG_MTD_DEBUG is not set 391# CONFIG_MTD_DEBUG is not set
383# CONFIG_MTD_CONCAT is not set 392# CONFIG_MTD_CONCAT is not set
384CONFIG_MTD_PARTITIONS=y 393CONFIG_MTD_PARTITIONS=y
394# CONFIG_MTD_TESTS is not set
385CONFIG_MTD_REDBOOT_PARTS=y 395CONFIG_MTD_REDBOOT_PARTS=y
386CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 396CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
387CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y 397CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
@@ -456,6 +466,12 @@ CONFIG_MTD_PHYSMAP_OF=y
456# CONFIG_MTD_ONENAND is not set 466# CONFIG_MTD_ONENAND is not set
457 467
458# 468#
469# LPDDR flash memory drivers
470#
471# CONFIG_MTD_LPDDR is not set
472# CONFIG_MTD_QINFO_PROBE is not set
473
474#
459# UBI - Unsorted block images 475# UBI - Unsorted block images
460# 476#
461# CONFIG_MTD_UBI is not set 477# CONFIG_MTD_UBI is not set
@@ -486,8 +502,10 @@ CONFIG_MISC_DEVICES=y
486# CONFIG_EEPROM_93CX6 is not set 502# CONFIG_EEPROM_93CX6 is not set
487# CONFIG_SGI_IOC4 is not set 503# CONFIG_SGI_IOC4 is not set
488# CONFIG_TIFM_CORE is not set 504# CONFIG_TIFM_CORE is not set
505# CONFIG_ICS932S401 is not set
489# CONFIG_ENCLOSURE_SERVICES is not set 506# CONFIG_ENCLOSURE_SERVICES is not set
490# CONFIG_HP_ILO is not set 507# CONFIG_HP_ILO is not set
508# CONFIG_C2PORT is not set
491CONFIG_HAVE_IDE=y 509CONFIG_HAVE_IDE=y
492# CONFIG_IDE is not set 510# CONFIG_IDE is not set
493 511
@@ -536,6 +554,9 @@ CONFIG_PHYLIB=y
536# CONFIG_BROADCOM_PHY is not set 554# CONFIG_BROADCOM_PHY is not set
537# CONFIG_ICPLUS_PHY is not set 555# CONFIG_ICPLUS_PHY is not set
538# CONFIG_REALTEK_PHY is not set 556# CONFIG_REALTEK_PHY is not set
557# CONFIG_NATIONAL_PHY is not set
558# CONFIG_STE10XP is not set
559# CONFIG_LSI_ET1011C_PHY is not set
539# CONFIG_FIXED_PHY is not set 560# CONFIG_FIXED_PHY is not set
540# CONFIG_MDIO_BITBANG is not set 561# CONFIG_MDIO_BITBANG is not set
541CONFIG_NET_ETHERNET=y 562CONFIG_NET_ETHERNET=y
@@ -590,6 +611,10 @@ CONFIG_GIANFAR=y
590# CONFIG_IWLWIFI_LEDS is not set 611# CONFIG_IWLWIFI_LEDS is not set
591 612
592# 613#
614# Enable WiMAX (Networking options) to see the WiMAX drivers
615#
616
617#
593# USB Network Adapters 618# USB Network Adapters
594# 619#
595# CONFIG_USB_CATC is not set 620# CONFIG_USB_CATC is not set
@@ -666,8 +691,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
666# CONFIG_SERIAL_JSM is not set 691# CONFIG_SERIAL_JSM is not set
667# CONFIG_SERIAL_OF_PLATFORM is not set 692# CONFIG_SERIAL_OF_PLATFORM is not set
668CONFIG_UNIX98_PTYS=y 693CONFIG_UNIX98_PTYS=y
694# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
669CONFIG_LEGACY_PTYS=y 695CONFIG_LEGACY_PTYS=y
670CONFIG_LEGACY_PTY_COUNT=256 696CONFIG_LEGACY_PTY_COUNT=256
697# CONFIG_HVC_UDBG is not set
671# CONFIG_IPMI_HANDLER is not set 698# CONFIG_IPMI_HANDLER is not set
672# CONFIG_HW_RANDOM is not set 699# CONFIG_HW_RANDOM is not set
673# CONFIG_NVRAM is not set 700# CONFIG_NVRAM is not set
@@ -740,7 +767,6 @@ CONFIG_I2C_MPC=y
740# CONFIG_SENSORS_PCF8591 is not set 767# CONFIG_SENSORS_PCF8591 is not set
741# CONFIG_SENSORS_MAX6875 is not set 768# CONFIG_SENSORS_MAX6875 is not set
742# CONFIG_SENSORS_TSL2550 is not set 769# CONFIG_SENSORS_TSL2550 is not set
743# CONFIG_MCU_MPC8349EMITX is not set
744# CONFIG_I2C_DEBUG_CORE is not set 770# CONFIG_I2C_DEBUG_CORE is not set
745# CONFIG_I2C_DEBUG_ALGO is not set 771# CONFIG_I2C_DEBUG_ALGO is not set
746# CONFIG_I2C_DEBUG_BUS is not set 772# CONFIG_I2C_DEBUG_BUS is not set
@@ -760,8 +786,10 @@ CONFIG_HWMON=y
760# CONFIG_SENSORS_ADM1029 is not set 786# CONFIG_SENSORS_ADM1029 is not set
761# CONFIG_SENSORS_ADM1031 is not set 787# CONFIG_SENSORS_ADM1031 is not set
762# CONFIG_SENSORS_ADM9240 is not set 788# CONFIG_SENSORS_ADM9240 is not set
789# CONFIG_SENSORS_ADT7462 is not set
763# CONFIG_SENSORS_ADT7470 is not set 790# CONFIG_SENSORS_ADT7470 is not set
764# CONFIG_SENSORS_ADT7473 is not set 791# CONFIG_SENSORS_ADT7473 is not set
792# CONFIG_SENSORS_ADT7475 is not set
765# CONFIG_SENSORS_ATXP1 is not set 793# CONFIG_SENSORS_ATXP1 is not set
766# CONFIG_SENSORS_DS1621 is not set 794# CONFIG_SENSORS_DS1621 is not set
767# CONFIG_SENSORS_I5K_AMB is not set 795# CONFIG_SENSORS_I5K_AMB is not set
@@ -782,6 +810,7 @@ CONFIG_HWMON=y
782# CONFIG_SENSORS_LM90 is not set 810# CONFIG_SENSORS_LM90 is not set
783# CONFIG_SENSORS_LM92 is not set 811# CONFIG_SENSORS_LM92 is not set
784# CONFIG_SENSORS_LM93 is not set 812# CONFIG_SENSORS_LM93 is not set
813# CONFIG_SENSORS_LTC4245 is not set
785# CONFIG_SENSORS_MAX1619 is not set 814# CONFIG_SENSORS_MAX1619 is not set
786# CONFIG_SENSORS_MAX6650 is not set 815# CONFIG_SENSORS_MAX6650 is not set
787# CONFIG_SENSORS_PC87360 is not set 816# CONFIG_SENSORS_PC87360 is not set
@@ -827,11 +856,11 @@ CONFIG_WATCHDOG=y
827# USB-based Watchdog Cards 856# USB-based Watchdog Cards
828# 857#
829# CONFIG_USBPCWATCHDOG is not set 858# CONFIG_USBPCWATCHDOG is not set
859CONFIG_SSB_POSSIBLE=y
830 860
831# 861#
832# Sonics Silicon Backplane 862# Sonics Silicon Backplane
833# 863#
834CONFIG_SSB_POSSIBLE=y
835# CONFIG_SSB is not set 864# CONFIG_SSB is not set
836 865
837# 866#
@@ -840,18 +869,13 @@ CONFIG_SSB_POSSIBLE=y
840# CONFIG_MFD_CORE is not set 869# CONFIG_MFD_CORE is not set
841# CONFIG_MFD_SM501 is not set 870# CONFIG_MFD_SM501 is not set
842# CONFIG_HTC_PASIC3 is not set 871# CONFIG_HTC_PASIC3 is not set
872# CONFIG_TWL4030_CORE is not set
843# CONFIG_MFD_TMIO is not set 873# CONFIG_MFD_TMIO is not set
844# CONFIG_PMIC_DA903X is not set 874# CONFIG_PMIC_DA903X is not set
845# CONFIG_MFD_WM8400 is not set 875# CONFIG_MFD_WM8400 is not set
846# CONFIG_MFD_WM8350_I2C is not set 876# CONFIG_MFD_WM8350_I2C is not set
847 877# CONFIG_MFD_PCF50633 is not set
848#
849# Voltage and Current regulators
850#
851# CONFIG_REGULATOR is not set 878# 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
855 879
856# 880#
857# Multimedia devices 881# Multimedia devices
@@ -916,6 +940,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
916# CONFIG_USB_EHCI_TT_NEWSCHED is not set 940# CONFIG_USB_EHCI_TT_NEWSCHED is not set
917CONFIG_USB_EHCI_FSL=y 941CONFIG_USB_EHCI_FSL=y
918CONFIG_USB_EHCI_HCD_PPC_OF=y 942CONFIG_USB_EHCI_HCD_PPC_OF=y
943# CONFIG_USB_OXU210HP_HCD is not set
919# CONFIG_USB_ISP116X_HCD is not set 944# CONFIG_USB_ISP116X_HCD is not set
920# CONFIG_USB_ISP1760_HCD is not set 945# CONFIG_USB_ISP1760_HCD is not set
921# CONFIG_USB_OHCI_HCD is not set 946# CONFIG_USB_OHCI_HCD is not set
@@ -934,11 +959,11 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
934# CONFIG_USB_TMC is not set 959# CONFIG_USB_TMC is not set
935 960
936# 961#
937# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 962# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
938# 963#
939 964
940# 965#
941# may also be needed; see USB_STORAGE Help for more information 966# see USB_STORAGE Help for more information
942# 967#
943# CONFIG_USB_LIBUSUAL is not set 968# CONFIG_USB_LIBUSUAL is not set
944 969
@@ -977,6 +1002,10 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
977# CONFIG_USB_ISIGHTFW is not set 1002# CONFIG_USB_ISIGHTFW is not set
978# CONFIG_USB_VST is not set 1003# CONFIG_USB_VST is not set
979# CONFIG_USB_GADGET is not set 1004# CONFIG_USB_GADGET is not set
1005
1006#
1007# OTG and related infrastructure
1008#
980# CONFIG_UWB is not set 1009# CONFIG_UWB is not set
981# CONFIG_MMC is not set 1010# CONFIG_MMC is not set
982# CONFIG_MEMSTICK is not set 1011# CONFIG_MEMSTICK is not set
@@ -1014,6 +1043,7 @@ CONFIG_RTC_DRV_DS1374=y
1014# CONFIG_RTC_DRV_M41T80 is not set 1043# CONFIG_RTC_DRV_M41T80 is not set
1015# CONFIG_RTC_DRV_S35390A is not set 1044# CONFIG_RTC_DRV_S35390A is not set
1016# CONFIG_RTC_DRV_FM3130 is not set 1045# CONFIG_RTC_DRV_FM3130 is not set
1046# CONFIG_RTC_DRV_RX8581 is not set
1017 1047
1018# 1048#
1019# SPI RTC drivers 1049# SPI RTC drivers
@@ -1061,6 +1091,7 @@ CONFIG_FS_MBCACHE=y
1061CONFIG_FILE_LOCKING=y 1091CONFIG_FILE_LOCKING=y
1062# CONFIG_XFS_FS is not set 1092# CONFIG_XFS_FS is not set
1063# CONFIG_OCFS2_FS is not set 1093# CONFIG_OCFS2_FS is not set
1094# CONFIG_BTRFS_FS is not set
1064CONFIG_DNOTIFY=y 1095CONFIG_DNOTIFY=y
1065CONFIG_INOTIFY=y 1096CONFIG_INOTIFY=y
1066CONFIG_INOTIFY_USER=y 1097CONFIG_INOTIFY_USER=y
@@ -1094,10 +1125,7 @@ CONFIG_TMPFS=y
1094# CONFIG_TMPFS_POSIX_ACL is not set 1125# CONFIG_TMPFS_POSIX_ACL is not set
1095# CONFIG_HUGETLB_PAGE is not set 1126# CONFIG_HUGETLB_PAGE is not set
1096# CONFIG_CONFIGFS_FS is not set 1127# CONFIG_CONFIGFS_FS is not set
1097 1128CONFIG_MISC_FILESYSTEMS=y
1098#
1099# Miscellaneous filesystems
1100#
1101# CONFIG_ADFS_FS is not set 1129# CONFIG_ADFS_FS is not set
1102# CONFIG_AFFS_FS is not set 1130# CONFIG_AFFS_FS is not set
1103# CONFIG_HFS_FS is not set 1131# CONFIG_HFS_FS is not set
@@ -1117,6 +1145,7 @@ CONFIG_JFFS2_ZLIB=y
1117CONFIG_JFFS2_RTIME=y 1145CONFIG_JFFS2_RTIME=y
1118# CONFIG_JFFS2_RUBIN is not set 1146# CONFIG_JFFS2_RUBIN is not set
1119# CONFIG_CRAMFS is not set 1147# CONFIG_CRAMFS is not set
1148# CONFIG_SQUASHFS is not set
1120# CONFIG_VXFS_FS is not set 1149# CONFIG_VXFS_FS is not set
1121# CONFIG_MINIX_FS is not set 1150# CONFIG_MINIX_FS is not set
1122# CONFIG_OMFS_FS is not set 1151# CONFIG_OMFS_FS is not set
@@ -1209,6 +1238,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1209# Library routines 1238# Library routines
1210# 1239#
1211CONFIG_BITREVERSE=y 1240CONFIG_BITREVERSE=y
1241CONFIG_GENERIC_FIND_LAST_BIT=y
1212# CONFIG_CRC_CCITT is not set 1242# CONFIG_CRC_CCITT is not set
1213# CONFIG_CRC16 is not set 1243# CONFIG_CRC16 is not set
1214# CONFIG_CRC_T10DIF is not set 1244# CONFIG_CRC_T10DIF is not set
@@ -1244,6 +1274,8 @@ CONFIG_FRAME_WARN=1024
1244# CONFIG_LATENCYTOP is not set 1274# CONFIG_LATENCYTOP is not set
1245# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1275# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1246CONFIG_HAVE_FUNCTION_TRACER=y 1276CONFIG_HAVE_FUNCTION_TRACER=y
1277CONFIG_HAVE_DYNAMIC_FTRACE=y
1278CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1247 1279
1248# 1280#
1249# Tracers 1281# Tracers
@@ -1251,6 +1283,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1251# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1283# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1252# CONFIG_SAMPLES is not set 1284# CONFIG_SAMPLES is not set
1253CONFIG_HAVE_ARCH_KGDB=y 1285CONFIG_HAVE_ARCH_KGDB=y
1286CONFIG_PRINT_STACK_DEPTH=64
1254# CONFIG_IRQSTACKS is not set 1287# CONFIG_IRQSTACKS is not set
1255# CONFIG_BOOTX_TEXT is not set 1288# CONFIG_BOOTX_TEXT is not set
1256# CONFIG_PPC_EARLY_DEBUG is not set 1289# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1269,11 +1302,15 @@ CONFIG_CRYPTO=y
1269# 1302#
1270# CONFIG_CRYPTO_FIPS is not set 1303# CONFIG_CRYPTO_FIPS is not set
1271CONFIG_CRYPTO_ALGAPI=y 1304CONFIG_CRYPTO_ALGAPI=y
1272CONFIG_CRYPTO_AEAD=y 1305CONFIG_CRYPTO_ALGAPI2=y
1306CONFIG_CRYPTO_AEAD2=y
1273CONFIG_CRYPTO_BLKCIPHER=y 1307CONFIG_CRYPTO_BLKCIPHER=y
1308CONFIG_CRYPTO_BLKCIPHER2=y
1274CONFIG_CRYPTO_HASH=y 1309CONFIG_CRYPTO_HASH=y
1275CONFIG_CRYPTO_RNG=y 1310CONFIG_CRYPTO_HASH2=y
1311CONFIG_CRYPTO_RNG2=y
1276CONFIG_CRYPTO_MANAGER=y 1312CONFIG_CRYPTO_MANAGER=y
1313CONFIG_CRYPTO_MANAGER2=y
1277# CONFIG_CRYPTO_GF128MUL is not set 1314# CONFIG_CRYPTO_GF128MUL is not set
1278# CONFIG_CRYPTO_NULL is not set 1315# CONFIG_CRYPTO_NULL is not set
1279# CONFIG_CRYPTO_CRYPTD is not set 1316# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
index 6293bb99b52e..9e47ae957e2e 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:50 2008 4# Mon Jan 26 15:35:48 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 113CONFIG_SLUB=y
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 126CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 132CONFIG_BLOCK=y
136# CONFIG_LBD is not set 133# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141 137
@@ -152,6 +148,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
156 156
157# 157#
@@ -198,6 +198,8 @@ CONFIG_IPIC=y
198# CONFIG_QUICC_ENGINE is not set 198# CONFIG_QUICC_ENGINE is not set
199# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_MPC8xxx_GPIO is not set 200# CONFIG_MPC8xxx_GPIO is not set
201# CONFIG_SIMPLE_GPIO is not set
202# CONFIG_MCU_MPC8349EMITX is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -225,6 +227,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 227CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 228CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 229# CONFIG_KEXEC is not set
230# CONFIG_CRASH_DUMP is not set
228CONFIG_ARCH_FLATMEM_ENABLE=y 231CONFIG_ARCH_FLATMEM_ENABLE=y
229CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
230CONFIG_SELECT_MEMORY_MODEL=y 233CONFIG_SELECT_MEMORY_MODEL=y
@@ -236,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
236CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
238CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set 242# CONFIG_PHYS_ADDR_T_64BIT is not set
241CONFIG_ZONE_DMA_FLAG=1 243CONFIG_ZONE_DMA_FLAG=1
242CONFIG_BOUNCE=y 244CONFIG_BOUNCE=y
243CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
245CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
247# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -267,6 +272,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
267# CONFIG_PCI_MSI is not set 272# CONFIG_PCI_MSI is not set
268# CONFIG_PCI_LEGACY is not set 273# CONFIG_PCI_LEGACY is not set
269# CONFIG_PCI_DEBUG is not set 274# CONFIG_PCI_DEBUG is not set
275# CONFIG_PCI_STUB is not set
270# CONFIG_PCCARD is not set 276# CONFIG_PCCARD is not set
271# CONFIG_HOTPLUG_PCI is not set 277# CONFIG_HOTPLUG_PCI is not set
272# CONFIG_HAS_RAPIDIO is not set 278# CONFIG_HAS_RAPIDIO is not set
@@ -289,6 +295,7 @@ CONFIG_NET=y
289# 295#
290# Networking options 296# Networking options
291# 297#
298CONFIG_COMPAT_NET_DEV_OPS=y
292CONFIG_PACKET=y 299CONFIG_PACKET=y
293# CONFIG_PACKET_MMAP is not set 300# CONFIG_PACKET_MMAP is not set
294CONFIG_UNIX=y 301CONFIG_UNIX=y
@@ -345,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
347# CONFIG_NET_SCHED is not set 354# CONFIG_NET_SCHED is not set
355# CONFIG_DCB is not set
348 356
349# 357#
350# Network testing 358# Network testing
@@ -360,8 +368,9 @@ CONFIG_WIRELESS=y
360# CONFIG_CFG80211 is not set 368# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y 369CONFIG_WIRELESS_OLD_REGULATORY=y
362# CONFIG_WIRELESS_EXT is not set 370# CONFIG_WIRELESS_EXT is not set
371# CONFIG_LIB80211 is not set
363# CONFIG_MAC80211 is not set 372# CONFIG_MAC80211 is not set
364# CONFIG_IEEE80211 is not set 373# CONFIG_WIMAX is not set
365# CONFIG_RFKILL is not set 374# CONFIG_RFKILL is not set
366# CONFIG_NET_9P is not set 375# CONFIG_NET_9P is not set
367 376
@@ -384,6 +393,7 @@ CONFIG_MTD=y
384# CONFIG_MTD_DEBUG is not set 393# CONFIG_MTD_DEBUG is not set
385# CONFIG_MTD_CONCAT is not set 394# CONFIG_MTD_CONCAT is not set
386CONFIG_MTD_PARTITIONS=y 395CONFIG_MTD_PARTITIONS=y
396# CONFIG_MTD_TESTS is not set
387# CONFIG_MTD_REDBOOT_PARTS is not set 397# CONFIG_MTD_REDBOOT_PARTS is not set
388# CONFIG_MTD_CMDLINE_PARTS is not set 398# CONFIG_MTD_CMDLINE_PARTS is not set
389CONFIG_MTD_OF_PARTS=y 399CONFIG_MTD_OF_PARTS=y
@@ -468,6 +478,12 @@ CONFIG_MTD_NAND_FSL_ELBC=y
468# CONFIG_MTD_ONENAND is not set 478# CONFIG_MTD_ONENAND is not set
469 479
470# 480#
481# LPDDR flash memory drivers
482#
483# CONFIG_MTD_LPDDR is not set
484# CONFIG_MTD_QINFO_PROBE is not set
485
486#
471# UBI - Unsorted block images 487# UBI - Unsorted block images
472# 488#
473# CONFIG_MTD_UBI is not set 489# CONFIG_MTD_UBI is not set
@@ -499,8 +515,10 @@ CONFIG_MISC_DEVICES=y
499# CONFIG_EEPROM_93CX6 is not set 515# CONFIG_EEPROM_93CX6 is not set
500# CONFIG_SGI_IOC4 is not set 516# CONFIG_SGI_IOC4 is not set
501# CONFIG_TIFM_CORE is not set 517# CONFIG_TIFM_CORE is not set
518# CONFIG_ICS932S401 is not set
502# CONFIG_ENCLOSURE_SERVICES is not set 519# CONFIG_ENCLOSURE_SERVICES is not set
503# CONFIG_HP_ILO is not set 520# CONFIG_HP_ILO is not set
521# CONFIG_C2PORT is not set
504CONFIG_HAVE_IDE=y 522CONFIG_HAVE_IDE=y
505# CONFIG_IDE is not set 523# CONFIG_IDE is not set
506 524
@@ -543,6 +561,7 @@ CONFIG_SCSI_SPI_ATTRS=y
543# CONFIG_SCSI_SRP_ATTRS is not set 561# CONFIG_SCSI_SRP_ATTRS is not set
544CONFIG_SCSI_LOWLEVEL=y 562CONFIG_SCSI_LOWLEVEL=y
545# CONFIG_ISCSI_TCP is not set 563# CONFIG_ISCSI_TCP is not set
564# CONFIG_SCSI_CXGB3_ISCSI is not set
546# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 565# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
547# CONFIG_SCSI_3W_9XXX is not set 566# CONFIG_SCSI_3W_9XXX is not set
548# CONFIG_SCSI_ACARD is not set 567# CONFIG_SCSI_ACARD is not set
@@ -559,6 +578,8 @@ CONFIG_SCSI_LOWLEVEL=y
559# CONFIG_MEGARAID_SAS is not set 578# CONFIG_MEGARAID_SAS is not set
560# CONFIG_SCSI_HPTIOP is not set 579# CONFIG_SCSI_HPTIOP is not set
561# CONFIG_SCSI_BUSLOGIC is not set 580# CONFIG_SCSI_BUSLOGIC is not set
581# CONFIG_LIBFC is not set
582# CONFIG_FCOE is not set
562# CONFIG_SCSI_DMX3191D is not set 583# CONFIG_SCSI_DMX3191D is not set
563# CONFIG_SCSI_EATA is not set 584# CONFIG_SCSI_EATA is not set
564# CONFIG_SCSI_FUTURE_DOMAIN is not set 585# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -627,6 +648,9 @@ CONFIG_CICADA_PHY=y
627# CONFIG_BROADCOM_PHY is not set 648# CONFIG_BROADCOM_PHY is not set
628# CONFIG_ICPLUS_PHY is not set 649# CONFIG_ICPLUS_PHY is not set
629# CONFIG_REALTEK_PHY is not set 650# CONFIG_REALTEK_PHY is not set
651# CONFIG_NATIONAL_PHY is not set
652# CONFIG_STE10XP is not set
653# CONFIG_LSI_ET1011C_PHY is not set
630# CONFIG_FIXED_PHY is not set 654# CONFIG_FIXED_PHY is not set
631# CONFIG_MDIO_BITBANG is not set 655# CONFIG_MDIO_BITBANG is not set
632CONFIG_NET_ETHERNET=y 656CONFIG_NET_ETHERNET=y
@@ -651,7 +675,6 @@ CONFIG_NET_PCI=y
651# CONFIG_ADAPTEC_STARFIRE is not set 675# CONFIG_ADAPTEC_STARFIRE is not set
652# CONFIG_B44 is not set 676# CONFIG_B44 is not set
653# CONFIG_FORCEDETH is not set 677# CONFIG_FORCEDETH is not set
654# CONFIG_EEPRO100 is not set
655CONFIG_E100=y 678CONFIG_E100=y
656# CONFIG_FEALNX is not set 679# CONFIG_FEALNX is not set
657# CONFIG_NATSEMI is not set 680# CONFIG_NATSEMI is not set
@@ -661,6 +684,7 @@ CONFIG_E100=y
661# CONFIG_R6040 is not set 684# CONFIG_R6040 is not set
662# CONFIG_SIS900 is not set 685# CONFIG_SIS900 is not set
663# CONFIG_EPIC100 is not set 686# CONFIG_EPIC100 is not set
687# CONFIG_SMSC9420 is not set
664# CONFIG_SUNDANCE is not set 688# CONFIG_SUNDANCE is not set
665# CONFIG_TLAN is not set 689# CONFIG_TLAN is not set
666# CONFIG_VIA_RHINE is not set 690# CONFIG_VIA_RHINE is not set
@@ -691,6 +715,7 @@ CONFIG_GIANFAR=y
691# CONFIG_JME is not set 715# CONFIG_JME is not set
692CONFIG_NETDEV_10000=y 716CONFIG_NETDEV_10000=y
693# CONFIG_CHELSIO_T1 is not set 717# CONFIG_CHELSIO_T1 is not set
718CONFIG_CHELSIO_T3_DEPENDS=y
694# CONFIG_CHELSIO_T3 is not set 719# CONFIG_CHELSIO_T3 is not set
695# CONFIG_ENIC is not set 720# CONFIG_ENIC is not set
696# CONFIG_IXGBE is not set 721# CONFIG_IXGBE is not set
@@ -715,6 +740,10 @@ CONFIG_NETDEV_10000=y
715# CONFIG_IWLWIFI_LEDS is not set 740# CONFIG_IWLWIFI_LEDS is not set
716 741
717# 742#
743# Enable WiMAX (Networking options) to see the WiMAX drivers
744#
745
746#
718# USB Network Adapters 747# USB Network Adapters
719# 748#
720# CONFIG_USB_CATC is not set 749# CONFIG_USB_CATC is not set
@@ -792,8 +821,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
792# CONFIG_SERIAL_JSM is not set 821# CONFIG_SERIAL_JSM is not set
793# CONFIG_SERIAL_OF_PLATFORM is not set 822# CONFIG_SERIAL_OF_PLATFORM is not set
794CONFIG_UNIX98_PTYS=y 823CONFIG_UNIX98_PTYS=y
824# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
795CONFIG_LEGACY_PTYS=y 825CONFIG_LEGACY_PTYS=y
796CONFIG_LEGACY_PTY_COUNT=256 826CONFIG_LEGACY_PTY_COUNT=256
827# CONFIG_HVC_UDBG is not set
797# CONFIG_IPMI_HANDLER is not set 828# CONFIG_IPMI_HANDLER is not set
798CONFIG_HW_RANDOM=y 829CONFIG_HW_RANDOM=y
799# CONFIG_NVRAM is not set 830# CONFIG_NVRAM is not set
@@ -866,7 +897,6 @@ CONFIG_I2C_MPC=y
866# CONFIG_SENSORS_PCF8591 is not set 897# CONFIG_SENSORS_PCF8591 is not set
867# CONFIG_SENSORS_MAX6875 is not set 898# CONFIG_SENSORS_MAX6875 is not set
868# CONFIG_SENSORS_TSL2550 is not set 899# CONFIG_SENSORS_TSL2550 is not set
869# CONFIG_MCU_MPC8349EMITX is not set
870# CONFIG_I2C_DEBUG_CORE is not set 900# CONFIG_I2C_DEBUG_CORE is not set
871# CONFIG_I2C_DEBUG_ALGO is not set 901# CONFIG_I2C_DEBUG_ALGO is not set
872# CONFIG_I2C_DEBUG_BUS is not set 902# CONFIG_I2C_DEBUG_BUS is not set
@@ -902,8 +932,10 @@ CONFIG_HWMON=y
902# CONFIG_SENSORS_ADM1029 is not set 932# CONFIG_SENSORS_ADM1029 is not set
903# CONFIG_SENSORS_ADM1031 is not set 933# CONFIG_SENSORS_ADM1031 is not set
904# CONFIG_SENSORS_ADM9240 is not set 934# CONFIG_SENSORS_ADM9240 is not set
935# CONFIG_SENSORS_ADT7462 is not set
905# CONFIG_SENSORS_ADT7470 is not set 936# CONFIG_SENSORS_ADT7470 is not set
906# CONFIG_SENSORS_ADT7473 is not set 937# CONFIG_SENSORS_ADT7473 is not set
938# CONFIG_SENSORS_ADT7475 is not set
907# CONFIG_SENSORS_ATXP1 is not set 939# CONFIG_SENSORS_ATXP1 is not set
908# CONFIG_SENSORS_DS1621 is not set 940# CONFIG_SENSORS_DS1621 is not set
909# CONFIG_SENSORS_I5K_AMB is not set 941# CONFIG_SENSORS_I5K_AMB is not set
@@ -925,6 +957,7 @@ CONFIG_HWMON=y
925# CONFIG_SENSORS_LM90 is not set 957# CONFIG_SENSORS_LM90 is not set
926# CONFIG_SENSORS_LM92 is not set 958# CONFIG_SENSORS_LM92 is not set
927# CONFIG_SENSORS_LM93 is not set 959# CONFIG_SENSORS_LM93 is not set
960# CONFIG_SENSORS_LTC4245 is not set
928# CONFIG_SENSORS_MAX1111 is not set 961# CONFIG_SENSORS_MAX1111 is not set
929# CONFIG_SENSORS_MAX1619 is not set 962# CONFIG_SENSORS_MAX1619 is not set
930# CONFIG_SENSORS_MAX6650 is not set 963# CONFIG_SENSORS_MAX6650 is not set
@@ -971,11 +1004,11 @@ CONFIG_WATCHDOG=y
971# USB-based Watchdog Cards 1004# USB-based Watchdog Cards
972# 1005#
973# CONFIG_USBPCWATCHDOG is not set 1006# CONFIG_USBPCWATCHDOG is not set
1007CONFIG_SSB_POSSIBLE=y
974 1008
975# 1009#
976# Sonics Silicon Backplane 1010# Sonics Silicon Backplane
977# 1011#
978CONFIG_SSB_POSSIBLE=y
979# CONFIG_SSB is not set 1012# CONFIG_SSB is not set
980 1013
981# 1014#
@@ -984,18 +1017,13 @@ CONFIG_SSB_POSSIBLE=y
984# CONFIG_MFD_CORE is not set 1017# CONFIG_MFD_CORE is not set
985# CONFIG_MFD_SM501 is not set 1018# CONFIG_MFD_SM501 is not set
986# CONFIG_HTC_PASIC3 is not set 1019# CONFIG_HTC_PASIC3 is not set
1020# CONFIG_TWL4030_CORE is not set
987# CONFIG_MFD_TMIO is not set 1021# CONFIG_MFD_TMIO is not set
988# CONFIG_PMIC_DA903X is not set 1022# CONFIG_PMIC_DA903X is not set
989# CONFIG_MFD_WM8400 is not set 1023# CONFIG_MFD_WM8400 is not set
990# CONFIG_MFD_WM8350_I2C is not set 1024# CONFIG_MFD_WM8350_I2C is not set
991 1025# CONFIG_MFD_PCF50633 is not set
992#
993# Voltage and Current regulators
994#
995# CONFIG_REGULATOR is not set 1026# 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
999 1027
1000# 1028#
1001# Multimedia devices 1029# Multimedia devices
@@ -1080,6 +1108,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
1080# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1108# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1081CONFIG_USB_EHCI_FSL=y 1109CONFIG_USB_EHCI_FSL=y
1082CONFIG_USB_EHCI_HCD_PPC_OF=y 1110CONFIG_USB_EHCI_HCD_PPC_OF=y
1111# CONFIG_USB_OXU210HP_HCD is not set
1083# CONFIG_USB_ISP116X_HCD is not set 1112# CONFIG_USB_ISP116X_HCD is not set
1084# CONFIG_USB_ISP1760_HCD is not set 1113# CONFIG_USB_ISP1760_HCD is not set
1085CONFIG_USB_OHCI_HCD=y 1114CONFIG_USB_OHCI_HCD=y
@@ -1106,18 +1135,17 @@ CONFIG_USB_UHCI_HCD=y
1106# CONFIG_USB_TMC is not set 1135# CONFIG_USB_TMC is not set
1107 1136
1108# 1137#
1109# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1138# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1110# 1139#
1111 1140
1112# 1141#
1113# may also be needed; see USB_STORAGE Help for more information 1142# see USB_STORAGE Help for more information
1114# 1143#
1115CONFIG_USB_STORAGE=y 1144CONFIG_USB_STORAGE=y
1116# CONFIG_USB_STORAGE_DEBUG is not set 1145# CONFIG_USB_STORAGE_DEBUG is not set
1117# CONFIG_USB_STORAGE_DATAFAB is not set 1146# CONFIG_USB_STORAGE_DATAFAB is not set
1118# CONFIG_USB_STORAGE_FREECOM is not set 1147# CONFIG_USB_STORAGE_FREECOM is not set
1119# CONFIG_USB_STORAGE_ISD200 is not set 1148# CONFIG_USB_STORAGE_ISD200 is not set
1120# CONFIG_USB_STORAGE_DPCM is not set
1121# CONFIG_USB_STORAGE_USBAT is not set 1149# CONFIG_USB_STORAGE_USBAT is not set
1122# CONFIG_USB_STORAGE_SDDR09 is not set 1150# CONFIG_USB_STORAGE_SDDR09 is not set
1123# CONFIG_USB_STORAGE_SDDR55 is not set 1151# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1177,9 +1205,11 @@ CONFIG_USB_GADGET_SELECTED=y
1177# CONFIG_USB_GADGET_PXA25X is not set 1205# CONFIG_USB_GADGET_PXA25X is not set
1178# CONFIG_USB_GADGET_PXA27X is not set 1206# CONFIG_USB_GADGET_PXA27X is not set
1179# CONFIG_USB_GADGET_S3C2410 is not set 1207# CONFIG_USB_GADGET_S3C2410 is not set
1208# CONFIG_USB_GADGET_IMX is not set
1180# CONFIG_USB_GADGET_M66592 is not set 1209# CONFIG_USB_GADGET_M66592 is not set
1181# CONFIG_USB_GADGET_AMD5536UDC is not set 1210# CONFIG_USB_GADGET_AMD5536UDC is not set
1182# CONFIG_USB_GADGET_FSL_QE is not set 1211# CONFIG_USB_GADGET_FSL_QE is not set
1212# CONFIG_USB_GADGET_CI13XXX is not set
1183CONFIG_USB_GADGET_NET2280=y 1213CONFIG_USB_GADGET_NET2280=y
1184CONFIG_USB_NET2280=y 1214CONFIG_USB_NET2280=y
1185# CONFIG_USB_GADGET_GOKU is not set 1215# CONFIG_USB_GADGET_GOKU is not set
@@ -1194,6 +1224,10 @@ CONFIG_USB_ETH_RNDIS=y
1194# CONFIG_USB_MIDI_GADGET is not set 1224# CONFIG_USB_MIDI_GADGET is not set
1195# CONFIG_USB_G_PRINTER is not set 1225# CONFIG_USB_G_PRINTER is not set
1196# CONFIG_USB_CDC_COMPOSITE is not set 1226# CONFIG_USB_CDC_COMPOSITE is not set
1227
1228#
1229# OTG and related infrastructure
1230#
1197# CONFIG_UWB is not set 1231# CONFIG_UWB is not set
1198# CONFIG_MMC is not set 1232# CONFIG_MMC is not set
1199# CONFIG_MEMSTICK is not set 1233# CONFIG_MEMSTICK is not set
@@ -1231,12 +1265,14 @@ CONFIG_RTC_DRV_DS1307=y
1231# CONFIG_RTC_DRV_M41T80 is not set 1265# CONFIG_RTC_DRV_M41T80 is not set
1232# CONFIG_RTC_DRV_S35390A is not set 1266# CONFIG_RTC_DRV_S35390A is not set
1233# CONFIG_RTC_DRV_FM3130 is not set 1267# CONFIG_RTC_DRV_FM3130 is not set
1268# CONFIG_RTC_DRV_RX8581 is not set
1234 1269
1235# 1270#
1236# SPI RTC drivers 1271# SPI RTC drivers
1237# 1272#
1238# CONFIG_RTC_DRV_M41T94 is not set 1273# CONFIG_RTC_DRV_M41T94 is not set
1239# CONFIG_RTC_DRV_DS1305 is not set 1274# CONFIG_RTC_DRV_DS1305 is not set
1275# CONFIG_RTC_DRV_DS1390 is not set
1240# CONFIG_RTC_DRV_MAX6902 is not set 1276# CONFIG_RTC_DRV_MAX6902 is not set
1241# CONFIG_RTC_DRV_R9701 is not set 1277# CONFIG_RTC_DRV_R9701 is not set
1242# CONFIG_RTC_DRV_RS5C348 is not set 1278# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1284,6 +1320,7 @@ CONFIG_FS_MBCACHE=y
1284CONFIG_FILE_LOCKING=y 1320CONFIG_FILE_LOCKING=y
1285# CONFIG_XFS_FS is not set 1321# CONFIG_XFS_FS is not set
1286# CONFIG_OCFS2_FS is not set 1322# CONFIG_OCFS2_FS is not set
1323# CONFIG_BTRFS_FS is not set
1287CONFIG_DNOTIFY=y 1324CONFIG_DNOTIFY=y
1288CONFIG_INOTIFY=y 1325CONFIG_INOTIFY=y
1289CONFIG_INOTIFY_USER=y 1326CONFIG_INOTIFY_USER=y
@@ -1317,10 +1354,7 @@ CONFIG_TMPFS=y
1317# CONFIG_TMPFS_POSIX_ACL is not set 1354# CONFIG_TMPFS_POSIX_ACL is not set
1318# CONFIG_HUGETLB_PAGE is not set 1355# CONFIG_HUGETLB_PAGE is not set
1319# CONFIG_CONFIGFS_FS is not set 1356# CONFIG_CONFIGFS_FS is not set
1320 1357CONFIG_MISC_FILESYSTEMS=y
1321#
1322# Miscellaneous filesystems
1323#
1324# CONFIG_ADFS_FS is not set 1358# CONFIG_ADFS_FS is not set
1325# CONFIG_AFFS_FS is not set 1359# CONFIG_AFFS_FS is not set
1326# CONFIG_HFS_FS is not set 1360# CONFIG_HFS_FS is not set
@@ -1340,6 +1374,7 @@ CONFIG_JFFS2_ZLIB=y
1340CONFIG_JFFS2_RTIME=y 1374CONFIG_JFFS2_RTIME=y
1341# CONFIG_JFFS2_RUBIN is not set 1375# CONFIG_JFFS2_RUBIN is not set
1342# CONFIG_CRAMFS is not set 1376# CONFIG_CRAMFS is not set
1377# CONFIG_SQUASHFS is not set
1343# CONFIG_VXFS_FS is not set 1378# CONFIG_VXFS_FS is not set
1344# CONFIG_MINIX_FS is not set 1379# CONFIG_MINIX_FS is not set
1345# CONFIG_OMFS_FS is not set 1380# CONFIG_OMFS_FS is not set
@@ -1397,6 +1432,7 @@ CONFIG_MSDOS_PARTITION=y
1397# Library routines 1432# Library routines
1398# 1433#
1399CONFIG_BITREVERSE=y 1434CONFIG_BITREVERSE=y
1435CONFIG_GENERIC_FIND_LAST_BIT=y
1400# CONFIG_CRC_CCITT is not set 1436# CONFIG_CRC_CCITT is not set
1401# CONFIG_CRC16 is not set 1437# CONFIG_CRC16 is not set
1402# CONFIG_CRC_T10DIF is not set 1438# CONFIG_CRC_T10DIF is not set
@@ -1448,6 +1484,7 @@ CONFIG_SCHED_DEBUG=y
1448# CONFIG_DEBUG_MEMORY_INIT is not set 1484# CONFIG_DEBUG_MEMORY_INIT is not set
1449# CONFIG_DEBUG_LIST is not set 1485# CONFIG_DEBUG_LIST is not set
1450# CONFIG_DEBUG_SG is not set 1486# CONFIG_DEBUG_SG is not set
1487# CONFIG_DEBUG_NOTIFIERS is not set
1451# CONFIG_BOOT_PRINTK_DELAY is not set 1488# CONFIG_BOOT_PRINTK_DELAY is not set
1452# CONFIG_RCU_TORTURE_TEST is not set 1489# CONFIG_RCU_TORTURE_TEST is not set
1453# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1490# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1457,6 +1494,8 @@ CONFIG_SCHED_DEBUG=y
1457# CONFIG_LATENCYTOP is not set 1494# CONFIG_LATENCYTOP is not set
1458CONFIG_SYSCTL_SYSCALL_CHECK=y 1495CONFIG_SYSCTL_SYSCALL_CHECK=y
1459CONFIG_HAVE_FUNCTION_TRACER=y 1496CONFIG_HAVE_FUNCTION_TRACER=y
1497CONFIG_HAVE_DYNAMIC_FTRACE=y
1498CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1460 1499
1461# 1500#
1462# Tracers 1501# Tracers
@@ -1465,11 +1504,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1465# CONFIG_SCHED_TRACER is not set 1504# CONFIG_SCHED_TRACER is not set
1466# CONFIG_CONTEXT_SWITCH_TRACER is not set 1505# CONFIG_CONTEXT_SWITCH_TRACER is not set
1467# CONFIG_BOOT_TRACER is not set 1506# CONFIG_BOOT_TRACER is not set
1507# CONFIG_TRACE_BRANCH_PROFILING is not set
1468# CONFIG_STACK_TRACER is not set 1508# CONFIG_STACK_TRACER is not set
1469# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1509# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1470# CONFIG_SAMPLES is not set 1510# CONFIG_SAMPLES is not set
1471CONFIG_HAVE_ARCH_KGDB=y 1511CONFIG_HAVE_ARCH_KGDB=y
1472# CONFIG_KGDB is not set 1512# CONFIG_KGDB is not set
1513CONFIG_PRINT_STACK_DEPTH=64
1473# CONFIG_DEBUG_STACKOVERFLOW is not set 1514# CONFIG_DEBUG_STACKOVERFLOW is not set
1474# CONFIG_DEBUG_STACK_USAGE is not set 1515# CONFIG_DEBUG_STACK_USAGE is not set
1475# CONFIG_DEBUG_PAGEALLOC is not set 1516# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1496,11 +1537,15 @@ CONFIG_CRYPTO=y
1496# 1537#
1497# CONFIG_CRYPTO_FIPS is not set 1538# CONFIG_CRYPTO_FIPS is not set
1498CONFIG_CRYPTO_ALGAPI=y 1539CONFIG_CRYPTO_ALGAPI=y
1499CONFIG_CRYPTO_AEAD=y 1540CONFIG_CRYPTO_ALGAPI2=y
1541CONFIG_CRYPTO_AEAD2=y
1500CONFIG_CRYPTO_BLKCIPHER=y 1542CONFIG_CRYPTO_BLKCIPHER=y
1543CONFIG_CRYPTO_BLKCIPHER2=y
1501CONFIG_CRYPTO_HASH=y 1544CONFIG_CRYPTO_HASH=y
1502CONFIG_CRYPTO_RNG=y 1545CONFIG_CRYPTO_HASH2=y
1546CONFIG_CRYPTO_RNG2=y
1503CONFIG_CRYPTO_MANAGER=y 1547CONFIG_CRYPTO_MANAGER=y
1548CONFIG_CRYPTO_MANAGER2=y
1504# CONFIG_CRYPTO_GF128MUL is not set 1549# CONFIG_CRYPTO_GF128MUL is not set
1505# CONFIG_CRYPTO_NULL is not set 1550# CONFIG_CRYPTO_NULL is not set
1506# CONFIG_CRYPTO_CRYPTD is not set 1551# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
index c7cceb4536d8..03db97c6cf33 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:51 2008 4# Mon Jan 26 15:35:49 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 113CONFIG_SLUB=y
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 126CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 132CONFIG_BLOCK=y
136# CONFIG_LBD is not set 133# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141 137
@@ -152,6 +148,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
156 156
157# 157#
@@ -198,6 +198,8 @@ CONFIG_IPIC=y
198# CONFIG_QUICC_ENGINE is not set 198# CONFIG_QUICC_ENGINE is not set
199# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_MPC8xxx_GPIO is not set 200# CONFIG_MPC8xxx_GPIO is not set
201# CONFIG_SIMPLE_GPIO is not set
202# CONFIG_MCU_MPC8349EMITX is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -225,6 +227,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 227CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 228CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 229# CONFIG_KEXEC is not set
230# CONFIG_CRASH_DUMP is not set
228CONFIG_ARCH_FLATMEM_ENABLE=y 231CONFIG_ARCH_FLATMEM_ENABLE=y
229CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
230CONFIG_SELECT_MEMORY_MODEL=y 233CONFIG_SELECT_MEMORY_MODEL=y
@@ -236,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
236CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
238CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set 242# CONFIG_PHYS_ADDR_T_64BIT is not set
241CONFIG_ZONE_DMA_FLAG=1 243CONFIG_ZONE_DMA_FLAG=1
242CONFIG_BOUNCE=y 244CONFIG_BOUNCE=y
243CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
245CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
247# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -267,6 +272,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
267# CONFIG_PCI_MSI is not set 272# CONFIG_PCI_MSI is not set
268# CONFIG_PCI_LEGACY is not set 273# CONFIG_PCI_LEGACY is not set
269# CONFIG_PCI_DEBUG is not set 274# CONFIG_PCI_DEBUG is not set
275# CONFIG_PCI_STUB is not set
270# CONFIG_PCCARD is not set 276# CONFIG_PCCARD is not set
271# CONFIG_HOTPLUG_PCI is not set 277# CONFIG_HOTPLUG_PCI is not set
272# CONFIG_HAS_RAPIDIO is not set 278# CONFIG_HAS_RAPIDIO is not set
@@ -289,6 +295,7 @@ CONFIG_NET=y
289# 295#
290# Networking options 296# Networking options
291# 297#
298CONFIG_COMPAT_NET_DEV_OPS=y
292CONFIG_PACKET=y 299CONFIG_PACKET=y
293# CONFIG_PACKET_MMAP is not set 300# CONFIG_PACKET_MMAP is not set
294CONFIG_UNIX=y 301CONFIG_UNIX=y
@@ -345,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
347# CONFIG_NET_SCHED is not set 354# CONFIG_NET_SCHED is not set
355# CONFIG_DCB is not set
348 356
349# 357#
350# Network testing 358# Network testing
@@ -360,8 +368,9 @@ CONFIG_WIRELESS=y
360# CONFIG_CFG80211 is not set 368# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y 369CONFIG_WIRELESS_OLD_REGULATORY=y
362# CONFIG_WIRELESS_EXT is not set 370# CONFIG_WIRELESS_EXT is not set
371# CONFIG_LIB80211 is not set
363# CONFIG_MAC80211 is not set 372# CONFIG_MAC80211 is not set
364# CONFIG_IEEE80211 is not set 373# CONFIG_WIMAX is not set
365# CONFIG_RFKILL is not set 374# CONFIG_RFKILL is not set
366# CONFIG_NET_9P is not set 375# CONFIG_NET_9P is not set
367 376
@@ -384,6 +393,7 @@ CONFIG_MTD=y
384# CONFIG_MTD_DEBUG is not set 393# CONFIG_MTD_DEBUG is not set
385# CONFIG_MTD_CONCAT is not set 394# CONFIG_MTD_CONCAT is not set
386CONFIG_MTD_PARTITIONS=y 395CONFIG_MTD_PARTITIONS=y
396# CONFIG_MTD_TESTS is not set
387# CONFIG_MTD_REDBOOT_PARTS is not set 397# CONFIG_MTD_REDBOOT_PARTS is not set
388# CONFIG_MTD_CMDLINE_PARTS is not set 398# CONFIG_MTD_CMDLINE_PARTS is not set
389# CONFIG_MTD_OF_PARTS is not set 399# CONFIG_MTD_OF_PARTS is not set
@@ -468,6 +478,12 @@ CONFIG_MTD_NAND_IDS=y
468# CONFIG_MTD_ONENAND is not set 478# CONFIG_MTD_ONENAND is not set
469 479
470# 480#
481# LPDDR flash memory drivers
482#
483# CONFIG_MTD_LPDDR is not set
484# CONFIG_MTD_QINFO_PROBE is not set
485
486#
471# UBI - Unsorted block images 487# UBI - Unsorted block images
472# 488#
473# CONFIG_MTD_UBI is not set 489# CONFIG_MTD_UBI is not set
@@ -499,8 +515,10 @@ CONFIG_MISC_DEVICES=y
499# CONFIG_EEPROM_93CX6 is not set 515# CONFIG_EEPROM_93CX6 is not set
500# CONFIG_SGI_IOC4 is not set 516# CONFIG_SGI_IOC4 is not set
501# CONFIG_TIFM_CORE is not set 517# CONFIG_TIFM_CORE is not set
518# CONFIG_ICS932S401 is not set
502# CONFIG_ENCLOSURE_SERVICES is not set 519# CONFIG_ENCLOSURE_SERVICES is not set
503# CONFIG_HP_ILO is not set 520# CONFIG_HP_ILO is not set
521# CONFIG_C2PORT is not set
504CONFIG_HAVE_IDE=y 522CONFIG_HAVE_IDE=y
505# CONFIG_IDE is not set 523# CONFIG_IDE is not set
506 524
@@ -543,6 +561,7 @@ CONFIG_SCSI_SPI_ATTRS=y
543# CONFIG_SCSI_SRP_ATTRS is not set 561# CONFIG_SCSI_SRP_ATTRS is not set
544CONFIG_SCSI_LOWLEVEL=y 562CONFIG_SCSI_LOWLEVEL=y
545# CONFIG_ISCSI_TCP is not set 563# CONFIG_ISCSI_TCP is not set
564# CONFIG_SCSI_CXGB3_ISCSI is not set
546# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 565# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
547# CONFIG_SCSI_3W_9XXX is not set 566# CONFIG_SCSI_3W_9XXX is not set
548# CONFIG_SCSI_ACARD is not set 567# CONFIG_SCSI_ACARD is not set
@@ -559,6 +578,8 @@ CONFIG_SCSI_LOWLEVEL=y
559# CONFIG_MEGARAID_SAS is not set 578# CONFIG_MEGARAID_SAS is not set
560# CONFIG_SCSI_HPTIOP is not set 579# CONFIG_SCSI_HPTIOP is not set
561# CONFIG_SCSI_BUSLOGIC is not set 580# CONFIG_SCSI_BUSLOGIC is not set
581# CONFIG_LIBFC is not set
582# CONFIG_FCOE is not set
562# CONFIG_SCSI_DMX3191D is not set 583# CONFIG_SCSI_DMX3191D is not set
563# CONFIG_SCSI_EATA is not set 584# CONFIG_SCSI_EATA is not set
564# CONFIG_SCSI_FUTURE_DOMAIN is not set 585# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -688,6 +709,9 @@ CONFIG_PHYLIB=y
688# CONFIG_BROADCOM_PHY is not set 709# CONFIG_BROADCOM_PHY is not set
689# CONFIG_ICPLUS_PHY is not set 710# CONFIG_ICPLUS_PHY is not set
690# CONFIG_REALTEK_PHY is not set 711# CONFIG_REALTEK_PHY is not set
712# CONFIG_NATIONAL_PHY is not set
713# CONFIG_STE10XP is not set
714# CONFIG_LSI_ET1011C_PHY is not set
691# CONFIG_FIXED_PHY is not set 715# CONFIG_FIXED_PHY is not set
692# CONFIG_MDIO_BITBANG is not set 716# CONFIG_MDIO_BITBANG is not set
693CONFIG_NET_ETHERNET=y 717CONFIG_NET_ETHERNET=y
@@ -712,7 +736,6 @@ CONFIG_NET_PCI=y
712# CONFIG_ADAPTEC_STARFIRE is not set 736# CONFIG_ADAPTEC_STARFIRE is not set
713# CONFIG_B44 is not set 737# CONFIG_B44 is not set
714# CONFIG_FORCEDETH is not set 738# CONFIG_FORCEDETH is not set
715# CONFIG_EEPRO100 is not set
716CONFIG_E100=y 739CONFIG_E100=y
717# CONFIG_FEALNX is not set 740# CONFIG_FEALNX is not set
718# CONFIG_NATSEMI is not set 741# CONFIG_NATSEMI is not set
@@ -722,6 +745,7 @@ CONFIG_E100=y
722# CONFIG_R6040 is not set 745# CONFIG_R6040 is not set
723# CONFIG_SIS900 is not set 746# CONFIG_SIS900 is not set
724# CONFIG_EPIC100 is not set 747# CONFIG_EPIC100 is not set
748# CONFIG_SMSC9420 is not set
725# CONFIG_SUNDANCE is not set 749# CONFIG_SUNDANCE is not set
726# CONFIG_TLAN is not set 750# CONFIG_TLAN is not set
727# CONFIG_VIA_RHINE is not set 751# CONFIG_VIA_RHINE is not set
@@ -752,6 +776,7 @@ CONFIG_GIANFAR=y
752# CONFIG_JME is not set 776# CONFIG_JME is not set
753CONFIG_NETDEV_10000=y 777CONFIG_NETDEV_10000=y
754# CONFIG_CHELSIO_T1 is not set 778# CONFIG_CHELSIO_T1 is not set
779CONFIG_CHELSIO_T3_DEPENDS=y
755# CONFIG_CHELSIO_T3 is not set 780# CONFIG_CHELSIO_T3 is not set
756# CONFIG_ENIC is not set 781# CONFIG_ENIC is not set
757# CONFIG_IXGBE is not set 782# CONFIG_IXGBE is not set
@@ -776,6 +801,10 @@ CONFIG_NETDEV_10000=y
776# CONFIG_IWLWIFI_LEDS is not set 801# CONFIG_IWLWIFI_LEDS is not set
777 802
778# 803#
804# Enable WiMAX (Networking options) to see the WiMAX drivers
805#
806
807#
779# USB Network Adapters 808# USB Network Adapters
780# 809#
781# CONFIG_USB_CATC is not set 810# CONFIG_USB_CATC is not set
@@ -853,8 +882,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
853# CONFIG_SERIAL_JSM is not set 882# CONFIG_SERIAL_JSM is not set
854# CONFIG_SERIAL_OF_PLATFORM is not set 883# CONFIG_SERIAL_OF_PLATFORM is not set
855CONFIG_UNIX98_PTYS=y 884CONFIG_UNIX98_PTYS=y
885# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
856CONFIG_LEGACY_PTYS=y 886CONFIG_LEGACY_PTYS=y
857CONFIG_LEGACY_PTY_COUNT=256 887CONFIG_LEGACY_PTY_COUNT=256
888# CONFIG_HVC_UDBG is not set
858# CONFIG_IPMI_HANDLER is not set 889# CONFIG_IPMI_HANDLER is not set
859CONFIG_HW_RANDOM=y 890CONFIG_HW_RANDOM=y
860# CONFIG_NVRAM is not set 891# CONFIG_NVRAM is not set
@@ -927,7 +958,6 @@ CONFIG_I2C_MPC=y
927# CONFIG_SENSORS_PCF8591 is not set 958# CONFIG_SENSORS_PCF8591 is not set
928# CONFIG_SENSORS_MAX6875 is not set 959# CONFIG_SENSORS_MAX6875 is not set
929# CONFIG_SENSORS_TSL2550 is not set 960# CONFIG_SENSORS_TSL2550 is not set
930# CONFIG_MCU_MPC8349EMITX is not set
931# CONFIG_I2C_DEBUG_CORE is not set 961# CONFIG_I2C_DEBUG_CORE is not set
932# CONFIG_I2C_DEBUG_ALGO is not set 962# CONFIG_I2C_DEBUG_ALGO is not set
933# CONFIG_I2C_DEBUG_BUS is not set 963# CONFIG_I2C_DEBUG_BUS is not set
@@ -963,8 +993,10 @@ CONFIG_HWMON=y
963# CONFIG_SENSORS_ADM1029 is not set 993# CONFIG_SENSORS_ADM1029 is not set
964# CONFIG_SENSORS_ADM1031 is not set 994# CONFIG_SENSORS_ADM1031 is not set
965# CONFIG_SENSORS_ADM9240 is not set 995# CONFIG_SENSORS_ADM9240 is not set
996# CONFIG_SENSORS_ADT7462 is not set
966# CONFIG_SENSORS_ADT7470 is not set 997# CONFIG_SENSORS_ADT7470 is not set
967# CONFIG_SENSORS_ADT7473 is not set 998# CONFIG_SENSORS_ADT7473 is not set
999# CONFIG_SENSORS_ADT7475 is not set
968# CONFIG_SENSORS_ATXP1 is not set 1000# CONFIG_SENSORS_ATXP1 is not set
969# CONFIG_SENSORS_DS1621 is not set 1001# CONFIG_SENSORS_DS1621 is not set
970# CONFIG_SENSORS_I5K_AMB is not set 1002# CONFIG_SENSORS_I5K_AMB is not set
@@ -986,6 +1018,7 @@ CONFIG_HWMON=y
986# CONFIG_SENSORS_LM90 is not set 1018# CONFIG_SENSORS_LM90 is not set
987# CONFIG_SENSORS_LM92 is not set 1019# CONFIG_SENSORS_LM92 is not set
988# CONFIG_SENSORS_LM93 is not set 1020# CONFIG_SENSORS_LM93 is not set
1021# CONFIG_SENSORS_LTC4245 is not set
989# CONFIG_SENSORS_MAX1111 is not set 1022# CONFIG_SENSORS_MAX1111 is not set
990# CONFIG_SENSORS_MAX1619 is not set 1023# CONFIG_SENSORS_MAX1619 is not set
991# CONFIG_SENSORS_MAX6650 is not set 1024# CONFIG_SENSORS_MAX6650 is not set
@@ -1032,11 +1065,11 @@ CONFIG_WATCHDOG=y
1032# USB-based Watchdog Cards 1065# USB-based Watchdog Cards
1033# 1066#
1034# CONFIG_USBPCWATCHDOG is not set 1067# CONFIG_USBPCWATCHDOG is not set
1068CONFIG_SSB_POSSIBLE=y
1035 1069
1036# 1070#
1037# Sonics Silicon Backplane 1071# Sonics Silicon Backplane
1038# 1072#
1039CONFIG_SSB_POSSIBLE=y
1040# CONFIG_SSB is not set 1073# CONFIG_SSB is not set
1041 1074
1042# 1075#
@@ -1045,18 +1078,13 @@ CONFIG_SSB_POSSIBLE=y
1045# CONFIG_MFD_CORE is not set 1078# CONFIG_MFD_CORE is not set
1046# CONFIG_MFD_SM501 is not set 1079# CONFIG_MFD_SM501 is not set
1047# CONFIG_HTC_PASIC3 is not set 1080# CONFIG_HTC_PASIC3 is not set
1081# CONFIG_TWL4030_CORE is not set
1048# CONFIG_MFD_TMIO is not set 1082# CONFIG_MFD_TMIO is not set
1049# CONFIG_PMIC_DA903X is not set 1083# CONFIG_PMIC_DA903X is not set
1050# CONFIG_MFD_WM8400 is not set 1084# CONFIG_MFD_WM8400 is not set
1051# CONFIG_MFD_WM8350_I2C is not set 1085# CONFIG_MFD_WM8350_I2C is not set
1052 1086# CONFIG_MFD_PCF50633 is not set
1053#
1054# Voltage and Current regulators
1055#
1056# CONFIG_REGULATOR is not set 1087# 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
1060 1088
1061# 1089#
1062# Multimedia devices 1090# Multimedia devices
@@ -1141,6 +1169,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
1141# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1169# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1142CONFIG_USB_EHCI_FSL=y 1170CONFIG_USB_EHCI_FSL=y
1143CONFIG_USB_EHCI_HCD_PPC_OF=y 1171CONFIG_USB_EHCI_HCD_PPC_OF=y
1172# CONFIG_USB_OXU210HP_HCD is not set
1144# CONFIG_USB_ISP116X_HCD is not set 1173# CONFIG_USB_ISP116X_HCD is not set
1145# CONFIG_USB_ISP1760_HCD is not set 1174# CONFIG_USB_ISP1760_HCD is not set
1146CONFIG_USB_OHCI_HCD=y 1175CONFIG_USB_OHCI_HCD=y
@@ -1167,18 +1196,17 @@ CONFIG_USB_UHCI_HCD=y
1167# CONFIG_USB_TMC is not set 1196# CONFIG_USB_TMC is not set
1168 1197
1169# 1198#
1170# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1199# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1171# 1200#
1172 1201
1173# 1202#
1174# may also be needed; see USB_STORAGE Help for more information 1203# see USB_STORAGE Help for more information
1175# 1204#
1176CONFIG_USB_STORAGE=y 1205CONFIG_USB_STORAGE=y
1177# CONFIG_USB_STORAGE_DEBUG is not set 1206# CONFIG_USB_STORAGE_DEBUG is not set
1178# CONFIG_USB_STORAGE_DATAFAB is not set 1207# CONFIG_USB_STORAGE_DATAFAB is not set
1179# CONFIG_USB_STORAGE_FREECOM is not set 1208# CONFIG_USB_STORAGE_FREECOM is not set
1180# CONFIG_USB_STORAGE_ISD200 is not set 1209# CONFIG_USB_STORAGE_ISD200 is not set
1181# CONFIG_USB_STORAGE_DPCM is not set
1182# CONFIG_USB_STORAGE_USBAT is not set 1210# CONFIG_USB_STORAGE_USBAT is not set
1183# CONFIG_USB_STORAGE_SDDR09 is not set 1211# CONFIG_USB_STORAGE_SDDR09 is not set
1184# CONFIG_USB_STORAGE_SDDR55 is not set 1212# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1238,9 +1266,11 @@ CONFIG_USB_GADGET_SELECTED=y
1238# CONFIG_USB_GADGET_PXA25X is not set 1266# CONFIG_USB_GADGET_PXA25X is not set
1239# CONFIG_USB_GADGET_PXA27X is not set 1267# CONFIG_USB_GADGET_PXA27X is not set
1240# CONFIG_USB_GADGET_S3C2410 is not set 1268# CONFIG_USB_GADGET_S3C2410 is not set
1269# CONFIG_USB_GADGET_IMX is not set
1241# CONFIG_USB_GADGET_M66592 is not set 1270# CONFIG_USB_GADGET_M66592 is not set
1242# CONFIG_USB_GADGET_AMD5536UDC is not set 1271# CONFIG_USB_GADGET_AMD5536UDC is not set
1243# CONFIG_USB_GADGET_FSL_QE is not set 1272# CONFIG_USB_GADGET_FSL_QE is not set
1273# CONFIG_USB_GADGET_CI13XXX is not set
1244CONFIG_USB_GADGET_NET2280=y 1274CONFIG_USB_GADGET_NET2280=y
1245CONFIG_USB_NET2280=y 1275CONFIG_USB_NET2280=y
1246# CONFIG_USB_GADGET_GOKU is not set 1276# CONFIG_USB_GADGET_GOKU is not set
@@ -1255,6 +1285,10 @@ CONFIG_USB_ETH_RNDIS=y
1255# CONFIG_USB_MIDI_GADGET is not set 1285# CONFIG_USB_MIDI_GADGET is not set
1256# CONFIG_USB_G_PRINTER is not set 1286# CONFIG_USB_G_PRINTER is not set
1257# CONFIG_USB_CDC_COMPOSITE is not set 1287# CONFIG_USB_CDC_COMPOSITE is not set
1288
1289#
1290# OTG and related infrastructure
1291#
1258# CONFIG_UWB is not set 1292# CONFIG_UWB is not set
1259# CONFIG_MMC is not set 1293# CONFIG_MMC is not set
1260# CONFIG_MEMSTICK is not set 1294# CONFIG_MEMSTICK is not set
@@ -1292,12 +1326,14 @@ CONFIG_RTC_DRV_DS1307=y
1292# CONFIG_RTC_DRV_M41T80 is not set 1326# CONFIG_RTC_DRV_M41T80 is not set
1293# CONFIG_RTC_DRV_S35390A is not set 1327# CONFIG_RTC_DRV_S35390A is not set
1294# CONFIG_RTC_DRV_FM3130 is not set 1328# CONFIG_RTC_DRV_FM3130 is not set
1329# CONFIG_RTC_DRV_RX8581 is not set
1295 1330
1296# 1331#
1297# SPI RTC drivers 1332# SPI RTC drivers
1298# 1333#
1299# CONFIG_RTC_DRV_M41T94 is not set 1334# CONFIG_RTC_DRV_M41T94 is not set
1300# CONFIG_RTC_DRV_DS1305 is not set 1335# CONFIG_RTC_DRV_DS1305 is not set
1336# CONFIG_RTC_DRV_DS1390 is not set
1301# CONFIG_RTC_DRV_MAX6902 is not set 1337# CONFIG_RTC_DRV_MAX6902 is not set
1302# CONFIG_RTC_DRV_R9701 is not set 1338# CONFIG_RTC_DRV_R9701 is not set
1303# CONFIG_RTC_DRV_RS5C348 is not set 1339# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1345,6 +1381,7 @@ CONFIG_FS_MBCACHE=y
1345CONFIG_FILE_LOCKING=y 1381CONFIG_FILE_LOCKING=y
1346# CONFIG_XFS_FS is not set 1382# CONFIG_XFS_FS is not set
1347# CONFIG_OCFS2_FS is not set 1383# CONFIG_OCFS2_FS is not set
1384# CONFIG_BTRFS_FS is not set
1348CONFIG_DNOTIFY=y 1385CONFIG_DNOTIFY=y
1349CONFIG_INOTIFY=y 1386CONFIG_INOTIFY=y
1350CONFIG_INOTIFY_USER=y 1387CONFIG_INOTIFY_USER=y
@@ -1378,10 +1415,7 @@ CONFIG_TMPFS=y
1378# CONFIG_TMPFS_POSIX_ACL is not set 1415# CONFIG_TMPFS_POSIX_ACL is not set
1379# CONFIG_HUGETLB_PAGE is not set 1416# CONFIG_HUGETLB_PAGE is not set
1380# CONFIG_CONFIGFS_FS is not set 1417# CONFIG_CONFIGFS_FS is not set
1381 1418CONFIG_MISC_FILESYSTEMS=y
1382#
1383# Miscellaneous filesystems
1384#
1385# CONFIG_ADFS_FS is not set 1419# CONFIG_ADFS_FS is not set
1386# CONFIG_AFFS_FS is not set 1420# CONFIG_AFFS_FS is not set
1387# CONFIG_HFS_FS is not set 1421# CONFIG_HFS_FS is not set
@@ -1401,6 +1435,7 @@ CONFIG_JFFS2_ZLIB=y
1401CONFIG_JFFS2_RTIME=y 1435CONFIG_JFFS2_RTIME=y
1402# CONFIG_JFFS2_RUBIN is not set 1436# CONFIG_JFFS2_RUBIN is not set
1403# CONFIG_CRAMFS is not set 1437# CONFIG_CRAMFS is not set
1438# CONFIG_SQUASHFS is not set
1404# CONFIG_VXFS_FS is not set 1439# CONFIG_VXFS_FS is not set
1405# CONFIG_MINIX_FS is not set 1440# CONFIG_MINIX_FS is not set
1406# CONFIG_OMFS_FS is not set 1441# CONFIG_OMFS_FS is not set
@@ -1458,6 +1493,7 @@ CONFIG_MSDOS_PARTITION=y
1458# Library routines 1493# Library routines
1459# 1494#
1460CONFIG_BITREVERSE=y 1495CONFIG_BITREVERSE=y
1496CONFIG_GENERIC_FIND_LAST_BIT=y
1461# CONFIG_CRC_CCITT is not set 1497# CONFIG_CRC_CCITT is not set
1462# CONFIG_CRC16 is not set 1498# CONFIG_CRC16 is not set
1463# CONFIG_CRC_T10DIF is not set 1499# CONFIG_CRC_T10DIF is not set
@@ -1509,6 +1545,7 @@ CONFIG_SCHED_DEBUG=y
1509# CONFIG_DEBUG_MEMORY_INIT is not set 1545# CONFIG_DEBUG_MEMORY_INIT is not set
1510# CONFIG_DEBUG_LIST is not set 1546# CONFIG_DEBUG_LIST is not set
1511# CONFIG_DEBUG_SG is not set 1547# CONFIG_DEBUG_SG is not set
1548# CONFIG_DEBUG_NOTIFIERS is not set
1512# CONFIG_BOOT_PRINTK_DELAY is not set 1549# CONFIG_BOOT_PRINTK_DELAY is not set
1513# CONFIG_RCU_TORTURE_TEST is not set 1550# CONFIG_RCU_TORTURE_TEST is not set
1514# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1551# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1518,6 +1555,8 @@ CONFIG_SCHED_DEBUG=y
1518# CONFIG_LATENCYTOP is not set 1555# CONFIG_LATENCYTOP is not set
1519CONFIG_SYSCTL_SYSCALL_CHECK=y 1556CONFIG_SYSCTL_SYSCALL_CHECK=y
1520CONFIG_HAVE_FUNCTION_TRACER=y 1557CONFIG_HAVE_FUNCTION_TRACER=y
1558CONFIG_HAVE_DYNAMIC_FTRACE=y
1559CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1521 1560
1522# 1561#
1523# Tracers 1562# Tracers
@@ -1526,11 +1565,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1526# CONFIG_SCHED_TRACER is not set 1565# CONFIG_SCHED_TRACER is not set
1527# CONFIG_CONTEXT_SWITCH_TRACER is not set 1566# CONFIG_CONTEXT_SWITCH_TRACER is not set
1528# CONFIG_BOOT_TRACER is not set 1567# CONFIG_BOOT_TRACER is not set
1568# CONFIG_TRACE_BRANCH_PROFILING is not set
1529# CONFIG_STACK_TRACER is not set 1569# CONFIG_STACK_TRACER is not set
1530# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1570# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1531# CONFIG_SAMPLES is not set 1571# CONFIG_SAMPLES is not set
1532CONFIG_HAVE_ARCH_KGDB=y 1572CONFIG_HAVE_ARCH_KGDB=y
1533# CONFIG_KGDB is not set 1573# CONFIG_KGDB is not set
1574CONFIG_PRINT_STACK_DEPTH=64
1534# CONFIG_DEBUG_STACKOVERFLOW is not set 1575# CONFIG_DEBUG_STACKOVERFLOW is not set
1535# CONFIG_DEBUG_STACK_USAGE is not set 1576# CONFIG_DEBUG_STACK_USAGE is not set
1536# CONFIG_DEBUG_PAGEALLOC is not set 1577# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1557,11 +1598,15 @@ CONFIG_CRYPTO=y
1557# 1598#
1558# CONFIG_CRYPTO_FIPS is not set 1599# CONFIG_CRYPTO_FIPS is not set
1559CONFIG_CRYPTO_ALGAPI=y 1600CONFIG_CRYPTO_ALGAPI=y
1560CONFIG_CRYPTO_AEAD=y 1601CONFIG_CRYPTO_ALGAPI2=y
1602CONFIG_CRYPTO_AEAD2=y
1561CONFIG_CRYPTO_BLKCIPHER=y 1603CONFIG_CRYPTO_BLKCIPHER=y
1604CONFIG_CRYPTO_BLKCIPHER2=y
1562CONFIG_CRYPTO_HASH=y 1605CONFIG_CRYPTO_HASH=y
1563CONFIG_CRYPTO_RNG=y 1606CONFIG_CRYPTO_HASH2=y
1607CONFIG_CRYPTO_RNG2=y
1564CONFIG_CRYPTO_MANAGER=y 1608CONFIG_CRYPTO_MANAGER=y
1609CONFIG_CRYPTO_MANAGER2=y
1565# CONFIG_CRYPTO_GF128MUL is not set 1610# CONFIG_CRYPTO_GF128MUL is not set
1566# CONFIG_CRYPTO_NULL is not set 1611# CONFIG_CRYPTO_NULL is not set
1567# CONFIG_CRYPTO_CRYPTD is not set 1612# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
index 5e3cd49a2e9c..fb17de53cc02 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:53 2008 4# Mon Jan 26 15:35:50 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 113CONFIG_SLUB=y
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 126CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 132CONFIG_BLOCK=y
136# CONFIG_LBD is not set 133# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141 137
@@ -152,6 +148,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
156 156
157# 157#
@@ -198,6 +198,8 @@ CONFIG_IPIC=y
198CONFIG_QUICC_ENGINE=y 198CONFIG_QUICC_ENGINE=y
199# CONFIG_QE_GPIO is not set 199# CONFIG_QE_GPIO is not set
200# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
201# CONFIG_SIMPLE_GPIO is not set
202# CONFIG_MCU_MPC8349EMITX is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -226,6 +228,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
226CONFIG_ARCH_HAS_WALK_MEMORY=y 228CONFIG_ARCH_HAS_WALK_MEMORY=y
227CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 229CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
228# CONFIG_KEXEC is not set 230# CONFIG_KEXEC is not set
231# CONFIG_CRASH_DUMP is not set
229CONFIG_ARCH_FLATMEM_ENABLE=y 232CONFIG_ARCH_FLATMEM_ENABLE=y
230CONFIG_ARCH_POPULATES_NODE_MAP=y 233CONFIG_ARCH_POPULATES_NODE_MAP=y
231CONFIG_SELECT_MEMORY_MODEL=y 234CONFIG_SELECT_MEMORY_MODEL=y
@@ -237,12 +240,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
237CONFIG_PAGEFLAGS_EXTENDED=y 240CONFIG_PAGEFLAGS_EXTENDED=y
238CONFIG_SPLIT_PTLOCK_CPUS=4 241CONFIG_SPLIT_PTLOCK_CPUS=4
239CONFIG_MIGRATION=y 242CONFIG_MIGRATION=y
240# CONFIG_RESOURCES_64BIT is not set
241# CONFIG_PHYS_ADDR_T_64BIT is not set 243# CONFIG_PHYS_ADDR_T_64BIT is not set
242CONFIG_ZONE_DMA_FLAG=1 244CONFIG_ZONE_DMA_FLAG=1
243CONFIG_BOUNCE=y 245CONFIG_BOUNCE=y
244CONFIG_VIRT_TO_BUS=y 246CONFIG_VIRT_TO_BUS=y
245CONFIG_UNEVICTABLE_LRU=y 247CONFIG_UNEVICTABLE_LRU=y
248CONFIG_PPC_4K_PAGES=y
249# CONFIG_PPC_16K_PAGES is not set
250# CONFIG_PPC_64K_PAGES is not set
246CONFIG_FORCE_MAX_ZONEORDER=11 251CONFIG_FORCE_MAX_ZONEORDER=11
247CONFIG_PROC_DEVICETREE=y 252CONFIG_PROC_DEVICETREE=y
248# CONFIG_CMDLINE_BOOL is not set 253# CONFIG_CMDLINE_BOOL is not set
@@ -267,6 +272,7 @@ CONFIG_PCI_SYSCALL=y
267CONFIG_ARCH_SUPPORTS_MSI=y 272CONFIG_ARCH_SUPPORTS_MSI=y
268# CONFIG_PCI_MSI is not set 273# CONFIG_PCI_MSI is not set
269# CONFIG_PCI_LEGACY is not set 274# CONFIG_PCI_LEGACY is not set
275# CONFIG_PCI_STUB is not set
270# CONFIG_PCCARD is not set 276# CONFIG_PCCARD is not set
271# CONFIG_HOTPLUG_PCI is not set 277# CONFIG_HOTPLUG_PCI is not set
272# CONFIG_HAS_RAPIDIO is not set 278# CONFIG_HAS_RAPIDIO is not set
@@ -289,6 +295,7 @@ CONFIG_NET=y
289# 295#
290# Networking options 296# Networking options
291# 297#
298CONFIG_COMPAT_NET_DEV_OPS=y
292CONFIG_PACKET=y 299CONFIG_PACKET=y
293# CONFIG_PACKET_MMAP is not set 300# CONFIG_PACKET_MMAP is not set
294CONFIG_UNIX=y 301CONFIG_UNIX=y
@@ -345,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
347# CONFIG_NET_SCHED is not set 354# CONFIG_NET_SCHED is not set
355# CONFIG_DCB is not set
348 356
349# 357#
350# Network testing 358# Network testing
@@ -360,8 +368,9 @@ CONFIG_WIRELESS=y
360# CONFIG_CFG80211 is not set 368# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y 369CONFIG_WIRELESS_OLD_REGULATORY=y
362# CONFIG_WIRELESS_EXT is not set 370# CONFIG_WIRELESS_EXT is not set
371# CONFIG_LIB80211 is not set
363# CONFIG_MAC80211 is not set 372# CONFIG_MAC80211 is not set
364# CONFIG_IEEE80211 is not set 373# CONFIG_WIMAX is not set
365# CONFIG_RFKILL is not set 374# CONFIG_RFKILL is not set
366# CONFIG_NET_9P is not set 375# CONFIG_NET_9P is not set
367 376
@@ -405,8 +414,10 @@ CONFIG_MISC_DEVICES=y
405# CONFIG_EEPROM_93CX6 is not set 414# CONFIG_EEPROM_93CX6 is not set
406# CONFIG_SGI_IOC4 is not set 415# CONFIG_SGI_IOC4 is not set
407# CONFIG_TIFM_CORE is not set 416# CONFIG_TIFM_CORE is not set
417# CONFIG_ICS932S401 is not set
408# CONFIG_ENCLOSURE_SERVICES is not set 418# CONFIG_ENCLOSURE_SERVICES is not set
409# CONFIG_HP_ILO is not set 419# CONFIG_HP_ILO is not set
420# CONFIG_C2PORT is not set
410CONFIG_HAVE_IDE=y 421CONFIG_HAVE_IDE=y
411# CONFIG_IDE is not set 422# CONFIG_IDE is not set
412 423
@@ -449,6 +460,7 @@ CONFIG_SCSI_WAIT_SCAN=m
449# CONFIG_SCSI_SRP_ATTRS is not set 460# CONFIG_SCSI_SRP_ATTRS is not set
450CONFIG_SCSI_LOWLEVEL=y 461CONFIG_SCSI_LOWLEVEL=y
451# CONFIG_ISCSI_TCP is not set 462# CONFIG_ISCSI_TCP is not set
463# CONFIG_SCSI_CXGB3_ISCSI is not set
452# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 464# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
453# CONFIG_SCSI_3W_9XXX is not set 465# CONFIG_SCSI_3W_9XXX is not set
454# CONFIG_SCSI_ACARD is not set 466# CONFIG_SCSI_ACARD is not set
@@ -465,6 +477,8 @@ CONFIG_SCSI_LOWLEVEL=y
465# CONFIG_MEGARAID_SAS is not set 477# CONFIG_MEGARAID_SAS is not set
466# CONFIG_SCSI_HPTIOP is not set 478# CONFIG_SCSI_HPTIOP is not set
467# CONFIG_SCSI_BUSLOGIC is not set 479# CONFIG_SCSI_BUSLOGIC is not set
480# CONFIG_LIBFC is not set
481# CONFIG_FCOE is not set
468# CONFIG_SCSI_DMX3191D is not set 482# CONFIG_SCSI_DMX3191D is not set
469# CONFIG_SCSI_EATA is not set 483# CONFIG_SCSI_EATA is not set
470# CONFIG_SCSI_FUTURE_DOMAIN is not set 484# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -523,6 +537,9 @@ CONFIG_DAVICOM_PHY=y
523# CONFIG_BROADCOM_PHY is not set 537# CONFIG_BROADCOM_PHY is not set
524# CONFIG_ICPLUS_PHY is not set 538# CONFIG_ICPLUS_PHY is not set
525# CONFIG_REALTEK_PHY is not set 539# CONFIG_REALTEK_PHY is not set
540# CONFIG_NATIONAL_PHY is not set
541# CONFIG_STE10XP is not set
542# CONFIG_LSI_ET1011C_PHY is not set
526# CONFIG_FIXED_PHY is not set 543# CONFIG_FIXED_PHY is not set
527# CONFIG_MDIO_BITBANG is not set 544# CONFIG_MDIO_BITBANG is not set
528CONFIG_NET_ETHERNET=y 545CONFIG_NET_ETHERNET=y
@@ -563,7 +580,6 @@ CONFIG_NETDEV_1000=y
563# CONFIG_GIANFAR is not set 580# CONFIG_GIANFAR is not set
564CONFIG_UCC_GETH=y 581CONFIG_UCC_GETH=y
565# CONFIG_UGETH_MAGIC_PACKET is not set 582# CONFIG_UGETH_MAGIC_PACKET is not set
566# CONFIG_UGETH_FILTERING is not set
567# CONFIG_UGETH_TX_ON_DEMAND is not set 583# CONFIG_UGETH_TX_ON_DEMAND is not set
568# CONFIG_MV643XX_ETH is not set 584# CONFIG_MV643XX_ETH is not set
569# CONFIG_QLA3XXX is not set 585# CONFIG_QLA3XXX is not set
@@ -572,6 +588,7 @@ CONFIG_UCC_GETH=y
572# CONFIG_JME is not set 588# CONFIG_JME is not set
573CONFIG_NETDEV_10000=y 589CONFIG_NETDEV_10000=y
574# CONFIG_CHELSIO_T1 is not set 590# CONFIG_CHELSIO_T1 is not set
591CONFIG_CHELSIO_T3_DEPENDS=y
575# CONFIG_CHELSIO_T3 is not set 592# CONFIG_CHELSIO_T3 is not set
576# CONFIG_ENIC is not set 593# CONFIG_ENIC is not set
577# CONFIG_IXGBE is not set 594# CONFIG_IXGBE is not set
@@ -594,6 +611,10 @@ CONFIG_NETDEV_10000=y
594# CONFIG_WLAN_PRE80211 is not set 611# CONFIG_WLAN_PRE80211 is not set
595# CONFIG_WLAN_80211 is not set 612# CONFIG_WLAN_80211 is not set
596# CONFIG_IWLWIFI_LEDS is not set 613# CONFIG_IWLWIFI_LEDS is not set
614
615#
616# Enable WiMAX (Networking options) to see the WiMAX drivers
617#
597# CONFIG_WAN is not set 618# CONFIG_WAN is not set
598# CONFIG_FDDI is not set 619# CONFIG_FDDI is not set
599# CONFIG_HIPPI is not set 620# CONFIG_HIPPI is not set
@@ -665,8 +686,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
665# CONFIG_SERIAL_OF_PLATFORM is not set 686# CONFIG_SERIAL_OF_PLATFORM is not set
666# CONFIG_SERIAL_QE is not set 687# CONFIG_SERIAL_QE is not set
667CONFIG_UNIX98_PTYS=y 688CONFIG_UNIX98_PTYS=y
689# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
668CONFIG_LEGACY_PTYS=y 690CONFIG_LEGACY_PTYS=y
669CONFIG_LEGACY_PTY_COUNT=256 691CONFIG_LEGACY_PTY_COUNT=256
692# CONFIG_HVC_UDBG is not set
670# CONFIG_IPMI_HANDLER is not set 693# CONFIG_IPMI_HANDLER is not set
671CONFIG_HW_RANDOM=y 694CONFIG_HW_RANDOM=y
672# CONFIG_NVRAM is not set 695# CONFIG_NVRAM is not set
@@ -738,7 +761,6 @@ CONFIG_I2C_MPC=y
738# CONFIG_SENSORS_PCF8591 is not set 761# CONFIG_SENSORS_PCF8591 is not set
739# CONFIG_SENSORS_MAX6875 is not set 762# CONFIG_SENSORS_MAX6875 is not set
740# CONFIG_SENSORS_TSL2550 is not set 763# CONFIG_SENSORS_TSL2550 is not set
741# CONFIG_MCU_MPC8349EMITX is not set
742# CONFIG_I2C_DEBUG_CORE is not set 764# CONFIG_I2C_DEBUG_CORE is not set
743# CONFIG_I2C_DEBUG_ALGO is not set 765# CONFIG_I2C_DEBUG_ALGO is not set
744# CONFIG_I2C_DEBUG_BUS is not set 766# CONFIG_I2C_DEBUG_BUS is not set
@@ -758,8 +780,10 @@ CONFIG_HWMON=y
758# CONFIG_SENSORS_ADM1029 is not set 780# CONFIG_SENSORS_ADM1029 is not set
759# CONFIG_SENSORS_ADM1031 is not set 781# CONFIG_SENSORS_ADM1031 is not set
760# CONFIG_SENSORS_ADM9240 is not set 782# CONFIG_SENSORS_ADM9240 is not set
783# CONFIG_SENSORS_ADT7462 is not set
761# CONFIG_SENSORS_ADT7470 is not set 784# CONFIG_SENSORS_ADT7470 is not set
762# CONFIG_SENSORS_ADT7473 is not set 785# CONFIG_SENSORS_ADT7473 is not set
786# CONFIG_SENSORS_ADT7475 is not set
763# CONFIG_SENSORS_ATXP1 is not set 787# CONFIG_SENSORS_ATXP1 is not set
764# CONFIG_SENSORS_DS1621 is not set 788# CONFIG_SENSORS_DS1621 is not set
765# CONFIG_SENSORS_I5K_AMB is not set 789# CONFIG_SENSORS_I5K_AMB is not set
@@ -780,6 +804,7 @@ CONFIG_HWMON=y
780# CONFIG_SENSORS_LM90 is not set 804# CONFIG_SENSORS_LM90 is not set
781# CONFIG_SENSORS_LM92 is not set 805# CONFIG_SENSORS_LM92 is not set
782# CONFIG_SENSORS_LM93 is not set 806# CONFIG_SENSORS_LM93 is not set
807# CONFIG_SENSORS_LTC4245 is not set
783# CONFIG_SENSORS_MAX1619 is not set 808# CONFIG_SENSORS_MAX1619 is not set
784# CONFIG_SENSORS_MAX6650 is not set 809# CONFIG_SENSORS_MAX6650 is not set
785# CONFIG_SENSORS_PC87360 is not set 810# CONFIG_SENSORS_PC87360 is not set
@@ -820,11 +845,11 @@ CONFIG_WATCHDOG=y
820# 845#
821# CONFIG_PCIPCWATCHDOG is not set 846# CONFIG_PCIPCWATCHDOG is not set
822# CONFIG_WDTPCI is not set 847# CONFIG_WDTPCI is not set
848CONFIG_SSB_POSSIBLE=y
823 849
824# 850#
825# Sonics Silicon Backplane 851# Sonics Silicon Backplane
826# 852#
827CONFIG_SSB_POSSIBLE=y
828# CONFIG_SSB is not set 853# CONFIG_SSB is not set
829 854
830# 855#
@@ -833,18 +858,13 @@ CONFIG_SSB_POSSIBLE=y
833# CONFIG_MFD_CORE is not set 858# CONFIG_MFD_CORE is not set
834# CONFIG_MFD_SM501 is not set 859# CONFIG_MFD_SM501 is not set
835# CONFIG_HTC_PASIC3 is not set 860# CONFIG_HTC_PASIC3 is not set
861# CONFIG_TWL4030_CORE is not set
836# CONFIG_MFD_TMIO is not set 862# CONFIG_MFD_TMIO is not set
837# CONFIG_PMIC_DA903X is not set 863# CONFIG_PMIC_DA903X is not set
838# CONFIG_MFD_WM8400 is not set 864# CONFIG_MFD_WM8400 is not set
839# CONFIG_MFD_WM8350_I2C is not set 865# CONFIG_MFD_WM8350_I2C is not set
840 866# CONFIG_MFD_PCF50633 is not set
841#
842# Voltage and Current regulators
843#
844# CONFIG_REGULATOR is not set 867# 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
848 868
849# 869#
850# Multimedia devices 870# Multimedia devices
@@ -900,9 +920,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
900# 920#
901 921
902# 922#
903# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 923# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
904# 924#
905# CONFIG_USB_GADGET is not set 925# CONFIG_USB_GADGET is not set
926
927#
928# OTG and related infrastructure
929#
906# CONFIG_UWB is not set 930# CONFIG_UWB is not set
907# CONFIG_MMC is not set 931# CONFIG_MMC is not set
908# CONFIG_MEMSTICK is not set 932# CONFIG_MEMSTICK is not set
@@ -940,6 +964,7 @@ CONFIG_RTC_DRV_DS1374=y
940# CONFIG_RTC_DRV_M41T80 is not set 964# CONFIG_RTC_DRV_M41T80 is not set
941# CONFIG_RTC_DRV_S35390A is not set 965# CONFIG_RTC_DRV_S35390A is not set
942# CONFIG_RTC_DRV_FM3130 is not set 966# CONFIG_RTC_DRV_FM3130 is not set
967# CONFIG_RTC_DRV_RX8581 is not set
943 968
944# 969#
945# SPI RTC drivers 970# SPI RTC drivers
@@ -987,6 +1012,7 @@ CONFIG_FS_MBCACHE=y
987CONFIG_FILE_LOCKING=y 1012CONFIG_FILE_LOCKING=y
988# CONFIG_XFS_FS is not set 1013# CONFIG_XFS_FS is not set
989# CONFIG_OCFS2_FS is not set 1014# CONFIG_OCFS2_FS is not set
1015# CONFIG_BTRFS_FS is not set
990CONFIG_DNOTIFY=y 1016CONFIG_DNOTIFY=y
991CONFIG_INOTIFY=y 1017CONFIG_INOTIFY=y
992CONFIG_INOTIFY_USER=y 1018CONFIG_INOTIFY_USER=y
@@ -1020,10 +1046,7 @@ CONFIG_TMPFS=y
1020# CONFIG_TMPFS_POSIX_ACL is not set 1046# CONFIG_TMPFS_POSIX_ACL is not set
1021# CONFIG_HUGETLB_PAGE is not set 1047# CONFIG_HUGETLB_PAGE is not set
1022# CONFIG_CONFIGFS_FS is not set 1048# CONFIG_CONFIGFS_FS is not set
1023 1049CONFIG_MISC_FILESYSTEMS=y
1024#
1025# Miscellaneous filesystems
1026#
1027# CONFIG_ADFS_FS is not set 1050# CONFIG_ADFS_FS is not set
1028# CONFIG_AFFS_FS is not set 1051# CONFIG_AFFS_FS is not set
1029# CONFIG_HFS_FS is not set 1052# CONFIG_HFS_FS is not set
@@ -1032,6 +1055,7 @@ CONFIG_TMPFS=y
1032# CONFIG_BFS_FS is not set 1055# CONFIG_BFS_FS is not set
1033# CONFIG_EFS_FS is not set 1056# CONFIG_EFS_FS is not set
1034# CONFIG_CRAMFS is not set 1057# CONFIG_CRAMFS is not set
1058# CONFIG_SQUASHFS is not set
1035# CONFIG_VXFS_FS is not set 1059# CONFIG_VXFS_FS is not set
1036# CONFIG_MINIX_FS is not set 1060# CONFIG_MINIX_FS is not set
1037# CONFIG_OMFS_FS is not set 1061# CONFIG_OMFS_FS is not set
@@ -1087,6 +1111,7 @@ CONFIG_UCC=y
1087# Library routines 1111# Library routines
1088# 1112#
1089CONFIG_BITREVERSE=y 1113CONFIG_BITREVERSE=y
1114CONFIG_GENERIC_FIND_LAST_BIT=y
1090# CONFIG_CRC_CCITT is not set 1115# CONFIG_CRC_CCITT is not set
1091# CONFIG_CRC16 is not set 1116# CONFIG_CRC16 is not set
1092# CONFIG_CRC_T10DIF is not set 1117# CONFIG_CRC_T10DIF is not set
@@ -1120,6 +1145,8 @@ CONFIG_FRAME_WARN=1024
1120# CONFIG_LATENCYTOP is not set 1145# CONFIG_LATENCYTOP is not set
1121CONFIG_SYSCTL_SYSCALL_CHECK=y 1146CONFIG_SYSCTL_SYSCALL_CHECK=y
1122CONFIG_HAVE_FUNCTION_TRACER=y 1147CONFIG_HAVE_FUNCTION_TRACER=y
1148CONFIG_HAVE_DYNAMIC_FTRACE=y
1149CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1123 1150
1124# 1151#
1125# Tracers 1152# Tracers
@@ -1127,6 +1154,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1127# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1154# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1128# CONFIG_SAMPLES is not set 1155# CONFIG_SAMPLES is not set
1129CONFIG_HAVE_ARCH_KGDB=y 1156CONFIG_HAVE_ARCH_KGDB=y
1157CONFIG_PRINT_STACK_DEPTH=64
1130# CONFIG_IRQSTACKS is not set 1158# CONFIG_IRQSTACKS is not set
1131# CONFIG_BOOTX_TEXT is not set 1159# CONFIG_BOOTX_TEXT is not set
1132# CONFIG_PPC_EARLY_DEBUG is not set 1160# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1145,11 +1173,15 @@ CONFIG_CRYPTO=y
1145# 1173#
1146# CONFIG_CRYPTO_FIPS is not set 1174# CONFIG_CRYPTO_FIPS is not set
1147CONFIG_CRYPTO_ALGAPI=y 1175CONFIG_CRYPTO_ALGAPI=y
1148CONFIG_CRYPTO_AEAD=y 1176CONFIG_CRYPTO_ALGAPI2=y
1177CONFIG_CRYPTO_AEAD2=y
1149CONFIG_CRYPTO_BLKCIPHER=y 1178CONFIG_CRYPTO_BLKCIPHER=y
1179CONFIG_CRYPTO_BLKCIPHER2=y
1150CONFIG_CRYPTO_HASH=y 1180CONFIG_CRYPTO_HASH=y
1151CONFIG_CRYPTO_RNG=y 1181CONFIG_CRYPTO_HASH2=y
1182CONFIG_CRYPTO_RNG2=y
1152CONFIG_CRYPTO_MANAGER=y 1183CONFIG_CRYPTO_MANAGER=y
1184CONFIG_CRYPTO_MANAGER2=y
1153# CONFIG_CRYPTO_GF128MUL is not set 1185# CONFIG_CRYPTO_GF128MUL is not set
1154# CONFIG_CRYPTO_NULL is not set 1186# CONFIG_CRYPTO_NULL is not set
1155# CONFIG_CRYPTO_CRYPTD is not set 1187# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
index 90c482606880..a012ce235203 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:54 2008 4# Mon Jan 26 15:35:52 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 113CONFIG_SLUB=y
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 126CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 132CONFIG_BLOCK=y
136# CONFIG_LBD is not set 133# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141 137
@@ -152,6 +148,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
156 156
157# 157#
@@ -198,6 +198,8 @@ CONFIG_IPIC=y
198CONFIG_QUICC_ENGINE=y 198CONFIG_QUICC_ENGINE=y
199# CONFIG_QE_GPIO is not set 199# CONFIG_QE_GPIO is not set
200# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
201# CONFIG_SIMPLE_GPIO is not set
202# CONFIG_MCU_MPC8349EMITX is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -226,6 +228,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
226CONFIG_ARCH_HAS_WALK_MEMORY=y 228CONFIG_ARCH_HAS_WALK_MEMORY=y
227CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 229CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
228# CONFIG_KEXEC is not set 230# CONFIG_KEXEC is not set
231# CONFIG_CRASH_DUMP is not set
229CONFIG_ARCH_FLATMEM_ENABLE=y 232CONFIG_ARCH_FLATMEM_ENABLE=y
230CONFIG_ARCH_POPULATES_NODE_MAP=y 233CONFIG_ARCH_POPULATES_NODE_MAP=y
231CONFIG_SELECT_MEMORY_MODEL=y 234CONFIG_SELECT_MEMORY_MODEL=y
@@ -237,12 +240,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
237CONFIG_PAGEFLAGS_EXTENDED=y 240CONFIG_PAGEFLAGS_EXTENDED=y
238CONFIG_SPLIT_PTLOCK_CPUS=4 241CONFIG_SPLIT_PTLOCK_CPUS=4
239CONFIG_MIGRATION=y 242CONFIG_MIGRATION=y
240# CONFIG_RESOURCES_64BIT is not set
241# CONFIG_PHYS_ADDR_T_64BIT is not set 243# CONFIG_PHYS_ADDR_T_64BIT is not set
242CONFIG_ZONE_DMA_FLAG=1 244CONFIG_ZONE_DMA_FLAG=1
243CONFIG_BOUNCE=y 245CONFIG_BOUNCE=y
244CONFIG_VIRT_TO_BUS=y 246CONFIG_VIRT_TO_BUS=y
245CONFIG_UNEVICTABLE_LRU=y 247CONFIG_UNEVICTABLE_LRU=y
248CONFIG_PPC_4K_PAGES=y
249# CONFIG_PPC_16K_PAGES is not set
250# CONFIG_PPC_64K_PAGES is not set
246CONFIG_FORCE_MAX_ZONEORDER=11 251CONFIG_FORCE_MAX_ZONEORDER=11
247CONFIG_PROC_DEVICETREE=y 252CONFIG_PROC_DEVICETREE=y
248# CONFIG_CMDLINE_BOOL is not set 253# CONFIG_CMDLINE_BOOL is not set
@@ -267,6 +272,7 @@ CONFIG_PCI_SYSCALL=y
267CONFIG_ARCH_SUPPORTS_MSI=y 272CONFIG_ARCH_SUPPORTS_MSI=y
268# CONFIG_PCI_MSI is not set 273# CONFIG_PCI_MSI is not set
269# CONFIG_PCI_LEGACY is not set 274# CONFIG_PCI_LEGACY is not set
275# CONFIG_PCI_STUB is not set
270# CONFIG_PCCARD is not set 276# CONFIG_PCCARD is not set
271# CONFIG_HOTPLUG_PCI is not set 277# CONFIG_HOTPLUG_PCI is not set
272# CONFIG_HAS_RAPIDIO is not set 278# CONFIG_HAS_RAPIDIO is not set
@@ -289,6 +295,7 @@ CONFIG_NET=y
289# 295#
290# Networking options 296# Networking options
291# 297#
298CONFIG_COMPAT_NET_DEV_OPS=y
292CONFIG_PACKET=y 299CONFIG_PACKET=y
293# CONFIG_PACKET_MMAP is not set 300# CONFIG_PACKET_MMAP is not set
294CONFIG_UNIX=y 301CONFIG_UNIX=y
@@ -345,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
347# CONFIG_NET_SCHED is not set 354# CONFIG_NET_SCHED is not set
355# CONFIG_DCB is not set
348 356
349# 357#
350# Network testing 358# Network testing
@@ -360,8 +368,9 @@ CONFIG_WIRELESS=y
360# CONFIG_CFG80211 is not set 368# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y 369CONFIG_WIRELESS_OLD_REGULATORY=y
362# CONFIG_WIRELESS_EXT is not set 370# CONFIG_WIRELESS_EXT is not set
371# CONFIG_LIB80211 is not set
363# CONFIG_MAC80211 is not set 372# CONFIG_MAC80211 is not set
364# CONFIG_IEEE80211 is not set 373# CONFIG_WIMAX is not set
365# CONFIG_RFKILL is not set 374# CONFIG_RFKILL is not set
366# CONFIG_NET_9P is not set 375# CONFIG_NET_9P is not set
367 376
@@ -407,8 +416,10 @@ CONFIG_MISC_DEVICES=y
407# CONFIG_EEPROM_93CX6 is not set 416# CONFIG_EEPROM_93CX6 is not set
408# CONFIG_SGI_IOC4 is not set 417# CONFIG_SGI_IOC4 is not set
409# CONFIG_TIFM_CORE is not set 418# CONFIG_TIFM_CORE is not set
419# CONFIG_ICS932S401 is not set
410# CONFIG_ENCLOSURE_SERVICES is not set 420# CONFIG_ENCLOSURE_SERVICES is not set
411# CONFIG_HP_ILO is not set 421# CONFIG_HP_ILO is not set
422# CONFIG_C2PORT is not set
412CONFIG_HAVE_IDE=y 423CONFIG_HAVE_IDE=y
413# CONFIG_IDE is not set 424# CONFIG_IDE is not set
414 425
@@ -451,6 +462,7 @@ CONFIG_SCSI_WAIT_SCAN=m
451# CONFIG_SCSI_SRP_ATTRS is not set 462# CONFIG_SCSI_SRP_ATTRS is not set
452CONFIG_SCSI_LOWLEVEL=y 463CONFIG_SCSI_LOWLEVEL=y
453# CONFIG_ISCSI_TCP is not set 464# CONFIG_ISCSI_TCP is not set
465# CONFIG_SCSI_CXGB3_ISCSI is not set
454# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 466# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
455# CONFIG_SCSI_3W_9XXX is not set 467# CONFIG_SCSI_3W_9XXX is not set
456# CONFIG_SCSI_ACARD is not set 468# CONFIG_SCSI_ACARD is not set
@@ -467,6 +479,8 @@ CONFIG_SCSI_LOWLEVEL=y
467# CONFIG_MEGARAID_SAS is not set 479# CONFIG_MEGARAID_SAS is not set
468# CONFIG_SCSI_HPTIOP is not set 480# CONFIG_SCSI_HPTIOP is not set
469# CONFIG_SCSI_BUSLOGIC is not set 481# CONFIG_SCSI_BUSLOGIC is not set
482# CONFIG_LIBFC is not set
483# CONFIG_FCOE is not set
470# CONFIG_SCSI_DMX3191D is not set 484# CONFIG_SCSI_DMX3191D is not set
471# CONFIG_SCSI_EATA is not set 485# CONFIG_SCSI_EATA is not set
472# CONFIG_SCSI_FUTURE_DOMAIN is not set 486# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -525,6 +539,9 @@ CONFIG_PHYLIB=y
525# CONFIG_BROADCOM_PHY is not set 539# CONFIG_BROADCOM_PHY is not set
526CONFIG_ICPLUS_PHY=y 540CONFIG_ICPLUS_PHY=y
527# CONFIG_REALTEK_PHY is not set 541# CONFIG_REALTEK_PHY is not set
542# CONFIG_NATIONAL_PHY is not set
543# CONFIG_STE10XP is not set
544# CONFIG_LSI_ET1011C_PHY is not set
528# CONFIG_FIXED_PHY is not set 545# CONFIG_FIXED_PHY is not set
529# CONFIG_MDIO_BITBANG is not set 546# CONFIG_MDIO_BITBANG is not set
530CONFIG_NET_ETHERNET=y 547CONFIG_NET_ETHERNET=y
@@ -566,7 +583,6 @@ CONFIG_E1000=y
566# CONFIG_GIANFAR is not set 583# CONFIG_GIANFAR is not set
567CONFIG_UCC_GETH=y 584CONFIG_UCC_GETH=y
568# CONFIG_UGETH_MAGIC_PACKET is not set 585# CONFIG_UGETH_MAGIC_PACKET is not set
569# CONFIG_UGETH_FILTERING is not set
570# CONFIG_UGETH_TX_ON_DEMAND is not set 586# CONFIG_UGETH_TX_ON_DEMAND is not set
571# CONFIG_MV643XX_ETH is not set 587# CONFIG_MV643XX_ETH is not set
572# CONFIG_QLA3XXX is not set 588# CONFIG_QLA3XXX is not set
@@ -575,6 +591,7 @@ CONFIG_UCC_GETH=y
575# CONFIG_JME is not set 591# CONFIG_JME is not set
576CONFIG_NETDEV_10000=y 592CONFIG_NETDEV_10000=y
577# CONFIG_CHELSIO_T1 is not set 593# CONFIG_CHELSIO_T1 is not set
594CONFIG_CHELSIO_T3_DEPENDS=y
578# CONFIG_CHELSIO_T3 is not set 595# CONFIG_CHELSIO_T3 is not set
579# CONFIG_ENIC is not set 596# CONFIG_ENIC is not set
580# CONFIG_IXGBE is not set 597# CONFIG_IXGBE is not set
@@ -599,6 +616,10 @@ CONFIG_NETDEV_10000=y
599# CONFIG_IWLWIFI_LEDS is not set 616# CONFIG_IWLWIFI_LEDS is not set
600 617
601# 618#
619# Enable WiMAX (Networking options) to see the WiMAX drivers
620#
621
622#
602# USB Network Adapters 623# USB Network Adapters
603# 624#
604# CONFIG_USB_CATC is not set 625# CONFIG_USB_CATC is not set
@@ -677,8 +698,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
677# CONFIG_SERIAL_OF_PLATFORM is not set 698# CONFIG_SERIAL_OF_PLATFORM is not set
678# CONFIG_SERIAL_QE is not set 699# CONFIG_SERIAL_QE is not set
679CONFIG_UNIX98_PTYS=y 700CONFIG_UNIX98_PTYS=y
701# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
680CONFIG_LEGACY_PTYS=y 702CONFIG_LEGACY_PTYS=y
681CONFIG_LEGACY_PTY_COUNT=256 703CONFIG_LEGACY_PTY_COUNT=256
704# CONFIG_HVC_UDBG is not set
682# CONFIG_IPMI_HANDLER is not set 705# CONFIG_IPMI_HANDLER is not set
683CONFIG_HW_RANDOM=y 706CONFIG_HW_RANDOM=y
684# CONFIG_NVRAM is not set 707# CONFIG_NVRAM is not set
@@ -753,7 +776,6 @@ CONFIG_I2C_MPC=y
753# CONFIG_SENSORS_PCF8591 is not set 776# CONFIG_SENSORS_PCF8591 is not set
754# CONFIG_SENSORS_MAX6875 is not set 777# CONFIG_SENSORS_MAX6875 is not set
755# CONFIG_SENSORS_TSL2550 is not set 778# CONFIG_SENSORS_TSL2550 is not set
756# CONFIG_MCU_MPC8349EMITX is not set
757# CONFIG_I2C_DEBUG_CORE is not set 779# CONFIG_I2C_DEBUG_CORE is not set
758# CONFIG_I2C_DEBUG_ALGO is not set 780# CONFIG_I2C_DEBUG_ALGO is not set
759# CONFIG_I2C_DEBUG_BUS is not set 781# CONFIG_I2C_DEBUG_BUS is not set
@@ -788,8 +810,10 @@ CONFIG_HWMON=y
788# CONFIG_SENSORS_ADM1029 is not set 810# CONFIG_SENSORS_ADM1029 is not set
789# CONFIG_SENSORS_ADM1031 is not set 811# CONFIG_SENSORS_ADM1031 is not set
790# CONFIG_SENSORS_ADM9240 is not set 812# CONFIG_SENSORS_ADM9240 is not set
813# CONFIG_SENSORS_ADT7462 is not set
791# CONFIG_SENSORS_ADT7470 is not set 814# CONFIG_SENSORS_ADT7470 is not set
792# CONFIG_SENSORS_ADT7473 is not set 815# CONFIG_SENSORS_ADT7473 is not set
816# CONFIG_SENSORS_ADT7475 is not set
793# CONFIG_SENSORS_ATXP1 is not set 817# CONFIG_SENSORS_ATXP1 is not set
794# CONFIG_SENSORS_DS1621 is not set 818# CONFIG_SENSORS_DS1621 is not set
795# CONFIG_SENSORS_I5K_AMB is not set 819# CONFIG_SENSORS_I5K_AMB is not set
@@ -811,6 +835,7 @@ CONFIG_HWMON=y
811# CONFIG_SENSORS_LM90 is not set 835# CONFIG_SENSORS_LM90 is not set
812# CONFIG_SENSORS_LM92 is not set 836# CONFIG_SENSORS_LM92 is not set
813# CONFIG_SENSORS_LM93 is not set 837# CONFIG_SENSORS_LM93 is not set
838# CONFIG_SENSORS_LTC4245 is not set
814# CONFIG_SENSORS_MAX1111 is not set 839# CONFIG_SENSORS_MAX1111 is not set
815# CONFIG_SENSORS_MAX1619 is not set 840# CONFIG_SENSORS_MAX1619 is not set
816# CONFIG_SENSORS_MAX6650 is not set 841# CONFIG_SENSORS_MAX6650 is not set
@@ -857,11 +882,11 @@ CONFIG_WATCHDOG=y
857# USB-based Watchdog Cards 882# USB-based Watchdog Cards
858# 883#
859# CONFIG_USBPCWATCHDOG is not set 884# CONFIG_USBPCWATCHDOG is not set
885CONFIG_SSB_POSSIBLE=y
860 886
861# 887#
862# Sonics Silicon Backplane 888# Sonics Silicon Backplane
863# 889#
864CONFIG_SSB_POSSIBLE=y
865# CONFIG_SSB is not set 890# CONFIG_SSB is not set
866 891
867# 892#
@@ -870,18 +895,13 @@ CONFIG_SSB_POSSIBLE=y
870# CONFIG_MFD_CORE is not set 895# CONFIG_MFD_CORE is not set
871# CONFIG_MFD_SM501 is not set 896# CONFIG_MFD_SM501 is not set
872# CONFIG_HTC_PASIC3 is not set 897# CONFIG_HTC_PASIC3 is not set
898# CONFIG_TWL4030_CORE is not set
873# CONFIG_MFD_TMIO is not set 899# CONFIG_MFD_TMIO is not set
874# CONFIG_PMIC_DA903X is not set 900# CONFIG_PMIC_DA903X is not set
875# CONFIG_MFD_WM8400 is not set 901# CONFIG_MFD_WM8400 is not set
876# CONFIG_MFD_WM8350_I2C is not set 902# CONFIG_MFD_WM8350_I2C is not set
877 903# CONFIG_MFD_PCF50633 is not set
878#
879# Voltage and Current regulators
880#
881# CONFIG_REGULATOR is not set 904# 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
885 905
886# 906#
887# Multimedia devices 907# Multimedia devices
@@ -966,6 +986,7 @@ CONFIG_USB_EHCI_HCD=y
966# CONFIG_USB_EHCI_TT_NEWSCHED is not set 986# CONFIG_USB_EHCI_TT_NEWSCHED is not set
967# CONFIG_USB_EHCI_FSL is not set 987# CONFIG_USB_EHCI_FSL is not set
968CONFIG_USB_EHCI_HCD_PPC_OF=y 988CONFIG_USB_EHCI_HCD_PPC_OF=y
989# CONFIG_USB_OXU210HP_HCD is not set
969# CONFIG_USB_ISP116X_HCD is not set 990# CONFIG_USB_ISP116X_HCD is not set
970# CONFIG_USB_ISP1760_HCD is not set 991# CONFIG_USB_ISP1760_HCD is not set
971CONFIG_USB_OHCI_HCD=y 992CONFIG_USB_OHCI_HCD=y
@@ -991,18 +1012,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
991# CONFIG_USB_TMC is not set 1012# CONFIG_USB_TMC is not set
992 1013
993# 1014#
994# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1015# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
995# 1016#
996 1017
997# 1018#
998# may also be needed; see USB_STORAGE Help for more information 1019# see USB_STORAGE Help for more information
999# 1020#
1000CONFIG_USB_STORAGE=y 1021CONFIG_USB_STORAGE=y
1001# CONFIG_USB_STORAGE_DEBUG is not set 1022# CONFIG_USB_STORAGE_DEBUG is not set
1002# CONFIG_USB_STORAGE_DATAFAB is not set 1023# CONFIG_USB_STORAGE_DATAFAB is not set
1003# CONFIG_USB_STORAGE_FREECOM is not set 1024# CONFIG_USB_STORAGE_FREECOM is not set
1004# CONFIG_USB_STORAGE_ISD200 is not set 1025# CONFIG_USB_STORAGE_ISD200 is not set
1005# CONFIG_USB_STORAGE_DPCM is not set
1006# CONFIG_USB_STORAGE_USBAT is not set 1026# CONFIG_USB_STORAGE_USBAT is not set
1007# CONFIG_USB_STORAGE_SDDR09 is not set 1027# CONFIG_USB_STORAGE_SDDR09 is not set
1008# CONFIG_USB_STORAGE_SDDR55 is not set 1028# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1050,6 +1070,10 @@ CONFIG_USB_STORAGE=y
1050# CONFIG_USB_ISIGHTFW is not set 1070# CONFIG_USB_ISIGHTFW is not set
1051# CONFIG_USB_VST is not set 1071# CONFIG_USB_VST is not set
1052# CONFIG_USB_GADGET is not set 1072# CONFIG_USB_GADGET is not set
1073
1074#
1075# OTG and related infrastructure
1076#
1053# CONFIG_UWB is not set 1077# CONFIG_UWB is not set
1054CONFIG_MMC=y 1078CONFIG_MMC=y
1055# CONFIG_MMC_DEBUG is not set 1079# CONFIG_MMC_DEBUG is not set
@@ -1099,6 +1123,7 @@ CONFIG_FS_MBCACHE=y
1099CONFIG_FILE_LOCKING=y 1123CONFIG_FILE_LOCKING=y
1100# CONFIG_XFS_FS is not set 1124# CONFIG_XFS_FS is not set
1101# CONFIG_OCFS2_FS is not set 1125# CONFIG_OCFS2_FS is not set
1126# CONFIG_BTRFS_FS is not set
1102CONFIG_DNOTIFY=y 1127CONFIG_DNOTIFY=y
1103CONFIG_INOTIFY=y 1128CONFIG_INOTIFY=y
1104CONFIG_INOTIFY_USER=y 1129CONFIG_INOTIFY_USER=y
@@ -1135,10 +1160,7 @@ CONFIG_TMPFS=y
1135# CONFIG_TMPFS_POSIX_ACL is not set 1160# CONFIG_TMPFS_POSIX_ACL is not set
1136# CONFIG_HUGETLB_PAGE is not set 1161# CONFIG_HUGETLB_PAGE is not set
1137# CONFIG_CONFIGFS_FS is not set 1162# CONFIG_CONFIGFS_FS is not set
1138 1163CONFIG_MISC_FILESYSTEMS=y
1139#
1140# Miscellaneous filesystems
1141#
1142# CONFIG_ADFS_FS is not set 1164# CONFIG_ADFS_FS is not set
1143# CONFIG_AFFS_FS is not set 1165# CONFIG_AFFS_FS is not set
1144# CONFIG_HFS_FS is not set 1166# CONFIG_HFS_FS is not set
@@ -1147,6 +1169,7 @@ CONFIG_TMPFS=y
1147# CONFIG_BFS_FS is not set 1169# CONFIG_BFS_FS is not set
1148# CONFIG_EFS_FS is not set 1170# CONFIG_EFS_FS is not set
1149# CONFIG_CRAMFS is not set 1171# CONFIG_CRAMFS is not set
1172# CONFIG_SQUASHFS is not set
1150# CONFIG_VXFS_FS is not set 1173# CONFIG_VXFS_FS is not set
1151# CONFIG_MINIX_FS is not set 1174# CONFIG_MINIX_FS is not set
1152# CONFIG_OMFS_FS is not set 1175# CONFIG_OMFS_FS is not set
@@ -1246,6 +1269,7 @@ CONFIG_UCC=y
1246# Library routines 1269# Library routines
1247# 1270#
1248CONFIG_BITREVERSE=y 1271CONFIG_BITREVERSE=y
1272CONFIG_GENERIC_FIND_LAST_BIT=y
1249# CONFIG_CRC_CCITT is not set 1273# CONFIG_CRC_CCITT is not set
1250# CONFIG_CRC16 is not set 1274# CONFIG_CRC16 is not set
1251CONFIG_CRC_T10DIF=y 1275CONFIG_CRC_T10DIF=y
@@ -1279,6 +1303,8 @@ CONFIG_FRAME_WARN=1024
1279# CONFIG_LATENCYTOP is not set 1303# CONFIG_LATENCYTOP is not set
1280CONFIG_SYSCTL_SYSCALL_CHECK=y 1304CONFIG_SYSCTL_SYSCALL_CHECK=y
1281CONFIG_HAVE_FUNCTION_TRACER=y 1305CONFIG_HAVE_FUNCTION_TRACER=y
1306CONFIG_HAVE_DYNAMIC_FTRACE=y
1307CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1282 1308
1283# 1309#
1284# Tracers 1310# Tracers
@@ -1286,6 +1312,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1286# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1312# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1287# CONFIG_SAMPLES is not set 1313# CONFIG_SAMPLES is not set
1288CONFIG_HAVE_ARCH_KGDB=y 1314CONFIG_HAVE_ARCH_KGDB=y
1315CONFIG_PRINT_STACK_DEPTH=64
1289# CONFIG_IRQSTACKS is not set 1316# CONFIG_IRQSTACKS is not set
1290# CONFIG_BOOTX_TEXT is not set 1317# CONFIG_BOOTX_TEXT is not set
1291# CONFIG_PPC_EARLY_DEBUG is not set 1318# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1304,11 +1331,15 @@ CONFIG_CRYPTO=y
1304# 1331#
1305# CONFIG_CRYPTO_FIPS is not set 1332# CONFIG_CRYPTO_FIPS is not set
1306CONFIG_CRYPTO_ALGAPI=y 1333CONFIG_CRYPTO_ALGAPI=y
1307CONFIG_CRYPTO_AEAD=y 1334CONFIG_CRYPTO_ALGAPI2=y
1335CONFIG_CRYPTO_AEAD2=y
1308CONFIG_CRYPTO_BLKCIPHER=y 1336CONFIG_CRYPTO_BLKCIPHER=y
1337CONFIG_CRYPTO_BLKCIPHER2=y
1309CONFIG_CRYPTO_HASH=y 1338CONFIG_CRYPTO_HASH=y
1310CONFIG_CRYPTO_RNG=y 1339CONFIG_CRYPTO_HASH2=y
1340CONFIG_CRYPTO_RNG2=y
1311CONFIG_CRYPTO_MANAGER=y 1341CONFIG_CRYPTO_MANAGER=y
1342CONFIG_CRYPTO_MANAGER2=y
1312# CONFIG_CRYPTO_GF128MUL is not set 1343# CONFIG_CRYPTO_GF128MUL is not set
1313# CONFIG_CRYPTO_NULL is not set 1344# CONFIG_CRYPTO_NULL is not set
1314# CONFIG_CRYPTO_CRYPTD is not set 1345# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
index 42b7f3403fb0..4bcc4a1ff308 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:56 2008 4# Mon Jan 26 15:35:53 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 113CONFIG_SLUB=y
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 126CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 132CONFIG_BLOCK=y
136# CONFIG_LBD is not set 133# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141 137
@@ -152,6 +148,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
156 156
157# 157#
@@ -198,6 +198,8 @@ CONFIG_IPIC=y
198# CONFIG_QUICC_ENGINE is not set 198# CONFIG_QUICC_ENGINE is not set
199# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_MPC8xxx_GPIO is not set 200# CONFIG_MPC8xxx_GPIO is not set
201# CONFIG_SIMPLE_GPIO is not set
202# CONFIG_MCU_MPC8349EMITX is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -225,6 +227,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 227CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 228CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 229# CONFIG_KEXEC is not set
230# CONFIG_CRASH_DUMP is not set
228CONFIG_ARCH_FLATMEM_ENABLE=y 231CONFIG_ARCH_FLATMEM_ENABLE=y
229CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
230CONFIG_SELECT_MEMORY_MODEL=y 233CONFIG_SELECT_MEMORY_MODEL=y
@@ -236,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
236CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
238CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set 242# CONFIG_PHYS_ADDR_T_64BIT is not set
241CONFIG_ZONE_DMA_FLAG=1 243CONFIG_ZONE_DMA_FLAG=1
242CONFIG_BOUNCE=y 244CONFIG_BOUNCE=y
243CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
245CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
247# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -266,6 +271,7 @@ CONFIG_PCI_SYSCALL=y
266CONFIG_ARCH_SUPPORTS_MSI=y 271CONFIG_ARCH_SUPPORTS_MSI=y
267# CONFIG_PCI_MSI is not set 272# CONFIG_PCI_MSI is not set
268# CONFIG_PCI_LEGACY is not set 273# CONFIG_PCI_LEGACY is not set
274# CONFIG_PCI_STUB is not set
269# CONFIG_PCCARD is not set 275# CONFIG_PCCARD is not set
270# CONFIG_HOTPLUG_PCI is not set 276# CONFIG_HOTPLUG_PCI is not set
271# CONFIG_HAS_RAPIDIO is not set 277# CONFIG_HAS_RAPIDIO is not set
@@ -288,6 +294,7 @@ CONFIG_NET=y
288# 294#
289# Networking options 295# Networking options
290# 296#
297CONFIG_COMPAT_NET_DEV_OPS=y
291CONFIG_PACKET=y 298CONFIG_PACKET=y
292# CONFIG_PACKET_MMAP is not set 299# CONFIG_PACKET_MMAP is not set
293CONFIG_UNIX=y 300CONFIG_UNIX=y
@@ -344,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_ECONET is not set 351# CONFIG_ECONET is not set
345# CONFIG_WAN_ROUTER is not set 352# CONFIG_WAN_ROUTER is not set
346# CONFIG_NET_SCHED is not set 353# CONFIG_NET_SCHED is not set
354# CONFIG_DCB is not set
347 355
348# 356#
349# Network testing 357# Network testing
@@ -359,8 +367,9 @@ CONFIG_WIRELESS=y
359# CONFIG_CFG80211 is not set 367# CONFIG_CFG80211 is not set
360CONFIG_WIRELESS_OLD_REGULATORY=y 368CONFIG_WIRELESS_OLD_REGULATORY=y
361# CONFIG_WIRELESS_EXT is not set 369# CONFIG_WIRELESS_EXT is not set
370# CONFIG_LIB80211 is not set
362# CONFIG_MAC80211 is not set 371# CONFIG_MAC80211 is not set
363# CONFIG_IEEE80211 is not set 372# CONFIG_WIMAX is not set
364# CONFIG_RFKILL is not set 373# CONFIG_RFKILL is not set
365# CONFIG_NET_9P is not set 374# CONFIG_NET_9P is not set
366 375
@@ -381,6 +390,7 @@ CONFIG_MTD=y
381# CONFIG_MTD_DEBUG is not set 390# CONFIG_MTD_DEBUG is not set
382# CONFIG_MTD_CONCAT is not set 391# CONFIG_MTD_CONCAT is not set
383# CONFIG_MTD_PARTITIONS is not set 392# CONFIG_MTD_PARTITIONS is not set
393# CONFIG_MTD_TESTS is not set
384 394
385# 395#
386# User Modules And Translation Layers 396# User Modules And Translation Layers
@@ -426,9 +436,7 @@ CONFIG_MTD_CFI_UTIL=y
426# 436#
427# CONFIG_MTD_COMPLEX_MAPPINGS is not set 437# CONFIG_MTD_COMPLEX_MAPPINGS is not set
428CONFIG_MTD_PHYSMAP=y 438CONFIG_MTD_PHYSMAP=y
429CONFIG_MTD_PHYSMAP_START=0xfe000000 439# CONFIG_MTD_PHYSMAP_COMPAT is not set
430CONFIG_MTD_PHYSMAP_LEN=0x1000000
431CONFIG_MTD_PHYSMAP_BANKWIDTH=2
432# CONFIG_MTD_PHYSMAP_OF is not set 440# CONFIG_MTD_PHYSMAP_OF is not set
433# CONFIG_MTD_INTEL_VR_NOR is not set 441# CONFIG_MTD_INTEL_VR_NOR is not set
434# CONFIG_MTD_PLATRAM is not set 442# CONFIG_MTD_PLATRAM is not set
@@ -454,6 +462,12 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
454# CONFIG_MTD_ONENAND is not set 462# CONFIG_MTD_ONENAND is not set
455 463
456# 464#
465# LPDDR flash memory drivers
466#
467# CONFIG_MTD_LPDDR is not set
468# CONFIG_MTD_QINFO_PROBE is not set
469
470#
457# UBI - Unsorted block images 471# UBI - Unsorted block images
458# 472#
459# CONFIG_MTD_UBI is not set 473# CONFIG_MTD_UBI is not set
@@ -485,8 +499,10 @@ CONFIG_MISC_DEVICES=y
485# CONFIG_EEPROM_93CX6 is not set 499# CONFIG_EEPROM_93CX6 is not set
486# CONFIG_SGI_IOC4 is not set 500# CONFIG_SGI_IOC4 is not set
487# CONFIG_TIFM_CORE is not set 501# CONFIG_TIFM_CORE is not set
502# CONFIG_ICS932S401 is not set
488# CONFIG_ENCLOSURE_SERVICES is not set 503# CONFIG_ENCLOSURE_SERVICES is not set
489# CONFIG_HP_ILO is not set 504# CONFIG_HP_ILO is not set
505# CONFIG_C2PORT is not set
490CONFIG_HAVE_IDE=y 506CONFIG_HAVE_IDE=y
491CONFIG_IDE=y 507CONFIG_IDE=y
492 508
@@ -499,7 +515,6 @@ CONFIG_IDE_GD_ATA=y
499# CONFIG_IDE_GD_ATAPI is not set 515# CONFIG_IDE_GD_ATAPI is not set
500# CONFIG_BLK_DEV_IDECD is not set 516# CONFIG_BLK_DEV_IDECD is not set
501# CONFIG_BLK_DEV_IDETAPE is not set 517# CONFIG_BLK_DEV_IDETAPE is not set
502# CONFIG_BLK_DEV_IDESCSI is not set
503# CONFIG_IDE_TASK_IOCTL is not set 518# CONFIG_IDE_TASK_IOCTL is not set
504CONFIG_IDE_PROC_FS=y 519CONFIG_IDE_PROC_FS=y
505 520
@@ -524,6 +539,7 @@ CONFIG_IDE_PROC_FS=y
524# CONFIG_BLK_DEV_JMICRON is not set 539# CONFIG_BLK_DEV_JMICRON is not set
525# CONFIG_BLK_DEV_SC1200 is not set 540# CONFIG_BLK_DEV_SC1200 is not set
526# CONFIG_BLK_DEV_PIIX is not set 541# CONFIG_BLK_DEV_PIIX is not set
542# CONFIG_BLK_DEV_IT8172 is not set
527# CONFIG_BLK_DEV_IT8213 is not set 543# CONFIG_BLK_DEV_IT8213 is not set
528# CONFIG_BLK_DEV_IT821X is not set 544# CONFIG_BLK_DEV_IT821X is not set
529# CONFIG_BLK_DEV_NS87415 is not set 545# CONFIG_BLK_DEV_NS87415 is not set
@@ -577,6 +593,7 @@ CONFIG_SCSI_SPI_ATTRS=y
577# CONFIG_SCSI_SRP_ATTRS is not set 593# CONFIG_SCSI_SRP_ATTRS is not set
578CONFIG_SCSI_LOWLEVEL=y 594CONFIG_SCSI_LOWLEVEL=y
579# CONFIG_ISCSI_TCP is not set 595# CONFIG_ISCSI_TCP is not set
596# CONFIG_SCSI_CXGB3_ISCSI is not set
580# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 597# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
581# CONFIG_SCSI_3W_9XXX is not set 598# CONFIG_SCSI_3W_9XXX is not set
582# CONFIG_SCSI_ACARD is not set 599# CONFIG_SCSI_ACARD is not set
@@ -593,6 +610,8 @@ CONFIG_SCSI_LOWLEVEL=y
593# CONFIG_MEGARAID_SAS is not set 610# CONFIG_MEGARAID_SAS is not set
594# CONFIG_SCSI_HPTIOP is not set 611# CONFIG_SCSI_HPTIOP is not set
595# CONFIG_SCSI_BUSLOGIC is not set 612# CONFIG_SCSI_BUSLOGIC is not set
613# CONFIG_LIBFC is not set
614# CONFIG_FCOE is not set
596# CONFIG_SCSI_DMX3191D is not set 615# CONFIG_SCSI_DMX3191D is not set
597# CONFIG_SCSI_EATA is not set 616# CONFIG_SCSI_EATA is not set
598# CONFIG_SCSI_FUTURE_DOMAIN is not set 617# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -723,6 +742,9 @@ CONFIG_CICADA_PHY=y
723# CONFIG_BROADCOM_PHY is not set 742# CONFIG_BROADCOM_PHY is not set
724# CONFIG_ICPLUS_PHY is not set 743# CONFIG_ICPLUS_PHY is not set
725# CONFIG_REALTEK_PHY is not set 744# CONFIG_REALTEK_PHY is not set
745# CONFIG_NATIONAL_PHY is not set
746# CONFIG_STE10XP is not set
747# CONFIG_LSI_ET1011C_PHY is not set
726CONFIG_FIXED_PHY=y 748CONFIG_FIXED_PHY=y
727# CONFIG_MDIO_BITBANG is not set 749# CONFIG_MDIO_BITBANG is not set
728# CONFIG_NET_ETHERNET is not set 750# CONFIG_NET_ETHERNET is not set
@@ -751,6 +773,7 @@ CONFIG_GIANFAR=y
751# CONFIG_JME is not set 773# CONFIG_JME is not set
752CONFIG_NETDEV_10000=y 774CONFIG_NETDEV_10000=y
753# CONFIG_CHELSIO_T1 is not set 775# CONFIG_CHELSIO_T1 is not set
776CONFIG_CHELSIO_T3_DEPENDS=y
754# CONFIG_CHELSIO_T3 is not set 777# CONFIG_CHELSIO_T3 is not set
755# CONFIG_ENIC is not set 778# CONFIG_ENIC is not set
756# CONFIG_IXGBE is not set 779# CONFIG_IXGBE is not set
@@ -775,6 +798,10 @@ CONFIG_NETDEV_10000=y
775# CONFIG_IWLWIFI_LEDS is not set 798# CONFIG_IWLWIFI_LEDS is not set
776 799
777# 800#
801# Enable WiMAX (Networking options) to see the WiMAX drivers
802#
803
804#
778# USB Network Adapters 805# USB Network Adapters
779# 806#
780# CONFIG_USB_CATC is not set 807# CONFIG_USB_CATC is not set
@@ -832,8 +859,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
832# CONFIG_SERIAL_JSM is not set 859# CONFIG_SERIAL_JSM is not set
833# CONFIG_SERIAL_OF_PLATFORM is not set 860# CONFIG_SERIAL_OF_PLATFORM is not set
834CONFIG_UNIX98_PTYS=y 861CONFIG_UNIX98_PTYS=y
862# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
835CONFIG_LEGACY_PTYS=y 863CONFIG_LEGACY_PTYS=y
836CONFIG_LEGACY_PTY_COUNT=256 864CONFIG_LEGACY_PTY_COUNT=256
865# CONFIG_HVC_UDBG is not set
837# CONFIG_IPMI_HANDLER is not set 866# CONFIG_IPMI_HANDLER is not set
838CONFIG_HW_RANDOM=y 867CONFIG_HW_RANDOM=y
839# CONFIG_NVRAM is not set 868# CONFIG_NVRAM is not set
@@ -906,7 +935,6 @@ CONFIG_SENSORS_PCF8574=y
906# CONFIG_SENSORS_PCF8591 is not set 935# CONFIG_SENSORS_PCF8591 is not set
907# CONFIG_SENSORS_MAX6875 is not set 936# CONFIG_SENSORS_MAX6875 is not set
908# CONFIG_SENSORS_TSL2550 is not set 937# CONFIG_SENSORS_TSL2550 is not set
909# CONFIG_MCU_MPC8349EMITX is not set
910# CONFIG_I2C_DEBUG_CORE is not set 938# CONFIG_I2C_DEBUG_CORE is not set
911# CONFIG_I2C_DEBUG_ALGO is not set 939# CONFIG_I2C_DEBUG_ALGO is not set
912# CONFIG_I2C_DEBUG_BUS is not set 940# CONFIG_I2C_DEBUG_BUS is not set
@@ -953,11 +981,11 @@ CONFIG_WATCHDOG=y
953# USB-based Watchdog Cards 981# USB-based Watchdog Cards
954# 982#
955# CONFIG_USBPCWATCHDOG is not set 983# CONFIG_USBPCWATCHDOG is not set
984CONFIG_SSB_POSSIBLE=y
956 985
957# 986#
958# Sonics Silicon Backplane 987# Sonics Silicon Backplane
959# 988#
960CONFIG_SSB_POSSIBLE=y
961# CONFIG_SSB is not set 989# CONFIG_SSB is not set
962 990
963# 991#
@@ -966,18 +994,13 @@ CONFIG_SSB_POSSIBLE=y
966# CONFIG_MFD_CORE is not set 994# CONFIG_MFD_CORE is not set
967# CONFIG_MFD_SM501 is not set 995# CONFIG_MFD_SM501 is not set
968# CONFIG_HTC_PASIC3 is not set 996# CONFIG_HTC_PASIC3 is not set
997# CONFIG_TWL4030_CORE is not set
969# CONFIG_MFD_TMIO is not set 998# CONFIG_MFD_TMIO is not set
970# CONFIG_PMIC_DA903X is not set 999# CONFIG_PMIC_DA903X is not set
971# CONFIG_MFD_WM8400 is not set 1000# CONFIG_MFD_WM8400 is not set
972# CONFIG_MFD_WM8350_I2C is not set 1001# CONFIG_MFD_WM8350_I2C is not set
973 1002# CONFIG_MFD_PCF50633 is not set
974#
975# Voltage and Current regulators
976#
977# CONFIG_REGULATOR is not set 1003# 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
981 1004
982# 1005#
983# Multimedia devices 1006# Multimedia devices
@@ -1041,6 +1064,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
1041# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1064# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1042CONFIG_USB_EHCI_FSL=y 1065CONFIG_USB_EHCI_FSL=y
1043CONFIG_USB_EHCI_HCD_PPC_OF=y 1066CONFIG_USB_EHCI_HCD_PPC_OF=y
1067# CONFIG_USB_OXU210HP_HCD is not set
1044# CONFIG_USB_ISP116X_HCD is not set 1068# CONFIG_USB_ISP116X_HCD is not set
1045# CONFIG_USB_ISP1760_HCD is not set 1069# CONFIG_USB_ISP1760_HCD is not set
1046# CONFIG_USB_OHCI_HCD is not set 1070# CONFIG_USB_OHCI_HCD is not set
@@ -1059,18 +1083,17 @@ CONFIG_USB_UHCI_HCD=y
1059# CONFIG_USB_TMC is not set 1083# CONFIG_USB_TMC is not set
1060 1084
1061# 1085#
1062# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1086# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1063# 1087#
1064 1088
1065# 1089#
1066# may also be needed; see USB_STORAGE Help for more information 1090# see USB_STORAGE Help for more information
1067# 1091#
1068CONFIG_USB_STORAGE=y 1092CONFIG_USB_STORAGE=y
1069# CONFIG_USB_STORAGE_DEBUG is not set 1093# CONFIG_USB_STORAGE_DEBUG is not set
1070# CONFIG_USB_STORAGE_DATAFAB is not set 1094# CONFIG_USB_STORAGE_DATAFAB is not set
1071# CONFIG_USB_STORAGE_FREECOM is not set 1095# CONFIG_USB_STORAGE_FREECOM is not set
1072# CONFIG_USB_STORAGE_ISD200 is not set 1096# CONFIG_USB_STORAGE_ISD200 is not set
1073# CONFIG_USB_STORAGE_DPCM is not set
1074# CONFIG_USB_STORAGE_USBAT is not set 1097# CONFIG_USB_STORAGE_USBAT is not set
1075# CONFIG_USB_STORAGE_SDDR09 is not set 1098# CONFIG_USB_STORAGE_SDDR09 is not set
1076# CONFIG_USB_STORAGE_SDDR55 is not set 1099# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1117,6 +1140,10 @@ CONFIG_USB_STORAGE=y
1117# CONFIG_USB_ISIGHTFW is not set 1140# CONFIG_USB_ISIGHTFW is not set
1118# CONFIG_USB_VST is not set 1141# CONFIG_USB_VST is not set
1119# CONFIG_USB_GADGET is not set 1142# CONFIG_USB_GADGET is not set
1143
1144#
1145# OTG and related infrastructure
1146#
1120# CONFIG_UWB is not set 1147# CONFIG_UWB is not set
1121# CONFIG_MMC is not set 1148# CONFIG_MMC is not set
1122# CONFIG_MEMSTICK is not set 1149# CONFIG_MEMSTICK is not set
@@ -1154,12 +1181,14 @@ CONFIG_RTC_DRV_DS1307=y
1154# CONFIG_RTC_DRV_M41T80 is not set 1181# CONFIG_RTC_DRV_M41T80 is not set
1155# CONFIG_RTC_DRV_S35390A is not set 1182# CONFIG_RTC_DRV_S35390A is not set
1156# CONFIG_RTC_DRV_FM3130 is not set 1183# CONFIG_RTC_DRV_FM3130 is not set
1184# CONFIG_RTC_DRV_RX8581 is not set
1157 1185
1158# 1186#
1159# SPI RTC drivers 1187# SPI RTC drivers
1160# 1188#
1161# CONFIG_RTC_DRV_M41T94 is not set 1189# CONFIG_RTC_DRV_M41T94 is not set
1162# CONFIG_RTC_DRV_DS1305 is not set 1190# CONFIG_RTC_DRV_DS1305 is not set
1191# CONFIG_RTC_DRV_DS1390 is not set
1163# CONFIG_RTC_DRV_MAX6902 is not set 1192# CONFIG_RTC_DRV_MAX6902 is not set
1164# CONFIG_RTC_DRV_R9701 is not set 1193# CONFIG_RTC_DRV_R9701 is not set
1165# CONFIG_RTC_DRV_RS5C348 is not set 1194# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1207,6 +1236,7 @@ CONFIG_FS_MBCACHE=y
1207CONFIG_FILE_LOCKING=y 1236CONFIG_FILE_LOCKING=y
1208# CONFIG_XFS_FS is not set 1237# CONFIG_XFS_FS is not set
1209# CONFIG_OCFS2_FS is not set 1238# CONFIG_OCFS2_FS is not set
1239# CONFIG_BTRFS_FS is not set
1210CONFIG_DNOTIFY=y 1240CONFIG_DNOTIFY=y
1211CONFIG_INOTIFY=y 1241CONFIG_INOTIFY=y
1212CONFIG_INOTIFY_USER=y 1242CONFIG_INOTIFY_USER=y
@@ -1243,10 +1273,7 @@ CONFIG_TMPFS=y
1243# CONFIG_TMPFS_POSIX_ACL is not set 1273# CONFIG_TMPFS_POSIX_ACL is not set
1244# CONFIG_HUGETLB_PAGE is not set 1274# CONFIG_HUGETLB_PAGE is not set
1245# CONFIG_CONFIGFS_FS is not set 1275# CONFIG_CONFIGFS_FS is not set
1246 1276CONFIG_MISC_FILESYSTEMS=y
1247#
1248# Miscellaneous filesystems
1249#
1250# CONFIG_ADFS_FS is not set 1277# CONFIG_ADFS_FS is not set
1251# CONFIG_AFFS_FS is not set 1278# CONFIG_AFFS_FS is not set
1252# CONFIG_HFS_FS is not set 1279# CONFIG_HFS_FS is not set
@@ -1256,6 +1283,7 @@ CONFIG_TMPFS=y
1256# CONFIG_EFS_FS is not set 1283# CONFIG_EFS_FS is not set
1257# CONFIG_JFFS2_FS is not set 1284# CONFIG_JFFS2_FS is not set
1258# CONFIG_CRAMFS is not set 1285# CONFIG_CRAMFS is not set
1286# CONFIG_SQUASHFS is not set
1259# CONFIG_VXFS_FS is not set 1287# CONFIG_VXFS_FS is not set
1260# CONFIG_MINIX_FS is not set 1288# CONFIG_MINIX_FS is not set
1261# CONFIG_OMFS_FS is not set 1289# CONFIG_OMFS_FS is not set
@@ -1352,6 +1380,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1352# Library routines 1380# Library routines
1353# 1381#
1354CONFIG_BITREVERSE=y 1382CONFIG_BITREVERSE=y
1383CONFIG_GENERIC_FIND_LAST_BIT=y
1355# CONFIG_CRC_CCITT is not set 1384# CONFIG_CRC_CCITT is not set
1356# CONFIG_CRC16 is not set 1385# CONFIG_CRC16 is not set
1357CONFIG_CRC_T10DIF=y 1386CONFIG_CRC_T10DIF=y
@@ -1385,6 +1414,8 @@ CONFIG_FRAME_WARN=1024
1385# CONFIG_LATENCYTOP is not set 1414# CONFIG_LATENCYTOP is not set
1386CONFIG_SYSCTL_SYSCALL_CHECK=y 1415CONFIG_SYSCTL_SYSCALL_CHECK=y
1387CONFIG_HAVE_FUNCTION_TRACER=y 1416CONFIG_HAVE_FUNCTION_TRACER=y
1417CONFIG_HAVE_DYNAMIC_FTRACE=y
1418CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1388 1419
1389# 1420#
1390# Tracers 1421# Tracers
@@ -1392,6 +1423,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1392# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1423# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1393# CONFIG_SAMPLES is not set 1424# CONFIG_SAMPLES is not set
1394CONFIG_HAVE_ARCH_KGDB=y 1425CONFIG_HAVE_ARCH_KGDB=y
1426CONFIG_PRINT_STACK_DEPTH=64
1395# CONFIG_IRQSTACKS is not set 1427# CONFIG_IRQSTACKS is not set
1396# CONFIG_BOOTX_TEXT is not set 1428# CONFIG_BOOTX_TEXT is not set
1397# CONFIG_PPC_EARLY_DEBUG is not set 1429# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1410,11 +1442,15 @@ CONFIG_CRYPTO=y
1410# 1442#
1411# CONFIG_CRYPTO_FIPS is not set 1443# CONFIG_CRYPTO_FIPS is not set
1412CONFIG_CRYPTO_ALGAPI=y 1444CONFIG_CRYPTO_ALGAPI=y
1413CONFIG_CRYPTO_AEAD=y 1445CONFIG_CRYPTO_ALGAPI2=y
1446CONFIG_CRYPTO_AEAD2=y
1414CONFIG_CRYPTO_BLKCIPHER=y 1447CONFIG_CRYPTO_BLKCIPHER=y
1448CONFIG_CRYPTO_BLKCIPHER2=y
1415CONFIG_CRYPTO_HASH=y 1449CONFIG_CRYPTO_HASH=y
1416CONFIG_CRYPTO_RNG=y 1450CONFIG_CRYPTO_HASH2=y
1451CONFIG_CRYPTO_RNG2=y
1417CONFIG_CRYPTO_MANAGER=y 1452CONFIG_CRYPTO_MANAGER=y
1453CONFIG_CRYPTO_MANAGER2=y
1418# CONFIG_CRYPTO_GF128MUL is not set 1454# CONFIG_CRYPTO_GF128MUL is not set
1419# CONFIG_CRYPTO_NULL is not set 1455# CONFIG_CRYPTO_NULL is not set
1420# CONFIG_CRYPTO_CRYPTD is not set 1456# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
index 17c903b36576..9ba5518ce8df 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:57 2008 4# Mon Jan 26 15:35:55 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 113CONFIG_SLUB=y
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 126CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 132CONFIG_BLOCK=y
136# CONFIG_LBD is not set 133# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141 137
@@ -152,6 +148,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
156 156
157# 157#
@@ -198,6 +198,8 @@ CONFIG_IPIC=y
198# CONFIG_QUICC_ENGINE is not set 198# CONFIG_QUICC_ENGINE is not set
199# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_MPC8xxx_GPIO is not set 200# CONFIG_MPC8xxx_GPIO is not set
201# CONFIG_SIMPLE_GPIO is not set
202# CONFIG_MCU_MPC8349EMITX is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -225,6 +227,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 227CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 228CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 229# CONFIG_KEXEC is not set
230# CONFIG_CRASH_DUMP is not set
228CONFIG_ARCH_FLATMEM_ENABLE=y 231CONFIG_ARCH_FLATMEM_ENABLE=y
229CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
230CONFIG_SELECT_MEMORY_MODEL=y 233CONFIG_SELECT_MEMORY_MODEL=y
@@ -236,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
236CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
238CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set 242# CONFIG_PHYS_ADDR_T_64BIT is not set
241CONFIG_ZONE_DMA_FLAG=1 243CONFIG_ZONE_DMA_FLAG=1
242CONFIG_BOUNCE=y 244CONFIG_BOUNCE=y
243CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
245CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
247# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -266,6 +271,7 @@ CONFIG_PCI_SYSCALL=y
266CONFIG_ARCH_SUPPORTS_MSI=y 271CONFIG_ARCH_SUPPORTS_MSI=y
267# CONFIG_PCI_MSI is not set 272# CONFIG_PCI_MSI is not set
268# CONFIG_PCI_LEGACY is not set 273# CONFIG_PCI_LEGACY is not set
274# CONFIG_PCI_STUB is not set
269# CONFIG_PCCARD is not set 275# CONFIG_PCCARD is not set
270# CONFIG_HOTPLUG_PCI is not set 276# CONFIG_HOTPLUG_PCI is not set
271# CONFIG_HAS_RAPIDIO is not set 277# CONFIG_HAS_RAPIDIO is not set
@@ -288,6 +294,7 @@ CONFIG_NET=y
288# 294#
289# Networking options 295# Networking options
290# 296#
297CONFIG_COMPAT_NET_DEV_OPS=y
291CONFIG_PACKET=y 298CONFIG_PACKET=y
292# CONFIG_PACKET_MMAP is not set 299# CONFIG_PACKET_MMAP is not set
293CONFIG_UNIX=y 300CONFIG_UNIX=y
@@ -344,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_ECONET is not set 351# CONFIG_ECONET is not set
345# CONFIG_WAN_ROUTER is not set 352# CONFIG_WAN_ROUTER is not set
346# CONFIG_NET_SCHED is not set 353# CONFIG_NET_SCHED is not set
354# CONFIG_DCB is not set
347 355
348# 356#
349# Network testing 357# Network testing
@@ -359,8 +367,9 @@ CONFIG_WIRELESS=y
359# CONFIG_CFG80211 is not set 367# CONFIG_CFG80211 is not set
360CONFIG_WIRELESS_OLD_REGULATORY=y 368CONFIG_WIRELESS_OLD_REGULATORY=y
361# CONFIG_WIRELESS_EXT is not set 369# CONFIG_WIRELESS_EXT is not set
370# CONFIG_LIB80211 is not set
362# CONFIG_MAC80211 is not set 371# CONFIG_MAC80211 is not set
363# CONFIG_IEEE80211 is not set 372# CONFIG_WIMAX is not set
364# CONFIG_RFKILL is not set 373# CONFIG_RFKILL is not set
365# CONFIG_NET_9P is not set 374# CONFIG_NET_9P is not set
366 375
@@ -381,6 +390,7 @@ CONFIG_MTD=y
381# CONFIG_MTD_DEBUG is not set 390# CONFIG_MTD_DEBUG is not set
382# CONFIG_MTD_CONCAT is not set 391# CONFIG_MTD_CONCAT is not set
383# CONFIG_MTD_PARTITIONS is not set 392# CONFIG_MTD_PARTITIONS is not set
393# CONFIG_MTD_TESTS is not set
384 394
385# 395#
386# User Modules And Translation Layers 396# User Modules And Translation Layers
@@ -426,9 +436,7 @@ CONFIG_MTD_CFI_UTIL=y
426# 436#
427# CONFIG_MTD_COMPLEX_MAPPINGS is not set 437# CONFIG_MTD_COMPLEX_MAPPINGS is not set
428CONFIG_MTD_PHYSMAP=y 438CONFIG_MTD_PHYSMAP=y
429CONFIG_MTD_PHYSMAP_START=0xfe000000 439# CONFIG_MTD_PHYSMAP_COMPAT is not set
430CONFIG_MTD_PHYSMAP_LEN=0x800000
431CONFIG_MTD_PHYSMAP_BANKWIDTH=2
432# CONFIG_MTD_PHYSMAP_OF is not set 440# CONFIG_MTD_PHYSMAP_OF is not set
433# CONFIG_MTD_INTEL_VR_NOR is not set 441# CONFIG_MTD_INTEL_VR_NOR is not set
434# CONFIG_MTD_PLATRAM is not set 442# CONFIG_MTD_PLATRAM is not set
@@ -454,6 +462,12 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
454# CONFIG_MTD_ONENAND is not set 462# CONFIG_MTD_ONENAND is not set
455 463
456# 464#
465# LPDDR flash memory drivers
466#
467# CONFIG_MTD_LPDDR is not set
468# CONFIG_MTD_QINFO_PROBE is not set
469
470#
457# UBI - Unsorted block images 471# UBI - Unsorted block images
458# 472#
459# CONFIG_MTD_UBI is not set 473# CONFIG_MTD_UBI is not set
@@ -485,8 +499,10 @@ CONFIG_MISC_DEVICES=y
485# CONFIG_EEPROM_93CX6 is not set 499# CONFIG_EEPROM_93CX6 is not set
486# CONFIG_SGI_IOC4 is not set 500# CONFIG_SGI_IOC4 is not set
487# CONFIG_TIFM_CORE is not set 501# CONFIG_TIFM_CORE is not set
502# CONFIG_ICS932S401 is not set
488# CONFIG_ENCLOSURE_SERVICES is not set 503# CONFIG_ENCLOSURE_SERVICES is not set
489# CONFIG_HP_ILO is not set 504# CONFIG_HP_ILO is not set
505# CONFIG_C2PORT is not set
490CONFIG_HAVE_IDE=y 506CONFIG_HAVE_IDE=y
491# CONFIG_IDE is not set 507# CONFIG_IDE is not set
492 508
@@ -529,6 +545,7 @@ CONFIG_SCSI_SPI_ATTRS=y
529# CONFIG_SCSI_SRP_ATTRS is not set 545# CONFIG_SCSI_SRP_ATTRS is not set
530CONFIG_SCSI_LOWLEVEL=y 546CONFIG_SCSI_LOWLEVEL=y
531# CONFIG_ISCSI_TCP is not set 547# CONFIG_ISCSI_TCP is not set
548# CONFIG_SCSI_CXGB3_ISCSI is not set
532# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 549# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
533# CONFIG_SCSI_3W_9XXX is not set 550# CONFIG_SCSI_3W_9XXX is not set
534# CONFIG_SCSI_ACARD is not set 551# CONFIG_SCSI_ACARD is not set
@@ -545,6 +562,8 @@ CONFIG_SCSI_LOWLEVEL=y
545# CONFIG_MEGARAID_SAS is not set 562# CONFIG_MEGARAID_SAS is not set
546# CONFIG_SCSI_HPTIOP is not set 563# CONFIG_SCSI_HPTIOP is not set
547# CONFIG_SCSI_BUSLOGIC is not set 564# CONFIG_SCSI_BUSLOGIC is not set
565# CONFIG_LIBFC is not set
566# CONFIG_FCOE is not set
548# CONFIG_SCSI_DMX3191D is not set 567# CONFIG_SCSI_DMX3191D is not set
549# CONFIG_SCSI_EATA is not set 568# CONFIG_SCSI_EATA is not set
550# CONFIG_SCSI_FUTURE_DOMAIN is not set 569# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -603,6 +622,9 @@ CONFIG_CICADA_PHY=y
603# CONFIG_BROADCOM_PHY is not set 622# CONFIG_BROADCOM_PHY is not set
604# CONFIG_ICPLUS_PHY is not set 623# CONFIG_ICPLUS_PHY is not set
605# CONFIG_REALTEK_PHY is not set 624# CONFIG_REALTEK_PHY is not set
625# CONFIG_NATIONAL_PHY is not set
626# CONFIG_STE10XP is not set
627# CONFIG_LSI_ET1011C_PHY is not set
606# CONFIG_FIXED_PHY is not set 628# CONFIG_FIXED_PHY is not set
607# CONFIG_MDIO_BITBANG is not set 629# CONFIG_MDIO_BITBANG is not set
608# CONFIG_NET_ETHERNET is not set 630# CONFIG_NET_ETHERNET is not set
@@ -631,6 +653,7 @@ CONFIG_GIANFAR=y
631# CONFIG_JME is not set 653# CONFIG_JME is not set
632CONFIG_NETDEV_10000=y 654CONFIG_NETDEV_10000=y
633# CONFIG_CHELSIO_T1 is not set 655# CONFIG_CHELSIO_T1 is not set
656CONFIG_CHELSIO_T3_DEPENDS=y
634# CONFIG_CHELSIO_T3 is not set 657# CONFIG_CHELSIO_T3 is not set
635# CONFIG_ENIC is not set 658# CONFIG_ENIC is not set
636# CONFIG_IXGBE is not set 659# CONFIG_IXGBE is not set
@@ -655,6 +678,10 @@ CONFIG_NETDEV_10000=y
655# CONFIG_IWLWIFI_LEDS is not set 678# CONFIG_IWLWIFI_LEDS is not set
656 679
657# 680#
681# Enable WiMAX (Networking options) to see the WiMAX drivers
682#
683
684#
658# USB Network Adapters 685# USB Network Adapters
659# 686#
660# CONFIG_USB_CATC is not set 687# CONFIG_USB_CATC is not set
@@ -712,8 +739,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
712# CONFIG_SERIAL_JSM is not set 739# CONFIG_SERIAL_JSM is not set
713# CONFIG_SERIAL_OF_PLATFORM is not set 740# CONFIG_SERIAL_OF_PLATFORM is not set
714CONFIG_UNIX98_PTYS=y 741CONFIG_UNIX98_PTYS=y
742# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
715CONFIG_LEGACY_PTYS=y 743CONFIG_LEGACY_PTYS=y
716CONFIG_LEGACY_PTY_COUNT=256 744CONFIG_LEGACY_PTY_COUNT=256
745# CONFIG_HVC_UDBG is not set
717# CONFIG_IPMI_HANDLER is not set 746# CONFIG_IPMI_HANDLER is not set
718CONFIG_HW_RANDOM=y 747CONFIG_HW_RANDOM=y
719# CONFIG_NVRAM is not set 748# CONFIG_NVRAM is not set
@@ -786,7 +815,6 @@ CONFIG_SENSORS_PCF8574=y
786# CONFIG_SENSORS_PCF8591 is not set 815# CONFIG_SENSORS_PCF8591 is not set
787# CONFIG_SENSORS_MAX6875 is not set 816# CONFIG_SENSORS_MAX6875 is not set
788# CONFIG_SENSORS_TSL2550 is not set 817# CONFIG_SENSORS_TSL2550 is not set
789# CONFIG_MCU_MPC8349EMITX is not set
790# CONFIG_I2C_DEBUG_CORE is not set 818# CONFIG_I2C_DEBUG_CORE is not set
791# CONFIG_I2C_DEBUG_ALGO is not set 819# CONFIG_I2C_DEBUG_ALGO is not set
792# CONFIG_I2C_DEBUG_BUS is not set 820# CONFIG_I2C_DEBUG_BUS is not set
@@ -833,11 +861,11 @@ CONFIG_WATCHDOG=y
833# USB-based Watchdog Cards 861# USB-based Watchdog Cards
834# 862#
835# CONFIG_USBPCWATCHDOG is not set 863# CONFIG_USBPCWATCHDOG is not set
864CONFIG_SSB_POSSIBLE=y
836 865
837# 866#
838# Sonics Silicon Backplane 867# Sonics Silicon Backplane
839# 868#
840CONFIG_SSB_POSSIBLE=y
841# CONFIG_SSB is not set 869# CONFIG_SSB is not set
842 870
843# 871#
@@ -846,18 +874,13 @@ CONFIG_SSB_POSSIBLE=y
846# CONFIG_MFD_CORE is not set 874# CONFIG_MFD_CORE is not set
847# CONFIG_MFD_SM501 is not set 875# CONFIG_MFD_SM501 is not set
848# CONFIG_HTC_PASIC3 is not set 876# CONFIG_HTC_PASIC3 is not set
877# CONFIG_TWL4030_CORE is not set
849# CONFIG_MFD_TMIO is not set 878# CONFIG_MFD_TMIO is not set
850# CONFIG_PMIC_DA903X is not set 879# CONFIG_PMIC_DA903X is not set
851# CONFIG_MFD_WM8400 is not set 880# CONFIG_MFD_WM8400 is not set
852# CONFIG_MFD_WM8350_I2C is not set 881# CONFIG_MFD_WM8350_I2C is not set
853 882# CONFIG_MFD_PCF50633 is not set
854#
855# Voltage and Current regulators
856#
857# CONFIG_REGULATOR is not set 883# 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
861 884
862# 885#
863# Multimedia devices 886# Multimedia devices
@@ -921,6 +944,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
921# CONFIG_USB_EHCI_TT_NEWSCHED is not set 944# CONFIG_USB_EHCI_TT_NEWSCHED is not set
922CONFIG_USB_EHCI_FSL=y 945CONFIG_USB_EHCI_FSL=y
923CONFIG_USB_EHCI_HCD_PPC_OF=y 946CONFIG_USB_EHCI_HCD_PPC_OF=y
947# CONFIG_USB_OXU210HP_HCD is not set
924# CONFIG_USB_ISP116X_HCD is not set 948# CONFIG_USB_ISP116X_HCD is not set
925# CONFIG_USB_ISP1760_HCD is not set 949# CONFIG_USB_ISP1760_HCD is not set
926# CONFIG_USB_OHCI_HCD is not set 950# CONFIG_USB_OHCI_HCD is not set
@@ -939,18 +963,17 @@ CONFIG_USB_UHCI_HCD=y
939# CONFIG_USB_TMC is not set 963# CONFIG_USB_TMC is not set
940 964
941# 965#
942# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 966# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
943# 967#
944 968
945# 969#
946# may also be needed; see USB_STORAGE Help for more information 970# see USB_STORAGE Help for more information
947# 971#
948CONFIG_USB_STORAGE=y 972CONFIG_USB_STORAGE=y
949# CONFIG_USB_STORAGE_DEBUG is not set 973# CONFIG_USB_STORAGE_DEBUG is not set
950# CONFIG_USB_STORAGE_DATAFAB is not set 974# CONFIG_USB_STORAGE_DATAFAB is not set
951# CONFIG_USB_STORAGE_FREECOM is not set 975# CONFIG_USB_STORAGE_FREECOM is not set
952# CONFIG_USB_STORAGE_ISD200 is not set 976# CONFIG_USB_STORAGE_ISD200 is not set
953# CONFIG_USB_STORAGE_DPCM is not set
954# CONFIG_USB_STORAGE_USBAT is not set 977# CONFIG_USB_STORAGE_USBAT is not set
955# CONFIG_USB_STORAGE_SDDR09 is not set 978# CONFIG_USB_STORAGE_SDDR09 is not set
956# CONFIG_USB_STORAGE_SDDR55 is not set 979# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -996,6 +1019,10 @@ CONFIG_USB_STORAGE=y
996# CONFIG_USB_ISIGHTFW is not set 1019# CONFIG_USB_ISIGHTFW is not set
997# CONFIG_USB_VST is not set 1020# CONFIG_USB_VST is not set
998# CONFIG_USB_GADGET is not set 1021# CONFIG_USB_GADGET is not set
1022
1023#
1024# OTG and related infrastructure
1025#
999# CONFIG_UWB is not set 1026# CONFIG_UWB is not set
1000# CONFIG_MMC is not set 1027# CONFIG_MMC is not set
1001# CONFIG_MEMSTICK is not set 1028# CONFIG_MEMSTICK is not set
@@ -1033,12 +1060,14 @@ CONFIG_RTC_DRV_DS1307=y
1033# CONFIG_RTC_DRV_M41T80 is not set 1060# CONFIG_RTC_DRV_M41T80 is not set
1034# CONFIG_RTC_DRV_S35390A is not set 1061# CONFIG_RTC_DRV_S35390A is not set
1035# CONFIG_RTC_DRV_FM3130 is not set 1062# CONFIG_RTC_DRV_FM3130 is not set
1063# CONFIG_RTC_DRV_RX8581 is not set
1036 1064
1037# 1065#
1038# SPI RTC drivers 1066# SPI RTC drivers
1039# 1067#
1040# CONFIG_RTC_DRV_M41T94 is not set 1068# CONFIG_RTC_DRV_M41T94 is not set
1041# CONFIG_RTC_DRV_DS1305 is not set 1069# CONFIG_RTC_DRV_DS1305 is not set
1070# CONFIG_RTC_DRV_DS1390 is not set
1042# CONFIG_RTC_DRV_MAX6902 is not set 1071# CONFIG_RTC_DRV_MAX6902 is not set
1043# CONFIG_RTC_DRV_R9701 is not set 1072# CONFIG_RTC_DRV_R9701 is not set
1044# CONFIG_RTC_DRV_RS5C348 is not set 1073# CONFIG_RTC_DRV_RS5C348 is not set
@@ -1086,6 +1115,7 @@ CONFIG_FS_MBCACHE=y
1086CONFIG_FILE_LOCKING=y 1115CONFIG_FILE_LOCKING=y
1087# CONFIG_XFS_FS is not set 1116# CONFIG_XFS_FS is not set
1088# CONFIG_OCFS2_FS is not set 1117# CONFIG_OCFS2_FS is not set
1118# CONFIG_BTRFS_FS is not set
1089CONFIG_DNOTIFY=y 1119CONFIG_DNOTIFY=y
1090CONFIG_INOTIFY=y 1120CONFIG_INOTIFY=y
1091CONFIG_INOTIFY_USER=y 1121CONFIG_INOTIFY_USER=y
@@ -1122,10 +1152,7 @@ CONFIG_TMPFS=y
1122# CONFIG_TMPFS_POSIX_ACL is not set 1152# CONFIG_TMPFS_POSIX_ACL is not set
1123# CONFIG_HUGETLB_PAGE is not set 1153# CONFIG_HUGETLB_PAGE is not set
1124# CONFIG_CONFIGFS_FS is not set 1154# CONFIG_CONFIGFS_FS is not set
1125 1155CONFIG_MISC_FILESYSTEMS=y
1126#
1127# Miscellaneous filesystems
1128#
1129# CONFIG_ADFS_FS is not set 1156# CONFIG_ADFS_FS is not set
1130# CONFIG_AFFS_FS is not set 1157# CONFIG_AFFS_FS is not set
1131# CONFIG_HFS_FS is not set 1158# CONFIG_HFS_FS is not set
@@ -1135,6 +1162,7 @@ CONFIG_TMPFS=y
1135# CONFIG_EFS_FS is not set 1162# CONFIG_EFS_FS is not set
1136# CONFIG_JFFS2_FS is not set 1163# CONFIG_JFFS2_FS is not set
1137# CONFIG_CRAMFS is not set 1164# CONFIG_CRAMFS is not set
1165# CONFIG_SQUASHFS is not set
1138# CONFIG_VXFS_FS is not set 1166# CONFIG_VXFS_FS is not set
1139# CONFIG_MINIX_FS is not set 1167# CONFIG_MINIX_FS is not set
1140# CONFIG_OMFS_FS is not set 1168# CONFIG_OMFS_FS is not set
@@ -1231,6 +1259,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1231# Library routines 1259# Library routines
1232# 1260#
1233CONFIG_BITREVERSE=y 1261CONFIG_BITREVERSE=y
1262CONFIG_GENERIC_FIND_LAST_BIT=y
1234# CONFIG_CRC_CCITT is not set 1263# CONFIG_CRC_CCITT is not set
1235# CONFIG_CRC16 is not set 1264# CONFIG_CRC16 is not set
1236CONFIG_CRC_T10DIF=y 1265CONFIG_CRC_T10DIF=y
@@ -1264,6 +1293,8 @@ CONFIG_FRAME_WARN=1024
1264# CONFIG_LATENCYTOP is not set 1293# CONFIG_LATENCYTOP is not set
1265CONFIG_SYSCTL_SYSCALL_CHECK=y 1294CONFIG_SYSCTL_SYSCALL_CHECK=y
1266CONFIG_HAVE_FUNCTION_TRACER=y 1295CONFIG_HAVE_FUNCTION_TRACER=y
1296CONFIG_HAVE_DYNAMIC_FTRACE=y
1297CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1267 1298
1268# 1299#
1269# Tracers 1300# Tracers
@@ -1271,6 +1302,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1271# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1302# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1272# CONFIG_SAMPLES is not set 1303# CONFIG_SAMPLES is not set
1273CONFIG_HAVE_ARCH_KGDB=y 1304CONFIG_HAVE_ARCH_KGDB=y
1305CONFIG_PRINT_STACK_DEPTH=64
1274# CONFIG_IRQSTACKS is not set 1306# CONFIG_IRQSTACKS is not set
1275# CONFIG_BOOTX_TEXT is not set 1307# CONFIG_BOOTX_TEXT is not set
1276# CONFIG_PPC_EARLY_DEBUG is not set 1308# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1289,11 +1321,15 @@ CONFIG_CRYPTO=y
1289# 1321#
1290# CONFIG_CRYPTO_FIPS is not set 1322# CONFIG_CRYPTO_FIPS is not set
1291CONFIG_CRYPTO_ALGAPI=y 1323CONFIG_CRYPTO_ALGAPI=y
1292CONFIG_CRYPTO_AEAD=y 1324CONFIG_CRYPTO_ALGAPI2=y
1325CONFIG_CRYPTO_AEAD2=y
1293CONFIG_CRYPTO_BLKCIPHER=y 1326CONFIG_CRYPTO_BLKCIPHER=y
1327CONFIG_CRYPTO_BLKCIPHER2=y
1294CONFIG_CRYPTO_HASH=y 1328CONFIG_CRYPTO_HASH=y
1295CONFIG_CRYPTO_RNG=y 1329CONFIG_CRYPTO_HASH2=y
1330CONFIG_CRYPTO_RNG2=y
1296CONFIG_CRYPTO_MANAGER=y 1331CONFIG_CRYPTO_MANAGER=y
1332CONFIG_CRYPTO_MANAGER2=y
1297# CONFIG_CRYPTO_GF128MUL is not set 1333# CONFIG_CRYPTO_GF128MUL is not set
1298# CONFIG_CRYPTO_NULL is not set 1334# CONFIG_CRYPTO_NULL is not set
1299# CONFIG_CRYPTO_CRYPTD is not set 1335# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
index 728fc95d5870..18e4bc0b3c11 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:58 2008 4# Mon Jan 26 15:35:56 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 113CONFIG_SLUB=y
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 126CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 132CONFIG_BLOCK=y
136# CONFIG_LBD is not set 133# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141 137
@@ -152,6 +148,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
156 156
157# 157#
@@ -198,6 +198,8 @@ CONFIG_IPIC=y
198# CONFIG_QUICC_ENGINE is not set 198# CONFIG_QUICC_ENGINE is not set
199# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_MPC8xxx_GPIO is not set 200# CONFIG_MPC8xxx_GPIO is not set
201# CONFIG_SIMPLE_GPIO is not set
202# CONFIG_MCU_MPC8349EMITX is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -225,6 +227,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 227CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 228CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 229# CONFIG_KEXEC is not set
230# CONFIG_CRASH_DUMP is not set
228CONFIG_ARCH_FLATMEM_ENABLE=y 231CONFIG_ARCH_FLATMEM_ENABLE=y
229CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
230CONFIG_SELECT_MEMORY_MODEL=y 233CONFIG_SELECT_MEMORY_MODEL=y
@@ -236,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
236CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
238CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set 242# CONFIG_PHYS_ADDR_T_64BIT is not set
241CONFIG_ZONE_DMA_FLAG=1 243CONFIG_ZONE_DMA_FLAG=1
242CONFIG_BOUNCE=y 244CONFIG_BOUNCE=y
243CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
245CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
247# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -266,6 +271,7 @@ CONFIG_PCI_SYSCALL=y
266CONFIG_ARCH_SUPPORTS_MSI=y 271CONFIG_ARCH_SUPPORTS_MSI=y
267# CONFIG_PCI_MSI is not set 272# CONFIG_PCI_MSI is not set
268# CONFIG_PCI_LEGACY is not set 273# CONFIG_PCI_LEGACY is not set
274# CONFIG_PCI_STUB is not set
269# CONFIG_PCCARD is not set 275# CONFIG_PCCARD is not set
270# CONFIG_HOTPLUG_PCI is not set 276# CONFIG_HOTPLUG_PCI is not set
271# CONFIG_HAS_RAPIDIO is not set 277# CONFIG_HAS_RAPIDIO is not set
@@ -288,6 +294,7 @@ CONFIG_NET=y
288# 294#
289# Networking options 295# Networking options
290# 296#
297CONFIG_COMPAT_NET_DEV_OPS=y
291CONFIG_PACKET=y 298CONFIG_PACKET=y
292# CONFIG_PACKET_MMAP is not set 299# CONFIG_PACKET_MMAP is not set
293CONFIG_UNIX=y 300CONFIG_UNIX=y
@@ -344,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_ECONET is not set 351# CONFIG_ECONET is not set
345# CONFIG_WAN_ROUTER is not set 352# CONFIG_WAN_ROUTER is not set
346# CONFIG_NET_SCHED is not set 353# CONFIG_NET_SCHED is not set
354# CONFIG_DCB is not set
347 355
348# 356#
349# Network testing 357# Network testing
@@ -359,8 +367,9 @@ CONFIG_WIRELESS=y
359# CONFIG_CFG80211 is not set 367# CONFIG_CFG80211 is not set
360CONFIG_WIRELESS_OLD_REGULATORY=y 368CONFIG_WIRELESS_OLD_REGULATORY=y
361# CONFIG_WIRELESS_EXT is not set 369# CONFIG_WIRELESS_EXT is not set
370# CONFIG_LIB80211 is not set
362# CONFIG_MAC80211 is not set 371# CONFIG_MAC80211 is not set
363# CONFIG_IEEE80211 is not set 372# CONFIG_WIMAX is not set
364# CONFIG_RFKILL is not set 373# CONFIG_RFKILL is not set
365# CONFIG_NET_9P is not set 374# CONFIG_NET_9P is not set
366 375
@@ -404,8 +413,10 @@ CONFIG_MISC_DEVICES=y
404# CONFIG_EEPROM_93CX6 is not set 413# CONFIG_EEPROM_93CX6 is not set
405# CONFIG_SGI_IOC4 is not set 414# CONFIG_SGI_IOC4 is not set
406# CONFIG_TIFM_CORE is not set 415# CONFIG_TIFM_CORE is not set
416# CONFIG_ICS932S401 is not set
407# CONFIG_ENCLOSURE_SERVICES is not set 417# CONFIG_ENCLOSURE_SERVICES is not set
408# CONFIG_HP_ILO is not set 418# CONFIG_HP_ILO is not set
419# CONFIG_C2PORT is not set
409CONFIG_HAVE_IDE=y 420CONFIG_HAVE_IDE=y
410# CONFIG_IDE is not set 421# CONFIG_IDE is not set
411 422
@@ -454,6 +465,9 @@ CONFIG_MARVELL_PHY=y
454# CONFIG_BROADCOM_PHY is not set 465# CONFIG_BROADCOM_PHY is not set
455# CONFIG_ICPLUS_PHY is not set 466# CONFIG_ICPLUS_PHY is not set
456# CONFIG_REALTEK_PHY is not set 467# CONFIG_REALTEK_PHY is not set
468# CONFIG_NATIONAL_PHY is not set
469# CONFIG_STE10XP is not set
470# CONFIG_LSI_ET1011C_PHY is not set
457# CONFIG_FIXED_PHY is not set 471# CONFIG_FIXED_PHY is not set
458# CONFIG_MDIO_BITBANG is not set 472# CONFIG_MDIO_BITBANG is not set
459CONFIG_NET_ETHERNET=y 473CONFIG_NET_ETHERNET=y
@@ -477,7 +491,6 @@ CONFIG_NET_PCI=y
477# CONFIG_ADAPTEC_STARFIRE is not set 491# CONFIG_ADAPTEC_STARFIRE is not set
478# CONFIG_B44 is not set 492# CONFIG_B44 is not set
479# CONFIG_FORCEDETH is not set 493# CONFIG_FORCEDETH is not set
480# CONFIG_EEPRO100 is not set
481CONFIG_E100=y 494CONFIG_E100=y
482# CONFIG_FEALNX is not set 495# CONFIG_FEALNX is not set
483# CONFIG_NATSEMI is not set 496# CONFIG_NATSEMI is not set
@@ -487,6 +500,7 @@ CONFIG_E100=y
487# CONFIG_R6040 is not set 500# CONFIG_R6040 is not set
488# CONFIG_SIS900 is not set 501# CONFIG_SIS900 is not set
489# CONFIG_EPIC100 is not set 502# CONFIG_EPIC100 is not set
503# CONFIG_SMSC9420 is not set
490# CONFIG_SUNDANCE is not set 504# CONFIG_SUNDANCE is not set
491# CONFIG_TLAN is not set 505# CONFIG_TLAN is not set
492# CONFIG_VIA_RHINE is not set 506# CONFIG_VIA_RHINE is not set
@@ -517,6 +531,7 @@ CONFIG_GIANFAR=y
517# CONFIG_JME is not set 531# CONFIG_JME is not set
518CONFIG_NETDEV_10000=y 532CONFIG_NETDEV_10000=y
519# CONFIG_CHELSIO_T1 is not set 533# CONFIG_CHELSIO_T1 is not set
534CONFIG_CHELSIO_T3_DEPENDS=y
520# CONFIG_CHELSIO_T3 is not set 535# CONFIG_CHELSIO_T3 is not set
521# CONFIG_ENIC is not set 536# CONFIG_ENIC is not set
522# CONFIG_IXGBE is not set 537# CONFIG_IXGBE is not set
@@ -539,6 +554,10 @@ CONFIG_NETDEV_10000=y
539# CONFIG_WLAN_PRE80211 is not set 554# CONFIG_WLAN_PRE80211 is not set
540# CONFIG_WLAN_80211 is not set 555# CONFIG_WLAN_80211 is not set
541# CONFIG_IWLWIFI_LEDS is not set 556# CONFIG_IWLWIFI_LEDS is not set
557
558#
559# Enable WiMAX (Networking options) to see the WiMAX drivers
560#
542# CONFIG_WAN is not set 561# CONFIG_WAN is not set
543# CONFIG_FDDI is not set 562# CONFIG_FDDI is not set
544# CONFIG_HIPPI is not set 563# CONFIG_HIPPI is not set
@@ -608,8 +627,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
608# CONFIG_SERIAL_JSM is not set 627# CONFIG_SERIAL_JSM is not set
609# CONFIG_SERIAL_OF_PLATFORM is not set 628# CONFIG_SERIAL_OF_PLATFORM is not set
610CONFIG_UNIX98_PTYS=y 629CONFIG_UNIX98_PTYS=y
630# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
611CONFIG_LEGACY_PTYS=y 631CONFIG_LEGACY_PTYS=y
612CONFIG_LEGACY_PTY_COUNT=256 632CONFIG_LEGACY_PTY_COUNT=256
633# CONFIG_HVC_UDBG is not set
613# CONFIG_IPMI_HANDLER is not set 634# CONFIG_IPMI_HANDLER is not set
614# CONFIG_HW_RANDOM is not set 635# CONFIG_HW_RANDOM is not set
615# CONFIG_NVRAM is not set 636# CONFIG_NVRAM is not set
@@ -681,7 +702,6 @@ CONFIG_I2C_MPC=y
681# CONFIG_SENSORS_PCF8591 is not set 702# CONFIG_SENSORS_PCF8591 is not set
682# CONFIG_SENSORS_MAX6875 is not set 703# CONFIG_SENSORS_MAX6875 is not set
683# CONFIG_SENSORS_TSL2550 is not set 704# CONFIG_SENSORS_TSL2550 is not set
684# CONFIG_MCU_MPC8349EMITX is not set
685# CONFIG_I2C_DEBUG_CORE is not set 705# CONFIG_I2C_DEBUG_CORE is not set
686# CONFIG_I2C_DEBUG_ALGO is not set 706# CONFIG_I2C_DEBUG_ALGO is not set
687# CONFIG_I2C_DEBUG_BUS is not set 707# CONFIG_I2C_DEBUG_BUS is not set
@@ -701,8 +721,10 @@ CONFIG_HWMON=y
701# CONFIG_SENSORS_ADM1029 is not set 721# CONFIG_SENSORS_ADM1029 is not set
702# CONFIG_SENSORS_ADM1031 is not set 722# CONFIG_SENSORS_ADM1031 is not set
703# CONFIG_SENSORS_ADM9240 is not set 723# CONFIG_SENSORS_ADM9240 is not set
724# CONFIG_SENSORS_ADT7462 is not set
704# CONFIG_SENSORS_ADT7470 is not set 725# CONFIG_SENSORS_ADT7470 is not set
705# CONFIG_SENSORS_ADT7473 is not set 726# CONFIG_SENSORS_ADT7473 is not set
727# CONFIG_SENSORS_ADT7475 is not set
706# CONFIG_SENSORS_ATXP1 is not set 728# CONFIG_SENSORS_ATXP1 is not set
707# CONFIG_SENSORS_DS1621 is not set 729# CONFIG_SENSORS_DS1621 is not set
708# CONFIG_SENSORS_I5K_AMB is not set 730# CONFIG_SENSORS_I5K_AMB is not set
@@ -723,6 +745,7 @@ CONFIG_HWMON=y
723# CONFIG_SENSORS_LM90 is not set 745# CONFIG_SENSORS_LM90 is not set
724# CONFIG_SENSORS_LM92 is not set 746# CONFIG_SENSORS_LM92 is not set
725# CONFIG_SENSORS_LM93 is not set 747# CONFIG_SENSORS_LM93 is not set
748# CONFIG_SENSORS_LTC4245 is not set
726# CONFIG_SENSORS_MAX1619 is not set 749# CONFIG_SENSORS_MAX1619 is not set
727# CONFIG_SENSORS_MAX6650 is not set 750# CONFIG_SENSORS_MAX6650 is not set
728# CONFIG_SENSORS_PC87360 is not set 751# CONFIG_SENSORS_PC87360 is not set
@@ -763,11 +786,11 @@ CONFIG_WATCHDOG=y
763# 786#
764# CONFIG_PCIPCWATCHDOG is not set 787# CONFIG_PCIPCWATCHDOG is not set
765# CONFIG_WDTPCI is not set 788# CONFIG_WDTPCI is not set
789CONFIG_SSB_POSSIBLE=y
766 790
767# 791#
768# Sonics Silicon Backplane 792# Sonics Silicon Backplane
769# 793#
770CONFIG_SSB_POSSIBLE=y
771# CONFIG_SSB is not set 794# CONFIG_SSB is not set
772 795
773# 796#
@@ -776,18 +799,13 @@ CONFIG_SSB_POSSIBLE=y
776# CONFIG_MFD_CORE is not set 799# CONFIG_MFD_CORE is not set
777# CONFIG_MFD_SM501 is not set 800# CONFIG_MFD_SM501 is not set
778# CONFIG_HTC_PASIC3 is not set 801# CONFIG_HTC_PASIC3 is not set
802# CONFIG_TWL4030_CORE is not set
779# CONFIG_MFD_TMIO is not set 803# CONFIG_MFD_TMIO is not set
780# CONFIG_PMIC_DA903X is not set 804# CONFIG_PMIC_DA903X is not set
781# CONFIG_MFD_WM8400 is not set 805# CONFIG_MFD_WM8400 is not set
782# CONFIG_MFD_WM8350_I2C is not set 806# CONFIG_MFD_WM8350_I2C is not set
783 807# CONFIG_MFD_PCF50633 is not set
784#
785# Voltage and Current regulators
786#
787# CONFIG_REGULATOR is not set 808# 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 809
792# 810#
793# Multimedia devices 811# Multimedia devices
@@ -843,9 +861,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
843# 861#
844 862
845# 863#
846# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 864# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
847# 865#
848# CONFIG_USB_GADGET is not set 866# CONFIG_USB_GADGET is not set
867
868#
869# OTG and related infrastructure
870#
849# CONFIG_UWB is not set 871# CONFIG_UWB is not set
850# CONFIG_MMC is not set 872# CONFIG_MMC is not set
851# CONFIG_MEMSTICK is not set 873# CONFIG_MEMSTICK is not set
@@ -883,6 +905,7 @@ CONFIG_RTC_DRV_DS1374=y
883# CONFIG_RTC_DRV_M41T80 is not set 905# CONFIG_RTC_DRV_M41T80 is not set
884# CONFIG_RTC_DRV_S35390A is not set 906# CONFIG_RTC_DRV_S35390A is not set
885# CONFIG_RTC_DRV_FM3130 is not set 907# CONFIG_RTC_DRV_FM3130 is not set
908# CONFIG_RTC_DRV_RX8581 is not set
886 909
887# 910#
888# SPI RTC drivers 911# SPI RTC drivers
@@ -930,6 +953,7 @@ CONFIG_FS_MBCACHE=y
930CONFIG_FILE_LOCKING=y 953CONFIG_FILE_LOCKING=y
931# CONFIG_XFS_FS is not set 954# CONFIG_XFS_FS is not set
932# CONFIG_OCFS2_FS is not set 955# CONFIG_OCFS2_FS is not set
956# CONFIG_BTRFS_FS is not set
933CONFIG_DNOTIFY=y 957CONFIG_DNOTIFY=y
934CONFIG_INOTIFY=y 958CONFIG_INOTIFY=y
935CONFIG_INOTIFY_USER=y 959CONFIG_INOTIFY_USER=y
@@ -963,10 +987,7 @@ CONFIG_TMPFS=y
963# CONFIG_TMPFS_POSIX_ACL is not set 987# CONFIG_TMPFS_POSIX_ACL is not set
964# CONFIG_HUGETLB_PAGE is not set 988# CONFIG_HUGETLB_PAGE is not set
965# CONFIG_CONFIGFS_FS is not set 989# CONFIG_CONFIGFS_FS is not set
966 990CONFIG_MISC_FILESYSTEMS=y
967#
968# Miscellaneous filesystems
969#
970# CONFIG_ADFS_FS is not set 991# CONFIG_ADFS_FS is not set
971# CONFIG_AFFS_FS is not set 992# CONFIG_AFFS_FS is not set
972# CONFIG_HFS_FS is not set 993# CONFIG_HFS_FS is not set
@@ -975,6 +996,7 @@ CONFIG_TMPFS=y
975# CONFIG_BFS_FS is not set 996# CONFIG_BFS_FS is not set
976# CONFIG_EFS_FS is not set 997# CONFIG_EFS_FS is not set
977# CONFIG_CRAMFS is not set 998# CONFIG_CRAMFS is not set
999# CONFIG_SQUASHFS is not set
978# CONFIG_VXFS_FS is not set 1000# CONFIG_VXFS_FS is not set
979# CONFIG_MINIX_FS is not set 1001# CONFIG_MINIX_FS is not set
980# CONFIG_OMFS_FS is not set 1002# CONFIG_OMFS_FS is not set
@@ -1028,6 +1050,7 @@ CONFIG_PARTITION_ADVANCED=y
1028# Library routines 1050# Library routines
1029# 1051#
1030CONFIG_BITREVERSE=y 1052CONFIG_BITREVERSE=y
1053CONFIG_GENERIC_FIND_LAST_BIT=y
1031# CONFIG_CRC_CCITT is not set 1054# CONFIG_CRC_CCITT is not set
1032# CONFIG_CRC16 is not set 1055# CONFIG_CRC16 is not set
1033# CONFIG_CRC_T10DIF is not set 1056# CONFIG_CRC_T10DIF is not set
@@ -1061,6 +1084,8 @@ CONFIG_FRAME_WARN=1024
1061# CONFIG_LATENCYTOP is not set 1084# CONFIG_LATENCYTOP is not set
1062CONFIG_SYSCTL_SYSCALL_CHECK=y 1085CONFIG_SYSCTL_SYSCALL_CHECK=y
1063CONFIG_HAVE_FUNCTION_TRACER=y 1086CONFIG_HAVE_FUNCTION_TRACER=y
1087CONFIG_HAVE_DYNAMIC_FTRACE=y
1088CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1064 1089
1065# 1090#
1066# Tracers 1091# Tracers
@@ -1068,6 +1093,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1068# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1093# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1069# CONFIG_SAMPLES is not set 1094# CONFIG_SAMPLES is not set
1070CONFIG_HAVE_ARCH_KGDB=y 1095CONFIG_HAVE_ARCH_KGDB=y
1096CONFIG_PRINT_STACK_DEPTH=64
1071# CONFIG_IRQSTACKS is not set 1097# CONFIG_IRQSTACKS is not set
1072# CONFIG_BOOTX_TEXT is not set 1098# CONFIG_BOOTX_TEXT is not set
1073# CONFIG_PPC_EARLY_DEBUG is not set 1099# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1086,11 +1112,15 @@ CONFIG_CRYPTO=y
1086# 1112#
1087# CONFIG_CRYPTO_FIPS is not set 1113# CONFIG_CRYPTO_FIPS is not set
1088CONFIG_CRYPTO_ALGAPI=y 1114CONFIG_CRYPTO_ALGAPI=y
1089CONFIG_CRYPTO_AEAD=y 1115CONFIG_CRYPTO_ALGAPI2=y
1116CONFIG_CRYPTO_AEAD2=y
1090CONFIG_CRYPTO_BLKCIPHER=y 1117CONFIG_CRYPTO_BLKCIPHER=y
1118CONFIG_CRYPTO_BLKCIPHER2=y
1091CONFIG_CRYPTO_HASH=y 1119CONFIG_CRYPTO_HASH=y
1092CONFIG_CRYPTO_RNG=y 1120CONFIG_CRYPTO_HASH2=y
1121CONFIG_CRYPTO_RNG2=y
1093CONFIG_CRYPTO_MANAGER=y 1122CONFIG_CRYPTO_MANAGER=y
1123CONFIG_CRYPTO_MANAGER2=y
1094# CONFIG_CRYPTO_GF128MUL is not set 1124# CONFIG_CRYPTO_GF128MUL is not set
1095# CONFIG_CRYPTO_NULL is not set 1125# CONFIG_CRYPTO_NULL is not set
1096# CONFIG_CRYPTO_CRYPTD is not set 1126# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
index f7546e7cb762..76db8138eac7 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:59 2008 4# Mon Jan 26 15:35:58 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 113CONFIG_SLUB=y
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 126CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 132CONFIG_BLOCK=y
136# CONFIG_LBD is not set 133# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141 137
@@ -152,6 +148,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
156 156
157# 157#
@@ -197,6 +197,8 @@ CONFIG_IPIC=y
197CONFIG_QUICC_ENGINE=y 197CONFIG_QUICC_ENGINE=y
198# CONFIG_QE_GPIO is not set 198# CONFIG_QE_GPIO is not set
199# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
200# CONFIG_SIMPLE_GPIO is not set
201# CONFIG_MCU_MPC8349EMITX is not set
200 202
201# 203#
202# Kernel options 204# Kernel options
@@ -224,6 +226,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
224CONFIG_ARCH_HAS_WALK_MEMORY=y 226CONFIG_ARCH_HAS_WALK_MEMORY=y
225CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 227CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
226# CONFIG_KEXEC is not set 228# CONFIG_KEXEC is not set
229# CONFIG_CRASH_DUMP is not set
227CONFIG_ARCH_FLATMEM_ENABLE=y 230CONFIG_ARCH_FLATMEM_ENABLE=y
228CONFIG_ARCH_POPULATES_NODE_MAP=y 231CONFIG_ARCH_POPULATES_NODE_MAP=y
229CONFIG_SELECT_MEMORY_MODEL=y 232CONFIG_SELECT_MEMORY_MODEL=y
@@ -235,12 +238,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
235CONFIG_PAGEFLAGS_EXTENDED=y 238CONFIG_PAGEFLAGS_EXTENDED=y
236CONFIG_SPLIT_PTLOCK_CPUS=4 239CONFIG_SPLIT_PTLOCK_CPUS=4
237CONFIG_MIGRATION=y 240CONFIG_MIGRATION=y
238# CONFIG_RESOURCES_64BIT is not set
239# CONFIG_PHYS_ADDR_T_64BIT is not set 241# CONFIG_PHYS_ADDR_T_64BIT is not set
240CONFIG_ZONE_DMA_FLAG=1 242CONFIG_ZONE_DMA_FLAG=1
241CONFIG_BOUNCE=y 243CONFIG_BOUNCE=y
242CONFIG_VIRT_TO_BUS=y 244CONFIG_VIRT_TO_BUS=y
243CONFIG_UNEVICTABLE_LRU=y 245CONFIG_UNEVICTABLE_LRU=y
246CONFIG_PPC_4K_PAGES=y
247# CONFIG_PPC_16K_PAGES is not set
248# CONFIG_PPC_64K_PAGES is not set
244CONFIG_FORCE_MAX_ZONEORDER=11 249CONFIG_FORCE_MAX_ZONEORDER=11
245CONFIG_PROC_DEVICETREE=y 250CONFIG_PROC_DEVICETREE=y
246# CONFIG_CMDLINE_BOOL is not set 251# CONFIG_CMDLINE_BOOL is not set
@@ -265,6 +270,7 @@ CONFIG_PCI_SYSCALL=y
265CONFIG_ARCH_SUPPORTS_MSI=y 270CONFIG_ARCH_SUPPORTS_MSI=y
266# CONFIG_PCI_MSI is not set 271# CONFIG_PCI_MSI is not set
267# CONFIG_PCI_LEGACY is not set 272# CONFIG_PCI_LEGACY is not set
273# CONFIG_PCI_STUB is not set
268# CONFIG_PCCARD is not set 274# CONFIG_PCCARD is not set
269# CONFIG_HOTPLUG_PCI is not set 275# CONFIG_HOTPLUG_PCI is not set
270# CONFIG_HAS_RAPIDIO is not set 276# CONFIG_HAS_RAPIDIO is not set
@@ -287,6 +293,7 @@ CONFIG_NET=y
287# 293#
288# Networking options 294# Networking options
289# 295#
296CONFIG_COMPAT_NET_DEV_OPS=y
290CONFIG_PACKET=y 297CONFIG_PACKET=y
291# CONFIG_PACKET_MMAP is not set 298# CONFIG_PACKET_MMAP is not set
292CONFIG_UNIX=y 299CONFIG_UNIX=y
@@ -343,6 +350,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
343# CONFIG_ECONET is not set 350# CONFIG_ECONET is not set
344# CONFIG_WAN_ROUTER is not set 351# CONFIG_WAN_ROUTER is not set
345# CONFIG_NET_SCHED is not set 352# CONFIG_NET_SCHED is not set
353# CONFIG_DCB is not set
346 354
347# 355#
348# Network testing 356# Network testing
@@ -358,8 +366,9 @@ CONFIG_WIRELESS=y
358# CONFIG_CFG80211 is not set 366# CONFIG_CFG80211 is not set
359CONFIG_WIRELESS_OLD_REGULATORY=y 367CONFIG_WIRELESS_OLD_REGULATORY=y
360# CONFIG_WIRELESS_EXT is not set 368# CONFIG_WIRELESS_EXT is not set
369# CONFIG_LIB80211 is not set
361# CONFIG_MAC80211 is not set 370# CONFIG_MAC80211 is not set
362# CONFIG_IEEE80211 is not set 371# CONFIG_WIMAX is not set
363# CONFIG_RFKILL is not set 372# CONFIG_RFKILL is not set
364# CONFIG_NET_9P is not set 373# CONFIG_NET_9P is not set
365 374
@@ -380,6 +389,7 @@ CONFIG_MTD=y
380# CONFIG_MTD_DEBUG is not set 389# CONFIG_MTD_DEBUG is not set
381# CONFIG_MTD_CONCAT is not set 390# CONFIG_MTD_CONCAT is not set
382CONFIG_MTD_PARTITIONS=y 391CONFIG_MTD_PARTITIONS=y
392# CONFIG_MTD_TESTS is not set
383# CONFIG_MTD_REDBOOT_PARTS is not set 393# CONFIG_MTD_REDBOOT_PARTS is not set
384CONFIG_MTD_CMDLINE_PARTS=y 394CONFIG_MTD_CMDLINE_PARTS=y
385# CONFIG_MTD_OF_PARTS is not set 395# CONFIG_MTD_OF_PARTS is not set
@@ -451,6 +461,12 @@ CONFIG_MTD_PHYSMAP_OF=y
451# CONFIG_MTD_ONENAND is not set 461# CONFIG_MTD_ONENAND is not set
452 462
453# 463#
464# LPDDR flash memory drivers
465#
466# CONFIG_MTD_LPDDR is not set
467# CONFIG_MTD_QINFO_PROBE is not set
468
469#
454# UBI - Unsorted block images 470# UBI - Unsorted block images
455# 471#
456# CONFIG_MTD_UBI is not set 472# CONFIG_MTD_UBI is not set
@@ -480,8 +496,10 @@ CONFIG_MISC_DEVICES=y
480# CONFIG_EEPROM_93CX6 is not set 496# CONFIG_EEPROM_93CX6 is not set
481# CONFIG_SGI_IOC4 is not set 497# CONFIG_SGI_IOC4 is not set
482# CONFIG_TIFM_CORE is not set 498# CONFIG_TIFM_CORE is not set
499# CONFIG_ICS932S401 is not set
483# CONFIG_ENCLOSURE_SERVICES is not set 500# CONFIG_ENCLOSURE_SERVICES is not set
484# CONFIG_HP_ILO is not set 501# CONFIG_HP_ILO is not set
502# CONFIG_C2PORT is not set
485CONFIG_HAVE_IDE=y 503CONFIG_HAVE_IDE=y
486# CONFIG_IDE is not set 504# CONFIG_IDE is not set
487 505
@@ -524,6 +542,7 @@ CONFIG_SCSI_WAIT_SCAN=m
524# CONFIG_SCSI_SRP_ATTRS is not set 542# CONFIG_SCSI_SRP_ATTRS is not set
525CONFIG_SCSI_LOWLEVEL=y 543CONFIG_SCSI_LOWLEVEL=y
526# CONFIG_ISCSI_TCP is not set 544# CONFIG_ISCSI_TCP is not set
545# CONFIG_SCSI_CXGB3_ISCSI is not set
527# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 546# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
528# CONFIG_SCSI_3W_9XXX is not set 547# CONFIG_SCSI_3W_9XXX is not set
529# CONFIG_SCSI_ACARD is not set 548# CONFIG_SCSI_ACARD is not set
@@ -540,6 +559,8 @@ CONFIG_SCSI_LOWLEVEL=y
540# CONFIG_MEGARAID_SAS is not set 559# CONFIG_MEGARAID_SAS is not set
541# CONFIG_SCSI_HPTIOP is not set 560# CONFIG_SCSI_HPTIOP is not set
542# CONFIG_SCSI_BUSLOGIC is not set 561# CONFIG_SCSI_BUSLOGIC is not set
562# CONFIG_LIBFC is not set
563# CONFIG_FCOE is not set
543# CONFIG_SCSI_DMX3191D is not set 564# CONFIG_SCSI_DMX3191D is not set
544# CONFIG_SCSI_EATA is not set 565# CONFIG_SCSI_EATA is not set
545# CONFIG_SCSI_FUTURE_DOMAIN is not set 566# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -598,6 +619,9 @@ CONFIG_MARVELL_PHY=y
598# CONFIG_BROADCOM_PHY is not set 619# CONFIG_BROADCOM_PHY is not set
599# CONFIG_ICPLUS_PHY is not set 620# CONFIG_ICPLUS_PHY is not set
600# CONFIG_REALTEK_PHY is not set 621# CONFIG_REALTEK_PHY is not set
622# CONFIG_NATIONAL_PHY is not set
623# CONFIG_STE10XP is not set
624# CONFIG_LSI_ET1011C_PHY is not set
601# CONFIG_FIXED_PHY is not set 625# CONFIG_FIXED_PHY is not set
602# CONFIG_MDIO_BITBANG is not set 626# CONFIG_MDIO_BITBANG is not set
603CONFIG_NET_ETHERNET=y 627CONFIG_NET_ETHERNET=y
@@ -638,7 +662,6 @@ CONFIG_NETDEV_1000=y
638# CONFIG_GIANFAR is not set 662# CONFIG_GIANFAR is not set
639CONFIG_UCC_GETH=y 663CONFIG_UCC_GETH=y
640# CONFIG_UGETH_MAGIC_PACKET is not set 664# CONFIG_UGETH_MAGIC_PACKET is not set
641# CONFIG_UGETH_FILTERING is not set
642# CONFIG_UGETH_TX_ON_DEMAND is not set 665# CONFIG_UGETH_TX_ON_DEMAND is not set
643# CONFIG_MV643XX_ETH is not set 666# CONFIG_MV643XX_ETH is not set
644# CONFIG_QLA3XXX is not set 667# CONFIG_QLA3XXX is not set
@@ -647,6 +670,7 @@ CONFIG_UCC_GETH=y
647# CONFIG_JME is not set 670# CONFIG_JME is not set
648CONFIG_NETDEV_10000=y 671CONFIG_NETDEV_10000=y
649# CONFIG_CHELSIO_T1 is not set 672# CONFIG_CHELSIO_T1 is not set
673CONFIG_CHELSIO_T3_DEPENDS=y
650# CONFIG_CHELSIO_T3 is not set 674# CONFIG_CHELSIO_T3 is not set
651# CONFIG_ENIC is not set 675# CONFIG_ENIC is not set
652# CONFIG_IXGBE is not set 676# CONFIG_IXGBE is not set
@@ -669,6 +693,10 @@ CONFIG_NETDEV_10000=y
669# CONFIG_WLAN_PRE80211 is not set 693# CONFIG_WLAN_PRE80211 is not set
670# CONFIG_WLAN_80211 is not set 694# CONFIG_WLAN_80211 is not set
671# CONFIG_IWLWIFI_LEDS is not set 695# CONFIG_IWLWIFI_LEDS is not set
696
697#
698# Enable WiMAX (Networking options) to see the WiMAX drivers
699#
672# CONFIG_WAN is not set 700# CONFIG_WAN is not set
673# CONFIG_FDDI is not set 701# CONFIG_FDDI is not set
674# CONFIG_HIPPI is not set 702# CONFIG_HIPPI is not set
@@ -740,8 +768,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
740# CONFIG_SERIAL_OF_PLATFORM is not set 768# CONFIG_SERIAL_OF_PLATFORM is not set
741# CONFIG_SERIAL_QE is not set 769# CONFIG_SERIAL_QE is not set
742CONFIG_UNIX98_PTYS=y 770CONFIG_UNIX98_PTYS=y
771# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
743CONFIG_LEGACY_PTYS=y 772CONFIG_LEGACY_PTYS=y
744CONFIG_LEGACY_PTY_COUNT=256 773CONFIG_LEGACY_PTY_COUNT=256
774# CONFIG_HVC_UDBG is not set
745# CONFIG_IPMI_HANDLER is not set 775# CONFIG_IPMI_HANDLER is not set
746CONFIG_HW_RANDOM=y 776CONFIG_HW_RANDOM=y
747# CONFIG_NVRAM is not set 777# CONFIG_NVRAM is not set
@@ -813,7 +843,6 @@ CONFIG_I2C_MPC=y
813# CONFIG_SENSORS_PCF8591 is not set 843# CONFIG_SENSORS_PCF8591 is not set
814# CONFIG_SENSORS_MAX6875 is not set 844# CONFIG_SENSORS_MAX6875 is not set
815# CONFIG_SENSORS_TSL2550 is not set 845# CONFIG_SENSORS_TSL2550 is not set
816# CONFIG_MCU_MPC8349EMITX is not set
817# CONFIG_I2C_DEBUG_CORE is not set 846# CONFIG_I2C_DEBUG_CORE is not set
818# CONFIG_I2C_DEBUG_ALGO is not set 847# CONFIG_I2C_DEBUG_ALGO is not set
819# CONFIG_I2C_DEBUG_BUS is not set 848# CONFIG_I2C_DEBUG_BUS is not set
@@ -833,8 +862,10 @@ CONFIG_HWMON=y
833# CONFIG_SENSORS_ADM1029 is not set 862# CONFIG_SENSORS_ADM1029 is not set
834# CONFIG_SENSORS_ADM1031 is not set 863# CONFIG_SENSORS_ADM1031 is not set
835# CONFIG_SENSORS_ADM9240 is not set 864# CONFIG_SENSORS_ADM9240 is not set
865# CONFIG_SENSORS_ADT7462 is not set
836# CONFIG_SENSORS_ADT7470 is not set 866# CONFIG_SENSORS_ADT7470 is not set
837# CONFIG_SENSORS_ADT7473 is not set 867# CONFIG_SENSORS_ADT7473 is not set
868# CONFIG_SENSORS_ADT7475 is not set
838# CONFIG_SENSORS_ATXP1 is not set 869# CONFIG_SENSORS_ATXP1 is not set
839# CONFIG_SENSORS_DS1621 is not set 870# CONFIG_SENSORS_DS1621 is not set
840# CONFIG_SENSORS_I5K_AMB is not set 871# CONFIG_SENSORS_I5K_AMB is not set
@@ -855,6 +886,7 @@ CONFIG_HWMON=y
855# CONFIG_SENSORS_LM90 is not set 886# CONFIG_SENSORS_LM90 is not set
856# CONFIG_SENSORS_LM92 is not set 887# CONFIG_SENSORS_LM92 is not set
857# CONFIG_SENSORS_LM93 is not set 888# CONFIG_SENSORS_LM93 is not set
889# CONFIG_SENSORS_LTC4245 is not set
858# CONFIG_SENSORS_MAX1619 is not set 890# CONFIG_SENSORS_MAX1619 is not set
859# CONFIG_SENSORS_MAX6650 is not set 891# CONFIG_SENSORS_MAX6650 is not set
860# CONFIG_SENSORS_PC87360 is not set 892# CONFIG_SENSORS_PC87360 is not set
@@ -895,11 +927,11 @@ CONFIG_WATCHDOG=y
895# 927#
896# CONFIG_PCIPCWATCHDOG is not set 928# CONFIG_PCIPCWATCHDOG is not set
897# CONFIG_WDTPCI is not set 929# CONFIG_WDTPCI is not set
930CONFIG_SSB_POSSIBLE=y
898 931
899# 932#
900# Sonics Silicon Backplane 933# Sonics Silicon Backplane
901# 934#
902CONFIG_SSB_POSSIBLE=y
903# CONFIG_SSB is not set 935# CONFIG_SSB is not set
904 936
905# 937#
@@ -908,18 +940,13 @@ CONFIG_SSB_POSSIBLE=y
908# CONFIG_MFD_CORE is not set 940# CONFIG_MFD_CORE is not set
909# CONFIG_MFD_SM501 is not set 941# CONFIG_MFD_SM501 is not set
910# CONFIG_HTC_PASIC3 is not set 942# CONFIG_HTC_PASIC3 is not set
943# CONFIG_TWL4030_CORE is not set
911# CONFIG_MFD_TMIO is not set 944# CONFIG_MFD_TMIO is not set
912# CONFIG_PMIC_DA903X is not set 945# CONFIG_PMIC_DA903X is not set
913# CONFIG_MFD_WM8400 is not set 946# CONFIG_MFD_WM8400 is not set
914# CONFIG_MFD_WM8350_I2C is not set 947# CONFIG_MFD_WM8350_I2C is not set
915 948# CONFIG_MFD_PCF50633 is not set
916#
917# Voltage and Current regulators
918#
919# CONFIG_REGULATOR is not set 949# 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
923 950
924# 951#
925# Multimedia devices 952# Multimedia devices
@@ -975,9 +1002,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
975# 1002#
976 1003
977# 1004#
978# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1005# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
979# 1006#
980# CONFIG_USB_GADGET is not set 1007# CONFIG_USB_GADGET is not set
1008
1009#
1010# OTG and related infrastructure
1011#
981# CONFIG_UWB is not set 1012# CONFIG_UWB is not set
982# CONFIG_MMC is not set 1013# CONFIG_MMC is not set
983# CONFIG_MEMSTICK is not set 1014# CONFIG_MEMSTICK is not set
@@ -1015,6 +1046,7 @@ CONFIG_RTC_DRV_DS1374=y
1015# CONFIG_RTC_DRV_M41T80 is not set 1046# CONFIG_RTC_DRV_M41T80 is not set
1016# CONFIG_RTC_DRV_S35390A is not set 1047# CONFIG_RTC_DRV_S35390A is not set
1017# CONFIG_RTC_DRV_FM3130 is not set 1048# CONFIG_RTC_DRV_FM3130 is not set
1049# CONFIG_RTC_DRV_RX8581 is not set
1018 1050
1019# 1051#
1020# SPI RTC drivers 1052# SPI RTC drivers
@@ -1062,6 +1094,7 @@ CONFIG_FS_MBCACHE=y
1062CONFIG_FILE_LOCKING=y 1094CONFIG_FILE_LOCKING=y
1063# CONFIG_XFS_FS is not set 1095# CONFIG_XFS_FS is not set
1064# CONFIG_OCFS2_FS is not set 1096# CONFIG_OCFS2_FS is not set
1097# CONFIG_BTRFS_FS is not set
1065CONFIG_DNOTIFY=y 1098CONFIG_DNOTIFY=y
1066CONFIG_INOTIFY=y 1099CONFIG_INOTIFY=y
1067CONFIG_INOTIFY_USER=y 1100CONFIG_INOTIFY_USER=y
@@ -1095,10 +1128,7 @@ CONFIG_TMPFS=y
1095# CONFIG_TMPFS_POSIX_ACL is not set 1128# CONFIG_TMPFS_POSIX_ACL is not set
1096# CONFIG_HUGETLB_PAGE is not set 1129# CONFIG_HUGETLB_PAGE is not set
1097# CONFIG_CONFIGFS_FS is not set 1130# CONFIG_CONFIGFS_FS is not set
1098 1131CONFIG_MISC_FILESYSTEMS=y
1099#
1100# Miscellaneous filesystems
1101#
1102# CONFIG_ADFS_FS is not set 1132# CONFIG_ADFS_FS is not set
1103# CONFIG_AFFS_FS is not set 1133# CONFIG_AFFS_FS is not set
1104# CONFIG_HFS_FS is not set 1134# CONFIG_HFS_FS is not set
@@ -1108,6 +1138,7 @@ CONFIG_TMPFS=y
1108# CONFIG_EFS_FS is not set 1138# CONFIG_EFS_FS is not set
1109# CONFIG_JFFS2_FS is not set 1139# CONFIG_JFFS2_FS is not set
1110# CONFIG_CRAMFS is not set 1140# CONFIG_CRAMFS is not set
1141# CONFIG_SQUASHFS is not set
1111# CONFIG_VXFS_FS is not set 1142# CONFIG_VXFS_FS is not set
1112# CONFIG_MINIX_FS is not set 1143# CONFIG_MINIX_FS is not set
1113# CONFIG_OMFS_FS is not set 1144# CONFIG_OMFS_FS is not set
@@ -1163,6 +1194,7 @@ CONFIG_UCC=y
1163# Library routines 1194# Library routines
1164# 1195#
1165CONFIG_BITREVERSE=y 1196CONFIG_BITREVERSE=y
1197CONFIG_GENERIC_FIND_LAST_BIT=y
1166# CONFIG_CRC_CCITT is not set 1198# CONFIG_CRC_CCITT is not set
1167# CONFIG_CRC16 is not set 1199# CONFIG_CRC16 is not set
1168# CONFIG_CRC_T10DIF is not set 1200# CONFIG_CRC_T10DIF is not set
@@ -1196,6 +1228,8 @@ CONFIG_FRAME_WARN=1024
1196# CONFIG_LATENCYTOP is not set 1228# CONFIG_LATENCYTOP is not set
1197CONFIG_SYSCTL_SYSCALL_CHECK=y 1229CONFIG_SYSCTL_SYSCALL_CHECK=y
1198CONFIG_HAVE_FUNCTION_TRACER=y 1230CONFIG_HAVE_FUNCTION_TRACER=y
1231CONFIG_HAVE_DYNAMIC_FTRACE=y
1232CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1199 1233
1200# 1234#
1201# Tracers 1235# Tracers
@@ -1203,6 +1237,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1203# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1237# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1204# CONFIG_SAMPLES is not set 1238# CONFIG_SAMPLES is not set
1205CONFIG_HAVE_ARCH_KGDB=y 1239CONFIG_HAVE_ARCH_KGDB=y
1240CONFIG_PRINT_STACK_DEPTH=64
1206# CONFIG_IRQSTACKS is not set 1241# CONFIG_IRQSTACKS is not set
1207# CONFIG_BOOTX_TEXT is not set 1242# CONFIG_BOOTX_TEXT is not set
1208# CONFIG_PPC_EARLY_DEBUG is not set 1243# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1221,11 +1256,15 @@ CONFIG_CRYPTO=y
1221# 1256#
1222# CONFIG_CRYPTO_FIPS is not set 1257# CONFIG_CRYPTO_FIPS is not set
1223CONFIG_CRYPTO_ALGAPI=y 1258CONFIG_CRYPTO_ALGAPI=y
1224CONFIG_CRYPTO_AEAD=y 1259CONFIG_CRYPTO_ALGAPI2=y
1260CONFIG_CRYPTO_AEAD2=y
1225CONFIG_CRYPTO_BLKCIPHER=y 1261CONFIG_CRYPTO_BLKCIPHER=y
1262CONFIG_CRYPTO_BLKCIPHER2=y
1226CONFIG_CRYPTO_HASH=y 1263CONFIG_CRYPTO_HASH=y
1227CONFIG_CRYPTO_RNG=y 1264CONFIG_CRYPTO_HASH2=y
1265CONFIG_CRYPTO_RNG2=y
1228CONFIG_CRYPTO_MANAGER=y 1266CONFIG_CRYPTO_MANAGER=y
1267CONFIG_CRYPTO_MANAGER2=y
1229# CONFIG_CRYPTO_GF128MUL is not set 1268# CONFIG_CRYPTO_GF128MUL is not set
1230# CONFIG_CRYPTO_NULL is not set 1269# CONFIG_CRYPTO_NULL is not set
1231# CONFIG_CRYPTO_CRYPTD is not set 1270# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
index b94972f52241..0dc11c44306b 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:00 2008 4# Mon Jan 26 15:36:01 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -45,7 +45,7 @@ CONFIG_GENERIC_GPIO=y
45CONFIG_PPC=y 45CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
51CONFIG_OF=y 51CONFIG_OF=y
@@ -76,12 +76,12 @@ CONFIG_SYSVIPC_SYSCTL=y
76# CONFIG_AUDIT is not set 76# CONFIG_AUDIT is not set
77# CONFIG_IKCONFIG is not set 77# CONFIG_IKCONFIG is not set
78CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
79# CONFIG_CGROUPS is not set
80CONFIG_GROUP_SCHED=y 79CONFIG_GROUP_SCHED=y
81CONFIG_FAIR_GROUP_SCHED=y 80CONFIG_FAIR_GROUP_SCHED=y
82# CONFIG_RT_GROUP_SCHED is not set 81# CONFIG_RT_GROUP_SCHED is not set
83CONFIG_USER_SCHED=y 82CONFIG_USER_SCHED=y
84# CONFIG_CGROUP_SCHED is not set 83# CONFIG_CGROUP_SCHED is not set
84# CONFIG_CGROUPS is not set
85CONFIG_SYSFS_DEPRECATED=y 85CONFIG_SYSFS_DEPRECATED=y
86CONFIG_SYSFS_DEPRECATED_V2=y 86CONFIG_SYSFS_DEPRECATED_V2=y
87# CONFIG_RELAY is not set 87# CONFIG_RELAY is not set
@@ -114,7 +114,6 @@ CONFIG_SLUB_DEBUG=y
114CONFIG_SLUB=y 114CONFIG_SLUB=y
115# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
116# CONFIG_PROFILING is not set 116# CONFIG_PROFILING is not set
117# CONFIG_MARKERS is not set
118CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
120CONFIG_HAVE_IOREMAP_PROT=y 119CONFIG_HAVE_IOREMAP_PROT=y
@@ -124,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
127# CONFIG_TINY_SHMEM is not set
128CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
129CONFIG_MODULES=y 127CONFIG_MODULES=y
130# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -132,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
132# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
133# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
134# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
135CONFIG_KMOD=y
136CONFIG_BLOCK=y 133CONFIG_BLOCK=y
137# CONFIG_LBD is not set 134# CONFIG_LBD is not set
138# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
139# CONFIG_LSF is not set
140# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
141# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
142 138
@@ -153,6 +149,10 @@ CONFIG_DEFAULT_AS=y
153# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
155CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
156# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
157 157
158# 158#
@@ -198,6 +198,8 @@ CONFIG_IPIC=y
198CONFIG_QUICC_ENGINE=y 198CONFIG_QUICC_ENGINE=y
199CONFIG_QE_GPIO=y 199CONFIG_QE_GPIO=y
200# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
201# CONFIG_SIMPLE_GPIO is not set
202# CONFIG_MCU_MPC8349EMITX is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -224,6 +226,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
224CONFIG_ARCH_HAS_WALK_MEMORY=y 226CONFIG_ARCH_HAS_WALK_MEMORY=y
225CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 227CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
226# CONFIG_KEXEC is not set 228# CONFIG_KEXEC is not set
229# CONFIG_CRASH_DUMP is not set
227CONFIG_ARCH_FLATMEM_ENABLE=y 230CONFIG_ARCH_FLATMEM_ENABLE=y
228CONFIG_ARCH_POPULATES_NODE_MAP=y 231CONFIG_ARCH_POPULATES_NODE_MAP=y
229CONFIG_SELECT_MEMORY_MODEL=y 232CONFIG_SELECT_MEMORY_MODEL=y
@@ -235,12 +238,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
235CONFIG_PAGEFLAGS_EXTENDED=y 238CONFIG_PAGEFLAGS_EXTENDED=y
236CONFIG_SPLIT_PTLOCK_CPUS=4 239CONFIG_SPLIT_PTLOCK_CPUS=4
237CONFIG_MIGRATION=y 240CONFIG_MIGRATION=y
238# CONFIG_RESOURCES_64BIT is not set
239# CONFIG_PHYS_ADDR_T_64BIT is not set 241# CONFIG_PHYS_ADDR_T_64BIT is not set
240CONFIG_ZONE_DMA_FLAG=1 242CONFIG_ZONE_DMA_FLAG=1
241CONFIG_BOUNCE=y 243CONFIG_BOUNCE=y
242CONFIG_VIRT_TO_BUS=y 244CONFIG_VIRT_TO_BUS=y
243CONFIG_UNEVICTABLE_LRU=y 245CONFIG_UNEVICTABLE_LRU=y
246CONFIG_PPC_4K_PAGES=y
247# CONFIG_PPC_16K_PAGES is not set
248# CONFIG_PPC_64K_PAGES is not set
244CONFIG_FORCE_MAX_ZONEORDER=11 249CONFIG_FORCE_MAX_ZONEORDER=11
245CONFIG_PROC_DEVICETREE=y 250CONFIG_PROC_DEVICETREE=y
246# CONFIG_CMDLINE_BOOL is not set 251# CONFIG_CMDLINE_BOOL is not set
@@ -267,6 +272,7 @@ CONFIG_PCI_SYSCALL=y
267CONFIG_ARCH_SUPPORTS_MSI=y 272CONFIG_ARCH_SUPPORTS_MSI=y
268# CONFIG_PCI_MSI is not set 273# CONFIG_PCI_MSI is not set
269# CONFIG_PCI_LEGACY is not set 274# CONFIG_PCI_LEGACY is not set
275# CONFIG_PCI_STUB is not set
270# CONFIG_PCCARD is not set 276# CONFIG_PCCARD is not set
271# CONFIG_HOTPLUG_PCI is not set 277# CONFIG_HOTPLUG_PCI is not set
272# CONFIG_HAS_RAPIDIO is not set 278# CONFIG_HAS_RAPIDIO is not set
@@ -289,6 +295,7 @@ CONFIG_NET=y
289# 295#
290# Networking options 296# Networking options
291# 297#
298CONFIG_COMPAT_NET_DEV_OPS=y
292CONFIG_PACKET=y 299CONFIG_PACKET=y
293# CONFIG_PACKET_MMAP is not set 300# CONFIG_PACKET_MMAP is not set
294CONFIG_UNIX=y 301CONFIG_UNIX=y
@@ -345,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
347# CONFIG_NET_SCHED is not set 354# CONFIG_NET_SCHED is not set
355# CONFIG_DCB is not set
348 356
349# 357#
350# Network testing 358# Network testing
@@ -360,8 +368,9 @@ CONFIG_WIRELESS=y
360# CONFIG_CFG80211 is not set 368# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y 369CONFIG_WIRELESS_OLD_REGULATORY=y
362# CONFIG_WIRELESS_EXT is not set 370# CONFIG_WIRELESS_EXT is not set
371# CONFIG_LIB80211 is not set
363# CONFIG_MAC80211 is not set 372# CONFIG_MAC80211 is not set
364# CONFIG_IEEE80211 is not set 373# CONFIG_WIMAX is not set
365# CONFIG_RFKILL is not set 374# CONFIG_RFKILL is not set
366# CONFIG_NET_9P is not set 375# CONFIG_NET_9P is not set
367 376
@@ -384,6 +393,7 @@ CONFIG_MTD=y
384# CONFIG_MTD_DEBUG is not set 393# CONFIG_MTD_DEBUG is not set
385# CONFIG_MTD_CONCAT is not set 394# CONFIG_MTD_CONCAT is not set
386CONFIG_MTD_PARTITIONS=y 395CONFIG_MTD_PARTITIONS=y
396# CONFIG_MTD_TESTS is not set
387# CONFIG_MTD_REDBOOT_PARTS is not set 397# CONFIG_MTD_REDBOOT_PARTS is not set
388CONFIG_MTD_CMDLINE_PARTS=y 398CONFIG_MTD_CMDLINE_PARTS=y
389# CONFIG_MTD_OF_PARTS is not set 399# CONFIG_MTD_OF_PARTS is not set
@@ -462,6 +472,12 @@ CONFIG_MTD_PHYSMAP_OF=y
462# CONFIG_MTD_ONENAND is not set 472# CONFIG_MTD_ONENAND is not set
463 473
464# 474#
475# LPDDR flash memory drivers
476#
477# CONFIG_MTD_LPDDR is not set
478# CONFIG_MTD_QINFO_PROBE is not set
479
480#
465# UBI - Unsorted block images 481# UBI - Unsorted block images
466# 482#
467# CONFIG_MTD_UBI is not set 483# CONFIG_MTD_UBI is not set
@@ -493,8 +509,10 @@ CONFIG_MISC_DEVICES=y
493# CONFIG_EEPROM_93CX6 is not set 509# CONFIG_EEPROM_93CX6 is not set
494# CONFIG_SGI_IOC4 is not set 510# CONFIG_SGI_IOC4 is not set
495# CONFIG_TIFM_CORE is not set 511# CONFIG_TIFM_CORE is not set
512# CONFIG_ICS932S401 is not set
496# CONFIG_ENCLOSURE_SERVICES is not set 513# CONFIG_ENCLOSURE_SERVICES is not set
497# CONFIG_HP_ILO is not set 514# CONFIG_HP_ILO is not set
515# CONFIG_C2PORT is not set
498CONFIG_HAVE_IDE=y 516CONFIG_HAVE_IDE=y
499# CONFIG_IDE is not set 517# CONFIG_IDE is not set
500 518
@@ -543,6 +561,9 @@ CONFIG_PHYLIB=y
543CONFIG_BROADCOM_PHY=y 561CONFIG_BROADCOM_PHY=y
544# CONFIG_ICPLUS_PHY is not set 562# CONFIG_ICPLUS_PHY is not set
545# CONFIG_REALTEK_PHY is not set 563# CONFIG_REALTEK_PHY is not set
564# CONFIG_NATIONAL_PHY is not set
565# CONFIG_STE10XP is not set
566# CONFIG_LSI_ET1011C_PHY is not set
546# CONFIG_FIXED_PHY is not set 567# CONFIG_FIXED_PHY is not set
547# CONFIG_MDIO_BITBANG is not set 568# CONFIG_MDIO_BITBANG is not set
548# CONFIG_NET_ETHERNET is not set 569# CONFIG_NET_ETHERNET is not set
@@ -566,7 +587,6 @@ CONFIG_NETDEV_1000=y
566# CONFIG_GIANFAR is not set 587# CONFIG_GIANFAR is not set
567CONFIG_UCC_GETH=y 588CONFIG_UCC_GETH=y
568# CONFIG_UGETH_MAGIC_PACKET is not set 589# CONFIG_UGETH_MAGIC_PACKET is not set
569# CONFIG_UGETH_FILTERING is not set
570# CONFIG_UGETH_TX_ON_DEMAND is not set 590# CONFIG_UGETH_TX_ON_DEMAND is not set
571# CONFIG_MV643XX_ETH is not set 591# CONFIG_MV643XX_ETH is not set
572# CONFIG_QLA3XXX is not set 592# CONFIG_QLA3XXX is not set
@@ -582,6 +602,10 @@ CONFIG_UCC_GETH=y
582# CONFIG_WLAN_PRE80211 is not set 602# CONFIG_WLAN_PRE80211 is not set
583# CONFIG_WLAN_80211 is not set 603# CONFIG_WLAN_80211 is not set
584# CONFIG_IWLWIFI_LEDS is not set 604# CONFIG_IWLWIFI_LEDS is not set
605
606#
607# Enable WiMAX (Networking options) to see the WiMAX drivers
608#
585# CONFIG_WAN is not set 609# CONFIG_WAN is not set
586# CONFIG_FDDI is not set 610# CONFIG_FDDI is not set
587# CONFIG_HIPPI is not set 611# CONFIG_HIPPI is not set
@@ -656,8 +680,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
656# CONFIG_SERIAL_OF_PLATFORM is not set 680# CONFIG_SERIAL_OF_PLATFORM is not set
657CONFIG_SERIAL_QE=y 681CONFIG_SERIAL_QE=y
658CONFIG_UNIX98_PTYS=y 682CONFIG_UNIX98_PTYS=y
683# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
659CONFIG_LEGACY_PTYS=y 684CONFIG_LEGACY_PTYS=y
660CONFIG_LEGACY_PTY_COUNT=256 685CONFIG_LEGACY_PTY_COUNT=256
686# CONFIG_HVC_UDBG is not set
661# CONFIG_IPMI_HANDLER is not set 687# CONFIG_IPMI_HANDLER is not set
662CONFIG_HW_RANDOM=y 688CONFIG_HW_RANDOM=y
663# CONFIG_NVRAM is not set 689# CONFIG_NVRAM is not set
@@ -729,10 +755,8 @@ CONFIG_I2C_MPC=y
729# CONFIG_PCF8575 is not set 755# CONFIG_PCF8575 is not set
730# CONFIG_SENSORS_PCA9539 is not set 756# CONFIG_SENSORS_PCA9539 is not set
731# CONFIG_SENSORS_PCF8591 is not set 757# CONFIG_SENSORS_PCF8591 is not set
732# CONFIG_TPS65010 is not set
733# CONFIG_SENSORS_MAX6875 is not set 758# CONFIG_SENSORS_MAX6875 is not set
734# CONFIG_SENSORS_TSL2550 is not set 759# CONFIG_SENSORS_TSL2550 is not set
735# CONFIG_MCU_MPC8349EMITX is not set
736# CONFIG_I2C_DEBUG_CORE is not set 760# CONFIG_I2C_DEBUG_CORE is not set
737# CONFIG_I2C_DEBUG_ALGO is not set 761# CONFIG_I2C_DEBUG_ALGO is not set
738# CONFIG_I2C_DEBUG_BUS is not set 762# CONFIG_I2C_DEBUG_BUS is not set
@@ -744,6 +768,7 @@ CONFIG_SPI_MASTER=y
744# SPI Master Controller Drivers 768# SPI Master Controller Drivers
745# 769#
746CONFIG_SPI_BITBANG=y 770CONFIG_SPI_BITBANG=y
771# CONFIG_SPI_GPIO is not set
747CONFIG_SPI_MPC83xx=y 772CONFIG_SPI_MPC83xx=y
748 773
749# 774#
@@ -758,6 +783,11 @@ CONFIG_GPIOLIB=y
758# CONFIG_GPIO_SYSFS is not set 783# CONFIG_GPIO_SYSFS is not set
759 784
760# 785#
786# Memory mapped GPIO expanders:
787#
788# CONFIG_GPIO_XILINX is not set
789
790#
761# I2C GPIO expanders: 791# I2C GPIO expanders:
762# 792#
763# CONFIG_GPIO_MAX732X is not set 793# CONFIG_GPIO_MAX732X is not set
@@ -794,11 +824,11 @@ CONFIG_WATCHDOG=y
794# 824#
795# CONFIG_PCIPCWATCHDOG is not set 825# CONFIG_PCIPCWATCHDOG is not set
796# CONFIG_WDTPCI is not set 826# CONFIG_WDTPCI is not set
827CONFIG_SSB_POSSIBLE=y
797 828
798# 829#
799# Sonics Silicon Backplane 830# Sonics Silicon Backplane
800# 831#
801CONFIG_SSB_POSSIBLE=y
802# CONFIG_SSB is not set 832# CONFIG_SSB is not set
803 833
804# 834#
@@ -807,18 +837,14 @@ CONFIG_SSB_POSSIBLE=y
807# CONFIG_MFD_CORE is not set 837# CONFIG_MFD_CORE is not set
808# CONFIG_MFD_SM501 is not set 838# CONFIG_MFD_SM501 is not set
809# CONFIG_HTC_PASIC3 is not set 839# CONFIG_HTC_PASIC3 is not set
840# CONFIG_TPS65010 is not set
841# CONFIG_TWL4030_CORE is not set
810# CONFIG_MFD_TMIO is not set 842# CONFIG_MFD_TMIO is not set
811# CONFIG_PMIC_DA903X is not set 843# CONFIG_PMIC_DA903X is not set
812# CONFIG_MFD_WM8400 is not set 844# CONFIG_MFD_WM8400 is not set
813# CONFIG_MFD_WM8350_I2C is not set 845# CONFIG_MFD_WM8350_I2C is not set
814 846# CONFIG_MFD_PCF50633 is not set
815#
816# Voltage and Current regulators
817#
818# CONFIG_REGULATOR is not set 847# 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
822 848
823# 849#
824# Multimedia devices 850# Multimedia devices
@@ -897,6 +923,7 @@ CONFIG_FB_OF=y
897# CONFIG_FB_IBM_GXT4500 is not set 923# CONFIG_FB_IBM_GXT4500 is not set
898# CONFIG_FB_VIRTUAL is not set 924# CONFIG_FB_VIRTUAL is not set
899# CONFIG_FB_METRONOME is not set 925# CONFIG_FB_METRONOME is not set
926# CONFIG_FB_MB862XX is not set
900# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 927# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
901 928
902# 929#
@@ -962,6 +989,7 @@ CONFIG_FS_MBCACHE=y
962CONFIG_FILE_LOCKING=y 989CONFIG_FILE_LOCKING=y
963# CONFIG_XFS_FS is not set 990# CONFIG_XFS_FS is not set
964# CONFIG_OCFS2_FS is not set 991# CONFIG_OCFS2_FS is not set
992# CONFIG_BTRFS_FS is not set
965CONFIG_DNOTIFY=y 993CONFIG_DNOTIFY=y
966CONFIG_INOTIFY=y 994CONFIG_INOTIFY=y
967CONFIG_INOTIFY_USER=y 995CONFIG_INOTIFY_USER=y
@@ -995,10 +1023,7 @@ CONFIG_TMPFS=y
995# CONFIG_TMPFS_POSIX_ACL is not set 1023# CONFIG_TMPFS_POSIX_ACL is not set
996# CONFIG_HUGETLB_PAGE is not set 1024# CONFIG_HUGETLB_PAGE is not set
997# CONFIG_CONFIGFS_FS is not set 1025# CONFIG_CONFIGFS_FS is not set
998 1026CONFIG_MISC_FILESYSTEMS=y
999#
1000# Miscellaneous filesystems
1001#
1002# CONFIG_ADFS_FS is not set 1027# CONFIG_ADFS_FS is not set
1003# CONFIG_AFFS_FS is not set 1028# CONFIG_AFFS_FS is not set
1004# CONFIG_HFS_FS is not set 1029# CONFIG_HFS_FS is not set
@@ -1018,6 +1043,7 @@ CONFIG_JFFS2_ZLIB=y
1018CONFIG_JFFS2_RTIME=y 1043CONFIG_JFFS2_RTIME=y
1019# CONFIG_JFFS2_RUBIN is not set 1044# CONFIG_JFFS2_RUBIN is not set
1020# CONFIG_CRAMFS is not set 1045# CONFIG_CRAMFS is not set
1046# CONFIG_SQUASHFS is not set
1021# CONFIG_VXFS_FS is not set 1047# CONFIG_VXFS_FS is not set
1022# CONFIG_MINIX_FS is not set 1048# CONFIG_MINIX_FS is not set
1023# CONFIG_OMFS_FS is not set 1049# CONFIG_OMFS_FS is not set
@@ -1074,6 +1100,7 @@ CONFIG_UCC=y
1074# Library routines 1100# Library routines
1075# 1101#
1076CONFIG_BITREVERSE=y 1102CONFIG_BITREVERSE=y
1103CONFIG_GENERIC_FIND_LAST_BIT=y
1077# CONFIG_CRC_CCITT is not set 1104# CONFIG_CRC_CCITT is not set
1078# CONFIG_CRC16 is not set 1105# CONFIG_CRC16 is not set
1079# CONFIG_CRC_T10DIF is not set 1106# CONFIG_CRC_T10DIF is not set
@@ -1109,6 +1136,8 @@ CONFIG_FRAME_WARN=1024
1109# CONFIG_LATENCYTOP is not set 1136# CONFIG_LATENCYTOP is not set
1110CONFIG_SYSCTL_SYSCALL_CHECK=y 1137CONFIG_SYSCTL_SYSCALL_CHECK=y
1111CONFIG_HAVE_FUNCTION_TRACER=y 1138CONFIG_HAVE_FUNCTION_TRACER=y
1139CONFIG_HAVE_DYNAMIC_FTRACE=y
1140CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1112 1141
1113# 1142#
1114# Tracers 1143# Tracers
@@ -1116,6 +1145,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1116# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1145# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1117# CONFIG_SAMPLES is not set 1146# CONFIG_SAMPLES is not set
1118CONFIG_HAVE_ARCH_KGDB=y 1147CONFIG_HAVE_ARCH_KGDB=y
1148CONFIG_PRINT_STACK_DEPTH=64
1119# CONFIG_IRQSTACKS is not set 1149# CONFIG_IRQSTACKS is not set
1120# CONFIG_BOOTX_TEXT is not set 1150# CONFIG_BOOTX_TEXT is not set
1121CONFIG_PPC_EARLY_DEBUG=y 1151CONFIG_PPC_EARLY_DEBUG=y
@@ -1145,11 +1175,15 @@ CONFIG_CRYPTO=y
1145# 1175#
1146# CONFIG_CRYPTO_FIPS is not set 1176# CONFIG_CRYPTO_FIPS is not set
1147CONFIG_CRYPTO_ALGAPI=y 1177CONFIG_CRYPTO_ALGAPI=y
1148CONFIG_CRYPTO_AEAD=y 1178CONFIG_CRYPTO_ALGAPI2=y
1179CONFIG_CRYPTO_AEAD2=y
1149CONFIG_CRYPTO_BLKCIPHER=y 1180CONFIG_CRYPTO_BLKCIPHER=y
1181CONFIG_CRYPTO_BLKCIPHER2=y
1150CONFIG_CRYPTO_HASH=y 1182CONFIG_CRYPTO_HASH=y
1151CONFIG_CRYPTO_RNG=y 1183CONFIG_CRYPTO_HASH2=y
1184CONFIG_CRYPTO_RNG2=y
1152CONFIG_CRYPTO_MANAGER=y 1185CONFIG_CRYPTO_MANAGER=y
1186CONFIG_CRYPTO_MANAGER2=y
1153# CONFIG_CRYPTO_GF128MUL is not set 1187# CONFIG_CRYPTO_GF128MUL is not set
1154# CONFIG_CRYPTO_NULL is not set 1188# CONFIG_CRYPTO_NULL is not set
1155# CONFIG_CRYPTO_CRYPTD is not set 1189# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
index ad97649bdc73..e42f6b3917d2 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:00 2008 4# Mon Jan 26 15:35:59 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80CONFIG_FAIR_GROUP_SCHED=y 79CONFIG_FAIR_GROUP_SCHED=y
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLAB=y
113# CONFIG_SLUB is not set 113# CONFIG_SLUB is not set
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -124,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
127# CONFIG_TINY_SHMEM is not set
128CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
129CONFIG_MODULES=y 127CONFIG_MODULES=y
130# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -132,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
132# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
133# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
134# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
135CONFIG_KMOD=y
136CONFIG_BLOCK=y 133CONFIG_BLOCK=y
137# CONFIG_LBD is not set 134# CONFIG_LBD is not set
138# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
139# CONFIG_LSF is not set
140# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
141# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
142 138
@@ -153,6 +149,10 @@ CONFIG_DEFAULT_AS=y
153# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
155CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
156# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
157 157
158# 158#
@@ -199,6 +199,8 @@ CONFIG_IPIC=y
199# CONFIG_QUICC_ENGINE is not set 199# CONFIG_QUICC_ENGINE is not set
200# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
201# CONFIG_MPC8xxx_GPIO is not set 201# CONFIG_MPC8xxx_GPIO is not set
202# CONFIG_SIMPLE_GPIO is not set
203# CONFIG_MCU_MPC8349EMITX is not set
202 204
203# 205#
204# Kernel options 206# Kernel options
@@ -225,6 +227,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 227CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 228CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 229# CONFIG_KEXEC is not set
230# CONFIG_CRASH_DUMP is not set
228CONFIG_ARCH_FLATMEM_ENABLE=y 231CONFIG_ARCH_FLATMEM_ENABLE=y
229CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
230CONFIG_SELECT_MEMORY_MODEL=y 233CONFIG_SELECT_MEMORY_MODEL=y
@@ -236,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
236CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
238CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set 242# CONFIG_PHYS_ADDR_T_64BIT is not set
241CONFIG_ZONE_DMA_FLAG=1 243CONFIG_ZONE_DMA_FLAG=1
242CONFIG_BOUNCE=y 244CONFIG_BOUNCE=y
243CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
245CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
247# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -266,6 +271,7 @@ CONFIG_PCI_SYSCALL=y
266CONFIG_ARCH_SUPPORTS_MSI=y 271CONFIG_ARCH_SUPPORTS_MSI=y
267# CONFIG_PCI_MSI is not set 272# CONFIG_PCI_MSI is not set
268# CONFIG_PCI_LEGACY is not set 273# CONFIG_PCI_LEGACY is not set
274# CONFIG_PCI_STUB is not set
269# CONFIG_PCCARD is not set 275# CONFIG_PCCARD is not set
270# CONFIG_HOTPLUG_PCI is not set 276# CONFIG_HOTPLUG_PCI is not set
271# CONFIG_HAS_RAPIDIO is not set 277# CONFIG_HAS_RAPIDIO is not set
@@ -288,6 +294,7 @@ CONFIG_NET=y
288# 294#
289# Networking options 295# Networking options
290# 296#
297CONFIG_COMPAT_NET_DEV_OPS=y
291CONFIG_PACKET=y 298CONFIG_PACKET=y
292# CONFIG_PACKET_MMAP is not set 299# CONFIG_PACKET_MMAP is not set
293CONFIG_UNIX=y 300CONFIG_UNIX=y
@@ -344,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_ECONET is not set 351# CONFIG_ECONET is not set
345# CONFIG_WAN_ROUTER is not set 352# CONFIG_WAN_ROUTER is not set
346# CONFIG_NET_SCHED is not set 353# CONFIG_NET_SCHED is not set
354# CONFIG_DCB is not set
347 355
348# 356#
349# Network testing 357# Network testing
@@ -359,8 +367,9 @@ CONFIG_WIRELESS=y
359# CONFIG_CFG80211 is not set 367# CONFIG_CFG80211 is not set
360CONFIG_WIRELESS_OLD_REGULATORY=y 368CONFIG_WIRELESS_OLD_REGULATORY=y
361# CONFIG_WIRELESS_EXT is not set 369# CONFIG_WIRELESS_EXT is not set
370# CONFIG_LIB80211 is not set
362# CONFIG_MAC80211 is not set 371# CONFIG_MAC80211 is not set
363# CONFIG_IEEE80211 is not set 372# CONFIG_WIMAX is not set
364# CONFIG_RFKILL is not set 373# CONFIG_RFKILL is not set
365# CONFIG_NET_9P is not set 374# CONFIG_NET_9P is not set
366 375
@@ -404,8 +413,10 @@ CONFIG_MISC_DEVICES=y
404# CONFIG_EEPROM_93CX6 is not set 413# CONFIG_EEPROM_93CX6 is not set
405# CONFIG_SGI_IOC4 is not set 414# CONFIG_SGI_IOC4 is not set
406# CONFIG_TIFM_CORE is not set 415# CONFIG_TIFM_CORE is not set
416# CONFIG_ICS932S401 is not set
407# CONFIG_ENCLOSURE_SERVICES is not set 417# CONFIG_ENCLOSURE_SERVICES is not set
408# CONFIG_HP_ILO is not set 418# CONFIG_HP_ILO is not set
419# CONFIG_C2PORT is not set
409CONFIG_HAVE_IDE=y 420CONFIG_HAVE_IDE=y
410# CONFIG_IDE is not set 421# CONFIG_IDE is not set
411 422
@@ -448,6 +459,7 @@ CONFIG_SCSI_WAIT_SCAN=m
448# CONFIG_SCSI_SRP_ATTRS is not set 459# CONFIG_SCSI_SRP_ATTRS is not set
449CONFIG_SCSI_LOWLEVEL=y 460CONFIG_SCSI_LOWLEVEL=y
450# CONFIG_ISCSI_TCP is not set 461# CONFIG_ISCSI_TCP is not set
462# CONFIG_SCSI_CXGB3_ISCSI is not set
451# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 463# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
452# CONFIG_SCSI_3W_9XXX is not set 464# CONFIG_SCSI_3W_9XXX is not set
453# CONFIG_SCSI_ACARD is not set 465# CONFIG_SCSI_ACARD is not set
@@ -464,6 +476,8 @@ CONFIG_SCSI_LOWLEVEL=y
464# CONFIG_MEGARAID_SAS is not set 476# CONFIG_MEGARAID_SAS is not set
465# CONFIG_SCSI_HPTIOP is not set 477# CONFIG_SCSI_HPTIOP is not set
466# CONFIG_SCSI_BUSLOGIC is not set 478# CONFIG_SCSI_BUSLOGIC is not set
479# CONFIG_LIBFC is not set
480# CONFIG_FCOE is not set
467# CONFIG_SCSI_DMX3191D is not set 481# CONFIG_SCSI_DMX3191D is not set
468# CONFIG_SCSI_EATA is not set 482# CONFIG_SCSI_EATA is not set
469# CONFIG_SCSI_FUTURE_DOMAIN is not set 483# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -583,6 +597,9 @@ CONFIG_MARVELL_PHY=y
583# CONFIG_BROADCOM_PHY is not set 597# CONFIG_BROADCOM_PHY is not set
584# CONFIG_ICPLUS_PHY is not set 598# CONFIG_ICPLUS_PHY is not set
585# CONFIG_REALTEK_PHY is not set 599# CONFIG_REALTEK_PHY is not set
600# CONFIG_NATIONAL_PHY is not set
601# CONFIG_STE10XP is not set
602# CONFIG_LSI_ET1011C_PHY is not set
586# CONFIG_FIXED_PHY is not set 603# CONFIG_FIXED_PHY is not set
587# CONFIG_MDIO_BITBANG is not set 604# CONFIG_MDIO_BITBANG is not set
588CONFIG_NET_ETHERNET=y 605CONFIG_NET_ETHERNET=y
@@ -628,6 +645,7 @@ CONFIG_GIANFAR=y
628# CONFIG_JME is not set 645# CONFIG_JME is not set
629CONFIG_NETDEV_10000=y 646CONFIG_NETDEV_10000=y
630# CONFIG_CHELSIO_T1 is not set 647# CONFIG_CHELSIO_T1 is not set
648CONFIG_CHELSIO_T3_DEPENDS=y
631# CONFIG_CHELSIO_T3 is not set 649# CONFIG_CHELSIO_T3 is not set
632# CONFIG_ENIC is not set 650# CONFIG_ENIC is not set
633# CONFIG_IXGBE is not set 651# CONFIG_IXGBE is not set
@@ -650,6 +668,10 @@ CONFIG_NETDEV_10000=y
650# CONFIG_WLAN_PRE80211 is not set 668# CONFIG_WLAN_PRE80211 is not set
651# CONFIG_WLAN_80211 is not set 669# CONFIG_WLAN_80211 is not set
652# CONFIG_IWLWIFI_LEDS is not set 670# CONFIG_IWLWIFI_LEDS is not set
671
672#
673# Enable WiMAX (Networking options) to see the WiMAX drivers
674#
653# CONFIG_WAN is not set 675# CONFIG_WAN is not set
654# CONFIG_FDDI is not set 676# CONFIG_FDDI is not set
655# CONFIG_HIPPI is not set 677# CONFIG_HIPPI is not set
@@ -720,8 +742,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
720# CONFIG_SERIAL_JSM is not set 742# CONFIG_SERIAL_JSM is not set
721# CONFIG_SERIAL_OF_PLATFORM is not set 743# CONFIG_SERIAL_OF_PLATFORM is not set
722CONFIG_UNIX98_PTYS=y 744CONFIG_UNIX98_PTYS=y
745# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
723CONFIG_LEGACY_PTYS=y 746CONFIG_LEGACY_PTYS=y
724CONFIG_LEGACY_PTY_COUNT=256 747CONFIG_LEGACY_PTY_COUNT=256
748# CONFIG_HVC_UDBG is not set
725# CONFIG_IPMI_HANDLER is not set 749# CONFIG_IPMI_HANDLER is not set
726# CONFIG_HW_RANDOM is not set 750# CONFIG_HW_RANDOM is not set
727# CONFIG_NVRAM is not set 751# CONFIG_NVRAM is not set
@@ -795,7 +819,6 @@ CONFIG_I2C_MPC=y
795# CONFIG_SENSORS_PCF8591 is not set 819# CONFIG_SENSORS_PCF8591 is not set
796# CONFIG_SENSORS_MAX6875 is not set 820# CONFIG_SENSORS_MAX6875 is not set
797# CONFIG_SENSORS_TSL2550 is not set 821# CONFIG_SENSORS_TSL2550 is not set
798# CONFIG_MCU_MPC8349EMITX is not set
799# CONFIG_I2C_DEBUG_CORE is not set 822# CONFIG_I2C_DEBUG_CORE is not set
800# CONFIG_I2C_DEBUG_ALGO is not set 823# CONFIG_I2C_DEBUG_ALGO is not set
801# CONFIG_I2C_DEBUG_BUS is not set 824# CONFIG_I2C_DEBUG_BUS is not set
@@ -815,8 +838,10 @@ CONFIG_HWMON=y
815# CONFIG_SENSORS_ADM1029 is not set 838# CONFIG_SENSORS_ADM1029 is not set
816# CONFIG_SENSORS_ADM1031 is not set 839# CONFIG_SENSORS_ADM1031 is not set
817# CONFIG_SENSORS_ADM9240 is not set 840# CONFIG_SENSORS_ADM9240 is not set
841# CONFIG_SENSORS_ADT7462 is not set
818# CONFIG_SENSORS_ADT7470 is not set 842# CONFIG_SENSORS_ADT7470 is not set
819# CONFIG_SENSORS_ADT7473 is not set 843# CONFIG_SENSORS_ADT7473 is not set
844# CONFIG_SENSORS_ADT7475 is not set
820# CONFIG_SENSORS_ATXP1 is not set 845# CONFIG_SENSORS_ATXP1 is not set
821# CONFIG_SENSORS_DS1621 is not set 846# CONFIG_SENSORS_DS1621 is not set
822# CONFIG_SENSORS_I5K_AMB is not set 847# CONFIG_SENSORS_I5K_AMB is not set
@@ -837,6 +862,7 @@ CONFIG_HWMON=y
837# CONFIG_SENSORS_LM90 is not set 862# CONFIG_SENSORS_LM90 is not set
838# CONFIG_SENSORS_LM92 is not set 863# CONFIG_SENSORS_LM92 is not set
839# CONFIG_SENSORS_LM93 is not set 864# CONFIG_SENSORS_LM93 is not set
865# CONFIG_SENSORS_LTC4245 is not set
840# CONFIG_SENSORS_MAX1619 is not set 866# CONFIG_SENSORS_MAX1619 is not set
841# CONFIG_SENSORS_MAX6650 is not set 867# CONFIG_SENSORS_MAX6650 is not set
842# CONFIG_SENSORS_PC87360 is not set 868# CONFIG_SENSORS_PC87360 is not set
@@ -877,11 +903,11 @@ CONFIG_WATCHDOG=y
877# 903#
878# CONFIG_PCIPCWATCHDOG is not set 904# CONFIG_PCIPCWATCHDOG is not set
879# CONFIG_WDTPCI is not set 905# CONFIG_WDTPCI is not set
906CONFIG_SSB_POSSIBLE=y
880 907
881# 908#
882# Sonics Silicon Backplane 909# Sonics Silicon Backplane
883# 910#
884CONFIG_SSB_POSSIBLE=y
885# CONFIG_SSB is not set 911# CONFIG_SSB is not set
886 912
887# 913#
@@ -890,18 +916,13 @@ CONFIG_SSB_POSSIBLE=y
890# CONFIG_MFD_CORE is not set 916# CONFIG_MFD_CORE is not set
891# CONFIG_MFD_SM501 is not set 917# CONFIG_MFD_SM501 is not set
892# CONFIG_HTC_PASIC3 is not set 918# CONFIG_HTC_PASIC3 is not set
919# CONFIG_TWL4030_CORE is not set
893# CONFIG_MFD_TMIO is not set 920# CONFIG_MFD_TMIO is not set
894# CONFIG_PMIC_DA903X is not set 921# CONFIG_PMIC_DA903X is not set
895# CONFIG_MFD_WM8400 is not set 922# CONFIG_MFD_WM8400 is not set
896# CONFIG_MFD_WM8350_I2C is not set 923# CONFIG_MFD_WM8350_I2C is not set
897 924# CONFIG_MFD_PCF50633 is not set
898#
899# Voltage and Current regulators
900#
901# CONFIG_REGULATOR is not set 925# 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
905 926
906# 927#
907# Multimedia devices 928# Multimedia devices
@@ -957,9 +978,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
957# 978#
958 979
959# 980#
960# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 981# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
961# 982#
962# CONFIG_USB_GADGET is not set 983# CONFIG_USB_GADGET is not set
984
985#
986# OTG and related infrastructure
987#
963# CONFIG_UWB is not set 988# CONFIG_UWB is not set
964# CONFIG_MMC is not set 989# CONFIG_MMC is not set
965# CONFIG_MEMSTICK is not set 990# CONFIG_MEMSTICK is not set
@@ -991,6 +1016,7 @@ CONFIG_FS_MBCACHE=y
991CONFIG_FILE_LOCKING=y 1016CONFIG_FILE_LOCKING=y
992# CONFIG_XFS_FS is not set 1017# CONFIG_XFS_FS is not set
993# CONFIG_OCFS2_FS is not set 1018# CONFIG_OCFS2_FS is not set
1019# CONFIG_BTRFS_FS is not set
994CONFIG_DNOTIFY=y 1020CONFIG_DNOTIFY=y
995CONFIG_INOTIFY=y 1021CONFIG_INOTIFY=y
996CONFIG_INOTIFY_USER=y 1022CONFIG_INOTIFY_USER=y
@@ -1024,10 +1050,7 @@ CONFIG_TMPFS=y
1024# CONFIG_TMPFS_POSIX_ACL is not set 1050# CONFIG_TMPFS_POSIX_ACL is not set
1025# CONFIG_HUGETLB_PAGE is not set 1051# CONFIG_HUGETLB_PAGE is not set
1026# CONFIG_CONFIGFS_FS is not set 1052# CONFIG_CONFIGFS_FS is not set
1027 1053CONFIG_MISC_FILESYSTEMS=y
1028#
1029# Miscellaneous filesystems
1030#
1031# CONFIG_ADFS_FS is not set 1054# CONFIG_ADFS_FS is not set
1032# CONFIG_AFFS_FS is not set 1055# CONFIG_AFFS_FS is not set
1033# CONFIG_HFS_FS is not set 1056# CONFIG_HFS_FS is not set
@@ -1036,6 +1059,7 @@ CONFIG_TMPFS=y
1036# CONFIG_BFS_FS is not set 1059# CONFIG_BFS_FS is not set
1037# CONFIG_EFS_FS is not set 1060# CONFIG_EFS_FS is not set
1038# CONFIG_CRAMFS is not set 1061# CONFIG_CRAMFS is not set
1062# CONFIG_SQUASHFS is not set
1039# CONFIG_VXFS_FS is not set 1063# CONFIG_VXFS_FS is not set
1040# CONFIG_MINIX_FS is not set 1064# CONFIG_MINIX_FS is not set
1041# CONFIG_OMFS_FS is not set 1065# CONFIG_OMFS_FS is not set
@@ -1093,6 +1117,7 @@ CONFIG_MSDOS_PARTITION=y
1093# Library routines 1117# Library routines
1094# 1118#
1095CONFIG_BITREVERSE=y 1119CONFIG_BITREVERSE=y
1120CONFIG_GENERIC_FIND_LAST_BIT=y
1096# CONFIG_CRC_CCITT is not set 1121# CONFIG_CRC_CCITT is not set
1097# CONFIG_CRC16 is not set 1122# CONFIG_CRC16 is not set
1098CONFIG_CRC_T10DIF=y 1123CONFIG_CRC_T10DIF=y
@@ -1124,6 +1149,8 @@ CONFIG_FRAME_WARN=1024
1124# CONFIG_LATENCYTOP is not set 1149# CONFIG_LATENCYTOP is not set
1125CONFIG_SYSCTL_SYSCALL_CHECK=y 1150CONFIG_SYSCTL_SYSCALL_CHECK=y
1126CONFIG_HAVE_FUNCTION_TRACER=y 1151CONFIG_HAVE_FUNCTION_TRACER=y
1152CONFIG_HAVE_DYNAMIC_FTRACE=y
1153CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1127 1154
1128# 1155#
1129# Tracers 1156# Tracers
@@ -1131,6 +1158,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1131# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1158# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1132# CONFIG_SAMPLES is not set 1159# CONFIG_SAMPLES is not set
1133CONFIG_HAVE_ARCH_KGDB=y 1160CONFIG_HAVE_ARCH_KGDB=y
1161CONFIG_PRINT_STACK_DEPTH=64
1134# CONFIG_IRQSTACKS is not set 1162# CONFIG_IRQSTACKS is not set
1135# CONFIG_BOOTX_TEXT is not set 1163# CONFIG_BOOTX_TEXT is not set
1136# CONFIG_PPC_EARLY_DEBUG is not set 1164# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1149,11 +1177,15 @@ CONFIG_CRYPTO=y
1149# 1177#
1150# CONFIG_CRYPTO_FIPS is not set 1178# CONFIG_CRYPTO_FIPS is not set
1151CONFIG_CRYPTO_ALGAPI=y 1179CONFIG_CRYPTO_ALGAPI=y
1152CONFIG_CRYPTO_AEAD=y 1180CONFIG_CRYPTO_ALGAPI2=y
1181CONFIG_CRYPTO_AEAD2=y
1153CONFIG_CRYPTO_BLKCIPHER=y 1182CONFIG_CRYPTO_BLKCIPHER=y
1183CONFIG_CRYPTO_BLKCIPHER2=y
1154CONFIG_CRYPTO_HASH=y 1184CONFIG_CRYPTO_HASH=y
1155CONFIG_CRYPTO_RNG=y 1185CONFIG_CRYPTO_HASH2=y
1186CONFIG_CRYPTO_RNG2=y
1156CONFIG_CRYPTO_MANAGER=y 1187CONFIG_CRYPTO_MANAGER=y
1188CONFIG_CRYPTO_MANAGER2=y
1157# CONFIG_CRYPTO_GF128MUL is not set 1189# CONFIG_CRYPTO_GF128MUL is not set
1158# CONFIG_CRYPTO_NULL is not set 1190# CONFIG_CRYPTO_NULL is not set
1159# CONFIG_CRYPTO_CRYPTD is not set 1191# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
index 2e526beeeb90..408022f79a50 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:01 2008 4# Mon Jan 26 15:36:01 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80CONFIG_FAIR_GROUP_SCHED=y 79CONFIG_FAIR_GROUP_SCHED=y
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -113,7 +113,6 @@ CONFIG_SLAB=y
113# CONFIG_SLUB is not set 113# CONFIG_SLUB is not set
114# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
118# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -124,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
127# CONFIG_TINY_SHMEM is not set
128CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
129CONFIG_MODULES=y 127CONFIG_MODULES=y
130# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -132,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
132# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
133# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
134# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
135CONFIG_KMOD=y
136CONFIG_BLOCK=y 133CONFIG_BLOCK=y
137# CONFIG_LBD is not set 134# CONFIG_LBD is not set
138# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
139# CONFIG_LSF is not set
140# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
141# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
142 138
@@ -153,6 +149,10 @@ CONFIG_DEFAULT_AS=y
153# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
155CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
156# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
157 157
158# 158#
@@ -199,6 +199,8 @@ CONFIG_IPIC=y
199# CONFIG_QUICC_ENGINE is not set 199# CONFIG_QUICC_ENGINE is not set
200# CONFIG_FSL_ULI1575 is not set 200# CONFIG_FSL_ULI1575 is not set
201# CONFIG_MPC8xxx_GPIO is not set 201# CONFIG_MPC8xxx_GPIO is not set
202# CONFIG_SIMPLE_GPIO is not set
203# CONFIG_MCU_MPC8349EMITX is not set
202 204
203# 205#
204# Kernel options 206# Kernel options
@@ -225,6 +227,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 227CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 228CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 229# CONFIG_KEXEC is not set
230# CONFIG_CRASH_DUMP is not set
228CONFIG_ARCH_FLATMEM_ENABLE=y 231CONFIG_ARCH_FLATMEM_ENABLE=y
229CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
230CONFIG_SELECT_MEMORY_MODEL=y 233CONFIG_SELECT_MEMORY_MODEL=y
@@ -236,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
236CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
238CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
239# CONFIG_RESOURCES_64BIT is not set
240# CONFIG_PHYS_ADDR_T_64BIT is not set 242# CONFIG_PHYS_ADDR_T_64BIT is not set
241CONFIG_ZONE_DMA_FLAG=1 243CONFIG_ZONE_DMA_FLAG=1
242CONFIG_BOUNCE=y 244CONFIG_BOUNCE=y
243CONFIG_VIRT_TO_BUS=y 245CONFIG_VIRT_TO_BUS=y
244CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
245CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
247# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -266,6 +271,7 @@ CONFIG_PCI_SYSCALL=y
266CONFIG_ARCH_SUPPORTS_MSI=y 271CONFIG_ARCH_SUPPORTS_MSI=y
267# CONFIG_PCI_MSI is not set 272# CONFIG_PCI_MSI is not set
268# CONFIG_PCI_LEGACY is not set 273# CONFIG_PCI_LEGACY is not set
274# CONFIG_PCI_STUB is not set
269# CONFIG_PCCARD is not set 275# CONFIG_PCCARD is not set
270# CONFIG_HOTPLUG_PCI is not set 276# CONFIG_HOTPLUG_PCI is not set
271# CONFIG_HAS_RAPIDIO is not set 277# CONFIG_HAS_RAPIDIO is not set
@@ -288,6 +294,7 @@ CONFIG_NET=y
288# 294#
289# Networking options 295# Networking options
290# 296#
297CONFIG_COMPAT_NET_DEV_OPS=y
291CONFIG_PACKET=y 298CONFIG_PACKET=y
292# CONFIG_PACKET_MMAP is not set 299# CONFIG_PACKET_MMAP is not set
293CONFIG_UNIX=y 300CONFIG_UNIX=y
@@ -339,6 +346,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
339# CONFIG_ECONET is not set 346# CONFIG_ECONET is not set
340# CONFIG_WAN_ROUTER is not set 347# CONFIG_WAN_ROUTER is not set
341# CONFIG_NET_SCHED is not set 348# CONFIG_NET_SCHED is not set
349# CONFIG_DCB is not set
342 350
343# 351#
344# Network testing 352# Network testing
@@ -354,8 +362,9 @@ CONFIG_WIRELESS=y
354# CONFIG_CFG80211 is not set 362# CONFIG_CFG80211 is not set
355CONFIG_WIRELESS_OLD_REGULATORY=y 363CONFIG_WIRELESS_OLD_REGULATORY=y
356# CONFIG_WIRELESS_EXT is not set 364# CONFIG_WIRELESS_EXT is not set
365# CONFIG_LIB80211 is not set
357# CONFIG_MAC80211 is not set 366# CONFIG_MAC80211 is not set
358# CONFIG_IEEE80211 is not set 367# CONFIG_WIMAX is not set
359# CONFIG_RFKILL is not set 368# CONFIG_RFKILL is not set
360# CONFIG_NET_9P is not set 369# CONFIG_NET_9P is not set
361 370
@@ -400,8 +409,10 @@ CONFIG_MISC_DEVICES=y
400# CONFIG_EEPROM_93CX6 is not set 409# CONFIG_EEPROM_93CX6 is not set
401# CONFIG_SGI_IOC4 is not set 410# CONFIG_SGI_IOC4 is not set
402# CONFIG_TIFM_CORE is not set 411# CONFIG_TIFM_CORE is not set
412# CONFIG_ICS932S401 is not set
403# CONFIG_ENCLOSURE_SERVICES is not set 413# CONFIG_ENCLOSURE_SERVICES is not set
404# CONFIG_HP_ILO is not set 414# CONFIG_HP_ILO is not set
415# CONFIG_C2PORT is not set
405CONFIG_HAVE_IDE=y 416CONFIG_HAVE_IDE=y
406# CONFIG_IDE is not set 417# CONFIG_IDE is not set
407 418
@@ -460,6 +471,8 @@ CONFIG_SCSI_LOWLEVEL=y
460# CONFIG_MEGARAID_SAS is not set 471# CONFIG_MEGARAID_SAS is not set
461# CONFIG_SCSI_HPTIOP is not set 472# CONFIG_SCSI_HPTIOP is not set
462# CONFIG_SCSI_BUSLOGIC is not set 473# CONFIG_SCSI_BUSLOGIC is not set
474# CONFIG_LIBFC is not set
475# CONFIG_FCOE is not set
463# CONFIG_SCSI_DMX3191D is not set 476# CONFIG_SCSI_DMX3191D is not set
464# CONFIG_SCSI_EATA is not set 477# CONFIG_SCSI_EATA is not set
465# CONFIG_SCSI_FUTURE_DOMAIN is not set 478# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -590,6 +603,9 @@ CONFIG_MARVELL_PHY=y
590# CONFIG_BROADCOM_PHY is not set 603# CONFIG_BROADCOM_PHY is not set
591# CONFIG_ICPLUS_PHY is not set 604# CONFIG_ICPLUS_PHY is not set
592# CONFIG_REALTEK_PHY is not set 605# CONFIG_REALTEK_PHY is not set
606# CONFIG_NATIONAL_PHY is not set
607# CONFIG_STE10XP is not set
608# CONFIG_LSI_ET1011C_PHY is not set
593CONFIG_FIXED_PHY=y 609CONFIG_FIXED_PHY=y
594# CONFIG_MDIO_BITBANG is not set 610# CONFIG_MDIO_BITBANG is not set
595CONFIG_NET_ETHERNET=y 611CONFIG_NET_ETHERNET=y
@@ -644,6 +660,10 @@ CONFIG_GIANFAR=y
644# CONFIG_IWLWIFI_LEDS is not set 660# CONFIG_IWLWIFI_LEDS is not set
645 661
646# 662#
663# Enable WiMAX (Networking options) to see the WiMAX drivers
664#
665
666#
647# USB Network Adapters 667# USB Network Adapters
648# 668#
649# CONFIG_USB_CATC is not set 669# CONFIG_USB_CATC is not set
@@ -721,8 +741,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
721# CONFIG_SERIAL_JSM is not set 741# CONFIG_SERIAL_JSM is not set
722# CONFIG_SERIAL_OF_PLATFORM is not set 742# CONFIG_SERIAL_OF_PLATFORM is not set
723CONFIG_UNIX98_PTYS=y 743CONFIG_UNIX98_PTYS=y
744# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
724CONFIG_LEGACY_PTYS=y 745CONFIG_LEGACY_PTYS=y
725CONFIG_LEGACY_PTY_COUNT=256 746CONFIG_LEGACY_PTY_COUNT=256
747# CONFIG_HVC_UDBG is not set
726# CONFIG_IPMI_HANDLER is not set 748# CONFIG_IPMI_HANDLER is not set
727# CONFIG_HW_RANDOM is not set 749# CONFIG_HW_RANDOM is not set
728# CONFIG_NVRAM is not set 750# CONFIG_NVRAM is not set
@@ -797,7 +819,6 @@ CONFIG_I2C_MPC=y
797# CONFIG_SENSORS_PCF8591 is not set 819# CONFIG_SENSORS_PCF8591 is not set
798# CONFIG_SENSORS_MAX6875 is not set 820# CONFIG_SENSORS_MAX6875 is not set
799# CONFIG_SENSORS_TSL2550 is not set 821# CONFIG_SENSORS_TSL2550 is not set
800# CONFIG_MCU_MPC8349EMITX is not set
801# CONFIG_I2C_DEBUG_CORE is not set 822# CONFIG_I2C_DEBUG_CORE is not set
802# CONFIG_I2C_DEBUG_ALGO is not set 823# CONFIG_I2C_DEBUG_ALGO is not set
803# CONFIG_I2C_DEBUG_BUS is not set 824# CONFIG_I2C_DEBUG_BUS is not set
@@ -817,8 +838,10 @@ CONFIG_HWMON=y
817# CONFIG_SENSORS_ADM1029 is not set 838# CONFIG_SENSORS_ADM1029 is not set
818# CONFIG_SENSORS_ADM1031 is not set 839# CONFIG_SENSORS_ADM1031 is not set
819# CONFIG_SENSORS_ADM9240 is not set 840# CONFIG_SENSORS_ADM9240 is not set
841# CONFIG_SENSORS_ADT7462 is not set
820# CONFIG_SENSORS_ADT7470 is not set 842# CONFIG_SENSORS_ADT7470 is not set
821# CONFIG_SENSORS_ADT7473 is not set 843# CONFIG_SENSORS_ADT7473 is not set
844# CONFIG_SENSORS_ADT7475 is not set
822# CONFIG_SENSORS_ATXP1 is not set 845# CONFIG_SENSORS_ATXP1 is not set
823# CONFIG_SENSORS_DS1621 is not set 846# CONFIG_SENSORS_DS1621 is not set
824# CONFIG_SENSORS_I5K_AMB is not set 847# CONFIG_SENSORS_I5K_AMB is not set
@@ -839,6 +862,7 @@ CONFIG_HWMON=y
839# CONFIG_SENSORS_LM90 is not set 862# CONFIG_SENSORS_LM90 is not set
840# CONFIG_SENSORS_LM92 is not set 863# CONFIG_SENSORS_LM92 is not set
841# CONFIG_SENSORS_LM93 is not set 864# CONFIG_SENSORS_LM93 is not set
865# CONFIG_SENSORS_LTC4245 is not set
842# CONFIG_SENSORS_MAX1619 is not set 866# CONFIG_SENSORS_MAX1619 is not set
843# CONFIG_SENSORS_MAX6650 is not set 867# CONFIG_SENSORS_MAX6650 is not set
844# CONFIG_SENSORS_PC87360 is not set 868# CONFIG_SENSORS_PC87360 is not set
@@ -884,11 +908,11 @@ CONFIG_WATCHDOG=y
884# USB-based Watchdog Cards 908# USB-based Watchdog Cards
885# 909#
886# CONFIG_USBPCWATCHDOG is not set 910# CONFIG_USBPCWATCHDOG is not set
911CONFIG_SSB_POSSIBLE=y
887 912
888# 913#
889# Sonics Silicon Backplane 914# Sonics Silicon Backplane
890# 915#
891CONFIG_SSB_POSSIBLE=y
892# CONFIG_SSB is not set 916# CONFIG_SSB is not set
893 917
894# 918#
@@ -897,18 +921,13 @@ CONFIG_SSB_POSSIBLE=y
897# CONFIG_MFD_CORE is not set 921# CONFIG_MFD_CORE is not set
898# CONFIG_MFD_SM501 is not set 922# CONFIG_MFD_SM501 is not set
899# CONFIG_HTC_PASIC3 is not set 923# CONFIG_HTC_PASIC3 is not set
924# CONFIG_TWL4030_CORE is not set
900# CONFIG_MFD_TMIO is not set 925# CONFIG_MFD_TMIO is not set
901# CONFIG_PMIC_DA903X is not set 926# CONFIG_PMIC_DA903X is not set
902# CONFIG_MFD_WM8400 is not set 927# CONFIG_MFD_WM8400 is not set
903# CONFIG_MFD_WM8350_I2C is not set 928# CONFIG_MFD_WM8350_I2C is not set
904 929# CONFIG_MFD_PCF50633 is not set
905#
906# Voltage and Current regulators
907#
908# CONFIG_REGULATOR is not set 930# 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
912 931
913# 932#
914# Multimedia devices 933# Multimedia devices
@@ -961,11 +980,9 @@ CONFIG_HID_COMPAT=y
961CONFIG_HID_A4TECH=y 980CONFIG_HID_A4TECH=y
962CONFIG_HID_APPLE=y 981CONFIG_HID_APPLE=y
963CONFIG_HID_BELKIN=y 982CONFIG_HID_BELKIN=y
964CONFIG_HID_BRIGHT=y
965CONFIG_HID_CHERRY=y 983CONFIG_HID_CHERRY=y
966CONFIG_HID_CHICONY=y 984CONFIG_HID_CHICONY=y
967CONFIG_HID_CYPRESS=y 985CONFIG_HID_CYPRESS=y
968CONFIG_HID_DELL=y
969CONFIG_HID_EZKEY=y 986CONFIG_HID_EZKEY=y
970CONFIG_HID_GYRATION=y 987CONFIG_HID_GYRATION=y
971CONFIG_HID_LOGITECH=y 988CONFIG_HID_LOGITECH=y
@@ -973,12 +990,15 @@ CONFIG_HID_LOGITECH=y
973# CONFIG_LOGIRUMBLEPAD2_FF is not set 990# CONFIG_LOGIRUMBLEPAD2_FF is not set
974CONFIG_HID_MICROSOFT=y 991CONFIG_HID_MICROSOFT=y
975CONFIG_HID_MONTEREY=y 992CONFIG_HID_MONTEREY=y
993# CONFIG_HID_NTRIG is not set
976CONFIG_HID_PANTHERLORD=y 994CONFIG_HID_PANTHERLORD=y
977# CONFIG_PANTHERLORD_FF is not set 995# CONFIG_PANTHERLORD_FF is not set
978CONFIG_HID_PETALYNX=y 996CONFIG_HID_PETALYNX=y
979CONFIG_HID_SAMSUNG=y 997CONFIG_HID_SAMSUNG=y
980CONFIG_HID_SONY=y 998CONFIG_HID_SONY=y
981CONFIG_HID_SUNPLUS=y 999CONFIG_HID_SUNPLUS=y
1000# CONFIG_GREENASIA_FF is not set
1001# CONFIG_HID_TOPSEED is not set
982CONFIG_THRUSTMASTER_FF=m 1002CONFIG_THRUSTMASTER_FF=m
983CONFIG_ZEROPLUS_FF=m 1003CONFIG_ZEROPLUS_FF=m
984CONFIG_USB_SUPPORT=y 1004CONFIG_USB_SUPPORT=y
@@ -1011,6 +1031,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
1011# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1031# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1012CONFIG_USB_EHCI_FSL=y 1032CONFIG_USB_EHCI_FSL=y
1013CONFIG_USB_EHCI_HCD_PPC_OF=y 1033CONFIG_USB_EHCI_HCD_PPC_OF=y
1034# CONFIG_USB_OXU210HP_HCD is not set
1014# CONFIG_USB_ISP116X_HCD is not set 1035# CONFIG_USB_ISP116X_HCD is not set
1015# CONFIG_USB_ISP1760_HCD is not set 1036# CONFIG_USB_ISP1760_HCD is not set
1016# CONFIG_USB_OHCI_HCD is not set 1037# CONFIG_USB_OHCI_HCD is not set
@@ -1029,11 +1050,11 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1029# CONFIG_USB_TMC is not set 1050# CONFIG_USB_TMC is not set
1030 1051
1031# 1052#
1032# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1053# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1033# 1054#
1034 1055
1035# 1056#
1036# may also be needed; see USB_STORAGE Help for more information 1057# see USB_STORAGE Help for more information
1037# 1058#
1038# CONFIG_USB_STORAGE is not set 1059# CONFIG_USB_STORAGE is not set
1039# CONFIG_USB_LIBUSUAL is not set 1060# CONFIG_USB_LIBUSUAL is not set
@@ -1074,6 +1095,10 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1074# CONFIG_USB_ISIGHTFW is not set 1095# CONFIG_USB_ISIGHTFW is not set
1075# CONFIG_USB_VST is not set 1096# CONFIG_USB_VST is not set
1076# CONFIG_USB_GADGET is not set 1097# CONFIG_USB_GADGET is not set
1098
1099#
1100# OTG and related infrastructure
1101#
1077# CONFIG_UWB is not set 1102# CONFIG_UWB is not set
1078# CONFIG_MMC is not set 1103# CONFIG_MMC is not set
1079# CONFIG_MEMSTICK is not set 1104# CONFIG_MEMSTICK is not set
@@ -1105,6 +1130,7 @@ CONFIG_FS_MBCACHE=y
1105CONFIG_FILE_LOCKING=y 1130CONFIG_FILE_LOCKING=y
1106# CONFIG_XFS_FS is not set 1131# CONFIG_XFS_FS is not set
1107# CONFIG_OCFS2_FS is not set 1132# CONFIG_OCFS2_FS is not set
1133# CONFIG_BTRFS_FS is not set
1108CONFIG_DNOTIFY=y 1134CONFIG_DNOTIFY=y
1109CONFIG_INOTIFY=y 1135CONFIG_INOTIFY=y
1110CONFIG_INOTIFY_USER=y 1136CONFIG_INOTIFY_USER=y
@@ -1138,10 +1164,7 @@ CONFIG_TMPFS=y
1138# CONFIG_TMPFS_POSIX_ACL is not set 1164# CONFIG_TMPFS_POSIX_ACL is not set
1139# CONFIG_HUGETLB_PAGE is not set 1165# CONFIG_HUGETLB_PAGE is not set
1140# CONFIG_CONFIGFS_FS is not set 1166# CONFIG_CONFIGFS_FS is not set
1141 1167CONFIG_MISC_FILESYSTEMS=y
1142#
1143# Miscellaneous filesystems
1144#
1145# CONFIG_ADFS_FS is not set 1168# CONFIG_ADFS_FS is not set
1146# CONFIG_AFFS_FS is not set 1169# CONFIG_AFFS_FS is not set
1147# CONFIG_HFS_FS is not set 1170# CONFIG_HFS_FS is not set
@@ -1150,6 +1173,7 @@ CONFIG_TMPFS=y
1150# CONFIG_BFS_FS is not set 1173# CONFIG_BFS_FS is not set
1151# CONFIG_EFS_FS is not set 1174# CONFIG_EFS_FS is not set
1152# CONFIG_CRAMFS is not set 1175# CONFIG_CRAMFS is not set
1176# CONFIG_SQUASHFS is not set
1153# CONFIG_VXFS_FS is not set 1177# CONFIG_VXFS_FS is not set
1154# CONFIG_MINIX_FS is not set 1178# CONFIG_MINIX_FS is not set
1155# CONFIG_OMFS_FS is not set 1179# CONFIG_OMFS_FS is not set
@@ -1207,6 +1231,7 @@ CONFIG_MSDOS_PARTITION=y
1207# Library routines 1231# Library routines
1208# 1232#
1209CONFIG_BITREVERSE=y 1233CONFIG_BITREVERSE=y
1234CONFIG_GENERIC_FIND_LAST_BIT=y
1210# CONFIG_CRC_CCITT is not set 1235# CONFIG_CRC_CCITT is not set
1211# CONFIG_CRC16 is not set 1236# CONFIG_CRC16 is not set
1212CONFIG_CRC_T10DIF=y 1237CONFIG_CRC_T10DIF=y
@@ -1238,6 +1263,8 @@ CONFIG_FRAME_WARN=1024
1238# CONFIG_LATENCYTOP is not set 1263# CONFIG_LATENCYTOP is not set
1239CONFIG_SYSCTL_SYSCALL_CHECK=y 1264CONFIG_SYSCTL_SYSCALL_CHECK=y
1240CONFIG_HAVE_FUNCTION_TRACER=y 1265CONFIG_HAVE_FUNCTION_TRACER=y
1266CONFIG_HAVE_DYNAMIC_FTRACE=y
1267CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1241 1268
1242# 1269#
1243# Tracers 1270# Tracers
@@ -1245,6 +1272,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1245# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1272# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1246# CONFIG_SAMPLES is not set 1273# CONFIG_SAMPLES is not set
1247CONFIG_HAVE_ARCH_KGDB=y 1274CONFIG_HAVE_ARCH_KGDB=y
1275CONFIG_PRINT_STACK_DEPTH=64
1248# CONFIG_IRQSTACKS is not set 1276# CONFIG_IRQSTACKS is not set
1249# CONFIG_BOOTX_TEXT is not set 1277# CONFIG_BOOTX_TEXT is not set
1250# CONFIG_PPC_EARLY_DEBUG is not set 1278# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1267,11 +1295,15 @@ CONFIG_CRYPTO=y
1267# 1295#
1268# CONFIG_CRYPTO_FIPS is not set 1296# CONFIG_CRYPTO_FIPS is not set
1269CONFIG_CRYPTO_ALGAPI=y 1297CONFIG_CRYPTO_ALGAPI=y
1270CONFIG_CRYPTO_AEAD=y 1298CONFIG_CRYPTO_ALGAPI2=y
1299CONFIG_CRYPTO_AEAD2=y
1271CONFIG_CRYPTO_BLKCIPHER=y 1300CONFIG_CRYPTO_BLKCIPHER=y
1301CONFIG_CRYPTO_BLKCIPHER2=y
1272CONFIG_CRYPTO_HASH=y 1302CONFIG_CRYPTO_HASH=y
1273CONFIG_CRYPTO_RNG=y 1303CONFIG_CRYPTO_HASH2=y
1304CONFIG_CRYPTO_RNG2=y
1274CONFIG_CRYPTO_MANAGER=y 1305CONFIG_CRYPTO_MANAGER=y
1306CONFIG_CRYPTO_MANAGER2=y
1275# CONFIG_CRYPTO_GF128MUL is not set 1307# CONFIG_CRYPTO_GF128MUL is not set
1276# CONFIG_CRYPTO_NULL is not set 1308# CONFIG_CRYPTO_NULL is not set
1277# CONFIG_CRYPTO_CRYPTD is not set 1309# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig
index 54bb24a5e02a..a0c42fb65cb9 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:02 2008 4# Mon Jan 26 15:36:02 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80CONFIG_FAIR_GROUP_SCHED=y 79CONFIG_FAIR_GROUP_SCHED=y
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -112,7 +112,6 @@ CONFIG_SLAB=y
112# CONFIG_SLUB is not set 112# CONFIG_SLUB is not set
113# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
114# CONFIG_PROFILING is not set 114# CONFIG_PROFILING is not set
115# CONFIG_MARKERS is not set
116CONFIG_HAVE_OPROFILE=y 115CONFIG_HAVE_OPROFILE=y
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 116CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
118CONFIG_HAVE_IOREMAP_PROT=y 117CONFIG_HAVE_IOREMAP_PROT=y
@@ -122,7 +121,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 121# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 122CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 123CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 124CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 125CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 126# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +128,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 128# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 129# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 130# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 131CONFIG_BLOCK=y
135# CONFIG_LBD is not set 132# CONFIG_LBD is not set
136# CONFIG_BLK_DEV_IO_TRACE is not set 133# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 134# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 135# CONFIG_BLK_DEV_INTEGRITY is not set
140 136
@@ -151,6 +147,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 147# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 148CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 149CONFIG_CLASSIC_RCU=y
150# CONFIG_TREE_RCU is not set
151# CONFIG_PREEMPT_RCU is not set
152# CONFIG_TREE_RCU_TRACE is not set
153# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 154# CONFIG_FREEZER is not set
155 155
156# 156#
@@ -197,6 +197,8 @@ CONFIG_IPIC=y
197# CONFIG_QUICC_ENGINE is not set 197# CONFIG_QUICC_ENGINE 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# CONFIG_MPC8xxx_GPIO is not set
200# CONFIG_SIMPLE_GPIO is not set
201# CONFIG_MCU_MPC8349EMITX is not set
200 202
201# 203#
202# Kernel options 204# Kernel options
@@ -223,6 +225,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
223CONFIG_ARCH_HAS_WALK_MEMORY=y 225CONFIG_ARCH_HAS_WALK_MEMORY=y
224CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
225# CONFIG_KEXEC is not set 227# CONFIG_KEXEC is not set
228# CONFIG_CRASH_DUMP is not set
226CONFIG_ARCH_FLATMEM_ENABLE=y 229CONFIG_ARCH_FLATMEM_ENABLE=y
227CONFIG_ARCH_POPULATES_NODE_MAP=y 230CONFIG_ARCH_POPULATES_NODE_MAP=y
228CONFIG_SELECT_MEMORY_MODEL=y 231CONFIG_SELECT_MEMORY_MODEL=y
@@ -234,12 +237,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
234CONFIG_PAGEFLAGS_EXTENDED=y 237CONFIG_PAGEFLAGS_EXTENDED=y
235CONFIG_SPLIT_PTLOCK_CPUS=4 238CONFIG_SPLIT_PTLOCK_CPUS=4
236CONFIG_MIGRATION=y 239CONFIG_MIGRATION=y
237# CONFIG_RESOURCES_64BIT is not set
238# CONFIG_PHYS_ADDR_T_64BIT is not set 240# CONFIG_PHYS_ADDR_T_64BIT is not set
239CONFIG_ZONE_DMA_FLAG=1 241CONFIG_ZONE_DMA_FLAG=1
240CONFIG_BOUNCE=y 242CONFIG_BOUNCE=y
241CONFIG_VIRT_TO_BUS=y 243CONFIG_VIRT_TO_BUS=y
242CONFIG_UNEVICTABLE_LRU=y 244CONFIG_UNEVICTABLE_LRU=y
245CONFIG_PPC_4K_PAGES=y
246# CONFIG_PPC_16K_PAGES is not set
247# CONFIG_PPC_64K_PAGES is not set
243CONFIG_FORCE_MAX_ZONEORDER=11 248CONFIG_FORCE_MAX_ZONEORDER=11
244CONFIG_PROC_DEVICETREE=y 249CONFIG_PROC_DEVICETREE=y
245# CONFIG_CMDLINE_BOOL is not set 250# CONFIG_CMDLINE_BOOL is not set
@@ -264,6 +269,7 @@ CONFIG_PCI_SYSCALL=y
264CONFIG_ARCH_SUPPORTS_MSI=y 269CONFIG_ARCH_SUPPORTS_MSI=y
265# CONFIG_PCI_MSI is not set 270# CONFIG_PCI_MSI is not set
266# CONFIG_PCI_LEGACY is not set 271# CONFIG_PCI_LEGACY is not set
272# CONFIG_PCI_STUB is not set
267# CONFIG_PCCARD is not set 273# CONFIG_PCCARD is not set
268# CONFIG_HOTPLUG_PCI is not set 274# CONFIG_HOTPLUG_PCI is not set
269# CONFIG_HAS_RAPIDIO is not set 275# CONFIG_HAS_RAPIDIO is not set
@@ -286,6 +292,7 @@ CONFIG_NET=y
286# 292#
287# Networking options 293# Networking options
288# 294#
295CONFIG_COMPAT_NET_DEV_OPS=y
289CONFIG_PACKET=y 296CONFIG_PACKET=y
290# CONFIG_PACKET_MMAP is not set 297# CONFIG_PACKET_MMAP is not set
291CONFIG_UNIX=y 298CONFIG_UNIX=y
@@ -342,6 +349,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
342# CONFIG_ECONET is not set 349# CONFIG_ECONET is not set
343# CONFIG_WAN_ROUTER is not set 350# CONFIG_WAN_ROUTER is not set
344# CONFIG_NET_SCHED is not set 351# CONFIG_NET_SCHED is not set
352# CONFIG_DCB is not set
345 353
346# 354#
347# Network testing 355# Network testing
@@ -357,8 +365,9 @@ CONFIG_WIRELESS=y
357# CONFIG_CFG80211 is not set 365# CONFIG_CFG80211 is not set
358CONFIG_WIRELESS_OLD_REGULATORY=y 366CONFIG_WIRELESS_OLD_REGULATORY=y
359# CONFIG_WIRELESS_EXT is not set 367# CONFIG_WIRELESS_EXT is not set
368# CONFIG_LIB80211 is not set
360# CONFIG_MAC80211 is not set 369# CONFIG_MAC80211 is not set
361# CONFIG_IEEE80211 is not set 370# CONFIG_WIMAX is not set
362# CONFIG_RFKILL is not set 371# CONFIG_RFKILL is not set
363# CONFIG_NET_9P is not set 372# CONFIG_NET_9P is not set
364 373
@@ -402,8 +411,10 @@ CONFIG_MISC_DEVICES=y
402# CONFIG_EEPROM_93CX6 is not set 411# CONFIG_EEPROM_93CX6 is not set
403# CONFIG_SGI_IOC4 is not set 412# CONFIG_SGI_IOC4 is not set
404# CONFIG_TIFM_CORE is not set 413# CONFIG_TIFM_CORE is not set
414# CONFIG_ICS932S401 is not set
405# CONFIG_ENCLOSURE_SERVICES is not set 415# CONFIG_ENCLOSURE_SERVICES is not set
406# CONFIG_HP_ILO is not set 416# CONFIG_HP_ILO is not set
417# CONFIG_C2PORT is not set
407CONFIG_HAVE_IDE=y 418CONFIG_HAVE_IDE=y
408# CONFIG_IDE is not set 419# CONFIG_IDE is not set
409 420
@@ -452,6 +463,9 @@ CONFIG_PHYLIB=y
452CONFIG_BROADCOM_PHY=y 463CONFIG_BROADCOM_PHY=y
453# CONFIG_ICPLUS_PHY is not set 464# CONFIG_ICPLUS_PHY is not set
454# CONFIG_REALTEK_PHY is not set 465# CONFIG_REALTEK_PHY is not set
466# CONFIG_NATIONAL_PHY is not set
467# CONFIG_STE10XP is not set
468# CONFIG_LSI_ET1011C_PHY is not set
455# CONFIG_FIXED_PHY is not set 469# CONFIG_FIXED_PHY is not set
456# CONFIG_MDIO_BITBANG is not set 470# CONFIG_MDIO_BITBANG is not set
457CONFIG_NET_ETHERNET=y 471CONFIG_NET_ETHERNET=y
@@ -504,6 +518,10 @@ CONFIG_GIANFAR=y
504# CONFIG_WLAN_PRE80211 is not set 518# CONFIG_WLAN_PRE80211 is not set
505# CONFIG_WLAN_80211 is not set 519# CONFIG_WLAN_80211 is not set
506# CONFIG_IWLWIFI_LEDS is not set 520# CONFIG_IWLWIFI_LEDS is not set
521
522#
523# Enable WiMAX (Networking options) to see the WiMAX drivers
524#
507# CONFIG_WAN is not set 525# CONFIG_WAN is not set
508# CONFIG_FDDI is not set 526# CONFIG_FDDI is not set
509# CONFIG_HIPPI is not set 527# CONFIG_HIPPI is not set
@@ -573,8 +591,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
573# CONFIG_SERIAL_JSM is not set 591# CONFIG_SERIAL_JSM is not set
574# CONFIG_SERIAL_OF_PLATFORM is not set 592# CONFIG_SERIAL_OF_PLATFORM is not set
575CONFIG_UNIX98_PTYS=y 593CONFIG_UNIX98_PTYS=y
594# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
576CONFIG_LEGACY_PTYS=y 595CONFIG_LEGACY_PTYS=y
577CONFIG_LEGACY_PTY_COUNT=256 596CONFIG_LEGACY_PTY_COUNT=256
597# CONFIG_HVC_UDBG is not set
578# CONFIG_IPMI_HANDLER is not set 598# CONFIG_IPMI_HANDLER is not set
579# CONFIG_HW_RANDOM is not set 599# CONFIG_HW_RANDOM is not set
580# CONFIG_NVRAM is not set 600# CONFIG_NVRAM is not set
@@ -648,7 +668,6 @@ CONFIG_I2C_MPC=y
648# CONFIG_SENSORS_PCF8591 is not set 668# CONFIG_SENSORS_PCF8591 is not set
649# CONFIG_SENSORS_MAX6875 is not set 669# CONFIG_SENSORS_MAX6875 is not set
650# CONFIG_SENSORS_TSL2550 is not set 670# CONFIG_SENSORS_TSL2550 is not set
651# CONFIG_MCU_MPC8349EMITX is not set
652# CONFIG_I2C_DEBUG_CORE is not set 671# CONFIG_I2C_DEBUG_CORE is not set
653# CONFIG_I2C_DEBUG_ALGO is not set 672# CONFIG_I2C_DEBUG_ALGO is not set
654# CONFIG_I2C_DEBUG_BUS is not set 673# CONFIG_I2C_DEBUG_BUS is not set
@@ -668,8 +687,10 @@ CONFIG_HWMON=y
668# CONFIG_SENSORS_ADM1029 is not set 687# CONFIG_SENSORS_ADM1029 is not set
669# CONFIG_SENSORS_ADM1031 is not set 688# CONFIG_SENSORS_ADM1031 is not set
670# CONFIG_SENSORS_ADM9240 is not set 689# CONFIG_SENSORS_ADM9240 is not set
690# CONFIG_SENSORS_ADT7462 is not set
671# CONFIG_SENSORS_ADT7470 is not set 691# CONFIG_SENSORS_ADT7470 is not set
672# CONFIG_SENSORS_ADT7473 is not set 692# CONFIG_SENSORS_ADT7473 is not set
693# CONFIG_SENSORS_ADT7475 is not set
673# CONFIG_SENSORS_ATXP1 is not set 694# CONFIG_SENSORS_ATXP1 is not set
674# CONFIG_SENSORS_DS1621 is not set 695# CONFIG_SENSORS_DS1621 is not set
675# CONFIG_SENSORS_I5K_AMB is not set 696# CONFIG_SENSORS_I5K_AMB is not set
@@ -690,6 +711,7 @@ CONFIG_HWMON=y
690# CONFIG_SENSORS_LM90 is not set 711# CONFIG_SENSORS_LM90 is not set
691# CONFIG_SENSORS_LM92 is not set 712# CONFIG_SENSORS_LM92 is not set
692# CONFIG_SENSORS_LM93 is not set 713# CONFIG_SENSORS_LM93 is not set
714# CONFIG_SENSORS_LTC4245 is not set
693# CONFIG_SENSORS_MAX1619 is not set 715# CONFIG_SENSORS_MAX1619 is not set
694# CONFIG_SENSORS_MAX6650 is not set 716# CONFIG_SENSORS_MAX6650 is not set
695# CONFIG_SENSORS_PC87360 is not set 717# CONFIG_SENSORS_PC87360 is not set
@@ -730,11 +752,11 @@ CONFIG_WATCHDOG=y
730# 752#
731# CONFIG_PCIPCWATCHDOG is not set 753# CONFIG_PCIPCWATCHDOG is not set
732# CONFIG_WDTPCI is not set 754# CONFIG_WDTPCI is not set
755CONFIG_SSB_POSSIBLE=y
733 756
734# 757#
735# Sonics Silicon Backplane 758# Sonics Silicon Backplane
736# 759#
737CONFIG_SSB_POSSIBLE=y
738# CONFIG_SSB is not set 760# CONFIG_SSB is not set
739 761
740# 762#
@@ -743,18 +765,13 @@ CONFIG_SSB_POSSIBLE=y
743# CONFIG_MFD_CORE is not set 765# CONFIG_MFD_CORE is not set
744# CONFIG_MFD_SM501 is not set 766# CONFIG_MFD_SM501 is not set
745# CONFIG_HTC_PASIC3 is not set 767# CONFIG_HTC_PASIC3 is not set
768# CONFIG_TWL4030_CORE is not set
746# CONFIG_MFD_TMIO is not set 769# CONFIG_MFD_TMIO is not set
747# CONFIG_PMIC_DA903X is not set 770# CONFIG_PMIC_DA903X is not set
748# CONFIG_MFD_WM8400 is not set 771# CONFIG_MFD_WM8400 is not set
749# CONFIG_MFD_WM8350_I2C is not set 772# CONFIG_MFD_WM8350_I2C is not set
750 773# CONFIG_MFD_PCF50633 is not set
751#
752# Voltage and Current regulators
753#
754# CONFIG_REGULATOR is not set 774# 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
758 775
759# 776#
760# Multimedia devices 777# Multimedia devices
@@ -822,6 +839,7 @@ CONFIG_HID_COMPAT=y
822CONFIG_FILE_LOCKING=y 839CONFIG_FILE_LOCKING=y
823# CONFIG_XFS_FS is not set 840# CONFIG_XFS_FS is not set
824# CONFIG_OCFS2_FS is not set 841# CONFIG_OCFS2_FS is not set
842# CONFIG_BTRFS_FS is not set
825CONFIG_DNOTIFY=y 843CONFIG_DNOTIFY=y
826CONFIG_INOTIFY=y 844CONFIG_INOTIFY=y
827CONFIG_INOTIFY_USER=y 845CONFIG_INOTIFY_USER=y
@@ -855,10 +873,7 @@ CONFIG_TMPFS=y
855# CONFIG_TMPFS_POSIX_ACL is not set 873# CONFIG_TMPFS_POSIX_ACL is not set
856# CONFIG_HUGETLB_PAGE is not set 874# CONFIG_HUGETLB_PAGE is not set
857# CONFIG_CONFIGFS_FS is not set 875# CONFIG_CONFIGFS_FS is not set
858 876CONFIG_MISC_FILESYSTEMS=y
859#
860# Miscellaneous filesystems
861#
862# CONFIG_ADFS_FS is not set 877# CONFIG_ADFS_FS is not set
863# CONFIG_AFFS_FS is not set 878# CONFIG_AFFS_FS is not set
864# CONFIG_HFS_FS is not set 879# CONFIG_HFS_FS is not set
@@ -867,6 +882,7 @@ CONFIG_TMPFS=y
867# CONFIG_BFS_FS is not set 882# CONFIG_BFS_FS is not set
868# CONFIG_EFS_FS is not set 883# CONFIG_EFS_FS is not set
869# CONFIG_CRAMFS is not set 884# CONFIG_CRAMFS is not set
885# CONFIG_SQUASHFS is not set
870# CONFIG_VXFS_FS is not set 886# CONFIG_VXFS_FS is not set
871# CONFIG_MINIX_FS is not set 887# CONFIG_MINIX_FS is not set
872# CONFIG_OMFS_FS is not set 888# CONFIG_OMFS_FS is not set
@@ -908,6 +924,7 @@ CONFIG_MSDOS_PARTITION=y
908# Library routines 924# Library routines
909# 925#
910CONFIG_BITREVERSE=y 926CONFIG_BITREVERSE=y
927CONFIG_GENERIC_FIND_LAST_BIT=y
911# CONFIG_CRC_CCITT is not set 928# CONFIG_CRC_CCITT is not set
912# CONFIG_CRC16 is not set 929# CONFIG_CRC16 is not set
913# CONFIG_CRC_T10DIF is not set 930# CONFIG_CRC_T10DIF is not set
@@ -939,6 +956,8 @@ CONFIG_FRAME_WARN=1024
939# CONFIG_LATENCYTOP is not set 956# CONFIG_LATENCYTOP is not set
940CONFIG_SYSCTL_SYSCALL_CHECK=y 957CONFIG_SYSCTL_SYSCALL_CHECK=y
941CONFIG_HAVE_FUNCTION_TRACER=y 958CONFIG_HAVE_FUNCTION_TRACER=y
959CONFIG_HAVE_DYNAMIC_FTRACE=y
960CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
942 961
943# 962#
944# Tracers 963# Tracers
@@ -946,6 +965,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
946# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 965# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
947# CONFIG_SAMPLES is not set 966# CONFIG_SAMPLES is not set
948CONFIG_HAVE_ARCH_KGDB=y 967CONFIG_HAVE_ARCH_KGDB=y
968CONFIG_PRINT_STACK_DEPTH=64
949# CONFIG_IRQSTACKS is not set 969# CONFIG_IRQSTACKS is not set
950# CONFIG_BOOTX_TEXT is not set 970# CONFIG_BOOTX_TEXT is not set
951# CONFIG_PPC_EARLY_DEBUG is not set 971# CONFIG_PPC_EARLY_DEBUG is not set
@@ -964,11 +984,15 @@ CONFIG_CRYPTO=y
964# 984#
965# CONFIG_CRYPTO_FIPS is not set 985# CONFIG_CRYPTO_FIPS is not set
966CONFIG_CRYPTO_ALGAPI=y 986CONFIG_CRYPTO_ALGAPI=y
967CONFIG_CRYPTO_AEAD=y 987CONFIG_CRYPTO_ALGAPI2=y
988CONFIG_CRYPTO_AEAD2=y
968CONFIG_CRYPTO_BLKCIPHER=y 989CONFIG_CRYPTO_BLKCIPHER=y
990CONFIG_CRYPTO_BLKCIPHER2=y
969CONFIG_CRYPTO_HASH=y 991CONFIG_CRYPTO_HASH=y
970CONFIG_CRYPTO_RNG=y 992CONFIG_CRYPTO_HASH2=y
993CONFIG_CRYPTO_RNG2=y
971CONFIG_CRYPTO_MANAGER=y 994CONFIG_CRYPTO_MANAGER=y
995CONFIG_CRYPTO_MANAGER2=y
972# CONFIG_CRYPTO_GF128MUL is not set 996# CONFIG_CRYPTO_GF128MUL is not set
973# CONFIG_CRYPTO_NULL is not set 997# CONFIG_CRYPTO_NULL is not set
974# CONFIG_CRYPTO_CRYPTD is not set 998# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig
index 1af7b9e37b61..6479bb9f3f57 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:03 2008 4# Mon Jan 26 15:36:03 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,7 +21,9 @@ CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y 21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
24# CONFIG_PPC_MM_SLICES is not set 25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
25CONFIG_PPC32=y 27CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 28CONFIG_WORD_SIZE=32
27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -46,7 +48,7 @@ CONFIG_GENERIC_GPIO=y
46CONFIG_PPC=y 48CONFIG_PPC=y
47CONFIG_EARLY_PRINTK=y 49CONFIG_EARLY_PRINTK=y
48CONFIG_GENERIC_NVRAM=y 50CONFIG_GENERIC_NVRAM=y
49CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 51CONFIG_SCHED_OMIT_FRAME_POINTER=y
50CONFIG_ARCH_MAY_HAVE_PC_FDC=y 52CONFIG_ARCH_MAY_HAVE_PC_FDC=y
51CONFIG_PPC_OF=y 53CONFIG_PPC_OF=y
52CONFIG_OF=y 54CONFIG_OF=y
@@ -76,8 +78,8 @@ CONFIG_SYSVIPC_SYSCTL=y
76# CONFIG_AUDIT is not set 78# CONFIG_AUDIT is not set
77# CONFIG_IKCONFIG is not set 79# CONFIG_IKCONFIG is not set
78CONFIG_LOG_BUF_SHIFT=14 80CONFIG_LOG_BUF_SHIFT=14
79# CONFIG_CGROUPS is not set
80# CONFIG_GROUP_SCHED is not set 81# CONFIG_GROUP_SCHED is not set
82# CONFIG_CGROUPS is not set
81CONFIG_SYSFS_DEPRECATED=y 83CONFIG_SYSFS_DEPRECATED=y
82CONFIG_SYSFS_DEPRECATED_V2=y 84CONFIG_SYSFS_DEPRECATED_V2=y
83# CONFIG_RELAY is not set 85# CONFIG_RELAY is not set
@@ -111,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 113CONFIG_SLUB=y
112# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
116CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
117CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -122,13 +123,11 @@ CONFIG_HAVE_CLK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
127# CONFIG_MODULES is not set 127# CONFIG_MODULES is not set
128CONFIG_BLOCK=y 128CONFIG_BLOCK=y
129# CONFIG_LBD is not set 129# CONFIG_LBD is not set
130# CONFIG_BLK_DEV_IO_TRACE is not set 130# CONFIG_BLK_DEV_IO_TRACE is not set
131# CONFIG_LSF is not set
132# CONFIG_BLK_DEV_BSG is not set 131# CONFIG_BLK_DEV_BSG is not set
133# CONFIG_BLK_DEV_INTEGRITY is not set 132# CONFIG_BLK_DEV_INTEGRITY is not set
134 133
@@ -145,6 +144,10 @@ CONFIG_DEFAULT_AS=y
145# CONFIG_DEFAULT_NOOP is not set 144# CONFIG_DEFAULT_NOOP is not set
146CONFIG_DEFAULT_IOSCHED="anticipatory" 145CONFIG_DEFAULT_IOSCHED="anticipatory"
147CONFIG_CLASSIC_RCU=y 146CONFIG_CLASSIC_RCU=y
147# CONFIG_TREE_RCU is not set
148# CONFIG_PREEMPT_RCU is not set
149# CONFIG_TREE_RCU_TRACE is not set
150# CONFIG_PREEMPT_RCU_TRACE is not set
148# CONFIG_FREEZER is not set 151# CONFIG_FREEZER is not set
149 152
150# 153#
@@ -185,6 +188,7 @@ CONFIG_CPM2=y
185# CONFIG_FSL_ULI1575 is not set 188# CONFIG_FSL_ULI1575 is not set
186CONFIG_CPM=y 189CONFIG_CPM=y
187# CONFIG_MPC8xxx_GPIO is not set 190# CONFIG_MPC8xxx_GPIO is not set
191# CONFIG_SIMPLE_GPIO is not set
188 192
189# 193#
190# Kernel options 194# Kernel options
@@ -222,12 +226,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
222CONFIG_PAGEFLAGS_EXTENDED=y 226CONFIG_PAGEFLAGS_EXTENDED=y
223CONFIG_SPLIT_PTLOCK_CPUS=4 227CONFIG_SPLIT_PTLOCK_CPUS=4
224CONFIG_MIGRATION=y 228CONFIG_MIGRATION=y
225# CONFIG_RESOURCES_64BIT is not set
226# CONFIG_PHYS_ADDR_T_64BIT is not set 229# CONFIG_PHYS_ADDR_T_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=1 230CONFIG_ZONE_DMA_FLAG=1
228CONFIG_BOUNCE=y 231CONFIG_BOUNCE=y
229CONFIG_VIRT_TO_BUS=y 232CONFIG_VIRT_TO_BUS=y
230CONFIG_UNEVICTABLE_LRU=y 233CONFIG_UNEVICTABLE_LRU=y
234CONFIG_PPC_4K_PAGES=y
235# CONFIG_PPC_16K_PAGES is not set
236# CONFIG_PPC_64K_PAGES is not set
231CONFIG_FORCE_MAX_ZONEORDER=11 237CONFIG_FORCE_MAX_ZONEORDER=11
232# CONFIG_PROC_DEVICETREE is not set 238# CONFIG_PROC_DEVICETREE is not set
233# CONFIG_CMDLINE_BOOL is not set 239# CONFIG_CMDLINE_BOOL is not set
@@ -268,6 +274,7 @@ CONFIG_NET=y
268# 274#
269# Networking options 275# Networking options
270# 276#
277CONFIG_COMPAT_NET_DEV_OPS=y
271CONFIG_PACKET=y 278CONFIG_PACKET=y
272# CONFIG_PACKET_MMAP is not set 279# CONFIG_PACKET_MMAP is not set
273CONFIG_UNIX=y 280CONFIG_UNIX=y
@@ -324,6 +331,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
324# CONFIG_ECONET is not set 331# CONFIG_ECONET is not set
325# CONFIG_WAN_ROUTER is not set 332# CONFIG_WAN_ROUTER is not set
326# CONFIG_NET_SCHED is not set 333# CONFIG_NET_SCHED is not set
334# CONFIG_DCB is not set
327 335
328# 336#
329# Network testing 337# Network testing
@@ -339,8 +347,9 @@ CONFIG_WIRELESS=y
339# CONFIG_CFG80211 is not set 347# CONFIG_CFG80211 is not set
340CONFIG_WIRELESS_OLD_REGULATORY=y 348CONFIG_WIRELESS_OLD_REGULATORY=y
341# CONFIG_WIRELESS_EXT is not set 349# CONFIG_WIRELESS_EXT is not set
350# CONFIG_LIB80211 is not set
342# CONFIG_MAC80211 is not set 351# CONFIG_MAC80211 is not set
343# CONFIG_IEEE80211 is not set 352# CONFIG_WIMAX is not set
344# CONFIG_RFKILL is not set 353# CONFIG_RFKILL is not set
345# CONFIG_NET_9P is not set 354# CONFIG_NET_9P is not set
346 355
@@ -432,6 +441,12 @@ CONFIG_MTD_PHYSMAP_OF=y
432# CONFIG_MTD_ONENAND is not set 441# CONFIG_MTD_ONENAND is not set
433 442
434# 443#
444# LPDDR flash memory drivers
445#
446# CONFIG_MTD_LPDDR is not set
447# CONFIG_MTD_QINFO_PROBE is not set
448
449#
435# UBI - Unsorted block images 450# UBI - Unsorted block images
436# 451#
437# CONFIG_MTD_UBI is not set 452# CONFIG_MTD_UBI is not set
@@ -454,6 +469,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
454CONFIG_MISC_DEVICES=y 469CONFIG_MISC_DEVICES=y
455# CONFIG_EEPROM_93CX6 is not set 470# CONFIG_EEPROM_93CX6 is not set
456# CONFIG_ENCLOSURE_SERVICES is not set 471# CONFIG_ENCLOSURE_SERVICES is not set
472# CONFIG_C2PORT is not set
457CONFIG_HAVE_IDE=y 473CONFIG_HAVE_IDE=y
458CONFIG_IDE=y 474CONFIG_IDE=y
459 475
@@ -507,9 +523,12 @@ CONFIG_MARVELL_PHY=y
507# CONFIG_BROADCOM_PHY is not set 523# CONFIG_BROADCOM_PHY is not set
508# CONFIG_ICPLUS_PHY is not set 524# CONFIG_ICPLUS_PHY is not set
509# CONFIG_REALTEK_PHY is not set 525# CONFIG_REALTEK_PHY is not set
526# CONFIG_NATIONAL_PHY is not set
527# CONFIG_STE10XP is not set
528# CONFIG_LSI_ET1011C_PHY is not set
510# CONFIG_FIXED_PHY is not set 529# CONFIG_FIXED_PHY is not set
511CONFIG_MDIO_BITBANG=y 530CONFIG_MDIO_BITBANG=y
512# CONFIG_MDIO_OF_GPIO is not set 531# CONFIG_MDIO_GPIO is not set
513CONFIG_NET_ETHERNET=y 532CONFIG_NET_ETHERNET=y
514CONFIG_MII=y 533CONFIG_MII=y
515# CONFIG_IBM_NEW_EMAC_ZMII is not set 534# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -534,6 +553,10 @@ CONFIG_NETDEV_10000=y
534# CONFIG_WLAN_PRE80211 is not set 553# CONFIG_WLAN_PRE80211 is not set
535# CONFIG_WLAN_80211 is not set 554# CONFIG_WLAN_80211 is not set
536# CONFIG_IWLWIFI_LEDS is not set 555# CONFIG_IWLWIFI_LEDS is not set
556
557#
558# Enable WiMAX (Networking options) to see the WiMAX drivers
559#
537# CONFIG_WAN is not set 560# CONFIG_WAN is not set
538# CONFIG_PPP is not set 561# CONFIG_PPP is not set
539# CONFIG_SLIP is not set 562# CONFIG_SLIP is not set
@@ -595,8 +618,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
595CONFIG_SERIAL_CPM=y 618CONFIG_SERIAL_CPM=y
596CONFIG_SERIAL_CPM_CONSOLE=y 619CONFIG_SERIAL_CPM_CONSOLE=y
597CONFIG_UNIX98_PTYS=y 620CONFIG_UNIX98_PTYS=y
621# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
598CONFIG_LEGACY_PTYS=y 622CONFIG_LEGACY_PTYS=y
599CONFIG_LEGACY_PTY_COUNT=256 623CONFIG_LEGACY_PTY_COUNT=256
624# CONFIG_HVC_UDBG is not set
600# CONFIG_IPMI_HANDLER is not set 625# CONFIG_IPMI_HANDLER is not set
601CONFIG_HW_RANDOM=y 626CONFIG_HW_RANDOM=y
602# CONFIG_NVRAM is not set 627# CONFIG_NVRAM is not set
@@ -614,6 +639,11 @@ CONFIG_GPIOLIB=y
614# CONFIG_GPIO_SYSFS is not set 639# CONFIG_GPIO_SYSFS is not set
615 640
616# 641#
642# Memory mapped GPIO expanders:
643#
644# CONFIG_GPIO_XILINX is not set
645
646#
617# I2C GPIO expanders: 647# I2C GPIO expanders:
618# 648#
619 649
@@ -642,11 +672,11 @@ CONFIG_HWMON=y
642# CONFIG_THERMAL is not set 672# CONFIG_THERMAL is not set
643# CONFIG_THERMAL_HWMON is not set 673# CONFIG_THERMAL_HWMON is not set
644# CONFIG_WATCHDOG is not set 674# CONFIG_WATCHDOG is not set
675CONFIG_SSB_POSSIBLE=y
645 676
646# 677#
647# Sonics Silicon Backplane 678# Sonics Silicon Backplane
648# 679#
649CONFIG_SSB_POSSIBLE=y
650# CONFIG_SSB is not set 680# CONFIG_SSB is not set
651 681
652# 682#
@@ -656,14 +686,7 @@ CONFIG_SSB_POSSIBLE=y
656# CONFIG_MFD_SM501 is not set 686# CONFIG_MFD_SM501 is not set
657# CONFIG_HTC_PASIC3 is not set 687# CONFIG_HTC_PASIC3 is not set
658# CONFIG_MFD_TMIO is not set 688# CONFIG_MFD_TMIO is not set
659
660#
661# Voltage and Current regulators
662#
663# CONFIG_REGULATOR is not set 689# 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 690
668# 691#
669# Multimedia devices 692# Multimedia devices
@@ -716,9 +739,13 @@ CONFIG_USB_SUPPORT=y
716# 739#
717 740
718# 741#
719# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 742# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
720# 743#
721# CONFIG_USB_GADGET is not set 744# CONFIG_USB_GADGET is not set
745
746#
747# OTG and related infrastructure
748#
722# CONFIG_MMC is not set 749# CONFIG_MMC is not set
723# CONFIG_MEMSTICK is not set 750# CONFIG_MEMSTICK is not set
724# CONFIG_NEW_LEDS is not set 751# CONFIG_NEW_LEDS is not set
@@ -749,6 +776,7 @@ CONFIG_FS_MBCACHE=y
749CONFIG_FILE_LOCKING=y 776CONFIG_FILE_LOCKING=y
750# CONFIG_XFS_FS is not set 777# CONFIG_XFS_FS is not set
751# CONFIG_OCFS2_FS is not set 778# CONFIG_OCFS2_FS is not set
779# CONFIG_BTRFS_FS is not set
752CONFIG_DNOTIFY=y 780CONFIG_DNOTIFY=y
753CONFIG_INOTIFY=y 781CONFIG_INOTIFY=y
754CONFIG_INOTIFY_USER=y 782CONFIG_INOTIFY_USER=y
@@ -782,10 +810,7 @@ CONFIG_TMPFS=y
782# CONFIG_TMPFS_POSIX_ACL is not set 810# CONFIG_TMPFS_POSIX_ACL is not set
783# CONFIG_HUGETLB_PAGE is not set 811# CONFIG_HUGETLB_PAGE is not set
784# CONFIG_CONFIGFS_FS is not set 812# CONFIG_CONFIGFS_FS is not set
785 813CONFIG_MISC_FILESYSTEMS=y
786#
787# Miscellaneous filesystems
788#
789# CONFIG_ADFS_FS is not set 814# CONFIG_ADFS_FS is not set
790# CONFIG_AFFS_FS is not set 815# CONFIG_AFFS_FS is not set
791# CONFIG_HFS_FS is not set 816# CONFIG_HFS_FS is not set
@@ -795,6 +820,7 @@ CONFIG_TMPFS=y
795# CONFIG_EFS_FS is not set 820# CONFIG_EFS_FS is not set
796# CONFIG_JFFS2_FS is not set 821# CONFIG_JFFS2_FS is not set
797# CONFIG_CRAMFS is not set 822# CONFIG_CRAMFS is not set
823# CONFIG_SQUASHFS is not set
798# CONFIG_VXFS_FS is not set 824# CONFIG_VXFS_FS is not set
799# CONFIG_MINIX_FS is not set 825# CONFIG_MINIX_FS is not set
800# CONFIG_OMFS_FS is not set 826# CONFIG_OMFS_FS is not set
@@ -845,6 +871,7 @@ CONFIG_PARTITION_ADVANCED=y
845# Library routines 871# Library routines
846# 872#
847CONFIG_BITREVERSE=y 873CONFIG_BITREVERSE=y
874CONFIG_GENERIC_FIND_LAST_BIT=y
848# CONFIG_CRC_CCITT is not set 875# CONFIG_CRC_CCITT is not set
849# CONFIG_CRC16 is not set 876# CONFIG_CRC16 is not set
850# CONFIG_CRC_T10DIF is not set 877# CONFIG_CRC_T10DIF is not set
@@ -895,6 +922,7 @@ CONFIG_DEBUG_MUTEXES=y
895# CONFIG_DEBUG_MEMORY_INIT is not set 922# CONFIG_DEBUG_MEMORY_INIT is not set
896# CONFIG_DEBUG_LIST is not set 923# CONFIG_DEBUG_LIST is not set
897# CONFIG_DEBUG_SG is not set 924# CONFIG_DEBUG_SG is not set
925# CONFIG_DEBUG_NOTIFIERS is not set
898# CONFIG_BOOT_PRINTK_DELAY is not set 926# CONFIG_BOOT_PRINTK_DELAY is not set
899# CONFIG_RCU_TORTURE_TEST is not set 927# CONFIG_RCU_TORTURE_TEST is not set
900# CONFIG_RCU_CPU_STALL_DETECTOR is not set 928# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -904,6 +932,8 @@ CONFIG_DEBUG_MUTEXES=y
904# CONFIG_LATENCYTOP is not set 932# CONFIG_LATENCYTOP is not set
905CONFIG_SYSCTL_SYSCALL_CHECK=y 933CONFIG_SYSCTL_SYSCALL_CHECK=y
906CONFIG_HAVE_FUNCTION_TRACER=y 934CONFIG_HAVE_FUNCTION_TRACER=y
935CONFIG_HAVE_DYNAMIC_FTRACE=y
936CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
907 937
908# 938#
909# Tracers 939# Tracers
@@ -912,11 +942,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
912# CONFIG_SCHED_TRACER is not set 942# CONFIG_SCHED_TRACER is not set
913# CONFIG_CONTEXT_SWITCH_TRACER is not set 943# CONFIG_CONTEXT_SWITCH_TRACER is not set
914# CONFIG_BOOT_TRACER is not set 944# CONFIG_BOOT_TRACER is not set
945# CONFIG_TRACE_BRANCH_PROFILING is not set
915# CONFIG_STACK_TRACER is not set 946# CONFIG_STACK_TRACER is not set
916# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 947# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
917# CONFIG_SAMPLES is not set 948# CONFIG_SAMPLES is not set
918CONFIG_HAVE_ARCH_KGDB=y 949CONFIG_HAVE_ARCH_KGDB=y
919# CONFIG_KGDB is not set 950# CONFIG_KGDB is not set
951CONFIG_PRINT_STACK_DEPTH=64
920# CONFIG_DEBUG_STACKOVERFLOW is not set 952# CONFIG_DEBUG_STACKOVERFLOW is not set
921# CONFIG_DEBUG_STACK_USAGE is not set 953# CONFIG_DEBUG_STACK_USAGE is not set
922# CONFIG_DEBUG_PAGEALLOC is not set 954# CONFIG_DEBUG_PAGEALLOC is not set
@@ -943,6 +975,7 @@ CONFIG_CRYPTO=y
943# 975#
944# CONFIG_CRYPTO_FIPS is not set 976# CONFIG_CRYPTO_FIPS is not set
945# CONFIG_CRYPTO_MANAGER is not set 977# CONFIG_CRYPTO_MANAGER is not set
978# CONFIG_CRYPTO_MANAGER2 is not set
946# CONFIG_CRYPTO_GF128MUL is not set 979# CONFIG_CRYPTO_GF128MUL is not set
947# CONFIG_CRYPTO_NULL is not set 980# CONFIG_CRYPTO_NULL is not set
948# CONFIG_CRYPTO_CRYPTD is not set 981# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/85xx/mpc8536_ds_defconfig b/arch/powerpc/configs/85xx/mpc8536_ds_defconfig
index 256055cb6d2f..e31b6a4732ed 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:05 2008 4# Mon Jan 26 15:36:04 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,7 +21,9 @@ CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y 21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
24# CONFIG_PPC_MM_SLICES is not set 25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
25CONFIG_PPC32=y 27CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 28CONFIG_WORD_SIZE=32
27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -45,7 +47,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
45CONFIG_PPC=y 47CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 48CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 49CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 50CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 51CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 52CONFIG_PPC_OF=y
51CONFIG_OF=y 53CONFIG_OF=y
@@ -78,12 +80,12 @@ CONFIG_AUDIT=y
78CONFIG_IKCONFIG=y 80CONFIG_IKCONFIG=y
79CONFIG_IKCONFIG_PROC=y 81CONFIG_IKCONFIG_PROC=y
80CONFIG_LOG_BUF_SHIFT=14 82CONFIG_LOG_BUF_SHIFT=14
81# CONFIG_CGROUPS is not set
82CONFIG_GROUP_SCHED=y 83CONFIG_GROUP_SCHED=y
83# CONFIG_FAIR_GROUP_SCHED is not set 84# CONFIG_FAIR_GROUP_SCHED is not set
84# CONFIG_RT_GROUP_SCHED is not set 85# CONFIG_RT_GROUP_SCHED is not set
85CONFIG_USER_SCHED=y 86CONFIG_USER_SCHED=y
86# CONFIG_CGROUP_SCHED is not set 87# CONFIG_CGROUP_SCHED is not set
88# CONFIG_CGROUPS is not set
87CONFIG_SYSFS_DEPRECATED=y 89CONFIG_SYSFS_DEPRECATED=y
88CONFIG_SYSFS_DEPRECATED_V2=y 90CONFIG_SYSFS_DEPRECATED_V2=y
89# CONFIG_RELAY is not set 91# CONFIG_RELAY is not set
@@ -96,6 +98,7 @@ CONFIG_EMBEDDED=y
96CONFIG_SYSCTL_SYSCALL=y 98CONFIG_SYSCTL_SYSCALL=y
97CONFIG_KALLSYMS=y 99CONFIG_KALLSYMS=y
98CONFIG_KALLSYMS_ALL=y 100CONFIG_KALLSYMS_ALL=y
101CONFIG_KALLSYMS_STRIP_GENERATED=y
99CONFIG_KALLSYMS_EXTRA_PASS=y 102CONFIG_KALLSYMS_EXTRA_PASS=y
100CONFIG_HOTPLUG=y 103CONFIG_HOTPLUG=y
101CONFIG_PRINTK=y 104CONFIG_PRINTK=y
@@ -118,7 +121,6 @@ CONFIG_SLUB_DEBUG=y
118CONFIG_SLUB=y 121CONFIG_SLUB=y
119# CONFIG_SLOB is not set 122# CONFIG_SLOB is not set
120# CONFIG_PROFILING is not set 123# CONFIG_PROFILING is not set
121# CONFIG_MARKERS is not set
122CONFIG_HAVE_OPROFILE=y 124CONFIG_HAVE_OPROFILE=y
123# CONFIG_KPROBES is not set 125# CONFIG_KPROBES is not set
124CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 126CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -129,7 +131,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 131# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 132CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 133CONFIG_RT_MUTEXES=y
132# CONFIG_TINY_SHMEM is not set
133CONFIG_BASE_SMALL=0 134CONFIG_BASE_SMALL=0
134CONFIG_MODULES=y 135CONFIG_MODULES=y
135# CONFIG_MODULE_FORCE_LOAD is not set 136# CONFIG_MODULE_FORCE_LOAD is not set
@@ -137,11 +138,9 @@ CONFIG_MODULE_UNLOAD=y
137CONFIG_MODULE_FORCE_UNLOAD=y 138CONFIG_MODULE_FORCE_UNLOAD=y
138CONFIG_MODVERSIONS=y 139CONFIG_MODVERSIONS=y
139# CONFIG_MODULE_SRCVERSION_ALL is not set 140# CONFIG_MODULE_SRCVERSION_ALL is not set
140CONFIG_KMOD=y
141CONFIG_BLOCK=y 141CONFIG_BLOCK=y
142CONFIG_LBD=y 142CONFIG_LBD=y
143# CONFIG_BLK_DEV_IO_TRACE is not set 143# CONFIG_BLK_DEV_IO_TRACE is not set
144# CONFIG_LSF is not set
145# CONFIG_BLK_DEV_BSG is not set 144# CONFIG_BLK_DEV_BSG is not set
146# CONFIG_BLK_DEV_INTEGRITY is not set 145# CONFIG_BLK_DEV_INTEGRITY is not set
147 146
@@ -158,6 +157,10 @@ CONFIG_DEFAULT_CFQ=y
158# CONFIG_DEFAULT_NOOP is not set 157# CONFIG_DEFAULT_NOOP is not set
159CONFIG_DEFAULT_IOSCHED="cfq" 158CONFIG_DEFAULT_IOSCHED="cfq"
160CONFIG_CLASSIC_RCU=y 159CONFIG_CLASSIC_RCU=y
160# CONFIG_TREE_RCU is not set
161# CONFIG_PREEMPT_RCU is not set
162# CONFIG_TREE_RCU_TRACE is not set
163# CONFIG_PREEMPT_RCU_TRACE is not set
161# CONFIG_FREEZER is not set 164# CONFIG_FREEZER is not set
162 165
163# 166#
@@ -197,6 +200,7 @@ CONFIG_MPIC=y
197# CONFIG_CPM2 is not set 200# CONFIG_CPM2 is not set
198# CONFIG_FSL_ULI1575 is not set 201# CONFIG_FSL_ULI1575 is not set
199# CONFIG_MPC8xxx_GPIO is not set 202# CONFIG_MPC8xxx_GPIO is not set
203# CONFIG_SIMPLE_GPIO is not set
200 204
201# 205#
202# Kernel options 206# Kernel options
@@ -235,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
235CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
236CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
237CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
238# CONFIG_RESOURCES_64BIT is not set
239# CONFIG_PHYS_ADDR_T_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
243CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
244CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
245CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
246# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -265,6 +271,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
265# CONFIG_PCI_MSI is not set 271# CONFIG_PCI_MSI is not set
266# CONFIG_PCI_LEGACY is not set 272# CONFIG_PCI_LEGACY is not set
267# CONFIG_PCI_DEBUG is not set 273# CONFIG_PCI_DEBUG is not set
274# CONFIG_PCI_STUB is not set
268# CONFIG_PCCARD is not set 275# CONFIG_PCCARD is not set
269# CONFIG_HOTPLUG_PCI is not set 276# CONFIG_HOTPLUG_PCI is not set
270# CONFIG_HAS_RAPIDIO is not set 277# CONFIG_HAS_RAPIDIO is not set
@@ -288,6 +295,7 @@ CONFIG_NET=y
288# 295#
289# Networking options 296# Networking options
290# 297#
298CONFIG_COMPAT_NET_DEV_OPS=y
291CONFIG_PACKET=y 299CONFIG_PACKET=y
292# CONFIG_PACKET_MMAP is not set 300# CONFIG_PACKET_MMAP is not set
293CONFIG_UNIX=y 301CONFIG_UNIX=y
@@ -376,6 +384,7 @@ CONFIG_SCTP_HMAC_MD5=y
376# CONFIG_ECONET is not set 384# CONFIG_ECONET is not set
377# CONFIG_WAN_ROUTER is not set 385# CONFIG_WAN_ROUTER is not set
378# CONFIG_NET_SCHED is not set 386# CONFIG_NET_SCHED is not set
387# CONFIG_DCB is not set
379 388
380# 389#
381# Network testing 390# Network testing
@@ -392,8 +401,9 @@ CONFIG_WIRELESS=y
392# CONFIG_CFG80211 is not set 401# CONFIG_CFG80211 is not set
393CONFIG_WIRELESS_OLD_REGULATORY=y 402CONFIG_WIRELESS_OLD_REGULATORY=y
394# CONFIG_WIRELESS_EXT is not set 403# CONFIG_WIRELESS_EXT is not set
404# CONFIG_LIB80211 is not set
395# CONFIG_MAC80211 is not set 405# CONFIG_MAC80211 is not set
396# CONFIG_IEEE80211 is not set 406# CONFIG_WIMAX is not set
397# CONFIG_RFKILL is not set 407# CONFIG_RFKILL is not set
398# CONFIG_NET_9P is not set 408# CONFIG_NET_9P is not set
399 409
@@ -442,8 +452,10 @@ CONFIG_MISC_DEVICES=y
442# CONFIG_EEPROM_93CX6 is not set 452# CONFIG_EEPROM_93CX6 is not set
443# CONFIG_SGI_IOC4 is not set 453# CONFIG_SGI_IOC4 is not set
444# CONFIG_TIFM_CORE is not set 454# CONFIG_TIFM_CORE is not set
455# CONFIG_ICS932S401 is not set
445# CONFIG_ENCLOSURE_SERVICES is not set 456# CONFIG_ENCLOSURE_SERVICES is not set
446# CONFIG_HP_ILO is not set 457# CONFIG_HP_ILO is not set
458# CONFIG_C2PORT is not set
447CONFIG_HAVE_IDE=y 459CONFIG_HAVE_IDE=y
448# CONFIG_IDE is not set 460# CONFIG_IDE is not set
449 461
@@ -487,6 +499,7 @@ CONFIG_SCSI_WAIT_SCAN=m
487# CONFIG_SCSI_SRP_ATTRS is not set 499# CONFIG_SCSI_SRP_ATTRS is not set
488CONFIG_SCSI_LOWLEVEL=y 500CONFIG_SCSI_LOWLEVEL=y
489# CONFIG_ISCSI_TCP is not set 501# CONFIG_ISCSI_TCP is not set
502# CONFIG_SCSI_CXGB3_ISCSI is not set
490# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 503# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
491# CONFIG_SCSI_3W_9XXX is not set 504# CONFIG_SCSI_3W_9XXX is not set
492# CONFIG_SCSI_ACARD is not set 505# CONFIG_SCSI_ACARD is not set
@@ -503,6 +516,8 @@ CONFIG_SCSI_LOWLEVEL=y
503# CONFIG_MEGARAID_SAS is not set 516# CONFIG_MEGARAID_SAS is not set
504# CONFIG_SCSI_HPTIOP is not set 517# CONFIG_SCSI_HPTIOP is not set
505# CONFIG_SCSI_BUSLOGIC is not set 518# CONFIG_SCSI_BUSLOGIC is not set
519# CONFIG_LIBFC is not set
520# CONFIG_FCOE is not set
506# CONFIG_SCSI_DMX3191D is not set 521# CONFIG_SCSI_DMX3191D is not set
507# CONFIG_SCSI_EATA is not set 522# CONFIG_SCSI_EATA is not set
508# CONFIG_SCSI_FUTURE_DOMAIN is not set 523# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -622,6 +637,9 @@ CONFIG_VITESSE_PHY=y
622# CONFIG_BROADCOM_PHY is not set 637# CONFIG_BROADCOM_PHY is not set
623# CONFIG_ICPLUS_PHY is not set 638# CONFIG_ICPLUS_PHY is not set
624# CONFIG_REALTEK_PHY is not set 639# CONFIG_REALTEK_PHY is not set
640# CONFIG_NATIONAL_PHY is not set
641# CONFIG_STE10XP is not set
642# CONFIG_LSI_ET1011C_PHY is not set
625# CONFIG_FIXED_PHY is not set 643# CONFIG_FIXED_PHY is not set
626# CONFIG_MDIO_BITBANG is not set 644# CONFIG_MDIO_BITBANG is not set
627CONFIG_NET_ETHERNET=y 645CONFIG_NET_ETHERNET=y
@@ -668,6 +686,7 @@ CONFIG_GIANFAR=y
668# CONFIG_JME is not set 686# CONFIG_JME is not set
669CONFIG_NETDEV_10000=y 687CONFIG_NETDEV_10000=y
670# CONFIG_CHELSIO_T1 is not set 688# CONFIG_CHELSIO_T1 is not set
689CONFIG_CHELSIO_T3_DEPENDS=y
671# CONFIG_CHELSIO_T3 is not set 690# CONFIG_CHELSIO_T3 is not set
672# CONFIG_ENIC is not set 691# CONFIG_ENIC is not set
673# CONFIG_IXGBE is not set 692# CONFIG_IXGBE is not set
@@ -692,6 +711,10 @@ CONFIG_NETDEV_10000=y
692# CONFIG_IWLWIFI_LEDS is not set 711# CONFIG_IWLWIFI_LEDS is not set
693 712
694# 713#
714# Enable WiMAX (Networking options) to see the WiMAX drivers
715#
716
717#
695# USB Network Adapters 718# USB Network Adapters
696# 719#
697# CONFIG_USB_CATC is not set 720# CONFIG_USB_CATC is not set
@@ -783,8 +806,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
783# CONFIG_SERIAL_JSM is not set 806# CONFIG_SERIAL_JSM is not set
784# CONFIG_SERIAL_OF_PLATFORM is not set 807# CONFIG_SERIAL_OF_PLATFORM is not set
785CONFIG_UNIX98_PTYS=y 808CONFIG_UNIX98_PTYS=y
809# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
786CONFIG_LEGACY_PTYS=y 810CONFIG_LEGACY_PTYS=y
787CONFIG_LEGACY_PTY_COUNT=256 811CONFIG_LEGACY_PTY_COUNT=256
812# CONFIG_HVC_UDBG is not set
788# CONFIG_IPMI_HANDLER is not set 813# CONFIG_IPMI_HANDLER is not set
789CONFIG_HW_RANDOM=y 814CONFIG_HW_RANDOM=y
790# CONFIG_NVRAM is not set 815# CONFIG_NVRAM is not set
@@ -869,11 +894,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
869# CONFIG_HWMON is not set 894# CONFIG_HWMON is not set
870CONFIG_THERMAL=y 895CONFIG_THERMAL=y
871# CONFIG_WATCHDOG is not set 896# CONFIG_WATCHDOG is not set
897CONFIG_SSB_POSSIBLE=y
872 898
873# 899#
874# Sonics Silicon Backplane 900# Sonics Silicon Backplane
875# 901#
876CONFIG_SSB_POSSIBLE=y
877# CONFIG_SSB is not set 902# CONFIG_SSB is not set
878 903
879# 904#
@@ -882,18 +907,13 @@ CONFIG_SSB_POSSIBLE=y
882# CONFIG_MFD_CORE is not set 907# CONFIG_MFD_CORE is not set
883# CONFIG_MFD_SM501 is not set 908# CONFIG_MFD_SM501 is not set
884# CONFIG_HTC_PASIC3 is not set 909# CONFIG_HTC_PASIC3 is not set
910# CONFIG_TWL4030_CORE is not set
885# CONFIG_MFD_TMIO is not set 911# CONFIG_MFD_TMIO is not set
886# CONFIG_PMIC_DA903X is not set 912# CONFIG_PMIC_DA903X is not set
887# CONFIG_MFD_WM8400 is not set 913# CONFIG_MFD_WM8400 is not set
888# CONFIG_MFD_WM8350_I2C is not set 914# CONFIG_MFD_WM8350_I2C is not set
889 915# CONFIG_MFD_PCF50633 is not set
890#
891# Voltage and Current regulators
892#
893# CONFIG_REGULATOR is not set 916# 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
897 917
898# 918#
899# Multimedia devices 919# Multimedia devices
@@ -920,6 +940,7 @@ CONFIG_MEDIA_TUNER_TEA5767=m
920CONFIG_MEDIA_TUNER_MT20XX=m 940CONFIG_MEDIA_TUNER_MT20XX=m
921CONFIG_MEDIA_TUNER_XC2028=m 941CONFIG_MEDIA_TUNER_XC2028=m
922CONFIG_MEDIA_TUNER_XC5000=m 942CONFIG_MEDIA_TUNER_XC5000=m
943# CONFIG_DVB_DYNAMIC_MINORS is not set
923CONFIG_DVB_CAPTURE_DRIVERS=y 944CONFIG_DVB_CAPTURE_DRIVERS=y
924 945
925# 946#
@@ -965,6 +986,12 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
965# CONFIG_DVB_FE_CUSTOMISE is not set 986# CONFIG_DVB_FE_CUSTOMISE is not set
966 987
967# 988#
989# Multistandard (satellite) frontends
990#
991# CONFIG_DVB_STB0899 is not set
992# CONFIG_DVB_STB6100 is not set
993
994#
968# DVB-S (satellite) frontends 995# DVB-S (satellite) frontends
969# 996#
970# CONFIG_DVB_CX24110 is not set 997# CONFIG_DVB_CX24110 is not set
@@ -976,8 +1003,10 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
976# CONFIG_DVB_STV0299 is not set 1003# CONFIG_DVB_STV0299 is not set
977# CONFIG_DVB_TDA8083 is not set 1004# CONFIG_DVB_TDA8083 is not set
978# CONFIG_DVB_TDA10086 is not set 1005# CONFIG_DVB_TDA10086 is not set
1006# CONFIG_DVB_TDA8261 is not set
979# CONFIG_DVB_VES1X93 is not set 1007# CONFIG_DVB_VES1X93 is not set
980# CONFIG_DVB_TUNER_ITD1000 is not set 1008# CONFIG_DVB_TUNER_ITD1000 is not set
1009# CONFIG_DVB_TUNER_CX24113 is not set
981# CONFIG_DVB_TDA826X is not set 1010# CONFIG_DVB_TDA826X is not set
982# CONFIG_DVB_TUA6100 is not set 1011# CONFIG_DVB_TUA6100 is not set
983# CONFIG_DVB_CX24116 is not set 1012# CONFIG_DVB_CX24116 is not set
@@ -1018,11 +1047,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
1018# CONFIG_DVB_OR51132 is not set 1047# CONFIG_DVB_OR51132 is not set
1019# CONFIG_DVB_BCM3510 is not set 1048# CONFIG_DVB_BCM3510 is not set
1020# CONFIG_DVB_LGDT330X is not set 1049# CONFIG_DVB_LGDT330X is not set
1050# CONFIG_DVB_LGDT3304 is not set
1021# CONFIG_DVB_S5H1409 is not set 1051# CONFIG_DVB_S5H1409 is not set
1022# CONFIG_DVB_AU8522 is not set 1052# CONFIG_DVB_AU8522 is not set
1023# CONFIG_DVB_S5H1411 is not set 1053# CONFIG_DVB_S5H1411 is not set
1024 1054
1025# 1055#
1056# ISDB-T (terrestrial) frontends
1057#
1058# CONFIG_DVB_S921 is not set
1059
1060#
1026# Digital terrestrial only tuners/PLL 1061# Digital terrestrial only tuners/PLL
1027# 1062#
1028# CONFIG_DVB_PLL is not set 1063# CONFIG_DVB_PLL is not set
@@ -1073,6 +1108,7 @@ CONFIG_SND_PCM=y
1073# CONFIG_SND_SEQUENCER is not set 1108# CONFIG_SND_SEQUENCER is not set
1074# CONFIG_SND_MIXER_OSS is not set 1109# CONFIG_SND_MIXER_OSS is not set
1075# CONFIG_SND_PCM_OSS is not set 1110# CONFIG_SND_PCM_OSS is not set
1111# CONFIG_SND_HRTIMER is not set
1076# CONFIG_SND_DYNAMIC_MINORS is not set 1112# CONFIG_SND_DYNAMIC_MINORS is not set
1077CONFIG_SND_SUPPORT_OLD_API=y 1113CONFIG_SND_SUPPORT_OLD_API=y
1078CONFIG_SND_VERBOSE_PROCFS=y 1114CONFIG_SND_VERBOSE_PROCFS=y
@@ -1175,11 +1211,9 @@ CONFIG_HID_COMPAT=y
1175CONFIG_HID_A4TECH=y 1211CONFIG_HID_A4TECH=y
1176CONFIG_HID_APPLE=y 1212CONFIG_HID_APPLE=y
1177CONFIG_HID_BELKIN=y 1213CONFIG_HID_BELKIN=y
1178CONFIG_HID_BRIGHT=y
1179CONFIG_HID_CHERRY=y 1214CONFIG_HID_CHERRY=y
1180CONFIG_HID_CHICONY=y 1215CONFIG_HID_CHICONY=y
1181CONFIG_HID_CYPRESS=y 1216CONFIG_HID_CYPRESS=y
1182CONFIG_HID_DELL=y
1183CONFIG_HID_EZKEY=y 1217CONFIG_HID_EZKEY=y
1184CONFIG_HID_GYRATION=y 1218CONFIG_HID_GYRATION=y
1185CONFIG_HID_LOGITECH=y 1219CONFIG_HID_LOGITECH=y
@@ -1187,12 +1221,15 @@ CONFIG_HID_LOGITECH=y
1187# CONFIG_LOGIRUMBLEPAD2_FF is not set 1221# CONFIG_LOGIRUMBLEPAD2_FF is not set
1188CONFIG_HID_MICROSOFT=y 1222CONFIG_HID_MICROSOFT=y
1189CONFIG_HID_MONTEREY=y 1223CONFIG_HID_MONTEREY=y
1224# CONFIG_HID_NTRIG is not set
1190CONFIG_HID_PANTHERLORD=y 1225CONFIG_HID_PANTHERLORD=y
1191# CONFIG_PANTHERLORD_FF is not set 1226# CONFIG_PANTHERLORD_FF is not set
1192CONFIG_HID_PETALYNX=y 1227CONFIG_HID_PETALYNX=y
1193CONFIG_HID_SAMSUNG=y 1228CONFIG_HID_SAMSUNG=y
1194CONFIG_HID_SONY=y 1229CONFIG_HID_SONY=y
1195CONFIG_HID_SUNPLUS=y 1230CONFIG_HID_SUNPLUS=y
1231# CONFIG_GREENASIA_FF is not set
1232# CONFIG_HID_TOPSEED is not set
1196CONFIG_THRUSTMASTER_FF=m 1233CONFIG_THRUSTMASTER_FF=m
1197CONFIG_ZEROPLUS_FF=m 1234CONFIG_ZEROPLUS_FF=m
1198CONFIG_USB_SUPPORT=y 1235CONFIG_USB_SUPPORT=y
@@ -1225,6 +1262,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
1225# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1262# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1226CONFIG_USB_EHCI_FSL=y 1263CONFIG_USB_EHCI_FSL=y
1227CONFIG_USB_EHCI_HCD_PPC_OF=y 1264CONFIG_USB_EHCI_HCD_PPC_OF=y
1265# CONFIG_USB_OXU210HP_HCD is not set
1228# CONFIG_USB_ISP116X_HCD is not set 1266# CONFIG_USB_ISP116X_HCD is not set
1229# CONFIG_USB_ISP1760_HCD is not set 1267# CONFIG_USB_ISP1760_HCD is not set
1230CONFIG_USB_OHCI_HCD=y 1268CONFIG_USB_OHCI_HCD=y
@@ -1250,18 +1288,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1250# CONFIG_USB_TMC is not set 1288# CONFIG_USB_TMC is not set
1251 1289
1252# 1290#
1253# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1291# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1254# 1292#
1255 1293
1256# 1294#
1257# may also be needed; see USB_STORAGE Help for more information 1295# see USB_STORAGE Help for more information
1258# 1296#
1259CONFIG_USB_STORAGE=y 1297CONFIG_USB_STORAGE=y
1260# CONFIG_USB_STORAGE_DEBUG is not set 1298# CONFIG_USB_STORAGE_DEBUG is not set
1261# CONFIG_USB_STORAGE_DATAFAB is not set 1299# CONFIG_USB_STORAGE_DATAFAB is not set
1262# CONFIG_USB_STORAGE_FREECOM is not set 1300# CONFIG_USB_STORAGE_FREECOM is not set
1263# CONFIG_USB_STORAGE_ISD200 is not set 1301# CONFIG_USB_STORAGE_ISD200 is not set
1264# CONFIG_USB_STORAGE_DPCM is not set
1265# CONFIG_USB_STORAGE_USBAT is not set 1302# CONFIG_USB_STORAGE_USBAT is not set
1266# CONFIG_USB_STORAGE_SDDR09 is not set 1303# CONFIG_USB_STORAGE_SDDR09 is not set
1267# CONFIG_USB_STORAGE_SDDR55 is not set 1304# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1309,6 +1346,10 @@ CONFIG_USB_STORAGE=y
1309# CONFIG_USB_ISIGHTFW is not set 1346# CONFIG_USB_ISIGHTFW is not set
1310# CONFIG_USB_VST is not set 1347# CONFIG_USB_VST is not set
1311# CONFIG_USB_GADGET is not set 1348# CONFIG_USB_GADGET is not set
1349
1350#
1351# OTG and related infrastructure
1352#
1312# CONFIG_UWB is not set 1353# CONFIG_UWB is not set
1313# CONFIG_MMC is not set 1354# CONFIG_MMC is not set
1314# CONFIG_MEMSTICK is not set 1355# CONFIG_MEMSTICK is not set
@@ -1346,6 +1387,7 @@ CONFIG_RTC_INTF_DEV=y
1346# CONFIG_RTC_DRV_M41T80 is not set 1387# CONFIG_RTC_DRV_M41T80 is not set
1347# CONFIG_RTC_DRV_S35390A is not set 1388# CONFIG_RTC_DRV_S35390A is not set
1348# CONFIG_RTC_DRV_FM3130 is not set 1389# CONFIG_RTC_DRV_FM3130 is not set
1390# CONFIG_RTC_DRV_RX8581 is not set
1349 1391
1350# 1392#
1351# SPI RTC drivers 1393# SPI RTC drivers
@@ -1405,7 +1447,9 @@ CONFIG_FS_MBCACHE=y
1405# CONFIG_FS_POSIX_ACL is not set 1447# CONFIG_FS_POSIX_ACL is not set
1406CONFIG_FILE_LOCKING=y 1448CONFIG_FILE_LOCKING=y
1407# CONFIG_XFS_FS is not set 1449# CONFIG_XFS_FS is not set
1450# CONFIG_GFS2_FS is not set
1408# CONFIG_OCFS2_FS is not set 1451# CONFIG_OCFS2_FS is not set
1452# CONFIG_BTRFS_FS is not set
1409CONFIG_DNOTIFY=y 1453CONFIG_DNOTIFY=y
1410CONFIG_INOTIFY=y 1454CONFIG_INOTIFY=y
1411CONFIG_INOTIFY_USER=y 1455CONFIG_INOTIFY_USER=y
@@ -1447,10 +1491,7 @@ CONFIG_TMPFS=y
1447# CONFIG_TMPFS_POSIX_ACL is not set 1491# CONFIG_TMPFS_POSIX_ACL is not set
1448# CONFIG_HUGETLB_PAGE is not set 1492# CONFIG_HUGETLB_PAGE is not set
1449# CONFIG_CONFIGFS_FS is not set 1493# CONFIG_CONFIGFS_FS is not set
1450 1494CONFIG_MISC_FILESYSTEMS=y
1451#
1452# Miscellaneous filesystems
1453#
1454CONFIG_ADFS_FS=m 1495CONFIG_ADFS_FS=m
1455# CONFIG_ADFS_FS_RW is not set 1496# CONFIG_ADFS_FS_RW is not set
1456CONFIG_AFFS_FS=m 1497CONFIG_AFFS_FS=m
@@ -1461,6 +1502,7 @@ CONFIG_BEFS_FS=m
1461CONFIG_BFS_FS=m 1502CONFIG_BFS_FS=m
1462CONFIG_EFS_FS=m 1503CONFIG_EFS_FS=m
1463CONFIG_CRAMFS=y 1504CONFIG_CRAMFS=y
1505# CONFIG_SQUASHFS is not set
1464CONFIG_VXFS_FS=m 1506CONFIG_VXFS_FS=m
1465# CONFIG_MINIX_FS is not set 1507# CONFIG_MINIX_FS is not set
1466# CONFIG_OMFS_FS is not set 1508# CONFIG_OMFS_FS is not set
@@ -1562,6 +1604,7 @@ CONFIG_NLS_UTF8=m
1562# Library routines 1604# Library routines
1563# 1605#
1564CONFIG_BITREVERSE=y 1606CONFIG_BITREVERSE=y
1607CONFIG_GENERIC_FIND_LAST_BIT=y
1565# CONFIG_CRC_CCITT is not set 1608# CONFIG_CRC_CCITT is not set
1566# CONFIG_CRC16 is not set 1609# CONFIG_CRC16 is not set
1567CONFIG_CRC_T10DIF=y 1610CONFIG_CRC_T10DIF=y
@@ -1613,6 +1656,7 @@ CONFIG_DEBUG_INFO=y
1613# CONFIG_DEBUG_MEMORY_INIT is not set 1656# CONFIG_DEBUG_MEMORY_INIT is not set
1614# CONFIG_DEBUG_LIST is not set 1657# CONFIG_DEBUG_LIST is not set
1615# CONFIG_DEBUG_SG is not set 1658# CONFIG_DEBUG_SG is not set
1659# CONFIG_DEBUG_NOTIFIERS is not set
1616# CONFIG_BOOT_PRINTK_DELAY is not set 1660# CONFIG_BOOT_PRINTK_DELAY is not set
1617# CONFIG_RCU_TORTURE_TEST is not set 1661# CONFIG_RCU_TORTURE_TEST is not set
1618# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1662# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1622,6 +1666,8 @@ CONFIG_DEBUG_INFO=y
1622# CONFIG_LATENCYTOP is not set 1666# CONFIG_LATENCYTOP is not set
1623CONFIG_SYSCTL_SYSCALL_CHECK=y 1667CONFIG_SYSCTL_SYSCALL_CHECK=y
1624CONFIG_HAVE_FUNCTION_TRACER=y 1668CONFIG_HAVE_FUNCTION_TRACER=y
1669CONFIG_HAVE_DYNAMIC_FTRACE=y
1670CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1625 1671
1626# 1672#
1627# Tracers 1673# Tracers
@@ -1630,11 +1676,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1630# CONFIG_SCHED_TRACER is not set 1676# CONFIG_SCHED_TRACER is not set
1631# CONFIG_CONTEXT_SWITCH_TRACER is not set 1677# CONFIG_CONTEXT_SWITCH_TRACER is not set
1632# CONFIG_BOOT_TRACER is not set 1678# CONFIG_BOOT_TRACER is not set
1679# CONFIG_TRACE_BRANCH_PROFILING is not set
1633# CONFIG_STACK_TRACER is not set 1680# CONFIG_STACK_TRACER is not set
1634# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1681# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1635# CONFIG_SAMPLES is not set 1682# CONFIG_SAMPLES is not set
1636CONFIG_HAVE_ARCH_KGDB=y 1683CONFIG_HAVE_ARCH_KGDB=y
1637# CONFIG_KGDB is not set 1684# CONFIG_KGDB is not set
1685CONFIG_PRINT_STACK_DEPTH=64
1638# CONFIG_DEBUG_STACKOVERFLOW is not set 1686# CONFIG_DEBUG_STACKOVERFLOW is not set
1639# CONFIG_DEBUG_STACK_USAGE is not set 1687# CONFIG_DEBUG_STACK_USAGE is not set
1640# CONFIG_DEBUG_PAGEALLOC is not set 1688# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1661,11 +1709,16 @@ CONFIG_CRYPTO=y
1661# 1709#
1662# CONFIG_CRYPTO_FIPS is not set 1710# CONFIG_CRYPTO_FIPS is not set
1663CONFIG_CRYPTO_ALGAPI=y 1711CONFIG_CRYPTO_ALGAPI=y
1712CONFIG_CRYPTO_ALGAPI2=y
1664CONFIG_CRYPTO_AEAD=y 1713CONFIG_CRYPTO_AEAD=y
1714CONFIG_CRYPTO_AEAD2=y
1665CONFIG_CRYPTO_BLKCIPHER=y 1715CONFIG_CRYPTO_BLKCIPHER=y
1716CONFIG_CRYPTO_BLKCIPHER2=y
1666CONFIG_CRYPTO_HASH=y 1717CONFIG_CRYPTO_HASH=y
1667CONFIG_CRYPTO_RNG=y 1718CONFIG_CRYPTO_HASH2=y
1719CONFIG_CRYPTO_RNG2=y
1668CONFIG_CRYPTO_MANAGER=y 1720CONFIG_CRYPTO_MANAGER=y
1721CONFIG_CRYPTO_MANAGER2=y
1669# CONFIG_CRYPTO_GF128MUL is not set 1722# CONFIG_CRYPTO_GF128MUL is not set
1670# CONFIG_CRYPTO_NULL is not set 1723# CONFIG_CRYPTO_NULL is not set
1671# CONFIG_CRYPTO_CRYPTD is not set 1724# CONFIG_CRYPTO_CRYPTD is not set
@@ -1699,7 +1752,7 @@ CONFIG_CRYPTO_HMAC=y
1699# 1752#
1700# Digest 1753# Digest
1701# 1754#
1702# CONFIG_CRYPTO_CRC32C is not set 1755CONFIG_CRYPTO_CRC32C=m
1703# CONFIG_CRYPTO_MD4 is not set 1756# CONFIG_CRYPTO_MD4 is not set
1704CONFIG_CRYPTO_MD5=y 1757CONFIG_CRYPTO_MD5=y
1705# CONFIG_CRYPTO_MICHAEL_MIC is not set 1758# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
index d790cbab80b8..905e8a3388d6 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:06 2008 4# Mon Jan 26 15:36:05 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,7 +21,9 @@ CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y 21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
24# CONFIG_PPC_MM_SLICES is not set 25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
25CONFIG_PPC32=y 27CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 28CONFIG_WORD_SIZE=32
27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -45,7 +47,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
45CONFIG_PPC=y 47CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 48CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 49CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 50CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 51CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 52CONFIG_PPC_OF=y
51CONFIG_OF=y 53CONFIG_OF=y
@@ -75,12 +77,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 77# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 78# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 79CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 80CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 81# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 82# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 83CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 84# CONFIG_CGROUP_SCHED is not set
85# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 86CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 87CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 88# CONFIG_RELAY is not set
@@ -114,7 +116,6 @@ CONFIG_SLUB_DEBUG=y
114CONFIG_SLUB=y 116CONFIG_SLUB=y
115# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
116# CONFIG_PROFILING is not set 118# CONFIG_PROFILING is not set
117# CONFIG_MARKERS is not set
118CONFIG_HAVE_OPROFILE=y 119CONFIG_HAVE_OPROFILE=y
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
120CONFIG_HAVE_IOREMAP_PROT=y 121CONFIG_HAVE_IOREMAP_PROT=y
@@ -124,13 +125,11 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 127CONFIG_RT_MUTEXES=y
127# CONFIG_TINY_SHMEM is not set
128CONFIG_BASE_SMALL=0 128CONFIG_BASE_SMALL=0
129# CONFIG_MODULES is not set 129# CONFIG_MODULES is not set
130CONFIG_BLOCK=y 130CONFIG_BLOCK=y
131# CONFIG_LBD is not set 131# CONFIG_LBD is not set
132# CONFIG_BLK_DEV_IO_TRACE is not set 132# CONFIG_BLK_DEV_IO_TRACE is not set
133# CONFIG_LSF is not set
134# CONFIG_BLK_DEV_BSG is not set 133# CONFIG_BLK_DEV_BSG is not set
135# CONFIG_BLK_DEV_INTEGRITY is not set 134# CONFIG_BLK_DEV_INTEGRITY is not set
136 135
@@ -147,6 +146,10 @@ CONFIG_DEFAULT_AS=y
147# CONFIG_DEFAULT_NOOP is not set 146# CONFIG_DEFAULT_NOOP is not set
148CONFIG_DEFAULT_IOSCHED="anticipatory" 147CONFIG_DEFAULT_IOSCHED="anticipatory"
149CONFIG_CLASSIC_RCU=y 148CONFIG_CLASSIC_RCU=y
149# CONFIG_TREE_RCU is not set
150# CONFIG_PREEMPT_RCU is not set
151# CONFIG_TREE_RCU_TRACE is not set
152# CONFIG_PREEMPT_RCU_TRACE is not set
150# CONFIG_FREEZER is not set 153# CONFIG_FREEZER is not set
151 154
152# 155#
@@ -186,6 +189,7 @@ CONFIG_MPIC=y
186# CONFIG_CPM2 is not set 189# CONFIG_CPM2 is not set
187# CONFIG_FSL_ULI1575 is not set 190# CONFIG_FSL_ULI1575 is not set
188# CONFIG_MPC8xxx_GPIO is not set 191# CONFIG_MPC8xxx_GPIO is not set
192# CONFIG_SIMPLE_GPIO is not set
189 193
190# 194#
191# Kernel options 195# Kernel options
@@ -224,12 +228,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
224CONFIG_PAGEFLAGS_EXTENDED=y 228CONFIG_PAGEFLAGS_EXTENDED=y
225CONFIG_SPLIT_PTLOCK_CPUS=4 229CONFIG_SPLIT_PTLOCK_CPUS=4
226CONFIG_MIGRATION=y 230CONFIG_MIGRATION=y
227# CONFIG_RESOURCES_64BIT is not set
228# CONFIG_PHYS_ADDR_T_64BIT is not set 231# CONFIG_PHYS_ADDR_T_64BIT is not set
229CONFIG_ZONE_DMA_FLAG=1 232CONFIG_ZONE_DMA_FLAG=1
230CONFIG_BOUNCE=y 233CONFIG_BOUNCE=y
231CONFIG_VIRT_TO_BUS=y 234CONFIG_VIRT_TO_BUS=y
232CONFIG_UNEVICTABLE_LRU=y 235CONFIG_UNEVICTABLE_LRU=y
236CONFIG_PPC_4K_PAGES=y
237# CONFIG_PPC_16K_PAGES is not set
238# CONFIG_PPC_64K_PAGES is not set
233CONFIG_FORCE_MAX_ZONEORDER=11 239CONFIG_FORCE_MAX_ZONEORDER=11
234CONFIG_PROC_DEVICETREE=y 240CONFIG_PROC_DEVICETREE=y
235# CONFIG_CMDLINE_BOOL is not set 241# CONFIG_CMDLINE_BOOL is not set
@@ -270,6 +276,7 @@ CONFIG_NET=y
270# 276#
271# Networking options 277# Networking options
272# 278#
279CONFIG_COMPAT_NET_DEV_OPS=y
273CONFIG_PACKET=y 280CONFIG_PACKET=y
274# CONFIG_PACKET_MMAP is not set 281# CONFIG_PACKET_MMAP is not set
275CONFIG_UNIX=y 282CONFIG_UNIX=y
@@ -326,6 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
326# CONFIG_ECONET is not set 333# CONFIG_ECONET is not set
327# CONFIG_WAN_ROUTER is not set 334# CONFIG_WAN_ROUTER is not set
328# CONFIG_NET_SCHED is not set 335# CONFIG_NET_SCHED is not set
336# CONFIG_DCB is not set
329 337
330# 338#
331# Network testing 339# Network testing
@@ -341,8 +349,9 @@ CONFIG_WIRELESS=y
341# CONFIG_CFG80211 is not set 349# CONFIG_CFG80211 is not set
342CONFIG_WIRELESS_OLD_REGULATORY=y 350CONFIG_WIRELESS_OLD_REGULATORY=y
343# CONFIG_WIRELESS_EXT is not set 351# CONFIG_WIRELESS_EXT is not set
352# CONFIG_LIB80211 is not set
344# CONFIG_MAC80211 is not set 353# CONFIG_MAC80211 is not set
345# CONFIG_IEEE80211 is not set 354# CONFIG_WIMAX is not set
346# CONFIG_RFKILL is not set 355# CONFIG_RFKILL is not set
347# CONFIG_NET_9P is not set 356# CONFIG_NET_9P is not set
348 357
@@ -380,6 +389,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
380CONFIG_MISC_DEVICES=y 389CONFIG_MISC_DEVICES=y
381# CONFIG_EEPROM_93CX6 is not set 390# CONFIG_EEPROM_93CX6 is not set
382# CONFIG_ENCLOSURE_SERVICES is not set 391# CONFIG_ENCLOSURE_SERVICES is not set
392# CONFIG_C2PORT is not set
383CONFIG_HAVE_IDE=y 393CONFIG_HAVE_IDE=y
384# CONFIG_IDE is not set 394# CONFIG_IDE is not set
385 395
@@ -415,6 +425,9 @@ CONFIG_PHYLIB=y
415# CONFIG_BROADCOM_PHY is not set 425# CONFIG_BROADCOM_PHY is not set
416# CONFIG_ICPLUS_PHY is not set 426# CONFIG_ICPLUS_PHY is not set
417# CONFIG_REALTEK_PHY is not set 427# CONFIG_REALTEK_PHY is not set
428# CONFIG_NATIONAL_PHY is not set
429# CONFIG_STE10XP is not set
430# CONFIG_LSI_ET1011C_PHY is not set
418# CONFIG_FIXED_PHY is not set 431# CONFIG_FIXED_PHY is not set
419# CONFIG_MDIO_BITBANG is not set 432# CONFIG_MDIO_BITBANG is not set
420CONFIG_NET_ETHERNET=y 433CONFIG_NET_ETHERNET=y
@@ -437,6 +450,10 @@ CONFIG_NETDEV_10000=y
437# CONFIG_WLAN_PRE80211 is not set 450# CONFIG_WLAN_PRE80211 is not set
438# CONFIG_WLAN_80211 is not set 451# CONFIG_WLAN_80211 is not set
439# CONFIG_IWLWIFI_LEDS is not set 452# CONFIG_IWLWIFI_LEDS is not set
453
454#
455# Enable WiMAX (Networking options) to see the WiMAX drivers
456#
440# CONFIG_WAN is not set 457# CONFIG_WAN is not set
441# CONFIG_PPP is not set 458# CONFIG_PPP is not set
442# CONFIG_SLIP is not set 459# CONFIG_SLIP is not set
@@ -502,8 +519,10 @@ CONFIG_SERIAL_CORE=y
502CONFIG_SERIAL_CORE_CONSOLE=y 519CONFIG_SERIAL_CORE_CONSOLE=y
503# CONFIG_SERIAL_OF_PLATFORM is not set 520# CONFIG_SERIAL_OF_PLATFORM is not set
504CONFIG_UNIX98_PTYS=y 521CONFIG_UNIX98_PTYS=y
522# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
505CONFIG_LEGACY_PTYS=y 523CONFIG_LEGACY_PTYS=y
506CONFIG_LEGACY_PTY_COUNT=256 524CONFIG_LEGACY_PTY_COUNT=256
525# CONFIG_HVC_UDBG is not set
507# CONFIG_IPMI_HANDLER is not set 526# CONFIG_IPMI_HANDLER is not set
508# CONFIG_HW_RANDOM is not set 527# CONFIG_HW_RANDOM is not set
509# CONFIG_NVRAM is not set 528# CONFIG_NVRAM is not set
@@ -534,11 +553,11 @@ CONFIG_HWMON=y
534# CONFIG_THERMAL is not set 553# CONFIG_THERMAL is not set
535# CONFIG_THERMAL_HWMON is not set 554# CONFIG_THERMAL_HWMON is not set
536# CONFIG_WATCHDOG is not set 555# CONFIG_WATCHDOG is not set
556CONFIG_SSB_POSSIBLE=y
537 557
538# 558#
539# Sonics Silicon Backplane 559# Sonics Silicon Backplane
540# 560#
541CONFIG_SSB_POSSIBLE=y
542# CONFIG_SSB is not set 561# CONFIG_SSB is not set
543 562
544# 563#
@@ -548,14 +567,7 @@ CONFIG_SSB_POSSIBLE=y
548# CONFIG_MFD_SM501 is not set 567# CONFIG_MFD_SM501 is not set
549# CONFIG_HTC_PASIC3 is not set 568# CONFIG_HTC_PASIC3 is not set
550# CONFIG_MFD_TMIO is not set 569# CONFIG_MFD_TMIO is not set
551
552#
553# Voltage and Current regulators
554#
555# CONFIG_REGULATOR is not set 570# 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 571
560# 572#
561# Multimedia devices 573# Multimedia devices
@@ -608,9 +620,13 @@ CONFIG_USB_SUPPORT=y
608# 620#
609 621
610# 622#
611# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 623# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
612# 624#
613# CONFIG_USB_GADGET is not set 625# CONFIG_USB_GADGET is not set
626
627#
628# OTG and related infrastructure
629#
614# CONFIG_MMC is not set 630# CONFIG_MMC is not set
615# CONFIG_MEMSTICK is not set 631# CONFIG_MEMSTICK is not set
616# CONFIG_NEW_LEDS is not set 632# CONFIG_NEW_LEDS is not set
@@ -640,6 +656,7 @@ CONFIG_FS_MBCACHE=y
640CONFIG_FILE_LOCKING=y 656CONFIG_FILE_LOCKING=y
641# CONFIG_XFS_FS is not set 657# CONFIG_XFS_FS is not set
642# CONFIG_OCFS2_FS is not set 658# CONFIG_OCFS2_FS is not set
659# CONFIG_BTRFS_FS is not set
643CONFIG_DNOTIFY=y 660CONFIG_DNOTIFY=y
644CONFIG_INOTIFY=y 661CONFIG_INOTIFY=y
645CONFIG_INOTIFY_USER=y 662CONFIG_INOTIFY_USER=y
@@ -673,10 +690,7 @@ CONFIG_TMPFS=y
673# CONFIG_TMPFS_POSIX_ACL is not set 690# CONFIG_TMPFS_POSIX_ACL is not set
674# CONFIG_HUGETLB_PAGE is not set 691# CONFIG_HUGETLB_PAGE is not set
675# CONFIG_CONFIGFS_FS is not set 692# CONFIG_CONFIGFS_FS is not set
676 693CONFIG_MISC_FILESYSTEMS=y
677#
678# Miscellaneous filesystems
679#
680# CONFIG_ADFS_FS is not set 694# CONFIG_ADFS_FS is not set
681# CONFIG_AFFS_FS is not set 695# CONFIG_AFFS_FS is not set
682# CONFIG_HFS_FS is not set 696# CONFIG_HFS_FS is not set
@@ -685,6 +699,7 @@ CONFIG_TMPFS=y
685# CONFIG_BFS_FS is not set 699# CONFIG_BFS_FS is not set
686# CONFIG_EFS_FS is not set 700# CONFIG_EFS_FS is not set
687# CONFIG_CRAMFS is not set 701# CONFIG_CRAMFS is not set
702# CONFIG_SQUASHFS is not set
688# CONFIG_VXFS_FS is not set 703# CONFIG_VXFS_FS is not set
689# CONFIG_MINIX_FS is not set 704# CONFIG_MINIX_FS is not set
690# CONFIG_OMFS_FS is not set 705# CONFIG_OMFS_FS is not set
@@ -735,6 +750,7 @@ CONFIG_PARTITION_ADVANCED=y
735# Library routines 750# Library routines
736# 751#
737CONFIG_BITREVERSE=y 752CONFIG_BITREVERSE=y
753CONFIG_GENERIC_FIND_LAST_BIT=y
738# CONFIG_CRC_CCITT is not set 754# CONFIG_CRC_CCITT is not set
739# CONFIG_CRC16 is not set 755# CONFIG_CRC16 is not set
740# CONFIG_CRC_T10DIF is not set 756# CONFIG_CRC_T10DIF is not set
@@ -784,6 +800,7 @@ CONFIG_DEBUG_MUTEXES=y
784# CONFIG_DEBUG_MEMORY_INIT is not set 800# CONFIG_DEBUG_MEMORY_INIT is not set
785# CONFIG_DEBUG_LIST is not set 801# CONFIG_DEBUG_LIST is not set
786# CONFIG_DEBUG_SG is not set 802# CONFIG_DEBUG_SG is not set
803# CONFIG_DEBUG_NOTIFIERS is not set
787# CONFIG_BOOT_PRINTK_DELAY is not set 804# CONFIG_BOOT_PRINTK_DELAY is not set
788# CONFIG_RCU_TORTURE_TEST is not set 805# CONFIG_RCU_TORTURE_TEST is not set
789# CONFIG_RCU_CPU_STALL_DETECTOR is not set 806# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -793,6 +810,8 @@ CONFIG_DEBUG_MUTEXES=y
793# CONFIG_LATENCYTOP is not set 810# CONFIG_LATENCYTOP is not set
794CONFIG_SYSCTL_SYSCALL_CHECK=y 811CONFIG_SYSCTL_SYSCALL_CHECK=y
795CONFIG_HAVE_FUNCTION_TRACER=y 812CONFIG_HAVE_FUNCTION_TRACER=y
813CONFIG_HAVE_DYNAMIC_FTRACE=y
814CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
796 815
797# 816#
798# Tracers 817# Tracers
@@ -801,11 +820,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
801# CONFIG_SCHED_TRACER is not set 820# CONFIG_SCHED_TRACER is not set
802# CONFIG_CONTEXT_SWITCH_TRACER is not set 821# CONFIG_CONTEXT_SWITCH_TRACER is not set
803# CONFIG_BOOT_TRACER is not set 822# CONFIG_BOOT_TRACER is not set
823# CONFIG_TRACE_BRANCH_PROFILING is not set
804# CONFIG_STACK_TRACER is not set 824# CONFIG_STACK_TRACER is not set
805# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 825# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
806# CONFIG_SAMPLES is not set 826# CONFIG_SAMPLES is not set
807CONFIG_HAVE_ARCH_KGDB=y 827CONFIG_HAVE_ARCH_KGDB=y
808# CONFIG_KGDB is not set 828# CONFIG_KGDB is not set
829CONFIG_PRINT_STACK_DEPTH=64
809# CONFIG_DEBUG_STACKOVERFLOW is not set 830# CONFIG_DEBUG_STACKOVERFLOW is not set
810# CONFIG_DEBUG_STACK_USAGE is not set 831# CONFIG_DEBUG_STACK_USAGE is not set
811# CONFIG_DEBUG_PAGEALLOC is not set 832# CONFIG_DEBUG_PAGEALLOC is not set
@@ -831,6 +852,7 @@ CONFIG_CRYPTO=y
831# 852#
832# CONFIG_CRYPTO_FIPS is not set 853# CONFIG_CRYPTO_FIPS is not set
833# CONFIG_CRYPTO_MANAGER is not set 854# CONFIG_CRYPTO_MANAGER is not set
855# CONFIG_CRYPTO_MANAGER2 is not set
834# CONFIG_CRYPTO_GF128MUL is not set 856# CONFIG_CRYPTO_GF128MUL is not set
835# CONFIG_CRYPTO_NULL is not set 857# CONFIG_CRYPTO_NULL is not set
836# CONFIG_CRYPTO_CRYPTD is not set 858# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
index 5ac7e51e9f14..f6fa0b761cb3 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:08 2008 4# Mon Jan 26 15:36:07 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,7 +21,9 @@ CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y 21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
24# CONFIG_PPC_MM_SLICES is not set 25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
25CONFIG_PPC32=y 27CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 28CONFIG_WORD_SIZE=32
27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -45,7 +47,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
45CONFIG_PPC=y 47CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 48CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 49CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 50CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 51CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 52CONFIG_PPC_OF=y
51CONFIG_OF=y 53CONFIG_OF=y
@@ -78,12 +80,12 @@ CONFIG_AUDIT=y
78CONFIG_IKCONFIG=y 80CONFIG_IKCONFIG=y
79CONFIG_IKCONFIG_PROC=y 81CONFIG_IKCONFIG_PROC=y
80CONFIG_LOG_BUF_SHIFT=14 82CONFIG_LOG_BUF_SHIFT=14
81# CONFIG_CGROUPS is not set
82CONFIG_GROUP_SCHED=y 83CONFIG_GROUP_SCHED=y
83# CONFIG_FAIR_GROUP_SCHED is not set 84# CONFIG_FAIR_GROUP_SCHED is not set
84# CONFIG_RT_GROUP_SCHED is not set 85# CONFIG_RT_GROUP_SCHED is not set
85CONFIG_USER_SCHED=y 86CONFIG_USER_SCHED=y
86# CONFIG_CGROUP_SCHED is not set 87# CONFIG_CGROUP_SCHED is not set
88# CONFIG_CGROUPS is not set
87CONFIG_SYSFS_DEPRECATED=y 89CONFIG_SYSFS_DEPRECATED=y
88CONFIG_SYSFS_DEPRECATED_V2=y 90CONFIG_SYSFS_DEPRECATED_V2=y
89# CONFIG_RELAY is not set 91# CONFIG_RELAY is not set
@@ -96,6 +98,7 @@ CONFIG_EMBEDDED=y
96CONFIG_SYSCTL_SYSCALL=y 98CONFIG_SYSCTL_SYSCALL=y
97CONFIG_KALLSYMS=y 99CONFIG_KALLSYMS=y
98CONFIG_KALLSYMS_ALL=y 100CONFIG_KALLSYMS_ALL=y
101CONFIG_KALLSYMS_STRIP_GENERATED=y
99CONFIG_KALLSYMS_EXTRA_PASS=y 102CONFIG_KALLSYMS_EXTRA_PASS=y
100CONFIG_HOTPLUG=y 103CONFIG_HOTPLUG=y
101CONFIG_PRINTK=y 104CONFIG_PRINTK=y
@@ -118,7 +121,6 @@ CONFIG_SLUB_DEBUG=y
118CONFIG_SLUB=y 121CONFIG_SLUB=y
119# CONFIG_SLOB is not set 122# CONFIG_SLOB is not set
120# CONFIG_PROFILING is not set 123# CONFIG_PROFILING is not set
121# CONFIG_MARKERS is not set
122CONFIG_HAVE_OPROFILE=y 124CONFIG_HAVE_OPROFILE=y
123# CONFIG_KPROBES is not set 125# CONFIG_KPROBES is not set
124CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 126CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -129,7 +131,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 131# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 132CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 133CONFIG_RT_MUTEXES=y
132# CONFIG_TINY_SHMEM is not set
133CONFIG_BASE_SMALL=0 134CONFIG_BASE_SMALL=0
134CONFIG_MODULES=y 135CONFIG_MODULES=y
135# CONFIG_MODULE_FORCE_LOAD is not set 136# CONFIG_MODULE_FORCE_LOAD is not set
@@ -137,11 +138,9 @@ CONFIG_MODULE_UNLOAD=y
137CONFIG_MODULE_FORCE_UNLOAD=y 138CONFIG_MODULE_FORCE_UNLOAD=y
138CONFIG_MODVERSIONS=y 139CONFIG_MODVERSIONS=y
139# CONFIG_MODULE_SRCVERSION_ALL is not set 140# CONFIG_MODULE_SRCVERSION_ALL is not set
140CONFIG_KMOD=y
141CONFIG_BLOCK=y 141CONFIG_BLOCK=y
142CONFIG_LBD=y 142CONFIG_LBD=y
143# CONFIG_BLK_DEV_IO_TRACE is not set 143# CONFIG_BLK_DEV_IO_TRACE is not set
144# CONFIG_LSF is not set
145# CONFIG_BLK_DEV_BSG is not set 144# CONFIG_BLK_DEV_BSG is not set
146# CONFIG_BLK_DEV_INTEGRITY is not set 145# CONFIG_BLK_DEV_INTEGRITY is not set
147 146
@@ -158,6 +157,10 @@ CONFIG_DEFAULT_CFQ=y
158# CONFIG_DEFAULT_NOOP is not set 157# CONFIG_DEFAULT_NOOP is not set
159CONFIG_DEFAULT_IOSCHED="cfq" 158CONFIG_DEFAULT_IOSCHED="cfq"
160CONFIG_CLASSIC_RCU=y 159CONFIG_CLASSIC_RCU=y
160# CONFIG_TREE_RCU is not set
161# CONFIG_PREEMPT_RCU is not set
162# CONFIG_TREE_RCU_TRACE is not set
163# CONFIG_PREEMPT_RCU_TRACE is not set
161# CONFIG_FREEZER is not set 164# CONFIG_FREEZER is not set
162 165
163# 166#
@@ -197,6 +200,7 @@ CONFIG_PPC_I8259=y
197# CONFIG_CPM2 is not set 200# CONFIG_CPM2 is not set
198CONFIG_FSL_ULI1575=y 201CONFIG_FSL_ULI1575=y
199# CONFIG_MPC8xxx_GPIO is not set 202# CONFIG_MPC8xxx_GPIO is not set
203# CONFIG_SIMPLE_GPIO is not set
200 204
201# 205#
202# Kernel options 206# Kernel options
@@ -235,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
235CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
236CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
237CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
238# CONFIG_RESOURCES_64BIT is not set
239# CONFIG_PHYS_ADDR_T_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
243CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
244CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
245CONFIG_PROC_DEVICETREE=y 251CONFIG_PROC_DEVICETREE=y
246# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -266,6 +272,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
266# CONFIG_PCI_MSI is not set 272# CONFIG_PCI_MSI is not set
267# CONFIG_PCI_LEGACY is not set 273# CONFIG_PCI_LEGACY is not set
268# CONFIG_PCI_DEBUG is not set 274# CONFIG_PCI_DEBUG is not set
275# CONFIG_PCI_STUB is not set
269# CONFIG_PCCARD is not set 276# CONFIG_PCCARD is not set
270# CONFIG_HOTPLUG_PCI is not set 277# CONFIG_HOTPLUG_PCI is not set
271# CONFIG_HAS_RAPIDIO is not set 278# CONFIG_HAS_RAPIDIO is not set
@@ -289,6 +296,7 @@ CONFIG_NET=y
289# 296#
290# Networking options 297# Networking options
291# 298#
299CONFIG_COMPAT_NET_DEV_OPS=y
292CONFIG_PACKET=y 300CONFIG_PACKET=y
293# CONFIG_PACKET_MMAP is not set 301# CONFIG_PACKET_MMAP is not set
294CONFIG_UNIX=y 302CONFIG_UNIX=y
@@ -377,6 +385,7 @@ CONFIG_SCTP_HMAC_MD5=y
377# CONFIG_ECONET is not set 385# CONFIG_ECONET is not set
378# CONFIG_WAN_ROUTER is not set 386# CONFIG_WAN_ROUTER is not set
379# CONFIG_NET_SCHED is not set 387# CONFIG_NET_SCHED is not set
388# CONFIG_DCB is not set
380 389
381# 390#
382# Network testing 391# Network testing
@@ -393,8 +402,9 @@ CONFIG_WIRELESS=y
393# CONFIG_CFG80211 is not set 402# CONFIG_CFG80211 is not set
394CONFIG_WIRELESS_OLD_REGULATORY=y 403CONFIG_WIRELESS_OLD_REGULATORY=y
395# CONFIG_WIRELESS_EXT is not set 404# CONFIG_WIRELESS_EXT is not set
405# CONFIG_LIB80211 is not set
396# CONFIG_MAC80211 is not set 406# CONFIG_MAC80211 is not set
397# CONFIG_IEEE80211 is not set 407# CONFIG_WIMAX is not set
398# CONFIG_RFKILL is not set 408# CONFIG_RFKILL is not set
399# CONFIG_NET_9P is not set 409# CONFIG_NET_9P is not set
400 410
@@ -443,8 +453,10 @@ CONFIG_MISC_DEVICES=y
443# CONFIG_EEPROM_93CX6 is not set 453# CONFIG_EEPROM_93CX6 is not set
444# CONFIG_SGI_IOC4 is not set 454# CONFIG_SGI_IOC4 is not set
445# CONFIG_TIFM_CORE is not set 455# CONFIG_TIFM_CORE is not set
456# CONFIG_ICS932S401 is not set
446# CONFIG_ENCLOSURE_SERVICES is not set 457# CONFIG_ENCLOSURE_SERVICES is not set
447# CONFIG_HP_ILO is not set 458# CONFIG_HP_ILO is not set
459# CONFIG_C2PORT is not set
448CONFIG_HAVE_IDE=y 460CONFIG_HAVE_IDE=y
449# CONFIG_IDE is not set 461# CONFIG_IDE is not set
450 462
@@ -488,6 +500,7 @@ CONFIG_SCSI_WAIT_SCAN=m
488# CONFIG_SCSI_SRP_ATTRS is not set 500# CONFIG_SCSI_SRP_ATTRS is not set
489CONFIG_SCSI_LOWLEVEL=y 501CONFIG_SCSI_LOWLEVEL=y
490# CONFIG_ISCSI_TCP is not set 502# CONFIG_ISCSI_TCP is not set
503# CONFIG_SCSI_CXGB3_ISCSI is not set
491# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 504# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
492# CONFIG_SCSI_3W_9XXX is not set 505# CONFIG_SCSI_3W_9XXX is not set
493# CONFIG_SCSI_ACARD is not set 506# CONFIG_SCSI_ACARD is not set
@@ -504,6 +517,8 @@ CONFIG_SCSI_LOWLEVEL=y
504# CONFIG_MEGARAID_SAS is not set 517# CONFIG_MEGARAID_SAS is not set
505# CONFIG_SCSI_HPTIOP is not set 518# CONFIG_SCSI_HPTIOP is not set
506# CONFIG_SCSI_BUSLOGIC is not set 519# CONFIG_SCSI_BUSLOGIC is not set
520# CONFIG_LIBFC is not set
521# CONFIG_FCOE is not set
507# CONFIG_SCSI_DMX3191D is not set 522# CONFIG_SCSI_DMX3191D is not set
508# CONFIG_SCSI_EATA is not set 523# CONFIG_SCSI_EATA is not set
509# CONFIG_SCSI_FUTURE_DOMAIN is not set 524# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -623,6 +638,9 @@ CONFIG_VITESSE_PHY=y
623# CONFIG_BROADCOM_PHY is not set 638# CONFIG_BROADCOM_PHY is not set
624# CONFIG_ICPLUS_PHY is not set 639# CONFIG_ICPLUS_PHY is not set
625# CONFIG_REALTEK_PHY is not set 640# CONFIG_REALTEK_PHY is not set
641# CONFIG_NATIONAL_PHY is not set
642# CONFIG_STE10XP is not set
643# CONFIG_LSI_ET1011C_PHY is not set
626# CONFIG_FIXED_PHY is not set 644# CONFIG_FIXED_PHY is not set
627# CONFIG_MDIO_BITBANG is not set 645# CONFIG_MDIO_BITBANG is not set
628CONFIG_NET_ETHERNET=y 646CONFIG_NET_ETHERNET=y
@@ -667,6 +685,7 @@ CONFIG_GIANFAR=y
667# CONFIG_JME is not set 685# CONFIG_JME is not set
668CONFIG_NETDEV_10000=y 686CONFIG_NETDEV_10000=y
669# CONFIG_CHELSIO_T1 is not set 687# CONFIG_CHELSIO_T1 is not set
688CONFIG_CHELSIO_T3_DEPENDS=y
670# CONFIG_CHELSIO_T3 is not set 689# CONFIG_CHELSIO_T3 is not set
671# CONFIG_ENIC is not set 690# CONFIG_ENIC is not set
672# CONFIG_IXGBE is not set 691# CONFIG_IXGBE is not set
@@ -691,6 +710,10 @@ CONFIG_NETDEV_10000=y
691# CONFIG_IWLWIFI_LEDS is not set 710# CONFIG_IWLWIFI_LEDS is not set
692 711
693# 712#
713# Enable WiMAX (Networking options) to see the WiMAX drivers
714#
715
716#
694# USB Network Adapters 717# USB Network Adapters
695# 718#
696# CONFIG_USB_CATC is not set 719# CONFIG_USB_CATC is not set
@@ -782,8 +805,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
782# CONFIG_SERIAL_JSM is not set 805# CONFIG_SERIAL_JSM is not set
783# CONFIG_SERIAL_OF_PLATFORM is not set 806# CONFIG_SERIAL_OF_PLATFORM is not set
784CONFIG_UNIX98_PTYS=y 807CONFIG_UNIX98_PTYS=y
808# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
785CONFIG_LEGACY_PTYS=y 809CONFIG_LEGACY_PTYS=y
786CONFIG_LEGACY_PTY_COUNT=256 810CONFIG_LEGACY_PTY_COUNT=256
811# CONFIG_HVC_UDBG is not set
787# CONFIG_IPMI_HANDLER is not set 812# CONFIG_IPMI_HANDLER is not set
788CONFIG_HW_RANDOM=y 813CONFIG_HW_RANDOM=y
789CONFIG_NVRAM=y 814CONFIG_NVRAM=y
@@ -869,11 +894,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
869# CONFIG_THERMAL is not set 894# CONFIG_THERMAL is not set
870# CONFIG_THERMAL_HWMON is not set 895# CONFIG_THERMAL_HWMON is not set
871# CONFIG_WATCHDOG is not set 896# CONFIG_WATCHDOG is not set
897CONFIG_SSB_POSSIBLE=y
872 898
873# 899#
874# Sonics Silicon Backplane 900# Sonics Silicon Backplane
875# 901#
876CONFIG_SSB_POSSIBLE=y
877# CONFIG_SSB is not set 902# CONFIG_SSB is not set
878 903
879# 904#
@@ -882,18 +907,13 @@ CONFIG_SSB_POSSIBLE=y
882# CONFIG_MFD_CORE is not set 907# CONFIG_MFD_CORE is not set
883# CONFIG_MFD_SM501 is not set 908# CONFIG_MFD_SM501 is not set
884# CONFIG_HTC_PASIC3 is not set 909# CONFIG_HTC_PASIC3 is not set
910# CONFIG_TWL4030_CORE is not set
885# CONFIG_MFD_TMIO is not set 911# CONFIG_MFD_TMIO is not set
886# CONFIG_PMIC_DA903X is not set 912# CONFIG_PMIC_DA903X is not set
887# CONFIG_MFD_WM8400 is not set 913# CONFIG_MFD_WM8400 is not set
888# CONFIG_MFD_WM8350_I2C is not set 914# CONFIG_MFD_WM8350_I2C is not set
889 915# CONFIG_MFD_PCF50633 is not set
890#
891# Voltage and Current regulators
892#
893# CONFIG_REGULATOR is not set 916# 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
897 917
898# 918#
899# Multimedia devices 919# Multimedia devices
@@ -920,6 +940,7 @@ CONFIG_MEDIA_TUNER_TEA5767=m
920CONFIG_MEDIA_TUNER_MT20XX=m 940CONFIG_MEDIA_TUNER_MT20XX=m
921CONFIG_MEDIA_TUNER_XC2028=m 941CONFIG_MEDIA_TUNER_XC2028=m
922CONFIG_MEDIA_TUNER_XC5000=m 942CONFIG_MEDIA_TUNER_XC5000=m
943# CONFIG_DVB_DYNAMIC_MINORS is not set
923CONFIG_DVB_CAPTURE_DRIVERS=y 944CONFIG_DVB_CAPTURE_DRIVERS=y
924 945
925# 946#
@@ -965,6 +986,12 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
965# CONFIG_DVB_FE_CUSTOMISE is not set 986# CONFIG_DVB_FE_CUSTOMISE is not set
966 987
967# 988#
989# Multistandard (satellite) frontends
990#
991# CONFIG_DVB_STB0899 is not set
992# CONFIG_DVB_STB6100 is not set
993
994#
968# DVB-S (satellite) frontends 995# DVB-S (satellite) frontends
969# 996#
970# CONFIG_DVB_CX24110 is not set 997# CONFIG_DVB_CX24110 is not set
@@ -976,8 +1003,10 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
976# CONFIG_DVB_STV0299 is not set 1003# CONFIG_DVB_STV0299 is not set
977# CONFIG_DVB_TDA8083 is not set 1004# CONFIG_DVB_TDA8083 is not set
978# CONFIG_DVB_TDA10086 is not set 1005# CONFIG_DVB_TDA10086 is not set
1006# CONFIG_DVB_TDA8261 is not set
979# CONFIG_DVB_VES1X93 is not set 1007# CONFIG_DVB_VES1X93 is not set
980# CONFIG_DVB_TUNER_ITD1000 is not set 1008# CONFIG_DVB_TUNER_ITD1000 is not set
1009# CONFIG_DVB_TUNER_CX24113 is not set
981# CONFIG_DVB_TDA826X is not set 1010# CONFIG_DVB_TDA826X is not set
982# CONFIG_DVB_TUA6100 is not set 1011# CONFIG_DVB_TUA6100 is not set
983# CONFIG_DVB_CX24116 is not set 1012# CONFIG_DVB_CX24116 is not set
@@ -1018,11 +1047,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
1018# CONFIG_DVB_OR51132 is not set 1047# CONFIG_DVB_OR51132 is not set
1019# CONFIG_DVB_BCM3510 is not set 1048# CONFIG_DVB_BCM3510 is not set
1020# CONFIG_DVB_LGDT330X is not set 1049# CONFIG_DVB_LGDT330X is not set
1050# CONFIG_DVB_LGDT3304 is not set
1021# CONFIG_DVB_S5H1409 is not set 1051# CONFIG_DVB_S5H1409 is not set
1022# CONFIG_DVB_AU8522 is not set 1052# CONFIG_DVB_AU8522 is not set
1023# CONFIG_DVB_S5H1411 is not set 1053# CONFIG_DVB_S5H1411 is not set
1024 1054
1025# 1055#
1056# ISDB-T (terrestrial) frontends
1057#
1058# CONFIG_DVB_S921 is not set
1059
1060#
1026# Digital terrestrial only tuners/PLL 1061# Digital terrestrial only tuners/PLL
1027# 1062#
1028# CONFIG_DVB_PLL is not set 1063# CONFIG_DVB_PLL is not set
@@ -1075,6 +1110,7 @@ CONFIG_SND_OSSEMUL=y
1075CONFIG_SND_MIXER_OSS=y 1110CONFIG_SND_MIXER_OSS=y
1076CONFIG_SND_PCM_OSS=y 1111CONFIG_SND_PCM_OSS=y
1077CONFIG_SND_PCM_OSS_PLUGINS=y 1112CONFIG_SND_PCM_OSS_PLUGINS=y
1113# CONFIG_SND_HRTIMER is not set
1078# CONFIG_SND_DYNAMIC_MINORS is not set 1114# CONFIG_SND_DYNAMIC_MINORS is not set
1079# CONFIG_SND_SUPPORT_OLD_API is not set 1115# CONFIG_SND_SUPPORT_OLD_API is not set
1080CONFIG_SND_VERBOSE_PROCFS=y 1116CONFIG_SND_VERBOSE_PROCFS=y
@@ -1177,11 +1213,9 @@ CONFIG_HID_COMPAT=y
1177CONFIG_HID_A4TECH=y 1213CONFIG_HID_A4TECH=y
1178CONFIG_HID_APPLE=y 1214CONFIG_HID_APPLE=y
1179CONFIG_HID_BELKIN=y 1215CONFIG_HID_BELKIN=y
1180CONFIG_HID_BRIGHT=y
1181CONFIG_HID_CHERRY=y 1216CONFIG_HID_CHERRY=y
1182CONFIG_HID_CHICONY=y 1217CONFIG_HID_CHICONY=y
1183CONFIG_HID_CYPRESS=y 1218CONFIG_HID_CYPRESS=y
1184CONFIG_HID_DELL=y
1185CONFIG_HID_EZKEY=y 1219CONFIG_HID_EZKEY=y
1186CONFIG_HID_GYRATION=y 1220CONFIG_HID_GYRATION=y
1187CONFIG_HID_LOGITECH=y 1221CONFIG_HID_LOGITECH=y
@@ -1189,12 +1223,15 @@ CONFIG_HID_LOGITECH=y
1189# CONFIG_LOGIRUMBLEPAD2_FF is not set 1223# CONFIG_LOGIRUMBLEPAD2_FF is not set
1190CONFIG_HID_MICROSOFT=y 1224CONFIG_HID_MICROSOFT=y
1191CONFIG_HID_MONTEREY=y 1225CONFIG_HID_MONTEREY=y
1226# CONFIG_HID_NTRIG is not set
1192CONFIG_HID_PANTHERLORD=y 1227CONFIG_HID_PANTHERLORD=y
1193# CONFIG_PANTHERLORD_FF is not set 1228# CONFIG_PANTHERLORD_FF is not set
1194CONFIG_HID_PETALYNX=y 1229CONFIG_HID_PETALYNX=y
1195CONFIG_HID_SAMSUNG=y 1230CONFIG_HID_SAMSUNG=y
1196CONFIG_HID_SONY=y 1231CONFIG_HID_SONY=y
1197CONFIG_HID_SUNPLUS=y 1232CONFIG_HID_SUNPLUS=y
1233# CONFIG_GREENASIA_FF is not set
1234# CONFIG_HID_TOPSEED is not set
1198CONFIG_THRUSTMASTER_FF=m 1235CONFIG_THRUSTMASTER_FF=m
1199CONFIG_ZEROPLUS_FF=m 1236CONFIG_ZEROPLUS_FF=m
1200CONFIG_USB_SUPPORT=y 1237CONFIG_USB_SUPPORT=y
@@ -1227,6 +1264,7 @@ CONFIG_USB_EHCI_HCD=y
1227# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1264# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1228# CONFIG_USB_EHCI_FSL is not set 1265# CONFIG_USB_EHCI_FSL is not set
1229CONFIG_USB_EHCI_HCD_PPC_OF=y 1266CONFIG_USB_EHCI_HCD_PPC_OF=y
1267# CONFIG_USB_OXU210HP_HCD is not set
1230# CONFIG_USB_ISP116X_HCD is not set 1268# CONFIG_USB_ISP116X_HCD is not set
1231# CONFIG_USB_ISP1760_HCD is not set 1269# CONFIG_USB_ISP1760_HCD is not set
1232CONFIG_USB_OHCI_HCD=y 1270CONFIG_USB_OHCI_HCD=y
@@ -1252,18 +1290,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1252# CONFIG_USB_TMC is not set 1290# CONFIG_USB_TMC is not set
1253 1291
1254# 1292#
1255# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1293# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1256# 1294#
1257 1295
1258# 1296#
1259# may also be needed; see USB_STORAGE Help for more information 1297# see USB_STORAGE Help for more information
1260# 1298#
1261CONFIG_USB_STORAGE=y 1299CONFIG_USB_STORAGE=y
1262# CONFIG_USB_STORAGE_DEBUG is not set 1300# CONFIG_USB_STORAGE_DEBUG is not set
1263# CONFIG_USB_STORAGE_DATAFAB is not set 1301# CONFIG_USB_STORAGE_DATAFAB is not set
1264# CONFIG_USB_STORAGE_FREECOM is not set 1302# CONFIG_USB_STORAGE_FREECOM is not set
1265# CONFIG_USB_STORAGE_ISD200 is not set 1303# CONFIG_USB_STORAGE_ISD200 is not set
1266# CONFIG_USB_STORAGE_DPCM is not set
1267# CONFIG_USB_STORAGE_USBAT is not set 1304# CONFIG_USB_STORAGE_USBAT is not set
1268# CONFIG_USB_STORAGE_SDDR09 is not set 1305# CONFIG_USB_STORAGE_SDDR09 is not set
1269# CONFIG_USB_STORAGE_SDDR55 is not set 1306# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1311,6 +1348,10 @@ CONFIG_USB_STORAGE=y
1311# CONFIG_USB_ISIGHTFW is not set 1348# CONFIG_USB_ISIGHTFW is not set
1312# CONFIG_USB_VST is not set 1349# CONFIG_USB_VST is not set
1313# CONFIG_USB_GADGET is not set 1350# CONFIG_USB_GADGET is not set
1351
1352#
1353# OTG and related infrastructure
1354#
1314# CONFIG_UWB is not set 1355# CONFIG_UWB is not set
1315# CONFIG_MMC is not set 1356# CONFIG_MMC is not set
1316# CONFIG_MEMSTICK is not set 1357# CONFIG_MEMSTICK is not set
@@ -1348,6 +1389,7 @@ CONFIG_RTC_INTF_DEV=y
1348# CONFIG_RTC_DRV_M41T80 is not set 1389# CONFIG_RTC_DRV_M41T80 is not set
1349# CONFIG_RTC_DRV_S35390A is not set 1390# CONFIG_RTC_DRV_S35390A is not set
1350# CONFIG_RTC_DRV_FM3130 is not set 1391# CONFIG_RTC_DRV_FM3130 is not set
1392# CONFIG_RTC_DRV_RX8581 is not set
1351 1393
1352# 1394#
1353# SPI RTC drivers 1395# SPI RTC drivers
@@ -1406,7 +1448,9 @@ CONFIG_FS_MBCACHE=y
1406# CONFIG_FS_POSIX_ACL is not set 1448# CONFIG_FS_POSIX_ACL is not set
1407CONFIG_FILE_LOCKING=y 1449CONFIG_FILE_LOCKING=y
1408# CONFIG_XFS_FS is not set 1450# CONFIG_XFS_FS is not set
1451# CONFIG_GFS2_FS is not set
1409# CONFIG_OCFS2_FS is not set 1452# CONFIG_OCFS2_FS is not set
1453# CONFIG_BTRFS_FS is not set
1410CONFIG_DNOTIFY=y 1454CONFIG_DNOTIFY=y
1411CONFIG_INOTIFY=y 1455CONFIG_INOTIFY=y
1412CONFIG_INOTIFY_USER=y 1456CONFIG_INOTIFY_USER=y
@@ -1448,10 +1492,7 @@ CONFIG_TMPFS=y
1448# CONFIG_TMPFS_POSIX_ACL is not set 1492# CONFIG_TMPFS_POSIX_ACL is not set
1449# CONFIG_HUGETLB_PAGE is not set 1493# CONFIG_HUGETLB_PAGE is not set
1450# CONFIG_CONFIGFS_FS is not set 1494# CONFIG_CONFIGFS_FS is not set
1451 1495CONFIG_MISC_FILESYSTEMS=y
1452#
1453# Miscellaneous filesystems
1454#
1455CONFIG_ADFS_FS=m 1496CONFIG_ADFS_FS=m
1456# CONFIG_ADFS_FS_RW is not set 1497# CONFIG_ADFS_FS_RW is not set
1457CONFIG_AFFS_FS=m 1498CONFIG_AFFS_FS=m
@@ -1462,6 +1503,7 @@ CONFIG_BEFS_FS=m
1462CONFIG_BFS_FS=m 1503CONFIG_BFS_FS=m
1463CONFIG_EFS_FS=m 1504CONFIG_EFS_FS=m
1464CONFIG_CRAMFS=y 1505CONFIG_CRAMFS=y
1506# CONFIG_SQUASHFS is not set
1465CONFIG_VXFS_FS=m 1507CONFIG_VXFS_FS=m
1466# CONFIG_MINIX_FS is not set 1508# CONFIG_MINIX_FS is not set
1467# CONFIG_OMFS_FS is not set 1509# CONFIG_OMFS_FS is not set
@@ -1563,6 +1605,7 @@ CONFIG_NLS_UTF8=m
1563# Library routines 1605# Library routines
1564# 1606#
1565CONFIG_BITREVERSE=y 1607CONFIG_BITREVERSE=y
1608CONFIG_GENERIC_FIND_LAST_BIT=y
1566# CONFIG_CRC_CCITT is not set 1609# CONFIG_CRC_CCITT is not set
1567# CONFIG_CRC16 is not set 1610# CONFIG_CRC16 is not set
1568CONFIG_CRC_T10DIF=y 1611CONFIG_CRC_T10DIF=y
@@ -1614,6 +1657,7 @@ CONFIG_DEBUG_INFO=y
1614# CONFIG_DEBUG_MEMORY_INIT is not set 1657# CONFIG_DEBUG_MEMORY_INIT is not set
1615# CONFIG_DEBUG_LIST is not set 1658# CONFIG_DEBUG_LIST is not set
1616# CONFIG_DEBUG_SG is not set 1659# CONFIG_DEBUG_SG is not set
1660# CONFIG_DEBUG_NOTIFIERS is not set
1617# CONFIG_BOOT_PRINTK_DELAY is not set 1661# CONFIG_BOOT_PRINTK_DELAY is not set
1618# CONFIG_RCU_TORTURE_TEST is not set 1662# CONFIG_RCU_TORTURE_TEST is not set
1619# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1663# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1623,6 +1667,8 @@ CONFIG_DEBUG_INFO=y
1623# CONFIG_LATENCYTOP is not set 1667# CONFIG_LATENCYTOP is not set
1624CONFIG_SYSCTL_SYSCALL_CHECK=y 1668CONFIG_SYSCTL_SYSCALL_CHECK=y
1625CONFIG_HAVE_FUNCTION_TRACER=y 1669CONFIG_HAVE_FUNCTION_TRACER=y
1670CONFIG_HAVE_DYNAMIC_FTRACE=y
1671CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1626 1672
1627# 1673#
1628# Tracers 1674# Tracers
@@ -1631,11 +1677,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1631# CONFIG_SCHED_TRACER is not set 1677# CONFIG_SCHED_TRACER is not set
1632# CONFIG_CONTEXT_SWITCH_TRACER is not set 1678# CONFIG_CONTEXT_SWITCH_TRACER is not set
1633# CONFIG_BOOT_TRACER is not set 1679# CONFIG_BOOT_TRACER is not set
1680# CONFIG_TRACE_BRANCH_PROFILING is not set
1634# CONFIG_STACK_TRACER is not set 1681# CONFIG_STACK_TRACER is not set
1635# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1682# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1636# CONFIG_SAMPLES is not set 1683# CONFIG_SAMPLES is not set
1637CONFIG_HAVE_ARCH_KGDB=y 1684CONFIG_HAVE_ARCH_KGDB=y
1638# CONFIG_KGDB is not set 1685# CONFIG_KGDB is not set
1686CONFIG_PRINT_STACK_DEPTH=64
1639# CONFIG_DEBUG_STACKOVERFLOW is not set 1687# CONFIG_DEBUG_STACKOVERFLOW is not set
1640# CONFIG_DEBUG_STACK_USAGE is not set 1688# CONFIG_DEBUG_STACK_USAGE is not set
1641# CONFIG_DEBUG_PAGEALLOC is not set 1689# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1661,11 +1709,16 @@ CONFIG_CRYPTO=y
1661# 1709#
1662# CONFIG_CRYPTO_FIPS is not set 1710# CONFIG_CRYPTO_FIPS is not set
1663CONFIG_CRYPTO_ALGAPI=y 1711CONFIG_CRYPTO_ALGAPI=y
1712CONFIG_CRYPTO_ALGAPI2=y
1664CONFIG_CRYPTO_AEAD=y 1713CONFIG_CRYPTO_AEAD=y
1714CONFIG_CRYPTO_AEAD2=y
1665CONFIG_CRYPTO_BLKCIPHER=y 1715CONFIG_CRYPTO_BLKCIPHER=y
1716CONFIG_CRYPTO_BLKCIPHER2=y
1666CONFIG_CRYPTO_HASH=y 1717CONFIG_CRYPTO_HASH=y
1667CONFIG_CRYPTO_RNG=y 1718CONFIG_CRYPTO_HASH2=y
1719CONFIG_CRYPTO_RNG2=y
1668CONFIG_CRYPTO_MANAGER=y 1720CONFIG_CRYPTO_MANAGER=y
1721CONFIG_CRYPTO_MANAGER2=y
1669# CONFIG_CRYPTO_GF128MUL is not set 1722# CONFIG_CRYPTO_GF128MUL is not set
1670# CONFIG_CRYPTO_NULL is not set 1723# CONFIG_CRYPTO_NULL is not set
1671# CONFIG_CRYPTO_CRYPTD is not set 1724# CONFIG_CRYPTO_CRYPTD is not set
@@ -1699,7 +1752,7 @@ CONFIG_CRYPTO_HMAC=y
1699# 1752#
1700# Digest 1753# Digest
1701# 1754#
1702# CONFIG_CRYPTO_CRC32C is not set 1755CONFIG_CRYPTO_CRC32C=m
1703# CONFIG_CRYPTO_MD4 is not set 1756# CONFIG_CRYPTO_MD4 is not set
1704CONFIG_CRYPTO_MD5=y 1757CONFIG_CRYPTO_MD5=y
1705# CONFIG_CRYPTO_MICHAEL_MIC is not set 1758# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
index 6cf929259ba7..095e2ded6e8b 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:09 2008 4# Mon Jan 26 15:36:09 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,7 +21,9 @@ CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y 21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
24# CONFIG_PPC_MM_SLICES is not set 25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
25CONFIG_PPC32=y 27CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 28CONFIG_WORD_SIZE=32
27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -46,7 +48,7 @@ CONFIG_GENERIC_GPIO=y
46CONFIG_PPC=y 48CONFIG_PPC=y
47CONFIG_EARLY_PRINTK=y 49CONFIG_EARLY_PRINTK=y
48CONFIG_GENERIC_NVRAM=y 50CONFIG_GENERIC_NVRAM=y
49CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 51CONFIG_SCHED_OMIT_FRAME_POINTER=y
50CONFIG_ARCH_MAY_HAVE_PC_FDC=y 52CONFIG_ARCH_MAY_HAVE_PC_FDC=y
51CONFIG_PPC_OF=y 53CONFIG_PPC_OF=y
52CONFIG_OF=y 54CONFIG_OF=y
@@ -76,12 +78,12 @@ CONFIG_SYSVIPC_SYSCTL=y
76# CONFIG_AUDIT is not set 78# CONFIG_AUDIT is not set
77# CONFIG_IKCONFIG is not set 79# CONFIG_IKCONFIG is not set
78CONFIG_LOG_BUF_SHIFT=14 80CONFIG_LOG_BUF_SHIFT=14
79# CONFIG_CGROUPS is not set
80CONFIG_GROUP_SCHED=y 81CONFIG_GROUP_SCHED=y
81# CONFIG_FAIR_GROUP_SCHED is not set 82# CONFIG_FAIR_GROUP_SCHED is not set
82# CONFIG_RT_GROUP_SCHED is not set 83# CONFIG_RT_GROUP_SCHED is not set
83CONFIG_USER_SCHED=y 84CONFIG_USER_SCHED=y
84# CONFIG_CGROUP_SCHED is not set 85# CONFIG_CGROUP_SCHED is not set
86# CONFIG_CGROUPS is not set
85CONFIG_SYSFS_DEPRECATED=y 87CONFIG_SYSFS_DEPRECATED=y
86CONFIG_SYSFS_DEPRECATED_V2=y 88CONFIG_SYSFS_DEPRECATED_V2=y
87# CONFIG_RELAY is not set 89# CONFIG_RELAY is not set
@@ -116,7 +118,6 @@ CONFIG_SLUB_DEBUG=y
116CONFIG_SLUB=y 118CONFIG_SLUB=y
117# CONFIG_SLOB is not set 119# CONFIG_SLOB is not set
118# CONFIG_PROFILING is not set 120# CONFIG_PROFILING is not set
119# CONFIG_MARKERS is not set
120CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 122CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
122CONFIG_HAVE_IOREMAP_PROT=y 123CONFIG_HAVE_IOREMAP_PROT=y
@@ -127,13 +128,11 @@ CONFIG_HAVE_CLK=y
127# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
128CONFIG_SLABINFO=y 129CONFIG_SLABINFO=y
129CONFIG_RT_MUTEXES=y 130CONFIG_RT_MUTEXES=y
130# CONFIG_TINY_SHMEM is not set
131CONFIG_BASE_SMALL=0 131CONFIG_BASE_SMALL=0
132# CONFIG_MODULES is not set 132# CONFIG_MODULES is not set
133CONFIG_BLOCK=y 133CONFIG_BLOCK=y
134# CONFIG_LBD is not set 134# CONFIG_LBD is not set
135# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
136# CONFIG_LSF is not set
137# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
138# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
139 138
@@ -150,6 +149,10 @@ CONFIG_DEFAULT_AS=y
150# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
151CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
152CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
153# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
154 157
155# 158#
@@ -190,6 +193,7 @@ CONFIG_CPM2=y
190# CONFIG_FSL_ULI1575 is not set 193# CONFIG_FSL_ULI1575 is not set
191CONFIG_CPM=y 194CONFIG_CPM=y
192# CONFIG_MPC8xxx_GPIO is not set 195# CONFIG_MPC8xxx_GPIO is not set
196# CONFIG_SIMPLE_GPIO is not set
193 197
194# 198#
195# Kernel options 199# Kernel options
@@ -227,12 +231,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
227CONFIG_PAGEFLAGS_EXTENDED=y 231CONFIG_PAGEFLAGS_EXTENDED=y
228CONFIG_SPLIT_PTLOCK_CPUS=4 232CONFIG_SPLIT_PTLOCK_CPUS=4
229CONFIG_MIGRATION=y 233CONFIG_MIGRATION=y
230# CONFIG_RESOURCES_64BIT is not set
231# CONFIG_PHYS_ADDR_T_64BIT is not set 234# CONFIG_PHYS_ADDR_T_64BIT is not set
232CONFIG_ZONE_DMA_FLAG=1 235CONFIG_ZONE_DMA_FLAG=1
233CONFIG_BOUNCE=y 236CONFIG_BOUNCE=y
234CONFIG_VIRT_TO_BUS=y 237CONFIG_VIRT_TO_BUS=y
235CONFIG_UNEVICTABLE_LRU=y 238CONFIG_UNEVICTABLE_LRU=y
239CONFIG_PPC_4K_PAGES=y
240# CONFIG_PPC_16K_PAGES is not set
241# CONFIG_PPC_64K_PAGES is not set
236CONFIG_FORCE_MAX_ZONEORDER=11 242CONFIG_FORCE_MAX_ZONEORDER=11
237# CONFIG_PROC_DEVICETREE is not set 243# CONFIG_PROC_DEVICETREE is not set
238# CONFIG_CMDLINE_BOOL is not set 244# CONFIG_CMDLINE_BOOL is not set
@@ -257,6 +263,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
257# CONFIG_PCI_MSI is not set 263# CONFIG_PCI_MSI is not set
258# CONFIG_PCI_LEGACY is not set 264# CONFIG_PCI_LEGACY is not set
259CONFIG_PCI_DEBUG=y 265CONFIG_PCI_DEBUG=y
266# CONFIG_PCI_STUB is not set
260# CONFIG_PCCARD is not set 267# CONFIG_PCCARD is not set
261# CONFIG_HOTPLUG_PCI is not set 268# CONFIG_HOTPLUG_PCI is not set
262# CONFIG_HAS_RAPIDIO is not set 269# CONFIG_HAS_RAPIDIO is not set
@@ -280,6 +287,7 @@ CONFIG_NET=y
280# 287#
281# Networking options 288# Networking options
282# 289#
290CONFIG_COMPAT_NET_DEV_OPS=y
283CONFIG_PACKET=y 291CONFIG_PACKET=y
284# CONFIG_PACKET_MMAP is not set 292# CONFIG_PACKET_MMAP is not set
285CONFIG_UNIX=y 293CONFIG_UNIX=y
@@ -336,6 +344,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
336# CONFIG_ECONET is not set 344# CONFIG_ECONET is not set
337# CONFIG_WAN_ROUTER is not set 345# CONFIG_WAN_ROUTER is not set
338# CONFIG_NET_SCHED is not set 346# CONFIG_NET_SCHED is not set
347# CONFIG_DCB is not set
339 348
340# 349#
341# Network testing 350# Network testing
@@ -351,8 +360,9 @@ CONFIG_WIRELESS=y
351# CONFIG_CFG80211 is not set 360# CONFIG_CFG80211 is not set
352CONFIG_WIRELESS_OLD_REGULATORY=y 361CONFIG_WIRELESS_OLD_REGULATORY=y
353# CONFIG_WIRELESS_EXT is not set 362# CONFIG_WIRELESS_EXT is not set
363# CONFIG_LIB80211 is not set
354# CONFIG_MAC80211 is not set 364# CONFIG_MAC80211 is not set
355# CONFIG_IEEE80211 is not set 365# CONFIG_WIMAX is not set
356# CONFIG_RFKILL is not set 366# CONFIG_RFKILL is not set
357# CONFIG_NET_9P is not set 367# CONFIG_NET_9P is not set
358 368
@@ -400,6 +410,7 @@ CONFIG_MISC_DEVICES=y
400# CONFIG_TIFM_CORE is not set 410# CONFIG_TIFM_CORE is not set
401# CONFIG_ENCLOSURE_SERVICES is not set 411# CONFIG_ENCLOSURE_SERVICES is not set
402# CONFIG_HP_ILO is not set 412# CONFIG_HP_ILO is not set
413# CONFIG_C2PORT is not set
403CONFIG_HAVE_IDE=y 414CONFIG_HAVE_IDE=y
404# CONFIG_IDE is not set 415# CONFIG_IDE is not set
405 416
@@ -448,6 +459,9 @@ CONFIG_DAVICOM_PHY=y
448# CONFIG_BROADCOM_PHY is not set 459# CONFIG_BROADCOM_PHY is not set
449# CONFIG_ICPLUS_PHY is not set 460# CONFIG_ICPLUS_PHY is not set
450# CONFIG_REALTEK_PHY is not set 461# CONFIG_REALTEK_PHY is not set
462# CONFIG_NATIONAL_PHY is not set
463# CONFIG_STE10XP is not set
464# CONFIG_LSI_ET1011C_PHY is not set
451# CONFIG_FIXED_PHY is not set 465# CONFIG_FIXED_PHY is not set
452# CONFIG_MDIO_BITBANG is not set 466# CONFIG_MDIO_BITBANG is not set
453CONFIG_NET_ETHERNET=y 467CONFIG_NET_ETHERNET=y
@@ -496,6 +510,7 @@ CONFIG_GIANFAR=y
496# CONFIG_JME is not set 510# CONFIG_JME is not set
497CONFIG_NETDEV_10000=y 511CONFIG_NETDEV_10000=y
498# CONFIG_CHELSIO_T1 is not set 512# CONFIG_CHELSIO_T1 is not set
513CONFIG_CHELSIO_T3_DEPENDS=y
499# CONFIG_CHELSIO_T3 is not set 514# CONFIG_CHELSIO_T3 is not set
500# CONFIG_ENIC is not set 515# CONFIG_ENIC is not set
501# CONFIG_IXGBE is not set 516# CONFIG_IXGBE is not set
@@ -518,6 +533,10 @@ CONFIG_NETDEV_10000=y
518# CONFIG_WLAN_PRE80211 is not set 533# CONFIG_WLAN_PRE80211 is not set
519# CONFIG_WLAN_80211 is not set 534# CONFIG_WLAN_80211 is not set
520# CONFIG_IWLWIFI_LEDS is not set 535# CONFIG_IWLWIFI_LEDS is not set
536
537#
538# Enable WiMAX (Networking options) to see the WiMAX drivers
539#
521# CONFIG_WAN is not set 540# CONFIG_WAN is not set
522# CONFIG_FDDI is not set 541# CONFIG_FDDI is not set
523# CONFIG_HIPPI is not set 542# CONFIG_HIPPI is not set
@@ -583,8 +602,10 @@ CONFIG_SERIAL_CPM=y
583CONFIG_SERIAL_CPM_CONSOLE=y 602CONFIG_SERIAL_CPM_CONSOLE=y
584# CONFIG_SERIAL_JSM is not set 603# CONFIG_SERIAL_JSM is not set
585CONFIG_UNIX98_PTYS=y 604CONFIG_UNIX98_PTYS=y
605# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
586CONFIG_LEGACY_PTYS=y 606CONFIG_LEGACY_PTYS=y
587CONFIG_LEGACY_PTY_COUNT=256 607CONFIG_LEGACY_PTY_COUNT=256
608# CONFIG_HVC_UDBG is not set
588# CONFIG_IPMI_HANDLER is not set 609# CONFIG_IPMI_HANDLER is not set
589CONFIG_HW_RANDOM=y 610CONFIG_HW_RANDOM=y
590# CONFIG_NVRAM is not set 611# CONFIG_NVRAM is not set
@@ -604,6 +625,11 @@ CONFIG_GPIOLIB=y
604# CONFIG_GPIO_SYSFS is not set 625# CONFIG_GPIO_SYSFS is not set
605 626
606# 627#
628# Memory mapped GPIO expanders:
629#
630# CONFIG_GPIO_XILINX is not set
631
632#
607# I2C GPIO expanders: 633# I2C GPIO expanders:
608# 634#
609 635
@@ -637,11 +663,11 @@ CONFIG_HWMON=y
637# CONFIG_THERMAL is not set 663# CONFIG_THERMAL is not set
638# CONFIG_THERMAL_HWMON is not set 664# CONFIG_THERMAL_HWMON is not set
639# CONFIG_WATCHDOG is not set 665# CONFIG_WATCHDOG is not set
666CONFIG_SSB_POSSIBLE=y
640 667
641# 668#
642# Sonics Silicon Backplane 669# Sonics Silicon Backplane
643# 670#
644CONFIG_SSB_POSSIBLE=y
645# CONFIG_SSB is not set 671# CONFIG_SSB is not set
646 672
647# 673#
@@ -651,14 +677,7 @@ CONFIG_SSB_POSSIBLE=y
651# CONFIG_MFD_SM501 is not set 677# CONFIG_MFD_SM501 is not set
652# CONFIG_HTC_PASIC3 is not set 678# CONFIG_HTC_PASIC3 is not set
653# CONFIG_MFD_TMIO is not set 679# CONFIG_MFD_TMIO is not set
654
655#
656# Voltage and Current regulators
657#
658# CONFIG_REGULATOR is not set 680# 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 681
663# 682#
664# Multimedia devices 683# Multimedia devices
@@ -714,9 +733,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
714# 733#
715 734
716# 735#
717# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 736# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
718# 737#
719# CONFIG_USB_GADGET is not set 738# CONFIG_USB_GADGET is not set
739
740#
741# OTG and related infrastructure
742#
720# CONFIG_UWB is not set 743# CONFIG_UWB is not set
721# CONFIG_MMC is not set 744# CONFIG_MMC is not set
722# CONFIG_MEMSTICK is not set 745# CONFIG_MEMSTICK is not set
@@ -748,6 +771,7 @@ CONFIG_FS_MBCACHE=y
748CONFIG_FILE_LOCKING=y 771CONFIG_FILE_LOCKING=y
749# CONFIG_XFS_FS is not set 772# CONFIG_XFS_FS is not set
750# CONFIG_OCFS2_FS is not set 773# CONFIG_OCFS2_FS is not set
774# CONFIG_BTRFS_FS is not set
751CONFIG_DNOTIFY=y 775CONFIG_DNOTIFY=y
752CONFIG_INOTIFY=y 776CONFIG_INOTIFY=y
753CONFIG_INOTIFY_USER=y 777CONFIG_INOTIFY_USER=y
@@ -781,10 +805,7 @@ CONFIG_TMPFS=y
781# CONFIG_TMPFS_POSIX_ACL is not set 805# CONFIG_TMPFS_POSIX_ACL is not set
782# CONFIG_HUGETLB_PAGE is not set 806# CONFIG_HUGETLB_PAGE is not set
783# CONFIG_CONFIGFS_FS is not set 807# CONFIG_CONFIGFS_FS is not set
784 808CONFIG_MISC_FILESYSTEMS=y
785#
786# Miscellaneous filesystems
787#
788# CONFIG_ADFS_FS is not set 809# CONFIG_ADFS_FS is not set
789# CONFIG_AFFS_FS is not set 810# CONFIG_AFFS_FS is not set
790# CONFIG_HFS_FS is not set 811# CONFIG_HFS_FS is not set
@@ -793,6 +814,7 @@ CONFIG_TMPFS=y
793# CONFIG_BFS_FS is not set 814# CONFIG_BFS_FS is not set
794# CONFIG_EFS_FS is not set 815# CONFIG_EFS_FS is not set
795# CONFIG_CRAMFS is not set 816# CONFIG_CRAMFS is not set
817# CONFIG_SQUASHFS is not set
796# CONFIG_VXFS_FS is not set 818# CONFIG_VXFS_FS is not set
797# CONFIG_MINIX_FS is not set 819# CONFIG_MINIX_FS is not set
798# CONFIG_OMFS_FS is not set 820# CONFIG_OMFS_FS is not set
@@ -843,6 +865,7 @@ CONFIG_PARTITION_ADVANCED=y
843# Library routines 865# Library routines
844# 866#
845CONFIG_BITREVERSE=y 867CONFIG_BITREVERSE=y
868CONFIG_GENERIC_FIND_LAST_BIT=y
846# CONFIG_CRC_CCITT is not set 869# CONFIG_CRC_CCITT is not set
847# CONFIG_CRC16 is not set 870# CONFIG_CRC16 is not set
848# CONFIG_CRC_T10DIF is not set 871# CONFIG_CRC_T10DIF is not set
@@ -892,6 +915,7 @@ CONFIG_DEBUG_MUTEXES=y
892# CONFIG_DEBUG_MEMORY_INIT is not set 915# CONFIG_DEBUG_MEMORY_INIT is not set
893# CONFIG_DEBUG_LIST is not set 916# CONFIG_DEBUG_LIST is not set
894# CONFIG_DEBUG_SG is not set 917# CONFIG_DEBUG_SG is not set
918# CONFIG_DEBUG_NOTIFIERS is not set
895# CONFIG_BOOT_PRINTK_DELAY is not set 919# CONFIG_BOOT_PRINTK_DELAY is not set
896# CONFIG_RCU_TORTURE_TEST is not set 920# CONFIG_RCU_TORTURE_TEST is not set
897# CONFIG_RCU_CPU_STALL_DETECTOR is not set 921# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -901,6 +925,8 @@ CONFIG_DEBUG_MUTEXES=y
901# CONFIG_LATENCYTOP is not set 925# CONFIG_LATENCYTOP is not set
902CONFIG_SYSCTL_SYSCALL_CHECK=y 926CONFIG_SYSCTL_SYSCALL_CHECK=y
903CONFIG_HAVE_FUNCTION_TRACER=y 927CONFIG_HAVE_FUNCTION_TRACER=y
928CONFIG_HAVE_DYNAMIC_FTRACE=y
929CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
904 930
905# 931#
906# Tracers 932# Tracers
@@ -909,11 +935,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
909# CONFIG_SCHED_TRACER is not set 935# CONFIG_SCHED_TRACER is not set
910# CONFIG_CONTEXT_SWITCH_TRACER is not set 936# CONFIG_CONTEXT_SWITCH_TRACER is not set
911# CONFIG_BOOT_TRACER is not set 937# CONFIG_BOOT_TRACER is not set
938# CONFIG_TRACE_BRANCH_PROFILING is not set
912# CONFIG_STACK_TRACER is not set 939# CONFIG_STACK_TRACER is not set
913# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 940# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
914# CONFIG_SAMPLES is not set 941# CONFIG_SAMPLES is not set
915CONFIG_HAVE_ARCH_KGDB=y 942CONFIG_HAVE_ARCH_KGDB=y
916# CONFIG_KGDB is not set 943# CONFIG_KGDB is not set
944CONFIG_PRINT_STACK_DEPTH=64
917# CONFIG_DEBUG_STACKOVERFLOW is not set 945# CONFIG_DEBUG_STACKOVERFLOW is not set
918# CONFIG_DEBUG_STACK_USAGE is not set 946# CONFIG_DEBUG_STACK_USAGE is not set
919# CONFIG_DEBUG_PAGEALLOC is not set 947# CONFIG_DEBUG_PAGEALLOC is not set
@@ -939,6 +967,7 @@ CONFIG_CRYPTO=y
939# 967#
940# CONFIG_CRYPTO_FIPS is not set 968# CONFIG_CRYPTO_FIPS is not set
941# CONFIG_CRYPTO_MANAGER is not set 969# CONFIG_CRYPTO_MANAGER is not set
970# CONFIG_CRYPTO_MANAGER2 is not set
942# CONFIG_CRYPTO_GF128MUL is not set 971# CONFIG_CRYPTO_GF128MUL is not set
943# CONFIG_CRYPTO_NULL is not set 972# CONFIG_CRYPTO_NULL is not set
944# CONFIG_CRYPTO_CRYPTD is not set 973# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/85xx/mpc8568mds_defconfig b/arch/powerpc/configs/85xx/mpc8568mds_defconfig
index ab5b0b58924c..186c1010a135 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:11 2008 4# Mon Jan 26 15:36:10 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,7 +21,9 @@ CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y 21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
24# CONFIG_PPC_MM_SLICES is not set 25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
25CONFIG_PPC32=y 27CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 28CONFIG_WORD_SIZE=32
27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -45,7 +47,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
45CONFIG_PPC=y 47CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 48CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 49CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 50CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 51CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 52CONFIG_PPC_OF=y
51CONFIG_OF=y 53CONFIG_OF=y
@@ -75,12 +77,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 77# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 78# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 79CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 80CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 81# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 82# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 83CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 84# CONFIG_CGROUP_SCHED is not set
85# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 86CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 87CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 88# CONFIG_RELAY is not set
@@ -113,7 +115,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 115CONFIG_SLUB=y
114# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 117# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 120CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,7 +124,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 127CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 128CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 129# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +131,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 131# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 132# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 133# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 134CONFIG_BLOCK=y
136# CONFIG_LBD is not set 135# CONFIG_LBD is not set
137# CONFIG_BLK_DEV_IO_TRACE is not set 136# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 137# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 138# CONFIG_BLK_DEV_INTEGRITY is not set
141 139
@@ -152,6 +150,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 150# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 151CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 152CONFIG_CLASSIC_RCU=y
153# CONFIG_TREE_RCU is not set
154# CONFIG_PREEMPT_RCU is not set
155# CONFIG_TREE_RCU_TRACE is not set
156# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 157# CONFIG_FREEZER is not set
156 158
157# 159#
@@ -192,6 +194,7 @@ CONFIG_QUICC_ENGINE=y
192# CONFIG_CPM2 is not set 194# CONFIG_CPM2 is not set
193# CONFIG_FSL_ULI1575 is not set 195# CONFIG_FSL_ULI1575 is not set
194# CONFIG_MPC8xxx_GPIO is not set 196# CONFIG_MPC8xxx_GPIO is not set
197# CONFIG_SIMPLE_GPIO is not set
195 198
196# 199#
197# Kernel options 200# Kernel options
@@ -230,12 +233,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
230CONFIG_PAGEFLAGS_EXTENDED=y 233CONFIG_PAGEFLAGS_EXTENDED=y
231CONFIG_SPLIT_PTLOCK_CPUS=4 234CONFIG_SPLIT_PTLOCK_CPUS=4
232CONFIG_MIGRATION=y 235CONFIG_MIGRATION=y
233# CONFIG_RESOURCES_64BIT is not set
234# CONFIG_PHYS_ADDR_T_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
238CONFIG_UNEVICTABLE_LRU=y 240CONFIG_UNEVICTABLE_LRU=y
241CONFIG_PPC_4K_PAGES=y
242# CONFIG_PPC_16K_PAGES is not set
243# CONFIG_PPC_64K_PAGES is not set
239CONFIG_FORCE_MAX_ZONEORDER=11 244CONFIG_FORCE_MAX_ZONEORDER=11
240CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
241# CONFIG_CMDLINE_BOOL is not set 246# CONFIG_CMDLINE_BOOL is not set
@@ -260,6 +265,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
260# CONFIG_PCI_MSI is not set 265# CONFIG_PCI_MSI is not set
261# CONFIG_PCI_LEGACY is not set 266# CONFIG_PCI_LEGACY is not set
262# CONFIG_PCI_DEBUG is not set 267# CONFIG_PCI_DEBUG is not set
268# CONFIG_PCI_STUB is not set
263# CONFIG_PCCARD is not set 269# CONFIG_PCCARD is not set
264# CONFIG_HOTPLUG_PCI is not set 270# CONFIG_HOTPLUG_PCI is not set
265# CONFIG_HAS_RAPIDIO is not set 271# CONFIG_HAS_RAPIDIO is not set
@@ -283,6 +289,7 @@ CONFIG_NET=y
283# 289#
284# Networking options 290# Networking options
285# 291#
292CONFIG_COMPAT_NET_DEV_OPS=y
286CONFIG_PACKET=y 293CONFIG_PACKET=y
287# CONFIG_PACKET_MMAP is not set 294# CONFIG_PACKET_MMAP is not set
288CONFIG_UNIX=y 295CONFIG_UNIX=y
@@ -339,6 +346,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
339# CONFIG_ECONET is not set 346# CONFIG_ECONET is not set
340# CONFIG_WAN_ROUTER is not set 347# CONFIG_WAN_ROUTER is not set
341# CONFIG_NET_SCHED is not set 348# CONFIG_NET_SCHED is not set
349# CONFIG_DCB is not set
342 350
343# 351#
344# Network testing 352# Network testing
@@ -354,8 +362,9 @@ CONFIG_WIRELESS=y
354# CONFIG_CFG80211 is not set 362# CONFIG_CFG80211 is not set
355CONFIG_WIRELESS_OLD_REGULATORY=y 363CONFIG_WIRELESS_OLD_REGULATORY=y
356# CONFIG_WIRELESS_EXT is not set 364# CONFIG_WIRELESS_EXT is not set
365# CONFIG_LIB80211 is not set
357# CONFIG_MAC80211 is not set 366# CONFIG_MAC80211 is not set
358# CONFIG_IEEE80211 is not set 367# CONFIG_WIMAX is not set
359# CONFIG_RFKILL is not set 368# CONFIG_RFKILL is not set
360# CONFIG_NET_9P is not set 369# CONFIG_NET_9P is not set
361 370
@@ -401,8 +410,10 @@ CONFIG_MISC_DEVICES=y
401# CONFIG_EEPROM_93CX6 is not set 410# CONFIG_EEPROM_93CX6 is not set
402# CONFIG_SGI_IOC4 is not set 411# CONFIG_SGI_IOC4 is not set
403# CONFIG_TIFM_CORE is not set 412# CONFIG_TIFM_CORE is not set
413# CONFIG_ICS932S401 is not set
404# CONFIG_ENCLOSURE_SERVICES is not set 414# CONFIG_ENCLOSURE_SERVICES is not set
405# CONFIG_HP_ILO is not set 415# CONFIG_HP_ILO is not set
416# CONFIG_C2PORT is not set
406CONFIG_HAVE_IDE=y 417CONFIG_HAVE_IDE=y
407# CONFIG_IDE is not set 418# CONFIG_IDE is not set
408 419
@@ -445,6 +456,7 @@ CONFIG_SCSI_WAIT_SCAN=m
445# CONFIG_SCSI_SRP_ATTRS is not set 456# CONFIG_SCSI_SRP_ATTRS is not set
446CONFIG_SCSI_LOWLEVEL=y 457CONFIG_SCSI_LOWLEVEL=y
447# CONFIG_ISCSI_TCP is not set 458# CONFIG_ISCSI_TCP is not set
459# CONFIG_SCSI_CXGB3_ISCSI is not set
448# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 460# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
449# CONFIG_SCSI_3W_9XXX is not set 461# CONFIG_SCSI_3W_9XXX is not set
450# CONFIG_SCSI_ACARD is not set 462# CONFIG_SCSI_ACARD is not set
@@ -461,6 +473,8 @@ CONFIG_SCSI_LOWLEVEL=y
461# CONFIG_MEGARAID_SAS is not set 473# CONFIG_MEGARAID_SAS is not set
462# CONFIG_SCSI_HPTIOP is not set 474# CONFIG_SCSI_HPTIOP is not set
463# CONFIG_SCSI_BUSLOGIC is not set 475# CONFIG_SCSI_BUSLOGIC is not set
476# CONFIG_LIBFC is not set
477# CONFIG_FCOE is not set
464# CONFIG_SCSI_DMX3191D is not set 478# CONFIG_SCSI_DMX3191D is not set
465# CONFIG_SCSI_EATA is not set 479# CONFIG_SCSI_EATA is not set
466# CONFIG_SCSI_FUTURE_DOMAIN is not set 480# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -519,6 +533,9 @@ CONFIG_MARVELL_PHY=y
519# CONFIG_BROADCOM_PHY is not set 533# CONFIG_BROADCOM_PHY is not set
520# CONFIG_ICPLUS_PHY is not set 534# CONFIG_ICPLUS_PHY is not set
521# CONFIG_REALTEK_PHY is not set 535# CONFIG_REALTEK_PHY is not set
536# CONFIG_NATIONAL_PHY is not set
537# CONFIG_STE10XP is not set
538# CONFIG_LSI_ET1011C_PHY is not set
522# CONFIG_FIXED_PHY is not set 539# CONFIG_FIXED_PHY is not set
523# CONFIG_MDIO_BITBANG is not set 540# CONFIG_MDIO_BITBANG is not set
524CONFIG_NET_ETHERNET=y 541CONFIG_NET_ETHERNET=y
@@ -564,6 +581,7 @@ CONFIG_GIANFAR=y
564# CONFIG_JME is not set 581# CONFIG_JME is not set
565CONFIG_NETDEV_10000=y 582CONFIG_NETDEV_10000=y
566# CONFIG_CHELSIO_T1 is not set 583# CONFIG_CHELSIO_T1 is not set
584CONFIG_CHELSIO_T3_DEPENDS=y
567# CONFIG_CHELSIO_T3 is not set 585# CONFIG_CHELSIO_T3 is not set
568# CONFIG_ENIC is not set 586# CONFIG_ENIC is not set
569# CONFIG_IXGBE is not set 587# CONFIG_IXGBE is not set
@@ -586,6 +604,10 @@ CONFIG_NETDEV_10000=y
586# CONFIG_WLAN_PRE80211 is not set 604# CONFIG_WLAN_PRE80211 is not set
587# CONFIG_WLAN_80211 is not set 605# CONFIG_WLAN_80211 is not set
588# CONFIG_IWLWIFI_LEDS is not set 606# CONFIG_IWLWIFI_LEDS is not set
607
608#
609# Enable WiMAX (Networking options) to see the WiMAX drivers
610#
589# CONFIG_WAN is not set 611# CONFIG_WAN is not set
590# CONFIG_FDDI is not set 612# CONFIG_FDDI is not set
591# CONFIG_HIPPI is not set 613# CONFIG_HIPPI is not set
@@ -658,8 +680,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
658# CONFIG_SERIAL_OF_PLATFORM is not set 680# CONFIG_SERIAL_OF_PLATFORM is not set
659# CONFIG_SERIAL_QE is not set 681# CONFIG_SERIAL_QE is not set
660CONFIG_UNIX98_PTYS=y 682CONFIG_UNIX98_PTYS=y
683# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
661CONFIG_LEGACY_PTYS=y 684CONFIG_LEGACY_PTYS=y
662CONFIG_LEGACY_PTY_COUNT=256 685CONFIG_LEGACY_PTY_COUNT=256
686# CONFIG_HVC_UDBG is not set
663# CONFIG_IPMI_HANDLER is not set 687# CONFIG_IPMI_HANDLER is not set
664CONFIG_HW_RANDOM=y 688CONFIG_HW_RANDOM=y
665# CONFIG_NVRAM is not set 689# CONFIG_NVRAM is not set
@@ -750,8 +774,10 @@ CONFIG_HWMON=y
750# CONFIG_SENSORS_ADM1029 is not set 774# CONFIG_SENSORS_ADM1029 is not set
751# CONFIG_SENSORS_ADM1031 is not set 775# CONFIG_SENSORS_ADM1031 is not set
752# CONFIG_SENSORS_ADM9240 is not set 776# CONFIG_SENSORS_ADM9240 is not set
777# CONFIG_SENSORS_ADT7462 is not set
753# CONFIG_SENSORS_ADT7470 is not set 778# CONFIG_SENSORS_ADT7470 is not set
754# CONFIG_SENSORS_ADT7473 is not set 779# CONFIG_SENSORS_ADT7473 is not set
780# CONFIG_SENSORS_ADT7475 is not set
755# CONFIG_SENSORS_ATXP1 is not set 781# CONFIG_SENSORS_ATXP1 is not set
756# CONFIG_SENSORS_DS1621 is not set 782# CONFIG_SENSORS_DS1621 is not set
757# CONFIG_SENSORS_I5K_AMB is not set 783# CONFIG_SENSORS_I5K_AMB is not set
@@ -772,6 +798,7 @@ CONFIG_HWMON=y
772# CONFIG_SENSORS_LM90 is not set 798# CONFIG_SENSORS_LM90 is not set
773# CONFIG_SENSORS_LM92 is not set 799# CONFIG_SENSORS_LM92 is not set
774# CONFIG_SENSORS_LM93 is not set 800# CONFIG_SENSORS_LM93 is not set
801# CONFIG_SENSORS_LTC4245 is not set
775# CONFIG_SENSORS_MAX1619 is not set 802# CONFIG_SENSORS_MAX1619 is not set
776# CONFIG_SENSORS_MAX6650 is not set 803# CONFIG_SENSORS_MAX6650 is not set
777# CONFIG_SENSORS_PC87360 is not set 804# CONFIG_SENSORS_PC87360 is not set
@@ -812,11 +839,11 @@ CONFIG_WATCHDOG=y
812# 839#
813# CONFIG_PCIPCWATCHDOG is not set 840# CONFIG_PCIPCWATCHDOG is not set
814# CONFIG_WDTPCI is not set 841# CONFIG_WDTPCI is not set
842CONFIG_SSB_POSSIBLE=y
815 843
816# 844#
817# Sonics Silicon Backplane 845# Sonics Silicon Backplane
818# 846#
819CONFIG_SSB_POSSIBLE=y
820# CONFIG_SSB is not set 847# CONFIG_SSB is not set
821 848
822# 849#
@@ -825,18 +852,13 @@ CONFIG_SSB_POSSIBLE=y
825# CONFIG_MFD_CORE is not set 852# CONFIG_MFD_CORE is not set
826# CONFIG_MFD_SM501 is not set 853# CONFIG_MFD_SM501 is not set
827# CONFIG_HTC_PASIC3 is not set 854# CONFIG_HTC_PASIC3 is not set
855# CONFIG_TWL4030_CORE is not set
828# CONFIG_MFD_TMIO is not set 856# CONFIG_MFD_TMIO is not set
829# CONFIG_PMIC_DA903X is not set 857# CONFIG_PMIC_DA903X is not set
830# CONFIG_MFD_WM8400 is not set 858# CONFIG_MFD_WM8400 is not set
831# CONFIG_MFD_WM8350_I2C is not set 859# CONFIG_MFD_WM8350_I2C is not set
832 860# CONFIG_MFD_PCF50633 is not set
833#
834# Voltage and Current regulators
835#
836# CONFIG_REGULATOR is not set 861# 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
840 862
841# 863#
842# Multimedia devices 864# Multimedia devices
@@ -892,9 +914,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
892# 914#
893 915
894# 916#
895# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 917# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
896# 918#
897# CONFIG_USB_GADGET is not set 919# CONFIG_USB_GADGET is not set
920
921#
922# OTG and related infrastructure
923#
898# CONFIG_UWB is not set 924# CONFIG_UWB is not set
899# CONFIG_MMC is not set 925# CONFIG_MMC is not set
900# CONFIG_MEMSTICK is not set 926# CONFIG_MEMSTICK is not set
@@ -932,6 +958,7 @@ CONFIG_RTC_DRV_DS1374=y
932# CONFIG_RTC_DRV_M41T80 is not set 958# CONFIG_RTC_DRV_M41T80 is not set
933# CONFIG_RTC_DRV_S35390A is not set 959# CONFIG_RTC_DRV_S35390A is not set
934# CONFIG_RTC_DRV_FM3130 is not set 960# CONFIG_RTC_DRV_FM3130 is not set
961# CONFIG_RTC_DRV_RX8581 is not set
935 962
936# 963#
937# SPI RTC drivers 964# SPI RTC drivers
@@ -979,6 +1006,7 @@ CONFIG_FS_MBCACHE=y
979CONFIG_FILE_LOCKING=y 1006CONFIG_FILE_LOCKING=y
980# CONFIG_XFS_FS is not set 1007# CONFIG_XFS_FS is not set
981# CONFIG_OCFS2_FS is not set 1008# CONFIG_OCFS2_FS is not set
1009# CONFIG_BTRFS_FS is not set
982CONFIG_DNOTIFY=y 1010CONFIG_DNOTIFY=y
983CONFIG_INOTIFY=y 1011CONFIG_INOTIFY=y
984CONFIG_INOTIFY_USER=y 1012CONFIG_INOTIFY_USER=y
@@ -1012,10 +1040,7 @@ CONFIG_TMPFS=y
1012# CONFIG_TMPFS_POSIX_ACL is not set 1040# CONFIG_TMPFS_POSIX_ACL is not set
1013# CONFIG_HUGETLB_PAGE is not set 1041# CONFIG_HUGETLB_PAGE is not set
1014# CONFIG_CONFIGFS_FS is not set 1042# CONFIG_CONFIGFS_FS is not set
1015 1043CONFIG_MISC_FILESYSTEMS=y
1016#
1017# Miscellaneous filesystems
1018#
1019# CONFIG_ADFS_FS is not set 1044# CONFIG_ADFS_FS is not set
1020# CONFIG_AFFS_FS is not set 1045# CONFIG_AFFS_FS is not set
1021# CONFIG_HFS_FS is not set 1046# CONFIG_HFS_FS is not set
@@ -1024,6 +1049,7 @@ CONFIG_TMPFS=y
1024# CONFIG_BFS_FS is not set 1049# CONFIG_BFS_FS is not set
1025# CONFIG_EFS_FS is not set 1050# CONFIG_EFS_FS is not set
1026# CONFIG_CRAMFS is not set 1051# CONFIG_CRAMFS is not set
1052# CONFIG_SQUASHFS is not set
1027# CONFIG_VXFS_FS is not set 1053# CONFIG_VXFS_FS is not set
1028# CONFIG_MINIX_FS is not set 1054# CONFIG_MINIX_FS is not set
1029# CONFIG_OMFS_FS is not set 1055# CONFIG_OMFS_FS is not set
@@ -1077,6 +1103,7 @@ CONFIG_PARTITION_ADVANCED=y
1077# Library routines 1103# Library routines
1078# 1104#
1079CONFIG_BITREVERSE=y 1105CONFIG_BITREVERSE=y
1106CONFIG_GENERIC_FIND_LAST_BIT=y
1080# CONFIG_CRC_CCITT is not set 1107# CONFIG_CRC_CCITT is not set
1081# CONFIG_CRC16 is not set 1108# CONFIG_CRC16 is not set
1082# CONFIG_CRC_T10DIF is not set 1109# CONFIG_CRC_T10DIF is not set
@@ -1126,6 +1153,7 @@ CONFIG_SCHED_DEBUG=y
1126# CONFIG_DEBUG_MEMORY_INIT is not set 1153# CONFIG_DEBUG_MEMORY_INIT is not set
1127# CONFIG_DEBUG_LIST is not set 1154# CONFIG_DEBUG_LIST is not set
1128# CONFIG_DEBUG_SG is not set 1155# CONFIG_DEBUG_SG is not set
1156# CONFIG_DEBUG_NOTIFIERS is not set
1129# CONFIG_BOOT_PRINTK_DELAY is not set 1157# CONFIG_BOOT_PRINTK_DELAY is not set
1130# CONFIG_RCU_TORTURE_TEST is not set 1158# CONFIG_RCU_TORTURE_TEST is not set
1131# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1159# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1135,6 +1163,8 @@ CONFIG_SCHED_DEBUG=y
1135# CONFIG_LATENCYTOP is not set 1163# CONFIG_LATENCYTOP is not set
1136CONFIG_SYSCTL_SYSCALL_CHECK=y 1164CONFIG_SYSCTL_SYSCALL_CHECK=y
1137CONFIG_HAVE_FUNCTION_TRACER=y 1165CONFIG_HAVE_FUNCTION_TRACER=y
1166CONFIG_HAVE_DYNAMIC_FTRACE=y
1167CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1138 1168
1139# 1169#
1140# Tracers 1170# Tracers
@@ -1143,11 +1173,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1143# CONFIG_SCHED_TRACER is not set 1173# CONFIG_SCHED_TRACER is not set
1144# CONFIG_CONTEXT_SWITCH_TRACER is not set 1174# CONFIG_CONTEXT_SWITCH_TRACER is not set
1145# CONFIG_BOOT_TRACER is not set 1175# CONFIG_BOOT_TRACER is not set
1176# CONFIG_TRACE_BRANCH_PROFILING is not set
1146# CONFIG_STACK_TRACER is not set 1177# CONFIG_STACK_TRACER is not set
1147# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1178# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1148# CONFIG_SAMPLES is not set 1179# CONFIG_SAMPLES is not set
1149CONFIG_HAVE_ARCH_KGDB=y 1180CONFIG_HAVE_ARCH_KGDB=y
1150# CONFIG_KGDB is not set 1181# CONFIG_KGDB is not set
1182CONFIG_PRINT_STACK_DEPTH=64
1151# CONFIG_DEBUG_STACKOVERFLOW is not set 1183# CONFIG_DEBUG_STACKOVERFLOW is not set
1152# CONFIG_DEBUG_STACK_USAGE is not set 1184# CONFIG_DEBUG_STACK_USAGE is not set
1153# CONFIG_DEBUG_PAGEALLOC is not set 1185# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1184,11 +1216,15 @@ CONFIG_CRYPTO=y
1184# 1216#
1185# CONFIG_CRYPTO_FIPS is not set 1217# CONFIG_CRYPTO_FIPS is not set
1186CONFIG_CRYPTO_ALGAPI=y 1218CONFIG_CRYPTO_ALGAPI=y
1187CONFIG_CRYPTO_AEAD=y 1219CONFIG_CRYPTO_ALGAPI2=y
1220CONFIG_CRYPTO_AEAD2=y
1188CONFIG_CRYPTO_BLKCIPHER=y 1221CONFIG_CRYPTO_BLKCIPHER=y
1222CONFIG_CRYPTO_BLKCIPHER2=y
1189CONFIG_CRYPTO_HASH=y 1223CONFIG_CRYPTO_HASH=y
1190CONFIG_CRYPTO_RNG=y 1224CONFIG_CRYPTO_HASH2=y
1225CONFIG_CRYPTO_RNG2=y
1191CONFIG_CRYPTO_MANAGER=y 1226CONFIG_CRYPTO_MANAGER=y
1227CONFIG_CRYPTO_MANAGER2=y
1192# CONFIG_CRYPTO_GF128MUL is not set 1228# CONFIG_CRYPTO_GF128MUL is not set
1193# CONFIG_CRYPTO_NULL is not set 1229# CONFIG_CRYPTO_NULL is not set
1194# CONFIG_CRYPTO_CRYPTD is not set 1230# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
index 65ef823e08c6..813223ae174d 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.28-rc8 3# Linux kernel version: 2.6.29-rc2
4# Tue Dec 30 11:17:46 2008 4# Mon Jan 26 15:36:12 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -48,7 +48,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
48CONFIG_PPC=y 48CONFIG_PPC=y
49CONFIG_EARLY_PRINTK=y 49CONFIG_EARLY_PRINTK=y
50CONFIG_GENERIC_NVRAM=y 50CONFIG_GENERIC_NVRAM=y
51CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 51CONFIG_SCHED_OMIT_FRAME_POINTER=y
52CONFIG_ARCH_MAY_HAVE_PC_FDC=y 52CONFIG_ARCH_MAY_HAVE_PC_FDC=y
53CONFIG_PPC_OF=y 53CONFIG_PPC_OF=y
54CONFIG_OF=y 54CONFIG_OF=y
@@ -81,12 +81,12 @@ CONFIG_AUDIT=y
81CONFIG_IKCONFIG=y 81CONFIG_IKCONFIG=y
82CONFIG_IKCONFIG_PROC=y 82CONFIG_IKCONFIG_PROC=y
83CONFIG_LOG_BUF_SHIFT=14 83CONFIG_LOG_BUF_SHIFT=14
84# CONFIG_CGROUPS is not set
85CONFIG_GROUP_SCHED=y 84CONFIG_GROUP_SCHED=y
86# CONFIG_FAIR_GROUP_SCHED is not set 85# CONFIG_FAIR_GROUP_SCHED is not set
87# CONFIG_RT_GROUP_SCHED is not set 86# CONFIG_RT_GROUP_SCHED is not set
88CONFIG_USER_SCHED=y 87CONFIG_USER_SCHED=y
89# CONFIG_CGROUP_SCHED is not set 88# CONFIG_CGROUP_SCHED is not set
89# CONFIG_CGROUPS is not set
90CONFIG_SYSFS_DEPRECATED=y 90CONFIG_SYSFS_DEPRECATED=y
91CONFIG_SYSFS_DEPRECATED_V2=y 91CONFIG_SYSFS_DEPRECATED_V2=y
92# CONFIG_RELAY is not set 92# CONFIG_RELAY is not set
@@ -99,6 +99,7 @@ CONFIG_EMBEDDED=y
99CONFIG_SYSCTL_SYSCALL=y 99CONFIG_SYSCTL_SYSCALL=y
100CONFIG_KALLSYMS=y 100CONFIG_KALLSYMS=y
101CONFIG_KALLSYMS_ALL=y 101CONFIG_KALLSYMS_ALL=y
102CONFIG_KALLSYMS_STRIP_GENERATED=y
102CONFIG_KALLSYMS_EXTRA_PASS=y 103CONFIG_KALLSYMS_EXTRA_PASS=y
103CONFIG_HOTPLUG=y 104CONFIG_HOTPLUG=y
104CONFIG_PRINTK=y 105CONFIG_PRINTK=y
@@ -121,7 +122,6 @@ CONFIG_SLUB_DEBUG=y
121CONFIG_SLUB=y 122CONFIG_SLUB=y
122# CONFIG_SLOB is not set 123# CONFIG_SLOB is not set
123# CONFIG_PROFILING is not set 124# CONFIG_PROFILING is not set
124# CONFIG_MARKERS is not set
125CONFIG_HAVE_OPROFILE=y 125CONFIG_HAVE_OPROFILE=y
126# CONFIG_KPROBES is not set 126# CONFIG_KPROBES is not set
127CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 127CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -133,7 +133,6 @@ CONFIG_USE_GENERIC_SMP_HELPERS=y
133# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 133# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
134CONFIG_SLABINFO=y 134CONFIG_SLABINFO=y
135CONFIG_RT_MUTEXES=y 135CONFIG_RT_MUTEXES=y
136# CONFIG_TINY_SHMEM is not set
137CONFIG_BASE_SMALL=0 136CONFIG_BASE_SMALL=0
138CONFIG_MODULES=y 137CONFIG_MODULES=y
139# CONFIG_MODULE_FORCE_LOAD is not set 138# CONFIG_MODULE_FORCE_LOAD is not set
@@ -141,12 +140,10 @@ CONFIG_MODULE_UNLOAD=y
141CONFIG_MODULE_FORCE_UNLOAD=y 140CONFIG_MODULE_FORCE_UNLOAD=y
142CONFIG_MODVERSIONS=y 141CONFIG_MODVERSIONS=y
143# CONFIG_MODULE_SRCVERSION_ALL is not set 142# CONFIG_MODULE_SRCVERSION_ALL is not set
144CONFIG_KMOD=y
145CONFIG_STOP_MACHINE=y 143CONFIG_STOP_MACHINE=y
146CONFIG_BLOCK=y 144CONFIG_BLOCK=y
147CONFIG_LBD=y 145CONFIG_LBD=y
148# CONFIG_BLK_DEV_IO_TRACE is not set 146# CONFIG_BLK_DEV_IO_TRACE is not set
149# CONFIG_LSF is not set
150# CONFIG_BLK_DEV_BSG is not set 147# CONFIG_BLK_DEV_BSG is not set
151# CONFIG_BLK_DEV_INTEGRITY is not set 148# CONFIG_BLK_DEV_INTEGRITY is not set
152 149
@@ -163,6 +160,10 @@ CONFIG_DEFAULT_CFQ=y
163# CONFIG_DEFAULT_NOOP is not set 160# CONFIG_DEFAULT_NOOP is not set
164CONFIG_DEFAULT_IOSCHED="cfq" 161CONFIG_DEFAULT_IOSCHED="cfq"
165CONFIG_CLASSIC_RCU=y 162CONFIG_CLASSIC_RCU=y
163# CONFIG_TREE_RCU is not set
164# CONFIG_PREEMPT_RCU is not set
165# CONFIG_TREE_RCU_TRACE is not set
166# CONFIG_PREEMPT_RCU_TRACE is not set
166# CONFIG_FREEZER is not set 167# CONFIG_FREEZER is not set
167 168
168# 169#
@@ -242,7 +243,6 @@ CONFIG_FLAT_NODE_MEM_MAP=y
242CONFIG_PAGEFLAGS_EXTENDED=y 243CONFIG_PAGEFLAGS_EXTENDED=y
243CONFIG_SPLIT_PTLOCK_CPUS=4 244CONFIG_SPLIT_PTLOCK_CPUS=4
244CONFIG_MIGRATION=y 245CONFIG_MIGRATION=y
245# CONFIG_RESOURCES_64BIT is not set
246# CONFIG_PHYS_ADDR_T_64BIT is not set 246# CONFIG_PHYS_ADDR_T_64BIT is not set
247CONFIG_ZONE_DMA_FLAG=1 247CONFIG_ZONE_DMA_FLAG=1
248CONFIG_BOUNCE=y 248CONFIG_BOUNCE=y
@@ -276,6 +276,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
276# CONFIG_PCI_MSI is not set 276# CONFIG_PCI_MSI is not set
277# CONFIG_PCI_LEGACY is not set 277# CONFIG_PCI_LEGACY is not set
278# CONFIG_PCI_DEBUG is not set 278# CONFIG_PCI_DEBUG is not set
279# CONFIG_PCI_STUB is not set
279# CONFIG_PCCARD is not set 280# CONFIG_PCCARD is not set
280# CONFIG_HOTPLUG_PCI is not set 281# CONFIG_HOTPLUG_PCI is not set
281# CONFIG_HAS_RAPIDIO is not set 282# CONFIG_HAS_RAPIDIO is not set
@@ -299,6 +300,7 @@ CONFIG_NET=y
299# 300#
300# Networking options 301# Networking options
301# 302#
303CONFIG_COMPAT_NET_DEV_OPS=y
302CONFIG_PACKET=y 304CONFIG_PACKET=y
303# CONFIG_PACKET_MMAP is not set 305# CONFIG_PACKET_MMAP is not set
304CONFIG_UNIX=y 306CONFIG_UNIX=y
@@ -387,6 +389,7 @@ CONFIG_SCTP_HMAC_MD5=y
387# CONFIG_ECONET is not set 389# CONFIG_ECONET is not set
388# CONFIG_WAN_ROUTER is not set 390# CONFIG_WAN_ROUTER is not set
389# CONFIG_NET_SCHED is not set 391# CONFIG_NET_SCHED is not set
392# CONFIG_DCB is not set
390 393
391# 394#
392# Network testing 395# Network testing
@@ -403,8 +406,9 @@ CONFIG_WIRELESS=y
403# CONFIG_CFG80211 is not set 406# CONFIG_CFG80211 is not set
404CONFIG_WIRELESS_OLD_REGULATORY=y 407CONFIG_WIRELESS_OLD_REGULATORY=y
405# CONFIG_WIRELESS_EXT is not set 408# CONFIG_WIRELESS_EXT is not set
409# CONFIG_LIB80211 is not set
406# CONFIG_MAC80211 is not set 410# CONFIG_MAC80211 is not set
407# CONFIG_IEEE80211 is not set 411# CONFIG_WIMAX is not set
408# CONFIG_RFKILL is not set 412# CONFIG_RFKILL is not set
409# CONFIG_NET_9P is not set 413# CONFIG_NET_9P is not set
410 414
@@ -500,6 +504,7 @@ CONFIG_SCSI_WAIT_SCAN=m
500# CONFIG_SCSI_SRP_ATTRS is not set 504# CONFIG_SCSI_SRP_ATTRS is not set
501CONFIG_SCSI_LOWLEVEL=y 505CONFIG_SCSI_LOWLEVEL=y
502# CONFIG_ISCSI_TCP is not set 506# CONFIG_ISCSI_TCP is not set
507# CONFIG_SCSI_CXGB3_ISCSI is not set
503# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 508# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
504# CONFIG_SCSI_3W_9XXX is not set 509# CONFIG_SCSI_3W_9XXX is not set
505# CONFIG_SCSI_ACARD is not set 510# CONFIG_SCSI_ACARD is not set
@@ -516,6 +521,8 @@ CONFIG_SCSI_LOWLEVEL=y
516# CONFIG_MEGARAID_SAS is not set 521# CONFIG_MEGARAID_SAS is not set
517# CONFIG_SCSI_HPTIOP is not set 522# CONFIG_SCSI_HPTIOP is not set
518# CONFIG_SCSI_BUSLOGIC is not set 523# CONFIG_SCSI_BUSLOGIC is not set
524# CONFIG_LIBFC is not set
525# CONFIG_FCOE is not set
519# CONFIG_SCSI_DMX3191D is not set 526# CONFIG_SCSI_DMX3191D is not set
520# CONFIG_SCSI_EATA is not set 527# CONFIG_SCSI_EATA is not set
521# CONFIG_SCSI_FUTURE_DOMAIN is not set 528# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -635,6 +642,9 @@ CONFIG_VITESSE_PHY=y
635# CONFIG_BROADCOM_PHY is not set 642# CONFIG_BROADCOM_PHY is not set
636# CONFIG_ICPLUS_PHY is not set 643# CONFIG_ICPLUS_PHY is not set
637# CONFIG_REALTEK_PHY is not set 644# CONFIG_REALTEK_PHY is not set
645# CONFIG_NATIONAL_PHY is not set
646# CONFIG_STE10XP is not set
647# CONFIG_LSI_ET1011C_PHY is not set
638# CONFIG_FIXED_PHY is not set 648# CONFIG_FIXED_PHY is not set
639# CONFIG_MDIO_BITBANG is not set 649# CONFIG_MDIO_BITBANG is not set
640CONFIG_NET_ETHERNET=y 650CONFIG_NET_ETHERNET=y
@@ -679,6 +689,7 @@ CONFIG_GIANFAR=y
679# CONFIG_JME is not set 689# CONFIG_JME is not set
680CONFIG_NETDEV_10000=y 690CONFIG_NETDEV_10000=y
681# CONFIG_CHELSIO_T1 is not set 691# CONFIG_CHELSIO_T1 is not set
692CONFIG_CHELSIO_T3_DEPENDS=y
682# CONFIG_CHELSIO_T3 is not set 693# CONFIG_CHELSIO_T3 is not set
683# CONFIG_ENIC is not set 694# CONFIG_ENIC is not set
684# CONFIG_IXGBE is not set 695# CONFIG_IXGBE is not set
@@ -703,6 +714,10 @@ CONFIG_NETDEV_10000=y
703# CONFIG_IWLWIFI_LEDS is not set 714# CONFIG_IWLWIFI_LEDS is not set
704 715
705# 716#
717# Enable WiMAX (Networking options) to see the WiMAX drivers
718#
719
720#
706# USB Network Adapters 721# USB Network Adapters
707# 722#
708# CONFIG_USB_CATC is not set 723# CONFIG_USB_CATC is not set
@@ -794,6 +809,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
794# CONFIG_SERIAL_JSM is not set 809# CONFIG_SERIAL_JSM is not set
795# CONFIG_SERIAL_OF_PLATFORM is not set 810# CONFIG_SERIAL_OF_PLATFORM is not set
796CONFIG_UNIX98_PTYS=y 811CONFIG_UNIX98_PTYS=y
812# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
797CONFIG_LEGACY_PTYS=y 813CONFIG_LEGACY_PTYS=y
798CONFIG_LEGACY_PTY_COUNT=256 814CONFIG_LEGACY_PTY_COUNT=256
799# CONFIG_HVC_UDBG is not set 815# CONFIG_HVC_UDBG is not set
@@ -895,10 +911,12 @@ CONFIG_SSB_POSSIBLE=y
895# CONFIG_MFD_CORE is not set 911# CONFIG_MFD_CORE is not set
896# CONFIG_MFD_SM501 is not set 912# CONFIG_MFD_SM501 is not set
897# CONFIG_HTC_PASIC3 is not set 913# CONFIG_HTC_PASIC3 is not set
914# CONFIG_TWL4030_CORE is not set
898# CONFIG_MFD_TMIO is not set 915# CONFIG_MFD_TMIO is not set
899# CONFIG_PMIC_DA903X is not set 916# CONFIG_PMIC_DA903X is not set
900# CONFIG_MFD_WM8400 is not set 917# CONFIG_MFD_WM8400 is not set
901# CONFIG_MFD_WM8350_I2C is not set 918# CONFIG_MFD_WM8350_I2C is not set
919# CONFIG_MFD_PCF50633 is not set
902# CONFIG_REGULATOR is not set 920# CONFIG_REGULATOR is not set
903 921
904# 922#
@@ -926,6 +944,7 @@ CONFIG_MEDIA_TUNER_TEA5767=m
926CONFIG_MEDIA_TUNER_MT20XX=m 944CONFIG_MEDIA_TUNER_MT20XX=m
927CONFIG_MEDIA_TUNER_XC2028=m 945CONFIG_MEDIA_TUNER_XC2028=m
928CONFIG_MEDIA_TUNER_XC5000=m 946CONFIG_MEDIA_TUNER_XC5000=m
947# CONFIG_DVB_DYNAMIC_MINORS is not set
929CONFIG_DVB_CAPTURE_DRIVERS=y 948CONFIG_DVB_CAPTURE_DRIVERS=y
930 949
931# 950#
@@ -971,6 +990,12 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
971# CONFIG_DVB_FE_CUSTOMISE is not set 990# CONFIG_DVB_FE_CUSTOMISE is not set
972 991
973# 992#
993# Multistandard (satellite) frontends
994#
995# CONFIG_DVB_STB0899 is not set
996# CONFIG_DVB_STB6100 is not set
997
998#
974# DVB-S (satellite) frontends 999# DVB-S (satellite) frontends
975# 1000#
976# CONFIG_DVB_CX24110 is not set 1001# CONFIG_DVB_CX24110 is not set
@@ -982,8 +1007,10 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
982# CONFIG_DVB_STV0299 is not set 1007# CONFIG_DVB_STV0299 is not set
983# CONFIG_DVB_TDA8083 is not set 1008# CONFIG_DVB_TDA8083 is not set
984# CONFIG_DVB_TDA10086 is not set 1009# CONFIG_DVB_TDA10086 is not set
1010# CONFIG_DVB_TDA8261 is not set
985# CONFIG_DVB_VES1X93 is not set 1011# CONFIG_DVB_VES1X93 is not set
986# CONFIG_DVB_TUNER_ITD1000 is not set 1012# CONFIG_DVB_TUNER_ITD1000 is not set
1013# CONFIG_DVB_TUNER_CX24113 is not set
987# CONFIG_DVB_TDA826X is not set 1014# CONFIG_DVB_TDA826X is not set
988# CONFIG_DVB_TUA6100 is not set 1015# CONFIG_DVB_TUA6100 is not set
989# CONFIG_DVB_CX24116 is not set 1016# CONFIG_DVB_CX24116 is not set
@@ -1024,11 +1051,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
1024# CONFIG_DVB_OR51132 is not set 1051# CONFIG_DVB_OR51132 is not set
1025# CONFIG_DVB_BCM3510 is not set 1052# CONFIG_DVB_BCM3510 is not set
1026# CONFIG_DVB_LGDT330X is not set 1053# CONFIG_DVB_LGDT330X is not set
1054# CONFIG_DVB_LGDT3304 is not set
1027# CONFIG_DVB_S5H1409 is not set 1055# CONFIG_DVB_S5H1409 is not set
1028# CONFIG_DVB_AU8522 is not set 1056# CONFIG_DVB_AU8522 is not set
1029# CONFIG_DVB_S5H1411 is not set 1057# CONFIG_DVB_S5H1411 is not set
1030 1058
1031# 1059#
1060# ISDB-T (terrestrial) frontends
1061#
1062# CONFIG_DVB_S921 is not set
1063
1064#
1032# Digital terrestrial only tuners/PLL 1065# Digital terrestrial only tuners/PLL
1033# 1066#
1034# CONFIG_DVB_PLL is not set 1067# CONFIG_DVB_PLL is not set
@@ -1081,6 +1114,7 @@ CONFIG_SND_OSSEMUL=y
1081CONFIG_SND_MIXER_OSS=y 1114CONFIG_SND_MIXER_OSS=y
1082CONFIG_SND_PCM_OSS=y 1115CONFIG_SND_PCM_OSS=y
1083CONFIG_SND_PCM_OSS_PLUGINS=y 1116CONFIG_SND_PCM_OSS_PLUGINS=y
1117# CONFIG_SND_HRTIMER is not set
1084# CONFIG_SND_DYNAMIC_MINORS is not set 1118# CONFIG_SND_DYNAMIC_MINORS is not set
1085# CONFIG_SND_SUPPORT_OLD_API is not set 1119# CONFIG_SND_SUPPORT_OLD_API is not set
1086CONFIG_SND_VERBOSE_PROCFS=y 1120CONFIG_SND_VERBOSE_PROCFS=y
@@ -1183,11 +1217,9 @@ CONFIG_HID_COMPAT=y
1183CONFIG_HID_A4TECH=y 1217CONFIG_HID_A4TECH=y
1184CONFIG_HID_APPLE=y 1218CONFIG_HID_APPLE=y
1185CONFIG_HID_BELKIN=y 1219CONFIG_HID_BELKIN=y
1186CONFIG_HID_BRIGHT=y
1187CONFIG_HID_CHERRY=y 1220CONFIG_HID_CHERRY=y
1188CONFIG_HID_CHICONY=y 1221CONFIG_HID_CHICONY=y
1189CONFIG_HID_CYPRESS=y 1222CONFIG_HID_CYPRESS=y
1190CONFIG_HID_DELL=y
1191CONFIG_HID_EZKEY=y 1223CONFIG_HID_EZKEY=y
1192CONFIG_HID_GYRATION=y 1224CONFIG_HID_GYRATION=y
1193CONFIG_HID_LOGITECH=y 1225CONFIG_HID_LOGITECH=y
@@ -1195,12 +1227,15 @@ CONFIG_HID_LOGITECH=y
1195# CONFIG_LOGIRUMBLEPAD2_FF is not set 1227# CONFIG_LOGIRUMBLEPAD2_FF is not set
1196CONFIG_HID_MICROSOFT=y 1228CONFIG_HID_MICROSOFT=y
1197CONFIG_HID_MONTEREY=y 1229CONFIG_HID_MONTEREY=y
1230# CONFIG_HID_NTRIG is not set
1198CONFIG_HID_PANTHERLORD=y 1231CONFIG_HID_PANTHERLORD=y
1199# CONFIG_PANTHERLORD_FF is not set 1232# CONFIG_PANTHERLORD_FF is not set
1200CONFIG_HID_PETALYNX=y 1233CONFIG_HID_PETALYNX=y
1201CONFIG_HID_SAMSUNG=y 1234CONFIG_HID_SAMSUNG=y
1202CONFIG_HID_SONY=y 1235CONFIG_HID_SONY=y
1203CONFIG_HID_SUNPLUS=y 1236CONFIG_HID_SUNPLUS=y
1237# CONFIG_GREENASIA_FF is not set
1238# CONFIG_HID_TOPSEED is not set
1204CONFIG_THRUSTMASTER_FF=m 1239CONFIG_THRUSTMASTER_FF=m
1205CONFIG_ZEROPLUS_FF=m 1240CONFIG_ZEROPLUS_FF=m
1206CONFIG_USB_SUPPORT=y 1241CONFIG_USB_SUPPORT=y
@@ -1233,6 +1268,7 @@ CONFIG_USB_EHCI_HCD=y
1233# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1268# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1234# CONFIG_USB_EHCI_FSL is not set 1269# CONFIG_USB_EHCI_FSL is not set
1235CONFIG_USB_EHCI_HCD_PPC_OF=y 1270CONFIG_USB_EHCI_HCD_PPC_OF=y
1271# CONFIG_USB_OXU210HP_HCD is not set
1236# CONFIG_USB_ISP116X_HCD is not set 1272# CONFIG_USB_ISP116X_HCD is not set
1237# CONFIG_USB_ISP1760_HCD is not set 1273# CONFIG_USB_ISP1760_HCD is not set
1238CONFIG_USB_OHCI_HCD=y 1274CONFIG_USB_OHCI_HCD=y
@@ -1269,7 +1305,6 @@ CONFIG_USB_STORAGE=y
1269# CONFIG_USB_STORAGE_DATAFAB is not set 1305# CONFIG_USB_STORAGE_DATAFAB is not set
1270# CONFIG_USB_STORAGE_FREECOM is not set 1306# CONFIG_USB_STORAGE_FREECOM is not set
1271# CONFIG_USB_STORAGE_ISD200 is not set 1307# CONFIG_USB_STORAGE_ISD200 is not set
1272# CONFIG_USB_STORAGE_DPCM is not set
1273# CONFIG_USB_STORAGE_USBAT is not set 1308# CONFIG_USB_STORAGE_USBAT is not set
1274# CONFIG_USB_STORAGE_SDDR09 is not set 1309# CONFIG_USB_STORAGE_SDDR09 is not set
1275# CONFIG_USB_STORAGE_SDDR55 is not set 1310# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1317,6 +1352,10 @@ CONFIG_USB_STORAGE=y
1317# CONFIG_USB_ISIGHTFW is not set 1352# CONFIG_USB_ISIGHTFW is not set
1318# CONFIG_USB_VST is not set 1353# CONFIG_USB_VST is not set
1319# CONFIG_USB_GADGET is not set 1354# CONFIG_USB_GADGET is not set
1355
1356#
1357# OTG and related infrastructure
1358#
1320# CONFIG_UWB is not set 1359# CONFIG_UWB is not set
1321# CONFIG_MMC is not set 1360# CONFIG_MMC is not set
1322# CONFIG_MEMSTICK is not set 1361# CONFIG_MEMSTICK is not set
@@ -1401,7 +1440,9 @@ CONFIG_FS_MBCACHE=y
1401# CONFIG_FS_POSIX_ACL is not set 1440# CONFIG_FS_POSIX_ACL is not set
1402CONFIG_FILE_LOCKING=y 1441CONFIG_FILE_LOCKING=y
1403# CONFIG_XFS_FS is not set 1442# CONFIG_XFS_FS is not set
1443# CONFIG_GFS2_FS is not set
1404# CONFIG_OCFS2_FS is not set 1444# CONFIG_OCFS2_FS is not set
1445# CONFIG_BTRFS_FS is not set
1405CONFIG_DNOTIFY=y 1446CONFIG_DNOTIFY=y
1406CONFIG_INOTIFY=y 1447CONFIG_INOTIFY=y
1407CONFIG_INOTIFY_USER=y 1448CONFIG_INOTIFY_USER=y
@@ -1443,10 +1484,7 @@ CONFIG_TMPFS=y
1443# CONFIG_TMPFS_POSIX_ACL is not set 1484# CONFIG_TMPFS_POSIX_ACL is not set
1444# CONFIG_HUGETLB_PAGE is not set 1485# CONFIG_HUGETLB_PAGE is not set
1445# CONFIG_CONFIGFS_FS is not set 1486# CONFIG_CONFIGFS_FS is not set
1446 1487CONFIG_MISC_FILESYSTEMS=y
1447#
1448# Miscellaneous filesystems
1449#
1450CONFIG_ADFS_FS=m 1488CONFIG_ADFS_FS=m
1451# CONFIG_ADFS_FS_RW is not set 1489# CONFIG_ADFS_FS_RW is not set
1452CONFIG_AFFS_FS=m 1490CONFIG_AFFS_FS=m
@@ -1457,6 +1495,7 @@ CONFIG_BEFS_FS=m
1457CONFIG_BFS_FS=m 1495CONFIG_BFS_FS=m
1458CONFIG_EFS_FS=m 1496CONFIG_EFS_FS=m
1459CONFIG_CRAMFS=y 1497CONFIG_CRAMFS=y
1498# CONFIG_SQUASHFS is not set
1460CONFIG_VXFS_FS=m 1499CONFIG_VXFS_FS=m
1461# CONFIG_MINIX_FS is not set 1500# CONFIG_MINIX_FS is not set
1462# CONFIG_OMFS_FS is not set 1501# CONFIG_OMFS_FS is not set
@@ -1558,6 +1597,7 @@ CONFIG_NLS_UTF8=m
1558# Library routines 1597# Library routines
1559# 1598#
1560CONFIG_BITREVERSE=y 1599CONFIG_BITREVERSE=y
1600CONFIG_GENERIC_FIND_LAST_BIT=y
1561# CONFIG_CRC_CCITT is not set 1601# CONFIG_CRC_CCITT is not set
1562# CONFIG_CRC16 is not set 1602# CONFIG_CRC16 is not set
1563CONFIG_CRC_T10DIF=y 1603CONFIG_CRC_T10DIF=y
@@ -1609,6 +1649,7 @@ CONFIG_DEBUG_INFO=y
1609# CONFIG_DEBUG_MEMORY_INIT is not set 1649# CONFIG_DEBUG_MEMORY_INIT is not set
1610# CONFIG_DEBUG_LIST is not set 1650# CONFIG_DEBUG_LIST is not set
1611# CONFIG_DEBUG_SG is not set 1651# CONFIG_DEBUG_SG is not set
1652# CONFIG_DEBUG_NOTIFIERS is not set
1612# CONFIG_BOOT_PRINTK_DELAY is not set 1653# CONFIG_BOOT_PRINTK_DELAY is not set
1613# CONFIG_RCU_TORTURE_TEST is not set 1654# CONFIG_RCU_TORTURE_TEST is not set
1614# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1655# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1618,6 +1659,8 @@ CONFIG_DEBUG_INFO=y
1618# CONFIG_LATENCYTOP is not set 1659# CONFIG_LATENCYTOP is not set
1619CONFIG_SYSCTL_SYSCALL_CHECK=y 1660CONFIG_SYSCTL_SYSCALL_CHECK=y
1620CONFIG_HAVE_FUNCTION_TRACER=y 1661CONFIG_HAVE_FUNCTION_TRACER=y
1662CONFIG_HAVE_DYNAMIC_FTRACE=y
1663CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1621 1664
1622# 1665#
1623# Tracers 1666# Tracers
@@ -1626,6 +1669,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1626# CONFIG_SCHED_TRACER is not set 1669# CONFIG_SCHED_TRACER is not set
1627# CONFIG_CONTEXT_SWITCH_TRACER is not set 1670# CONFIG_CONTEXT_SWITCH_TRACER is not set
1628# CONFIG_BOOT_TRACER is not set 1671# CONFIG_BOOT_TRACER is not set
1672# CONFIG_TRACE_BRANCH_PROFILING is not set
1629# CONFIG_STACK_TRACER is not set 1673# CONFIG_STACK_TRACER is not set
1630# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1674# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1631# CONFIG_SAMPLES is not set 1675# CONFIG_SAMPLES is not set
@@ -1700,7 +1744,7 @@ CONFIG_CRYPTO_HMAC=y
1700# 1744#
1701# Digest 1745# Digest
1702# 1746#
1703# CONFIG_CRYPTO_CRC32C is not set 1747CONFIG_CRYPTO_CRC32C=m
1704# CONFIG_CRYPTO_MD4 is not set 1748# CONFIG_CRYPTO_MD4 is not set
1705CONFIG_CRYPTO_MD5=y 1749CONFIG_CRYPTO_MD5=y
1706# CONFIG_CRYPTO_MICHAEL_MIC is not set 1750# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
index 8769359dfe6a..f95961c04a20 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:14 2008 4# Mon Jan 26 15:36:13 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,7 +21,9 @@ CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y 21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
24# CONFIG_PPC_MM_SLICES is not set 25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
25CONFIG_PPC32=y 27CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 28CONFIG_WORD_SIZE=32
27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -45,7 +47,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
45CONFIG_PPC=y 47CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 48CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 49CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 50CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 51CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 52CONFIG_PPC_OF=y
51CONFIG_OF=y 53CONFIG_OF=y
@@ -75,12 +77,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 77# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 78# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 79CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 80CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 81# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 82# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 83CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 84# CONFIG_CGROUP_SCHED is not set
85# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 86CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 87CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 88# CONFIG_RELAY is not set
@@ -115,7 +117,6 @@ CONFIG_SLUB_DEBUG=y
115CONFIG_SLUB=y 117CONFIG_SLUB=y
116# CONFIG_SLOB is not set 118# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set 119# CONFIG_PROFILING is not set
118# CONFIG_MARKERS is not set
119CONFIG_HAVE_OPROFILE=y 120CONFIG_HAVE_OPROFILE=y
120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
121CONFIG_HAVE_IOREMAP_PROT=y 122CONFIG_HAVE_IOREMAP_PROT=y
@@ -125,13 +126,11 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
126CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
127CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
128# CONFIG_TINY_SHMEM is not set
129CONFIG_BASE_SMALL=0 129CONFIG_BASE_SMALL=0
130# CONFIG_MODULES is not set 130# CONFIG_MODULES is not set
131CONFIG_BLOCK=y 131CONFIG_BLOCK=y
132# CONFIG_LBD is not set 132# CONFIG_LBD is not set
133# CONFIG_BLK_DEV_IO_TRACE is not set 133# CONFIG_BLK_DEV_IO_TRACE is not set
134# CONFIG_LSF is not set
135# CONFIG_BLK_DEV_BSG is not set 134# CONFIG_BLK_DEV_BSG is not set
136# CONFIG_BLK_DEV_INTEGRITY is not set 135# CONFIG_BLK_DEV_INTEGRITY is not set
137 136
@@ -148,6 +147,10 @@ CONFIG_DEFAULT_AS=y
148# CONFIG_DEFAULT_NOOP is not set 147# CONFIG_DEFAULT_NOOP is not set
149CONFIG_DEFAULT_IOSCHED="anticipatory" 148CONFIG_DEFAULT_IOSCHED="anticipatory"
150CONFIG_CLASSIC_RCU=y 149CONFIG_CLASSIC_RCU=y
150# CONFIG_TREE_RCU is not set
151# CONFIG_PREEMPT_RCU is not set
152# CONFIG_TREE_RCU_TRACE is not set
153# CONFIG_PREEMPT_RCU_TRACE is not set
151# CONFIG_FREEZER is not set 154# CONFIG_FREEZER is not set
152 155
153# 156#
@@ -187,6 +190,7 @@ CONFIG_PPC_I8259=y
187# CONFIG_CPM2 is not set 190# CONFIG_CPM2 is not set
188# CONFIG_FSL_ULI1575 is not set 191# CONFIG_FSL_ULI1575 is not set
189# CONFIG_MPC8xxx_GPIO is not set 192# CONFIG_MPC8xxx_GPIO is not set
193# CONFIG_SIMPLE_GPIO is not set
190 194
191# 195#
192# Kernel options 196# Kernel options
@@ -225,12 +229,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
225CONFIG_PAGEFLAGS_EXTENDED=y 229CONFIG_PAGEFLAGS_EXTENDED=y
226CONFIG_SPLIT_PTLOCK_CPUS=4 230CONFIG_SPLIT_PTLOCK_CPUS=4
227CONFIG_MIGRATION=y 231CONFIG_MIGRATION=y
228# CONFIG_RESOURCES_64BIT is not set
229# CONFIG_PHYS_ADDR_T_64BIT is not set 232# CONFIG_PHYS_ADDR_T_64BIT is not set
230CONFIG_ZONE_DMA_FLAG=1 233CONFIG_ZONE_DMA_FLAG=1
231CONFIG_BOUNCE=y 234CONFIG_BOUNCE=y
232CONFIG_VIRT_TO_BUS=y 235CONFIG_VIRT_TO_BUS=y
233CONFIG_UNEVICTABLE_LRU=y 236CONFIG_UNEVICTABLE_LRU=y
237CONFIG_PPC_4K_PAGES=y
238# CONFIG_PPC_16K_PAGES is not set
239# CONFIG_PPC_64K_PAGES is not set
234CONFIG_FORCE_MAX_ZONEORDER=11 240CONFIG_FORCE_MAX_ZONEORDER=11
235CONFIG_PROC_DEVICETREE=y 241CONFIG_PROC_DEVICETREE=y
236# CONFIG_CMDLINE_BOOL is not set 242# CONFIG_CMDLINE_BOOL is not set
@@ -255,6 +261,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
255# CONFIG_PCI_MSI is not set 261# CONFIG_PCI_MSI is not set
256# CONFIG_PCI_LEGACY is not set 262# CONFIG_PCI_LEGACY is not set
257# CONFIG_PCI_DEBUG is not set 263# CONFIG_PCI_DEBUG is not set
264# CONFIG_PCI_STUB is not set
258# CONFIG_PCCARD is not set 265# CONFIG_PCCARD is not set
259# CONFIG_HOTPLUG_PCI is not set 266# CONFIG_HOTPLUG_PCI is not set
260# CONFIG_HAS_RAPIDIO is not set 267# CONFIG_HAS_RAPIDIO is not set
@@ -278,6 +285,7 @@ CONFIG_NET=y
278# 285#
279# Networking options 286# Networking options
280# 287#
288CONFIG_COMPAT_NET_DEV_OPS=y
281CONFIG_PACKET=y 289CONFIG_PACKET=y
282# CONFIG_PACKET_MMAP is not set 290# CONFIG_PACKET_MMAP is not set
283CONFIG_UNIX=y 291CONFIG_UNIX=y
@@ -334,6 +342,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
334# CONFIG_ECONET is not set 342# CONFIG_ECONET is not set
335# CONFIG_WAN_ROUTER is not set 343# CONFIG_WAN_ROUTER is not set
336# CONFIG_NET_SCHED is not set 344# CONFIG_NET_SCHED is not set
345# CONFIG_DCB is not set
337 346
338# 347#
339# Network testing 348# Network testing
@@ -349,8 +358,9 @@ CONFIG_WIRELESS=y
349# CONFIG_CFG80211 is not set 358# CONFIG_CFG80211 is not set
350CONFIG_WIRELESS_OLD_REGULATORY=y 359CONFIG_WIRELESS_OLD_REGULATORY=y
351# CONFIG_WIRELESS_EXT is not set 360# CONFIG_WIRELESS_EXT is not set
361# CONFIG_LIB80211 is not set
352# CONFIG_MAC80211 is not set 362# CONFIG_MAC80211 is not set
353# CONFIG_IEEE80211 is not set 363# CONFIG_WIMAX is not set
354# CONFIG_RFKILL is not set 364# CONFIG_RFKILL is not set
355# CONFIG_NET_9P is not set 365# CONFIG_NET_9P is not set
356 366
@@ -397,6 +407,7 @@ CONFIG_MISC_DEVICES=y
397# CONFIG_TIFM_CORE is not set 407# CONFIG_TIFM_CORE is not set
398# CONFIG_ENCLOSURE_SERVICES is not set 408# CONFIG_ENCLOSURE_SERVICES is not set
399# CONFIG_HP_ILO is not set 409# CONFIG_HP_ILO is not set
410# CONFIG_C2PORT is not set
400CONFIG_HAVE_IDE=y 411CONFIG_HAVE_IDE=y
401CONFIG_IDE=y 412CONFIG_IDE=y
402 413
@@ -439,6 +450,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
439# CONFIG_BLK_DEV_JMICRON is not set 450# CONFIG_BLK_DEV_JMICRON is not set
440# CONFIG_BLK_DEV_SC1200 is not set 451# CONFIG_BLK_DEV_SC1200 is not set
441# CONFIG_BLK_DEV_PIIX is not set 452# CONFIG_BLK_DEV_PIIX is not set
453# CONFIG_BLK_DEV_IT8172 is not set
442# CONFIG_BLK_DEV_IT8213 is not set 454# CONFIG_BLK_DEV_IT8213 is not set
443# CONFIG_BLK_DEV_IT821X is not set 455# CONFIG_BLK_DEV_IT821X is not set
444# CONFIG_BLK_DEV_NS87415 is not set 456# CONFIG_BLK_DEV_NS87415 is not set
@@ -498,6 +510,9 @@ CONFIG_PHYLIB=y
498# CONFIG_BROADCOM_PHY is not set 510# CONFIG_BROADCOM_PHY is not set
499# CONFIG_ICPLUS_PHY is not set 511# CONFIG_ICPLUS_PHY is not set
500# CONFIG_REALTEK_PHY is not set 512# CONFIG_REALTEK_PHY is not set
513# CONFIG_NATIONAL_PHY is not set
514# CONFIG_STE10XP is not set
515# CONFIG_LSI_ET1011C_PHY is not set
501# CONFIG_FIXED_PHY is not set 516# CONFIG_FIXED_PHY is not set
502# CONFIG_MDIO_BITBANG is not set 517# CONFIG_MDIO_BITBANG is not set
503CONFIG_NET_ETHERNET=y 518CONFIG_NET_ETHERNET=y
@@ -542,6 +557,7 @@ CONFIG_GIANFAR=y
542# CONFIG_JME is not set 557# CONFIG_JME is not set
543CONFIG_NETDEV_10000=y 558CONFIG_NETDEV_10000=y
544# CONFIG_CHELSIO_T1 is not set 559# CONFIG_CHELSIO_T1 is not set
560CONFIG_CHELSIO_T3_DEPENDS=y
545# CONFIG_CHELSIO_T3 is not set 561# CONFIG_CHELSIO_T3 is not set
546# CONFIG_ENIC is not set 562# CONFIG_ENIC is not set
547# CONFIG_IXGBE is not set 563# CONFIG_IXGBE is not set
@@ -564,6 +580,10 @@ CONFIG_NETDEV_10000=y
564# CONFIG_WLAN_PRE80211 is not set 580# CONFIG_WLAN_PRE80211 is not set
565# CONFIG_WLAN_80211 is not set 581# CONFIG_WLAN_80211 is not set
566# CONFIG_IWLWIFI_LEDS is not set 582# CONFIG_IWLWIFI_LEDS is not set
583
584#
585# Enable WiMAX (Networking options) to see the WiMAX drivers
586#
567# CONFIG_WAN is not set 587# CONFIG_WAN is not set
568# CONFIG_FDDI is not set 588# CONFIG_FDDI is not set
569# CONFIG_HIPPI is not set 589# CONFIG_HIPPI is not set
@@ -634,8 +654,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
634# CONFIG_SERIAL_JSM is not set 654# CONFIG_SERIAL_JSM is not set
635# CONFIG_SERIAL_OF_PLATFORM is not set 655# CONFIG_SERIAL_OF_PLATFORM is not set
636CONFIG_UNIX98_PTYS=y 656CONFIG_UNIX98_PTYS=y
657# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
637CONFIG_LEGACY_PTYS=y 658CONFIG_LEGACY_PTYS=y
638CONFIG_LEGACY_PTY_COUNT=256 659CONFIG_LEGACY_PTY_COUNT=256
660# CONFIG_HVC_UDBG is not set
639# CONFIG_IPMI_HANDLER is not set 661# CONFIG_IPMI_HANDLER is not set
640# CONFIG_HW_RANDOM is not set 662# CONFIG_HW_RANDOM is not set
641# CONFIG_NVRAM is not set 663# CONFIG_NVRAM is not set
@@ -672,11 +694,11 @@ CONFIG_HWMON=y
672# CONFIG_THERMAL is not set 694# CONFIG_THERMAL is not set
673# CONFIG_THERMAL_HWMON is not set 695# CONFIG_THERMAL_HWMON is not set
674# CONFIG_WATCHDOG is not set 696# CONFIG_WATCHDOG is not set
697CONFIG_SSB_POSSIBLE=y
675 698
676# 699#
677# Sonics Silicon Backplane 700# Sonics Silicon Backplane
678# 701#
679CONFIG_SSB_POSSIBLE=y
680# CONFIG_SSB is not set 702# CONFIG_SSB is not set
681 703
682# 704#
@@ -686,14 +708,7 @@ CONFIG_SSB_POSSIBLE=y
686# CONFIG_MFD_SM501 is not set 708# CONFIG_MFD_SM501 is not set
687# CONFIG_HTC_PASIC3 is not set 709# CONFIG_HTC_PASIC3 is not set
688# CONFIG_MFD_TMIO is not set 710# CONFIG_MFD_TMIO is not set
689
690#
691# Voltage and Current regulators
692#
693# CONFIG_REGULATOR is not set 711# 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 712
698# 713#
699# Multimedia devices 714# Multimedia devices
@@ -749,9 +764,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
749# 764#
750 765
751# 766#
752# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 767# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
753# 768#
754# CONFIG_USB_GADGET is not set 769# CONFIG_USB_GADGET is not set
770
771#
772# OTG and related infrastructure
773#
755# CONFIG_UWB is not set 774# CONFIG_UWB is not set
756# CONFIG_MMC is not set 775# CONFIG_MMC is not set
757# CONFIG_MEMSTICK is not set 776# CONFIG_MEMSTICK is not set
@@ -783,6 +802,7 @@ CONFIG_FS_MBCACHE=y
783CONFIG_FILE_LOCKING=y 802CONFIG_FILE_LOCKING=y
784# CONFIG_XFS_FS is not set 803# CONFIG_XFS_FS is not set
785# CONFIG_OCFS2_FS is not set 804# CONFIG_OCFS2_FS is not set
805# CONFIG_BTRFS_FS is not set
786CONFIG_DNOTIFY=y 806CONFIG_DNOTIFY=y
787CONFIG_INOTIFY=y 807CONFIG_INOTIFY=y
788CONFIG_INOTIFY_USER=y 808CONFIG_INOTIFY_USER=y
@@ -816,10 +836,7 @@ CONFIG_TMPFS=y
816# CONFIG_TMPFS_POSIX_ACL is not set 836# CONFIG_TMPFS_POSIX_ACL is not set
817# CONFIG_HUGETLB_PAGE is not set 837# CONFIG_HUGETLB_PAGE is not set
818# CONFIG_CONFIGFS_FS is not set 838# CONFIG_CONFIGFS_FS is not set
819 839CONFIG_MISC_FILESYSTEMS=y
820#
821# Miscellaneous filesystems
822#
823# CONFIG_ADFS_FS is not set 840# CONFIG_ADFS_FS is not set
824# CONFIG_AFFS_FS is not set 841# CONFIG_AFFS_FS is not set
825# CONFIG_HFS_FS is not set 842# CONFIG_HFS_FS is not set
@@ -828,6 +845,7 @@ CONFIG_TMPFS=y
828# CONFIG_BFS_FS is not set 845# CONFIG_BFS_FS is not set
829# CONFIG_EFS_FS is not set 846# CONFIG_EFS_FS is not set
830# CONFIG_CRAMFS is not set 847# CONFIG_CRAMFS is not set
848# CONFIG_SQUASHFS is not set
831# CONFIG_VXFS_FS is not set 849# CONFIG_VXFS_FS is not set
832# CONFIG_MINIX_FS is not set 850# CONFIG_MINIX_FS is not set
833# CONFIG_OMFS_FS is not set 851# CONFIG_OMFS_FS is not set
@@ -878,6 +896,7 @@ CONFIG_PARTITION_ADVANCED=y
878# Library routines 896# Library routines
879# 897#
880CONFIG_BITREVERSE=y 898CONFIG_BITREVERSE=y
899CONFIG_GENERIC_FIND_LAST_BIT=y
881# CONFIG_CRC_CCITT is not set 900# CONFIG_CRC_CCITT is not set
882# CONFIG_CRC16 is not set 901# CONFIG_CRC16 is not set
883# CONFIG_CRC_T10DIF is not set 902# CONFIG_CRC_T10DIF is not set
@@ -927,6 +946,7 @@ CONFIG_DEBUG_MUTEXES=y
927# CONFIG_DEBUG_MEMORY_INIT is not set 946# CONFIG_DEBUG_MEMORY_INIT is not set
928# CONFIG_DEBUG_LIST is not set 947# CONFIG_DEBUG_LIST is not set
929# CONFIG_DEBUG_SG is not set 948# CONFIG_DEBUG_SG is not set
949# CONFIG_DEBUG_NOTIFIERS is not set
930# CONFIG_BOOT_PRINTK_DELAY is not set 950# CONFIG_BOOT_PRINTK_DELAY is not set
931# CONFIG_RCU_TORTURE_TEST is not set 951# CONFIG_RCU_TORTURE_TEST is not set
932# CONFIG_RCU_CPU_STALL_DETECTOR is not set 952# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -936,6 +956,8 @@ CONFIG_DEBUG_MUTEXES=y
936# CONFIG_LATENCYTOP is not set 956# CONFIG_LATENCYTOP is not set
937CONFIG_SYSCTL_SYSCALL_CHECK=y 957CONFIG_SYSCTL_SYSCALL_CHECK=y
938CONFIG_HAVE_FUNCTION_TRACER=y 958CONFIG_HAVE_FUNCTION_TRACER=y
959CONFIG_HAVE_DYNAMIC_FTRACE=y
960CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
939 961
940# 962#
941# Tracers 963# Tracers
@@ -944,11 +966,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
944# CONFIG_SCHED_TRACER is not set 966# CONFIG_SCHED_TRACER is not set
945# CONFIG_CONTEXT_SWITCH_TRACER is not set 967# CONFIG_CONTEXT_SWITCH_TRACER is not set
946# CONFIG_BOOT_TRACER is not set 968# CONFIG_BOOT_TRACER is not set
969# CONFIG_TRACE_BRANCH_PROFILING is not set
947# CONFIG_STACK_TRACER is not set 970# CONFIG_STACK_TRACER is not set
948# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 971# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
949# CONFIG_SAMPLES is not set 972# CONFIG_SAMPLES is not set
950CONFIG_HAVE_ARCH_KGDB=y 973CONFIG_HAVE_ARCH_KGDB=y
951# CONFIG_KGDB is not set 974# CONFIG_KGDB is not set
975CONFIG_PRINT_STACK_DEPTH=64
952# CONFIG_DEBUG_STACKOVERFLOW is not set 976# CONFIG_DEBUG_STACKOVERFLOW is not set
953# CONFIG_DEBUG_STACK_USAGE is not set 977# CONFIG_DEBUG_STACK_USAGE is not set
954# CONFIG_DEBUG_PAGEALLOC is not set 978# CONFIG_DEBUG_PAGEALLOC is not set
@@ -974,6 +998,7 @@ CONFIG_CRYPTO=y
974# 998#
975# CONFIG_CRYPTO_FIPS is not set 999# CONFIG_CRYPTO_FIPS is not set
976# CONFIG_CRYPTO_MANAGER is not set 1000# CONFIG_CRYPTO_MANAGER is not set
1001# CONFIG_CRYPTO_MANAGER2 is not set
977# CONFIG_CRYPTO_GF128MUL is not set 1002# CONFIG_CRYPTO_GF128MUL is not set
978# CONFIG_CRYPTO_NULL is not set 1003# CONFIG_CRYPTO_NULL is not set
979# CONFIG_CRYPTO_CRYPTD is not set 1004# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig
index bfe3c9731573..e68e80987aa9 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:16 2008 4# Mon Jan 26 15:36:15 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,7 +21,9 @@ CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y 21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
24# CONFIG_PPC_MM_SLICES is not set 25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
25CONFIG_PPC32=y 27CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 28CONFIG_WORD_SIZE=32
27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -45,7 +47,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
45CONFIG_PPC=y 47CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 48CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 49CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 50CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 51CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 52CONFIG_PPC_OF=y
51CONFIG_OF=y 53CONFIG_OF=y
@@ -75,12 +77,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 77# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 78# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 79CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 80CONFIG_GROUP_SCHED=y
80CONFIG_FAIR_GROUP_SCHED=y 81CONFIG_FAIR_GROUP_SCHED=y
81# CONFIG_RT_GROUP_SCHED is not set 82# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 83CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 84# CONFIG_CGROUP_SCHED is not set
85# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 86CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 87CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 88# CONFIG_RELAY is not set
@@ -113,7 +115,6 @@ CONFIG_SLAB=y
113# CONFIG_SLUB is not set 115# CONFIG_SLUB is not set
114# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 117# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 120CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,13 +124,11 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 127CONFIG_BASE_SMALL=0
128# CONFIG_MODULES is not set 128# CONFIG_MODULES is not set
129CONFIG_BLOCK=y 129CONFIG_BLOCK=y
130# CONFIG_LBD is not set 130# CONFIG_LBD is not set
131# CONFIG_BLK_DEV_IO_TRACE is not set 131# CONFIG_BLK_DEV_IO_TRACE is not set
132# CONFIG_LSF is not set
133# CONFIG_BLK_DEV_BSG is not set 132# CONFIG_BLK_DEV_BSG is not set
134# CONFIG_BLK_DEV_INTEGRITY is not set 133# CONFIG_BLK_DEV_INTEGRITY is not set
135 134
@@ -146,6 +145,10 @@ CONFIG_DEFAULT_AS=y
146# CONFIG_DEFAULT_NOOP is not set 145# CONFIG_DEFAULT_NOOP is not set
147CONFIG_DEFAULT_IOSCHED="anticipatory" 146CONFIG_DEFAULT_IOSCHED="anticipatory"
148CONFIG_CLASSIC_RCU=y 147CONFIG_CLASSIC_RCU=y
148# CONFIG_TREE_RCU is not set
149# CONFIG_PREEMPT_RCU is not set
150# CONFIG_TREE_RCU_TRACE is not set
151# CONFIG_PREEMPT_RCU_TRACE is not set
149# CONFIG_FREEZER is not set 152# CONFIG_FREEZER is not set
150 153
151# 154#
@@ -185,6 +188,7 @@ CONFIG_MPIC=y
185# CONFIG_CPM2 is not set 188# CONFIG_CPM2 is not set
186# CONFIG_FSL_ULI1575 is not set 189# CONFIG_FSL_ULI1575 is not set
187# CONFIG_MPC8xxx_GPIO is not set 190# CONFIG_MPC8xxx_GPIO is not set
191# CONFIG_SIMPLE_GPIO is not set
188 192
189# 193#
190# Kernel options 194# Kernel options
@@ -222,12 +226,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
222CONFIG_PAGEFLAGS_EXTENDED=y 226CONFIG_PAGEFLAGS_EXTENDED=y
223CONFIG_SPLIT_PTLOCK_CPUS=4 227CONFIG_SPLIT_PTLOCK_CPUS=4
224CONFIG_MIGRATION=y 228CONFIG_MIGRATION=y
225# CONFIG_RESOURCES_64BIT is not set
226# CONFIG_PHYS_ADDR_T_64BIT is not set 229# CONFIG_PHYS_ADDR_T_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=1 230CONFIG_ZONE_DMA_FLAG=1
228CONFIG_BOUNCE=y 231CONFIG_BOUNCE=y
229CONFIG_VIRT_TO_BUS=y 232CONFIG_VIRT_TO_BUS=y
230CONFIG_UNEVICTABLE_LRU=y 233CONFIG_UNEVICTABLE_LRU=y
234CONFIG_PPC_4K_PAGES=y
235# CONFIG_PPC_16K_PAGES is not set
236# CONFIG_PPC_64K_PAGES is not set
231CONFIG_FORCE_MAX_ZONEORDER=11 237CONFIG_FORCE_MAX_ZONEORDER=11
232CONFIG_PROC_DEVICETREE=y 238CONFIG_PROC_DEVICETREE=y
233# CONFIG_CMDLINE_BOOL is not set 239# CONFIG_CMDLINE_BOOL is not set
@@ -251,6 +257,7 @@ CONFIG_PCI_SYSCALL=y
251CONFIG_ARCH_SUPPORTS_MSI=y 257CONFIG_ARCH_SUPPORTS_MSI=y
252# CONFIG_PCI_MSI is not set 258# CONFIG_PCI_MSI is not set
253# CONFIG_PCI_LEGACY is not set 259# CONFIG_PCI_LEGACY is not set
260# CONFIG_PCI_STUB is not set
254# CONFIG_PCCARD is not set 261# CONFIG_PCCARD is not set
255# CONFIG_HOTPLUG_PCI is not set 262# CONFIG_HOTPLUG_PCI is not set
256# CONFIG_HAS_RAPIDIO is not set 263# CONFIG_HAS_RAPIDIO is not set
@@ -274,6 +281,7 @@ CONFIG_NET=y
274# 281#
275# Networking options 282# Networking options
276# 283#
284CONFIG_COMPAT_NET_DEV_OPS=y
277CONFIG_PACKET=y 285CONFIG_PACKET=y
278# CONFIG_PACKET_MMAP is not set 286# CONFIG_PACKET_MMAP is not set
279CONFIG_UNIX=y 287CONFIG_UNIX=y
@@ -330,6 +338,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
330# CONFIG_ECONET is not set 338# CONFIG_ECONET is not set
331# CONFIG_WAN_ROUTER is not set 339# CONFIG_WAN_ROUTER is not set
332# CONFIG_NET_SCHED is not set 340# CONFIG_NET_SCHED is not set
341# CONFIG_DCB is not set
333 342
334# 343#
335# Network testing 344# Network testing
@@ -345,8 +354,9 @@ CONFIG_WIRELESS=y
345# CONFIG_CFG80211 is not set 354# CONFIG_CFG80211 is not set
346CONFIG_WIRELESS_OLD_REGULATORY=y 355CONFIG_WIRELESS_OLD_REGULATORY=y
347# CONFIG_WIRELESS_EXT is not set 356# CONFIG_WIRELESS_EXT is not set
357# CONFIG_LIB80211 is not set
348# CONFIG_MAC80211 is not set 358# CONFIG_MAC80211 is not set
349# CONFIG_IEEE80211 is not set 359# CONFIG_WIMAX is not set
350# CONFIG_RFKILL is not set 360# CONFIG_RFKILL is not set
351# CONFIG_NET_9P is not set 361# CONFIG_NET_9P is not set
352 362
@@ -391,6 +401,7 @@ CONFIG_MISC_DEVICES=y
391# CONFIG_TIFM_CORE is not set 401# CONFIG_TIFM_CORE is not set
392# CONFIG_ENCLOSURE_SERVICES is not set 402# CONFIG_ENCLOSURE_SERVICES is not set
393# CONFIG_HP_ILO is not set 403# CONFIG_HP_ILO is not set
404# CONFIG_C2PORT is not set
394CONFIG_HAVE_IDE=y 405CONFIG_HAVE_IDE=y
395# CONFIG_IDE is not set 406# CONFIG_IDE is not set
396 407
@@ -439,6 +450,9 @@ CONFIG_PHYLIB=y
439CONFIG_BROADCOM_PHY=y 450CONFIG_BROADCOM_PHY=y
440# CONFIG_ICPLUS_PHY is not set 451# CONFIG_ICPLUS_PHY is not set
441# CONFIG_REALTEK_PHY is not set 452# CONFIG_REALTEK_PHY is not set
453# CONFIG_NATIONAL_PHY is not set
454# CONFIG_STE10XP is not set
455# CONFIG_LSI_ET1011C_PHY is not set
442# CONFIG_FIXED_PHY is not set 456# CONFIG_FIXED_PHY is not set
443# CONFIG_MDIO_BITBANG is not set 457# CONFIG_MDIO_BITBANG is not set
444CONFIG_NET_ETHERNET=y 458CONFIG_NET_ETHERNET=y
@@ -483,6 +497,7 @@ CONFIG_GIANFAR=y
483# CONFIG_JME is not set 497# CONFIG_JME is not set
484CONFIG_NETDEV_10000=y 498CONFIG_NETDEV_10000=y
485# CONFIG_CHELSIO_T1 is not set 499# CONFIG_CHELSIO_T1 is not set
500CONFIG_CHELSIO_T3_DEPENDS=y
486# CONFIG_CHELSIO_T3 is not set 501# CONFIG_CHELSIO_T3 is not set
487# CONFIG_ENIC is not set 502# CONFIG_ENIC is not set
488# CONFIG_IXGBE is not set 503# CONFIG_IXGBE is not set
@@ -505,6 +520,10 @@ CONFIG_NETDEV_10000=y
505# CONFIG_WLAN_PRE80211 is not set 520# CONFIG_WLAN_PRE80211 is not set
506# CONFIG_WLAN_80211 is not set 521# CONFIG_WLAN_80211 is not set
507# CONFIG_IWLWIFI_LEDS is not set 522# CONFIG_IWLWIFI_LEDS is not set
523
524#
525# Enable WiMAX (Networking options) to see the WiMAX drivers
526#
508# CONFIG_WAN is not set 527# CONFIG_WAN is not set
509# CONFIG_FDDI is not set 528# CONFIG_FDDI is not set
510# CONFIG_HIPPI is not set 529# CONFIG_HIPPI is not set
@@ -575,8 +594,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
575# CONFIG_SERIAL_JSM is not set 594# CONFIG_SERIAL_JSM is not set
576# CONFIG_SERIAL_OF_PLATFORM is not set 595# CONFIG_SERIAL_OF_PLATFORM is not set
577CONFIG_UNIX98_PTYS=y 596CONFIG_UNIX98_PTYS=y
597# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
578CONFIG_LEGACY_PTYS=y 598CONFIG_LEGACY_PTYS=y
579CONFIG_LEGACY_PTY_COUNT=256 599CONFIG_LEGACY_PTY_COUNT=256
600# CONFIG_HVC_UDBG is not set
580# CONFIG_IPMI_HANDLER is not set 601# CONFIG_IPMI_HANDLER is not set
581# CONFIG_HW_RANDOM is not set 602# CONFIG_HW_RANDOM is not set
582# CONFIG_NVRAM is not set 603# CONFIG_NVRAM is not set
@@ -613,11 +634,11 @@ CONFIG_HWMON=y
613# CONFIG_THERMAL is not set 634# CONFIG_THERMAL is not set
614# CONFIG_THERMAL_HWMON is not set 635# CONFIG_THERMAL_HWMON is not set
615# CONFIG_WATCHDOG is not set 636# CONFIG_WATCHDOG is not set
637CONFIG_SSB_POSSIBLE=y
616 638
617# 639#
618# Sonics Silicon Backplane 640# Sonics Silicon Backplane
619# 641#
620CONFIG_SSB_POSSIBLE=y
621# CONFIG_SSB is not set 642# CONFIG_SSB is not set
622 643
623# 644#
@@ -627,14 +648,7 @@ CONFIG_SSB_POSSIBLE=y
627# CONFIG_MFD_SM501 is not set 648# CONFIG_MFD_SM501 is not set
628# CONFIG_HTC_PASIC3 is not set 649# CONFIG_HTC_PASIC3 is not set
629# CONFIG_MFD_TMIO is not set 650# CONFIG_MFD_TMIO is not set
630
631#
632# Voltage and Current regulators
633#
634# CONFIG_REGULATOR is not set 651# 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 652
639# 653#
640# Multimedia devices 654# Multimedia devices
@@ -693,6 +707,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
693CONFIG_FILE_LOCKING=y 707CONFIG_FILE_LOCKING=y
694# CONFIG_XFS_FS is not set 708# CONFIG_XFS_FS is not set
695# CONFIG_OCFS2_FS is not set 709# CONFIG_OCFS2_FS is not set
710# CONFIG_BTRFS_FS is not set
696CONFIG_DNOTIFY=y 711CONFIG_DNOTIFY=y
697CONFIG_INOTIFY=y 712CONFIG_INOTIFY=y
698CONFIG_INOTIFY_USER=y 713CONFIG_INOTIFY_USER=y
@@ -726,10 +741,7 @@ CONFIG_TMPFS=y
726# CONFIG_TMPFS_POSIX_ACL is not set 741# CONFIG_TMPFS_POSIX_ACL is not set
727# CONFIG_HUGETLB_PAGE is not set 742# CONFIG_HUGETLB_PAGE is not set
728# CONFIG_CONFIGFS_FS is not set 743# CONFIG_CONFIGFS_FS is not set
729 744CONFIG_MISC_FILESYSTEMS=y
730#
731# Miscellaneous filesystems
732#
733# CONFIG_ADFS_FS is not set 745# CONFIG_ADFS_FS is not set
734# CONFIG_AFFS_FS is not set 746# CONFIG_AFFS_FS is not set
735# CONFIG_HFS_FS is not set 747# CONFIG_HFS_FS is not set
@@ -738,6 +750,7 @@ CONFIG_TMPFS=y
738# CONFIG_BFS_FS is not set 750# CONFIG_BFS_FS is not set
739# CONFIG_EFS_FS is not set 751# CONFIG_EFS_FS is not set
740# CONFIG_CRAMFS is not set 752# CONFIG_CRAMFS is not set
753# CONFIG_SQUASHFS is not set
741# CONFIG_VXFS_FS is not set 754# CONFIG_VXFS_FS is not set
742# CONFIG_MINIX_FS is not set 755# CONFIG_MINIX_FS is not set
743# CONFIG_OMFS_FS is not set 756# CONFIG_OMFS_FS is not set
@@ -776,6 +789,7 @@ CONFIG_MSDOS_PARTITION=y
776# Library routines 789# Library routines
777# 790#
778CONFIG_BITREVERSE=y 791CONFIG_BITREVERSE=y
792CONFIG_GENERIC_FIND_LAST_BIT=y
779# CONFIG_CRC_CCITT is not set 793# CONFIG_CRC_CCITT is not set
780# CONFIG_CRC16 is not set 794# CONFIG_CRC16 is not set
781# CONFIG_CRC_T10DIF is not set 795# CONFIG_CRC_T10DIF is not set
@@ -807,6 +821,8 @@ CONFIG_FRAME_WARN=1024
807# CONFIG_LATENCYTOP is not set 821# CONFIG_LATENCYTOP is not set
808CONFIG_SYSCTL_SYSCALL_CHECK=y 822CONFIG_SYSCTL_SYSCALL_CHECK=y
809CONFIG_HAVE_FUNCTION_TRACER=y 823CONFIG_HAVE_FUNCTION_TRACER=y
824CONFIG_HAVE_DYNAMIC_FTRACE=y
825CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
810 826
811# 827#
812# Tracers 828# Tracers
@@ -814,6 +830,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
814# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 830# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
815# CONFIG_SAMPLES is not set 831# CONFIG_SAMPLES is not set
816CONFIG_HAVE_ARCH_KGDB=y 832CONFIG_HAVE_ARCH_KGDB=y
833CONFIG_PRINT_STACK_DEPTH=64
817# CONFIG_IRQSTACKS is not set 834# CONFIG_IRQSTACKS is not set
818# CONFIG_PPC_EARLY_DEBUG is not set 835# CONFIG_PPC_EARLY_DEBUG is not set
819 836
@@ -831,6 +848,7 @@ CONFIG_CRYPTO=y
831# 848#
832# CONFIG_CRYPTO_FIPS is not set 849# CONFIG_CRYPTO_FIPS is not set
833# CONFIG_CRYPTO_MANAGER is not set 850# CONFIG_CRYPTO_MANAGER is not set
851# CONFIG_CRYPTO_MANAGER2 is not set
834# CONFIG_CRYPTO_GF128MUL is not set 852# CONFIG_CRYPTO_GF128MUL is not set
835# CONFIG_CRYPTO_NULL is not set 853# CONFIG_CRYPTO_NULL is not set
836# CONFIG_CRYPTO_CRYPTD is not set 854# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/85xx/sbc8560_defconfig b/arch/powerpc/configs/85xx/sbc8560_defconfig
index 8c507f8d15a8..b1c766ef7e2e 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:17 2008 4# Mon Jan 26 15:36:17 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,7 +21,9 @@ CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y 21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
24# CONFIG_PPC_MM_SLICES is not set 25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
25CONFIG_PPC32=y 27CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 28CONFIG_WORD_SIZE=32
27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -45,7 +47,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
45CONFIG_PPC=y 47CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 48CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 49CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 50CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 51CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 52CONFIG_PPC_OF=y
51CONFIG_OF=y 53CONFIG_OF=y
@@ -75,12 +77,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 77# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 78# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 79CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 80CONFIG_GROUP_SCHED=y
80CONFIG_FAIR_GROUP_SCHED=y 81CONFIG_FAIR_GROUP_SCHED=y
81# CONFIG_RT_GROUP_SCHED is not set 82# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 83CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 84# CONFIG_CGROUP_SCHED is not set
85# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 86CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 87CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 88# CONFIG_RELAY is not set
@@ -113,7 +115,6 @@ CONFIG_SLAB=y
113# CONFIG_SLUB is not set 115# CONFIG_SLUB is not set
114# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 117# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 120CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,13 +124,11 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 127CONFIG_BASE_SMALL=0
128# CONFIG_MODULES is not set 128# CONFIG_MODULES is not set
129CONFIG_BLOCK=y 129CONFIG_BLOCK=y
130# CONFIG_LBD is not set 130# CONFIG_LBD is not set
131# CONFIG_BLK_DEV_IO_TRACE is not set 131# CONFIG_BLK_DEV_IO_TRACE is not set
132# CONFIG_LSF is not set
133# CONFIG_BLK_DEV_BSG is not set 132# CONFIG_BLK_DEV_BSG is not set
134# CONFIG_BLK_DEV_INTEGRITY is not set 133# CONFIG_BLK_DEV_INTEGRITY is not set
135 134
@@ -146,6 +145,10 @@ CONFIG_DEFAULT_AS=y
146# CONFIG_DEFAULT_NOOP is not set 145# CONFIG_DEFAULT_NOOP is not set
147CONFIG_DEFAULT_IOSCHED="anticipatory" 146CONFIG_DEFAULT_IOSCHED="anticipatory"
148CONFIG_CLASSIC_RCU=y 147CONFIG_CLASSIC_RCU=y
148# CONFIG_TREE_RCU is not set
149# CONFIG_PREEMPT_RCU is not set
150# CONFIG_TREE_RCU_TRACE is not set
151# CONFIG_PREEMPT_RCU_TRACE is not set
149# CONFIG_FREEZER is not set 152# CONFIG_FREEZER is not set
150 153
151# 154#
@@ -185,6 +188,7 @@ CONFIG_MPIC=y
185# CONFIG_CPM2 is not set 188# CONFIG_CPM2 is not set
186# CONFIG_FSL_ULI1575 is not set 189# CONFIG_FSL_ULI1575 is not set
187# CONFIG_MPC8xxx_GPIO is not set 190# CONFIG_MPC8xxx_GPIO is not set
191# CONFIG_SIMPLE_GPIO is not set
188 192
189# 193#
190# Kernel options 194# Kernel options
@@ -222,12 +226,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
222CONFIG_PAGEFLAGS_EXTENDED=y 226CONFIG_PAGEFLAGS_EXTENDED=y
223CONFIG_SPLIT_PTLOCK_CPUS=4 227CONFIG_SPLIT_PTLOCK_CPUS=4
224CONFIG_MIGRATION=y 228CONFIG_MIGRATION=y
225# CONFIG_RESOURCES_64BIT is not set
226# CONFIG_PHYS_ADDR_T_64BIT is not set 229# CONFIG_PHYS_ADDR_T_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=1 230CONFIG_ZONE_DMA_FLAG=1
228CONFIG_BOUNCE=y 231CONFIG_BOUNCE=y
229CONFIG_VIRT_TO_BUS=y 232CONFIG_VIRT_TO_BUS=y
230CONFIG_UNEVICTABLE_LRU=y 233CONFIG_UNEVICTABLE_LRU=y
234CONFIG_PPC_4K_PAGES=y
235# CONFIG_PPC_16K_PAGES is not set
236# CONFIG_PPC_64K_PAGES is not set
231CONFIG_FORCE_MAX_ZONEORDER=11 237CONFIG_FORCE_MAX_ZONEORDER=11
232CONFIG_PROC_DEVICETREE=y 238CONFIG_PROC_DEVICETREE=y
233# CONFIG_CMDLINE_BOOL is not set 239# CONFIG_CMDLINE_BOOL is not set
@@ -268,6 +274,7 @@ CONFIG_NET=y
268# 274#
269# Networking options 275# Networking options
270# 276#
277CONFIG_COMPAT_NET_DEV_OPS=y
271CONFIG_PACKET=y 278CONFIG_PACKET=y
272# CONFIG_PACKET_MMAP is not set 279# CONFIG_PACKET_MMAP is not set
273CONFIG_UNIX=y 280CONFIG_UNIX=y
@@ -324,6 +331,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
324# CONFIG_ECONET is not set 331# CONFIG_ECONET is not set
325# CONFIG_WAN_ROUTER is not set 332# CONFIG_WAN_ROUTER is not set
326# CONFIG_NET_SCHED is not set 333# CONFIG_NET_SCHED is not set
334# CONFIG_DCB is not set
327 335
328# 336#
329# Network testing 337# Network testing
@@ -339,8 +347,9 @@ CONFIG_WIRELESS=y
339# CONFIG_CFG80211 is not set 347# CONFIG_CFG80211 is not set
340CONFIG_WIRELESS_OLD_REGULATORY=y 348CONFIG_WIRELESS_OLD_REGULATORY=y
341# CONFIG_WIRELESS_EXT is not set 349# CONFIG_WIRELESS_EXT is not set
350# CONFIG_LIB80211 is not set
342# CONFIG_MAC80211 is not set 351# CONFIG_MAC80211 is not set
343# CONFIG_IEEE80211 is not set 352# CONFIG_WIMAX is not set
344# CONFIG_RFKILL is not set 353# CONFIG_RFKILL is not set
345# CONFIG_NET_9P is not set 354# CONFIG_NET_9P is not set
346 355
@@ -378,6 +387,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
378CONFIG_MISC_DEVICES=y 387CONFIG_MISC_DEVICES=y
379# CONFIG_EEPROM_93CX6 is not set 388# CONFIG_EEPROM_93CX6 is not set
380# CONFIG_ENCLOSURE_SERVICES is not set 389# CONFIG_ENCLOSURE_SERVICES is not set
390# CONFIG_C2PORT is not set
381CONFIG_HAVE_IDE=y 391CONFIG_HAVE_IDE=y
382# CONFIG_IDE is not set 392# CONFIG_IDE is not set
383 393
@@ -413,6 +423,9 @@ CONFIG_PHYLIB=y
413CONFIG_BROADCOM_PHY=y 423CONFIG_BROADCOM_PHY=y
414# CONFIG_ICPLUS_PHY is not set 424# CONFIG_ICPLUS_PHY is not set
415# CONFIG_REALTEK_PHY is not set 425# CONFIG_REALTEK_PHY is not set
426# CONFIG_NATIONAL_PHY is not set
427# CONFIG_STE10XP is not set
428# CONFIG_LSI_ET1011C_PHY is not set
416# CONFIG_FIXED_PHY is not set 429# CONFIG_FIXED_PHY is not set
417# CONFIG_MDIO_BITBANG is not set 430# CONFIG_MDIO_BITBANG is not set
418CONFIG_NET_ETHERNET=y 431CONFIG_NET_ETHERNET=y
@@ -435,6 +448,10 @@ CONFIG_NETDEV_10000=y
435# CONFIG_WLAN_PRE80211 is not set 448# CONFIG_WLAN_PRE80211 is not set
436# CONFIG_WLAN_80211 is not set 449# CONFIG_WLAN_80211 is not set
437# CONFIG_IWLWIFI_LEDS is not set 450# CONFIG_IWLWIFI_LEDS is not set
451
452#
453# Enable WiMAX (Networking options) to see the WiMAX drivers
454#
438# CONFIG_WAN is not set 455# CONFIG_WAN is not set
439# CONFIG_PPP is not set 456# CONFIG_PPP is not set
440# CONFIG_SLIP is not set 457# CONFIG_SLIP is not set
@@ -500,8 +517,10 @@ CONFIG_SERIAL_CORE=y
500CONFIG_SERIAL_CORE_CONSOLE=y 517CONFIG_SERIAL_CORE_CONSOLE=y
501# CONFIG_SERIAL_OF_PLATFORM is not set 518# CONFIG_SERIAL_OF_PLATFORM is not set
502CONFIG_UNIX98_PTYS=y 519CONFIG_UNIX98_PTYS=y
520# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
503CONFIG_LEGACY_PTYS=y 521CONFIG_LEGACY_PTYS=y
504CONFIG_LEGACY_PTY_COUNT=256 522CONFIG_LEGACY_PTY_COUNT=256
523# CONFIG_HVC_UDBG is not set
505# CONFIG_IPMI_HANDLER is not set 524# CONFIG_IPMI_HANDLER is not set
506# CONFIG_HW_RANDOM is not set 525# CONFIG_HW_RANDOM is not set
507# CONFIG_NVRAM is not set 526# CONFIG_NVRAM is not set
@@ -530,11 +549,11 @@ CONFIG_HWMON=y
530# CONFIG_THERMAL is not set 549# CONFIG_THERMAL is not set
531# CONFIG_THERMAL_HWMON is not set 550# CONFIG_THERMAL_HWMON is not set
532# CONFIG_WATCHDOG is not set 551# CONFIG_WATCHDOG is not set
552CONFIG_SSB_POSSIBLE=y
533 553
534# 554#
535# Sonics Silicon Backplane 555# Sonics Silicon Backplane
536# 556#
537CONFIG_SSB_POSSIBLE=y
538# CONFIG_SSB is not set 557# CONFIG_SSB is not set
539 558
540# 559#
@@ -544,14 +563,7 @@ CONFIG_SSB_POSSIBLE=y
544# CONFIG_MFD_SM501 is not set 563# CONFIG_MFD_SM501 is not set
545# CONFIG_HTC_PASIC3 is not set 564# CONFIG_HTC_PASIC3 is not set
546# CONFIG_MFD_TMIO is not set 565# CONFIG_MFD_TMIO is not set
547
548#
549# Voltage and Current regulators
550#
551# CONFIG_REGULATOR is not set 566# 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 567
556# 568#
557# Multimedia devices 569# Multimedia devices
@@ -604,9 +616,13 @@ CONFIG_USB_SUPPORT=y
604# 616#
605 617
606# 618#
607# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 619# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
608# 620#
609# CONFIG_USB_GADGET is not set 621# CONFIG_USB_GADGET is not set
622
623#
624# OTG and related infrastructure
625#
610# CONFIG_MMC is not set 626# CONFIG_MMC is not set
611# CONFIG_MEMSTICK is not set 627# CONFIG_MEMSTICK is not set
612# CONFIG_NEW_LEDS is not set 628# CONFIG_NEW_LEDS is not set
@@ -666,6 +682,7 @@ CONFIG_RTC_DRV_M48T59=y
666CONFIG_FILE_LOCKING=y 682CONFIG_FILE_LOCKING=y
667# CONFIG_XFS_FS is not set 683# CONFIG_XFS_FS is not set
668# CONFIG_OCFS2_FS is not set 684# CONFIG_OCFS2_FS is not set
685# CONFIG_BTRFS_FS is not set
669CONFIG_DNOTIFY=y 686CONFIG_DNOTIFY=y
670CONFIG_INOTIFY=y 687CONFIG_INOTIFY=y
671CONFIG_INOTIFY_USER=y 688CONFIG_INOTIFY_USER=y
@@ -699,10 +716,7 @@ CONFIG_TMPFS=y
699# CONFIG_TMPFS_POSIX_ACL is not set 716# CONFIG_TMPFS_POSIX_ACL is not set
700# CONFIG_HUGETLB_PAGE is not set 717# CONFIG_HUGETLB_PAGE is not set
701# CONFIG_CONFIGFS_FS is not set 718# CONFIG_CONFIGFS_FS is not set
702 719CONFIG_MISC_FILESYSTEMS=y
703#
704# Miscellaneous filesystems
705#
706# CONFIG_ADFS_FS is not set 720# CONFIG_ADFS_FS is not set
707# CONFIG_AFFS_FS is not set 721# CONFIG_AFFS_FS is not set
708# CONFIG_HFS_FS is not set 722# CONFIG_HFS_FS is not set
@@ -711,6 +725,7 @@ CONFIG_TMPFS=y
711# CONFIG_BFS_FS is not set 725# CONFIG_BFS_FS is not set
712# CONFIG_EFS_FS is not set 726# CONFIG_EFS_FS is not set
713# CONFIG_CRAMFS is not set 727# CONFIG_CRAMFS is not set
728# CONFIG_SQUASHFS is not set
714# CONFIG_VXFS_FS is not set 729# CONFIG_VXFS_FS is not set
715# CONFIG_MINIX_FS is not set 730# CONFIG_MINIX_FS is not set
716# CONFIG_OMFS_FS is not set 731# CONFIG_OMFS_FS is not set
@@ -761,6 +776,7 @@ CONFIG_PARTITION_ADVANCED=y
761# Library routines 776# Library routines
762# 777#
763CONFIG_BITREVERSE=y 778CONFIG_BITREVERSE=y
779CONFIG_GENERIC_FIND_LAST_BIT=y
764# CONFIG_CRC_CCITT is not set 780# CONFIG_CRC_CCITT is not set
765# CONFIG_CRC16 is not set 781# CONFIG_CRC16 is not set
766# CONFIG_CRC_T10DIF is not set 782# CONFIG_CRC_T10DIF is not set
@@ -809,6 +825,7 @@ CONFIG_DEBUG_MUTEXES=y
809# CONFIG_DEBUG_MEMORY_INIT is not set 825# CONFIG_DEBUG_MEMORY_INIT is not set
810# CONFIG_DEBUG_LIST is not set 826# CONFIG_DEBUG_LIST is not set
811# CONFIG_DEBUG_SG is not set 827# CONFIG_DEBUG_SG is not set
828# CONFIG_DEBUG_NOTIFIERS is not set
812# CONFIG_BOOT_PRINTK_DELAY is not set 829# CONFIG_BOOT_PRINTK_DELAY is not set
813# CONFIG_RCU_TORTURE_TEST is not set 830# CONFIG_RCU_TORTURE_TEST is not set
814# CONFIG_RCU_CPU_STALL_DETECTOR is not set 831# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -818,6 +835,8 @@ CONFIG_DEBUG_MUTEXES=y
818# CONFIG_LATENCYTOP is not set 835# CONFIG_LATENCYTOP is not set
819CONFIG_SYSCTL_SYSCALL_CHECK=y 836CONFIG_SYSCTL_SYSCALL_CHECK=y
820CONFIG_HAVE_FUNCTION_TRACER=y 837CONFIG_HAVE_FUNCTION_TRACER=y
838CONFIG_HAVE_DYNAMIC_FTRACE=y
839CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
821 840
822# 841#
823# Tracers 842# Tracers
@@ -826,11 +845,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
826# CONFIG_SCHED_TRACER is not set 845# CONFIG_SCHED_TRACER is not set
827# CONFIG_CONTEXT_SWITCH_TRACER is not set 846# CONFIG_CONTEXT_SWITCH_TRACER is not set
828# CONFIG_BOOT_TRACER is not set 847# CONFIG_BOOT_TRACER is not set
848# CONFIG_TRACE_BRANCH_PROFILING is not set
829# CONFIG_STACK_TRACER is not set 849# CONFIG_STACK_TRACER is not set
830# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 850# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
831# CONFIG_SAMPLES is not set 851# CONFIG_SAMPLES is not set
832CONFIG_HAVE_ARCH_KGDB=y 852CONFIG_HAVE_ARCH_KGDB=y
833# CONFIG_KGDB is not set 853# CONFIG_KGDB is not set
854CONFIG_PRINT_STACK_DEPTH=64
834# CONFIG_DEBUG_STACKOVERFLOW is not set 855# CONFIG_DEBUG_STACKOVERFLOW is not set
835# CONFIG_DEBUG_STACK_USAGE is not set 856# CONFIG_DEBUG_STACK_USAGE is not set
836# CONFIG_DEBUG_PAGEALLOC is not set 857# CONFIG_DEBUG_PAGEALLOC is not set
@@ -867,6 +888,7 @@ CONFIG_CRYPTO=y
867# 888#
868# CONFIG_CRYPTO_FIPS is not set 889# CONFIG_CRYPTO_FIPS is not set
869# CONFIG_CRYPTO_MANAGER is not set 890# CONFIG_CRYPTO_MANAGER is not set
891# CONFIG_CRYPTO_MANAGER2 is not set
870# CONFIG_CRYPTO_GF128MUL is not set 892# CONFIG_CRYPTO_GF128MUL is not set
871# CONFIG_CRYPTO_NULL is not set 893# CONFIG_CRYPTO_NULL is not set
872# CONFIG_CRYPTO_CRYPTD is not set 894# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig
index f1288a0c3040..eb4ba7a5f41f 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:19 2008 4# Mon Jan 26 15:36:18 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,7 +21,9 @@ CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y 21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
24# CONFIG_PPC_MM_SLICES is not set 25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
25CONFIG_PPC32=y 27CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 28CONFIG_WORD_SIZE=32
27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -46,7 +48,7 @@ CONFIG_GENERIC_GPIO=y
46CONFIG_PPC=y 48CONFIG_PPC=y
47CONFIG_EARLY_PRINTK=y 49CONFIG_EARLY_PRINTK=y
48CONFIG_GENERIC_NVRAM=y 50CONFIG_GENERIC_NVRAM=y
49CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 51CONFIG_SCHED_OMIT_FRAME_POINTER=y
50CONFIG_ARCH_MAY_HAVE_PC_FDC=y 52CONFIG_ARCH_MAY_HAVE_PC_FDC=y
51CONFIG_PPC_OF=y 53CONFIG_PPC_OF=y
52CONFIG_OF=y 54CONFIG_OF=y
@@ -76,12 +78,12 @@ CONFIG_SYSVIPC_SYSCTL=y
76# CONFIG_AUDIT is not set 78# CONFIG_AUDIT is not set
77# CONFIG_IKCONFIG is not set 79# CONFIG_IKCONFIG is not set
78CONFIG_LOG_BUF_SHIFT=14 80CONFIG_LOG_BUF_SHIFT=14
79# CONFIG_CGROUPS is not set
80CONFIG_GROUP_SCHED=y 81CONFIG_GROUP_SCHED=y
81CONFIG_FAIR_GROUP_SCHED=y 82CONFIG_FAIR_GROUP_SCHED=y
82# CONFIG_RT_GROUP_SCHED is not set 83# CONFIG_RT_GROUP_SCHED is not set
83CONFIG_USER_SCHED=y 84CONFIG_USER_SCHED=y
84# CONFIG_CGROUP_SCHED is not set 85# CONFIG_CGROUP_SCHED is not set
86# CONFIG_CGROUPS is not set
85CONFIG_SYSFS_DEPRECATED=y 87CONFIG_SYSFS_DEPRECATED=y
86CONFIG_SYSFS_DEPRECATED_V2=y 88CONFIG_SYSFS_DEPRECATED_V2=y
87# CONFIG_RELAY is not set 89# CONFIG_RELAY is not set
@@ -116,7 +118,6 @@ CONFIG_SLUB_DEBUG=y
116CONFIG_SLUB=y 118CONFIG_SLUB=y
117# CONFIG_SLOB is not set 119# CONFIG_SLOB is not set
118# CONFIG_PROFILING is not set 120# CONFIG_PROFILING is not set
119# CONFIG_MARKERS is not set
120CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
121# CONFIG_KPROBES is not set 122# CONFIG_KPROBES is not set
122CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 123CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -128,18 +129,15 @@ CONFIG_HAVE_CLK=y
128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
129CONFIG_SLABINFO=y 130CONFIG_SLABINFO=y
130CONFIG_RT_MUTEXES=y 131CONFIG_RT_MUTEXES=y
131# CONFIG_TINY_SHMEM is not set
132CONFIG_BASE_SMALL=0 132CONFIG_BASE_SMALL=0
133CONFIG_MODULES=y 133CONFIG_MODULES=y
134# CONFIG_MODULE_FORCE_LOAD is not set 134# CONFIG_MODULE_FORCE_LOAD is not set
135# CONFIG_MODULE_UNLOAD is not set 135# CONFIG_MODULE_UNLOAD is not set
136CONFIG_MODVERSIONS=y 136CONFIG_MODVERSIONS=y
137# CONFIG_MODULE_SRCVERSION_ALL is not set 137# CONFIG_MODULE_SRCVERSION_ALL is not set
138CONFIG_KMOD=y
139CONFIG_BLOCK=y 138CONFIG_BLOCK=y
140# CONFIG_LBD is not set 139# CONFIG_LBD is not set
141# CONFIG_BLK_DEV_IO_TRACE is not set 140# CONFIG_BLK_DEV_IO_TRACE is not set
142# CONFIG_LSF is not set
143# CONFIG_BLK_DEV_BSG is not set 141# CONFIG_BLK_DEV_BSG is not set
144# CONFIG_BLK_DEV_INTEGRITY is not set 142# CONFIG_BLK_DEV_INTEGRITY is not set
145 143
@@ -156,6 +154,10 @@ CONFIG_DEFAULT_CFQ=y
156# CONFIG_DEFAULT_NOOP is not set 154# CONFIG_DEFAULT_NOOP is not set
157CONFIG_DEFAULT_IOSCHED="cfq" 155CONFIG_DEFAULT_IOSCHED="cfq"
158CONFIG_CLASSIC_RCU=y 156CONFIG_CLASSIC_RCU=y
157# CONFIG_TREE_RCU is not set
158# CONFIG_PREEMPT_RCU is not set
159# CONFIG_TREE_RCU_TRACE is not set
160# CONFIG_PREEMPT_RCU_TRACE is not set
159# CONFIG_FREEZER is not set 161# CONFIG_FREEZER is not set
160 162
161# 163#
@@ -196,6 +198,7 @@ CONFIG_CPM2=y
196# CONFIG_FSL_ULI1575 is not set 198# CONFIG_FSL_ULI1575 is not set
197CONFIG_CPM=y 199CONFIG_CPM=y
198# CONFIG_MPC8xxx_GPIO is not set 200# CONFIG_MPC8xxx_GPIO is not set
201# CONFIG_SIMPLE_GPIO is not set
199 202
200# 203#
201# Kernel options 204# Kernel options
@@ -233,12 +236,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
233CONFIG_PAGEFLAGS_EXTENDED=y 236CONFIG_PAGEFLAGS_EXTENDED=y
234CONFIG_SPLIT_PTLOCK_CPUS=4 237CONFIG_SPLIT_PTLOCK_CPUS=4
235CONFIG_MIGRATION=y 238CONFIG_MIGRATION=y
236# CONFIG_RESOURCES_64BIT is not set
237# CONFIG_PHYS_ADDR_T_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
241CONFIG_UNEVICTABLE_LRU=y 243CONFIG_UNEVICTABLE_LRU=y
244CONFIG_PPC_4K_PAGES=y
245# CONFIG_PPC_16K_PAGES is not set
246# CONFIG_PPC_64K_PAGES is not set
242CONFIG_FORCE_MAX_ZONEORDER=11 247CONFIG_FORCE_MAX_ZONEORDER=11
243CONFIG_PROC_DEVICETREE=y 248CONFIG_PROC_DEVICETREE=y
244# CONFIG_CMDLINE_BOOL is not set 249# CONFIG_CMDLINE_BOOL is not set
@@ -263,6 +268,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
263# CONFIG_PCI_MSI is not set 268# CONFIG_PCI_MSI is not set
264# CONFIG_PCI_LEGACY is not set 269# CONFIG_PCI_LEGACY is not set
265# CONFIG_PCI_DEBUG is not set 270# CONFIG_PCI_DEBUG is not set
271# CONFIG_PCI_STUB is not set
266# CONFIG_PCCARD is not set 272# CONFIG_PCCARD is not set
267# CONFIG_HOTPLUG_PCI is not set 273# CONFIG_HOTPLUG_PCI is not set
268# CONFIG_HAS_RAPIDIO is not set 274# CONFIG_HAS_RAPIDIO is not set
@@ -286,6 +292,7 @@ CONFIG_NET=y
286# 292#
287# Networking options 293# Networking options
288# 294#
295CONFIG_COMPAT_NET_DEV_OPS=y
289CONFIG_PACKET=y 296CONFIG_PACKET=y
290# CONFIG_PACKET_MMAP is not set 297# CONFIG_PACKET_MMAP is not set
291CONFIG_UNIX=y 298CONFIG_UNIX=y
@@ -400,6 +407,7 @@ CONFIG_IP_NF_FILTER=m
400# CONFIG_ECONET is not set 407# CONFIG_ECONET is not set
401# CONFIG_WAN_ROUTER is not set 408# CONFIG_WAN_ROUTER is not set
402# CONFIG_NET_SCHED is not set 409# CONFIG_NET_SCHED is not set
410# CONFIG_DCB is not set
403 411
404# 412#
405# Network testing 413# Network testing
@@ -415,8 +423,9 @@ CONFIG_WIRELESS=y
415# CONFIG_CFG80211 is not set 423# CONFIG_CFG80211 is not set
416CONFIG_WIRELESS_OLD_REGULATORY=y 424CONFIG_WIRELESS_OLD_REGULATORY=y
417# CONFIG_WIRELESS_EXT is not set 425# CONFIG_WIRELESS_EXT is not set
426# CONFIG_LIB80211 is not set
418# CONFIG_MAC80211 is not set 427# CONFIG_MAC80211 is not set
419# CONFIG_IEEE80211 is not set 428# CONFIG_WIMAX is not set
420# CONFIG_RFKILL is not set 429# CONFIG_RFKILL is not set
421# CONFIG_NET_9P is not set 430# CONFIG_NET_9P is not set
422 431
@@ -470,14 +479,17 @@ CONFIG_MISC_DEVICES=y
470# CONFIG_EEPROM_93CX6 is not set 479# CONFIG_EEPROM_93CX6 is not set
471# CONFIG_SGI_IOC4 is not set 480# CONFIG_SGI_IOC4 is not set
472# CONFIG_TIFM_CORE is not set 481# CONFIG_TIFM_CORE is not set
482# CONFIG_ICS932S401 is not set
473# CONFIG_ENCLOSURE_SERVICES is not set 483# CONFIG_ENCLOSURE_SERVICES is not set
474# CONFIG_HP_ILO is not set 484# CONFIG_HP_ILO is not set
485# CONFIG_C2PORT is not set
475CONFIG_HAVE_IDE=y 486CONFIG_HAVE_IDE=y
476CONFIG_IDE=y 487CONFIG_IDE=y
477 488
478# 489#
479# Please see Documentation/ide/ide.txt for help/info on IDE drives 490# Please see Documentation/ide/ide.txt for help/info on IDE drives
480# 491#
492CONFIG_IDE_ATAPI=y
481# CONFIG_BLK_DEV_IDE_SATA is not set 493# CONFIG_BLK_DEV_IDE_SATA is not set
482CONFIG_IDE_GD=y 494CONFIG_IDE_GD=y
483CONFIG_IDE_GD_ATA=y 495CONFIG_IDE_GD_ATA=y
@@ -485,7 +497,6 @@ CONFIG_IDE_GD_ATA=y
485CONFIG_BLK_DEV_IDECD=m 497CONFIG_BLK_DEV_IDECD=m
486CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 498CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
487# CONFIG_BLK_DEV_IDETAPE is not set 499# CONFIG_BLK_DEV_IDETAPE is not set
488# CONFIG_BLK_DEV_IDESCSI is not set
489# CONFIG_IDE_TASK_IOCTL is not set 500# CONFIG_IDE_TASK_IOCTL is not set
490CONFIG_IDE_PROC_FS=y 501CONFIG_IDE_PROC_FS=y
491 502
@@ -510,6 +521,7 @@ CONFIG_IDE_PROC_FS=y
510# CONFIG_BLK_DEV_JMICRON is not set 521# CONFIG_BLK_DEV_JMICRON is not set
511# CONFIG_BLK_DEV_SC1200 is not set 522# CONFIG_BLK_DEV_SC1200 is not set
512# CONFIG_BLK_DEV_PIIX is not set 523# CONFIG_BLK_DEV_PIIX is not set
524# CONFIG_BLK_DEV_IT8172 is not set
513# CONFIG_BLK_DEV_IT8213 is not set 525# CONFIG_BLK_DEV_IT8213 is not set
514# CONFIG_BLK_DEV_IT821X is not set 526# CONFIG_BLK_DEV_IT821X is not set
515# CONFIG_BLK_DEV_NS87415 is not set 527# CONFIG_BLK_DEV_NS87415 is not set
@@ -564,6 +576,7 @@ CONFIG_SCSI_WAIT_SCAN=m
564# CONFIG_SCSI_SRP_ATTRS is not set 576# CONFIG_SCSI_SRP_ATTRS is not set
565CONFIG_SCSI_LOWLEVEL=y 577CONFIG_SCSI_LOWLEVEL=y
566# CONFIG_ISCSI_TCP is not set 578# CONFIG_ISCSI_TCP is not set
579# CONFIG_SCSI_CXGB3_ISCSI is not set
567# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 580# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
568# CONFIG_SCSI_3W_9XXX is not set 581# CONFIG_SCSI_3W_9XXX is not set
569# CONFIG_SCSI_ACARD is not set 582# CONFIG_SCSI_ACARD is not set
@@ -580,6 +593,8 @@ CONFIG_SCSI_LOWLEVEL=y
580# CONFIG_MEGARAID_SAS is not set 593# CONFIG_MEGARAID_SAS is not set
581# CONFIG_SCSI_HPTIOP is not set 594# CONFIG_SCSI_HPTIOP is not set
582# CONFIG_SCSI_BUSLOGIC is not set 595# CONFIG_SCSI_BUSLOGIC is not set
596# CONFIG_LIBFC is not set
597# CONFIG_FCOE is not set
583# CONFIG_SCSI_DMX3191D is not set 598# CONFIG_SCSI_DMX3191D is not set
584# CONFIG_SCSI_EATA is not set 599# CONFIG_SCSI_EATA is not set
585# CONFIG_SCSI_FUTURE_DOMAIN is not set 600# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -640,6 +655,9 @@ CONFIG_MARVELL_PHY=y
640# CONFIG_BROADCOM_PHY is not set 655# CONFIG_BROADCOM_PHY is not set
641# CONFIG_ICPLUS_PHY is not set 656# CONFIG_ICPLUS_PHY is not set
642# CONFIG_REALTEK_PHY is not set 657# CONFIG_REALTEK_PHY is not set
658# CONFIG_NATIONAL_PHY is not set
659# CONFIG_STE10XP is not set
660# CONFIG_LSI_ET1011C_PHY is not set
643# CONFIG_FIXED_PHY is not set 661# CONFIG_FIXED_PHY is not set
644# CONFIG_MDIO_BITBANG is not set 662# CONFIG_MDIO_BITBANG is not set
645CONFIG_NET_ETHERNET=y 663CONFIG_NET_ETHERNET=y
@@ -686,6 +704,7 @@ CONFIG_GIANFAR=y
686# CONFIG_JME is not set 704# CONFIG_JME is not set
687CONFIG_NETDEV_10000=y 705CONFIG_NETDEV_10000=y
688# CONFIG_CHELSIO_T1 is not set 706# CONFIG_CHELSIO_T1 is not set
707CONFIG_CHELSIO_T3_DEPENDS=y
689# CONFIG_CHELSIO_T3 is not set 708# CONFIG_CHELSIO_T3 is not set
690# CONFIG_ENIC is not set 709# CONFIG_ENIC is not set
691# CONFIG_IXGBE is not set 710# CONFIG_IXGBE is not set
@@ -708,6 +727,10 @@ CONFIG_NETDEV_10000=y
708# CONFIG_WLAN_PRE80211 is not set 727# CONFIG_WLAN_PRE80211 is not set
709# CONFIG_WLAN_80211 is not set 728# CONFIG_WLAN_80211 is not set
710# CONFIG_IWLWIFI_LEDS is not set 729# CONFIG_IWLWIFI_LEDS is not set
730
731#
732# Enable WiMAX (Networking options) to see the WiMAX drivers
733#
711# CONFIG_WAN is not set 734# CONFIG_WAN is not set
712# CONFIG_FDDI is not set 735# CONFIG_FDDI is not set
713# CONFIG_HIPPI is not set 736# CONFIG_HIPPI is not set
@@ -805,11 +828,13 @@ CONFIG_SERIAL_CPM=y
805CONFIG_SERIAL_CPM_CONSOLE=y 828CONFIG_SERIAL_CPM_CONSOLE=y
806# CONFIG_SERIAL_JSM is not set 829# CONFIG_SERIAL_JSM is not set
807CONFIG_UNIX98_PTYS=y 830CONFIG_UNIX98_PTYS=y
831# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
808CONFIG_LEGACY_PTYS=y 832CONFIG_LEGACY_PTYS=y
809CONFIG_LEGACY_PTY_COUNT=256 833CONFIG_LEGACY_PTY_COUNT=256
810CONFIG_PRINTER=m 834CONFIG_PRINTER=m
811# CONFIG_LP_CONSOLE is not set 835# CONFIG_LP_CONSOLE is not set
812# CONFIG_PPDEV is not set 836# CONFIG_PPDEV is not set
837# CONFIG_HVC_UDBG is not set
813# CONFIG_IPMI_HANDLER is not set 838# CONFIG_IPMI_HANDLER is not set
814CONFIG_HW_RANDOM=m 839CONFIG_HW_RANDOM=m
815# CONFIG_NVRAM is not set 840# CONFIG_NVRAM is not set
@@ -823,6 +848,7 @@ CONFIG_I2C=m
823CONFIG_I2C_BOARDINFO=y 848CONFIG_I2C_BOARDINFO=y
824CONFIG_I2C_CHARDEV=m 849CONFIG_I2C_CHARDEV=m
825CONFIG_I2C_HELPER_AUTO=y 850CONFIG_I2C_HELPER_AUTO=y
851CONFIG_I2C_ALGOBIT=m
826 852
827# 853#
828# I2C Hardware Bus support 854# I2C Hardware Bus support
@@ -883,7 +909,6 @@ CONFIG_I2C_HELPER_AUTO=y
883# CONFIG_PCF8575 is not set 909# CONFIG_PCF8575 is not set
884# CONFIG_SENSORS_PCA9539 is not set 910# CONFIG_SENSORS_PCA9539 is not set
885# CONFIG_SENSORS_PCF8591 is not set 911# CONFIG_SENSORS_PCF8591 is not set
886# CONFIG_TPS65010 is not set
887# CONFIG_SENSORS_MAX6875 is not set 912# CONFIG_SENSORS_MAX6875 is not set
888# CONFIG_SENSORS_TSL2550 is not set 913# CONFIG_SENSORS_TSL2550 is not set
889# CONFIG_I2C_DEBUG_CORE is not set 914# CONFIG_I2C_DEBUG_CORE is not set
@@ -898,6 +923,11 @@ CONFIG_GPIOLIB=y
898# CONFIG_GPIO_SYSFS is not set 923# CONFIG_GPIO_SYSFS is not set
899 924
900# 925#
926# Memory mapped GPIO expanders:
927#
928# CONFIG_GPIO_XILINX is not set
929
930#
901# I2C GPIO expanders: 931# I2C GPIO expanders:
902# 932#
903# CONFIG_GPIO_MAX732X is not set 933# CONFIG_GPIO_MAX732X is not set
@@ -924,8 +954,10 @@ CONFIG_HWMON=y
924# CONFIG_SENSORS_ADM1029 is not set 954# CONFIG_SENSORS_ADM1029 is not set
925# CONFIG_SENSORS_ADM1031 is not set 955# CONFIG_SENSORS_ADM1031 is not set
926# CONFIG_SENSORS_ADM9240 is not set 956# CONFIG_SENSORS_ADM9240 is not set
957# CONFIG_SENSORS_ADT7462 is not set
927# CONFIG_SENSORS_ADT7470 is not set 958# CONFIG_SENSORS_ADT7470 is not set
928# CONFIG_SENSORS_ADT7473 is not set 959# CONFIG_SENSORS_ADT7473 is not set
960# CONFIG_SENSORS_ADT7475 is not set
929# CONFIG_SENSORS_ATXP1 is not set 961# CONFIG_SENSORS_ATXP1 is not set
930# CONFIG_SENSORS_DS1621 is not set 962# CONFIG_SENSORS_DS1621 is not set
931# CONFIG_SENSORS_I5K_AMB is not set 963# CONFIG_SENSORS_I5K_AMB is not set
@@ -946,6 +978,7 @@ CONFIG_HWMON=y
946# CONFIG_SENSORS_LM90 is not set 978# CONFIG_SENSORS_LM90 is not set
947# CONFIG_SENSORS_LM92 is not set 979# CONFIG_SENSORS_LM92 is not set
948# CONFIG_SENSORS_LM93 is not set 980# CONFIG_SENSORS_LM93 is not set
981# CONFIG_SENSORS_LTC4245 is not set
949# CONFIG_SENSORS_MAX1619 is not set 982# CONFIG_SENSORS_MAX1619 is not set
950# CONFIG_SENSORS_MAX6650 is not set 983# CONFIG_SENSORS_MAX6650 is not set
951# CONFIG_SENSORS_PC87360 is not set 984# CONFIG_SENSORS_PC87360 is not set
@@ -972,11 +1005,11 @@ CONFIG_HWMON=y
972# CONFIG_THERMAL is not set 1005# CONFIG_THERMAL is not set
973# CONFIG_THERMAL_HWMON is not set 1006# CONFIG_THERMAL_HWMON is not set
974# CONFIG_WATCHDOG is not set 1007# CONFIG_WATCHDOG is not set
1008CONFIG_SSB_POSSIBLE=y
975 1009
976# 1010#
977# Sonics Silicon Backplane 1011# Sonics Silicon Backplane
978# 1012#
979CONFIG_SSB_POSSIBLE=y
980# CONFIG_SSB is not set 1013# CONFIG_SSB is not set
981 1014
982# 1015#
@@ -985,17 +1018,12 @@ CONFIG_SSB_POSSIBLE=y
985# CONFIG_MFD_CORE is not set 1018# CONFIG_MFD_CORE is not set
986# CONFIG_MFD_SM501 is not set 1019# CONFIG_MFD_SM501 is not set
987# CONFIG_HTC_PASIC3 is not set 1020# CONFIG_HTC_PASIC3 is not set
1021# CONFIG_TPS65010 is not set
988# CONFIG_MFD_TMIO is not set 1022# CONFIG_MFD_TMIO is not set
989# CONFIG_MFD_WM8400 is not set 1023# CONFIG_MFD_WM8400 is not set
990# CONFIG_MFD_WM8350_I2C is not set 1024# CONFIG_MFD_WM8350_I2C is not set
991 1025# CONFIG_MFD_PCF50633 is not set
992#
993# Voltage and Current regulators
994#
995# CONFIG_REGULATOR is not set 1026# 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
999 1027
1000# 1028#
1001# Multimedia devices 1029# Multimedia devices
@@ -1061,9 +1089,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1061# 1089#
1062 1090
1063# 1091#
1064# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1092# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1065# 1093#
1066# CONFIG_USB_GADGET is not set 1094# CONFIG_USB_GADGET is not set
1095
1096#
1097# OTG and related infrastructure
1098#
1067# CONFIG_UWB is not set 1099# CONFIG_UWB is not set
1068# CONFIG_MMC is not set 1100# CONFIG_MMC is not set
1069# CONFIG_MEMSTICK is not set 1101# CONFIG_MEMSTICK is not set
@@ -1096,6 +1128,7 @@ CONFIG_FS_MBCACHE=y
1096CONFIG_FILE_LOCKING=y 1128CONFIG_FILE_LOCKING=y
1097# CONFIG_XFS_FS is not set 1129# CONFIG_XFS_FS is not set
1098# CONFIG_OCFS2_FS is not set 1130# CONFIG_OCFS2_FS is not set
1131# CONFIG_BTRFS_FS is not set
1099CONFIG_DNOTIFY=y 1132CONFIG_DNOTIFY=y
1100CONFIG_INOTIFY=y 1133CONFIG_INOTIFY=y
1101CONFIG_INOTIFY_USER=y 1134CONFIG_INOTIFY_USER=y
@@ -1135,10 +1168,7 @@ CONFIG_TMPFS=y
1135# CONFIG_TMPFS_POSIX_ACL is not set 1168# CONFIG_TMPFS_POSIX_ACL is not set
1136# CONFIG_HUGETLB_PAGE is not set 1169# CONFIG_HUGETLB_PAGE is not set
1137# CONFIG_CONFIGFS_FS is not set 1170# CONFIG_CONFIGFS_FS is not set
1138 1171CONFIG_MISC_FILESYSTEMS=y
1139#
1140# Miscellaneous filesystems
1141#
1142# CONFIG_ADFS_FS is not set 1172# CONFIG_ADFS_FS is not set
1143# CONFIG_AFFS_FS is not set 1173# CONFIG_AFFS_FS is not set
1144# CONFIG_HFS_FS is not set 1174# CONFIG_HFS_FS is not set
@@ -1147,6 +1177,7 @@ CONFIG_TMPFS=y
1147# CONFIG_BFS_FS is not set 1177# CONFIG_BFS_FS is not set
1148# CONFIG_EFS_FS is not set 1178# CONFIG_EFS_FS is not set
1149CONFIG_CRAMFS=m 1179CONFIG_CRAMFS=m
1180# CONFIG_SQUASHFS is not set
1150# CONFIG_VXFS_FS is not set 1181# CONFIG_VXFS_FS is not set
1151# CONFIG_MINIX_FS is not set 1182# CONFIG_MINIX_FS is not set
1152# CONFIG_OMFS_FS is not set 1183# CONFIG_OMFS_FS is not set
@@ -1227,6 +1258,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1227# Library routines 1258# Library routines
1228# 1259#
1229CONFIG_BITREVERSE=y 1260CONFIG_BITREVERSE=y
1261CONFIG_GENERIC_FIND_LAST_BIT=y
1230CONFIG_CRC_CCITT=y 1262CONFIG_CRC_CCITT=y
1231# CONFIG_CRC16 is not set 1263# CONFIG_CRC16 is not set
1232CONFIG_CRC_T10DIF=m 1264CONFIG_CRC_T10DIF=m
@@ -1278,6 +1310,7 @@ CONFIG_SCHED_DEBUG=y
1278# CONFIG_DEBUG_MEMORY_INIT is not set 1310# CONFIG_DEBUG_MEMORY_INIT is not set
1279# CONFIG_DEBUG_LIST is not set 1311# CONFIG_DEBUG_LIST is not set
1280# CONFIG_DEBUG_SG is not set 1312# CONFIG_DEBUG_SG is not set
1313# CONFIG_DEBUG_NOTIFIERS is not set
1281# CONFIG_BOOT_PRINTK_DELAY is not set 1314# CONFIG_BOOT_PRINTK_DELAY is not set
1282# CONFIG_RCU_TORTURE_TEST is not set 1315# CONFIG_RCU_TORTURE_TEST is not set
1283# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1316# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1287,6 +1320,8 @@ CONFIG_SCHED_DEBUG=y
1287# CONFIG_LATENCYTOP is not set 1320# CONFIG_LATENCYTOP is not set
1288CONFIG_SYSCTL_SYSCALL_CHECK=y 1321CONFIG_SYSCTL_SYSCALL_CHECK=y
1289CONFIG_HAVE_FUNCTION_TRACER=y 1322CONFIG_HAVE_FUNCTION_TRACER=y
1323CONFIG_HAVE_DYNAMIC_FTRACE=y
1324CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1290 1325
1291# 1326#
1292# Tracers 1327# Tracers
@@ -1295,11 +1330,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1295# CONFIG_SCHED_TRACER is not set 1330# CONFIG_SCHED_TRACER is not set
1296# CONFIG_CONTEXT_SWITCH_TRACER is not set 1331# CONFIG_CONTEXT_SWITCH_TRACER is not set
1297# CONFIG_BOOT_TRACER is not set 1332# CONFIG_BOOT_TRACER is not set
1333# CONFIG_TRACE_BRANCH_PROFILING is not set
1298# CONFIG_STACK_TRACER is not set 1334# CONFIG_STACK_TRACER is not set
1299# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1335# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1300# CONFIG_SAMPLES is not set 1336# CONFIG_SAMPLES is not set
1301CONFIG_HAVE_ARCH_KGDB=y 1337CONFIG_HAVE_ARCH_KGDB=y
1302# CONFIG_KGDB is not set 1338# CONFIG_KGDB is not set
1339CONFIG_PRINT_STACK_DEPTH=64
1303# CONFIG_DEBUG_STACKOVERFLOW is not set 1340# CONFIG_DEBUG_STACKOVERFLOW is not set
1304# CONFIG_DEBUG_STACK_USAGE is not set 1341# CONFIG_DEBUG_STACK_USAGE is not set
1305# CONFIG_DEBUG_PAGEALLOC is not set 1342# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1325,6 +1362,7 @@ CONFIG_CRYPTO=y
1325# 1362#
1326# CONFIG_CRYPTO_FIPS is not set 1363# CONFIG_CRYPTO_FIPS is not set
1327# CONFIG_CRYPTO_MANAGER is not set 1364# CONFIG_CRYPTO_MANAGER is not set
1365# CONFIG_CRYPTO_MANAGER2 is not set
1328# CONFIG_CRYPTO_GF128MUL is not set 1366# CONFIG_CRYPTO_GF128MUL is not set
1329# CONFIG_CRYPTO_NULL is not set 1367# CONFIG_CRYPTO_NULL is not set
1330# CONFIG_CRYPTO_CRYPTD is not set 1368# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig
index b3b1de6a6a85..f4379b1cf841 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:20 2008 4# Mon Jan 26 15:36:19 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,7 +21,9 @@ CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y 21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
24# CONFIG_PPC_MM_SLICES is not set 25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
25CONFIG_PPC32=y 27CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 28CONFIG_WORD_SIZE=32
27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -45,7 +47,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
45CONFIG_PPC=y 47CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 48CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 49CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 50CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 51CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 52CONFIG_PPC_OF=y
51CONFIG_OF=y 53CONFIG_OF=y
@@ -75,12 +77,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 77# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 78# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 79CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 80CONFIG_GROUP_SCHED=y
80CONFIG_FAIR_GROUP_SCHED=y 81CONFIG_FAIR_GROUP_SCHED=y
81# CONFIG_RT_GROUP_SCHED is not set 82# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 83CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 84# CONFIG_CGROUP_SCHED is not set
85# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 86CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 87CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 88# CONFIG_RELAY is not set
@@ -113,7 +115,6 @@ CONFIG_SLUB_DEBUG=y
113CONFIG_SLUB=y 115CONFIG_SLUB=y
114# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 117# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
119CONFIG_HAVE_IOREMAP_PROT=y 120CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,13 +124,11 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 127CONFIG_BASE_SMALL=0
128# CONFIG_MODULES is not set 128# CONFIG_MODULES is not set
129CONFIG_BLOCK=y 129CONFIG_BLOCK=y
130# CONFIG_LBD is not set 130# CONFIG_LBD is not set
131# CONFIG_BLK_DEV_IO_TRACE is not set 131# CONFIG_BLK_DEV_IO_TRACE is not set
132# CONFIG_LSF is not set
133# CONFIG_BLK_DEV_BSG is not set 132# CONFIG_BLK_DEV_BSG is not set
134# CONFIG_BLK_DEV_INTEGRITY is not set 133# CONFIG_BLK_DEV_INTEGRITY is not set
135 134
@@ -146,6 +145,10 @@ CONFIG_DEFAULT_AS=y
146# CONFIG_DEFAULT_NOOP is not set 145# CONFIG_DEFAULT_NOOP is not set
147CONFIG_DEFAULT_IOSCHED="anticipatory" 146CONFIG_DEFAULT_IOSCHED="anticipatory"
148CONFIG_CLASSIC_RCU=y 147CONFIG_CLASSIC_RCU=y
148# CONFIG_TREE_RCU is not set
149# CONFIG_PREEMPT_RCU is not set
150# CONFIG_TREE_RCU_TRACE is not set
151# CONFIG_PREEMPT_RCU_TRACE is not set
149# CONFIG_FREEZER is not set 152# CONFIG_FREEZER is not set
150 153
151# 154#
@@ -186,6 +189,7 @@ CONFIG_MPIC=y
186# CONFIG_CPM2 is not set 189# CONFIG_CPM2 is not set
187# CONFIG_FSL_ULI1575 is not set 190# CONFIG_FSL_ULI1575 is not set
188# CONFIG_MPC8xxx_GPIO is not set 191# CONFIG_MPC8xxx_GPIO is not set
192# CONFIG_SIMPLE_GPIO is not set
189 193
190# 194#
191# Kernel options 195# Kernel options
@@ -223,12 +227,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
223CONFIG_PAGEFLAGS_EXTENDED=y 227CONFIG_PAGEFLAGS_EXTENDED=y
224CONFIG_SPLIT_PTLOCK_CPUS=4 228CONFIG_SPLIT_PTLOCK_CPUS=4
225CONFIG_MIGRATION=y 229CONFIG_MIGRATION=y
226# CONFIG_RESOURCES_64BIT is not set
227# CONFIG_PHYS_ADDR_T_64BIT is not set 230# CONFIG_PHYS_ADDR_T_64BIT is not set
228CONFIG_ZONE_DMA_FLAG=1 231CONFIG_ZONE_DMA_FLAG=1
229CONFIG_BOUNCE=y 232CONFIG_BOUNCE=y
230CONFIG_VIRT_TO_BUS=y 233CONFIG_VIRT_TO_BUS=y
231CONFIG_UNEVICTABLE_LRU=y 234CONFIG_UNEVICTABLE_LRU=y
235CONFIG_PPC_4K_PAGES=y
236# CONFIG_PPC_16K_PAGES is not set
237# CONFIG_PPC_64K_PAGES is not set
232CONFIG_FORCE_MAX_ZONEORDER=11 238CONFIG_FORCE_MAX_ZONEORDER=11
233# CONFIG_PROC_DEVICETREE is not set 239# CONFIG_PROC_DEVICETREE is not set
234# CONFIG_CMDLINE_BOOL is not set 240# CONFIG_CMDLINE_BOOL is not set
@@ -252,6 +258,7 @@ CONFIG_PCI_SYSCALL=y
252CONFIG_ARCH_SUPPORTS_MSI=y 258CONFIG_ARCH_SUPPORTS_MSI=y
253# CONFIG_PCI_MSI is not set 259# CONFIG_PCI_MSI is not set
254# CONFIG_PCI_LEGACY is not set 260# CONFIG_PCI_LEGACY is not set
261# CONFIG_PCI_STUB is not set
255# CONFIG_HAS_RAPIDIO is not set 262# CONFIG_HAS_RAPIDIO is not set
256 263
257# 264#
@@ -273,6 +280,7 @@ CONFIG_NET=y
273# 280#
274# Networking options 281# Networking options
275# 282#
283CONFIG_COMPAT_NET_DEV_OPS=y
276CONFIG_PACKET=y 284CONFIG_PACKET=y
277# CONFIG_PACKET_MMAP is not set 285# CONFIG_PACKET_MMAP is not set
278CONFIG_UNIX=y 286CONFIG_UNIX=y
@@ -329,6 +337,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
329# CONFIG_ECONET is not set 337# CONFIG_ECONET is not set
330# CONFIG_WAN_ROUTER is not set 338# CONFIG_WAN_ROUTER is not set
331# CONFIG_NET_SCHED is not set 339# CONFIG_NET_SCHED is not set
340# CONFIG_DCB is not set
332 341
333# 342#
334# Network testing 343# Network testing
@@ -344,8 +353,9 @@ CONFIG_WIRELESS=y
344# CONFIG_CFG80211 is not set 353# CONFIG_CFG80211 is not set
345CONFIG_WIRELESS_OLD_REGULATORY=y 354CONFIG_WIRELESS_OLD_REGULATORY=y
346# CONFIG_WIRELESS_EXT is not set 355# CONFIG_WIRELESS_EXT is not set
356# CONFIG_LIB80211 is not set
347# CONFIG_MAC80211 is not set 357# CONFIG_MAC80211 is not set
348# CONFIG_IEEE80211 is not set 358# CONFIG_WIMAX is not set
349# CONFIG_RFKILL is not set 359# CONFIG_RFKILL is not set
350# CONFIG_NET_9P is not set 360# CONFIG_NET_9P is not set
351 361
@@ -435,6 +445,12 @@ CONFIG_MTD_CFI_UTIL=y
435# CONFIG_MTD_ONENAND is not set 445# CONFIG_MTD_ONENAND is not set
436 446
437# 447#
448# LPDDR flash memory drivers
449#
450# CONFIG_MTD_LPDDR is not set
451# CONFIG_MTD_QINFO_PROBE is not set
452
453#
438# UBI - Unsorted block images 454# UBI - Unsorted block images
439# 455#
440# CONFIG_MTD_UBI is not set 456# CONFIG_MTD_UBI is not set
@@ -464,8 +480,10 @@ CONFIG_MISC_DEVICES=y
464# CONFIG_EEPROM_93CX6 is not set 480# CONFIG_EEPROM_93CX6 is not set
465# CONFIG_SGI_IOC4 is not set 481# CONFIG_SGI_IOC4 is not set
466# CONFIG_TIFM_CORE is not set 482# CONFIG_TIFM_CORE is not set
483# CONFIG_ICS932S401 is not set
467# CONFIG_ENCLOSURE_SERVICES is not set 484# CONFIG_ENCLOSURE_SERVICES is not set
468# CONFIG_HP_ILO is not set 485# CONFIG_HP_ILO is not set
486# CONFIG_C2PORT is not set
469CONFIG_HAVE_IDE=y 487CONFIG_HAVE_IDE=y
470CONFIG_IDE=y 488CONFIG_IDE=y
471 489
@@ -508,6 +526,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
508# CONFIG_BLK_DEV_JMICRON is not set 526# CONFIG_BLK_DEV_JMICRON is not set
509# CONFIG_BLK_DEV_SC1200 is not set 527# CONFIG_BLK_DEV_SC1200 is not set
510# CONFIG_BLK_DEV_PIIX is not set 528# CONFIG_BLK_DEV_PIIX is not set
529# CONFIG_BLK_DEV_IT8172 is not set
511# CONFIG_BLK_DEV_IT8213 is not set 530# CONFIG_BLK_DEV_IT8213 is not set
512# CONFIG_BLK_DEV_IT821X is not set 531# CONFIG_BLK_DEV_IT821X is not set
513# CONFIG_BLK_DEV_NS87415 is not set 532# CONFIG_BLK_DEV_NS87415 is not set
@@ -567,6 +586,9 @@ CONFIG_PHYLIB=y
567# CONFIG_BROADCOM_PHY is not set 586# CONFIG_BROADCOM_PHY is not set
568# CONFIG_ICPLUS_PHY is not set 587# CONFIG_ICPLUS_PHY is not set
569# CONFIG_REALTEK_PHY is not set 588# CONFIG_REALTEK_PHY is not set
589# CONFIG_NATIONAL_PHY is not set
590# CONFIG_STE10XP is not set
591# CONFIG_LSI_ET1011C_PHY is not set
570# CONFIG_FIXED_PHY is not set 592# CONFIG_FIXED_PHY is not set
571# CONFIG_MDIO_BITBANG is not set 593# CONFIG_MDIO_BITBANG is not set
572CONFIG_NET_ETHERNET=y 594CONFIG_NET_ETHERNET=y
@@ -590,7 +612,6 @@ CONFIG_NET_PCI=y
590# CONFIG_ADAPTEC_STARFIRE is not set 612# CONFIG_ADAPTEC_STARFIRE is not set
591# CONFIG_B44 is not set 613# CONFIG_B44 is not set
592# CONFIG_FORCEDETH is not set 614# CONFIG_FORCEDETH is not set
593# CONFIG_EEPRO100 is not set
594CONFIG_E100=y 615CONFIG_E100=y
595# CONFIG_FEALNX is not set 616# CONFIG_FEALNX is not set
596# CONFIG_NATSEMI is not set 617# CONFIG_NATSEMI is not set
@@ -600,6 +621,7 @@ CONFIG_E100=y
600# CONFIG_R6040 is not set 621# CONFIG_R6040 is not set
601# CONFIG_SIS900 is not set 622# CONFIG_SIS900 is not set
602# CONFIG_EPIC100 is not set 623# CONFIG_EPIC100 is not set
624# CONFIG_SMSC9420 is not set
603# CONFIG_SUNDANCE is not set 625# CONFIG_SUNDANCE is not set
604# CONFIG_TLAN is not set 626# CONFIG_TLAN is not set
605# CONFIG_VIA_RHINE is not set 627# CONFIG_VIA_RHINE is not set
@@ -629,6 +651,7 @@ CONFIG_GIANFAR=y
629# CONFIG_JME is not set 651# CONFIG_JME is not set
630CONFIG_NETDEV_10000=y 652CONFIG_NETDEV_10000=y
631# CONFIG_CHELSIO_T1 is not set 653# CONFIG_CHELSIO_T1 is not set
654CONFIG_CHELSIO_T3_DEPENDS=y
632# CONFIG_CHELSIO_T3 is not set 655# CONFIG_CHELSIO_T3 is not set
633# CONFIG_ENIC is not set 656# CONFIG_ENIC is not set
634# CONFIG_IXGBE is not set 657# CONFIG_IXGBE is not set
@@ -651,6 +674,10 @@ CONFIG_NETDEV_10000=y
651# CONFIG_WLAN_PRE80211 is not set 674# CONFIG_WLAN_PRE80211 is not set
652# CONFIG_WLAN_80211 is not set 675# CONFIG_WLAN_80211 is not set
653# CONFIG_IWLWIFI_LEDS is not set 676# CONFIG_IWLWIFI_LEDS is not set
677
678#
679# Enable WiMAX (Networking options) to see the WiMAX drivers
680#
654# CONFIG_WAN is not set 681# CONFIG_WAN is not set
655# CONFIG_FDDI is not set 682# CONFIG_FDDI is not set
656# CONFIG_HIPPI is not set 683# CONFIG_HIPPI is not set
@@ -721,8 +748,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
721# CONFIG_SERIAL_JSM is not set 748# CONFIG_SERIAL_JSM is not set
722# CONFIG_SERIAL_OF_PLATFORM is not set 749# CONFIG_SERIAL_OF_PLATFORM is not set
723CONFIG_UNIX98_PTYS=y 750CONFIG_UNIX98_PTYS=y
751# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
724CONFIG_LEGACY_PTYS=y 752CONFIG_LEGACY_PTYS=y
725CONFIG_LEGACY_PTY_COUNT=256 753CONFIG_LEGACY_PTY_COUNT=256
754# CONFIG_HVC_UDBG is not set
726# CONFIG_IPMI_HANDLER is not set 755# CONFIG_IPMI_HANDLER is not set
727CONFIG_HW_RANDOM=y 756CONFIG_HW_RANDOM=y
728# CONFIG_NVRAM is not set 757# CONFIG_NVRAM is not set
@@ -814,8 +843,10 @@ CONFIG_HWMON=y
814# CONFIG_SENSORS_ADM1029 is not set 843# CONFIG_SENSORS_ADM1029 is not set
815# CONFIG_SENSORS_ADM1031 is not set 844# CONFIG_SENSORS_ADM1031 is not set
816# CONFIG_SENSORS_ADM9240 is not set 845# CONFIG_SENSORS_ADM9240 is not set
846# CONFIG_SENSORS_ADT7462 is not set
817# CONFIG_SENSORS_ADT7470 is not set 847# CONFIG_SENSORS_ADT7470 is not set
818# CONFIG_SENSORS_ADT7473 is not set 848# CONFIG_SENSORS_ADT7473 is not set
849# CONFIG_SENSORS_ADT7475 is not set
819# CONFIG_SENSORS_ATXP1 is not set 850# CONFIG_SENSORS_ATXP1 is not set
820# CONFIG_SENSORS_DS1621 is not set 851# CONFIG_SENSORS_DS1621 is not set
821# CONFIG_SENSORS_I5K_AMB is not set 852# CONFIG_SENSORS_I5K_AMB is not set
@@ -836,6 +867,7 @@ CONFIG_SENSORS_LM75=y
836# CONFIG_SENSORS_LM90 is not set 867# CONFIG_SENSORS_LM90 is not set
837# CONFIG_SENSORS_LM92 is not set 868# CONFIG_SENSORS_LM92 is not set
838# CONFIG_SENSORS_LM93 is not set 869# CONFIG_SENSORS_LM93 is not set
870# CONFIG_SENSORS_LTC4245 is not set
839# CONFIG_SENSORS_MAX1619 is not set 871# CONFIG_SENSORS_MAX1619 is not set
840# CONFIG_SENSORS_MAX6650 is not set 872# CONFIG_SENSORS_MAX6650 is not set
841# CONFIG_SENSORS_PC87360 is not set 873# CONFIG_SENSORS_PC87360 is not set
@@ -862,11 +894,11 @@ CONFIG_HWMON_DEBUG_CHIP=y
862# CONFIG_THERMAL is not set 894# CONFIG_THERMAL is not set
863# CONFIG_THERMAL_HWMON is not set 895# CONFIG_THERMAL_HWMON is not set
864# CONFIG_WATCHDOG is not set 896# CONFIG_WATCHDOG is not set
897CONFIG_SSB_POSSIBLE=y
865 898
866# 899#
867# Sonics Silicon Backplane 900# Sonics Silicon Backplane
868# 901#
869CONFIG_SSB_POSSIBLE=y
870# CONFIG_SSB is not set 902# CONFIG_SSB is not set
871 903
872# 904#
@@ -875,18 +907,13 @@ CONFIG_SSB_POSSIBLE=y
875# CONFIG_MFD_CORE is not set 907# CONFIG_MFD_CORE is not set
876# CONFIG_MFD_SM501 is not set 908# CONFIG_MFD_SM501 is not set
877# CONFIG_HTC_PASIC3 is not set 909# CONFIG_HTC_PASIC3 is not set
910# CONFIG_TWL4030_CORE is not set
878# CONFIG_MFD_TMIO is not set 911# CONFIG_MFD_TMIO is not set
879# CONFIG_PMIC_DA903X is not set 912# CONFIG_PMIC_DA903X is not set
880# CONFIG_MFD_WM8400 is not set 913# CONFIG_MFD_WM8400 is not set
881# CONFIG_MFD_WM8350_I2C is not set 914# CONFIG_MFD_WM8350_I2C is not set
882 915# CONFIG_MFD_PCF50633 is not set
883#
884# Voltage and Current regulators
885#
886# CONFIG_REGULATOR is not set 916# 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
890 917
891# 918#
892# Multimedia devices 919# Multimedia devices
@@ -942,9 +969,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
942# 969#
943 970
944# 971#
945# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 972# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
946# 973#
947# CONFIG_USB_GADGET is not set 974# CONFIG_USB_GADGET is not set
975
976#
977# OTG and related infrastructure
978#
948# CONFIG_UWB is not set 979# CONFIG_UWB is not set
949# CONFIG_MMC is not set 980# CONFIG_MMC is not set
950# CONFIG_MEMSTICK is not set 981# CONFIG_MEMSTICK is not set
@@ -976,6 +1007,7 @@ CONFIG_FS_MBCACHE=y
976CONFIG_FILE_LOCKING=y 1007CONFIG_FILE_LOCKING=y
977# CONFIG_XFS_FS is not set 1008# CONFIG_XFS_FS is not set
978# CONFIG_OCFS2_FS is not set 1009# CONFIG_OCFS2_FS is not set
1010# CONFIG_BTRFS_FS is not set
979CONFIG_DNOTIFY=y 1011CONFIG_DNOTIFY=y
980CONFIG_INOTIFY=y 1012CONFIG_INOTIFY=y
981CONFIG_INOTIFY_USER=y 1013CONFIG_INOTIFY_USER=y
@@ -1009,10 +1041,7 @@ CONFIG_TMPFS=y
1009# CONFIG_TMPFS_POSIX_ACL is not set 1041# CONFIG_TMPFS_POSIX_ACL is not set
1010# CONFIG_HUGETLB_PAGE is not set 1042# CONFIG_HUGETLB_PAGE is not set
1011# CONFIG_CONFIGFS_FS is not set 1043# CONFIG_CONFIGFS_FS is not set
1012 1044CONFIG_MISC_FILESYSTEMS=y
1013#
1014# Miscellaneous filesystems
1015#
1016# CONFIG_ADFS_FS is not set 1045# CONFIG_ADFS_FS is not set
1017# CONFIG_AFFS_FS is not set 1046# CONFIG_AFFS_FS is not set
1018# CONFIG_HFS_FS is not set 1047# CONFIG_HFS_FS is not set
@@ -1032,6 +1061,7 @@ CONFIG_JFFS2_ZLIB=y
1032CONFIG_JFFS2_RTIME=y 1061CONFIG_JFFS2_RTIME=y
1033# CONFIG_JFFS2_RUBIN is not set 1062# CONFIG_JFFS2_RUBIN is not set
1034CONFIG_CRAMFS=y 1063CONFIG_CRAMFS=y
1064# CONFIG_SQUASHFS is not set
1035# CONFIG_VXFS_FS is not set 1065# CONFIG_VXFS_FS is not set
1036# CONFIG_MINIX_FS is not set 1066# CONFIG_MINIX_FS is not set
1037# CONFIG_OMFS_FS is not set 1067# CONFIG_OMFS_FS is not set
@@ -1082,6 +1112,7 @@ CONFIG_PARTITION_ADVANCED=y
1082# Library routines 1112# Library routines
1083# 1113#
1084CONFIG_BITREVERSE=y 1114CONFIG_BITREVERSE=y
1115CONFIG_GENERIC_FIND_LAST_BIT=y
1085# CONFIG_CRC_CCITT is not set 1116# CONFIG_CRC_CCITT is not set
1086# CONFIG_CRC16 is not set 1117# CONFIG_CRC16 is not set
1087# CONFIG_CRC_T10DIF is not set 1118# CONFIG_CRC_T10DIF is not set
@@ -1117,6 +1148,8 @@ CONFIG_FRAME_WARN=1024
1117# CONFIG_LATENCYTOP is not set 1148# CONFIG_LATENCYTOP is not set
1118CONFIG_SYSCTL_SYSCALL_CHECK=y 1149CONFIG_SYSCTL_SYSCALL_CHECK=y
1119CONFIG_HAVE_FUNCTION_TRACER=y 1150CONFIG_HAVE_FUNCTION_TRACER=y
1151CONFIG_HAVE_DYNAMIC_FTRACE=y
1152CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1120 1153
1121# 1154#
1122# Tracers 1155# Tracers
@@ -1124,6 +1157,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1124# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1157# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1125# CONFIG_SAMPLES is not set 1158# CONFIG_SAMPLES is not set
1126CONFIG_HAVE_ARCH_KGDB=y 1159CONFIG_HAVE_ARCH_KGDB=y
1160CONFIG_PRINT_STACK_DEPTH=64
1127# CONFIG_IRQSTACKS is not set 1161# CONFIG_IRQSTACKS is not set
1128# CONFIG_PPC_EARLY_DEBUG is not set 1162# CONFIG_PPC_EARLY_DEBUG is not set
1129 1163
@@ -1141,6 +1175,7 @@ CONFIG_CRYPTO=y
1141# 1175#
1142# CONFIG_CRYPTO_FIPS is not set 1176# CONFIG_CRYPTO_FIPS is not set
1143# CONFIG_CRYPTO_MANAGER is not set 1177# CONFIG_CRYPTO_MANAGER is not set
1178# CONFIG_CRYPTO_MANAGER2 is not set
1144# CONFIG_CRYPTO_GF128MUL is not set 1179# CONFIG_CRYPTO_GF128MUL is not set
1145# CONFIG_CRYPTO_NULL is not set 1180# CONFIG_CRYPTO_NULL is not set
1146# CONFIG_CRYPTO_CRYPTD is not set 1181# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig
index a92a639cdf8a..b8669231c1fe 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:21 2008 4# Mon Jan 26 15:36:20 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,7 +21,9 @@ CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y 21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
24# CONFIG_PPC_MM_SLICES is not set 25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
25CONFIG_PPC32=y 27CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 28CONFIG_WORD_SIZE=32
27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -46,7 +48,7 @@ CONFIG_GENERIC_GPIO=y
46CONFIG_PPC=y 48CONFIG_PPC=y
47CONFIG_EARLY_PRINTK=y 49CONFIG_EARLY_PRINTK=y
48CONFIG_GENERIC_NVRAM=y 50CONFIG_GENERIC_NVRAM=y
49CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 51CONFIG_SCHED_OMIT_FRAME_POINTER=y
50CONFIG_ARCH_MAY_HAVE_PC_FDC=y 52CONFIG_ARCH_MAY_HAVE_PC_FDC=y
51CONFIG_PPC_OF=y 53CONFIG_PPC_OF=y
52CONFIG_OF=y 54CONFIG_OF=y
@@ -76,12 +78,12 @@ CONFIG_SYSVIPC_SYSCTL=y
76# CONFIG_AUDIT is not set 78# CONFIG_AUDIT is not set
77# CONFIG_IKCONFIG is not set 79# CONFIG_IKCONFIG is not set
78CONFIG_LOG_BUF_SHIFT=14 80CONFIG_LOG_BUF_SHIFT=14
79# CONFIG_CGROUPS is not set
80CONFIG_GROUP_SCHED=y 81CONFIG_GROUP_SCHED=y
81CONFIG_FAIR_GROUP_SCHED=y 82CONFIG_FAIR_GROUP_SCHED=y
82# CONFIG_RT_GROUP_SCHED is not set 83# CONFIG_RT_GROUP_SCHED is not set
83CONFIG_USER_SCHED=y 84CONFIG_USER_SCHED=y
84# CONFIG_CGROUP_SCHED is not set 85# CONFIG_CGROUP_SCHED is not set
86# CONFIG_CGROUPS is not set
85CONFIG_SYSFS_DEPRECATED=y 87CONFIG_SYSFS_DEPRECATED=y
86CONFIG_SYSFS_DEPRECATED_V2=y 88CONFIG_SYSFS_DEPRECATED_V2=y
87# CONFIG_RELAY is not set 89# CONFIG_RELAY is not set
@@ -114,7 +116,6 @@ CONFIG_SLUB_DEBUG=y
114CONFIG_SLUB=y 116CONFIG_SLUB=y
115# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
116# CONFIG_PROFILING is not set 118# CONFIG_PROFILING is not set
117# CONFIG_MARKERS is not set
118CONFIG_HAVE_OPROFILE=y 119CONFIG_HAVE_OPROFILE=y
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
120CONFIG_HAVE_IOREMAP_PROT=y 121CONFIG_HAVE_IOREMAP_PROT=y
@@ -125,13 +126,11 @@ CONFIG_HAVE_CLK=y
125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
126CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
127CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
128# CONFIG_TINY_SHMEM is not set
129CONFIG_BASE_SMALL=0 129CONFIG_BASE_SMALL=0
130# CONFIG_MODULES is not set 130# CONFIG_MODULES is not set
131CONFIG_BLOCK=y 131CONFIG_BLOCK=y
132# CONFIG_LBD is not set 132# CONFIG_LBD is not set
133# CONFIG_BLK_DEV_IO_TRACE is not set 133# CONFIG_BLK_DEV_IO_TRACE is not set
134# CONFIG_LSF is not set
135# CONFIG_BLK_DEV_BSG is not set 134# CONFIG_BLK_DEV_BSG is not set
136# CONFIG_BLK_DEV_INTEGRITY is not set 135# CONFIG_BLK_DEV_INTEGRITY is not set
137 136
@@ -148,6 +147,10 @@ CONFIG_DEFAULT_AS=y
148# CONFIG_DEFAULT_NOOP is not set 147# CONFIG_DEFAULT_NOOP is not set
149CONFIG_DEFAULT_IOSCHED="anticipatory" 148CONFIG_DEFAULT_IOSCHED="anticipatory"
150CONFIG_CLASSIC_RCU=y 149CONFIG_CLASSIC_RCU=y
150# CONFIG_TREE_RCU is not set
151# CONFIG_PREEMPT_RCU is not set
152# CONFIG_TREE_RCU_TRACE is not set
153# CONFIG_PREEMPT_RCU_TRACE is not set
151# CONFIG_FREEZER is not set 154# CONFIG_FREEZER is not set
152 155
153# 156#
@@ -189,6 +192,7 @@ CONFIG_CPM2=y
189# CONFIG_FSL_ULI1575 is not set 192# CONFIG_FSL_ULI1575 is not set
190CONFIG_CPM=y 193CONFIG_CPM=y
191# CONFIG_MPC8xxx_GPIO is not set 194# CONFIG_MPC8xxx_GPIO is not set
195# CONFIG_SIMPLE_GPIO is not set
192 196
193# 197#
194# Kernel options 198# Kernel options
@@ -226,12 +230,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
226CONFIG_PAGEFLAGS_EXTENDED=y 230CONFIG_PAGEFLAGS_EXTENDED=y
227CONFIG_SPLIT_PTLOCK_CPUS=4 231CONFIG_SPLIT_PTLOCK_CPUS=4
228CONFIG_MIGRATION=y 232CONFIG_MIGRATION=y
229# CONFIG_RESOURCES_64BIT is not set
230# CONFIG_PHYS_ADDR_T_64BIT is not set 233# CONFIG_PHYS_ADDR_T_64BIT is not set
231CONFIG_ZONE_DMA_FLAG=1 234CONFIG_ZONE_DMA_FLAG=1
232CONFIG_BOUNCE=y 235CONFIG_BOUNCE=y
233CONFIG_VIRT_TO_BUS=y 236CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y 237CONFIG_UNEVICTABLE_LRU=y
238CONFIG_PPC_4K_PAGES=y
239# CONFIG_PPC_16K_PAGES is not set
240# CONFIG_PPC_64K_PAGES is not set
235CONFIG_FORCE_MAX_ZONEORDER=11 241CONFIG_FORCE_MAX_ZONEORDER=11
236# CONFIG_PROC_DEVICETREE is not set 242# CONFIG_PROC_DEVICETREE is not set
237# CONFIG_CMDLINE_BOOL is not set 243# CONFIG_CMDLINE_BOOL is not set
@@ -255,6 +261,7 @@ CONFIG_PCI_SYSCALL=y
255CONFIG_ARCH_SUPPORTS_MSI=y 261CONFIG_ARCH_SUPPORTS_MSI=y
256# CONFIG_PCI_MSI is not set 262# CONFIG_PCI_MSI is not set
257# CONFIG_PCI_LEGACY is not set 263# CONFIG_PCI_LEGACY is not set
264# CONFIG_PCI_STUB is not set
258# CONFIG_HAS_RAPIDIO is not set 265# CONFIG_HAS_RAPIDIO is not set
259 266
260# 267#
@@ -276,6 +283,7 @@ CONFIG_NET=y
276# 283#
277# Networking options 284# Networking options
278# 285#
286CONFIG_COMPAT_NET_DEV_OPS=y
279CONFIG_PACKET=y 287CONFIG_PACKET=y
280# CONFIG_PACKET_MMAP is not set 288# CONFIG_PACKET_MMAP is not set
281CONFIG_UNIX=y 289CONFIG_UNIX=y
@@ -332,6 +340,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
332# CONFIG_ECONET is not set 340# CONFIG_ECONET is not set
333# CONFIG_WAN_ROUTER is not set 341# CONFIG_WAN_ROUTER is not set
334# CONFIG_NET_SCHED is not set 342# CONFIG_NET_SCHED is not set
343# CONFIG_DCB is not set
335 344
336# 345#
337# Network testing 346# Network testing
@@ -347,8 +356,9 @@ CONFIG_WIRELESS=y
347# CONFIG_CFG80211 is not set 356# CONFIG_CFG80211 is not set
348CONFIG_WIRELESS_OLD_REGULATORY=y 357CONFIG_WIRELESS_OLD_REGULATORY=y
349# CONFIG_WIRELESS_EXT is not set 358# CONFIG_WIRELESS_EXT is not set
359# CONFIG_LIB80211 is not set
350# CONFIG_MAC80211 is not set 360# CONFIG_MAC80211 is not set
351# CONFIG_IEEE80211 is not set 361# CONFIG_WIMAX is not set
352# CONFIG_RFKILL is not set 362# CONFIG_RFKILL is not set
353# CONFIG_NET_9P is not set 363# CONFIG_NET_9P is not set
354 364
@@ -438,6 +448,12 @@ CONFIG_MTD_CFI_UTIL=y
438# CONFIG_MTD_ONENAND is not set 448# CONFIG_MTD_ONENAND is not set
439 449
440# 450#
451# LPDDR flash memory drivers
452#
453# CONFIG_MTD_LPDDR is not set
454# CONFIG_MTD_QINFO_PROBE is not set
455
456#
441# UBI - Unsorted block images 457# UBI - Unsorted block images
442# 458#
443# CONFIG_MTD_UBI is not set 459# CONFIG_MTD_UBI is not set
@@ -468,8 +484,10 @@ CONFIG_MISC_DEVICES=y
468# CONFIG_EEPROM_93CX6 is not set 484# CONFIG_EEPROM_93CX6 is not set
469# CONFIG_SGI_IOC4 is not set 485# CONFIG_SGI_IOC4 is not set
470# CONFIG_TIFM_CORE is not set 486# CONFIG_TIFM_CORE is not set
487# CONFIG_ICS932S401 is not set
471# CONFIG_ENCLOSURE_SERVICES is not set 488# CONFIG_ENCLOSURE_SERVICES is not set
472# CONFIG_HP_ILO is not set 489# CONFIG_HP_ILO is not set
490# CONFIG_C2PORT is not set
473CONFIG_HAVE_IDE=y 491CONFIG_HAVE_IDE=y
474CONFIG_IDE=y 492CONFIG_IDE=y
475 493
@@ -512,6 +530,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
512# CONFIG_BLK_DEV_JMICRON is not set 530# CONFIG_BLK_DEV_JMICRON is not set
513# CONFIG_BLK_DEV_SC1200 is not set 531# CONFIG_BLK_DEV_SC1200 is not set
514# CONFIG_BLK_DEV_PIIX is not set 532# CONFIG_BLK_DEV_PIIX is not set
533# CONFIG_BLK_DEV_IT8172 is not set
515# CONFIG_BLK_DEV_IT8213 is not set 534# CONFIG_BLK_DEV_IT8213 is not set
516# CONFIG_BLK_DEV_IT821X is not set 535# CONFIG_BLK_DEV_IT821X is not set
517# CONFIG_BLK_DEV_NS87415 is not set 536# CONFIG_BLK_DEV_NS87415 is not set
@@ -571,6 +590,9 @@ CONFIG_PHYLIB=y
571# CONFIG_BROADCOM_PHY is not set 590# CONFIG_BROADCOM_PHY is not set
572# CONFIG_ICPLUS_PHY is not set 591# CONFIG_ICPLUS_PHY is not set
573# CONFIG_REALTEK_PHY is not set 592# CONFIG_REALTEK_PHY is not set
593# CONFIG_NATIONAL_PHY is not set
594# CONFIG_STE10XP is not set
595# CONFIG_LSI_ET1011C_PHY is not set
574# CONFIG_FIXED_PHY is not set 596# CONFIG_FIXED_PHY is not set
575# CONFIG_MDIO_BITBANG is not set 597# CONFIG_MDIO_BITBANG is not set
576CONFIG_NET_ETHERNET=y 598CONFIG_NET_ETHERNET=y
@@ -594,7 +616,6 @@ CONFIG_NET_PCI=y
594# CONFIG_ADAPTEC_STARFIRE is not set 616# CONFIG_ADAPTEC_STARFIRE is not set
595# CONFIG_B44 is not set 617# CONFIG_B44 is not set
596# CONFIG_FORCEDETH is not set 618# CONFIG_FORCEDETH is not set
597# CONFIG_EEPRO100 is not set
598CONFIG_E100=y 619CONFIG_E100=y
599# CONFIG_FEALNX is not set 620# CONFIG_FEALNX is not set
600# CONFIG_NATSEMI is not set 621# CONFIG_NATSEMI is not set
@@ -604,6 +625,7 @@ CONFIG_E100=y
604# CONFIG_R6040 is not set 625# CONFIG_R6040 is not set
605# CONFIG_SIS900 is not set 626# CONFIG_SIS900 is not set
606# CONFIG_EPIC100 is not set 627# CONFIG_EPIC100 is not set
628# CONFIG_SMSC9420 is not set
607# CONFIG_SUNDANCE is not set 629# CONFIG_SUNDANCE is not set
608# CONFIG_TLAN is not set 630# CONFIG_TLAN is not set
609# CONFIG_VIA_RHINE is not set 631# CONFIG_VIA_RHINE is not set
@@ -634,6 +656,7 @@ CONFIG_GIANFAR=y
634# CONFIG_JME is not set 656# CONFIG_JME is not set
635CONFIG_NETDEV_10000=y 657CONFIG_NETDEV_10000=y
636# CONFIG_CHELSIO_T1 is not set 658# CONFIG_CHELSIO_T1 is not set
659CONFIG_CHELSIO_T3_DEPENDS=y
637# CONFIG_CHELSIO_T3 is not set 660# CONFIG_CHELSIO_T3 is not set
638# CONFIG_ENIC is not set 661# CONFIG_ENIC is not set
639# CONFIG_IXGBE is not set 662# CONFIG_IXGBE is not set
@@ -656,6 +679,10 @@ CONFIG_NETDEV_10000=y
656# CONFIG_WLAN_PRE80211 is not set 679# CONFIG_WLAN_PRE80211 is not set
657# CONFIG_WLAN_80211 is not set 680# CONFIG_WLAN_80211 is not set
658# CONFIG_IWLWIFI_LEDS is not set 681# CONFIG_IWLWIFI_LEDS is not set
682
683#
684# Enable WiMAX (Networking options) to see the WiMAX drivers
685#
659# CONFIG_WAN is not set 686# CONFIG_WAN is not set
660# CONFIG_FDDI is not set 687# CONFIG_FDDI is not set
661# CONFIG_HIPPI is not set 688# CONFIG_HIPPI is not set
@@ -728,8 +755,10 @@ CONFIG_SERIAL_CPM_CONSOLE=y
728# CONFIG_SERIAL_JSM is not set 755# CONFIG_SERIAL_JSM is not set
729# CONFIG_SERIAL_OF_PLATFORM is not set 756# CONFIG_SERIAL_OF_PLATFORM is not set
730CONFIG_UNIX98_PTYS=y 757CONFIG_UNIX98_PTYS=y
758# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
731CONFIG_LEGACY_PTYS=y 759CONFIG_LEGACY_PTYS=y
732CONFIG_LEGACY_PTY_COUNT=256 760CONFIG_LEGACY_PTY_COUNT=256
761# CONFIG_HVC_UDBG is not set
733# CONFIG_IPMI_HANDLER is not set 762# CONFIG_IPMI_HANDLER is not set
734CONFIG_HW_RANDOM=y 763CONFIG_HW_RANDOM=y
735# CONFIG_NVRAM is not set 764# CONFIG_NVRAM is not set
@@ -802,7 +831,6 @@ CONFIG_I2C_MPC=y
802# CONFIG_PCF8575 is not set 831# CONFIG_PCF8575 is not set
803# CONFIG_SENSORS_PCA9539 is not set 832# CONFIG_SENSORS_PCA9539 is not set
804# CONFIG_SENSORS_PCF8591 is not set 833# CONFIG_SENSORS_PCF8591 is not set
805# CONFIG_TPS65010 is not set
806# CONFIG_SENSORS_MAX6875 is not set 834# CONFIG_SENSORS_MAX6875 is not set
807# CONFIG_SENSORS_TSL2550 is not set 835# CONFIG_SENSORS_TSL2550 is not set
808# CONFIG_I2C_DEBUG_CORE is not set 836# CONFIG_I2C_DEBUG_CORE is not set
@@ -816,6 +844,11 @@ CONFIG_GPIOLIB=y
816# CONFIG_GPIO_SYSFS is not set 844# CONFIG_GPIO_SYSFS is not set
817 845
818# 846#
847# Memory mapped GPIO expanders:
848#
849# CONFIG_GPIO_XILINX is not set
850
851#
819# I2C GPIO expanders: 852# I2C GPIO expanders:
820# 853#
821# CONFIG_GPIO_MAX732X is not set 854# CONFIG_GPIO_MAX732X is not set
@@ -842,8 +875,10 @@ CONFIG_HWMON=y
842# CONFIG_SENSORS_ADM1029 is not set 875# CONFIG_SENSORS_ADM1029 is not set
843# CONFIG_SENSORS_ADM1031 is not set 876# CONFIG_SENSORS_ADM1031 is not set
844# CONFIG_SENSORS_ADM9240 is not set 877# CONFIG_SENSORS_ADM9240 is not set
878# CONFIG_SENSORS_ADT7462 is not set
845# CONFIG_SENSORS_ADT7470 is not set 879# CONFIG_SENSORS_ADT7470 is not set
846# CONFIG_SENSORS_ADT7473 is not set 880# CONFIG_SENSORS_ADT7473 is not set
881# CONFIG_SENSORS_ADT7475 is not set
847# CONFIG_SENSORS_ATXP1 is not set 882# CONFIG_SENSORS_ATXP1 is not set
848# CONFIG_SENSORS_DS1621 is not set 883# CONFIG_SENSORS_DS1621 is not set
849# CONFIG_SENSORS_I5K_AMB is not set 884# CONFIG_SENSORS_I5K_AMB is not set
@@ -864,6 +899,7 @@ CONFIG_SENSORS_LM75=y
864# CONFIG_SENSORS_LM90 is not set 899# CONFIG_SENSORS_LM90 is not set
865# CONFIG_SENSORS_LM92 is not set 900# CONFIG_SENSORS_LM92 is not set
866# CONFIG_SENSORS_LM93 is not set 901# CONFIG_SENSORS_LM93 is not set
902# CONFIG_SENSORS_LTC4245 is not set
867# CONFIG_SENSORS_MAX1619 is not set 903# CONFIG_SENSORS_MAX1619 is not set
868# CONFIG_SENSORS_MAX6650 is not set 904# CONFIG_SENSORS_MAX6650 is not set
869# CONFIG_SENSORS_PC87360 is not set 905# CONFIG_SENSORS_PC87360 is not set
@@ -890,11 +926,11 @@ CONFIG_HWMON_DEBUG_CHIP=y
890# CONFIG_THERMAL is not set 926# CONFIG_THERMAL is not set
891# CONFIG_THERMAL_HWMON is not set 927# CONFIG_THERMAL_HWMON is not set
892# CONFIG_WATCHDOG is not set 928# CONFIG_WATCHDOG is not set
929CONFIG_SSB_POSSIBLE=y
893 930
894# 931#
895# Sonics Silicon Backplane 932# Sonics Silicon Backplane
896# 933#
897CONFIG_SSB_POSSIBLE=y
898# CONFIG_SSB is not set 934# CONFIG_SSB is not set
899 935
900# 936#
@@ -903,18 +939,14 @@ CONFIG_SSB_POSSIBLE=y
903# CONFIG_MFD_CORE is not set 939# CONFIG_MFD_CORE is not set
904# CONFIG_MFD_SM501 is not set 940# CONFIG_MFD_SM501 is not set
905# CONFIG_HTC_PASIC3 is not set 941# CONFIG_HTC_PASIC3 is not set
942# CONFIG_TPS65010 is not set
943# CONFIG_TWL4030_CORE is not set
906# CONFIG_MFD_TMIO is not set 944# CONFIG_MFD_TMIO is not set
907# CONFIG_PMIC_DA903X is not set 945# CONFIG_PMIC_DA903X is not set
908# CONFIG_MFD_WM8400 is not set 946# CONFIG_MFD_WM8400 is not set
909# CONFIG_MFD_WM8350_I2C is not set 947# CONFIG_MFD_WM8350_I2C is not set
910 948# CONFIG_MFD_PCF50633 is not set
911#
912# Voltage and Current regulators
913#
914# CONFIG_REGULATOR is not set 949# 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
918 950
919# 951#
920# Multimedia devices 952# Multimedia devices
@@ -970,9 +1002,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
970# 1002#
971 1003
972# 1004#
973# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1005# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
974# 1006#
975# CONFIG_USB_GADGET is not set 1007# CONFIG_USB_GADGET is not set
1008
1009#
1010# OTG and related infrastructure
1011#
976# CONFIG_UWB is not set 1012# CONFIG_UWB is not set
977# CONFIG_MMC is not set 1013# CONFIG_MMC is not set
978# CONFIG_MEMSTICK is not set 1014# CONFIG_MEMSTICK is not set
@@ -1004,6 +1040,7 @@ CONFIG_FS_MBCACHE=y
1004CONFIG_FILE_LOCKING=y 1040CONFIG_FILE_LOCKING=y
1005# CONFIG_XFS_FS is not set 1041# CONFIG_XFS_FS is not set
1006# CONFIG_OCFS2_FS is not set 1042# CONFIG_OCFS2_FS is not set
1043# CONFIG_BTRFS_FS is not set
1007CONFIG_DNOTIFY=y 1044CONFIG_DNOTIFY=y
1008CONFIG_INOTIFY=y 1045CONFIG_INOTIFY=y
1009CONFIG_INOTIFY_USER=y 1046CONFIG_INOTIFY_USER=y
@@ -1037,10 +1074,7 @@ CONFIG_TMPFS=y
1037# CONFIG_TMPFS_POSIX_ACL is not set 1074# CONFIG_TMPFS_POSIX_ACL is not set
1038# CONFIG_HUGETLB_PAGE is not set 1075# CONFIG_HUGETLB_PAGE is not set
1039# CONFIG_CONFIGFS_FS is not set 1076# CONFIG_CONFIGFS_FS is not set
1040 1077CONFIG_MISC_FILESYSTEMS=y
1041#
1042# Miscellaneous filesystems
1043#
1044# CONFIG_ADFS_FS is not set 1078# CONFIG_ADFS_FS is not set
1045# CONFIG_AFFS_FS is not set 1079# CONFIG_AFFS_FS is not set
1046# CONFIG_HFS_FS is not set 1080# CONFIG_HFS_FS is not set
@@ -1060,6 +1094,7 @@ CONFIG_JFFS2_ZLIB=y
1060CONFIG_JFFS2_RTIME=y 1094CONFIG_JFFS2_RTIME=y
1061# CONFIG_JFFS2_RUBIN is not set 1095# CONFIG_JFFS2_RUBIN is not set
1062CONFIG_CRAMFS=y 1096CONFIG_CRAMFS=y
1097# CONFIG_SQUASHFS is not set
1063# CONFIG_VXFS_FS is not set 1098# CONFIG_VXFS_FS is not set
1064# CONFIG_MINIX_FS is not set 1099# CONFIG_MINIX_FS is not set
1065# CONFIG_OMFS_FS is not set 1100# CONFIG_OMFS_FS is not set
@@ -1110,6 +1145,7 @@ CONFIG_PARTITION_ADVANCED=y
1110# Library routines 1145# Library routines
1111# 1146#
1112CONFIG_BITREVERSE=y 1147CONFIG_BITREVERSE=y
1148CONFIG_GENERIC_FIND_LAST_BIT=y
1113# CONFIG_CRC_CCITT is not set 1149# CONFIG_CRC_CCITT is not set
1114# CONFIG_CRC16 is not set 1150# CONFIG_CRC16 is not set
1115# CONFIG_CRC_T10DIF is not set 1151# CONFIG_CRC_T10DIF is not set
@@ -1145,6 +1181,8 @@ CONFIG_FRAME_WARN=1024
1145# CONFIG_LATENCYTOP is not set 1181# CONFIG_LATENCYTOP is not set
1146CONFIG_SYSCTL_SYSCALL_CHECK=y 1182CONFIG_SYSCTL_SYSCALL_CHECK=y
1147CONFIG_HAVE_FUNCTION_TRACER=y 1183CONFIG_HAVE_FUNCTION_TRACER=y
1184CONFIG_HAVE_DYNAMIC_FTRACE=y
1185CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1148 1186
1149# 1187#
1150# Tracers 1188# Tracers
@@ -1152,6 +1190,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1152# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1190# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1153# CONFIG_SAMPLES is not set 1191# CONFIG_SAMPLES is not set
1154CONFIG_HAVE_ARCH_KGDB=y 1192CONFIG_HAVE_ARCH_KGDB=y
1193CONFIG_PRINT_STACK_DEPTH=64
1155# CONFIG_IRQSTACKS is not set 1194# CONFIG_IRQSTACKS is not set
1156# CONFIG_PPC_EARLY_DEBUG is not set 1195# CONFIG_PPC_EARLY_DEBUG is not set
1157 1196
@@ -1169,6 +1208,7 @@ CONFIG_CRYPTO=y
1169# 1208#
1170# CONFIG_CRYPTO_FIPS is not set 1209# CONFIG_CRYPTO_FIPS is not set
1171# CONFIG_CRYPTO_MANAGER is not set 1210# CONFIG_CRYPTO_MANAGER is not set
1211# CONFIG_CRYPTO_MANAGER2 is not set
1172# CONFIG_CRYPTO_GF128MUL is not set 1212# CONFIG_CRYPTO_GF128MUL is not set
1173# CONFIG_CRYPTO_NULL is not set 1213# CONFIG_CRYPTO_NULL is not set
1174# CONFIG_CRYPTO_CRYPTD is not set 1214# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/85xx/tqm8548_defconfig b/arch/powerpc/configs/85xx/tqm8548_defconfig
index 397d37fbe7e3..0bc45975911a 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:22 2008 4# Mon Jan 26 15:36:20 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,7 +21,9 @@ CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y 21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
24# CONFIG_PPC_MM_SLICES is not set 25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
25CONFIG_PPC32=y 27CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 28CONFIG_WORD_SIZE=32
27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -45,7 +47,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
45CONFIG_PPC=y 47CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 48CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 49CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 50CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 51CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 52CONFIG_PPC_OF=y
51CONFIG_OF=y 53CONFIG_OF=y
@@ -75,12 +77,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 77# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 78# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 79CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 80CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 81# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 82# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 83CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 84# CONFIG_CGROUP_SCHED is not set
85# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 86CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 87CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 88# CONFIG_RELAY is not set
@@ -115,7 +117,6 @@ CONFIG_SLUB_DEBUG=y
115CONFIG_SLUB=y 117CONFIG_SLUB=y
116# CONFIG_SLOB is not set 118# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set 119# CONFIG_PROFILING is not set
118# CONFIG_MARKERS is not set
119CONFIG_HAVE_OPROFILE=y 120CONFIG_HAVE_OPROFILE=y
120# CONFIG_KPROBES is not set 121# CONFIG_KPROBES is not set
121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 122CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -126,7 +127,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 127# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 128CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 129CONFIG_RT_MUTEXES=y
129# CONFIG_TINY_SHMEM is not set
130CONFIG_BASE_SMALL=0 130CONFIG_BASE_SMALL=0
131CONFIG_MODULES=y 131CONFIG_MODULES=y
132# CONFIG_MODULE_FORCE_LOAD is not set 132# CONFIG_MODULE_FORCE_LOAD is not set
@@ -134,11 +134,9 @@ CONFIG_MODULE_UNLOAD=y
134# CONFIG_MODULE_FORCE_UNLOAD is not set 134# CONFIG_MODULE_FORCE_UNLOAD is not set
135# CONFIG_MODVERSIONS is not set 135# CONFIG_MODVERSIONS is not set
136# CONFIG_MODULE_SRCVERSION_ALL is not set 136# CONFIG_MODULE_SRCVERSION_ALL is not set
137CONFIG_KMOD=y
138CONFIG_BLOCK=y 137CONFIG_BLOCK=y
139# CONFIG_LBD is not set 138# CONFIG_LBD is not set
140# CONFIG_BLK_DEV_IO_TRACE is not set 139# CONFIG_BLK_DEV_IO_TRACE is not set
141# CONFIG_LSF is not set
142# CONFIG_BLK_DEV_BSG is not set 140# CONFIG_BLK_DEV_BSG is not set
143# CONFIG_BLK_DEV_INTEGRITY is not set 141# CONFIG_BLK_DEV_INTEGRITY is not set
144 142
@@ -155,6 +153,10 @@ CONFIG_DEFAULT_AS=y
155# CONFIG_DEFAULT_NOOP is not set 153# CONFIG_DEFAULT_NOOP is not set
156CONFIG_DEFAULT_IOSCHED="anticipatory" 154CONFIG_DEFAULT_IOSCHED="anticipatory"
157CONFIG_CLASSIC_RCU=y 155CONFIG_CLASSIC_RCU=y
156# CONFIG_TREE_RCU is not set
157# CONFIG_PREEMPT_RCU is not set
158# CONFIG_TREE_RCU_TRACE is not set
159# CONFIG_PREEMPT_RCU_TRACE is not set
158# CONFIG_FREEZER is not set 160# CONFIG_FREEZER is not set
159 161
160# 162#
@@ -195,6 +197,7 @@ CONFIG_MPIC=y
195# CONFIG_CPM2 is not set 197# CONFIG_CPM2 is not set
196# CONFIG_FSL_ULI1575 is not set 198# CONFIG_FSL_ULI1575 is not set
197# CONFIG_MPC8xxx_GPIO is not set 199# CONFIG_MPC8xxx_GPIO is not set
200# CONFIG_SIMPLE_GPIO is not set
198 201
199# 202#
200# Kernel options 203# Kernel options
@@ -233,12 +236,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
233CONFIG_PAGEFLAGS_EXTENDED=y 236CONFIG_PAGEFLAGS_EXTENDED=y
234CONFIG_SPLIT_PTLOCK_CPUS=4 237CONFIG_SPLIT_PTLOCK_CPUS=4
235CONFIG_MIGRATION=y 238CONFIG_MIGRATION=y
236# CONFIG_RESOURCES_64BIT is not set
237# CONFIG_PHYS_ADDR_T_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
241CONFIG_UNEVICTABLE_LRU=y 243CONFIG_UNEVICTABLE_LRU=y
244CONFIG_PPC_4K_PAGES=y
245# CONFIG_PPC_16K_PAGES is not set
246# CONFIG_PPC_64K_PAGES is not set
242CONFIG_FORCE_MAX_ZONEORDER=11 247CONFIG_FORCE_MAX_ZONEORDER=11
243CONFIG_PROC_DEVICETREE=y 248CONFIG_PROC_DEVICETREE=y
244# CONFIG_CMDLINE_BOOL is not set 249# CONFIG_CMDLINE_BOOL is not set
@@ -265,6 +270,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
265# CONFIG_PCI_MSI is not set 270# CONFIG_PCI_MSI is not set
266# CONFIG_PCI_LEGACY is not set 271# CONFIG_PCI_LEGACY is not set
267# CONFIG_PCI_DEBUG is not set 272# CONFIG_PCI_DEBUG is not set
273# CONFIG_PCI_STUB is not set
268# CONFIG_PCCARD is not set 274# CONFIG_PCCARD is not set
269# CONFIG_HOTPLUG_PCI is not set 275# CONFIG_HOTPLUG_PCI is not set
270# CONFIG_HAS_RAPIDIO is not set 276# CONFIG_HAS_RAPIDIO is not set
@@ -288,6 +294,7 @@ CONFIG_NET=y
288# 294#
289# Networking options 295# Networking options
290# 296#
297CONFIG_COMPAT_NET_DEV_OPS=y
291CONFIG_PACKET=y 298CONFIG_PACKET=y
292# CONFIG_PACKET_MMAP is not set 299# CONFIG_PACKET_MMAP is not set
293CONFIG_UNIX=y 300CONFIG_UNIX=y
@@ -344,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_ECONET is not set 351# CONFIG_ECONET is not set
345# CONFIG_WAN_ROUTER is not set 352# CONFIG_WAN_ROUTER is not set
346# CONFIG_NET_SCHED is not set 353# CONFIG_NET_SCHED is not set
354# CONFIG_DCB is not set
347 355
348# 356#
349# Network testing 357# Network testing
@@ -359,8 +367,9 @@ CONFIG_WIRELESS=y
359# CONFIG_CFG80211 is not set 367# CONFIG_CFG80211 is not set
360CONFIG_WIRELESS_OLD_REGULATORY=y 368CONFIG_WIRELESS_OLD_REGULATORY=y
361# CONFIG_WIRELESS_EXT is not set 369# CONFIG_WIRELESS_EXT is not set
370# CONFIG_LIB80211 is not set
362# CONFIG_MAC80211 is not set 371# CONFIG_MAC80211 is not set
363# CONFIG_IEEE80211 is not set 372# CONFIG_WIMAX is not set
364# CONFIG_RFKILL is not set 373# CONFIG_RFKILL is not set
365# CONFIG_NET_9P is not set 374# CONFIG_NET_9P is not set
366 375
@@ -383,6 +392,7 @@ CONFIG_MTD=y
383# CONFIG_MTD_DEBUG is not set 392# CONFIG_MTD_DEBUG is not set
384# CONFIG_MTD_CONCAT is not set 393# CONFIG_MTD_CONCAT is not set
385CONFIG_MTD_PARTITIONS=y 394CONFIG_MTD_PARTITIONS=y
395# CONFIG_MTD_TESTS is not set
386# CONFIG_MTD_REDBOOT_PARTS is not set 396# CONFIG_MTD_REDBOOT_PARTS is not set
387# CONFIG_MTD_CMDLINE_PARTS is not set 397# CONFIG_MTD_CMDLINE_PARTS is not set
388CONFIG_MTD_OF_PARTS=y 398CONFIG_MTD_OF_PARTS=y
@@ -465,6 +475,12 @@ CONFIG_MTD_NAND_IDS=y
465# CONFIG_MTD_ONENAND is not set 475# CONFIG_MTD_ONENAND is not set
466 476
467# 477#
478# LPDDR flash memory drivers
479#
480# CONFIG_MTD_LPDDR is not set
481# CONFIG_MTD_QINFO_PROBE is not set
482
483#
468# UBI - Unsorted block images 484# UBI - Unsorted block images
469# 485#
470CONFIG_MTD_UBI=m 486CONFIG_MTD_UBI=m
@@ -502,8 +518,10 @@ CONFIG_MISC_DEVICES=y
502# CONFIG_EEPROM_93CX6 is not set 518# CONFIG_EEPROM_93CX6 is not set
503# CONFIG_SGI_IOC4 is not set 519# CONFIG_SGI_IOC4 is not set
504# CONFIG_TIFM_CORE is not set 520# CONFIG_TIFM_CORE is not set
521# CONFIG_ICS932S401 is not set
505# CONFIG_ENCLOSURE_SERVICES is not set 522# CONFIG_ENCLOSURE_SERVICES is not set
506# CONFIG_HP_ILO is not set 523# CONFIG_HP_ILO is not set
524# CONFIG_C2PORT is not set
507CONFIG_HAVE_IDE=y 525CONFIG_HAVE_IDE=y
508CONFIG_IDE=y 526CONFIG_IDE=y
509 527
@@ -546,6 +564,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
546# CONFIG_BLK_DEV_JMICRON is not set 564# CONFIG_BLK_DEV_JMICRON is not set
547# CONFIG_BLK_DEV_SC1200 is not set 565# CONFIG_BLK_DEV_SC1200 is not set
548# CONFIG_BLK_DEV_PIIX is not set 566# CONFIG_BLK_DEV_PIIX is not set
567# CONFIG_BLK_DEV_IT8172 is not set
549# CONFIG_BLK_DEV_IT8213 is not set 568# CONFIG_BLK_DEV_IT8213 is not set
550# CONFIG_BLK_DEV_IT821X is not set 569# CONFIG_BLK_DEV_IT821X is not set
551# CONFIG_BLK_DEV_NS87415 is not set 570# CONFIG_BLK_DEV_NS87415 is not set
@@ -605,6 +624,9 @@ CONFIG_PHYLIB=y
605# CONFIG_BROADCOM_PHY is not set 624# CONFIG_BROADCOM_PHY is not set
606# CONFIG_ICPLUS_PHY is not set 625# CONFIG_ICPLUS_PHY is not set
607# CONFIG_REALTEK_PHY is not set 626# CONFIG_REALTEK_PHY is not set
627# CONFIG_NATIONAL_PHY is not set
628# CONFIG_STE10XP is not set
629# CONFIG_LSI_ET1011C_PHY is not set
608# CONFIG_FIXED_PHY is not set 630# CONFIG_FIXED_PHY is not set
609# CONFIG_MDIO_BITBANG is not set 631# CONFIG_MDIO_BITBANG is not set
610CONFIG_NET_ETHERNET=y 632CONFIG_NET_ETHERNET=y
@@ -649,6 +671,7 @@ CONFIG_GIANFAR=y
649# CONFIG_JME is not set 671# CONFIG_JME is not set
650CONFIG_NETDEV_10000=y 672CONFIG_NETDEV_10000=y
651# CONFIG_CHELSIO_T1 is not set 673# CONFIG_CHELSIO_T1 is not set
674CONFIG_CHELSIO_T3_DEPENDS=y
652# CONFIG_CHELSIO_T3 is not set 675# CONFIG_CHELSIO_T3 is not set
653# CONFIG_ENIC is not set 676# CONFIG_ENIC is not set
654# CONFIG_IXGBE is not set 677# CONFIG_IXGBE is not set
@@ -671,6 +694,10 @@ CONFIG_NETDEV_10000=y
671# CONFIG_WLAN_PRE80211 is not set 694# CONFIG_WLAN_PRE80211 is not set
672# CONFIG_WLAN_80211 is not set 695# CONFIG_WLAN_80211 is not set
673# CONFIG_IWLWIFI_LEDS is not set 696# CONFIG_IWLWIFI_LEDS is not set
697
698#
699# Enable WiMAX (Networking options) to see the WiMAX drivers
700#
674# CONFIG_WAN is not set 701# CONFIG_WAN is not set
675# CONFIG_FDDI is not set 702# CONFIG_FDDI is not set
676# CONFIG_HIPPI is not set 703# CONFIG_HIPPI is not set
@@ -741,8 +768,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
741# CONFIG_SERIAL_JSM is not set 768# CONFIG_SERIAL_JSM is not set
742# CONFIG_SERIAL_OF_PLATFORM is not set 769# CONFIG_SERIAL_OF_PLATFORM is not set
743CONFIG_UNIX98_PTYS=y 770CONFIG_UNIX98_PTYS=y
771# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
744CONFIG_LEGACY_PTYS=y 772CONFIG_LEGACY_PTYS=y
745CONFIG_LEGACY_PTY_COUNT=256 773CONFIG_LEGACY_PTY_COUNT=256
774# CONFIG_HVC_UDBG is not set
746# CONFIG_IPMI_HANDLER is not set 775# CONFIG_IPMI_HANDLER is not set
747# CONFIG_HW_RANDOM is not set 776# CONFIG_HW_RANDOM is not set
748# CONFIG_NVRAM is not set 777# CONFIG_NVRAM is not set
@@ -833,8 +862,10 @@ CONFIG_HWMON=y
833# CONFIG_SENSORS_ADM1029 is not set 862# CONFIG_SENSORS_ADM1029 is not set
834# CONFIG_SENSORS_ADM1031 is not set 863# CONFIG_SENSORS_ADM1031 is not set
835# CONFIG_SENSORS_ADM9240 is not set 864# CONFIG_SENSORS_ADM9240 is not set
865# CONFIG_SENSORS_ADT7462 is not set
836# CONFIG_SENSORS_ADT7470 is not set 866# CONFIG_SENSORS_ADT7470 is not set
837# CONFIG_SENSORS_ADT7473 is not set 867# CONFIG_SENSORS_ADT7473 is not set
868# CONFIG_SENSORS_ADT7475 is not set
838# CONFIG_SENSORS_ATXP1 is not set 869# CONFIG_SENSORS_ATXP1 is not set
839# CONFIG_SENSORS_DS1621 is not set 870# CONFIG_SENSORS_DS1621 is not set
840# CONFIG_SENSORS_I5K_AMB is not set 871# CONFIG_SENSORS_I5K_AMB is not set
@@ -855,6 +886,7 @@ CONFIG_SENSORS_LM75=y
855# CONFIG_SENSORS_LM90 is not set 886# CONFIG_SENSORS_LM90 is not set
856# CONFIG_SENSORS_LM92 is not set 887# CONFIG_SENSORS_LM92 is not set
857# CONFIG_SENSORS_LM93 is not set 888# CONFIG_SENSORS_LM93 is not set
889# CONFIG_SENSORS_LTC4245 is not set
858# CONFIG_SENSORS_MAX1619 is not set 890# CONFIG_SENSORS_MAX1619 is not set
859# CONFIG_SENSORS_MAX6650 is not set 891# CONFIG_SENSORS_MAX6650 is not set
860# CONFIG_SENSORS_PC87360 is not set 892# CONFIG_SENSORS_PC87360 is not set
@@ -881,11 +913,11 @@ CONFIG_SENSORS_LM75=y
881# CONFIG_THERMAL is not set 913# CONFIG_THERMAL is not set
882# CONFIG_THERMAL_HWMON is not set 914# CONFIG_THERMAL_HWMON is not set
883# CONFIG_WATCHDOG is not set 915# CONFIG_WATCHDOG is not set
916CONFIG_SSB_POSSIBLE=y
884 917
885# 918#
886# Sonics Silicon Backplane 919# Sonics Silicon Backplane
887# 920#
888CONFIG_SSB_POSSIBLE=y
889# CONFIG_SSB is not set 921# CONFIG_SSB is not set
890 922
891# 923#
@@ -894,18 +926,13 @@ CONFIG_SSB_POSSIBLE=y
894# CONFIG_MFD_CORE is not set 926# CONFIG_MFD_CORE is not set
895# CONFIG_MFD_SM501 is not set 927# CONFIG_MFD_SM501 is not set
896# CONFIG_HTC_PASIC3 is not set 928# CONFIG_HTC_PASIC3 is not set
929# CONFIG_TWL4030_CORE is not set
897# CONFIG_MFD_TMIO is not set 930# CONFIG_MFD_TMIO is not set
898# CONFIG_PMIC_DA903X is not set 931# CONFIG_PMIC_DA903X is not set
899# CONFIG_MFD_WM8400 is not set 932# CONFIG_MFD_WM8400 is not set
900# CONFIG_MFD_WM8350_I2C is not set 933# CONFIG_MFD_WM8350_I2C is not set
901 934# CONFIG_MFD_PCF50633 is not set
902#
903# Voltage and Current regulators
904#
905# CONFIG_REGULATOR is not set 935# 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
909 936
910# 937#
911# Multimedia devices 938# Multimedia devices
@@ -961,9 +988,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
961# 988#
962 989
963# 990#
964# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 991# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
965# 992#
966# CONFIG_USB_GADGET is not set 993# CONFIG_USB_GADGET is not set
994
995#
996# OTG and related infrastructure
997#
967# CONFIG_UWB is not set 998# CONFIG_UWB is not set
968# CONFIG_MMC is not set 999# CONFIG_MMC is not set
969# CONFIG_MEMSTICK is not set 1000# CONFIG_MEMSTICK is not set
@@ -1001,6 +1032,7 @@ CONFIG_RTC_DRV_DS1307=y
1001# CONFIG_RTC_DRV_M41T80 is not set 1032# CONFIG_RTC_DRV_M41T80 is not set
1002# CONFIG_RTC_DRV_S35390A is not set 1033# CONFIG_RTC_DRV_S35390A is not set
1003# CONFIG_RTC_DRV_FM3130 is not set 1034# CONFIG_RTC_DRV_FM3130 is not set
1035# CONFIG_RTC_DRV_RX8581 is not set
1004 1036
1005# 1037#
1006# SPI RTC drivers 1038# SPI RTC drivers
@@ -1048,6 +1080,7 @@ CONFIG_FS_MBCACHE=y
1048CONFIG_FILE_LOCKING=y 1080CONFIG_FILE_LOCKING=y
1049# CONFIG_XFS_FS is not set 1081# CONFIG_XFS_FS is not set
1050# CONFIG_OCFS2_FS is not set 1082# CONFIG_OCFS2_FS is not set
1083# CONFIG_BTRFS_FS is not set
1051CONFIG_DNOTIFY=y 1084CONFIG_DNOTIFY=y
1052CONFIG_INOTIFY=y 1085CONFIG_INOTIFY=y
1053CONFIG_INOTIFY_USER=y 1086CONFIG_INOTIFY_USER=y
@@ -1081,10 +1114,7 @@ CONFIG_TMPFS=y
1081# CONFIG_TMPFS_POSIX_ACL is not set 1114# CONFIG_TMPFS_POSIX_ACL is not set
1082# CONFIG_HUGETLB_PAGE is not set 1115# CONFIG_HUGETLB_PAGE is not set
1083# CONFIG_CONFIGFS_FS is not set 1116# CONFIG_CONFIGFS_FS is not set
1084 1117CONFIG_MISC_FILESYSTEMS=y
1085#
1086# Miscellaneous filesystems
1087#
1088# CONFIG_ADFS_FS is not set 1118# CONFIG_ADFS_FS is not set
1089# CONFIG_AFFS_FS is not set 1119# CONFIG_AFFS_FS is not set
1090# CONFIG_HFS_FS is not set 1120# CONFIG_HFS_FS is not set
@@ -1095,6 +1125,7 @@ CONFIG_TMPFS=y
1095# CONFIG_JFFS2_FS is not set 1125# CONFIG_JFFS2_FS is not set
1096# CONFIG_UBIFS_FS is not set 1126# CONFIG_UBIFS_FS is not set
1097# CONFIG_CRAMFS is not set 1127# CONFIG_CRAMFS is not set
1128# CONFIG_SQUASHFS is not set
1098# CONFIG_VXFS_FS is not set 1129# CONFIG_VXFS_FS is not set
1099# CONFIG_MINIX_FS is not set 1130# CONFIG_MINIX_FS is not set
1100# CONFIG_OMFS_FS is not set 1131# CONFIG_OMFS_FS is not set
@@ -1145,6 +1176,7 @@ CONFIG_PARTITION_ADVANCED=y
1145# Library routines 1176# Library routines
1146# 1177#
1147CONFIG_BITREVERSE=y 1178CONFIG_BITREVERSE=y
1179CONFIG_GENERIC_FIND_LAST_BIT=y
1148# CONFIG_CRC_CCITT is not set 1180# CONFIG_CRC_CCITT is not set
1149# CONFIG_CRC16 is not set 1181# CONFIG_CRC16 is not set
1150# CONFIG_CRC_T10DIF is not set 1182# CONFIG_CRC_T10DIF is not set
@@ -1194,6 +1226,7 @@ CONFIG_DEBUG_MUTEXES=y
1194# CONFIG_DEBUG_MEMORY_INIT is not set 1226# CONFIG_DEBUG_MEMORY_INIT is not set
1195# CONFIG_DEBUG_LIST is not set 1227# CONFIG_DEBUG_LIST is not set
1196# CONFIG_DEBUG_SG is not set 1228# CONFIG_DEBUG_SG is not set
1229# CONFIG_DEBUG_NOTIFIERS is not set
1197# CONFIG_BOOT_PRINTK_DELAY is not set 1230# CONFIG_BOOT_PRINTK_DELAY is not set
1198# CONFIG_RCU_TORTURE_TEST is not set 1231# CONFIG_RCU_TORTURE_TEST is not set
1199# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1232# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1203,6 +1236,8 @@ CONFIG_DEBUG_MUTEXES=y
1203# CONFIG_LATENCYTOP is not set 1236# CONFIG_LATENCYTOP is not set
1204CONFIG_SYSCTL_SYSCALL_CHECK=y 1237CONFIG_SYSCTL_SYSCALL_CHECK=y
1205CONFIG_HAVE_FUNCTION_TRACER=y 1238CONFIG_HAVE_FUNCTION_TRACER=y
1239CONFIG_HAVE_DYNAMIC_FTRACE=y
1240CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1206 1241
1207# 1242#
1208# Tracers 1243# Tracers
@@ -1211,11 +1246,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1211# CONFIG_SCHED_TRACER is not set 1246# CONFIG_SCHED_TRACER is not set
1212# CONFIG_CONTEXT_SWITCH_TRACER is not set 1247# CONFIG_CONTEXT_SWITCH_TRACER is not set
1213# CONFIG_BOOT_TRACER is not set 1248# CONFIG_BOOT_TRACER is not set
1249# CONFIG_TRACE_BRANCH_PROFILING is not set
1214# CONFIG_STACK_TRACER is not set 1250# CONFIG_STACK_TRACER is not set
1215# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1251# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1216# CONFIG_SAMPLES is not set 1252# CONFIG_SAMPLES is not set
1217CONFIG_HAVE_ARCH_KGDB=y 1253CONFIG_HAVE_ARCH_KGDB=y
1218# CONFIG_KGDB is not set 1254# CONFIG_KGDB is not set
1255CONFIG_PRINT_STACK_DEPTH=64
1219# CONFIG_DEBUG_STACKOVERFLOW is not set 1256# CONFIG_DEBUG_STACKOVERFLOW is not set
1220# CONFIG_DEBUG_STACK_USAGE is not set 1257# CONFIG_DEBUG_STACK_USAGE is not set
1221# CONFIG_DEBUG_PAGEALLOC is not set 1258# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1241,6 +1278,7 @@ CONFIG_CRYPTO=y
1241# 1278#
1242# CONFIG_CRYPTO_FIPS is not set 1279# CONFIG_CRYPTO_FIPS is not set
1243# CONFIG_CRYPTO_MANAGER is not set 1280# CONFIG_CRYPTO_MANAGER is not set
1281# CONFIG_CRYPTO_MANAGER2 is not set
1244# CONFIG_CRYPTO_GF128MUL is not set 1282# CONFIG_CRYPTO_GF128MUL is not set
1245# CONFIG_CRYPTO_NULL is not set 1283# CONFIG_CRYPTO_NULL is not set
1246# CONFIG_CRYPTO_CRYPTD is not set 1284# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig
index 856ca6ab37b7..d5a864d74461 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:23 2008 4# Mon Jan 26 15:36:21 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,7 +21,9 @@ CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y 21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
24# CONFIG_PPC_MM_SLICES is not set 25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
25CONFIG_PPC32=y 27CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 28CONFIG_WORD_SIZE=32
27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -46,7 +48,7 @@ CONFIG_GENERIC_GPIO=y
46CONFIG_PPC=y 48CONFIG_PPC=y
47CONFIG_EARLY_PRINTK=y 49CONFIG_EARLY_PRINTK=y
48CONFIG_GENERIC_NVRAM=y 50CONFIG_GENERIC_NVRAM=y
49CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 51CONFIG_SCHED_OMIT_FRAME_POINTER=y
50CONFIG_ARCH_MAY_HAVE_PC_FDC=y 52CONFIG_ARCH_MAY_HAVE_PC_FDC=y
51CONFIG_PPC_OF=y 53CONFIG_PPC_OF=y
52CONFIG_OF=y 54CONFIG_OF=y
@@ -76,12 +78,12 @@ CONFIG_SYSVIPC_SYSCTL=y
76# CONFIG_AUDIT is not set 78# CONFIG_AUDIT is not set
77# CONFIG_IKCONFIG is not set 79# CONFIG_IKCONFIG is not set
78CONFIG_LOG_BUF_SHIFT=14 80CONFIG_LOG_BUF_SHIFT=14
79# CONFIG_CGROUPS is not set
80CONFIG_GROUP_SCHED=y 81CONFIG_GROUP_SCHED=y
81CONFIG_FAIR_GROUP_SCHED=y 82CONFIG_FAIR_GROUP_SCHED=y
82# CONFIG_RT_GROUP_SCHED is not set 83# CONFIG_RT_GROUP_SCHED is not set
83CONFIG_USER_SCHED=y 84CONFIG_USER_SCHED=y
84# CONFIG_CGROUP_SCHED is not set 85# CONFIG_CGROUP_SCHED is not set
86# CONFIG_CGROUPS is not set
85CONFIG_SYSFS_DEPRECATED=y 87CONFIG_SYSFS_DEPRECATED=y
86CONFIG_SYSFS_DEPRECATED_V2=y 88CONFIG_SYSFS_DEPRECATED_V2=y
87# CONFIG_RELAY is not set 89# CONFIG_RELAY is not set
@@ -114,7 +116,6 @@ CONFIG_SLUB_DEBUG=y
114CONFIG_SLUB=y 116CONFIG_SLUB=y
115# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
116# CONFIG_PROFILING is not set 118# CONFIG_PROFILING is not set
117# CONFIG_MARKERS is not set
118CONFIG_HAVE_OPROFILE=y 119CONFIG_HAVE_OPROFILE=y
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
120CONFIG_HAVE_IOREMAP_PROT=y 121CONFIG_HAVE_IOREMAP_PROT=y
@@ -125,13 +126,11 @@ CONFIG_HAVE_CLK=y
125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
126CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
127CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
128# CONFIG_TINY_SHMEM is not set
129CONFIG_BASE_SMALL=0 129CONFIG_BASE_SMALL=0
130# CONFIG_MODULES is not set 130# CONFIG_MODULES is not set
131CONFIG_BLOCK=y 131CONFIG_BLOCK=y
132# CONFIG_LBD is not set 132# CONFIG_LBD is not set
133# CONFIG_BLK_DEV_IO_TRACE is not set 133# CONFIG_BLK_DEV_IO_TRACE is not set
134# CONFIG_LSF is not set
135# CONFIG_BLK_DEV_BSG is not set 134# CONFIG_BLK_DEV_BSG is not set
136# CONFIG_BLK_DEV_INTEGRITY is not set 135# CONFIG_BLK_DEV_INTEGRITY is not set
137 136
@@ -148,6 +147,10 @@ CONFIG_DEFAULT_AS=y
148# CONFIG_DEFAULT_NOOP is not set 147# CONFIG_DEFAULT_NOOP is not set
149CONFIG_DEFAULT_IOSCHED="anticipatory" 148CONFIG_DEFAULT_IOSCHED="anticipatory"
150CONFIG_CLASSIC_RCU=y 149CONFIG_CLASSIC_RCU=y
150# CONFIG_TREE_RCU is not set
151# CONFIG_PREEMPT_RCU is not set
152# CONFIG_TREE_RCU_TRACE is not set
153# CONFIG_PREEMPT_RCU_TRACE is not set
151# CONFIG_FREEZER is not set 154# CONFIG_FREEZER is not set
152 155
153# 156#
@@ -189,6 +192,7 @@ CONFIG_CPM2=y
189# CONFIG_FSL_ULI1575 is not set 192# CONFIG_FSL_ULI1575 is not set
190CONFIG_CPM=y 193CONFIG_CPM=y
191# CONFIG_MPC8xxx_GPIO is not set 194# CONFIG_MPC8xxx_GPIO is not set
195# CONFIG_SIMPLE_GPIO is not set
192 196
193# 197#
194# Kernel options 198# Kernel options
@@ -226,12 +230,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
226CONFIG_PAGEFLAGS_EXTENDED=y 230CONFIG_PAGEFLAGS_EXTENDED=y
227CONFIG_SPLIT_PTLOCK_CPUS=4 231CONFIG_SPLIT_PTLOCK_CPUS=4
228CONFIG_MIGRATION=y 232CONFIG_MIGRATION=y
229# CONFIG_RESOURCES_64BIT is not set
230# CONFIG_PHYS_ADDR_T_64BIT is not set 233# CONFIG_PHYS_ADDR_T_64BIT is not set
231CONFIG_ZONE_DMA_FLAG=1 234CONFIG_ZONE_DMA_FLAG=1
232CONFIG_BOUNCE=y 235CONFIG_BOUNCE=y
233CONFIG_VIRT_TO_BUS=y 236CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y 237CONFIG_UNEVICTABLE_LRU=y
238CONFIG_PPC_4K_PAGES=y
239# CONFIG_PPC_16K_PAGES is not set
240# CONFIG_PPC_64K_PAGES is not set
235CONFIG_FORCE_MAX_ZONEORDER=11 241CONFIG_FORCE_MAX_ZONEORDER=11
236# CONFIG_PROC_DEVICETREE is not set 242# CONFIG_PROC_DEVICETREE is not set
237# CONFIG_CMDLINE_BOOL is not set 243# CONFIG_CMDLINE_BOOL is not set
@@ -255,6 +261,7 @@ CONFIG_PCI_SYSCALL=y
255CONFIG_ARCH_SUPPORTS_MSI=y 261CONFIG_ARCH_SUPPORTS_MSI=y
256# CONFIG_PCI_MSI is not set 262# CONFIG_PCI_MSI is not set
257# CONFIG_PCI_LEGACY is not set 263# CONFIG_PCI_LEGACY is not set
264# CONFIG_PCI_STUB is not set
258# CONFIG_HAS_RAPIDIO is not set 265# CONFIG_HAS_RAPIDIO is not set
259 266
260# 267#
@@ -276,6 +283,7 @@ CONFIG_NET=y
276# 283#
277# Networking options 284# Networking options
278# 285#
286CONFIG_COMPAT_NET_DEV_OPS=y
279CONFIG_PACKET=y 287CONFIG_PACKET=y
280# CONFIG_PACKET_MMAP is not set 288# CONFIG_PACKET_MMAP is not set
281CONFIG_UNIX=y 289CONFIG_UNIX=y
@@ -332,6 +340,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
332# CONFIG_ECONET is not set 340# CONFIG_ECONET is not set
333# CONFIG_WAN_ROUTER is not set 341# CONFIG_WAN_ROUTER is not set
334# CONFIG_NET_SCHED is not set 342# CONFIG_NET_SCHED is not set
343# CONFIG_DCB is not set
335 344
336# 345#
337# Network testing 346# Network testing
@@ -347,8 +356,9 @@ CONFIG_WIRELESS=y
347# CONFIG_CFG80211 is not set 356# CONFIG_CFG80211 is not set
348CONFIG_WIRELESS_OLD_REGULATORY=y 357CONFIG_WIRELESS_OLD_REGULATORY=y
349# CONFIG_WIRELESS_EXT is not set 358# CONFIG_WIRELESS_EXT is not set
359# CONFIG_LIB80211 is not set
350# CONFIG_MAC80211 is not set 360# CONFIG_MAC80211 is not set
351# CONFIG_IEEE80211 is not set 361# CONFIG_WIMAX is not set
352# CONFIG_RFKILL is not set 362# CONFIG_RFKILL is not set
353# CONFIG_NET_9P is not set 363# CONFIG_NET_9P is not set
354 364
@@ -438,6 +448,12 @@ CONFIG_MTD_CFI_UTIL=y
438# CONFIG_MTD_ONENAND is not set 448# CONFIG_MTD_ONENAND is not set
439 449
440# 450#
451# LPDDR flash memory drivers
452#
453# CONFIG_MTD_LPDDR is not set
454# CONFIG_MTD_QINFO_PROBE is not set
455
456#
441# UBI - Unsorted block images 457# UBI - Unsorted block images
442# 458#
443# CONFIG_MTD_UBI is not set 459# CONFIG_MTD_UBI is not set
@@ -468,8 +484,10 @@ CONFIG_MISC_DEVICES=y
468# CONFIG_EEPROM_93CX6 is not set 484# CONFIG_EEPROM_93CX6 is not set
469# CONFIG_SGI_IOC4 is not set 485# CONFIG_SGI_IOC4 is not set
470# CONFIG_TIFM_CORE is not set 486# CONFIG_TIFM_CORE is not set
487# CONFIG_ICS932S401 is not set
471# CONFIG_ENCLOSURE_SERVICES is not set 488# CONFIG_ENCLOSURE_SERVICES is not set
472# CONFIG_HP_ILO is not set 489# CONFIG_HP_ILO is not set
490# CONFIG_C2PORT is not set
473CONFIG_HAVE_IDE=y 491CONFIG_HAVE_IDE=y
474CONFIG_IDE=y 492CONFIG_IDE=y
475 493
@@ -512,6 +530,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
512# CONFIG_BLK_DEV_JMICRON is not set 530# CONFIG_BLK_DEV_JMICRON is not set
513# CONFIG_BLK_DEV_SC1200 is not set 531# CONFIG_BLK_DEV_SC1200 is not set
514# CONFIG_BLK_DEV_PIIX is not set 532# CONFIG_BLK_DEV_PIIX is not set
533# CONFIG_BLK_DEV_IT8172 is not set
515# CONFIG_BLK_DEV_IT8213 is not set 534# CONFIG_BLK_DEV_IT8213 is not set
516# CONFIG_BLK_DEV_IT821X is not set 535# CONFIG_BLK_DEV_IT821X is not set
517# CONFIG_BLK_DEV_NS87415 is not set 536# CONFIG_BLK_DEV_NS87415 is not set
@@ -571,6 +590,9 @@ CONFIG_PHYLIB=y
571# CONFIG_BROADCOM_PHY is not set 590# CONFIG_BROADCOM_PHY is not set
572# CONFIG_ICPLUS_PHY is not set 591# CONFIG_ICPLUS_PHY is not set
573# CONFIG_REALTEK_PHY is not set 592# CONFIG_REALTEK_PHY is not set
593# CONFIG_NATIONAL_PHY is not set
594# CONFIG_STE10XP is not set
595# CONFIG_LSI_ET1011C_PHY is not set
574# CONFIG_FIXED_PHY is not set 596# CONFIG_FIXED_PHY is not set
575# CONFIG_MDIO_BITBANG is not set 597# CONFIG_MDIO_BITBANG is not set
576CONFIG_NET_ETHERNET=y 598CONFIG_NET_ETHERNET=y
@@ -594,7 +616,6 @@ CONFIG_NET_PCI=y
594# CONFIG_ADAPTEC_STARFIRE is not set 616# CONFIG_ADAPTEC_STARFIRE is not set
595# CONFIG_B44 is not set 617# CONFIG_B44 is not set
596# CONFIG_FORCEDETH is not set 618# CONFIG_FORCEDETH is not set
597# CONFIG_EEPRO100 is not set
598CONFIG_E100=y 619CONFIG_E100=y
599# CONFIG_FEALNX is not set 620# CONFIG_FEALNX is not set
600# CONFIG_NATSEMI is not set 621# CONFIG_NATSEMI is not set
@@ -604,6 +625,7 @@ CONFIG_E100=y
604# CONFIG_R6040 is not set 625# CONFIG_R6040 is not set
605# CONFIG_SIS900 is not set 626# CONFIG_SIS900 is not set
606# CONFIG_EPIC100 is not set 627# CONFIG_EPIC100 is not set
628# CONFIG_SMSC9420 is not set
607# CONFIG_SUNDANCE is not set 629# CONFIG_SUNDANCE is not set
608# CONFIG_TLAN is not set 630# CONFIG_TLAN is not set
609# CONFIG_VIA_RHINE is not set 631# CONFIG_VIA_RHINE is not set
@@ -634,6 +656,7 @@ CONFIG_GIANFAR=y
634# CONFIG_JME is not set 656# CONFIG_JME is not set
635CONFIG_NETDEV_10000=y 657CONFIG_NETDEV_10000=y
636# CONFIG_CHELSIO_T1 is not set 658# CONFIG_CHELSIO_T1 is not set
659CONFIG_CHELSIO_T3_DEPENDS=y
637# CONFIG_CHELSIO_T3 is not set 660# CONFIG_CHELSIO_T3 is not set
638# CONFIG_ENIC is not set 661# CONFIG_ENIC is not set
639# CONFIG_IXGBE is not set 662# CONFIG_IXGBE is not set
@@ -656,6 +679,10 @@ CONFIG_NETDEV_10000=y
656# CONFIG_WLAN_PRE80211 is not set 679# CONFIG_WLAN_PRE80211 is not set
657# CONFIG_WLAN_80211 is not set 680# CONFIG_WLAN_80211 is not set
658# CONFIG_IWLWIFI_LEDS is not set 681# CONFIG_IWLWIFI_LEDS is not set
682
683#
684# Enable WiMAX (Networking options) to see the WiMAX drivers
685#
659# CONFIG_WAN is not set 686# CONFIG_WAN is not set
660# CONFIG_FDDI is not set 687# CONFIG_FDDI is not set
661# CONFIG_HIPPI is not set 688# CONFIG_HIPPI is not set
@@ -728,8 +755,10 @@ CONFIG_SERIAL_CPM_CONSOLE=y
728# CONFIG_SERIAL_JSM is not set 755# CONFIG_SERIAL_JSM is not set
729# CONFIG_SERIAL_OF_PLATFORM is not set 756# CONFIG_SERIAL_OF_PLATFORM is not set
730CONFIG_UNIX98_PTYS=y 757CONFIG_UNIX98_PTYS=y
758# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
731CONFIG_LEGACY_PTYS=y 759CONFIG_LEGACY_PTYS=y
732CONFIG_LEGACY_PTY_COUNT=256 760CONFIG_LEGACY_PTY_COUNT=256
761# CONFIG_HVC_UDBG is not set
733# CONFIG_IPMI_HANDLER is not set 762# CONFIG_IPMI_HANDLER is not set
734CONFIG_HW_RANDOM=y 763CONFIG_HW_RANDOM=y
735# CONFIG_NVRAM is not set 764# CONFIG_NVRAM is not set
@@ -802,7 +831,6 @@ CONFIG_I2C_MPC=y
802# CONFIG_PCF8575 is not set 831# CONFIG_PCF8575 is not set
803# CONFIG_SENSORS_PCA9539 is not set 832# CONFIG_SENSORS_PCA9539 is not set
804# CONFIG_SENSORS_PCF8591 is not set 833# CONFIG_SENSORS_PCF8591 is not set
805# CONFIG_TPS65010 is not set
806# CONFIG_SENSORS_MAX6875 is not set 834# CONFIG_SENSORS_MAX6875 is not set
807# CONFIG_SENSORS_TSL2550 is not set 835# CONFIG_SENSORS_TSL2550 is not set
808# CONFIG_I2C_DEBUG_CORE is not set 836# CONFIG_I2C_DEBUG_CORE is not set
@@ -816,6 +844,11 @@ CONFIG_GPIOLIB=y
816# CONFIG_GPIO_SYSFS is not set 844# CONFIG_GPIO_SYSFS is not set
817 845
818# 846#
847# Memory mapped GPIO expanders:
848#
849# CONFIG_GPIO_XILINX is not set
850
851#
819# I2C GPIO expanders: 852# I2C GPIO expanders:
820# 853#
821# CONFIG_GPIO_MAX732X is not set 854# CONFIG_GPIO_MAX732X is not set
@@ -842,8 +875,10 @@ CONFIG_HWMON=y
842# CONFIG_SENSORS_ADM1029 is not set 875# CONFIG_SENSORS_ADM1029 is not set
843# CONFIG_SENSORS_ADM1031 is not set 876# CONFIG_SENSORS_ADM1031 is not set
844# CONFIG_SENSORS_ADM9240 is not set 877# CONFIG_SENSORS_ADM9240 is not set
878# CONFIG_SENSORS_ADT7462 is not set
845# CONFIG_SENSORS_ADT7470 is not set 879# CONFIG_SENSORS_ADT7470 is not set
846# CONFIG_SENSORS_ADT7473 is not set 880# CONFIG_SENSORS_ADT7473 is not set
881# CONFIG_SENSORS_ADT7475 is not set
847# CONFIG_SENSORS_ATXP1 is not set 882# CONFIG_SENSORS_ATXP1 is not set
848# CONFIG_SENSORS_DS1621 is not set 883# CONFIG_SENSORS_DS1621 is not set
849# CONFIG_SENSORS_I5K_AMB is not set 884# CONFIG_SENSORS_I5K_AMB is not set
@@ -864,6 +899,7 @@ CONFIG_SENSORS_LM75=y
864# CONFIG_SENSORS_LM90 is not set 899# CONFIG_SENSORS_LM90 is not set
865# CONFIG_SENSORS_LM92 is not set 900# CONFIG_SENSORS_LM92 is not set
866# CONFIG_SENSORS_LM93 is not set 901# CONFIG_SENSORS_LM93 is not set
902# CONFIG_SENSORS_LTC4245 is not set
867# CONFIG_SENSORS_MAX1619 is not set 903# CONFIG_SENSORS_MAX1619 is not set
868# CONFIG_SENSORS_MAX6650 is not set 904# CONFIG_SENSORS_MAX6650 is not set
869# CONFIG_SENSORS_PC87360 is not set 905# CONFIG_SENSORS_PC87360 is not set
@@ -890,11 +926,11 @@ CONFIG_HWMON_DEBUG_CHIP=y
890# CONFIG_THERMAL is not set 926# CONFIG_THERMAL is not set
891# CONFIG_THERMAL_HWMON is not set 927# CONFIG_THERMAL_HWMON is not set
892# CONFIG_WATCHDOG is not set 928# CONFIG_WATCHDOG is not set
929CONFIG_SSB_POSSIBLE=y
893 930
894# 931#
895# Sonics Silicon Backplane 932# Sonics Silicon Backplane
896# 933#
897CONFIG_SSB_POSSIBLE=y
898# CONFIG_SSB is not set 934# CONFIG_SSB is not set
899 935
900# 936#
@@ -903,18 +939,14 @@ CONFIG_SSB_POSSIBLE=y
903# CONFIG_MFD_CORE is not set 939# CONFIG_MFD_CORE is not set
904# CONFIG_MFD_SM501 is not set 940# CONFIG_MFD_SM501 is not set
905# CONFIG_HTC_PASIC3 is not set 941# CONFIG_HTC_PASIC3 is not set
942# CONFIG_TPS65010 is not set
943# CONFIG_TWL4030_CORE is not set
906# CONFIG_MFD_TMIO is not set 944# CONFIG_MFD_TMIO is not set
907# CONFIG_PMIC_DA903X is not set 945# CONFIG_PMIC_DA903X is not set
908# CONFIG_MFD_WM8400 is not set 946# CONFIG_MFD_WM8400 is not set
909# CONFIG_MFD_WM8350_I2C is not set 947# CONFIG_MFD_WM8350_I2C is not set
910 948# CONFIG_MFD_PCF50633 is not set
911#
912# Voltage and Current regulators
913#
914# CONFIG_REGULATOR is not set 949# 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
918 950
919# 951#
920# Multimedia devices 952# Multimedia devices
@@ -970,9 +1002,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
970# 1002#
971 1003
972# 1004#
973# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1005# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
974# 1006#
975# CONFIG_USB_GADGET is not set 1007# CONFIG_USB_GADGET is not set
1008
1009#
1010# OTG and related infrastructure
1011#
976# CONFIG_UWB is not set 1012# CONFIG_UWB is not set
977# CONFIG_MMC is not set 1013# CONFIG_MMC is not set
978# CONFIG_MEMSTICK is not set 1014# CONFIG_MEMSTICK is not set
@@ -1004,6 +1040,7 @@ CONFIG_FS_MBCACHE=y
1004CONFIG_FILE_LOCKING=y 1040CONFIG_FILE_LOCKING=y
1005# CONFIG_XFS_FS is not set 1041# CONFIG_XFS_FS is not set
1006# CONFIG_OCFS2_FS is not set 1042# CONFIG_OCFS2_FS is not set
1043# CONFIG_BTRFS_FS is not set
1007CONFIG_DNOTIFY=y 1044CONFIG_DNOTIFY=y
1008CONFIG_INOTIFY=y 1045CONFIG_INOTIFY=y
1009CONFIG_INOTIFY_USER=y 1046CONFIG_INOTIFY_USER=y
@@ -1037,10 +1074,7 @@ CONFIG_TMPFS=y
1037# CONFIG_TMPFS_POSIX_ACL is not set 1074# CONFIG_TMPFS_POSIX_ACL is not set
1038# CONFIG_HUGETLB_PAGE is not set 1075# CONFIG_HUGETLB_PAGE is not set
1039# CONFIG_CONFIGFS_FS is not set 1076# CONFIG_CONFIGFS_FS is not set
1040 1077CONFIG_MISC_FILESYSTEMS=y
1041#
1042# Miscellaneous filesystems
1043#
1044# CONFIG_ADFS_FS is not set 1078# CONFIG_ADFS_FS is not set
1045# CONFIG_AFFS_FS is not set 1079# CONFIG_AFFS_FS is not set
1046# CONFIG_HFS_FS is not set 1080# CONFIG_HFS_FS is not set
@@ -1060,6 +1094,7 @@ CONFIG_JFFS2_ZLIB=y
1060CONFIG_JFFS2_RTIME=y 1094CONFIG_JFFS2_RTIME=y
1061# CONFIG_JFFS2_RUBIN is not set 1095# CONFIG_JFFS2_RUBIN is not set
1062CONFIG_CRAMFS=y 1096CONFIG_CRAMFS=y
1097# CONFIG_SQUASHFS is not set
1063# CONFIG_VXFS_FS is not set 1098# CONFIG_VXFS_FS is not set
1064# CONFIG_MINIX_FS is not set 1099# CONFIG_MINIX_FS is not set
1065# CONFIG_OMFS_FS is not set 1100# CONFIG_OMFS_FS is not set
@@ -1110,6 +1145,7 @@ CONFIG_PARTITION_ADVANCED=y
1110# Library routines 1145# Library routines
1111# 1146#
1112CONFIG_BITREVERSE=y 1147CONFIG_BITREVERSE=y
1148CONFIG_GENERIC_FIND_LAST_BIT=y
1113# CONFIG_CRC_CCITT is not set 1149# CONFIG_CRC_CCITT is not set
1114# CONFIG_CRC16 is not set 1150# CONFIG_CRC16 is not set
1115# CONFIG_CRC_T10DIF is not set 1151# CONFIG_CRC_T10DIF is not set
@@ -1145,6 +1181,8 @@ CONFIG_FRAME_WARN=1024
1145# CONFIG_LATENCYTOP is not set 1181# CONFIG_LATENCYTOP is not set
1146CONFIG_SYSCTL_SYSCALL_CHECK=y 1182CONFIG_SYSCTL_SYSCALL_CHECK=y
1147CONFIG_HAVE_FUNCTION_TRACER=y 1183CONFIG_HAVE_FUNCTION_TRACER=y
1184CONFIG_HAVE_DYNAMIC_FTRACE=y
1185CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1148 1186
1149# 1187#
1150# Tracers 1188# Tracers
@@ -1152,6 +1190,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1152# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1190# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1153# CONFIG_SAMPLES is not set 1191# CONFIG_SAMPLES is not set
1154CONFIG_HAVE_ARCH_KGDB=y 1192CONFIG_HAVE_ARCH_KGDB=y
1193CONFIG_PRINT_STACK_DEPTH=64
1155# CONFIG_IRQSTACKS is not set 1194# CONFIG_IRQSTACKS is not set
1156# CONFIG_PPC_EARLY_DEBUG is not set 1195# CONFIG_PPC_EARLY_DEBUG is not set
1157 1196
@@ -1169,6 +1208,7 @@ CONFIG_CRYPTO=y
1169# 1208#
1170# CONFIG_CRYPTO_FIPS is not set 1209# CONFIG_CRYPTO_FIPS is not set
1171# CONFIG_CRYPTO_MANAGER is not set 1210# CONFIG_CRYPTO_MANAGER is not set
1211# CONFIG_CRYPTO_MANAGER2 is not set
1172# CONFIG_CRYPTO_GF128MUL is not set 1212# CONFIG_CRYPTO_GF128MUL is not set
1173# CONFIG_CRYPTO_NULL is not set 1213# CONFIG_CRYPTO_NULL is not set
1174# CONFIG_CRYPTO_CRYPTD is not set 1214# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig
index 56ed4213609c..a25009174f37 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:25 2008 4# Mon Jan 26 15:36:22 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,7 +21,9 @@ CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y 21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
24# CONFIG_PPC_MM_SLICES is not set 25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
25CONFIG_PPC32=y 27CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 28CONFIG_WORD_SIZE=32
27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -46,7 +48,7 @@ CONFIG_GENERIC_GPIO=y
46CONFIG_PPC=y 48CONFIG_PPC=y
47CONFIG_EARLY_PRINTK=y 49CONFIG_EARLY_PRINTK=y
48CONFIG_GENERIC_NVRAM=y 50CONFIG_GENERIC_NVRAM=y
49CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 51CONFIG_SCHED_OMIT_FRAME_POINTER=y
50CONFIG_ARCH_MAY_HAVE_PC_FDC=y 52CONFIG_ARCH_MAY_HAVE_PC_FDC=y
51CONFIG_PPC_OF=y 53CONFIG_PPC_OF=y
52CONFIG_OF=y 54CONFIG_OF=y
@@ -76,12 +78,12 @@ CONFIG_SYSVIPC_SYSCTL=y
76# CONFIG_AUDIT is not set 78# CONFIG_AUDIT is not set
77# CONFIG_IKCONFIG is not set 79# CONFIG_IKCONFIG is not set
78CONFIG_LOG_BUF_SHIFT=14 80CONFIG_LOG_BUF_SHIFT=14
79# CONFIG_CGROUPS is not set
80CONFIG_GROUP_SCHED=y 81CONFIG_GROUP_SCHED=y
81CONFIG_FAIR_GROUP_SCHED=y 82CONFIG_FAIR_GROUP_SCHED=y
82# CONFIG_RT_GROUP_SCHED is not set 83# CONFIG_RT_GROUP_SCHED is not set
83CONFIG_USER_SCHED=y 84CONFIG_USER_SCHED=y
84# CONFIG_CGROUP_SCHED is not set 85# CONFIG_CGROUP_SCHED is not set
86# CONFIG_CGROUPS is not set
85CONFIG_SYSFS_DEPRECATED=y 87CONFIG_SYSFS_DEPRECATED=y
86CONFIG_SYSFS_DEPRECATED_V2=y 88CONFIG_SYSFS_DEPRECATED_V2=y
87# CONFIG_RELAY is not set 89# CONFIG_RELAY is not set
@@ -114,7 +116,6 @@ CONFIG_SLUB_DEBUG=y
114CONFIG_SLUB=y 116CONFIG_SLUB=y
115# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
116# CONFIG_PROFILING is not set 118# CONFIG_PROFILING is not set
117# CONFIG_MARKERS is not set
118CONFIG_HAVE_OPROFILE=y 119CONFIG_HAVE_OPROFILE=y
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
120CONFIG_HAVE_IOREMAP_PROT=y 121CONFIG_HAVE_IOREMAP_PROT=y
@@ -125,13 +126,11 @@ CONFIG_HAVE_CLK=y
125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
126CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
127CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
128# CONFIG_TINY_SHMEM is not set
129CONFIG_BASE_SMALL=0 129CONFIG_BASE_SMALL=0
130# CONFIG_MODULES is not set 130# CONFIG_MODULES is not set
131CONFIG_BLOCK=y 131CONFIG_BLOCK=y
132# CONFIG_LBD is not set 132# CONFIG_LBD is not set
133# CONFIG_BLK_DEV_IO_TRACE is not set 133# CONFIG_BLK_DEV_IO_TRACE is not set
134# CONFIG_LSF is not set
135# CONFIG_BLK_DEV_BSG is not set 134# CONFIG_BLK_DEV_BSG is not set
136# CONFIG_BLK_DEV_INTEGRITY is not set 135# CONFIG_BLK_DEV_INTEGRITY is not set
137 136
@@ -148,6 +147,10 @@ CONFIG_DEFAULT_AS=y
148# CONFIG_DEFAULT_NOOP is not set 147# CONFIG_DEFAULT_NOOP is not set
149CONFIG_DEFAULT_IOSCHED="anticipatory" 148CONFIG_DEFAULT_IOSCHED="anticipatory"
150CONFIG_CLASSIC_RCU=y 149CONFIG_CLASSIC_RCU=y
150# CONFIG_TREE_RCU is not set
151# CONFIG_PREEMPT_RCU is not set
152# CONFIG_TREE_RCU_TRACE is not set
153# CONFIG_PREEMPT_RCU_TRACE is not set
151# CONFIG_FREEZER is not set 154# CONFIG_FREEZER is not set
152 155
153# 156#
@@ -189,6 +192,7 @@ CONFIG_CPM2=y
189# CONFIG_FSL_ULI1575 is not set 192# CONFIG_FSL_ULI1575 is not set
190CONFIG_CPM=y 193CONFIG_CPM=y
191# CONFIG_MPC8xxx_GPIO is not set 194# CONFIG_MPC8xxx_GPIO is not set
195# CONFIG_SIMPLE_GPIO is not set
192 196
193# 197#
194# Kernel options 198# Kernel options
@@ -226,12 +230,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
226CONFIG_PAGEFLAGS_EXTENDED=y 230CONFIG_PAGEFLAGS_EXTENDED=y
227CONFIG_SPLIT_PTLOCK_CPUS=4 231CONFIG_SPLIT_PTLOCK_CPUS=4
228CONFIG_MIGRATION=y 232CONFIG_MIGRATION=y
229# CONFIG_RESOURCES_64BIT is not set
230# CONFIG_PHYS_ADDR_T_64BIT is not set 233# CONFIG_PHYS_ADDR_T_64BIT is not set
231CONFIG_ZONE_DMA_FLAG=1 234CONFIG_ZONE_DMA_FLAG=1
232CONFIG_BOUNCE=y 235CONFIG_BOUNCE=y
233CONFIG_VIRT_TO_BUS=y 236CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y 237CONFIG_UNEVICTABLE_LRU=y
238CONFIG_PPC_4K_PAGES=y
239# CONFIG_PPC_16K_PAGES is not set
240# CONFIG_PPC_64K_PAGES is not set
235CONFIG_FORCE_MAX_ZONEORDER=11 241CONFIG_FORCE_MAX_ZONEORDER=11
236# CONFIG_PROC_DEVICETREE is not set 242# CONFIG_PROC_DEVICETREE is not set
237# CONFIG_CMDLINE_BOOL is not set 243# CONFIG_CMDLINE_BOOL is not set
@@ -255,6 +261,7 @@ CONFIG_PCI_SYSCALL=y
255CONFIG_ARCH_SUPPORTS_MSI=y 261CONFIG_ARCH_SUPPORTS_MSI=y
256# CONFIG_PCI_MSI is not set 262# CONFIG_PCI_MSI is not set
257# CONFIG_PCI_LEGACY is not set 263# CONFIG_PCI_LEGACY is not set
264# CONFIG_PCI_STUB is not set
258# CONFIG_HAS_RAPIDIO is not set 265# CONFIG_HAS_RAPIDIO is not set
259 266
260# 267#
@@ -276,6 +283,7 @@ CONFIG_NET=y
276# 283#
277# Networking options 284# Networking options
278# 285#
286CONFIG_COMPAT_NET_DEV_OPS=y
279CONFIG_PACKET=y 287CONFIG_PACKET=y
280# CONFIG_PACKET_MMAP is not set 288# CONFIG_PACKET_MMAP is not set
281CONFIG_UNIX=y 289CONFIG_UNIX=y
@@ -332,6 +340,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
332# CONFIG_ECONET is not set 340# CONFIG_ECONET is not set
333# CONFIG_WAN_ROUTER is not set 341# CONFIG_WAN_ROUTER is not set
334# CONFIG_NET_SCHED is not set 342# CONFIG_NET_SCHED is not set
343# CONFIG_DCB is not set
335 344
336# 345#
337# Network testing 346# Network testing
@@ -347,8 +356,9 @@ CONFIG_WIRELESS=y
347# CONFIG_CFG80211 is not set 356# CONFIG_CFG80211 is not set
348CONFIG_WIRELESS_OLD_REGULATORY=y 357CONFIG_WIRELESS_OLD_REGULATORY=y
349# CONFIG_WIRELESS_EXT is not set 358# CONFIG_WIRELESS_EXT is not set
359# CONFIG_LIB80211 is not set
350# CONFIG_MAC80211 is not set 360# CONFIG_MAC80211 is not set
351# CONFIG_IEEE80211 is not set 361# CONFIG_WIMAX is not set
352# CONFIG_RFKILL is not set 362# CONFIG_RFKILL is not set
353# CONFIG_NET_9P is not set 363# CONFIG_NET_9P is not set
354 364
@@ -438,6 +448,12 @@ CONFIG_MTD_CFI_UTIL=y
438# CONFIG_MTD_ONENAND is not set 448# CONFIG_MTD_ONENAND is not set
439 449
440# 450#
451# LPDDR flash memory drivers
452#
453# CONFIG_MTD_LPDDR is not set
454# CONFIG_MTD_QINFO_PROBE is not set
455
456#
441# UBI - Unsorted block images 457# UBI - Unsorted block images
442# 458#
443# CONFIG_MTD_UBI is not set 459# CONFIG_MTD_UBI is not set
@@ -468,8 +484,10 @@ CONFIG_MISC_DEVICES=y
468# CONFIG_EEPROM_93CX6 is not set 484# CONFIG_EEPROM_93CX6 is not set
469# CONFIG_SGI_IOC4 is not set 485# CONFIG_SGI_IOC4 is not set
470# CONFIG_TIFM_CORE is not set 486# CONFIG_TIFM_CORE is not set
487# CONFIG_ICS932S401 is not set
471# CONFIG_ENCLOSURE_SERVICES is not set 488# CONFIG_ENCLOSURE_SERVICES is not set
472# CONFIG_HP_ILO is not set 489# CONFIG_HP_ILO is not set
490# CONFIG_C2PORT is not set
473CONFIG_HAVE_IDE=y 491CONFIG_HAVE_IDE=y
474CONFIG_IDE=y 492CONFIG_IDE=y
475 493
@@ -512,6 +530,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
512# CONFIG_BLK_DEV_JMICRON is not set 530# CONFIG_BLK_DEV_JMICRON is not set
513# CONFIG_BLK_DEV_SC1200 is not set 531# CONFIG_BLK_DEV_SC1200 is not set
514# CONFIG_BLK_DEV_PIIX is not set 532# CONFIG_BLK_DEV_PIIX is not set
533# CONFIG_BLK_DEV_IT8172 is not set
515# CONFIG_BLK_DEV_IT8213 is not set 534# CONFIG_BLK_DEV_IT8213 is not set
516# CONFIG_BLK_DEV_IT821X is not set 535# CONFIG_BLK_DEV_IT821X is not set
517# CONFIG_BLK_DEV_NS87415 is not set 536# CONFIG_BLK_DEV_NS87415 is not set
@@ -571,6 +590,9 @@ CONFIG_PHYLIB=y
571# CONFIG_BROADCOM_PHY is not set 590# CONFIG_BROADCOM_PHY is not set
572# CONFIG_ICPLUS_PHY is not set 591# CONFIG_ICPLUS_PHY is not set
573# CONFIG_REALTEK_PHY is not set 592# CONFIG_REALTEK_PHY is not set
593# CONFIG_NATIONAL_PHY is not set
594# CONFIG_STE10XP is not set
595# CONFIG_LSI_ET1011C_PHY is not set
574# CONFIG_FIXED_PHY is not set 596# CONFIG_FIXED_PHY is not set
575# CONFIG_MDIO_BITBANG is not set 597# CONFIG_MDIO_BITBANG is not set
576CONFIG_NET_ETHERNET=y 598CONFIG_NET_ETHERNET=y
@@ -594,7 +616,6 @@ CONFIG_NET_PCI=y
594# CONFIG_ADAPTEC_STARFIRE is not set 616# CONFIG_ADAPTEC_STARFIRE is not set
595# CONFIG_B44 is not set 617# CONFIG_B44 is not set
596# CONFIG_FORCEDETH is not set 618# CONFIG_FORCEDETH is not set
597# CONFIG_EEPRO100 is not set
598CONFIG_E100=y 619CONFIG_E100=y
599# CONFIG_FEALNX is not set 620# CONFIG_FEALNX is not set
600# CONFIG_NATSEMI is not set 621# CONFIG_NATSEMI is not set
@@ -604,6 +625,7 @@ CONFIG_E100=y
604# CONFIG_R6040 is not set 625# CONFIG_R6040 is not set
605# CONFIG_SIS900 is not set 626# CONFIG_SIS900 is not set
606# CONFIG_EPIC100 is not set 627# CONFIG_EPIC100 is not set
628# CONFIG_SMSC9420 is not set
607# CONFIG_SUNDANCE is not set 629# CONFIG_SUNDANCE is not set
608# CONFIG_TLAN is not set 630# CONFIG_TLAN is not set
609# CONFIG_VIA_RHINE is not set 631# CONFIG_VIA_RHINE is not set
@@ -634,6 +656,7 @@ CONFIG_GIANFAR=y
634# CONFIG_JME is not set 656# CONFIG_JME is not set
635CONFIG_NETDEV_10000=y 657CONFIG_NETDEV_10000=y
636# CONFIG_CHELSIO_T1 is not set 658# CONFIG_CHELSIO_T1 is not set
659CONFIG_CHELSIO_T3_DEPENDS=y
637# CONFIG_CHELSIO_T3 is not set 660# CONFIG_CHELSIO_T3 is not set
638# CONFIG_ENIC is not set 661# CONFIG_ENIC is not set
639# CONFIG_IXGBE is not set 662# CONFIG_IXGBE is not set
@@ -656,6 +679,10 @@ CONFIG_NETDEV_10000=y
656# CONFIG_WLAN_PRE80211 is not set 679# CONFIG_WLAN_PRE80211 is not set
657# CONFIG_WLAN_80211 is not set 680# CONFIG_WLAN_80211 is not set
658# CONFIG_IWLWIFI_LEDS is not set 681# CONFIG_IWLWIFI_LEDS is not set
682
683#
684# Enable WiMAX (Networking options) to see the WiMAX drivers
685#
659# CONFIG_WAN is not set 686# CONFIG_WAN is not set
660# CONFIG_FDDI is not set 687# CONFIG_FDDI is not set
661# CONFIG_HIPPI is not set 688# CONFIG_HIPPI is not set
@@ -728,8 +755,10 @@ CONFIG_SERIAL_CPM_CONSOLE=y
728# CONFIG_SERIAL_JSM is not set 755# CONFIG_SERIAL_JSM is not set
729# CONFIG_SERIAL_OF_PLATFORM is not set 756# CONFIG_SERIAL_OF_PLATFORM is not set
730CONFIG_UNIX98_PTYS=y 757CONFIG_UNIX98_PTYS=y
758# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
731CONFIG_LEGACY_PTYS=y 759CONFIG_LEGACY_PTYS=y
732CONFIG_LEGACY_PTY_COUNT=256 760CONFIG_LEGACY_PTY_COUNT=256
761# CONFIG_HVC_UDBG is not set
733# CONFIG_IPMI_HANDLER is not set 762# CONFIG_IPMI_HANDLER is not set
734CONFIG_HW_RANDOM=y 763CONFIG_HW_RANDOM=y
735# CONFIG_NVRAM is not set 764# CONFIG_NVRAM is not set
@@ -802,7 +831,6 @@ CONFIG_I2C_MPC=y
802# CONFIG_PCF8575 is not set 831# CONFIG_PCF8575 is not set
803# CONFIG_SENSORS_PCA9539 is not set 832# CONFIG_SENSORS_PCA9539 is not set
804# CONFIG_SENSORS_PCF8591 is not set 833# CONFIG_SENSORS_PCF8591 is not set
805# CONFIG_TPS65010 is not set
806# CONFIG_SENSORS_MAX6875 is not set 834# CONFIG_SENSORS_MAX6875 is not set
807# CONFIG_SENSORS_TSL2550 is not set 835# CONFIG_SENSORS_TSL2550 is not set
808# CONFIG_I2C_DEBUG_CORE is not set 836# CONFIG_I2C_DEBUG_CORE is not set
@@ -816,6 +844,11 @@ CONFIG_GPIOLIB=y
816# CONFIG_GPIO_SYSFS is not set 844# CONFIG_GPIO_SYSFS is not set
817 845
818# 846#
847# Memory mapped GPIO expanders:
848#
849# CONFIG_GPIO_XILINX is not set
850
851#
819# I2C GPIO expanders: 852# I2C GPIO expanders:
820# 853#
821# CONFIG_GPIO_MAX732X is not set 854# CONFIG_GPIO_MAX732X is not set
@@ -842,8 +875,10 @@ CONFIG_HWMON=y
842# CONFIG_SENSORS_ADM1029 is not set 875# CONFIG_SENSORS_ADM1029 is not set
843# CONFIG_SENSORS_ADM1031 is not set 876# CONFIG_SENSORS_ADM1031 is not set
844# CONFIG_SENSORS_ADM9240 is not set 877# CONFIG_SENSORS_ADM9240 is not set
878# CONFIG_SENSORS_ADT7462 is not set
845# CONFIG_SENSORS_ADT7470 is not set 879# CONFIG_SENSORS_ADT7470 is not set
846# CONFIG_SENSORS_ADT7473 is not set 880# CONFIG_SENSORS_ADT7473 is not set
881# CONFIG_SENSORS_ADT7475 is not set
847# CONFIG_SENSORS_ATXP1 is not set 882# CONFIG_SENSORS_ATXP1 is not set
848# CONFIG_SENSORS_DS1621 is not set 883# CONFIG_SENSORS_DS1621 is not set
849# CONFIG_SENSORS_I5K_AMB is not set 884# CONFIG_SENSORS_I5K_AMB is not set
@@ -864,6 +899,7 @@ CONFIG_SENSORS_LM75=y
864# CONFIG_SENSORS_LM90 is not set 899# CONFIG_SENSORS_LM90 is not set
865# CONFIG_SENSORS_LM92 is not set 900# CONFIG_SENSORS_LM92 is not set
866# CONFIG_SENSORS_LM93 is not set 901# CONFIG_SENSORS_LM93 is not set
902# CONFIG_SENSORS_LTC4245 is not set
867# CONFIG_SENSORS_MAX1619 is not set 903# CONFIG_SENSORS_MAX1619 is not set
868# CONFIG_SENSORS_MAX6650 is not set 904# CONFIG_SENSORS_MAX6650 is not set
869# CONFIG_SENSORS_PC87360 is not set 905# CONFIG_SENSORS_PC87360 is not set
@@ -890,11 +926,11 @@ CONFIG_HWMON_DEBUG_CHIP=y
890# CONFIG_THERMAL is not set 926# CONFIG_THERMAL is not set
891# CONFIG_THERMAL_HWMON is not set 927# CONFIG_THERMAL_HWMON is not set
892# CONFIG_WATCHDOG is not set 928# CONFIG_WATCHDOG is not set
929CONFIG_SSB_POSSIBLE=y
893 930
894# 931#
895# Sonics Silicon Backplane 932# Sonics Silicon Backplane
896# 933#
897CONFIG_SSB_POSSIBLE=y
898# CONFIG_SSB is not set 934# CONFIG_SSB is not set
899 935
900# 936#
@@ -903,18 +939,14 @@ CONFIG_SSB_POSSIBLE=y
903# CONFIG_MFD_CORE is not set 939# CONFIG_MFD_CORE is not set
904# CONFIG_MFD_SM501 is not set 940# CONFIG_MFD_SM501 is not set
905# CONFIG_HTC_PASIC3 is not set 941# CONFIG_HTC_PASIC3 is not set
942# CONFIG_TPS65010 is not set
943# CONFIG_TWL4030_CORE is not set
906# CONFIG_MFD_TMIO is not set 944# CONFIG_MFD_TMIO is not set
907# CONFIG_PMIC_DA903X is not set 945# CONFIG_PMIC_DA903X is not set
908# CONFIG_MFD_WM8400 is not set 946# CONFIG_MFD_WM8400 is not set
909# CONFIG_MFD_WM8350_I2C is not set 947# CONFIG_MFD_WM8350_I2C is not set
910 948# CONFIG_MFD_PCF50633 is not set
911#
912# Voltage and Current regulators
913#
914# CONFIG_REGULATOR is not set 949# 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
918 950
919# 951#
920# Multimedia devices 952# Multimedia devices
@@ -970,9 +1002,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
970# 1002#
971 1003
972# 1004#
973# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1005# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
974# 1006#
975# CONFIG_USB_GADGET is not set 1007# CONFIG_USB_GADGET is not set
1008
1009#
1010# OTG and related infrastructure
1011#
976# CONFIG_UWB is not set 1012# CONFIG_UWB is not set
977# CONFIG_MMC is not set 1013# CONFIG_MMC is not set
978# CONFIG_MEMSTICK is not set 1014# CONFIG_MEMSTICK is not set
@@ -1004,6 +1040,7 @@ CONFIG_FS_MBCACHE=y
1004CONFIG_FILE_LOCKING=y 1040CONFIG_FILE_LOCKING=y
1005# CONFIG_XFS_FS is not set 1041# CONFIG_XFS_FS is not set
1006# CONFIG_OCFS2_FS is not set 1042# CONFIG_OCFS2_FS is not set
1043# CONFIG_BTRFS_FS is not set
1007CONFIG_DNOTIFY=y 1044CONFIG_DNOTIFY=y
1008CONFIG_INOTIFY=y 1045CONFIG_INOTIFY=y
1009CONFIG_INOTIFY_USER=y 1046CONFIG_INOTIFY_USER=y
@@ -1037,10 +1074,7 @@ CONFIG_TMPFS=y
1037# CONFIG_TMPFS_POSIX_ACL is not set 1074# CONFIG_TMPFS_POSIX_ACL is not set
1038# CONFIG_HUGETLB_PAGE is not set 1075# CONFIG_HUGETLB_PAGE is not set
1039# CONFIG_CONFIGFS_FS is not set 1076# CONFIG_CONFIGFS_FS is not set
1040 1077CONFIG_MISC_FILESYSTEMS=y
1041#
1042# Miscellaneous filesystems
1043#
1044# CONFIG_ADFS_FS is not set 1078# CONFIG_ADFS_FS is not set
1045# CONFIG_AFFS_FS is not set 1079# CONFIG_AFFS_FS is not set
1046# CONFIG_HFS_FS is not set 1080# CONFIG_HFS_FS is not set
@@ -1060,6 +1094,7 @@ CONFIG_JFFS2_ZLIB=y
1060CONFIG_JFFS2_RTIME=y 1094CONFIG_JFFS2_RTIME=y
1061# CONFIG_JFFS2_RUBIN is not set 1095# CONFIG_JFFS2_RUBIN is not set
1062CONFIG_CRAMFS=y 1096CONFIG_CRAMFS=y
1097# CONFIG_SQUASHFS is not set
1063# CONFIG_VXFS_FS is not set 1098# CONFIG_VXFS_FS is not set
1064# CONFIG_MINIX_FS is not set 1099# CONFIG_MINIX_FS is not set
1065# CONFIG_OMFS_FS is not set 1100# CONFIG_OMFS_FS is not set
@@ -1110,6 +1145,7 @@ CONFIG_PARTITION_ADVANCED=y
1110# Library routines 1145# Library routines
1111# 1146#
1112CONFIG_BITREVERSE=y 1147CONFIG_BITREVERSE=y
1148CONFIG_GENERIC_FIND_LAST_BIT=y
1113# CONFIG_CRC_CCITT is not set 1149# CONFIG_CRC_CCITT is not set
1114# CONFIG_CRC16 is not set 1150# CONFIG_CRC16 is not set
1115# CONFIG_CRC_T10DIF is not set 1151# CONFIG_CRC_T10DIF is not set
@@ -1145,6 +1181,8 @@ CONFIG_FRAME_WARN=1024
1145# CONFIG_LATENCYTOP is not set 1181# CONFIG_LATENCYTOP is not set
1146CONFIG_SYSCTL_SYSCALL_CHECK=y 1182CONFIG_SYSCTL_SYSCALL_CHECK=y
1147CONFIG_HAVE_FUNCTION_TRACER=y 1183CONFIG_HAVE_FUNCTION_TRACER=y
1184CONFIG_HAVE_DYNAMIC_FTRACE=y
1185CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1148 1186
1149# 1187#
1150# Tracers 1188# Tracers
@@ -1152,6 +1190,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1152# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1190# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1153# CONFIG_SAMPLES is not set 1191# CONFIG_SAMPLES is not set
1154CONFIG_HAVE_ARCH_KGDB=y 1192CONFIG_HAVE_ARCH_KGDB=y
1193CONFIG_PRINT_STACK_DEPTH=64
1155# CONFIG_IRQSTACKS is not set 1194# CONFIG_IRQSTACKS is not set
1156# CONFIG_PPC_EARLY_DEBUG is not set 1195# CONFIG_PPC_EARLY_DEBUG is not set
1157 1196
@@ -1169,6 +1208,7 @@ CONFIG_CRYPTO=y
1169# 1208#
1170# CONFIG_CRYPTO_FIPS is not set 1209# CONFIG_CRYPTO_FIPS is not set
1171# CONFIG_CRYPTO_MANAGER is not set 1210# CONFIG_CRYPTO_MANAGER is not set
1211# CONFIG_CRYPTO_MANAGER2 is not set
1172# CONFIG_CRYPTO_GF128MUL is not set 1212# CONFIG_CRYPTO_GF128MUL is not set
1173# CONFIG_CRYPTO_NULL is not set 1213# CONFIG_CRYPTO_NULL is not set
1174# CONFIG_CRYPTO_CRYPTD is not set 1214# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
index 840b09a07282..1ab5abae00a2 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:30 2008 4# Mon Jan 26 15:36:26 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -42,11 +42,12 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
42CONFIG_GENERIC_HWEIGHT=y 42CONFIG_GENERIC_HWEIGHT=y
43CONFIG_GENERIC_CALIBRATE_DELAY=y 43CONFIG_GENERIC_CALIBRATE_DELAY=y
44CONFIG_GENERIC_FIND_NEXT_BIT=y 44CONFIG_GENERIC_FIND_NEXT_BIT=y
45CONFIG_GENERIC_GPIO=y
45# CONFIG_ARCH_NO_VIRT_TO_BUS is not set 46# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
46CONFIG_PPC=y 47CONFIG_PPC=y
47CONFIG_EARLY_PRINTK=y 48CONFIG_EARLY_PRINTK=y
48CONFIG_GENERIC_NVRAM=y 49CONFIG_GENERIC_NVRAM=y
49CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 50CONFIG_SCHED_OMIT_FRAME_POINTER=y
50CONFIG_ARCH_MAY_HAVE_PC_FDC=y 51CONFIG_ARCH_MAY_HAVE_PC_FDC=y
51CONFIG_PPC_OF=y 52CONFIG_PPC_OF=y
52CONFIG_OF=y 53CONFIG_OF=y
@@ -78,12 +79,12 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
78CONFIG_IKCONFIG=y 79CONFIG_IKCONFIG=y
79CONFIG_IKCONFIG_PROC=y 80CONFIG_IKCONFIG_PROC=y
80CONFIG_LOG_BUF_SHIFT=14 81CONFIG_LOG_BUF_SHIFT=14
81# CONFIG_CGROUPS is not set
82CONFIG_GROUP_SCHED=y 82CONFIG_GROUP_SCHED=y
83CONFIG_FAIR_GROUP_SCHED=y 83CONFIG_FAIR_GROUP_SCHED=y
84# CONFIG_RT_GROUP_SCHED is not set 84# CONFIG_RT_GROUP_SCHED is not set
85CONFIG_USER_SCHED=y 85CONFIG_USER_SCHED=y
86# CONFIG_CGROUP_SCHED is not set 86# CONFIG_CGROUP_SCHED is not set
87# CONFIG_CGROUPS is not set
87CONFIG_SYSFS_DEPRECATED=y 88CONFIG_SYSFS_DEPRECATED=y
88CONFIG_SYSFS_DEPRECATED_V2=y 89CONFIG_SYSFS_DEPRECATED_V2=y
89CONFIG_RELAY=y 90CONFIG_RELAY=y
@@ -117,7 +118,6 @@ CONFIG_SLAB=y
117# CONFIG_SLUB is not set 118# CONFIG_SLUB is not set
118# CONFIG_SLOB is not set 119# CONFIG_SLOB is not set
119# CONFIG_PROFILING is not set 120# CONFIG_PROFILING is not set
120# CONFIG_MARKERS is not set
121CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
122# CONFIG_KPROBES is not set 122# CONFIG_KPROBES is not set
123CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 123CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -129,7 +129,6 @@ CONFIG_USE_GENERIC_SMP_HELPERS=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 130CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 131CONFIG_RT_MUTEXES=y
132# CONFIG_TINY_SHMEM is not set
133CONFIG_BASE_SMALL=0 132CONFIG_BASE_SMALL=0
134CONFIG_MODULES=y 133CONFIG_MODULES=y
135# CONFIG_MODULE_FORCE_LOAD is not set 134# CONFIG_MODULE_FORCE_LOAD is not set
@@ -137,12 +136,10 @@ CONFIG_MODULE_UNLOAD=y
137# CONFIG_MODULE_FORCE_UNLOAD is not set 136# CONFIG_MODULE_FORCE_UNLOAD is not set
138# CONFIG_MODVERSIONS is not set 137# CONFIG_MODVERSIONS is not set
139# CONFIG_MODULE_SRCVERSION_ALL is not set 138# CONFIG_MODULE_SRCVERSION_ALL is not set
140CONFIG_KMOD=y
141CONFIG_STOP_MACHINE=y 139CONFIG_STOP_MACHINE=y
142CONFIG_BLOCK=y 140CONFIG_BLOCK=y
143# CONFIG_LBD is not set 141# CONFIG_LBD is not set
144# CONFIG_BLK_DEV_IO_TRACE is not set 142# CONFIG_BLK_DEV_IO_TRACE is not set
145# CONFIG_LSF is not set
146# CONFIG_BLK_DEV_BSG is not set 143# CONFIG_BLK_DEV_BSG is not set
147# CONFIG_BLK_DEV_INTEGRITY is not set 144# CONFIG_BLK_DEV_INTEGRITY is not set
148 145
@@ -159,6 +156,10 @@ CONFIG_DEFAULT_CFQ=y
159# CONFIG_DEFAULT_NOOP is not set 156# CONFIG_DEFAULT_NOOP is not set
160CONFIG_DEFAULT_IOSCHED="cfq" 157CONFIG_DEFAULT_IOSCHED="cfq"
161CONFIG_CLASSIC_RCU=y 158CONFIG_CLASSIC_RCU=y
159# CONFIG_TREE_RCU is not set
160# CONFIG_PREEMPT_RCU is not set
161# CONFIG_TREE_RCU_TRACE is not set
162# CONFIG_PREEMPT_RCU_TRACE is not set
162# CONFIG_FREEZER is not set 163# CONFIG_FREEZER is not set
163 164
164# 165#
@@ -197,6 +198,7 @@ CONFIG_MPIC=y
197# CONFIG_QUICC_ENGINE is not set 198# CONFIG_QUICC_ENGINE is not set
198# CONFIG_FSL_ULI1575 is not set 199# CONFIG_FSL_ULI1575 is not set
199# CONFIG_MPC8xxx_GPIO is not set 200# CONFIG_MPC8xxx_GPIO is not set
201# CONFIG_SIMPLE_GPIO is not set
200 202
201# 203#
202# Kernel options 204# Kernel options
@@ -215,7 +217,6 @@ CONFIG_SCHED_HRTICK=y
215# CONFIG_PREEMPT_NONE is not set 217# CONFIG_PREEMPT_NONE is not set
216# CONFIG_PREEMPT_VOLUNTARY is not set 218# CONFIG_PREEMPT_VOLUNTARY is not set
217CONFIG_PREEMPT=y 219CONFIG_PREEMPT=y
218# CONFIG_PREEMPT_RCU is not set
219CONFIG_BINFMT_ELF=y 220CONFIG_BINFMT_ELF=y
220# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 221# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
221# CONFIG_HAVE_AOUT is not set 222# CONFIG_HAVE_AOUT is not set
@@ -225,6 +226,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 226CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 227CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 228# CONFIG_KEXEC is not set
229# CONFIG_CRASH_DUMP is not set
228CONFIG_IRQ_ALL_CPUS=y 230CONFIG_IRQ_ALL_CPUS=y
229CONFIG_ARCH_FLATMEM_ENABLE=y 231CONFIG_ARCH_FLATMEM_ENABLE=y
230CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -237,12 +239,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
237CONFIG_PAGEFLAGS_EXTENDED=y 239CONFIG_PAGEFLAGS_EXTENDED=y
238CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
239CONFIG_MIGRATION=y 241CONFIG_MIGRATION=y
240# CONFIG_RESOURCES_64BIT is not set
241# CONFIG_PHYS_ADDR_T_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
245CONFIG_UNEVICTABLE_LRU=y 246CONFIG_UNEVICTABLE_LRU=y
247CONFIG_PPC_4K_PAGES=y
248# CONFIG_PPC_16K_PAGES is not set
249# CONFIG_PPC_64K_PAGES is not set
246CONFIG_FORCE_MAX_ZONEORDER=11 250CONFIG_FORCE_MAX_ZONEORDER=11
247# CONFIG_PROC_DEVICETREE is not set 251# CONFIG_PROC_DEVICETREE is not set
248# CONFIG_CMDLINE_BOOL is not set 252# CONFIG_CMDLINE_BOOL is not set
@@ -270,6 +274,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
270# CONFIG_PCI_MSI is not set 274# CONFIG_PCI_MSI is not set
271# CONFIG_PCI_LEGACY is not set 275# CONFIG_PCI_LEGACY is not set
272CONFIG_PCI_DEBUG=y 276CONFIG_PCI_DEBUG=y
277# CONFIG_PCI_STUB is not set
273# CONFIG_PCCARD is not set 278# CONFIG_PCCARD is not set
274# CONFIG_HOTPLUG_PCI is not set 279# CONFIG_HOTPLUG_PCI is not set
275CONFIG_HAS_RAPIDIO=y 280CONFIG_HAS_RAPIDIO=y
@@ -293,6 +298,7 @@ CONFIG_NET=y
293# 298#
294# Networking options 299# Networking options
295# 300#
301CONFIG_COMPAT_NET_DEV_OPS=y
296CONFIG_PACKET=y 302CONFIG_PACKET=y
297CONFIG_PACKET_MMAP=y 303CONFIG_PACKET_MMAP=y
298CONFIG_UNIX=y 304CONFIG_UNIX=y
@@ -502,6 +508,7 @@ CONFIG_NET_SCH_TBF=m
502CONFIG_NET_SCH_GRED=m 508CONFIG_NET_SCH_GRED=m
503CONFIG_NET_SCH_DSMARK=m 509CONFIG_NET_SCH_DSMARK=m
504CONFIG_NET_SCH_NETEM=m 510CONFIG_NET_SCH_NETEM=m
511# CONFIG_NET_SCH_DRR is not set
505 512
506# 513#
507# Classification 514# Classification
@@ -522,6 +529,7 @@ CONFIG_NET_CLS_RSVP6=m
522# CONFIG_NET_CLS_ACT is not set 529# CONFIG_NET_CLS_ACT is not set
523# CONFIG_NET_CLS_IND is not set 530# CONFIG_NET_CLS_IND is not set
524CONFIG_NET_SCH_FIFO=y 531CONFIG_NET_SCH_FIFO=y
532# CONFIG_DCB is not set
525 533
526# 534#
527# Network testing 535# Network testing
@@ -538,8 +546,9 @@ CONFIG_WIRELESS=y
538# CONFIG_CFG80211 is not set 546# CONFIG_CFG80211 is not set
539CONFIG_WIRELESS_OLD_REGULATORY=y 547CONFIG_WIRELESS_OLD_REGULATORY=y
540# CONFIG_WIRELESS_EXT is not set 548# CONFIG_WIRELESS_EXT is not set
549# CONFIG_LIB80211 is not set
541# CONFIG_MAC80211 is not set 550# CONFIG_MAC80211 is not set
542# CONFIG_IEEE80211 is not set 551# CONFIG_WIMAX is not set
543# CONFIG_RFKILL is not set 552# CONFIG_RFKILL is not set
544# CONFIG_NET_9P is not set 553# CONFIG_NET_9P is not set
545 554
@@ -562,6 +571,7 @@ CONFIG_MTD=y
562# CONFIG_MTD_DEBUG is not set 571# CONFIG_MTD_DEBUG is not set
563CONFIG_MTD_CONCAT=y 572CONFIG_MTD_CONCAT=y
564CONFIG_MTD_PARTITIONS=y 573CONFIG_MTD_PARTITIONS=y
574# CONFIG_MTD_TESTS is not set
565# CONFIG_MTD_REDBOOT_PARTS is not set 575# CONFIG_MTD_REDBOOT_PARTS is not set
566# CONFIG_MTD_CMDLINE_PARTS is not set 576# CONFIG_MTD_CMDLINE_PARTS is not set
567# CONFIG_MTD_OF_PARTS is not set 577# CONFIG_MTD_OF_PARTS is not set
@@ -638,10 +648,17 @@ CONFIG_MTD_PHYSMAP_OF=y
638# CONFIG_MTD_ONENAND is not set 648# CONFIG_MTD_ONENAND is not set
639 649
640# 650#
651# LPDDR flash memory drivers
652#
653# CONFIG_MTD_LPDDR is not set
654# CONFIG_MTD_QINFO_PROBE is not set
655
656#
641# UBI - Unsorted block images 657# UBI - Unsorted block images
642# 658#
643# CONFIG_MTD_UBI is not set 659# CONFIG_MTD_UBI is not set
644CONFIG_OF_DEVICE=y 660CONFIG_OF_DEVICE=y
661CONFIG_OF_GPIO=y
645CONFIG_OF_I2C=y 662CONFIG_OF_I2C=y
646# CONFIG_PARPORT is not set 663# CONFIG_PARPORT is not set
647CONFIG_BLK_DEV=y 664CONFIG_BLK_DEV=y
@@ -668,8 +685,10 @@ CONFIG_MISC_DEVICES=y
668# CONFIG_EEPROM_93CX6 is not set 685# CONFIG_EEPROM_93CX6 is not set
669# CONFIG_SGI_IOC4 is not set 686# CONFIG_SGI_IOC4 is not set
670# CONFIG_TIFM_CORE is not set 687# CONFIG_TIFM_CORE is not set
688# CONFIG_ICS932S401 is not set
671# CONFIG_ENCLOSURE_SERVICES is not set 689# CONFIG_ENCLOSURE_SERVICES is not set
672# CONFIG_HP_ILO is not set 690# CONFIG_HP_ILO is not set
691# CONFIG_C2PORT is not set
673CONFIG_HAVE_IDE=y 692CONFIG_HAVE_IDE=y
674# CONFIG_IDE is not set 693# CONFIG_IDE is not set
675 694
@@ -729,6 +748,8 @@ CONFIG_SCSI_LOWLEVEL=y
729# CONFIG_MEGARAID_SAS is not set 748# CONFIG_MEGARAID_SAS is not set
730# CONFIG_SCSI_HPTIOP is not set 749# CONFIG_SCSI_HPTIOP is not set
731# CONFIG_SCSI_BUSLOGIC is not set 750# CONFIG_SCSI_BUSLOGIC is not set
751# CONFIG_LIBFC is not set
752# CONFIG_FCOE is not set
732# CONFIG_SCSI_DMX3191D is not set 753# CONFIG_SCSI_DMX3191D is not set
733# CONFIG_SCSI_EATA is not set 754# CONFIG_SCSI_EATA is not set
734# CONFIG_SCSI_FUTURE_DOMAIN is not set 755# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -848,6 +869,9 @@ CONFIG_PHYLIB=y
848# CONFIG_BROADCOM_PHY is not set 869# CONFIG_BROADCOM_PHY is not set
849# CONFIG_ICPLUS_PHY is not set 870# CONFIG_ICPLUS_PHY is not set
850# CONFIG_REALTEK_PHY is not set 871# CONFIG_REALTEK_PHY is not set
872# CONFIG_NATIONAL_PHY is not set
873# CONFIG_STE10XP is not set
874# CONFIG_LSI_ET1011C_PHY is not set
851# CONFIG_FIXED_PHY is not set 875# CONFIG_FIXED_PHY is not set
852# CONFIG_MDIO_BITBANG is not set 876# CONFIG_MDIO_BITBANG is not set
853CONFIG_NET_ETHERNET=y 877CONFIG_NET_ETHERNET=y
@@ -902,6 +926,10 @@ CONFIG_GIANFAR=y
902# CONFIG_IWLWIFI_LEDS is not set 926# CONFIG_IWLWIFI_LEDS is not set
903 927
904# 928#
929# Enable WiMAX (Networking options) to see the WiMAX drivers
930#
931
932#
905# USB Network Adapters 933# USB Network Adapters
906# 934#
907# CONFIG_USB_CATC is not set 935# CONFIG_USB_CATC is not set
@@ -924,6 +952,7 @@ CONFIG_ATM_DRIVERS=y
924# CONFIG_ATM_IA is not set 952# CONFIG_ATM_IA is not set
925# CONFIG_ATM_FORE200E is not set 953# CONFIG_ATM_FORE200E is not set
926# CONFIG_ATM_HE is not set 954# CONFIG_ATM_HE is not set
955# CONFIG_ATM_SOLOS is not set
927# CONFIG_FDDI is not set 956# CONFIG_FDDI is not set
928# CONFIG_HIPPI is not set 957# CONFIG_HIPPI is not set
929CONFIG_PPP=m 958CONFIG_PPP=m
@@ -1016,7 +1045,9 @@ CONFIG_SERIAL_CORE_CONSOLE=y
1016# CONFIG_SERIAL_JSM is not set 1045# CONFIG_SERIAL_JSM is not set
1017# CONFIG_SERIAL_OF_PLATFORM is not set 1046# CONFIG_SERIAL_OF_PLATFORM is not set
1018CONFIG_UNIX98_PTYS=y 1047CONFIG_UNIX98_PTYS=y
1048# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1019# CONFIG_LEGACY_PTYS is not set 1049# CONFIG_LEGACY_PTYS is not set
1050# CONFIG_HVC_UDBG is not set
1020# CONFIG_IPMI_HANDLER is not set 1051# CONFIG_IPMI_HANDLER is not set
1021CONFIG_HW_RANDOM=y 1052CONFIG_HW_RANDOM=y
1022# CONFIG_NVRAM is not set 1053# CONFIG_NVRAM is not set
@@ -1055,6 +1086,7 @@ CONFIG_I2C_HELPER_AUTO=y
1055# 1086#
1056# I2C system bus drivers (mostly embedded / system-on-chip) 1087# I2C system bus drivers (mostly embedded / system-on-chip)
1057# 1088#
1089# CONFIG_I2C_GPIO is not set
1058CONFIG_I2C_MPC=y 1090CONFIG_I2C_MPC=y
1059# CONFIG_I2C_OCORES is not set 1091# CONFIG_I2C_OCORES is not set
1060# CONFIG_I2C_SIMTEC is not set 1092# CONFIG_I2C_SIMTEC is not set
@@ -1095,7 +1127,31 @@ CONFIG_DS1682=y
1095# CONFIG_I2C_DEBUG_CHIP is not set 1127# CONFIG_I2C_DEBUG_CHIP is not set
1096# CONFIG_SPI is not set 1128# CONFIG_SPI is not set
1097CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 1129CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
1098# CONFIG_GPIOLIB is not set 1130CONFIG_ARCH_REQUIRE_GPIOLIB=y
1131CONFIG_GPIOLIB=y
1132# CONFIG_DEBUG_GPIO is not set
1133# CONFIG_GPIO_SYSFS is not set
1134
1135#
1136# Memory mapped GPIO expanders:
1137#
1138# CONFIG_GPIO_XILINX is not set
1139
1140#
1141# I2C GPIO expanders:
1142#
1143# CONFIG_GPIO_MAX732X is not set
1144# CONFIG_GPIO_PCA953X is not set
1145# CONFIG_GPIO_PCF857X is not set
1146
1147#
1148# PCI GPIO expanders:
1149#
1150# CONFIG_GPIO_BT8XX is not set
1151
1152#
1153# SPI GPIO expanders:
1154#
1099# CONFIG_W1 is not set 1155# CONFIG_W1 is not set
1100# CONFIG_POWER_SUPPLY is not set 1156# CONFIG_POWER_SUPPLY is not set
1101CONFIG_HWMON=y 1157CONFIG_HWMON=y
@@ -1108,8 +1164,10 @@ CONFIG_HWMON=y
1108# CONFIG_SENSORS_ADM1029 is not set 1164# CONFIG_SENSORS_ADM1029 is not set
1109# CONFIG_SENSORS_ADM1031 is not set 1165# CONFIG_SENSORS_ADM1031 is not set
1110# CONFIG_SENSORS_ADM9240 is not set 1166# CONFIG_SENSORS_ADM9240 is not set
1167# CONFIG_SENSORS_ADT7462 is not set
1111# CONFIG_SENSORS_ADT7470 is not set 1168# CONFIG_SENSORS_ADT7470 is not set
1112# CONFIG_SENSORS_ADT7473 is not set 1169# CONFIG_SENSORS_ADT7473 is not set
1170# CONFIG_SENSORS_ADT7475 is not set
1113# CONFIG_SENSORS_ATXP1 is not set 1171# CONFIG_SENSORS_ATXP1 is not set
1114# CONFIG_SENSORS_DS1621 is not set 1172# CONFIG_SENSORS_DS1621 is not set
1115# CONFIG_SENSORS_I5K_AMB is not set 1173# CONFIG_SENSORS_I5K_AMB is not set
@@ -1130,6 +1188,7 @@ CONFIG_HWMON=y
1130CONFIG_SENSORS_LM90=y 1188CONFIG_SENSORS_LM90=y
1131CONFIG_SENSORS_LM92=y 1189CONFIG_SENSORS_LM92=y
1132# CONFIG_SENSORS_LM93 is not set 1190# CONFIG_SENSORS_LM93 is not set
1191# CONFIG_SENSORS_LTC4245 is not set
1133# CONFIG_SENSORS_MAX1619 is not set 1192# CONFIG_SENSORS_MAX1619 is not set
1134# CONFIG_SENSORS_MAX6650 is not set 1193# CONFIG_SENSORS_MAX6650 is not set
1135# CONFIG_SENSORS_PC87360 is not set 1194# CONFIG_SENSORS_PC87360 is not set
@@ -1163,8 +1222,8 @@ CONFIG_WATCHDOG=y
1163# 1222#
1164# CONFIG_SOFT_WATCHDOG is not set 1223# CONFIG_SOFT_WATCHDOG is not set
1165# CONFIG_ALIM7101_WDT is not set 1224# CONFIG_ALIM7101_WDT is not set
1166# CONFIG_8xxx_WDT is not set
1167CONFIG_GEF_WDT=y 1225CONFIG_GEF_WDT=y
1226# CONFIG_8xxx_WDT is not set
1168 1227
1169# 1228#
1170# PCI-based Watchdog Cards 1229# PCI-based Watchdog Cards
@@ -1176,11 +1235,11 @@ CONFIG_GEF_WDT=y
1176# USB-based Watchdog Cards 1235# USB-based Watchdog Cards
1177# 1236#
1178# CONFIG_USBPCWATCHDOG is not set 1237# CONFIG_USBPCWATCHDOG is not set
1238CONFIG_SSB_POSSIBLE=y
1179 1239
1180# 1240#
1181# Sonics Silicon Backplane 1241# Sonics Silicon Backplane
1182# 1242#
1183CONFIG_SSB_POSSIBLE=y
1184# CONFIG_SSB is not set 1243# CONFIG_SSB is not set
1185 1244
1186# 1245#
@@ -1189,18 +1248,14 @@ CONFIG_SSB_POSSIBLE=y
1189# CONFIG_MFD_CORE is not set 1248# CONFIG_MFD_CORE is not set
1190# CONFIG_MFD_SM501 is not set 1249# CONFIG_MFD_SM501 is not set
1191# CONFIG_HTC_PASIC3 is not set 1250# CONFIG_HTC_PASIC3 is not set
1251# CONFIG_TPS65010 is not set
1252# CONFIG_TWL4030_CORE is not set
1192# CONFIG_MFD_TMIO is not set 1253# CONFIG_MFD_TMIO is not set
1193# CONFIG_PMIC_DA903X is not set 1254# CONFIG_PMIC_DA903X is not set
1194# CONFIG_MFD_WM8400 is not set 1255# CONFIG_MFD_WM8400 is not set
1195# CONFIG_MFD_WM8350_I2C is not set 1256# CONFIG_MFD_WM8350_I2C is not set
1196 1257# CONFIG_MFD_PCF50633 is not set
1197#
1198# Voltage and Current regulators
1199#
1200# CONFIG_REGULATOR is not set 1258# CONFIG_REGULATOR is not set
1201# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1202# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1203# CONFIG_REGULATOR_BQ24022 is not set
1204 1259
1205# 1260#
1206# Multimedia devices 1261# Multimedia devices
@@ -1260,11 +1315,9 @@ CONFIG_HID_COMPAT=y
1260CONFIG_HID_A4TECH=y 1315CONFIG_HID_A4TECH=y
1261CONFIG_HID_APPLE=y 1316CONFIG_HID_APPLE=y
1262CONFIG_HID_BELKIN=y 1317CONFIG_HID_BELKIN=y
1263CONFIG_HID_BRIGHT=y
1264CONFIG_HID_CHERRY=y 1318CONFIG_HID_CHERRY=y
1265CONFIG_HID_CHICONY=y 1319CONFIG_HID_CHICONY=y
1266CONFIG_HID_CYPRESS=y 1320CONFIG_HID_CYPRESS=y
1267CONFIG_HID_DELL=y
1268CONFIG_HID_EZKEY=y 1321CONFIG_HID_EZKEY=y
1269CONFIG_HID_GYRATION=y 1322CONFIG_HID_GYRATION=y
1270CONFIG_HID_LOGITECH=y 1323CONFIG_HID_LOGITECH=y
@@ -1272,12 +1325,15 @@ CONFIG_HID_LOGITECH=y
1272# CONFIG_LOGIRUMBLEPAD2_FF is not set 1325# CONFIG_LOGIRUMBLEPAD2_FF is not set
1273CONFIG_HID_MICROSOFT=y 1326CONFIG_HID_MICROSOFT=y
1274CONFIG_HID_MONTEREY=y 1327CONFIG_HID_MONTEREY=y
1328# CONFIG_HID_NTRIG is not set
1275CONFIG_HID_PANTHERLORD=y 1329CONFIG_HID_PANTHERLORD=y
1276# CONFIG_PANTHERLORD_FF is not set 1330# CONFIG_PANTHERLORD_FF is not set
1277CONFIG_HID_PETALYNX=y 1331CONFIG_HID_PETALYNX=y
1278CONFIG_HID_SAMSUNG=y 1332CONFIG_HID_SAMSUNG=y
1279CONFIG_HID_SONY=y 1333CONFIG_HID_SONY=y
1280CONFIG_HID_SUNPLUS=y 1334CONFIG_HID_SUNPLUS=y
1335# CONFIG_GREENASIA_FF is not set
1336# CONFIG_HID_TOPSEED is not set
1281CONFIG_THRUSTMASTER_FF=m 1337CONFIG_THRUSTMASTER_FF=m
1282CONFIG_ZEROPLUS_FF=m 1338CONFIG_ZEROPLUS_FF=m
1283CONFIG_USB_SUPPORT=y 1339CONFIG_USB_SUPPORT=y
@@ -1310,6 +1366,7 @@ CONFIG_USB_EHCI_HCD=y
1310# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1366# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1311# CONFIG_USB_EHCI_FSL is not set 1367# CONFIG_USB_EHCI_FSL is not set
1312# CONFIG_USB_EHCI_HCD_PPC_OF is not set 1368# CONFIG_USB_EHCI_HCD_PPC_OF is not set
1369# CONFIG_USB_OXU210HP_HCD is not set
1313# CONFIG_USB_ISP116X_HCD is not set 1370# CONFIG_USB_ISP116X_HCD is not set
1314# CONFIG_USB_ISP1760_HCD is not set 1371# CONFIG_USB_ISP1760_HCD is not set
1315CONFIG_USB_OHCI_HCD=y 1372CONFIG_USB_OHCI_HCD=y
@@ -1332,18 +1389,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1332# CONFIG_USB_TMC is not set 1389# CONFIG_USB_TMC is not set
1333 1390
1334# 1391#
1335# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1392# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1336# 1393#
1337 1394
1338# 1395#
1339# may also be needed; see USB_STORAGE Help for more information 1396# see USB_STORAGE Help for more information
1340# 1397#
1341CONFIG_USB_STORAGE=y 1398CONFIG_USB_STORAGE=y
1342# CONFIG_USB_STORAGE_DEBUG is not set 1399# CONFIG_USB_STORAGE_DEBUG is not set
1343# CONFIG_USB_STORAGE_DATAFAB is not set 1400# CONFIG_USB_STORAGE_DATAFAB is not set
1344# CONFIG_USB_STORAGE_FREECOM is not set 1401# CONFIG_USB_STORAGE_FREECOM is not set
1345# CONFIG_USB_STORAGE_ISD200 is not set 1402# CONFIG_USB_STORAGE_ISD200 is not set
1346# CONFIG_USB_STORAGE_DPCM is not set
1347# CONFIG_USB_STORAGE_USBAT is not set 1403# CONFIG_USB_STORAGE_USBAT is not set
1348# CONFIG_USB_STORAGE_SDDR09 is not set 1404# CONFIG_USB_STORAGE_SDDR09 is not set
1349# CONFIG_USB_STORAGE_SDDR55 is not set 1405# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1391,6 +1447,11 @@ CONFIG_USB_STORAGE=y
1391# CONFIG_USB_VST is not set 1447# CONFIG_USB_VST is not set
1392# CONFIG_USB_ATM is not set 1448# CONFIG_USB_ATM is not set
1393# CONFIG_USB_GADGET is not set 1449# CONFIG_USB_GADGET is not set
1450
1451#
1452# OTG and related infrastructure
1453#
1454# CONFIG_USB_GPIO_VBUS is not set
1394# CONFIG_UWB is not set 1455# CONFIG_UWB is not set
1395# CONFIG_MMC is not set 1456# CONFIG_MMC is not set
1396# CONFIG_MEMSTICK is not set 1457# CONFIG_MEMSTICK is not set
@@ -1478,6 +1539,7 @@ CONFIG_FS_POSIX_ACL=y
1478CONFIG_FILE_LOCKING=y 1539CONFIG_FILE_LOCKING=y
1479# CONFIG_XFS_FS is not set 1540# CONFIG_XFS_FS is not set
1480# CONFIG_OCFS2_FS is not set 1541# CONFIG_OCFS2_FS is not set
1542# CONFIG_BTRFS_FS is not set
1481CONFIG_DNOTIFY=y 1543CONFIG_DNOTIFY=y
1482CONFIG_INOTIFY=y 1544CONFIG_INOTIFY=y
1483CONFIG_INOTIFY_USER=y 1545CONFIG_INOTIFY_USER=y
@@ -1514,10 +1576,7 @@ CONFIG_TMPFS=y
1514# CONFIG_TMPFS_POSIX_ACL is not set 1576# CONFIG_TMPFS_POSIX_ACL is not set
1515# CONFIG_HUGETLB_PAGE is not set 1577# CONFIG_HUGETLB_PAGE is not set
1516# CONFIG_CONFIGFS_FS is not set 1578# CONFIG_CONFIGFS_FS is not set
1517 1579CONFIG_MISC_FILESYSTEMS=y
1518#
1519# Miscellaneous filesystems
1520#
1521# CONFIG_ADFS_FS is not set 1580# CONFIG_ADFS_FS is not set
1522# CONFIG_AFFS_FS is not set 1581# CONFIG_AFFS_FS is not set
1523# CONFIG_HFS_FS is not set 1582# CONFIG_HFS_FS is not set
@@ -1527,6 +1586,7 @@ CONFIG_TMPFS=y
1527# CONFIG_EFS_FS is not set 1586# CONFIG_EFS_FS is not set
1528# CONFIG_JFFS2_FS is not set 1587# CONFIG_JFFS2_FS is not set
1529# CONFIG_CRAMFS is not set 1588# CONFIG_CRAMFS is not set
1589# CONFIG_SQUASHFS is not set
1530# CONFIG_VXFS_FS is not set 1590# CONFIG_VXFS_FS is not set
1531# CONFIG_MINIX_FS is not set 1591# CONFIG_MINIX_FS is not set
1532# CONFIG_OMFS_FS is not set 1592# CONFIG_OMFS_FS is not set
@@ -1613,6 +1673,7 @@ CONFIG_NLS_UTF8=m
1613# Library routines 1673# Library routines
1614# 1674#
1615CONFIG_BITREVERSE=y 1675CONFIG_BITREVERSE=y
1676CONFIG_GENERIC_FIND_LAST_BIT=y
1616CONFIG_CRC_CCITT=m 1677CONFIG_CRC_CCITT=m
1617# CONFIG_CRC16 is not set 1678# CONFIG_CRC16 is not set
1618# CONFIG_CRC_T10DIF is not set 1679# CONFIG_CRC_T10DIF is not set
@@ -1663,6 +1724,7 @@ CONFIG_DEBUG_INFO=y
1663# CONFIG_DEBUG_MEMORY_INIT is not set 1724# CONFIG_DEBUG_MEMORY_INIT is not set
1664# CONFIG_DEBUG_LIST is not set 1725# CONFIG_DEBUG_LIST is not set
1665# CONFIG_DEBUG_SG is not set 1726# CONFIG_DEBUG_SG is not set
1727# CONFIG_DEBUG_NOTIFIERS is not set
1666# CONFIG_BOOT_PRINTK_DELAY is not set 1728# CONFIG_BOOT_PRINTK_DELAY is not set
1667# CONFIG_RCU_TORTURE_TEST is not set 1729# CONFIG_RCU_TORTURE_TEST is not set
1668# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1730# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1672,6 +1734,8 @@ CONFIG_DEBUG_INFO=y
1672# CONFIG_LATENCYTOP is not set 1734# CONFIG_LATENCYTOP is not set
1673CONFIG_SYSCTL_SYSCALL_CHECK=y 1735CONFIG_SYSCTL_SYSCALL_CHECK=y
1674CONFIG_HAVE_FUNCTION_TRACER=y 1736CONFIG_HAVE_FUNCTION_TRACER=y
1737CONFIG_HAVE_DYNAMIC_FTRACE=y
1738CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1675 1739
1676# 1740#
1677# Tracers 1741# Tracers
@@ -1681,11 +1745,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1681# CONFIG_SCHED_TRACER is not set 1745# CONFIG_SCHED_TRACER is not set
1682# CONFIG_CONTEXT_SWITCH_TRACER is not set 1746# CONFIG_CONTEXT_SWITCH_TRACER is not set
1683# CONFIG_BOOT_TRACER is not set 1747# CONFIG_BOOT_TRACER is not set
1748# CONFIG_TRACE_BRANCH_PROFILING is not set
1684# CONFIG_STACK_TRACER is not set 1749# CONFIG_STACK_TRACER is not set
1685# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1750# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1686# CONFIG_SAMPLES is not set 1751# CONFIG_SAMPLES is not set
1687CONFIG_HAVE_ARCH_KGDB=y 1752CONFIG_HAVE_ARCH_KGDB=y
1688# CONFIG_KGDB is not set 1753# CONFIG_KGDB is not set
1754CONFIG_PRINT_STACK_DEPTH=64
1689# CONFIG_DEBUG_STACKOVERFLOW is not set 1755# CONFIG_DEBUG_STACKOVERFLOW is not set
1690# CONFIG_DEBUG_STACK_USAGE is not set 1756# CONFIG_DEBUG_STACK_USAGE is not set
1691# CONFIG_DEBUG_PAGEALLOC is not set 1757# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1706,6 +1772,7 @@ CONFIG_SECURITY=y
1706# CONFIG_SECURITYFS is not set 1772# CONFIG_SECURITYFS is not set
1707CONFIG_SECURITY_NETWORK=y 1773CONFIG_SECURITY_NETWORK=y
1708# CONFIG_SECURITY_NETWORK_XFRM is not set 1774# CONFIG_SECURITY_NETWORK_XFRM is not set
1775# CONFIG_SECURITY_PATH is not set
1709# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1776# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1710# CONFIG_SECURITY_ROOTPLUG is not set 1777# CONFIG_SECURITY_ROOTPLUG is not set
1711CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 1778CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
@@ -1716,11 +1783,16 @@ CONFIG_CRYPTO=y
1716# 1783#
1717# CONFIG_CRYPTO_FIPS is not set 1784# CONFIG_CRYPTO_FIPS is not set
1718CONFIG_CRYPTO_ALGAPI=y 1785CONFIG_CRYPTO_ALGAPI=y
1719CONFIG_CRYPTO_AEAD=y 1786CONFIG_CRYPTO_ALGAPI2=y
1787CONFIG_CRYPTO_AEAD=m
1788CONFIG_CRYPTO_AEAD2=y
1720CONFIG_CRYPTO_BLKCIPHER=y 1789CONFIG_CRYPTO_BLKCIPHER=y
1790CONFIG_CRYPTO_BLKCIPHER2=y
1721CONFIG_CRYPTO_HASH=y 1791CONFIG_CRYPTO_HASH=y
1722CONFIG_CRYPTO_RNG=y 1792CONFIG_CRYPTO_HASH2=y
1793CONFIG_CRYPTO_RNG2=y
1723CONFIG_CRYPTO_MANAGER=y 1794CONFIG_CRYPTO_MANAGER=y
1795CONFIG_CRYPTO_MANAGER2=y
1724# CONFIG_CRYPTO_GF128MUL is not set 1796# CONFIG_CRYPTO_GF128MUL is not set
1725CONFIG_CRYPTO_NULL=m 1797CONFIG_CRYPTO_NULL=m
1726# CONFIG_CRYPTO_CRYPTD is not set 1798# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
index 25bf4e95acb8..bbdf4bfc4327 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:28 2008 4# Mon Jan 26 15:36:24 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -75,12 +75,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75CONFIG_IKCONFIG=y 75CONFIG_IKCONFIG=y
76CONFIG_IKCONFIG_PROC=y 76CONFIG_IKCONFIG_PROC=y
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -115,7 +115,6 @@ CONFIG_SLUB_DEBUG=y
115CONFIG_SLUB=y 115CONFIG_SLUB=y
116# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set 117# CONFIG_PROFILING is not set
118# CONFIG_MARKERS is not set
119CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
120# CONFIG_KPROBES is not set 119# CONFIG_KPROBES is not set
121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -126,7 +125,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=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
129# CONFIG_TINY_SHMEM is not set
130CONFIG_BASE_SMALL=0 128CONFIG_BASE_SMALL=0
131CONFIG_MODULES=y 129CONFIG_MODULES=y
132# CONFIG_MODULE_FORCE_LOAD is not set 130# CONFIG_MODULE_FORCE_LOAD is not set
@@ -134,11 +132,9 @@ CONFIG_MODULE_UNLOAD=y
134# CONFIG_MODULE_FORCE_UNLOAD is not set 132# CONFIG_MODULE_FORCE_UNLOAD is not set
135# CONFIG_MODVERSIONS is not set 133# CONFIG_MODVERSIONS is not set
136# CONFIG_MODULE_SRCVERSION_ALL is not set 134# CONFIG_MODULE_SRCVERSION_ALL is not set
137CONFIG_KMOD=y
138CONFIG_BLOCK=y 135CONFIG_BLOCK=y
139# CONFIG_LBD is not set 136# CONFIG_LBD is not set
140# CONFIG_BLK_DEV_IO_TRACE is not set 137# CONFIG_BLK_DEV_IO_TRACE is not set
141# CONFIG_LSF is not set
142# CONFIG_BLK_DEV_BSG is not set 138# CONFIG_BLK_DEV_BSG is not set
143# CONFIG_BLK_DEV_INTEGRITY is not set 139# CONFIG_BLK_DEV_INTEGRITY is not set
144 140
@@ -155,6 +151,10 @@ CONFIG_DEFAULT_DEADLINE=y
155# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
156CONFIG_DEFAULT_IOSCHED="deadline" 152CONFIG_DEFAULT_IOSCHED="deadline"
157CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_TREE_RCU is not set
155# CONFIG_PREEMPT_RCU is not set
156# CONFIG_TREE_RCU_TRACE is not set
157# CONFIG_PREEMPT_RCU_TRACE is not set
158# CONFIG_FREEZER is not set 158# CONFIG_FREEZER is not set
159 159
160# 160#
@@ -194,6 +194,7 @@ CONFIG_MPIC=y
194# CONFIG_QUICC_ENGINE is not set 194# CONFIG_QUICC_ENGINE is not set
195CONFIG_FSL_ULI1575=y 195CONFIG_FSL_ULI1575=y
196# CONFIG_MPC8xxx_GPIO is not set 196# CONFIG_MPC8xxx_GPIO is not set
197# CONFIG_SIMPLE_GPIO is not set
197 198
198# 199#
199# Kernel options 200# Kernel options
@@ -213,7 +214,6 @@ 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
216# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
217# CONFIG_HAVE_AOUT is not set 217# CONFIG_HAVE_AOUT is not set
218# CONFIG_BINFMT_MISC is not set 218# CONFIG_BINFMT_MISC is not set
219# CONFIG_IOMMU_HELPER is not set 219# CONFIG_IOMMU_HELPER is not set
@@ -221,6 +221,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
221CONFIG_ARCH_HAS_WALK_MEMORY=y 221CONFIG_ARCH_HAS_WALK_MEMORY=y
222CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 222CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
223# CONFIG_KEXEC is not set 223# CONFIG_KEXEC is not set
224# CONFIG_CRASH_DUMP is not set
224CONFIG_ARCH_FLATMEM_ENABLE=y 225CONFIG_ARCH_FLATMEM_ENABLE=y
225CONFIG_ARCH_POPULATES_NODE_MAP=y 226CONFIG_ARCH_POPULATES_NODE_MAP=y
226CONFIG_SELECT_MEMORY_MODEL=y 227CONFIG_SELECT_MEMORY_MODEL=y
@@ -232,12 +233,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
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_PHYS_ADDR_T_64BIT is not set 236# CONFIG_PHYS_ADDR_T_64BIT is not set
237CONFIG_ZONE_DMA_FLAG=1 237CONFIG_ZONE_DMA_FLAG=1
238CONFIG_BOUNCE=y 238CONFIG_BOUNCE=y
239CONFIG_VIRT_TO_BUS=y 239CONFIG_VIRT_TO_BUS=y
240CONFIG_UNEVICTABLE_LRU=y 240CONFIG_UNEVICTABLE_LRU=y
241CONFIG_PPC_4K_PAGES=y
242# CONFIG_PPC_16K_PAGES is not set
243# CONFIG_PPC_64K_PAGES is not set
241CONFIG_FORCE_MAX_ZONEORDER=12 244CONFIG_FORCE_MAX_ZONEORDER=12
242CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
243# CONFIG_CMDLINE_BOOL is not set 246# CONFIG_CMDLINE_BOOL is not set
@@ -265,6 +268,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
265# CONFIG_PCI_MSI is not set 268# CONFIG_PCI_MSI is not set
266# CONFIG_PCI_LEGACY is not set 269# CONFIG_PCI_LEGACY is not set
267CONFIG_PCI_DEBUG=y 270CONFIG_PCI_DEBUG=y
271# CONFIG_PCI_STUB 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
270# CONFIG_HAS_RAPIDIO is not set 274# CONFIG_HAS_RAPIDIO is not set
@@ -287,6 +291,7 @@ CONFIG_NET=y
287# 291#
288# Networking options 292# Networking options
289# 293#
294CONFIG_COMPAT_NET_DEV_OPS=y
290CONFIG_PACKET=y 295CONFIG_PACKET=y
291# CONFIG_PACKET_MMAP is not set 296# CONFIG_PACKET_MMAP is not set
292CONFIG_UNIX=y 297CONFIG_UNIX=y
@@ -360,6 +365,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
360# CONFIG_ECONET is not set 365# CONFIG_ECONET is not set
361# CONFIG_WAN_ROUTER is not set 366# CONFIG_WAN_ROUTER is not set
362# CONFIG_NET_SCHED is not set 367# CONFIG_NET_SCHED is not set
368# CONFIG_DCB is not set
363 369
364# 370#
365# Network testing 371# Network testing
@@ -375,8 +381,9 @@ CONFIG_WIRELESS=y
375# CONFIG_CFG80211 is not set 381# CONFIG_CFG80211 is not set
376CONFIG_WIRELESS_OLD_REGULATORY=y 382CONFIG_WIRELESS_OLD_REGULATORY=y
377# CONFIG_WIRELESS_EXT is not set 383# CONFIG_WIRELESS_EXT is not set
384# CONFIG_LIB80211 is not set
378# CONFIG_MAC80211 is not set 385# CONFIG_MAC80211 is not set
379# CONFIG_IEEE80211 is not set 386# CONFIG_WIMAX is not set
380# CONFIG_RFKILL is not set 387# CONFIG_RFKILL is not set
381# CONFIG_NET_9P is not set 388# CONFIG_NET_9P is not set
382 389
@@ -401,6 +408,7 @@ CONFIG_MTD=y
401# CONFIG_MTD_DEBUG is not set 408# CONFIG_MTD_DEBUG is not set
402# CONFIG_MTD_CONCAT is not set 409# CONFIG_MTD_CONCAT is not set
403CONFIG_MTD_PARTITIONS=y 410CONFIG_MTD_PARTITIONS=y
411# CONFIG_MTD_TESTS is not set
404# CONFIG_MTD_REDBOOT_PARTS is not set 412# CONFIG_MTD_REDBOOT_PARTS is not set
405CONFIG_MTD_CMDLINE_PARTS=y 413CONFIG_MTD_CMDLINE_PARTS=y
406# CONFIG_MTD_OF_PARTS is not set 414# CONFIG_MTD_OF_PARTS is not set
@@ -481,6 +489,12 @@ CONFIG_MTD_NAND_FSL_ELBC=y
481# CONFIG_MTD_ONENAND is not set 489# CONFIG_MTD_ONENAND is not set
482 490
483# 491#
492# LPDDR flash memory drivers
493#
494# CONFIG_MTD_LPDDR is not set
495# CONFIG_MTD_QINFO_PROBE is not set
496
497#
484# UBI - Unsorted block images 498# UBI - Unsorted block images
485# 499#
486# CONFIG_MTD_UBI is not set 500# CONFIG_MTD_UBI is not set
@@ -510,8 +524,10 @@ CONFIG_MISC_DEVICES=y
510# CONFIG_EEPROM_93CX6 is not set 524# CONFIG_EEPROM_93CX6 is not set
511# CONFIG_SGI_IOC4 is not set 525# CONFIG_SGI_IOC4 is not set
512# CONFIG_TIFM_CORE is not set 526# CONFIG_TIFM_CORE is not set
527# CONFIG_ICS932S401 is not set
513# CONFIG_ENCLOSURE_SERVICES is not set 528# CONFIG_ENCLOSURE_SERVICES is not set
514# CONFIG_HP_ILO is not set 529# CONFIG_HP_ILO is not set
530# CONFIG_C2PORT is not set
515CONFIG_HAVE_IDE=y 531CONFIG_HAVE_IDE=y
516CONFIG_IDE=y 532CONFIG_IDE=y
517 533
@@ -524,7 +540,6 @@ CONFIG_IDE_GD_ATA=y
524# CONFIG_IDE_GD_ATAPI is not set 540# CONFIG_IDE_GD_ATAPI is not set
525# CONFIG_BLK_DEV_IDECD is not set 541# CONFIG_BLK_DEV_IDECD is not set
526# CONFIG_BLK_DEV_IDETAPE is not set 542# CONFIG_BLK_DEV_IDETAPE is not set
527# CONFIG_BLK_DEV_IDESCSI is not set
528# CONFIG_IDE_TASK_IOCTL is not set 543# CONFIG_IDE_TASK_IOCTL is not set
529CONFIG_IDE_PROC_FS=y 544CONFIG_IDE_PROC_FS=y
530 545
@@ -549,6 +564,7 @@ CONFIG_IDE_PROC_FS=y
549# CONFIG_BLK_DEV_JMICRON is not set 564# CONFIG_BLK_DEV_JMICRON is not set
550# CONFIG_BLK_DEV_SC1200 is not set 565# CONFIG_BLK_DEV_SC1200 is not set
551# CONFIG_BLK_DEV_PIIX is not set 566# CONFIG_BLK_DEV_PIIX is not set
567# CONFIG_BLK_DEV_IT8172 is not set
552# CONFIG_BLK_DEV_IT8213 is not set 568# CONFIG_BLK_DEV_IT8213 is not set
553# CONFIG_BLK_DEV_IT821X is not set 569# CONFIG_BLK_DEV_IT821X is not set
554# CONFIG_BLK_DEV_NS87415 is not set 570# CONFIG_BLK_DEV_NS87415 is not set
@@ -618,6 +634,8 @@ CONFIG_SCSI_LOWLEVEL=y
618# CONFIG_MEGARAID_SAS is not set 634# CONFIG_MEGARAID_SAS is not set
619# CONFIG_SCSI_HPTIOP is not set 635# CONFIG_SCSI_HPTIOP is not set
620# CONFIG_SCSI_BUSLOGIC is not set 636# CONFIG_SCSI_BUSLOGIC is not set
637# CONFIG_LIBFC is not set
638# CONFIG_FCOE is not set
621# CONFIG_SCSI_DMX3191D is not set 639# CONFIG_SCSI_DMX3191D is not set
622# CONFIG_SCSI_EATA is not set 640# CONFIG_SCSI_EATA is not set
623# CONFIG_SCSI_FUTURE_DOMAIN is not set 641# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -757,6 +775,10 @@ CONFIG_ULI526X=y
757# CONFIG_WLAN_PRE80211 is not set 775# CONFIG_WLAN_PRE80211 is not set
758# CONFIG_WLAN_80211 is not set 776# CONFIG_WLAN_80211 is not set
759# CONFIG_IWLWIFI_LEDS is not set 777# CONFIG_IWLWIFI_LEDS is not set
778
779#
780# Enable WiMAX (Networking options) to see the WiMAX drivers
781#
760# CONFIG_WAN is not set 782# CONFIG_WAN is not set
761# CONFIG_FDDI is not set 783# CONFIG_FDDI is not set
762# CONFIG_HIPPI is not set 784# CONFIG_HIPPI is not set
@@ -841,7 +863,9 @@ CONFIG_SERIAL_CORE_CONSOLE=y
841# CONFIG_SERIAL_JSM is not set 863# CONFIG_SERIAL_JSM is not set
842# CONFIG_SERIAL_OF_PLATFORM is not set 864# CONFIG_SERIAL_OF_PLATFORM is not set
843CONFIG_UNIX98_PTYS=y 865CONFIG_UNIX98_PTYS=y
866# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
844# CONFIG_LEGACY_PTYS is not set 867# CONFIG_LEGACY_PTYS is not set
868# CONFIG_HVC_UDBG is not set
845# CONFIG_IPMI_HANDLER is not set 869# CONFIG_IPMI_HANDLER is not set
846# CONFIG_HW_RANDOM is not set 870# CONFIG_HW_RANDOM is not set
847# CONFIG_NVRAM is not set 871# CONFIG_NVRAM is not set
@@ -926,11 +950,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
926# CONFIG_THERMAL is not set 950# CONFIG_THERMAL is not set
927# CONFIG_THERMAL_HWMON is not set 951# CONFIG_THERMAL_HWMON is not set
928# CONFIG_WATCHDOG is not set 952# CONFIG_WATCHDOG is not set
953CONFIG_SSB_POSSIBLE=y
929 954
930# 955#
931# Sonics Silicon Backplane 956# Sonics Silicon Backplane
932# 957#
933CONFIG_SSB_POSSIBLE=y
934# CONFIG_SSB is not set 958# CONFIG_SSB is not set
935 959
936# 960#
@@ -939,18 +963,13 @@ CONFIG_SSB_POSSIBLE=y
939# CONFIG_MFD_CORE is not set 963# CONFIG_MFD_CORE is not set
940# CONFIG_MFD_SM501 is not set 964# CONFIG_MFD_SM501 is not set
941# CONFIG_HTC_PASIC3 is not set 965# CONFIG_HTC_PASIC3 is not set
966# CONFIG_TWL4030_CORE is not set
942# CONFIG_MFD_TMIO is not set 967# CONFIG_MFD_TMIO is not set
943# CONFIG_PMIC_DA903X is not set 968# CONFIG_PMIC_DA903X is not set
944# CONFIG_MFD_WM8400 is not set 969# CONFIG_MFD_WM8400 is not set
945# CONFIG_MFD_WM8350_I2C is not set 970# CONFIG_MFD_WM8350_I2C is not set
946 971# CONFIG_MFD_PCF50633 is not set
947#
948# Voltage and Current regulators
949#
950# CONFIG_REGULATOR is not set 972# 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
954 973
955# 974#
956# Multimedia devices 975# Multimedia devices
@@ -1029,6 +1048,7 @@ CONFIG_FB_FSL_DIU=y
1029# CONFIG_FB_IBM_GXT4500 is not set 1048# CONFIG_FB_IBM_GXT4500 is not set
1030# CONFIG_FB_VIRTUAL is not set 1049# CONFIG_FB_VIRTUAL is not set
1031# CONFIG_FB_METRONOME is not set 1050# CONFIG_FB_METRONOME is not set
1051# CONFIG_FB_MB862XX is not set
1032# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1052# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1033 1053
1034# 1054#
@@ -1054,6 +1074,7 @@ CONFIG_SND_OSSEMUL=y
1054CONFIG_SND_MIXER_OSS=y 1074CONFIG_SND_MIXER_OSS=y
1055CONFIG_SND_PCM_OSS=y 1075CONFIG_SND_PCM_OSS=y
1056CONFIG_SND_PCM_OSS_PLUGINS=y 1076CONFIG_SND_PCM_OSS_PLUGINS=y
1077# CONFIG_SND_HRTIMER is not set
1057# CONFIG_SND_DYNAMIC_MINORS is not set 1078# CONFIG_SND_DYNAMIC_MINORS is not set
1058# CONFIG_SND_SUPPORT_OLD_API is not set 1079# CONFIG_SND_SUPPORT_OLD_API is not set
1059CONFIG_SND_VERBOSE_PROCFS=y 1080CONFIG_SND_VERBOSE_PROCFS=y
@@ -1130,6 +1151,7 @@ CONFIG_SND_PPC=y
1130CONFIG_SND_SOC=y 1151CONFIG_SND_SOC=y
1131CONFIG_SND_SOC_MPC8610=y 1152CONFIG_SND_SOC_MPC8610=y
1132CONFIG_SND_SOC_MPC8610_HPCD=y 1153CONFIG_SND_SOC_MPC8610_HPCD=y
1154CONFIG_SND_SOC_I2C_AND_SPI=y
1133# CONFIG_SND_SOC_ALL_CODECS is not set 1155# CONFIG_SND_SOC_ALL_CODECS is not set
1134CONFIG_SND_SOC_CS4270=y 1156CONFIG_SND_SOC_CS4270=y
1135CONFIG_SND_SOC_CS4270_VD33_ERRATA=y 1157CONFIG_SND_SOC_CS4270_VD33_ERRATA=y
@@ -1157,9 +1179,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1157# 1179#
1158 1180
1159# 1181#
1160# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1182# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1161# 1183#
1162# CONFIG_USB_GADGET is not set 1184# CONFIG_USB_GADGET is not set
1185
1186#
1187# OTG and related infrastructure
1188#
1163# CONFIG_UWB is not set 1189# CONFIG_UWB is not set
1164# CONFIG_MMC is not set 1190# CONFIG_MMC is not set
1165# CONFIG_MEMSTICK is not set 1191# CONFIG_MEMSTICK is not set
@@ -1197,6 +1223,7 @@ CONFIG_RTC_INTF_DEV=y
1197# CONFIG_RTC_DRV_M41T80 is not set 1223# CONFIG_RTC_DRV_M41T80 is not set
1198# CONFIG_RTC_DRV_S35390A is not set 1224# CONFIG_RTC_DRV_S35390A is not set
1199# CONFIG_RTC_DRV_FM3130 is not set 1225# CONFIG_RTC_DRV_FM3130 is not set
1226# CONFIG_RTC_DRV_RX8581 is not set
1200 1227
1201# 1228#
1202# SPI RTC drivers 1229# SPI RTC drivers
@@ -1244,6 +1271,7 @@ CONFIG_FS_MBCACHE=y
1244CONFIG_FILE_LOCKING=y 1271CONFIG_FILE_LOCKING=y
1245# CONFIG_XFS_FS is not set 1272# CONFIG_XFS_FS is not set
1246# CONFIG_OCFS2_FS is not set 1273# CONFIG_OCFS2_FS is not set
1274# CONFIG_BTRFS_FS is not set
1247# CONFIG_DNOTIFY is not set 1275# CONFIG_DNOTIFY is not set
1248# CONFIG_INOTIFY is not set 1276# CONFIG_INOTIFY is not set
1249# CONFIG_QUOTA is not set 1277# CONFIG_QUOTA is not set
@@ -1276,10 +1304,7 @@ CONFIG_TMPFS=y
1276# CONFIG_TMPFS_POSIX_ACL is not set 1304# CONFIG_TMPFS_POSIX_ACL is not set
1277# CONFIG_HUGETLB_PAGE is not set 1305# CONFIG_HUGETLB_PAGE is not set
1278# CONFIG_CONFIGFS_FS is not set 1306# CONFIG_CONFIGFS_FS is not set
1279 1307CONFIG_MISC_FILESYSTEMS=y
1280#
1281# Miscellaneous filesystems
1282#
1283# CONFIG_ADFS_FS is not set 1308# CONFIG_ADFS_FS is not set
1284# CONFIG_AFFS_FS is not set 1309# CONFIG_AFFS_FS is not set
1285# CONFIG_HFS_FS is not set 1310# CONFIG_HFS_FS is not set
@@ -1289,6 +1314,7 @@ CONFIG_TMPFS=y
1289# CONFIG_EFS_FS is not set 1314# CONFIG_EFS_FS is not set
1290# CONFIG_JFFS2_FS is not set 1315# CONFIG_JFFS2_FS is not set
1291# CONFIG_CRAMFS is not set 1316# CONFIG_CRAMFS is not set
1317# CONFIG_SQUASHFS is not set
1292# CONFIG_VXFS_FS is not set 1318# CONFIG_VXFS_FS is not set
1293# CONFIG_MINIX_FS is not set 1319# CONFIG_MINIX_FS is not set
1294# CONFIG_OMFS_FS is not set 1320# CONFIG_OMFS_FS is not set
@@ -1388,6 +1414,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1388# Library routines 1414# Library routines
1389# 1415#
1390CONFIG_BITREVERSE=y 1416CONFIG_BITREVERSE=y
1417CONFIG_GENERIC_FIND_LAST_BIT=y
1391# CONFIG_CRC_CCITT is not set 1418# CONFIG_CRC_CCITT is not set
1392# CONFIG_CRC16 is not set 1419# CONFIG_CRC16 is not set
1393CONFIG_CRC_T10DIF=y 1420CONFIG_CRC_T10DIF=y
@@ -1438,6 +1465,7 @@ CONFIG_DEBUG_INFO=y
1438# CONFIG_DEBUG_MEMORY_INIT is not set 1465# CONFIG_DEBUG_MEMORY_INIT is not set
1439# CONFIG_DEBUG_LIST is not set 1466# CONFIG_DEBUG_LIST is not set
1440# CONFIG_DEBUG_SG is not set 1467# CONFIG_DEBUG_SG is not set
1468# CONFIG_DEBUG_NOTIFIERS is not set
1441# CONFIG_BOOT_PRINTK_DELAY is not set 1469# CONFIG_BOOT_PRINTK_DELAY is not set
1442# CONFIG_RCU_TORTURE_TEST is not set 1470# CONFIG_RCU_TORTURE_TEST is not set
1443# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1471# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1447,6 +1475,8 @@ CONFIG_DEBUG_INFO=y
1447# CONFIG_LATENCYTOP is not set 1475# CONFIG_LATENCYTOP is not set
1448CONFIG_SYSCTL_SYSCALL_CHECK=y 1476CONFIG_SYSCTL_SYSCALL_CHECK=y
1449CONFIG_HAVE_FUNCTION_TRACER=y 1477CONFIG_HAVE_FUNCTION_TRACER=y
1478CONFIG_HAVE_DYNAMIC_FTRACE=y
1479CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1450 1480
1451# 1481#
1452# Tracers 1482# Tracers
@@ -1455,11 +1485,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1455# CONFIG_SCHED_TRACER is not set 1485# CONFIG_SCHED_TRACER is not set
1456# CONFIG_CONTEXT_SWITCH_TRACER is not set 1486# CONFIG_CONTEXT_SWITCH_TRACER is not set
1457# CONFIG_BOOT_TRACER is not set 1487# CONFIG_BOOT_TRACER is not set
1488# CONFIG_TRACE_BRANCH_PROFILING is not set
1458# CONFIG_STACK_TRACER is not set 1489# CONFIG_STACK_TRACER is not set
1459# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1490# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1460# CONFIG_SAMPLES is not set 1491# CONFIG_SAMPLES is not set
1461CONFIG_HAVE_ARCH_KGDB=y 1492CONFIG_HAVE_ARCH_KGDB=y
1462# CONFIG_KGDB is not set 1493# CONFIG_KGDB is not set
1494CONFIG_PRINT_STACK_DEPTH=64
1463# CONFIG_DEBUG_STACKOVERFLOW is not set 1495# CONFIG_DEBUG_STACKOVERFLOW is not set
1464# CONFIG_DEBUG_STACK_USAGE is not set 1496# CONFIG_DEBUG_STACK_USAGE is not set
1465# CONFIG_DEBUG_PAGEALLOC is not set 1497# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1486,6 +1518,7 @@ CONFIG_CRYPTO=y
1486# 1518#
1487# CONFIG_CRYPTO_FIPS is not set 1519# CONFIG_CRYPTO_FIPS is not set
1488# CONFIG_CRYPTO_MANAGER is not set 1520# CONFIG_CRYPTO_MANAGER is not set
1521# CONFIG_CRYPTO_MANAGER2 is not set
1489# CONFIG_CRYPTO_GF128MUL is not set 1522# CONFIG_CRYPTO_GF128MUL is not set
1490# CONFIG_CRYPTO_NULL is not set 1523# CONFIG_CRYPTO_NULL is not set
1491# CONFIG_CRYPTO_CRYPTD is not set 1524# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
index 8e0f0e5180a4..92acfdf3540a 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:29 2008 4# Mon Jan 26 15:36:25 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -45,7 +45,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
45CONFIG_PPC=y 45CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
51CONFIG_OF=y 51CONFIG_OF=y
@@ -78,12 +78,12 @@ CONFIG_AUDIT=y
78CONFIG_IKCONFIG=y 78CONFIG_IKCONFIG=y
79CONFIG_IKCONFIG_PROC=y 79CONFIG_IKCONFIG_PROC=y
80CONFIG_LOG_BUF_SHIFT=14 80CONFIG_LOG_BUF_SHIFT=14
81# CONFIG_CGROUPS is not set
82CONFIG_GROUP_SCHED=y 81CONFIG_GROUP_SCHED=y
83# CONFIG_FAIR_GROUP_SCHED is not set 82# CONFIG_FAIR_GROUP_SCHED is not set
84# CONFIG_RT_GROUP_SCHED is not set 83# CONFIG_RT_GROUP_SCHED is not set
85CONFIG_USER_SCHED=y 84CONFIG_USER_SCHED=y
86# CONFIG_CGROUP_SCHED is not set 85# CONFIG_CGROUP_SCHED is not set
86# CONFIG_CGROUPS is not set
87CONFIG_SYSFS_DEPRECATED=y 87CONFIG_SYSFS_DEPRECATED=y
88CONFIG_SYSFS_DEPRECATED_V2=y 88CONFIG_SYSFS_DEPRECATED_V2=y
89# CONFIG_RELAY is not set 89# CONFIG_RELAY is not set
@@ -96,6 +96,7 @@ CONFIG_EMBEDDED=y
96CONFIG_SYSCTL_SYSCALL=y 96CONFIG_SYSCTL_SYSCALL=y
97CONFIG_KALLSYMS=y 97CONFIG_KALLSYMS=y
98CONFIG_KALLSYMS_ALL=y 98CONFIG_KALLSYMS_ALL=y
99CONFIG_KALLSYMS_STRIP_GENERATED=y
99CONFIG_KALLSYMS_EXTRA_PASS=y 100CONFIG_KALLSYMS_EXTRA_PASS=y
100CONFIG_HOTPLUG=y 101CONFIG_HOTPLUG=y
101CONFIG_PRINTK=y 102CONFIG_PRINTK=y
@@ -118,7 +119,6 @@ CONFIG_SLUB_DEBUG=y
118CONFIG_SLUB=y 119CONFIG_SLUB=y
119# CONFIG_SLOB is not set 120# CONFIG_SLOB is not set
120# CONFIG_PROFILING is not set 121# CONFIG_PROFILING is not set
121# CONFIG_MARKERS is not set
122CONFIG_HAVE_OPROFILE=y 122CONFIG_HAVE_OPROFILE=y
123# CONFIG_KPROBES is not set 123# CONFIG_KPROBES is not set
124CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 124CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -130,7 +130,6 @@ CONFIG_USE_GENERIC_SMP_HELPERS=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
133# CONFIG_TINY_SHMEM is not set
134CONFIG_BASE_SMALL=0 133CONFIG_BASE_SMALL=0
135CONFIG_MODULES=y 134CONFIG_MODULES=y
136# CONFIG_MODULE_FORCE_LOAD is not set 135# CONFIG_MODULE_FORCE_LOAD is not set
@@ -138,12 +137,10 @@ CONFIG_MODULE_UNLOAD=y
138CONFIG_MODULE_FORCE_UNLOAD=y 137CONFIG_MODULE_FORCE_UNLOAD=y
139CONFIG_MODVERSIONS=y 138CONFIG_MODVERSIONS=y
140# CONFIG_MODULE_SRCVERSION_ALL is not set 139# CONFIG_MODULE_SRCVERSION_ALL is not set
141CONFIG_KMOD=y
142CONFIG_STOP_MACHINE=y 140CONFIG_STOP_MACHINE=y
143CONFIG_BLOCK=y 141CONFIG_BLOCK=y
144CONFIG_LBD=y 142CONFIG_LBD=y
145# CONFIG_BLK_DEV_IO_TRACE is not set 143# CONFIG_BLK_DEV_IO_TRACE is not set
146# CONFIG_LSF is not set
147# CONFIG_BLK_DEV_BSG is not set 144# CONFIG_BLK_DEV_BSG is not set
148# CONFIG_BLK_DEV_INTEGRITY is not set 145# CONFIG_BLK_DEV_INTEGRITY is not set
149 146
@@ -160,6 +157,10 @@ CONFIG_DEFAULT_CFQ=y
160# CONFIG_DEFAULT_NOOP is not set 157# CONFIG_DEFAULT_NOOP is not set
161CONFIG_DEFAULT_IOSCHED="cfq" 158CONFIG_DEFAULT_IOSCHED="cfq"
162CONFIG_CLASSIC_RCU=y 159CONFIG_CLASSIC_RCU=y
160# CONFIG_TREE_RCU is not set
161# CONFIG_PREEMPT_RCU is not set
162# CONFIG_TREE_RCU_TRACE is not set
163# CONFIG_PREEMPT_RCU_TRACE is not set
163# CONFIG_FREEZER is not set 164# CONFIG_FREEZER is not set
164 165
165# 166#
@@ -198,6 +199,7 @@ CONFIG_PPC_I8259=y
198# CONFIG_QUICC_ENGINE is not set 199# CONFIG_QUICC_ENGINE is not set
199CONFIG_FSL_ULI1575=y 200CONFIG_FSL_ULI1575=y
200# CONFIG_MPC8xxx_GPIO is not set 201# CONFIG_MPC8xxx_GPIO is not set
202# CONFIG_SIMPLE_GPIO is not set
201 203
202# 204#
203# Kernel options 205# Kernel options
@@ -225,6 +227,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 227CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 228CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 229# CONFIG_KEXEC is not set
230# CONFIG_CRASH_DUMP is not set
228# CONFIG_IRQ_ALL_CPUS is not set 231# CONFIG_IRQ_ALL_CPUS is not set
229CONFIG_ARCH_FLATMEM_ENABLE=y 232CONFIG_ARCH_FLATMEM_ENABLE=y
230CONFIG_ARCH_POPULATES_NODE_MAP=y 233CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -237,12 +240,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
237CONFIG_PAGEFLAGS_EXTENDED=y 240CONFIG_PAGEFLAGS_EXTENDED=y
238CONFIG_SPLIT_PTLOCK_CPUS=4 241CONFIG_SPLIT_PTLOCK_CPUS=4
239CONFIG_MIGRATION=y 242CONFIG_MIGRATION=y
240# CONFIG_RESOURCES_64BIT is not set
241# CONFIG_PHYS_ADDR_T_64BIT is not set 243# CONFIG_PHYS_ADDR_T_64BIT is not set
242CONFIG_ZONE_DMA_FLAG=1 244CONFIG_ZONE_DMA_FLAG=1
243CONFIG_BOUNCE=y 245CONFIG_BOUNCE=y
244CONFIG_VIRT_TO_BUS=y 246CONFIG_VIRT_TO_BUS=y
245CONFIG_UNEVICTABLE_LRU=y 247CONFIG_UNEVICTABLE_LRU=y
248CONFIG_PPC_4K_PAGES=y
249# CONFIG_PPC_16K_PAGES is not set
250# CONFIG_PPC_64K_PAGES is not set
246CONFIG_FORCE_MAX_ZONEORDER=11 251CONFIG_FORCE_MAX_ZONEORDER=11
247CONFIG_PROC_DEVICETREE=y 252CONFIG_PROC_DEVICETREE=y
248# CONFIG_CMDLINE_BOOL is not set 253# CONFIG_CMDLINE_BOOL is not set
@@ -268,6 +273,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
268# CONFIG_PCI_MSI is not set 273# CONFIG_PCI_MSI is not set
269# CONFIG_PCI_LEGACY is not set 274# CONFIG_PCI_LEGACY is not set
270# CONFIG_PCI_DEBUG is not set 275# CONFIG_PCI_DEBUG is not set
276# CONFIG_PCI_STUB is not set
271# CONFIG_PCCARD is not set 277# CONFIG_PCCARD is not set
272# CONFIG_HOTPLUG_PCI is not set 278# CONFIG_HOTPLUG_PCI is not set
273CONFIG_HAS_RAPIDIO=y 279CONFIG_HAS_RAPIDIO=y
@@ -291,6 +297,7 @@ CONFIG_NET=y
291# 297#
292# Networking options 298# Networking options
293# 299#
300CONFIG_COMPAT_NET_DEV_OPS=y
294CONFIG_PACKET=y 301CONFIG_PACKET=y
295# CONFIG_PACKET_MMAP is not set 302# CONFIG_PACKET_MMAP is not set
296CONFIG_UNIX=y 303CONFIG_UNIX=y
@@ -379,6 +386,7 @@ CONFIG_SCTP_HMAC_MD5=y
379# CONFIG_ECONET is not set 386# CONFIG_ECONET is not set
380# CONFIG_WAN_ROUTER is not set 387# CONFIG_WAN_ROUTER is not set
381# CONFIG_NET_SCHED is not set 388# CONFIG_NET_SCHED is not set
389# CONFIG_DCB is not set
382 390
383# 391#
384# Network testing 392# Network testing
@@ -395,8 +403,9 @@ CONFIG_WIRELESS=y
395# CONFIG_CFG80211 is not set 403# CONFIG_CFG80211 is not set
396CONFIG_WIRELESS_OLD_REGULATORY=y 404CONFIG_WIRELESS_OLD_REGULATORY=y
397# CONFIG_WIRELESS_EXT is not set 405# CONFIG_WIRELESS_EXT is not set
406# CONFIG_LIB80211 is not set
398# CONFIG_MAC80211 is not set 407# CONFIG_MAC80211 is not set
399# CONFIG_IEEE80211 is not set 408# CONFIG_WIMAX is not set
400# CONFIG_RFKILL is not set 409# CONFIG_RFKILL is not set
401# CONFIG_NET_9P is not set 410# CONFIG_NET_9P is not set
402 411
@@ -445,8 +454,10 @@ CONFIG_MISC_DEVICES=y
445# CONFIG_EEPROM_93CX6 is not set 454# CONFIG_EEPROM_93CX6 is not set
446# CONFIG_SGI_IOC4 is not set 455# CONFIG_SGI_IOC4 is not set
447# CONFIG_TIFM_CORE is not set 456# CONFIG_TIFM_CORE is not set
457# CONFIG_ICS932S401 is not set
448# CONFIG_ENCLOSURE_SERVICES is not set 458# CONFIG_ENCLOSURE_SERVICES is not set
449# CONFIG_HP_ILO is not set 459# CONFIG_HP_ILO is not set
460# CONFIG_C2PORT is not set
450CONFIG_HAVE_IDE=y 461CONFIG_HAVE_IDE=y
451# CONFIG_IDE is not set 462# CONFIG_IDE is not set
452 463
@@ -490,6 +501,7 @@ CONFIG_SCSI_WAIT_SCAN=m
490# CONFIG_SCSI_SRP_ATTRS is not set 501# CONFIG_SCSI_SRP_ATTRS is not set
491CONFIG_SCSI_LOWLEVEL=y 502CONFIG_SCSI_LOWLEVEL=y
492# CONFIG_ISCSI_TCP is not set 503# CONFIG_ISCSI_TCP is not set
504# CONFIG_SCSI_CXGB3_ISCSI is not set
493# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 505# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
494# CONFIG_SCSI_3W_9XXX is not set 506# CONFIG_SCSI_3W_9XXX is not set
495# CONFIG_SCSI_ACARD is not set 507# CONFIG_SCSI_ACARD is not set
@@ -506,6 +518,8 @@ CONFIG_SCSI_LOWLEVEL=y
506# CONFIG_MEGARAID_SAS is not set 518# CONFIG_MEGARAID_SAS is not set
507# CONFIG_SCSI_HPTIOP is not set 519# CONFIG_SCSI_HPTIOP is not set
508# CONFIG_SCSI_BUSLOGIC is not set 520# CONFIG_SCSI_BUSLOGIC is not set
521# CONFIG_LIBFC is not set
522# CONFIG_FCOE is not set
509# CONFIG_SCSI_DMX3191D is not set 523# CONFIG_SCSI_DMX3191D is not set
510# CONFIG_SCSI_EATA is not set 524# CONFIG_SCSI_EATA is not set
511# CONFIG_SCSI_FUTURE_DOMAIN is not set 525# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -625,6 +639,9 @@ CONFIG_VITESSE_PHY=y
625# CONFIG_BROADCOM_PHY is not set 639# CONFIG_BROADCOM_PHY is not set
626# CONFIG_ICPLUS_PHY is not set 640# CONFIG_ICPLUS_PHY is not set
627# CONFIG_REALTEK_PHY is not set 641# CONFIG_REALTEK_PHY is not set
642# CONFIG_NATIONAL_PHY is not set
643# CONFIG_STE10XP is not set
644# CONFIG_LSI_ET1011C_PHY is not set
628# CONFIG_FIXED_PHY is not set 645# CONFIG_FIXED_PHY is not set
629# CONFIG_MDIO_BITBANG is not set 646# CONFIG_MDIO_BITBANG is not set
630CONFIG_NET_ETHERNET=y 647CONFIG_NET_ETHERNET=y
@@ -670,6 +687,7 @@ CONFIG_GIANFAR=y
670# CONFIG_JME is not set 687# CONFIG_JME is not set
671CONFIG_NETDEV_10000=y 688CONFIG_NETDEV_10000=y
672# CONFIG_CHELSIO_T1 is not set 689# CONFIG_CHELSIO_T1 is not set
690CONFIG_CHELSIO_T3_DEPENDS=y
673# CONFIG_CHELSIO_T3 is not set 691# CONFIG_CHELSIO_T3 is not set
674# CONFIG_ENIC is not set 692# CONFIG_ENIC is not set
675# CONFIG_IXGBE is not set 693# CONFIG_IXGBE is not set
@@ -694,6 +712,10 @@ CONFIG_NETDEV_10000=y
694# CONFIG_IWLWIFI_LEDS is not set 712# CONFIG_IWLWIFI_LEDS is not set
695 713
696# 714#
715# Enable WiMAX (Networking options) to see the WiMAX drivers
716#
717
718#
697# USB Network Adapters 719# USB Network Adapters
698# 720#
699# CONFIG_USB_CATC is not set 721# CONFIG_USB_CATC is not set
@@ -785,8 +807,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
785# CONFIG_SERIAL_JSM is not set 807# CONFIG_SERIAL_JSM is not set
786# CONFIG_SERIAL_OF_PLATFORM is not set 808# CONFIG_SERIAL_OF_PLATFORM is not set
787CONFIG_UNIX98_PTYS=y 809CONFIG_UNIX98_PTYS=y
810# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
788CONFIG_LEGACY_PTYS=y 811CONFIG_LEGACY_PTYS=y
789CONFIG_LEGACY_PTY_COUNT=256 812CONFIG_LEGACY_PTY_COUNT=256
813# CONFIG_HVC_UDBG is not set
790# CONFIG_IPMI_HANDLER is not set 814# CONFIG_IPMI_HANDLER is not set
791# CONFIG_HW_RANDOM is not set 815# CONFIG_HW_RANDOM is not set
792CONFIG_NVRAM=y 816CONFIG_NVRAM=y
@@ -872,11 +896,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
872# CONFIG_THERMAL is not set 896# CONFIG_THERMAL is not set
873# CONFIG_THERMAL_HWMON is not set 897# CONFIG_THERMAL_HWMON is not set
874# CONFIG_WATCHDOG is not set 898# CONFIG_WATCHDOG is not set
899CONFIG_SSB_POSSIBLE=y
875 900
876# 901#
877# Sonics Silicon Backplane 902# Sonics Silicon Backplane
878# 903#
879CONFIG_SSB_POSSIBLE=y
880# CONFIG_SSB is not set 904# CONFIG_SSB is not set
881 905
882# 906#
@@ -885,18 +909,13 @@ CONFIG_SSB_POSSIBLE=y
885# CONFIG_MFD_CORE is not set 909# CONFIG_MFD_CORE is not set
886# CONFIG_MFD_SM501 is not set 910# CONFIG_MFD_SM501 is not set
887# CONFIG_HTC_PASIC3 is not set 911# CONFIG_HTC_PASIC3 is not set
912# CONFIG_TWL4030_CORE is not set
888# CONFIG_MFD_TMIO is not set 913# CONFIG_MFD_TMIO is not set
889# CONFIG_PMIC_DA903X is not set 914# CONFIG_PMIC_DA903X is not set
890# CONFIG_MFD_WM8400 is not set 915# CONFIG_MFD_WM8400 is not set
891# CONFIG_MFD_WM8350_I2C is not set 916# CONFIG_MFD_WM8350_I2C is not set
892 917# CONFIG_MFD_PCF50633 is not set
893#
894# Voltage and Current regulators
895#
896# CONFIG_REGULATOR is not set 918# 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
900 919
901# 920#
902# Multimedia devices 921# Multimedia devices
@@ -923,6 +942,7 @@ CONFIG_MEDIA_TUNER_TEA5767=m
923CONFIG_MEDIA_TUNER_MT20XX=m 942CONFIG_MEDIA_TUNER_MT20XX=m
924CONFIG_MEDIA_TUNER_XC2028=m 943CONFIG_MEDIA_TUNER_XC2028=m
925CONFIG_MEDIA_TUNER_XC5000=m 944CONFIG_MEDIA_TUNER_XC5000=m
945# CONFIG_DVB_DYNAMIC_MINORS is not set
926CONFIG_DVB_CAPTURE_DRIVERS=y 946CONFIG_DVB_CAPTURE_DRIVERS=y
927 947
928# 948#
@@ -968,6 +988,12 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
968# CONFIG_DVB_FE_CUSTOMISE is not set 988# CONFIG_DVB_FE_CUSTOMISE is not set
969 989
970# 990#
991# Multistandard (satellite) frontends
992#
993# CONFIG_DVB_STB0899 is not set
994# CONFIG_DVB_STB6100 is not set
995
996#
971# DVB-S (satellite) frontends 997# DVB-S (satellite) frontends
972# 998#
973# CONFIG_DVB_CX24110 is not set 999# CONFIG_DVB_CX24110 is not set
@@ -979,8 +1005,10 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
979# CONFIG_DVB_STV0299 is not set 1005# CONFIG_DVB_STV0299 is not set
980# CONFIG_DVB_TDA8083 is not set 1006# CONFIG_DVB_TDA8083 is not set
981# CONFIG_DVB_TDA10086 is not set 1007# CONFIG_DVB_TDA10086 is not set
1008# CONFIG_DVB_TDA8261 is not set
982# CONFIG_DVB_VES1X93 is not set 1009# CONFIG_DVB_VES1X93 is not set
983# CONFIG_DVB_TUNER_ITD1000 is not set 1010# CONFIG_DVB_TUNER_ITD1000 is not set
1011# CONFIG_DVB_TUNER_CX24113 is not set
984# CONFIG_DVB_TDA826X is not set 1012# CONFIG_DVB_TDA826X is not set
985# CONFIG_DVB_TUA6100 is not set 1013# CONFIG_DVB_TUA6100 is not set
986# CONFIG_DVB_CX24116 is not set 1014# CONFIG_DVB_CX24116 is not set
@@ -1021,11 +1049,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
1021# CONFIG_DVB_OR51132 is not set 1049# CONFIG_DVB_OR51132 is not set
1022# CONFIG_DVB_BCM3510 is not set 1050# CONFIG_DVB_BCM3510 is not set
1023# CONFIG_DVB_LGDT330X is not set 1051# CONFIG_DVB_LGDT330X is not set
1052# CONFIG_DVB_LGDT3304 is not set
1024# CONFIG_DVB_S5H1409 is not set 1053# CONFIG_DVB_S5H1409 is not set
1025# CONFIG_DVB_AU8522 is not set 1054# CONFIG_DVB_AU8522 is not set
1026# CONFIG_DVB_S5H1411 is not set 1055# CONFIG_DVB_S5H1411 is not set
1027 1056
1028# 1057#
1058# ISDB-T (terrestrial) frontends
1059#
1060# CONFIG_DVB_S921 is not set
1061
1062#
1029# Digital terrestrial only tuners/PLL 1063# Digital terrestrial only tuners/PLL
1030# 1064#
1031# CONFIG_DVB_PLL is not set 1065# CONFIG_DVB_PLL is not set
@@ -1078,6 +1112,7 @@ CONFIG_SND_OSSEMUL=y
1078CONFIG_SND_MIXER_OSS=y 1112CONFIG_SND_MIXER_OSS=y
1079CONFIG_SND_PCM_OSS=y 1113CONFIG_SND_PCM_OSS=y
1080CONFIG_SND_PCM_OSS_PLUGINS=y 1114CONFIG_SND_PCM_OSS_PLUGINS=y
1115# CONFIG_SND_HRTIMER is not set
1081# CONFIG_SND_DYNAMIC_MINORS is not set 1116# CONFIG_SND_DYNAMIC_MINORS is not set
1082# CONFIG_SND_SUPPORT_OLD_API is not set 1117# CONFIG_SND_SUPPORT_OLD_API is not set
1083CONFIG_SND_VERBOSE_PROCFS=y 1118CONFIG_SND_VERBOSE_PROCFS=y
@@ -1180,11 +1215,9 @@ CONFIG_HID_COMPAT=y
1180CONFIG_HID_A4TECH=y 1215CONFIG_HID_A4TECH=y
1181CONFIG_HID_APPLE=y 1216CONFIG_HID_APPLE=y
1182CONFIG_HID_BELKIN=y 1217CONFIG_HID_BELKIN=y
1183CONFIG_HID_BRIGHT=y
1184CONFIG_HID_CHERRY=y 1218CONFIG_HID_CHERRY=y
1185CONFIG_HID_CHICONY=y 1219CONFIG_HID_CHICONY=y
1186CONFIG_HID_CYPRESS=y 1220CONFIG_HID_CYPRESS=y
1187CONFIG_HID_DELL=y
1188CONFIG_HID_EZKEY=y 1221CONFIG_HID_EZKEY=y
1189CONFIG_HID_GYRATION=y 1222CONFIG_HID_GYRATION=y
1190CONFIG_HID_LOGITECH=y 1223CONFIG_HID_LOGITECH=y
@@ -1192,12 +1225,15 @@ CONFIG_HID_LOGITECH=y
1192# CONFIG_LOGIRUMBLEPAD2_FF is not set 1225# CONFIG_LOGIRUMBLEPAD2_FF is not set
1193CONFIG_HID_MICROSOFT=y 1226CONFIG_HID_MICROSOFT=y
1194CONFIG_HID_MONTEREY=y 1227CONFIG_HID_MONTEREY=y
1228# CONFIG_HID_NTRIG is not set
1195CONFIG_HID_PANTHERLORD=y 1229CONFIG_HID_PANTHERLORD=y
1196# CONFIG_PANTHERLORD_FF is not set 1230# CONFIG_PANTHERLORD_FF is not set
1197CONFIG_HID_PETALYNX=y 1231CONFIG_HID_PETALYNX=y
1198CONFIG_HID_SAMSUNG=y 1232CONFIG_HID_SAMSUNG=y
1199CONFIG_HID_SONY=y 1233CONFIG_HID_SONY=y
1200CONFIG_HID_SUNPLUS=y 1234CONFIG_HID_SUNPLUS=y
1235# CONFIG_GREENASIA_FF is not set
1236# CONFIG_HID_TOPSEED is not set
1201CONFIG_THRUSTMASTER_FF=m 1237CONFIG_THRUSTMASTER_FF=m
1202CONFIG_ZEROPLUS_FF=m 1238CONFIG_ZEROPLUS_FF=m
1203CONFIG_USB_SUPPORT=y 1239CONFIG_USB_SUPPORT=y
@@ -1230,6 +1266,7 @@ CONFIG_USB_EHCI_HCD=y
1230# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1266# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1231# CONFIG_USB_EHCI_FSL is not set 1267# CONFIG_USB_EHCI_FSL is not set
1232CONFIG_USB_EHCI_HCD_PPC_OF=y 1268CONFIG_USB_EHCI_HCD_PPC_OF=y
1269# CONFIG_USB_OXU210HP_HCD is not set
1233# CONFIG_USB_ISP116X_HCD is not set 1270# CONFIG_USB_ISP116X_HCD is not set
1234# CONFIG_USB_ISP1760_HCD is not set 1271# CONFIG_USB_ISP1760_HCD is not set
1235CONFIG_USB_OHCI_HCD=y 1272CONFIG_USB_OHCI_HCD=y
@@ -1255,18 +1292,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1255# CONFIG_USB_TMC is not set 1292# CONFIG_USB_TMC is not set
1256 1293
1257# 1294#
1258# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1295# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1259# 1296#
1260 1297
1261# 1298#
1262# may also be needed; see USB_STORAGE Help for more information 1299# see USB_STORAGE Help for more information
1263# 1300#
1264CONFIG_USB_STORAGE=y 1301CONFIG_USB_STORAGE=y
1265# CONFIG_USB_STORAGE_DEBUG is not set 1302# CONFIG_USB_STORAGE_DEBUG is not set
1266# CONFIG_USB_STORAGE_DATAFAB is not set 1303# CONFIG_USB_STORAGE_DATAFAB is not set
1267# CONFIG_USB_STORAGE_FREECOM is not set 1304# CONFIG_USB_STORAGE_FREECOM is not set
1268# CONFIG_USB_STORAGE_ISD200 is not set 1305# CONFIG_USB_STORAGE_ISD200 is not set
1269# CONFIG_USB_STORAGE_DPCM is not set
1270# CONFIG_USB_STORAGE_USBAT is not set 1306# CONFIG_USB_STORAGE_USBAT is not set
1271# CONFIG_USB_STORAGE_SDDR09 is not set 1307# CONFIG_USB_STORAGE_SDDR09 is not set
1272# CONFIG_USB_STORAGE_SDDR55 is not set 1308# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1314,6 +1350,10 @@ CONFIG_USB_STORAGE=y
1314# CONFIG_USB_ISIGHTFW is not set 1350# CONFIG_USB_ISIGHTFW is not set
1315# CONFIG_USB_VST is not set 1351# CONFIG_USB_VST is not set
1316# CONFIG_USB_GADGET is not set 1352# CONFIG_USB_GADGET is not set
1353
1354#
1355# OTG and related infrastructure
1356#
1317# CONFIG_UWB is not set 1357# CONFIG_UWB is not set
1318# CONFIG_MMC is not set 1358# CONFIG_MMC is not set
1319# CONFIG_MEMSTICK is not set 1359# CONFIG_MEMSTICK is not set
@@ -1351,6 +1391,7 @@ CONFIG_RTC_INTF_DEV=y
1351# CONFIG_RTC_DRV_M41T80 is not set 1391# CONFIG_RTC_DRV_M41T80 is not set
1352# CONFIG_RTC_DRV_S35390A is not set 1392# CONFIG_RTC_DRV_S35390A is not set
1353# CONFIG_RTC_DRV_FM3130 is not set 1393# CONFIG_RTC_DRV_FM3130 is not set
1394# CONFIG_RTC_DRV_RX8581 is not set
1354 1395
1355# 1396#
1356# SPI RTC drivers 1397# SPI RTC drivers
@@ -1397,7 +1438,9 @@ CONFIG_FS_MBCACHE=y
1397# CONFIG_FS_POSIX_ACL is not set 1438# CONFIG_FS_POSIX_ACL is not set
1398CONFIG_FILE_LOCKING=y 1439CONFIG_FILE_LOCKING=y
1399# CONFIG_XFS_FS is not set 1440# CONFIG_XFS_FS is not set
1441# CONFIG_GFS2_FS is not set
1400# CONFIG_OCFS2_FS is not set 1442# CONFIG_OCFS2_FS is not set
1443# CONFIG_BTRFS_FS is not set
1401CONFIG_DNOTIFY=y 1444CONFIG_DNOTIFY=y
1402CONFIG_INOTIFY=y 1445CONFIG_INOTIFY=y
1403CONFIG_INOTIFY_USER=y 1446CONFIG_INOTIFY_USER=y
@@ -1439,10 +1482,7 @@ CONFIG_TMPFS=y
1439# CONFIG_TMPFS_POSIX_ACL is not set 1482# CONFIG_TMPFS_POSIX_ACL is not set
1440# CONFIG_HUGETLB_PAGE is not set 1483# CONFIG_HUGETLB_PAGE is not set
1441# CONFIG_CONFIGFS_FS is not set 1484# CONFIG_CONFIGFS_FS is not set
1442 1485CONFIG_MISC_FILESYSTEMS=y
1443#
1444# Miscellaneous filesystems
1445#
1446CONFIG_ADFS_FS=m 1486CONFIG_ADFS_FS=m
1447# CONFIG_ADFS_FS_RW is not set 1487# CONFIG_ADFS_FS_RW is not set
1448CONFIG_AFFS_FS=m 1488CONFIG_AFFS_FS=m
@@ -1453,6 +1493,7 @@ CONFIG_BEFS_FS=m
1453CONFIG_BFS_FS=m 1493CONFIG_BFS_FS=m
1454CONFIG_EFS_FS=m 1494CONFIG_EFS_FS=m
1455CONFIG_CRAMFS=y 1495CONFIG_CRAMFS=y
1496# CONFIG_SQUASHFS is not set
1456CONFIG_VXFS_FS=m 1497CONFIG_VXFS_FS=m
1457# CONFIG_MINIX_FS is not set 1498# CONFIG_MINIX_FS is not set
1458# CONFIG_OMFS_FS is not set 1499# CONFIG_OMFS_FS is not set
@@ -1554,6 +1595,7 @@ CONFIG_NLS_UTF8=m
1554# Library routines 1595# Library routines
1555# 1596#
1556CONFIG_BITREVERSE=y 1597CONFIG_BITREVERSE=y
1598CONFIG_GENERIC_FIND_LAST_BIT=y
1557# CONFIG_CRC_CCITT is not set 1599# CONFIG_CRC_CCITT is not set
1558# CONFIG_CRC16 is not set 1600# CONFIG_CRC16 is not set
1559CONFIG_CRC_T10DIF=y 1601CONFIG_CRC_T10DIF=y
@@ -1605,6 +1647,7 @@ CONFIG_DEBUG_INFO=y
1605# CONFIG_DEBUG_MEMORY_INIT is not set 1647# CONFIG_DEBUG_MEMORY_INIT is not set
1606# CONFIG_DEBUG_LIST is not set 1648# CONFIG_DEBUG_LIST is not set
1607# CONFIG_DEBUG_SG is not set 1649# CONFIG_DEBUG_SG is not set
1650# CONFIG_DEBUG_NOTIFIERS is not set
1608# CONFIG_BOOT_PRINTK_DELAY is not set 1651# CONFIG_BOOT_PRINTK_DELAY is not set
1609# CONFIG_RCU_TORTURE_TEST is not set 1652# CONFIG_RCU_TORTURE_TEST is not set
1610# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1653# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1614,6 +1657,8 @@ CONFIG_DEBUG_INFO=y
1614# CONFIG_LATENCYTOP is not set 1657# CONFIG_LATENCYTOP is not set
1615CONFIG_SYSCTL_SYSCALL_CHECK=y 1658CONFIG_SYSCTL_SYSCALL_CHECK=y
1616CONFIG_HAVE_FUNCTION_TRACER=y 1659CONFIG_HAVE_FUNCTION_TRACER=y
1660CONFIG_HAVE_DYNAMIC_FTRACE=y
1661CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1617 1662
1618# 1663#
1619# Tracers 1664# Tracers
@@ -1622,11 +1667,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1622# CONFIG_SCHED_TRACER is not set 1667# CONFIG_SCHED_TRACER is not set
1623# CONFIG_CONTEXT_SWITCH_TRACER is not set 1668# CONFIG_CONTEXT_SWITCH_TRACER is not set
1624# CONFIG_BOOT_TRACER is not set 1669# CONFIG_BOOT_TRACER is not set
1670# CONFIG_TRACE_BRANCH_PROFILING is not set
1625# CONFIG_STACK_TRACER is not set 1671# CONFIG_STACK_TRACER is not set
1626# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1672# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1627# CONFIG_SAMPLES is not set 1673# CONFIG_SAMPLES is not set
1628CONFIG_HAVE_ARCH_KGDB=y 1674CONFIG_HAVE_ARCH_KGDB=y
1629# CONFIG_KGDB is not set 1675# CONFIG_KGDB is not set
1676CONFIG_PRINT_STACK_DEPTH=64
1630# CONFIG_DEBUG_STACKOVERFLOW is not set 1677# CONFIG_DEBUG_STACKOVERFLOW is not set
1631# CONFIG_DEBUG_STACK_USAGE is not set 1678# CONFIG_DEBUG_STACK_USAGE is not set
1632# CONFIG_DEBUG_PAGEALLOC is not set 1679# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1653,11 +1700,15 @@ CONFIG_CRYPTO=y
1653# 1700#
1654# CONFIG_CRYPTO_FIPS is not set 1701# CONFIG_CRYPTO_FIPS is not set
1655CONFIG_CRYPTO_ALGAPI=y 1702CONFIG_CRYPTO_ALGAPI=y
1656CONFIG_CRYPTO_AEAD=y 1703CONFIG_CRYPTO_ALGAPI2=y
1704CONFIG_CRYPTO_AEAD2=y
1657CONFIG_CRYPTO_BLKCIPHER=y 1705CONFIG_CRYPTO_BLKCIPHER=y
1706CONFIG_CRYPTO_BLKCIPHER2=y
1658CONFIG_CRYPTO_HASH=y 1707CONFIG_CRYPTO_HASH=y
1659CONFIG_CRYPTO_RNG=y 1708CONFIG_CRYPTO_HASH2=y
1709CONFIG_CRYPTO_RNG2=y
1660CONFIG_CRYPTO_MANAGER=y 1710CONFIG_CRYPTO_MANAGER=y
1711CONFIG_CRYPTO_MANAGER2=y
1661# CONFIG_CRYPTO_GF128MUL is not set 1712# CONFIG_CRYPTO_GF128MUL is not set
1662# CONFIG_CRYPTO_NULL is not set 1713# CONFIG_CRYPTO_NULL is not set
1663# CONFIG_CRYPTO_CRYPTD is not set 1714# CONFIG_CRYPTO_CRYPTD is not set
@@ -1691,7 +1742,7 @@ CONFIG_CRYPTO_HMAC=y
1691# 1742#
1692# Digest 1743# Digest
1693# 1744#
1694# CONFIG_CRYPTO_CRC32C is not set 1745CONFIG_CRYPTO_CRC32C=m
1695# CONFIG_CRYPTO_MD4 is not set 1746# CONFIG_CRYPTO_MD4 is not set
1696CONFIG_CRYPTO_MD5=y 1747CONFIG_CRYPTO_MD5=y
1697# CONFIG_CRYPTO_MICHAEL_MIC is not set 1748# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/86xx/sbc8641d_defconfig b/arch/powerpc/configs/86xx/sbc8641d_defconfig
index 37d9f4ed80f5..04797e730c5a 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:40:26 2008 4# Mon Jan 26 15:36:23 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -46,7 +46,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
46CONFIG_PPC=y 46CONFIG_PPC=y
47CONFIG_EARLY_PRINTK=y 47CONFIG_EARLY_PRINTK=y
48CONFIG_GENERIC_NVRAM=y 48CONFIG_GENERIC_NVRAM=y
49CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 49CONFIG_SCHED_OMIT_FRAME_POINTER=y
50CONFIG_ARCH_MAY_HAVE_PC_FDC=y 50CONFIG_ARCH_MAY_HAVE_PC_FDC=y
51CONFIG_PPC_OF=y 51CONFIG_PPC_OF=y
52CONFIG_OF=y 52CONFIG_OF=y
@@ -78,12 +78,12 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
78CONFIG_IKCONFIG=y 78CONFIG_IKCONFIG=y
79CONFIG_IKCONFIG_PROC=y 79CONFIG_IKCONFIG_PROC=y
80CONFIG_LOG_BUF_SHIFT=14 80CONFIG_LOG_BUF_SHIFT=14
81# CONFIG_CGROUPS is not set
82CONFIG_GROUP_SCHED=y 81CONFIG_GROUP_SCHED=y
83CONFIG_FAIR_GROUP_SCHED=y 82CONFIG_FAIR_GROUP_SCHED=y
84# CONFIG_RT_GROUP_SCHED is not set 83# CONFIG_RT_GROUP_SCHED is not set
85CONFIG_USER_SCHED=y 84CONFIG_USER_SCHED=y
86# CONFIG_CGROUP_SCHED is not set 85# CONFIG_CGROUP_SCHED is not set
86# CONFIG_CGROUPS is not set
87CONFIG_SYSFS_DEPRECATED=y 87CONFIG_SYSFS_DEPRECATED=y
88CONFIG_SYSFS_DEPRECATED_V2=y 88CONFIG_SYSFS_DEPRECATED_V2=y
89CONFIG_RELAY=y 89CONFIG_RELAY=y
@@ -117,7 +117,6 @@ CONFIG_SLAB=y
117# CONFIG_SLUB is not set 117# CONFIG_SLUB is not set
118# CONFIG_SLOB is not set 118# CONFIG_SLOB is not set
119# CONFIG_PROFILING is not set 119# CONFIG_PROFILING is not set
120# CONFIG_MARKERS is not set
121CONFIG_HAVE_OPROFILE=y 120CONFIG_HAVE_OPROFILE=y
122# CONFIG_KPROBES is not set 121# CONFIG_KPROBES is not set
123CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 122CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -129,7 +128,6 @@ CONFIG_USE_GENERIC_SMP_HELPERS=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
132# CONFIG_TINY_SHMEM is not set
133CONFIG_BASE_SMALL=0 131CONFIG_BASE_SMALL=0
134CONFIG_MODULES=y 132CONFIG_MODULES=y
135# CONFIG_MODULE_FORCE_LOAD is not set 133# CONFIG_MODULE_FORCE_LOAD is not set
@@ -137,12 +135,10 @@ CONFIG_MODULE_UNLOAD=y
137# CONFIG_MODULE_FORCE_UNLOAD is not set 135# CONFIG_MODULE_FORCE_UNLOAD is not set
138# CONFIG_MODVERSIONS is not set 136# CONFIG_MODVERSIONS is not set
139# CONFIG_MODULE_SRCVERSION_ALL is not set 137# CONFIG_MODULE_SRCVERSION_ALL is not set
140CONFIG_KMOD=y
141CONFIG_STOP_MACHINE=y 138CONFIG_STOP_MACHINE=y
142CONFIG_BLOCK=y 139CONFIG_BLOCK=y
143# CONFIG_LBD is not set 140# CONFIG_LBD is not set
144# CONFIG_BLK_DEV_IO_TRACE is not set 141# CONFIG_BLK_DEV_IO_TRACE is not set
145# CONFIG_LSF is not set
146# CONFIG_BLK_DEV_BSG is not set 142# CONFIG_BLK_DEV_BSG is not set
147# CONFIG_BLK_DEV_INTEGRITY is not set 143# CONFIG_BLK_DEV_INTEGRITY is not set
148 144
@@ -159,6 +155,10 @@ CONFIG_DEFAULT_CFQ=y
159# CONFIG_DEFAULT_NOOP is not set 155# CONFIG_DEFAULT_NOOP is not set
160CONFIG_DEFAULT_IOSCHED="cfq" 156CONFIG_DEFAULT_IOSCHED="cfq"
161CONFIG_CLASSIC_RCU=y 157CONFIG_CLASSIC_RCU=y
158# CONFIG_TREE_RCU is not set
159# CONFIG_PREEMPT_RCU is not set
160# CONFIG_TREE_RCU_TRACE is not set
161# CONFIG_PREEMPT_RCU_TRACE is not set
162# CONFIG_FREEZER is not set 162# CONFIG_FREEZER is not set
163 163
164# 164#
@@ -197,6 +197,7 @@ CONFIG_MPIC=y
197# CONFIG_QUICC_ENGINE is not set 197# CONFIG_QUICC_ENGINE 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# CONFIG_MPC8xxx_GPIO is not set
200# CONFIG_SIMPLE_GPIO is not set
200 201
201# 202#
202# Kernel options 203# Kernel options
@@ -215,7 +216,6 @@ CONFIG_SCHED_HRTICK=y
215# CONFIG_PREEMPT_NONE is not set 216# CONFIG_PREEMPT_NONE is not set
216# CONFIG_PREEMPT_VOLUNTARY is not set 217# CONFIG_PREEMPT_VOLUNTARY is not set
217CONFIG_PREEMPT=y 218CONFIG_PREEMPT=y
218# CONFIG_PREEMPT_RCU is not set
219CONFIG_BINFMT_ELF=y 219CONFIG_BINFMT_ELF=y
220# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 220# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
221# CONFIG_HAVE_AOUT is not set 221# CONFIG_HAVE_AOUT is not set
@@ -225,6 +225,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
225CONFIG_ARCH_HAS_WALK_MEMORY=y 225CONFIG_ARCH_HAS_WALK_MEMORY=y
226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
227# CONFIG_KEXEC is not set 227# CONFIG_KEXEC is not set
228# CONFIG_CRASH_DUMP is not set
228CONFIG_IRQ_ALL_CPUS=y 229CONFIG_IRQ_ALL_CPUS=y
229CONFIG_ARCH_FLATMEM_ENABLE=y 230CONFIG_ARCH_FLATMEM_ENABLE=y
230CONFIG_ARCH_POPULATES_NODE_MAP=y 231CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -237,12 +238,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
237CONFIG_PAGEFLAGS_EXTENDED=y 238CONFIG_PAGEFLAGS_EXTENDED=y
238CONFIG_SPLIT_PTLOCK_CPUS=4 239CONFIG_SPLIT_PTLOCK_CPUS=4
239CONFIG_MIGRATION=y 240CONFIG_MIGRATION=y
240# CONFIG_RESOURCES_64BIT is not set
241# CONFIG_PHYS_ADDR_T_64BIT is not set 241# CONFIG_PHYS_ADDR_T_64BIT is not set
242CONFIG_ZONE_DMA_FLAG=1 242CONFIG_ZONE_DMA_FLAG=1
243CONFIG_BOUNCE=y 243CONFIG_BOUNCE=y
244CONFIG_VIRT_TO_BUS=y 244CONFIG_VIRT_TO_BUS=y
245CONFIG_UNEVICTABLE_LRU=y 245CONFIG_UNEVICTABLE_LRU=y
246CONFIG_PPC_4K_PAGES=y
247# CONFIG_PPC_16K_PAGES is not set
248# CONFIG_PPC_64K_PAGES is not set
246CONFIG_FORCE_MAX_ZONEORDER=11 249CONFIG_FORCE_MAX_ZONEORDER=11
247# CONFIG_PROC_DEVICETREE is not set 250# CONFIG_PROC_DEVICETREE is not set
248# CONFIG_CMDLINE_BOOL is not set 251# CONFIG_CMDLINE_BOOL is not set
@@ -270,6 +273,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
270# CONFIG_PCI_MSI is not set 273# CONFIG_PCI_MSI is not set
271# CONFIG_PCI_LEGACY is not set 274# CONFIG_PCI_LEGACY is not set
272# CONFIG_PCI_DEBUG is not set 275# CONFIG_PCI_DEBUG is not set
276# CONFIG_PCI_STUB is not set
273# CONFIG_PCCARD is not set 277# CONFIG_PCCARD is not set
274# CONFIG_HOTPLUG_PCI is not set 278# CONFIG_HOTPLUG_PCI is not set
275# CONFIG_HAS_RAPIDIO is not set 279# CONFIG_HAS_RAPIDIO is not set
@@ -292,6 +296,7 @@ CONFIG_NET=y
292# 296#
293# Networking options 297# Networking options
294# 298#
299CONFIG_COMPAT_NET_DEV_OPS=y
295CONFIG_PACKET=y 300CONFIG_PACKET=y
296CONFIG_PACKET_MMAP=y 301CONFIG_PACKET_MMAP=y
297CONFIG_UNIX=y 302CONFIG_UNIX=y
@@ -501,6 +506,7 @@ CONFIG_NET_SCH_TBF=m
501CONFIG_NET_SCH_GRED=m 506CONFIG_NET_SCH_GRED=m
502CONFIG_NET_SCH_DSMARK=m 507CONFIG_NET_SCH_DSMARK=m
503CONFIG_NET_SCH_NETEM=m 508CONFIG_NET_SCH_NETEM=m
509# CONFIG_NET_SCH_DRR is not set
504 510
505# 511#
506# Classification 512# Classification
@@ -521,6 +527,7 @@ CONFIG_NET_CLS_RSVP6=m
521# CONFIG_NET_CLS_ACT is not set 527# CONFIG_NET_CLS_ACT is not set
522# CONFIG_NET_CLS_IND is not set 528# CONFIG_NET_CLS_IND is not set
523CONFIG_NET_SCH_FIFO=y 529CONFIG_NET_SCH_FIFO=y
530# CONFIG_DCB is not set
524 531
525# 532#
526# Network testing 533# Network testing
@@ -537,8 +544,9 @@ CONFIG_WIRELESS=y
537# CONFIG_CFG80211 is not set 544# CONFIG_CFG80211 is not set
538CONFIG_WIRELESS_OLD_REGULATORY=y 545CONFIG_WIRELESS_OLD_REGULATORY=y
539# CONFIG_WIRELESS_EXT is not set 546# CONFIG_WIRELESS_EXT is not set
547# CONFIG_LIB80211 is not set
540# CONFIG_MAC80211 is not set 548# CONFIG_MAC80211 is not set
541# CONFIG_IEEE80211 is not set 549# CONFIG_WIMAX is not set
542# CONFIG_RFKILL is not set 550# CONFIG_RFKILL is not set
543# CONFIG_NET_9P is not set 551# CONFIG_NET_9P is not set
544 552
@@ -561,6 +569,7 @@ CONFIG_MTD=y
561# CONFIG_MTD_DEBUG is not set 569# CONFIG_MTD_DEBUG is not set
562CONFIG_MTD_CONCAT=y 570CONFIG_MTD_CONCAT=y
563CONFIG_MTD_PARTITIONS=y 571CONFIG_MTD_PARTITIONS=y
572# CONFIG_MTD_TESTS is not set
564# CONFIG_MTD_REDBOOT_PARTS is not set 573# CONFIG_MTD_REDBOOT_PARTS is not set
565# CONFIG_MTD_CMDLINE_PARTS is not set 574# CONFIG_MTD_CMDLINE_PARTS is not set
566# CONFIG_MTD_OF_PARTS is not set 575# CONFIG_MTD_OF_PARTS is not set
@@ -637,6 +646,12 @@ CONFIG_MTD_PHYSMAP_OF=y
637# CONFIG_MTD_ONENAND is not set 646# CONFIG_MTD_ONENAND is not set
638 647
639# 648#
649# LPDDR flash memory drivers
650#
651# CONFIG_MTD_LPDDR is not set
652# CONFIG_MTD_QINFO_PROBE is not set
653
654#
640# UBI - Unsorted block images 655# UBI - Unsorted block images
641# 656#
642# CONFIG_MTD_UBI is not set 657# CONFIG_MTD_UBI is not set
@@ -666,8 +681,10 @@ CONFIG_MISC_DEVICES=y
666# CONFIG_EEPROM_93CX6 is not set 681# CONFIG_EEPROM_93CX6 is not set
667# CONFIG_SGI_IOC4 is not set 682# CONFIG_SGI_IOC4 is not set
668# CONFIG_TIFM_CORE is not set 683# CONFIG_TIFM_CORE is not set
684# CONFIG_ICS932S401 is not set
669# CONFIG_ENCLOSURE_SERVICES is not set 685# CONFIG_ENCLOSURE_SERVICES is not set
670# CONFIG_HP_ILO is not set 686# CONFIG_HP_ILO is not set
687# CONFIG_C2PORT is not set
671CONFIG_HAVE_IDE=y 688CONFIG_HAVE_IDE=y
672# CONFIG_IDE is not set 689# CONFIG_IDE is not set
673 690
@@ -734,6 +751,9 @@ CONFIG_PHYLIB=y
734CONFIG_BROADCOM_PHY=y 751CONFIG_BROADCOM_PHY=y
735# CONFIG_ICPLUS_PHY is not set 752# CONFIG_ICPLUS_PHY is not set
736# CONFIG_REALTEK_PHY is not set 753# CONFIG_REALTEK_PHY is not set
754# CONFIG_NATIONAL_PHY is not set
755# CONFIG_STE10XP is not set
756# CONFIG_LSI_ET1011C_PHY is not set
737# CONFIG_FIXED_PHY is not set 757# CONFIG_FIXED_PHY is not set
738# CONFIG_MDIO_BITBANG is not set 758# CONFIG_MDIO_BITBANG is not set
739CONFIG_NET_ETHERNET=y 759CONFIG_NET_ETHERNET=y
@@ -786,6 +806,10 @@ CONFIG_GIANFAR=y
786# CONFIG_WLAN_PRE80211 is not set 806# CONFIG_WLAN_PRE80211 is not set
787# CONFIG_WLAN_80211 is not set 807# CONFIG_WLAN_80211 is not set
788# CONFIG_IWLWIFI_LEDS is not set 808# CONFIG_IWLWIFI_LEDS is not set
809
810#
811# Enable WiMAX (Networking options) to see the WiMAX drivers
812#
789# CONFIG_WAN is not set 813# CONFIG_WAN is not set
790CONFIG_ATM_DRIVERS=y 814CONFIG_ATM_DRIVERS=y
791# CONFIG_ATM_DUMMY is not set 815# CONFIG_ATM_DUMMY is not set
@@ -801,6 +825,7 @@ CONFIG_ATM_DRIVERS=y
801# CONFIG_ATM_IA is not set 825# CONFIG_ATM_IA is not set
802# CONFIG_ATM_FORE200E is not set 826# CONFIG_ATM_FORE200E is not set
803# CONFIG_ATM_HE is not set 827# CONFIG_ATM_HE is not set
828# CONFIG_ATM_SOLOS is not set
804# CONFIG_FDDI is not set 829# CONFIG_FDDI is not set
805# CONFIG_HIPPI is not set 830# CONFIG_HIPPI is not set
806CONFIG_PPP=m 831CONFIG_PPP=m
@@ -892,8 +917,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
892# CONFIG_SERIAL_JSM is not set 917# CONFIG_SERIAL_JSM is not set
893# CONFIG_SERIAL_OF_PLATFORM is not set 918# CONFIG_SERIAL_OF_PLATFORM is not set
894CONFIG_UNIX98_PTYS=y 919CONFIG_UNIX98_PTYS=y
920# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
895CONFIG_LEGACY_PTYS=y 921CONFIG_LEGACY_PTYS=y
896CONFIG_LEGACY_PTY_COUNT=256 922CONFIG_LEGACY_PTY_COUNT=256
923# CONFIG_HVC_UDBG is not set
897# CONFIG_IPMI_HANDLER is not set 924# CONFIG_IPMI_HANDLER is not set
898CONFIG_HW_RANDOM=m 925CONFIG_HW_RANDOM=m
899# CONFIG_NVRAM is not set 926# CONFIG_NVRAM is not set
@@ -985,8 +1012,10 @@ CONFIG_HWMON=y
985# CONFIG_SENSORS_ADM1029 is not set 1012# CONFIG_SENSORS_ADM1029 is not set
986# CONFIG_SENSORS_ADM1031 is not set 1013# CONFIG_SENSORS_ADM1031 is not set
987# CONFIG_SENSORS_ADM9240 is not set 1014# CONFIG_SENSORS_ADM9240 is not set
1015# CONFIG_SENSORS_ADT7462 is not set
988# CONFIG_SENSORS_ADT7470 is not set 1016# CONFIG_SENSORS_ADT7470 is not set
989# CONFIG_SENSORS_ADT7473 is not set 1017# CONFIG_SENSORS_ADT7473 is not set
1018# CONFIG_SENSORS_ADT7475 is not set
990# CONFIG_SENSORS_ATXP1 is not set 1019# CONFIG_SENSORS_ATXP1 is not set
991# CONFIG_SENSORS_DS1621 is not set 1020# CONFIG_SENSORS_DS1621 is not set
992# CONFIG_SENSORS_I5K_AMB is not set 1021# CONFIG_SENSORS_I5K_AMB is not set
@@ -1007,6 +1036,7 @@ CONFIG_HWMON=y
1007# CONFIG_SENSORS_LM90 is not set 1036# CONFIG_SENSORS_LM90 is not set
1008# CONFIG_SENSORS_LM92 is not set 1037# CONFIG_SENSORS_LM92 is not set
1009# CONFIG_SENSORS_LM93 is not set 1038# CONFIG_SENSORS_LM93 is not set
1039# CONFIG_SENSORS_LTC4245 is not set
1010# CONFIG_SENSORS_MAX1619 is not set 1040# CONFIG_SENSORS_MAX1619 is not set
1011# CONFIG_SENSORS_MAX6650 is not set 1041# CONFIG_SENSORS_MAX6650 is not set
1012# CONFIG_SENSORS_PC87360 is not set 1042# CONFIG_SENSORS_PC87360 is not set
@@ -1047,11 +1077,11 @@ CONFIG_SOFT_WATCHDOG=m
1047# 1077#
1048# CONFIG_PCIPCWATCHDOG is not set 1078# CONFIG_PCIPCWATCHDOG is not set
1049# CONFIG_WDTPCI is not set 1079# CONFIG_WDTPCI is not set
1080CONFIG_SSB_POSSIBLE=y
1050 1081
1051# 1082#
1052# Sonics Silicon Backplane 1083# Sonics Silicon Backplane
1053# 1084#
1054CONFIG_SSB_POSSIBLE=y
1055# CONFIG_SSB is not set 1085# CONFIG_SSB is not set
1056 1086
1057# 1087#
@@ -1060,18 +1090,13 @@ CONFIG_SSB_POSSIBLE=y
1060# CONFIG_MFD_CORE is not set 1090# CONFIG_MFD_CORE is not set
1061# CONFIG_MFD_SM501 is not set 1091# CONFIG_MFD_SM501 is not set
1062# CONFIG_HTC_PASIC3 is not set 1092# CONFIG_HTC_PASIC3 is not set
1093# CONFIG_TWL4030_CORE is not set
1063# CONFIG_MFD_TMIO is not set 1094# CONFIG_MFD_TMIO is not set
1064# CONFIG_PMIC_DA903X is not set 1095# CONFIG_PMIC_DA903X is not set
1065# CONFIG_MFD_WM8400 is not set 1096# CONFIG_MFD_WM8400 is not set
1066# CONFIG_MFD_WM8350_I2C is not set 1097# CONFIG_MFD_WM8350_I2C is not set
1067 1098# CONFIG_MFD_PCF50633 is not set
1068#
1069# Voltage and Current regulators
1070#
1071# CONFIG_REGULATOR is not set 1099# 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
1075 1100
1076# 1101#
1077# Multimedia devices 1102# Multimedia devices
@@ -1134,9 +1159,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1134# 1159#
1135 1160
1136# 1161#
1137# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1162# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1138# 1163#
1139# CONFIG_USB_GADGET is not set 1164# CONFIG_USB_GADGET is not set
1165
1166#
1167# OTG and related infrastructure
1168#
1140# CONFIG_UWB is not set 1169# CONFIG_UWB is not set
1141# CONFIG_MMC is not set 1170# CONFIG_MMC is not set
1142# CONFIG_MEMSTICK is not set 1171# CONFIG_MEMSTICK is not set
@@ -1182,11 +1211,18 @@ CONFIG_OCFS2_FS_O2CB=m
1182CONFIG_OCFS2_FS_STATS=y 1211CONFIG_OCFS2_FS_STATS=y
1183CONFIG_OCFS2_DEBUG_MASKLOG=y 1212CONFIG_OCFS2_DEBUG_MASKLOG=y
1184# CONFIG_OCFS2_DEBUG_FS is not set 1213# CONFIG_OCFS2_DEBUG_FS is not set
1185# CONFIG_OCFS2_COMPAT_JBD is not set 1214# CONFIG_OCFS2_FS_POSIX_ACL is not set
1215# CONFIG_BTRFS_FS is not set
1186CONFIG_DNOTIFY=y 1216CONFIG_DNOTIFY=y
1187CONFIG_INOTIFY=y 1217CONFIG_INOTIFY=y
1188CONFIG_INOTIFY_USER=y 1218CONFIG_INOTIFY_USER=y
1189# CONFIG_QUOTA is not set 1219CONFIG_QUOTA=y
1220# CONFIG_QUOTA_NETLINK_INTERFACE is not set
1221CONFIG_PRINT_QUOTA_WARNING=y
1222CONFIG_QUOTA_TREE=m
1223# CONFIG_QFMT_V1 is not set
1224# CONFIG_QFMT_V2 is not set
1225CONFIG_QUOTACTL=y
1190CONFIG_AUTOFS_FS=m 1226CONFIG_AUTOFS_FS=m
1191CONFIG_AUTOFS4_FS=m 1227CONFIG_AUTOFS4_FS=m
1192# CONFIG_FUSE_FS is not set 1228# CONFIG_FUSE_FS is not set
@@ -1216,10 +1252,7 @@ CONFIG_TMPFS=y
1216# CONFIG_TMPFS_POSIX_ACL is not set 1252# CONFIG_TMPFS_POSIX_ACL is not set
1217# CONFIG_HUGETLB_PAGE is not set 1253# CONFIG_HUGETLB_PAGE is not set
1218CONFIG_CONFIGFS_FS=m 1254CONFIG_CONFIGFS_FS=m
1219 1255CONFIG_MISC_FILESYSTEMS=y
1220#
1221# Miscellaneous filesystems
1222#
1223# CONFIG_ADFS_FS is not set 1256# CONFIG_ADFS_FS is not set
1224# CONFIG_AFFS_FS is not set 1257# CONFIG_AFFS_FS is not set
1225# CONFIG_HFS_FS is not set 1258# CONFIG_HFS_FS is not set
@@ -1229,6 +1262,7 @@ CONFIG_CONFIGFS_FS=m
1229# CONFIG_EFS_FS is not set 1262# CONFIG_EFS_FS is not set
1230# CONFIG_JFFS2_FS is not set 1263# CONFIG_JFFS2_FS is not set
1231# CONFIG_CRAMFS is not set 1264# CONFIG_CRAMFS is not set
1265# CONFIG_SQUASHFS is not set
1232# CONFIG_VXFS_FS is not set 1266# CONFIG_VXFS_FS is not set
1233CONFIG_MINIX_FS=m 1267CONFIG_MINIX_FS=m
1234# CONFIG_OMFS_FS is not set 1268# CONFIG_OMFS_FS is not set
@@ -1317,6 +1351,7 @@ CONFIG_NLS_UTF8=m
1317# Library routines 1351# Library routines
1318# 1352#
1319CONFIG_BITREVERSE=y 1353CONFIG_BITREVERSE=y
1354CONFIG_GENERIC_FIND_LAST_BIT=y
1320CONFIG_CRC_CCITT=m 1355CONFIG_CRC_CCITT=m
1321# CONFIG_CRC16 is not set 1356# CONFIG_CRC16 is not set
1322# CONFIG_CRC_T10DIF is not set 1357# CONFIG_CRC_T10DIF is not set
@@ -1367,6 +1402,7 @@ CONFIG_DEBUG_INFO=y
1367# CONFIG_DEBUG_MEMORY_INIT is not set 1402# CONFIG_DEBUG_MEMORY_INIT is not set
1368# CONFIG_DEBUG_LIST is not set 1403# CONFIG_DEBUG_LIST is not set
1369# CONFIG_DEBUG_SG is not set 1404# CONFIG_DEBUG_SG is not set
1405# CONFIG_DEBUG_NOTIFIERS is not set
1370# CONFIG_BOOT_PRINTK_DELAY is not set 1406# CONFIG_BOOT_PRINTK_DELAY is not set
1371# CONFIG_RCU_TORTURE_TEST is not set 1407# CONFIG_RCU_TORTURE_TEST is not set
1372# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1408# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1376,6 +1412,8 @@ CONFIG_DEBUG_INFO=y
1376# CONFIG_LATENCYTOP is not set 1412# CONFIG_LATENCYTOP is not set
1377CONFIG_SYSCTL_SYSCALL_CHECK=y 1413CONFIG_SYSCTL_SYSCALL_CHECK=y
1378CONFIG_HAVE_FUNCTION_TRACER=y 1414CONFIG_HAVE_FUNCTION_TRACER=y
1415CONFIG_HAVE_DYNAMIC_FTRACE=y
1416CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1379 1417
1380# 1418#
1381# Tracers 1419# Tracers
@@ -1385,11 +1423,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1385# CONFIG_SCHED_TRACER is not set 1423# CONFIG_SCHED_TRACER is not set
1386# CONFIG_CONTEXT_SWITCH_TRACER is not set 1424# CONFIG_CONTEXT_SWITCH_TRACER is not set
1387# CONFIG_BOOT_TRACER is not set 1425# CONFIG_BOOT_TRACER is not set
1426# CONFIG_TRACE_BRANCH_PROFILING is not set
1388# CONFIG_STACK_TRACER is not set 1427# CONFIG_STACK_TRACER is not set
1389# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1428# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1390# CONFIG_SAMPLES is not set 1429# CONFIG_SAMPLES is not set
1391CONFIG_HAVE_ARCH_KGDB=y 1430CONFIG_HAVE_ARCH_KGDB=y
1392# CONFIG_KGDB is not set 1431# CONFIG_KGDB is not set
1432CONFIG_PRINT_STACK_DEPTH=64
1393# CONFIG_DEBUG_STACKOVERFLOW is not set 1433# CONFIG_DEBUG_STACKOVERFLOW is not set
1394# CONFIG_DEBUG_STACK_USAGE is not set 1434# CONFIG_DEBUG_STACK_USAGE is not set
1395# CONFIG_DEBUG_PAGEALLOC is not set 1435# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1411,6 +1451,7 @@ CONFIG_SECURITY=y
1411# CONFIG_SECURITYFS is not set 1451# CONFIG_SECURITYFS is not set
1412CONFIG_SECURITY_NETWORK=y 1452CONFIG_SECURITY_NETWORK=y
1413# CONFIG_SECURITY_NETWORK_XFRM is not set 1453# CONFIG_SECURITY_NETWORK_XFRM is not set
1454# CONFIG_SECURITY_PATH is not set
1414# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1455# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1415CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 1456CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
1416CONFIG_CRYPTO=y 1457CONFIG_CRYPTO=y
@@ -1420,11 +1461,16 @@ CONFIG_CRYPTO=y
1420# 1461#
1421# CONFIG_CRYPTO_FIPS is not set 1462# CONFIG_CRYPTO_FIPS is not set
1422CONFIG_CRYPTO_ALGAPI=y 1463CONFIG_CRYPTO_ALGAPI=y
1423CONFIG_CRYPTO_AEAD=y 1464CONFIG_CRYPTO_ALGAPI2=y
1465CONFIG_CRYPTO_AEAD=m
1466CONFIG_CRYPTO_AEAD2=y
1424CONFIG_CRYPTO_BLKCIPHER=y 1467CONFIG_CRYPTO_BLKCIPHER=y
1468CONFIG_CRYPTO_BLKCIPHER2=y
1425CONFIG_CRYPTO_HASH=y 1469CONFIG_CRYPTO_HASH=y
1426CONFIG_CRYPTO_RNG=y 1470CONFIG_CRYPTO_HASH2=y
1471CONFIG_CRYPTO_RNG2=y
1427CONFIG_CRYPTO_MANAGER=y 1472CONFIG_CRYPTO_MANAGER=y
1473CONFIG_CRYPTO_MANAGER2=y
1428# CONFIG_CRYPTO_GF128MUL is not set 1474# CONFIG_CRYPTO_GF128MUL is not set
1429CONFIG_CRYPTO_NULL=m 1475CONFIG_CRYPTO_NULL=m
1430# CONFIG_CRYPTO_CRYPTD is not set 1476# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig
index 024f279af90a..aaab5cc3751c 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:32 2008 4# Mon Jan 26 15:35:24 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_PPC_8xx=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_8xx=y 17CONFIG_8xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -71,12 +72,12 @@ CONFIG_SYSVIPC_SYSCTL=y
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75CONFIG_GROUP_SCHED=y 75CONFIG_GROUP_SCHED=y
76CONFIG_FAIR_GROUP_SCHED=y 76CONFIG_FAIR_GROUP_SCHED=y
77# CONFIG_RT_GROUP_SCHED is not set 77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y 78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set 79# CONFIG_CGROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -109,7 +110,6 @@ CONFIG_SLUB_DEBUG=y
109CONFIG_SLUB=y 110CONFIG_SLUB=y
110# CONFIG_SLOB is not set 111# CONFIG_SLOB is not set
111# CONFIG_PROFILING is not set 112# CONFIG_PROFILING is not set
112# CONFIG_MARKERS is not set
113CONFIG_HAVE_OPROFILE=y 113CONFIG_HAVE_OPROFILE=y
114CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 114CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
115CONFIG_HAVE_IOREMAP_PROT=y 115CONFIG_HAVE_IOREMAP_PROT=y
@@ -119,13 +119,11 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
119CONFIG_HAVE_CLK=y 119CONFIG_HAVE_CLK=y
120# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 120# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
121CONFIG_SLABINFO=y 121CONFIG_SLABINFO=y
122# CONFIG_TINY_SHMEM is not set
123CONFIG_BASE_SMALL=1 122CONFIG_BASE_SMALL=1
124# CONFIG_MODULES is not set 123# CONFIG_MODULES is not set
125CONFIG_BLOCK=y 124CONFIG_BLOCK=y
126# CONFIG_LBD is not set 125# CONFIG_LBD is not set
127# CONFIG_BLK_DEV_IO_TRACE is not set 126# CONFIG_BLK_DEV_IO_TRACE is not set
128# CONFIG_LSF is not set
129# CONFIG_BLK_DEV_BSG is not set 127# CONFIG_BLK_DEV_BSG is not set
130# CONFIG_BLK_DEV_INTEGRITY is not set 128# CONFIG_BLK_DEV_INTEGRITY is not set
131 129
@@ -142,6 +140,10 @@ CONFIG_DEFAULT_DEADLINE=y
142# CONFIG_DEFAULT_NOOP is not set 140# CONFIG_DEFAULT_NOOP is not set
143CONFIG_DEFAULT_IOSCHED="deadline" 141CONFIG_DEFAULT_IOSCHED="deadline"
144CONFIG_CLASSIC_RCU=y 142CONFIG_CLASSIC_RCU=y
143# CONFIG_TREE_RCU is not set
144# CONFIG_PREEMPT_RCU is not set
145# CONFIG_TREE_RCU_TRACE is not set
146# CONFIG_PREEMPT_RCU_TRACE is not set
145# CONFIG_FREEZER is not set 147# CONFIG_FREEZER is not set
146 148
147# 149#
@@ -187,6 +189,7 @@ CONFIG_NO_UCODE_PATCH=y
187# CONFIG_QUICC_ENGINE is not set 189# CONFIG_QUICC_ENGINE is not set
188# CONFIG_FSL_ULI1575 is not set 190# CONFIG_FSL_ULI1575 is not set
189CONFIG_CPM=y 191CONFIG_CPM=y
192# CONFIG_SIMPLE_GPIO is not set
190 193
191# 194#
192# Kernel options 195# Kernel options
@@ -205,12 +208,12 @@ CONFIG_PREEMPT_NONE=y
205# CONFIG_PREEMPT_VOLUNTARY is not set 208# CONFIG_PREEMPT_VOLUNTARY is not set
206# CONFIG_PREEMPT is not set 209# CONFIG_PREEMPT is not set
207CONFIG_BINFMT_ELF=y 210CONFIG_BINFMT_ELF=y
208# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
209# CONFIG_HAVE_AOUT is not set 211# CONFIG_HAVE_AOUT is not set
210# CONFIG_BINFMT_MISC is not set 212# CONFIG_BINFMT_MISC is not set
211# CONFIG_MATH_EMULATION is not set 213# CONFIG_MATH_EMULATION is not set
212# CONFIG_8XX_MINIMAL_FPEMU is not set 214# CONFIG_8XX_MINIMAL_FPEMU is not set
213# CONFIG_IOMMU_HELPER is not set 215# CONFIG_IOMMU_HELPER is not set
216CONFIG_PPC_NEED_DMA_SYNC_OPS=y
214CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 217CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
215CONFIG_ARCH_HAS_WALK_MEMORY=y 218CONFIG_ARCH_HAS_WALK_MEMORY=y
216CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 219CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -225,12 +228,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
225CONFIG_PAGEFLAGS_EXTENDED=y 228CONFIG_PAGEFLAGS_EXTENDED=y
226CONFIG_SPLIT_PTLOCK_CPUS=4 229CONFIG_SPLIT_PTLOCK_CPUS=4
227CONFIG_MIGRATION=y 230CONFIG_MIGRATION=y
228# CONFIG_RESOURCES_64BIT is not set
229# CONFIG_PHYS_ADDR_T_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
233CONFIG_UNEVICTABLE_LRU=y 235CONFIG_UNEVICTABLE_LRU=y
236CONFIG_PPC_4K_PAGES=y
237# CONFIG_PPC_16K_PAGES is not set
238# CONFIG_PPC_64K_PAGES is not set
234CONFIG_FORCE_MAX_ZONEORDER=11 239CONFIG_FORCE_MAX_ZONEORDER=11
235# CONFIG_PROC_DEVICETREE is not set 240# CONFIG_PROC_DEVICETREE is not set
236# CONFIG_CMDLINE_BOOL is not set 241# CONFIG_CMDLINE_BOOL is not set
@@ -272,6 +277,7 @@ CONFIG_NET=y
272# 277#
273# Networking options 278# Networking options
274# 279#
280CONFIG_COMPAT_NET_DEV_OPS=y
275CONFIG_PACKET=y 281CONFIG_PACKET=y
276# CONFIG_PACKET_MMAP is not set 282# CONFIG_PACKET_MMAP is not set
277CONFIG_UNIX=y 283CONFIG_UNIX=y
@@ -323,6 +329,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
323# CONFIG_ECONET is not set 329# CONFIG_ECONET is not set
324# CONFIG_WAN_ROUTER is not set 330# CONFIG_WAN_ROUTER is not set
325# CONFIG_NET_SCHED is not set 331# CONFIG_NET_SCHED is not set
332# CONFIG_DCB is not set
326 333
327# 334#
328# Network testing 335# Network testing
@@ -338,8 +345,9 @@ CONFIG_WIRELESS=y
338# CONFIG_CFG80211 is not set 345# CONFIG_CFG80211 is not set
339CONFIG_WIRELESS_OLD_REGULATORY=y 346CONFIG_WIRELESS_OLD_REGULATORY=y
340# CONFIG_WIRELESS_EXT is not set 347# CONFIG_WIRELESS_EXT is not set
348# CONFIG_LIB80211 is not set
341# CONFIG_MAC80211 is not set 349# CONFIG_MAC80211 is not set
342# CONFIG_IEEE80211 is not set 350# CONFIG_WIMAX is not set
343# CONFIG_RFKILL is not set 351# CONFIG_RFKILL is not set
344# CONFIG_NET_9P is not set 352# CONFIG_NET_9P is not set
345 353
@@ -428,6 +436,12 @@ CONFIG_MTD_PHYSMAP_OF=y
428# CONFIG_MTD_ONENAND is not set 436# CONFIG_MTD_ONENAND is not set
429 437
430# 438#
439# LPDDR flash memory drivers
440#
441# CONFIG_MTD_LPDDR is not set
442# CONFIG_MTD_QINFO_PROBE is not set
443
444#
431# UBI - Unsorted block images 445# UBI - Unsorted block images
432# 446#
433# CONFIG_MTD_UBI is not set 447# CONFIG_MTD_UBI is not set
@@ -470,6 +484,9 @@ CONFIG_DAVICOM_PHY=y
470# CONFIG_BROADCOM_PHY is not set 484# CONFIG_BROADCOM_PHY is not set
471# CONFIG_ICPLUS_PHY is not set 485# CONFIG_ICPLUS_PHY is not set
472# CONFIG_REALTEK_PHY is not set 486# CONFIG_REALTEK_PHY is not set
487# CONFIG_NATIONAL_PHY is not set
488# CONFIG_STE10XP is not set
489# CONFIG_LSI_ET1011C_PHY is not set
473# CONFIG_FIXED_PHY is not set 490# CONFIG_FIXED_PHY is not set
474# CONFIG_MDIO_BITBANG is not set 491# CONFIG_MDIO_BITBANG is not set
475CONFIG_NET_ETHERNET=y 492CONFIG_NET_ETHERNET=y
@@ -495,6 +512,10 @@ CONFIG_FS_ENET_MDIO_FEC=y
495# CONFIG_WLAN_PRE80211 is not set 512# CONFIG_WLAN_PRE80211 is not set
496# CONFIG_WLAN_80211 is not set 513# CONFIG_WLAN_80211 is not set
497# CONFIG_IWLWIFI_LEDS is not set 514# CONFIG_IWLWIFI_LEDS is not set
515
516#
517# Enable WiMAX (Networking options) to see the WiMAX drivers
518#
498# CONFIG_WAN is not set 519# CONFIG_WAN is not set
499# CONFIG_PPP is not set 520# CONFIG_PPP is not set
500# CONFIG_SLIP is not set 521# CONFIG_SLIP is not set
@@ -580,7 +601,9 @@ CONFIG_SERIAL_CORE_CONSOLE=y
580CONFIG_SERIAL_CPM=y 601CONFIG_SERIAL_CPM=y
581CONFIG_SERIAL_CPM_CONSOLE=y 602CONFIG_SERIAL_CPM_CONSOLE=y
582CONFIG_UNIX98_PTYS=y 603CONFIG_UNIX98_PTYS=y
604# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
583# CONFIG_LEGACY_PTYS is not set 605# CONFIG_LEGACY_PTYS is not set
606# CONFIG_HVC_UDBG is not set
584# CONFIG_IPMI_HANDLER is not set 607# CONFIG_IPMI_HANDLER is not set
585CONFIG_HW_RANDOM=y 608CONFIG_HW_RANDOM=y
586# CONFIG_NVRAM is not set 609# CONFIG_NVRAM is not set
@@ -598,11 +621,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
598# CONFIG_HWMON is not set 621# CONFIG_HWMON is not set
599CONFIG_THERMAL=y 622CONFIG_THERMAL=y
600# CONFIG_WATCHDOG is not set 623# CONFIG_WATCHDOG is not set
624CONFIG_SSB_POSSIBLE=y
601 625
602# 626#
603# Sonics Silicon Backplane 627# Sonics Silicon Backplane
604# 628#
605CONFIG_SSB_POSSIBLE=y
606# CONFIG_SSB is not set 629# CONFIG_SSB is not set
607 630
608# 631#
@@ -612,14 +635,7 @@ CONFIG_SSB_POSSIBLE=y
612# CONFIG_MFD_SM501 is not set 635# CONFIG_MFD_SM501 is not set
613# CONFIG_HTC_PASIC3 is not set 636# CONFIG_HTC_PASIC3 is not set
614# CONFIG_MFD_TMIO is not set 637# CONFIG_MFD_TMIO is not set
615
616#
617# Voltage and Current regulators
618#
619# CONFIG_REGULATOR is not set 638# 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 639
624# 640#
625# Multimedia devices 641# Multimedia devices
@@ -674,6 +690,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
674CONFIG_FILE_LOCKING=y 690CONFIG_FILE_LOCKING=y
675# CONFIG_XFS_FS is not set 691# CONFIG_XFS_FS is not set
676# CONFIG_OCFS2_FS is not set 692# CONFIG_OCFS2_FS is not set
693# CONFIG_BTRFS_FS is not set
677# CONFIG_DNOTIFY is not set 694# CONFIG_DNOTIFY is not set
678# CONFIG_INOTIFY is not set 695# CONFIG_INOTIFY is not set
679# CONFIG_QUOTA is not set 696# CONFIG_QUOTA is not set
@@ -706,10 +723,7 @@ CONFIG_TMPFS=y
706# CONFIG_TMPFS_POSIX_ACL is not set 723# CONFIG_TMPFS_POSIX_ACL is not set
707# CONFIG_HUGETLB_PAGE is not set 724# CONFIG_HUGETLB_PAGE is not set
708# CONFIG_CONFIGFS_FS is not set 725# CONFIG_CONFIGFS_FS is not set
709 726CONFIG_MISC_FILESYSTEMS=y
710#
711# Miscellaneous filesystems
712#
713# CONFIG_ADFS_FS is not set 727# CONFIG_ADFS_FS is not set
714# CONFIG_AFFS_FS is not set 728# CONFIG_AFFS_FS is not set
715# CONFIG_HFS_FS is not set 729# CONFIG_HFS_FS is not set
@@ -719,6 +733,7 @@ CONFIG_TMPFS=y
719# CONFIG_EFS_FS is not set 733# CONFIG_EFS_FS is not set
720# CONFIG_JFFS2_FS is not set 734# CONFIG_JFFS2_FS is not set
721CONFIG_CRAMFS=y 735CONFIG_CRAMFS=y
736# CONFIG_SQUASHFS is not set
722# CONFIG_VXFS_FS is not set 737# CONFIG_VXFS_FS is not set
723# CONFIG_MINIX_FS is not set 738# CONFIG_MINIX_FS is not set
724# CONFIG_OMFS_FS is not set 739# CONFIG_OMFS_FS is not set
@@ -774,6 +789,7 @@ CONFIG_MSDOS_PARTITION=y
774# 789#
775# Library routines 790# Library routines
776# 791#
792CONFIG_GENERIC_FIND_LAST_BIT=y
777# CONFIG_CRC_CCITT is not set 793# CONFIG_CRC_CCITT is not set
778# CONFIG_CRC16 is not set 794# CONFIG_CRC16 is not set
779# CONFIG_CRC_T10DIF is not set 795# CONFIG_CRC_T10DIF is not set
@@ -821,6 +837,7 @@ CONFIG_DEBUG_INFO=y
821# CONFIG_DEBUG_MEMORY_INIT is not set 837# CONFIG_DEBUG_MEMORY_INIT is not set
822# CONFIG_DEBUG_LIST is not set 838# CONFIG_DEBUG_LIST is not set
823# CONFIG_DEBUG_SG is not set 839# CONFIG_DEBUG_SG is not set
840# CONFIG_DEBUG_NOTIFIERS is not set
824# CONFIG_BOOT_PRINTK_DELAY is not set 841# CONFIG_BOOT_PRINTK_DELAY is not set
825# CONFIG_RCU_TORTURE_TEST is not set 842# CONFIG_RCU_TORTURE_TEST is not set
826# CONFIG_RCU_CPU_STALL_DETECTOR is not set 843# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -829,6 +846,8 @@ CONFIG_DEBUG_INFO=y
829# CONFIG_FAULT_INJECTION is not set 846# CONFIG_FAULT_INJECTION is not set
830# CONFIG_LATENCYTOP is not set 847# CONFIG_LATENCYTOP is not set
831CONFIG_HAVE_FUNCTION_TRACER=y 848CONFIG_HAVE_FUNCTION_TRACER=y
849CONFIG_HAVE_DYNAMIC_FTRACE=y
850CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
832 851
833# 852#
834# Tracers 853# Tracers
@@ -837,11 +856,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
837# CONFIG_SCHED_TRACER is not set 856# CONFIG_SCHED_TRACER is not set
838# CONFIG_CONTEXT_SWITCH_TRACER is not set 857# CONFIG_CONTEXT_SWITCH_TRACER is not set
839# CONFIG_BOOT_TRACER is not set 858# CONFIG_BOOT_TRACER is not set
859# CONFIG_TRACE_BRANCH_PROFILING is not set
840# CONFIG_STACK_TRACER is not set 860# CONFIG_STACK_TRACER is not set
841# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 861# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
842# CONFIG_SAMPLES is not set 862# CONFIG_SAMPLES is not set
843CONFIG_HAVE_ARCH_KGDB=y 863CONFIG_HAVE_ARCH_KGDB=y
844# CONFIG_KGDB is not set 864# CONFIG_KGDB is not set
865CONFIG_PRINT_STACK_DEPTH=64
845# CONFIG_DEBUG_STACKOVERFLOW is not set 866# CONFIG_DEBUG_STACKOVERFLOW is not set
846# CONFIG_DEBUG_STACK_USAGE is not set 867# CONFIG_DEBUG_STACK_USAGE is not set
847# CONFIG_DEBUG_PAGEALLOC is not set 868# CONFIG_DEBUG_PAGEALLOC is not set
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig
index 74c6feabdd77..5103319a7f56 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:34 2008 4# Mon Jan 26 15:35:26 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -45,7 +45,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
45CONFIG_PPC=y 45CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
51CONFIG_OF=y 51CONFIG_OF=y
@@ -78,12 +78,12 @@ CONFIG_AUDITSYSCALL=y
78CONFIG_AUDIT_TREE=y 78CONFIG_AUDIT_TREE=y
79# CONFIG_IKCONFIG is not set 79# CONFIG_IKCONFIG is not set
80CONFIG_LOG_BUF_SHIFT=17 80CONFIG_LOG_BUF_SHIFT=17
81# CONFIG_CGROUPS is not set
82CONFIG_GROUP_SCHED=y 81CONFIG_GROUP_SCHED=y
83CONFIG_FAIR_GROUP_SCHED=y 82CONFIG_FAIR_GROUP_SCHED=y
84# CONFIG_RT_GROUP_SCHED is not set 83# CONFIG_RT_GROUP_SCHED is not set
85CONFIG_USER_SCHED=y 84CONFIG_USER_SCHED=y
86# CONFIG_CGROUP_SCHED is not set 85# CONFIG_CGROUP_SCHED is not set
86# CONFIG_CGROUPS is not set
87CONFIG_SYSFS_DEPRECATED=y 87CONFIG_SYSFS_DEPRECATED=y
88CONFIG_SYSFS_DEPRECATED_V2=y 88CONFIG_SYSFS_DEPRECATED_V2=y
89# CONFIG_RELAY is not set 89# CONFIG_RELAY is not set
@@ -122,6 +122,7 @@ CONFIG_SLUB_DEBUG=y
122CONFIG_SLUB=y 122CONFIG_SLUB=y
123# CONFIG_SLOB is not set 123# CONFIG_SLOB is not set
124CONFIG_PROFILING=y 124CONFIG_PROFILING=y
125CONFIG_TRACEPOINTS=y
125# CONFIG_MARKERS is not set 126# CONFIG_MARKERS is not set
126CONFIG_OPROFILE=m 127CONFIG_OPROFILE=m
127CONFIG_HAVE_OPROFILE=y 128CONFIG_HAVE_OPROFILE=y
@@ -135,7 +136,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
135# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 136# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
136CONFIG_SLABINFO=y 137CONFIG_SLABINFO=y
137CONFIG_RT_MUTEXES=y 138CONFIG_RT_MUTEXES=y
138# CONFIG_TINY_SHMEM is not set
139CONFIG_BASE_SMALL=0 139CONFIG_BASE_SMALL=0
140CONFIG_MODULES=y 140CONFIG_MODULES=y
141# CONFIG_MODULE_FORCE_LOAD is not set 141# CONFIG_MODULE_FORCE_LOAD is not set
@@ -143,11 +143,9 @@ CONFIG_MODULE_UNLOAD=y
143# CONFIG_MODULE_FORCE_UNLOAD is not set 143# CONFIG_MODULE_FORCE_UNLOAD is not set
144CONFIG_MODVERSIONS=y 144CONFIG_MODVERSIONS=y
145# CONFIG_MODULE_SRCVERSION_ALL is not set 145# CONFIG_MODULE_SRCVERSION_ALL is not set
146CONFIG_KMOD=y
147CONFIG_BLOCK=y 146CONFIG_BLOCK=y
148CONFIG_LBD=y 147CONFIG_LBD=y
149# CONFIG_BLK_DEV_IO_TRACE is not set 148# CONFIG_BLK_DEV_IO_TRACE is not set
150# CONFIG_LSF is not set
151# CONFIG_BLK_DEV_BSG is not set 149# CONFIG_BLK_DEV_BSG is not set
152# CONFIG_BLK_DEV_INTEGRITY is not set 150# CONFIG_BLK_DEV_INTEGRITY is not set
153 151
@@ -164,6 +162,10 @@ CONFIG_DEFAULT_CFQ=y
164# CONFIG_DEFAULT_NOOP is not set 162# CONFIG_DEFAULT_NOOP is not set
165CONFIG_DEFAULT_IOSCHED="cfq" 163CONFIG_DEFAULT_IOSCHED="cfq"
166CONFIG_CLASSIC_RCU=y 164CONFIG_CLASSIC_RCU=y
165# CONFIG_TREE_RCU is not set
166# CONFIG_PREEMPT_RCU is not set
167# CONFIG_TREE_RCU_TRACE is not set
168# CONFIG_PREEMPT_RCU_TRACE is not set
167# CONFIG_FREEZER is not set 169# CONFIG_FREEZER is not set
168 170
169# 171#
@@ -221,6 +223,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=m
221# 223#
222# CONFIG_TAU is not set 224# CONFIG_TAU is not set
223# CONFIG_FSL_ULI1575 is not set 225# CONFIG_FSL_ULI1575 is not set
226# CONFIG_SIMPLE_GPIO is not set
224 227
225# 228#
226# Kernel options 229# Kernel options
@@ -243,10 +246,12 @@ CONFIG_BINFMT_ELF=y
243# CONFIG_HAVE_AOUT is not set 246# CONFIG_HAVE_AOUT is not set
244CONFIG_BINFMT_MISC=y 247CONFIG_BINFMT_MISC=y
245# CONFIG_IOMMU_HELPER is not set 248# CONFIG_IOMMU_HELPER is not set
249CONFIG_PPC_NEED_DMA_SYNC_OPS=y
246CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 250CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
247CONFIG_ARCH_HAS_WALK_MEMORY=y 251CONFIG_ARCH_HAS_WALK_MEMORY=y
248CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 252CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
249# CONFIG_KEXEC is not set 253# CONFIG_KEXEC is not set
254# CONFIG_CRASH_DUMP is not set
250CONFIG_ARCH_FLATMEM_ENABLE=y 255CONFIG_ARCH_FLATMEM_ENABLE=y
251CONFIG_ARCH_POPULATES_NODE_MAP=y 256CONFIG_ARCH_POPULATES_NODE_MAP=y
252CONFIG_SELECT_MEMORY_MODEL=y 257CONFIG_SELECT_MEMORY_MODEL=y
@@ -258,12 +263,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
258CONFIG_PAGEFLAGS_EXTENDED=y 263CONFIG_PAGEFLAGS_EXTENDED=y
259CONFIG_SPLIT_PTLOCK_CPUS=4 264CONFIG_SPLIT_PTLOCK_CPUS=4
260CONFIG_MIGRATION=y 265CONFIG_MIGRATION=y
261# CONFIG_RESOURCES_64BIT is not set
262# CONFIG_PHYS_ADDR_T_64BIT is not set 266# CONFIG_PHYS_ADDR_T_64BIT is not set
263CONFIG_ZONE_DMA_FLAG=1 267CONFIG_ZONE_DMA_FLAG=1
264CONFIG_BOUNCE=y 268CONFIG_BOUNCE=y
265CONFIG_VIRT_TO_BUS=y 269CONFIG_VIRT_TO_BUS=y
266CONFIG_UNEVICTABLE_LRU=y 270CONFIG_UNEVICTABLE_LRU=y
271CONFIG_PPC_4K_PAGES=y
272# CONFIG_PPC_16K_PAGES is not set
273# CONFIG_PPC_64K_PAGES is not set
267CONFIG_FORCE_MAX_ZONEORDER=11 274CONFIG_FORCE_MAX_ZONEORDER=11
268# CONFIG_PROC_DEVICETREE is not set 275# CONFIG_PROC_DEVICETREE is not set
269# CONFIG_CMDLINE_BOOL is not set 276# CONFIG_CMDLINE_BOOL is not set
@@ -287,6 +294,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
287CONFIG_PCI_MSI=y 294CONFIG_PCI_MSI=y
288# CONFIG_PCI_LEGACY is not set 295# CONFIG_PCI_LEGACY is not set
289# CONFIG_PCI_DEBUG is not set 296# CONFIG_PCI_DEBUG is not set
297# CONFIG_PCI_STUB is not set
290# CONFIG_PCCARD is not set 298# CONFIG_PCCARD is not set
291CONFIG_HOTPLUG_PCI=y 299CONFIG_HOTPLUG_PCI=y
292# CONFIG_HOTPLUG_PCI_FAKE is not set 300# CONFIG_HOTPLUG_PCI_FAKE is not set
@@ -314,6 +322,8 @@ CONFIG_NET=y
314# 322#
315# Networking options 323# Networking options
316# 324#
325# CONFIG_NET_NS is not set
326CONFIG_COMPAT_NET_DEV_OPS=y
317CONFIG_PACKET=y 327CONFIG_PACKET=y
318CONFIG_PACKET_MMAP=y 328CONFIG_PACKET_MMAP=y
319CONFIG_UNIX=y 329CONFIG_UNIX=y
@@ -574,6 +584,7 @@ CONFIG_NET_SCH_TBF=m
574CONFIG_NET_SCH_GRED=m 584CONFIG_NET_SCH_GRED=m
575CONFIG_NET_SCH_DSMARK=m 585CONFIG_NET_SCH_DSMARK=m
576CONFIG_NET_SCH_NETEM=m 586CONFIG_NET_SCH_NETEM=m
587# CONFIG_NET_SCH_DRR is not set
577 588
578# 589#
579# Classification 590# Classification
@@ -594,6 +605,7 @@ CONFIG_NET_CLS_RSVP6=m
594# CONFIG_NET_CLS_ACT is not set 605# CONFIG_NET_CLS_ACT is not set
595CONFIG_NET_CLS_IND=y 606CONFIG_NET_CLS_IND=y
596CONFIG_NET_SCH_FIFO=y 607CONFIG_NET_SCH_FIFO=y
608# CONFIG_DCB is not set
597 609
598# 610#
599# Network testing 611# Network testing
@@ -616,8 +628,6 @@ CONFIG_BT_HIDP=m
616# 628#
617# Bluetooth device drivers 629# Bluetooth device drivers
618# 630#
619CONFIG_BT_HCIUSB=m
620CONFIG_BT_HCIUSB_SCO=y
621# CONFIG_BT_HCIBTUSB is not set 631# CONFIG_BT_HCIBTUSB is not set
622CONFIG_BT_HCIUART=m 632CONFIG_BT_HCIUART=m
623CONFIG_BT_HCIUART_H4=y 633CONFIG_BT_HCIUART_H4=y
@@ -635,12 +645,9 @@ CONFIG_WIRELESS=y
635CONFIG_WIRELESS_OLD_REGULATORY=y 645CONFIG_WIRELESS_OLD_REGULATORY=y
636CONFIG_WIRELESS_EXT=y 646CONFIG_WIRELESS_EXT=y
637CONFIG_WIRELESS_EXT_SYSFS=y 647CONFIG_WIRELESS_EXT_SYSFS=y
648# CONFIG_LIB80211 is not set
638# CONFIG_MAC80211 is not set 649# CONFIG_MAC80211 is not set
639CONFIG_IEEE80211=m 650# CONFIG_WIMAX is not set
640# CONFIG_IEEE80211_DEBUG is not set
641CONFIG_IEEE80211_CRYPT_WEP=m
642CONFIG_IEEE80211_CRYPT_CCMP=m
643CONFIG_IEEE80211_CRYPT_TKIP=m
644# CONFIG_RFKILL is not set 651# CONFIG_RFKILL is not set
645# CONFIG_NET_9P is not set 652# CONFIG_NET_9P is not set
646 653
@@ -665,6 +672,7 @@ CONFIG_MTD=y
665# CONFIG_MTD_DEBUG is not set 672# CONFIG_MTD_DEBUG is not set
666CONFIG_MTD_CONCAT=m 673CONFIG_MTD_CONCAT=m
667CONFIG_MTD_PARTITIONS=y 674CONFIG_MTD_PARTITIONS=y
675# CONFIG_MTD_TESTS is not set
668# CONFIG_MTD_REDBOOT_PARTS is not set 676# CONFIG_MTD_REDBOOT_PARTS is not set
669# CONFIG_MTD_CMDLINE_PARTS is not set 677# CONFIG_MTD_CMDLINE_PARTS is not set
670CONFIG_MTD_OF_PARTS=y 678CONFIG_MTD_OF_PARTS=y
@@ -737,6 +745,12 @@ CONFIG_MTD_PHYSMAP_OF=y
737# CONFIG_MTD_ONENAND is not set 745# CONFIG_MTD_ONENAND is not set
738 746
739# 747#
748# LPDDR flash memory drivers
749#
750# CONFIG_MTD_LPDDR is not set
751# CONFIG_MTD_QINFO_PROBE is not set
752
753#
740# UBI - Unsorted block images 754# UBI - Unsorted block images
741# 755#
742# CONFIG_MTD_UBI is not set 756# CONFIG_MTD_UBI is not set
@@ -834,6 +848,8 @@ CONFIG_MEGARAID_MAILBOX=m
834CONFIG_MEGARAID_SAS=m 848CONFIG_MEGARAID_SAS=m
835# CONFIG_SCSI_HPTIOP is not set 849# CONFIG_SCSI_HPTIOP is not set
836# CONFIG_SCSI_BUSLOGIC is not set 850# CONFIG_SCSI_BUSLOGIC is not set
851# CONFIG_LIBFC is not set
852# CONFIG_FCOE is not set
837# CONFIG_SCSI_DMX3191D is not set 853# CONFIG_SCSI_DMX3191D is not set
838# CONFIG_SCSI_EATA is not set 854# CONFIG_SCSI_EATA is not set
839CONFIG_SCSI_FUTURE_DOMAIN=m 855CONFIG_SCSI_FUTURE_DOMAIN=m
@@ -852,6 +868,7 @@ CONFIG_SCSI_QLOGIC_1280=m
852# CONFIG_SCSI_QLA_FC is not set 868# CONFIG_SCSI_QLA_FC is not set
853# CONFIG_SCSI_QLA_ISCSI is not set 869# CONFIG_SCSI_QLA_ISCSI is not set
854CONFIG_SCSI_LPFC=m 870CONFIG_SCSI_LPFC=m
871# CONFIG_SCSI_LPFC_DEBUG_FS is not set
855# CONFIG_SCSI_DC395x is not set 872# CONFIG_SCSI_DC395x is not set
856# CONFIG_SCSI_DC390T is not set 873# CONFIG_SCSI_DC390T is not set
857# CONFIG_SCSI_NSP32 is not set 874# CONFIG_SCSI_NSP32 is not set
@@ -896,6 +913,9 @@ CONFIG_VITESSE_PHY=y
896# CONFIG_BROADCOM_PHY is not set 913# CONFIG_BROADCOM_PHY is not set
897# CONFIG_ICPLUS_PHY is not set 914# CONFIG_ICPLUS_PHY is not set
898# CONFIG_REALTEK_PHY is not set 915# CONFIG_REALTEK_PHY is not set
916# CONFIG_NATIONAL_PHY is not set
917# CONFIG_STE10XP is not set
918# CONFIG_LSI_ET1011C_PHY is not set
899# CONFIG_FIXED_PHY is not set 919# CONFIG_FIXED_PHY is not set
900# CONFIG_MDIO_BITBANG is not set 920# CONFIG_MDIO_BITBANG is not set
901CONFIG_NET_ETHERNET=y 921CONFIG_NET_ETHERNET=y
@@ -949,6 +969,10 @@ CONFIG_MV643XX_ETH=y
949# CONFIG_IWLWIFI_LEDS is not set 969# CONFIG_IWLWIFI_LEDS is not set
950 970
951# 971#
972# Enable WiMAX (Networking options) to see the WiMAX drivers
973#
974
975#
952# USB Network Adapters 976# USB Network Adapters
953# 977#
954# CONFIG_USB_CATC is not set 978# CONFIG_USB_CATC is not set
@@ -1055,7 +1079,9 @@ CONFIG_SERIAL_CORE=y
1055CONFIG_SERIAL_CORE_CONSOLE=y 1079CONFIG_SERIAL_CORE_CONSOLE=y
1056# CONFIG_SERIAL_JSM is not set 1080# CONFIG_SERIAL_JSM is not set
1057CONFIG_UNIX98_PTYS=y 1081CONFIG_UNIX98_PTYS=y
1082# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1058# CONFIG_LEGACY_PTYS is not set 1083# CONFIG_LEGACY_PTYS is not set
1084# CONFIG_HVC_UDBG is not set
1059# CONFIG_IPMI_HANDLER is not set 1085# CONFIG_IPMI_HANDLER is not set
1060CONFIG_HW_RANDOM=m 1086CONFIG_HW_RANDOM=m
1061CONFIG_NVRAM=m 1087CONFIG_NVRAM=m
@@ -1151,8 +1177,10 @@ CONFIG_SENSORS_ADM1026=m
1151# CONFIG_SENSORS_ADM1029 is not set 1177# CONFIG_SENSORS_ADM1029 is not set
1152CONFIG_SENSORS_ADM1031=m 1178CONFIG_SENSORS_ADM1031=m
1153# CONFIG_SENSORS_ADM9240 is not set 1179# CONFIG_SENSORS_ADM9240 is not set
1180# CONFIG_SENSORS_ADT7462 is not set
1154# CONFIG_SENSORS_ADT7470 is not set 1181# CONFIG_SENSORS_ADT7470 is not set
1155# CONFIG_SENSORS_ADT7473 is not set 1182# CONFIG_SENSORS_ADT7473 is not set
1183# CONFIG_SENSORS_ADT7475 is not set
1156# CONFIG_SENSORS_ATXP1 is not set 1184# CONFIG_SENSORS_ATXP1 is not set
1157CONFIG_SENSORS_DS1621=m 1185CONFIG_SENSORS_DS1621=m
1158# CONFIG_SENSORS_I5K_AMB is not set 1186# CONFIG_SENSORS_I5K_AMB is not set
@@ -1173,6 +1201,7 @@ CONFIG_SENSORS_LM87=m
1173CONFIG_SENSORS_LM90=m 1201CONFIG_SENSORS_LM90=m
1174# CONFIG_SENSORS_LM92 is not set 1202# CONFIG_SENSORS_LM92 is not set
1175# CONFIG_SENSORS_LM93 is not set 1203# CONFIG_SENSORS_LM93 is not set
1204# CONFIG_SENSORS_LTC4245 is not set
1176CONFIG_SENSORS_MAX1619=m 1205CONFIG_SENSORS_MAX1619=m
1177# CONFIG_SENSORS_MAX6650 is not set 1206# CONFIG_SENSORS_MAX6650 is not set
1178# CONFIG_SENSORS_PC87360 is not set 1207# CONFIG_SENSORS_PC87360 is not set
@@ -1218,11 +1247,11 @@ CONFIG_WDT_501_PCI=y
1218# USB-based Watchdog Cards 1247# USB-based Watchdog Cards
1219# 1248#
1220CONFIG_USBPCWATCHDOG=m 1249CONFIG_USBPCWATCHDOG=m
1250CONFIG_SSB_POSSIBLE=y
1221 1251
1222# 1252#
1223# Sonics Silicon Backplane 1253# Sonics Silicon Backplane
1224# 1254#
1225CONFIG_SSB_POSSIBLE=y
1226# CONFIG_SSB is not set 1255# CONFIG_SSB is not set
1227 1256
1228# 1257#
@@ -1234,14 +1263,8 @@ CONFIG_SSB_POSSIBLE=y
1234# CONFIG_MFD_TMIO is not set 1263# CONFIG_MFD_TMIO is not set
1235# CONFIG_MFD_WM8400 is not set 1264# CONFIG_MFD_WM8400 is not set
1236# CONFIG_MFD_WM8350_I2C is not set 1265# CONFIG_MFD_WM8350_I2C is not set
1237 1266# CONFIG_MFD_PCF50633 is not set
1238#
1239# Voltage and Current regulators
1240#
1241# CONFIG_REGULATOR is not set 1267# 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
1245 1268
1246# 1269#
1247# Multimedia devices 1270# Multimedia devices
@@ -1298,7 +1321,7 @@ CONFIG_USB_DEVICEFS=y
1298# CONFIG_USB_DYNAMIC_MINORS is not set 1321# CONFIG_USB_DYNAMIC_MINORS is not set
1299CONFIG_USB_SUSPEND=y 1322CONFIG_USB_SUSPEND=y
1300# CONFIG_USB_OTG is not set 1323# CONFIG_USB_OTG is not set
1301CONFIG_USB_MON=y 1324CONFIG_USB_MON=m
1302# CONFIG_USB_WUSB is not set 1325# CONFIG_USB_WUSB is not set
1303# CONFIG_USB_WUSB_CBAF is not set 1326# CONFIG_USB_WUSB_CBAF is not set
1304 1327
@@ -1310,6 +1333,7 @@ CONFIG_USB_EHCI_HCD=m
1310CONFIG_USB_EHCI_ROOT_HUB_TT=y 1333CONFIG_USB_EHCI_ROOT_HUB_TT=y
1311# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1334# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1312CONFIG_USB_EHCI_HCD_PPC_OF=y 1335CONFIG_USB_EHCI_HCD_PPC_OF=y
1336# CONFIG_USB_OXU210HP_HCD is not set
1313# CONFIG_USB_ISP116X_HCD is not set 1337# CONFIG_USB_ISP116X_HCD is not set
1314# CONFIG_USB_ISP1760_HCD is not set 1338# CONFIG_USB_ISP1760_HCD is not set
1315CONFIG_USB_OHCI_HCD=m 1339CONFIG_USB_OHCI_HCD=m
@@ -1339,18 +1363,17 @@ CONFIG_USB_PRINTER=m
1339# CONFIG_USB_TMC is not set 1363# CONFIG_USB_TMC is not set
1340 1364
1341# 1365#
1342# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1366# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1343# 1367#
1344 1368
1345# 1369#
1346# may also be needed; see USB_STORAGE Help for more information 1370# see USB_STORAGE Help for more information
1347# 1371#
1348CONFIG_USB_STORAGE=m 1372CONFIG_USB_STORAGE=m
1349# CONFIG_USB_STORAGE_DEBUG is not set 1373# CONFIG_USB_STORAGE_DEBUG is not set
1350CONFIG_USB_STORAGE_DATAFAB=y 1374CONFIG_USB_STORAGE_DATAFAB=y
1351CONFIG_USB_STORAGE_FREECOM=y 1375CONFIG_USB_STORAGE_FREECOM=y
1352CONFIG_USB_STORAGE_ISD200=y 1376CONFIG_USB_STORAGE_ISD200=y
1353CONFIG_USB_STORAGE_DPCM=y
1354# CONFIG_USB_STORAGE_USBAT is not set 1377# CONFIG_USB_STORAGE_USBAT is not set
1355CONFIG_USB_STORAGE_SDDR09=y 1378CONFIG_USB_STORAGE_SDDR09=y
1356CONFIG_USB_STORAGE_SDDR55=y 1379CONFIG_USB_STORAGE_SDDR55=y
@@ -1419,12 +1442,14 @@ CONFIG_USB_SERIAL_PL2303=m
1419# CONFIG_USB_SERIAL_HP4X is not set 1442# CONFIG_USB_SERIAL_HP4X is not set
1420CONFIG_USB_SERIAL_SAFE=m 1443CONFIG_USB_SERIAL_SAFE=m
1421CONFIG_USB_SERIAL_SAFE_PADDED=y 1444CONFIG_USB_SERIAL_SAFE_PADDED=y
1445# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
1422# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set 1446# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
1423# CONFIG_USB_SERIAL_TI is not set 1447# CONFIG_USB_SERIAL_TI is not set
1424CONFIG_USB_SERIAL_CYBERJACK=m 1448CONFIG_USB_SERIAL_CYBERJACK=m
1425CONFIG_USB_SERIAL_XIRCOM=m 1449CONFIG_USB_SERIAL_XIRCOM=m
1426# CONFIG_USB_SERIAL_OPTION is not set 1450# CONFIG_USB_SERIAL_OPTION is not set
1427CONFIG_USB_SERIAL_OMNINET=m 1451CONFIG_USB_SERIAL_OMNINET=m
1452# CONFIG_USB_SERIAL_OPTICON is not set
1428# CONFIG_USB_SERIAL_DEBUG is not set 1453# CONFIG_USB_SERIAL_DEBUG is not set
1429 1454
1430# 1455#
@@ -1458,6 +1483,10 @@ CONFIG_USB_SPEEDTOUCH=m
1458# CONFIG_USB_UEAGLEATM is not set 1483# CONFIG_USB_UEAGLEATM is not set
1459# CONFIG_USB_XUSBATM is not set 1484# CONFIG_USB_XUSBATM is not set
1460# CONFIG_USB_GADGET is not set 1485# CONFIG_USB_GADGET is not set
1486
1487#
1488# OTG and related infrastructure
1489#
1461# CONFIG_UWB is not set 1490# CONFIG_UWB is not set
1462# CONFIG_MMC is not set 1491# CONFIG_MMC is not set
1463# CONFIG_MEMSTICK is not set 1492# CONFIG_MEMSTICK is not set
@@ -1500,19 +1529,23 @@ CONFIG_EXT3_FS_POSIX_ACL=y
1500CONFIG_EXT3_FS_SECURITY=y 1529CONFIG_EXT3_FS_SECURITY=y
1501# CONFIG_EXT4_FS is not set 1530# CONFIG_EXT4_FS is not set
1502CONFIG_JBD=m 1531CONFIG_JBD=m
1532# CONFIG_JBD_DEBUG is not set
1503CONFIG_FS_MBCACHE=m 1533CONFIG_FS_MBCACHE=m
1504# CONFIG_REISERFS_FS is not set 1534# CONFIG_REISERFS_FS is not set
1505# CONFIG_JFS_FS is not set 1535# CONFIG_JFS_FS is not set
1506CONFIG_FS_POSIX_ACL=y 1536CONFIG_FS_POSIX_ACL=y
1507CONFIG_FILE_LOCKING=y 1537CONFIG_FILE_LOCKING=y
1508# CONFIG_XFS_FS is not set 1538# CONFIG_XFS_FS is not set
1539# CONFIG_GFS2_FS is not set
1509# CONFIG_OCFS2_FS is not set 1540# CONFIG_OCFS2_FS is not set
1541# CONFIG_BTRFS_FS is not set
1510CONFIG_DNOTIFY=y 1542CONFIG_DNOTIFY=y
1511CONFIG_INOTIFY=y 1543CONFIG_INOTIFY=y
1512CONFIG_INOTIFY_USER=y 1544CONFIG_INOTIFY_USER=y
1513CONFIG_QUOTA=y 1545CONFIG_QUOTA=y
1514# CONFIG_QUOTA_NETLINK_INTERFACE is not set 1546# CONFIG_QUOTA_NETLINK_INTERFACE is not set
1515CONFIG_PRINT_QUOTA_WARNING=y 1547CONFIG_PRINT_QUOTA_WARNING=y
1548CONFIG_QUOTA_TREE=y
1516# CONFIG_QFMT_V1 is not set 1549# CONFIG_QFMT_V1 is not set
1517CONFIG_QFMT_V2=y 1550CONFIG_QFMT_V2=y
1518CONFIG_QUOTACTL=y 1551CONFIG_QUOTACTL=y
@@ -1549,10 +1582,7 @@ CONFIG_TMPFS=y
1549# CONFIG_TMPFS_POSIX_ACL is not set 1582# CONFIG_TMPFS_POSIX_ACL is not set
1550# CONFIG_HUGETLB_PAGE is not set 1583# CONFIG_HUGETLB_PAGE is not set
1551# CONFIG_CONFIGFS_FS is not set 1584# CONFIG_CONFIGFS_FS is not set
1552 1585CONFIG_MISC_FILESYSTEMS=y
1553#
1554# Miscellaneous filesystems
1555#
1556# CONFIG_ADFS_FS is not set 1586# CONFIG_ADFS_FS is not set
1557# CONFIG_AFFS_FS is not set 1587# CONFIG_AFFS_FS is not set
1558# CONFIG_ECRYPT_FS is not set 1588# CONFIG_ECRYPT_FS is not set
@@ -1573,6 +1603,7 @@ CONFIG_JFFS2_ZLIB=y
1573CONFIG_JFFS2_RTIME=y 1603CONFIG_JFFS2_RTIME=y
1574# CONFIG_JFFS2_RUBIN is not set 1604# CONFIG_JFFS2_RUBIN is not set
1575CONFIG_CRAMFS=m 1605CONFIG_CRAMFS=m
1606# CONFIG_SQUASHFS is not set
1576CONFIG_VXFS_FS=m 1607CONFIG_VXFS_FS=m
1577# CONFIG_MINIX_FS is not set 1608# CONFIG_MINIX_FS is not set
1578# CONFIG_OMFS_FS is not set 1609# CONFIG_OMFS_FS is not set
@@ -1678,6 +1709,7 @@ CONFIG_NLS_UTF8=m
1678# Library routines 1709# Library routines
1679# 1710#
1680CONFIG_BITREVERSE=y 1711CONFIG_BITREVERSE=y
1712CONFIG_GENERIC_FIND_LAST_BIT=y
1681CONFIG_CRC_CCITT=m 1713CONFIG_CRC_CCITT=m
1682# CONFIG_CRC16 is not set 1714# CONFIG_CRC16 is not set
1683CONFIG_CRC_T10DIF=m 1715CONFIG_CRC_T10DIF=m
@@ -1703,7 +1735,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1703CONFIG_FRAME_WARN=1024 1735CONFIG_FRAME_WARN=1024
1704CONFIG_MAGIC_SYSRQ=y 1736CONFIG_MAGIC_SYSRQ=y
1705# CONFIG_UNUSED_SYMBOLS is not set 1737# CONFIG_UNUSED_SYMBOLS is not set
1706# CONFIG_DEBUG_FS is not set 1738CONFIG_DEBUG_FS=y
1707# CONFIG_HEADERS_CHECK is not set 1739# CONFIG_HEADERS_CHECK is not set
1708CONFIG_DEBUG_KERNEL=y 1740CONFIG_DEBUG_KERNEL=y
1709# CONFIG_DEBUG_SHIRQ is not set 1741# CONFIG_DEBUG_SHIRQ is not set
@@ -1722,6 +1754,7 @@ CONFIG_DEBUG_SPINLOCK=y
1722# CONFIG_DEBUG_MUTEXES is not set 1754# CONFIG_DEBUG_MUTEXES is not set
1723CONFIG_DEBUG_SPINLOCK_SLEEP=y 1755CONFIG_DEBUG_SPINLOCK_SLEEP=y
1724# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1756# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1757CONFIG_STACKTRACE=y
1725# CONFIG_DEBUG_KOBJECT is not set 1758# CONFIG_DEBUG_KOBJECT is not set
1726CONFIG_DEBUG_HIGHMEM=y 1759CONFIG_DEBUG_HIGHMEM=y
1727CONFIG_DEBUG_BUGVERBOSE=y 1760CONFIG_DEBUG_BUGVERBOSE=y
@@ -1731,6 +1764,7 @@ CONFIG_DEBUG_INFO=y
1731CONFIG_DEBUG_MEMORY_INIT=y 1764CONFIG_DEBUG_MEMORY_INIT=y
1732# CONFIG_DEBUG_LIST is not set 1765# CONFIG_DEBUG_LIST is not set
1733# CONFIG_DEBUG_SG is not set 1766# CONFIG_DEBUG_SG is not set
1767# CONFIG_DEBUG_NOTIFIERS is not set
1734# CONFIG_BOOT_PRINTK_DELAY is not set 1768# CONFIG_BOOT_PRINTK_DELAY is not set
1735# CONFIG_RCU_TORTURE_TEST is not set 1769# CONFIG_RCU_TORTURE_TEST is not set
1736# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1770# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1741,7 +1775,12 @@ CONFIG_DEBUG_MEMORY_INIT=y
1741# CONFIG_FAULT_INJECTION is not set 1775# CONFIG_FAULT_INJECTION is not set
1742# CONFIG_LATENCYTOP is not set 1776# CONFIG_LATENCYTOP is not set
1743CONFIG_SYSCTL_SYSCALL_CHECK=y 1777CONFIG_SYSCTL_SYSCALL_CHECK=y
1778CONFIG_NOP_TRACER=y
1744CONFIG_HAVE_FUNCTION_TRACER=y 1779CONFIG_HAVE_FUNCTION_TRACER=y
1780CONFIG_HAVE_DYNAMIC_FTRACE=y
1781CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1782CONFIG_RING_BUFFER=y
1783CONFIG_TRACING=y
1745 1784
1746# 1785#
1747# Tracers 1786# Tracers
@@ -1750,11 +1789,14 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1750# CONFIG_SCHED_TRACER is not set 1789# CONFIG_SCHED_TRACER is not set
1751# CONFIG_CONTEXT_SWITCH_TRACER is not set 1790# CONFIG_CONTEXT_SWITCH_TRACER is not set
1752# CONFIG_BOOT_TRACER is not set 1791# CONFIG_BOOT_TRACER is not set
1792# CONFIG_TRACE_BRANCH_PROFILING is not set
1753# CONFIG_STACK_TRACER is not set 1793# CONFIG_STACK_TRACER is not set
1794# CONFIG_FTRACE_STARTUP_TEST is not set
1754# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1795# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1755# CONFIG_SAMPLES is not set 1796# CONFIG_SAMPLES is not set
1756CONFIG_HAVE_ARCH_KGDB=y 1797CONFIG_HAVE_ARCH_KGDB=y
1757# CONFIG_KGDB is not set 1798# CONFIG_KGDB is not set
1799CONFIG_PRINT_STACK_DEPTH=64
1758CONFIG_DEBUG_STACKOVERFLOW=y 1800CONFIG_DEBUG_STACKOVERFLOW=y
1759CONFIG_DEBUG_STACK_USAGE=y 1801CONFIG_DEBUG_STACK_USAGE=y
1760# CONFIG_DEBUG_PAGEALLOC is not set 1802# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1763,6 +1805,7 @@ CONFIG_DEBUG_STACK_USAGE=y
1763# CONFIG_MSI_BITMAP_SELFTEST is not set 1805# CONFIG_MSI_BITMAP_SELFTEST is not set
1764# CONFIG_XMON is not set 1806# CONFIG_XMON is not set
1765# CONFIG_IRQSTACKS is not set 1807# CONFIG_IRQSTACKS is not set
1808# CONFIG_VIRQ_DEBUG is not set
1766# CONFIG_BDI_SWITCH is not set 1809# CONFIG_BDI_SWITCH is not set
1767CONFIG_BOOTX_TEXT=y 1810CONFIG_BOOTX_TEXT=y
1768# CONFIG_PPC_EARLY_DEBUG is not set 1811# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1776,6 +1819,7 @@ CONFIG_SECURITY=y
1776# CONFIG_SECURITYFS is not set 1819# CONFIG_SECURITYFS is not set
1777CONFIG_SECURITY_NETWORK=y 1820CONFIG_SECURITY_NETWORK=y
1778# CONFIG_SECURITY_NETWORK_XFRM is not set 1821# CONFIG_SECURITY_NETWORK_XFRM is not set
1822# CONFIG_SECURITY_PATH is not set
1779# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1823# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1780CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 1824CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
1781CONFIG_SECURITY_SELINUX=y 1825CONFIG_SECURITY_SELINUX=y
@@ -1785,7 +1829,6 @@ CONFIG_SECURITY_SELINUX_DISABLE=y
1785CONFIG_SECURITY_SELINUX_DEVELOP=y 1829CONFIG_SECURITY_SELINUX_DEVELOP=y
1786CONFIG_SECURITY_SELINUX_AVC_STATS=y 1830CONFIG_SECURITY_SELINUX_AVC_STATS=y
1787CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 1831CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
1788# CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set
1789# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set 1832# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
1790CONFIG_CRYPTO=y 1833CONFIG_CRYPTO=y
1791 1834
@@ -1794,11 +1837,16 @@ CONFIG_CRYPTO=y
1794# 1837#
1795# CONFIG_CRYPTO_FIPS is not set 1838# CONFIG_CRYPTO_FIPS is not set
1796CONFIG_CRYPTO_ALGAPI=y 1839CONFIG_CRYPTO_ALGAPI=y
1797CONFIG_CRYPTO_AEAD=y 1840CONFIG_CRYPTO_ALGAPI2=y
1841CONFIG_CRYPTO_AEAD=m
1842CONFIG_CRYPTO_AEAD2=y
1798CONFIG_CRYPTO_BLKCIPHER=y 1843CONFIG_CRYPTO_BLKCIPHER=y
1844CONFIG_CRYPTO_BLKCIPHER2=y
1799CONFIG_CRYPTO_HASH=y 1845CONFIG_CRYPTO_HASH=y
1800CONFIG_CRYPTO_RNG=y 1846CONFIG_CRYPTO_HASH2=y
1847CONFIG_CRYPTO_RNG2=y
1801CONFIG_CRYPTO_MANAGER=y 1848CONFIG_CRYPTO_MANAGER=y
1849CONFIG_CRYPTO_MANAGER2=y
1802# CONFIG_CRYPTO_GF128MUL is not set 1850# CONFIG_CRYPTO_GF128MUL is not set
1803CONFIG_CRYPTO_NULL=m 1851CONFIG_CRYPTO_NULL=m
1804# CONFIG_CRYPTO_CRYPTD is not set 1852# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig
index a6f1cff564e6..add6419c15d9 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:36 2008 4# Mon Jan 26 15:35:27 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_GPIO=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -86,6 +86,7 @@ CONFIG_EMBEDDED=y
86CONFIG_SYSCTL_SYSCALL=y 86CONFIG_SYSCTL_SYSCALL=y
87CONFIG_KALLSYMS=y 87CONFIG_KALLSYMS=y
88CONFIG_KALLSYMS_ALL=y 88CONFIG_KALLSYMS_ALL=y
89CONFIG_KALLSYMS_STRIP_GENERATED=y
89# CONFIG_KALLSYMS_EXTRA_PASS is not set 90# CONFIG_KALLSYMS_EXTRA_PASS is not set
90CONFIG_HOTPLUG=y 91CONFIG_HOTPLUG=y
91CONFIG_PRINTK=y 92CONFIG_PRINTK=y
@@ -107,7 +108,6 @@ CONFIG_SLAB=y
107# CONFIG_SLUB is not set 108# CONFIG_SLUB is not set
108# CONFIG_SLOB is not set 109# CONFIG_SLOB is not set
109# CONFIG_PROFILING is not set 110# CONFIG_PROFILING is not set
110# CONFIG_MARKERS is not set
111CONFIG_HAVE_OPROFILE=y 111CONFIG_HAVE_OPROFILE=y
112CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 112CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
113CONFIG_HAVE_IOREMAP_PROT=y 113CONFIG_HAVE_IOREMAP_PROT=y
@@ -118,13 +118,11 @@ CONFIG_HAVE_CLK=y
118# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 118# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
119CONFIG_SLABINFO=y 119CONFIG_SLABINFO=y
120CONFIG_RT_MUTEXES=y 120CONFIG_RT_MUTEXES=y
121# CONFIG_TINY_SHMEM is not set
122CONFIG_BASE_SMALL=0 121CONFIG_BASE_SMALL=0
123# CONFIG_MODULES is not set 122# CONFIG_MODULES is not set
124CONFIG_BLOCK=y 123CONFIG_BLOCK=y
125# CONFIG_LBD is not set 124# CONFIG_LBD is not set
126# CONFIG_BLK_DEV_IO_TRACE is not set 125# CONFIG_BLK_DEV_IO_TRACE is not set
127# CONFIG_LSF is not set
128# CONFIG_BLK_DEV_INTEGRITY is not set 126# CONFIG_BLK_DEV_INTEGRITY is not set
129 127
130# 128#
@@ -140,6 +138,10 @@ CONFIG_DEFAULT_DEADLINE=y
140# CONFIG_DEFAULT_NOOP is not set 138# CONFIG_DEFAULT_NOOP is not set
141CONFIG_DEFAULT_IOSCHED="deadline" 139CONFIG_DEFAULT_IOSCHED="deadline"
142CONFIG_CLASSIC_RCU=y 140CONFIG_CLASSIC_RCU=y
141# CONFIG_TREE_RCU is not set
142# CONFIG_PREEMPT_RCU is not set
143# CONFIG_TREE_RCU_TRACE is not set
144# CONFIG_PREEMPT_RCU_TRACE is not set
143# CONFIG_FREEZER is not set 145# CONFIG_FREEZER is not set
144 146
145# 147#
@@ -181,6 +183,7 @@ CONFIG_8272=y
181CONFIG_CPM2=y 183CONFIG_CPM2=y
182# CONFIG_FSL_ULI1575 is not set 184# CONFIG_FSL_ULI1575 is not set
183CONFIG_CPM=y 185CONFIG_CPM=y
186# CONFIG_SIMPLE_GPIO is not set
184 187
185# 188#
186# Kernel options 189# Kernel options
@@ -206,6 +209,7 @@ CONFIG_BINFMT_MISC=y
206CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 209CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
207CONFIG_ARCH_HAS_WALK_MEMORY=y 210CONFIG_ARCH_HAS_WALK_MEMORY=y
208CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 211CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
212# CONFIG_CRASH_DUMP is not set
209CONFIG_ARCH_FLATMEM_ENABLE=y 213CONFIG_ARCH_FLATMEM_ENABLE=y
210CONFIG_ARCH_POPULATES_NODE_MAP=y 214CONFIG_ARCH_POPULATES_NODE_MAP=y
211CONFIG_FLATMEM=y 215CONFIG_FLATMEM=y
@@ -213,12 +217,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
213CONFIG_PAGEFLAGS_EXTENDED=y 217CONFIG_PAGEFLAGS_EXTENDED=y
214CONFIG_SPLIT_PTLOCK_CPUS=4 218CONFIG_SPLIT_PTLOCK_CPUS=4
215CONFIG_MIGRATION=y 219CONFIG_MIGRATION=y
216# CONFIG_RESOURCES_64BIT is not set
217# CONFIG_PHYS_ADDR_T_64BIT is not set 220# CONFIG_PHYS_ADDR_T_64BIT is not set
218CONFIG_ZONE_DMA_FLAG=1 221CONFIG_ZONE_DMA_FLAG=1
219CONFIG_BOUNCE=y 222CONFIG_BOUNCE=y
220CONFIG_VIRT_TO_BUS=y 223CONFIG_VIRT_TO_BUS=y
221CONFIG_UNEVICTABLE_LRU=y 224CONFIG_UNEVICTABLE_LRU=y
225CONFIG_PPC_4K_PAGES=y
226# CONFIG_PPC_16K_PAGES is not set
227# CONFIG_PPC_64K_PAGES is not set
222CONFIG_FORCE_MAX_ZONEORDER=11 228CONFIG_FORCE_MAX_ZONEORDER=11
223CONFIG_PROC_DEVICETREE=y 229CONFIG_PROC_DEVICETREE=y
224# CONFIG_CMDLINE_BOOL is not set 230# CONFIG_CMDLINE_BOOL is not set
@@ -243,6 +249,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
243# CONFIG_PCI_MSI is not set 249# CONFIG_PCI_MSI is not set
244# CONFIG_PCI_LEGACY is not set 250# CONFIG_PCI_LEGACY is not set
245# CONFIG_PCI_DEBUG is not set 251# CONFIG_PCI_DEBUG is not set
252# CONFIG_PCI_STUB is not set
246# CONFIG_PCCARD is not set 253# CONFIG_PCCARD is not set
247# CONFIG_HOTPLUG_PCI is not set 254# CONFIG_HOTPLUG_PCI is not set
248# CONFIG_HAS_RAPIDIO is not set 255# CONFIG_HAS_RAPIDIO is not set
@@ -265,6 +272,7 @@ CONFIG_NET=y
265# 272#
266# Networking options 273# Networking options
267# 274#
275CONFIG_COMPAT_NET_DEV_OPS=y
268CONFIG_PACKET=y 276CONFIG_PACKET=y
269# CONFIG_PACKET_MMAP is not set 277# CONFIG_PACKET_MMAP is not set
270CONFIG_UNIX=y 278CONFIG_UNIX=y
@@ -346,6 +354,7 @@ CONFIG_NETFILTER_ADVANCED=y
346# CONFIG_IPX is not set 354# CONFIG_IPX is not set
347# CONFIG_ATALK is not set 355# CONFIG_ATALK is not set
348# CONFIG_NET_SCHED is not set 356# CONFIG_NET_SCHED is not set
357# CONFIG_DCB is not set
349 358
350# 359#
351# Network testing 360# Network testing
@@ -360,8 +369,9 @@ CONFIG_WIRELESS=y
360# CONFIG_CFG80211 is not set 369# CONFIG_CFG80211 is not set
361CONFIG_WIRELESS_OLD_REGULATORY=y 370CONFIG_WIRELESS_OLD_REGULATORY=y
362# CONFIG_WIRELESS_EXT is not set 371# CONFIG_WIRELESS_EXT is not set
372# CONFIG_LIB80211 is not set
363# CONFIG_MAC80211 is not set 373# CONFIG_MAC80211 is not set
364# CONFIG_IEEE80211 is not set 374# CONFIG_WIMAX is not set
365# CONFIG_RFKILL is not set 375# CONFIG_RFKILL is not set
366 376
367# 377#
@@ -455,6 +465,12 @@ CONFIG_MTD_PHYSMAP_OF=y
455# CONFIG_MTD_ONENAND is not set 465# CONFIG_MTD_ONENAND is not set
456 466
457# 467#
468# LPDDR flash memory drivers
469#
470# CONFIG_MTD_LPDDR is not set
471# CONFIG_MTD_QINFO_PROBE is not set
472
473#
458# UBI - Unsorted block images 474# UBI - Unsorted block images
459# 475#
460# CONFIG_MTD_UBI is not set 476# CONFIG_MTD_UBI is not set
@@ -522,9 +538,12 @@ CONFIG_DAVICOM_PHY=y
522# CONFIG_BROADCOM_PHY is not set 538# CONFIG_BROADCOM_PHY is not set
523# CONFIG_ICPLUS_PHY is not set 539# CONFIG_ICPLUS_PHY is not set
524# CONFIG_REALTEK_PHY is not set 540# CONFIG_REALTEK_PHY is not set
541# CONFIG_NATIONAL_PHY is not set
542# CONFIG_STE10XP is not set
543# CONFIG_LSI_ET1011C_PHY is not set
525# CONFIG_FIXED_PHY is not set 544# CONFIG_FIXED_PHY is not set
526CONFIG_MDIO_BITBANG=y 545CONFIG_MDIO_BITBANG=y
527# CONFIG_MDIO_OF_GPIO is not set 546# CONFIG_MDIO_GPIO is not set
528CONFIG_NET_ETHERNET=y 547CONFIG_NET_ETHERNET=y
529CONFIG_MII=y 548CONFIG_MII=y
530# CONFIG_HAPPYMEAL is not set 549# CONFIG_HAPPYMEAL is not set
@@ -569,6 +588,7 @@ CONFIG_NETDEV_1000=y
569# CONFIG_JME is not set 588# CONFIG_JME is not set
570CONFIG_NETDEV_10000=y 589CONFIG_NETDEV_10000=y
571# CONFIG_CHELSIO_T1 is not set 590# CONFIG_CHELSIO_T1 is not set
591CONFIG_CHELSIO_T3_DEPENDS=y
572# CONFIG_CHELSIO_T3 is not set 592# CONFIG_CHELSIO_T3 is not set
573# CONFIG_ENIC is not set 593# CONFIG_ENIC is not set
574# CONFIG_IXGBE is not set 594# CONFIG_IXGBE is not set
@@ -591,6 +611,10 @@ CONFIG_NETDEV_10000=y
591# CONFIG_WLAN_PRE80211 is not set 611# CONFIG_WLAN_PRE80211 is not set
592# CONFIG_WLAN_80211 is not set 612# CONFIG_WLAN_80211 is not set
593# CONFIG_IWLWIFI_LEDS is not set 613# CONFIG_IWLWIFI_LEDS is not set
614
615#
616# Enable WiMAX (Networking options) to see the WiMAX drivers
617#
594# CONFIG_WAN is not set 618# CONFIG_WAN is not set
595# CONFIG_FDDI is not set 619# CONFIG_FDDI is not set
596# CONFIG_PPP is not set 620# CONFIG_PPP is not set
@@ -633,6 +657,7 @@ CONFIG_SERIAL_CPM=y
633CONFIG_SERIAL_CPM_CONSOLE=y 657CONFIG_SERIAL_CPM_CONSOLE=y
634# CONFIG_SERIAL_JSM is not set 658# CONFIG_SERIAL_JSM is not set
635CONFIG_UNIX98_PTYS=y 659CONFIG_UNIX98_PTYS=y
660# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
636CONFIG_LEGACY_PTYS=y 661CONFIG_LEGACY_PTYS=y
637CONFIG_LEGACY_PTY_COUNT=256 662CONFIG_LEGACY_PTY_COUNT=256
638# CONFIG_IPMI_HANDLER is not set 663# CONFIG_IPMI_HANDLER is not set
@@ -651,6 +676,11 @@ CONFIG_GPIOLIB=y
651# CONFIG_DEBUG_GPIO is not set 676# CONFIG_DEBUG_GPIO is not set
652 677
653# 678#
679# Memory mapped GPIO expanders:
680#
681# CONFIG_GPIO_XILINX is not set
682
683#
654# I2C GPIO expanders: 684# I2C GPIO expanders:
655# 685#
656 686
@@ -668,11 +698,11 @@ CONFIG_GPIOLIB=y
668# CONFIG_THERMAL is not set 698# CONFIG_THERMAL is not set
669# CONFIG_THERMAL_HWMON is not set 699# CONFIG_THERMAL_HWMON is not set
670# CONFIG_WATCHDOG is not set 700# CONFIG_WATCHDOG is not set
701CONFIG_SSB_POSSIBLE=y
671 702
672# 703#
673# Sonics Silicon Backplane 704# Sonics Silicon Backplane
674# 705#
675CONFIG_SSB_POSSIBLE=y
676# CONFIG_SSB is not set 706# CONFIG_SSB is not set
677 707
678# 708#
@@ -682,14 +712,7 @@ CONFIG_SSB_POSSIBLE=y
682# CONFIG_MFD_SM501 is not set 712# CONFIG_MFD_SM501 is not set
683# CONFIG_HTC_PASIC3 is not set 713# CONFIG_HTC_PASIC3 is not set
684# CONFIG_MFD_TMIO is not set 714# CONFIG_MFD_TMIO is not set
685
686#
687# Voltage and Current regulators
688#
689# CONFIG_REGULATOR is not set 715# 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 716
694# 717#
695# Multimedia devices 718# Multimedia devices
@@ -782,13 +805,11 @@ CONFIG_TMPFS=y
782# CONFIG_TMPFS_POSIX_ACL is not set 805# CONFIG_TMPFS_POSIX_ACL is not set
783# CONFIG_HUGETLB_PAGE is not set 806# CONFIG_HUGETLB_PAGE is not set
784# CONFIG_CONFIGFS_FS is not set 807# CONFIG_CONFIGFS_FS is not set
785 808CONFIG_MISC_FILESYSTEMS=y
786#
787# Miscellaneous filesystems
788#
789# CONFIG_HFSPLUS_FS is not set 809# CONFIG_HFSPLUS_FS is not set
790# CONFIG_JFFS2_FS is not set 810# CONFIG_JFFS2_FS is not set
791CONFIG_CRAMFS=y 811CONFIG_CRAMFS=y
812# CONFIG_SQUASHFS is not set
792# CONFIG_VXFS_FS is not set 813# CONFIG_VXFS_FS is not set
793# CONFIG_MINIX_FS is not set 814# CONFIG_MINIX_FS is not set
794# CONFIG_OMFS_FS is not set 815# CONFIG_OMFS_FS is not set
@@ -877,6 +898,7 @@ CONFIG_NLS_UTF8=y
877# 898#
878# Library routines 899# Library routines
879# 900#
901CONFIG_GENERIC_FIND_LAST_BIT=y
880# CONFIG_CRC_CCITT is not set 902# CONFIG_CRC_CCITT is not set
881# CONFIG_CRC16 is not set 903# CONFIG_CRC16 is not set
882# CONFIG_CRC_T10DIF is not set 904# CONFIG_CRC_T10DIF is not set
@@ -924,6 +946,7 @@ CONFIG_DEBUG_INFO=y
924# CONFIG_DEBUG_MEMORY_INIT is not set 946# CONFIG_DEBUG_MEMORY_INIT is not set
925# CONFIG_DEBUG_LIST is not set 947# CONFIG_DEBUG_LIST is not set
926# CONFIG_DEBUG_SG is not set 948# CONFIG_DEBUG_SG is not set
949# CONFIG_DEBUG_NOTIFIERS is not set
927# CONFIG_BOOT_PRINTK_DELAY is not set 950# CONFIG_BOOT_PRINTK_DELAY is not set
928# CONFIG_RCU_TORTURE_TEST is not set 951# CONFIG_RCU_TORTURE_TEST is not set
929# CONFIG_RCU_CPU_STALL_DETECTOR is not set 952# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -933,6 +956,8 @@ CONFIG_DEBUG_INFO=y
933# CONFIG_LATENCYTOP is not set 956# CONFIG_LATENCYTOP is not set
934CONFIG_SYSCTL_SYSCALL_CHECK=y 957CONFIG_SYSCTL_SYSCALL_CHECK=y
935CONFIG_HAVE_FUNCTION_TRACER=y 958CONFIG_HAVE_FUNCTION_TRACER=y
959CONFIG_HAVE_DYNAMIC_FTRACE=y
960CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
936 961
937# 962#
938# Tracers 963# Tracers
@@ -941,10 +966,12 @@ CONFIG_HAVE_FUNCTION_TRACER=y
941# CONFIG_SCHED_TRACER is not set 966# CONFIG_SCHED_TRACER is not set
942# CONFIG_CONTEXT_SWITCH_TRACER is not set 967# CONFIG_CONTEXT_SWITCH_TRACER is not set
943# CONFIG_BOOT_TRACER is not set 968# CONFIG_BOOT_TRACER is not set
969# CONFIG_TRACE_BRANCH_PROFILING is not set
944# CONFIG_STACK_TRACER is not set 970# CONFIG_STACK_TRACER is not set
945# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 971# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
946# CONFIG_SAMPLES is not set 972# CONFIG_SAMPLES is not set
947CONFIG_HAVE_ARCH_KGDB=y 973CONFIG_HAVE_ARCH_KGDB=y
974CONFIG_PRINT_STACK_DEPTH=64
948# CONFIG_DEBUG_STACKOVERFLOW is not set 975# CONFIG_DEBUG_STACKOVERFLOW is not set
949# CONFIG_DEBUG_STACK_USAGE is not set 976# CONFIG_DEBUG_STACK_USAGE is not set
950# CONFIG_DEBUG_PAGEALLOC is not set 977# CONFIG_DEBUG_PAGEALLOC is not set
@@ -971,11 +998,15 @@ CONFIG_CRYPTO=y
971# 998#
972# CONFIG_CRYPTO_FIPS is not set 999# CONFIG_CRYPTO_FIPS is not set
973CONFIG_CRYPTO_ALGAPI=y 1000CONFIG_CRYPTO_ALGAPI=y
974CONFIG_CRYPTO_AEAD=y 1001CONFIG_CRYPTO_ALGAPI2=y
1002CONFIG_CRYPTO_AEAD2=y
975CONFIG_CRYPTO_BLKCIPHER=y 1003CONFIG_CRYPTO_BLKCIPHER=y
1004CONFIG_CRYPTO_BLKCIPHER2=y
976CONFIG_CRYPTO_HASH=y 1005CONFIG_CRYPTO_HASH=y
977CONFIG_CRYPTO_RNG=y 1006CONFIG_CRYPTO_HASH2=y
1007CONFIG_CRYPTO_RNG2=y
978CONFIG_CRYPTO_MANAGER=y 1008CONFIG_CRYPTO_MANAGER=y
1009CONFIG_CRYPTO_MANAGER2=y
979# CONFIG_CRYPTO_NULL is not set 1010# CONFIG_CRYPTO_NULL is not set
980# CONFIG_CRYPTO_CRYPTD is not set 1011# CONFIG_CRYPTO_CRYPTD is not set
981# CONFIG_CRYPTO_AUTHENC is not set 1012# CONFIG_CRYPTO_AUTHENC is not set
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig
index 870d28976a44..b2fdfd9e183c 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:37 2008 4# Mon Jan 26 15:35:28 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_PPC_8xx=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_8xx=y 17CONFIG_8xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -70,12 +71,12 @@ CONFIG_SYSVIPC_SYSCTL=y
70# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
71# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
72CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y 74CONFIG_GROUP_SCHED=y
75# CONFIG_FAIR_GROUP_SCHED is not set 75# CONFIG_FAIR_GROUP_SCHED is not set
76# CONFIG_RT_GROUP_SCHED is not set 76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y 77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set 78# CONFIG_CGROUP_SCHED is not set
79# CONFIG_CGROUPS is not set
79CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
81# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
@@ -108,7 +109,6 @@ CONFIG_SLUB_DEBUG=y
108CONFIG_SLUB=y 109CONFIG_SLUB=y
109# CONFIG_SLOB is not set 110# CONFIG_SLOB is not set
110# CONFIG_PROFILING is not set 111# CONFIG_PROFILING is not set
111# CONFIG_MARKERS is not set
112CONFIG_HAVE_OPROFILE=y 112CONFIG_HAVE_OPROFILE=y
113CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 113CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
114CONFIG_HAVE_IOREMAP_PROT=y 114CONFIG_HAVE_IOREMAP_PROT=y
@@ -118,13 +118,11 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
118CONFIG_HAVE_CLK=y 118CONFIG_HAVE_CLK=y
119# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 119# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
120CONFIG_SLABINFO=y 120CONFIG_SLABINFO=y
121# CONFIG_TINY_SHMEM is not set
122CONFIG_BASE_SMALL=1 121CONFIG_BASE_SMALL=1
123# CONFIG_MODULES is not set 122# CONFIG_MODULES is not set
124CONFIG_BLOCK=y 123CONFIG_BLOCK=y
125# CONFIG_LBD is not set 124# CONFIG_LBD is not set
126# CONFIG_BLK_DEV_IO_TRACE is not set 125# CONFIG_BLK_DEV_IO_TRACE is not set
127# CONFIG_LSF is not set
128# CONFIG_BLK_DEV_BSG is not set 126# CONFIG_BLK_DEV_BSG is not set
129# CONFIG_BLK_DEV_INTEGRITY is not set 127# CONFIG_BLK_DEV_INTEGRITY is not set
130 128
@@ -141,6 +139,10 @@ CONFIG_DEFAULT_DEADLINE=y
141# CONFIG_DEFAULT_NOOP is not set 139# CONFIG_DEFAULT_NOOP is not set
142CONFIG_DEFAULT_IOSCHED="deadline" 140CONFIG_DEFAULT_IOSCHED="deadline"
143CONFIG_CLASSIC_RCU=y 141CONFIG_CLASSIC_RCU=y
142# CONFIG_TREE_RCU is not set
143# CONFIG_PREEMPT_RCU is not set
144# CONFIG_TREE_RCU_TRACE is not set
145# CONFIG_PREEMPT_RCU_TRACE is not set
144# CONFIG_FREEZER is not set 146# CONFIG_FREEZER is not set
145 147
146# 148#
@@ -186,6 +188,7 @@ CONFIG_NO_UCODE_PATCH=y
186# CONFIG_QUICC_ENGINE is not set 188# CONFIG_QUICC_ENGINE is not set
187# CONFIG_FSL_ULI1575 is not set 189# CONFIG_FSL_ULI1575 is not set
188CONFIG_CPM=y 190CONFIG_CPM=y
191# CONFIG_SIMPLE_GPIO is not set
189 192
190# 193#
191# Kernel options 194# Kernel options
@@ -205,12 +208,12 @@ CONFIG_PREEMPT_NONE=y
205# CONFIG_PREEMPT_VOLUNTARY is not set 208# CONFIG_PREEMPT_VOLUNTARY is not set
206# CONFIG_PREEMPT is not set 209# CONFIG_PREEMPT is not set
207CONFIG_BINFMT_ELF=y 210CONFIG_BINFMT_ELF=y
208# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
209# CONFIG_HAVE_AOUT is not set 211# CONFIG_HAVE_AOUT is not set
210# CONFIG_BINFMT_MISC is not set 212# CONFIG_BINFMT_MISC is not set
211# CONFIG_MATH_EMULATION is not set 213# CONFIG_MATH_EMULATION is not set
212CONFIG_8XX_MINIMAL_FPEMU=y 214CONFIG_8XX_MINIMAL_FPEMU=y
213# CONFIG_IOMMU_HELPER is not set 215# CONFIG_IOMMU_HELPER is not set
216CONFIG_PPC_NEED_DMA_SYNC_OPS=y
214CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 217CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
215CONFIG_ARCH_HAS_WALK_MEMORY=y 218CONFIG_ARCH_HAS_WALK_MEMORY=y
216CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 219CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -225,12 +228,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
225CONFIG_PAGEFLAGS_EXTENDED=y 228CONFIG_PAGEFLAGS_EXTENDED=y
226CONFIG_SPLIT_PTLOCK_CPUS=4 229CONFIG_SPLIT_PTLOCK_CPUS=4
227CONFIG_MIGRATION=y 230CONFIG_MIGRATION=y
228# CONFIG_RESOURCES_64BIT is not set
229# CONFIG_PHYS_ADDR_T_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
233CONFIG_UNEVICTABLE_LRU=y 235CONFIG_UNEVICTABLE_LRU=y
236CONFIG_PPC_4K_PAGES=y
237# CONFIG_PPC_16K_PAGES is not set
238# CONFIG_PPC_64K_PAGES is not set
234CONFIG_FORCE_MAX_ZONEORDER=11 239CONFIG_FORCE_MAX_ZONEORDER=11
235CONFIG_PROC_DEVICETREE=y 240CONFIG_PROC_DEVICETREE=y
236# CONFIG_CMDLINE_BOOL is not set 241# CONFIG_CMDLINE_BOOL is not set
@@ -272,6 +277,7 @@ CONFIG_NET=y
272# 277#
273# Networking options 278# Networking options
274# 279#
280CONFIG_COMPAT_NET_DEV_OPS=y
275CONFIG_PACKET=y 281CONFIG_PACKET=y
276# CONFIG_PACKET_MMAP is not set 282# CONFIG_PACKET_MMAP is not set
277CONFIG_UNIX=y 283CONFIG_UNIX=y
@@ -323,6 +329,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
323# CONFIG_ECONET is not set 329# CONFIG_ECONET is not set
324# CONFIG_WAN_ROUTER is not set 330# CONFIG_WAN_ROUTER is not set
325# CONFIG_NET_SCHED is not set 331# CONFIG_NET_SCHED is not set
332# CONFIG_DCB is not set
326 333
327# 334#
328# Network testing 335# Network testing
@@ -338,8 +345,9 @@ CONFIG_WIRELESS=y
338# CONFIG_CFG80211 is not set 345# CONFIG_CFG80211 is not set
339CONFIG_WIRELESS_OLD_REGULATORY=y 346CONFIG_WIRELESS_OLD_REGULATORY=y
340# CONFIG_WIRELESS_EXT is not set 347# CONFIG_WIRELESS_EXT is not set
348# CONFIG_LIB80211 is not set
341# CONFIG_MAC80211 is not set 349# CONFIG_MAC80211 is not set
342# CONFIG_IEEE80211 is not set 350# CONFIG_WIMAX is not set
343# CONFIG_RFKILL is not set 351# CONFIG_RFKILL is not set
344# CONFIG_NET_9P is not set 352# CONFIG_NET_9P is not set
345 353
@@ -428,6 +436,12 @@ CONFIG_MTD_PHYSMAP_OF=y
428# CONFIG_MTD_ONENAND is not set 436# CONFIG_MTD_ONENAND is not set
429 437
430# 438#
439# LPDDR flash memory drivers
440#
441# CONFIG_MTD_LPDDR is not set
442# CONFIG_MTD_QINFO_PROBE is not set
443
444#
431# UBI - Unsorted block images 445# UBI - Unsorted block images
432# 446#
433# CONFIG_MTD_UBI is not set 447# CONFIG_MTD_UBI is not set
@@ -470,6 +484,9 @@ CONFIG_LXT_PHY=y
470# CONFIG_BROADCOM_PHY is not set 484# CONFIG_BROADCOM_PHY is not set
471# CONFIG_ICPLUS_PHY is not set 485# CONFIG_ICPLUS_PHY is not set
472# CONFIG_REALTEK_PHY is not set 486# CONFIG_REALTEK_PHY is not set
487# CONFIG_NATIONAL_PHY is not set
488# CONFIG_STE10XP is not set
489# CONFIG_LSI_ET1011C_PHY is not set
473# CONFIG_FIXED_PHY is not set 490# CONFIG_FIXED_PHY is not set
474# CONFIG_MDIO_BITBANG is not set 491# CONFIG_MDIO_BITBANG is not set
475CONFIG_NET_ETHERNET=y 492CONFIG_NET_ETHERNET=y
@@ -495,6 +512,10 @@ CONFIG_FS_ENET_MDIO_FEC=y
495# CONFIG_WLAN_PRE80211 is not set 512# CONFIG_WLAN_PRE80211 is not set
496# CONFIG_WLAN_80211 is not set 513# CONFIG_WLAN_80211 is not set
497# CONFIG_IWLWIFI_LEDS is not set 514# CONFIG_IWLWIFI_LEDS is not set
515
516#
517# Enable WiMAX (Networking options) to see the WiMAX drivers
518#
498# CONFIG_WAN is not set 519# CONFIG_WAN is not set
499# CONFIG_PPP is not set 520# CONFIG_PPP is not set
500# CONFIG_SLIP is not set 521# CONFIG_SLIP is not set
@@ -536,7 +557,9 @@ CONFIG_SERIAL_CORE_CONSOLE=y
536CONFIG_SERIAL_CPM=y 557CONFIG_SERIAL_CPM=y
537CONFIG_SERIAL_CPM_CONSOLE=y 558CONFIG_SERIAL_CPM_CONSOLE=y
538CONFIG_UNIX98_PTYS=y 559CONFIG_UNIX98_PTYS=y
560# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
539# CONFIG_LEGACY_PTYS is not set 561# CONFIG_LEGACY_PTYS is not set
562# CONFIG_HVC_UDBG is not set
540# CONFIG_IPMI_HANDLER is not set 563# CONFIG_IPMI_HANDLER is not set
541CONFIG_HW_RANDOM=y 564CONFIG_HW_RANDOM=y
542# CONFIG_NVRAM is not set 565# CONFIG_NVRAM is not set
@@ -555,11 +578,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
555# CONFIG_THERMAL is not set 578# CONFIG_THERMAL is not set
556# CONFIG_THERMAL_HWMON is not set 579# CONFIG_THERMAL_HWMON is not set
557# CONFIG_WATCHDOG is not set 580# CONFIG_WATCHDOG is not set
581CONFIG_SSB_POSSIBLE=y
558 582
559# 583#
560# Sonics Silicon Backplane 584# Sonics Silicon Backplane
561# 585#
562CONFIG_SSB_POSSIBLE=y
563# CONFIG_SSB is not set 586# CONFIG_SSB is not set
564 587
565# 588#
@@ -569,14 +592,7 @@ CONFIG_SSB_POSSIBLE=y
569# CONFIG_MFD_SM501 is not set 592# CONFIG_MFD_SM501 is not set
570# CONFIG_HTC_PASIC3 is not set 593# CONFIG_HTC_PASIC3 is not set
571# CONFIG_MFD_TMIO is not set 594# CONFIG_MFD_TMIO is not set
572
573#
574# Voltage and Current regulators
575#
576# CONFIG_REGULATOR is not set 595# 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 596
581# 597#
582# Multimedia devices 598# Multimedia devices
@@ -630,6 +646,7 @@ CONFIG_DAB=y
630CONFIG_FILE_LOCKING=y 646CONFIG_FILE_LOCKING=y
631# CONFIG_XFS_FS is not set 647# CONFIG_XFS_FS is not set
632# CONFIG_OCFS2_FS is not set 648# CONFIG_OCFS2_FS is not set
649# CONFIG_BTRFS_FS is not set
633# CONFIG_DNOTIFY is not set 650# CONFIG_DNOTIFY is not set
634# CONFIG_INOTIFY is not set 651# CONFIG_INOTIFY is not set
635# CONFIG_QUOTA is not set 652# CONFIG_QUOTA is not set
@@ -662,10 +679,7 @@ CONFIG_TMPFS=y
662# CONFIG_TMPFS_POSIX_ACL is not set 679# CONFIG_TMPFS_POSIX_ACL is not set
663# CONFIG_HUGETLB_PAGE is not set 680# CONFIG_HUGETLB_PAGE is not set
664# CONFIG_CONFIGFS_FS is not set 681# CONFIG_CONFIGFS_FS is not set
665 682CONFIG_MISC_FILESYSTEMS=y
666#
667# Miscellaneous filesystems
668#
669# CONFIG_ADFS_FS is not set 683# CONFIG_ADFS_FS is not set
670# CONFIG_AFFS_FS is not set 684# CONFIG_AFFS_FS is not set
671# CONFIG_HFS_FS is not set 685# CONFIG_HFS_FS is not set
@@ -675,6 +689,7 @@ CONFIG_TMPFS=y
675# CONFIG_EFS_FS is not set 689# CONFIG_EFS_FS is not set
676# CONFIG_JFFS2_FS is not set 690# CONFIG_JFFS2_FS is not set
677CONFIG_CRAMFS=y 691CONFIG_CRAMFS=y
692# CONFIG_SQUASHFS is not set
678# CONFIG_VXFS_FS is not set 693# CONFIG_VXFS_FS is not set
679# CONFIG_MINIX_FS is not set 694# CONFIG_MINIX_FS is not set
680# CONFIG_OMFS_FS is not set 695# CONFIG_OMFS_FS is not set
@@ -730,6 +745,7 @@ CONFIG_MSDOS_PARTITION=y
730# 745#
731# Library routines 746# Library routines
732# 747#
748CONFIG_GENERIC_FIND_LAST_BIT=y
733# CONFIG_CRC_CCITT is not set 749# CONFIG_CRC_CCITT is not set
734# CONFIG_CRC16 is not set 750# CONFIG_CRC16 is not set
735# CONFIG_CRC_T10DIF is not set 751# CONFIG_CRC_T10DIF is not set
@@ -777,6 +793,7 @@ CONFIG_DEBUG_INFO=y
777# CONFIG_DEBUG_MEMORY_INIT is not set 793# CONFIG_DEBUG_MEMORY_INIT is not set
778# CONFIG_DEBUG_LIST is not set 794# CONFIG_DEBUG_LIST is not set
779# CONFIG_DEBUG_SG is not set 795# CONFIG_DEBUG_SG is not set
796# CONFIG_DEBUG_NOTIFIERS is not set
780# CONFIG_BOOT_PRINTK_DELAY is not set 797# CONFIG_BOOT_PRINTK_DELAY is not set
781# CONFIG_RCU_TORTURE_TEST is not set 798# CONFIG_RCU_TORTURE_TEST is not set
782# CONFIG_RCU_CPU_STALL_DETECTOR is not set 799# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -785,6 +802,8 @@ CONFIG_DEBUG_INFO=y
785# CONFIG_FAULT_INJECTION is not set 802# CONFIG_FAULT_INJECTION is not set
786# CONFIG_LATENCYTOP is not set 803# CONFIG_LATENCYTOP is not set
787CONFIG_HAVE_FUNCTION_TRACER=y 804CONFIG_HAVE_FUNCTION_TRACER=y
805CONFIG_HAVE_DYNAMIC_FTRACE=y
806CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
788 807
789# 808#
790# Tracers 809# Tracers
@@ -793,11 +812,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
793# CONFIG_SCHED_TRACER is not set 812# CONFIG_SCHED_TRACER is not set
794# CONFIG_CONTEXT_SWITCH_TRACER is not set 813# CONFIG_CONTEXT_SWITCH_TRACER is not set
795# CONFIG_BOOT_TRACER is not set 814# CONFIG_BOOT_TRACER is not set
815# CONFIG_TRACE_BRANCH_PROFILING is not set
796# CONFIG_STACK_TRACER is not set 816# CONFIG_STACK_TRACER is not set
797# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 817# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
798# CONFIG_SAMPLES is not set 818# CONFIG_SAMPLES is not set
799CONFIG_HAVE_ARCH_KGDB=y 819CONFIG_HAVE_ARCH_KGDB=y
800# CONFIG_KGDB is not set 820# CONFIG_KGDB is not set
821CONFIG_PRINT_STACK_DEPTH=64
801# CONFIG_DEBUG_STACKOVERFLOW is not set 822# CONFIG_DEBUG_STACKOVERFLOW is not set
802# CONFIG_DEBUG_STACK_USAGE is not set 823# CONFIG_DEBUG_STACK_USAGE is not set
803# CONFIG_DEBUG_PAGEALLOC is not set 824# CONFIG_DEBUG_PAGEALLOC is not set
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index 3a0ffd73b65c..aa5855a156de 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:38 2008 4# Mon Jan 26 15:35:29 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -43,7 +43,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
43CONFIG_PPC=y 43CONFIG_PPC=y
44CONFIG_EARLY_PRINTK=y 44CONFIG_EARLY_PRINTK=y
45CONFIG_GENERIC_NVRAM=y 45CONFIG_GENERIC_NVRAM=y
46CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 46CONFIG_SCHED_OMIT_FRAME_POINTER=y
47CONFIG_ARCH_MAY_HAVE_PC_FDC=y 47CONFIG_ARCH_MAY_HAVE_PC_FDC=y
48CONFIG_PPC_OF=y 48CONFIG_PPC_OF=y
49CONFIG_OF=y 49CONFIG_OF=y
@@ -74,12 +74,12 @@ CONFIG_POSIX_MQUEUE=y
74CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
75CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
76CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
77# CONFIG_CGROUPS is not set
78CONFIG_GROUP_SCHED=y 77CONFIG_GROUP_SCHED=y
79# CONFIG_FAIR_GROUP_SCHED is not set 78# CONFIG_FAIR_GROUP_SCHED is not set
80# CONFIG_RT_GROUP_SCHED is not set 79# CONFIG_RT_GROUP_SCHED is not set
81CONFIG_USER_SCHED=y 80CONFIG_USER_SCHED=y
82# CONFIG_CGROUP_SCHED is not set 81# CONFIG_CGROUP_SCHED is not set
82# CONFIG_CGROUPS is not set
83CONFIG_SYSFS_DEPRECATED=y 83CONFIG_SYSFS_DEPRECATED=y
84CONFIG_SYSFS_DEPRECATED_V2=y 84CONFIG_SYSFS_DEPRECATED_V2=y
85# CONFIG_RELAY is not set 85# CONFIG_RELAY is not set
@@ -118,7 +118,6 @@ CONFIG_SLUB_DEBUG=y
118CONFIG_SLUB=y 118CONFIG_SLUB=y
119# CONFIG_SLOB is not set 119# CONFIG_SLOB is not set
120# CONFIG_PROFILING is not set 120# CONFIG_PROFILING is not set
121# CONFIG_MARKERS is not set
122CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
123# CONFIG_KPROBES is not set 122# CONFIG_KPROBES is not set
124CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 123CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -129,7 +128,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=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
132# CONFIG_TINY_SHMEM is not set
133CONFIG_BASE_SMALL=0 131CONFIG_BASE_SMALL=0
134CONFIG_MODULES=y 132CONFIG_MODULES=y
135# CONFIG_MODULE_FORCE_LOAD is not set 133# CONFIG_MODULE_FORCE_LOAD is not set
@@ -137,11 +135,9 @@ CONFIG_MODULE_UNLOAD=y
137# CONFIG_MODULE_FORCE_UNLOAD is not set 135# CONFIG_MODULE_FORCE_UNLOAD is not set
138# CONFIG_MODVERSIONS is not set 136# CONFIG_MODVERSIONS is not set
139# CONFIG_MODULE_SRCVERSION_ALL is not set 137# CONFIG_MODULE_SRCVERSION_ALL is not set
140CONFIG_KMOD=y
141CONFIG_BLOCK=y 138CONFIG_BLOCK=y
142# CONFIG_LBD is not set 139# CONFIG_LBD is not set
143# CONFIG_BLK_DEV_IO_TRACE is not set 140# CONFIG_BLK_DEV_IO_TRACE is not set
144# CONFIG_LSF is not set
145# CONFIG_BLK_DEV_BSG is not set 141# CONFIG_BLK_DEV_BSG is not set
146# CONFIG_BLK_DEV_INTEGRITY is not set 142# CONFIG_BLK_DEV_INTEGRITY is not set
147 143
@@ -158,6 +154,10 @@ CONFIG_DEFAULT_AS=y
158# CONFIG_DEFAULT_NOOP is not set 154# CONFIG_DEFAULT_NOOP is not set
159CONFIG_DEFAULT_IOSCHED="anticipatory" 155CONFIG_DEFAULT_IOSCHED="anticipatory"
160CONFIG_CLASSIC_RCU=y 156CONFIG_CLASSIC_RCU=y
157# CONFIG_TREE_RCU is not set
158# CONFIG_PREEMPT_RCU is not set
159# CONFIG_TREE_RCU_TRACE is not set
160# CONFIG_PREEMPT_RCU_TRACE is not set
161# CONFIG_FREEZER is not set 161# CONFIG_FREEZER is not set
162 162
163# 163#
@@ -200,6 +200,7 @@ CONFIG_MPIC=y
200# CONFIG_TAU is not set 200# CONFIG_TAU is not set
201# CONFIG_QUICC_ENGINE 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# CONFIG_SIMPLE_GPIO is not set
203 204
204# 205#
205# Kernel options 206# Kernel options
@@ -227,6 +228,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
227CONFIG_ARCH_HAS_WALK_MEMORY=y 228CONFIG_ARCH_HAS_WALK_MEMORY=y
228CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 229CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
229# CONFIG_KEXEC is not set 230# CONFIG_KEXEC is not set
231# CONFIG_CRASH_DUMP is not set
230CONFIG_ARCH_FLATMEM_ENABLE=y 232CONFIG_ARCH_FLATMEM_ENABLE=y
231CONFIG_ARCH_POPULATES_NODE_MAP=y 233CONFIG_ARCH_POPULATES_NODE_MAP=y
232CONFIG_SELECT_MEMORY_MODEL=y 234CONFIG_SELECT_MEMORY_MODEL=y
@@ -238,12 +240,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
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
242# CONFIG_PHYS_ADDR_T_64BIT is not set 243# CONFIG_PHYS_ADDR_T_64BIT is not set
243CONFIG_ZONE_DMA_FLAG=1 244CONFIG_ZONE_DMA_FLAG=1
244CONFIG_BOUNCE=y 245CONFIG_BOUNCE=y
245CONFIG_VIRT_TO_BUS=y 246CONFIG_VIRT_TO_BUS=y
246CONFIG_UNEVICTABLE_LRU=y 247CONFIG_UNEVICTABLE_LRU=y
248CONFIG_PPC_4K_PAGES=y
249# CONFIG_PPC_16K_PAGES is not set
250# CONFIG_PPC_64K_PAGES is not set
247CONFIG_FORCE_MAX_ZONEORDER=11 251CONFIG_FORCE_MAX_ZONEORDER=11
248CONFIG_PROC_DEVICETREE=y 252CONFIG_PROC_DEVICETREE=y
249# CONFIG_CMDLINE_BOOL is not set 253# CONFIG_CMDLINE_BOOL is not set
@@ -267,6 +271,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
267# CONFIG_PCI_MSI is not set 271# CONFIG_PCI_MSI is not set
268# CONFIG_PCI_LEGACY is not set 272# CONFIG_PCI_LEGACY is not set
269# CONFIG_PCI_DEBUG is not set 273# CONFIG_PCI_DEBUG is not set
274# CONFIG_PCI_STUB is not set
270# CONFIG_PCCARD is not set 275# CONFIG_PCCARD is not set
271# CONFIG_HOTPLUG_PCI is not set 276# CONFIG_HOTPLUG_PCI is not set
272# CONFIG_HAS_RAPIDIO is not set 277# CONFIG_HAS_RAPIDIO is not set
@@ -289,6 +294,8 @@ CONFIG_NET=y
289# 294#
290# Networking options 295# Networking options
291# 296#
297# CONFIG_NET_NS is not set
298CONFIG_COMPAT_NET_DEV_OPS=y
292CONFIG_PACKET=y 299CONFIG_PACKET=y
293CONFIG_PACKET_MMAP=y 300CONFIG_PACKET_MMAP=y
294CONFIG_UNIX=y 301CONFIG_UNIX=y
@@ -455,6 +462,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
455# CONFIG_ECONET is not set 462# CONFIG_ECONET is not set
456# CONFIG_WAN_ROUTER is not set 463# CONFIG_WAN_ROUTER is not set
457# CONFIG_NET_SCHED is not set 464# CONFIG_NET_SCHED is not set
465# CONFIG_DCB is not set
458 466
459# 467#
460# Network testing 468# Network testing
@@ -471,12 +479,9 @@ CONFIG_WIRELESS=y
471CONFIG_WIRELESS_OLD_REGULATORY=y 479CONFIG_WIRELESS_OLD_REGULATORY=y
472CONFIG_WIRELESS_EXT=y 480CONFIG_WIRELESS_EXT=y
473CONFIG_WIRELESS_EXT_SYSFS=y 481CONFIG_WIRELESS_EXT_SYSFS=y
482# CONFIG_LIB80211 is not set
474# CONFIG_MAC80211 is not set 483# CONFIG_MAC80211 is not set
475CONFIG_IEEE80211=m 484# CONFIG_WIMAX is not set
476CONFIG_IEEE80211_DEBUG=y
477CONFIG_IEEE80211_CRYPT_WEP=m
478CONFIG_IEEE80211_CRYPT_CCMP=m
479CONFIG_IEEE80211_CRYPT_TKIP=m
480# CONFIG_RFKILL is not set 485# CONFIG_RFKILL is not set
481# CONFIG_NET_9P is not set 486# CONFIG_NET_9P is not set
482 487
@@ -501,6 +506,7 @@ CONFIG_MTD=y
501# CONFIG_MTD_DEBUG is not set 506# CONFIG_MTD_DEBUG is not set
502CONFIG_MTD_CONCAT=y 507CONFIG_MTD_CONCAT=y
503CONFIG_MTD_PARTITIONS=y 508CONFIG_MTD_PARTITIONS=y
509# CONFIG_MTD_TESTS is not set
504# CONFIG_MTD_REDBOOT_PARTS is not set 510# CONFIG_MTD_REDBOOT_PARTS is not set
505# CONFIG_MTD_CMDLINE_PARTS is not set 511# CONFIG_MTD_CMDLINE_PARTS is not set
506# CONFIG_MTD_OF_PARTS is not set 512# CONFIG_MTD_OF_PARTS is not set
@@ -554,9 +560,7 @@ CONFIG_MTD_CFI_UTIL=y
554# 560#
555# CONFIG_MTD_COMPLEX_MAPPINGS is not set 561# CONFIG_MTD_COMPLEX_MAPPINGS is not set
556CONFIG_MTD_PHYSMAP=y 562CONFIG_MTD_PHYSMAP=y
557CONFIG_MTD_PHYSMAP_START=0xffc00000 563# CONFIG_MTD_PHYSMAP_COMPAT is not set
558CONFIG_MTD_PHYSMAP_LEN=0x400000
559CONFIG_MTD_PHYSMAP_BANKWIDTH=1
560# CONFIG_MTD_PHYSMAP_OF is not set 564# CONFIG_MTD_PHYSMAP_OF is not set
561# CONFIG_MTD_INTEL_VR_NOR is not set 565# CONFIG_MTD_INTEL_VR_NOR is not set
562# CONFIG_MTD_PLATRAM is not set 566# CONFIG_MTD_PLATRAM is not set
@@ -580,6 +584,12 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
580# CONFIG_MTD_ONENAND is not set 584# CONFIG_MTD_ONENAND is not set
581 585
582# 586#
587# LPDDR flash memory drivers
588#
589# CONFIG_MTD_LPDDR is not set
590# CONFIG_MTD_QINFO_PROBE is not set
591
592#
583# UBI - Unsorted block images 593# UBI - Unsorted block images
584# 594#
585# CONFIG_MTD_UBI is not set 595# CONFIG_MTD_UBI is not set
@@ -610,8 +620,10 @@ CONFIG_MISC_DEVICES=y
610# CONFIG_EEPROM_93CX6 is not set 620# CONFIG_EEPROM_93CX6 is not set
611# CONFIG_SGI_IOC4 is not set 621# CONFIG_SGI_IOC4 is not set
612# CONFIG_TIFM_CORE is not set 622# CONFIG_TIFM_CORE is not set
623# CONFIG_ICS932S401 is not set
613# CONFIG_ENCLOSURE_SERVICES is not set 624# CONFIG_ENCLOSURE_SERVICES is not set
614# CONFIG_HP_ILO is not set 625# CONFIG_HP_ILO is not set
626# CONFIG_C2PORT is not set
615CONFIG_HAVE_IDE=y 627CONFIG_HAVE_IDE=y
616# CONFIG_IDE is not set 628# CONFIG_IDE is not set
617 629
@@ -654,6 +666,7 @@ CONFIG_SCSI_WAIT_SCAN=m
654# CONFIG_SCSI_SRP_ATTRS is not set 666# CONFIG_SCSI_SRP_ATTRS is not set
655CONFIG_SCSI_LOWLEVEL=y 667CONFIG_SCSI_LOWLEVEL=y
656# CONFIG_ISCSI_TCP is not set 668# CONFIG_ISCSI_TCP is not set
669# CONFIG_SCSI_CXGB3_ISCSI is not set
657# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 670# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
658# CONFIG_SCSI_3W_9XXX is not set 671# CONFIG_SCSI_3W_9XXX is not set
659# CONFIG_SCSI_ACARD is not set 672# CONFIG_SCSI_ACARD is not set
@@ -670,6 +683,8 @@ CONFIG_SCSI_LOWLEVEL=y
670# CONFIG_MEGARAID_SAS is not set 683# CONFIG_MEGARAID_SAS is not set
671# CONFIG_SCSI_HPTIOP is not set 684# CONFIG_SCSI_HPTIOP is not set
672# CONFIG_SCSI_BUSLOGIC is not set 685# CONFIG_SCSI_BUSLOGIC is not set
686# CONFIG_LIBFC is not set
687# CONFIG_FCOE is not set
673# CONFIG_SCSI_DMX3191D is not set 688# CONFIG_SCSI_DMX3191D is not set
674# CONFIG_SCSI_EATA is not set 689# CONFIG_SCSI_EATA is not set
675# CONFIG_SCSI_FUTURE_DOMAIN is not set 690# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -827,6 +842,7 @@ CONFIG_R8169=y
827# CONFIG_JME is not set 842# CONFIG_JME is not set
828CONFIG_NETDEV_10000=y 843CONFIG_NETDEV_10000=y
829# CONFIG_CHELSIO_T1 is not set 844# CONFIG_CHELSIO_T1 is not set
845CONFIG_CHELSIO_T3_DEPENDS=y
830# CONFIG_CHELSIO_T3 is not set 846# CONFIG_CHELSIO_T3 is not set
831# CONFIG_ENIC is not set 847# CONFIG_ENIC is not set
832# CONFIG_IXGBE is not set 848# CONFIG_IXGBE is not set
@@ -851,6 +867,10 @@ CONFIG_NETDEV_10000=y
851# CONFIG_IWLWIFI_LEDS is not set 867# CONFIG_IWLWIFI_LEDS is not set
852 868
853# 869#
870# Enable WiMAX (Networking options) to see the WiMAX drivers
871#
872
873#
854# USB Network Adapters 874# USB Network Adapters
855# 875#
856# CONFIG_USB_CATC is not set 876# CONFIG_USB_CATC is not set
@@ -949,8 +969,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
949# CONFIG_SERIAL_JSM is not set 969# CONFIG_SERIAL_JSM is not set
950# CONFIG_SERIAL_OF_PLATFORM is not set 970# CONFIG_SERIAL_OF_PLATFORM is not set
951CONFIG_UNIX98_PTYS=y 971CONFIG_UNIX98_PTYS=y
972# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
952CONFIG_LEGACY_PTYS=y 973CONFIG_LEGACY_PTYS=y
953CONFIG_LEGACY_PTY_COUNT=256 974CONFIG_LEGACY_PTY_COUNT=256
975# CONFIG_HVC_UDBG is not set
954# CONFIG_IPMI_HANDLER is not set 976# CONFIG_IPMI_HANDLER is not set
955CONFIG_HW_RANDOM=y 977CONFIG_HW_RANDOM=y
956# CONFIG_NVRAM is not set 978# CONFIG_NVRAM is not set
@@ -1042,8 +1064,10 @@ CONFIG_HWMON=y
1042# CONFIG_SENSORS_ADM1029 is not set 1064# CONFIG_SENSORS_ADM1029 is not set
1043# CONFIG_SENSORS_ADM1031 is not set 1065# CONFIG_SENSORS_ADM1031 is not set
1044# CONFIG_SENSORS_ADM9240 is not set 1066# CONFIG_SENSORS_ADM9240 is not set
1067# CONFIG_SENSORS_ADT7462 is not set
1045# CONFIG_SENSORS_ADT7470 is not set 1068# CONFIG_SENSORS_ADT7470 is not set
1046# CONFIG_SENSORS_ADT7473 is not set 1069# CONFIG_SENSORS_ADT7473 is not set
1070# CONFIG_SENSORS_ADT7475 is not set
1047# CONFIG_SENSORS_ATXP1 is not set 1071# CONFIG_SENSORS_ATXP1 is not set
1048# CONFIG_SENSORS_DS1621 is not set 1072# CONFIG_SENSORS_DS1621 is not set
1049# CONFIG_SENSORS_I5K_AMB is not set 1073# CONFIG_SENSORS_I5K_AMB is not set
@@ -1064,6 +1088,7 @@ CONFIG_HWMON=y
1064# CONFIG_SENSORS_LM90 is not set 1088# CONFIG_SENSORS_LM90 is not set
1065# CONFIG_SENSORS_LM92 is not set 1089# CONFIG_SENSORS_LM92 is not set
1066# CONFIG_SENSORS_LM93 is not set 1090# CONFIG_SENSORS_LM93 is not set
1091# CONFIG_SENSORS_LTC4245 is not set
1067# CONFIG_SENSORS_MAX1619 is not set 1092# CONFIG_SENSORS_MAX1619 is not set
1068# CONFIG_SENSORS_MAX6650 is not set 1093# CONFIG_SENSORS_MAX6650 is not set
1069# CONFIG_SENSORS_PC87360 is not set 1094# CONFIG_SENSORS_PC87360 is not set
@@ -1090,11 +1115,11 @@ CONFIG_HWMON=y
1090# CONFIG_THERMAL is not set 1115# CONFIG_THERMAL is not set
1091# CONFIG_THERMAL_HWMON is not set 1116# CONFIG_THERMAL_HWMON is not set
1092# CONFIG_WATCHDOG is not set 1117# CONFIG_WATCHDOG is not set
1118CONFIG_SSB_POSSIBLE=y
1093 1119
1094# 1120#
1095# Sonics Silicon Backplane 1121# Sonics Silicon Backplane
1096# 1122#
1097CONFIG_SSB_POSSIBLE=y
1098# CONFIG_SSB is not set 1123# CONFIG_SSB is not set
1099 1124
1100# 1125#
@@ -1103,18 +1128,13 @@ CONFIG_SSB_POSSIBLE=y
1103# CONFIG_MFD_CORE is not set 1128# CONFIG_MFD_CORE is not set
1104# CONFIG_MFD_SM501 is not set 1129# CONFIG_MFD_SM501 is not set
1105# CONFIG_HTC_PASIC3 is not set 1130# CONFIG_HTC_PASIC3 is not set
1131# CONFIG_TWL4030_CORE is not set
1106# CONFIG_MFD_TMIO is not set 1132# CONFIG_MFD_TMIO is not set
1107# CONFIG_PMIC_DA903X is not set 1133# CONFIG_PMIC_DA903X is not set
1108# CONFIG_MFD_WM8400 is not set 1134# CONFIG_MFD_WM8400 is not set
1109# CONFIG_MFD_WM8350_I2C is not set 1135# CONFIG_MFD_WM8350_I2C is not set
1110 1136# CONFIG_MFD_PCF50633 is not set
1111#
1112# Voltage and Current regulators
1113#
1114# CONFIG_REGULATOR is not set 1137# 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
1118 1138
1119# 1139#
1120# Multimedia devices 1140# Multimedia devices
@@ -1165,12 +1185,6 @@ CONFIG_HID=m
1165# CONFIG_HID_PID is not set 1185# CONFIG_HID_PID is not set
1166 1186
1167# 1187#
1168# USB HID Boot Protocol drivers
1169#
1170# CONFIG_USB_KBD is not set
1171# CONFIG_USB_MOUSE is not set
1172
1173#
1174# Special HID drivers 1188# Special HID drivers
1175# 1189#
1176CONFIG_HID_COMPAT=y 1190CONFIG_HID_COMPAT=y
@@ -1202,6 +1216,7 @@ CONFIG_USB_EHCI_HCD=y
1202# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1216# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1203# CONFIG_USB_EHCI_FSL is not set 1217# CONFIG_USB_EHCI_FSL is not set
1204CONFIG_USB_EHCI_HCD_PPC_OF=y 1218CONFIG_USB_EHCI_HCD_PPC_OF=y
1219# CONFIG_USB_OXU210HP_HCD is not set
1205# CONFIG_USB_ISP116X_HCD is not set 1220# CONFIG_USB_ISP116X_HCD is not set
1206# CONFIG_USB_ISP1760_HCD is not set 1221# CONFIG_USB_ISP1760_HCD is not set
1207CONFIG_USB_OHCI_HCD=y 1222CONFIG_USB_OHCI_HCD=y
@@ -1227,18 +1242,17 @@ CONFIG_USB_PRINTER=m
1227# CONFIG_USB_TMC is not set 1242# CONFIG_USB_TMC is not set
1228 1243
1229# 1244#
1230# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1245# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1231# 1246#
1232 1247
1233# 1248#
1234# may also be needed; see USB_STORAGE Help for more information 1249# see USB_STORAGE Help for more information
1235# 1250#
1236CONFIG_USB_STORAGE=m 1251CONFIG_USB_STORAGE=m
1237# CONFIG_USB_STORAGE_DEBUG is not set 1252# CONFIG_USB_STORAGE_DEBUG is not set
1238# CONFIG_USB_STORAGE_DATAFAB is not set 1253# CONFIG_USB_STORAGE_DATAFAB is not set
1239# CONFIG_USB_STORAGE_FREECOM is not set 1254# CONFIG_USB_STORAGE_FREECOM is not set
1240# CONFIG_USB_STORAGE_ISD200 is not set 1255# CONFIG_USB_STORAGE_ISD200 is not set
1241# CONFIG_USB_STORAGE_DPCM is not set
1242# CONFIG_USB_STORAGE_USBAT is not set 1256# CONFIG_USB_STORAGE_USBAT is not set
1243# CONFIG_USB_STORAGE_SDDR09 is not set 1257# CONFIG_USB_STORAGE_SDDR09 is not set
1244# CONFIG_USB_STORAGE_SDDR55 is not set 1258# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1295,12 +1309,14 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
1295# CONFIG_USB_SERIAL_SPCP8X5 is not set 1309# CONFIG_USB_SERIAL_SPCP8X5 is not set
1296# CONFIG_USB_SERIAL_HP4X is not set 1310# CONFIG_USB_SERIAL_HP4X is not set
1297# CONFIG_USB_SERIAL_SAFE is not set 1311# CONFIG_USB_SERIAL_SAFE is not set
1312# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
1298# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set 1313# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
1299# CONFIG_USB_SERIAL_TI is not set 1314# CONFIG_USB_SERIAL_TI is not set
1300# CONFIG_USB_SERIAL_CYBERJACK is not set 1315# CONFIG_USB_SERIAL_CYBERJACK is not set
1301# CONFIG_USB_SERIAL_XIRCOM is not set 1316# CONFIG_USB_SERIAL_XIRCOM is not set
1302# CONFIG_USB_SERIAL_OPTION is not set 1317# CONFIG_USB_SERIAL_OPTION is not set
1303# CONFIG_USB_SERIAL_OMNINET is not set 1318# CONFIG_USB_SERIAL_OMNINET is not set
1319# CONFIG_USB_SERIAL_OPTICON is not set
1304# CONFIG_USB_SERIAL_DEBUG is not set 1320# CONFIG_USB_SERIAL_DEBUG is not set
1305 1321
1306# 1322#
@@ -1329,6 +1345,10 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
1329# CONFIG_USB_ISIGHTFW is not set 1345# CONFIG_USB_ISIGHTFW is not set
1330# CONFIG_USB_VST is not set 1346# CONFIG_USB_VST is not set
1331# CONFIG_USB_GADGET is not set 1347# CONFIG_USB_GADGET is not set
1348
1349#
1350# OTG and related infrastructure
1351#
1332# CONFIG_UWB is not set 1352# CONFIG_UWB is not set
1333# CONFIG_MMC is not set 1353# CONFIG_MMC is not set
1334# CONFIG_MEMSTICK is not set 1354# CONFIG_MEMSTICK is not set
@@ -1366,6 +1386,7 @@ CONFIG_RTC_DRV_RS5C372=y
1366# CONFIG_RTC_DRV_M41T80 is not set 1386# CONFIG_RTC_DRV_M41T80 is not set
1367# CONFIG_RTC_DRV_S35390A is not set 1387# CONFIG_RTC_DRV_S35390A is not set
1368# CONFIG_RTC_DRV_FM3130 is not set 1388# CONFIG_RTC_DRV_FM3130 is not set
1389# CONFIG_RTC_DRV_RX8581 is not set
1369 1390
1370# 1391#
1371# SPI RTC drivers 1392# SPI RTC drivers
@@ -1417,6 +1438,7 @@ CONFIG_XFS_FS=m
1417# CONFIG_XFS_RT is not set 1438# CONFIG_XFS_RT is not set
1418# CONFIG_XFS_DEBUG is not set 1439# CONFIG_XFS_DEBUG is not set
1419# CONFIG_OCFS2_FS is not set 1440# CONFIG_OCFS2_FS is not set
1441# CONFIG_BTRFS_FS is not set
1420CONFIG_DNOTIFY=y 1442CONFIG_DNOTIFY=y
1421CONFIG_INOTIFY=y 1443CONFIG_INOTIFY=y
1422CONFIG_INOTIFY_USER=y 1444CONFIG_INOTIFY_USER=y
@@ -1458,10 +1480,7 @@ CONFIG_TMPFS=y
1458# CONFIG_TMPFS_POSIX_ACL is not set 1480# CONFIG_TMPFS_POSIX_ACL is not set
1459# CONFIG_HUGETLB_PAGE is not set 1481# CONFIG_HUGETLB_PAGE is not set
1460# CONFIG_CONFIGFS_FS is not set 1482# CONFIG_CONFIGFS_FS is not set
1461 1483CONFIG_MISC_FILESYSTEMS=y
1462#
1463# Miscellaneous filesystems
1464#
1465# CONFIG_ADFS_FS is not set 1484# CONFIG_ADFS_FS is not set
1466# CONFIG_AFFS_FS is not set 1485# CONFIG_AFFS_FS is not set
1467# CONFIG_HFS_FS is not set 1486# CONFIG_HFS_FS is not set
@@ -1471,6 +1490,7 @@ CONFIG_TMPFS=y
1471# CONFIG_EFS_FS is not set 1490# CONFIG_EFS_FS is not set
1472# CONFIG_JFFS2_FS is not set 1491# CONFIG_JFFS2_FS is not set
1473# CONFIG_CRAMFS is not set 1492# CONFIG_CRAMFS is not set
1493# CONFIG_SQUASHFS is not set
1474# CONFIG_VXFS_FS is not set 1494# CONFIG_VXFS_FS is not set
1475# CONFIG_MINIX_FS is not set 1495# CONFIG_MINIX_FS is not set
1476# CONFIG_OMFS_FS is not set 1496# CONFIG_OMFS_FS is not set
@@ -1561,6 +1581,7 @@ CONFIG_NLS_UTF8=m
1561# Library routines 1581# Library routines
1562# 1582#
1563CONFIG_BITREVERSE=y 1583CONFIG_BITREVERSE=y
1584CONFIG_GENERIC_FIND_LAST_BIT=y
1564CONFIG_CRC_CCITT=m 1585CONFIG_CRC_CCITT=m
1565# CONFIG_CRC16 is not set 1586# CONFIG_CRC16 is not set
1566CONFIG_CRC_T10DIF=y 1587CONFIG_CRC_T10DIF=y
@@ -1614,6 +1635,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
1614CONFIG_DEBUG_MEMORY_INIT=y 1635CONFIG_DEBUG_MEMORY_INIT=y
1615# CONFIG_DEBUG_LIST is not set 1636# CONFIG_DEBUG_LIST is not set
1616# CONFIG_DEBUG_SG is not set 1637# CONFIG_DEBUG_SG is not set
1638# CONFIG_DEBUG_NOTIFIERS is not set
1617# CONFIG_BOOT_PRINTK_DELAY is not set 1639# CONFIG_BOOT_PRINTK_DELAY is not set
1618# CONFIG_RCU_TORTURE_TEST is not set 1640# CONFIG_RCU_TORTURE_TEST is not set
1619# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1641# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1623,6 +1645,8 @@ CONFIG_DEBUG_MEMORY_INIT=y
1623# CONFIG_LATENCYTOP is not set 1645# CONFIG_LATENCYTOP is not set
1624CONFIG_SYSCTL_SYSCALL_CHECK=y 1646CONFIG_SYSCTL_SYSCALL_CHECK=y
1625CONFIG_HAVE_FUNCTION_TRACER=y 1647CONFIG_HAVE_FUNCTION_TRACER=y
1648CONFIG_HAVE_DYNAMIC_FTRACE=y
1649CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1626 1650
1627# 1651#
1628# Tracers 1652# Tracers
@@ -1631,11 +1655,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1631# CONFIG_SCHED_TRACER is not set 1655# CONFIG_SCHED_TRACER is not set
1632# CONFIG_CONTEXT_SWITCH_TRACER is not set 1656# CONFIG_CONTEXT_SWITCH_TRACER is not set
1633# CONFIG_BOOT_TRACER is not set 1657# CONFIG_BOOT_TRACER is not set
1658# CONFIG_TRACE_BRANCH_PROFILING is not set
1634# CONFIG_STACK_TRACER is not set 1659# CONFIG_STACK_TRACER is not set
1635# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1660# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1636# CONFIG_SAMPLES is not set 1661# CONFIG_SAMPLES is not set
1637CONFIG_HAVE_ARCH_KGDB=y 1662CONFIG_HAVE_ARCH_KGDB=y
1638# CONFIG_KGDB is not set 1663# CONFIG_KGDB is not set
1664CONFIG_PRINT_STACK_DEPTH=64
1639# CONFIG_DEBUG_STACKOVERFLOW is not set 1665# CONFIG_DEBUG_STACKOVERFLOW is not set
1640# CONFIG_DEBUG_STACK_USAGE is not set 1666# CONFIG_DEBUG_STACK_USAGE is not set
1641# CONFIG_DEBUG_PAGEALLOC is not set 1667# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1662,11 +1688,15 @@ CONFIG_CRYPTO=y
1662# 1688#
1663# CONFIG_CRYPTO_FIPS is not set 1689# CONFIG_CRYPTO_FIPS is not set
1664CONFIG_CRYPTO_ALGAPI=y 1690CONFIG_CRYPTO_ALGAPI=y
1665CONFIG_CRYPTO_AEAD=y 1691CONFIG_CRYPTO_ALGAPI2=y
1692CONFIG_CRYPTO_AEAD2=y
1666CONFIG_CRYPTO_BLKCIPHER=y 1693CONFIG_CRYPTO_BLKCIPHER=y
1694CONFIG_CRYPTO_BLKCIPHER2=y
1667CONFIG_CRYPTO_HASH=y 1695CONFIG_CRYPTO_HASH=y
1668CONFIG_CRYPTO_RNG=y 1696CONFIG_CRYPTO_HASH2=y
1697CONFIG_CRYPTO_RNG2=y
1669CONFIG_CRYPTO_MANAGER=y 1698CONFIG_CRYPTO_MANAGER=y
1699CONFIG_CRYPTO_MANAGER2=y
1670# CONFIG_CRYPTO_GF128MUL is not set 1700# CONFIG_CRYPTO_GF128MUL is not set
1671# CONFIG_CRYPTO_NULL is not set 1701# CONFIG_CRYPTO_NULL is not set
1672# CONFIG_CRYPTO_CRYPTD is not set 1702# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/mgcoge_defconfig b/arch/powerpc/configs/mgcoge_defconfig
index 8d3c62324009..c58c38d5b7a6 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:38 2008 4# Mon Jan 26 15:35:30 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_GPIO=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -89,6 +89,7 @@ CONFIG_EMBEDDED=y
89CONFIG_SYSCTL_SYSCALL=y 89CONFIG_SYSCTL_SYSCALL=y
90CONFIG_KALLSYMS=y 90CONFIG_KALLSYMS=y
91CONFIG_KALLSYMS_ALL=y 91CONFIG_KALLSYMS_ALL=y
92CONFIG_KALLSYMS_STRIP_GENERATED=y
92# CONFIG_KALLSYMS_EXTRA_PASS is not set 93# CONFIG_KALLSYMS_EXTRA_PASS is not set
93CONFIG_HOTPLUG=y 94CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y 95CONFIG_PRINTK=y
@@ -111,7 +112,6 @@ CONFIG_SLAB=y
111# CONFIG_SLUB is not set 112# CONFIG_SLUB is not set
112# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 114# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 115CONFIG_HAVE_OPROFILE=y
116CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 116CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
117CONFIG_HAVE_IOREMAP_PROT=y 117CONFIG_HAVE_IOREMAP_PROT=y
@@ -122,13 +122,11 @@ CONFIG_HAVE_CLK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
127# CONFIG_MODULES is not set 126# CONFIG_MODULES is not set
128CONFIG_BLOCK=y 127CONFIG_BLOCK=y
129# CONFIG_LBD is not set 128# CONFIG_LBD is not set
130# CONFIG_BLK_DEV_IO_TRACE is not set 129# CONFIG_BLK_DEV_IO_TRACE is not set
131# CONFIG_LSF is not set
132# CONFIG_BLK_DEV_INTEGRITY is not set 130# CONFIG_BLK_DEV_INTEGRITY is not set
133 131
134# 132#
@@ -144,6 +142,10 @@ 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_TREE_RCU is not set
146# CONFIG_PREEMPT_RCU is not set
147# CONFIG_TREE_RCU_TRACE is not set
148# CONFIG_PREEMPT_RCU_TRACE is not set
147# CONFIG_FREEZER is not set 149# CONFIG_FREEZER is not set
148 150
149# 151#
@@ -190,6 +192,7 @@ CONFIG_PPC_MPC106=y
190CONFIG_CPM2=y 192CONFIG_CPM2=y
191# CONFIG_FSL_ULI1575 is not set 193# CONFIG_FSL_ULI1575 is not set
192CONFIG_CPM=y 194CONFIG_CPM=y
195# CONFIG_SIMPLE_GPIO is not set
193 196
194# 197#
195# Kernel options 198# Kernel options
@@ -215,6 +218,7 @@ CONFIG_BINFMT_MISC=y
215CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 218CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
216CONFIG_ARCH_HAS_WALK_MEMORY=y 219CONFIG_ARCH_HAS_WALK_MEMORY=y
217CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 220CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
221# CONFIG_CRASH_DUMP is not set
218CONFIG_ARCH_FLATMEM_ENABLE=y 222CONFIG_ARCH_FLATMEM_ENABLE=y
219CONFIG_ARCH_POPULATES_NODE_MAP=y 223CONFIG_ARCH_POPULATES_NODE_MAP=y
220CONFIG_FLATMEM=y 224CONFIG_FLATMEM=y
@@ -222,12 +226,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
222CONFIG_PAGEFLAGS_EXTENDED=y 226CONFIG_PAGEFLAGS_EXTENDED=y
223CONFIG_SPLIT_PTLOCK_CPUS=4 227CONFIG_SPLIT_PTLOCK_CPUS=4
224CONFIG_MIGRATION=y 228CONFIG_MIGRATION=y
225# CONFIG_RESOURCES_64BIT is not set
226# CONFIG_PHYS_ADDR_T_64BIT is not set 229# CONFIG_PHYS_ADDR_T_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=1 230CONFIG_ZONE_DMA_FLAG=1
228CONFIG_BOUNCE=y 231CONFIG_BOUNCE=y
229CONFIG_VIRT_TO_BUS=y 232CONFIG_VIRT_TO_BUS=y
230CONFIG_UNEVICTABLE_LRU=y 233CONFIG_UNEVICTABLE_LRU=y
234CONFIG_PPC_4K_PAGES=y
235# CONFIG_PPC_16K_PAGES is not set
236# CONFIG_PPC_64K_PAGES is not set
231CONFIG_FORCE_MAX_ZONEORDER=11 237CONFIG_FORCE_MAX_ZONEORDER=11
232CONFIG_PROC_DEVICETREE=y 238CONFIG_PROC_DEVICETREE=y
233# CONFIG_CMDLINE_BOOL is not set 239# CONFIG_CMDLINE_BOOL is not set
@@ -253,6 +259,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
253# CONFIG_PCI_MSI is not set 259# CONFIG_PCI_MSI is not set
254# CONFIG_PCI_LEGACY is not set 260# CONFIG_PCI_LEGACY is not set
255# CONFIG_PCI_DEBUG is not set 261# CONFIG_PCI_DEBUG is not set
262# CONFIG_PCI_STUB is not set
256# CONFIG_PCCARD is not set 263# CONFIG_PCCARD is not set
257# CONFIG_HOTPLUG_PCI is not set 264# CONFIG_HOTPLUG_PCI is not set
258# CONFIG_HAS_RAPIDIO is not set 265# CONFIG_HAS_RAPIDIO is not set
@@ -275,6 +282,7 @@ CONFIG_NET=y
275# 282#
276# Networking options 283# Networking options
277# 284#
285CONFIG_COMPAT_NET_DEV_OPS=y
278CONFIG_PACKET=y 286CONFIG_PACKET=y
279# CONFIG_PACKET_MMAP is not set 287# CONFIG_PACKET_MMAP is not set
280CONFIG_UNIX=y 288CONFIG_UNIX=y
@@ -337,6 +345,7 @@ CONFIG_NETFILTER_ADVANCED=y
337# CONFIG_IPX is not set 345# CONFIG_IPX is not set
338# CONFIG_ATALK is not set 346# CONFIG_ATALK is not set
339# CONFIG_NET_SCHED is not set 347# CONFIG_NET_SCHED is not set
348# CONFIG_DCB is not set
340 349
341# 350#
342# Network testing 351# Network testing
@@ -351,8 +360,9 @@ CONFIG_WIRELESS=y
351# CONFIG_CFG80211 is not set 360# CONFIG_CFG80211 is not set
352CONFIG_WIRELESS_OLD_REGULATORY=y 361CONFIG_WIRELESS_OLD_REGULATORY=y
353# CONFIG_WIRELESS_EXT is not set 362# CONFIG_WIRELESS_EXT is not set
363# CONFIG_LIB80211 is not set
354# CONFIG_MAC80211 is not set 364# CONFIG_MAC80211 is not set
355# CONFIG_IEEE80211 is not set 365# CONFIG_WIMAX is not set
356# CONFIG_RFKILL is not set 366# CONFIG_RFKILL is not set
357 367
358# 368#
@@ -451,6 +461,12 @@ CONFIG_MTD_PHYSMAP_OF=y
451# CONFIG_MTD_ONENAND is not set 461# CONFIG_MTD_ONENAND is not set
452 462
453# 463#
464# LPDDR flash memory drivers
465#
466# CONFIG_MTD_LPDDR is not set
467# CONFIG_MTD_QINFO_PROBE is not set
468
469#
454# UBI - Unsorted block images 470# UBI - Unsorted block images
455# 471#
456# CONFIG_MTD_UBI is not set 472# CONFIG_MTD_UBI is not set
@@ -522,6 +538,9 @@ CONFIG_PHYLIB=y
522# CONFIG_BROADCOM_PHY is not set 538# CONFIG_BROADCOM_PHY is not set
523# CONFIG_ICPLUS_PHY is not set 539# CONFIG_ICPLUS_PHY is not set
524# CONFIG_REALTEK_PHY is not set 540# CONFIG_REALTEK_PHY is not set
541# CONFIG_NATIONAL_PHY is not set
542# CONFIG_STE10XP is not set
543# CONFIG_LSI_ET1011C_PHY is not set
525CONFIG_FIXED_PHY=y 544CONFIG_FIXED_PHY=y
526# CONFIG_MDIO_BITBANG is not set 545# CONFIG_MDIO_BITBANG is not set
527CONFIG_NET_ETHERNET=y 546CONFIG_NET_ETHERNET=y
@@ -558,6 +577,10 @@ CONFIG_FS_ENET_HAS_SCC=y
558# CONFIG_WLAN_PRE80211 is not set 577# CONFIG_WLAN_PRE80211 is not set
559# CONFIG_WLAN_80211 is not set 578# CONFIG_WLAN_80211 is not set
560# CONFIG_IWLWIFI_LEDS is not set 579# CONFIG_IWLWIFI_LEDS is not set
580
581#
582# Enable WiMAX (Networking options) to see the WiMAX drivers
583#
561# CONFIG_WAN is not set 584# CONFIG_WAN is not set
562# CONFIG_FDDI is not set 585# CONFIG_FDDI is not set
563# CONFIG_PPP is not set 586# CONFIG_PPP is not set
@@ -601,6 +624,7 @@ CONFIG_SERIAL_CPM=y
601CONFIG_SERIAL_CPM_CONSOLE=y 624CONFIG_SERIAL_CPM_CONSOLE=y
602# CONFIG_SERIAL_JSM is not set 625# CONFIG_SERIAL_JSM is not set
603CONFIG_UNIX98_PTYS=y 626CONFIG_UNIX98_PTYS=y
627# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
604CONFIG_LEGACY_PTYS=y 628CONFIG_LEGACY_PTYS=y
605CONFIG_LEGACY_PTY_COUNT=256 629CONFIG_LEGACY_PTY_COUNT=256
606# CONFIG_BRIQ_PANEL is not set 630# CONFIG_BRIQ_PANEL is not set
@@ -621,6 +645,11 @@ CONFIG_GPIOLIB=y
621# CONFIG_DEBUG_GPIO is not set 645# CONFIG_DEBUG_GPIO is not set
622 646
623# 647#
648# Memory mapped GPIO expanders:
649#
650# CONFIG_GPIO_XILINX is not set
651
652#
624# I2C GPIO expanders: 653# I2C GPIO expanders:
625# 654#
626 655
@@ -638,11 +667,11 @@ CONFIG_GPIOLIB=y
638# CONFIG_THERMAL is not set 667# CONFIG_THERMAL is not set
639# CONFIG_THERMAL_HWMON is not set 668# CONFIG_THERMAL_HWMON is not set
640# CONFIG_WATCHDOG is not set 669# CONFIG_WATCHDOG is not set
670CONFIG_SSB_POSSIBLE=y
641 671
642# 672#
643# Sonics Silicon Backplane 673# Sonics Silicon Backplane
644# 674#
645CONFIG_SSB_POSSIBLE=y
646# CONFIG_SSB is not set 675# CONFIG_SSB is not set
647 676
648# 677#
@@ -652,14 +681,7 @@ CONFIG_SSB_POSSIBLE=y
652# CONFIG_MFD_SM501 is not set 681# CONFIG_MFD_SM501 is not set
653# CONFIG_HTC_PASIC3 is not set 682# CONFIG_HTC_PASIC3 is not set
654# CONFIG_MFD_TMIO is not set 683# CONFIG_MFD_TMIO is not set
655
656#
657# Voltage and Current regulators
658#
659# CONFIG_REGULATOR is not set 684# 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
663 685
664# 686#
665# Multimedia devices 687# Multimedia devices
@@ -753,10 +775,7 @@ CONFIG_TMPFS=y
753# CONFIG_TMPFS_POSIX_ACL is not set 775# CONFIG_TMPFS_POSIX_ACL is not set
754# CONFIG_HUGETLB_PAGE is not set 776# CONFIG_HUGETLB_PAGE is not set
755# CONFIG_CONFIGFS_FS is not set 777# CONFIG_CONFIGFS_FS is not set
756 778CONFIG_MISC_FILESYSTEMS=y
757#
758# Miscellaneous filesystems
759#
760# CONFIG_HFSPLUS_FS is not set 779# CONFIG_HFSPLUS_FS is not set
761CONFIG_JFFS2_FS=y 780CONFIG_JFFS2_FS=y
762CONFIG_JFFS2_FS_DEBUG=0 781CONFIG_JFFS2_FS_DEBUG=0
@@ -768,6 +787,7 @@ CONFIG_JFFS2_ZLIB=y
768CONFIG_JFFS2_RTIME=y 787CONFIG_JFFS2_RTIME=y
769# CONFIG_JFFS2_RUBIN is not set 788# CONFIG_JFFS2_RUBIN is not set
770CONFIG_CRAMFS=y 789CONFIG_CRAMFS=y
790# CONFIG_SQUASHFS is not set
771# CONFIG_VXFS_FS is not set 791# CONFIG_VXFS_FS is not set
772# CONFIG_MINIX_FS is not set 792# CONFIG_MINIX_FS is not set
773# CONFIG_OMFS_FS is not set 793# CONFIG_OMFS_FS is not set
@@ -857,6 +877,7 @@ CONFIG_NLS_UTF8=y
857# Library routines 877# Library routines
858# 878#
859CONFIG_BITREVERSE=y 879CONFIG_BITREVERSE=y
880CONFIG_GENERIC_FIND_LAST_BIT=y
860# CONFIG_CRC_CCITT is not set 881# CONFIG_CRC_CCITT is not set
861# CONFIG_CRC16 is not set 882# CONFIG_CRC16 is not set
862# CONFIG_CRC_T10DIF is not set 883# CONFIG_CRC_T10DIF is not set
@@ -905,6 +926,7 @@ CONFIG_DEBUG_INFO=y
905# CONFIG_DEBUG_MEMORY_INIT is not set 926# CONFIG_DEBUG_MEMORY_INIT is not set
906# CONFIG_DEBUG_LIST is not set 927# CONFIG_DEBUG_LIST is not set
907# CONFIG_DEBUG_SG is not set 928# CONFIG_DEBUG_SG is not set
929# CONFIG_DEBUG_NOTIFIERS is not set
908# CONFIG_BOOT_PRINTK_DELAY is not set 930# CONFIG_BOOT_PRINTK_DELAY is not set
909# CONFIG_RCU_TORTURE_TEST is not set 931# CONFIG_RCU_TORTURE_TEST is not set
910# CONFIG_RCU_CPU_STALL_DETECTOR is not set 932# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -914,6 +936,8 @@ CONFIG_DEBUG_INFO=y
914# CONFIG_LATENCYTOP is not set 936# CONFIG_LATENCYTOP is not set
915CONFIG_SYSCTL_SYSCALL_CHECK=y 937CONFIG_SYSCTL_SYSCALL_CHECK=y
916CONFIG_HAVE_FUNCTION_TRACER=y 938CONFIG_HAVE_FUNCTION_TRACER=y
939CONFIG_HAVE_DYNAMIC_FTRACE=y
940CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
917 941
918# 942#
919# Tracers 943# Tracers
@@ -922,10 +946,12 @@ CONFIG_HAVE_FUNCTION_TRACER=y
922# CONFIG_SCHED_TRACER is not set 946# CONFIG_SCHED_TRACER is not set
923# CONFIG_CONTEXT_SWITCH_TRACER is not set 947# CONFIG_CONTEXT_SWITCH_TRACER is not set
924# CONFIG_BOOT_TRACER is not set 948# CONFIG_BOOT_TRACER is not set
949# CONFIG_TRACE_BRANCH_PROFILING is not set
925# CONFIG_STACK_TRACER is not set 950# CONFIG_STACK_TRACER is not set
926# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 951# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
927# CONFIG_SAMPLES is not set 952# CONFIG_SAMPLES is not set
928CONFIG_HAVE_ARCH_KGDB=y 953CONFIG_HAVE_ARCH_KGDB=y
954CONFIG_PRINT_STACK_DEPTH=64
929# CONFIG_DEBUG_STACKOVERFLOW is not set 955# CONFIG_DEBUG_STACKOVERFLOW is not set
930# CONFIG_DEBUG_STACK_USAGE is not set 956# CONFIG_DEBUG_STACK_USAGE is not set
931# CONFIG_DEBUG_PAGEALLOC is not set 957# CONFIG_DEBUG_PAGEALLOC is not set
@@ -953,11 +979,15 @@ CONFIG_CRYPTO=y
953# 979#
954# CONFIG_CRYPTO_FIPS is not set 980# CONFIG_CRYPTO_FIPS is not set
955CONFIG_CRYPTO_ALGAPI=y 981CONFIG_CRYPTO_ALGAPI=y
956CONFIG_CRYPTO_AEAD=y 982CONFIG_CRYPTO_ALGAPI2=y
983CONFIG_CRYPTO_AEAD2=y
957CONFIG_CRYPTO_BLKCIPHER=y 984CONFIG_CRYPTO_BLKCIPHER=y
985CONFIG_CRYPTO_BLKCIPHER2=y
958CONFIG_CRYPTO_HASH=y 986CONFIG_CRYPTO_HASH=y
959CONFIG_CRYPTO_RNG=y 987CONFIG_CRYPTO_HASH2=y
988CONFIG_CRYPTO_RNG2=y
960CONFIG_CRYPTO_MANAGER=y 989CONFIG_CRYPTO_MANAGER=y
990CONFIG_CRYPTO_MANAGER2=y
961# CONFIG_CRYPTO_NULL is not set 991# CONFIG_CRYPTO_NULL is not set
962# CONFIG_CRYPTO_CRYPTD is not set 992# CONFIG_CRYPTO_CRYPTD is not set
963# CONFIG_CRYPTO_AUTHENC is not set 993# CONFIG_CRYPTO_AUTHENC is not set
diff --git a/arch/powerpc/configs/mgsuvd_defconfig b/arch/powerpc/configs/mgsuvd_defconfig
index fbaa67f7b0ef..297b5d5042be 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:39 2008 4# Mon Jan 26 15:35:32 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_PPC_8xx=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_8xx=y 17CONFIG_8xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -69,12 +70,12 @@ CONFIG_SYSVIPC_SYSCTL=y
69# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
70# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=17 72CONFIG_LOG_BUF_SHIFT=17
72# CONFIG_CGROUPS is not set
73CONFIG_GROUP_SCHED=y 73CONFIG_GROUP_SCHED=y
74CONFIG_FAIR_GROUP_SCHED=y 74CONFIG_FAIR_GROUP_SCHED=y
75# CONFIG_RT_GROUP_SCHED is not set 75# CONFIG_RT_GROUP_SCHED is not set
76CONFIG_USER_SCHED=y 76CONFIG_USER_SCHED=y
77# CONFIG_CGROUP_SCHED is not set 77# CONFIG_CGROUP_SCHED is not set
78# CONFIG_CGROUPS is not set
78CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y 80CONFIG_SYSFS_DEPRECATED_V2=y
80# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
@@ -106,7 +107,6 @@ CONFIG_SLAB=y
106# CONFIG_SLUB is not set 107# CONFIG_SLUB is not set
107# CONFIG_SLOB is not set 108# CONFIG_SLOB is not set
108# CONFIG_PROFILING is not set 109# CONFIG_PROFILING is not set
109# CONFIG_MARKERS is not set
110CONFIG_HAVE_OPROFILE=y 110CONFIG_HAVE_OPROFILE=y
111CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 111CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
112CONFIG_HAVE_IOREMAP_PROT=y 112CONFIG_HAVE_IOREMAP_PROT=y
@@ -117,13 +117,11 @@ CONFIG_HAVE_CLK=y
117# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 117# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
118CONFIG_SLABINFO=y 118CONFIG_SLABINFO=y
119CONFIG_RT_MUTEXES=y 119CONFIG_RT_MUTEXES=y
120# CONFIG_TINY_SHMEM is not set
121CONFIG_BASE_SMALL=1 120CONFIG_BASE_SMALL=1
122# CONFIG_MODULES is not set 121# CONFIG_MODULES is not set
123CONFIG_BLOCK=y 122CONFIG_BLOCK=y
124# CONFIG_LBD is not set 123# CONFIG_LBD is not set
125# CONFIG_BLK_DEV_IO_TRACE is not set 124# CONFIG_BLK_DEV_IO_TRACE is not set
126# CONFIG_LSF is not set
127# CONFIG_BLK_DEV_BSG is not set 125# CONFIG_BLK_DEV_BSG is not set
128# CONFIG_BLK_DEV_INTEGRITY is not set 126# CONFIG_BLK_DEV_INTEGRITY is not set
129 127
@@ -140,6 +138,10 @@ CONFIG_DEFAULT_AS=y
140# CONFIG_DEFAULT_NOOP is not set 138# CONFIG_DEFAULT_NOOP is not set
141CONFIG_DEFAULT_IOSCHED="anticipatory" 139CONFIG_DEFAULT_IOSCHED="anticipatory"
142CONFIG_CLASSIC_RCU=y 140CONFIG_CLASSIC_RCU=y
141# CONFIG_TREE_RCU is not set
142# CONFIG_PREEMPT_RCU is not set
143# CONFIG_TREE_RCU_TRACE is not set
144# CONFIG_PREEMPT_RCU_TRACE is not set
143# CONFIG_FREEZER is not set 145# CONFIG_FREEZER is not set
144 146
145# 147#
@@ -186,6 +188,7 @@ CONFIG_UCODE_PATCH=y
186# CONFIG_QUICC_ENGINE is not set 188# CONFIG_QUICC_ENGINE is not set
187# CONFIG_FSL_ULI1575 is not set 189# CONFIG_FSL_ULI1575 is not set
188CONFIG_CPM=y 190CONFIG_CPM=y
191# CONFIG_SIMPLE_GPIO is not set
189 192
190# 193#
191# Kernel options 194# Kernel options
@@ -209,6 +212,7 @@ CONFIG_BINFMT_ELF=y
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
215CONFIG_PPC_NEED_DMA_SYNC_OPS=y
212CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 216CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
213CONFIG_ARCH_HAS_WALK_MEMORY=y 217CONFIG_ARCH_HAS_WALK_MEMORY=y
214CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 218CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -223,12 +227,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
223CONFIG_PAGEFLAGS_EXTENDED=y 227CONFIG_PAGEFLAGS_EXTENDED=y
224CONFIG_SPLIT_PTLOCK_CPUS=4 228CONFIG_SPLIT_PTLOCK_CPUS=4
225CONFIG_MIGRATION=y 229CONFIG_MIGRATION=y
226# CONFIG_RESOURCES_64BIT is not set
227# CONFIG_PHYS_ADDR_T_64BIT is not set 230# CONFIG_PHYS_ADDR_T_64BIT is not set
228CONFIG_ZONE_DMA_FLAG=1 231CONFIG_ZONE_DMA_FLAG=1
229CONFIG_BOUNCE=y 232CONFIG_BOUNCE=y
230CONFIG_VIRT_TO_BUS=y 233CONFIG_VIRT_TO_BUS=y
231CONFIG_UNEVICTABLE_LRU=y 234CONFIG_UNEVICTABLE_LRU=y
235CONFIG_PPC_4K_PAGES=y
236# CONFIG_PPC_16K_PAGES is not set
237# CONFIG_PPC_64K_PAGES is not set
232CONFIG_FORCE_MAX_ZONEORDER=11 238CONFIG_FORCE_MAX_ZONEORDER=11
233# CONFIG_PROC_DEVICETREE is not set 239# CONFIG_PROC_DEVICETREE is not set
234# CONFIG_CMDLINE_BOOL is not set 240# CONFIG_CMDLINE_BOOL is not set
@@ -269,6 +275,7 @@ CONFIG_NET=y
269# 275#
270# Networking options 276# Networking options
271# 277#
278CONFIG_COMPAT_NET_DEV_OPS=y
272CONFIG_PACKET=y 279CONFIG_PACKET=y
273# CONFIG_PACKET_MMAP is not set 280# CONFIG_PACKET_MMAP is not set
274CONFIG_UNIX=y 281CONFIG_UNIX=y
@@ -325,6 +332,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
325# CONFIG_ECONET is not set 332# CONFIG_ECONET is not set
326# CONFIG_WAN_ROUTER is not set 333# CONFIG_WAN_ROUTER is not set
327# CONFIG_NET_SCHED is not set 334# CONFIG_NET_SCHED is not set
335# CONFIG_DCB is not set
328 336
329# 337#
330# Network testing 338# Network testing
@@ -340,8 +348,9 @@ CONFIG_WIRELESS=y
340# CONFIG_CFG80211 is not set 348# CONFIG_CFG80211 is not set
341CONFIG_WIRELESS_OLD_REGULATORY=y 349CONFIG_WIRELESS_OLD_REGULATORY=y
342# CONFIG_WIRELESS_EXT is not set 350# CONFIG_WIRELESS_EXT is not set
351# CONFIG_LIB80211 is not set
343# CONFIG_MAC80211 is not set 352# CONFIG_MAC80211 is not set
344# CONFIG_IEEE80211 is not set 353# CONFIG_WIMAX is not set
345# CONFIG_RFKILL is not set 354# CONFIG_RFKILL is not set
346# CONFIG_NET_9P is not set 355# CONFIG_NET_9P is not set
347 356
@@ -435,6 +444,12 @@ CONFIG_MTD_PHYSMAP_OF=y
435# CONFIG_MTD_ONENAND is not set 444# CONFIG_MTD_ONENAND is not set
436 445
437# 446#
447# LPDDR flash memory drivers
448#
449# CONFIG_MTD_LPDDR is not set
450# CONFIG_MTD_QINFO_PROBE is not set
451
452#
438# UBI - Unsorted block images 453# UBI - Unsorted block images
439# 454#
440# CONFIG_MTD_UBI is not set 455# CONFIG_MTD_UBI is not set
@@ -489,6 +504,9 @@ CONFIG_PHYLIB=y
489# CONFIG_BROADCOM_PHY is not set 504# CONFIG_BROADCOM_PHY is not set
490# CONFIG_ICPLUS_PHY is not set 505# CONFIG_ICPLUS_PHY is not set
491# CONFIG_REALTEK_PHY is not set 506# CONFIG_REALTEK_PHY is not set
507# CONFIG_NATIONAL_PHY is not set
508# CONFIG_STE10XP is not set
509# CONFIG_LSI_ET1011C_PHY is not set
492CONFIG_FIXED_PHY=y 510CONFIG_FIXED_PHY=y
493# CONFIG_MDIO_BITBANG is not set 511# CONFIG_MDIO_BITBANG is not set
494CONFIG_NET_ETHERNET=y 512CONFIG_NET_ETHERNET=y
@@ -514,6 +532,10 @@ CONFIG_FS_ENET_HAS_SCC=y
514# CONFIG_WLAN_PRE80211 is not set 532# CONFIG_WLAN_PRE80211 is not set
515# CONFIG_WLAN_80211 is not set 533# CONFIG_WLAN_80211 is not set
516# CONFIG_IWLWIFI_LEDS is not set 534# CONFIG_IWLWIFI_LEDS is not set
535
536#
537# Enable WiMAX (Networking options) to see the WiMAX drivers
538#
517# CONFIG_WAN is not set 539# CONFIG_WAN is not set
518# CONFIG_PPP is not set 540# CONFIG_PPP is not set
519# CONFIG_SLIP is not set 541# CONFIG_SLIP is not set
@@ -555,7 +577,9 @@ CONFIG_SERIAL_CORE_CONSOLE=y
555CONFIG_SERIAL_CPM=y 577CONFIG_SERIAL_CPM=y
556CONFIG_SERIAL_CPM_CONSOLE=y 578CONFIG_SERIAL_CPM_CONSOLE=y
557CONFIG_UNIX98_PTYS=y 579CONFIG_UNIX98_PTYS=y
580# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
558# CONFIG_LEGACY_PTYS is not set 581# CONFIG_LEGACY_PTYS is not set
582# CONFIG_HVC_UDBG is not set
559# CONFIG_IPMI_HANDLER is not set 583# CONFIG_IPMI_HANDLER is not set
560CONFIG_HW_RANDOM=y 584CONFIG_HW_RANDOM=y
561# CONFIG_NVRAM is not set 585# CONFIG_NVRAM is not set
@@ -574,11 +598,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
574# CONFIG_THERMAL is not set 598# CONFIG_THERMAL is not set
575# CONFIG_THERMAL_HWMON is not set 599# CONFIG_THERMAL_HWMON is not set
576# CONFIG_WATCHDOG is not set 600# CONFIG_WATCHDOG is not set
601CONFIG_SSB_POSSIBLE=y
577 602
578# 603#
579# Sonics Silicon Backplane 604# Sonics Silicon Backplane
580# 605#
581CONFIG_SSB_POSSIBLE=y
582# CONFIG_SSB is not set 606# CONFIG_SSB is not set
583 607
584# 608#
@@ -588,14 +612,7 @@ CONFIG_SSB_POSSIBLE=y
588# CONFIG_MFD_SM501 is not set 612# CONFIG_MFD_SM501 is not set
589# CONFIG_HTC_PASIC3 is not set 613# CONFIG_HTC_PASIC3 is not set
590# CONFIG_MFD_TMIO is not set 614# CONFIG_MFD_TMIO is not set
591
592#
593# Voltage and Current regulators
594#
595# CONFIG_REGULATOR is not set 615# 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
599 616
600# 617#
601# Multimedia devices 618# Multimedia devices
@@ -659,6 +676,7 @@ CONFIG_FS_MBCACHE=y
659CONFIG_FILE_LOCKING=y 676CONFIG_FILE_LOCKING=y
660# CONFIG_XFS_FS is not set 677# CONFIG_XFS_FS is not set
661# CONFIG_OCFS2_FS is not set 678# CONFIG_OCFS2_FS is not set
679# CONFIG_BTRFS_FS is not set
662CONFIG_DNOTIFY=y 680CONFIG_DNOTIFY=y
663CONFIG_INOTIFY=y 681CONFIG_INOTIFY=y
664CONFIG_INOTIFY_USER=y 682CONFIG_INOTIFY_USER=y
@@ -692,10 +710,7 @@ CONFIG_TMPFS=y
692# CONFIG_TMPFS_POSIX_ACL is not set 710# CONFIG_TMPFS_POSIX_ACL is not set
693# CONFIG_HUGETLB_PAGE is not set 711# CONFIG_HUGETLB_PAGE is not set
694# CONFIG_CONFIGFS_FS is not set 712# CONFIG_CONFIGFS_FS is not set
695 713CONFIG_MISC_FILESYSTEMS=y
696#
697# Miscellaneous filesystems
698#
699# CONFIG_ADFS_FS is not set 714# CONFIG_ADFS_FS is not set
700# CONFIG_AFFS_FS is not set 715# CONFIG_AFFS_FS is not set
701# CONFIG_HFS_FS is not set 716# CONFIG_HFS_FS is not set
@@ -715,6 +730,7 @@ CONFIG_JFFS2_ZLIB=y
715CONFIG_JFFS2_RTIME=y 730CONFIG_JFFS2_RTIME=y
716# CONFIG_JFFS2_RUBIN is not set 731# CONFIG_JFFS2_RUBIN is not set
717CONFIG_CRAMFS=y 732CONFIG_CRAMFS=y
733# CONFIG_SQUASHFS is not set
718# CONFIG_VXFS_FS is not set 734# CONFIG_VXFS_FS is not set
719# CONFIG_MINIX_FS is not set 735# CONFIG_MINIX_FS is not set
720# CONFIG_OMFS_FS is not set 736# CONFIG_OMFS_FS is not set
@@ -771,6 +787,7 @@ CONFIG_MSDOS_PARTITION=y
771# Library routines 787# Library routines
772# 788#
773CONFIG_BITREVERSE=y 789CONFIG_BITREVERSE=y
790CONFIG_GENERIC_FIND_LAST_BIT=y
774CONFIG_CRC_CCITT=y 791CONFIG_CRC_CCITT=y
775# CONFIG_CRC16 is not set 792# CONFIG_CRC16 is not set
776# CONFIG_CRC_T10DIF is not set 793# CONFIG_CRC_T10DIF is not set
@@ -802,6 +819,8 @@ CONFIG_DEBUG_FS=y
802# CONFIG_RCU_CPU_STALL_DETECTOR is not set 819# CONFIG_RCU_CPU_STALL_DETECTOR is not set
803# CONFIG_LATENCYTOP is not set 820# CONFIG_LATENCYTOP is not set
804CONFIG_HAVE_FUNCTION_TRACER=y 821CONFIG_HAVE_FUNCTION_TRACER=y
822CONFIG_HAVE_DYNAMIC_FTRACE=y
823CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
805 824
806# 825#
807# Tracers 826# Tracers
@@ -809,6 +828,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
809# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 828# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
810# CONFIG_SAMPLES is not set 829# CONFIG_SAMPLES is not set
811CONFIG_HAVE_ARCH_KGDB=y 830CONFIG_HAVE_ARCH_KGDB=y
831CONFIG_PRINT_STACK_DEPTH=64
812# CONFIG_IRQSTACKS is not set 832# CONFIG_IRQSTACKS is not set
813# CONFIG_VIRQ_DEBUG is not set 833# CONFIG_VIRQ_DEBUG is not set
814# CONFIG_PPC_EARLY_DEBUG is not set 834# CONFIG_PPC_EARLY_DEBUG is not set
@@ -827,6 +847,7 @@ CONFIG_CRYPTO=y
827# 847#
828# CONFIG_CRYPTO_FIPS is not set 848# CONFIG_CRYPTO_FIPS is not set
829# CONFIG_CRYPTO_MANAGER is not set 849# CONFIG_CRYPTO_MANAGER is not set
850# CONFIG_CRYPTO_MANAGER2 is not set
830# CONFIG_CRYPTO_GF128MUL is not set 851# CONFIG_CRYPTO_GF128MUL is not set
831# CONFIG_CRYPTO_NULL is not set 852# CONFIG_CRYPTO_NULL is not set
832# CONFIG_CRYPTO_CRYPTD is not set 853# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index f80b1ca43afb..38712e861c46 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:40 2008 4# Mon Jan 26 15:35:33 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -43,7 +43,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
43CONFIG_PPC=y 43CONFIG_PPC=y
44CONFIG_EARLY_PRINTK=y 44CONFIG_EARLY_PRINTK=y
45CONFIG_GENERIC_NVRAM=y 45CONFIG_GENERIC_NVRAM=y
46CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 46CONFIG_SCHED_OMIT_FRAME_POINTER=y
47CONFIG_ARCH_MAY_HAVE_PC_FDC=y 47CONFIG_ARCH_MAY_HAVE_PC_FDC=y
48CONFIG_PPC_OF=y 48CONFIG_PPC_OF=y
49CONFIG_OF=y 49CONFIG_OF=y
@@ -73,12 +73,12 @@ CONFIG_SYSVIPC_SYSCTL=y
73# CONFIG_AUDIT is not set 73# CONFIG_AUDIT is not set
74# CONFIG_IKCONFIG is not set 74# CONFIG_IKCONFIG is not set
75CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
76# CONFIG_CGROUPS is not set
77CONFIG_GROUP_SCHED=y 76CONFIG_GROUP_SCHED=y
78# CONFIG_FAIR_GROUP_SCHED is not set 77# CONFIG_FAIR_GROUP_SCHED is not set
79# CONFIG_RT_GROUP_SCHED is not set 78# CONFIG_RT_GROUP_SCHED is not set
80CONFIG_USER_SCHED=y 79CONFIG_USER_SCHED=y
81# CONFIG_CGROUP_SCHED is not set 80# CONFIG_CGROUP_SCHED is not set
81# CONFIG_CGROUPS is not set
82CONFIG_SYSFS_DEPRECATED=y 82CONFIG_SYSFS_DEPRECATED=y
83CONFIG_SYSFS_DEPRECATED_V2=y 83CONFIG_SYSFS_DEPRECATED_V2=y
84# CONFIG_RELAY is not set 84# CONFIG_RELAY is not set
@@ -112,7 +112,6 @@ CONFIG_SLUB_DEBUG=y
112CONFIG_SLUB=y 112CONFIG_SLUB=y
113# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
114# CONFIG_PROFILING is not set 114# CONFIG_PROFILING is not set
115# CONFIG_MARKERS is not set
116CONFIG_HAVE_OPROFILE=y 115CONFIG_HAVE_OPROFILE=y
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 116CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
118CONFIG_HAVE_IOREMAP_PROT=y 117CONFIG_HAVE_IOREMAP_PROT=y
@@ -122,13 +121,11 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 121# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 122CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 123CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 124CONFIG_BASE_SMALL=0
127# CONFIG_MODULES is not set 125# CONFIG_MODULES is not set
128CONFIG_BLOCK=y 126CONFIG_BLOCK=y
129CONFIG_LBD=y 127CONFIG_LBD=y
130# CONFIG_BLK_DEV_IO_TRACE is not set 128# CONFIG_BLK_DEV_IO_TRACE is not set
131# CONFIG_LSF is not set
132# CONFIG_BLK_DEV_BSG is not set 129# CONFIG_BLK_DEV_BSG is not set
133# CONFIG_BLK_DEV_INTEGRITY is not set 130# CONFIG_BLK_DEV_INTEGRITY is not set
134 131
@@ -145,6 +142,10 @@ CONFIG_DEFAULT_AS=y
145# CONFIG_DEFAULT_NOOP is not set 142# CONFIG_DEFAULT_NOOP is not set
146CONFIG_DEFAULT_IOSCHED="anticipatory" 143CONFIG_DEFAULT_IOSCHED="anticipatory"
147CONFIG_CLASSIC_RCU=y 144CONFIG_CLASSIC_RCU=y
145# CONFIG_TREE_RCU is not set
146# CONFIG_PREEMPT_RCU is not set
147# CONFIG_TREE_RCU_TRACE is not set
148# CONFIG_PREEMPT_RCU_TRACE is not set
148# CONFIG_FREEZER is not set 149# CONFIG_FREEZER is not set
149 150
150# 151#
@@ -184,6 +185,7 @@ CONFIG_MPIC_WEIRD=y
184# CONFIG_CPU_FREQ is not set 185# CONFIG_CPU_FREQ is not set
185# CONFIG_TAU is not set 186# CONFIG_TAU is not set
186# CONFIG_FSL_ULI1575 is not set 187# CONFIG_FSL_ULI1575 is not set
188# CONFIG_SIMPLE_GPIO is not set
187 189
188# 190#
189# Kernel options 191# Kernel options
@@ -211,6 +213,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
211CONFIG_ARCH_HAS_WALK_MEMORY=y 213CONFIG_ARCH_HAS_WALK_MEMORY=y
212CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 214CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
213# CONFIG_KEXEC is not set 215# CONFIG_KEXEC is not set
216# CONFIG_CRASH_DUMP is not set
214CONFIG_ARCH_FLATMEM_ENABLE=y 217CONFIG_ARCH_FLATMEM_ENABLE=y
215CONFIG_ARCH_POPULATES_NODE_MAP=y 218CONFIG_ARCH_POPULATES_NODE_MAP=y
216CONFIG_SELECT_MEMORY_MODEL=y 219CONFIG_SELECT_MEMORY_MODEL=y
@@ -222,12 +225,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
222CONFIG_PAGEFLAGS_EXTENDED=y 225CONFIG_PAGEFLAGS_EXTENDED=y
223CONFIG_SPLIT_PTLOCK_CPUS=4 226CONFIG_SPLIT_PTLOCK_CPUS=4
224CONFIG_MIGRATION=y 227CONFIG_MIGRATION=y
225# CONFIG_RESOURCES_64BIT is not set
226# CONFIG_PHYS_ADDR_T_64BIT is not set 228# CONFIG_PHYS_ADDR_T_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=1 229CONFIG_ZONE_DMA_FLAG=1
228CONFIG_BOUNCE=y 230CONFIG_BOUNCE=y
229CONFIG_VIRT_TO_BUS=y 231CONFIG_VIRT_TO_BUS=y
230CONFIG_UNEVICTABLE_LRU=y 232CONFIG_UNEVICTABLE_LRU=y
233CONFIG_PPC_4K_PAGES=y
234# CONFIG_PPC_16K_PAGES is not set
235# CONFIG_PPC_64K_PAGES is not set
231CONFIG_FORCE_MAX_ZONEORDER=11 236CONFIG_FORCE_MAX_ZONEORDER=11
232CONFIG_PROC_DEVICETREE=y 237CONFIG_PROC_DEVICETREE=y
233# CONFIG_CMDLINE_BOOL is not set 238# CONFIG_CMDLINE_BOOL is not set
@@ -249,6 +254,7 @@ CONFIG_PCI_SYSCALL=y
249CONFIG_ARCH_SUPPORTS_MSI=y 254CONFIG_ARCH_SUPPORTS_MSI=y
250# CONFIG_PCI_MSI is not set 255# CONFIG_PCI_MSI is not set
251# CONFIG_PCI_LEGACY is not set 256# CONFIG_PCI_LEGACY is not set
257# CONFIG_PCI_STUB is not set
252# CONFIG_PCCARD is not set 258# CONFIG_PCCARD is not set
253# CONFIG_HOTPLUG_PCI is not set 259# CONFIG_HOTPLUG_PCI is not set
254# CONFIG_HAS_RAPIDIO is not set 260# CONFIG_HAS_RAPIDIO is not set
@@ -271,6 +277,7 @@ CONFIG_NET=y
271# 277#
272# Networking options 278# Networking options
273# 279#
280CONFIG_COMPAT_NET_DEV_OPS=y
274CONFIG_PACKET=y 281CONFIG_PACKET=y
275# CONFIG_PACKET_MMAP is not set 282# CONFIG_PACKET_MMAP is not set
276CONFIG_UNIX=y 283CONFIG_UNIX=y
@@ -327,6 +334,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
327# CONFIG_ECONET is not set 334# CONFIG_ECONET is not set
328# CONFIG_WAN_ROUTER is not set 335# CONFIG_WAN_ROUTER is not set
329# CONFIG_NET_SCHED is not set 336# CONFIG_NET_SCHED is not set
337# CONFIG_DCB is not set
330 338
331# 339#
332# Network testing 340# Network testing
@@ -342,8 +350,9 @@ CONFIG_WIRELESS=y
342# CONFIG_CFG80211 is not set 350# CONFIG_CFG80211 is not set
343CONFIG_WIRELESS_OLD_REGULATORY=y 351CONFIG_WIRELESS_OLD_REGULATORY=y
344# CONFIG_WIRELESS_EXT is not set 352# CONFIG_WIRELESS_EXT is not set
353# CONFIG_LIB80211 is not set
345# CONFIG_MAC80211 is not set 354# CONFIG_MAC80211 is not set
346# CONFIG_IEEE80211 is not set 355# CONFIG_WIMAX is not set
347# CONFIG_RFKILL is not set 356# CONFIG_RFKILL is not set
348# CONFIG_NET_9P is not set 357# CONFIG_NET_9P is not set
349 358
@@ -388,6 +397,7 @@ CONFIG_MISC_DEVICES=y
388# CONFIG_TIFM_CORE is not set 397# CONFIG_TIFM_CORE is not set
389# CONFIG_ENCLOSURE_SERVICES is not set 398# CONFIG_ENCLOSURE_SERVICES is not set
390# CONFIG_HP_ILO is not set 399# CONFIG_HP_ILO is not set
400# CONFIG_C2PORT is not set
391CONFIG_HAVE_IDE=y 401CONFIG_HAVE_IDE=y
392# CONFIG_IDE is not set 402# CONFIG_IDE is not set
393 403
@@ -429,6 +439,7 @@ CONFIG_BLK_DEV_SD=y
429# CONFIG_SCSI_SRP_ATTRS is not set 439# CONFIG_SCSI_SRP_ATTRS is not set
430CONFIG_SCSI_LOWLEVEL=y 440CONFIG_SCSI_LOWLEVEL=y
431# CONFIG_ISCSI_TCP is not set 441# CONFIG_ISCSI_TCP is not set
442# CONFIG_SCSI_CXGB3_ISCSI is not set
432# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 443# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
433# CONFIG_SCSI_3W_9XXX is not set 444# CONFIG_SCSI_3W_9XXX is not set
434# CONFIG_SCSI_ACARD is not set 445# CONFIG_SCSI_ACARD is not set
@@ -445,6 +456,8 @@ CONFIG_SCSI_LOWLEVEL=y
445# CONFIG_MEGARAID_SAS is not set 456# CONFIG_MEGARAID_SAS is not set
446# CONFIG_SCSI_HPTIOP is not set 457# CONFIG_SCSI_HPTIOP is not set
447# CONFIG_SCSI_BUSLOGIC is not set 458# CONFIG_SCSI_BUSLOGIC is not set
459# CONFIG_LIBFC is not set
460# CONFIG_FCOE is not set
448# CONFIG_SCSI_DMX3191D is not set 461# CONFIG_SCSI_DMX3191D is not set
449# CONFIG_SCSI_EATA is not set 462# CONFIG_SCSI_EATA is not set
450# CONFIG_SCSI_FUTURE_DOMAIN is not set 463# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -563,6 +576,9 @@ CONFIG_PHYLIB=y
563# CONFIG_BROADCOM_PHY is not set 576# CONFIG_BROADCOM_PHY is not set
564# CONFIG_ICPLUS_PHY is not set 577# CONFIG_ICPLUS_PHY is not set
565# CONFIG_REALTEK_PHY is not set 578# CONFIG_REALTEK_PHY is not set
579# CONFIG_NATIONAL_PHY is not set
580# CONFIG_STE10XP is not set
581# CONFIG_LSI_ET1011C_PHY is not set
566# CONFIG_FIXED_PHY is not set 582# CONFIG_FIXED_PHY is not set
567# CONFIG_MDIO_BITBANG is not set 583# CONFIG_MDIO_BITBANG is not set
568CONFIG_NET_ETHERNET=y 584CONFIG_NET_ETHERNET=y
@@ -586,7 +602,6 @@ CONFIG_NET_PCI=y
586# CONFIG_ADAPTEC_STARFIRE is not set 602# CONFIG_ADAPTEC_STARFIRE is not set
587# CONFIG_B44 is not set 603# CONFIG_B44 is not set
588# CONFIG_FORCEDETH is not set 604# CONFIG_FORCEDETH is not set
589# CONFIG_EEPRO100 is not set
590CONFIG_E100=y 605CONFIG_E100=y
591# CONFIG_FEALNX is not set 606# CONFIG_FEALNX is not set
592# CONFIG_NATSEMI is not set 607# CONFIG_NATSEMI is not set
@@ -600,6 +615,7 @@ CONFIG_8139TOO=y
600# CONFIG_R6040 is not set 615# CONFIG_R6040 is not set
601# CONFIG_SIS900 is not set 616# CONFIG_SIS900 is not set
602# CONFIG_EPIC100 is not set 617# CONFIG_EPIC100 is not set
618# CONFIG_SMSC9420 is not set
603# CONFIG_SUNDANCE is not set 619# CONFIG_SUNDANCE is not set
604# CONFIG_TLAN is not set 620# CONFIG_TLAN is not set
605# CONFIG_VIA_RHINE is not set 621# CONFIG_VIA_RHINE is not set
@@ -630,6 +646,7 @@ CONFIG_TSI108_ETH=y
630# CONFIG_JME is not set 646# CONFIG_JME is not set
631CONFIG_NETDEV_10000=y 647CONFIG_NETDEV_10000=y
632# CONFIG_CHELSIO_T1 is not set 648# CONFIG_CHELSIO_T1 is not set
649CONFIG_CHELSIO_T3_DEPENDS=y
633# CONFIG_CHELSIO_T3 is not set 650# CONFIG_CHELSIO_T3 is not set
634# CONFIG_ENIC is not set 651# CONFIG_ENIC is not set
635# CONFIG_IXGBE is not set 652# CONFIG_IXGBE is not set
@@ -652,6 +669,10 @@ CONFIG_NETDEV_10000=y
652# CONFIG_WLAN_PRE80211 is not set 669# CONFIG_WLAN_PRE80211 is not set
653# CONFIG_WLAN_80211 is not set 670# CONFIG_WLAN_80211 is not set
654# CONFIG_IWLWIFI_LEDS is not set 671# CONFIG_IWLWIFI_LEDS is not set
672
673#
674# Enable WiMAX (Networking options) to see the WiMAX drivers
675#
655# CONFIG_WAN is not set 676# CONFIG_WAN is not set
656# CONFIG_FDDI is not set 677# CONFIG_FDDI is not set
657# CONFIG_HIPPI is not set 678# CONFIG_HIPPI is not set
@@ -722,8 +743,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
722# CONFIG_SERIAL_JSM is not set 743# CONFIG_SERIAL_JSM is not set
723# CONFIG_SERIAL_OF_PLATFORM is not set 744# CONFIG_SERIAL_OF_PLATFORM is not set
724CONFIG_UNIX98_PTYS=y 745CONFIG_UNIX98_PTYS=y
746# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
725CONFIG_LEGACY_PTYS=y 747CONFIG_LEGACY_PTYS=y
726CONFIG_LEGACY_PTY_COUNT=256 748CONFIG_LEGACY_PTY_COUNT=256
749# CONFIG_HVC_UDBG is not set
727# CONFIG_IPMI_HANDLER is not set 750# CONFIG_IPMI_HANDLER is not set
728# CONFIG_HW_RANDOM is not set 751# CONFIG_HW_RANDOM is not set
729# CONFIG_NVRAM is not set 752# CONFIG_NVRAM is not set
@@ -760,11 +783,11 @@ CONFIG_HWMON=y
760# CONFIG_THERMAL is not set 783# CONFIG_THERMAL is not set
761# CONFIG_THERMAL_HWMON is not set 784# CONFIG_THERMAL_HWMON is not set
762# CONFIG_WATCHDOG is not set 785# CONFIG_WATCHDOG is not set
786CONFIG_SSB_POSSIBLE=y
763 787
764# 788#
765# Sonics Silicon Backplane 789# Sonics Silicon Backplane
766# 790#
767CONFIG_SSB_POSSIBLE=y
768# CONFIG_SSB is not set 791# CONFIG_SSB is not set
769 792
770# 793#
@@ -774,14 +797,7 @@ CONFIG_SSB_POSSIBLE=y
774# CONFIG_MFD_SM501 is not set 797# CONFIG_MFD_SM501 is not set
775# CONFIG_HTC_PASIC3 is not set 798# CONFIG_HTC_PASIC3 is not set
776# CONFIG_MFD_TMIO is not set 799# CONFIG_MFD_TMIO is not set
777
778#
779# Voltage and Current regulators
780#
781# CONFIG_REGULATOR is not set 800# 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 801
786# 802#
787# Multimedia devices 803# Multimedia devices
@@ -837,9 +853,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
837# 853#
838 854
839# 855#
840# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 856# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
841# 857#
842# CONFIG_USB_GADGET is not set 858# CONFIG_USB_GADGET is not set
859
860#
861# OTG and related infrastructure
862#
843# CONFIG_UWB is not set 863# CONFIG_UWB is not set
844# CONFIG_MMC is not set 864# CONFIG_MMC is not set
845# CONFIG_MEMSTICK is not set 865# CONFIG_MEMSTICK is not set
@@ -870,7 +890,9 @@ CONFIG_FS_MBCACHE=y
870# CONFIG_FS_POSIX_ACL is not set 890# CONFIG_FS_POSIX_ACL is not set
871CONFIG_FILE_LOCKING=y 891CONFIG_FILE_LOCKING=y
872# CONFIG_XFS_FS is not set 892# CONFIG_XFS_FS is not set
893# CONFIG_GFS2_FS is not set
873# CONFIG_OCFS2_FS is not set 894# CONFIG_OCFS2_FS is not set
895# CONFIG_BTRFS_FS is not set
874CONFIG_DNOTIFY=y 896CONFIG_DNOTIFY=y
875CONFIG_INOTIFY=y 897CONFIG_INOTIFY=y
876CONFIG_INOTIFY_USER=y 898CONFIG_INOTIFY_USER=y
@@ -904,10 +926,7 @@ CONFIG_TMPFS=y
904# CONFIG_TMPFS_POSIX_ACL is not set 926# CONFIG_TMPFS_POSIX_ACL is not set
905# CONFIG_HUGETLB_PAGE is not set 927# CONFIG_HUGETLB_PAGE is not set
906# CONFIG_CONFIGFS_FS is not set 928# CONFIG_CONFIGFS_FS is not set
907 929CONFIG_MISC_FILESYSTEMS=y
908#
909# Miscellaneous filesystems
910#
911# CONFIG_ADFS_FS is not set 930# CONFIG_ADFS_FS is not set
912# CONFIG_AFFS_FS is not set 931# CONFIG_AFFS_FS is not set
913# CONFIG_HFS_FS is not set 932# CONFIG_HFS_FS is not set
@@ -916,6 +935,7 @@ CONFIG_TMPFS=y
916# CONFIG_BFS_FS is not set 935# CONFIG_BFS_FS is not set
917# CONFIG_EFS_FS is not set 936# CONFIG_EFS_FS is not set
918# CONFIG_CRAMFS is not set 937# CONFIG_CRAMFS is not set
938# CONFIG_SQUASHFS is not set
919# CONFIG_VXFS_FS is not set 939# CONFIG_VXFS_FS is not set
920# CONFIG_MINIX_FS is not set 940# CONFIG_MINIX_FS is not set
921# CONFIG_OMFS_FS is not set 941# CONFIG_OMFS_FS is not set
@@ -970,6 +990,7 @@ CONFIG_MSDOS_PARTITION=y
970# Library routines 990# Library routines
971# 991#
972CONFIG_BITREVERSE=y 992CONFIG_BITREVERSE=y
993CONFIG_GENERIC_FIND_LAST_BIT=y
973# CONFIG_CRC_CCITT is not set 994# CONFIG_CRC_CCITT is not set
974# CONFIG_CRC16 is not set 995# CONFIG_CRC16 is not set
975CONFIG_CRC_T10DIF=y 996CONFIG_CRC_T10DIF=y
@@ -1003,6 +1024,8 @@ CONFIG_FRAME_WARN=1024
1003# CONFIG_LATENCYTOP is not set 1024# CONFIG_LATENCYTOP is not set
1004CONFIG_SYSCTL_SYSCALL_CHECK=y 1025CONFIG_SYSCTL_SYSCALL_CHECK=y
1005CONFIG_HAVE_FUNCTION_TRACER=y 1026CONFIG_HAVE_FUNCTION_TRACER=y
1027CONFIG_HAVE_DYNAMIC_FTRACE=y
1028CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1006 1029
1007# 1030#
1008# Tracers 1031# Tracers
@@ -1010,6 +1033,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1010# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1033# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1011# CONFIG_SAMPLES is not set 1034# CONFIG_SAMPLES is not set
1012CONFIG_HAVE_ARCH_KGDB=y 1035CONFIG_HAVE_ARCH_KGDB=y
1036CONFIG_PRINT_STACK_DEPTH=64
1013# CONFIG_IRQSTACKS is not set 1037# CONFIG_IRQSTACKS is not set
1014# CONFIG_BOOTX_TEXT is not set 1038# CONFIG_BOOTX_TEXT is not set
1015# CONFIG_PPC_EARLY_DEBUG is not set 1039# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1028,6 +1052,7 @@ CONFIG_CRYPTO=y
1028# 1052#
1029# CONFIG_CRYPTO_FIPS is not set 1053# CONFIG_CRYPTO_FIPS is not set
1030# CONFIG_CRYPTO_MANAGER is not set 1054# CONFIG_CRYPTO_MANAGER is not set
1055# CONFIG_CRYPTO_MANAGER2 is not set
1031# CONFIG_CRYPTO_GF128MUL is not set 1056# CONFIG_CRYPTO_GF128MUL is not set
1032# CONFIG_CRYPTO_NULL is not set 1057# CONFIG_CRYPTO_NULL is not set
1033# CONFIG_CRYPTO_CRYPTD is not set 1058# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig
index c8f5dec1b696..d85a43cb821f 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:41 2008 4# Mon Jan 26 15:35:35 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_GPIO=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -86,6 +86,7 @@ CONFIG_EMBEDDED=y
86CONFIG_SYSCTL_SYSCALL=y 86CONFIG_SYSCTL_SYSCALL=y
87CONFIG_KALLSYMS=y 87CONFIG_KALLSYMS=y
88CONFIG_KALLSYMS_ALL=y 88CONFIG_KALLSYMS_ALL=y
89CONFIG_KALLSYMS_STRIP_GENERATED=y
89# CONFIG_KALLSYMS_EXTRA_PASS is not set 90# CONFIG_KALLSYMS_EXTRA_PASS is not set
90CONFIG_HOTPLUG=y 91CONFIG_HOTPLUG=y
91CONFIG_PRINTK=y 92CONFIG_PRINTK=y
@@ -108,7 +109,6 @@ CONFIG_SLUB_DEBUG=y
108CONFIG_SLUB=y 109CONFIG_SLUB=y
109# CONFIG_SLOB is not set 110# CONFIG_SLOB is not set
110# CONFIG_PROFILING is not set 111# CONFIG_PROFILING is not set
111# CONFIG_MARKERS is not set
112CONFIG_HAVE_OPROFILE=y 112CONFIG_HAVE_OPROFILE=y
113CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 113CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
114CONFIG_HAVE_IOREMAP_PROT=y 114CONFIG_HAVE_IOREMAP_PROT=y
@@ -119,13 +119,11 @@ CONFIG_HAVE_CLK=y
119# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 119# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
120CONFIG_SLABINFO=y 120CONFIG_SLABINFO=y
121CONFIG_RT_MUTEXES=y 121CONFIG_RT_MUTEXES=y
122# CONFIG_TINY_SHMEM is not set
123CONFIG_BASE_SMALL=0 122CONFIG_BASE_SMALL=0
124# CONFIG_MODULES is not set 123# CONFIG_MODULES is not set
125CONFIG_BLOCK=y 124CONFIG_BLOCK=y
126# CONFIG_LBD is not set 125# CONFIG_LBD is not set
127# CONFIG_BLK_DEV_IO_TRACE is not set 126# CONFIG_BLK_DEV_IO_TRACE is not set
128# CONFIG_LSF is not set
129# CONFIG_BLK_DEV_INTEGRITY is not set 127# CONFIG_BLK_DEV_INTEGRITY is not set
130 128
131# 129#
@@ -141,6 +139,10 @@ CONFIG_DEFAULT_AS=y
141# CONFIG_DEFAULT_NOOP is not set 139# CONFIG_DEFAULT_NOOP is not set
142CONFIG_DEFAULT_IOSCHED="anticipatory" 140CONFIG_DEFAULT_IOSCHED="anticipatory"
143CONFIG_CLASSIC_RCU=y 141CONFIG_CLASSIC_RCU=y
142# CONFIG_TREE_RCU is not set
143# CONFIG_PREEMPT_RCU is not set
144# CONFIG_TREE_RCU_TRACE is not set
145# CONFIG_PREEMPT_RCU_TRACE is not set
144# CONFIG_FREEZER is not set 146# CONFIG_FREEZER is not set
145 147
146# 148#
@@ -183,6 +185,7 @@ CONFIG_PQ2_ADS_PCI_PIC=y
183CONFIG_CPM2=y 185CONFIG_CPM2=y
184# CONFIG_FSL_ULI1575 is not set 186# CONFIG_FSL_ULI1575 is not set
185CONFIG_CPM=y 187CONFIG_CPM=y
188# CONFIG_SIMPLE_GPIO is not set
186 189
187# 190#
188# Kernel options 191# Kernel options
@@ -209,6 +212,7 @@ CONFIG_BINFMT_MISC=y
209CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 212CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
210CONFIG_ARCH_HAS_WALK_MEMORY=y 213CONFIG_ARCH_HAS_WALK_MEMORY=y
211CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 214CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
215# CONFIG_CRASH_DUMP is not set
212CONFIG_ARCH_FLATMEM_ENABLE=y 216CONFIG_ARCH_FLATMEM_ENABLE=y
213CONFIG_ARCH_POPULATES_NODE_MAP=y 217CONFIG_ARCH_POPULATES_NODE_MAP=y
214CONFIG_FLATMEM=y 218CONFIG_FLATMEM=y
@@ -216,12 +220,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
216CONFIG_PAGEFLAGS_EXTENDED=y 220CONFIG_PAGEFLAGS_EXTENDED=y
217CONFIG_SPLIT_PTLOCK_CPUS=4 221CONFIG_SPLIT_PTLOCK_CPUS=4
218CONFIG_MIGRATION=y 222CONFIG_MIGRATION=y
219# CONFIG_RESOURCES_64BIT is not set
220# CONFIG_PHYS_ADDR_T_64BIT is not set 223# CONFIG_PHYS_ADDR_T_64BIT is not set
221CONFIG_ZONE_DMA_FLAG=1 224CONFIG_ZONE_DMA_FLAG=1
222CONFIG_BOUNCE=y 225CONFIG_BOUNCE=y
223CONFIG_VIRT_TO_BUS=y 226CONFIG_VIRT_TO_BUS=y
224CONFIG_UNEVICTABLE_LRU=y 227CONFIG_UNEVICTABLE_LRU=y
228CONFIG_PPC_4K_PAGES=y
229# CONFIG_PPC_16K_PAGES is not set
230# CONFIG_PPC_64K_PAGES is not set
225CONFIG_FORCE_MAX_ZONEORDER=11 231CONFIG_FORCE_MAX_ZONEORDER=11
226CONFIG_PROC_DEVICETREE=y 232CONFIG_PROC_DEVICETREE=y
227# CONFIG_CMDLINE_BOOL is not set 233# CONFIG_CMDLINE_BOOL is not set
@@ -246,6 +252,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
246# CONFIG_PCI_MSI is not set 252# CONFIG_PCI_MSI is not set
247# CONFIG_PCI_LEGACY is not set 253# CONFIG_PCI_LEGACY is not set
248# CONFIG_PCI_DEBUG is not set 254# CONFIG_PCI_DEBUG is not set
255# CONFIG_PCI_STUB is not set
249# CONFIG_PCCARD is not set 256# CONFIG_PCCARD is not set
250# CONFIG_HOTPLUG_PCI is not set 257# CONFIG_HOTPLUG_PCI is not set
251# CONFIG_HAS_RAPIDIO is not set 258# CONFIG_HAS_RAPIDIO is not set
@@ -268,6 +275,7 @@ CONFIG_NET=y
268# 275#
269# Networking options 276# Networking options
270# 277#
278CONFIG_COMPAT_NET_DEV_OPS=y
271CONFIG_PACKET=y 279CONFIG_PACKET=y
272# CONFIG_PACKET_MMAP is not set 280# CONFIG_PACKET_MMAP is not set
273CONFIG_UNIX=y 281CONFIG_UNIX=y
@@ -349,6 +357,7 @@ CONFIG_NETFILTER_ADVANCED=y
349# CONFIG_IPX is not set 357# CONFIG_IPX is not set
350# CONFIG_ATALK is not set 358# CONFIG_ATALK is not set
351# CONFIG_NET_SCHED is not set 359# CONFIG_NET_SCHED is not set
360# CONFIG_DCB is not set
352 361
353# 362#
354# Network testing 363# Network testing
@@ -363,8 +372,9 @@ CONFIG_WIRELESS=y
363# CONFIG_CFG80211 is not set 372# CONFIG_CFG80211 is not set
364CONFIG_WIRELESS_OLD_REGULATORY=y 373CONFIG_WIRELESS_OLD_REGULATORY=y
365# CONFIG_WIRELESS_EXT is not set 374# CONFIG_WIRELESS_EXT is not set
375# CONFIG_LIB80211 is not set
366# CONFIG_MAC80211 is not set 376# CONFIG_MAC80211 is not set
367# CONFIG_IEEE80211 is not set 377# CONFIG_WIMAX is not set
368# CONFIG_RFKILL is not set 378# CONFIG_RFKILL is not set
369 379
370# 380#
@@ -459,6 +469,12 @@ CONFIG_MTD_PHYSMAP_OF=y
459# CONFIG_MTD_ONENAND is not set 469# CONFIG_MTD_ONENAND is not set
460 470
461# 471#
472# LPDDR flash memory drivers
473#
474# CONFIG_MTD_LPDDR is not set
475# CONFIG_MTD_QINFO_PROBE is not set
476
477#
462# UBI - Unsorted block images 478# UBI - Unsorted block images
463# 479#
464# CONFIG_MTD_UBI is not set 480# CONFIG_MTD_UBI is not set
@@ -526,9 +542,12 @@ CONFIG_DAVICOM_PHY=y
526# CONFIG_BROADCOM_PHY is not set 542# CONFIG_BROADCOM_PHY is not set
527# CONFIG_ICPLUS_PHY is not set 543# CONFIG_ICPLUS_PHY is not set
528# CONFIG_REALTEK_PHY is not set 544# CONFIG_REALTEK_PHY is not set
545# CONFIG_NATIONAL_PHY is not set
546# CONFIG_STE10XP is not set
547# CONFIG_LSI_ET1011C_PHY is not set
529# CONFIG_FIXED_PHY is not set 548# CONFIG_FIXED_PHY is not set
530CONFIG_MDIO_BITBANG=y 549CONFIG_MDIO_BITBANG=y
531# CONFIG_MDIO_OF_GPIO is not set 550# CONFIG_MDIO_GPIO is not set
532CONFIG_NET_ETHERNET=y 551CONFIG_NET_ETHERNET=y
533CONFIG_MII=y 552CONFIG_MII=y
534# CONFIG_HAPPYMEAL is not set 553# CONFIG_HAPPYMEAL is not set
@@ -573,6 +592,7 @@ CONFIG_NETDEV_1000=y
573# CONFIG_JME is not set 592# CONFIG_JME is not set
574CONFIG_NETDEV_10000=y 593CONFIG_NETDEV_10000=y
575# CONFIG_CHELSIO_T1 is not set 594# CONFIG_CHELSIO_T1 is not set
595CONFIG_CHELSIO_T3_DEPENDS=y
576# CONFIG_CHELSIO_T3 is not set 596# CONFIG_CHELSIO_T3 is not set
577# CONFIG_ENIC is not set 597# CONFIG_ENIC is not set
578# CONFIG_IXGBE is not set 598# CONFIG_IXGBE is not set
@@ -595,6 +615,10 @@ CONFIG_NETDEV_10000=y
595# CONFIG_WLAN_PRE80211 is not set 615# CONFIG_WLAN_PRE80211 is not set
596# CONFIG_WLAN_80211 is not set 616# CONFIG_WLAN_80211 is not set
597# CONFIG_IWLWIFI_LEDS is not set 617# CONFIG_IWLWIFI_LEDS is not set
618
619#
620# Enable WiMAX (Networking options) to see the WiMAX drivers
621#
598# CONFIG_WAN is not set 622# CONFIG_WAN is not set
599# CONFIG_FDDI is not set 623# CONFIG_FDDI is not set
600CONFIG_PPP=y 624CONFIG_PPP=y
@@ -690,6 +714,7 @@ CONFIG_SERIAL_CPM=y
690CONFIG_SERIAL_CPM_CONSOLE=y 714CONFIG_SERIAL_CPM_CONSOLE=y
691# CONFIG_SERIAL_JSM is not set 715# CONFIG_SERIAL_JSM is not set
692CONFIG_UNIX98_PTYS=y 716CONFIG_UNIX98_PTYS=y
717# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
693CONFIG_LEGACY_PTYS=y 718CONFIG_LEGACY_PTYS=y
694CONFIG_LEGACY_PTY_COUNT=256 719CONFIG_LEGACY_PTY_COUNT=256
695# CONFIG_IPMI_HANDLER is not set 720# CONFIG_IPMI_HANDLER is not set
@@ -708,6 +733,11 @@ CONFIG_GPIOLIB=y
708# CONFIG_DEBUG_GPIO is not set 733# CONFIG_DEBUG_GPIO is not set
709 734
710# 735#
736# Memory mapped GPIO expanders:
737#
738# CONFIG_GPIO_XILINX is not set
739
740#
711# I2C GPIO expanders: 741# I2C GPIO expanders:
712# 742#
713 743
@@ -725,11 +755,11 @@ CONFIG_GPIOLIB=y
725# CONFIG_THERMAL is not set 755# CONFIG_THERMAL is not set
726# CONFIG_THERMAL_HWMON is not set 756# CONFIG_THERMAL_HWMON is not set
727# CONFIG_WATCHDOG is not set 757# CONFIG_WATCHDOG is not set
758CONFIG_SSB_POSSIBLE=y
728 759
729# 760#
730# Sonics Silicon Backplane 761# Sonics Silicon Backplane
731# 762#
732CONFIG_SSB_POSSIBLE=y
733# CONFIG_SSB is not set 763# CONFIG_SSB is not set
734 764
735# 765#
@@ -739,14 +769,7 @@ CONFIG_SSB_POSSIBLE=y
739# CONFIG_MFD_SM501 is not set 769# CONFIG_MFD_SM501 is not set
740# CONFIG_HTC_PASIC3 is not set 770# CONFIG_HTC_PASIC3 is not set
741# CONFIG_MFD_TMIO is not set 771# CONFIG_MFD_TMIO is not set
742
743#
744# Voltage and Current regulators
745#
746# CONFIG_REGULATOR is not set 772# 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 773
751# 774#
752# Multimedia devices 775# Multimedia devices
@@ -843,13 +866,11 @@ CONFIG_TMPFS=y
843# CONFIG_TMPFS_POSIX_ACL is not set 866# CONFIG_TMPFS_POSIX_ACL is not set
844# CONFIG_HUGETLB_PAGE is not set 867# CONFIG_HUGETLB_PAGE is not set
845# CONFIG_CONFIGFS_FS is not set 868# CONFIG_CONFIGFS_FS is not set
846 869CONFIG_MISC_FILESYSTEMS=y
847#
848# Miscellaneous filesystems
849#
850# CONFIG_HFSPLUS_FS is not set 870# CONFIG_HFSPLUS_FS is not set
851# CONFIG_JFFS2_FS is not set 871# CONFIG_JFFS2_FS is not set
852CONFIG_CRAMFS=y 872CONFIG_CRAMFS=y
873# CONFIG_SQUASHFS is not set
853# CONFIG_VXFS_FS is not set 874# CONFIG_VXFS_FS is not set
854# CONFIG_MINIX_FS is not set 875# CONFIG_MINIX_FS is not set
855# CONFIG_OMFS_FS is not set 876# CONFIG_OMFS_FS is not set
@@ -940,6 +961,7 @@ CONFIG_NLS_UTF8=y
940# Library routines 961# Library routines
941# 962#
942CONFIG_BITREVERSE=y 963CONFIG_BITREVERSE=y
964CONFIG_GENERIC_FIND_LAST_BIT=y
943CONFIG_CRC_CCITT=y 965CONFIG_CRC_CCITT=y
944# CONFIG_CRC16 is not set 966# CONFIG_CRC16 is not set
945# CONFIG_CRC_T10DIF is not set 967# CONFIG_CRC_T10DIF is not set
@@ -991,6 +1013,7 @@ CONFIG_DEBUG_INFO=y
991# CONFIG_DEBUG_MEMORY_INIT is not set 1013# CONFIG_DEBUG_MEMORY_INIT is not set
992# CONFIG_DEBUG_LIST is not set 1014# CONFIG_DEBUG_LIST is not set
993# CONFIG_DEBUG_SG is not set 1015# CONFIG_DEBUG_SG is not set
1016# CONFIG_DEBUG_NOTIFIERS is not set
994# CONFIG_BOOT_PRINTK_DELAY is not set 1017# CONFIG_BOOT_PRINTK_DELAY is not set
995# CONFIG_RCU_TORTURE_TEST is not set 1018# CONFIG_RCU_TORTURE_TEST is not set
996# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1019# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1000,6 +1023,8 @@ CONFIG_DEBUG_INFO=y
1000# CONFIG_LATENCYTOP is not set 1023# CONFIG_LATENCYTOP is not set
1001CONFIG_SYSCTL_SYSCALL_CHECK=y 1024CONFIG_SYSCTL_SYSCALL_CHECK=y
1002CONFIG_HAVE_FUNCTION_TRACER=y 1025CONFIG_HAVE_FUNCTION_TRACER=y
1026CONFIG_HAVE_DYNAMIC_FTRACE=y
1027CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1003 1028
1004# 1029#
1005# Tracers 1030# Tracers
@@ -1008,10 +1033,12 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1008# CONFIG_SCHED_TRACER is not set 1033# CONFIG_SCHED_TRACER is not set
1009# CONFIG_CONTEXT_SWITCH_TRACER is not set 1034# CONFIG_CONTEXT_SWITCH_TRACER is not set
1010# CONFIG_BOOT_TRACER is not set 1035# CONFIG_BOOT_TRACER is not set
1036# CONFIG_TRACE_BRANCH_PROFILING is not set
1011# CONFIG_STACK_TRACER is not set 1037# CONFIG_STACK_TRACER is not set
1012# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1038# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1013# CONFIG_SAMPLES is not set 1039# CONFIG_SAMPLES is not set
1014CONFIG_HAVE_ARCH_KGDB=y 1040CONFIG_HAVE_ARCH_KGDB=y
1041CONFIG_PRINT_STACK_DEPTH=64
1015# CONFIG_DEBUG_STACKOVERFLOW is not set 1042# CONFIG_DEBUG_STACKOVERFLOW is not set
1016# CONFIG_DEBUG_STACK_USAGE is not set 1043# CONFIG_DEBUG_STACK_USAGE is not set
1017# CONFIG_DEBUG_PAGEALLOC is not set 1044# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1038,11 +1065,15 @@ CONFIG_CRYPTO=y
1038# 1065#
1039# CONFIG_CRYPTO_FIPS is not set 1066# CONFIG_CRYPTO_FIPS is not set
1040CONFIG_CRYPTO_ALGAPI=y 1067CONFIG_CRYPTO_ALGAPI=y
1041CONFIG_CRYPTO_AEAD=y 1068CONFIG_CRYPTO_ALGAPI2=y
1069CONFIG_CRYPTO_AEAD2=y
1042CONFIG_CRYPTO_BLKCIPHER=y 1070CONFIG_CRYPTO_BLKCIPHER=y
1071CONFIG_CRYPTO_BLKCIPHER2=y
1043CONFIG_CRYPTO_HASH=y 1072CONFIG_CRYPTO_HASH=y
1044CONFIG_CRYPTO_RNG=y 1073CONFIG_CRYPTO_HASH2=y
1074CONFIG_CRYPTO_RNG2=y
1045CONFIG_CRYPTO_MANAGER=y 1075CONFIG_CRYPTO_MANAGER=y
1076CONFIG_CRYPTO_MANAGER2=y
1046# CONFIG_CRYPTO_NULL is not set 1077# CONFIG_CRYPTO_NULL is not set
1047# CONFIG_CRYPTO_CRYPTD is not set 1078# CONFIG_CRYPTO_CRYPTD is not set
1048# CONFIG_CRYPTO_AUTHENC is not set 1079# CONFIG_CRYPTO_AUTHENC is not set
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index 3e1272cfdd91..45f03cad8db6 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:42 2008 4# Mon Jan 26 15:35:36 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -45,7 +45,7 @@ CONFIG_GENERIC_GPIO=y
45CONFIG_PPC=y 45CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
51CONFIG_OF=y 51CONFIG_OF=y
@@ -77,12 +77,12 @@ CONFIG_SYSVIPC_SYSCTL=y
77# CONFIG_AUDIT is not set 77# CONFIG_AUDIT is not set
78# CONFIG_IKCONFIG is not set 78# CONFIG_IKCONFIG is not set
79CONFIG_LOG_BUF_SHIFT=14 79CONFIG_LOG_BUF_SHIFT=14
80# CONFIG_CGROUPS is not set
81CONFIG_GROUP_SCHED=y 80CONFIG_GROUP_SCHED=y
82CONFIG_FAIR_GROUP_SCHED=y 81CONFIG_FAIR_GROUP_SCHED=y
83# CONFIG_RT_GROUP_SCHED is not set 82# CONFIG_RT_GROUP_SCHED is not set
84CONFIG_USER_SCHED=y 83CONFIG_USER_SCHED=y
85# CONFIG_CGROUP_SCHED is not set 84# CONFIG_CGROUP_SCHED is not set
85# CONFIG_CGROUPS is not set
86CONFIG_SYSFS_DEPRECATED=y 86CONFIG_SYSFS_DEPRECATED=y
87CONFIG_SYSFS_DEPRECATED_V2=y 87CONFIG_SYSFS_DEPRECATED_V2=y
88# CONFIG_RELAY is not set 88# CONFIG_RELAY is not set
@@ -115,7 +115,6 @@ CONFIG_SLAB=y
115# CONFIG_SLUB is not set 115# CONFIG_SLUB is not set
116# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set 117# CONFIG_PROFILING is not set
118# CONFIG_MARKERS is not set
119CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
120# CONFIG_KPROBES is not set 119# CONFIG_KPROBES is not set
121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -126,7 +125,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=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
129# CONFIG_TINY_SHMEM is not set
130CONFIG_BASE_SMALL=0 128CONFIG_BASE_SMALL=0
131CONFIG_MODULES=y 129CONFIG_MODULES=y
132# CONFIG_MODULE_FORCE_LOAD is not set 130# CONFIG_MODULE_FORCE_LOAD is not set
@@ -134,11 +132,9 @@ CONFIG_MODULE_UNLOAD=y
134# CONFIG_MODULE_FORCE_UNLOAD is not set 132# CONFIG_MODULE_FORCE_UNLOAD is not set
135# CONFIG_MODVERSIONS is not set 133# CONFIG_MODVERSIONS is not set
136# CONFIG_MODULE_SRCVERSION_ALL is not set 134# CONFIG_MODULE_SRCVERSION_ALL is not set
137CONFIG_KMOD=y
138CONFIG_BLOCK=y 135CONFIG_BLOCK=y
139# CONFIG_LBD is not set 136# CONFIG_LBD is not set
140# CONFIG_BLK_DEV_IO_TRACE is not set 137# CONFIG_BLK_DEV_IO_TRACE is not set
141# CONFIG_LSF is not set
142# CONFIG_BLK_DEV_BSG is not set 138# CONFIG_BLK_DEV_BSG is not set
143# CONFIG_BLK_DEV_INTEGRITY is not set 139# CONFIG_BLK_DEV_INTEGRITY is not set
144 140
@@ -155,6 +151,10 @@ CONFIG_DEFAULT_AS=y
155# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
156CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
157CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_TREE_RCU is not set
155# CONFIG_PREEMPT_RCU is not set
156# CONFIG_TREE_RCU_TRACE is not set
157# CONFIG_PREEMPT_RCU_TRACE is not set
158# CONFIG_FREEZER is not set 158# CONFIG_FREEZER is not set
159 159
160# 160#
@@ -205,6 +205,8 @@ CONFIG_QUICC_ENGINE=y
205CONFIG_QE_GPIO=y 205CONFIG_QE_GPIO=y
206# CONFIG_FSL_ULI1575 is not set 206# CONFIG_FSL_ULI1575 is not set
207# CONFIG_MPC8xxx_GPIO is not set 207# CONFIG_MPC8xxx_GPIO is not set
208# CONFIG_SIMPLE_GPIO is not set
209# CONFIG_MCU_MPC8349EMITX is not set
208 210
209# 211#
210# Kernel options 212# Kernel options
@@ -232,6 +234,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
232CONFIG_ARCH_HAS_WALK_MEMORY=y 234CONFIG_ARCH_HAS_WALK_MEMORY=y
233CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 235CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
234# CONFIG_KEXEC is not set 236# CONFIG_KEXEC is not set
237# CONFIG_CRASH_DUMP is not set
235CONFIG_ARCH_FLATMEM_ENABLE=y 238CONFIG_ARCH_FLATMEM_ENABLE=y
236CONFIG_ARCH_POPULATES_NODE_MAP=y 239CONFIG_ARCH_POPULATES_NODE_MAP=y
237CONFIG_SELECT_MEMORY_MODEL=y 240CONFIG_SELECT_MEMORY_MODEL=y
@@ -243,12 +246,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
243CONFIG_PAGEFLAGS_EXTENDED=y 246CONFIG_PAGEFLAGS_EXTENDED=y
244CONFIG_SPLIT_PTLOCK_CPUS=4 247CONFIG_SPLIT_PTLOCK_CPUS=4
245CONFIG_MIGRATION=y 248CONFIG_MIGRATION=y
246# CONFIG_RESOURCES_64BIT is not set
247# CONFIG_PHYS_ADDR_T_64BIT is not set 249# CONFIG_PHYS_ADDR_T_64BIT is not set
248CONFIG_ZONE_DMA_FLAG=1 250CONFIG_ZONE_DMA_FLAG=1
249CONFIG_BOUNCE=y 251CONFIG_BOUNCE=y
250CONFIG_VIRT_TO_BUS=y 252CONFIG_VIRT_TO_BUS=y
251CONFIG_UNEVICTABLE_LRU=y 253CONFIG_UNEVICTABLE_LRU=y
254CONFIG_PPC_4K_PAGES=y
255# CONFIG_PPC_16K_PAGES is not set
256# CONFIG_PPC_64K_PAGES is not set
252CONFIG_FORCE_MAX_ZONEORDER=11 257CONFIG_FORCE_MAX_ZONEORDER=11
253CONFIG_PROC_DEVICETREE=y 258CONFIG_PROC_DEVICETREE=y
254# CONFIG_CMDLINE_BOOL is not set 259# CONFIG_CMDLINE_BOOL is not set
@@ -275,6 +280,7 @@ CONFIG_PCI_SYSCALL=y
275CONFIG_ARCH_SUPPORTS_MSI=y 280CONFIG_ARCH_SUPPORTS_MSI=y
276# CONFIG_PCI_MSI is not set 281# CONFIG_PCI_MSI is not set
277# CONFIG_PCI_LEGACY is not set 282# CONFIG_PCI_LEGACY is not set
283# CONFIG_PCI_STUB is not set
278# CONFIG_PCCARD is not set 284# CONFIG_PCCARD is not set
279# CONFIG_HOTPLUG_PCI is not set 285# CONFIG_HOTPLUG_PCI is not set
280# CONFIG_HAS_RAPIDIO is not set 286# CONFIG_HAS_RAPIDIO is not set
@@ -297,6 +303,7 @@ CONFIG_NET=y
297# 303#
298# Networking options 304# Networking options
299# 305#
306CONFIG_COMPAT_NET_DEV_OPS=y
300CONFIG_PACKET=y 307CONFIG_PACKET=y
301# CONFIG_PACKET_MMAP is not set 308# CONFIG_PACKET_MMAP is not set
302CONFIG_UNIX=y 309CONFIG_UNIX=y
@@ -353,6 +360,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
353# CONFIG_ECONET is not set 360# CONFIG_ECONET is not set
354# CONFIG_WAN_ROUTER is not set 361# CONFIG_WAN_ROUTER is not set
355# CONFIG_NET_SCHED is not set 362# CONFIG_NET_SCHED is not set
363# CONFIG_DCB is not set
356 364
357# 365#
358# Network testing 366# Network testing
@@ -368,8 +376,9 @@ CONFIG_WIRELESS=y
368# CONFIG_CFG80211 is not set 376# CONFIG_CFG80211 is not set
369CONFIG_WIRELESS_OLD_REGULATORY=y 377CONFIG_WIRELESS_OLD_REGULATORY=y
370# CONFIG_WIRELESS_EXT is not set 378# CONFIG_WIRELESS_EXT is not set
379# CONFIG_LIB80211 is not set
371# CONFIG_MAC80211 is not set 380# CONFIG_MAC80211 is not set
372# CONFIG_IEEE80211 is not set 381# CONFIG_WIMAX is not set
373# CONFIG_RFKILL is not set 382# CONFIG_RFKILL is not set
374# CONFIG_NET_9P is not set 383# CONFIG_NET_9P is not set
375 384
@@ -390,6 +399,7 @@ CONFIG_MTD=y
390# CONFIG_MTD_DEBUG is not set 399# CONFIG_MTD_DEBUG is not set
391# CONFIG_MTD_CONCAT is not set 400# CONFIG_MTD_CONCAT is not set
392CONFIG_MTD_PARTITIONS=y 401CONFIG_MTD_PARTITIONS=y
402# CONFIG_MTD_TESTS is not set
393# CONFIG_MTD_REDBOOT_PARTS is not set 403# CONFIG_MTD_REDBOOT_PARTS is not set
394# CONFIG_MTD_CMDLINE_PARTS is not set 404# CONFIG_MTD_CMDLINE_PARTS is not set
395CONFIG_MTD_OF_PARTS=y 405CONFIG_MTD_OF_PARTS=y
@@ -472,6 +482,12 @@ CONFIG_MTD_NAND_FSL_ELBC=y
472# CONFIG_MTD_ONENAND is not set 482# CONFIG_MTD_ONENAND is not set
473 483
474# 484#
485# LPDDR flash memory drivers
486#
487# CONFIG_MTD_LPDDR is not set
488# CONFIG_MTD_QINFO_PROBE is not set
489
490#
475# UBI - Unsorted block images 491# UBI - Unsorted block images
476# 492#
477# CONFIG_MTD_UBI is not set 493# CONFIG_MTD_UBI is not set
@@ -503,8 +519,10 @@ CONFIG_MISC_DEVICES=y
503# CONFIG_EEPROM_93CX6 is not set 519# CONFIG_EEPROM_93CX6 is not set
504# CONFIG_SGI_IOC4 is not set 520# CONFIG_SGI_IOC4 is not set
505# CONFIG_TIFM_CORE is not set 521# CONFIG_TIFM_CORE is not set
522# CONFIG_ICS932S401 is not set
506# CONFIG_ENCLOSURE_SERVICES is not set 523# CONFIG_ENCLOSURE_SERVICES is not set
507# CONFIG_HP_ILO is not set 524# CONFIG_HP_ILO is not set
525# CONFIG_C2PORT is not set
508CONFIG_HAVE_IDE=y 526CONFIG_HAVE_IDE=y
509# CONFIG_IDE is not set 527# CONFIG_IDE is not set
510 528
@@ -547,6 +565,7 @@ CONFIG_SCSI_WAIT_SCAN=m
547# CONFIG_SCSI_SRP_ATTRS is not set 565# CONFIG_SCSI_SRP_ATTRS is not set
548CONFIG_SCSI_LOWLEVEL=y 566CONFIG_SCSI_LOWLEVEL=y
549# CONFIG_ISCSI_TCP is not set 567# CONFIG_ISCSI_TCP is not set
568# CONFIG_SCSI_CXGB3_ISCSI is not set
550# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 569# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
551# CONFIG_SCSI_3W_9XXX is not set 570# CONFIG_SCSI_3W_9XXX is not set
552# CONFIG_SCSI_ACARD is not set 571# CONFIG_SCSI_ACARD is not set
@@ -563,6 +582,8 @@ CONFIG_SCSI_LOWLEVEL=y
563# CONFIG_MEGARAID_SAS is not set 582# CONFIG_MEGARAID_SAS is not set
564# CONFIG_SCSI_HPTIOP is not set 583# CONFIG_SCSI_HPTIOP is not set
565# CONFIG_SCSI_BUSLOGIC is not set 584# CONFIG_SCSI_BUSLOGIC is not set
585# CONFIG_LIBFC is not set
586# CONFIG_FCOE is not set
566# CONFIG_SCSI_DMX3191D is not set 587# CONFIG_SCSI_DMX3191D is not set
567# CONFIG_SCSI_EATA is not set 588# CONFIG_SCSI_EATA is not set
568# CONFIG_SCSI_FUTURE_DOMAIN is not set 589# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -682,6 +703,9 @@ CONFIG_VITESSE_PHY=y
682# CONFIG_BROADCOM_PHY is not set 703# CONFIG_BROADCOM_PHY is not set
683CONFIG_ICPLUS_PHY=y 704CONFIG_ICPLUS_PHY=y
684# CONFIG_REALTEK_PHY is not set 705# CONFIG_REALTEK_PHY is not set
706# CONFIG_NATIONAL_PHY is not set
707# CONFIG_STE10XP is not set
708# CONFIG_LSI_ET1011C_PHY is not set
685CONFIG_FIXED_PHY=y 709CONFIG_FIXED_PHY=y
686# CONFIG_MDIO_BITBANG is not set 710# CONFIG_MDIO_BITBANG is not set
687CONFIG_NET_ETHERNET=y 711CONFIG_NET_ETHERNET=y
@@ -722,7 +746,6 @@ CONFIG_NETDEV_1000=y
722CONFIG_GIANFAR=y 746CONFIG_GIANFAR=y
723CONFIG_UCC_GETH=y 747CONFIG_UCC_GETH=y
724# CONFIG_UGETH_MAGIC_PACKET is not set 748# CONFIG_UGETH_MAGIC_PACKET is not set
725# CONFIG_UGETH_FILTERING is not set
726# CONFIG_UGETH_TX_ON_DEMAND is not set 749# CONFIG_UGETH_TX_ON_DEMAND is not set
727# CONFIG_MV643XX_ETH is not set 750# CONFIG_MV643XX_ETH is not set
728# CONFIG_QLA3XXX is not set 751# CONFIG_QLA3XXX is not set
@@ -731,6 +754,7 @@ CONFIG_UCC_GETH=y
731# CONFIG_JME is not set 754# CONFIG_JME is not set
732CONFIG_NETDEV_10000=y 755CONFIG_NETDEV_10000=y
733# CONFIG_CHELSIO_T1 is not set 756# CONFIG_CHELSIO_T1 is not set
757CONFIG_CHELSIO_T3_DEPENDS=y
734# CONFIG_CHELSIO_T3 is not set 758# CONFIG_CHELSIO_T3 is not set
735# CONFIG_ENIC is not set 759# CONFIG_ENIC is not set
736# CONFIG_IXGBE is not set 760# CONFIG_IXGBE is not set
@@ -755,6 +779,10 @@ CONFIG_NETDEV_10000=y
755# CONFIG_IWLWIFI_LEDS is not set 779# CONFIG_IWLWIFI_LEDS is not set
756 780
757# 781#
782# Enable WiMAX (Networking options) to see the WiMAX drivers
783#
784
785#
758# USB Network Adapters 786# USB Network Adapters
759# 787#
760# CONFIG_USB_CATC is not set 788# CONFIG_USB_CATC is not set
@@ -833,8 +861,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
833# CONFIG_SERIAL_OF_PLATFORM is not set 861# CONFIG_SERIAL_OF_PLATFORM is not set
834# CONFIG_SERIAL_QE is not set 862# CONFIG_SERIAL_QE is not set
835CONFIG_UNIX98_PTYS=y 863CONFIG_UNIX98_PTYS=y
864# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
836CONFIG_LEGACY_PTYS=y 865CONFIG_LEGACY_PTYS=y
837CONFIG_LEGACY_PTY_COUNT=256 866CONFIG_LEGACY_PTY_COUNT=256
867# CONFIG_HVC_UDBG is not set
838# CONFIG_IPMI_HANDLER is not set 868# CONFIG_IPMI_HANDLER is not set
839CONFIG_HW_RANDOM=y 869CONFIG_HW_RANDOM=y
840# CONFIG_NVRAM is not set 870# CONFIG_NVRAM is not set
@@ -908,10 +938,8 @@ CONFIG_I2C_MPC=y
908# CONFIG_PCF8575 is not set 938# CONFIG_PCF8575 is not set
909# CONFIG_SENSORS_PCA9539 is not set 939# CONFIG_SENSORS_PCA9539 is not set
910# CONFIG_SENSORS_PCF8591 is not set 940# CONFIG_SENSORS_PCF8591 is not set
911# CONFIG_TPS65010 is not set
912# CONFIG_SENSORS_MAX6875 is not set 941# CONFIG_SENSORS_MAX6875 is not set
913# CONFIG_SENSORS_TSL2550 is not set 942# CONFIG_SENSORS_TSL2550 is not set
914# CONFIG_MCU_MPC8349EMITX is not set
915# CONFIG_I2C_DEBUG_CORE is not set 943# CONFIG_I2C_DEBUG_CORE is not set
916# CONFIG_I2C_DEBUG_ALGO is not set 944# CONFIG_I2C_DEBUG_ALGO is not set
917# CONFIG_I2C_DEBUG_BUS is not set 945# CONFIG_I2C_DEBUG_BUS is not set
@@ -923,6 +951,11 @@ CONFIG_GPIOLIB=y
923# CONFIG_GPIO_SYSFS is not set 951# CONFIG_GPIO_SYSFS is not set
924 952
925# 953#
954# Memory mapped GPIO expanders:
955#
956# CONFIG_GPIO_XILINX is not set
957
958#
926# I2C GPIO expanders: 959# I2C GPIO expanders:
927# 960#
928# CONFIG_GPIO_MAX732X is not set 961# CONFIG_GPIO_MAX732X is not set
@@ -949,8 +982,10 @@ CONFIG_HWMON=y
949# CONFIG_SENSORS_ADM1029 is not set 982# CONFIG_SENSORS_ADM1029 is not set
950# CONFIG_SENSORS_ADM1031 is not set 983# CONFIG_SENSORS_ADM1031 is not set
951# CONFIG_SENSORS_ADM9240 is not set 984# CONFIG_SENSORS_ADM9240 is not set
985# CONFIG_SENSORS_ADT7462 is not set
952# CONFIG_SENSORS_ADT7470 is not set 986# CONFIG_SENSORS_ADT7470 is not set
953# CONFIG_SENSORS_ADT7473 is not set 987# CONFIG_SENSORS_ADT7473 is not set
988# CONFIG_SENSORS_ADT7475 is not set
954# CONFIG_SENSORS_ATXP1 is not set 989# CONFIG_SENSORS_ATXP1 is not set
955# CONFIG_SENSORS_DS1621 is not set 990# CONFIG_SENSORS_DS1621 is not set
956# CONFIG_SENSORS_I5K_AMB is not set 991# CONFIG_SENSORS_I5K_AMB is not set
@@ -971,6 +1006,7 @@ CONFIG_HWMON=y
971# CONFIG_SENSORS_LM90 is not set 1006# CONFIG_SENSORS_LM90 is not set
972# CONFIG_SENSORS_LM92 is not set 1007# CONFIG_SENSORS_LM92 is not set
973# CONFIG_SENSORS_LM93 is not set 1008# CONFIG_SENSORS_LM93 is not set
1009# CONFIG_SENSORS_LTC4245 is not set
974# CONFIG_SENSORS_MAX1619 is not set 1010# CONFIG_SENSORS_MAX1619 is not set
975# CONFIG_SENSORS_MAX6650 is not set 1011# CONFIG_SENSORS_MAX6650 is not set
976# CONFIG_SENSORS_PC87360 is not set 1012# CONFIG_SENSORS_PC87360 is not set
@@ -1016,11 +1052,11 @@ CONFIG_WATCHDOG=y
1016# USB-based Watchdog Cards 1052# USB-based Watchdog Cards
1017# 1053#
1018# CONFIG_USBPCWATCHDOG is not set 1054# CONFIG_USBPCWATCHDOG is not set
1055CONFIG_SSB_POSSIBLE=y
1019 1056
1020# 1057#
1021# Sonics Silicon Backplane 1058# Sonics Silicon Backplane
1022# 1059#
1023CONFIG_SSB_POSSIBLE=y
1024# CONFIG_SSB is not set 1060# CONFIG_SSB is not set
1025 1061
1026# 1062#
@@ -1029,18 +1065,14 @@ CONFIG_SSB_POSSIBLE=y
1029# CONFIG_MFD_CORE is not set 1065# CONFIG_MFD_CORE is not set
1030# CONFIG_MFD_SM501 is not set 1066# CONFIG_MFD_SM501 is not set
1031# CONFIG_HTC_PASIC3 is not set 1067# CONFIG_HTC_PASIC3 is not set
1068# CONFIG_TPS65010 is not set
1069# CONFIG_TWL4030_CORE is not set
1032# CONFIG_MFD_TMIO is not set 1070# CONFIG_MFD_TMIO is not set
1033# CONFIG_PMIC_DA903X is not set 1071# CONFIG_PMIC_DA903X is not set
1034# CONFIG_MFD_WM8400 is not set 1072# CONFIG_MFD_WM8400 is not set
1035# CONFIG_MFD_WM8350_I2C is not set 1073# CONFIG_MFD_WM8350_I2C is not set
1036 1074# CONFIG_MFD_PCF50633 is not set
1037#
1038# Voltage and Current regulators
1039#
1040# CONFIG_REGULATOR is not set 1075# 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
1044 1076
1045# 1077#
1046# Multimedia devices 1078# Multimedia devices
@@ -1093,11 +1125,9 @@ CONFIG_HID_COMPAT=y
1093CONFIG_HID_A4TECH=y 1125CONFIG_HID_A4TECH=y
1094CONFIG_HID_APPLE=y 1126CONFIG_HID_APPLE=y
1095CONFIG_HID_BELKIN=y 1127CONFIG_HID_BELKIN=y
1096CONFIG_HID_BRIGHT=y
1097CONFIG_HID_CHERRY=y 1128CONFIG_HID_CHERRY=y
1098CONFIG_HID_CHICONY=y 1129CONFIG_HID_CHICONY=y
1099CONFIG_HID_CYPRESS=y 1130CONFIG_HID_CYPRESS=y
1100CONFIG_HID_DELL=y
1101CONFIG_HID_EZKEY=y 1131CONFIG_HID_EZKEY=y
1102CONFIG_HID_GYRATION=y 1132CONFIG_HID_GYRATION=y
1103CONFIG_HID_LOGITECH=y 1133CONFIG_HID_LOGITECH=y
@@ -1105,12 +1135,15 @@ CONFIG_HID_LOGITECH=y
1105# CONFIG_LOGIRUMBLEPAD2_FF is not set 1135# CONFIG_LOGIRUMBLEPAD2_FF is not set
1106CONFIG_HID_MICROSOFT=y 1136CONFIG_HID_MICROSOFT=y
1107CONFIG_HID_MONTEREY=y 1137CONFIG_HID_MONTEREY=y
1138# CONFIG_HID_NTRIG is not set
1108CONFIG_HID_PANTHERLORD=y 1139CONFIG_HID_PANTHERLORD=y
1109# CONFIG_PANTHERLORD_FF is not set 1140# CONFIG_PANTHERLORD_FF is not set
1110CONFIG_HID_PETALYNX=y 1141CONFIG_HID_PETALYNX=y
1111CONFIG_HID_SAMSUNG=y 1142CONFIG_HID_SAMSUNG=y
1112CONFIG_HID_SONY=y 1143CONFIG_HID_SONY=y
1113CONFIG_HID_SUNPLUS=y 1144CONFIG_HID_SUNPLUS=y
1145# CONFIG_GREENASIA_FF is not set
1146# CONFIG_HID_TOPSEED is not set
1114CONFIG_THRUSTMASTER_FF=m 1147CONFIG_THRUSTMASTER_FF=m
1115CONFIG_ZEROPLUS_FF=m 1148CONFIG_ZEROPLUS_FF=m
1116CONFIG_USB_SUPPORT=y 1149CONFIG_USB_SUPPORT=y
@@ -1143,6 +1176,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
1143# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1176# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1144CONFIG_USB_EHCI_FSL=y 1177CONFIG_USB_EHCI_FSL=y
1145CONFIG_USB_EHCI_HCD_PPC_OF=y 1178CONFIG_USB_EHCI_HCD_PPC_OF=y
1179# CONFIG_USB_OXU210HP_HCD is not set
1146# CONFIG_USB_ISP116X_HCD is not set 1180# CONFIG_USB_ISP116X_HCD is not set
1147# CONFIG_USB_ISP1760_HCD is not set 1181# CONFIG_USB_ISP1760_HCD is not set
1148# CONFIG_USB_OHCI_HCD is not set 1182# CONFIG_USB_OHCI_HCD is not set
@@ -1161,11 +1195,11 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1161# CONFIG_USB_TMC is not set 1195# CONFIG_USB_TMC is not set
1162 1196
1163# 1197#
1164# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1198# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1165# 1199#
1166 1200
1167# 1201#
1168# may also be needed; see USB_STORAGE Help for more information 1202# see USB_STORAGE Help for more information
1169# 1203#
1170# CONFIG_USB_STORAGE is not set 1204# CONFIG_USB_STORAGE is not set
1171# CONFIG_USB_LIBUSUAL is not set 1205# CONFIG_USB_LIBUSUAL is not set
@@ -1206,6 +1240,11 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
1206# CONFIG_USB_ISIGHTFW is not set 1240# CONFIG_USB_ISIGHTFW is not set
1207# CONFIG_USB_VST is not set 1241# CONFIG_USB_VST is not set
1208# CONFIG_USB_GADGET is not set 1242# CONFIG_USB_GADGET is not set
1243
1244#
1245# OTG and related infrastructure
1246#
1247# CONFIG_USB_GPIO_VBUS is not set
1209# CONFIG_UWB is not set 1248# CONFIG_UWB is not set
1210# CONFIG_MMC is not set 1249# CONFIG_MMC is not set
1211# CONFIG_MEMSTICK is not set 1250# CONFIG_MEMSTICK is not set
@@ -1237,6 +1276,7 @@ CONFIG_FS_MBCACHE=y
1237CONFIG_FILE_LOCKING=y 1276CONFIG_FILE_LOCKING=y
1238# CONFIG_XFS_FS is not set 1277# CONFIG_XFS_FS is not set
1239# CONFIG_OCFS2_FS is not set 1278# CONFIG_OCFS2_FS is not set
1279# CONFIG_BTRFS_FS is not set
1240CONFIG_DNOTIFY=y 1280CONFIG_DNOTIFY=y
1241CONFIG_INOTIFY=y 1281CONFIG_INOTIFY=y
1242CONFIG_INOTIFY_USER=y 1282CONFIG_INOTIFY_USER=y
@@ -1270,10 +1310,7 @@ CONFIG_TMPFS=y
1270# CONFIG_TMPFS_POSIX_ACL is not set 1310# CONFIG_TMPFS_POSIX_ACL is not set
1271# CONFIG_HUGETLB_PAGE is not set 1311# CONFIG_HUGETLB_PAGE is not set
1272# CONFIG_CONFIGFS_FS is not set 1312# CONFIG_CONFIGFS_FS is not set
1273 1313CONFIG_MISC_FILESYSTEMS=y
1274#
1275# Miscellaneous filesystems
1276#
1277# CONFIG_ADFS_FS is not set 1314# CONFIG_ADFS_FS is not set
1278# CONFIG_AFFS_FS is not set 1315# CONFIG_AFFS_FS is not set
1279# CONFIG_HFS_FS is not set 1316# CONFIG_HFS_FS is not set
@@ -1283,6 +1320,7 @@ CONFIG_TMPFS=y
1283# CONFIG_EFS_FS is not set 1320# CONFIG_EFS_FS is not set
1284# CONFIG_JFFS2_FS is not set 1321# CONFIG_JFFS2_FS is not set
1285# CONFIG_CRAMFS is not set 1322# CONFIG_CRAMFS is not set
1323# CONFIG_SQUASHFS is not set
1286# CONFIG_VXFS_FS is not set 1324# CONFIG_VXFS_FS is not set
1287# CONFIG_MINIX_FS is not set 1325# CONFIG_MINIX_FS is not set
1288# CONFIG_OMFS_FS is not set 1326# CONFIG_OMFS_FS is not set
@@ -1342,6 +1380,7 @@ CONFIG_UCC=y
1342# Library routines 1380# Library routines
1343# 1381#
1344CONFIG_BITREVERSE=y 1382CONFIG_BITREVERSE=y
1383CONFIG_GENERIC_FIND_LAST_BIT=y
1345# CONFIG_CRC_CCITT is not set 1384# CONFIG_CRC_CCITT is not set
1346# CONFIG_CRC16 is not set 1385# CONFIG_CRC16 is not set
1347CONFIG_CRC_T10DIF=y 1386CONFIG_CRC_T10DIF=y
@@ -1373,6 +1412,8 @@ CONFIG_FRAME_WARN=1024
1373# CONFIG_LATENCYTOP is not set 1412# CONFIG_LATENCYTOP is not set
1374CONFIG_SYSCTL_SYSCALL_CHECK=y 1413CONFIG_SYSCTL_SYSCALL_CHECK=y
1375CONFIG_HAVE_FUNCTION_TRACER=y 1414CONFIG_HAVE_FUNCTION_TRACER=y
1415CONFIG_HAVE_DYNAMIC_FTRACE=y
1416CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1376 1417
1377# 1418#
1378# Tracers 1419# Tracers
@@ -1380,6 +1421,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1380# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1421# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1381# CONFIG_SAMPLES is not set 1422# CONFIG_SAMPLES is not set
1382CONFIG_HAVE_ARCH_KGDB=y 1423CONFIG_HAVE_ARCH_KGDB=y
1424CONFIG_PRINT_STACK_DEPTH=64
1383# CONFIG_IRQSTACKS is not set 1425# CONFIG_IRQSTACKS is not set
1384# CONFIG_BOOTX_TEXT is not set 1426# CONFIG_BOOTX_TEXT is not set
1385# CONFIG_PPC_EARLY_DEBUG is not set 1427# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1398,11 +1440,16 @@ CONFIG_CRYPTO=y
1398# 1440#
1399# CONFIG_CRYPTO_FIPS is not set 1441# CONFIG_CRYPTO_FIPS is not set
1400CONFIG_CRYPTO_ALGAPI=y 1442CONFIG_CRYPTO_ALGAPI=y
1443CONFIG_CRYPTO_ALGAPI2=y
1401CONFIG_CRYPTO_AEAD=y 1444CONFIG_CRYPTO_AEAD=y
1445CONFIG_CRYPTO_AEAD2=y
1402CONFIG_CRYPTO_BLKCIPHER=y 1446CONFIG_CRYPTO_BLKCIPHER=y
1447CONFIG_CRYPTO_BLKCIPHER2=y
1403CONFIG_CRYPTO_HASH=y 1448CONFIG_CRYPTO_HASH=y
1404CONFIG_CRYPTO_RNG=y 1449CONFIG_CRYPTO_HASH2=y
1450CONFIG_CRYPTO_RNG2=y
1405CONFIG_CRYPTO_MANAGER=y 1451CONFIG_CRYPTO_MANAGER=y
1452CONFIG_CRYPTO_MANAGER2=y
1406# CONFIG_CRYPTO_GF128MUL is not set 1453# CONFIG_CRYPTO_GF128MUL is not set
1407# CONFIG_CRYPTO_NULL is not set 1454# CONFIG_CRYPTO_NULL is not set
1408# CONFIG_CRYPTO_CRYPTD is not set 1455# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index 55e5ebd91cd0..fb08819d7cc4 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:43 2008 4# Mon Jan 26 15:35:37 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,7 +21,9 @@ CONFIG_FSL_BOOKE=y
21CONFIG_FSL_EMB_PERFMON=y 21CONFIG_FSL_EMB_PERFMON=y
22# CONFIG_PHYS_64BIT is not set 22# CONFIG_PHYS_64BIT is not set
23CONFIG_SPE=y 23CONFIG_SPE=y
24CONFIG_PPC_MMU_NOHASH=y
24# CONFIG_PPC_MM_SLICES is not set 25# CONFIG_PPC_MM_SLICES is not set
26# CONFIG_SMP is not set
25CONFIG_PPC32=y 27CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32 28CONFIG_WORD_SIZE=32
27# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 29# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -46,7 +48,7 @@ CONFIG_GENERIC_GPIO=y
46CONFIG_PPC=y 48CONFIG_PPC=y
47CONFIG_EARLY_PRINTK=y 49CONFIG_EARLY_PRINTK=y
48CONFIG_GENERIC_NVRAM=y 50CONFIG_GENERIC_NVRAM=y
49CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 51CONFIG_SCHED_OMIT_FRAME_POINTER=y
50CONFIG_ARCH_MAY_HAVE_PC_FDC=y 52CONFIG_ARCH_MAY_HAVE_PC_FDC=y
51CONFIG_PPC_OF=y 53CONFIG_PPC_OF=y
52CONFIG_OF=y 54CONFIG_OF=y
@@ -79,12 +81,12 @@ CONFIG_AUDIT=y
79CONFIG_IKCONFIG=y 81CONFIG_IKCONFIG=y
80CONFIG_IKCONFIG_PROC=y 82CONFIG_IKCONFIG_PROC=y
81CONFIG_LOG_BUF_SHIFT=14 83CONFIG_LOG_BUF_SHIFT=14
82# CONFIG_CGROUPS is not set
83CONFIG_GROUP_SCHED=y 84CONFIG_GROUP_SCHED=y
84# CONFIG_FAIR_GROUP_SCHED is not set 85# CONFIG_FAIR_GROUP_SCHED is not set
85# CONFIG_RT_GROUP_SCHED is not set 86# CONFIG_RT_GROUP_SCHED is not set
86CONFIG_USER_SCHED=y 87CONFIG_USER_SCHED=y
87# CONFIG_CGROUP_SCHED is not set 88# CONFIG_CGROUP_SCHED is not set
89# CONFIG_CGROUPS is not set
88CONFIG_SYSFS_DEPRECATED=y 90CONFIG_SYSFS_DEPRECATED=y
89CONFIG_SYSFS_DEPRECATED_V2=y 91CONFIG_SYSFS_DEPRECATED_V2=y
90# CONFIG_RELAY is not set 92# CONFIG_RELAY is not set
@@ -97,6 +99,7 @@ CONFIG_EMBEDDED=y
97CONFIG_SYSCTL_SYSCALL=y 99CONFIG_SYSCTL_SYSCALL=y
98CONFIG_KALLSYMS=y 100CONFIG_KALLSYMS=y
99CONFIG_KALLSYMS_ALL=y 101CONFIG_KALLSYMS_ALL=y
102CONFIG_KALLSYMS_STRIP_GENERATED=y
100CONFIG_KALLSYMS_EXTRA_PASS=y 103CONFIG_KALLSYMS_EXTRA_PASS=y
101CONFIG_HOTPLUG=y 104CONFIG_HOTPLUG=y
102CONFIG_PRINTK=y 105CONFIG_PRINTK=y
@@ -119,7 +122,6 @@ CONFIG_SLUB_DEBUG=y
119CONFIG_SLUB=y 122CONFIG_SLUB=y
120# CONFIG_SLOB is not set 123# CONFIG_SLOB is not set
121# CONFIG_PROFILING is not set 124# CONFIG_PROFILING is not set
122# CONFIG_MARKERS is not set
123CONFIG_HAVE_OPROFILE=y 125CONFIG_HAVE_OPROFILE=y
124# CONFIG_KPROBES is not set 126# CONFIG_KPROBES is not set
125CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 127CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -131,7 +133,6 @@ CONFIG_HAVE_CLK=y
131# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 133# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
132CONFIG_SLABINFO=y 134CONFIG_SLABINFO=y
133CONFIG_RT_MUTEXES=y 135CONFIG_RT_MUTEXES=y
134# CONFIG_TINY_SHMEM is not set
135CONFIG_BASE_SMALL=0 136CONFIG_BASE_SMALL=0
136CONFIG_MODULES=y 137CONFIG_MODULES=y
137# CONFIG_MODULE_FORCE_LOAD is not set 138# CONFIG_MODULE_FORCE_LOAD is not set
@@ -139,11 +140,9 @@ CONFIG_MODULE_UNLOAD=y
139CONFIG_MODULE_FORCE_UNLOAD=y 140CONFIG_MODULE_FORCE_UNLOAD=y
140CONFIG_MODVERSIONS=y 141CONFIG_MODVERSIONS=y
141# CONFIG_MODULE_SRCVERSION_ALL is not set 142# CONFIG_MODULE_SRCVERSION_ALL is not set
142CONFIG_KMOD=y
143CONFIG_BLOCK=y 143CONFIG_BLOCK=y
144CONFIG_LBD=y 144CONFIG_LBD=y
145# CONFIG_BLK_DEV_IO_TRACE is not set 145# CONFIG_BLK_DEV_IO_TRACE is not set
146# CONFIG_LSF is not set
147# CONFIG_BLK_DEV_BSG is not set 146# CONFIG_BLK_DEV_BSG is not set
148# CONFIG_BLK_DEV_INTEGRITY is not set 147# CONFIG_BLK_DEV_INTEGRITY is not set
149 148
@@ -160,6 +159,10 @@ 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_TREE_RCU is not set
163# CONFIG_PREEMPT_RCU is not set
164# CONFIG_TREE_RCU_TRACE is not set
165# CONFIG_PREEMPT_RCU_TRACE is not set
163# CONFIG_FREEZER is not set 166# CONFIG_FREEZER is not set
164 167
165# 168#
@@ -202,6 +205,7 @@ CONFIG_CPM2=y
202CONFIG_FSL_ULI1575=y 205CONFIG_FSL_ULI1575=y
203CONFIG_CPM=y 206CONFIG_CPM=y
204# CONFIG_MPC8xxx_GPIO is not set 207# CONFIG_MPC8xxx_GPIO is not set
208# CONFIG_SIMPLE_GPIO is not set
205 209
206# 210#
207# Kernel options 211# Kernel options
@@ -240,12 +244,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
240CONFIG_PAGEFLAGS_EXTENDED=y 244CONFIG_PAGEFLAGS_EXTENDED=y
241CONFIG_SPLIT_PTLOCK_CPUS=4 245CONFIG_SPLIT_PTLOCK_CPUS=4
242CONFIG_MIGRATION=y 246CONFIG_MIGRATION=y
243# CONFIG_RESOURCES_64BIT is not set
244# CONFIG_PHYS_ADDR_T_64BIT is not set 247# CONFIG_PHYS_ADDR_T_64BIT is not set
245CONFIG_ZONE_DMA_FLAG=1 248CONFIG_ZONE_DMA_FLAG=1
246CONFIG_BOUNCE=y 249CONFIG_BOUNCE=y
247CONFIG_VIRT_TO_BUS=y 250CONFIG_VIRT_TO_BUS=y
248CONFIG_UNEVICTABLE_LRU=y 251CONFIG_UNEVICTABLE_LRU=y
252CONFIG_PPC_4K_PAGES=y
253# CONFIG_PPC_16K_PAGES is not set
254# CONFIG_PPC_64K_PAGES is not set
249CONFIG_FORCE_MAX_ZONEORDER=11 255CONFIG_FORCE_MAX_ZONEORDER=11
250CONFIG_PROC_DEVICETREE=y 256CONFIG_PROC_DEVICETREE=y
251# CONFIG_CMDLINE_BOOL is not set 257# CONFIG_CMDLINE_BOOL is not set
@@ -271,6 +277,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
271# CONFIG_PCI_MSI is not set 277# CONFIG_PCI_MSI is not set
272# CONFIG_PCI_LEGACY is not set 278# CONFIG_PCI_LEGACY is not set
273# CONFIG_PCI_DEBUG is not set 279# CONFIG_PCI_DEBUG is not set
280# CONFIG_PCI_STUB is not set
274# CONFIG_PCCARD is not set 281# CONFIG_PCCARD is not set
275# CONFIG_HOTPLUG_PCI is not set 282# CONFIG_HOTPLUG_PCI is not set
276# CONFIG_HAS_RAPIDIO is not set 283# CONFIG_HAS_RAPIDIO is not set
@@ -294,6 +301,7 @@ CONFIG_NET=y
294# 301#
295# Networking options 302# Networking options
296# 303#
304CONFIG_COMPAT_NET_DEV_OPS=y
297CONFIG_PACKET=y 305CONFIG_PACKET=y
298# CONFIG_PACKET_MMAP is not set 306# CONFIG_PACKET_MMAP is not set
299CONFIG_UNIX=y 307CONFIG_UNIX=y
@@ -382,6 +390,7 @@ CONFIG_SCTP_HMAC_MD5=y
382# CONFIG_ECONET is not set 390# CONFIG_ECONET is not set
383# CONFIG_WAN_ROUTER is not set 391# CONFIG_WAN_ROUTER is not set
384# CONFIG_NET_SCHED is not set 392# CONFIG_NET_SCHED is not set
393# CONFIG_DCB is not set
385 394
386# 395#
387# Network testing 396# Network testing
@@ -398,8 +407,9 @@ CONFIG_WIRELESS=y
398# CONFIG_CFG80211 is not set 407# CONFIG_CFG80211 is not set
399CONFIG_WIRELESS_OLD_REGULATORY=y 408CONFIG_WIRELESS_OLD_REGULATORY=y
400# CONFIG_WIRELESS_EXT is not set 409# CONFIG_WIRELESS_EXT is not set
410# CONFIG_LIB80211 is not set
401# CONFIG_MAC80211 is not set 411# CONFIG_MAC80211 is not set
402# CONFIG_IEEE80211 is not set 412# CONFIG_WIMAX is not set
403# CONFIG_RFKILL is not set 413# CONFIG_RFKILL is not set
404# CONFIG_NET_9P is not set 414# CONFIG_NET_9P is not set
405 415
@@ -449,8 +459,10 @@ CONFIG_MISC_DEVICES=y
449# CONFIG_EEPROM_93CX6 is not set 459# CONFIG_EEPROM_93CX6 is not set
450# CONFIG_SGI_IOC4 is not set 460# CONFIG_SGI_IOC4 is not set
451# CONFIG_TIFM_CORE is not set 461# CONFIG_TIFM_CORE is not set
462# CONFIG_ICS932S401 is not set
452# CONFIG_ENCLOSURE_SERVICES is not set 463# CONFIG_ENCLOSURE_SERVICES is not set
453# CONFIG_HP_ILO is not set 464# CONFIG_HP_ILO is not set
465# CONFIG_C2PORT is not set
454CONFIG_HAVE_IDE=y 466CONFIG_HAVE_IDE=y
455# CONFIG_IDE is not set 467# CONFIG_IDE is not set
456 468
@@ -494,6 +506,7 @@ CONFIG_SCSI_WAIT_SCAN=m
494# CONFIG_SCSI_SRP_ATTRS is not set 506# CONFIG_SCSI_SRP_ATTRS is not set
495CONFIG_SCSI_LOWLEVEL=y 507CONFIG_SCSI_LOWLEVEL=y
496# CONFIG_ISCSI_TCP is not set 508# CONFIG_ISCSI_TCP is not set
509# CONFIG_SCSI_CXGB3_ISCSI is not set
497# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 510# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
498# CONFIG_SCSI_3W_9XXX is not set 511# CONFIG_SCSI_3W_9XXX is not set
499# CONFIG_SCSI_ACARD is not set 512# CONFIG_SCSI_ACARD is not set
@@ -510,6 +523,8 @@ CONFIG_SCSI_LOWLEVEL=y
510# CONFIG_MEGARAID_SAS is not set 523# CONFIG_MEGARAID_SAS is not set
511# CONFIG_SCSI_HPTIOP is not set 524# CONFIG_SCSI_HPTIOP is not set
512# CONFIG_SCSI_BUSLOGIC is not set 525# CONFIG_SCSI_BUSLOGIC is not set
526# CONFIG_LIBFC is not set
527# CONFIG_FCOE is not set
513# CONFIG_SCSI_DMX3191D is not set 528# CONFIG_SCSI_DMX3191D is not set
514# CONFIG_SCSI_EATA is not set 529# CONFIG_SCSI_EATA is not set
515# CONFIG_SCSI_FUTURE_DOMAIN is not set 530# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -629,6 +644,9 @@ CONFIG_VITESSE_PHY=y
629# CONFIG_BROADCOM_PHY is not set 644# CONFIG_BROADCOM_PHY is not set
630# CONFIG_ICPLUS_PHY is not set 645# CONFIG_ICPLUS_PHY is not set
631# CONFIG_REALTEK_PHY is not set 646# CONFIG_REALTEK_PHY is not set
647# CONFIG_NATIONAL_PHY is not set
648# CONFIG_STE10XP is not set
649# CONFIG_LSI_ET1011C_PHY is not set
632# CONFIG_FIXED_PHY is not set 650# CONFIG_FIXED_PHY is not set
633# CONFIG_MDIO_BITBANG is not set 651# CONFIG_MDIO_BITBANG is not set
634CONFIG_NET_ETHERNET=y 652CONFIG_NET_ETHERNET=y
@@ -675,6 +693,7 @@ CONFIG_GIANFAR=y
675# CONFIG_JME is not set 693# CONFIG_JME is not set
676CONFIG_NETDEV_10000=y 694CONFIG_NETDEV_10000=y
677# CONFIG_CHELSIO_T1 is not set 695# CONFIG_CHELSIO_T1 is not set
696CONFIG_CHELSIO_T3_DEPENDS=y
678# CONFIG_CHELSIO_T3 is not set 697# CONFIG_CHELSIO_T3 is not set
679# CONFIG_ENIC is not set 698# CONFIG_ENIC is not set
680# CONFIG_IXGBE is not set 699# CONFIG_IXGBE is not set
@@ -699,6 +718,10 @@ CONFIG_NETDEV_10000=y
699# CONFIG_IWLWIFI_LEDS is not set 718# CONFIG_IWLWIFI_LEDS is not set
700 719
701# 720#
721# Enable WiMAX (Networking options) to see the WiMAX drivers
722#
723
724#
702# USB Network Adapters 725# USB Network Adapters
703# 726#
704# CONFIG_USB_CATC is not set 727# CONFIG_USB_CATC is not set
@@ -792,8 +815,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
792# CONFIG_SERIAL_OF_PLATFORM is not set 815# CONFIG_SERIAL_OF_PLATFORM is not set
793# CONFIG_SERIAL_QE is not set 816# CONFIG_SERIAL_QE is not set
794CONFIG_UNIX98_PTYS=y 817CONFIG_UNIX98_PTYS=y
818# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
795CONFIG_LEGACY_PTYS=y 819CONFIG_LEGACY_PTYS=y
796CONFIG_LEGACY_PTY_COUNT=256 820CONFIG_LEGACY_PTY_COUNT=256
821# CONFIG_HVC_UDBG is not set
797# CONFIG_IPMI_HANDLER is not set 822# CONFIG_IPMI_HANDLER is not set
798# CONFIG_HW_RANDOM is not set 823# CONFIG_HW_RANDOM is not set
799CONFIG_NVRAM=y 824CONFIG_NVRAM=y
@@ -866,7 +891,6 @@ CONFIG_EEPROM_LEGACY=y
866# CONFIG_PCF8575 is not set 891# CONFIG_PCF8575 is not set
867# CONFIG_SENSORS_PCA9539 is not set 892# CONFIG_SENSORS_PCA9539 is not set
868# CONFIG_SENSORS_PCF8591 is not set 893# CONFIG_SENSORS_PCF8591 is not set
869# CONFIG_TPS65010 is not set
870# CONFIG_SENSORS_MAX6875 is not set 894# CONFIG_SENSORS_MAX6875 is not set
871# CONFIG_SENSORS_TSL2550 is not set 895# CONFIG_SENSORS_TSL2550 is not set
872# CONFIG_I2C_DEBUG_CORE is not set 896# CONFIG_I2C_DEBUG_CORE is not set
@@ -881,6 +905,11 @@ CONFIG_GPIOLIB=y
881# CONFIG_GPIO_SYSFS is not set 905# CONFIG_GPIO_SYSFS is not set
882 906
883# 907#
908# Memory mapped GPIO expanders:
909#
910# CONFIG_GPIO_XILINX is not set
911
912#
884# I2C GPIO expanders: 913# I2C GPIO expanders:
885# 914#
886# CONFIG_GPIO_MAX732X is not set 915# CONFIG_GPIO_MAX732X is not set
@@ -901,11 +930,11 @@ CONFIG_GPIOLIB=y
901# CONFIG_THERMAL is not set 930# CONFIG_THERMAL is not set
902# CONFIG_THERMAL_HWMON is not set 931# CONFIG_THERMAL_HWMON is not set
903# CONFIG_WATCHDOG is not set 932# CONFIG_WATCHDOG is not set
933CONFIG_SSB_POSSIBLE=y
904 934
905# 935#
906# Sonics Silicon Backplane 936# Sonics Silicon Backplane
907# 937#
908CONFIG_SSB_POSSIBLE=y
909# CONFIG_SSB is not set 938# CONFIG_SSB is not set
910 939
911# 940#
@@ -915,18 +944,14 @@ CONFIG_SSB_POSSIBLE=y
915# CONFIG_MFD_SM501 is not set 944# CONFIG_MFD_SM501 is not set
916# CONFIG_HTC_PASIC3 is not set 945# CONFIG_HTC_PASIC3 is not set
917# CONFIG_UCB1400_CORE is not set 946# CONFIG_UCB1400_CORE is not set
947# CONFIG_TPS65010 is not set
948# CONFIG_TWL4030_CORE is not set
918# CONFIG_MFD_TMIO is not set 949# CONFIG_MFD_TMIO is not set
919# CONFIG_PMIC_DA903X is not set 950# CONFIG_PMIC_DA903X is not set
920# CONFIG_MFD_WM8400 is not set 951# CONFIG_MFD_WM8400 is not set
921# CONFIG_MFD_WM8350_I2C is not set 952# CONFIG_MFD_WM8350_I2C is not set
922 953# CONFIG_MFD_PCF50633 is not set
923#
924# Voltage and Current regulators
925#
926# CONFIG_REGULATOR is not set 954# 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
930 955
931# 956#
932# Multimedia devices 957# Multimedia devices
@@ -953,6 +978,7 @@ CONFIG_MEDIA_TUNER_TEA5767=m
953CONFIG_MEDIA_TUNER_MT20XX=m 978CONFIG_MEDIA_TUNER_MT20XX=m
954CONFIG_MEDIA_TUNER_XC2028=m 979CONFIG_MEDIA_TUNER_XC2028=m
955CONFIG_MEDIA_TUNER_XC5000=m 980CONFIG_MEDIA_TUNER_XC5000=m
981# CONFIG_DVB_DYNAMIC_MINORS is not set
956CONFIG_DVB_CAPTURE_DRIVERS=y 982CONFIG_DVB_CAPTURE_DRIVERS=y
957 983
958# 984#
@@ -998,6 +1024,12 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
998# CONFIG_DVB_FE_CUSTOMISE is not set 1024# CONFIG_DVB_FE_CUSTOMISE is not set
999 1025
1000# 1026#
1027# Multistandard (satellite) frontends
1028#
1029# CONFIG_DVB_STB0899 is not set
1030# CONFIG_DVB_STB6100 is not set
1031
1032#
1001# DVB-S (satellite) frontends 1033# DVB-S (satellite) frontends
1002# 1034#
1003# CONFIG_DVB_CX24110 is not set 1035# CONFIG_DVB_CX24110 is not set
@@ -1009,8 +1041,10 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
1009# CONFIG_DVB_STV0299 is not set 1041# CONFIG_DVB_STV0299 is not set
1010# CONFIG_DVB_TDA8083 is not set 1042# CONFIG_DVB_TDA8083 is not set
1011# CONFIG_DVB_TDA10086 is not set 1043# CONFIG_DVB_TDA10086 is not set
1044# CONFIG_DVB_TDA8261 is not set
1012# CONFIG_DVB_VES1X93 is not set 1045# CONFIG_DVB_VES1X93 is not set
1013# CONFIG_DVB_TUNER_ITD1000 is not set 1046# CONFIG_DVB_TUNER_ITD1000 is not set
1047# CONFIG_DVB_TUNER_CX24113 is not set
1014# CONFIG_DVB_TDA826X is not set 1048# CONFIG_DVB_TDA826X is not set
1015# CONFIG_DVB_TUA6100 is not set 1049# CONFIG_DVB_TUA6100 is not set
1016# CONFIG_DVB_CX24116 is not set 1050# CONFIG_DVB_CX24116 is not set
@@ -1051,11 +1085,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
1051# CONFIG_DVB_OR51132 is not set 1085# CONFIG_DVB_OR51132 is not set
1052# CONFIG_DVB_BCM3510 is not set 1086# CONFIG_DVB_BCM3510 is not set
1053# CONFIG_DVB_LGDT330X is not set 1087# CONFIG_DVB_LGDT330X is not set
1088# CONFIG_DVB_LGDT3304 is not set
1054# CONFIG_DVB_S5H1409 is not set 1089# CONFIG_DVB_S5H1409 is not set
1055# CONFIG_DVB_AU8522 is not set 1090# CONFIG_DVB_AU8522 is not set
1056# CONFIG_DVB_S5H1411 is not set 1091# CONFIG_DVB_S5H1411 is not set
1057 1092
1058# 1093#
1094# ISDB-T (terrestrial) frontends
1095#
1096# CONFIG_DVB_S921 is not set
1097
1098#
1059# Digital terrestrial only tuners/PLL 1099# Digital terrestrial only tuners/PLL
1060# 1100#
1061# CONFIG_DVB_PLL is not set 1101# CONFIG_DVB_PLL is not set
@@ -1108,6 +1148,7 @@ CONFIG_SND_OSSEMUL=y
1108CONFIG_SND_MIXER_OSS=y 1148CONFIG_SND_MIXER_OSS=y
1109CONFIG_SND_PCM_OSS=y 1149CONFIG_SND_PCM_OSS=y
1110CONFIG_SND_PCM_OSS_PLUGINS=y 1150CONFIG_SND_PCM_OSS_PLUGINS=y
1151# CONFIG_SND_HRTIMER is not set
1111# CONFIG_SND_DYNAMIC_MINORS is not set 1152# CONFIG_SND_DYNAMIC_MINORS is not set
1112# CONFIG_SND_SUPPORT_OLD_API is not set 1153# CONFIG_SND_SUPPORT_OLD_API is not set
1113CONFIG_SND_VERBOSE_PROCFS=y 1154CONFIG_SND_VERBOSE_PROCFS=y
@@ -1210,11 +1251,9 @@ CONFIG_HID_COMPAT=y
1210CONFIG_HID_A4TECH=y 1251CONFIG_HID_A4TECH=y
1211CONFIG_HID_APPLE=y 1252CONFIG_HID_APPLE=y
1212CONFIG_HID_BELKIN=y 1253CONFIG_HID_BELKIN=y
1213CONFIG_HID_BRIGHT=y
1214CONFIG_HID_CHERRY=y 1254CONFIG_HID_CHERRY=y
1215CONFIG_HID_CHICONY=y 1255CONFIG_HID_CHICONY=y
1216CONFIG_HID_CYPRESS=y 1256CONFIG_HID_CYPRESS=y
1217CONFIG_HID_DELL=y
1218CONFIG_HID_EZKEY=y 1257CONFIG_HID_EZKEY=y
1219CONFIG_HID_GYRATION=y 1258CONFIG_HID_GYRATION=y
1220CONFIG_HID_LOGITECH=y 1259CONFIG_HID_LOGITECH=y
@@ -1222,12 +1261,15 @@ CONFIG_HID_LOGITECH=y
1222# CONFIG_LOGIRUMBLEPAD2_FF is not set 1261# CONFIG_LOGIRUMBLEPAD2_FF is not set
1223CONFIG_HID_MICROSOFT=y 1262CONFIG_HID_MICROSOFT=y
1224CONFIG_HID_MONTEREY=y 1263CONFIG_HID_MONTEREY=y
1264# CONFIG_HID_NTRIG is not set
1225CONFIG_HID_PANTHERLORD=y 1265CONFIG_HID_PANTHERLORD=y
1226# CONFIG_PANTHERLORD_FF is not set 1266# CONFIG_PANTHERLORD_FF is not set
1227CONFIG_HID_PETALYNX=y 1267CONFIG_HID_PETALYNX=y
1228CONFIG_HID_SAMSUNG=y 1268CONFIG_HID_SAMSUNG=y
1229CONFIG_HID_SONY=y 1269CONFIG_HID_SONY=y
1230CONFIG_HID_SUNPLUS=y 1270CONFIG_HID_SUNPLUS=y
1271# CONFIG_GREENASIA_FF is not set
1272# CONFIG_HID_TOPSEED is not set
1231CONFIG_THRUSTMASTER_FF=m 1273CONFIG_THRUSTMASTER_FF=m
1232CONFIG_ZEROPLUS_FF=m 1274CONFIG_ZEROPLUS_FF=m
1233CONFIG_USB_SUPPORT=y 1275CONFIG_USB_SUPPORT=y
@@ -1260,6 +1302,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
1260# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1302# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1261CONFIG_USB_EHCI_FSL=y 1303CONFIG_USB_EHCI_FSL=y
1262CONFIG_USB_EHCI_HCD_PPC_OF=y 1304CONFIG_USB_EHCI_HCD_PPC_OF=y
1305# CONFIG_USB_OXU210HP_HCD is not set
1263# CONFIG_USB_ISP116X_HCD is not set 1306# CONFIG_USB_ISP116X_HCD is not set
1264# CONFIG_USB_ISP1760_HCD is not set 1307# CONFIG_USB_ISP1760_HCD is not set
1265CONFIG_USB_OHCI_HCD=y 1308CONFIG_USB_OHCI_HCD=y
@@ -1286,18 +1329,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1286# CONFIG_USB_TMC is not set 1329# CONFIG_USB_TMC is not set
1287 1330
1288# 1331#
1289# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1332# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1290# 1333#
1291 1334
1292# 1335#
1293# may also be needed; see USB_STORAGE Help for more information 1336# see USB_STORAGE Help for more information
1294# 1337#
1295CONFIG_USB_STORAGE=y 1338CONFIG_USB_STORAGE=y
1296# CONFIG_USB_STORAGE_DEBUG is not set 1339# CONFIG_USB_STORAGE_DEBUG is not set
1297# CONFIG_USB_STORAGE_DATAFAB is not set 1340# CONFIG_USB_STORAGE_DATAFAB is not set
1298# CONFIG_USB_STORAGE_FREECOM is not set 1341# CONFIG_USB_STORAGE_FREECOM is not set
1299# CONFIG_USB_STORAGE_ISD200 is not set 1342# CONFIG_USB_STORAGE_ISD200 is not set
1300# CONFIG_USB_STORAGE_DPCM is not set
1301# CONFIG_USB_STORAGE_USBAT is not set 1343# CONFIG_USB_STORAGE_USBAT is not set
1302# CONFIG_USB_STORAGE_SDDR09 is not set 1344# CONFIG_USB_STORAGE_SDDR09 is not set
1303# CONFIG_USB_STORAGE_SDDR55 is not set 1345# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1345,6 +1387,11 @@ CONFIG_USB_STORAGE=y
1345# CONFIG_USB_ISIGHTFW is not set 1387# CONFIG_USB_ISIGHTFW is not set
1346# CONFIG_USB_VST is not set 1388# CONFIG_USB_VST is not set
1347# CONFIG_USB_GADGET is not set 1389# CONFIG_USB_GADGET is not set
1390
1391#
1392# OTG and related infrastructure
1393#
1394# CONFIG_USB_GPIO_VBUS is not set
1348# CONFIG_UWB is not set 1395# CONFIG_UWB is not set
1349# CONFIG_MMC is not set 1396# CONFIG_MMC is not set
1350# CONFIG_MEMSTICK is not set 1397# CONFIG_MEMSTICK is not set
@@ -1389,6 +1436,7 @@ CONFIG_RTC_INTF_DEV=y
1389# CONFIG_RTC_DRV_M41T80 is not set 1436# CONFIG_RTC_DRV_M41T80 is not set
1390# CONFIG_RTC_DRV_S35390A is not set 1437# CONFIG_RTC_DRV_S35390A is not set
1391# CONFIG_RTC_DRV_FM3130 is not set 1438# CONFIG_RTC_DRV_FM3130 is not set
1439# CONFIG_RTC_DRV_RX8581 is not set
1392 1440
1393# 1441#
1394# SPI RTC drivers 1442# SPI RTC drivers
@@ -1448,7 +1496,9 @@ CONFIG_FS_MBCACHE=y
1448# CONFIG_FS_POSIX_ACL is not set 1496# CONFIG_FS_POSIX_ACL is not set
1449CONFIG_FILE_LOCKING=y 1497CONFIG_FILE_LOCKING=y
1450# CONFIG_XFS_FS is not set 1498# CONFIG_XFS_FS is not set
1499# CONFIG_GFS2_FS is not set
1451# CONFIG_OCFS2_FS is not set 1500# CONFIG_OCFS2_FS is not set
1501# CONFIG_BTRFS_FS is not set
1452CONFIG_DNOTIFY=y 1502CONFIG_DNOTIFY=y
1453CONFIG_INOTIFY=y 1503CONFIG_INOTIFY=y
1454CONFIG_INOTIFY_USER=y 1504CONFIG_INOTIFY_USER=y
@@ -1490,10 +1540,7 @@ CONFIG_TMPFS=y
1490# CONFIG_TMPFS_POSIX_ACL is not set 1540# CONFIG_TMPFS_POSIX_ACL is not set
1491# CONFIG_HUGETLB_PAGE is not set 1541# CONFIG_HUGETLB_PAGE is not set
1492# CONFIG_CONFIGFS_FS is not set 1542# CONFIG_CONFIGFS_FS is not set
1493 1543CONFIG_MISC_FILESYSTEMS=y
1494#
1495# Miscellaneous filesystems
1496#
1497CONFIG_ADFS_FS=m 1544CONFIG_ADFS_FS=m
1498# CONFIG_ADFS_FS_RW is not set 1545# CONFIG_ADFS_FS_RW is not set
1499CONFIG_AFFS_FS=m 1546CONFIG_AFFS_FS=m
@@ -1504,6 +1551,7 @@ CONFIG_BEFS_FS=m
1504CONFIG_BFS_FS=m 1551CONFIG_BFS_FS=m
1505CONFIG_EFS_FS=m 1552CONFIG_EFS_FS=m
1506CONFIG_CRAMFS=y 1553CONFIG_CRAMFS=y
1554# CONFIG_SQUASHFS is not set
1507CONFIG_VXFS_FS=m 1555CONFIG_VXFS_FS=m
1508# CONFIG_MINIX_FS is not set 1556# CONFIG_MINIX_FS is not set
1509# CONFIG_OMFS_FS is not set 1557# CONFIG_OMFS_FS is not set
@@ -1605,6 +1653,7 @@ CONFIG_NLS_UTF8=m
1605# Library routines 1653# Library routines
1606# 1654#
1607CONFIG_BITREVERSE=y 1655CONFIG_BITREVERSE=y
1656CONFIG_GENERIC_FIND_LAST_BIT=y
1608# CONFIG_CRC_CCITT is not set 1657# CONFIG_CRC_CCITT is not set
1609# CONFIG_CRC16 is not set 1658# CONFIG_CRC16 is not set
1610CONFIG_CRC_T10DIF=y 1659CONFIG_CRC_T10DIF=y
@@ -1656,6 +1705,7 @@ CONFIG_DEBUG_INFO=y
1656# CONFIG_DEBUG_MEMORY_INIT is not set 1705# CONFIG_DEBUG_MEMORY_INIT is not set
1657# CONFIG_DEBUG_LIST is not set 1706# CONFIG_DEBUG_LIST is not set
1658# CONFIG_DEBUG_SG is not set 1707# CONFIG_DEBUG_SG is not set
1708# CONFIG_DEBUG_NOTIFIERS is not set
1659# CONFIG_BOOT_PRINTK_DELAY is not set 1709# CONFIG_BOOT_PRINTK_DELAY is not set
1660# CONFIG_RCU_TORTURE_TEST is not set 1710# CONFIG_RCU_TORTURE_TEST is not set
1661# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1711# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1665,6 +1715,8 @@ CONFIG_DEBUG_INFO=y
1665# CONFIG_LATENCYTOP is not set 1715# CONFIG_LATENCYTOP is not set
1666CONFIG_SYSCTL_SYSCALL_CHECK=y 1716CONFIG_SYSCTL_SYSCALL_CHECK=y
1667CONFIG_HAVE_FUNCTION_TRACER=y 1717CONFIG_HAVE_FUNCTION_TRACER=y
1718CONFIG_HAVE_DYNAMIC_FTRACE=y
1719CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1668 1720
1669# 1721#
1670# Tracers 1722# Tracers
@@ -1673,11 +1725,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1673# CONFIG_SCHED_TRACER is not set 1725# CONFIG_SCHED_TRACER is not set
1674# CONFIG_CONTEXT_SWITCH_TRACER is not set 1726# CONFIG_CONTEXT_SWITCH_TRACER is not set
1675# CONFIG_BOOT_TRACER is not set 1727# CONFIG_BOOT_TRACER is not set
1728# CONFIG_TRACE_BRANCH_PROFILING is not set
1676# CONFIG_STACK_TRACER is not set 1729# CONFIG_STACK_TRACER is not set
1677# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1730# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1678# CONFIG_SAMPLES is not set 1731# CONFIG_SAMPLES is not set
1679CONFIG_HAVE_ARCH_KGDB=y 1732CONFIG_HAVE_ARCH_KGDB=y
1680# CONFIG_KGDB is not set 1733# CONFIG_KGDB is not set
1734CONFIG_PRINT_STACK_DEPTH=64
1681# CONFIG_DEBUG_STACKOVERFLOW is not set 1735# CONFIG_DEBUG_STACKOVERFLOW is not set
1682# CONFIG_DEBUG_STACK_USAGE is not set 1736# CONFIG_DEBUG_STACK_USAGE is not set
1683# CONFIG_DEBUG_PAGEALLOC is not set 1737# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1704,11 +1758,15 @@ CONFIG_CRYPTO=y
1704# 1758#
1705# CONFIG_CRYPTO_FIPS is not set 1759# CONFIG_CRYPTO_FIPS is not set
1706CONFIG_CRYPTO_ALGAPI=y 1760CONFIG_CRYPTO_ALGAPI=y
1707CONFIG_CRYPTO_AEAD=y 1761CONFIG_CRYPTO_ALGAPI2=y
1762CONFIG_CRYPTO_AEAD2=y
1708CONFIG_CRYPTO_BLKCIPHER=y 1763CONFIG_CRYPTO_BLKCIPHER=y
1764CONFIG_CRYPTO_BLKCIPHER2=y
1709CONFIG_CRYPTO_HASH=y 1765CONFIG_CRYPTO_HASH=y
1710CONFIG_CRYPTO_RNG=y 1766CONFIG_CRYPTO_HASH2=y
1767CONFIG_CRYPTO_RNG2=y
1711CONFIG_CRYPTO_MANAGER=y 1768CONFIG_CRYPTO_MANAGER=y
1769CONFIG_CRYPTO_MANAGER2=y
1712# CONFIG_CRYPTO_GF128MUL is not set 1770# CONFIG_CRYPTO_GF128MUL is not set
1713# CONFIG_CRYPTO_NULL is not set 1771# CONFIG_CRYPTO_NULL is not set
1714# CONFIG_CRYPTO_CRYPTD is not set 1772# CONFIG_CRYPTO_CRYPTD is not set
@@ -1742,7 +1800,7 @@ CONFIG_CRYPTO_HMAC=y
1742# 1800#
1743# Digest 1801# Digest
1744# 1802#
1745# CONFIG_CRYPTO_CRC32C is not set 1803CONFIG_CRYPTO_CRC32C=m
1746# CONFIG_CRYPTO_MD4 is not set 1804# CONFIG_CRYPTO_MD4 is not set
1747CONFIG_CRYPTO_MD5=y 1805CONFIG_CRYPTO_MD5=y
1748# CONFIG_CRYPTO_MICHAEL_MIC is not set 1806# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig
index 8272b1ac71f9..1793d08e9c01 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:43 2008 4# Mon Jan 26 15:35:38 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_PPC_8xx=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_8xx=y 17CONFIG_8xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -69,12 +70,12 @@ CONFIG_SYSVIPC_SYSCTL=y
69# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
70# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
72# CONFIG_CGROUPS is not set
73CONFIG_GROUP_SCHED=y 73CONFIG_GROUP_SCHED=y
74# CONFIG_FAIR_GROUP_SCHED is not set 74# CONFIG_FAIR_GROUP_SCHED is not set
75# CONFIG_RT_GROUP_SCHED is not set 75# CONFIG_RT_GROUP_SCHED is not set
76CONFIG_USER_SCHED=y 76CONFIG_USER_SCHED=y
77# CONFIG_CGROUP_SCHED is not set 77# CONFIG_CGROUP_SCHED is not set
78# CONFIG_CGROUPS is not set
78CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y 80CONFIG_SYSFS_DEPRECATED_V2=y
80# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
@@ -106,7 +107,6 @@ CONFIG_SLUB_DEBUG=y
106CONFIG_SLUB=y 107CONFIG_SLUB=y
107# CONFIG_SLOB is not set 108# CONFIG_SLOB is not set
108# CONFIG_PROFILING is not set 109# CONFIG_PROFILING is not set
109# CONFIG_MARKERS is not set
110CONFIG_HAVE_OPROFILE=y 110CONFIG_HAVE_OPROFILE=y
111CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 111CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
112CONFIG_HAVE_IOREMAP_PROT=y 112CONFIG_HAVE_IOREMAP_PROT=y
@@ -117,13 +117,11 @@ CONFIG_HAVE_CLK=y
117# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 117# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
118CONFIG_SLABINFO=y 118CONFIG_SLABINFO=y
119CONFIG_RT_MUTEXES=y 119CONFIG_RT_MUTEXES=y
120# CONFIG_TINY_SHMEM is not set
121CONFIG_BASE_SMALL=1 120CONFIG_BASE_SMALL=1
122# CONFIG_MODULES is not set 121# CONFIG_MODULES is not set
123CONFIG_BLOCK=y 122CONFIG_BLOCK=y
124# CONFIG_LBD is not set 123# CONFIG_LBD is not set
125# CONFIG_BLK_DEV_IO_TRACE is not set 124# CONFIG_BLK_DEV_IO_TRACE is not set
126# CONFIG_LSF is not set
127# CONFIG_BLK_DEV_BSG is not set 125# CONFIG_BLK_DEV_BSG is not set
128# CONFIG_BLK_DEV_INTEGRITY is not set 126# CONFIG_BLK_DEV_INTEGRITY is not set
129 127
@@ -140,6 +138,10 @@ CONFIG_DEFAULT_AS=y
140# CONFIG_DEFAULT_NOOP is not set 138# CONFIG_DEFAULT_NOOP is not set
141CONFIG_DEFAULT_IOSCHED="anticipatory" 139CONFIG_DEFAULT_IOSCHED="anticipatory"
142CONFIG_CLASSIC_RCU=y 140CONFIG_CLASSIC_RCU=y
141# CONFIG_TREE_RCU is not set
142# CONFIG_PREEMPT_RCU is not set
143# CONFIG_TREE_RCU_TRACE is not set
144# CONFIG_PREEMPT_RCU_TRACE is not set
143# CONFIG_FREEZER is not set 145# CONFIG_FREEZER is not set
144 146
145# 147#
@@ -185,6 +187,7 @@ CONFIG_NO_UCODE_PATCH=y
185# CONFIG_QUICC_ENGINE is not set 187# CONFIG_QUICC_ENGINE is not set
186# CONFIG_FSL_ULI1575 is not set 188# CONFIG_FSL_ULI1575 is not set
187CONFIG_CPM=y 189CONFIG_CPM=y
190# CONFIG_SIMPLE_GPIO is not set
188 191
189# 192#
190# Kernel options 193# Kernel options
@@ -209,6 +212,7 @@ CONFIG_BINFMT_ELF=y
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
215CONFIG_PPC_NEED_DMA_SYNC_OPS=y
212CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 216CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
213CONFIG_ARCH_HAS_WALK_MEMORY=y 217CONFIG_ARCH_HAS_WALK_MEMORY=y
214CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 218CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -223,12 +227,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
223CONFIG_PAGEFLAGS_EXTENDED=y 227CONFIG_PAGEFLAGS_EXTENDED=y
224CONFIG_SPLIT_PTLOCK_CPUS=4 228CONFIG_SPLIT_PTLOCK_CPUS=4
225CONFIG_MIGRATION=y 229CONFIG_MIGRATION=y
226# CONFIG_RESOURCES_64BIT is not set
227# CONFIG_PHYS_ADDR_T_64BIT is not set 230# CONFIG_PHYS_ADDR_T_64BIT is not set
228CONFIG_ZONE_DMA_FLAG=1 231CONFIG_ZONE_DMA_FLAG=1
229CONFIG_BOUNCE=y 232CONFIG_BOUNCE=y
230CONFIG_VIRT_TO_BUS=y 233CONFIG_VIRT_TO_BUS=y
231CONFIG_UNEVICTABLE_LRU=y 234CONFIG_UNEVICTABLE_LRU=y
235CONFIG_PPC_4K_PAGES=y
236# CONFIG_PPC_16K_PAGES is not set
237# CONFIG_PPC_64K_PAGES is not set
232CONFIG_FORCE_MAX_ZONEORDER=11 238CONFIG_FORCE_MAX_ZONEORDER=11
233# CONFIG_PROC_DEVICETREE is not set 239# CONFIG_PROC_DEVICETREE is not set
234# CONFIG_CMDLINE_BOOL is not set 240# CONFIG_CMDLINE_BOOL is not set
@@ -269,6 +275,7 @@ CONFIG_NET=y
269# 275#
270# Networking options 276# Networking options
271# 277#
278CONFIG_COMPAT_NET_DEV_OPS=y
272CONFIG_PACKET=y 279CONFIG_PACKET=y
273# CONFIG_PACKET_MMAP is not set 280# CONFIG_PACKET_MMAP is not set
274CONFIG_UNIX=y 281CONFIG_UNIX=y
@@ -325,6 +332,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
325# CONFIG_ECONET is not set 332# CONFIG_ECONET is not set
326# CONFIG_WAN_ROUTER is not set 333# CONFIG_WAN_ROUTER is not set
327# CONFIG_NET_SCHED is not set 334# CONFIG_NET_SCHED is not set
335# CONFIG_DCB is not set
328 336
329# 337#
330# Network testing 338# Network testing
@@ -340,8 +348,9 @@ CONFIG_WIRELESS=y
340# CONFIG_CFG80211 is not set 348# CONFIG_CFG80211 is not set
341CONFIG_WIRELESS_OLD_REGULATORY=y 349CONFIG_WIRELESS_OLD_REGULATORY=y
342# CONFIG_WIRELESS_EXT is not set 350# CONFIG_WIRELESS_EXT is not set
351# CONFIG_LIB80211 is not set
343# CONFIG_MAC80211 is not set 352# CONFIG_MAC80211 is not set
344# CONFIG_IEEE80211 is not set 353# CONFIG_WIMAX is not set
345# CONFIG_RFKILL is not set 354# CONFIG_RFKILL is not set
346# CONFIG_NET_9P is not set 355# CONFIG_NET_9P is not set
347 356
@@ -372,6 +381,7 @@ CONFIG_BLK_DEV_LOOP=y
372CONFIG_MISC_DEVICES=y 381CONFIG_MISC_DEVICES=y
373# CONFIG_EEPROM_93CX6 is not set 382# CONFIG_EEPROM_93CX6 is not set
374# CONFIG_ENCLOSURE_SERVICES is not set 383# CONFIG_ENCLOSURE_SERVICES is not set
384# CONFIG_C2PORT is not set
375CONFIG_HAVE_IDE=y 385CONFIG_HAVE_IDE=y
376# CONFIG_IDE is not set 386# CONFIG_IDE is not set
377 387
@@ -407,6 +417,9 @@ CONFIG_PHYLIB=y
407# CONFIG_BROADCOM_PHY is not set 417# CONFIG_BROADCOM_PHY is not set
408# CONFIG_ICPLUS_PHY is not set 418# CONFIG_ICPLUS_PHY is not set
409# CONFIG_REALTEK_PHY is not set 419# CONFIG_REALTEK_PHY is not set
420# CONFIG_NATIONAL_PHY is not set
421# CONFIG_STE10XP is not set
422# CONFIG_LSI_ET1011C_PHY is not set
410CONFIG_FIXED_PHY=y 423CONFIG_FIXED_PHY=y
411# CONFIG_MDIO_BITBANG is not set 424# CONFIG_MDIO_BITBANG is not set
412CONFIG_NET_ETHERNET=y 425CONFIG_NET_ETHERNET=y
@@ -433,6 +446,10 @@ CONFIG_NETDEV_10000=y
433# CONFIG_WLAN_PRE80211 is not set 446# CONFIG_WLAN_PRE80211 is not set
434# CONFIG_WLAN_80211 is not set 447# CONFIG_WLAN_80211 is not set
435# CONFIG_IWLWIFI_LEDS is not set 448# CONFIG_IWLWIFI_LEDS is not set
449
450#
451# Enable WiMAX (Networking options) to see the WiMAX drivers
452#
436# CONFIG_WAN is not set 453# CONFIG_WAN is not set
437# CONFIG_PPP is not set 454# CONFIG_PPP is not set
438# CONFIG_SLIP is not set 455# CONFIG_SLIP is not set
@@ -518,7 +535,9 @@ CONFIG_SERIAL_CORE_CONSOLE=y
518CONFIG_SERIAL_CPM=y 535CONFIG_SERIAL_CPM=y
519CONFIG_SERIAL_CPM_CONSOLE=y 536CONFIG_SERIAL_CPM_CONSOLE=y
520CONFIG_UNIX98_PTYS=y 537CONFIG_UNIX98_PTYS=y
538# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
521# CONFIG_LEGACY_PTYS is not set 539# CONFIG_LEGACY_PTYS is not set
540# CONFIG_HVC_UDBG is not set
522# CONFIG_IPMI_HANDLER is not set 541# CONFIG_IPMI_HANDLER is not set
523CONFIG_HW_RANDOM=y 542CONFIG_HW_RANDOM=y
524# CONFIG_NVRAM is not set 543# CONFIG_NVRAM is not set
@@ -549,11 +568,11 @@ CONFIG_HWMON=y
549# CONFIG_THERMAL is not set 568# CONFIG_THERMAL is not set
550# CONFIG_THERMAL_HWMON is not set 569# CONFIG_THERMAL_HWMON is not set
551# CONFIG_WATCHDOG is not set 570# CONFIG_WATCHDOG is not set
571CONFIG_SSB_POSSIBLE=y
552 572
553# 573#
554# Sonics Silicon Backplane 574# Sonics Silicon Backplane
555# 575#
556CONFIG_SSB_POSSIBLE=y
557# CONFIG_SSB is not set 576# CONFIG_SSB is not set
558 577
559# 578#
@@ -563,14 +582,7 @@ CONFIG_SSB_POSSIBLE=y
563# CONFIG_MFD_SM501 is not set 582# CONFIG_MFD_SM501 is not set
564# CONFIG_HTC_PASIC3 is not set 583# CONFIG_HTC_PASIC3 is not set
565# CONFIG_MFD_TMIO is not set 584# CONFIG_MFD_TMIO is not set
566
567#
568# Voltage and Current regulators
569#
570# CONFIG_REGULATOR is not set 585# 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 586
575# 587#
576# Multimedia devices 588# Multimedia devices
@@ -623,9 +635,13 @@ CONFIG_USB_SUPPORT=y
623# 635#
624 636
625# 637#
626# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 638# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
627# 639#
628# CONFIG_USB_GADGET is not set 640# CONFIG_USB_GADGET is not set
641
642#
643# OTG and related infrastructure
644#
629# CONFIG_MMC is not set 645# CONFIG_MMC is not set
630# CONFIG_MEMSTICK is not set 646# CONFIG_MEMSTICK is not set
631# CONFIG_NEW_LEDS is not set 647# CONFIG_NEW_LEDS is not set
@@ -657,6 +673,7 @@ CONFIG_FS_MBCACHE=y
657CONFIG_FILE_LOCKING=y 673CONFIG_FILE_LOCKING=y
658# CONFIG_XFS_FS is not set 674# CONFIG_XFS_FS is not set
659# CONFIG_OCFS2_FS is not set 675# CONFIG_OCFS2_FS is not set
676# CONFIG_BTRFS_FS is not set
660CONFIG_DNOTIFY=y 677CONFIG_DNOTIFY=y
661CONFIG_INOTIFY=y 678CONFIG_INOTIFY=y
662CONFIG_INOTIFY_USER=y 679CONFIG_INOTIFY_USER=y
@@ -690,10 +707,7 @@ CONFIG_TMPFS=y
690# CONFIG_TMPFS_POSIX_ACL is not set 707# CONFIG_TMPFS_POSIX_ACL is not set
691# CONFIG_HUGETLB_PAGE is not set 708# CONFIG_HUGETLB_PAGE is not set
692# CONFIG_CONFIGFS_FS is not set 709# CONFIG_CONFIGFS_FS is not set
693 710CONFIG_MISC_FILESYSTEMS=y
694#
695# Miscellaneous filesystems
696#
697# CONFIG_ADFS_FS is not set 711# CONFIG_ADFS_FS is not set
698# CONFIG_AFFS_FS is not set 712# CONFIG_AFFS_FS is not set
699# CONFIG_HFS_FS is not set 713# CONFIG_HFS_FS is not set
@@ -702,6 +716,7 @@ CONFIG_TMPFS=y
702# CONFIG_BFS_FS is not set 716# CONFIG_BFS_FS is not set
703# CONFIG_EFS_FS is not set 717# CONFIG_EFS_FS is not set
704CONFIG_CRAMFS=y 718CONFIG_CRAMFS=y
719# CONFIG_SQUASHFS is not set
705# CONFIG_VXFS_FS is not set 720# CONFIG_VXFS_FS is not set
706# CONFIG_MINIX_FS is not set 721# CONFIG_MINIX_FS is not set
707# CONFIG_OMFS_FS is not set 722# CONFIG_OMFS_FS is not set
@@ -758,6 +773,7 @@ CONFIG_MSDOS_PARTITION=y
758# Library routines 773# Library routines
759# 774#
760CONFIG_BITREVERSE=y 775CONFIG_BITREVERSE=y
776CONFIG_GENERIC_FIND_LAST_BIT=y
761CONFIG_CRC_CCITT=y 777CONFIG_CRC_CCITT=y
762# CONFIG_CRC16 is not set 778# CONFIG_CRC16 is not set
763# CONFIG_CRC_T10DIF is not set 779# CONFIG_CRC_T10DIF is not set
@@ -790,6 +806,8 @@ CONFIG_FRAME_WARN=1024
790# CONFIG_RCU_CPU_STALL_DETECTOR is not set 806# CONFIG_RCU_CPU_STALL_DETECTOR is not set
791# CONFIG_LATENCYTOP is not set 807# CONFIG_LATENCYTOP is not set
792CONFIG_HAVE_FUNCTION_TRACER=y 808CONFIG_HAVE_FUNCTION_TRACER=y
809CONFIG_HAVE_DYNAMIC_FTRACE=y
810CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
793 811
794# 812#
795# Tracers 813# Tracers
@@ -797,6 +815,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
797# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 815# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
798# CONFIG_SAMPLES is not set 816# CONFIG_SAMPLES is not set
799CONFIG_HAVE_ARCH_KGDB=y 817CONFIG_HAVE_ARCH_KGDB=y
818CONFIG_PRINT_STACK_DEPTH=64
800# CONFIG_IRQSTACKS is not set 819# CONFIG_IRQSTACKS is not set
801# CONFIG_PPC_EARLY_DEBUG is not set 820# CONFIG_PPC_EARLY_DEBUG is not set
802 821
@@ -814,6 +833,7 @@ CONFIG_CRYPTO=y
814# 833#
815# CONFIG_CRYPTO_FIPS is not set 834# CONFIG_CRYPTO_FIPS is not set
816# CONFIG_CRYPTO_MANAGER is not set 835# CONFIG_CRYPTO_MANAGER is not set
836# CONFIG_CRYPTO_MANAGER2 is not set
817# CONFIG_CRYPTO_GF128MUL is not set 837# CONFIG_CRYPTO_GF128MUL is not set
818# CONFIG_CRYPTO_NULL is not set 838# CONFIG_CRYPTO_NULL is not set
819# CONFIG_CRYPTO_CRYPTD is not set 839# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig
index 21e0ccbd3f5c..adc756e1f252 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:44 2008 4# Mon Jan 26 15:35:39 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -41,11 +41,12 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
41CONFIG_GENERIC_HWEIGHT=y 41CONFIG_GENERIC_HWEIGHT=y
42CONFIG_GENERIC_CALIBRATE_DELAY=y 42CONFIG_GENERIC_CALIBRATE_DELAY=y
43CONFIG_GENERIC_FIND_NEXT_BIT=y 43CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_GENERIC_GPIO=y
44# CONFIG_ARCH_NO_VIRT_TO_BUS is not set 45# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
45CONFIG_PPC=y 46CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 47CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 48CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 49CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 50CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 51CONFIG_PPC_OF=y
51CONFIG_OF=y 52CONFIG_OF=y
@@ -78,12 +79,12 @@ CONFIG_AUDIT=y
78CONFIG_IKCONFIG=y 79CONFIG_IKCONFIG=y
79CONFIG_IKCONFIG_PROC=y 80CONFIG_IKCONFIG_PROC=y
80CONFIG_LOG_BUF_SHIFT=14 81CONFIG_LOG_BUF_SHIFT=14
81# CONFIG_CGROUPS is not set
82CONFIG_GROUP_SCHED=y 82CONFIG_GROUP_SCHED=y
83# CONFIG_FAIR_GROUP_SCHED is not set 83# CONFIG_FAIR_GROUP_SCHED is not set
84# CONFIG_RT_GROUP_SCHED is not set 84# CONFIG_RT_GROUP_SCHED is not set
85CONFIG_USER_SCHED=y 85CONFIG_USER_SCHED=y
86# CONFIG_CGROUP_SCHED is not set 86# CONFIG_CGROUP_SCHED is not set
87# CONFIG_CGROUPS is not set
87CONFIG_SYSFS_DEPRECATED=y 88CONFIG_SYSFS_DEPRECATED=y
88CONFIG_SYSFS_DEPRECATED_V2=y 89CONFIG_SYSFS_DEPRECATED_V2=y
89# CONFIG_RELAY is not set 90# CONFIG_RELAY is not set
@@ -96,6 +97,7 @@ CONFIG_EMBEDDED=y
96CONFIG_SYSCTL_SYSCALL=y 97CONFIG_SYSCTL_SYSCALL=y
97CONFIG_KALLSYMS=y 98CONFIG_KALLSYMS=y
98CONFIG_KALLSYMS_ALL=y 99CONFIG_KALLSYMS_ALL=y
100CONFIG_KALLSYMS_STRIP_GENERATED=y
99CONFIG_KALLSYMS_EXTRA_PASS=y 101CONFIG_KALLSYMS_EXTRA_PASS=y
100CONFIG_HOTPLUG=y 102CONFIG_HOTPLUG=y
101CONFIG_PRINTK=y 103CONFIG_PRINTK=y
@@ -118,7 +120,6 @@ CONFIG_SLUB_DEBUG=y
118CONFIG_SLUB=y 120CONFIG_SLUB=y
119# CONFIG_SLOB is not set 121# CONFIG_SLOB is not set
120# CONFIG_PROFILING is not set 122# CONFIG_PROFILING is not set
121# CONFIG_MARKERS is not set
122CONFIG_HAVE_OPROFILE=y 123CONFIG_HAVE_OPROFILE=y
123# CONFIG_KPROBES is not set 124# CONFIG_KPROBES is not set
124CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 125CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -130,7 +131,6 @@ CONFIG_USE_GENERIC_SMP_HELPERS=y
130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 131# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
131CONFIG_SLABINFO=y 132CONFIG_SLABINFO=y
132CONFIG_RT_MUTEXES=y 133CONFIG_RT_MUTEXES=y
133# CONFIG_TINY_SHMEM is not set
134CONFIG_BASE_SMALL=0 134CONFIG_BASE_SMALL=0
135CONFIG_MODULES=y 135CONFIG_MODULES=y
136# CONFIG_MODULE_FORCE_LOAD is not set 136# CONFIG_MODULE_FORCE_LOAD is not set
@@ -138,12 +138,10 @@ CONFIG_MODULE_UNLOAD=y
138CONFIG_MODULE_FORCE_UNLOAD=y 138CONFIG_MODULE_FORCE_UNLOAD=y
139CONFIG_MODVERSIONS=y 139CONFIG_MODVERSIONS=y
140# CONFIG_MODULE_SRCVERSION_ALL is not set 140# CONFIG_MODULE_SRCVERSION_ALL is not set
141CONFIG_KMOD=y
142CONFIG_STOP_MACHINE=y 141CONFIG_STOP_MACHINE=y
143CONFIG_BLOCK=y 142CONFIG_BLOCK=y
144CONFIG_LBD=y 143CONFIG_LBD=y
145# CONFIG_BLK_DEV_IO_TRACE is not set 144# CONFIG_BLK_DEV_IO_TRACE is not set
146# CONFIG_LSF is not set
147# CONFIG_BLK_DEV_BSG is not set 145# CONFIG_BLK_DEV_BSG is not set
148# CONFIG_BLK_DEV_INTEGRITY is not set 146# CONFIG_BLK_DEV_INTEGRITY is not set
149 147
@@ -160,6 +158,10 @@ 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_TREE_RCU is not set
162# CONFIG_PREEMPT_RCU is not set
163# CONFIG_TREE_RCU_TRACE is not set
164# CONFIG_PREEMPT_RCU_TRACE is not set
163# CONFIG_FREEZER is not set 165# CONFIG_FREEZER is not set
164 166
165# 167#
@@ -199,6 +201,7 @@ CONFIG_PPC_I8259=y
199# CONFIG_QUICC_ENGINE is not set 201# CONFIG_QUICC_ENGINE is not set
200CONFIG_FSL_ULI1575=y 202CONFIG_FSL_ULI1575=y
201# CONFIG_MPC8xxx_GPIO is not set 203# CONFIG_MPC8xxx_GPIO is not set
204# CONFIG_SIMPLE_GPIO is not set
202 205
203# 206#
204# Kernel options 207# Kernel options
@@ -226,6 +229,7 @@ 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
232# CONFIG_CRASH_DUMP is not set
229# CONFIG_IRQ_ALL_CPUS is not set 233# CONFIG_IRQ_ALL_CPUS is not set
230CONFIG_ARCH_FLATMEM_ENABLE=y 234CONFIG_ARCH_FLATMEM_ENABLE=y
231CONFIG_ARCH_POPULATES_NODE_MAP=y 235CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -238,12 +242,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
238CONFIG_PAGEFLAGS_EXTENDED=y 242CONFIG_PAGEFLAGS_EXTENDED=y
239CONFIG_SPLIT_PTLOCK_CPUS=4 243CONFIG_SPLIT_PTLOCK_CPUS=4
240CONFIG_MIGRATION=y 244CONFIG_MIGRATION=y
241# CONFIG_RESOURCES_64BIT is not set
242# CONFIG_PHYS_ADDR_T_64BIT is not set 245# CONFIG_PHYS_ADDR_T_64BIT is not set
243CONFIG_ZONE_DMA_FLAG=1 246CONFIG_ZONE_DMA_FLAG=1
244CONFIG_BOUNCE=y 247CONFIG_BOUNCE=y
245CONFIG_VIRT_TO_BUS=y 248CONFIG_VIRT_TO_BUS=y
246CONFIG_UNEVICTABLE_LRU=y 249CONFIG_UNEVICTABLE_LRU=y
250CONFIG_PPC_4K_PAGES=y
251# CONFIG_PPC_16K_PAGES is not set
252# CONFIG_PPC_64K_PAGES is not set
247CONFIG_FORCE_MAX_ZONEORDER=11 253CONFIG_FORCE_MAX_ZONEORDER=11
248CONFIG_PROC_DEVICETREE=y 254CONFIG_PROC_DEVICETREE=y
249# CONFIG_CMDLINE_BOOL is not set 255# CONFIG_CMDLINE_BOOL is not set
@@ -269,6 +275,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
269# CONFIG_PCI_MSI is not set 275# CONFIG_PCI_MSI is not set
270# CONFIG_PCI_LEGACY is not set 276# CONFIG_PCI_LEGACY is not set
271# CONFIG_PCI_DEBUG is not set 277# CONFIG_PCI_DEBUG is not set
278# CONFIG_PCI_STUB is not set
272# CONFIG_PCCARD is not set 279# CONFIG_PCCARD is not set
273# CONFIG_HOTPLUG_PCI is not set 280# CONFIG_HOTPLUG_PCI is not set
274CONFIG_HAS_RAPIDIO=y 281CONFIG_HAS_RAPIDIO=y
@@ -292,6 +299,7 @@ CONFIG_NET=y
292# 299#
293# Networking options 300# Networking options
294# 301#
302CONFIG_COMPAT_NET_DEV_OPS=y
295CONFIG_PACKET=y 303CONFIG_PACKET=y
296# CONFIG_PACKET_MMAP is not set 304# CONFIG_PACKET_MMAP is not set
297CONFIG_UNIX=y 305CONFIG_UNIX=y
@@ -380,6 +388,7 @@ CONFIG_SCTP_HMAC_MD5=y
380# CONFIG_ECONET is not set 388# CONFIG_ECONET is not set
381# CONFIG_WAN_ROUTER is not set 389# CONFIG_WAN_ROUTER is not set
382# CONFIG_NET_SCHED is not set 390# CONFIG_NET_SCHED is not set
391# CONFIG_DCB is not set
383 392
384# 393#
385# Network testing 394# Network testing
@@ -396,8 +405,9 @@ CONFIG_WIRELESS=y
396# CONFIG_CFG80211 is not set 405# CONFIG_CFG80211 is not set
397CONFIG_WIRELESS_OLD_REGULATORY=y 406CONFIG_WIRELESS_OLD_REGULATORY=y
398# CONFIG_WIRELESS_EXT is not set 407# CONFIG_WIRELESS_EXT is not set
408# CONFIG_LIB80211 is not set
399# CONFIG_MAC80211 is not set 409# CONFIG_MAC80211 is not set
400# CONFIG_IEEE80211 is not set 410# CONFIG_WIMAX is not set
401# CONFIG_RFKILL is not set 411# CONFIG_RFKILL is not set
402# CONFIG_NET_9P is not set 412# CONFIG_NET_9P is not set
403 413
@@ -420,6 +430,7 @@ CONFIG_EXTRA_FIRMWARE=""
420# CONFIG_CONNECTOR is not set 430# CONFIG_CONNECTOR is not set
421# CONFIG_MTD is not set 431# CONFIG_MTD is not set
422CONFIG_OF_DEVICE=y 432CONFIG_OF_DEVICE=y
433CONFIG_OF_GPIO=y
423CONFIG_OF_I2C=y 434CONFIG_OF_I2C=y
424# CONFIG_PARPORT is not set 435# CONFIG_PARPORT is not set
425CONFIG_BLK_DEV=y 436CONFIG_BLK_DEV=y
@@ -446,8 +457,10 @@ CONFIG_MISC_DEVICES=y
446# CONFIG_EEPROM_93CX6 is not set 457# CONFIG_EEPROM_93CX6 is not set
447# CONFIG_SGI_IOC4 is not set 458# CONFIG_SGI_IOC4 is not set
448# CONFIG_TIFM_CORE is not set 459# CONFIG_TIFM_CORE is not set
460# CONFIG_ICS932S401 is not set
449# CONFIG_ENCLOSURE_SERVICES is not set 461# CONFIG_ENCLOSURE_SERVICES is not set
450# CONFIG_HP_ILO is not set 462# CONFIG_HP_ILO is not set
463# CONFIG_C2PORT is not set
451CONFIG_HAVE_IDE=y 464CONFIG_HAVE_IDE=y
452# CONFIG_IDE is not set 465# CONFIG_IDE is not set
453 466
@@ -491,6 +504,7 @@ CONFIG_SCSI_WAIT_SCAN=m
491# CONFIG_SCSI_SRP_ATTRS is not set 504# CONFIG_SCSI_SRP_ATTRS is not set
492CONFIG_SCSI_LOWLEVEL=y 505CONFIG_SCSI_LOWLEVEL=y
493# CONFIG_ISCSI_TCP is not set 506# CONFIG_ISCSI_TCP is not set
507# CONFIG_SCSI_CXGB3_ISCSI is not set
494# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 508# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
495# CONFIG_SCSI_3W_9XXX is not set 509# CONFIG_SCSI_3W_9XXX is not set
496# CONFIG_SCSI_ACARD is not set 510# CONFIG_SCSI_ACARD is not set
@@ -507,6 +521,8 @@ CONFIG_SCSI_LOWLEVEL=y
507# CONFIG_MEGARAID_SAS is not set 521# CONFIG_MEGARAID_SAS is not set
508# CONFIG_SCSI_HPTIOP is not set 522# CONFIG_SCSI_HPTIOP is not set
509# CONFIG_SCSI_BUSLOGIC is not set 523# CONFIG_SCSI_BUSLOGIC is not set
524# CONFIG_LIBFC is not set
525# CONFIG_FCOE is not set
510# CONFIG_SCSI_DMX3191D is not set 526# CONFIG_SCSI_DMX3191D is not set
511# CONFIG_SCSI_EATA is not set 527# CONFIG_SCSI_EATA is not set
512# CONFIG_SCSI_FUTURE_DOMAIN is not set 528# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -626,6 +642,9 @@ CONFIG_VITESSE_PHY=y
626# CONFIG_BROADCOM_PHY is not set 642# CONFIG_BROADCOM_PHY is not set
627# CONFIG_ICPLUS_PHY is not set 643# CONFIG_ICPLUS_PHY is not set
628# CONFIG_REALTEK_PHY is not set 644# CONFIG_REALTEK_PHY is not set
645# CONFIG_NATIONAL_PHY is not set
646# CONFIG_STE10XP is not set
647# CONFIG_LSI_ET1011C_PHY is not set
629# CONFIG_FIXED_PHY is not set 648# CONFIG_FIXED_PHY is not set
630# CONFIG_MDIO_BITBANG is not set 649# CONFIG_MDIO_BITBANG is not set
631CONFIG_NET_ETHERNET=y 650CONFIG_NET_ETHERNET=y
@@ -671,6 +690,7 @@ CONFIG_GIANFAR=y
671# CONFIG_JME is not set 690# CONFIG_JME is not set
672CONFIG_NETDEV_10000=y 691CONFIG_NETDEV_10000=y
673# CONFIG_CHELSIO_T1 is not set 692# CONFIG_CHELSIO_T1 is not set
693CONFIG_CHELSIO_T3_DEPENDS=y
674# CONFIG_CHELSIO_T3 is not set 694# CONFIG_CHELSIO_T3 is not set
675# CONFIG_ENIC is not set 695# CONFIG_ENIC is not set
676# CONFIG_IXGBE is not set 696# CONFIG_IXGBE is not set
@@ -695,6 +715,10 @@ CONFIG_NETDEV_10000=y
695# CONFIG_IWLWIFI_LEDS is not set 715# CONFIG_IWLWIFI_LEDS is not set
696 716
697# 717#
718# Enable WiMAX (Networking options) to see the WiMAX drivers
719#
720
721#
698# USB Network Adapters 722# USB Network Adapters
699# 723#
700# CONFIG_USB_CATC is not set 724# CONFIG_USB_CATC is not set
@@ -786,8 +810,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
786# CONFIG_SERIAL_JSM is not set 810# CONFIG_SERIAL_JSM is not set
787# CONFIG_SERIAL_OF_PLATFORM is not set 811# CONFIG_SERIAL_OF_PLATFORM is not set
788CONFIG_UNIX98_PTYS=y 812CONFIG_UNIX98_PTYS=y
813# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
789CONFIG_LEGACY_PTYS=y 814CONFIG_LEGACY_PTYS=y
790CONFIG_LEGACY_PTY_COUNT=256 815CONFIG_LEGACY_PTY_COUNT=256
816# CONFIG_HVC_UDBG is not set
791# CONFIG_IPMI_HANDLER is not set 817# CONFIG_IPMI_HANDLER is not set
792# CONFIG_HW_RANDOM is not set 818# CONFIG_HW_RANDOM is not set
793CONFIG_NVRAM=y 819CONFIG_NVRAM=y
@@ -826,6 +852,7 @@ CONFIG_I2C_HELPER_AUTO=y
826# 852#
827# I2C system bus drivers (mostly embedded / system-on-chip) 853# I2C system bus drivers (mostly embedded / system-on-chip)
828# 854#
855# CONFIG_I2C_GPIO is not set
829CONFIG_I2C_MPC=y 856CONFIG_I2C_MPC=y
830# CONFIG_I2C_OCORES is not set 857# CONFIG_I2C_OCORES is not set
831# CONFIG_I2C_SIMTEC is not set 858# CONFIG_I2C_SIMTEC is not set
@@ -866,18 +893,42 @@ CONFIG_EEPROM_LEGACY=y
866# CONFIG_I2C_DEBUG_CHIP is not set 893# CONFIG_I2C_DEBUG_CHIP is not set
867# CONFIG_SPI is not set 894# CONFIG_SPI is not set
868CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 895CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
869# CONFIG_GPIOLIB is not set 896CONFIG_ARCH_REQUIRE_GPIOLIB=y
897CONFIG_GPIOLIB=y
898# CONFIG_DEBUG_GPIO is not set
899# CONFIG_GPIO_SYSFS is not set
900
901#
902# Memory mapped GPIO expanders:
903#
904# CONFIG_GPIO_XILINX is not set
905
906#
907# I2C GPIO expanders:
908#
909# CONFIG_GPIO_MAX732X is not set
910# CONFIG_GPIO_PCA953X is not set
911# CONFIG_GPIO_PCF857X is not set
912
913#
914# PCI GPIO expanders:
915#
916# CONFIG_GPIO_BT8XX is not set
917
918#
919# SPI GPIO expanders:
920#
870# CONFIG_W1 is not set 921# CONFIG_W1 is not set
871# CONFIG_POWER_SUPPLY is not set 922# CONFIG_POWER_SUPPLY is not set
872# CONFIG_HWMON is not set 923# CONFIG_HWMON is not set
873# CONFIG_THERMAL is not set 924# CONFIG_THERMAL is not set
874# CONFIG_THERMAL_HWMON is not set 925# CONFIG_THERMAL_HWMON is not set
875# CONFIG_WATCHDOG is not set 926# CONFIG_WATCHDOG is not set
927CONFIG_SSB_POSSIBLE=y
876 928
877# 929#
878# Sonics Silicon Backplane 930# Sonics Silicon Backplane
879# 931#
880CONFIG_SSB_POSSIBLE=y
881# CONFIG_SSB is not set 932# CONFIG_SSB is not set
882 933
883# 934#
@@ -886,18 +937,15 @@ CONFIG_SSB_POSSIBLE=y
886# CONFIG_MFD_CORE is not set 937# CONFIG_MFD_CORE is not set
887# CONFIG_MFD_SM501 is not set 938# CONFIG_MFD_SM501 is not set
888# CONFIG_HTC_PASIC3 is not set 939# CONFIG_HTC_PASIC3 is not set
940# CONFIG_UCB1400_CORE is not set
941# CONFIG_TPS65010 is not set
942# CONFIG_TWL4030_CORE is not set
889# CONFIG_MFD_TMIO is not set 943# CONFIG_MFD_TMIO is not set
890# CONFIG_PMIC_DA903X is not set 944# CONFIG_PMIC_DA903X is not set
891# CONFIG_MFD_WM8400 is not set 945# CONFIG_MFD_WM8400 is not set
892# CONFIG_MFD_WM8350_I2C is not set 946# CONFIG_MFD_WM8350_I2C is not set
893 947# CONFIG_MFD_PCF50633 is not set
894#
895# Voltage and Current regulators
896#
897# CONFIG_REGULATOR is not set 948# 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
901 949
902# 950#
903# Multimedia devices 951# Multimedia devices
@@ -924,6 +972,7 @@ CONFIG_MEDIA_TUNER_TEA5767=m
924CONFIG_MEDIA_TUNER_MT20XX=m 972CONFIG_MEDIA_TUNER_MT20XX=m
925CONFIG_MEDIA_TUNER_XC2028=m 973CONFIG_MEDIA_TUNER_XC2028=m
926CONFIG_MEDIA_TUNER_XC5000=m 974CONFIG_MEDIA_TUNER_XC5000=m
975# CONFIG_DVB_DYNAMIC_MINORS is not set
927CONFIG_DVB_CAPTURE_DRIVERS=y 976CONFIG_DVB_CAPTURE_DRIVERS=y
928 977
929# 978#
@@ -969,6 +1018,12 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
969# CONFIG_DVB_FE_CUSTOMISE is not set 1018# CONFIG_DVB_FE_CUSTOMISE is not set
970 1019
971# 1020#
1021# Multistandard (satellite) frontends
1022#
1023# CONFIG_DVB_STB0899 is not set
1024# CONFIG_DVB_STB6100 is not set
1025
1026#
972# DVB-S (satellite) frontends 1027# DVB-S (satellite) frontends
973# 1028#
974# CONFIG_DVB_CX24110 is not set 1029# CONFIG_DVB_CX24110 is not set
@@ -980,8 +1035,10 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
980# CONFIG_DVB_STV0299 is not set 1035# CONFIG_DVB_STV0299 is not set
981# CONFIG_DVB_TDA8083 is not set 1036# CONFIG_DVB_TDA8083 is not set
982# CONFIG_DVB_TDA10086 is not set 1037# CONFIG_DVB_TDA10086 is not set
1038# CONFIG_DVB_TDA8261 is not set
983# CONFIG_DVB_VES1X93 is not set 1039# CONFIG_DVB_VES1X93 is not set
984# CONFIG_DVB_TUNER_ITD1000 is not set 1040# CONFIG_DVB_TUNER_ITD1000 is not set
1041# CONFIG_DVB_TUNER_CX24113 is not set
985# CONFIG_DVB_TDA826X is not set 1042# CONFIG_DVB_TDA826X is not set
986# CONFIG_DVB_TUA6100 is not set 1043# CONFIG_DVB_TUA6100 is not set
987# CONFIG_DVB_CX24116 is not set 1044# CONFIG_DVB_CX24116 is not set
@@ -1022,11 +1079,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
1022# CONFIG_DVB_OR51132 is not set 1079# CONFIG_DVB_OR51132 is not set
1023# CONFIG_DVB_BCM3510 is not set 1080# CONFIG_DVB_BCM3510 is not set
1024# CONFIG_DVB_LGDT330X is not set 1081# CONFIG_DVB_LGDT330X is not set
1082# CONFIG_DVB_LGDT3304 is not set
1025# CONFIG_DVB_S5H1409 is not set 1083# CONFIG_DVB_S5H1409 is not set
1026# CONFIG_DVB_AU8522 is not set 1084# CONFIG_DVB_AU8522 is not set
1027# CONFIG_DVB_S5H1411 is not set 1085# CONFIG_DVB_S5H1411 is not set
1028 1086
1029# 1087#
1088# ISDB-T (terrestrial) frontends
1089#
1090# CONFIG_DVB_S921 is not set
1091
1092#
1030# Digital terrestrial only tuners/PLL 1093# Digital terrestrial only tuners/PLL
1031# 1094#
1032# CONFIG_DVB_PLL is not set 1095# CONFIG_DVB_PLL is not set
@@ -1079,6 +1142,7 @@ CONFIG_SND_OSSEMUL=y
1079CONFIG_SND_MIXER_OSS=y 1142CONFIG_SND_MIXER_OSS=y
1080CONFIG_SND_PCM_OSS=y 1143CONFIG_SND_PCM_OSS=y
1081CONFIG_SND_PCM_OSS_PLUGINS=y 1144CONFIG_SND_PCM_OSS_PLUGINS=y
1145# CONFIG_SND_HRTIMER is not set
1082# CONFIG_SND_DYNAMIC_MINORS is not set 1146# CONFIG_SND_DYNAMIC_MINORS is not set
1083# CONFIG_SND_SUPPORT_OLD_API is not set 1147# CONFIG_SND_SUPPORT_OLD_API is not set
1084CONFIG_SND_VERBOSE_PROCFS=y 1148CONFIG_SND_VERBOSE_PROCFS=y
@@ -1181,11 +1245,9 @@ CONFIG_HID_COMPAT=y
1181CONFIG_HID_A4TECH=y 1245CONFIG_HID_A4TECH=y
1182CONFIG_HID_APPLE=y 1246CONFIG_HID_APPLE=y
1183CONFIG_HID_BELKIN=y 1247CONFIG_HID_BELKIN=y
1184CONFIG_HID_BRIGHT=y
1185CONFIG_HID_CHERRY=y 1248CONFIG_HID_CHERRY=y
1186CONFIG_HID_CHICONY=y 1249CONFIG_HID_CHICONY=y
1187CONFIG_HID_CYPRESS=y 1250CONFIG_HID_CYPRESS=y
1188CONFIG_HID_DELL=y
1189CONFIG_HID_EZKEY=y 1251CONFIG_HID_EZKEY=y
1190CONFIG_HID_GYRATION=y 1252CONFIG_HID_GYRATION=y
1191CONFIG_HID_LOGITECH=y 1253CONFIG_HID_LOGITECH=y
@@ -1193,12 +1255,15 @@ CONFIG_HID_LOGITECH=y
1193# CONFIG_LOGIRUMBLEPAD2_FF is not set 1255# CONFIG_LOGIRUMBLEPAD2_FF is not set
1194CONFIG_HID_MICROSOFT=y 1256CONFIG_HID_MICROSOFT=y
1195CONFIG_HID_MONTEREY=y 1257CONFIG_HID_MONTEREY=y
1258# CONFIG_HID_NTRIG is not set
1196CONFIG_HID_PANTHERLORD=y 1259CONFIG_HID_PANTHERLORD=y
1197# CONFIG_PANTHERLORD_FF is not set 1260# CONFIG_PANTHERLORD_FF is not set
1198CONFIG_HID_PETALYNX=y 1261CONFIG_HID_PETALYNX=y
1199CONFIG_HID_SAMSUNG=y 1262CONFIG_HID_SAMSUNG=y
1200CONFIG_HID_SONY=y 1263CONFIG_HID_SONY=y
1201CONFIG_HID_SUNPLUS=y 1264CONFIG_HID_SUNPLUS=y
1265# CONFIG_GREENASIA_FF is not set
1266# CONFIG_HID_TOPSEED is not set
1202CONFIG_THRUSTMASTER_FF=m 1267CONFIG_THRUSTMASTER_FF=m
1203CONFIG_ZEROPLUS_FF=m 1268CONFIG_ZEROPLUS_FF=m
1204CONFIG_USB_SUPPORT=y 1269CONFIG_USB_SUPPORT=y
@@ -1231,6 +1296,7 @@ CONFIG_USB_EHCI_HCD=y
1231# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1296# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1232# CONFIG_USB_EHCI_FSL is not set 1297# CONFIG_USB_EHCI_FSL is not set
1233CONFIG_USB_EHCI_HCD_PPC_OF=y 1298CONFIG_USB_EHCI_HCD_PPC_OF=y
1299# CONFIG_USB_OXU210HP_HCD is not set
1234# CONFIG_USB_ISP116X_HCD is not set 1300# CONFIG_USB_ISP116X_HCD is not set
1235# CONFIG_USB_ISP1760_HCD is not set 1301# CONFIG_USB_ISP1760_HCD is not set
1236CONFIG_USB_OHCI_HCD=y 1302CONFIG_USB_OHCI_HCD=y
@@ -1256,18 +1322,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1256# CONFIG_USB_TMC is not set 1322# CONFIG_USB_TMC is not set
1257 1323
1258# 1324#
1259# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1325# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1260# 1326#
1261 1327
1262# 1328#
1263# may also be needed; see USB_STORAGE Help for more information 1329# see USB_STORAGE Help for more information
1264# 1330#
1265CONFIG_USB_STORAGE=y 1331CONFIG_USB_STORAGE=y
1266# CONFIG_USB_STORAGE_DEBUG is not set 1332# CONFIG_USB_STORAGE_DEBUG is not set
1267# CONFIG_USB_STORAGE_DATAFAB is not set 1333# CONFIG_USB_STORAGE_DATAFAB is not set
1268# CONFIG_USB_STORAGE_FREECOM is not set 1334# CONFIG_USB_STORAGE_FREECOM is not set
1269# CONFIG_USB_STORAGE_ISD200 is not set 1335# CONFIG_USB_STORAGE_ISD200 is not set
1270# CONFIG_USB_STORAGE_DPCM is not set
1271# CONFIG_USB_STORAGE_USBAT is not set 1336# CONFIG_USB_STORAGE_USBAT is not set
1272# CONFIG_USB_STORAGE_SDDR09 is not set 1337# CONFIG_USB_STORAGE_SDDR09 is not set
1273# CONFIG_USB_STORAGE_SDDR55 is not set 1338# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1315,6 +1380,11 @@ CONFIG_USB_STORAGE=y
1315# CONFIG_USB_ISIGHTFW is not set 1380# CONFIG_USB_ISIGHTFW is not set
1316# CONFIG_USB_VST is not set 1381# CONFIG_USB_VST is not set
1317# CONFIG_USB_GADGET is not set 1382# CONFIG_USB_GADGET is not set
1383
1384#
1385# OTG and related infrastructure
1386#
1387# CONFIG_USB_GPIO_VBUS is not set
1318# CONFIG_UWB is not set 1388# CONFIG_UWB is not set
1319# CONFIG_MMC is not set 1389# CONFIG_MMC is not set
1320# CONFIG_MEMSTICK is not set 1390# CONFIG_MEMSTICK is not set
@@ -1352,6 +1422,7 @@ CONFIG_RTC_INTF_DEV=y
1352# CONFIG_RTC_DRV_M41T80 is not set 1422# CONFIG_RTC_DRV_M41T80 is not set
1353# CONFIG_RTC_DRV_S35390A is not set 1423# CONFIG_RTC_DRV_S35390A is not set
1354# CONFIG_RTC_DRV_FM3130 is not set 1424# CONFIG_RTC_DRV_FM3130 is not set
1425# CONFIG_RTC_DRV_RX8581 is not set
1355 1426
1356# 1427#
1357# SPI RTC drivers 1428# SPI RTC drivers
@@ -1398,7 +1469,9 @@ CONFIG_FS_MBCACHE=y
1398# CONFIG_FS_POSIX_ACL is not set 1469# CONFIG_FS_POSIX_ACL is not set
1399CONFIG_FILE_LOCKING=y 1470CONFIG_FILE_LOCKING=y
1400# CONFIG_XFS_FS is not set 1471# CONFIG_XFS_FS is not set
1472# CONFIG_GFS2_FS is not set
1401# CONFIG_OCFS2_FS is not set 1473# CONFIG_OCFS2_FS is not set
1474# CONFIG_BTRFS_FS is not set
1402CONFIG_DNOTIFY=y 1475CONFIG_DNOTIFY=y
1403CONFIG_INOTIFY=y 1476CONFIG_INOTIFY=y
1404CONFIG_INOTIFY_USER=y 1477CONFIG_INOTIFY_USER=y
@@ -1440,10 +1513,7 @@ CONFIG_TMPFS=y
1440# CONFIG_TMPFS_POSIX_ACL is not set 1513# CONFIG_TMPFS_POSIX_ACL is not set
1441# CONFIG_HUGETLB_PAGE is not set 1514# CONFIG_HUGETLB_PAGE is not set
1442# CONFIG_CONFIGFS_FS is not set 1515# CONFIG_CONFIGFS_FS is not set
1443 1516CONFIG_MISC_FILESYSTEMS=y
1444#
1445# Miscellaneous filesystems
1446#
1447CONFIG_ADFS_FS=m 1517CONFIG_ADFS_FS=m
1448# CONFIG_ADFS_FS_RW is not set 1518# CONFIG_ADFS_FS_RW is not set
1449CONFIG_AFFS_FS=m 1519CONFIG_AFFS_FS=m
@@ -1454,6 +1524,7 @@ CONFIG_BEFS_FS=m
1454CONFIG_BFS_FS=m 1524CONFIG_BFS_FS=m
1455CONFIG_EFS_FS=m 1525CONFIG_EFS_FS=m
1456CONFIG_CRAMFS=y 1526CONFIG_CRAMFS=y
1527# CONFIG_SQUASHFS is not set
1457CONFIG_VXFS_FS=m 1528CONFIG_VXFS_FS=m
1458# CONFIG_MINIX_FS is not set 1529# CONFIG_MINIX_FS is not set
1459# CONFIG_OMFS_FS is not set 1530# CONFIG_OMFS_FS is not set
@@ -1555,6 +1626,7 @@ CONFIG_NLS_UTF8=m
1555# Library routines 1626# Library routines
1556# 1627#
1557CONFIG_BITREVERSE=y 1628CONFIG_BITREVERSE=y
1629CONFIG_GENERIC_FIND_LAST_BIT=y
1558# CONFIG_CRC_CCITT is not set 1630# CONFIG_CRC_CCITT is not set
1559# CONFIG_CRC16 is not set 1631# CONFIG_CRC16 is not set
1560CONFIG_CRC_T10DIF=y 1632CONFIG_CRC_T10DIF=y
@@ -1606,6 +1678,7 @@ CONFIG_DEBUG_INFO=y
1606# CONFIG_DEBUG_MEMORY_INIT is not set 1678# CONFIG_DEBUG_MEMORY_INIT is not set
1607# CONFIG_DEBUG_LIST is not set 1679# CONFIG_DEBUG_LIST is not set
1608# CONFIG_DEBUG_SG is not set 1680# CONFIG_DEBUG_SG is not set
1681# CONFIG_DEBUG_NOTIFIERS is not set
1609# CONFIG_BOOT_PRINTK_DELAY is not set 1682# CONFIG_BOOT_PRINTK_DELAY is not set
1610# CONFIG_RCU_TORTURE_TEST is not set 1683# CONFIG_RCU_TORTURE_TEST is not set
1611# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1684# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1615,6 +1688,8 @@ CONFIG_DEBUG_INFO=y
1615# CONFIG_LATENCYTOP is not set 1688# CONFIG_LATENCYTOP is not set
1616CONFIG_SYSCTL_SYSCALL_CHECK=y 1689CONFIG_SYSCTL_SYSCALL_CHECK=y
1617CONFIG_HAVE_FUNCTION_TRACER=y 1690CONFIG_HAVE_FUNCTION_TRACER=y
1691CONFIG_HAVE_DYNAMIC_FTRACE=y
1692CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1618 1693
1619# 1694#
1620# Tracers 1695# Tracers
@@ -1623,11 +1698,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1623# CONFIG_SCHED_TRACER is not set 1698# CONFIG_SCHED_TRACER is not set
1624# CONFIG_CONTEXT_SWITCH_TRACER is not set 1699# CONFIG_CONTEXT_SWITCH_TRACER is not set
1625# CONFIG_BOOT_TRACER is not set 1700# CONFIG_BOOT_TRACER is not set
1701# CONFIG_TRACE_BRANCH_PROFILING is not set
1626# CONFIG_STACK_TRACER is not set 1702# CONFIG_STACK_TRACER is not set
1627# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1703# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1628# CONFIG_SAMPLES is not set 1704# CONFIG_SAMPLES is not set
1629CONFIG_HAVE_ARCH_KGDB=y 1705CONFIG_HAVE_ARCH_KGDB=y
1630# CONFIG_KGDB is not set 1706# CONFIG_KGDB is not set
1707CONFIG_PRINT_STACK_DEPTH=64
1631# CONFIG_DEBUG_STACKOVERFLOW is not set 1708# CONFIG_DEBUG_STACKOVERFLOW is not set
1632# CONFIG_DEBUG_STACK_USAGE is not set 1709# CONFIG_DEBUG_STACK_USAGE is not set
1633# CONFIG_DEBUG_PAGEALLOC is not set 1710# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1654,11 +1731,15 @@ CONFIG_CRYPTO=y
1654# 1731#
1655# CONFIG_CRYPTO_FIPS is not set 1732# CONFIG_CRYPTO_FIPS is not set
1656CONFIG_CRYPTO_ALGAPI=y 1733CONFIG_CRYPTO_ALGAPI=y
1657CONFIG_CRYPTO_AEAD=y 1734CONFIG_CRYPTO_ALGAPI2=y
1735CONFIG_CRYPTO_AEAD2=y
1658CONFIG_CRYPTO_BLKCIPHER=y 1736CONFIG_CRYPTO_BLKCIPHER=y
1737CONFIG_CRYPTO_BLKCIPHER2=y
1659CONFIG_CRYPTO_HASH=y 1738CONFIG_CRYPTO_HASH=y
1660CONFIG_CRYPTO_RNG=y 1739CONFIG_CRYPTO_HASH2=y
1740CONFIG_CRYPTO_RNG2=y
1661CONFIG_CRYPTO_MANAGER=y 1741CONFIG_CRYPTO_MANAGER=y
1742CONFIG_CRYPTO_MANAGER2=y
1662# CONFIG_CRYPTO_GF128MUL is not set 1743# CONFIG_CRYPTO_GF128MUL is not set
1663# CONFIG_CRYPTO_NULL is not set 1744# CONFIG_CRYPTO_NULL is not set
1664# CONFIG_CRYPTO_CRYPTD is not set 1745# CONFIG_CRYPTO_CRYPTD is not set
@@ -1692,7 +1773,7 @@ CONFIG_CRYPTO_HMAC=y
1692# 1773#
1693# Digest 1774# Digest
1694# 1775#
1695# CONFIG_CRYPTO_CRC32C is not set 1776CONFIG_CRYPTO_CRC32C=m
1696# CONFIG_CRYPTO_MD4 is not set 1777# CONFIG_CRYPTO_MD4 is not set
1697CONFIG_CRYPTO_MD5=y 1778CONFIG_CRYPTO_MD5=y
1698# CONFIG_CRYPTO_MICHAEL_MIC is not set 1779# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index a4283b6a43d2..4b76321c0ec4 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:46 2008 4# Mon Jan 26 15:35:41 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_PPC_8xx=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_8xx=y 17CONFIG_8xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -70,12 +71,12 @@ CONFIG_SYSVIPC_SYSCTL=y
70# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
71# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
72CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
73# CONFIG_CGROUPS is not set
74CONFIG_GROUP_SCHED=y 74CONFIG_GROUP_SCHED=y
75# CONFIG_FAIR_GROUP_SCHED is not set 75# CONFIG_FAIR_GROUP_SCHED is not set
76# CONFIG_RT_GROUP_SCHED is not set 76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y 77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set 78# CONFIG_CGROUP_SCHED is not set
79# CONFIG_CGROUPS is not set
79CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
81# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
@@ -108,7 +109,6 @@ CONFIG_SLUB_DEBUG=y
108CONFIG_SLUB=y 109CONFIG_SLUB=y
109# CONFIG_SLOB is not set 110# CONFIG_SLOB is not set
110# CONFIG_PROFILING is not set 111# CONFIG_PROFILING is not set
111# CONFIG_MARKERS is not set
112CONFIG_HAVE_OPROFILE=y 112CONFIG_HAVE_OPROFILE=y
113CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 113CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
114CONFIG_HAVE_IOREMAP_PROT=y 114CONFIG_HAVE_IOREMAP_PROT=y
@@ -118,13 +118,11 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
118CONFIG_HAVE_CLK=y 118CONFIG_HAVE_CLK=y
119# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 119# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
120CONFIG_SLABINFO=y 120CONFIG_SLABINFO=y
121# CONFIG_TINY_SHMEM is not set
122CONFIG_BASE_SMALL=1 121CONFIG_BASE_SMALL=1
123# CONFIG_MODULES is not set 122# CONFIG_MODULES is not set
124CONFIG_BLOCK=y 123CONFIG_BLOCK=y
125# CONFIG_LBD is not set 124# CONFIG_LBD is not set
126# CONFIG_BLK_DEV_IO_TRACE is not set 125# CONFIG_BLK_DEV_IO_TRACE is not set
127# CONFIG_LSF is not set
128# CONFIG_BLK_DEV_BSG is not set 126# CONFIG_BLK_DEV_BSG is not set
129# CONFIG_BLK_DEV_INTEGRITY is not set 127# CONFIG_BLK_DEV_INTEGRITY is not set
130 128
@@ -141,6 +139,10 @@ CONFIG_DEFAULT_DEADLINE=y
141# CONFIG_DEFAULT_NOOP is not set 139# CONFIG_DEFAULT_NOOP is not set
142CONFIG_DEFAULT_IOSCHED="deadline" 140CONFIG_DEFAULT_IOSCHED="deadline"
143CONFIG_CLASSIC_RCU=y 141CONFIG_CLASSIC_RCU=y
142# CONFIG_TREE_RCU is not set
143# CONFIG_PREEMPT_RCU is not set
144# CONFIG_TREE_RCU_TRACE is not set
145# CONFIG_PREEMPT_RCU_TRACE is not set
144# CONFIG_FREEZER is not set 146# CONFIG_FREEZER is not set
145 147
146# 148#
@@ -193,6 +195,7 @@ CONFIG_NO_UCODE_PATCH=y
193# CONFIG_QUICC_ENGINE is not set 195# CONFIG_QUICC_ENGINE is not set
194# CONFIG_FSL_ULI1575 is not set 196# CONFIG_FSL_ULI1575 is not set
195CONFIG_CPM=y 197CONFIG_CPM=y
198# CONFIG_SIMPLE_GPIO is not set
196 199
197# 200#
198# Kernel options 201# Kernel options
@@ -212,12 +215,12 @@ CONFIG_PREEMPT_NONE=y
212# CONFIG_PREEMPT_VOLUNTARY is not set 215# CONFIG_PREEMPT_VOLUNTARY is not set
213# CONFIG_PREEMPT is not set 216# CONFIG_PREEMPT is not set
214CONFIG_BINFMT_ELF=y 217CONFIG_BINFMT_ELF=y
215# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
216# CONFIG_HAVE_AOUT is not set 218# CONFIG_HAVE_AOUT is not set
217# CONFIG_BINFMT_MISC is not set 219# CONFIG_BINFMT_MISC is not set
218# CONFIG_MATH_EMULATION is not set 220# CONFIG_MATH_EMULATION is not set
219CONFIG_8XX_MINIMAL_FPEMU=y 221CONFIG_8XX_MINIMAL_FPEMU=y
220# CONFIG_IOMMU_HELPER is not set 222# CONFIG_IOMMU_HELPER is not set
223CONFIG_PPC_NEED_DMA_SYNC_OPS=y
221CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
222CONFIG_ARCH_HAS_WALK_MEMORY=y 225CONFIG_ARCH_HAS_WALK_MEMORY=y
223CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -232,12 +235,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
232CONFIG_PAGEFLAGS_EXTENDED=y 235CONFIG_PAGEFLAGS_EXTENDED=y
233CONFIG_SPLIT_PTLOCK_CPUS=4 236CONFIG_SPLIT_PTLOCK_CPUS=4
234CONFIG_MIGRATION=y 237CONFIG_MIGRATION=y
235# CONFIG_RESOURCES_64BIT is not set
236# CONFIG_PHYS_ADDR_T_64BIT is not set 238# CONFIG_PHYS_ADDR_T_64BIT is not set
237CONFIG_ZONE_DMA_FLAG=1 239CONFIG_ZONE_DMA_FLAG=1
238CONFIG_BOUNCE=y 240CONFIG_BOUNCE=y
239CONFIG_VIRT_TO_BUS=y 241CONFIG_VIRT_TO_BUS=y
240CONFIG_UNEVICTABLE_LRU=y 242CONFIG_UNEVICTABLE_LRU=y
243CONFIG_PPC_4K_PAGES=y
244# CONFIG_PPC_16K_PAGES is not set
245# CONFIG_PPC_64K_PAGES is not set
241CONFIG_FORCE_MAX_ZONEORDER=11 246CONFIG_FORCE_MAX_ZONEORDER=11
242CONFIG_PROC_DEVICETREE=y 247CONFIG_PROC_DEVICETREE=y
243# CONFIG_CMDLINE_BOOL is not set 248# CONFIG_CMDLINE_BOOL is not set
@@ -279,6 +284,7 @@ CONFIG_NET=y
279# 284#
280# Networking options 285# Networking options
281# 286#
287CONFIG_COMPAT_NET_DEV_OPS=y
282CONFIG_PACKET=y 288CONFIG_PACKET=y
283# CONFIG_PACKET_MMAP is not set 289# CONFIG_PACKET_MMAP is not set
284CONFIG_UNIX=y 290CONFIG_UNIX=y
@@ -330,6 +336,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
330# CONFIG_ECONET is not set 336# CONFIG_ECONET is not set
331# CONFIG_WAN_ROUTER is not set 337# CONFIG_WAN_ROUTER is not set
332# CONFIG_NET_SCHED is not set 338# CONFIG_NET_SCHED is not set
339# CONFIG_DCB is not set
333 340
334# 341#
335# Network testing 342# Network testing
@@ -345,8 +352,9 @@ CONFIG_WIRELESS=y
345# CONFIG_CFG80211 is not set 352# CONFIG_CFG80211 is not set
346CONFIG_WIRELESS_OLD_REGULATORY=y 353CONFIG_WIRELESS_OLD_REGULATORY=y
347# CONFIG_WIRELESS_EXT is not set 354# CONFIG_WIRELESS_EXT is not set
355# CONFIG_LIB80211 is not set
348# CONFIG_MAC80211 is not set 356# CONFIG_MAC80211 is not set
349# CONFIG_IEEE80211 is not set 357# CONFIG_WIMAX is not set
350# CONFIG_RFKILL is not set 358# CONFIG_RFKILL is not set
351# CONFIG_NET_9P is not set 359# CONFIG_NET_9P is not set
352 360
@@ -439,6 +447,12 @@ CONFIG_MTD_PHYSMAP_OF=y
439# CONFIG_MTD_ONENAND is not set 447# CONFIG_MTD_ONENAND is not set
440 448
441# 449#
450# LPDDR flash memory drivers
451#
452# CONFIG_MTD_LPDDR is not set
453# CONFIG_MTD_QINFO_PROBE is not set
454
455#
442# UBI - Unsorted block images 456# UBI - Unsorted block images
443# 457#
444# CONFIG_MTD_UBI is not set 458# CONFIG_MTD_UBI is not set
@@ -481,6 +495,9 @@ CONFIG_DAVICOM_PHY=y
481# CONFIG_BROADCOM_PHY is not set 495# CONFIG_BROADCOM_PHY is not set
482# CONFIG_ICPLUS_PHY is not set 496# CONFIG_ICPLUS_PHY is not set
483# CONFIG_REALTEK_PHY is not set 497# CONFIG_REALTEK_PHY is not set
498# CONFIG_NATIONAL_PHY is not set
499# CONFIG_STE10XP is not set
500# CONFIG_LSI_ET1011C_PHY is not set
484# CONFIG_FIXED_PHY is not set 501# CONFIG_FIXED_PHY is not set
485# CONFIG_MDIO_BITBANG is not set 502# CONFIG_MDIO_BITBANG is not set
486CONFIG_NET_ETHERNET=y 503CONFIG_NET_ETHERNET=y
@@ -506,6 +523,10 @@ CONFIG_FS_ENET_MDIO_FEC=y
506# CONFIG_WLAN_PRE80211 is not set 523# CONFIG_WLAN_PRE80211 is not set
507# CONFIG_WLAN_80211 is not set 524# CONFIG_WLAN_80211 is not set
508# CONFIG_IWLWIFI_LEDS is not set 525# CONFIG_IWLWIFI_LEDS is not set
526
527#
528# Enable WiMAX (Networking options) to see the WiMAX drivers
529#
509# CONFIG_WAN is not set 530# CONFIG_WAN is not set
510# CONFIG_PPP is not set 531# CONFIG_PPP is not set
511# CONFIG_SLIP is not set 532# CONFIG_SLIP is not set
@@ -547,7 +568,9 @@ CONFIG_SERIAL_CORE_CONSOLE=y
547CONFIG_SERIAL_CPM=y 568CONFIG_SERIAL_CPM=y
548CONFIG_SERIAL_CPM_CONSOLE=y 569CONFIG_SERIAL_CPM_CONSOLE=y
549CONFIG_UNIX98_PTYS=y 570CONFIG_UNIX98_PTYS=y
571# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
550# CONFIG_LEGACY_PTYS is not set 572# CONFIG_LEGACY_PTYS is not set
573# CONFIG_HVC_UDBG is not set
551# CONFIG_IPMI_HANDLER is not set 574# CONFIG_IPMI_HANDLER is not set
552CONFIG_HW_RANDOM=y 575CONFIG_HW_RANDOM=y
553# CONFIG_NVRAM is not set 576# CONFIG_NVRAM is not set
@@ -566,11 +589,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
566# CONFIG_THERMAL is not set 589# CONFIG_THERMAL is not set
567# CONFIG_THERMAL_HWMON is not set 590# CONFIG_THERMAL_HWMON is not set
568# CONFIG_WATCHDOG is not set 591# CONFIG_WATCHDOG is not set
592CONFIG_SSB_POSSIBLE=y
569 593
570# 594#
571# Sonics Silicon Backplane 595# Sonics Silicon Backplane
572# 596#
573CONFIG_SSB_POSSIBLE=y
574# CONFIG_SSB is not set 597# CONFIG_SSB is not set
575 598
576# 599#
@@ -580,14 +603,7 @@ CONFIG_SSB_POSSIBLE=y
580# CONFIG_MFD_SM501 is not set 603# CONFIG_MFD_SM501 is not set
581# CONFIG_HTC_PASIC3 is not set 604# CONFIG_HTC_PASIC3 is not set
582# CONFIG_MFD_TMIO is not set 605# CONFIG_MFD_TMIO is not set
583
584#
585# Voltage and Current regulators
586#
587# CONFIG_REGULATOR is not set 606# 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 607
592# 608#
593# Multimedia devices 609# Multimedia devices
@@ -641,6 +657,7 @@ CONFIG_DAB=y
641CONFIG_FILE_LOCKING=y 657CONFIG_FILE_LOCKING=y
642# CONFIG_XFS_FS is not set 658# CONFIG_XFS_FS is not set
643# CONFIG_OCFS2_FS is not set 659# CONFIG_OCFS2_FS is not set
660# CONFIG_BTRFS_FS is not set
644# CONFIG_DNOTIFY is not set 661# CONFIG_DNOTIFY is not set
645# CONFIG_INOTIFY is not set 662# CONFIG_INOTIFY is not set
646# CONFIG_QUOTA is not set 663# CONFIG_QUOTA is not set
@@ -673,10 +690,7 @@ CONFIG_TMPFS=y
673# CONFIG_TMPFS_POSIX_ACL is not set 690# CONFIG_TMPFS_POSIX_ACL is not set
674# CONFIG_HUGETLB_PAGE is not set 691# CONFIG_HUGETLB_PAGE is not set
675# CONFIG_CONFIGFS_FS is not set 692# CONFIG_CONFIGFS_FS is not set
676 693CONFIG_MISC_FILESYSTEMS=y
677#
678# Miscellaneous filesystems
679#
680# CONFIG_ADFS_FS is not set 694# CONFIG_ADFS_FS is not set
681# CONFIG_AFFS_FS is not set 695# CONFIG_AFFS_FS is not set
682# CONFIG_HFS_FS is not set 696# CONFIG_HFS_FS is not set
@@ -686,6 +700,7 @@ CONFIG_TMPFS=y
686# CONFIG_EFS_FS is not set 700# CONFIG_EFS_FS is not set
687# CONFIG_JFFS2_FS is not set 701# CONFIG_JFFS2_FS is not set
688CONFIG_CRAMFS=y 702CONFIG_CRAMFS=y
703# CONFIG_SQUASHFS is not set
689# CONFIG_VXFS_FS is not set 704# CONFIG_VXFS_FS is not set
690# CONFIG_MINIX_FS is not set 705# CONFIG_MINIX_FS is not set
691# CONFIG_OMFS_FS is not set 706# CONFIG_OMFS_FS is not set
@@ -741,6 +756,7 @@ CONFIG_MSDOS_PARTITION=y
741# 756#
742# Library routines 757# Library routines
743# 758#
759CONFIG_GENERIC_FIND_LAST_BIT=y
744# CONFIG_CRC_CCITT is not set 760# CONFIG_CRC_CCITT is not set
745# CONFIG_CRC16 is not set 761# CONFIG_CRC16 is not set
746# CONFIG_CRC_T10DIF is not set 762# CONFIG_CRC_T10DIF is not set
@@ -788,6 +804,7 @@ CONFIG_DEBUG_INFO=y
788# CONFIG_DEBUG_MEMORY_INIT is not set 804# CONFIG_DEBUG_MEMORY_INIT is not set
789# CONFIG_DEBUG_LIST is not set 805# CONFIG_DEBUG_LIST is not set
790# CONFIG_DEBUG_SG is not set 806# CONFIG_DEBUG_SG is not set
807# CONFIG_DEBUG_NOTIFIERS is not set
791# CONFIG_BOOT_PRINTK_DELAY is not set 808# CONFIG_BOOT_PRINTK_DELAY is not set
792# CONFIG_RCU_TORTURE_TEST is not set 809# CONFIG_RCU_TORTURE_TEST is not set
793# CONFIG_RCU_CPU_STALL_DETECTOR is not set 810# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -796,6 +813,8 @@ CONFIG_DEBUG_INFO=y
796# CONFIG_FAULT_INJECTION is not set 813# CONFIG_FAULT_INJECTION is not set
797# CONFIG_LATENCYTOP is not set 814# CONFIG_LATENCYTOP is not set
798CONFIG_HAVE_FUNCTION_TRACER=y 815CONFIG_HAVE_FUNCTION_TRACER=y
816CONFIG_HAVE_DYNAMIC_FTRACE=y
817CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
799 818
800# 819#
801# Tracers 820# Tracers
@@ -804,11 +823,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
804# CONFIG_SCHED_TRACER is not set 823# CONFIG_SCHED_TRACER is not set
805# CONFIG_CONTEXT_SWITCH_TRACER is not set 824# CONFIG_CONTEXT_SWITCH_TRACER is not set
806# CONFIG_BOOT_TRACER is not set 825# CONFIG_BOOT_TRACER is not set
826# CONFIG_TRACE_BRANCH_PROFILING is not set
807# CONFIG_STACK_TRACER is not set 827# CONFIG_STACK_TRACER is not set
808# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 828# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
809# CONFIG_SAMPLES is not set 829# CONFIG_SAMPLES is not set
810CONFIG_HAVE_ARCH_KGDB=y 830CONFIG_HAVE_ARCH_KGDB=y
811# CONFIG_KGDB is not set 831# CONFIG_KGDB is not set
832CONFIG_PRINT_STACK_DEPTH=64
812# CONFIG_DEBUG_STACKOVERFLOW is not set 833# CONFIG_DEBUG_STACKOVERFLOW is not set
813# CONFIG_DEBUG_STACK_USAGE is not set 834# CONFIG_DEBUG_STACK_USAGE is not set
814# CONFIG_DEBUG_PAGEALLOC is not set 835# CONFIG_DEBUG_PAGEALLOC is not set
diff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig
index 2d72ee7a8d60..326205cabf77 100644
--- a/arch/powerpc/configs/ppc40x_defconfig
+++ b/arch/powerpc/configs/ppc40x_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.28-rc4 3# Linux kernel version: 2.6.29-rc2
4# Fri Nov 14 09:54:44 2008 4# Fri Jan 23 08:44:03 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_40x=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_4xx=y 17CONFIG_4xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -41,7 +42,7 @@ CONFIG_GENERIC_GPIO=y
41CONFIG_PPC=y 42CONFIG_PPC=y
42CONFIG_EARLY_PRINTK=y 43CONFIG_EARLY_PRINTK=y
43CONFIG_GENERIC_NVRAM=y 44CONFIG_GENERIC_NVRAM=y
44CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 45CONFIG_SCHED_OMIT_FRAME_POINTER=y
45CONFIG_ARCH_MAY_HAVE_PC_FDC=y 46CONFIG_ARCH_MAY_HAVE_PC_FDC=y
46CONFIG_PPC_OF=y 47CONFIG_PPC_OF=y
47CONFIG_OF=y 48CONFIG_OF=y
@@ -72,12 +73,12 @@ CONFIG_POSIX_MQUEUE=y
72# CONFIG_AUDIT is not set 73# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set 74# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set
76CONFIG_GROUP_SCHED=y 76CONFIG_GROUP_SCHED=y
77CONFIG_FAIR_GROUP_SCHED=y 77CONFIG_FAIR_GROUP_SCHED=y
78# CONFIG_RT_GROUP_SCHED is not set 78# CONFIG_RT_GROUP_SCHED is not set
79CONFIG_USER_SCHED=y 79CONFIG_USER_SCHED=y
80# CONFIG_CGROUP_SCHED is not set 80# CONFIG_CGROUP_SCHED is not set
81# CONFIG_CGROUPS is not set
81CONFIG_SYSFS_DEPRECATED=y 82CONFIG_SYSFS_DEPRECATED=y
82CONFIG_SYSFS_DEPRECATED_V2=y 83CONFIG_SYSFS_DEPRECATED_V2=y
83# CONFIG_RELAY is not set 84# CONFIG_RELAY is not set
@@ -90,6 +91,7 @@ CONFIG_EMBEDDED=y
90CONFIG_SYSCTL_SYSCALL=y 91CONFIG_SYSCTL_SYSCALL=y
91CONFIG_KALLSYMS=y 92CONFIG_KALLSYMS=y
92CONFIG_KALLSYMS_ALL=y 93CONFIG_KALLSYMS_ALL=y
94CONFIG_KALLSYMS_STRIP_GENERATED=y
93CONFIG_KALLSYMS_EXTRA_PASS=y 95CONFIG_KALLSYMS_EXTRA_PASS=y
94CONFIG_HOTPLUG=y 96CONFIG_HOTPLUG=y
95CONFIG_PRINTK=y 97CONFIG_PRINTK=y
@@ -112,7 +114,6 @@ CONFIG_SLUB_DEBUG=y
112CONFIG_SLUB=y 114CONFIG_SLUB=y
113# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
114# CONFIG_PROFILING is not set 116# CONFIG_PROFILING is not set
115# CONFIG_MARKERS is not set
116CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
117# CONFIG_KPROBES is not set 118# CONFIG_KPROBES is not set
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -123,7 +124,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 127CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 128CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 129# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +131,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 131# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 132# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 133# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 134CONFIG_BLOCK=y
136CONFIG_LBD=y 135CONFIG_LBD=y
137# CONFIG_BLK_DEV_IO_TRACE is not set 136# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 137# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 138# CONFIG_BLK_DEV_INTEGRITY is not set
141 139
@@ -152,6 +150,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 150# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 151CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 152CONFIG_CLASSIC_RCU=y
153# CONFIG_TREE_RCU is not set
154# CONFIG_PREEMPT_RCU is not set
155# CONFIG_TREE_RCU_TRACE is not set
156# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 157# CONFIG_FREEZER is not set
156CONFIG_PPC4xx_PCI_EXPRESS=y 158CONFIG_PPC4xx_PCI_EXPRESS=y
157 159
@@ -192,6 +194,7 @@ CONFIG_IBM405_ERR51=y
192# CONFIG_CPU_FREQ is not set 194# CONFIG_CPU_FREQ is not set
193# CONFIG_FSL_ULI1575 is not set 195# CONFIG_FSL_ULI1575 is not set
194CONFIG_OF_RTC=y 196CONFIG_OF_RTC=y
197# CONFIG_SIMPLE_GPIO is not set
195 198
196# 199#
197# Kernel options 200# Kernel options
@@ -215,6 +218,7 @@ CONFIG_BINFMT_ELF=y
215# CONFIG_BINFMT_MISC is not set 218# CONFIG_BINFMT_MISC is not set
216# CONFIG_MATH_EMULATION is not set 219# CONFIG_MATH_EMULATION is not set
217# CONFIG_IOMMU_HELPER is not set 220# CONFIG_IOMMU_HELPER is not set
221CONFIG_PPC_NEED_DMA_SYNC_OPS=y
218CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 222CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
219CONFIG_ARCH_HAS_WALK_MEMORY=y 223CONFIG_ARCH_HAS_WALK_MEMORY=y
220CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -229,12 +233,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
229CONFIG_PAGEFLAGS_EXTENDED=y 233CONFIG_PAGEFLAGS_EXTENDED=y
230CONFIG_SPLIT_PTLOCK_CPUS=4 234CONFIG_SPLIT_PTLOCK_CPUS=4
231CONFIG_MIGRATION=y 235CONFIG_MIGRATION=y
232CONFIG_RESOURCES_64BIT=y
233# CONFIG_PHYS_ADDR_T_64BIT is not set 236# CONFIG_PHYS_ADDR_T_64BIT is not set
234CONFIG_ZONE_DMA_FLAG=1 237CONFIG_ZONE_DMA_FLAG=1
235CONFIG_BOUNCE=y 238CONFIG_BOUNCE=y
236CONFIG_VIRT_TO_BUS=y 239CONFIG_VIRT_TO_BUS=y
237CONFIG_UNEVICTABLE_LRU=y 240CONFIG_UNEVICTABLE_LRU=y
241CONFIG_PPC_4K_PAGES=y
242# CONFIG_PPC_16K_PAGES is not set
243# CONFIG_PPC_64K_PAGES is not set
238CONFIG_FORCE_MAX_ZONEORDER=11 244CONFIG_FORCE_MAX_ZONEORDER=11
239CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
240# CONFIG_CMDLINE_BOOL is not set 246# CONFIG_CMDLINE_BOOL is not set
@@ -258,6 +264,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
258# CONFIG_PCI_MSI is not set 264# CONFIG_PCI_MSI is not set
259# CONFIG_PCI_LEGACY is not set 265# CONFIG_PCI_LEGACY is not set
260# CONFIG_PCI_DEBUG is not set 266# CONFIG_PCI_DEBUG is not set
267# CONFIG_PCI_STUB is not set
261# CONFIG_PCCARD is not set 268# CONFIG_PCCARD is not set
262# CONFIG_HOTPLUG_PCI is not set 269# CONFIG_HOTPLUG_PCI is not set
263# CONFIG_HAS_RAPIDIO is not set 270# CONFIG_HAS_RAPIDIO is not set
@@ -282,6 +289,7 @@ CONFIG_NET=y
282# 289#
283# Networking options 290# Networking options
284# 291#
292CONFIG_COMPAT_NET_DEV_OPS=y
285CONFIG_PACKET=y 293CONFIG_PACKET=y
286# CONFIG_PACKET_MMAP is not set 294# CONFIG_PACKET_MMAP is not set
287CONFIG_UNIX=y 295CONFIG_UNIX=y
@@ -355,6 +363,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
355# CONFIG_ECONET is not set 363# CONFIG_ECONET is not set
356# CONFIG_WAN_ROUTER is not set 364# CONFIG_WAN_ROUTER is not set
357# CONFIG_NET_SCHED is not set 365# CONFIG_NET_SCHED is not set
366# CONFIG_DCB is not set
358 367
359# 368#
360# Network testing 369# Network testing
@@ -370,8 +379,9 @@ CONFIG_WIRELESS=y
370# CONFIG_CFG80211 is not set 379# CONFIG_CFG80211 is not set
371CONFIG_WIRELESS_OLD_REGULATORY=y 380CONFIG_WIRELESS_OLD_REGULATORY=y
372# CONFIG_WIRELESS_EXT is not set 381# CONFIG_WIRELESS_EXT is not set
382# CONFIG_LIB80211 is not set
373# CONFIG_MAC80211 is not set 383# CONFIG_MAC80211 is not set
374# CONFIG_IEEE80211 is not set 384# CONFIG_WIMAX is not set
375# CONFIG_RFKILL is not set 385# CONFIG_RFKILL is not set
376# CONFIG_NET_9P is not set 386# CONFIG_NET_9P is not set
377 387
@@ -397,6 +407,7 @@ CONFIG_MTD=y
397# CONFIG_MTD_DEBUG is not set 407# CONFIG_MTD_DEBUG is not set
398# CONFIG_MTD_CONCAT is not set 408# CONFIG_MTD_CONCAT is not set
399CONFIG_MTD_PARTITIONS=y 409CONFIG_MTD_PARTITIONS=y
410# CONFIG_MTD_TESTS is not set
400# CONFIG_MTD_REDBOOT_PARTS is not set 411# CONFIG_MTD_REDBOOT_PARTS is not set
401CONFIG_MTD_CMDLINE_PARTS=y 412CONFIG_MTD_CMDLINE_PARTS=y
402CONFIG_MTD_OF_PARTS=y 413CONFIG_MTD_OF_PARTS=y
@@ -469,6 +480,12 @@ CONFIG_MTD_PHYSMAP_OF=y
469# CONFIG_MTD_ONENAND is not set 480# CONFIG_MTD_ONENAND is not set
470 481
471# 482#
483# LPDDR flash memory drivers
484#
485# CONFIG_MTD_LPDDR is not set
486# CONFIG_MTD_QINFO_PROBE is not set
487
488#
472# UBI - Unsorted block images 489# UBI - Unsorted block images
473# 490#
474CONFIG_MTD_UBI=m 491CONFIG_MTD_UBI=m
@@ -593,6 +610,7 @@ CONFIG_NETDEV_1000=y
593# CONFIG_JME is not set 610# CONFIG_JME is not set
594CONFIG_NETDEV_10000=y 611CONFIG_NETDEV_10000=y
595# CONFIG_CHELSIO_T1 is not set 612# CONFIG_CHELSIO_T1 is not set
613CONFIG_CHELSIO_T3_DEPENDS=y
596# CONFIG_CHELSIO_T3 is not set 614# CONFIG_CHELSIO_T3 is not set
597# CONFIG_ENIC is not set 615# CONFIG_ENIC is not set
598# CONFIG_IXGBE is not set 616# CONFIG_IXGBE is not set
@@ -615,6 +633,10 @@ CONFIG_NETDEV_10000=y
615# CONFIG_WLAN_PRE80211 is not set 633# CONFIG_WLAN_PRE80211 is not set
616# CONFIG_WLAN_80211 is not set 634# CONFIG_WLAN_80211 is not set
617# CONFIG_IWLWIFI_LEDS is not set 635# CONFIG_IWLWIFI_LEDS is not set
636
637#
638# Enable WiMAX (Networking options) to see the WiMAX drivers
639#
618# CONFIG_WAN is not set 640# CONFIG_WAN is not set
619# CONFIG_FDDI is not set 641# CONFIG_FDDI is not set
620# CONFIG_HIPPI is not set 642# CONFIG_HIPPI is not set
@@ -674,9 +696,12 @@ CONFIG_SERIAL_CORE=y
674CONFIG_SERIAL_CORE_CONSOLE=y 696CONFIG_SERIAL_CORE_CONSOLE=y
675# CONFIG_SERIAL_JSM is not set 697# CONFIG_SERIAL_JSM is not set
676CONFIG_SERIAL_OF_PLATFORM=y 698CONFIG_SERIAL_OF_PLATFORM=y
699# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
677CONFIG_UNIX98_PTYS=y 700CONFIG_UNIX98_PTYS=y
701# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
678CONFIG_LEGACY_PTYS=y 702CONFIG_LEGACY_PTYS=y
679CONFIG_LEGACY_PTY_COUNT=256 703CONFIG_LEGACY_PTY_COUNT=256
704# CONFIG_HVC_UDBG is not set
680# CONFIG_IPMI_HANDLER is not set 705# CONFIG_IPMI_HANDLER is not set
681# CONFIG_HW_RANDOM is not set 706# CONFIG_HW_RANDOM is not set
682# CONFIG_NVRAM is not set 707# CONFIG_NVRAM is not set
@@ -751,7 +776,6 @@ CONFIG_I2C_IBM_IIC=m
751# CONFIG_PCF8575 is not set 776# CONFIG_PCF8575 is not set
752# CONFIG_SENSORS_PCA9539 is not set 777# CONFIG_SENSORS_PCA9539 is not set
753# CONFIG_SENSORS_PCF8591 is not set 778# CONFIG_SENSORS_PCF8591 is not set
754# CONFIG_TPS65010 is not set
755# CONFIG_SENSORS_MAX6875 is not set 779# CONFIG_SENSORS_MAX6875 is not set
756# CONFIG_SENSORS_TSL2550 is not set 780# CONFIG_SENSORS_TSL2550 is not set
757# CONFIG_I2C_DEBUG_CORE is not set 781# CONFIG_I2C_DEBUG_CORE is not set
@@ -803,9 +827,11 @@ CONFIG_SSB_POSSIBLE=y
803# CONFIG_MFD_CORE is not set 827# CONFIG_MFD_CORE is not set
804# CONFIG_MFD_SM501 is not set 828# CONFIG_MFD_SM501 is not set
805# CONFIG_HTC_PASIC3 is not set 829# CONFIG_HTC_PASIC3 is not set
830# CONFIG_TPS65010 is not set
806# CONFIG_MFD_TMIO is not set 831# CONFIG_MFD_TMIO is not set
807# CONFIG_MFD_WM8400 is not set 832# CONFIG_MFD_WM8400 is not set
808# CONFIG_MFD_WM8350_I2C is not set 833# CONFIG_MFD_WM8350_I2C is not set
834# CONFIG_MFD_PCF50633 is not set
809# CONFIG_REGULATOR is not set 835# CONFIG_REGULATOR is not set
810 836
811# 837#
@@ -904,9 +930,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
904# 930#
905 931
906# 932#
907# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 933# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
908# 934#
909# CONFIG_USB_GADGET is not set 935# CONFIG_USB_GADGET is not set
936
937#
938# OTG and related infrastructure
939#
910# CONFIG_UWB is not set 940# CONFIG_UWB is not set
911# CONFIG_MMC is not set 941# CONFIG_MMC is not set
912# CONFIG_MEMSTICK is not set 942# CONFIG_MEMSTICK is not set
@@ -918,7 +948,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
918# CONFIG_DMADEVICES is not set 948# CONFIG_DMADEVICES is not set
919# CONFIG_UIO is not set 949# CONFIG_UIO is not set
920# CONFIG_STAGING is not set 950# CONFIG_STAGING is not set
921CONFIG_STAGING_EXCLUDE_BUILD=y
922 951
923# 952#
924# File systems 953# File systems
@@ -939,7 +968,9 @@ CONFIG_FS_MBCACHE=m
939# CONFIG_FS_POSIX_ACL is not set 968# CONFIG_FS_POSIX_ACL is not set
940CONFIG_FILE_LOCKING=y 969CONFIG_FILE_LOCKING=y
941# CONFIG_XFS_FS is not set 970# CONFIG_XFS_FS is not set
971# CONFIG_GFS2_FS is not set
942# CONFIG_OCFS2_FS is not set 972# CONFIG_OCFS2_FS is not set
973# CONFIG_BTRFS_FS is not set
943CONFIG_DNOTIFY=y 974CONFIG_DNOTIFY=y
944CONFIG_INOTIFY=y 975CONFIG_INOTIFY=y
945CONFIG_INOTIFY_USER=y 976CONFIG_INOTIFY_USER=y
@@ -976,10 +1007,7 @@ CONFIG_TMPFS=y
976# CONFIG_TMPFS_POSIX_ACL is not set 1007# CONFIG_TMPFS_POSIX_ACL is not set
977# CONFIG_HUGETLB_PAGE is not set 1008# CONFIG_HUGETLB_PAGE is not set
978# CONFIG_CONFIGFS_FS is not set 1009# CONFIG_CONFIGFS_FS is not set
979 1010CONFIG_MISC_FILESYSTEMS=y
980#
981# Miscellaneous filesystems
982#
983# CONFIG_ADFS_FS is not set 1011# CONFIG_ADFS_FS is not set
984# CONFIG_AFFS_FS is not set 1012# CONFIG_AFFS_FS is not set
985# CONFIG_HFS_FS is not set 1013# CONFIG_HFS_FS is not set
@@ -1005,6 +1033,7 @@ CONFIG_UBIFS_FS_LZO=y
1005CONFIG_UBIFS_FS_ZLIB=y 1033CONFIG_UBIFS_FS_ZLIB=y
1006# CONFIG_UBIFS_FS_DEBUG is not set 1034# CONFIG_UBIFS_FS_DEBUG is not set
1007CONFIG_CRAMFS=y 1035CONFIG_CRAMFS=y
1036# CONFIG_SQUASHFS is not set
1008# CONFIG_VXFS_FS is not set 1037# CONFIG_VXFS_FS is not set
1009# CONFIG_MINIX_FS is not set 1038# CONFIG_MINIX_FS is not set
1010# CONFIG_OMFS_FS is not set 1039# CONFIG_OMFS_FS is not set
@@ -1084,6 +1113,7 @@ CONFIG_NLS_ISO8859_1=m
1084# Library routines 1113# Library routines
1085# 1114#
1086CONFIG_BITREVERSE=y 1115CONFIG_BITREVERSE=y
1116CONFIG_GENERIC_FIND_LAST_BIT=y
1087# CONFIG_CRC_CCITT is not set 1117# CONFIG_CRC_CCITT is not set
1088CONFIG_CRC16=m 1118CONFIG_CRC16=m
1089# CONFIG_CRC_T10DIF is not set 1119# CONFIG_CRC_T10DIF is not set
@@ -1137,6 +1167,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
1137# CONFIG_DEBUG_MEMORY_INIT is not set 1167# CONFIG_DEBUG_MEMORY_INIT is not set
1138# CONFIG_DEBUG_LIST is not set 1168# CONFIG_DEBUG_LIST is not set
1139# CONFIG_DEBUG_SG is not set 1169# CONFIG_DEBUG_SG is not set
1170# CONFIG_DEBUG_NOTIFIERS is not set
1140# CONFIG_BOOT_PRINTK_DELAY is not set 1171# CONFIG_BOOT_PRINTK_DELAY is not set
1141# CONFIG_RCU_TORTURE_TEST is not set 1172# CONFIG_RCU_TORTURE_TEST is not set
1142# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1173# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1146,6 +1177,8 @@ CONFIG_DEBUG_BUGVERBOSE=y
1146# CONFIG_LATENCYTOP is not set 1177# CONFIG_LATENCYTOP is not set
1147CONFIG_SYSCTL_SYSCALL_CHECK=y 1178CONFIG_SYSCTL_SYSCALL_CHECK=y
1148CONFIG_HAVE_FUNCTION_TRACER=y 1179CONFIG_HAVE_FUNCTION_TRACER=y
1180CONFIG_HAVE_DYNAMIC_FTRACE=y
1181CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1149 1182
1150# 1183#
1151# Tracers 1184# Tracers
@@ -1154,11 +1187,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1154# CONFIG_SCHED_TRACER is not set 1187# CONFIG_SCHED_TRACER is not set
1155# CONFIG_CONTEXT_SWITCH_TRACER is not set 1188# CONFIG_CONTEXT_SWITCH_TRACER is not set
1156# CONFIG_BOOT_TRACER is not set 1189# CONFIG_BOOT_TRACER is not set
1190# CONFIG_TRACE_BRANCH_PROFILING is not set
1157# CONFIG_STACK_TRACER is not set 1191# CONFIG_STACK_TRACER is not set
1158# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1192# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1159# CONFIG_SAMPLES is not set 1193# CONFIG_SAMPLES is not set
1160CONFIG_HAVE_ARCH_KGDB=y 1194CONFIG_HAVE_ARCH_KGDB=y
1161# CONFIG_KGDB is not set 1195# CONFIG_KGDB is not set
1196CONFIG_PRINT_STACK_DEPTH=64
1162# CONFIG_DEBUG_STACKOVERFLOW is not set 1197# CONFIG_DEBUG_STACKOVERFLOW is not set
1163# CONFIG_DEBUG_STACK_USAGE is not set 1198# CONFIG_DEBUG_STACK_USAGE is not set
1164# CONFIG_DEBUG_PAGEALLOC is not set 1199# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1185,11 +1220,15 @@ CONFIG_CRYPTO=y
1185# 1220#
1186# CONFIG_CRYPTO_FIPS is not set 1221# CONFIG_CRYPTO_FIPS is not set
1187CONFIG_CRYPTO_ALGAPI=y 1222CONFIG_CRYPTO_ALGAPI=y
1188CONFIG_CRYPTO_AEAD=y 1223CONFIG_CRYPTO_ALGAPI2=y
1224CONFIG_CRYPTO_AEAD2=y
1189CONFIG_CRYPTO_BLKCIPHER=y 1225CONFIG_CRYPTO_BLKCIPHER=y
1226CONFIG_CRYPTO_BLKCIPHER2=y
1190CONFIG_CRYPTO_HASH=y 1227CONFIG_CRYPTO_HASH=y
1191CONFIG_CRYPTO_RNG=y 1228CONFIG_CRYPTO_HASH2=y
1229CONFIG_CRYPTO_RNG2=y
1192CONFIG_CRYPTO_MANAGER=y 1230CONFIG_CRYPTO_MANAGER=y
1231CONFIG_CRYPTO_MANAGER2=y
1193# CONFIG_CRYPTO_GF128MUL is not set 1232# CONFIG_CRYPTO_GF128MUL is not set
1194# CONFIG_CRYPTO_NULL is not set 1233# CONFIG_CRYPTO_NULL is not set
1195# CONFIG_CRYPTO_CRYPTD is not set 1234# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig
index 358b85f9270e..5e6d55f006bb 100644
--- a/arch/powerpc/configs/ppc44x_defconfig
+++ b/arch/powerpc/configs/ppc44x_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.28-rc4 3# Linux kernel version: 2.6.29-rc2
4# Fri Nov 14 10:06:19 2008 4# Fri Jan 23 08:43:46 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,6 +19,7 @@ CONFIG_4xx=y
19CONFIG_BOOKE=y 19CONFIG_BOOKE=y
20CONFIG_PTE_64BIT=y 20CONFIG_PTE_64BIT=y
21CONFIG_PHYS_64BIT=y 21CONFIG_PHYS_64BIT=y
22CONFIG_PPC_MMU_NOHASH=y
22# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y 24CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 25CONFIG_PPC32=y
@@ -45,7 +46,7 @@ CONFIG_GENERIC_GPIO=y
45CONFIG_PPC=y 46CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 47CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 48CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 49CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 50CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 51CONFIG_PPC_OF=y
51CONFIG_OF=y 52CONFIG_OF=y
@@ -76,12 +77,12 @@ CONFIG_POSIX_MQUEUE=y
76# CONFIG_AUDIT is not set 77# CONFIG_AUDIT is not set
77# CONFIG_IKCONFIG is not set 78# CONFIG_IKCONFIG is not set
78CONFIG_LOG_BUF_SHIFT=14 79CONFIG_LOG_BUF_SHIFT=14
79# CONFIG_CGROUPS is not set
80CONFIG_GROUP_SCHED=y 80CONFIG_GROUP_SCHED=y
81CONFIG_FAIR_GROUP_SCHED=y 81CONFIG_FAIR_GROUP_SCHED=y
82# CONFIG_RT_GROUP_SCHED is not set 82# CONFIG_RT_GROUP_SCHED is not set
83CONFIG_USER_SCHED=y 83CONFIG_USER_SCHED=y
84# CONFIG_CGROUP_SCHED is not set 84# CONFIG_CGROUP_SCHED is not set
85# CONFIG_CGROUPS is not set
85CONFIG_SYSFS_DEPRECATED=y 86CONFIG_SYSFS_DEPRECATED=y
86CONFIG_SYSFS_DEPRECATED_V2=y 87CONFIG_SYSFS_DEPRECATED_V2=y
87# CONFIG_RELAY is not set 88# CONFIG_RELAY is not set
@@ -94,6 +95,7 @@ CONFIG_EMBEDDED=y
94CONFIG_SYSCTL_SYSCALL=y 95CONFIG_SYSCTL_SYSCALL=y
95CONFIG_KALLSYMS=y 96CONFIG_KALLSYMS=y
96CONFIG_KALLSYMS_ALL=y 97CONFIG_KALLSYMS_ALL=y
98CONFIG_KALLSYMS_STRIP_GENERATED=y
97CONFIG_KALLSYMS_EXTRA_PASS=y 99CONFIG_KALLSYMS_EXTRA_PASS=y
98CONFIG_HOTPLUG=y 100CONFIG_HOTPLUG=y
99CONFIG_PRINTK=y 101CONFIG_PRINTK=y
@@ -116,7 +118,6 @@ CONFIG_SLUB_DEBUG=y
116CONFIG_SLUB=y 118CONFIG_SLUB=y
117# CONFIG_SLOB is not set 119# CONFIG_SLOB is not set
118# CONFIG_PROFILING is not set 120# CONFIG_PROFILING is not set
119# CONFIG_MARKERS is not set
120CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
121# CONFIG_KPROBES is not set 122# CONFIG_KPROBES is not set
122CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 123CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -127,7 +128,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
127# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
128CONFIG_SLABINFO=y 129CONFIG_SLABINFO=y
129CONFIG_RT_MUTEXES=y 130CONFIG_RT_MUTEXES=y
130# CONFIG_TINY_SHMEM is not set
131CONFIG_BASE_SMALL=0 131CONFIG_BASE_SMALL=0
132CONFIG_MODULES=y 132CONFIG_MODULES=y
133# CONFIG_MODULE_FORCE_LOAD is not set 133# CONFIG_MODULE_FORCE_LOAD is not set
@@ -135,11 +135,9 @@ CONFIG_MODULE_UNLOAD=y
135# CONFIG_MODULE_FORCE_UNLOAD is not set 135# CONFIG_MODULE_FORCE_UNLOAD is not set
136# CONFIG_MODVERSIONS is not set 136# CONFIG_MODVERSIONS is not set
137# CONFIG_MODULE_SRCVERSION_ALL is not set 137# CONFIG_MODULE_SRCVERSION_ALL is not set
138CONFIG_KMOD=y
139CONFIG_BLOCK=y 138CONFIG_BLOCK=y
140CONFIG_LBD=y 139CONFIG_LBD=y
141# CONFIG_BLK_DEV_IO_TRACE is not set 140# CONFIG_BLK_DEV_IO_TRACE is not set
142# CONFIG_LSF is not set
143# CONFIG_BLK_DEV_BSG is not set 141# CONFIG_BLK_DEV_BSG is not set
144# CONFIG_BLK_DEV_INTEGRITY is not set 142# CONFIG_BLK_DEV_INTEGRITY is not set
145 143
@@ -157,6 +155,10 @@ CONFIG_DEFAULT_AS=y
157CONFIG_DEFAULT_IOSCHED="anticipatory" 155CONFIG_DEFAULT_IOSCHED="anticipatory"
158CONFIG_PREEMPT_NOTIFIERS=y 156CONFIG_PREEMPT_NOTIFIERS=y
159CONFIG_CLASSIC_RCU=y 157CONFIG_CLASSIC_RCU=y
158# CONFIG_TREE_RCU is not set
159# CONFIG_PREEMPT_RCU is not set
160# CONFIG_TREE_RCU_TRACE is not set
161# CONFIG_PREEMPT_RCU_TRACE is not set
160# CONFIG_FREEZER is not set 162# CONFIG_FREEZER is not set
161CONFIG_PPC4xx_PCI_EXPRESS=y 163CONFIG_PPC4xx_PCI_EXPRESS=y
162 164
@@ -204,6 +206,7 @@ CONFIG_XILINX_VIRTEX_5_FXT=y
204# CONFIG_CPU_FREQ is not set 206# CONFIG_CPU_FREQ is not set
205# CONFIG_FSL_ULI1575 is not set 207# CONFIG_FSL_ULI1575 is not set
206CONFIG_OF_RTC=y 208CONFIG_OF_RTC=y
209# CONFIG_SIMPLE_GPIO is not set
207 210
208# 211#
209# Kernel options 212# Kernel options
@@ -227,6 +230,7 @@ CONFIG_BINFMT_ELF=y
227# CONFIG_BINFMT_MISC is not set 230# CONFIG_BINFMT_MISC is not set
228CONFIG_MATH_EMULATION=y 231CONFIG_MATH_EMULATION=y
229# CONFIG_IOMMU_HELPER is not set 232# CONFIG_IOMMU_HELPER is not set
233CONFIG_PPC_NEED_DMA_SYNC_OPS=y
230CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 234CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
231CONFIG_ARCH_HAS_WALK_MEMORY=y 235CONFIG_ARCH_HAS_WALK_MEMORY=y
232CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 236CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -241,12 +245,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
241CONFIG_PAGEFLAGS_EXTENDED=y 245CONFIG_PAGEFLAGS_EXTENDED=y
242CONFIG_SPLIT_PTLOCK_CPUS=4 246CONFIG_SPLIT_PTLOCK_CPUS=4
243CONFIG_MIGRATION=y 247CONFIG_MIGRATION=y
244CONFIG_RESOURCES_64BIT=y
245CONFIG_PHYS_ADDR_T_64BIT=y 248CONFIG_PHYS_ADDR_T_64BIT=y
246CONFIG_ZONE_DMA_FLAG=1 249CONFIG_ZONE_DMA_FLAG=1
247CONFIG_BOUNCE=y 250CONFIG_BOUNCE=y
248CONFIG_VIRT_TO_BUS=y 251CONFIG_VIRT_TO_BUS=y
249CONFIG_UNEVICTABLE_LRU=y 252CONFIG_UNEVICTABLE_LRU=y
253CONFIG_PPC_4K_PAGES=y
254# CONFIG_PPC_16K_PAGES is not set
255# CONFIG_PPC_64K_PAGES is not set
250CONFIG_FORCE_MAX_ZONEORDER=11 256CONFIG_FORCE_MAX_ZONEORDER=11
251CONFIG_PROC_DEVICETREE=y 257CONFIG_PROC_DEVICETREE=y
252# CONFIG_CMDLINE_BOOL is not set 258# CONFIG_CMDLINE_BOOL is not set
@@ -269,6 +275,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
269# CONFIG_PCI_MSI is not set 275# CONFIG_PCI_MSI is not set
270# CONFIG_PCI_LEGACY is not set 276# CONFIG_PCI_LEGACY is not set
271# CONFIG_PCI_DEBUG is not set 277# CONFIG_PCI_DEBUG is not set
278# CONFIG_PCI_STUB is not set
272# CONFIG_PCCARD is not set 279# CONFIG_PCCARD is not set
273# CONFIG_HOTPLUG_PCI is not set 280# CONFIG_HOTPLUG_PCI is not set
274# CONFIG_HAS_RAPIDIO is not set 281# CONFIG_HAS_RAPIDIO is not set
@@ -293,6 +300,7 @@ CONFIG_NET=y
293# 300#
294# Networking options 301# Networking options
295# 302#
303CONFIG_COMPAT_NET_DEV_OPS=y
296CONFIG_PACKET=y 304CONFIG_PACKET=y
297# CONFIG_PACKET_MMAP is not set 305# CONFIG_PACKET_MMAP is not set
298CONFIG_UNIX=y 306CONFIG_UNIX=y
@@ -354,10 +362,12 @@ CONFIG_IPV6_NDISC_NODETYPE=y
354# CONFIG_IP_SCTP is not set 362# CONFIG_IP_SCTP is not set
355# CONFIG_TIPC is not set 363# CONFIG_TIPC is not set
356# CONFIG_ATM is not set 364# CONFIG_ATM is not set
365CONFIG_STP=m
357CONFIG_BRIDGE=m 366CONFIG_BRIDGE=m
358# CONFIG_NET_DSA is not set 367# CONFIG_NET_DSA is not set
359# CONFIG_VLAN_8021Q is not set 368# CONFIG_VLAN_8021Q is not set
360# CONFIG_DECNET is not set 369# CONFIG_DECNET is not set
370CONFIG_LLC=m
361# CONFIG_LLC2 is not set 371# CONFIG_LLC2 is not set
362# CONFIG_IPX is not set 372# CONFIG_IPX is not set
363# CONFIG_ATALK is not set 373# CONFIG_ATALK is not set
@@ -366,6 +376,7 @@ CONFIG_BRIDGE=m
366# CONFIG_ECONET is not set 376# CONFIG_ECONET is not set
367# CONFIG_WAN_ROUTER is not set 377# CONFIG_WAN_ROUTER is not set
368# CONFIG_NET_SCHED is not set 378# CONFIG_NET_SCHED is not set
379# CONFIG_DCB is not set
369 380
370# 381#
371# Network testing 382# Network testing
@@ -378,6 +389,7 @@ CONFIG_BRIDGE=m
378# CONFIG_AF_RXRPC is not set 389# CONFIG_AF_RXRPC is not set
379# CONFIG_PHONET is not set 390# CONFIG_PHONET is not set
380# CONFIG_WIRELESS is not set 391# CONFIG_WIRELESS is not set
392# CONFIG_WIMAX is not set
381# CONFIG_RFKILL is not set 393# CONFIG_RFKILL is not set
382# CONFIG_NET_9P is not set 394# CONFIG_NET_9P is not set
383 395
@@ -403,6 +415,7 @@ CONFIG_MTD=y
403# CONFIG_MTD_DEBUG is not set 415# CONFIG_MTD_DEBUG is not set
404# CONFIG_MTD_CONCAT is not set 416# CONFIG_MTD_CONCAT is not set
405CONFIG_MTD_PARTITIONS=y 417CONFIG_MTD_PARTITIONS=y
418# CONFIG_MTD_TESTS is not set
406# CONFIG_MTD_REDBOOT_PARTS is not set 419# CONFIG_MTD_REDBOOT_PARTS is not set
407# CONFIG_MTD_CMDLINE_PARTS is not set 420# CONFIG_MTD_CMDLINE_PARTS is not set
408CONFIG_MTD_OF_PARTS=y 421CONFIG_MTD_OF_PARTS=y
@@ -474,6 +487,12 @@ CONFIG_MTD_PHYSMAP_OF=y
474# CONFIG_MTD_ONENAND is not set 487# CONFIG_MTD_ONENAND is not set
475 488
476# 489#
490# LPDDR flash memory drivers
491#
492# CONFIG_MTD_LPDDR is not set
493# CONFIG_MTD_QINFO_PROBE is not set
494
495#
477# UBI - Unsorted block images 496# UBI - Unsorted block images
478# 497#
479CONFIG_MTD_UBI=m 498CONFIG_MTD_UBI=m
@@ -631,6 +650,7 @@ CONFIG_NETDEV_1000=y
631# CONFIG_JME is not set 650# CONFIG_JME is not set
632CONFIG_NETDEV_10000=y 651CONFIG_NETDEV_10000=y
633# CONFIG_CHELSIO_T1 is not set 652# CONFIG_CHELSIO_T1 is not set
653CONFIG_CHELSIO_T3_DEPENDS=y
634# CONFIG_CHELSIO_T3 is not set 654# CONFIG_CHELSIO_T3 is not set
635# CONFIG_ENIC is not set 655# CONFIG_ENIC is not set
636# CONFIG_IXGBE is not set 656# CONFIG_IXGBE is not set
@@ -655,6 +675,10 @@ CONFIG_NETDEV_10000=y
655# CONFIG_IWLWIFI_LEDS is not set 675# CONFIG_IWLWIFI_LEDS is not set
656 676
657# 677#
678# Enable WiMAX (Networking options) to see the WiMAX drivers
679#
680
681#
658# USB Network Adapters 682# USB Network Adapters
659# 683#
660# CONFIG_USB_CATC is not set 684# CONFIG_USB_CATC is not set
@@ -722,9 +746,12 @@ CONFIG_SERIAL_CORE=y
722CONFIG_SERIAL_CORE_CONSOLE=y 746CONFIG_SERIAL_CORE_CONSOLE=y
723# CONFIG_SERIAL_JSM is not set 747# CONFIG_SERIAL_JSM is not set
724CONFIG_SERIAL_OF_PLATFORM=y 748CONFIG_SERIAL_OF_PLATFORM=y
749# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
725CONFIG_UNIX98_PTYS=y 750CONFIG_UNIX98_PTYS=y
751# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
726CONFIG_LEGACY_PTYS=y 752CONFIG_LEGACY_PTYS=y
727CONFIG_LEGACY_PTY_COUNT=256 753CONFIG_LEGACY_PTY_COUNT=256
754# CONFIG_HVC_UDBG is not set
728# CONFIG_IPMI_HANDLER is not set 755# CONFIG_IPMI_HANDLER is not set
729# CONFIG_HW_RANDOM is not set 756# CONFIG_HW_RANDOM is not set
730# CONFIG_NVRAM is not set 757# CONFIG_NVRAM is not set
@@ -800,7 +827,6 @@ CONFIG_I2C_IBM_IIC=m
800# CONFIG_PCF8575 is not set 827# CONFIG_PCF8575 is not set
801# CONFIG_SENSORS_PCA9539 is not set 828# CONFIG_SENSORS_PCA9539 is not set
802# CONFIG_SENSORS_PCF8591 is not set 829# CONFIG_SENSORS_PCF8591 is not set
803# CONFIG_TPS65010 is not set
804# CONFIG_SENSORS_MAX6875 is not set 830# CONFIG_SENSORS_MAX6875 is not set
805# CONFIG_SENSORS_TSL2550 is not set 831# CONFIG_SENSORS_TSL2550 is not set
806# CONFIG_I2C_DEBUG_CORE is not set 832# CONFIG_I2C_DEBUG_CORE is not set
@@ -853,9 +879,11 @@ CONFIG_SSB_POSSIBLE=y
853# CONFIG_MFD_CORE is not set 879# CONFIG_MFD_CORE is not set
854# CONFIG_MFD_SM501 is not set 880# CONFIG_MFD_SM501 is not set
855# CONFIG_HTC_PASIC3 is not set 881# CONFIG_HTC_PASIC3 is not set
882# CONFIG_TPS65010 is not set
856# CONFIG_MFD_TMIO is not set 883# CONFIG_MFD_TMIO is not set
857# CONFIG_MFD_WM8400 is not set 884# CONFIG_MFD_WM8400 is not set
858# CONFIG_MFD_WM8350_I2C is not set 885# CONFIG_MFD_WM8350_I2C is not set
886# CONFIG_MFD_PCF50633 is not set
859# CONFIG_REGULATOR is not set 887# CONFIG_REGULATOR is not set
860 888
861# 889#
@@ -972,6 +1000,7 @@ CONFIG_USB_EHCI_HCD=m
972CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y 1000CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
973CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y 1001CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y
974CONFIG_USB_EHCI_HCD_PPC_OF=y 1002CONFIG_USB_EHCI_HCD_PPC_OF=y
1003# CONFIG_USB_OXU210HP_HCD is not set
975# CONFIG_USB_ISP116X_HCD is not set 1004# CONFIG_USB_ISP116X_HCD is not set
976# CONFIG_USB_ISP1760_HCD is not set 1005# CONFIG_USB_ISP1760_HCD is not set
977CONFIG_USB_OHCI_HCD=m 1006CONFIG_USB_OHCI_HCD=m
@@ -1012,7 +1041,6 @@ CONFIG_USB_STORAGE=m
1012# CONFIG_USB_STORAGE_DATAFAB is not set 1041# CONFIG_USB_STORAGE_DATAFAB is not set
1013# CONFIG_USB_STORAGE_FREECOM is not set 1042# CONFIG_USB_STORAGE_FREECOM is not set
1014# CONFIG_USB_STORAGE_ISD200 is not set 1043# CONFIG_USB_STORAGE_ISD200 is not set
1015# CONFIG_USB_STORAGE_DPCM is not set
1016# CONFIG_USB_STORAGE_USBAT is not set 1044# CONFIG_USB_STORAGE_USBAT is not set
1017# CONFIG_USB_STORAGE_SDDR09 is not set 1045# CONFIG_USB_STORAGE_SDDR09 is not set
1018# CONFIG_USB_STORAGE_SDDR55 is not set 1046# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1058,6 +1086,11 @@ CONFIG_USB_STORAGE=m
1058# CONFIG_USB_ISIGHTFW is not set 1086# CONFIG_USB_ISIGHTFW is not set
1059# CONFIG_USB_VST is not set 1087# CONFIG_USB_VST is not set
1060# CONFIG_USB_GADGET is not set 1088# CONFIG_USB_GADGET is not set
1089
1090#
1091# OTG and related infrastructure
1092#
1093# CONFIG_USB_GPIO_VBUS is not set
1061# CONFIG_UWB is not set 1094# CONFIG_UWB is not set
1062# CONFIG_MMC is not set 1095# CONFIG_MMC is not set
1063# CONFIG_MEMSTICK is not set 1096# CONFIG_MEMSTICK is not set
@@ -1069,7 +1102,6 @@ CONFIG_USB_STORAGE=m
1069# CONFIG_DMADEVICES is not set 1102# CONFIG_DMADEVICES is not set
1070# CONFIG_UIO is not set 1103# CONFIG_UIO is not set
1071# CONFIG_STAGING is not set 1104# CONFIG_STAGING is not set
1072CONFIG_STAGING_EXCLUDE_BUILD=y
1073 1105
1074# 1106#
1075# File systems 1107# File systems
@@ -1089,7 +1121,9 @@ CONFIG_FS_MBCACHE=m
1089# CONFIG_FS_POSIX_ACL is not set 1121# CONFIG_FS_POSIX_ACL is not set
1090CONFIG_FILE_LOCKING=y 1122CONFIG_FILE_LOCKING=y
1091# CONFIG_XFS_FS is not set 1123# CONFIG_XFS_FS is not set
1124# CONFIG_GFS2_FS is not set
1092# CONFIG_OCFS2_FS is not set 1125# CONFIG_OCFS2_FS is not set
1126# CONFIG_BTRFS_FS is not set
1093CONFIG_DNOTIFY=y 1127CONFIG_DNOTIFY=y
1094CONFIG_INOTIFY=y 1128CONFIG_INOTIFY=y
1095CONFIG_INOTIFY_USER=y 1129CONFIG_INOTIFY_USER=y
@@ -1126,10 +1160,7 @@ CONFIG_TMPFS=y
1126# CONFIG_TMPFS_POSIX_ACL is not set 1160# CONFIG_TMPFS_POSIX_ACL is not set
1127# CONFIG_HUGETLB_PAGE is not set 1161# CONFIG_HUGETLB_PAGE is not set
1128# CONFIG_CONFIGFS_FS is not set 1162# CONFIG_CONFIGFS_FS is not set
1129 1163CONFIG_MISC_FILESYSTEMS=y
1130#
1131# Miscellaneous filesystems
1132#
1133# CONFIG_ADFS_FS is not set 1164# CONFIG_ADFS_FS is not set
1134# CONFIG_AFFS_FS is not set 1165# CONFIG_AFFS_FS is not set
1135# CONFIG_HFS_FS is not set 1166# CONFIG_HFS_FS is not set
@@ -1155,6 +1186,7 @@ CONFIG_UBIFS_FS_LZO=y
1155CONFIG_UBIFS_FS_ZLIB=y 1186CONFIG_UBIFS_FS_ZLIB=y
1156# CONFIG_UBIFS_FS_DEBUG is not set 1187# CONFIG_UBIFS_FS_DEBUG is not set
1157CONFIG_CRAMFS=y 1188CONFIG_CRAMFS=y
1189# CONFIG_SQUASHFS is not set
1158# CONFIG_VXFS_FS is not set 1190# CONFIG_VXFS_FS is not set
1159# CONFIG_MINIX_FS is not set 1191# CONFIG_MINIX_FS is not set
1160# CONFIG_OMFS_FS is not set 1192# CONFIG_OMFS_FS is not set
@@ -1234,6 +1266,7 @@ CONFIG_NLS_ISO8859_1=m
1234# Library routines 1266# Library routines
1235# 1267#
1236CONFIG_BITREVERSE=y 1268CONFIG_BITREVERSE=y
1269CONFIG_GENERIC_FIND_LAST_BIT=y
1237# CONFIG_CRC_CCITT is not set 1270# CONFIG_CRC_CCITT is not set
1238CONFIG_CRC16=m 1271CONFIG_CRC16=m
1239CONFIG_CRC_T10DIF=m 1272CONFIG_CRC_T10DIF=m
@@ -1287,6 +1320,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
1287# CONFIG_DEBUG_MEMORY_INIT is not set 1320# CONFIG_DEBUG_MEMORY_INIT is not set
1288# CONFIG_DEBUG_LIST is not set 1321# CONFIG_DEBUG_LIST is not set
1289# CONFIG_DEBUG_SG is not set 1322# CONFIG_DEBUG_SG is not set
1323# CONFIG_DEBUG_NOTIFIERS is not set
1290# CONFIG_BOOT_PRINTK_DELAY is not set 1324# CONFIG_BOOT_PRINTK_DELAY is not set
1291# CONFIG_RCU_TORTURE_TEST is not set 1325# CONFIG_RCU_TORTURE_TEST is not set
1292# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1326# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1296,6 +1330,8 @@ CONFIG_DEBUG_BUGVERBOSE=y
1296# CONFIG_LATENCYTOP is not set 1330# CONFIG_LATENCYTOP is not set
1297CONFIG_SYSCTL_SYSCALL_CHECK=y 1331CONFIG_SYSCTL_SYSCALL_CHECK=y
1298CONFIG_HAVE_FUNCTION_TRACER=y 1332CONFIG_HAVE_FUNCTION_TRACER=y
1333CONFIG_HAVE_DYNAMIC_FTRACE=y
1334CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1299 1335
1300# 1336#
1301# Tracers 1337# Tracers
@@ -1304,11 +1340,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1304# CONFIG_SCHED_TRACER is not set 1340# CONFIG_SCHED_TRACER is not set
1305# CONFIG_CONTEXT_SWITCH_TRACER is not set 1341# CONFIG_CONTEXT_SWITCH_TRACER is not set
1306# CONFIG_BOOT_TRACER is not set 1342# CONFIG_BOOT_TRACER is not set
1343# CONFIG_TRACE_BRANCH_PROFILING is not set
1307# CONFIG_STACK_TRACER is not set 1344# CONFIG_STACK_TRACER is not set
1308# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1345# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1309# CONFIG_SAMPLES is not set 1346# CONFIG_SAMPLES is not set
1310CONFIG_HAVE_ARCH_KGDB=y 1347CONFIG_HAVE_ARCH_KGDB=y
1311# CONFIG_KGDB is not set 1348# CONFIG_KGDB is not set
1349CONFIG_PRINT_STACK_DEPTH=64
1312# CONFIG_DEBUG_STACKOVERFLOW is not set 1350# CONFIG_DEBUG_STACKOVERFLOW is not set
1313# CONFIG_DEBUG_STACK_USAGE is not set 1351# CONFIG_DEBUG_STACK_USAGE is not set
1314# CONFIG_DEBUG_PAGEALLOC is not set 1352# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1333,11 +1371,15 @@ CONFIG_CRYPTO=y
1333# 1371#
1334# CONFIG_CRYPTO_FIPS is not set 1372# CONFIG_CRYPTO_FIPS is not set
1335CONFIG_CRYPTO_ALGAPI=y 1373CONFIG_CRYPTO_ALGAPI=y
1336CONFIG_CRYPTO_AEAD=y 1374CONFIG_CRYPTO_ALGAPI2=y
1375CONFIG_CRYPTO_AEAD2=y
1337CONFIG_CRYPTO_BLKCIPHER=y 1376CONFIG_CRYPTO_BLKCIPHER=y
1377CONFIG_CRYPTO_BLKCIPHER2=y
1338CONFIG_CRYPTO_HASH=y 1378CONFIG_CRYPTO_HASH=y
1339CONFIG_CRYPTO_RNG=y 1379CONFIG_CRYPTO_HASH2=y
1380CONFIG_CRYPTO_RNG2=y
1340CONFIG_CRYPTO_MANAGER=y 1381CONFIG_CRYPTO_MANAGER=y
1382CONFIG_CRYPTO_MANAGER2=y
1341# CONFIG_CRYPTO_GF128MUL is not set 1383# CONFIG_CRYPTO_GF128MUL is not set
1342# CONFIG_CRYPTO_NULL is not set 1384# CONFIG_CRYPTO_NULL is not set
1343# CONFIG_CRYPTO_CRYPTD is not set 1385# CONFIG_CRYPTO_CRYPTD is not set
@@ -1419,5 +1461,6 @@ CONFIG_CRYPTO_LZO=m
1419CONFIG_VIRTUALIZATION=y 1461CONFIG_VIRTUALIZATION=y
1420CONFIG_KVM=y 1462CONFIG_KVM=y
1421CONFIG_KVM_440=y 1463CONFIG_KVM_440=y
1464# CONFIG_KVM_EXIT_TIMING is not set
1422# CONFIG_VIRTIO_PCI is not set 1465# CONFIG_VIRTIO_PCI is not set
1423# CONFIG_VIRTIO_BALLOON is not set 1466# CONFIG_VIRTIO_BALLOON is not set
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig
index 228099d77c3b..fdded96633a1 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:47 2008 4# Mon Jan 26 15:35:42 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -44,7 +44,7 @@ CONFIG_GENERIC_GPIO=y
44CONFIG_PPC=y 44CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_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
@@ -87,6 +87,7 @@ CONFIG_EMBEDDED=y
87CONFIG_SYSCTL_SYSCALL=y 87CONFIG_SYSCTL_SYSCALL=y
88CONFIG_KALLSYMS=y 88CONFIG_KALLSYMS=y
89CONFIG_KALLSYMS_ALL=y 89CONFIG_KALLSYMS_ALL=y
90CONFIG_KALLSYMS_STRIP_GENERATED=y
90# CONFIG_KALLSYMS_EXTRA_PASS is not set 91# CONFIG_KALLSYMS_EXTRA_PASS is not set
91CONFIG_HOTPLUG=y 92CONFIG_HOTPLUG=y
92CONFIG_PRINTK=y 93CONFIG_PRINTK=y
@@ -109,7 +110,6 @@ CONFIG_SLUB_DEBUG=y
109CONFIG_SLUB=y 110CONFIG_SLUB=y
110# CONFIG_SLOB is not set 111# CONFIG_SLOB is not set
111# CONFIG_PROFILING is not set 112# CONFIG_PROFILING is not set
112# CONFIG_MARKERS is not set
113CONFIG_HAVE_OPROFILE=y 113CONFIG_HAVE_OPROFILE=y
114CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 114CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
115CONFIG_HAVE_IOREMAP_PROT=y 115CONFIG_HAVE_IOREMAP_PROT=y
@@ -120,13 +120,11 @@ CONFIG_HAVE_CLK=y
120# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 120# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
121CONFIG_SLABINFO=y 121CONFIG_SLABINFO=y
122CONFIG_RT_MUTEXES=y 122CONFIG_RT_MUTEXES=y
123# CONFIG_TINY_SHMEM is not set
124CONFIG_BASE_SMALL=0 123CONFIG_BASE_SMALL=0
125# CONFIG_MODULES is not set 124# CONFIG_MODULES is not set
126CONFIG_BLOCK=y 125CONFIG_BLOCK=y
127# CONFIG_LBD is not set 126# CONFIG_LBD is not set
128# CONFIG_BLK_DEV_IO_TRACE is not set 127# CONFIG_BLK_DEV_IO_TRACE is not set
129# CONFIG_LSF is not set
130# CONFIG_BLK_DEV_INTEGRITY is not set 128# CONFIG_BLK_DEV_INTEGRITY is not set
131 129
132# 130#
@@ -142,6 +140,10 @@ 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_TREE_RCU is not set
144# CONFIG_PREEMPT_RCU is not set
145# CONFIG_TREE_RCU_TRACE is not set
146# CONFIG_PREEMPT_RCU_TRACE is not set
145# CONFIG_FREEZER is not set 147# CONFIG_FREEZER is not set
146 148
147# 149#
@@ -183,6 +185,7 @@ CONFIG_PQ2_ADS_PCI_PIC=y
183CONFIG_CPM2=y 185CONFIG_CPM2=y
184# CONFIG_FSL_ULI1575 is not set 186# CONFIG_FSL_ULI1575 is not set
185CONFIG_CPM=y 187CONFIG_CPM=y
188# CONFIG_SIMPLE_GPIO is not set
186 189
187# 190#
188# Kernel options 191# Kernel options
@@ -209,6 +212,7 @@ CONFIG_BINFMT_MISC=y
209CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 212CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
210CONFIG_ARCH_HAS_WALK_MEMORY=y 213CONFIG_ARCH_HAS_WALK_MEMORY=y
211CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 214CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
215# CONFIG_CRASH_DUMP is not set
212CONFIG_ARCH_FLATMEM_ENABLE=y 216CONFIG_ARCH_FLATMEM_ENABLE=y
213CONFIG_ARCH_POPULATES_NODE_MAP=y 217CONFIG_ARCH_POPULATES_NODE_MAP=y
214CONFIG_FLATMEM=y 218CONFIG_FLATMEM=y
@@ -216,12 +220,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
216CONFIG_PAGEFLAGS_EXTENDED=y 220CONFIG_PAGEFLAGS_EXTENDED=y
217CONFIG_SPLIT_PTLOCK_CPUS=4 221CONFIG_SPLIT_PTLOCK_CPUS=4
218CONFIG_MIGRATION=y 222CONFIG_MIGRATION=y
219# CONFIG_RESOURCES_64BIT is not set
220# CONFIG_PHYS_ADDR_T_64BIT is not set 223# CONFIG_PHYS_ADDR_T_64BIT is not set
221CONFIG_ZONE_DMA_FLAG=1 224CONFIG_ZONE_DMA_FLAG=1
222CONFIG_BOUNCE=y 225CONFIG_BOUNCE=y
223CONFIG_VIRT_TO_BUS=y 226CONFIG_VIRT_TO_BUS=y
224CONFIG_UNEVICTABLE_LRU=y 227CONFIG_UNEVICTABLE_LRU=y
228CONFIG_PPC_4K_PAGES=y
229# CONFIG_PPC_16K_PAGES is not set
230# CONFIG_PPC_64K_PAGES is not set
225CONFIG_FORCE_MAX_ZONEORDER=11 231CONFIG_FORCE_MAX_ZONEORDER=11
226CONFIG_PROC_DEVICETREE=y 232CONFIG_PROC_DEVICETREE=y
227# CONFIG_CMDLINE_BOOL is not set 233# CONFIG_CMDLINE_BOOL is not set
@@ -247,6 +253,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
247# CONFIG_PCI_MSI is not set 253# CONFIG_PCI_MSI is not set
248# CONFIG_PCI_LEGACY is not set 254# CONFIG_PCI_LEGACY is not set
249# CONFIG_PCI_DEBUG is not set 255# CONFIG_PCI_DEBUG is not set
256# CONFIG_PCI_STUB is not set
250# CONFIG_PCCARD is not set 257# CONFIG_PCCARD is not set
251# CONFIG_HOTPLUG_PCI is not set 258# CONFIG_HOTPLUG_PCI is not set
252# CONFIG_HAS_RAPIDIO is not set 259# CONFIG_HAS_RAPIDIO is not set
@@ -269,6 +276,7 @@ CONFIG_NET=y
269# 276#
270# Networking options 277# Networking options
271# 278#
279CONFIG_COMPAT_NET_DEV_OPS=y
272CONFIG_PACKET=y 280CONFIG_PACKET=y
273# CONFIG_PACKET_MMAP is not set 281# CONFIG_PACKET_MMAP is not set
274CONFIG_UNIX=y 282CONFIG_UNIX=y
@@ -350,6 +358,7 @@ CONFIG_NETFILTER_ADVANCED=y
350# CONFIG_IPX is not set 358# CONFIG_IPX is not set
351# CONFIG_ATALK is not set 359# CONFIG_ATALK is not set
352# CONFIG_NET_SCHED is not set 360# CONFIG_NET_SCHED is not set
361# CONFIG_DCB is not set
353 362
354# 363#
355# Network testing 364# Network testing
@@ -364,8 +373,9 @@ CONFIG_WIRELESS=y
364# CONFIG_CFG80211 is not set 373# CONFIG_CFG80211 is not set
365CONFIG_WIRELESS_OLD_REGULATORY=y 374CONFIG_WIRELESS_OLD_REGULATORY=y
366# CONFIG_WIRELESS_EXT is not set 375# CONFIG_WIRELESS_EXT is not set
376# CONFIG_LIB80211 is not set
367# CONFIG_MAC80211 is not set 377# CONFIG_MAC80211 is not set
368# CONFIG_IEEE80211 is not set 378# CONFIG_WIMAX is not set
369# CONFIG_RFKILL is not set 379# CONFIG_RFKILL is not set
370 380
371# 381#
@@ -460,6 +470,12 @@ CONFIG_MTD_PHYSMAP_OF=y
460# CONFIG_MTD_ONENAND is not set 470# CONFIG_MTD_ONENAND is not set
461 471
462# 472#
473# LPDDR flash memory drivers
474#
475# CONFIG_MTD_LPDDR is not set
476# CONFIG_MTD_QINFO_PROBE is not set
477
478#
463# UBI - Unsorted block images 479# UBI - Unsorted block images
464# 480#
465# CONFIG_MTD_UBI is not set 481# CONFIG_MTD_UBI is not set
@@ -520,6 +536,7 @@ CONFIG_IDE_PROC_FS=y
520# CONFIG_BLK_DEV_JMICRON is not set 536# CONFIG_BLK_DEV_JMICRON is not set
521# CONFIG_BLK_DEV_SC1200 is not set 537# CONFIG_BLK_DEV_SC1200 is not set
522# CONFIG_BLK_DEV_PIIX is not set 538# CONFIG_BLK_DEV_PIIX is not set
539# CONFIG_BLK_DEV_IT8172 is not set
523# CONFIG_BLK_DEV_IT8213 is not set 540# CONFIG_BLK_DEV_IT8213 is not set
524# CONFIG_BLK_DEV_IT821X is not set 541# CONFIG_BLK_DEV_IT821X is not set
525# CONFIG_BLK_DEV_NS87415 is not set 542# CONFIG_BLK_DEV_NS87415 is not set
@@ -577,9 +594,12 @@ CONFIG_DAVICOM_PHY=y
577# CONFIG_BROADCOM_PHY is not set 594# CONFIG_BROADCOM_PHY is not set
578# CONFIG_ICPLUS_PHY is not set 595# CONFIG_ICPLUS_PHY is not set
579# CONFIG_REALTEK_PHY is not set 596# CONFIG_REALTEK_PHY is not set
597# CONFIG_NATIONAL_PHY is not set
598# CONFIG_STE10XP is not set
599# CONFIG_LSI_ET1011C_PHY is not set
580# CONFIG_FIXED_PHY is not set 600# CONFIG_FIXED_PHY is not set
581CONFIG_MDIO_BITBANG=y 601CONFIG_MDIO_BITBANG=y
582# CONFIG_MDIO_OF_GPIO is not set 602# CONFIG_MDIO_GPIO is not set
583CONFIG_NET_ETHERNET=y 603CONFIG_NET_ETHERNET=y
584CONFIG_MII=y 604CONFIG_MII=y
585# CONFIG_HAPPYMEAL is not set 605# CONFIG_HAPPYMEAL is not set
@@ -624,6 +644,7 @@ CONFIG_NETDEV_1000=y
624# CONFIG_JME is not set 644# CONFIG_JME is not set
625CONFIG_NETDEV_10000=y 645CONFIG_NETDEV_10000=y
626# CONFIG_CHELSIO_T1 is not set 646# CONFIG_CHELSIO_T1 is not set
647CONFIG_CHELSIO_T3_DEPENDS=y
627# CONFIG_CHELSIO_T3 is not set 648# CONFIG_CHELSIO_T3 is not set
628# CONFIG_ENIC is not set 649# CONFIG_ENIC is not set
629# CONFIG_IXGBE is not set 650# CONFIG_IXGBE is not set
@@ -646,6 +667,10 @@ CONFIG_NETDEV_10000=y
646# CONFIG_WLAN_PRE80211 is not set 667# CONFIG_WLAN_PRE80211 is not set
647# CONFIG_WLAN_80211 is not set 668# CONFIG_WLAN_80211 is not set
648# CONFIG_IWLWIFI_LEDS is not set 669# CONFIG_IWLWIFI_LEDS is not set
670
671#
672# Enable WiMAX (Networking options) to see the WiMAX drivers
673#
649# CONFIG_WAN is not set 674# CONFIG_WAN is not set
650# CONFIG_FDDI is not set 675# CONFIG_FDDI is not set
651CONFIG_PPP=y 676CONFIG_PPP=y
@@ -743,6 +768,7 @@ CONFIG_SERIAL_CPM=y
743CONFIG_SERIAL_CPM_CONSOLE=y 768CONFIG_SERIAL_CPM_CONSOLE=y
744# CONFIG_SERIAL_JSM is not set 769# CONFIG_SERIAL_JSM is not set
745CONFIG_UNIX98_PTYS=y 770CONFIG_UNIX98_PTYS=y
771# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
746CONFIG_LEGACY_PTYS=y 772CONFIG_LEGACY_PTYS=y
747CONFIG_LEGACY_PTY_COUNT=256 773CONFIG_LEGACY_PTY_COUNT=256
748# CONFIG_IPMI_HANDLER is not set 774# CONFIG_IPMI_HANDLER is not set
@@ -761,6 +787,11 @@ CONFIG_GPIOLIB=y
761# CONFIG_DEBUG_GPIO is not set 787# CONFIG_DEBUG_GPIO is not set
762 788
763# 789#
790# Memory mapped GPIO expanders:
791#
792# CONFIG_GPIO_XILINX is not set
793
794#
764# I2C GPIO expanders: 795# I2C GPIO expanders:
765# 796#
766 797
@@ -778,11 +809,11 @@ CONFIG_GPIOLIB=y
778# CONFIG_THERMAL is not set 809# CONFIG_THERMAL is not set
779# CONFIG_THERMAL_HWMON is not set 810# CONFIG_THERMAL_HWMON is not set
780# CONFIG_WATCHDOG is not set 811# CONFIG_WATCHDOG is not set
812CONFIG_SSB_POSSIBLE=y
781 813
782# 814#
783# Sonics Silicon Backplane 815# Sonics Silicon Backplane
784# 816#
785CONFIG_SSB_POSSIBLE=y
786# CONFIG_SSB is not set 817# CONFIG_SSB is not set
787 818
788# 819#
@@ -792,14 +823,7 @@ CONFIG_SSB_POSSIBLE=y
792# CONFIG_MFD_SM501 is not set 823# CONFIG_MFD_SM501 is not set
793# CONFIG_HTC_PASIC3 is not set 824# CONFIG_HTC_PASIC3 is not set
794# CONFIG_MFD_TMIO is not set 825# CONFIG_MFD_TMIO is not set
795
796#
797# Voltage and Current regulators
798#
799# CONFIG_REGULATOR is not set 826# 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 827
804# 828#
805# Multimedia devices 829# Multimedia devices
@@ -844,7 +868,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
844# CONFIG_USB_GADGET_MUSB_HDRC is not set 868# CONFIG_USB_GADGET_MUSB_HDRC is not set
845 869
846# 870#
847# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 871# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
848# 872#
849CONFIG_USB_GADGET=y 873CONFIG_USB_GADGET=y
850# CONFIG_USB_GADGET_DEBUG is not set 874# CONFIG_USB_GADGET_DEBUG is not set
@@ -859,10 +883,12 @@ CONFIG_USB_GADGET_SELECTED=y
859# CONFIG_USB_GADGET_PXA25X is not set 883# CONFIG_USB_GADGET_PXA25X is not set
860# CONFIG_USB_GADGET_PXA27X is not set 884# CONFIG_USB_GADGET_PXA27X is not set
861# CONFIG_USB_GADGET_S3C2410 is not set 885# CONFIG_USB_GADGET_S3C2410 is not set
886# CONFIG_USB_GADGET_IMX is not set
862CONFIG_USB_GADGET_M66592=y 887CONFIG_USB_GADGET_M66592=y
863CONFIG_USB_M66592=y 888CONFIG_USB_M66592=y
864# CONFIG_USB_GADGET_AMD5536UDC is not set 889# CONFIG_USB_GADGET_AMD5536UDC is not set
865# CONFIG_USB_GADGET_FSL_QE is not set 890# CONFIG_USB_GADGET_FSL_QE is not set
891# CONFIG_USB_GADGET_CI13XXX is not set
866# CONFIG_USB_GADGET_NET2280 is not set 892# CONFIG_USB_GADGET_NET2280 is not set
867# CONFIG_USB_GADGET_GOKU is not set 893# CONFIG_USB_GADGET_GOKU is not set
868# CONFIG_USB_GADGET_DUMMY_HCD is not set 894# CONFIG_USB_GADGET_DUMMY_HCD is not set
@@ -876,6 +902,11 @@ CONFIG_USB_ETH_RNDIS=y
876# CONFIG_USB_MIDI_GADGET is not set 902# CONFIG_USB_MIDI_GADGET is not set
877# CONFIG_USB_G_PRINTER is not set 903# CONFIG_USB_G_PRINTER is not set
878# CONFIG_USB_CDC_COMPOSITE is not set 904# CONFIG_USB_CDC_COMPOSITE is not set
905
906#
907# OTG and related infrastructure
908#
909# CONFIG_USB_GPIO_VBUS is not set
879# CONFIG_MMC is not set 910# CONFIG_MMC is not set
880# CONFIG_MEMSTICK is not set 911# CONFIG_MEMSTICK is not set
881# CONFIG_NEW_LEDS is not set 912# CONFIG_NEW_LEDS is not set
@@ -938,13 +969,11 @@ CONFIG_TMPFS=y
938# CONFIG_TMPFS_POSIX_ACL is not set 969# CONFIG_TMPFS_POSIX_ACL is not set
939# CONFIG_HUGETLB_PAGE is not set 970# CONFIG_HUGETLB_PAGE is not set
940# CONFIG_CONFIGFS_FS is not set 971# CONFIG_CONFIGFS_FS is not set
941 972CONFIG_MISC_FILESYSTEMS=y
942#
943# Miscellaneous filesystems
944#
945# CONFIG_HFSPLUS_FS is not set 973# CONFIG_HFSPLUS_FS is not set
946# CONFIG_JFFS2_FS is not set 974# CONFIG_JFFS2_FS is not set
947CONFIG_CRAMFS=y 975CONFIG_CRAMFS=y
976# CONFIG_SQUASHFS is not set
948# CONFIG_VXFS_FS is not set 977# CONFIG_VXFS_FS is not set
949# CONFIG_MINIX_FS is not set 978# CONFIG_MINIX_FS is not set
950# CONFIG_OMFS_FS is not set 979# CONFIG_OMFS_FS is not set
@@ -1035,6 +1064,7 @@ CONFIG_NLS_UTF8=y
1035# Library routines 1064# Library routines
1036# 1065#
1037CONFIG_BITREVERSE=y 1066CONFIG_BITREVERSE=y
1067CONFIG_GENERIC_FIND_LAST_BIT=y
1038CONFIG_CRC_CCITT=y 1068CONFIG_CRC_CCITT=y
1039# CONFIG_CRC16 is not set 1069# CONFIG_CRC16 is not set
1040# CONFIG_CRC_T10DIF is not set 1070# CONFIG_CRC_T10DIF is not set
@@ -1086,6 +1116,7 @@ CONFIG_DEBUG_INFO=y
1086# CONFIG_DEBUG_MEMORY_INIT is not set 1116# CONFIG_DEBUG_MEMORY_INIT is not set
1087# CONFIG_DEBUG_LIST is not set 1117# CONFIG_DEBUG_LIST is not set
1088# CONFIG_DEBUG_SG is not set 1118# CONFIG_DEBUG_SG is not set
1119# CONFIG_DEBUG_NOTIFIERS is not set
1089# CONFIG_BOOT_PRINTK_DELAY is not set 1120# CONFIG_BOOT_PRINTK_DELAY is not set
1090# CONFIG_RCU_TORTURE_TEST is not set 1121# CONFIG_RCU_TORTURE_TEST is not set
1091# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1122# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1095,6 +1126,8 @@ CONFIG_DEBUG_INFO=y
1095# CONFIG_LATENCYTOP is not set 1126# CONFIG_LATENCYTOP is not set
1096CONFIG_SYSCTL_SYSCALL_CHECK=y 1127CONFIG_SYSCTL_SYSCALL_CHECK=y
1097CONFIG_HAVE_FUNCTION_TRACER=y 1128CONFIG_HAVE_FUNCTION_TRACER=y
1129CONFIG_HAVE_DYNAMIC_FTRACE=y
1130CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1098 1131
1099# 1132#
1100# Tracers 1133# Tracers
@@ -1103,10 +1136,12 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1103# CONFIG_SCHED_TRACER is not set 1136# CONFIG_SCHED_TRACER is not set
1104# CONFIG_CONTEXT_SWITCH_TRACER is not set 1137# CONFIG_CONTEXT_SWITCH_TRACER is not set
1105# CONFIG_BOOT_TRACER is not set 1138# CONFIG_BOOT_TRACER is not set
1139# CONFIG_TRACE_BRANCH_PROFILING is not set
1106# CONFIG_STACK_TRACER is not set 1140# CONFIG_STACK_TRACER is not set
1107# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1141# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1108# CONFIG_SAMPLES is not set 1142# CONFIG_SAMPLES is not set
1109CONFIG_HAVE_ARCH_KGDB=y 1143CONFIG_HAVE_ARCH_KGDB=y
1144CONFIG_PRINT_STACK_DEPTH=64
1110# CONFIG_DEBUG_STACKOVERFLOW is not set 1145# CONFIG_DEBUG_STACKOVERFLOW is not set
1111# CONFIG_DEBUG_STACK_USAGE is not set 1146# CONFIG_DEBUG_STACK_USAGE is not set
1112# CONFIG_DEBUG_PAGEALLOC is not set 1147# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1133,11 +1168,15 @@ CONFIG_CRYPTO=y
1133# 1168#
1134# CONFIG_CRYPTO_FIPS is not set 1169# CONFIG_CRYPTO_FIPS is not set
1135CONFIG_CRYPTO_ALGAPI=y 1170CONFIG_CRYPTO_ALGAPI=y
1136CONFIG_CRYPTO_AEAD=y 1171CONFIG_CRYPTO_ALGAPI2=y
1172CONFIG_CRYPTO_AEAD2=y
1137CONFIG_CRYPTO_BLKCIPHER=y 1173CONFIG_CRYPTO_BLKCIPHER=y
1174CONFIG_CRYPTO_BLKCIPHER2=y
1138CONFIG_CRYPTO_HASH=y 1175CONFIG_CRYPTO_HASH=y
1139CONFIG_CRYPTO_RNG=y 1176CONFIG_CRYPTO_HASH2=y
1177CONFIG_CRYPTO_RNG2=y
1140CONFIG_CRYPTO_MANAGER=y 1178CONFIG_CRYPTO_MANAGER=y
1179CONFIG_CRYPTO_MANAGER2=y
1141# CONFIG_CRYPTO_NULL is not set 1180# CONFIG_CRYPTO_NULL is not set
1142# CONFIG_CRYPTO_CRYPTD is not set 1181# CONFIG_CRYPTO_CRYPTD is not set
1143# CONFIG_CRYPTO_AUTHENC is not set 1182# CONFIG_CRYPTO_AUTHENC is not set
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig
index a257da608081..e971db171138 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:48 2008 4# Mon Jan 26 15:35:44 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -45,7 +45,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
45CONFIG_PPC=y 45CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
51CONFIG_OF=y 51CONFIG_OF=y
@@ -75,12 +75,12 @@ CONFIG_POSIX_MQUEUE=y
75# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 79# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -118,7 +118,6 @@ CONFIG_SLUB_DEBUG=y
118CONFIG_SLUB=y 118CONFIG_SLUB=y
119# CONFIG_SLOB is not set 119# CONFIG_SLOB is not set
120# CONFIG_PROFILING is not set 120# CONFIG_PROFILING is not set
121# CONFIG_MARKERS is not set
122CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
123CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 122CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
124CONFIG_HAVE_IOREMAP_PROT=y 123CONFIG_HAVE_IOREMAP_PROT=y
@@ -128,13 +127,11 @@ CONFIG_HAVE_ARCH_TRACEHOOK=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
131# CONFIG_TINY_SHMEM is not set
132CONFIG_BASE_SMALL=0 130CONFIG_BASE_SMALL=0
133# CONFIG_MODULES is not set 131# CONFIG_MODULES is not set
134CONFIG_BLOCK=y 132CONFIG_BLOCK=y
135CONFIG_LBD=y 133CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
140 137
@@ -151,6 +148,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
155 156
156# 157#
@@ -190,6 +191,7 @@ CONFIG_MV64X60=y
190# CONFIG_CPU_FREQ is not set 191# CONFIG_CPU_FREQ is not set
191# CONFIG_TAU is not set 192# CONFIG_TAU is not set
192# CONFIG_FSL_ULI1575 is not set 193# CONFIG_FSL_ULI1575 is not set
194# CONFIG_SIMPLE_GPIO is not set
193 195
194# 196#
195# Kernel options 197# Kernel options
@@ -213,10 +215,12 @@ CONFIG_BINFMT_ELF=y
213# CONFIG_HAVE_AOUT is not set 215# CONFIG_HAVE_AOUT is not set
214CONFIG_BINFMT_MISC=y 216CONFIG_BINFMT_MISC=y
215# CONFIG_IOMMU_HELPER is not set 217# CONFIG_IOMMU_HELPER is not set
218CONFIG_PPC_NEED_DMA_SYNC_OPS=y
216CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 219CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
217CONFIG_ARCH_HAS_WALK_MEMORY=y 220CONFIG_ARCH_HAS_WALK_MEMORY=y
218CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 221CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
219# CONFIG_KEXEC is not set 222# CONFIG_KEXEC is not set
223# CONFIG_CRASH_DUMP is not set
220CONFIG_ARCH_FLATMEM_ENABLE=y 224CONFIG_ARCH_FLATMEM_ENABLE=y
221CONFIG_ARCH_POPULATES_NODE_MAP=y 225CONFIG_ARCH_POPULATES_NODE_MAP=y
222CONFIG_SELECT_MEMORY_MODEL=y 226CONFIG_SELECT_MEMORY_MODEL=y
@@ -228,12 +232,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
228CONFIG_PAGEFLAGS_EXTENDED=y 232CONFIG_PAGEFLAGS_EXTENDED=y
229CONFIG_SPLIT_PTLOCK_CPUS=4 233CONFIG_SPLIT_PTLOCK_CPUS=4
230CONFIG_MIGRATION=y 234CONFIG_MIGRATION=y
231# CONFIG_RESOURCES_64BIT is not set
232# CONFIG_PHYS_ADDR_T_64BIT is not set 235# CONFIG_PHYS_ADDR_T_64BIT is not set
233CONFIG_ZONE_DMA_FLAG=1 236CONFIG_ZONE_DMA_FLAG=1
234CONFIG_BOUNCE=y 237CONFIG_BOUNCE=y
235CONFIG_VIRT_TO_BUS=y 238CONFIG_VIRT_TO_BUS=y
236CONFIG_UNEVICTABLE_LRU=y 239CONFIG_UNEVICTABLE_LRU=y
240CONFIG_PPC_4K_PAGES=y
241# CONFIG_PPC_16K_PAGES is not set
242# CONFIG_PPC_64K_PAGES is not set
237CONFIG_FORCE_MAX_ZONEORDER=11 243CONFIG_FORCE_MAX_ZONEORDER=11
238CONFIG_PROC_DEVICETREE=y 244CONFIG_PROC_DEVICETREE=y
239# CONFIG_CMDLINE_BOOL is not set 245# CONFIG_CMDLINE_BOOL is not set
@@ -255,6 +261,7 @@ CONFIG_PCI_SYSCALL=y
255CONFIG_ARCH_SUPPORTS_MSI=y 261CONFIG_ARCH_SUPPORTS_MSI=y
256# CONFIG_PCI_MSI is not set 262# CONFIG_PCI_MSI is not set
257# CONFIG_PCI_LEGACY is not set 263# CONFIG_PCI_LEGACY is not set
264# CONFIG_PCI_STUB is not set
258# CONFIG_PCCARD is not set 265# CONFIG_PCCARD is not set
259# CONFIG_HOTPLUG_PCI is not set 266# CONFIG_HOTPLUG_PCI is not set
260# CONFIG_HAS_RAPIDIO is not set 267# CONFIG_HAS_RAPIDIO is not set
@@ -279,6 +286,8 @@ CONFIG_NET=y
279# 286#
280# Networking options 287# Networking options
281# 288#
289# CONFIG_NET_NS is not set
290CONFIG_COMPAT_NET_DEV_OPS=y
282CONFIG_PACKET=y 291CONFIG_PACKET=y
283# CONFIG_PACKET_MMAP is not set 292# CONFIG_PACKET_MMAP is not set
284CONFIG_UNIX=y 293CONFIG_UNIX=y
@@ -335,6 +344,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
335# CONFIG_ECONET is not set 344# CONFIG_ECONET is not set
336# CONFIG_WAN_ROUTER is not set 345# CONFIG_WAN_ROUTER is not set
337# CONFIG_NET_SCHED is not set 346# CONFIG_NET_SCHED is not set
347# CONFIG_DCB is not set
338 348
339# 349#
340# Network testing 350# Network testing
@@ -350,8 +360,9 @@ CONFIG_WIRELESS=y
350# CONFIG_CFG80211 is not set 360# CONFIG_CFG80211 is not set
351CONFIG_WIRELESS_OLD_REGULATORY=y 361CONFIG_WIRELESS_OLD_REGULATORY=y
352# CONFIG_WIRELESS_EXT is not set 362# CONFIG_WIRELESS_EXT is not set
363# CONFIG_LIB80211 is not set
353# CONFIG_MAC80211 is not set 364# CONFIG_MAC80211 is not set
354# CONFIG_IEEE80211 is not set 365# CONFIG_WIMAX is not set
355# CONFIG_RFKILL is not set 366# CONFIG_RFKILL is not set
356# CONFIG_NET_9P is not set 367# CONFIG_NET_9P is not set
357 368
@@ -445,6 +456,12 @@ CONFIG_MTD_PHYSMAP_OF=y
445# CONFIG_MTD_ONENAND is not set 456# CONFIG_MTD_ONENAND is not set
446 457
447# 458#
459# LPDDR flash memory drivers
460#
461# CONFIG_MTD_LPDDR is not set
462# CONFIG_MTD_QINFO_PROBE is not set
463
464#
448# UBI - Unsorted block images 465# UBI - Unsorted block images
449# 466#
450# CONFIG_MTD_UBI is not set 467# CONFIG_MTD_UBI is not set
@@ -475,8 +492,10 @@ CONFIG_MISC_DEVICES=y
475# CONFIG_EEPROM_93CX6 is not set 492# CONFIG_EEPROM_93CX6 is not set
476# CONFIG_SGI_IOC4 is not set 493# CONFIG_SGI_IOC4 is not set
477# CONFIG_TIFM_CORE is not set 494# CONFIG_TIFM_CORE is not set
495# CONFIG_ICS932S401 is not set
478# CONFIG_ENCLOSURE_SERVICES is not set 496# CONFIG_ENCLOSURE_SERVICES is not set
479# CONFIG_HP_ILO is not set 497# CONFIG_HP_ILO is not set
498# CONFIG_C2PORT is not set
480CONFIG_HAVE_IDE=y 499CONFIG_HAVE_IDE=y
481CONFIG_IDE=y 500CONFIG_IDE=y
482 501
@@ -489,7 +508,6 @@ CONFIG_IDE_GD_ATA=y
489# CONFIG_IDE_GD_ATAPI is not set 508# CONFIG_IDE_GD_ATAPI is not set
490# CONFIG_BLK_DEV_IDECD is not set 509# CONFIG_BLK_DEV_IDECD is not set
491# CONFIG_BLK_DEV_IDETAPE is not set 510# CONFIG_BLK_DEV_IDETAPE is not set
492# CONFIG_BLK_DEV_IDESCSI is not set
493# CONFIG_IDE_TASK_IOCTL is not set 511# CONFIG_IDE_TASK_IOCTL is not set
494CONFIG_IDE_PROC_FS=y 512CONFIG_IDE_PROC_FS=y
495 513
@@ -519,6 +537,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
519# CONFIG_BLK_DEV_JMICRON is not set 537# CONFIG_BLK_DEV_JMICRON is not set
520# CONFIG_BLK_DEV_SC1200 is not set 538# CONFIG_BLK_DEV_SC1200 is not set
521# CONFIG_BLK_DEV_PIIX is not set 539# CONFIG_BLK_DEV_PIIX is not set
540# CONFIG_BLK_DEV_IT8172 is not set
522# CONFIG_BLK_DEV_IT8213 is not set 541# CONFIG_BLK_DEV_IT8213 is not set
523# CONFIG_BLK_DEV_IT821X is not set 542# CONFIG_BLK_DEV_IT821X is not set
524# CONFIG_BLK_DEV_NS87415 is not set 543# CONFIG_BLK_DEV_NS87415 is not set
@@ -571,6 +590,7 @@ CONFIG_BLK_DEV_SD=y
571# CONFIG_SCSI_SRP_ATTRS is not set 590# CONFIG_SCSI_SRP_ATTRS is not set
572CONFIG_SCSI_LOWLEVEL=y 591CONFIG_SCSI_LOWLEVEL=y
573# CONFIG_ISCSI_TCP is not set 592# CONFIG_ISCSI_TCP is not set
593# CONFIG_SCSI_CXGB3_ISCSI is not set
574# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 594# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
575# CONFIG_SCSI_3W_9XXX is not set 595# CONFIG_SCSI_3W_9XXX is not set
576# CONFIG_SCSI_ACARD is not set 596# CONFIG_SCSI_ACARD is not set
@@ -587,6 +607,8 @@ CONFIG_SCSI_LOWLEVEL=y
587# CONFIG_MEGARAID_SAS is not set 607# CONFIG_MEGARAID_SAS is not set
588# CONFIG_SCSI_HPTIOP is not set 608# CONFIG_SCSI_HPTIOP is not set
589# CONFIG_SCSI_BUSLOGIC is not set 609# CONFIG_SCSI_BUSLOGIC is not set
610# CONFIG_LIBFC is not set
611# CONFIG_FCOE is not set
590# CONFIG_SCSI_DMX3191D is not set 612# CONFIG_SCSI_DMX3191D is not set
591# CONFIG_SCSI_EATA is not set 613# CONFIG_SCSI_EATA is not set
592# CONFIG_SCSI_FUTURE_DOMAIN is not set 614# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -707,6 +729,9 @@ CONFIG_PHYLIB=y
707# CONFIG_BROADCOM_PHY is not set 729# CONFIG_BROADCOM_PHY is not set
708# CONFIG_ICPLUS_PHY is not set 730# CONFIG_ICPLUS_PHY is not set
709# CONFIG_REALTEK_PHY is not set 731# CONFIG_REALTEK_PHY is not set
732# CONFIG_NATIONAL_PHY is not set
733# CONFIG_STE10XP is not set
734# CONFIG_LSI_ET1011C_PHY is not set
710# CONFIG_FIXED_PHY is not set 735# CONFIG_FIXED_PHY is not set
711# CONFIG_MDIO_BITBANG is not set 736# CONFIG_MDIO_BITBANG is not set
712CONFIG_NET_ETHERNET=y 737CONFIG_NET_ETHERNET=y
@@ -730,7 +755,6 @@ CONFIG_NET_PCI=y
730# CONFIG_ADAPTEC_STARFIRE is not set 755# CONFIG_ADAPTEC_STARFIRE is not set
731# CONFIG_B44 is not set 756# CONFIG_B44 is not set
732# CONFIG_FORCEDETH is not set 757# CONFIG_FORCEDETH is not set
733# CONFIG_EEPRO100 is not set
734CONFIG_E100=y 758CONFIG_E100=y
735# CONFIG_FEALNX is not set 759# CONFIG_FEALNX is not set
736# CONFIG_NATSEMI is not set 760# CONFIG_NATSEMI is not set
@@ -744,6 +768,7 @@ CONFIG_8139TOO=y
744# CONFIG_R6040 is not set 768# CONFIG_R6040 is not set
745# CONFIG_SIS900 is not set 769# CONFIG_SIS900 is not set
746# CONFIG_EPIC100 is not set 770# CONFIG_EPIC100 is not set
771# CONFIG_SMSC9420 is not set
747# CONFIG_SUNDANCE is not set 772# CONFIG_SUNDANCE is not set
748# CONFIG_TLAN is not set 773# CONFIG_TLAN is not set
749# CONFIG_VIA_RHINE is not set 774# CONFIG_VIA_RHINE is not set
@@ -773,6 +798,7 @@ CONFIG_MV643XX_ETH=y
773# CONFIG_JME is not set 798# CONFIG_JME is not set
774CONFIG_NETDEV_10000=y 799CONFIG_NETDEV_10000=y
775# CONFIG_CHELSIO_T1 is not set 800# CONFIG_CHELSIO_T1 is not set
801CONFIG_CHELSIO_T3_DEPENDS=y
776# CONFIG_CHELSIO_T3 is not set 802# CONFIG_CHELSIO_T3 is not set
777# CONFIG_ENIC is not set 803# CONFIG_ENIC is not set
778# CONFIG_IXGBE is not set 804# CONFIG_IXGBE is not set
@@ -797,6 +823,10 @@ CONFIG_NETDEV_10000=y
797# CONFIG_IWLWIFI_LEDS is not set 823# CONFIG_IWLWIFI_LEDS is not set
798 824
799# 825#
826# Enable WiMAX (Networking options) to see the WiMAX drivers
827#
828
829#
800# USB Network Adapters 830# USB Network Adapters
801# 831#
802# CONFIG_USB_CATC is not set 832# CONFIG_USB_CATC is not set
@@ -877,8 +907,10 @@ CONFIG_SERIAL_CORE=y
877CONFIG_SERIAL_CORE_CONSOLE=y 907CONFIG_SERIAL_CORE_CONSOLE=y
878# CONFIG_SERIAL_JSM is not set 908# CONFIG_SERIAL_JSM is not set
879CONFIG_UNIX98_PTYS=y 909CONFIG_UNIX98_PTYS=y
910# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
880CONFIG_LEGACY_PTYS=y 911CONFIG_LEGACY_PTYS=y
881CONFIG_LEGACY_PTY_COUNT=256 912CONFIG_LEGACY_PTY_COUNT=256
913# CONFIG_HVC_UDBG is not set
882# CONFIG_IPMI_HANDLER is not set 914# CONFIG_IPMI_HANDLER is not set
883# CONFIG_HW_RANDOM is not set 915# CONFIG_HW_RANDOM is not set
884# CONFIG_NVRAM is not set 916# CONFIG_NVRAM is not set
@@ -970,8 +1002,10 @@ CONFIG_HWMON=y
970# CONFIG_SENSORS_ADM1029 is not set 1002# CONFIG_SENSORS_ADM1029 is not set
971# CONFIG_SENSORS_ADM1031 is not set 1003# CONFIG_SENSORS_ADM1031 is not set
972# CONFIG_SENSORS_ADM9240 is not set 1004# CONFIG_SENSORS_ADM9240 is not set
1005# CONFIG_SENSORS_ADT7462 is not set
973# CONFIG_SENSORS_ADT7470 is not set 1006# CONFIG_SENSORS_ADT7470 is not set
974# CONFIG_SENSORS_ADT7473 is not set 1007# CONFIG_SENSORS_ADT7473 is not set
1008# CONFIG_SENSORS_ADT7475 is not set
975# CONFIG_SENSORS_ATXP1 is not set 1009# CONFIG_SENSORS_ATXP1 is not set
976# CONFIG_SENSORS_DS1621 is not set 1010# CONFIG_SENSORS_DS1621 is not set
977# CONFIG_SENSORS_I5K_AMB is not set 1011# CONFIG_SENSORS_I5K_AMB is not set
@@ -992,6 +1026,7 @@ CONFIG_HWMON=y
992# CONFIG_SENSORS_LM90 is not set 1026# CONFIG_SENSORS_LM90 is not set
993# CONFIG_SENSORS_LM92 is not set 1027# CONFIG_SENSORS_LM92 is not set
994# CONFIG_SENSORS_LM93 is not set 1028# CONFIG_SENSORS_LM93 is not set
1029# CONFIG_SENSORS_LTC4245 is not set
995# CONFIG_SENSORS_MAX1619 is not set 1030# CONFIG_SENSORS_MAX1619 is not set
996# CONFIG_SENSORS_MAX6650 is not set 1031# CONFIG_SENSORS_MAX6650 is not set
997# CONFIG_SENSORS_PC87360 is not set 1032# CONFIG_SENSORS_PC87360 is not set
@@ -1018,11 +1053,11 @@ CONFIG_HWMON=y
1018# CONFIG_THERMAL is not set 1053# CONFIG_THERMAL is not set
1019# CONFIG_THERMAL_HWMON is not set 1054# CONFIG_THERMAL_HWMON is not set
1020# CONFIG_WATCHDOG is not set 1055# CONFIG_WATCHDOG is not set
1056CONFIG_SSB_POSSIBLE=y
1021 1057
1022# 1058#
1023# Sonics Silicon Backplane 1059# Sonics Silicon Backplane
1024# 1060#
1025CONFIG_SSB_POSSIBLE=y
1026# CONFIG_SSB is not set 1061# CONFIG_SSB is not set
1027 1062
1028# 1063#
@@ -1031,18 +1066,13 @@ CONFIG_SSB_POSSIBLE=y
1031# CONFIG_MFD_CORE is not set 1066# CONFIG_MFD_CORE is not set
1032# CONFIG_MFD_SM501 is not set 1067# CONFIG_MFD_SM501 is not set
1033# CONFIG_HTC_PASIC3 is not set 1068# CONFIG_HTC_PASIC3 is not set
1069# CONFIG_TWL4030_CORE is not set
1034# CONFIG_MFD_TMIO is not set 1070# CONFIG_MFD_TMIO is not set
1035# CONFIG_PMIC_DA903X is not set 1071# CONFIG_PMIC_DA903X is not set
1036# CONFIG_MFD_WM8400 is not set 1072# CONFIG_MFD_WM8400 is not set
1037# CONFIG_MFD_WM8350_I2C is not set 1073# CONFIG_MFD_WM8350_I2C is not set
1038 1074# CONFIG_MFD_PCF50633 is not set
1039#
1040# Voltage and Current regulators
1041#
1042# CONFIG_REGULATOR is not set 1075# 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
1046 1076
1047# 1077#
1048# Multimedia devices 1078# Multimedia devices
@@ -1101,11 +1131,9 @@ CONFIG_HID_COMPAT=y
1101CONFIG_HID_A4TECH=y 1131CONFIG_HID_A4TECH=y
1102CONFIG_HID_APPLE=y 1132CONFIG_HID_APPLE=y
1103CONFIG_HID_BELKIN=y 1133CONFIG_HID_BELKIN=y
1104CONFIG_HID_BRIGHT=y
1105CONFIG_HID_CHERRY=y 1134CONFIG_HID_CHERRY=y
1106CONFIG_HID_CHICONY=y 1135CONFIG_HID_CHICONY=y
1107CONFIG_HID_CYPRESS=y 1136CONFIG_HID_CYPRESS=y
1108CONFIG_HID_DELL=y
1109CONFIG_HID_EZKEY=y 1137CONFIG_HID_EZKEY=y
1110CONFIG_HID_GYRATION=y 1138CONFIG_HID_GYRATION=y
1111CONFIG_HID_LOGITECH=y 1139CONFIG_HID_LOGITECH=y
@@ -1113,12 +1141,15 @@ CONFIG_HID_LOGITECH=y
1113# CONFIG_LOGIRUMBLEPAD2_FF is not set 1141# CONFIG_LOGIRUMBLEPAD2_FF is not set
1114CONFIG_HID_MICROSOFT=y 1142CONFIG_HID_MICROSOFT=y
1115CONFIG_HID_MONTEREY=y 1143CONFIG_HID_MONTEREY=y
1144CONFIG_HID_NTRIG=y
1116CONFIG_HID_PANTHERLORD=y 1145CONFIG_HID_PANTHERLORD=y
1117# CONFIG_PANTHERLORD_FF is not set 1146# CONFIG_PANTHERLORD_FF is not set
1118CONFIG_HID_PETALYNX=y 1147CONFIG_HID_PETALYNX=y
1119CONFIG_HID_SAMSUNG=y 1148CONFIG_HID_SAMSUNG=y
1120CONFIG_HID_SONY=y 1149CONFIG_HID_SONY=y
1121CONFIG_HID_SUNPLUS=y 1150CONFIG_HID_SUNPLUS=y
1151# CONFIG_GREENASIA_FF is not set
1152CONFIG_HID_TOPSEED=y
1122CONFIG_THRUSTMASTER_FF=y 1153CONFIG_THRUSTMASTER_FF=y
1123CONFIG_ZEROPLUS_FF=y 1154CONFIG_ZEROPLUS_FF=y
1124CONFIG_USB_SUPPORT=y 1155CONFIG_USB_SUPPORT=y
@@ -1148,6 +1179,7 @@ CONFIG_USB_EHCI_HCD=y
1148# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1179# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1149# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1180# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1150CONFIG_USB_EHCI_HCD_PPC_OF=y 1181CONFIG_USB_EHCI_HCD_PPC_OF=y
1182# CONFIG_USB_OXU210HP_HCD is not set
1151# CONFIG_USB_ISP116X_HCD is not set 1183# CONFIG_USB_ISP116X_HCD is not set
1152# CONFIG_USB_ISP1760_HCD is not set 1184# CONFIG_USB_ISP1760_HCD is not set
1153CONFIG_USB_OHCI_HCD=y 1185CONFIG_USB_OHCI_HCD=y
@@ -1170,11 +1202,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1170# CONFIG_USB_TMC is not set 1202# CONFIG_USB_TMC is not set
1171 1203
1172# 1204#
1173# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1205# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
1174# 1206#
1175 1207
1176# 1208#
1177# may also be needed; see USB_STORAGE Help for more information 1209# see USB_STORAGE Help for more information
1178# 1210#
1179# CONFIG_USB_STORAGE is not set 1211# CONFIG_USB_STORAGE is not set
1180# CONFIG_USB_LIBUSUAL is not set 1212# CONFIG_USB_LIBUSUAL is not set
@@ -1216,6 +1248,10 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1216# CONFIG_USB_ISIGHTFW is not set 1248# CONFIG_USB_ISIGHTFW is not set
1217# CONFIG_USB_VST is not set 1249# CONFIG_USB_VST is not set
1218# CONFIG_USB_GADGET is not set 1250# CONFIG_USB_GADGET is not set
1251
1252#
1253# OTG and related infrastructure
1254#
1219# CONFIG_UWB is not set 1255# CONFIG_UWB is not set
1220# CONFIG_MMC is not set 1256# CONFIG_MMC is not set
1221# CONFIG_MEMSTICK is not set 1257# CONFIG_MEMSTICK is not set
@@ -1253,6 +1289,7 @@ CONFIG_RTC_DRV_MAX6900=y
1253# CONFIG_RTC_DRV_M41T80 is not set 1289# CONFIG_RTC_DRV_M41T80 is not set
1254# CONFIG_RTC_DRV_S35390A is not set 1290# CONFIG_RTC_DRV_S35390A is not set
1255# CONFIG_RTC_DRV_FM3130 is not set 1291# CONFIG_RTC_DRV_FM3130 is not set
1292# CONFIG_RTC_DRV_RX8581 is not set
1256 1293
1257# 1294#
1258# SPI RTC drivers 1295# SPI RTC drivers
@@ -1299,7 +1336,9 @@ CONFIG_FS_MBCACHE=y
1299# CONFIG_FS_POSIX_ACL is not set 1336# CONFIG_FS_POSIX_ACL is not set
1300CONFIG_FILE_LOCKING=y 1337CONFIG_FILE_LOCKING=y
1301# CONFIG_XFS_FS is not set 1338# CONFIG_XFS_FS is not set
1339# CONFIG_GFS2_FS is not set
1302# CONFIG_OCFS2_FS is not set 1340# CONFIG_OCFS2_FS is not set
1341# CONFIG_BTRFS_FS is not set
1303CONFIG_DNOTIFY=y 1342CONFIG_DNOTIFY=y
1304CONFIG_INOTIFY=y 1343CONFIG_INOTIFY=y
1305CONFIG_INOTIFY_USER=y 1344CONFIG_INOTIFY_USER=y
@@ -1333,10 +1372,7 @@ CONFIG_TMPFS=y
1333# CONFIG_TMPFS_POSIX_ACL is not set 1372# CONFIG_TMPFS_POSIX_ACL is not set
1334# CONFIG_HUGETLB_PAGE is not set 1373# CONFIG_HUGETLB_PAGE is not set
1335# CONFIG_CONFIGFS_FS is not set 1374# CONFIG_CONFIGFS_FS is not set
1336 1375CONFIG_MISC_FILESYSTEMS=y
1337#
1338# Miscellaneous filesystems
1339#
1340# CONFIG_ADFS_FS is not set 1376# CONFIG_ADFS_FS is not set
1341# CONFIG_AFFS_FS is not set 1377# CONFIG_AFFS_FS is not set
1342# CONFIG_HFS_FS is not set 1378# CONFIG_HFS_FS is not set
@@ -1346,6 +1382,7 @@ CONFIG_TMPFS=y
1346# CONFIG_EFS_FS is not set 1382# CONFIG_EFS_FS is not set
1347# CONFIG_JFFS2_FS is not set 1383# CONFIG_JFFS2_FS is not set
1348# CONFIG_CRAMFS is not set 1384# CONFIG_CRAMFS is not set
1385# CONFIG_SQUASHFS is not set
1349# CONFIG_VXFS_FS is not set 1386# CONFIG_VXFS_FS is not set
1350# CONFIG_MINIX_FS is not set 1387# CONFIG_MINIX_FS is not set
1351# CONFIG_OMFS_FS is not set 1388# CONFIG_OMFS_FS is not set
@@ -1400,6 +1437,7 @@ CONFIG_MSDOS_PARTITION=y
1400# Library routines 1437# Library routines
1401# 1438#
1402CONFIG_BITREVERSE=y 1439CONFIG_BITREVERSE=y
1440CONFIG_GENERIC_FIND_LAST_BIT=y
1403# CONFIG_CRC_CCITT is not set 1441# CONFIG_CRC_CCITT is not set
1404# CONFIG_CRC16 is not set 1442# CONFIG_CRC16 is not set
1405CONFIG_CRC_T10DIF=y 1443CONFIG_CRC_T10DIF=y
@@ -1433,6 +1471,8 @@ CONFIG_DEBUG_MEMORY_INIT=y
1433# CONFIG_LATENCYTOP is not set 1471# CONFIG_LATENCYTOP is not set
1434CONFIG_SYSCTL_SYSCALL_CHECK=y 1472CONFIG_SYSCTL_SYSCALL_CHECK=y
1435CONFIG_HAVE_FUNCTION_TRACER=y 1473CONFIG_HAVE_FUNCTION_TRACER=y
1474CONFIG_HAVE_DYNAMIC_FTRACE=y
1475CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1436 1476
1437# 1477#
1438# Tracers 1478# Tracers
@@ -1440,6 +1480,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1440# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1480# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1441# CONFIG_SAMPLES is not set 1481# CONFIG_SAMPLES is not set
1442CONFIG_HAVE_ARCH_KGDB=y 1482CONFIG_HAVE_ARCH_KGDB=y
1483CONFIG_PRINT_STACK_DEPTH=64
1443# CONFIG_IRQSTACKS is not set 1484# CONFIG_IRQSTACKS is not set
1444# CONFIG_BOOTX_TEXT is not set 1485# CONFIG_BOOTX_TEXT is not set
1445# CONFIG_PPC_EARLY_DEBUG is not set 1486# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1458,6 +1499,7 @@ CONFIG_CRYPTO=y
1458# 1499#
1459# CONFIG_CRYPTO_FIPS is not set 1500# CONFIG_CRYPTO_FIPS is not set
1460# CONFIG_CRYPTO_MANAGER is not set 1501# CONFIG_CRYPTO_MANAGER is not set
1502# CONFIG_CRYPTO_MANAGER2 is not set
1461# CONFIG_CRYPTO_GF128MUL is not set 1503# CONFIG_CRYPTO_GF128MUL is not set
1462# CONFIG_CRYPTO_NULL is not set 1504# CONFIG_CRYPTO_NULL is not set
1463# CONFIG_CRYPTO_CRYPTD is not set 1505# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig
index 7eb16ab7b71b..86512c8790d1 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.28-rc3 3# Linux kernel version: 2.6.29-rc2
4# Sat Nov 8 12:39:48 2008 4# Mon Jan 26 15:35:46 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -43,7 +43,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
43CONFIG_PPC=y 43CONFIG_PPC=y
44CONFIG_EARLY_PRINTK=y 44CONFIG_EARLY_PRINTK=y
45CONFIG_GENERIC_NVRAM=y 45CONFIG_GENERIC_NVRAM=y
46CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 46CONFIG_SCHED_OMIT_FRAME_POINTER=y
47CONFIG_ARCH_MAY_HAVE_PC_FDC=y 47CONFIG_ARCH_MAY_HAVE_PC_FDC=y
48CONFIG_PPC_OF=y 48CONFIG_PPC_OF=y
49CONFIG_OF=y 49CONFIG_OF=y
@@ -73,12 +73,12 @@ CONFIG_SYSVIPC_SYSCTL=y
73# CONFIG_AUDIT is not set 73# CONFIG_AUDIT is not set
74# CONFIG_IKCONFIG is not set 74# CONFIG_IKCONFIG is not set
75CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
76# CONFIG_CGROUPS is not set
77CONFIG_GROUP_SCHED=y 76CONFIG_GROUP_SCHED=y
78CONFIG_FAIR_GROUP_SCHED=y 77CONFIG_FAIR_GROUP_SCHED=y
79# CONFIG_RT_GROUP_SCHED is not set 78# CONFIG_RT_GROUP_SCHED is not set
80CONFIG_USER_SCHED=y 79CONFIG_USER_SCHED=y
81# CONFIG_CGROUP_SCHED is not set 80# CONFIG_CGROUP_SCHED is not set
81# CONFIG_CGROUPS is not set
82CONFIG_SYSFS_DEPRECATED=y 82CONFIG_SYSFS_DEPRECATED=y
83CONFIG_SYSFS_DEPRECATED_V2=y 83CONFIG_SYSFS_DEPRECATED_V2=y
84# CONFIG_RELAY is not set 84# CONFIG_RELAY is not set
@@ -110,7 +110,6 @@ CONFIG_SLUB_DEBUG=y
110CONFIG_SLUB=y 110CONFIG_SLUB=y
111# CONFIG_SLOB is not set 111# CONFIG_SLOB is not set
112# CONFIG_PROFILING is not set 112# CONFIG_PROFILING is not set
113# CONFIG_MARKERS is not set
114CONFIG_HAVE_OPROFILE=y 113CONFIG_HAVE_OPROFILE=y
115CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 114CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
116CONFIG_HAVE_IOREMAP_PROT=y 115CONFIG_HAVE_IOREMAP_PROT=y
@@ -120,7 +119,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
120# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 119# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
121CONFIG_SLABINFO=y 120CONFIG_SLABINFO=y
122CONFIG_RT_MUTEXES=y 121CONFIG_RT_MUTEXES=y
123# CONFIG_TINY_SHMEM is not set
124CONFIG_BASE_SMALL=0 122CONFIG_BASE_SMALL=0
125CONFIG_MODULES=y 123CONFIG_MODULES=y
126# CONFIG_MODULE_FORCE_LOAD is not set 124# CONFIG_MODULE_FORCE_LOAD is not set
@@ -128,11 +126,9 @@ CONFIG_MODULE_UNLOAD=y
128# CONFIG_MODULE_FORCE_UNLOAD is not set 126# CONFIG_MODULE_FORCE_UNLOAD is not set
129# CONFIG_MODVERSIONS is not set 127# CONFIG_MODVERSIONS is not set
130# CONFIG_MODULE_SRCVERSION_ALL is not set 128# CONFIG_MODULE_SRCVERSION_ALL is not set
131CONFIG_KMOD=y
132CONFIG_BLOCK=y 129CONFIG_BLOCK=y
133CONFIG_LBD=y 130CONFIG_LBD=y
134# CONFIG_BLK_DEV_IO_TRACE is not set 131# CONFIG_BLK_DEV_IO_TRACE is not set
135# CONFIG_LSF is not set
136# CONFIG_BLK_DEV_BSG is not set 132# CONFIG_BLK_DEV_BSG is not set
137# CONFIG_BLK_DEV_INTEGRITY is not set 133# CONFIG_BLK_DEV_INTEGRITY is not set
138 134
@@ -149,6 +145,10 @@ CONFIG_DEFAULT_CFQ=y
149# CONFIG_DEFAULT_NOOP is not set 145# CONFIG_DEFAULT_NOOP is not set
150CONFIG_DEFAULT_IOSCHED="cfq" 146CONFIG_DEFAULT_IOSCHED="cfq"
151CONFIG_CLASSIC_RCU=y 147CONFIG_CLASSIC_RCU=y
148# CONFIG_TREE_RCU is not set
149# CONFIG_PREEMPT_RCU is not set
150# CONFIG_TREE_RCU_TRACE is not set
151# CONFIG_PREEMPT_RCU_TRACE is not set
152# CONFIG_FREEZER is not set 152# CONFIG_FREEZER is not set
153 153
154# 154#
@@ -191,6 +191,7 @@ CONFIG_MPIC=y
191# CONFIG_TAU is not set 191# CONFIG_TAU is not set
192# CONFIG_QUICC_ENGINE 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# CONFIG_SIMPLE_GPIO is not set
194 195
195# 196#
196# Kernel options 197# Kernel options
@@ -217,6 +218,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
217CONFIG_ARCH_HAS_WALK_MEMORY=y 218CONFIG_ARCH_HAS_WALK_MEMORY=y
218CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 219CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
219# CONFIG_KEXEC is not set 220# CONFIG_KEXEC is not set
221# CONFIG_CRASH_DUMP is not set
220CONFIG_ARCH_FLATMEM_ENABLE=y 222CONFIG_ARCH_FLATMEM_ENABLE=y
221CONFIG_ARCH_POPULATES_NODE_MAP=y 223CONFIG_ARCH_POPULATES_NODE_MAP=y
222CONFIG_SELECT_MEMORY_MODEL=y 224CONFIG_SELECT_MEMORY_MODEL=y
@@ -228,12 +230,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
228CONFIG_PAGEFLAGS_EXTENDED=y 230CONFIG_PAGEFLAGS_EXTENDED=y
229CONFIG_SPLIT_PTLOCK_CPUS=4 231CONFIG_SPLIT_PTLOCK_CPUS=4
230CONFIG_MIGRATION=y 232CONFIG_MIGRATION=y
231# CONFIG_RESOURCES_64BIT is not set
232# CONFIG_PHYS_ADDR_T_64BIT is not set 233# CONFIG_PHYS_ADDR_T_64BIT is not set
233CONFIG_ZONE_DMA_FLAG=1 234CONFIG_ZONE_DMA_FLAG=1
234CONFIG_BOUNCE=y 235CONFIG_BOUNCE=y
235CONFIG_VIRT_TO_BUS=y 236CONFIG_VIRT_TO_BUS=y
236CONFIG_UNEVICTABLE_LRU=y 237CONFIG_UNEVICTABLE_LRU=y
238CONFIG_PPC_4K_PAGES=y
239# CONFIG_PPC_16K_PAGES is not set
240# CONFIG_PPC_64K_PAGES is not set
237CONFIG_FORCE_MAX_ZONEORDER=11 241CONFIG_FORCE_MAX_ZONEORDER=11
238CONFIG_PROC_DEVICETREE=y 242CONFIG_PROC_DEVICETREE=y
239CONFIG_CMDLINE_BOOL=y 243CONFIG_CMDLINE_BOOL=y
@@ -257,6 +261,7 @@ CONFIG_PCI_SYSCALL=y
257CONFIG_ARCH_SUPPORTS_MSI=y 261CONFIG_ARCH_SUPPORTS_MSI=y
258# CONFIG_PCI_MSI is not set 262# CONFIG_PCI_MSI is not set
259# CONFIG_PCI_LEGACY is not set 263# CONFIG_PCI_LEGACY is not set
264# CONFIG_PCI_STUB is not set
260# CONFIG_PCCARD is not set 265# CONFIG_PCCARD is not set
261# CONFIG_HOTPLUG_PCI is not set 266# CONFIG_HOTPLUG_PCI is not set
262# CONFIG_HAS_RAPIDIO is not set 267# CONFIG_HAS_RAPIDIO is not set
@@ -279,6 +284,7 @@ CONFIG_NET=y
279# 284#
280# Networking options 285# Networking options
281# 286#
287CONFIG_COMPAT_NET_DEV_OPS=y
282CONFIG_PACKET=m 288CONFIG_PACKET=m
283# CONFIG_PACKET_MMAP is not set 289# CONFIG_PACKET_MMAP is not set
284CONFIG_UNIX=y 290CONFIG_UNIX=y
@@ -330,6 +336,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
330# CONFIG_ECONET is not set 336# CONFIG_ECONET is not set
331# CONFIG_WAN_ROUTER is not set 337# CONFIG_WAN_ROUTER is not set
332# CONFIG_NET_SCHED is not set 338# CONFIG_NET_SCHED is not set
339# CONFIG_DCB is not set
333 340
334# 341#
335# Network testing 342# Network testing
@@ -345,8 +352,9 @@ CONFIG_WIRELESS=y
345# CONFIG_CFG80211 is not set 352# CONFIG_CFG80211 is not set
346CONFIG_WIRELESS_OLD_REGULATORY=y 353CONFIG_WIRELESS_OLD_REGULATORY=y
347# CONFIG_WIRELESS_EXT is not set 354# CONFIG_WIRELESS_EXT is not set
355# CONFIG_LIB80211 is not set
348# CONFIG_MAC80211 is not set 356# CONFIG_MAC80211 is not set
349# CONFIG_IEEE80211 is not set 357# CONFIG_WIMAX is not set
350# CONFIG_RFKILL is not set 358# CONFIG_RFKILL is not set
351# CONFIG_NET_9P is not set 359# CONFIG_NET_9P is not set
352 360
@@ -367,6 +375,7 @@ CONFIG_MTD=y
367# CONFIG_MTD_DEBUG is not set 375# CONFIG_MTD_DEBUG is not set
368# CONFIG_MTD_CONCAT is not set 376# CONFIG_MTD_CONCAT is not set
369CONFIG_MTD_PARTITIONS=y 377CONFIG_MTD_PARTITIONS=y
378# CONFIG_MTD_TESTS is not set
370# CONFIG_MTD_REDBOOT_PARTS is not set 379# CONFIG_MTD_REDBOOT_PARTS is not set
371# CONFIG_MTD_CMDLINE_PARTS is not set 380# CONFIG_MTD_CMDLINE_PARTS is not set
372# CONFIG_MTD_OF_PARTS is not set 381# CONFIG_MTD_OF_PARTS is not set
@@ -416,9 +425,7 @@ CONFIG_MTD_CFI_UTIL=y
416# 425#
417# CONFIG_MTD_COMPLEX_MAPPINGS is not set 426# CONFIG_MTD_COMPLEX_MAPPINGS is not set
418CONFIG_MTD_PHYSMAP=y 427CONFIG_MTD_PHYSMAP=y
419CONFIG_MTD_PHYSMAP_START=0xFF800000 428# CONFIG_MTD_PHYSMAP_COMPAT is not set
420CONFIG_MTD_PHYSMAP_LEN=0x00800000
421CONFIG_MTD_PHYSMAP_BANKWIDTH=1
422# CONFIG_MTD_PHYSMAP_OF is not set 429# CONFIG_MTD_PHYSMAP_OF is not set
423# CONFIG_MTD_INTEL_VR_NOR is not set 430# CONFIG_MTD_INTEL_VR_NOR is not set
424# CONFIG_MTD_PLATRAM is not set 431# CONFIG_MTD_PLATRAM is not set
@@ -442,6 +449,12 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
442# CONFIG_MTD_ONENAND is not set 449# CONFIG_MTD_ONENAND is not set
443 450
444# 451#
452# LPDDR flash memory drivers
453#
454# CONFIG_MTD_LPDDR is not set
455# CONFIG_MTD_QINFO_PROBE is not set
456
457#
445# UBI - Unsorted block images 458# UBI - Unsorted block images
446# 459#
447# CONFIG_MTD_UBI is not set 460# CONFIG_MTD_UBI is not set
@@ -468,8 +481,10 @@ CONFIG_MISC_DEVICES=y
468# CONFIG_EEPROM_93CX6 is not set 481# CONFIG_EEPROM_93CX6 is not set
469# CONFIG_SGI_IOC4 is not set 482# CONFIG_SGI_IOC4 is not set
470# CONFIG_TIFM_CORE is not set 483# CONFIG_TIFM_CORE is not set
484# CONFIG_ICS932S401 is not set
471# CONFIG_ENCLOSURE_SERVICES is not set 485# CONFIG_ENCLOSURE_SERVICES is not set
472# CONFIG_HP_ILO is not set 486# CONFIG_HP_ILO is not set
487# CONFIG_C2PORT is not set
473CONFIG_HAVE_IDE=y 488CONFIG_HAVE_IDE=y
474CONFIG_IDE=y 489CONFIG_IDE=y
475 490
@@ -483,7 +498,6 @@ CONFIG_IDE_GD_ATA=y
483# CONFIG_IDE_GD_ATAPI is not set 498# CONFIG_IDE_GD_ATAPI is not set
484# CONFIG_BLK_DEV_IDECD is not set 499# CONFIG_BLK_DEV_IDECD is not set
485# CONFIG_BLK_DEV_IDETAPE is not set 500# CONFIG_BLK_DEV_IDETAPE is not set
486# CONFIG_BLK_DEV_IDESCSI is not set
487# CONFIG_IDE_TASK_IOCTL is not set 501# CONFIG_IDE_TASK_IOCTL is not set
488CONFIG_IDE_PROC_FS=y 502CONFIG_IDE_PROC_FS=y
489 503
@@ -512,6 +526,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
512# CONFIG_BLK_DEV_JMICRON is not set 526# CONFIG_BLK_DEV_JMICRON is not set
513# CONFIG_BLK_DEV_SC1200 is not set 527# CONFIG_BLK_DEV_SC1200 is not set
514# CONFIG_BLK_DEV_PIIX is not set 528# CONFIG_BLK_DEV_PIIX is not set
529# CONFIG_BLK_DEV_IT8172 is not set
515# CONFIG_BLK_DEV_IT8213 is not set 530# CONFIG_BLK_DEV_IT8213 is not set
516# CONFIG_BLK_DEV_IT821X is not set 531# CONFIG_BLK_DEV_IT821X is not set
517# CONFIG_BLK_DEV_NS87415 is not set 532# CONFIG_BLK_DEV_NS87415 is not set
@@ -582,6 +597,8 @@ CONFIG_SCSI_LOWLEVEL=y
582# CONFIG_MEGARAID_SAS is not set 597# CONFIG_MEGARAID_SAS is not set
583# CONFIG_SCSI_HPTIOP is not set 598# CONFIG_SCSI_HPTIOP is not set
584# CONFIG_SCSI_BUSLOGIC is not set 599# CONFIG_SCSI_BUSLOGIC is not set
600# CONFIG_LIBFC is not set
601# CONFIG_FCOE is not set
585# CONFIG_SCSI_DMX3191D is not set 602# CONFIG_SCSI_DMX3191D is not set
586# CONFIG_SCSI_EATA is not set 603# CONFIG_SCSI_EATA is not set
587# CONFIG_SCSI_FUTURE_DOMAIN is not set 604# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -672,6 +689,10 @@ CONFIG_R8169=y
672# CONFIG_IWLWIFI_LEDS is not set 689# CONFIG_IWLWIFI_LEDS is not set
673 690
674# 691#
692# Enable WiMAX (Networking options) to see the WiMAX drivers
693#
694
695#
675# USB Network Adapters 696# USB Network Adapters
676# 697#
677# CONFIG_USB_CATC is not set 698# CONFIG_USB_CATC is not set
@@ -729,8 +750,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y
729# CONFIG_SERIAL_JSM is not set 750# CONFIG_SERIAL_JSM is not set
730# CONFIG_SERIAL_OF_PLATFORM is not set 751# CONFIG_SERIAL_OF_PLATFORM is not set
731CONFIG_UNIX98_PTYS=y 752CONFIG_UNIX98_PTYS=y
753# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
732CONFIG_LEGACY_PTYS=y 754CONFIG_LEGACY_PTYS=y
733CONFIG_LEGACY_PTY_COUNT=256 755CONFIG_LEGACY_PTY_COUNT=256
756# CONFIG_HVC_UDBG is not set
734# CONFIG_IPMI_HANDLER is not set 757# CONFIG_IPMI_HANDLER is not set
735CONFIG_HW_RANDOM=m 758CONFIG_HW_RANDOM=m
736CONFIG_NVRAM=y 759CONFIG_NVRAM=y
@@ -816,11 +839,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
816# CONFIG_THERMAL is not set 839# CONFIG_THERMAL is not set
817# CONFIG_THERMAL_HWMON is not set 840# CONFIG_THERMAL_HWMON is not set
818# CONFIG_WATCHDOG is not set 841# CONFIG_WATCHDOG is not set
842CONFIG_SSB_POSSIBLE=y
819 843
820# 844#
821# Sonics Silicon Backplane 845# Sonics Silicon Backplane
822# 846#
823CONFIG_SSB_POSSIBLE=y
824# CONFIG_SSB is not set 847# CONFIG_SSB is not set
825 848
826# 849#
@@ -829,18 +852,13 @@ CONFIG_SSB_POSSIBLE=y
829# CONFIG_MFD_CORE is not set 852# CONFIG_MFD_CORE is not set
830# CONFIG_MFD_SM501 is not set 853# CONFIG_MFD_SM501 is not set
831# CONFIG_HTC_PASIC3 is not set 854# CONFIG_HTC_PASIC3 is not set
855# CONFIG_TWL4030_CORE is not set
832# CONFIG_MFD_TMIO is not set 856# CONFIG_MFD_TMIO is not set
833# CONFIG_PMIC_DA903X is not set 857# CONFIG_PMIC_DA903X is not set
834# CONFIG_MFD_WM8400 is not set 858# CONFIG_MFD_WM8400 is not set
835# CONFIG_MFD_WM8350_I2C is not set 859# CONFIG_MFD_WM8350_I2C is not set
836 860# CONFIG_MFD_PCF50633 is not set
837#
838# Voltage and Current regulators
839#
840# CONFIG_REGULATOR is not set 861# 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
844 862
845# 863#
846# Multimedia devices 864# Multimedia devices
@@ -903,6 +921,7 @@ CONFIG_USB_EHCI_HCD=y
903# CONFIG_USB_EHCI_TT_NEWSCHED is not set 921# CONFIG_USB_EHCI_TT_NEWSCHED is not set
904# CONFIG_USB_EHCI_FSL is not set 922# CONFIG_USB_EHCI_FSL is not set
905CONFIG_USB_EHCI_HCD_PPC_OF=y 923CONFIG_USB_EHCI_HCD_PPC_OF=y
924# CONFIG_USB_OXU210HP_HCD is not set
906# CONFIG_USB_ISP116X_HCD is not set 925# CONFIG_USB_ISP116X_HCD is not set
907# CONFIG_USB_ISP1760_HCD is not set 926# CONFIG_USB_ISP1760_HCD is not set
908CONFIG_USB_OHCI_HCD=y 927CONFIG_USB_OHCI_HCD=y
@@ -925,18 +944,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
925# CONFIG_USB_TMC is not set 944# CONFIG_USB_TMC is not set
926 945
927# 946#
928# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 947# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
929# 948#
930 949
931# 950#
932# may also be needed; see USB_STORAGE Help for more information 951# see USB_STORAGE Help for more information
933# 952#
934CONFIG_USB_STORAGE=y 953CONFIG_USB_STORAGE=y
935# CONFIG_USB_STORAGE_DEBUG is not set 954# CONFIG_USB_STORAGE_DEBUG is not set
936# CONFIG_USB_STORAGE_DATAFAB is not set 955# CONFIG_USB_STORAGE_DATAFAB is not set
937# CONFIG_USB_STORAGE_FREECOM is not set 956# CONFIG_USB_STORAGE_FREECOM is not set
938# CONFIG_USB_STORAGE_ISD200 is not set 957# CONFIG_USB_STORAGE_ISD200 is not set
939# CONFIG_USB_STORAGE_DPCM is not set
940# CONFIG_USB_STORAGE_USBAT is not set 958# CONFIG_USB_STORAGE_USBAT is not set
941# CONFIG_USB_STORAGE_SDDR09 is not set 959# CONFIG_USB_STORAGE_SDDR09 is not set
942# CONFIG_USB_STORAGE_SDDR55 is not set 960# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -983,6 +1001,10 @@ CONFIG_USB_STORAGE=y
983# CONFIG_USB_ISIGHTFW is not set 1001# CONFIG_USB_ISIGHTFW is not set
984# CONFIG_USB_VST is not set 1002# CONFIG_USB_VST is not set
985# CONFIG_USB_GADGET is not set 1003# CONFIG_USB_GADGET is not set
1004
1005#
1006# OTG and related infrastructure
1007#
986# CONFIG_UWB is not set 1008# CONFIG_UWB is not set
987# CONFIG_MMC is not set 1009# CONFIG_MMC is not set
988# CONFIG_MEMSTICK is not set 1010# CONFIG_MEMSTICK is not set
@@ -1020,6 +1042,7 @@ CONFIG_RTC_DRV_DS1307=y
1020# CONFIG_RTC_DRV_M41T80 is not set 1042# CONFIG_RTC_DRV_M41T80 is not set
1021# CONFIG_RTC_DRV_S35390A is not set 1043# CONFIG_RTC_DRV_S35390A is not set
1022# CONFIG_RTC_DRV_FM3130 is not set 1044# CONFIG_RTC_DRV_FM3130 is not set
1045# CONFIG_RTC_DRV_RX8581 is not set
1023 1046
1024# 1047#
1025# SPI RTC drivers 1048# SPI RTC drivers
@@ -1070,7 +1093,9 @@ CONFIG_XFS_FS=m
1070# CONFIG_XFS_POSIX_ACL is not set 1093# CONFIG_XFS_POSIX_ACL is not set
1071# CONFIG_XFS_RT is not set 1094# CONFIG_XFS_RT is not set
1072# CONFIG_XFS_DEBUG is not set 1095# CONFIG_XFS_DEBUG is not set
1096# CONFIG_GFS2_FS is not set
1073# CONFIG_OCFS2_FS is not set 1097# CONFIG_OCFS2_FS is not set
1098# CONFIG_BTRFS_FS is not set
1074CONFIG_DNOTIFY=y 1099CONFIG_DNOTIFY=y
1075CONFIG_INOTIFY=y 1100CONFIG_INOTIFY=y
1076CONFIG_INOTIFY_USER=y 1101CONFIG_INOTIFY_USER=y
@@ -1104,10 +1129,7 @@ CONFIG_TMPFS=y
1104# CONFIG_TMPFS_POSIX_ACL is not set 1129# CONFIG_TMPFS_POSIX_ACL is not set
1105# CONFIG_HUGETLB_PAGE is not set 1130# CONFIG_HUGETLB_PAGE is not set
1106# CONFIG_CONFIGFS_FS is not set 1131# CONFIG_CONFIGFS_FS is not set
1107 1132CONFIG_MISC_FILESYSTEMS=y
1108#
1109# Miscellaneous filesystems
1110#
1111# CONFIG_ADFS_FS is not set 1133# CONFIG_ADFS_FS is not set
1112# CONFIG_AFFS_FS is not set 1134# CONFIG_AFFS_FS is not set
1113# CONFIG_HFS_FS is not set 1135# CONFIG_HFS_FS is not set
@@ -1127,6 +1149,7 @@ CONFIG_JFFS2_ZLIB=y
1127CONFIG_JFFS2_RTIME=y 1149CONFIG_JFFS2_RTIME=y
1128# CONFIG_JFFS2_RUBIN is not set 1150# CONFIG_JFFS2_RUBIN is not set
1129# CONFIG_CRAMFS is not set 1151# CONFIG_CRAMFS is not set
1152# CONFIG_SQUASHFS is not set
1130# CONFIG_VXFS_FS is not set 1153# CONFIG_VXFS_FS is not set
1131# CONFIG_MINIX_FS is not set 1154# CONFIG_MINIX_FS is not set
1132# CONFIG_OMFS_FS is not set 1155# CONFIG_OMFS_FS is not set
@@ -1204,6 +1227,7 @@ CONFIG_NLS_UTF8=y
1204# Library routines 1227# Library routines
1205# 1228#
1206CONFIG_BITREVERSE=y 1229CONFIG_BITREVERSE=y
1230CONFIG_GENERIC_FIND_LAST_BIT=y
1207# CONFIG_CRC_CCITT is not set 1231# CONFIG_CRC_CCITT is not set
1208# CONFIG_CRC16 is not set 1232# CONFIG_CRC16 is not set
1209CONFIG_CRC_T10DIF=y 1233CONFIG_CRC_T10DIF=y
@@ -1239,6 +1263,8 @@ CONFIG_FRAME_WARN=1024
1239# CONFIG_LATENCYTOP is not set 1263# CONFIG_LATENCYTOP is not set
1240CONFIG_SYSCTL_SYSCALL_CHECK=y 1264CONFIG_SYSCTL_SYSCALL_CHECK=y
1241CONFIG_HAVE_FUNCTION_TRACER=y 1265CONFIG_HAVE_FUNCTION_TRACER=y
1266CONFIG_HAVE_DYNAMIC_FTRACE=y
1267CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1242 1268
1243# 1269#
1244# Tracers 1270# Tracers
@@ -1246,6 +1272,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1246# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1272# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1247# CONFIG_SAMPLES is not set 1273# CONFIG_SAMPLES is not set
1248CONFIG_HAVE_ARCH_KGDB=y 1274CONFIG_HAVE_ARCH_KGDB=y
1275CONFIG_PRINT_STACK_DEPTH=64
1249# CONFIG_IRQSTACKS is not set 1276# CONFIG_IRQSTACKS is not set
1250# CONFIG_BOOTX_TEXT is not set 1277# CONFIG_BOOTX_TEXT is not set
1251# CONFIG_PPC_EARLY_DEBUG is not set 1278# CONFIG_PPC_EARLY_DEBUG is not set
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 94aa7b011b27..d3694498f3af 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -492,14 +492,14 @@ static void *vio_dma_iommu_alloc_coherent(struct device *dev, size_t size,
492 struct vio_dev *viodev = to_vio_dev(dev); 492 struct vio_dev *viodev = to_vio_dev(dev);
493 void *ret; 493 void *ret;
494 494
495 if (vio_cmo_alloc(viodev, roundup(size, IOMMU_PAGE_SIZE))) { 495 if (vio_cmo_alloc(viodev, roundup(size, PAGE_SIZE))) {
496 atomic_inc(&viodev->cmo.allocs_failed); 496 atomic_inc(&viodev->cmo.allocs_failed);
497 return NULL; 497 return NULL;
498 } 498 }
499 499
500 ret = dma_iommu_ops.alloc_coherent(dev, size, dma_handle, flag); 500 ret = dma_iommu_ops.alloc_coherent(dev, size, dma_handle, flag);
501 if (unlikely(ret == NULL)) { 501 if (unlikely(ret == NULL)) {
502 vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE)); 502 vio_cmo_dealloc(viodev, roundup(size, PAGE_SIZE));
503 atomic_inc(&viodev->cmo.allocs_failed); 503 atomic_inc(&viodev->cmo.allocs_failed);
504 } 504 }
505 505
@@ -513,7 +513,7 @@ static void vio_dma_iommu_free_coherent(struct device *dev, size_t size,
513 513
514 dma_iommu_ops.free_coherent(dev, size, vaddr, dma_handle); 514 dma_iommu_ops.free_coherent(dev, size, vaddr, dma_handle);
515 515
516 vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE)); 516 vio_cmo_dealloc(viodev, roundup(size, PAGE_SIZE));
517} 517}
518 518
519static dma_addr_t vio_dma_iommu_map_page(struct device *dev, struct page *page, 519static dma_addr_t vio_dma_iommu_map_page(struct device *dev, struct page *page,
@@ -572,6 +572,7 @@ static int vio_dma_iommu_map_sg(struct device *dev, struct scatterlist *sglist,
572 if (unlikely(!ret)) { 572 if (unlikely(!ret)) {
573 vio_cmo_dealloc(viodev, alloc_size); 573 vio_cmo_dealloc(viodev, alloc_size);
574 atomic_inc(&viodev->cmo.allocs_failed); 574 atomic_inc(&viodev->cmo.allocs_failed);
575 return ret;
575 } 576 }
576 577
577 for (sgl = sglist, count = 0; count < ret; count++, sgl++) 578 for (sgl = sglist, count = 0; count < ret; count++, sgl++)
diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c
index 45d925360b89..fe65c405412c 100644
--- a/arch/powerpc/mm/ppc_mmu_32.c
+++ b/arch/powerpc/mm/ppc_mmu_32.c
@@ -123,9 +123,9 @@ void __init setbat(int index, unsigned long virt, phys_addr_t phys,
123 int wimgxpp; 123 int wimgxpp;
124 struct ppc_bat *bat = BATS[index]; 124 struct ppc_bat *bat = BATS[index];
125 125
126 if (((flags & _PAGE_NO_CACHE) == 0) && 126 if ((flags & _PAGE_NO_CACHE) ||
127 cpu_has_feature(CPU_FTR_NEED_COHERENT)) 127 (cpu_has_feature(CPU_FTR_NEED_COHERENT) == 0))
128 flags |= _PAGE_COHERENT; 128 flags &= ~_PAGE_COHERENT;
129 129
130 bl = (size >> 17) - 1; 130 bl = (size >> 17) - 1;
131 if (PVR_VER(mfspr(SPRN_PVR)) != 1) { 131 if (PVR_VER(mfspr(SPRN_PVR)) != 1) {
diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile
index 698133180aee..01f51daace13 100644
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -3,5 +3,4 @@ obj-$(CONFIG_PPC44x_SIMPLE) += ppc44x_simple.o
3obj-$(CONFIG_EBONY) += ebony.o 3obj-$(CONFIG_EBONY) += ebony.o
4obj-$(CONFIG_SAM440EP) += sam440ep.o 4obj-$(CONFIG_SAM440EP) += sam440ep.o
5obj-$(CONFIG_WARP) += warp.o 5obj-$(CONFIG_WARP) += warp.o
6obj-$(CONFIG_WARP) += warp-nand.o
7obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o 6obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o
diff --git a/arch/powerpc/platforms/44x/warp-nand.c b/arch/powerpc/platforms/44x/warp-nand.c
deleted file mode 100644
index 89ecd76127d8..000000000000
--- a/arch/powerpc/platforms/44x/warp-nand.c
+++ /dev/null
@@ -1,135 +0,0 @@
1/*
2 * PIKA Warp(tm) NAND flash specific routines
3 *
4 * Copyright (c) 2008 PIKA Technologies
5 * Sean MacLennan <smaclennan@pikatech.com>
6 */
7
8#include <linux/platform_device.h>
9#include <linux/mtd/mtd.h>
10#include <linux/mtd/map.h>
11#include <linux/mtd/partitions.h>
12#include <linux/mtd/nand.h>
13#include <linux/mtd/ndfc.h>
14#include <linux/of.h>
15#include <asm/machdep.h>
16
17
18#ifdef CONFIG_MTD_NAND_NDFC
19
20#define CS_NAND_0 1 /* use chip select 1 for NAND device 0 */
21
22#define WARP_NAND_FLASH_REG_ADDR 0xD0000000UL
23#define WARP_NAND_FLASH_REG_SIZE 0x2000
24
25static struct resource warp_ndfc = {
26 .start = WARP_NAND_FLASH_REG_ADDR,
27 .end = WARP_NAND_FLASH_REG_ADDR + WARP_NAND_FLASH_REG_SIZE - 1,
28 .flags = IORESOURCE_MEM,
29};
30
31static struct mtd_partition nand_parts[] = {
32 {
33 .name = "kernel",
34 .offset = 0,
35 .size = 0x0200000
36 },
37 {
38 .name = "root",
39 .offset = 0x0200000,
40 .size = 0x3E00000
41 },
42 {
43 .name = "persistent",
44 .offset = 0x4000000,
45 .size = 0x4000000
46 },
47 {
48 .name = "persistent1",
49 .offset = 0x8000000,
50 .size = 0x4000000
51 },
52 {
53 .name = "persistent2",
54 .offset = 0xC000000,
55 .size = 0x4000000
56 }
57};
58
59struct ndfc_controller_settings warp_ndfc_settings = {
60 .ccr_settings = (NDFC_CCR_BS(CS_NAND_0) | NDFC_CCR_ARAC1),
61 .ndfc_erpn = 0,
62};
63
64static struct ndfc_chip_settings warp_chip0_settings = {
65 .bank_settings = 0x80002222,
66};
67
68struct platform_nand_ctrl warp_nand_ctrl = {
69 .priv = &warp_ndfc_settings,
70};
71
72static struct platform_device warp_ndfc_device = {
73 .name = "ndfc-nand",
74 .id = 0,
75 .dev = {
76 .platform_data = &warp_nand_ctrl,
77 },
78 .num_resources = 1,
79 .resource = &warp_ndfc,
80};
81
82/* Do NOT set the ecclayout: let it default so it is correct for both
83 * 64M and 256M flash chips.
84 */
85static struct platform_nand_chip warp_nand_chip0 = {
86 .nr_chips = 1,
87 .chip_offset = CS_NAND_0,
88 .nr_partitions = ARRAY_SIZE(nand_parts),
89 .partitions = nand_parts,
90 .chip_delay = 20,
91 .priv = &warp_chip0_settings,
92};
93
94static struct platform_device warp_nand_device = {
95 .name = "ndfc-chip",
96 .id = 0,
97 .num_resources = 0,
98 .dev = {
99 .platform_data = &warp_nand_chip0,
100 .parent = &warp_ndfc_device.dev,
101 }
102};
103
104static int warp_setup_nand_flash(void)
105{
106 struct device_node *np;
107
108 /* Try to detect a rev A based on NOR size. */
109 np = of_find_compatible_node(NULL, NULL, "cfi-flash");
110 if (np) {
111 struct property *pp;
112
113 pp = of_find_property(np, "reg", NULL);
114 if (pp && (pp->length == 12)) {
115 u32 *v = pp->value;
116 if (v[2] == 0x4000000) {
117 /* Rev A = 64M NAND */
118 warp_nand_chip0.nr_partitions = 3;
119
120 nand_parts[1].size = 0x3000000;
121 nand_parts[2].offset = 0x3200000;
122 nand_parts[2].size = 0x0e00000;
123 }
124 }
125 of_node_put(np);
126 }
127
128 platform_device_register(&warp_ndfc_device);
129 platform_device_register(&warp_nand_device);
130
131 return 0;
132}
133machine_device_initcall(warp, warp_setup_nand_flash);
134
135#endif
diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
index 5177bdd2c62a..91a2c80b9d72 100644
--- a/arch/powerpc/platforms/83xx/mpc831x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
@@ -71,6 +71,7 @@ static int __init mpc831x_rdb_probe(void)
71 71
72static struct of_device_id __initdata of_bus_ids[] = { 72static struct of_device_id __initdata of_bus_ids[] = {
73 { .compatible = "simple-bus" }, 73 { .compatible = "simple-bus" },
74 { .compatible = "gianfar" },
74 {}, 75 {},
75}; 76};
76 77
diff --git a/arch/powerpc/platforms/pseries/phyp_dump.c b/arch/powerpc/platforms/pseries/phyp_dump.c
index 6cf35cd8d0b5..15eb6107bcd2 100644
--- a/arch/powerpc/platforms/pseries/phyp_dump.c
+++ b/arch/powerpc/platforms/pseries/phyp_dump.c
@@ -144,8 +144,8 @@ static void print_dump_header(const struct phyp_dump_header *ph)
144 ph->first_offset_section); 144 ph->first_offset_section);
145 printk(KERN_INFO "dump disk sections should be zero\n"); 145 printk(KERN_INFO "dump disk sections should be zero\n");
146 printk(KERN_INFO "dump disk section = %d\n", ph->dump_disk_section); 146 printk(KERN_INFO "dump disk section = %d\n", ph->dump_disk_section);
147 printk(KERN_INFO "block num = %ld\n", ph->block_num_dd); 147 printk(KERN_INFO "block num = %lld\n", ph->block_num_dd);
148 printk(KERN_INFO "number of blocks = %ld\n", ph->num_of_blocks_dd); 148 printk(KERN_INFO "number of blocks = %lld\n", ph->num_of_blocks_dd);
149 printk(KERN_INFO "dump disk offset = %d\n", ph->offset_dd); 149 printk(KERN_INFO "dump disk offset = %d\n", ph->offset_dd);
150 printk(KERN_INFO "Max auto time= %d\n", ph->maxtime_to_auto); 150 printk(KERN_INFO "Max auto time= %d\n", ph->maxtime_to_auto);
151 151
@@ -154,33 +154,33 @@ static void print_dump_header(const struct phyp_dump_header *ph)
154 printk(KERN_INFO "cpu dump_flags =%d\n", ph->cpu_data.dump_flags); 154 printk(KERN_INFO "cpu dump_flags =%d\n", ph->cpu_data.dump_flags);
155 printk(KERN_INFO "cpu source_type =%d\n", ph->cpu_data.source_type); 155 printk(KERN_INFO "cpu source_type =%d\n", ph->cpu_data.source_type);
156 printk(KERN_INFO "cpu error_flags =%d\n", ph->cpu_data.error_flags); 156 printk(KERN_INFO "cpu error_flags =%d\n", ph->cpu_data.error_flags);
157 printk(KERN_INFO "cpu source_address =%lx\n", 157 printk(KERN_INFO "cpu source_address =%llx\n",
158 ph->cpu_data.source_address); 158 ph->cpu_data.source_address);
159 printk(KERN_INFO "cpu source_length =%lx\n", 159 printk(KERN_INFO "cpu source_length =%llx\n",
160 ph->cpu_data.source_length); 160 ph->cpu_data.source_length);
161 printk(KERN_INFO "cpu length_copied =%lx\n", 161 printk(KERN_INFO "cpu length_copied =%llx\n",
162 ph->cpu_data.length_copied); 162 ph->cpu_data.length_copied);
163 163
164 printk(KERN_INFO " HPTE AREA \n"); 164 printk(KERN_INFO " HPTE AREA \n");
165 printk(KERN_INFO "HPTE dump_flags =%d\n", ph->hpte_data.dump_flags); 165 printk(KERN_INFO "HPTE dump_flags =%d\n", ph->hpte_data.dump_flags);
166 printk(KERN_INFO "HPTE source_type =%d\n", ph->hpte_data.source_type); 166 printk(KERN_INFO "HPTE source_type =%d\n", ph->hpte_data.source_type);
167 printk(KERN_INFO "HPTE error_flags =%d\n", ph->hpte_data.error_flags); 167 printk(KERN_INFO "HPTE error_flags =%d\n", ph->hpte_data.error_flags);
168 printk(KERN_INFO "HPTE source_address =%lx\n", 168 printk(KERN_INFO "HPTE source_address =%llx\n",
169 ph->hpte_data.source_address); 169 ph->hpte_data.source_address);
170 printk(KERN_INFO "HPTE source_length =%lx\n", 170 printk(KERN_INFO "HPTE source_length =%llx\n",
171 ph->hpte_data.source_length); 171 ph->hpte_data.source_length);
172 printk(KERN_INFO "HPTE length_copied =%lx\n", 172 printk(KERN_INFO "HPTE length_copied =%llx\n",
173 ph->hpte_data.length_copied); 173 ph->hpte_data.length_copied);
174 174
175 printk(KERN_INFO " SRSD AREA \n"); 175 printk(KERN_INFO " SRSD AREA \n");
176 printk(KERN_INFO "SRSD dump_flags =%d\n", ph->kernel_data.dump_flags); 176 printk(KERN_INFO "SRSD dump_flags =%d\n", ph->kernel_data.dump_flags);
177 printk(KERN_INFO "SRSD source_type =%d\n", ph->kernel_data.source_type); 177 printk(KERN_INFO "SRSD source_type =%d\n", ph->kernel_data.source_type);
178 printk(KERN_INFO "SRSD error_flags =%d\n", ph->kernel_data.error_flags); 178 printk(KERN_INFO "SRSD error_flags =%d\n", ph->kernel_data.error_flags);
179 printk(KERN_INFO "SRSD source_address =%lx\n", 179 printk(KERN_INFO "SRSD source_address =%llx\n",
180 ph->kernel_data.source_address); 180 ph->kernel_data.source_address);
181 printk(KERN_INFO "SRSD source_length =%lx\n", 181 printk(KERN_INFO "SRSD source_length =%llx\n",
182 ph->kernel_data.source_length); 182 ph->kernel_data.source_length);
183 printk(KERN_INFO "SRSD length_copied =%lx\n", 183 printk(KERN_INFO "SRSD length_copied =%llx\n",
184 ph->kernel_data.length_copied); 184 ph->kernel_data.length_copied);
185#endif 185#endif
186} 186}
@@ -367,8 +367,8 @@ static ssize_t show_release_region(struct kobject *kobj,
367 /* total reserved size - start of scratch area */ 367 /* total reserved size - start of scratch area */
368 second_addr_range = phyp_dump_info->init_reserve_size - 368 second_addr_range = phyp_dump_info->init_reserve_size -
369 phyp_dump_info->reserved_scratch_size; 369 phyp_dump_info->reserved_scratch_size;
370 return sprintf(buf, "CPU:0x%lx-0x%lx: HPTE:0x%lx-0x%lx:" 370 return sprintf(buf, "CPU:0x%llx-0x%llx: HPTE:0x%llx-0x%llx:"
371 " DUMP:0x%lx-0x%lx, 0x%lx-0x%lx:\n", 371 " DUMP:0x%llx-0x%llx, 0x%lx-0x%llx:\n",
372 phdr.cpu_data.destination_address, 372 phdr.cpu_data.destination_address,
373 phdr.cpu_data.length_copied, 373 phdr.cpu_data.length_copied,
374 phdr.hpte_data.destination_address, 374 phdr.hpte_data.destination_address,
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-10 07:52:22 -0500