aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/sh/boards/mach-ecovec24/setup.c1
-rw-r--r--arch/sh/boards/mach-se/7724/setup.c89
-rw-r--r--arch/sh/configs/ap325rxa_defconfig100
-rw-r--r--arch/sh/configs/dreamcast_defconfig82
-rw-r--r--arch/sh/configs/ecovec24-romimage_defconfig52
-rw-r--r--arch/sh/configs/ecovec24_defconfig70
-rw-r--r--arch/sh/configs/edosk7705_defconfig50
-rw-r--r--arch/sh/configs/edosk7760_defconfig82
-rw-r--r--arch/sh/configs/espt_defconfig75
-rw-r--r--arch/sh/configs/hp6xx_defconfig69
-rw-r--r--arch/sh/configs/kfr2r09-romimage_defconfig47
-rw-r--r--arch/sh/configs/kfr2r09_defconfig57
-rw-r--r--arch/sh/configs/landisk_defconfig86
-rw-r--r--arch/sh/configs/lboxre2_defconfig86
-rw-r--r--arch/sh/configs/magicpanelr2_defconfig85
-rw-r--r--arch/sh/configs/microdev_defconfig74
-rw-r--r--arch/sh/configs/migor_defconfig111
-rw-r--r--arch/sh/configs/polaris_defconfig73
-rw-r--r--arch/sh/configs/r7780mp_defconfig116
-rw-r--r--arch/sh/configs/r7785rp_defconfig125
-rw-r--r--arch/sh/configs/rsk7201_defconfig60
-rw-r--r--arch/sh/configs/rsk7203_defconfig81
-rw-r--r--arch/sh/configs/rts7751r2d1_defconfig97
-rw-r--r--arch/sh/configs/rts7751r2dplus_defconfig100
-rw-r--r--arch/sh/configs/sdk7780_defconfig93
-rw-r--r--arch/sh/configs/se7206_defconfig80
-rw-r--r--arch/sh/configs/se7343_defconfig91
-rw-r--r--arch/sh/configs/se7619_defconfig56
-rw-r--r--arch/sh/configs/se7705_defconfig75
-rw-r--r--arch/sh/configs/se7712_defconfig79
-rw-r--r--arch/sh/configs/se7721_defconfig86
-rw-r--r--arch/sh/configs/se7722_defconfig92
-rw-r--r--arch/sh/configs/se7724_defconfig264
-rw-r--r--arch/sh/configs/se7750_defconfig75
-rw-r--r--arch/sh/configs/se7751_defconfig74
-rw-r--r--arch/sh/configs/se7780_defconfig89
-rw-r--r--arch/sh/configs/sh03_defconfig87
-rw-r--r--arch/sh/configs/sh7710voipgw_defconfig71
-rw-r--r--arch/sh/configs/sh7724_generic_defconfig64
-rw-r--r--arch/sh/configs/sh7763rdp_defconfig79
-rw-r--r--arch/sh/configs/sh7770_generic_defconfig62
-rw-r--r--arch/sh/configs/sh7785lcr_32bit_defconfig559
-rw-r--r--arch/sh/configs/sh7785lcr_defconfig107
-rw-r--r--arch/sh/configs/shmin_defconfig68
-rw-r--r--arch/sh/configs/shx3_defconfig95
-rw-r--r--arch/sh/configs/snapgear_defconfig40
-rw-r--r--arch/sh/configs/systemh_defconfig61
-rw-r--r--arch/sh/configs/titan_defconfig93
-rw-r--r--arch/sh/configs/ul2_defconfig104
-rw-r--r--arch/sh/configs/urquell_defconfig125
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7722.c14
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7780.c14
-rw-r--r--arch/sh/kernel/dwarf.c1
-rw-r--r--arch/sh/kernel/traps_32.c23
-rw-r--r--drivers/media/video/sh_mobile_ceu_camera.c4
55 files changed, 3409 insertions, 1284 deletions
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 96bc1698310f..5f9881e16e2f 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -121,6 +121,7 @@ static struct resource sh_eth_resources[] = {
121struct sh_eth_plat_data sh_eth_plat = { 121struct sh_eth_plat_data sh_eth_plat = {
122 .phy = 0x1f, /* SMSC LAN8700 */ 122 .phy = 0x1f, /* SMSC LAN8700 */
123 .edmac_endian = EDMAC_LITTLE_ENDIAN, 123 .edmac_endian = EDMAC_LITTLE_ENDIAN,
124 .ether_link_active_low = 1
124}; 125};
125 126
126static struct platform_device sh_eth_device = { 127static struct platform_device sh_eth_device = {
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 00973e0f8c63..e78c3be8ad2f 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -22,6 +22,7 @@
22#include <linux/usb/r8a66597.h> 22#include <linux/usb/r8a66597.h>
23#include <video/sh_mobile_lcdc.h> 23#include <video/sh_mobile_lcdc.h>
24#include <media/sh_mobile_ceu.h> 24#include <media/sh_mobile_ceu.h>
25#include <sound/sh_fsi.h>
25#include <asm/io.h> 26#include <asm/io.h>
26#include <asm/heartbeat.h> 27#include <asm/heartbeat.h>
27#include <asm/sh_eth.h> 28#include <asm/sh_eth.h>
@@ -255,6 +256,65 @@ static struct platform_device ceu1_device = {
255 }, 256 },
256}; 257};
257 258
259/* FSI */
260/*
261 * FSI-A use external clock which came from ak464x.
262 * So, we should change parent of fsi
263 */
264#define FCLKACR 0xa4150008
265static void fsimck_init(struct clk *clk)
266{
267 u32 status = ctrl_inl(clk->enable_reg);
268
269 /* use external clock */
270 status &= ~0x000000ff;
271 status |= 0x00000080;
272 ctrl_outl(status, clk->enable_reg);
273}
274
275static struct clk_ops fsimck_clk_ops = {
276 .init = fsimck_init,
277};
278
279static struct clk fsimcka_clk = {
280 .name = "fsimcka_clk",
281 .id = -1,
282 .ops = &fsimck_clk_ops,
283 .enable_reg = (void __iomem *)FCLKACR,
284 .rate = 0, /* unknown */
285};
286
287struct sh_fsi_platform_info fsi_info = {
288 .porta_flags = SH_FSI_BRS_INV |
289 SH_FSI_OUT_SLAVE_MODE |
290 SH_FSI_IN_SLAVE_MODE |
291 SH_FSI_OFMT(PCM) |
292 SH_FSI_IFMT(PCM),
293};
294
295static struct resource fsi_resources[] = {
296 [0] = {
297 .name = "FSI",
298 .start = 0xFE3C0000,
299 .end = 0xFE3C021d,
300 .flags = IORESOURCE_MEM,
301 },
302 [1] = {
303 .start = 108,
304 .flags = IORESOURCE_IRQ,
305 },
306};
307
308static struct platform_device fsi_device = {
309 .name = "sh_fsi",
310 .id = 0,
311 .num_resources = ARRAY_SIZE(fsi_resources),
312 .resource = fsi_resources,
313 .dev = {
314 .platform_data = &fsi_info,
315 },
316};
317
258/* KEYSC in SoC (Needs SW33-2 set to ON) */ 318/* KEYSC in SoC (Needs SW33-2 set to ON) */
259static struct sh_keysc_info keysc_info = { 319static struct sh_keysc_info keysc_info = {
260 .mode = SH_KEYSC_MODE_1, 320 .mode = SH_KEYSC_MODE_1,
@@ -399,6 +459,7 @@ static struct platform_device *ms7724se_devices[] __initdata = {
399 &sh_eth_device, 459 &sh_eth_device,
400 &sh7724_usb0_host_device, 460 &sh7724_usb0_host_device,
401 &sh7724_usb1_gadget_device, 461 &sh7724_usb1_gadget_device,
462 &fsi_device,
402}; 463};
403 464
404#define EEPROM_OP 0xBA206000 465#define EEPROM_OP 0xBA206000
@@ -466,11 +527,13 @@ static void __init sh_eth_init(void)
466static int __init devices_setup(void) 527static int __init devices_setup(void)
467{ 528{
468 u16 sw = ctrl_inw(SW4140); /* select camera, monitor */ 529 u16 sw = ctrl_inw(SW4140); /* select camera, monitor */
530 struct clk *fsia_clk;
469 531
470 /* Reset Release */ 532 /* Reset Release */
471 ctrl_outw(ctrl_inw(FPGA_OUT) & 533 ctrl_outw(ctrl_inw(FPGA_OUT) &
472 ~((1 << 1) | /* LAN */ 534 ~((1 << 1) | /* LAN */
473 (1 << 6) | /* VIDEO DAC */ 535 (1 << 6) | /* VIDEO DAC */
536 (1 << 7) | /* AK4643 */
474 (1 << 12) | /* USB0 */ 537 (1 << 12) | /* USB0 */
475 (1 << 14)), /* RMII */ 538 (1 << 14)), /* RMII */
476 FPGA_OUT); 539 FPGA_OUT);
@@ -609,6 +672,32 @@ static int __init devices_setup(void)
609 gpio_request(GPIO_FN_KEYOUT1, NULL); 672 gpio_request(GPIO_FN_KEYOUT1, NULL);
610 gpio_request(GPIO_FN_KEYOUT0, NULL); 673 gpio_request(GPIO_FN_KEYOUT0, NULL);
611 674
675 /* enable FSI */
676 gpio_request(GPIO_FN_FSIMCKB, NULL);
677 gpio_request(GPIO_FN_FSIMCKA, NULL);
678 gpio_request(GPIO_FN_FSIOASD, NULL);
679 gpio_request(GPIO_FN_FSIIABCK, NULL);
680 gpio_request(GPIO_FN_FSIIALRCK, NULL);
681 gpio_request(GPIO_FN_FSIOABCK, NULL);
682 gpio_request(GPIO_FN_FSIOALRCK, NULL);
683 gpio_request(GPIO_FN_CLKAUDIOAO, NULL);
684 gpio_request(GPIO_FN_FSIIBSD, NULL);
685 gpio_request(GPIO_FN_FSIOBSD, NULL);
686 gpio_request(GPIO_FN_FSIIBBCK, NULL);
687 gpio_request(GPIO_FN_FSIIBLRCK, NULL);
688 gpio_request(GPIO_FN_FSIOBBCK, NULL);
689 gpio_request(GPIO_FN_FSIOBLRCK, NULL);
690 gpio_request(GPIO_FN_CLKAUDIOBO, NULL);
691 gpio_request(GPIO_FN_FSIIASD, NULL);
692
693 /* change parent of FSI A */
694 fsia_clk = clk_get(NULL, "fsia_clk");
695 clk_register(&fsimcka_clk);
696 clk_set_parent(fsia_clk, &fsimcka_clk);
697 clk_set_rate(fsia_clk, 11000);
698 clk_set_rate(&fsimcka_clk, 11000);
699 clk_put(fsia_clk);
700
612 /* 701 /*
613 * enable SH-Eth 702 * enable SH-Eth
614 * 703 *
diff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig
index 6c38a43594fc..2f78d01cc6c0 100644
--- a/arch/sh/configs/ap325rxa_defconfig
+++ b/arch/sh/configs/ap325rxa_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 16:04:11 2009 4# Fri Sep 25 11:22:50 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,7 +29,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
28# CONFIG_ARCH_HAS_ILOG2_U64 is not set 29# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29CONFIG_ARCH_NO_VIRT_TO_BUS=y 30CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y
32 35
33# 36#
34# General setup 37# General setup
@@ -39,6 +42,12 @@ CONFIG_LOCK_KERNEL=y
39CONFIG_INIT_ENV_ARG_LIMIT=32 42CONFIG_INIT_ENV_ARG_LIMIT=32
40CONFIG_LOCALVERSION="" 43CONFIG_LOCALVERSION=""
41# CONFIG_LOCALVERSION_AUTO is not set 44# CONFIG_LOCALVERSION_AUTO is not set
45CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y
48CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set
42CONFIG_SWAP=y 51CONFIG_SWAP=y
43CONFIG_SYSVIPC=y 52CONFIG_SYSVIPC=y
44CONFIG_SYSVIPC_SYSCTL=y 53CONFIG_SYSVIPC_SYSCTL=y
@@ -51,11 +60,12 @@ CONFIG_BSD_PROCESS_ACCT=y
51# 60#
52# RCU Subsystem 61# RCU Subsystem
53# 62#
54CONFIG_CLASSIC_RCU=y 63CONFIG_TREE_RCU=y
55# CONFIG_TREE_RCU is not set 64# CONFIG_TREE_PREEMPT_RCU is not set
56# CONFIG_PREEMPT_RCU is not set 65# CONFIG_RCU_TRACE is not set
66CONFIG_RCU_FANOUT=32
67# CONFIG_RCU_FANOUT_EXACT is not set
57# CONFIG_TREE_RCU_TRACE is not set 68# CONFIG_TREE_RCU_TRACE is not set
58# CONFIG_PREEMPT_RCU_TRACE is not set
59# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
60CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
61CONFIG_GROUP_SCHED=y 71CONFIG_GROUP_SCHED=y
@@ -88,18 +98,19 @@ CONFIG_TIMERFD=y
88CONFIG_EVENTFD=y 98CONFIG_EVENTFD=y
89CONFIG_SHMEM=y 99CONFIG_SHMEM=y
90CONFIG_AIO=y 100CONFIG_AIO=y
101CONFIG_HAVE_PERF_EVENTS=y
91 102
92# 103#
93# Performance Counters 104# Kernel Performance Events And Counters
94# 105#
106# CONFIG_PERF_EVENTS is not set
107# CONFIG_PERF_COUNTERS is not set
95CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
96# CONFIG_STRIP_ASM_SYMS is not set
97CONFIG_COMPAT_BRK=y 109CONFIG_COMPAT_BRK=y
98CONFIG_SLAB=y 110CONFIG_SLAB=y
99# CONFIG_SLUB is not set 111# CONFIG_SLUB is not set
100# CONFIG_SLOB is not set 112# CONFIG_SLOB is not set
101# CONFIG_PROFILING is not set 113# CONFIG_PROFILING is not set
102# CONFIG_MARKERS is not set
103CONFIG_HAVE_OPROFILE=y 114CONFIG_HAVE_OPROFILE=y
104CONFIG_HAVE_IOREMAP_PROT=y 115CONFIG_HAVE_IOREMAP_PROT=y
105CONFIG_HAVE_KPROBES=y 116CONFIG_HAVE_KPROBES=y
@@ -107,6 +118,10 @@ CONFIG_HAVE_KRETPROBES=y
107CONFIG_HAVE_ARCH_TRACEHOOK=y 118CONFIG_HAVE_ARCH_TRACEHOOK=y
108CONFIG_HAVE_CLK=y 119CONFIG_HAVE_CLK=y
109CONFIG_HAVE_DMA_API_DEBUG=y 120CONFIG_HAVE_DMA_API_DEBUG=y
121
122#
123# GCOV-based kernel profiling
124#
110# CONFIG_SLOW_WORK is not set 125# CONFIG_SLOW_WORK is not set
111CONFIG_HAVE_GENERIC_DMA_COHERENT=y 126CONFIG_HAVE_GENERIC_DMA_COHERENT=y
112CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
@@ -119,7 +134,7 @@ CONFIG_MODULE_UNLOAD=y
119# CONFIG_MODVERSIONS is not set 134# CONFIG_MODVERSIONS is not set
120# CONFIG_MODULE_SRCVERSION_ALL is not set 135# CONFIG_MODULE_SRCVERSION_ALL is not set
121CONFIG_BLOCK=y 136CONFIG_BLOCK=y
122# CONFIG_LBD is not set 137CONFIG_LBDAF=y
123# CONFIG_BLK_DEV_BSG is not set 138# CONFIG_BLK_DEV_BSG is not set
124# CONFIG_BLK_DEV_INTEGRITY is not set 139# CONFIG_BLK_DEV_INTEGRITY is not set
125 140
@@ -135,7 +150,7 @@ CONFIG_IOSCHED_CFQ=y
135CONFIG_DEFAULT_CFQ=y 150CONFIG_DEFAULT_CFQ=y
136# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
137CONFIG_DEFAULT_IOSCHED="cfq" 152CONFIG_DEFAULT_IOSCHED="cfq"
138# CONFIG_FREEZER is not set 153CONFIG_FREEZER=y
139 154
140# 155#
141# System type 156# System type
@@ -169,6 +184,7 @@ CONFIG_ARCH_SHMOBILE=y
169# CONFIG_CPU_SUBTYPE_SH4_202 is not set 184# CONFIG_CPU_SUBTYPE_SH4_202 is not set
170CONFIG_CPU_SUBTYPE_SH7723=y 185CONFIG_CPU_SUBTYPE_SH7723=y
171# CONFIG_CPU_SUBTYPE_SH7724 is not set 186# CONFIG_CPU_SUBTYPE_SH7724 is not set
187# CONFIG_CPU_SUBTYPE_SH7757 is not set
172# CONFIG_CPU_SUBTYPE_SH7763 is not set 188# CONFIG_CPU_SUBTYPE_SH7763 is not set
173# CONFIG_CPU_SUBTYPE_SH7770 is not set 189# CONFIG_CPU_SUBTYPE_SH7770 is not set
174# CONFIG_CPU_SUBTYPE_SH7780 is not set 190# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -215,6 +231,7 @@ CONFIG_ZONE_DMA_FLAG=0
215CONFIG_NR_QUICK=2 231CONFIG_NR_QUICK=2
216CONFIG_HAVE_MLOCK=y 232CONFIG_HAVE_MLOCK=y
217CONFIG_HAVE_MLOCKED_PAGE_BIT=y 233CONFIG_HAVE_MLOCKED_PAGE_BIT=y
234# CONFIG_KSM is not set
218CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 235CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
219 236
220# 237#
@@ -296,7 +313,8 @@ CONFIG_GUSA=y
296CONFIG_ZERO_PAGE_OFFSET=0x00001000 313CONFIG_ZERO_PAGE_OFFSET=0x00001000
297CONFIG_BOOT_LINK_OFFSET=0x00800000 314CONFIG_BOOT_LINK_OFFSET=0x00800000
298CONFIG_ENTRY_OFFSET=0x00001000 315CONFIG_ENTRY_OFFSET=0x00001000
299CONFIG_CMDLINE_BOOL=y 316CONFIG_CMDLINE_OVERWRITE=y
317# CONFIG_CMDLINE_EXTEND is not set
300CONFIG_CMDLINE="console=tty1 console=ttySC5,38400 root=/dev/nfs ip=dhcp" 318CONFIG_CMDLINE="console=tty1 console=ttySC5,38400 root=/dev/nfs ip=dhcp"
301 319
302# 320#
@@ -316,7 +334,13 @@ CONFIG_BINFMT_ELF=y
316# 334#
317# Power management options (EXPERIMENTAL) 335# Power management options (EXPERIMENTAL)
318# 336#
319# CONFIG_PM is not set 337CONFIG_PM=y
338# CONFIG_PM_DEBUG is not set
339CONFIG_PM_SLEEP=y
340CONFIG_SUSPEND=y
341CONFIG_SUSPEND_FREEZER=y
342# CONFIG_HIBERNATION is not set
343CONFIG_PM_RUNTIME=y
320# CONFIG_CPU_IDLE is not set 344# CONFIG_CPU_IDLE is not set
321CONFIG_NET=y 345CONFIG_NET=y
322 346
@@ -364,6 +388,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
364# CONFIG_NETFILTER is not set 388# CONFIG_NETFILTER is not set
365# CONFIG_IP_DCCP is not set 389# CONFIG_IP_DCCP is not set
366# CONFIG_IP_SCTP is not set 390# CONFIG_IP_SCTP is not set
391# CONFIG_RDS is not set
367# CONFIG_TIPC is not set 392# CONFIG_TIPC is not set
368# CONFIG_ATM is not set 393# CONFIG_ATM is not set
369# CONFIG_BRIDGE is not set 394# CONFIG_BRIDGE is not set
@@ -393,6 +418,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
393# CONFIG_AF_RXRPC is not set 418# CONFIG_AF_RXRPC is not set
394CONFIG_WIRELESS=y 419CONFIG_WIRELESS=y
395# CONFIG_CFG80211 is not set 420# CONFIG_CFG80211 is not set
421CONFIG_CFG80211_DEFAULT_PS_VALUE=0
396# CONFIG_WIRELESS_OLD_REGULATORY is not set 422# CONFIG_WIRELESS_OLD_REGULATORY is not set
397# CONFIG_WIRELESS_EXT is not set 423# CONFIG_WIRELESS_EXT is not set
398# CONFIG_LIB80211 is not set 424# CONFIG_LIB80211 is not set
@@ -400,7 +426,6 @@ CONFIG_WIRELESS=y
400# 426#
401# CFG80211 needs to be enabled for MAC80211 427# CFG80211 needs to be enabled for MAC80211
402# 428#
403CONFIG_MAC80211_DEFAULT_PS_VALUE=0
404# CONFIG_WIMAX is not set 429# CONFIG_WIMAX is not set
405# CONFIG_RFKILL is not set 430# CONFIG_RFKILL is not set
406# CONFIG_NET_9P is not set 431# CONFIG_NET_9P is not set
@@ -413,6 +438,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
413# Generic Driver Options 438# Generic Driver Options
414# 439#
415CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 440CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
441# CONFIG_DEVTMPFS is not set
416CONFIG_STANDALONE=y 442CONFIG_STANDALONE=y
417CONFIG_PREVENT_FIRMWARE_BUILD=y 443CONFIG_PREVENT_FIRMWARE_BUILD=y
418CONFIG_FW_LOADER=y 444CONFIG_FW_LOADER=y
@@ -422,9 +448,9 @@ CONFIG_EXTRA_FIRMWARE=""
422# CONFIG_CONNECTOR is not set 448# CONFIG_CONNECTOR is not set
423CONFIG_MTD=y 449CONFIG_MTD=y
424# CONFIG_MTD_DEBUG is not set 450# CONFIG_MTD_DEBUG is not set
451# CONFIG_MTD_TESTS is not set
425CONFIG_MTD_CONCAT=y 452CONFIG_MTD_CONCAT=y
426CONFIG_MTD_PARTITIONS=y 453CONFIG_MTD_PARTITIONS=y
427# CONFIG_MTD_TESTS is not set
428# CONFIG_MTD_REDBOOT_PARTS is not set 454# CONFIG_MTD_REDBOOT_PARTS is not set
429CONFIG_MTD_CMDLINE_PARTS=y 455CONFIG_MTD_CMDLINE_PARTS=y
430# CONFIG_MTD_AR7_PARTS is not set 456# CONFIG_MTD_AR7_PARTS is not set
@@ -480,6 +506,7 @@ CONFIG_MTD_PHYSMAP=y
480# 506#
481# CONFIG_MTD_DATAFLASH is not set 507# CONFIG_MTD_DATAFLASH is not set
482# CONFIG_MTD_M25P80 is not set 508# CONFIG_MTD_M25P80 is not set
509# CONFIG_MTD_SST25L is not set
483# CONFIG_MTD_SLRAM is not set 510# CONFIG_MTD_SLRAM is not set
484# CONFIG_MTD_PHRAM is not set 511# CONFIG_MTD_PHRAM is not set
485# CONFIG_MTD_MTDRAM is not set 512# CONFIG_MTD_MTDRAM is not set
@@ -583,7 +610,6 @@ CONFIG_SCSI_WAIT_SCAN=m
583# CONFIG_SCSI_SRP_ATTRS is not set 610# CONFIG_SCSI_SRP_ATTRS is not set
584CONFIG_SCSI_LOWLEVEL=y 611CONFIG_SCSI_LOWLEVEL=y
585# CONFIG_ISCSI_TCP is not set 612# CONFIG_ISCSI_TCP is not set
586# CONFIG_SCSI_BNX2_ISCSI is not set
587# CONFIG_LIBFC is not set 613# CONFIG_LIBFC is not set
588# CONFIG_LIBFCOE is not set 614# CONFIG_LIBFCOE is not set
589# CONFIG_SCSI_DEBUG is not set 615# CONFIG_SCSI_DEBUG is not set
@@ -637,12 +663,10 @@ CONFIG_SMSC911X=y
637# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 663# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
638# CONFIG_B44 is not set 664# CONFIG_B44 is not set
639# CONFIG_KS8842 is not set 665# CONFIG_KS8842 is not set
666# CONFIG_KS8851 is not set
640# CONFIG_NETDEV_1000 is not set 667# CONFIG_NETDEV_1000 is not set
641# CONFIG_NETDEV_10000 is not set 668# CONFIG_NETDEV_10000 is not set
642 669CONFIG_WLAN=y
643#
644# Wireless LAN
645#
646# CONFIG_WLAN_PRE80211 is not set 670# CONFIG_WLAN_PRE80211 is not set
647# CONFIG_WLAN_80211 is not set 671# CONFIG_WLAN_80211 is not set
648 672
@@ -726,6 +750,7 @@ CONFIG_HW_RANDOM=y
726# CONFIG_TCG_TPM is not set 750# CONFIG_TCG_TPM is not set
727CONFIG_I2C=y 751CONFIG_I2C=y
728CONFIG_I2C_BOARDINFO=y 752CONFIG_I2C_BOARDINFO=y
753CONFIG_I2C_COMPAT=y
729CONFIG_I2C_CHARDEV=y 754CONFIG_I2C_CHARDEV=y
730CONFIG_I2C_HELPER_AUTO=y 755CONFIG_I2C_HELPER_AUTO=y
731 756
@@ -736,6 +761,7 @@ CONFIG_I2C_HELPER_AUTO=y
736# 761#
737# I2C system bus drivers (mostly embedded / system-on-chip) 762# I2C system bus drivers (mostly embedded / system-on-chip)
738# 763#
764# CONFIG_I2C_DESIGNWARE is not set
739# CONFIG_I2C_GPIO is not set 765# CONFIG_I2C_GPIO is not set
740# CONFIG_I2C_OCORES is not set 766# CONFIG_I2C_OCORES is not set
741CONFIG_I2C_SH_MOBILE=y 767CONFIG_I2C_SH_MOBILE=y
@@ -757,9 +783,6 @@ CONFIG_I2C_SH_MOBILE=y
757# Miscellaneous I2C Chip support 783# Miscellaneous I2C Chip support
758# 784#
759# CONFIG_DS1682 is not set 785# CONFIG_DS1682 is not set
760# CONFIG_SENSORS_PCF8574 is not set
761# CONFIG_PCF8575 is not set
762# CONFIG_SENSORS_PCA9539 is not set
763# CONFIG_SENSORS_TSL2550 is not set 786# CONFIG_SENSORS_TSL2550 is not set
764# CONFIG_I2C_DEBUG_CORE is not set 787# CONFIG_I2C_DEBUG_CORE is not set
765# CONFIG_I2C_DEBUG_ALGO is not set 788# CONFIG_I2C_DEBUG_ALGO is not set
@@ -780,6 +803,11 @@ CONFIG_SPI_GPIO=y
780# 803#
781# CONFIG_SPI_SPIDEV is not set 804# CONFIG_SPI_SPIDEV is not set
782# CONFIG_SPI_TLE62X0 is not set 805# CONFIG_SPI_TLE62X0 is not set
806
807#
808# PPS support
809#
810# CONFIG_PPS is not set
783CONFIG_ARCH_REQUIRE_GPIOLIB=y 811CONFIG_ARCH_REQUIRE_GPIOLIB=y
784CONFIG_GPIOLIB=y 812CONFIG_GPIOLIB=y
785# CONFIG_GPIO_SYSFS is not set 813# CONFIG_GPIO_SYSFS is not set
@@ -804,11 +832,15 @@ CONFIG_GPIOLIB=y
804# 832#
805# CONFIG_GPIO_MAX7301 is not set 833# CONFIG_GPIO_MAX7301 is not set
806# CONFIG_GPIO_MCP23S08 is not set 834# CONFIG_GPIO_MCP23S08 is not set
835# CONFIG_GPIO_MC33880 is not set
836
837#
838# AC97 GPIO expanders:
839#
807# CONFIG_W1 is not set 840# CONFIG_W1 is not set
808# CONFIG_POWER_SUPPLY is not set 841# CONFIG_POWER_SUPPLY is not set
809# CONFIG_HWMON is not set 842# CONFIG_HWMON is not set
810# CONFIG_THERMAL is not set 843# CONFIG_THERMAL is not set
811# CONFIG_THERMAL_HWMON is not set
812# CONFIG_WATCHDOG is not set 844# CONFIG_WATCHDOG is not set
813CONFIG_SSB_POSSIBLE=y 845CONFIG_SSB_POSSIBLE=y
814 846
@@ -828,8 +860,12 @@ CONFIG_SSB_POSSIBLE=y
828# CONFIG_MFD_TMIO is not set 860# CONFIG_MFD_TMIO is not set
829# CONFIG_PMIC_DA903X is not set 861# CONFIG_PMIC_DA903X is not set
830# CONFIG_MFD_WM8400 is not set 862# CONFIG_MFD_WM8400 is not set
863# CONFIG_MFD_WM831X is not set
831# CONFIG_MFD_WM8350_I2C is not set 864# CONFIG_MFD_WM8350_I2C is not set
832# CONFIG_MFD_PCF50633 is not set 865# CONFIG_MFD_PCF50633 is not set
866# CONFIG_MFD_MC13783 is not set
867# CONFIG_AB3100_CORE is not set
868# CONFIG_EZX_PCAP is not set
833# CONFIG_REGULATOR is not set 869# CONFIG_REGULATOR is not set
834CONFIG_MEDIA_SUPPORT=y 870CONFIG_MEDIA_SUPPORT=y
835 871
@@ -957,6 +993,8 @@ CONFIG_MMC_BLOCK_BOUNCE=y
957# MMC/SD/SDIO Host Controller Drivers 993# MMC/SD/SDIO Host Controller Drivers
958# 994#
959# CONFIG_MMC_SDHCI is not set 995# CONFIG_MMC_SDHCI is not set
996# CONFIG_MMC_AT91 is not set
997# CONFIG_MMC_ATMELMCI is not set
960CONFIG_MMC_SPI=y 998CONFIG_MMC_SPI=y
961# CONFIG_MEMSTICK is not set 999# CONFIG_MEMSTICK is not set
962# CONFIG_NEW_LEDS is not set 1000# CONFIG_NEW_LEDS is not set
@@ -992,6 +1030,7 @@ CONFIG_RTC_DRV_PCF8563=y
992# CONFIG_RTC_DRV_S35390A is not set 1030# CONFIG_RTC_DRV_S35390A is not set
993# CONFIG_RTC_DRV_FM3130 is not set 1031# CONFIG_RTC_DRV_FM3130 is not set
994# CONFIG_RTC_DRV_RX8581 is not set 1032# CONFIG_RTC_DRV_RX8581 is not set
1033# CONFIG_RTC_DRV_RX8025 is not set
995 1034
996# 1035#
997# SPI RTC drivers 1036# SPI RTC drivers
@@ -1003,6 +1042,7 @@ CONFIG_RTC_DRV_PCF8563=y
1003# CONFIG_RTC_DRV_R9701 is not set 1042# CONFIG_RTC_DRV_R9701 is not set
1004# CONFIG_RTC_DRV_RS5C348 is not set 1043# CONFIG_RTC_DRV_RS5C348 is not set
1005# CONFIG_RTC_DRV_DS3234 is not set 1044# CONFIG_RTC_DRV_DS3234 is not set
1045# CONFIG_RTC_DRV_PCF2123 is not set
1006 1046
1007# 1047#
1008# Platform RTC drivers 1048# Platform RTC drivers
@@ -1056,8 +1096,10 @@ CONFIG_FS_MBCACHE=y
1056# CONFIG_JFS_FS is not set 1096# CONFIG_JFS_FS is not set
1057CONFIG_FS_POSIX_ACL=y 1097CONFIG_FS_POSIX_ACL=y
1058# CONFIG_XFS_FS is not set 1098# CONFIG_XFS_FS is not set
1099# CONFIG_GFS2_FS is not set
1059# CONFIG_OCFS2_FS is not set 1100# CONFIG_OCFS2_FS is not set
1060# CONFIG_BTRFS_FS is not set 1101# CONFIG_BTRFS_FS is not set
1102# CONFIG_NILFS2_FS is not set
1061CONFIG_FILE_LOCKING=y 1103CONFIG_FILE_LOCKING=y
1062CONFIG_FSNOTIFY=y 1104CONFIG_FSNOTIFY=y
1063CONFIG_DNOTIFY=y 1105CONFIG_DNOTIFY=y
@@ -1122,7 +1164,6 @@ CONFIG_MISC_FILESYSTEMS=y
1122# CONFIG_ROMFS_FS is not set 1164# CONFIG_ROMFS_FS is not set
1123# CONFIG_SYSV_FS is not set 1165# CONFIG_SYSV_FS is not set
1124# CONFIG_UFS_FS is not set 1166# CONFIG_UFS_FS is not set
1125# CONFIG_NILFS2_FS is not set
1126CONFIG_NETWORK_FILESYSTEMS=y 1167CONFIG_NETWORK_FILESYSTEMS=y
1127CONFIG_NFS_FS=y 1168CONFIG_NFS_FS=y
1128CONFIG_NFS_V3=y 1169CONFIG_NFS_V3=y
@@ -1202,6 +1243,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1202# CONFIG_ENABLE_MUST_CHECK is not set 1243# CONFIG_ENABLE_MUST_CHECK is not set
1203CONFIG_FRAME_WARN=1024 1244CONFIG_FRAME_WARN=1024
1204# CONFIG_MAGIC_SYSRQ is not set 1245# CONFIG_MAGIC_SYSRQ is not set
1246# CONFIG_STRIP_ASM_SYMS is not set
1205# CONFIG_UNUSED_SYMBOLS is not set 1247# CONFIG_UNUSED_SYMBOLS is not set
1206# CONFIG_DEBUG_FS is not set 1248# CONFIG_DEBUG_FS is not set
1207# CONFIG_HEADERS_CHECK is not set 1249# CONFIG_HEADERS_CHECK is not set
@@ -1212,8 +1254,11 @@ CONFIG_FRAME_WARN=1024
1212# CONFIG_LATENCYTOP is not set 1254# CONFIG_LATENCYTOP is not set
1213CONFIG_SYSCTL_SYSCALL_CHECK=y 1255CONFIG_SYSCTL_SYSCALL_CHECK=y
1214CONFIG_HAVE_FUNCTION_TRACER=y 1256CONFIG_HAVE_FUNCTION_TRACER=y
1257CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1258CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1215CONFIG_HAVE_DYNAMIC_FTRACE=y 1259CONFIG_HAVE_DYNAMIC_FTRACE=y
1216CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1260CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1261CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1217CONFIG_TRACING_SUPPORT=y 1262CONFIG_TRACING_SUPPORT=y
1218# CONFIG_FTRACE is not set 1263# CONFIG_FTRACE is not set
1219# CONFIG_DMA_API_DEBUG is not set 1264# CONFIG_DMA_API_DEBUG is not set
@@ -1221,6 +1266,7 @@ CONFIG_TRACING_SUPPORT=y
1221CONFIG_HAVE_ARCH_KGDB=y 1266CONFIG_HAVE_ARCH_KGDB=y
1222# CONFIG_SH_STANDARD_BIOS is not set 1267# CONFIG_SH_STANDARD_BIOS is not set
1223# CONFIG_EARLY_SCIF_CONSOLE is not set 1268# CONFIG_EARLY_SCIF_CONSOLE is not set
1269# CONFIG_DWARF_UNWINDER is not set
1224 1270
1225# 1271#
1226# Security options 1272# Security options
@@ -1234,7 +1280,6 @@ CONFIG_CRYPTO=y
1234# 1280#
1235# Crypto core or helper 1281# Crypto core or helper
1236# 1282#
1237# CONFIG_CRYPTO_FIPS is not set
1238CONFIG_CRYPTO_ALGAPI=y 1283CONFIG_CRYPTO_ALGAPI=y
1239CONFIG_CRYPTO_ALGAPI2=y 1284CONFIG_CRYPTO_ALGAPI2=y
1240CONFIG_CRYPTO_AEAD2=y 1285CONFIG_CRYPTO_AEAD2=y
@@ -1275,11 +1320,13 @@ CONFIG_CRYPTO_CBC=y
1275# 1320#
1276# CONFIG_CRYPTO_HMAC is not set 1321# CONFIG_CRYPTO_HMAC is not set
1277# CONFIG_CRYPTO_XCBC is not set 1322# CONFIG_CRYPTO_XCBC is not set
1323# CONFIG_CRYPTO_VMAC is not set
1278 1324
1279# 1325#
1280# Digest 1326# Digest
1281# 1327#
1282# CONFIG_CRYPTO_CRC32C is not set 1328# CONFIG_CRYPTO_CRC32C is not set
1329# CONFIG_CRYPTO_GHASH is not set
1283# CONFIG_CRYPTO_MD4 is not set 1330# CONFIG_CRYPTO_MD4 is not set
1284# CONFIG_CRYPTO_MD5 is not set 1331# CONFIG_CRYPTO_MD5 is not set
1285# CONFIG_CRYPTO_MICHAEL_MIC is not set 1332# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1341,5 +1388,6 @@ CONFIG_CRC7=y
1341CONFIG_HAS_IOMEM=y 1388CONFIG_HAS_IOMEM=y
1342CONFIG_HAS_IOPORT=y 1389CONFIG_HAS_IOPORT=y
1343CONFIG_HAS_DMA=y 1390CONFIG_HAS_DMA=y
1391CONFIG_HAVE_LMB=y
1344CONFIG_NLATTR=y 1392CONFIG_NLATTR=y
1345CONFIG_GENERIC_ATOMIC64=y 1393CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/dreamcast_defconfig b/arch/sh/configs/dreamcast_defconfig
index 95717a041ed6..aedbd4f13046 100644
--- a/arch/sh/configs/dreamcast_defconfig
+++ b/arch/sh/configs/dreamcast_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:24:48 2009 4# Thu Sep 24 17:56:07 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -29,7 +30,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
29# CONFIG_ARCH_HAS_ILOG2_U64 is not set 30# CONFIG_ARCH_HAS_ILOG2_U64 is not set
30CONFIG_ARCH_NO_VIRT_TO_BUS=y 31CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y
33 36
34# 37#
35# General setup 38# General setup
@@ -40,6 +43,12 @@ CONFIG_LOCK_KERNEL=y
40CONFIG_INIT_ENV_ARG_LIMIT=32 43CONFIG_INIT_ENV_ARG_LIMIT=32
41CONFIG_LOCALVERSION="" 44CONFIG_LOCALVERSION=""
42CONFIG_LOCALVERSION_AUTO=y 45CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set
43CONFIG_SWAP=y 52CONFIG_SWAP=y
44CONFIG_SYSVIPC=y 53CONFIG_SYSVIPC=y
45CONFIG_SYSVIPC_SYSCTL=y 54CONFIG_SYSVIPC_SYSCTL=y
@@ -52,11 +61,12 @@ CONFIG_BSD_PROCESS_ACCT=y
52# 61#
53# RCU Subsystem 62# RCU Subsystem
54# 63#
55CONFIG_CLASSIC_RCU=y 64CONFIG_TREE_RCU=y
56# CONFIG_TREE_RCU is not set 65# CONFIG_TREE_PREEMPT_RCU is not set
57# CONFIG_PREEMPT_RCU is not set 66# CONFIG_RCU_TRACE is not set
67CONFIG_RCU_FANOUT=32
68# CONFIG_RCU_FANOUT_EXACT is not set
58# CONFIG_TREE_RCU_TRACE is not set 69# CONFIG_TREE_RCU_TRACE is not set
59# CONFIG_PREEMPT_RCU_TRACE is not set
60# CONFIG_IKCONFIG is not set 70# CONFIG_IKCONFIG is not set
61CONFIG_LOG_BUF_SHIFT=14 71CONFIG_LOG_BUF_SHIFT=14
62# CONFIG_GROUP_SCHED is not set 72# CONFIG_GROUP_SCHED is not set
@@ -86,19 +96,20 @@ CONFIG_TIMERFD=y
86CONFIG_EVENTFD=y 96CONFIG_EVENTFD=y
87CONFIG_SHMEM=y 97CONFIG_SHMEM=y
88CONFIG_AIO=y 98CONFIG_AIO=y
99CONFIG_HAVE_PERF_EVENTS=y
89 100
90# 101#
91# Performance Counters 102# Kernel Performance Events And Counters
92# 103#
104CONFIG_PERF_EVENTS=y
105# CONFIG_PERF_COUNTERS is not set
93CONFIG_VM_EVENT_COUNTERS=y 106CONFIG_VM_EVENT_COUNTERS=y
94CONFIG_PCI_QUIRKS=y 107CONFIG_PCI_QUIRKS=y
95# CONFIG_STRIP_ASM_SYMS is not set
96CONFIG_COMPAT_BRK=y 108CONFIG_COMPAT_BRK=y
97CONFIG_SLAB=y 109CONFIG_SLAB=y
98# CONFIG_SLUB is not set 110# CONFIG_SLUB is not set
99# CONFIG_SLOB is not set 111# CONFIG_SLOB is not set
100CONFIG_PROFILING=y 112CONFIG_PROFILING=y
101# CONFIG_MARKERS is not set
102# CONFIG_OPROFILE is not set 113# CONFIG_OPROFILE is not set
103CONFIG_HAVE_OPROFILE=y 114CONFIG_HAVE_OPROFILE=y
104# CONFIG_KPROBES is not set 115# CONFIG_KPROBES is not set
@@ -108,6 +119,10 @@ CONFIG_HAVE_KRETPROBES=y
108CONFIG_HAVE_ARCH_TRACEHOOK=y 119CONFIG_HAVE_ARCH_TRACEHOOK=y
109CONFIG_HAVE_CLK=y 120CONFIG_HAVE_CLK=y
110CONFIG_HAVE_DMA_API_DEBUG=y 121CONFIG_HAVE_DMA_API_DEBUG=y
122
123#
124# GCOV-based kernel profiling
125#
111# CONFIG_SLOW_WORK is not set 126# CONFIG_SLOW_WORK is not set
112CONFIG_HAVE_GENERIC_DMA_COHERENT=y 127CONFIG_HAVE_GENERIC_DMA_COHERENT=y
113CONFIG_SLABINFO=y 128CONFIG_SLABINFO=y
@@ -120,7 +135,7 @@ CONFIG_MODULE_UNLOAD=y
120# CONFIG_MODVERSIONS is not set 135# CONFIG_MODVERSIONS is not set
121# CONFIG_MODULE_SRCVERSION_ALL is not set 136# CONFIG_MODULE_SRCVERSION_ALL is not set
122CONFIG_BLOCK=y 137CONFIG_BLOCK=y
123# CONFIG_LBD is not set 138CONFIG_LBDAF=y
124# CONFIG_BLK_DEV_BSG is not set 139# CONFIG_BLK_DEV_BSG is not set
125# CONFIG_BLK_DEV_INTEGRITY is not set 140# CONFIG_BLK_DEV_INTEGRITY is not set
126 141
@@ -167,6 +182,7 @@ CONFIG_CPU_SUBTYPE_SH7091=y
167# CONFIG_CPU_SUBTYPE_SH4_202 is not set 182# CONFIG_CPU_SUBTYPE_SH4_202 is not set
168# CONFIG_CPU_SUBTYPE_SH7723 is not set 183# CONFIG_CPU_SUBTYPE_SH7723 is not set
169# CONFIG_CPU_SUBTYPE_SH7724 is not set 184# CONFIG_CPU_SUBTYPE_SH7724 is not set
185# CONFIG_CPU_SUBTYPE_SH7757 is not set
170# CONFIG_CPU_SUBTYPE_SH7763 is not set 186# CONFIG_CPU_SUBTYPE_SH7763 is not set
171# CONFIG_CPU_SUBTYPE_SH7770 is not set 187# CONFIG_CPU_SUBTYPE_SH7770 is not set
172# CONFIG_CPU_SUBTYPE_SH7780 is not set 188# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -218,6 +234,7 @@ CONFIG_ZONE_DMA_FLAG=0
218CONFIG_NR_QUICK=2 234CONFIG_NR_QUICK=2
219CONFIG_HAVE_MLOCK=y 235CONFIG_HAVE_MLOCK=y
220CONFIG_HAVE_MLOCKED_PAGE_BIT=y 236CONFIG_HAVE_MLOCKED_PAGE_BIT=y
237# CONFIG_KSM is not set
221CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 238CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
222 239
223# 240#
@@ -322,7 +339,8 @@ CONFIG_ZERO_PAGE_OFFSET=0x00001000
322CONFIG_BOOT_LINK_OFFSET=0x00800000 339CONFIG_BOOT_LINK_OFFSET=0x00800000
323CONFIG_ENTRY_OFFSET=0x00001000 340CONFIG_ENTRY_OFFSET=0x00001000
324# CONFIG_UBC_WAKEUP is not set 341# CONFIG_UBC_WAKEUP is not set
325CONFIG_CMDLINE_BOOL=y 342CONFIG_CMDLINE_OVERWRITE=y
343# CONFIG_CMDLINE_EXTEND is not set
326CONFIG_CMDLINE="console=ttySC1,115200 panic=3" 344CONFIG_CMDLINE="console=ttySC1,115200 panic=3"
327 345
328# 346#
@@ -395,6 +413,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
395# CONFIG_NETFILTER is not set 413# CONFIG_NETFILTER is not set
396# CONFIG_IP_DCCP is not set 414# CONFIG_IP_DCCP is not set
397# CONFIG_IP_SCTP is not set 415# CONFIG_IP_SCTP is not set
416# CONFIG_RDS is not set
398# CONFIG_TIPC is not set 417# CONFIG_TIPC is not set
399# CONFIG_ATM is not set 418# CONFIG_ATM is not set
400# CONFIG_BRIDGE is not set 419# CONFIG_BRIDGE is not set
@@ -424,6 +443,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
424# CONFIG_AF_RXRPC is not set 443# CONFIG_AF_RXRPC is not set
425CONFIG_WIRELESS=y 444CONFIG_WIRELESS=y
426# CONFIG_CFG80211 is not set 445# CONFIG_CFG80211 is not set
446CONFIG_CFG80211_DEFAULT_PS_VALUE=0
427# CONFIG_WIRELESS_OLD_REGULATORY is not set 447# CONFIG_WIRELESS_OLD_REGULATORY is not set
428# CONFIG_WIRELESS_EXT is not set 448# CONFIG_WIRELESS_EXT is not set
429# CONFIG_LIB80211 is not set 449# CONFIG_LIB80211 is not set
@@ -431,7 +451,6 @@ CONFIG_WIRELESS=y
431# 451#
432# CFG80211 needs to be enabled for MAC80211 452# CFG80211 needs to be enabled for MAC80211
433# 453#
434CONFIG_MAC80211_DEFAULT_PS_VALUE=0
435# CONFIG_WIMAX is not set 454# CONFIG_WIMAX is not set
436# CONFIG_RFKILL is not set 455# CONFIG_RFKILL is not set
437# CONFIG_NET_9P is not set 456# CONFIG_NET_9P is not set
@@ -444,6 +463,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
444# Generic Driver Options 463# Generic Driver Options
445# 464#
446CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 465CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
466# CONFIG_DEVTMPFS is not set
447# CONFIG_STANDALONE is not set 467# CONFIG_STANDALONE is not set
448CONFIG_PREVENT_FIRMWARE_BUILD=y 468CONFIG_PREVENT_FIRMWARE_BUILD=y
449# CONFIG_FW_LOADER is not set 469# CONFIG_FW_LOADER is not set
@@ -496,7 +516,11 @@ CONFIG_HAVE_IDE=y
496# 516#
497 517
498# 518#
499# Enable only one of the two stacks, unless you know what you are doing 519# You can enable one or both FireWire driver stacks.
520#
521
522#
523# See the help texts for more information.
500# 524#
501# CONFIG_FIREWIRE is not set 525# CONFIG_FIREWIRE is not set
502# CONFIG_IEEE1394 is not set 526# CONFIG_IEEE1394 is not set
@@ -561,10 +585,7 @@ CONFIG_8139TOO=y
561# CONFIG_NETDEV_1000 is not set 585# CONFIG_NETDEV_1000 is not set
562# CONFIG_NETDEV_10000 is not set 586# CONFIG_NETDEV_10000 is not set
563# CONFIG_TR is not set 587# CONFIG_TR is not set
564 588CONFIG_WLAN=y
565#
566# Wireless LAN
567#
568# CONFIG_WLAN_PRE80211 is not set 589# CONFIG_WLAN_PRE80211 is not set
569# CONFIG_WLAN_80211 is not set 590# CONFIG_WLAN_80211 is not set
570 591
@@ -605,13 +626,14 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
605# 626#
606CONFIG_INPUT_KEYBOARD=y 627CONFIG_INPUT_KEYBOARD=y
607# CONFIG_KEYBOARD_ATKBD is not set 628# CONFIG_KEYBOARD_ATKBD is not set
608# CONFIG_KEYBOARD_SUNKBD is not set
609# CONFIG_KEYBOARD_LKKBD is not set 629# CONFIG_KEYBOARD_LKKBD is not set
610# CONFIG_KEYBOARD_XTKBD is not set 630CONFIG_KEYBOARD_MAPLE=y
611# CONFIG_KEYBOARD_NEWTON is not set 631# CONFIG_KEYBOARD_NEWTON is not set
632# CONFIG_KEYBOARD_OPENCORES is not set
612# CONFIG_KEYBOARD_STOWAWAY is not set 633# CONFIG_KEYBOARD_STOWAWAY is not set
613CONFIG_KEYBOARD_MAPLE=y 634# CONFIG_KEYBOARD_SUNKBD is not set
614# CONFIG_KEYBOARD_SH_KEYSC is not set 635# CONFIG_KEYBOARD_SH_KEYSC is not set
636# CONFIG_KEYBOARD_XTKBD is not set
615CONFIG_INPUT_MOUSE=y 637CONFIG_INPUT_MOUSE=y
616# CONFIG_MOUSE_PS2 is not set 638# CONFIG_MOUSE_PS2 is not set
617# CONFIG_MOUSE_SERIAL is not set 639# CONFIG_MOUSE_SERIAL is not set
@@ -675,11 +697,15 @@ CONFIG_HW_RANDOM=y
675CONFIG_DEVPORT=y 697CONFIG_DEVPORT=y
676# CONFIG_I2C is not set 698# CONFIG_I2C is not set
677# CONFIG_SPI is not set 699# CONFIG_SPI is not set
700
701#
702# PPS support
703#
704# CONFIG_PPS is not set
678# CONFIG_W1 is not set 705# CONFIG_W1 is not set
679# CONFIG_POWER_SUPPLY is not set 706# CONFIG_POWER_SUPPLY is not set
680# CONFIG_HWMON is not set 707# CONFIG_HWMON is not set
681# CONFIG_THERMAL is not set 708# CONFIG_THERMAL is not set
682# CONFIG_THERMAL_HWMON is not set
683CONFIG_WATCHDOG=y 709CONFIG_WATCHDOG=y
684# CONFIG_WATCHDOG_NOWAYOUT is not set 710# CONFIG_WATCHDOG_NOWAYOUT is not set
685 711
@@ -716,6 +742,7 @@ CONFIG_SSB_POSSIBLE=y
716# 742#
717# Graphics support 743# Graphics support
718# 744#
745CONFIG_VGA_ARB=y
719# CONFIG_DRM is not set 746# CONFIG_DRM is not set
720# CONFIG_VGASTATE is not set 747# CONFIG_VGASTATE is not set
721CONFIG_VIDEO_OUTPUT_CONTROL=m 748CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -807,7 +834,6 @@ CONFIG_LOGO_SUPERH_CLUT224=y
807# CONFIG_SOUND is not set 834# CONFIG_SOUND is not set
808CONFIG_HID_SUPPORT=y 835CONFIG_HID_SUPPORT=y
809CONFIG_HID=y 836CONFIG_HID=y
810# CONFIG_HID_DEBUG is not set
811# CONFIG_HIDRAW is not set 837# CONFIG_HIDRAW is not set
812# CONFIG_HID_PID is not set 838# CONFIG_HID_PID is not set
813 839
@@ -861,8 +887,10 @@ CONFIG_RTC_LIB=y
861# CONFIG_JFS_FS is not set 887# CONFIG_JFS_FS is not set
862# CONFIG_FS_POSIX_ACL is not set 888# CONFIG_FS_POSIX_ACL is not set
863# CONFIG_XFS_FS is not set 889# CONFIG_XFS_FS is not set
890# CONFIG_GFS2_FS is not set
864# CONFIG_OCFS2_FS is not set 891# CONFIG_OCFS2_FS is not set
865# CONFIG_BTRFS_FS is not set 892# CONFIG_BTRFS_FS is not set
893# CONFIG_NILFS2_FS is not set
866CONFIG_FILE_LOCKING=y 894CONFIG_FILE_LOCKING=y
867CONFIG_FSNOTIFY=y 895CONFIG_FSNOTIFY=y
868# CONFIG_DNOTIFY is not set 896# CONFIG_DNOTIFY is not set
@@ -922,7 +950,6 @@ CONFIG_MISC_FILESYSTEMS=y
922# CONFIG_ROMFS_FS is not set 950# CONFIG_ROMFS_FS is not set
923# CONFIG_SYSV_FS is not set 951# CONFIG_SYSV_FS is not set
924# CONFIG_UFS_FS is not set 952# CONFIG_UFS_FS is not set
925# CONFIG_NILFS2_FS is not set
926CONFIG_NETWORK_FILESYSTEMS=y 953CONFIG_NETWORK_FILESYSTEMS=y
927# CONFIG_NFS_FS is not set 954# CONFIG_NFS_FS is not set
928# CONFIG_NFSD is not set 955# CONFIG_NFSD is not set
@@ -949,6 +976,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
949CONFIG_ENABLE_MUST_CHECK=y 976CONFIG_ENABLE_MUST_CHECK=y
950CONFIG_FRAME_WARN=1024 977CONFIG_FRAME_WARN=1024
951# CONFIG_MAGIC_SYSRQ is not set 978# CONFIG_MAGIC_SYSRQ is not set
979# CONFIG_STRIP_ASM_SYMS is not set
952# CONFIG_UNUSED_SYMBOLS is not set 980# CONFIG_UNUSED_SYMBOLS is not set
953# CONFIG_DEBUG_FS is not set 981# CONFIG_DEBUG_FS is not set
954# CONFIG_HEADERS_CHECK is not set 982# CONFIG_HEADERS_CHECK is not set
@@ -958,8 +986,11 @@ CONFIG_FRAME_WARN=1024
958# CONFIG_RCU_CPU_STALL_DETECTOR is not set 986# CONFIG_RCU_CPU_STALL_DETECTOR is not set
959# CONFIG_LATENCYTOP is not set 987# CONFIG_LATENCYTOP is not set
960CONFIG_HAVE_FUNCTION_TRACER=y 988CONFIG_HAVE_FUNCTION_TRACER=y
989CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
990CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
961CONFIG_HAVE_DYNAMIC_FTRACE=y 991CONFIG_HAVE_DYNAMIC_FTRACE=y
962CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 992CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
993CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
963CONFIG_TRACING_SUPPORT=y 994CONFIG_TRACING_SUPPORT=y
964# CONFIG_FTRACE is not set 995# CONFIG_FTRACE is not set
965# CONFIG_DMA_API_DEBUG is not set 996# CONFIG_DMA_API_DEBUG is not set
@@ -967,6 +998,7 @@ CONFIG_TRACING_SUPPORT=y
967CONFIG_HAVE_ARCH_KGDB=y 998CONFIG_HAVE_ARCH_KGDB=y
968# CONFIG_SH_STANDARD_BIOS is not set 999# CONFIG_SH_STANDARD_BIOS is not set
969# CONFIG_EARLY_SCIF_CONSOLE is not set 1000# CONFIG_EARLY_SCIF_CONSOLE is not set
1001# CONFIG_DWARF_UNWINDER is not set
970 1002
971# 1003#
972# Security options 1004# Security options
@@ -980,7 +1012,6 @@ CONFIG_CRYPTO=y
980# 1012#
981# Crypto core or helper 1013# Crypto core or helper
982# 1014#
983# CONFIG_CRYPTO_FIPS is not set
984# CONFIG_CRYPTO_MANAGER is not set 1015# CONFIG_CRYPTO_MANAGER is not set
985# CONFIG_CRYPTO_MANAGER2 is not set 1016# CONFIG_CRYPTO_MANAGER2 is not set
986# CONFIG_CRYPTO_GF128MUL is not set 1017# CONFIG_CRYPTO_GF128MUL is not set
@@ -1012,11 +1043,13 @@ CONFIG_CRYPTO=y
1012# 1043#
1013# CONFIG_CRYPTO_HMAC is not set 1044# CONFIG_CRYPTO_HMAC is not set
1014# CONFIG_CRYPTO_XCBC is not set 1045# CONFIG_CRYPTO_XCBC is not set
1046# CONFIG_CRYPTO_VMAC is not set
1015 1047
1016# 1048#
1017# Digest 1049# Digest
1018# 1050#
1019# CONFIG_CRYPTO_CRC32C is not set 1051# CONFIG_CRYPTO_CRC32C is not set
1052# CONFIG_CRYPTO_GHASH is not set
1020# CONFIG_CRYPTO_MD4 is not set 1053# CONFIG_CRYPTO_MD4 is not set
1021# CONFIG_CRYPTO_MD5 is not set 1054# CONFIG_CRYPTO_MD5 is not set
1022# CONFIG_CRYPTO_MICHAEL_MIC is not set 1055# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1079,5 +1112,6 @@ CONFIG_CRC32=y
1079CONFIG_HAS_IOMEM=y 1112CONFIG_HAS_IOMEM=y
1080CONFIG_HAS_IOPORT=y 1113CONFIG_HAS_IOPORT=y
1081CONFIG_HAS_DMA=y 1114CONFIG_HAS_DMA=y
1115CONFIG_HAVE_LMB=y
1082CONFIG_NLATTR=y 1116CONFIG_NLATTR=y
1083CONFIG_GENERIC_ATOMIC64=y 1117CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/ecovec24-romimage_defconfig b/arch/sh/configs/ecovec24-romimage_defconfig
index 9a22c64775be..0774924623cc 100644
--- a/arch/sh/configs/ecovec24-romimage_defconfig
+++ b/arch/sh/configs/ecovec24-romimage_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.31-rc7 3# Linux kernel version: 2.6.31
4# Tue Sep 8 13:56:18 2009 4# Thu Sep 24 17:56:41 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -59,11 +59,12 @@ CONFIG_BSD_PROCESS_ACCT=y
59# 59#
60# RCU Subsystem 60# RCU Subsystem
61# 61#
62CONFIG_CLASSIC_RCU=y 62CONFIG_TREE_RCU=y
63# CONFIG_TREE_RCU is not set 63# CONFIG_TREE_PREEMPT_RCU is not set
64# CONFIG_PREEMPT_RCU is not set 64# CONFIG_RCU_TRACE is not set
65CONFIG_RCU_FANOUT=32
66# CONFIG_RCU_FANOUT_EXACT is not set
65# CONFIG_TREE_RCU_TRACE is not set 67# CONFIG_TREE_RCU_TRACE is not set
66# CONFIG_PREEMPT_RCU_TRACE is not set
67CONFIG_IKCONFIG=y 68CONFIG_IKCONFIG=y
68CONFIG_IKCONFIG_PROC=y 69CONFIG_IKCONFIG_PROC=y
69CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
@@ -79,15 +80,9 @@ CONFIG_SYSFS_DEPRECATED_V2=y
79# CONFIG_NAMESPACES is not set 80# CONFIG_NAMESPACES is not set
80CONFIG_BLK_DEV_INITRD=y 81CONFIG_BLK_DEV_INITRD=y
81CONFIG_INITRAMFS_SOURCE="" 82CONFIG_INITRAMFS_SOURCE=""
82CONFIG_INITRAMFS_ROOT_UID=0
83CONFIG_INITRAMFS_ROOT_GID=0
84CONFIG_RD_GZIP=y 83CONFIG_RD_GZIP=y
85# CONFIG_RD_BZIP2 is not set 84# CONFIG_RD_BZIP2 is not set
86# CONFIG_RD_LZMA is not set 85# CONFIG_RD_LZMA is not set
87CONFIG_INITRAMFS_COMPRESSION_NONE=y
88# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
89# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
90# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
91CONFIG_CC_OPTIMIZE_FOR_SIZE=y 86CONFIG_CC_OPTIMIZE_FOR_SIZE=y
92CONFIG_SYSCTL=y 87CONFIG_SYSCTL=y
93CONFIG_ANON_INODES=y 88CONFIG_ANON_INODES=y
@@ -107,20 +102,19 @@ CONFIG_TIMERFD=y
107CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
108CONFIG_SHMEM=y 103CONFIG_SHMEM=y
109CONFIG_AIO=y 104CONFIG_AIO=y
110CONFIG_HAVE_PERF_COUNTERS=y 105CONFIG_HAVE_PERF_EVENTS=y
111 106
112# 107#
113# Performance Counters 108# Kernel Performance Events And Counters
114# 109#
110# CONFIG_PERF_EVENTS is not set
115# CONFIG_PERF_COUNTERS is not set 111# CONFIG_PERF_COUNTERS is not set
116CONFIG_VM_EVENT_COUNTERS=y 112CONFIG_VM_EVENT_COUNTERS=y
117# CONFIG_STRIP_ASM_SYMS is not set
118CONFIG_COMPAT_BRK=y 113CONFIG_COMPAT_BRK=y
119CONFIG_SLAB=y 114CONFIG_SLAB=y
120# CONFIG_SLUB is not set 115# CONFIG_SLUB is not set
121# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
122# CONFIG_PROFILING is not set 117# CONFIG_PROFILING is not set
123# CONFIG_MARKERS is not set
124CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
125CONFIG_HAVE_IOREMAP_PROT=y 119CONFIG_HAVE_IOREMAP_PROT=y
126CONFIG_HAVE_KPROBES=y 120CONFIG_HAVE_KPROBES=y
@@ -237,6 +231,7 @@ CONFIG_ZONE_DMA_FLAG=0
237CONFIG_NR_QUICK=2 231CONFIG_NR_QUICK=2
238CONFIG_HAVE_MLOCK=y 232CONFIG_HAVE_MLOCK=y
239CONFIG_HAVE_MLOCKED_PAGE_BIT=y 233CONFIG_HAVE_MLOCKED_PAGE_BIT=y
234# CONFIG_KSM is not set
240CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 235CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
241 236
242# 237#
@@ -319,7 +314,8 @@ CONFIG_GUSA=y
319CONFIG_ZERO_PAGE_OFFSET=0x00001000 314CONFIG_ZERO_PAGE_OFFSET=0x00001000
320CONFIG_BOOT_LINK_OFFSET=0x00800000 315CONFIG_BOOT_LINK_OFFSET=0x00800000
321CONFIG_ENTRY_OFFSET=0x00001000 316CONFIG_ENTRY_OFFSET=0x00001000
322CONFIG_CMDLINE_BOOL=y 317CONFIG_CMDLINE_OVERWRITE=y
318# CONFIG_CMDLINE_EXTEND is not set
323CONFIG_CMDLINE="console=ttySC0,115200" 319CONFIG_CMDLINE="console=ttySC0,115200"
324 320
325# 321#
@@ -382,6 +378,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
382# CONFIG_NETFILTER is not set 378# CONFIG_NETFILTER is not set
383# CONFIG_IP_DCCP is not set 379# CONFIG_IP_DCCP is not set
384# CONFIG_IP_SCTP is not set 380# CONFIG_IP_SCTP is not set
381# CONFIG_RDS is not set
385# CONFIG_TIPC is not set 382# CONFIG_TIPC is not set
386# CONFIG_ATM is not set 383# CONFIG_ATM is not set
387# CONFIG_BRIDGE is not set 384# CONFIG_BRIDGE is not set
@@ -422,6 +419,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
422# Generic Driver Options 419# Generic Driver Options
423# 420#
424CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 421CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
422# CONFIG_DEVTMPFS is not set
425CONFIG_STANDALONE=y 423CONFIG_STANDALONE=y
426CONFIG_PREVENT_FIRMWARE_BUILD=y 424CONFIG_PREVENT_FIRMWARE_BUILD=y
427CONFIG_FW_LOADER=y 425CONFIG_FW_LOADER=y
@@ -530,10 +528,7 @@ CONFIG_SH_ETH=y
530# CONFIG_KS8842 is not set 528# CONFIG_KS8842 is not set
531# CONFIG_NETDEV_1000 is not set 529# CONFIG_NETDEV_1000 is not set
532# CONFIG_NETDEV_10000 is not set 530# CONFIG_NETDEV_10000 is not set
533 531CONFIG_WLAN=y
534#
535# Wireless LAN
536#
537# CONFIG_WLAN_PRE80211 is not set 532# CONFIG_WLAN_PRE80211 is not set
538# CONFIG_WLAN_80211 is not set 533# CONFIG_WLAN_80211 is not set
539 534
@@ -625,6 +620,7 @@ CONFIG_HW_RANDOM=y
625# CONFIG_TCG_TPM is not set 620# CONFIG_TCG_TPM is not set
626CONFIG_I2C=y 621CONFIG_I2C=y
627CONFIG_I2C_BOARDINFO=y 622CONFIG_I2C_BOARDINFO=y
623CONFIG_I2C_COMPAT=y
628# CONFIG_I2C_CHARDEV is not set 624# CONFIG_I2C_CHARDEV is not set
629CONFIG_I2C_HELPER_AUTO=y 625CONFIG_I2C_HELPER_AUTO=y
630 626
@@ -657,9 +653,6 @@ CONFIG_I2C_SH_MOBILE=y
657# Miscellaneous I2C Chip support 653# Miscellaneous I2C Chip support
658# 654#
659# CONFIG_DS1682 is not set 655# CONFIG_DS1682 is not set
660# CONFIG_SENSORS_PCF8574 is not set
661# CONFIG_PCF8575 is not set
662# CONFIG_SENSORS_PCA9539 is not set
663# CONFIG_SENSORS_TSL2550 is not set 656# CONFIG_SENSORS_TSL2550 is not set
664# CONFIG_I2C_DEBUG_CORE is not set 657# CONFIG_I2C_DEBUG_CORE is not set
665# CONFIG_I2C_DEBUG_ALGO is not set 658# CONFIG_I2C_DEBUG_ALGO is not set
@@ -693,11 +686,14 @@ CONFIG_GPIO_SYSFS=y
693# 686#
694# SPI GPIO expanders: 687# SPI GPIO expanders:
695# 688#
689
690#
691# AC97 GPIO expanders:
692#
696# CONFIG_W1 is not set 693# CONFIG_W1 is not set
697# CONFIG_POWER_SUPPLY is not set 694# CONFIG_POWER_SUPPLY is not set
698# CONFIG_HWMON is not set 695# CONFIG_HWMON is not set
699# CONFIG_THERMAL is not set 696# CONFIG_THERMAL is not set
700# CONFIG_THERMAL_HWMON is not set
701# CONFIG_WATCHDOG is not set 697# CONFIG_WATCHDOG is not set
702CONFIG_SSB_POSSIBLE=y 698CONFIG_SSB_POSSIBLE=y
703 699
@@ -717,6 +713,7 @@ CONFIG_SSB_POSSIBLE=y
717# CONFIG_MFD_TMIO is not set 713# CONFIG_MFD_TMIO is not set
718# CONFIG_PMIC_DA903X is not set 714# CONFIG_PMIC_DA903X is not set
719# CONFIG_MFD_WM8400 is not set 715# CONFIG_MFD_WM8400 is not set
716# CONFIG_MFD_WM831X is not set
720# CONFIG_MFD_WM8350_I2C is not set 717# CONFIG_MFD_WM8350_I2C is not set
721# CONFIG_MFD_PCF50633 is not set 718# CONFIG_MFD_PCF50633 is not set
722# CONFIG_AB3100_CORE is not set 719# CONFIG_AB3100_CORE is not set
@@ -771,6 +768,7 @@ CONFIG_USB_DEVICE_CLASS=y
771# CONFIG_USB_OXU210HP_HCD is not set 768# CONFIG_USB_OXU210HP_HCD is not set
772# CONFIG_USB_ISP116X_HCD is not set 769# CONFIG_USB_ISP116X_HCD is not set
773# CONFIG_USB_ISP1760_HCD is not set 770# CONFIG_USB_ISP1760_HCD is not set
771# CONFIG_USB_ISP1362_HCD is not set
774# CONFIG_USB_SL811_HCD is not set 772# CONFIG_USB_SL811_HCD is not set
775CONFIG_USB_R8A66597_HCD=y 773CONFIG_USB_R8A66597_HCD=y
776# CONFIG_USB_HWA_HCD is not set 774# CONFIG_USB_HWA_HCD is not set
@@ -875,6 +873,7 @@ CONFIG_EXT2_FS=y
875# CONFIG_XFS_FS is not set 873# CONFIG_XFS_FS is not set
876# CONFIG_OCFS2_FS is not set 874# CONFIG_OCFS2_FS is not set
877# CONFIG_BTRFS_FS is not set 875# CONFIG_BTRFS_FS is not set
876# CONFIG_NILFS2_FS is not set
878CONFIG_FILE_LOCKING=y 877CONFIG_FILE_LOCKING=y
879# CONFIG_FSNOTIFY is not set 878# CONFIG_FSNOTIFY is not set
880# CONFIG_DNOTIFY is not set 879# CONFIG_DNOTIFY is not set
@@ -975,6 +974,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
975# CONFIG_ENABLE_MUST_CHECK is not set 974# CONFIG_ENABLE_MUST_CHECK is not set
976CONFIG_FRAME_WARN=1024 975CONFIG_FRAME_WARN=1024
977# CONFIG_MAGIC_SYSRQ is not set 976# CONFIG_MAGIC_SYSRQ is not set
977# CONFIG_STRIP_ASM_SYMS is not set
978# CONFIG_UNUSED_SYMBOLS is not set 978# CONFIG_UNUSED_SYMBOLS is not set
979CONFIG_DEBUG_FS=y 979CONFIG_DEBUG_FS=y
980# CONFIG_HEADERS_CHECK is not set 980# CONFIG_HEADERS_CHECK is not set
@@ -989,7 +989,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
989CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 989CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
990CONFIG_HAVE_DYNAMIC_FTRACE=y 990CONFIG_HAVE_DYNAMIC_FTRACE=y
991CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 991CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
992CONFIG_HAVE_FTRACE_SYSCALLS=y 992CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
993CONFIG_TRACING_SUPPORT=y 993CONFIG_TRACING_SUPPORT=y
994# CONFIG_FTRACE is not set 994# CONFIG_FTRACE is not set
995# CONFIG_DYNAMIC_DEBUG is not set 995# CONFIG_DYNAMIC_DEBUG is not set
diff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_defconfig
index 2050a76683c3..ac6469718a2c 100644
--- a/arch/sh/configs/ecovec24_defconfig
+++ b/arch/sh/configs/ecovec24_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.31-rc7 3# Linux kernel version: 2.6.31
4# Wed Aug 26 09:09:07 2009 4# Thu Sep 24 17:45:39 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -60,11 +60,12 @@ CONFIG_BSD_PROCESS_ACCT=y
60# 60#
61# RCU Subsystem 61# RCU Subsystem
62# 62#
63CONFIG_CLASSIC_RCU=y 63CONFIG_TREE_RCU=y
64# CONFIG_TREE_RCU is not set 64# CONFIG_TREE_PREEMPT_RCU is not set
65# CONFIG_PREEMPT_RCU is not set 65# CONFIG_RCU_TRACE is not set
66CONFIG_RCU_FANOUT=32
67# CONFIG_RCU_FANOUT_EXACT is not set
66# CONFIG_TREE_RCU_TRACE is not set 68# CONFIG_TREE_RCU_TRACE is not set
67# CONFIG_PREEMPT_RCU_TRACE is not set
68# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
69CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
70CONFIG_GROUP_SCHED=y 71CONFIG_GROUP_SCHED=y
@@ -97,20 +98,19 @@ CONFIG_TIMERFD=y
97CONFIG_EVENTFD=y 98CONFIG_EVENTFD=y
98CONFIG_SHMEM=y 99CONFIG_SHMEM=y
99CONFIG_AIO=y 100CONFIG_AIO=y
100CONFIG_HAVE_PERF_COUNTERS=y 101CONFIG_HAVE_PERF_EVENTS=y
101 102
102# 103#
103# Performance Counters 104# Kernel Performance Events And Counters
104# 105#
106# CONFIG_PERF_EVENTS is not set
105# CONFIG_PERF_COUNTERS is not set 107# CONFIG_PERF_COUNTERS is not set
106CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
107# CONFIG_STRIP_ASM_SYMS is not set
108CONFIG_COMPAT_BRK=y 109CONFIG_COMPAT_BRK=y
109CONFIG_SLAB=y 110CONFIG_SLAB=y
110# CONFIG_SLUB is not set 111# CONFIG_SLUB is not set
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
115CONFIG_HAVE_IOREMAP_PROT=y 115CONFIG_HAVE_IOREMAP_PROT=y
116CONFIG_HAVE_KPROBES=y 116CONFIG_HAVE_KPROBES=y
@@ -232,6 +232,7 @@ CONFIG_ZONE_DMA_FLAG=0
232CONFIG_NR_QUICK=2 232CONFIG_NR_QUICK=2
233CONFIG_HAVE_MLOCK=y 233CONFIG_HAVE_MLOCK=y
234CONFIG_HAVE_MLOCKED_PAGE_BIT=y 234CONFIG_HAVE_MLOCKED_PAGE_BIT=y
235# CONFIG_KSM is not set
235CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 236CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
236 237
237# 238#
@@ -314,7 +315,8 @@ CONFIG_GUSA=y
314CONFIG_ZERO_PAGE_OFFSET=0x00001000 315CONFIG_ZERO_PAGE_OFFSET=0x00001000
315CONFIG_BOOT_LINK_OFFSET=0x00800000 316CONFIG_BOOT_LINK_OFFSET=0x00800000
316CONFIG_ENTRY_OFFSET=0x00001000 317CONFIG_ENTRY_OFFSET=0x00001000
317CONFIG_CMDLINE_BOOL=y 318CONFIG_CMDLINE_OVERWRITE=y
319# CONFIG_CMDLINE_EXTEND is not set
318CONFIG_CMDLINE="console=tty0, console=ttySC0,115200 root=/dev/nfs ip=dhcp mem=120M memchunk.vpu=4m" 320CONFIG_CMDLINE="console=tty0, console=ttySC0,115200 root=/dev/nfs ip=dhcp mem=120M memchunk.vpu=4m"
319 321
320# 322#
@@ -388,6 +390,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
388# CONFIG_NETFILTER is not set 390# CONFIG_NETFILTER is not set
389# CONFIG_IP_DCCP is not set 391# CONFIG_IP_DCCP is not set
390# CONFIG_IP_SCTP is not set 392# CONFIG_IP_SCTP is not set
393# CONFIG_RDS is not set
391# CONFIG_TIPC is not set 394# CONFIG_TIPC is not set
392# CONFIG_ATM is not set 395# CONFIG_ATM is not set
393# CONFIG_BRIDGE is not set 396# CONFIG_BRIDGE is not set
@@ -417,6 +420,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
417# CONFIG_AF_RXRPC is not set 420# CONFIG_AF_RXRPC is not set
418CONFIG_WIRELESS=y 421CONFIG_WIRELESS=y
419# CONFIG_CFG80211 is not set 422# CONFIG_CFG80211 is not set
423CONFIG_CFG80211_DEFAULT_PS_VALUE=0
420# CONFIG_WIRELESS_OLD_REGULATORY is not set 424# CONFIG_WIRELESS_OLD_REGULATORY is not set
421# CONFIG_WIRELESS_EXT is not set 425# CONFIG_WIRELESS_EXT is not set
422# CONFIG_LIB80211 is not set 426# CONFIG_LIB80211 is not set
@@ -424,7 +428,6 @@ CONFIG_WIRELESS=y
424# 428#
425# CFG80211 needs to be enabled for MAC80211 429# CFG80211 needs to be enabled for MAC80211
426# 430#
427CONFIG_MAC80211_DEFAULT_PS_VALUE=0
428# CONFIG_WIMAX is not set 431# CONFIG_WIMAX is not set
429# CONFIG_RFKILL is not set 432# CONFIG_RFKILL is not set
430# CONFIG_NET_9P is not set 433# CONFIG_NET_9P is not set
@@ -437,6 +440,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
437# Generic Driver Options 440# Generic Driver Options
438# 441#
439CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 442CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
443# CONFIG_DEVTMPFS is not set
440CONFIG_STANDALONE=y 444CONFIG_STANDALONE=y
441CONFIG_PREVENT_FIRMWARE_BUILD=y 445CONFIG_PREVENT_FIRMWARE_BUILD=y
442CONFIG_FW_LOADER=y 446CONFIG_FW_LOADER=y
@@ -446,9 +450,9 @@ CONFIG_EXTRA_FIRMWARE=""
446# CONFIG_CONNECTOR is not set 450# CONFIG_CONNECTOR is not set
447CONFIG_MTD=y 451CONFIG_MTD=y
448# CONFIG_MTD_DEBUG is not set 452# CONFIG_MTD_DEBUG is not set
453# CONFIG_MTD_TESTS is not set
449CONFIG_MTD_CONCAT=y 454CONFIG_MTD_CONCAT=y
450CONFIG_MTD_PARTITIONS=y 455CONFIG_MTD_PARTITIONS=y
451# CONFIG_MTD_TESTS is not set
452# CONFIG_MTD_REDBOOT_PARTS is not set 456# CONFIG_MTD_REDBOOT_PARTS is not set
453CONFIG_MTD_CMDLINE_PARTS=y 457CONFIG_MTD_CMDLINE_PARTS=y
454# CONFIG_MTD_AR7_PARTS is not set 458# CONFIG_MTD_AR7_PARTS is not set
@@ -504,6 +508,7 @@ CONFIG_MTD_PHYSMAP=y
504# 508#
505# CONFIG_MTD_DATAFLASH is not set 509# CONFIG_MTD_DATAFLASH is not set
506# CONFIG_MTD_M25P80 is not set 510# CONFIG_MTD_M25P80 is not set
511# CONFIG_MTD_SST25L is not set
507# CONFIG_MTD_SLRAM is not set 512# CONFIG_MTD_SLRAM is not set
508# CONFIG_MTD_PHRAM is not set 513# CONFIG_MTD_PHRAM is not set
509# CONFIG_MTD_MTDRAM is not set 514# CONFIG_MTD_MTDRAM is not set
@@ -666,10 +671,7 @@ CONFIG_SH_ETH=y
666# CONFIG_KS8851 is not set 671# CONFIG_KS8851 is not set
667# CONFIG_NETDEV_1000 is not set 672# CONFIG_NETDEV_1000 is not set
668# CONFIG_NETDEV_10000 is not set 673# CONFIG_NETDEV_10000 is not set
669 674CONFIG_WLAN=y
670#
671# Wireless LAN
672#
673# CONFIG_WLAN_PRE80211 is not set 675# CONFIG_WLAN_PRE80211 is not set
674# CONFIG_WLAN_80211 is not set 676# CONFIG_WLAN_80211 is not set
675 677
@@ -713,11 +715,15 @@ CONFIG_INPUT_EVDEV=y
713# Input Device Drivers 715# Input Device Drivers
714# 716#
715CONFIG_INPUT_KEYBOARD=y 717CONFIG_INPUT_KEYBOARD=y
718# CONFIG_KEYBOARD_ADP5588 is not set
716# CONFIG_KEYBOARD_ATKBD is not set 719# CONFIG_KEYBOARD_ATKBD is not set
720# CONFIG_QT2160 is not set
717# CONFIG_KEYBOARD_LKKBD is not set 721# CONFIG_KEYBOARD_LKKBD is not set
718# CONFIG_KEYBOARD_GPIO is not set 722# CONFIG_KEYBOARD_GPIO is not set
719# CONFIG_KEYBOARD_MATRIX is not set 723# CONFIG_KEYBOARD_MATRIX is not set
724# CONFIG_KEYBOARD_MAX7359 is not set
720# CONFIG_KEYBOARD_NEWTON is not set 725# CONFIG_KEYBOARD_NEWTON is not set
726# CONFIG_KEYBOARD_OPENCORES is not set
721# CONFIG_KEYBOARD_STOWAWAY is not set 727# CONFIG_KEYBOARD_STOWAWAY is not set
722# CONFIG_KEYBOARD_SUNKBD is not set 728# CONFIG_KEYBOARD_SUNKBD is not set
723CONFIG_KEYBOARD_SH_KEYSC=y 729CONFIG_KEYBOARD_SH_KEYSC=y
@@ -771,6 +777,7 @@ CONFIG_HW_RANDOM=y
771# CONFIG_TCG_TPM is not set 777# CONFIG_TCG_TPM is not set
772CONFIG_I2C=y 778CONFIG_I2C=y
773CONFIG_I2C_BOARDINFO=y 779CONFIG_I2C_BOARDINFO=y
780CONFIG_I2C_COMPAT=y
774CONFIG_I2C_CHARDEV=y 781CONFIG_I2C_CHARDEV=y
775CONFIG_I2C_HELPER_AUTO=y 782CONFIG_I2C_HELPER_AUTO=y
776 783
@@ -804,9 +811,6 @@ CONFIG_I2C_SH_MOBILE=y
804# Miscellaneous I2C Chip support 811# Miscellaneous I2C Chip support
805# 812#
806# CONFIG_DS1682 is not set 813# CONFIG_DS1682 is not set
807# CONFIG_SENSORS_PCF8574 is not set
808# CONFIG_PCF8575 is not set
809# CONFIG_SENSORS_PCA9539 is not set
810# CONFIG_SENSORS_TSL2550 is not set 814# CONFIG_SENSORS_TSL2550 is not set
811# CONFIG_I2C_DEBUG_CORE is not set 815# CONFIG_I2C_DEBUG_CORE is not set
812# CONFIG_I2C_DEBUG_ALGO is not set 816# CONFIG_I2C_DEBUG_ALGO is not set
@@ -856,11 +860,15 @@ CONFIG_GPIOLIB=y
856# 860#
857# CONFIG_GPIO_MAX7301 is not set 861# CONFIG_GPIO_MAX7301 is not set
858# CONFIG_GPIO_MCP23S08 is not set 862# CONFIG_GPIO_MCP23S08 is not set
863# CONFIG_GPIO_MC33880 is not set
864
865#
866# AC97 GPIO expanders:
867#
859# CONFIG_W1 is not set 868# CONFIG_W1 is not set
860# CONFIG_POWER_SUPPLY is not set 869# CONFIG_POWER_SUPPLY is not set
861# CONFIG_HWMON is not set 870# CONFIG_HWMON is not set
862# CONFIG_THERMAL is not set 871# CONFIG_THERMAL is not set
863# CONFIG_THERMAL_HWMON is not set
864# CONFIG_WATCHDOG is not set 872# CONFIG_WATCHDOG is not set
865CONFIG_SSB_POSSIBLE=y 873CONFIG_SSB_POSSIBLE=y
866 874
@@ -880,8 +888,10 @@ CONFIG_SSB_POSSIBLE=y
880# CONFIG_MFD_TMIO is not set 888# CONFIG_MFD_TMIO is not set
881# CONFIG_PMIC_DA903X is not set 889# CONFIG_PMIC_DA903X is not set
882# CONFIG_MFD_WM8400 is not set 890# CONFIG_MFD_WM8400 is not set
891# CONFIG_MFD_WM831X is not set
883# CONFIG_MFD_WM8350_I2C is not set 892# CONFIG_MFD_WM8350_I2C is not set
884# CONFIG_MFD_PCF50633 is not set 893# CONFIG_MFD_PCF50633 is not set
894# CONFIG_MFD_MC13783 is not set
885# CONFIG_AB3100_CORE is not set 895# CONFIG_AB3100_CORE is not set
886# CONFIG_EZX_PCAP is not set 896# CONFIG_EZX_PCAP is not set
887# CONFIG_REGULATOR is not set 897# CONFIG_REGULATOR is not set
@@ -936,8 +946,10 @@ CONFIG_SOC_CAMERA=y
936CONFIG_VIDEO_SH_MOBILE_CEU=y 946CONFIG_VIDEO_SH_MOBILE_CEU=y
937# CONFIG_V4L_USB_DRIVERS is not set 947# CONFIG_V4L_USB_DRIVERS is not set
938CONFIG_RADIO_ADAPTERS=y 948CONFIG_RADIO_ADAPTERS=y
949# CONFIG_I2C_SI4713 is not set
950# CONFIG_RADIO_SI4713 is not set
939# CONFIG_USB_DSBR is not set 951# CONFIG_USB_DSBR is not set
940# CONFIG_USB_SI470X is not set 952# CONFIG_RADIO_SI470X is not set
941# CONFIG_USB_MR800 is not set 953# CONFIG_USB_MR800 is not set
942# CONFIG_RADIO_TEA5764 is not set 954# CONFIG_RADIO_TEA5764 is not set
943# CONFIG_DAB is not set 955# CONFIG_DAB is not set
@@ -1003,7 +1015,6 @@ CONFIG_LOGO_SUPERH_CLUT224=y
1003# CONFIG_SOUND is not set 1015# CONFIG_SOUND is not set
1004CONFIG_HID_SUPPORT=y 1016CONFIG_HID_SUPPORT=y
1005CONFIG_HID=y 1017CONFIG_HID=y
1006# CONFIG_HID_DEBUG is not set
1007# CONFIG_HIDRAW is not set 1018# CONFIG_HIDRAW is not set
1008 1019
1009# 1020#
@@ -1026,6 +1037,7 @@ CONFIG_USB_HID=y
1026# CONFIG_HID_EZKEY is not set 1037# CONFIG_HID_EZKEY is not set
1027# CONFIG_HID_KYE is not set 1038# CONFIG_HID_KYE is not set
1028# CONFIG_HID_GYRATION is not set 1039# CONFIG_HID_GYRATION is not set
1040# CONFIG_HID_TWINHAN is not set
1029# CONFIG_HID_KENSINGTON is not set 1041# CONFIG_HID_KENSINGTON is not set
1030# CONFIG_HID_LOGITECH is not set 1042# CONFIG_HID_LOGITECH is not set
1031# CONFIG_HID_MICROSOFT is not set 1043# CONFIG_HID_MICROSOFT is not set
@@ -1070,6 +1082,7 @@ CONFIG_USB_MON=y
1070# CONFIG_USB_OXU210HP_HCD is not set 1082# CONFIG_USB_OXU210HP_HCD is not set
1071# CONFIG_USB_ISP116X_HCD is not set 1083# CONFIG_USB_ISP116X_HCD is not set
1072# CONFIG_USB_ISP1760_HCD is not set 1084# CONFIG_USB_ISP1760_HCD is not set
1085# CONFIG_USB_ISP1362_HCD is not set
1073# CONFIG_USB_SL811_HCD is not set 1086# CONFIG_USB_SL811_HCD is not set
1074CONFIG_USB_R8A66597_HCD=y 1087CONFIG_USB_R8A66597_HCD=y
1075# CONFIG_USB_HWA_HCD is not set 1088# CONFIG_USB_HWA_HCD is not set
@@ -1161,6 +1174,8 @@ CONFIG_MMC_BLOCK_BOUNCE=y
1161# MMC/SD/SDIO Host Controller Drivers 1174# MMC/SD/SDIO Host Controller Drivers
1162# 1175#
1163# CONFIG_MMC_SDHCI is not set 1176# CONFIG_MMC_SDHCI is not set
1177# CONFIG_MMC_AT91 is not set
1178# CONFIG_MMC_ATMELMCI is not set
1164CONFIG_MMC_SPI=y 1179CONFIG_MMC_SPI=y
1165# CONFIG_MEMSTICK is not set 1180# CONFIG_MEMSTICK is not set
1166# CONFIG_NEW_LEDS is not set 1181# CONFIG_NEW_LEDS is not set
@@ -1208,6 +1223,7 @@ CONFIG_RTC_DRV_PCF8563=y
1208# CONFIG_RTC_DRV_R9701 is not set 1223# CONFIG_RTC_DRV_R9701 is not set
1209# CONFIG_RTC_DRV_RS5C348 is not set 1224# CONFIG_RTC_DRV_RS5C348 is not set
1210# CONFIG_RTC_DRV_DS3234 is not set 1225# CONFIG_RTC_DRV_DS3234 is not set
1226# CONFIG_RTC_DRV_PCF2123 is not set
1211 1227
1212# 1228#
1213# Platform RTC drivers 1229# Platform RTC drivers
@@ -1265,6 +1281,7 @@ CONFIG_FS_POSIX_ACL=y
1265# CONFIG_GFS2_FS is not set 1281# CONFIG_GFS2_FS is not set
1266# CONFIG_OCFS2_FS is not set 1282# CONFIG_OCFS2_FS is not set
1267# CONFIG_BTRFS_FS is not set 1283# CONFIG_BTRFS_FS is not set
1284# CONFIG_NILFS2_FS is not set
1268CONFIG_FILE_LOCKING=y 1285CONFIG_FILE_LOCKING=y
1269CONFIG_FSNOTIFY=y 1286CONFIG_FSNOTIFY=y
1270CONFIG_DNOTIFY=y 1287CONFIG_DNOTIFY=y
@@ -1329,7 +1346,6 @@ CONFIG_MISC_FILESYSTEMS=y
1329# CONFIG_ROMFS_FS is not set 1346# CONFIG_ROMFS_FS is not set
1330# CONFIG_SYSV_FS is not set 1347# CONFIG_SYSV_FS is not set
1331# CONFIG_UFS_FS is not set 1348# CONFIG_UFS_FS is not set
1332# CONFIG_NILFS2_FS is not set
1333CONFIG_NETWORK_FILESYSTEMS=y 1349CONFIG_NETWORK_FILESYSTEMS=y
1334CONFIG_NFS_FS=y 1350CONFIG_NFS_FS=y
1335CONFIG_NFS_V3=y 1351CONFIG_NFS_V3=y
@@ -1409,6 +1425,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1409# CONFIG_ENABLE_MUST_CHECK is not set 1425# CONFIG_ENABLE_MUST_CHECK is not set
1410CONFIG_FRAME_WARN=1024 1426CONFIG_FRAME_WARN=1024
1411# CONFIG_MAGIC_SYSRQ is not set 1427# CONFIG_MAGIC_SYSRQ is not set
1428# CONFIG_STRIP_ASM_SYMS is not set
1412# CONFIG_UNUSED_SYMBOLS is not set 1429# CONFIG_UNUSED_SYMBOLS is not set
1413CONFIG_DEBUG_FS=y 1430CONFIG_DEBUG_FS=y
1414# CONFIG_HEADERS_CHECK is not set 1431# CONFIG_HEADERS_CHECK is not set
@@ -1423,7 +1440,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1423CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1440CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1424CONFIG_HAVE_DYNAMIC_FTRACE=y 1441CONFIG_HAVE_DYNAMIC_FTRACE=y
1425CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1442CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1426CONFIG_HAVE_FTRACE_SYSCALLS=y 1443CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1427CONFIG_TRACING_SUPPORT=y 1444CONFIG_TRACING_SUPPORT=y
1428# CONFIG_FTRACE is not set 1445# CONFIG_FTRACE is not set
1429# CONFIG_DYNAMIC_DEBUG is not set 1446# CONFIG_DYNAMIC_DEBUG is not set
@@ -1446,7 +1463,6 @@ CONFIG_CRYPTO=y
1446# 1463#
1447# Crypto core or helper 1464# Crypto core or helper
1448# 1465#
1449# CONFIG_CRYPTO_FIPS is not set
1450CONFIG_CRYPTO_ALGAPI=y 1466CONFIG_CRYPTO_ALGAPI=y
1451CONFIG_CRYPTO_ALGAPI2=y 1467CONFIG_CRYPTO_ALGAPI2=y
1452CONFIG_CRYPTO_AEAD2=y 1468CONFIG_CRYPTO_AEAD2=y
@@ -1487,11 +1503,13 @@ CONFIG_CRYPTO_CBC=y
1487# 1503#
1488# CONFIG_CRYPTO_HMAC is not set 1504# CONFIG_CRYPTO_HMAC is not set
1489# CONFIG_CRYPTO_XCBC is not set 1505# CONFIG_CRYPTO_XCBC is not set
1506# CONFIG_CRYPTO_VMAC is not set
1490 1507
1491# 1508#
1492# Digest 1509# Digest
1493# 1510#
1494# CONFIG_CRYPTO_CRC32C is not set 1511# CONFIG_CRYPTO_CRC32C is not set
1512# CONFIG_CRYPTO_GHASH is not set
1495# CONFIG_CRYPTO_MD4 is not set 1513# CONFIG_CRYPTO_MD4 is not set
1496# CONFIG_CRYPTO_MD5 is not set 1514# CONFIG_CRYPTO_MD5 is not set
1497# CONFIG_CRYPTO_MICHAEL_MIC is not set 1515# CONFIG_CRYPTO_MICHAEL_MIC is not set
diff --git a/arch/sh/configs/edosk7705_defconfig b/arch/sh/configs/edosk7705_defconfig
index 497414c439f4..86c9bc050629 100644
--- a/arch/sh/configs/edosk7705_defconfig
+++ b/arch/sh/configs/edosk7705_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:25:35 2009 4# Thu Sep 24 17:57:13 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,6 +13,7 @@ CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_HARDIRQS=y 13CONFIG_GENERIC_HARDIRQS=y
14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
15CONFIG_GENERIC_IRQ_PROBE=y 15CONFIG_GENERIC_IRQ_PROBE=y
16CONFIG_IRQ_PER_CPU=y
16# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
17CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
@@ -26,7 +27,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 27# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 28CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y 29CONFIG_ARCH_HAS_DEFAULT_IDLE=y
30CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
32CONFIG_CONSTRUCTORS=y
30 33
31# 34#
32# General setup 35# General setup
@@ -36,17 +39,24 @@ CONFIG_BROKEN_ON_SMP=y
36CONFIG_INIT_ENV_ARG_LIMIT=32 39CONFIG_INIT_ENV_ARG_LIMIT=32
37CONFIG_LOCALVERSION="" 40CONFIG_LOCALVERSION=""
38# CONFIG_LOCALVERSION_AUTO is not set 41# CONFIG_LOCALVERSION_AUTO is not set
42CONFIG_HAVE_KERNEL_GZIP=y
43CONFIG_HAVE_KERNEL_BZIP2=y
44CONFIG_HAVE_KERNEL_LZMA=y
45CONFIG_KERNEL_GZIP=y
46# CONFIG_KERNEL_BZIP2 is not set
47# CONFIG_KERNEL_LZMA is not set
39# CONFIG_SYSVIPC is not set 48# CONFIG_SYSVIPC is not set
40# CONFIG_BSD_PROCESS_ACCT is not set 49# CONFIG_BSD_PROCESS_ACCT is not set
41 50
42# 51#
43# RCU Subsystem 52# RCU Subsystem
44# 53#
45CONFIG_CLASSIC_RCU=y 54CONFIG_TREE_RCU=y
46# CONFIG_TREE_RCU is not set 55# CONFIG_TREE_PREEMPT_RCU is not set
47# CONFIG_PREEMPT_RCU is not set 56# CONFIG_RCU_TRACE is not set
57CONFIG_RCU_FANOUT=32
58# CONFIG_RCU_FANOUT_EXACT is not set
48# CONFIG_TREE_RCU_TRACE is not set 59# CONFIG_TREE_RCU_TRACE is not set
49# CONFIG_PREEMPT_RCU_TRACE is not set
50# CONFIG_IKCONFIG is not set 60# CONFIG_IKCONFIG is not set
51CONFIG_LOG_BUF_SHIFT=17 61CONFIG_LOG_BUF_SHIFT=17
52# CONFIG_CGROUPS is not set 62# CONFIG_CGROUPS is not set
@@ -70,18 +80,19 @@ CONFIG_EMBEDDED=y
70# CONFIG_EVENTFD is not set 80# CONFIG_EVENTFD is not set
71CONFIG_SHMEM=y 81CONFIG_SHMEM=y
72# CONFIG_AIO is not set 82# CONFIG_AIO is not set
83CONFIG_HAVE_PERF_EVENTS=y
73 84
74# 85#
75# Performance Counters 86# Kernel Performance Events And Counters
76# 87#
88# CONFIG_PERF_EVENTS is not set
89# CONFIG_PERF_COUNTERS is not set
77# CONFIG_VM_EVENT_COUNTERS is not set 90# CONFIG_VM_EVENT_COUNTERS is not set
78# CONFIG_STRIP_ASM_SYMS is not set
79# CONFIG_COMPAT_BRK is not set 91# CONFIG_COMPAT_BRK is not set
80# CONFIG_SLAB is not set 92# CONFIG_SLAB is not set
81CONFIG_SLUB=y 93CONFIG_SLUB=y
82# CONFIG_SLOB is not set 94# CONFIG_SLOB is not set
83# CONFIG_PROFILING is not set 95# CONFIG_PROFILING is not set
84# CONFIG_MARKERS is not set
85CONFIG_HAVE_OPROFILE=y 96CONFIG_HAVE_OPROFILE=y
86CONFIG_HAVE_IOREMAP_PROT=y 97CONFIG_HAVE_IOREMAP_PROT=y
87CONFIG_HAVE_KPROBES=y 98CONFIG_HAVE_KPROBES=y
@@ -89,6 +100,10 @@ CONFIG_HAVE_KRETPROBES=y
89CONFIG_HAVE_ARCH_TRACEHOOK=y 100CONFIG_HAVE_ARCH_TRACEHOOK=y
90CONFIG_HAVE_CLK=y 101CONFIG_HAVE_CLK=y
91CONFIG_HAVE_DMA_API_DEBUG=y 102CONFIG_HAVE_DMA_API_DEBUG=y
103
104#
105# GCOV-based kernel profiling
106#
92# CONFIG_SLOW_WORK is not set 107# CONFIG_SLOW_WORK is not set
93CONFIG_HAVE_GENERIC_DMA_COHERENT=y 108CONFIG_HAVE_GENERIC_DMA_COHERENT=y
94CONFIG_BASE_SMALL=1 109CONFIG_BASE_SMALL=1
@@ -125,6 +140,7 @@ CONFIG_CPU_SUBTYPE_SH7705=y
125# CONFIG_CPU_SUBTYPE_SH4_202 is not set 140# CONFIG_CPU_SUBTYPE_SH4_202 is not set
126# CONFIG_CPU_SUBTYPE_SH7723 is not set 141# CONFIG_CPU_SUBTYPE_SH7723 is not set
127# CONFIG_CPU_SUBTYPE_SH7724 is not set 142# CONFIG_CPU_SUBTYPE_SH7724 is not set
143# CONFIG_CPU_SUBTYPE_SH7757 is not set
128# CONFIG_CPU_SUBTYPE_SH7763 is not set 144# CONFIG_CPU_SUBTYPE_SH7763 is not set
129# CONFIG_CPU_SUBTYPE_SH7770 is not set 145# CONFIG_CPU_SUBTYPE_SH7770 is not set
130# CONFIG_CPU_SUBTYPE_SH7780 is not set 146# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -165,7 +181,6 @@ CONFIG_SPARSEMEM_MANUAL=y
165CONFIG_SPARSEMEM=y 181CONFIG_SPARSEMEM=y
166CONFIG_HAVE_MEMORY_PRESENT=y 182CONFIG_HAVE_MEMORY_PRESENT=y
167CONFIG_SPARSEMEM_STATIC=y 183CONFIG_SPARSEMEM_STATIC=y
168CONFIG_PAGEFLAGS_EXTENDED=y
169CONFIG_SPLIT_PTLOCK_CPUS=4 184CONFIG_SPLIT_PTLOCK_CPUS=4
170CONFIG_MIGRATION=y 185CONFIG_MIGRATION=y
171# CONFIG_PHYS_ADDR_T_64BIT is not set 186# CONFIG_PHYS_ADDR_T_64BIT is not set
@@ -173,6 +188,7 @@ CONFIG_ZONE_DMA_FLAG=0
173CONFIG_NR_QUICK=2 188CONFIG_NR_QUICK=2
174CONFIG_HAVE_MLOCK=y 189CONFIG_HAVE_MLOCK=y
175CONFIG_HAVE_MLOCKED_PAGE_BIT=y 190CONFIG_HAVE_MLOCKED_PAGE_BIT=y
191# CONFIG_KSM is not set
176CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 192CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
177 193
178# 194#
@@ -250,7 +266,8 @@ CONFIG_GUSA=y
250CONFIG_ZERO_PAGE_OFFSET=0x00001000 266CONFIG_ZERO_PAGE_OFFSET=0x00001000
251CONFIG_BOOT_LINK_OFFSET=0x00800000 267CONFIG_BOOT_LINK_OFFSET=0x00800000
252CONFIG_ENTRY_OFFSET=0x00001000 268CONFIG_ENTRY_OFFSET=0x00001000
253# CONFIG_CMDLINE_BOOL is not set 269# CONFIG_CMDLINE_OVERWRITE is not set
270# CONFIG_CMDLINE_EXTEND is not set
254 271
255# 272#
256# Bus options 273# Bus options
@@ -321,11 +338,14 @@ CONFIG_HAVE_IDE=y
321# CONFIG_R3964 is not set 338# CONFIG_R3964 is not set
322# CONFIG_I2C is not set 339# CONFIG_I2C is not set
323# CONFIG_SPI is not set 340# CONFIG_SPI is not set
341
342#
343# PPS support
344#
324# CONFIG_W1 is not set 345# CONFIG_W1 is not set
325# CONFIG_POWER_SUPPLY is not set 346# CONFIG_POWER_SUPPLY is not set
326# CONFIG_HWMON is not set 347# CONFIG_HWMON is not set
327# CONFIG_THERMAL is not set 348# CONFIG_THERMAL is not set
328# CONFIG_THERMAL_HWMON is not set
329# CONFIG_WATCHDOG is not set 349# CONFIG_WATCHDOG is not set
330CONFIG_SSB_POSSIBLE=y 350CONFIG_SSB_POSSIBLE=y
331 351
@@ -409,6 +429,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
409# CONFIG_ENABLE_MUST_CHECK is not set 429# CONFIG_ENABLE_MUST_CHECK is not set
410CONFIG_FRAME_WARN=1024 430CONFIG_FRAME_WARN=1024
411# CONFIG_MAGIC_SYSRQ is not set 431# CONFIG_MAGIC_SYSRQ is not set
432# CONFIG_STRIP_ASM_SYMS is not set
412# CONFIG_UNUSED_SYMBOLS is not set 433# CONFIG_UNUSED_SYMBOLS is not set
413# CONFIG_HEADERS_CHECK is not set 434# CONFIG_HEADERS_CHECK is not set
414# CONFIG_DEBUG_KERNEL is not set 435# CONFIG_DEBUG_KERNEL is not set
@@ -416,8 +437,11 @@ CONFIG_FRAME_WARN=1024
416# CONFIG_RCU_CPU_STALL_DETECTOR is not set 437# CONFIG_RCU_CPU_STALL_DETECTOR is not set
417# CONFIG_LATENCYTOP is not set 438# CONFIG_LATENCYTOP is not set
418CONFIG_HAVE_FUNCTION_TRACER=y 439CONFIG_HAVE_FUNCTION_TRACER=y
440CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
441CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
419CONFIG_HAVE_DYNAMIC_FTRACE=y 442CONFIG_HAVE_DYNAMIC_FTRACE=y
420CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 443CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
444CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
421CONFIG_TRACING_SUPPORT=y 445CONFIG_TRACING_SUPPORT=y
422# CONFIG_FTRACE is not set 446# CONFIG_FTRACE is not set
423# CONFIG_DMA_API_DEBUG is not set 447# CONFIG_DMA_API_DEBUG is not set
@@ -425,6 +449,7 @@ CONFIG_TRACING_SUPPORT=y
425CONFIG_HAVE_ARCH_KGDB=y 449CONFIG_HAVE_ARCH_KGDB=y
426# CONFIG_SH_STANDARD_BIOS is not set 450# CONFIG_SH_STANDARD_BIOS is not set
427# CONFIG_EARLY_SCIF_CONSOLE is not set 451# CONFIG_EARLY_SCIF_CONSOLE is not set
452# CONFIG_DWARF_UNWINDER is not set
428 453
429# 454#
430# Security options 455# Security options
@@ -449,4 +474,5 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
449CONFIG_HAS_IOMEM=y 474CONFIG_HAS_IOMEM=y
450CONFIG_HAS_IOPORT=y 475CONFIG_HAS_IOPORT=y
451CONFIG_HAS_DMA=y 476CONFIG_HAS_DMA=y
477CONFIG_HAVE_LMB=y
452CONFIG_GENERIC_ATOMIC64=y 478CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/edosk7760_defconfig b/arch/sh/configs/edosk7760_defconfig
index 77684ed91270..4c0f82b7def2 100644
--- a/arch/sh/configs/edosk7760_defconfig
+++ b/arch/sh/configs/edosk7760_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:25:55 2009 4# Thu Sep 24 17:57:30 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -27,7 +28,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 28# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 29CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y
31 34
32# 35#
33# General setup 36# General setup
@@ -38,6 +41,12 @@ CONFIG_LOCK_KERNEL=y
38CONFIG_INIT_ENV_ARG_LIMIT=32 41CONFIG_INIT_ENV_ARG_LIMIT=32
39CONFIG_LOCALVERSION="_edosk7760" 42CONFIG_LOCALVERSION="_edosk7760"
40CONFIG_LOCALVERSION_AUTO=y 43CONFIG_LOCALVERSION_AUTO=y
44CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set
41CONFIG_SWAP=y 50CONFIG_SWAP=y
42CONFIG_SYSVIPC=y 51CONFIG_SYSVIPC=y
43CONFIG_SYSVIPC_SYSCTL=y 52CONFIG_SYSVIPC_SYSCTL=y
@@ -51,11 +60,12 @@ CONFIG_BSD_PROCESS_ACCT=y
51# 60#
52# RCU Subsystem 61# RCU Subsystem
53# 62#
54CONFIG_CLASSIC_RCU=y 63CONFIG_TREE_RCU=y
55# CONFIG_TREE_RCU is not set 64# CONFIG_TREE_PREEMPT_RCU is not set
56# CONFIG_PREEMPT_RCU is not set 65# CONFIG_RCU_TRACE is not set
66CONFIG_RCU_FANOUT=32
67# CONFIG_RCU_FANOUT_EXACT is not set
57# CONFIG_TREE_RCU_TRACE is not set 68# CONFIG_TREE_RCU_TRACE is not set
58# CONFIG_PREEMPT_RCU_TRACE is not set
59CONFIG_IKCONFIG=y 69CONFIG_IKCONFIG=y
60CONFIG_IKCONFIG_PROC=y 70CONFIG_IKCONFIG_PROC=y
61CONFIG_LOG_BUF_SHIFT=17 71CONFIG_LOG_BUF_SHIFT=17
@@ -91,19 +101,20 @@ CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 102CONFIG_SHMEM=y
93CONFIG_AIO=y 103CONFIG_AIO=y
104CONFIG_HAVE_PERF_EVENTS=y
94 105
95# 106#
96# Performance Counters 107# Kernel Performance Events And Counters
97# 108#
109# CONFIG_PERF_EVENTS is not set
110# CONFIG_PERF_COUNTERS is not set
98CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
99CONFIG_SLUB_DEBUG=y 112CONFIG_SLUB_DEBUG=y
100# CONFIG_STRIP_ASM_SYMS is not set
101CONFIG_COMPAT_BRK=y 113CONFIG_COMPAT_BRK=y
102# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
103CONFIG_SLUB=y 115CONFIG_SLUB=y
104# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
105# CONFIG_PROFILING is not set 117# CONFIG_PROFILING is not set
106# CONFIG_MARKERS is not set
107CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
108# CONFIG_KPROBES is not set 119# CONFIG_KPROBES is not set
109CONFIG_HAVE_IOREMAP_PROT=y 120CONFIG_HAVE_IOREMAP_PROT=y
@@ -112,6 +123,10 @@ CONFIG_HAVE_KRETPROBES=y
112CONFIG_HAVE_ARCH_TRACEHOOK=y 123CONFIG_HAVE_ARCH_TRACEHOOK=y
113CONFIG_HAVE_CLK=y 124CONFIG_HAVE_CLK=y
114CONFIG_HAVE_DMA_API_DEBUG=y 125CONFIG_HAVE_DMA_API_DEBUG=y
126
127#
128# GCOV-based kernel profiling
129#
115# CONFIG_SLOW_WORK is not set 130# CONFIG_SLOW_WORK is not set
116CONFIG_HAVE_GENERIC_DMA_COHERENT=y 131CONFIG_HAVE_GENERIC_DMA_COHERENT=y
117CONFIG_SLABINFO=y 132CONFIG_SLABINFO=y
@@ -124,7 +139,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
124# CONFIG_MODVERSIONS is not set 139# CONFIG_MODVERSIONS is not set
125# CONFIG_MODULE_SRCVERSION_ALL is not set 140# CONFIG_MODULE_SRCVERSION_ALL is not set
126CONFIG_BLOCK=y 141CONFIG_BLOCK=y
127# CONFIG_LBD is not set 142CONFIG_LBDAF=y
128# CONFIG_BLK_DEV_BSG is not set 143# CONFIG_BLK_DEV_BSG is not set
129# CONFIG_BLK_DEV_INTEGRITY is not set 144# CONFIG_BLK_DEV_INTEGRITY is not set
130 145
@@ -171,6 +186,7 @@ CONFIG_CPU_SUBTYPE_SH7760=y
171# CONFIG_CPU_SUBTYPE_SH4_202 is not set 186# CONFIG_CPU_SUBTYPE_SH4_202 is not set
172# CONFIG_CPU_SUBTYPE_SH7723 is not set 187# CONFIG_CPU_SUBTYPE_SH7723 is not set
173# CONFIG_CPU_SUBTYPE_SH7724 is not set 188# CONFIG_CPU_SUBTYPE_SH7724 is not set
189# CONFIG_CPU_SUBTYPE_SH7757 is not set
174# CONFIG_CPU_SUBTYPE_SH7763 is not set 190# CONFIG_CPU_SUBTYPE_SH7763 is not set
175# CONFIG_CPU_SUBTYPE_SH7770 is not set 191# CONFIG_CPU_SUBTYPE_SH7770 is not set
176# CONFIG_CPU_SUBTYPE_SH7780 is not set 192# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -216,6 +232,7 @@ CONFIG_ZONE_DMA_FLAG=0
216CONFIG_NR_QUICK=2 232CONFIG_NR_QUICK=2
217CONFIG_HAVE_MLOCK=y 233CONFIG_HAVE_MLOCK=y
218CONFIG_HAVE_MLOCKED_PAGE_BIT=y 234CONFIG_HAVE_MLOCKED_PAGE_BIT=y
235# CONFIG_KSM is not set
219CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 236CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
220 237
221# 238#
@@ -304,7 +321,8 @@ CONFIG_ZERO_PAGE_OFFSET=0x00001000
304CONFIG_BOOT_LINK_OFFSET=0x02000000 321CONFIG_BOOT_LINK_OFFSET=0x02000000
305CONFIG_ENTRY_OFFSET=0x00001000 322CONFIG_ENTRY_OFFSET=0x00001000
306# CONFIG_UBC_WAKEUP is not set 323# CONFIG_UBC_WAKEUP is not set
307CONFIG_CMDLINE_BOOL=y 324CONFIG_CMDLINE_OVERWRITE=y
325# CONFIG_CMDLINE_EXTEND is not set
308CONFIG_CMDLINE="mem=64M console=ttySC2,115200 root=/dev/nfs rw nfsroot=192.168.0.3:/scripts/filesys ip=192.168.0.4" 326CONFIG_CMDLINE="mem=64M console=ttySC2,115200 root=/dev/nfs rw nfsroot=192.168.0.3:/scripts/filesys ip=192.168.0.4"
309 327
310# 328#
@@ -367,6 +385,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
367# CONFIG_NETFILTER is not set 385# CONFIG_NETFILTER is not set
368# CONFIG_IP_DCCP is not set 386# CONFIG_IP_DCCP is not set
369# CONFIG_IP_SCTP is not set 387# CONFIG_IP_SCTP is not set
388# CONFIG_RDS is not set
370# CONFIG_TIPC is not set 389# CONFIG_TIPC is not set
371# CONFIG_ATM is not set 390# CONFIG_ATM is not set
372# CONFIG_BRIDGE is not set 391# CONFIG_BRIDGE is not set
@@ -396,6 +415,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
396# CONFIG_AF_RXRPC is not set 415# CONFIG_AF_RXRPC is not set
397CONFIG_WIRELESS=y 416CONFIG_WIRELESS=y
398# CONFIG_CFG80211 is not set 417# CONFIG_CFG80211 is not set
418CONFIG_CFG80211_DEFAULT_PS_VALUE=0
399# CONFIG_WIRELESS_OLD_REGULATORY is not set 419# CONFIG_WIRELESS_OLD_REGULATORY is not set
400# CONFIG_WIRELESS_EXT is not set 420# CONFIG_WIRELESS_EXT is not set
401# CONFIG_LIB80211 is not set 421# CONFIG_LIB80211 is not set
@@ -403,7 +423,6 @@ CONFIG_WIRELESS=y
403# 423#
404# CFG80211 needs to be enabled for MAC80211 424# CFG80211 needs to be enabled for MAC80211
405# 425#
406CONFIG_MAC80211_DEFAULT_PS_VALUE=0
407# CONFIG_WIMAX is not set 426# CONFIG_WIMAX is not set
408# CONFIG_RFKILL is not set 427# CONFIG_RFKILL is not set
409# CONFIG_NET_9P is not set 428# CONFIG_NET_9P is not set
@@ -416,6 +435,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
416# Generic Driver Options 435# Generic Driver Options
417# 436#
418CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 437CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
438# CONFIG_DEVTMPFS is not set
419CONFIG_STANDALONE=y 439CONFIG_STANDALONE=y
420CONFIG_PREVENT_FIRMWARE_BUILD=y 440CONFIG_PREVENT_FIRMWARE_BUILD=y
421# CONFIG_FW_LOADER is not set 441# CONFIG_FW_LOADER is not set
@@ -426,9 +446,9 @@ CONFIG_DEBUG_DEVRES=y
426CONFIG_MTD=y 446CONFIG_MTD=y
427CONFIG_MTD_DEBUG=y 447CONFIG_MTD_DEBUG=y
428CONFIG_MTD_DEBUG_VERBOSE=0 448CONFIG_MTD_DEBUG_VERBOSE=0
449# CONFIG_MTD_TESTS is not set
429CONFIG_MTD_CONCAT=y 450CONFIG_MTD_CONCAT=y
430CONFIG_MTD_PARTITIONS=y 451CONFIG_MTD_PARTITIONS=y
431# CONFIG_MTD_TESTS is not set
432# CONFIG_MTD_REDBOOT_PARTS is not set 452# CONFIG_MTD_REDBOOT_PARTS is not set
433CONFIG_MTD_CMDLINE_PARTS=y 453CONFIG_MTD_CMDLINE_PARTS=y
434# CONFIG_MTD_AR7_PARTS is not set 454# CONFIG_MTD_AR7_PARTS is not set
@@ -563,10 +583,7 @@ CONFIG_SMC91X=y
563# CONFIG_KS8842 is not set 583# CONFIG_KS8842 is not set
564# CONFIG_NETDEV_1000 is not set 584# CONFIG_NETDEV_1000 is not set
565# CONFIG_NETDEV_10000 is not set 585# CONFIG_NETDEV_10000 is not set
566 586CONFIG_WLAN=y
567#
568# Wireless LAN
569#
570# CONFIG_WLAN_PRE80211 is not set 587# CONFIG_WLAN_PRE80211 is not set
571# CONFIG_WLAN_80211 is not set 588# CONFIG_WLAN_80211 is not set
572 589
@@ -649,6 +666,7 @@ CONFIG_HW_RANDOM=y
649# CONFIG_TCG_TPM is not set 666# CONFIG_TCG_TPM is not set
650CONFIG_I2C=y 667CONFIG_I2C=y
651CONFIG_I2C_BOARDINFO=y 668CONFIG_I2C_BOARDINFO=y
669CONFIG_I2C_COMPAT=y
652CONFIG_I2C_CHARDEV=y 670CONFIG_I2C_CHARDEV=y
653CONFIG_I2C_HELPER_AUTO=y 671CONFIG_I2C_HELPER_AUTO=y
654 672
@@ -659,6 +677,7 @@ CONFIG_I2C_HELPER_AUTO=y
659# 677#
660# I2C system bus drivers (mostly embedded / system-on-chip) 678# I2C system bus drivers (mostly embedded / system-on-chip)
661# 679#
680# CONFIG_I2C_DESIGNWARE is not set
662# CONFIG_I2C_OCORES is not set 681# CONFIG_I2C_OCORES is not set
663CONFIG_I2C_SH7760=y 682CONFIG_I2C_SH7760=y
664# CONFIG_I2C_SH_MOBILE is not set 683# CONFIG_I2C_SH_MOBILE is not set
@@ -680,20 +699,21 @@ CONFIG_I2C_SH7760=y
680# Miscellaneous I2C Chip support 699# Miscellaneous I2C Chip support
681# 700#
682# CONFIG_DS1682 is not set 701# CONFIG_DS1682 is not set
683# CONFIG_SENSORS_PCF8574 is not set
684# CONFIG_PCF8575 is not set
685# CONFIG_SENSORS_PCA9539 is not set
686# CONFIG_SENSORS_TSL2550 is not set 702# CONFIG_SENSORS_TSL2550 is not set
687CONFIG_I2C_DEBUG_CORE=y 703CONFIG_I2C_DEBUG_CORE=y
688CONFIG_I2C_DEBUG_ALGO=y 704CONFIG_I2C_DEBUG_ALGO=y
689CONFIG_I2C_DEBUG_BUS=y 705CONFIG_I2C_DEBUG_BUS=y
690CONFIG_I2C_DEBUG_CHIP=y 706CONFIG_I2C_DEBUG_CHIP=y
691# CONFIG_SPI is not set 707# CONFIG_SPI is not set
708
709#
710# PPS support
711#
712# CONFIG_PPS is not set
692# CONFIG_W1 is not set 713# CONFIG_W1 is not set
693# CONFIG_POWER_SUPPLY is not set 714# CONFIG_POWER_SUPPLY is not set
694# CONFIG_HWMON is not set 715# CONFIG_HWMON is not set
695# CONFIG_THERMAL is not set 716# CONFIG_THERMAL is not set
696# CONFIG_THERMAL_HWMON is not set
697# CONFIG_WATCHDOG is not set 717# CONFIG_WATCHDOG is not set
698CONFIG_SSB_POSSIBLE=y 718CONFIG_SSB_POSSIBLE=y
699 719
@@ -712,8 +732,10 @@ CONFIG_SSB_POSSIBLE=y
712# CONFIG_MFD_TMIO is not set 732# CONFIG_MFD_TMIO is not set
713# CONFIG_PMIC_DA903X is not set 733# CONFIG_PMIC_DA903X is not set
714# CONFIG_MFD_WM8400 is not set 734# CONFIG_MFD_WM8400 is not set
735# CONFIG_MFD_WM831X is not set
715# CONFIG_MFD_WM8350_I2C is not set 736# CONFIG_MFD_WM8350_I2C is not set
716# CONFIG_MFD_PCF50633 is not set 737# CONFIG_MFD_PCF50633 is not set
738# CONFIG_AB3100_CORE is not set
717# CONFIG_REGULATOR is not set 739# CONFIG_REGULATOR is not set
718# CONFIG_MEDIA_SUPPORT is not set 740# CONFIG_MEDIA_SUPPORT is not set
719 741
@@ -837,8 +859,10 @@ CONFIG_FS_MBCACHE=y
837# CONFIG_JFS_FS is not set 859# CONFIG_JFS_FS is not set
838CONFIG_FS_POSIX_ACL=y 860CONFIG_FS_POSIX_ACL=y
839# CONFIG_XFS_FS is not set 861# CONFIG_XFS_FS is not set
862# CONFIG_GFS2_FS is not set
840# CONFIG_OCFS2_FS is not set 863# CONFIG_OCFS2_FS is not set
841# CONFIG_BTRFS_FS is not set 864# CONFIG_BTRFS_FS is not set
865# CONFIG_NILFS2_FS is not set
842CONFIG_FILE_LOCKING=y 866CONFIG_FILE_LOCKING=y
843CONFIG_FSNOTIFY=y 867CONFIG_FSNOTIFY=y
844CONFIG_DNOTIFY=y 868CONFIG_DNOTIFY=y
@@ -900,7 +924,6 @@ CONFIG_MISC_FILESYSTEMS=y
900# CONFIG_ROMFS_FS is not set 924# CONFIG_ROMFS_FS is not set
901# CONFIG_SYSV_FS is not set 925# CONFIG_SYSV_FS is not set
902# CONFIG_UFS_FS is not set 926# CONFIG_UFS_FS is not set
903# CONFIG_NILFS2_FS is not set
904CONFIG_NETWORK_FILESYSTEMS=y 927CONFIG_NETWORK_FILESYSTEMS=y
905CONFIG_NFS_FS=y 928CONFIG_NFS_FS=y
906# CONFIG_NFS_V3 is not set 929# CONFIG_NFS_V3 is not set
@@ -974,6 +997,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
974# CONFIG_ENABLE_MUST_CHECK is not set 997# CONFIG_ENABLE_MUST_CHECK is not set
975CONFIG_FRAME_WARN=1024 998CONFIG_FRAME_WARN=1024
976CONFIG_MAGIC_SYSRQ=y 999CONFIG_MAGIC_SYSRQ=y
1000# CONFIG_STRIP_ASM_SYMS is not set
977CONFIG_UNUSED_SYMBOLS=y 1001CONFIG_UNUSED_SYMBOLS=y
978# CONFIG_DEBUG_FS is not set 1002# CONFIG_DEBUG_FS is not set
979# CONFIG_HEADERS_CHECK is not set 1003# CONFIG_HEADERS_CHECK is not set
@@ -1010,18 +1034,23 @@ CONFIG_DEBUG_INFO=y
1010# CONFIG_DEBUG_LIST is not set 1034# CONFIG_DEBUG_LIST is not set
1011# CONFIG_DEBUG_SG is not set 1035# CONFIG_DEBUG_SG is not set
1012# CONFIG_DEBUG_NOTIFIERS is not set 1036# CONFIG_DEBUG_NOTIFIERS is not set
1037# CONFIG_DEBUG_CREDENTIALS is not set
1013# CONFIG_FRAME_POINTER is not set 1038# CONFIG_FRAME_POINTER is not set
1014# CONFIG_RCU_TORTURE_TEST is not set 1039# CONFIG_RCU_TORTURE_TEST is not set
1015# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1040# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1016# CONFIG_BACKTRACE_SELF_TEST is not set 1041# CONFIG_BACKTRACE_SELF_TEST is not set
1017# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1042# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1043# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1018# CONFIG_FAULT_INJECTION is not set 1044# CONFIG_FAULT_INJECTION is not set
1019# CONFIG_LATENCYTOP is not set 1045# CONFIG_LATENCYTOP is not set
1020CONFIG_SYSCTL_SYSCALL_CHECK=y 1046CONFIG_SYSCTL_SYSCALL_CHECK=y
1021# CONFIG_PAGE_POISONING is not set 1047# CONFIG_PAGE_POISONING is not set
1022CONFIG_HAVE_FUNCTION_TRACER=y 1048CONFIG_HAVE_FUNCTION_TRACER=y
1049CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1050CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1023CONFIG_HAVE_DYNAMIC_FTRACE=y 1051CONFIG_HAVE_DYNAMIC_FTRACE=y
1024CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1052CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1053CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1025CONFIG_TRACING_SUPPORT=y 1054CONFIG_TRACING_SUPPORT=y
1026CONFIG_FTRACE=y 1055CONFIG_FTRACE=y
1027# CONFIG_FUNCTION_TRACER is not set 1056# CONFIG_FUNCTION_TRACER is not set
@@ -1029,6 +1058,7 @@ CONFIG_FTRACE=y
1029# CONFIG_PREEMPT_TRACER is not set 1058# CONFIG_PREEMPT_TRACER is not set
1030# CONFIG_SCHED_TRACER is not set 1059# CONFIG_SCHED_TRACER is not set
1031# CONFIG_ENABLE_DEFAULT_TRACERS is not set 1060# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1061# CONFIG_FTRACE_SYSCALLS is not set
1032# CONFIG_BOOT_TRACER is not set 1062# CONFIG_BOOT_TRACER is not set
1033CONFIG_BRANCH_PROFILE_NONE=y 1063CONFIG_BRANCH_PROFILE_NONE=y
1034# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1064# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -1045,11 +1075,11 @@ CONFIG_HAVE_ARCH_KGDB=y
1045CONFIG_EARLY_SCIF_CONSOLE=y 1075CONFIG_EARLY_SCIF_CONSOLE=y
1046CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000 1076CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000
1047CONFIG_EARLY_PRINTK=y 1077CONFIG_EARLY_PRINTK=y
1048# CONFIG_DEBUG_BOOTMEM is not set 1078# CONFIG_STACK_DEBUG is not set
1049CONFIG_DEBUG_STACKOVERFLOW=y
1050# CONFIG_DEBUG_STACK_USAGE is not set 1079# CONFIG_DEBUG_STACK_USAGE is not set
1051# CONFIG_4KSTACKS is not set 1080# CONFIG_4KSTACKS is not set
1052CONFIG_DUMP_CODE=y 1081CONFIG_DUMP_CODE=y
1082# CONFIG_DWARF_UNWINDER is not set
1053# CONFIG_SH_NO_BSS_INIT is not set 1083# CONFIG_SH_NO_BSS_INIT is not set
1054 1084
1055# 1085#
@@ -1064,7 +1094,6 @@ CONFIG_CRYPTO=y
1064# 1094#
1065# Crypto core or helper 1095# Crypto core or helper
1066# 1096#
1067# CONFIG_CRYPTO_FIPS is not set
1068CONFIG_CRYPTO_ALGAPI=y 1097CONFIG_CRYPTO_ALGAPI=y
1069CONFIG_CRYPTO_ALGAPI2=y 1098CONFIG_CRYPTO_ALGAPI2=y
1070CONFIG_CRYPTO_HASH=y 1099CONFIG_CRYPTO_HASH=y
@@ -1100,11 +1129,13 @@ CONFIG_CRYPTO_HASH2=y
1100# 1129#
1101# CONFIG_CRYPTO_HMAC is not set 1130# CONFIG_CRYPTO_HMAC is not set
1102# CONFIG_CRYPTO_XCBC is not set 1131# CONFIG_CRYPTO_XCBC is not set
1132# CONFIG_CRYPTO_VMAC is not set
1103 1133
1104# 1134#
1105# Digest 1135# Digest
1106# 1136#
1107# CONFIG_CRYPTO_CRC32C is not set 1137# CONFIG_CRYPTO_CRC32C is not set
1138# CONFIG_CRYPTO_GHASH is not set
1108# CONFIG_CRYPTO_MD4 is not set 1139# CONFIG_CRYPTO_MD4 is not set
1109CONFIG_CRYPTO_MD5=y 1140CONFIG_CRYPTO_MD5=y
1110# CONFIG_CRYPTO_MICHAEL_MIC is not set 1141# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1168,5 +1199,6 @@ CONFIG_DECOMPRESS_GZIP=y
1168CONFIG_HAS_IOMEM=y 1199CONFIG_HAS_IOMEM=y
1169CONFIG_HAS_IOPORT=y 1200CONFIG_HAS_IOPORT=y
1170CONFIG_HAS_DMA=y 1201CONFIG_HAS_DMA=y
1202CONFIG_HAVE_LMB=y
1171CONFIG_NLATTR=y 1203CONFIG_NLATTR=y
1172CONFIG_GENERIC_ATOMIC64=y 1204CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/espt_defconfig b/arch/sh/configs/espt_defconfig
index 881128eeab35..9b785517abcf 100644
--- a/arch/sh/configs/espt_defconfig
+++ b/arch/sh/configs/espt_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:27:21 2009 4# Thu Sep 24 17:58:18 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -27,7 +28,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 28# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 29CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y
31 34
32# 35#
33# General setup 36# General setup
@@ -37,6 +40,12 @@ CONFIG_BROKEN_ON_SMP=y
37CONFIG_INIT_ENV_ARG_LIMIT=32 40CONFIG_INIT_ENV_ARG_LIMIT=32
38CONFIG_LOCALVERSION="" 41CONFIG_LOCALVERSION=""
39CONFIG_LOCALVERSION_AUTO=y 42CONFIG_LOCALVERSION_AUTO=y
43CONFIG_HAVE_KERNEL_GZIP=y
44CONFIG_HAVE_KERNEL_BZIP2=y
45CONFIG_HAVE_KERNEL_LZMA=y
46CONFIG_KERNEL_GZIP=y
47# CONFIG_KERNEL_BZIP2 is not set
48# CONFIG_KERNEL_LZMA is not set
40CONFIG_SWAP=y 49CONFIG_SWAP=y
41CONFIG_SYSVIPC=y 50CONFIG_SYSVIPC=y
42CONFIG_SYSVIPC_SYSCTL=y 51CONFIG_SYSVIPC_SYSCTL=y
@@ -48,11 +57,12 @@ CONFIG_SYSVIPC_SYSCTL=y
48# 57#
49# RCU Subsystem 58# RCU Subsystem
50# 59#
51CONFIG_CLASSIC_RCU=y 60CONFIG_TREE_RCU=y
52# CONFIG_TREE_RCU is not set 61# CONFIG_TREE_PREEMPT_RCU is not set
53# CONFIG_PREEMPT_RCU is not set 62# CONFIG_RCU_TRACE is not set
63CONFIG_RCU_FANOUT=32
64# CONFIG_RCU_FANOUT_EXACT is not set
54# CONFIG_TREE_RCU_TRACE is not set 65# CONFIG_TREE_RCU_TRACE is not set
55# CONFIG_PREEMPT_RCU_TRACE is not set
56CONFIG_IKCONFIG=y 66CONFIG_IKCONFIG=y
57CONFIG_IKCONFIG_PROC=y 67CONFIG_IKCONFIG_PROC=y
58CONFIG_LOG_BUF_SHIFT=14 68CONFIG_LOG_BUF_SHIFT=14
@@ -92,19 +102,21 @@ CONFIG_TIMERFD=y
92CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
93CONFIG_SHMEM=y 103CONFIG_SHMEM=y
94CONFIG_AIO=y 104CONFIG_AIO=y
105CONFIG_HAVE_PERF_EVENTS=y
95 106
96# 107#
97# Performance Counters 108# Kernel Performance Events And Counters
98# 109#
110CONFIG_PERF_EVENTS=y
111CONFIG_EVENT_PROFILE=y
112# CONFIG_PERF_COUNTERS is not set
99CONFIG_VM_EVENT_COUNTERS=y 113CONFIG_VM_EVENT_COUNTERS=y
100# CONFIG_STRIP_ASM_SYMS is not set
101CONFIG_COMPAT_BRK=y 114CONFIG_COMPAT_BRK=y
102CONFIG_SLAB=y 115CONFIG_SLAB=y
103# CONFIG_SLUB is not set 116# CONFIG_SLUB is not set
104# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
105CONFIG_PROFILING=y 118CONFIG_PROFILING=y
106CONFIG_TRACEPOINTS=y 119CONFIG_TRACEPOINTS=y
107CONFIG_MARKERS=y
108CONFIG_OPROFILE=y 120CONFIG_OPROFILE=y
109CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
110# CONFIG_KPROBES is not set 122# CONFIG_KPROBES is not set
@@ -114,6 +126,11 @@ CONFIG_HAVE_KRETPROBES=y
114CONFIG_HAVE_ARCH_TRACEHOOK=y 126CONFIG_HAVE_ARCH_TRACEHOOK=y
115CONFIG_HAVE_CLK=y 127CONFIG_HAVE_CLK=y
116CONFIG_HAVE_DMA_API_DEBUG=y 128CONFIG_HAVE_DMA_API_DEBUG=y
129
130#
131# GCOV-based kernel profiling
132#
133# CONFIG_GCOV_KERNEL is not set
117# CONFIG_SLOW_WORK is not set 134# CONFIG_SLOW_WORK is not set
118CONFIG_HAVE_GENERIC_DMA_COHERENT=y 135CONFIG_HAVE_GENERIC_DMA_COHERENT=y
119CONFIG_SLABINFO=y 136CONFIG_SLABINFO=y
@@ -125,7 +142,7 @@ CONFIG_MODULES=y
125# CONFIG_MODVERSIONS is not set 142# CONFIG_MODVERSIONS is not set
126# CONFIG_MODULE_SRCVERSION_ALL is not set 143# CONFIG_MODULE_SRCVERSION_ALL is not set
127CONFIG_BLOCK=y 144CONFIG_BLOCK=y
128# CONFIG_LBD is not set 145CONFIG_LBDAF=y
129# CONFIG_BLK_DEV_BSG is not set 146# CONFIG_BLK_DEV_BSG is not set
130# CONFIG_BLK_DEV_INTEGRITY is not set 147# CONFIG_BLK_DEV_INTEGRITY is not set
131 148
@@ -173,6 +190,7 @@ CONFIG_CPU_SH4A=y
173# CONFIG_CPU_SUBTYPE_SH4_202 is not set 190# CONFIG_CPU_SUBTYPE_SH4_202 is not set
174# CONFIG_CPU_SUBTYPE_SH7723 is not set 191# CONFIG_CPU_SUBTYPE_SH7723 is not set
175# CONFIG_CPU_SUBTYPE_SH7724 is not set 192# CONFIG_CPU_SUBTYPE_SH7724 is not set
193# CONFIG_CPU_SUBTYPE_SH7757 is not set
176CONFIG_CPU_SUBTYPE_SH7763=y 194CONFIG_CPU_SUBTYPE_SH7763=y
177# CONFIG_CPU_SUBTYPE_SH7770 is not set 195# CONFIG_CPU_SUBTYPE_SH7770 is not set
178# CONFIG_CPU_SUBTYPE_SH7780 is not set 196# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -214,7 +232,6 @@ CONFIG_SPARSEMEM=y
214CONFIG_HAVE_MEMORY_PRESENT=y 232CONFIG_HAVE_MEMORY_PRESENT=y
215CONFIG_SPARSEMEM_STATIC=y 233CONFIG_SPARSEMEM_STATIC=y
216# CONFIG_MEMORY_HOTPLUG is not set 234# CONFIG_MEMORY_HOTPLUG is not set
217CONFIG_PAGEFLAGS_EXTENDED=y
218CONFIG_SPLIT_PTLOCK_CPUS=4 235CONFIG_SPLIT_PTLOCK_CPUS=4
219CONFIG_MIGRATION=y 236CONFIG_MIGRATION=y
220# CONFIG_PHYS_ADDR_T_64BIT is not set 237# CONFIG_PHYS_ADDR_T_64BIT is not set
@@ -222,6 +239,7 @@ CONFIG_ZONE_DMA_FLAG=0
222CONFIG_NR_QUICK=2 239CONFIG_NR_QUICK=2
223CONFIG_HAVE_MLOCK=y 240CONFIG_HAVE_MLOCK=y
224CONFIG_HAVE_MLOCKED_PAGE_BIT=y 241CONFIG_HAVE_MLOCKED_PAGE_BIT=y
242# CONFIG_KSM is not set
225CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 243CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
226 244
227# 245#
@@ -303,7 +321,8 @@ CONFIG_GUSA=y
303CONFIG_ZERO_PAGE_OFFSET=0x00001000 321CONFIG_ZERO_PAGE_OFFSET=0x00001000
304CONFIG_BOOT_LINK_OFFSET=0x00800000 322CONFIG_BOOT_LINK_OFFSET=0x00800000
305CONFIG_ENTRY_OFFSET=0x00001000 323CONFIG_ENTRY_OFFSET=0x00001000
306CONFIG_CMDLINE_BOOL=y 324CONFIG_CMDLINE_OVERWRITE=y
325# CONFIG_CMDLINE_EXTEND is not set
307CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/nfs ip=bootp" 326CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/nfs ip=bootp"
308 327
309# 328#
@@ -371,6 +390,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
371# CONFIG_NETFILTER is not set 390# CONFIG_NETFILTER is not set
372# CONFIG_IP_DCCP is not set 391# CONFIG_IP_DCCP is not set
373# CONFIG_IP_SCTP is not set 392# CONFIG_IP_SCTP is not set
393# CONFIG_RDS is not set
374# CONFIG_TIPC is not set 394# CONFIG_TIPC is not set
375# CONFIG_ATM is not set 395# CONFIG_ATM is not set
376# CONFIG_BRIDGE is not set 396# CONFIG_BRIDGE is not set
@@ -412,6 +432,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
412# Generic Driver Options 432# Generic Driver Options
413# 433#
414CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 434CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
435# CONFIG_DEVTMPFS is not set
415CONFIG_STANDALONE=y 436CONFIG_STANDALONE=y
416CONFIG_PREVENT_FIRMWARE_BUILD=y 437CONFIG_PREVENT_FIRMWARE_BUILD=y
417CONFIG_FW_LOADER=y 438CONFIG_FW_LOADER=y
@@ -421,9 +442,9 @@ CONFIG_EXTRA_FIRMWARE=""
421# CONFIG_CONNECTOR is not set 442# CONFIG_CONNECTOR is not set
422CONFIG_MTD=y 443CONFIG_MTD=y
423# CONFIG_MTD_DEBUG is not set 444# CONFIG_MTD_DEBUG is not set
445# CONFIG_MTD_TESTS is not set
424# CONFIG_MTD_CONCAT is not set 446# CONFIG_MTD_CONCAT is not set
425CONFIG_MTD_PARTITIONS=y 447CONFIG_MTD_PARTITIONS=y
426# CONFIG_MTD_TESTS is not set
427# CONFIG_MTD_REDBOOT_PARTS is not set 448# CONFIG_MTD_REDBOOT_PARTS is not set
428CONFIG_MTD_CMDLINE_PARTS=y 449CONFIG_MTD_CMDLINE_PARTS=y
429# CONFIG_MTD_AR7_PARTS is not set 450# CONFIG_MTD_AR7_PARTS is not set
@@ -477,6 +498,7 @@ CONFIG_MTD_CFI_UTIL=y
477CONFIG_MTD_COMPLEX_MAPPINGS=y 498CONFIG_MTD_COMPLEX_MAPPINGS=y
478CONFIG_MTD_PHYSMAP=y 499CONFIG_MTD_PHYSMAP=y
479# CONFIG_MTD_PHYSMAP_COMPAT is not set 500# CONFIG_MTD_PHYSMAP_COMPAT is not set
501# CONFIG_MTD_GPIO_ADDR is not set
480# CONFIG_MTD_PLATRAM is not set 502# CONFIG_MTD_PLATRAM is not set
481 503
482# 504#
@@ -554,7 +576,6 @@ CONFIG_SCSI_WAIT_SCAN=m
554# CONFIG_SCSI_SRP_ATTRS is not set 576# CONFIG_SCSI_SRP_ATTRS is not set
555CONFIG_SCSI_LOWLEVEL=y 577CONFIG_SCSI_LOWLEVEL=y
556# CONFIG_ISCSI_TCP is not set 578# CONFIG_ISCSI_TCP is not set
557# CONFIG_SCSI_BNX2_ISCSI is not set
558# CONFIG_LIBFC is not set 579# CONFIG_LIBFC is not set
559# CONFIG_LIBFCOE is not set 580# CONFIG_LIBFCOE is not set
560# CONFIG_SCSI_DEBUG is not set 581# CONFIG_SCSI_DEBUG is not set
@@ -610,10 +631,7 @@ CONFIG_SH_ETH=y
610# CONFIG_KS8842 is not set 631# CONFIG_KS8842 is not set
611# CONFIG_NETDEV_1000 is not set 632# CONFIG_NETDEV_1000 is not set
612# CONFIG_NETDEV_10000 is not set 633# CONFIG_NETDEV_10000 is not set
613 634CONFIG_WLAN=y
614#
615# Wireless LAN
616#
617# CONFIG_WLAN_PRE80211 is not set 635# CONFIG_WLAN_PRE80211 is not set
618# CONFIG_WLAN_80211 is not set 636# CONFIG_WLAN_80211 is not set
619 637
@@ -705,11 +723,15 @@ CONFIG_HW_RANDOM=y
705# CONFIG_TCG_TPM is not set 723# CONFIG_TCG_TPM is not set
706# CONFIG_I2C is not set 724# CONFIG_I2C is not set
707# CONFIG_SPI is not set 725# CONFIG_SPI is not set
726
727#
728# PPS support
729#
730# CONFIG_PPS is not set
708# CONFIG_W1 is not set 731# CONFIG_W1 is not set
709# CONFIG_POWER_SUPPLY is not set 732# CONFIG_POWER_SUPPLY is not set
710# CONFIG_HWMON is not set 733# CONFIG_HWMON is not set
711# CONFIG_THERMAL is not set 734# CONFIG_THERMAL is not set
712# CONFIG_THERMAL_HWMON is not set
713# CONFIG_WATCHDOG is not set 735# CONFIG_WATCHDOG is not set
714CONFIG_SSB_POSSIBLE=y 736CONFIG_SSB_POSSIBLE=y
715 737
@@ -819,6 +841,7 @@ CONFIG_USB_MON=y
819# CONFIG_USB_OXU210HP_HCD is not set 841# CONFIG_USB_OXU210HP_HCD is not set
820# CONFIG_USB_ISP116X_HCD is not set 842# CONFIG_USB_ISP116X_HCD is not set
821# CONFIG_USB_ISP1760_HCD is not set 843# CONFIG_USB_ISP1760_HCD is not set
844# CONFIG_USB_ISP1362_HCD is not set
822CONFIG_USB_OHCI_HCD=y 845CONFIG_USB_OHCI_HCD=y
823# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 846# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
824# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 847# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -888,6 +911,7 @@ CONFIG_USB_STORAGE=y
888# CONFIG_USB_LD is not set 911# CONFIG_USB_LD is not set
889# CONFIG_USB_TRANCEVIBRATOR is not set 912# CONFIG_USB_TRANCEVIBRATOR is not set
890# CONFIG_USB_IOWARRIOR is not set 913# CONFIG_USB_IOWARRIOR is not set
914# CONFIG_USB_TEST is not set
891# CONFIG_USB_ISIGHTFW is not set 915# CONFIG_USB_ISIGHTFW is not set
892# CONFIG_USB_VST is not set 916# CONFIG_USB_VST is not set
893# CONFIG_USB_GADGET is not set 917# CONFIG_USB_GADGET is not set
@@ -930,8 +954,10 @@ CONFIG_FS_MBCACHE=y
930# CONFIG_JFS_FS is not set 954# CONFIG_JFS_FS is not set
931CONFIG_FS_POSIX_ACL=y 955CONFIG_FS_POSIX_ACL=y
932# CONFIG_XFS_FS is not set 956# CONFIG_XFS_FS is not set
957# CONFIG_GFS2_FS is not set
933# CONFIG_OCFS2_FS is not set 958# CONFIG_OCFS2_FS is not set
934# CONFIG_BTRFS_FS is not set 959# CONFIG_BTRFS_FS is not set
960# CONFIG_NILFS2_FS is not set
935CONFIG_FILE_LOCKING=y 961CONFIG_FILE_LOCKING=y
936CONFIG_FSNOTIFY=y 962CONFIG_FSNOTIFY=y
937CONFIG_DNOTIFY=y 963CONFIG_DNOTIFY=y
@@ -997,7 +1023,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
997CONFIG_ROMFS_ON_BLOCK=y 1023CONFIG_ROMFS_ON_BLOCK=y
998# CONFIG_SYSV_FS is not set 1024# CONFIG_SYSV_FS is not set
999# CONFIG_UFS_FS is not set 1025# CONFIG_UFS_FS is not set
1000# CONFIG_NILFS2_FS is not set
1001CONFIG_NETWORK_FILESYSTEMS=y 1026CONFIG_NETWORK_FILESYSTEMS=y
1002CONFIG_NFS_FS=y 1027CONFIG_NFS_FS=y
1003# CONFIG_NFS_V3 is not set 1028# CONFIG_NFS_V3 is not set
@@ -1071,6 +1096,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1071# CONFIG_ENABLE_MUST_CHECK is not set 1096# CONFIG_ENABLE_MUST_CHECK is not set
1072CONFIG_FRAME_WARN=1024 1097CONFIG_FRAME_WARN=1024
1073# CONFIG_MAGIC_SYSRQ is not set 1098# CONFIG_MAGIC_SYSRQ is not set
1099# CONFIG_STRIP_ASM_SYMS is not set
1074# CONFIG_UNUSED_SYMBOLS is not set 1100# CONFIG_UNUSED_SYMBOLS is not set
1075CONFIG_DEBUG_FS=y 1101CONFIG_DEBUG_FS=y
1076# CONFIG_HEADERS_CHECK is not set 1102# CONFIG_HEADERS_CHECK is not set
@@ -1082,11 +1108,15 @@ CONFIG_STACKTRACE=y
1082# CONFIG_LATENCYTOP is not set 1108# CONFIG_LATENCYTOP is not set
1083CONFIG_NOP_TRACER=y 1109CONFIG_NOP_TRACER=y
1084CONFIG_HAVE_FUNCTION_TRACER=y 1110CONFIG_HAVE_FUNCTION_TRACER=y
1111CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1112CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1085CONFIG_HAVE_DYNAMIC_FTRACE=y 1113CONFIG_HAVE_DYNAMIC_FTRACE=y
1086CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1114CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1115CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1087CONFIG_RING_BUFFER=y 1116CONFIG_RING_BUFFER=y
1088CONFIG_EVENT_TRACING=y 1117CONFIG_EVENT_TRACING=y
1089CONFIG_CONTEXT_SWITCH_TRACER=y 1118CONFIG_CONTEXT_SWITCH_TRACER=y
1119CONFIG_RING_BUFFER_ALLOW_SWAP=y
1090CONFIG_TRACING=y 1120CONFIG_TRACING=y
1091CONFIG_TRACING_SUPPORT=y 1121CONFIG_TRACING_SUPPORT=y
1092# CONFIG_FTRACE is not set 1122# CONFIG_FTRACE is not set
@@ -1096,6 +1126,7 @@ CONFIG_TRACING_SUPPORT=y
1096CONFIG_HAVE_ARCH_KGDB=y 1126CONFIG_HAVE_ARCH_KGDB=y
1097# CONFIG_SH_STANDARD_BIOS is not set 1127# CONFIG_SH_STANDARD_BIOS is not set
1098# CONFIG_EARLY_SCIF_CONSOLE is not set 1128# CONFIG_EARLY_SCIF_CONSOLE is not set
1129# CONFIG_DWARF_UNWINDER is not set
1099 1130
1100# 1131#
1101# Security options 1132# Security options
@@ -1109,7 +1140,6 @@ CONFIG_CRYPTO=y
1109# 1140#
1110# Crypto core or helper 1141# Crypto core or helper
1111# 1142#
1112# CONFIG_CRYPTO_FIPS is not set
1113# CONFIG_CRYPTO_MANAGER is not set 1143# CONFIG_CRYPTO_MANAGER is not set
1114# CONFIG_CRYPTO_MANAGER2 is not set 1144# CONFIG_CRYPTO_MANAGER2 is not set
1115# CONFIG_CRYPTO_GF128MUL is not set 1145# CONFIG_CRYPTO_GF128MUL is not set
@@ -1141,11 +1171,13 @@ CONFIG_CRYPTO=y
1141# 1171#
1142# CONFIG_CRYPTO_HMAC is not set 1172# CONFIG_CRYPTO_HMAC is not set
1143# CONFIG_CRYPTO_XCBC is not set 1173# CONFIG_CRYPTO_XCBC is not set
1174# CONFIG_CRYPTO_VMAC is not set
1144 1175
1145# 1176#
1146# Digest 1177# Digest
1147# 1178#
1148# CONFIG_CRYPTO_CRC32C is not set 1179# CONFIG_CRYPTO_CRC32C is not set
1180# CONFIG_CRYPTO_GHASH is not set
1149# CONFIG_CRYPTO_MD4 is not set 1181# CONFIG_CRYPTO_MD4 is not set
1150# CONFIG_CRYPTO_MD5 is not set 1182# CONFIG_CRYPTO_MD5 is not set
1151# CONFIG_CRYPTO_MICHAEL_MIC is not set 1183# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1208,5 +1240,6 @@ CONFIG_ZLIB_INFLATE=y
1208CONFIG_HAS_IOMEM=y 1240CONFIG_HAS_IOMEM=y
1209CONFIG_HAS_IOPORT=y 1241CONFIG_HAS_IOPORT=y
1210CONFIG_HAS_DMA=y 1242CONFIG_HAS_DMA=y
1243CONFIG_HAVE_LMB=y
1211CONFIG_NLATTR=y 1244CONFIG_NLATTR=y
1212CONFIG_GENERIC_ATOMIC64=y 1245CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/hp6xx_defconfig b/arch/sh/configs/hp6xx_defconfig
index 3249d46fdc13..f59be446f829 100644
--- a/arch/sh/configs/hp6xx_defconfig
+++ b/arch/sh/configs/hp6xx_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:28:12 2009 4# Thu Sep 24 17:59:45 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,7 +29,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
28# CONFIG_ARCH_HAS_ILOG2_U64 is not set 29# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29CONFIG_ARCH_NO_VIRT_TO_BUS=y 30CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y
32 35
33# 36#
34# General setup 37# General setup
@@ -38,6 +41,12 @@ CONFIG_BROKEN_ON_SMP=y
38CONFIG_INIT_ENV_ARG_LIMIT=32 41CONFIG_INIT_ENV_ARG_LIMIT=32
39CONFIG_LOCALVERSION="" 42CONFIG_LOCALVERSION=""
40CONFIG_LOCALVERSION_AUTO=y 43CONFIG_LOCALVERSION_AUTO=y
44CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set
41CONFIG_SWAP=y 50CONFIG_SWAP=y
42# CONFIG_SYSVIPC is not set 51# CONFIG_SYSVIPC is not set
43CONFIG_BSD_PROCESS_ACCT=y 52CONFIG_BSD_PROCESS_ACCT=y
@@ -46,11 +55,12 @@ CONFIG_BSD_PROCESS_ACCT=y
46# 55#
47# RCU Subsystem 56# RCU Subsystem
48# 57#
49CONFIG_CLASSIC_RCU=y 58CONFIG_TREE_RCU=y
50# CONFIG_TREE_RCU is not set 59# CONFIG_TREE_PREEMPT_RCU is not set
51# CONFIG_PREEMPT_RCU is not set 60# CONFIG_RCU_TRACE is not set
61CONFIG_RCU_FANOUT=32
62# CONFIG_RCU_FANOUT_EXACT is not set
52# CONFIG_TREE_RCU_TRACE is not set 63# CONFIG_TREE_RCU_TRACE is not set
53# CONFIG_PREEMPT_RCU_TRACE is not set
54CONFIG_IKCONFIG=y 64CONFIG_IKCONFIG=y
55CONFIG_IKCONFIG_PROC=y 65CONFIG_IKCONFIG_PROC=y
56CONFIG_LOG_BUF_SHIFT=14 66CONFIG_LOG_BUF_SHIFT=14
@@ -81,18 +91,19 @@ CONFIG_TIMERFD=y
81CONFIG_EVENTFD=y 91CONFIG_EVENTFD=y
82CONFIG_SHMEM=y 92CONFIG_SHMEM=y
83CONFIG_AIO=y 93CONFIG_AIO=y
94CONFIG_HAVE_PERF_EVENTS=y
84 95
85# 96#
86# Performance Counters 97# Kernel Performance Events And Counters
87# 98#
99# CONFIG_PERF_EVENTS is not set
100# CONFIG_PERF_COUNTERS is not set
88CONFIG_VM_EVENT_COUNTERS=y 101CONFIG_VM_EVENT_COUNTERS=y
89# CONFIG_STRIP_ASM_SYMS is not set
90CONFIG_COMPAT_BRK=y 102CONFIG_COMPAT_BRK=y
91CONFIG_SLAB=y 103CONFIG_SLAB=y
92# CONFIG_SLUB is not set 104# CONFIG_SLUB is not set
93# CONFIG_SLOB is not set 105# CONFIG_SLOB is not set
94# CONFIG_PROFILING is not set 106# CONFIG_PROFILING is not set
95# CONFIG_MARKERS is not set
96CONFIG_HAVE_OPROFILE=y 107CONFIG_HAVE_OPROFILE=y
97CONFIG_HAVE_IOREMAP_PROT=y 108CONFIG_HAVE_IOREMAP_PROT=y
98CONFIG_HAVE_KPROBES=y 109CONFIG_HAVE_KPROBES=y
@@ -100,6 +111,10 @@ CONFIG_HAVE_KRETPROBES=y
100CONFIG_HAVE_ARCH_TRACEHOOK=y 111CONFIG_HAVE_ARCH_TRACEHOOK=y
101CONFIG_HAVE_CLK=y 112CONFIG_HAVE_CLK=y
102CONFIG_HAVE_DMA_API_DEBUG=y 113CONFIG_HAVE_DMA_API_DEBUG=y
114
115#
116# GCOV-based kernel profiling
117#
103# CONFIG_SLOW_WORK is not set 118# CONFIG_SLOW_WORK is not set
104CONFIG_HAVE_GENERIC_DMA_COHERENT=y 119CONFIG_HAVE_GENERIC_DMA_COHERENT=y
105CONFIG_SLABINFO=y 120CONFIG_SLABINFO=y
@@ -107,7 +122,7 @@ CONFIG_RT_MUTEXES=y
107CONFIG_BASE_SMALL=0 122CONFIG_BASE_SMALL=0
108# CONFIG_MODULES is not set 123# CONFIG_MODULES is not set
109CONFIG_BLOCK=y 124CONFIG_BLOCK=y
110# CONFIG_LBD is not set 125CONFIG_LBDAF=y
111# CONFIG_BLK_DEV_BSG is not set 126# CONFIG_BLK_DEV_BSG is not set
112# CONFIG_BLK_DEV_INTEGRITY is not set 127# CONFIG_BLK_DEV_INTEGRITY is not set
113 128
@@ -154,6 +169,7 @@ CONFIG_CPU_SUBTYPE_SH7709=y
154# CONFIG_CPU_SUBTYPE_SH4_202 is not set 169# CONFIG_CPU_SUBTYPE_SH4_202 is not set
155# CONFIG_CPU_SUBTYPE_SH7723 is not set 170# CONFIG_CPU_SUBTYPE_SH7723 is not set
156# CONFIG_CPU_SUBTYPE_SH7724 is not set 171# CONFIG_CPU_SUBTYPE_SH7724 is not set
172# CONFIG_CPU_SUBTYPE_SH7757 is not set
157# CONFIG_CPU_SUBTYPE_SH7763 is not set 173# CONFIG_CPU_SUBTYPE_SH7763 is not set
158# CONFIG_CPU_SUBTYPE_SH7770 is not set 174# CONFIG_CPU_SUBTYPE_SH7770 is not set
159# CONFIG_CPU_SUBTYPE_SH7780 is not set 175# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -199,6 +215,7 @@ CONFIG_ZONE_DMA_FLAG=0
199CONFIG_NR_QUICK=2 215CONFIG_NR_QUICK=2
200CONFIG_HAVE_MLOCK=y 216CONFIG_HAVE_MLOCK=y
201CONFIG_HAVE_MLOCKED_PAGE_BIT=y 217CONFIG_HAVE_MLOCKED_PAGE_BIT=y
218# CONFIG_KSM is not set
202CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 219CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
203 220
204# 221#
@@ -288,7 +305,8 @@ CONFIG_GUSA=y
288CONFIG_ZERO_PAGE_OFFSET=0x00001000 305CONFIG_ZERO_PAGE_OFFSET=0x00001000
289CONFIG_BOOT_LINK_OFFSET=0x00800000 306CONFIG_BOOT_LINK_OFFSET=0x00800000
290CONFIG_ENTRY_OFFSET=0x00001000 307CONFIG_ENTRY_OFFSET=0x00001000
291# CONFIG_CMDLINE_BOOL is not set 308# CONFIG_CMDLINE_OVERWRITE is not set
309# CONFIG_CMDLINE_EXTEND is not set
292 310
293# 311#
294# Bus options 312# Bus options
@@ -322,6 +340,7 @@ CONFIG_SUSPEND=y
322CONFIG_SUSPEND_FREEZER=y 340CONFIG_SUSPEND_FREEZER=y
323# CONFIG_HIBERNATION is not set 341# CONFIG_HIBERNATION is not set
324CONFIG_APM_EMULATION=y 342CONFIG_APM_EMULATION=y
343# CONFIG_PM_RUNTIME is not set
325# CONFIG_CPU_IDLE is not set 344# CONFIG_CPU_IDLE is not set
326# CONFIG_NET is not set 345# CONFIG_NET is not set
327 346
@@ -390,7 +409,6 @@ CONFIG_BLK_DEV_SD=y
390# CONFIG_SCSI_SAS_LIBSAS is not set 409# CONFIG_SCSI_SAS_LIBSAS is not set
391# CONFIG_SCSI_SRP_ATTRS is not set 410# CONFIG_SCSI_SRP_ATTRS is not set
392CONFIG_SCSI_LOWLEVEL=y 411CONFIG_SCSI_LOWLEVEL=y
393# CONFIG_SCSI_BNX2_ISCSI is not set
394# CONFIG_LIBFC is not set 412# CONFIG_LIBFC is not set
395# CONFIG_LIBFCOE is not set 413# CONFIG_LIBFCOE is not set
396# CONFIG_SCSI_DEBUG is not set 414# CONFIG_SCSI_DEBUG is not set
@@ -399,6 +417,7 @@ CONFIG_SCSI_LOWLEVEL=y
399# CONFIG_SCSI_OSD_INITIATOR is not set 417# CONFIG_SCSI_OSD_INITIATOR is not set
400CONFIG_ATA=y 418CONFIG_ATA=y
401# CONFIG_ATA_NONSTANDARD is not set 419# CONFIG_ATA_NONSTANDARD is not set
420CONFIG_ATA_VERBOSE_ERROR=y
402CONFIG_SATA_PMP=y 421CONFIG_SATA_PMP=y
403CONFIG_ATA_SFF=y 422CONFIG_ATA_SFF=y
404# CONFIG_SATA_MV is not set 423# CONFIG_SATA_MV is not set
@@ -428,13 +447,14 @@ CONFIG_INPUT_EVDEV=y
428# 447#
429CONFIG_INPUT_KEYBOARD=y 448CONFIG_INPUT_KEYBOARD=y
430# CONFIG_KEYBOARD_ATKBD is not set 449# CONFIG_KEYBOARD_ATKBD is not set
431# CONFIG_KEYBOARD_SUNKBD is not set
432# CONFIG_KEYBOARD_LKKBD is not set 450# CONFIG_KEYBOARD_LKKBD is not set
433# CONFIG_KEYBOARD_XTKBD is not set 451CONFIG_KEYBOARD_HP6XX=y
434# CONFIG_KEYBOARD_NEWTON is not set 452# CONFIG_KEYBOARD_NEWTON is not set
453# CONFIG_KEYBOARD_OPENCORES is not set
435# CONFIG_KEYBOARD_STOWAWAY is not set 454# CONFIG_KEYBOARD_STOWAWAY is not set
436CONFIG_KEYBOARD_HP6XX=y 455# CONFIG_KEYBOARD_SUNKBD is not set
437# CONFIG_KEYBOARD_SH_KEYSC is not set 456# CONFIG_KEYBOARD_SH_KEYSC is not set
457# CONFIG_KEYBOARD_XTKBD is not set
438# CONFIG_INPUT_MOUSE is not set 458# CONFIG_INPUT_MOUSE is not set
439# CONFIG_INPUT_JOYSTICK is not set 459# CONFIG_INPUT_JOYSTICK is not set
440# CONFIG_INPUT_TABLET is not set 460# CONFIG_INPUT_TABLET is not set
@@ -452,6 +472,7 @@ CONFIG_TOUCHSCREEN_HP600=y
452# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set 472# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
453# CONFIG_TOUCHSCREEN_TOUCHWIN is not set 473# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
454# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set 474# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
475# CONFIG_TOUCHSCREEN_W90X900 is not set
455# CONFIG_INPUT_MISC is not set 476# CONFIG_INPUT_MISC is not set
456 477
457# 478#
@@ -507,11 +528,15 @@ CONFIG_HW_RANDOM=y
507# CONFIG_TCG_TPM is not set 528# CONFIG_TCG_TPM is not set
508# CONFIG_I2C is not set 529# CONFIG_I2C is not set
509# CONFIG_SPI is not set 530# CONFIG_SPI is not set
531
532#
533# PPS support
534#
535# CONFIG_PPS is not set
510# CONFIG_W1 is not set 536# CONFIG_W1 is not set
511# CONFIG_POWER_SUPPLY is not set 537# CONFIG_POWER_SUPPLY is not set
512# CONFIG_HWMON is not set 538# CONFIG_HWMON is not set
513# CONFIG_THERMAL is not set 539# CONFIG_THERMAL is not set
514# CONFIG_THERMAL_HWMON is not set
515# CONFIG_WATCHDOG is not set 540# CONFIG_WATCHDOG is not set
516CONFIG_SSB_POSSIBLE=y 541CONFIG_SSB_POSSIBLE=y
517 542
@@ -663,7 +688,9 @@ CONFIG_EXT2_FS=y
663# CONFIG_JFS_FS is not set 688# CONFIG_JFS_FS is not set
664# CONFIG_FS_POSIX_ACL is not set 689# CONFIG_FS_POSIX_ACL is not set
665# CONFIG_XFS_FS is not set 690# CONFIG_XFS_FS is not set
691# CONFIG_GFS2_FS is not set
666# CONFIG_BTRFS_FS is not set 692# CONFIG_BTRFS_FS is not set
693# CONFIG_NILFS2_FS is not set
667CONFIG_FILE_LOCKING=y 694CONFIG_FILE_LOCKING=y
668CONFIG_FSNOTIFY=y 695CONFIG_FSNOTIFY=y
669CONFIG_DNOTIFY=y 696CONFIG_DNOTIFY=y
@@ -725,7 +752,6 @@ CONFIG_MISC_FILESYSTEMS=y
725# CONFIG_ROMFS_FS is not set 752# CONFIG_ROMFS_FS is not set
726# CONFIG_SYSV_FS is not set 753# CONFIG_SYSV_FS is not set
727# CONFIG_UFS_FS is not set 754# CONFIG_UFS_FS is not set
728# CONFIG_NILFS2_FS is not set
729 755
730# 756#
731# Partition Types 757# Partition Types
@@ -782,6 +808,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
782CONFIG_ENABLE_MUST_CHECK=y 808CONFIG_ENABLE_MUST_CHECK=y
783CONFIG_FRAME_WARN=1024 809CONFIG_FRAME_WARN=1024
784# CONFIG_MAGIC_SYSRQ is not set 810# CONFIG_MAGIC_SYSRQ is not set
811# CONFIG_STRIP_ASM_SYMS is not set
785# CONFIG_UNUSED_SYMBOLS is not set 812# CONFIG_UNUSED_SYMBOLS is not set
786# CONFIG_DEBUG_FS is not set 813# CONFIG_DEBUG_FS is not set
787# CONFIG_HEADERS_CHECK is not set 814# CONFIG_HEADERS_CHECK is not set
@@ -791,8 +818,11 @@ CONFIG_FRAME_WARN=1024
791# CONFIG_RCU_CPU_STALL_DETECTOR is not set 818# CONFIG_RCU_CPU_STALL_DETECTOR is not set
792# CONFIG_LATENCYTOP is not set 819# CONFIG_LATENCYTOP is not set
793CONFIG_HAVE_FUNCTION_TRACER=y 820CONFIG_HAVE_FUNCTION_TRACER=y
821CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
822CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
794CONFIG_HAVE_DYNAMIC_FTRACE=y 823CONFIG_HAVE_DYNAMIC_FTRACE=y
795CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 824CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
825CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
796CONFIG_TRACING_SUPPORT=y 826CONFIG_TRACING_SUPPORT=y
797# CONFIG_FTRACE is not set 827# CONFIG_FTRACE is not set
798# CONFIG_DMA_API_DEBUG is not set 828# CONFIG_DMA_API_DEBUG is not set
@@ -800,6 +830,7 @@ CONFIG_TRACING_SUPPORT=y
800CONFIG_HAVE_ARCH_KGDB=y 830CONFIG_HAVE_ARCH_KGDB=y
801# CONFIG_SH_STANDARD_BIOS is not set 831# CONFIG_SH_STANDARD_BIOS is not set
802# CONFIG_EARLY_SCIF_CONSOLE is not set 832# CONFIG_EARLY_SCIF_CONSOLE is not set
833# CONFIG_DWARF_UNWINDER is not set
803 834
804# 835#
805# Security options 836# Security options
@@ -813,7 +844,6 @@ CONFIG_CRYPTO=y
813# 844#
814# Crypto core or helper 845# Crypto core or helper
815# 846#
816# CONFIG_CRYPTO_FIPS is not set
817CONFIG_CRYPTO_ALGAPI=y 847CONFIG_CRYPTO_ALGAPI=y
818CONFIG_CRYPTO_ALGAPI2=y 848CONFIG_CRYPTO_ALGAPI2=y
819CONFIG_CRYPTO_AEAD2=y 849CONFIG_CRYPTO_AEAD2=y
@@ -854,11 +884,13 @@ CONFIG_CRYPTO_PCBC=y
854# 884#
855# CONFIG_CRYPTO_HMAC is not set 885# CONFIG_CRYPTO_HMAC is not set
856# CONFIG_CRYPTO_XCBC is not set 886# CONFIG_CRYPTO_XCBC is not set
887# CONFIG_CRYPTO_VMAC is not set
857 888
858# 889#
859# Digest 890# Digest
860# 891#
861# CONFIG_CRYPTO_CRC32C is not set 892# CONFIG_CRYPTO_CRC32C is not set
893# CONFIG_CRYPTO_GHASH is not set
862# CONFIG_CRYPTO_MD4 is not set 894# CONFIG_CRYPTO_MD4 is not set
863CONFIG_CRYPTO_MD5=y 895CONFIG_CRYPTO_MD5=y
864# CONFIG_CRYPTO_MICHAEL_MIC is not set 896# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -920,4 +952,5 @@ CONFIG_CRC32=y
920CONFIG_HAS_IOMEM=y 952CONFIG_HAS_IOMEM=y
921CONFIG_HAS_IOPORT=y 953CONFIG_HAS_IOPORT=y
922CONFIG_HAS_DMA=y 954CONFIG_HAS_DMA=y
955CONFIG_HAVE_LMB=y
923CONFIG_GENERIC_ATOMIC64=y 956CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/kfr2r09-romimage_defconfig b/arch/sh/configs/kfr2r09-romimage_defconfig
index c0f9263e1387..02590e127f74 100644
--- a/arch/sh/configs/kfr2r09-romimage_defconfig
+++ b/arch/sh/configs/kfr2r09-romimage_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.31-rc6 3# Linux kernel version: 2.6.31
4# Thu Aug 20 15:09:16 2009 4# Thu Sep 24 18:01:48 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -58,11 +58,12 @@ CONFIG_BSD_PROCESS_ACCT=y
58# 58#
59# RCU Subsystem 59# RCU Subsystem
60# 60#
61CONFIG_CLASSIC_RCU=y 61CONFIG_TREE_RCU=y
62# CONFIG_TREE_RCU is not set 62# CONFIG_TREE_PREEMPT_RCU is not set
63# CONFIG_PREEMPT_RCU is not set 63# CONFIG_RCU_TRACE is not set
64CONFIG_RCU_FANOUT=32
65# CONFIG_RCU_FANOUT_EXACT is not set
64# CONFIG_TREE_RCU_TRACE is not set 66# CONFIG_TREE_RCU_TRACE is not set
65# CONFIG_PREEMPT_RCU_TRACE is not set
66CONFIG_IKCONFIG=y 67CONFIG_IKCONFIG=y
67CONFIG_IKCONFIG_PROC=y 68CONFIG_IKCONFIG_PROC=y
68CONFIG_LOG_BUF_SHIFT=14 69CONFIG_LOG_BUF_SHIFT=14
@@ -78,15 +79,9 @@ CONFIG_SYSFS_DEPRECATED_V2=y
78# CONFIG_NAMESPACES is not set 79# CONFIG_NAMESPACES is not set
79CONFIG_BLK_DEV_INITRD=y 80CONFIG_BLK_DEV_INITRD=y
80CONFIG_INITRAMFS_SOURCE="" 81CONFIG_INITRAMFS_SOURCE=""
81CONFIG_INITRAMFS_ROOT_UID=0
82CONFIG_INITRAMFS_ROOT_GID=0
83CONFIG_RD_GZIP=y 82CONFIG_RD_GZIP=y
84# CONFIG_RD_BZIP2 is not set 83# CONFIG_RD_BZIP2 is not set
85# CONFIG_RD_LZMA is not set 84# CONFIG_RD_LZMA is not set
86# CONFIG_INITRAMFS_COMPRESSION_NONE is not set
87CONFIG_INITRAMFS_COMPRESSION_GZIP=y
88# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
89# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
90CONFIG_CC_OPTIMIZE_FOR_SIZE=y 85CONFIG_CC_OPTIMIZE_FOR_SIZE=y
91CONFIG_SYSCTL=y 86CONFIG_SYSCTL=y
92CONFIG_ANON_INODES=y 87CONFIG_ANON_INODES=y
@@ -106,20 +101,19 @@ CONFIG_TIMERFD=y
106CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
107CONFIG_SHMEM=y 102CONFIG_SHMEM=y
108CONFIG_AIO=y 103CONFIG_AIO=y
109CONFIG_HAVE_PERF_COUNTERS=y 104CONFIG_HAVE_PERF_EVENTS=y
110 105
111# 106#
112# Performance Counters 107# Kernel Performance Events And Counters
113# 108#
109# CONFIG_PERF_EVENTS is not set
114# CONFIG_PERF_COUNTERS is not set 110# CONFIG_PERF_COUNTERS is not set
115CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
116# CONFIG_STRIP_ASM_SYMS is not set
117CONFIG_COMPAT_BRK=y 112CONFIG_COMPAT_BRK=y
118CONFIG_SLAB=y 113CONFIG_SLAB=y
119# CONFIG_SLUB is not set 114# CONFIG_SLUB is not set
120# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
121# CONFIG_PROFILING is not set 116# CONFIG_PROFILING is not set
122# CONFIG_MARKERS is not set
123CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
124CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
125CONFIG_HAVE_KPROBES=y 119CONFIG_HAVE_KPROBES=y
@@ -173,6 +167,7 @@ CONFIG_ARCH_SHMOBILE=y
173# CONFIG_CPU_SUBTYPE_SH4_202 is not set 167# CONFIG_CPU_SUBTYPE_SH4_202 is not set
174# CONFIG_CPU_SUBTYPE_SH7723 is not set 168# CONFIG_CPU_SUBTYPE_SH7723 is not set
175CONFIG_CPU_SUBTYPE_SH7724=y 169CONFIG_CPU_SUBTYPE_SH7724=y
170# CONFIG_CPU_SUBTYPE_SH7757 is not set
176# CONFIG_CPU_SUBTYPE_SH7763 is not set 171# CONFIG_CPU_SUBTYPE_SH7763 is not set
177# CONFIG_CPU_SUBTYPE_SH7770 is not set 172# CONFIG_CPU_SUBTYPE_SH7770 is not set
178# CONFIG_CPU_SUBTYPE_SH7780 is not set 173# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -219,6 +214,7 @@ CONFIG_ZONE_DMA_FLAG=0
219CONFIG_NR_QUICK=2 214CONFIG_NR_QUICK=2
220CONFIG_HAVE_MLOCK=y 215CONFIG_HAVE_MLOCK=y
221CONFIG_HAVE_MLOCKED_PAGE_BIT=y 216CONFIG_HAVE_MLOCKED_PAGE_BIT=y
217# CONFIG_KSM is not set
222CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 218CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
223 219
224# 220#
@@ -301,7 +297,8 @@ CONFIG_GUSA=y
301CONFIG_ZERO_PAGE_OFFSET=0x00001000 297CONFIG_ZERO_PAGE_OFFSET=0x00001000
302CONFIG_BOOT_LINK_OFFSET=0x00800000 298CONFIG_BOOT_LINK_OFFSET=0x00800000
303CONFIG_ENTRY_OFFSET=0x00001000 299CONFIG_ENTRY_OFFSET=0x00001000
304CONFIG_CMDLINE_BOOL=y 300CONFIG_CMDLINE_OVERWRITE=y
301# CONFIG_CMDLINE_EXTEND is not set
305CONFIG_CMDLINE="console=ttySC1,115200 quiet" 302CONFIG_CMDLINE="console=ttySC1,115200 quiet"
306 303
307# 304#
@@ -324,6 +321,7 @@ CONFIG_BINFMT_ELF=y
324CONFIG_PM=y 321CONFIG_PM=y
325# CONFIG_PM_DEBUG is not set 322# CONFIG_PM_DEBUG is not set
326# CONFIG_SUSPEND is not set 323# CONFIG_SUSPEND is not set
324CONFIG_PM_RUNTIME=y
327# CONFIG_CPU_IDLE is not set 325# CONFIG_CPU_IDLE is not set
328CONFIG_NET=y 326CONFIG_NET=y
329 327
@@ -362,6 +360,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
362# CONFIG_NETFILTER is not set 360# CONFIG_NETFILTER is not set
363# CONFIG_IP_DCCP is not set 361# CONFIG_IP_DCCP is not set
364# CONFIG_IP_SCTP is not set 362# CONFIG_IP_SCTP is not set
363# CONFIG_RDS is not set
365# CONFIG_TIPC is not set 364# CONFIG_TIPC is not set
366# CONFIG_ATM is not set 365# CONFIG_ATM is not set
367# CONFIG_BRIDGE is not set 366# CONFIG_BRIDGE is not set
@@ -402,6 +401,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
402# Generic Driver Options 401# Generic Driver Options
403# 402#
404CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 403CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
404# CONFIG_DEVTMPFS is not set
405CONFIG_STANDALONE=y 405CONFIG_STANDALONE=y
406CONFIG_PREVENT_FIRMWARE_BUILD=y 406CONFIG_PREVENT_FIRMWARE_BUILD=y
407CONFIG_FW_LOADER=y 407CONFIG_FW_LOADER=y
@@ -489,6 +489,7 @@ CONFIG_HW_RANDOM=y
489# CONFIG_TCG_TPM is not set 489# CONFIG_TCG_TPM is not set
490CONFIG_I2C=y 490CONFIG_I2C=y
491CONFIG_I2C_BOARDINFO=y 491CONFIG_I2C_BOARDINFO=y
492CONFIG_I2C_COMPAT=y
492# CONFIG_I2C_CHARDEV is not set 493# CONFIG_I2C_CHARDEV is not set
493CONFIG_I2C_HELPER_AUTO=y 494CONFIG_I2C_HELPER_AUTO=y
494 495
@@ -520,9 +521,6 @@ CONFIG_I2C_SH_MOBILE=y
520# Miscellaneous I2C Chip support 521# Miscellaneous I2C Chip support
521# 522#
522# CONFIG_DS1682 is not set 523# CONFIG_DS1682 is not set
523# CONFIG_SENSORS_PCF8574 is not set
524# CONFIG_PCF8575 is not set
525# CONFIG_SENSORS_PCA9539 is not set
526# CONFIG_SENSORS_TSL2550 is not set 524# CONFIG_SENSORS_TSL2550 is not set
527# CONFIG_I2C_DEBUG_CORE is not set 525# CONFIG_I2C_DEBUG_CORE is not set
528# CONFIG_I2C_DEBUG_ALGO is not set 526# CONFIG_I2C_DEBUG_ALGO is not set
@@ -556,11 +554,14 @@ CONFIG_GPIO_SYSFS=y
556# 554#
557# SPI GPIO expanders: 555# SPI GPIO expanders:
558# 556#
557
558#
559# AC97 GPIO expanders:
560#
559# CONFIG_W1 is not set 561# CONFIG_W1 is not set
560# CONFIG_POWER_SUPPLY is not set 562# CONFIG_POWER_SUPPLY is not set
561# CONFIG_HWMON is not set 563# CONFIG_HWMON is not set
562# CONFIG_THERMAL is not set 564# CONFIG_THERMAL is not set
563# CONFIG_THERMAL_HWMON is not set
564# CONFIG_WATCHDOG is not set 565# CONFIG_WATCHDOG is not set
565CONFIG_SSB_POSSIBLE=y 566CONFIG_SSB_POSSIBLE=y
566 567
@@ -580,6 +581,7 @@ CONFIG_SSB_POSSIBLE=y
580# CONFIG_MFD_TMIO is not set 581# CONFIG_MFD_TMIO is not set
581# CONFIG_PMIC_DA903X is not set 582# CONFIG_PMIC_DA903X is not set
582# CONFIG_MFD_WM8400 is not set 583# CONFIG_MFD_WM8400 is not set
584# CONFIG_MFD_WM831X is not set
583# CONFIG_MFD_WM8350_I2C is not set 585# CONFIG_MFD_WM8350_I2C is not set
584# CONFIG_MFD_PCF50633 is not set 586# CONFIG_MFD_PCF50633 is not set
585# CONFIG_AB3100_CORE is not set 587# CONFIG_AB3100_CORE is not set
@@ -718,6 +720,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
718# CONFIG_ENABLE_MUST_CHECK is not set 720# CONFIG_ENABLE_MUST_CHECK is not set
719CONFIG_FRAME_WARN=1024 721CONFIG_FRAME_WARN=1024
720# CONFIG_MAGIC_SYSRQ is not set 722# CONFIG_MAGIC_SYSRQ is not set
723# CONFIG_STRIP_ASM_SYMS is not set
721# CONFIG_UNUSED_SYMBOLS is not set 724# CONFIG_UNUSED_SYMBOLS is not set
722CONFIG_DEBUG_FS=y 725CONFIG_DEBUG_FS=y
723# CONFIG_HEADERS_CHECK is not set 726# CONFIG_HEADERS_CHECK is not set
@@ -732,7 +735,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
732CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 735CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
733CONFIG_HAVE_DYNAMIC_FTRACE=y 736CONFIG_HAVE_DYNAMIC_FTRACE=y
734CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 737CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
735CONFIG_HAVE_FTRACE_SYSCALLS=y 738CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
736CONFIG_TRACING_SUPPORT=y 739CONFIG_TRACING_SUPPORT=y
737# CONFIG_FTRACE is not set 740# CONFIG_FTRACE is not set
738# CONFIG_DYNAMIC_DEBUG is not set 741# CONFIG_DYNAMIC_DEBUG is not set
diff --git a/arch/sh/configs/kfr2r09_defconfig b/arch/sh/configs/kfr2r09_defconfig
index cef61319d2f4..8ae65d294b11 100644
--- a/arch/sh/configs/kfr2r09_defconfig
+++ b/arch/sh/configs/kfr2r09_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.31-rc6 3# Linux kernel version: 2.6.31
4# Thu Aug 20 21:58:52 2009 4# Fri Sep 25 11:54:22 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -60,11 +60,12 @@ CONFIG_BSD_PROCESS_ACCT=y
60# 60#
61# RCU Subsystem 61# RCU Subsystem
62# 62#
63CONFIG_CLASSIC_RCU=y 63CONFIG_TREE_RCU=y
64# CONFIG_TREE_RCU is not set 64# CONFIG_TREE_PREEMPT_RCU is not set
65# CONFIG_PREEMPT_RCU is not set 65# CONFIG_RCU_TRACE is not set
66CONFIG_RCU_FANOUT=32
67# CONFIG_RCU_FANOUT_EXACT is not set
66# CONFIG_TREE_RCU_TRACE is not set 68# CONFIG_TREE_RCU_TRACE is not set
67# CONFIG_PREEMPT_RCU_TRACE is not set
68CONFIG_IKCONFIG=y 69CONFIG_IKCONFIG=y
69CONFIG_IKCONFIG_PROC=y 70CONFIG_IKCONFIG_PROC=y
70CONFIG_LOG_BUF_SHIFT=14 71CONFIG_LOG_BUF_SHIFT=14
@@ -102,20 +103,19 @@ CONFIG_TIMERFD=y
102CONFIG_EVENTFD=y 103CONFIG_EVENTFD=y
103CONFIG_SHMEM=y 104CONFIG_SHMEM=y
104CONFIG_AIO=y 105CONFIG_AIO=y
105CONFIG_HAVE_PERF_COUNTERS=y 106CONFIG_HAVE_PERF_EVENTS=y
106 107
107# 108#
108# Performance Counters 109# Kernel Performance Events And Counters
109# 110#
111# CONFIG_PERF_EVENTS is not set
110# CONFIG_PERF_COUNTERS is not set 112# CONFIG_PERF_COUNTERS is not set
111CONFIG_VM_EVENT_COUNTERS=y 113CONFIG_VM_EVENT_COUNTERS=y
112# CONFIG_STRIP_ASM_SYMS is not set
113CONFIG_COMPAT_BRK=y 114CONFIG_COMPAT_BRK=y
114CONFIG_SLAB=y 115CONFIG_SLAB=y
115# CONFIG_SLUB is not set 116# CONFIG_SLUB is not set
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
120CONFIG_HAVE_IOREMAP_PROT=y 120CONFIG_HAVE_IOREMAP_PROT=y
121CONFIG_HAVE_KPROBES=y 121CONFIG_HAVE_KPROBES=y
@@ -190,6 +190,7 @@ CONFIG_ARCH_SHMOBILE=y
190# CONFIG_CPU_SUBTYPE_SH4_202 is not set 190# CONFIG_CPU_SUBTYPE_SH4_202 is not set
191# CONFIG_CPU_SUBTYPE_SH7723 is not set 191# CONFIG_CPU_SUBTYPE_SH7723 is not set
192CONFIG_CPU_SUBTYPE_SH7724=y 192CONFIG_CPU_SUBTYPE_SH7724=y
193# CONFIG_CPU_SUBTYPE_SH7757 is not set
193# CONFIG_CPU_SUBTYPE_SH7763 is not set 194# CONFIG_CPU_SUBTYPE_SH7763 is not set
194# CONFIG_CPU_SUBTYPE_SH7770 is not set 195# CONFIG_CPU_SUBTYPE_SH7770 is not set
195# CONFIG_CPU_SUBTYPE_SH7780 is not set 196# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -236,6 +237,7 @@ CONFIG_ZONE_DMA_FLAG=0
236CONFIG_NR_QUICK=2 237CONFIG_NR_QUICK=2
237CONFIG_HAVE_MLOCK=y 238CONFIG_HAVE_MLOCK=y
238CONFIG_HAVE_MLOCKED_PAGE_BIT=y 239CONFIG_HAVE_MLOCKED_PAGE_BIT=y
240# CONFIG_KSM is not set
239CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 241CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
240 242
241# 243#
@@ -319,7 +321,8 @@ CONFIG_GUSA=y
319CONFIG_ZERO_PAGE_OFFSET=0x00001000 321CONFIG_ZERO_PAGE_OFFSET=0x00001000
320CONFIG_BOOT_LINK_OFFSET=0x00800000 322CONFIG_BOOT_LINK_OFFSET=0x00800000
321CONFIG_ENTRY_OFFSET=0x00001000 323CONFIG_ENTRY_OFFSET=0x00001000
322CONFIG_CMDLINE_BOOL=y 324CONFIG_CMDLINE_OVERWRITE=y
325# CONFIG_CMDLINE_EXTEND is not set
323CONFIG_CMDLINE="console=tty0 console=ttySC1,115200" 326CONFIG_CMDLINE="console=tty0 console=ttySC1,115200"
324 327
325# 328#
@@ -343,6 +346,7 @@ CONFIG_PM=y
343# CONFIG_PM_DEBUG is not set 346# CONFIG_PM_DEBUG is not set
344# CONFIG_SUSPEND is not set 347# CONFIG_SUSPEND is not set
345# CONFIG_HIBERNATION is not set 348# CONFIG_HIBERNATION is not set
349CONFIG_PM_RUNTIME=y
346CONFIG_CPU_IDLE=y 350CONFIG_CPU_IDLE=y
347CONFIG_CPU_IDLE_GOV_LADDER=y 351CONFIG_CPU_IDLE_GOV_LADDER=y
348CONFIG_CPU_IDLE_GOV_MENU=y 352CONFIG_CPU_IDLE_GOV_MENU=y
@@ -383,6 +387,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
383# CONFIG_NETFILTER is not set 387# CONFIG_NETFILTER is not set
384# CONFIG_IP_DCCP is not set 388# CONFIG_IP_DCCP is not set
385# CONFIG_IP_SCTP is not set 389# CONFIG_IP_SCTP is not set
390# CONFIG_RDS is not set
386# CONFIG_TIPC is not set 391# CONFIG_TIPC is not set
387# CONFIG_ATM is not set 392# CONFIG_ATM is not set
388# CONFIG_BRIDGE is not set 393# CONFIG_BRIDGE is not set
@@ -423,6 +428,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
423# Generic Driver Options 428# Generic Driver Options
424# 429#
425CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 430CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
431# CONFIG_DEVTMPFS is not set
426CONFIG_STANDALONE=y 432CONFIG_STANDALONE=y
427CONFIG_PREVENT_FIRMWARE_BUILD=y 433CONFIG_PREVENT_FIRMWARE_BUILD=y
428CONFIG_FW_LOADER=y 434CONFIG_FW_LOADER=y
@@ -432,9 +438,9 @@ CONFIG_EXTRA_FIRMWARE=""
432# CONFIG_CONNECTOR is not set 438# CONFIG_CONNECTOR is not set
433CONFIG_MTD=y 439CONFIG_MTD=y
434# CONFIG_MTD_DEBUG is not set 440# CONFIG_MTD_DEBUG is not set
441# CONFIG_MTD_TESTS is not set
435CONFIG_MTD_CONCAT=y 442CONFIG_MTD_CONCAT=y
436CONFIG_MTD_PARTITIONS=y 443CONFIG_MTD_PARTITIONS=y
437# CONFIG_MTD_TESTS is not set
438# CONFIG_MTD_REDBOOT_PARTS is not set 444# CONFIG_MTD_REDBOOT_PARTS is not set
439CONFIG_MTD_CMDLINE_PARTS=y 445CONFIG_MTD_CMDLINE_PARTS=y
440# CONFIG_MTD_AR7_PARTS is not set 446# CONFIG_MTD_AR7_PARTS is not set
@@ -500,7 +506,12 @@ CONFIG_MTD_PHYSMAP=y
500# CONFIG_MTD_DOC2001 is not set 506# CONFIG_MTD_DOC2001 is not set
501# CONFIG_MTD_DOC2001PLUS is not set 507# CONFIG_MTD_DOC2001PLUS is not set
502# CONFIG_MTD_NAND is not set 508# CONFIG_MTD_NAND is not set
503# CONFIG_MTD_ONENAND is not set 509CONFIG_MTD_ONENAND=y
510# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
511CONFIG_MTD_ONENAND_GENERIC=y
512# CONFIG_MTD_ONENAND_OTP is not set
513# CONFIG_MTD_ONENAND_2X_PROGRAM is not set
514# CONFIG_MTD_ONENAND_SIM is not set
504 515
505# 516#
506# LPDDR flash memory drivers 517# LPDDR flash memory drivers
@@ -564,11 +575,15 @@ CONFIG_INPUT_EVDEV=y
564# Input Device Drivers 575# Input Device Drivers
565# 576#
566CONFIG_INPUT_KEYBOARD=y 577CONFIG_INPUT_KEYBOARD=y
578# CONFIG_KEYBOARD_ADP5588 is not set
567# CONFIG_KEYBOARD_ATKBD is not set 579# CONFIG_KEYBOARD_ATKBD is not set
580# CONFIG_QT2160 is not set
568# CONFIG_KEYBOARD_LKKBD is not set 581# CONFIG_KEYBOARD_LKKBD is not set
569# CONFIG_KEYBOARD_GPIO is not set 582# CONFIG_KEYBOARD_GPIO is not set
570# CONFIG_KEYBOARD_MATRIX is not set 583# CONFIG_KEYBOARD_MATRIX is not set
584# CONFIG_KEYBOARD_MAX7359 is not set
571# CONFIG_KEYBOARD_NEWTON is not set 585# CONFIG_KEYBOARD_NEWTON is not set
586# CONFIG_KEYBOARD_OPENCORES is not set
572# CONFIG_KEYBOARD_STOWAWAY is not set 587# CONFIG_KEYBOARD_STOWAWAY is not set
573# CONFIG_KEYBOARD_SUNKBD is not set 588# CONFIG_KEYBOARD_SUNKBD is not set
574CONFIG_KEYBOARD_SH_KEYSC=y 589CONFIG_KEYBOARD_SH_KEYSC=y
@@ -621,6 +636,7 @@ CONFIG_HW_RANDOM=y
621# CONFIG_TCG_TPM is not set 636# CONFIG_TCG_TPM is not set
622CONFIG_I2C=y 637CONFIG_I2C=y
623CONFIG_I2C_BOARDINFO=y 638CONFIG_I2C_BOARDINFO=y
639CONFIG_I2C_COMPAT=y
624# CONFIG_I2C_CHARDEV is not set 640# CONFIG_I2C_CHARDEV is not set
625CONFIG_I2C_HELPER_AUTO=y 641CONFIG_I2C_HELPER_AUTO=y
626 642
@@ -653,9 +669,6 @@ CONFIG_I2C_SH_MOBILE=y
653# Miscellaneous I2C Chip support 669# Miscellaneous I2C Chip support
654# 670#
655# CONFIG_DS1682 is not set 671# CONFIG_DS1682 is not set
656# CONFIG_SENSORS_PCF8574 is not set
657# CONFIG_PCF8575 is not set
658# CONFIG_SENSORS_PCA9539 is not set
659# CONFIG_SENSORS_TSL2550 is not set 672# CONFIG_SENSORS_TSL2550 is not set
660# CONFIG_I2C_DEBUG_CORE is not set 673# CONFIG_I2C_DEBUG_CORE is not set
661# CONFIG_I2C_DEBUG_ALGO is not set 674# CONFIG_I2C_DEBUG_ALGO is not set
@@ -689,11 +702,14 @@ CONFIG_GPIO_SYSFS=y
689# 702#
690# SPI GPIO expanders: 703# SPI GPIO expanders:
691# 704#
705
706#
707# AC97 GPIO expanders:
708#
692# CONFIG_W1 is not set 709# CONFIG_W1 is not set
693# CONFIG_POWER_SUPPLY is not set 710# CONFIG_POWER_SUPPLY is not set
694# CONFIG_HWMON is not set 711# CONFIG_HWMON is not set
695# CONFIG_THERMAL is not set 712# CONFIG_THERMAL is not set
696# CONFIG_THERMAL_HWMON is not set
697# CONFIG_WATCHDOG is not set 713# CONFIG_WATCHDOG is not set
698CONFIG_SSB_POSSIBLE=y 714CONFIG_SSB_POSSIBLE=y
699 715
@@ -713,6 +729,7 @@ CONFIG_SSB_POSSIBLE=y
713# CONFIG_MFD_TMIO is not set 729# CONFIG_MFD_TMIO is not set
714# CONFIG_PMIC_DA903X is not set 730# CONFIG_PMIC_DA903X is not set
715# CONFIG_MFD_WM8400 is not set 731# CONFIG_MFD_WM8400 is not set
732# CONFIG_MFD_WM831X is not set
716# CONFIG_MFD_WM8350_I2C is not set 733# CONFIG_MFD_WM8350_I2C is not set
717# CONFIG_MFD_PCF50633 is not set 734# CONFIG_MFD_PCF50633 is not set
718# CONFIG_AB3100_CORE is not set 735# CONFIG_AB3100_CORE is not set
@@ -856,6 +873,8 @@ CONFIG_MMC_BLOCK_BOUNCE=y
856# MMC/SD/SDIO Host Controller Drivers 873# MMC/SD/SDIO Host Controller Drivers
857# 874#
858# CONFIG_MMC_SDHCI is not set 875# CONFIG_MMC_SDHCI is not set
876# CONFIG_MMC_AT91 is not set
877# CONFIG_MMC_ATMELMCI is not set
859# CONFIG_MEMSTICK is not set 878# CONFIG_MEMSTICK is not set
860# CONFIG_NEW_LEDS is not set 879# CONFIG_NEW_LEDS is not set
861# CONFIG_ACCESSIBILITY is not set 880# CONFIG_ACCESSIBILITY is not set
@@ -941,6 +960,7 @@ CONFIG_UIO_PDRV_GENIRQ=y
941# CONFIG_GFS2_FS is not set 960# CONFIG_GFS2_FS is not set
942# CONFIG_OCFS2_FS is not set 961# CONFIG_OCFS2_FS is not set
943# CONFIG_BTRFS_FS is not set 962# CONFIG_BTRFS_FS is not set
963# CONFIG_NILFS2_FS is not set
944CONFIG_FILE_LOCKING=y 964CONFIG_FILE_LOCKING=y
945CONFIG_FSNOTIFY=y 965CONFIG_FSNOTIFY=y
946CONFIG_DNOTIFY=y 966CONFIG_DNOTIFY=y
@@ -1002,6 +1022,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1002# CONFIG_ENABLE_MUST_CHECK is not set 1022# CONFIG_ENABLE_MUST_CHECK is not set
1003CONFIG_FRAME_WARN=1024 1023CONFIG_FRAME_WARN=1024
1004# CONFIG_MAGIC_SYSRQ is not set 1024# CONFIG_MAGIC_SYSRQ is not set
1025# CONFIG_STRIP_ASM_SYMS is not set
1005# CONFIG_UNUSED_SYMBOLS is not set 1026# CONFIG_UNUSED_SYMBOLS is not set
1006CONFIG_DEBUG_FS=y 1027CONFIG_DEBUG_FS=y
1007# CONFIG_HEADERS_CHECK is not set 1028# CONFIG_HEADERS_CHECK is not set
@@ -1016,7 +1037,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1016CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1037CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1017CONFIG_HAVE_DYNAMIC_FTRACE=y 1038CONFIG_HAVE_DYNAMIC_FTRACE=y
1018CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1039CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1019CONFIG_HAVE_FTRACE_SYSCALLS=y 1040CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1020CONFIG_TRACING_SUPPORT=y 1041CONFIG_TRACING_SUPPORT=y
1021# CONFIG_FTRACE is not set 1042# CONFIG_FTRACE is not set
1022# CONFIG_DYNAMIC_DEBUG is not set 1043# CONFIG_DYNAMIC_DEBUG is not set
diff --git a/arch/sh/configs/landisk_defconfig b/arch/sh/configs/landisk_defconfig
index ba05739fda21..c2a9a3996388 100644
--- a/arch/sh/configs/landisk_defconfig
+++ b/arch/sh/configs/landisk_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:28:45 2009 4# Thu Sep 24 18:05:49 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,7 +29,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
28# CONFIG_ARCH_HAS_ILOG2_U64 is not set 29# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29CONFIG_ARCH_NO_VIRT_TO_BUS=y 30CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y
32 35
33# 36#
34# General setup 37# General setup
@@ -38,6 +41,12 @@ CONFIG_BROKEN_ON_SMP=y
38CONFIG_INIT_ENV_ARG_LIMIT=32 41CONFIG_INIT_ENV_ARG_LIMIT=32
39CONFIG_LOCALVERSION="" 42CONFIG_LOCALVERSION=""
40CONFIG_LOCALVERSION_AUTO=y 43CONFIG_LOCALVERSION_AUTO=y
44CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set
41CONFIG_SWAP=y 50CONFIG_SWAP=y
42CONFIG_SYSVIPC=y 51CONFIG_SYSVIPC=y
43CONFIG_SYSVIPC_SYSCTL=y 52CONFIG_SYSVIPC_SYSCTL=y
@@ -49,11 +58,12 @@ CONFIG_SYSVIPC_SYSCTL=y
49# 58#
50# RCU Subsystem 59# RCU Subsystem
51# 60#
52CONFIG_CLASSIC_RCU=y 61CONFIG_TREE_RCU=y
53# CONFIG_TREE_RCU is not set 62# CONFIG_TREE_PREEMPT_RCU is not set
54# CONFIG_PREEMPT_RCU is not set 63# CONFIG_RCU_TRACE is not set
64CONFIG_RCU_FANOUT=32
65# CONFIG_RCU_FANOUT_EXACT is not set
55# CONFIG_TREE_RCU_TRACE is not set 66# CONFIG_TREE_RCU_TRACE is not set
56# CONFIG_PREEMPT_RCU_TRACE is not set
57# CONFIG_IKCONFIG is not set 67# CONFIG_IKCONFIG is not set
58CONFIG_LOG_BUF_SHIFT=14 68CONFIG_LOG_BUF_SHIFT=14
59# CONFIG_GROUP_SCHED is not set 69# CONFIG_GROUP_SCHED is not set
@@ -83,19 +93,20 @@ CONFIG_TIMERFD=y
83CONFIG_EVENTFD=y 93CONFIG_EVENTFD=y
84CONFIG_SHMEM=y 94CONFIG_SHMEM=y
85CONFIG_AIO=y 95CONFIG_AIO=y
96CONFIG_HAVE_PERF_EVENTS=y
86 97
87# 98#
88# Performance Counters 99# Kernel Performance Events And Counters
89# 100#
101# CONFIG_PERF_EVENTS is not set
102# CONFIG_PERF_COUNTERS is not set
90CONFIG_VM_EVENT_COUNTERS=y 103CONFIG_VM_EVENT_COUNTERS=y
91CONFIG_PCI_QUIRKS=y 104CONFIG_PCI_QUIRKS=y
92# CONFIG_STRIP_ASM_SYMS is not set
93CONFIG_COMPAT_BRK=y 105CONFIG_COMPAT_BRK=y
94CONFIG_SLAB=y 106CONFIG_SLAB=y
95# CONFIG_SLUB is not set 107# CONFIG_SLUB is not set
96# CONFIG_SLOB is not set 108# CONFIG_SLOB is not set
97# CONFIG_PROFILING is not set 109# CONFIG_PROFILING is not set
98# CONFIG_MARKERS is not set
99CONFIG_HAVE_OPROFILE=y 110CONFIG_HAVE_OPROFILE=y
100# CONFIG_KPROBES is not set 111# CONFIG_KPROBES is not set
101CONFIG_HAVE_IOREMAP_PROT=y 112CONFIG_HAVE_IOREMAP_PROT=y
@@ -104,6 +115,10 @@ CONFIG_HAVE_KRETPROBES=y
104CONFIG_HAVE_ARCH_TRACEHOOK=y 115CONFIG_HAVE_ARCH_TRACEHOOK=y
105CONFIG_HAVE_CLK=y 116CONFIG_HAVE_CLK=y
106CONFIG_HAVE_DMA_API_DEBUG=y 117CONFIG_HAVE_DMA_API_DEBUG=y
118
119#
120# GCOV-based kernel profiling
121#
107# CONFIG_SLOW_WORK is not set 122# CONFIG_SLOW_WORK is not set
108CONFIG_HAVE_GENERIC_DMA_COHERENT=y 123CONFIG_HAVE_GENERIC_DMA_COHERENT=y
109CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
@@ -116,7 +131,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
116# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
117# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
118CONFIG_BLOCK=y 133CONFIG_BLOCK=y
119# CONFIG_LBD is not set 134CONFIG_LBDAF=y
120# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
121# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
122 137
@@ -163,6 +178,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
163# CONFIG_CPU_SUBTYPE_SH4_202 is not set 178# CONFIG_CPU_SUBTYPE_SH4_202 is not set
164# CONFIG_CPU_SUBTYPE_SH7723 is not set 179# CONFIG_CPU_SUBTYPE_SH7723 is not set
165# CONFIG_CPU_SUBTYPE_SH7724 is not set 180# CONFIG_CPU_SUBTYPE_SH7724 is not set
181# CONFIG_CPU_SUBTYPE_SH7757 is not set
166# CONFIG_CPU_SUBTYPE_SH7763 is not set 182# CONFIG_CPU_SUBTYPE_SH7763 is not set
167# CONFIG_CPU_SUBTYPE_SH7770 is not set 183# CONFIG_CPU_SUBTYPE_SH7770 is not set
168# CONFIG_CPU_SUBTYPE_SH7780 is not set 184# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -208,6 +224,7 @@ CONFIG_ZONE_DMA_FLAG=0
208CONFIG_NR_QUICK=2 224CONFIG_NR_QUICK=2
209CONFIG_HAVE_MLOCK=y 225CONFIG_HAVE_MLOCK=y
210CONFIG_HAVE_MLOCKED_PAGE_BIT=y 226CONFIG_HAVE_MLOCKED_PAGE_BIT=y
227# CONFIG_KSM is not set
211CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 228CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
212 229
213# 230#
@@ -295,7 +312,8 @@ CONFIG_ZERO_PAGE_OFFSET=0x00001000
295CONFIG_BOOT_LINK_OFFSET=0x00800000 312CONFIG_BOOT_LINK_OFFSET=0x00800000
296CONFIG_ENTRY_OFFSET=0x00001000 313CONFIG_ENTRY_OFFSET=0x00001000
297# CONFIG_UBC_WAKEUP is not set 314# CONFIG_UBC_WAKEUP is not set
298# CONFIG_CMDLINE_BOOL is not set 315# CONFIG_CMDLINE_OVERWRITE is not set
316# CONFIG_CMDLINE_EXTEND is not set
299 317
300# 318#
301# Bus options 319# Bus options
@@ -411,6 +429,7 @@ CONFIG_IP_NF_QUEUE=m
411# CONFIG_IP_NF_ARPTABLES is not set 429# CONFIG_IP_NF_ARPTABLES is not set
412# CONFIG_IP_DCCP is not set 430# CONFIG_IP_DCCP is not set
413# CONFIG_IP_SCTP is not set 431# CONFIG_IP_SCTP is not set
432# CONFIG_RDS is not set
414# CONFIG_TIPC is not set 433# CONFIG_TIPC is not set
415# CONFIG_ATM is not set 434# CONFIG_ATM is not set
416# CONFIG_BRIDGE is not set 435# CONFIG_BRIDGE is not set
@@ -442,6 +461,7 @@ CONFIG_ATALK=m
442# CONFIG_AF_RXRPC is not set 461# CONFIG_AF_RXRPC is not set
443CONFIG_WIRELESS=y 462CONFIG_WIRELESS=y
444# CONFIG_CFG80211 is not set 463# CONFIG_CFG80211 is not set
464CONFIG_CFG80211_DEFAULT_PS_VALUE=0
445# CONFIG_WIRELESS_OLD_REGULATORY is not set 465# CONFIG_WIRELESS_OLD_REGULATORY is not set
446# CONFIG_WIRELESS_EXT is not set 466# CONFIG_WIRELESS_EXT is not set
447# CONFIG_LIB80211 is not set 467# CONFIG_LIB80211 is not set
@@ -449,7 +469,6 @@ CONFIG_WIRELESS=y
449# 469#
450# CFG80211 needs to be enabled for MAC80211 470# CFG80211 needs to be enabled for MAC80211
451# 471#
452CONFIG_MAC80211_DEFAULT_PS_VALUE=0
453# CONFIG_WIMAX is not set 472# CONFIG_WIMAX is not set
454# CONFIG_RFKILL is not set 473# CONFIG_RFKILL is not set
455# CONFIG_NET_9P is not set 474# CONFIG_NET_9P is not set
@@ -462,6 +481,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
462# Generic Driver Options 481# Generic Driver Options
463# 482#
464CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 483CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
484# CONFIG_DEVTMPFS is not set
465CONFIG_STANDALONE=y 485CONFIG_STANDALONE=y
466CONFIG_PREVENT_FIRMWARE_BUILD=y 486CONFIG_PREVENT_FIRMWARE_BUILD=y
467CONFIG_FW_LOADER=y 487CONFIG_FW_LOADER=y
@@ -631,6 +651,7 @@ CONFIG_SCSI_LOWLEVEL=y
631# CONFIG_SCSI_DC390T is not set 651# CONFIG_SCSI_DC390T is not set
632# CONFIG_SCSI_NSP32 is not set 652# CONFIG_SCSI_NSP32 is not set
633# CONFIG_SCSI_DEBUG is not set 653# CONFIG_SCSI_DEBUG is not set
654# CONFIG_SCSI_PMCRAID is not set
634# CONFIG_SCSI_SRP is not set 655# CONFIG_SCSI_SRP is not set
635# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 656# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
636# CONFIG_SCSI_DH is not set 657# CONFIG_SCSI_DH is not set
@@ -653,7 +674,11 @@ CONFIG_MD_RAID1=m
653# 674#
654 675
655# 676#
656# Enable only one of the two stacks, unless you know what you are doing 677# You can enable one or both FireWire driver stacks.
678#
679
680#
681# See the help texts for more information.
657# 682#
658# CONFIG_FIREWIRE is not set 683# CONFIG_FIREWIRE is not set
659# CONFIG_IEEE1394 is not set 684# CONFIG_IEEE1394 is not set
@@ -729,6 +754,7 @@ CONFIG_NETDEV_1000=y
729# CONFIG_VIA_VELOCITY is not set 754# CONFIG_VIA_VELOCITY is not set
730# CONFIG_TIGON3 is not set 755# CONFIG_TIGON3 is not set
731# CONFIG_BNX2 is not set 756# CONFIG_BNX2 is not set
757# CONFIG_CNIC is not set
732# CONFIG_QLA3XXX is not set 758# CONFIG_QLA3XXX is not set
733# CONFIG_ATL1 is not set 759# CONFIG_ATL1 is not set
734# CONFIG_ATL1E is not set 760# CONFIG_ATL1E is not set
@@ -754,10 +780,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
754# CONFIG_SFC is not set 780# CONFIG_SFC is not set
755# CONFIG_BE2NET is not set 781# CONFIG_BE2NET is not set
756# CONFIG_TR is not set 782# CONFIG_TR is not set
757 783CONFIG_WLAN=y
758#
759# Wireless LAN
760#
761# CONFIG_WLAN_PRE80211 is not set 784# CONFIG_WLAN_PRE80211 is not set
762# CONFIG_WLAN_80211 is not set 785# CONFIG_WLAN_80211 is not set
763 786
@@ -868,10 +891,20 @@ CONFIG_HW_RANDOM=y
868CONFIG_DEVPORT=y 891CONFIG_DEVPORT=y
869# CONFIG_I2C is not set 892# CONFIG_I2C is not set
870# CONFIG_SPI is not set 893# CONFIG_SPI is not set
894
895#
896# PPS support
897#
898# CONFIG_PPS is not set
871# CONFIG_W1 is not set 899# CONFIG_W1 is not set
872# CONFIG_POWER_SUPPLY is not set 900# CONFIG_POWER_SUPPLY is not set
873CONFIG_HWMON=y 901CONFIG_HWMON=y
874# CONFIG_HWMON_VID is not set 902# CONFIG_HWMON_VID is not set
903# CONFIG_HWMON_DEBUG_CHIP is not set
904
905#
906# Native drivers
907#
875# CONFIG_SENSORS_I5K_AMB is not set 908# CONFIG_SENSORS_I5K_AMB is not set
876# CONFIG_SENSORS_F71805F is not set 909# CONFIG_SENSORS_F71805F is not set
877# CONFIG_SENSORS_F71882FG is not set 910# CONFIG_SENSORS_F71882FG is not set
@@ -886,9 +919,7 @@ CONFIG_HWMON=y
886# CONFIG_SENSORS_VT8231 is not set 919# CONFIG_SENSORS_VT8231 is not set
887# CONFIG_SENSORS_W83627HF is not set 920# CONFIG_SENSORS_W83627HF is not set
888# CONFIG_SENSORS_W83627EHF is not set 921# CONFIG_SENSORS_W83627EHF is not set
889# CONFIG_HWMON_DEBUG_CHIP is not set
890# CONFIG_THERMAL is not set 922# CONFIG_THERMAL is not set
891# CONFIG_THERMAL_HWMON is not set
892# CONFIG_WATCHDOG is not set 923# CONFIG_WATCHDOG is not set
893CONFIG_SSB_POSSIBLE=y 924CONFIG_SSB_POSSIBLE=y
894 925
@@ -910,6 +941,7 @@ CONFIG_SSB_POSSIBLE=y
910# 941#
911# Graphics support 942# Graphics support
912# 943#
944CONFIG_VGA_ARB=y
913# CONFIG_DRM is not set 945# CONFIG_DRM is not set
914# CONFIG_VGASTATE is not set 946# CONFIG_VGASTATE is not set
915# CONFIG_VIDEO_OUTPUT_CONTROL is not set 947# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -928,11 +960,11 @@ CONFIG_DUMMY_CONSOLE=y
928CONFIG_FONT_8x16=y 960CONFIG_FONT_8x16=y
929CONFIG_SOUND=m 961CONFIG_SOUND=m
930CONFIG_SOUND_OSS_CORE=y 962CONFIG_SOUND_OSS_CORE=y
963CONFIG_SOUND_OSS_CORE_PRECLAIM=y
931# CONFIG_SND is not set 964# CONFIG_SND is not set
932CONFIG_SOUND_PRIME=m 965CONFIG_SOUND_PRIME=m
933CONFIG_HID_SUPPORT=y 966CONFIG_HID_SUPPORT=y
934CONFIG_HID=y 967CONFIG_HID=y
935# CONFIG_HID_DEBUG is not set
936# CONFIG_HIDRAW is not set 968# CONFIG_HIDRAW is not set
937 969
938# 970#
@@ -961,6 +993,7 @@ CONFIG_HID_CYPRESS=m
961CONFIG_HID_EZKEY=m 993CONFIG_HID_EZKEY=m
962# CONFIG_HID_KYE is not set 994# CONFIG_HID_KYE is not set
963CONFIG_HID_GYRATION=m 995CONFIG_HID_GYRATION=m
996# CONFIG_HID_TWINHAN is not set
964# CONFIG_HID_KENSINGTON is not set 997# CONFIG_HID_KENSINGTON is not set
965CONFIG_HID_LOGITECH=m 998CONFIG_HID_LOGITECH=m
966# CONFIG_LOGITECH_FF is not set 999# CONFIG_LOGITECH_FF is not set
@@ -1011,6 +1044,7 @@ CONFIG_USB_EHCI_HCD=y
1011# CONFIG_USB_OXU210HP_HCD is not set 1044# CONFIG_USB_OXU210HP_HCD is not set
1012# CONFIG_USB_ISP116X_HCD is not set 1045# CONFIG_USB_ISP116X_HCD is not set
1013# CONFIG_USB_ISP1760_HCD is not set 1046# CONFIG_USB_ISP1760_HCD is not set
1047# CONFIG_USB_ISP1362_HCD is not set
1014CONFIG_USB_OHCI_HCD=y 1048CONFIG_USB_OHCI_HCD=y
1015# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 1049# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1016# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 1050# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -1177,8 +1211,10 @@ CONFIG_REISERFS_FS=y
1177# CONFIG_JFS_FS is not set 1211# CONFIG_JFS_FS is not set
1178# CONFIG_FS_POSIX_ACL is not set 1212# CONFIG_FS_POSIX_ACL is not set
1179# CONFIG_XFS_FS is not set 1213# CONFIG_XFS_FS is not set
1214# CONFIG_GFS2_FS is not set
1180# CONFIG_OCFS2_FS is not set 1215# CONFIG_OCFS2_FS is not set
1181# CONFIG_BTRFS_FS is not set 1216# CONFIG_BTRFS_FS is not set
1217# CONFIG_NILFS2_FS is not set
1182CONFIG_FILE_LOCKING=y 1218CONFIG_FILE_LOCKING=y
1183CONFIG_FSNOTIFY=y 1219CONFIG_FSNOTIFY=y
1184CONFIG_DNOTIFY=y 1220CONFIG_DNOTIFY=y
@@ -1251,7 +1287,6 @@ CONFIG_ROMFS_ON_BLOCK=y
1251CONFIG_UFS_FS=m 1287CONFIG_UFS_FS=m
1252# CONFIG_UFS_FS_WRITE is not set 1288# CONFIG_UFS_FS_WRITE is not set
1253# CONFIG_UFS_DEBUG is not set 1289# CONFIG_UFS_DEBUG is not set
1254# CONFIG_NILFS2_FS is not set
1255CONFIG_NETWORK_FILESYSTEMS=y 1290CONFIG_NETWORK_FILESYSTEMS=y
1256CONFIG_NFS_FS=m 1291CONFIG_NFS_FS=m
1257CONFIG_NFS_V3=y 1292CONFIG_NFS_V3=y
@@ -1331,6 +1366,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1331CONFIG_ENABLE_MUST_CHECK=y 1366CONFIG_ENABLE_MUST_CHECK=y
1332CONFIG_FRAME_WARN=1024 1367CONFIG_FRAME_WARN=1024
1333# CONFIG_MAGIC_SYSRQ is not set 1368# CONFIG_MAGIC_SYSRQ is not set
1369# CONFIG_STRIP_ASM_SYMS is not set
1334# CONFIG_UNUSED_SYMBOLS is not set 1370# CONFIG_UNUSED_SYMBOLS is not set
1335# CONFIG_DEBUG_FS is not set 1371# CONFIG_DEBUG_FS is not set
1336# CONFIG_HEADERS_CHECK is not set 1372# CONFIG_HEADERS_CHECK is not set
@@ -1340,8 +1376,11 @@ CONFIG_FRAME_WARN=1024
1340# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1376# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1341# CONFIG_LATENCYTOP is not set 1377# CONFIG_LATENCYTOP is not set
1342CONFIG_HAVE_FUNCTION_TRACER=y 1378CONFIG_HAVE_FUNCTION_TRACER=y
1379CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1380CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1343CONFIG_HAVE_DYNAMIC_FTRACE=y 1381CONFIG_HAVE_DYNAMIC_FTRACE=y
1344CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1382CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1383CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1345CONFIG_TRACING_SUPPORT=y 1384CONFIG_TRACING_SUPPORT=y
1346# CONFIG_FTRACE is not set 1385# CONFIG_FTRACE is not set
1347# CONFIG_DMA_API_DEBUG is not set 1386# CONFIG_DMA_API_DEBUG is not set
@@ -1350,6 +1389,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1350CONFIG_SH_STANDARD_BIOS=y 1389CONFIG_SH_STANDARD_BIOS=y
1351# CONFIG_EARLY_SCIF_CONSOLE is not set 1390# CONFIG_EARLY_SCIF_CONSOLE is not set
1352# CONFIG_EARLY_PRINTK is not set 1391# CONFIG_EARLY_PRINTK is not set
1392# CONFIG_DWARF_UNWINDER is not set
1353 1393
1354# 1394#
1355# Security options 1395# Security options
@@ -1363,7 +1403,6 @@ CONFIG_CRYPTO=y
1363# 1403#
1364# Crypto core or helper 1404# Crypto core or helper
1365# 1405#
1366# CONFIG_CRYPTO_FIPS is not set
1367# CONFIG_CRYPTO_MANAGER is not set 1406# CONFIG_CRYPTO_MANAGER is not set
1368# CONFIG_CRYPTO_MANAGER2 is not set 1407# CONFIG_CRYPTO_MANAGER2 is not set
1369# CONFIG_CRYPTO_GF128MUL is not set 1408# CONFIG_CRYPTO_GF128MUL is not set
@@ -1395,11 +1434,13 @@ CONFIG_CRYPTO=y
1395# 1434#
1396# CONFIG_CRYPTO_HMAC is not set 1435# CONFIG_CRYPTO_HMAC is not set
1397# CONFIG_CRYPTO_XCBC is not set 1436# CONFIG_CRYPTO_XCBC is not set
1437# CONFIG_CRYPTO_VMAC is not set
1398 1438
1399# 1439#
1400# Digest 1440# Digest
1401# 1441#
1402# CONFIG_CRYPTO_CRC32C is not set 1442# CONFIG_CRYPTO_CRC32C is not set
1443# CONFIG_CRYPTO_GHASH is not set
1403# CONFIG_CRYPTO_MD4 is not set 1444# CONFIG_CRYPTO_MD4 is not set
1404# CONFIG_CRYPTO_MD5 is not set 1445# CONFIG_CRYPTO_MD5 is not set
1405# CONFIG_CRYPTO_MICHAEL_MIC is not set 1446# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1462,5 +1503,6 @@ CONFIG_CRC32=y
1462CONFIG_HAS_IOMEM=y 1503CONFIG_HAS_IOMEM=y
1463CONFIG_HAS_IOPORT=y 1504CONFIG_HAS_IOPORT=y
1464CONFIG_HAS_DMA=y 1505CONFIG_HAS_DMA=y
1506CONFIG_HAVE_LMB=y
1465CONFIG_NLATTR=y 1507CONFIG_NLATTR=y
1466CONFIG_GENERIC_ATOMIC64=y 1508CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/lboxre2_defconfig b/arch/sh/configs/lboxre2_defconfig
index c0bc2fd033b9..ec0c0b432c74 100644
--- a/arch/sh/configs/lboxre2_defconfig
+++ b/arch/sh/configs/lboxre2_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:29:50 2009 4# Thu Sep 24 18:09:59 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,7 +29,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
28# CONFIG_ARCH_HAS_ILOG2_U64 is not set 29# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29CONFIG_ARCH_NO_VIRT_TO_BUS=y 30CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y
32 35
33# 36#
34# General setup 37# General setup
@@ -38,6 +41,12 @@ CONFIG_BROKEN_ON_SMP=y
38CONFIG_INIT_ENV_ARG_LIMIT=32 41CONFIG_INIT_ENV_ARG_LIMIT=32
39CONFIG_LOCALVERSION="" 42CONFIG_LOCALVERSION=""
40CONFIG_LOCALVERSION_AUTO=y 43CONFIG_LOCALVERSION_AUTO=y
44CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set
41CONFIG_SWAP=y 50CONFIG_SWAP=y
42CONFIG_SYSVIPC=y 51CONFIG_SYSVIPC=y
43CONFIG_SYSVIPC_SYSCTL=y 52CONFIG_SYSVIPC_SYSCTL=y
@@ -49,11 +58,12 @@ CONFIG_SYSVIPC_SYSCTL=y
49# 58#
50# RCU Subsystem 59# RCU Subsystem
51# 60#
52CONFIG_CLASSIC_RCU=y 61CONFIG_TREE_RCU=y
53# CONFIG_TREE_RCU is not set 62# CONFIG_TREE_PREEMPT_RCU is not set
54# CONFIG_PREEMPT_RCU is not set 63# CONFIG_RCU_TRACE is not set
64CONFIG_RCU_FANOUT=32
65# CONFIG_RCU_FANOUT_EXACT is not set
55# CONFIG_TREE_RCU_TRACE is not set 66# CONFIG_TREE_RCU_TRACE is not set
56# CONFIG_PREEMPT_RCU_TRACE is not set
57# CONFIG_IKCONFIG is not set 67# CONFIG_IKCONFIG is not set
58CONFIG_LOG_BUF_SHIFT=14 68CONFIG_LOG_BUF_SHIFT=14
59# CONFIG_GROUP_SCHED is not set 69# CONFIG_GROUP_SCHED is not set
@@ -83,19 +93,20 @@ CONFIG_TIMERFD=y
83CONFIG_EVENTFD=y 93CONFIG_EVENTFD=y
84CONFIG_SHMEM=y 94CONFIG_SHMEM=y
85CONFIG_AIO=y 95CONFIG_AIO=y
96CONFIG_HAVE_PERF_EVENTS=y
86 97
87# 98#
88# Performance Counters 99# Kernel Performance Events And Counters
89# 100#
101# CONFIG_PERF_EVENTS is not set
102# CONFIG_PERF_COUNTERS is not set
90CONFIG_VM_EVENT_COUNTERS=y 103CONFIG_VM_EVENT_COUNTERS=y
91CONFIG_PCI_QUIRKS=y 104CONFIG_PCI_QUIRKS=y
92# CONFIG_STRIP_ASM_SYMS is not set
93CONFIG_COMPAT_BRK=y 105CONFIG_COMPAT_BRK=y
94CONFIG_SLAB=y 106CONFIG_SLAB=y
95# CONFIG_SLUB is not set 107# CONFIG_SLUB is not set
96# CONFIG_SLOB is not set 108# CONFIG_SLOB is not set
97# CONFIG_PROFILING is not set 109# CONFIG_PROFILING is not set
98# CONFIG_MARKERS is not set
99CONFIG_HAVE_OPROFILE=y 110CONFIG_HAVE_OPROFILE=y
100# CONFIG_KPROBES is not set 111# CONFIG_KPROBES is not set
101CONFIG_HAVE_IOREMAP_PROT=y 112CONFIG_HAVE_IOREMAP_PROT=y
@@ -104,6 +115,10 @@ CONFIG_HAVE_KRETPROBES=y
104CONFIG_HAVE_ARCH_TRACEHOOK=y 115CONFIG_HAVE_ARCH_TRACEHOOK=y
105CONFIG_HAVE_CLK=y 116CONFIG_HAVE_CLK=y
106CONFIG_HAVE_DMA_API_DEBUG=y 117CONFIG_HAVE_DMA_API_DEBUG=y
118
119#
120# GCOV-based kernel profiling
121#
107# CONFIG_SLOW_WORK is not set 122# CONFIG_SLOW_WORK is not set
108CONFIG_HAVE_GENERIC_DMA_COHERENT=y 123CONFIG_HAVE_GENERIC_DMA_COHERENT=y
109CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
@@ -116,7 +131,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
116# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
117# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
118CONFIG_BLOCK=y 133CONFIG_BLOCK=y
119# CONFIG_LBD is not set 134CONFIG_LBDAF=y
120# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
121# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
122 137
@@ -163,6 +178,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
163# CONFIG_CPU_SUBTYPE_SH4_202 is not set 178# CONFIG_CPU_SUBTYPE_SH4_202 is not set
164# CONFIG_CPU_SUBTYPE_SH7723 is not set 179# CONFIG_CPU_SUBTYPE_SH7723 is not set
165# CONFIG_CPU_SUBTYPE_SH7724 is not set 180# CONFIG_CPU_SUBTYPE_SH7724 is not set
181# CONFIG_CPU_SUBTYPE_SH7757 is not set
166# CONFIG_CPU_SUBTYPE_SH7763 is not set 182# CONFIG_CPU_SUBTYPE_SH7763 is not set
167# CONFIG_CPU_SUBTYPE_SH7770 is not set 183# CONFIG_CPU_SUBTYPE_SH7770 is not set
168# CONFIG_CPU_SUBTYPE_SH7780 is not set 184# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -208,6 +224,7 @@ CONFIG_ZONE_DMA_FLAG=0
208CONFIG_NR_QUICK=2 224CONFIG_NR_QUICK=2
209CONFIG_HAVE_MLOCK=y 225CONFIG_HAVE_MLOCK=y
210CONFIG_HAVE_MLOCKED_PAGE_BIT=y 226CONFIG_HAVE_MLOCKED_PAGE_BIT=y
227# CONFIG_KSM is not set
211CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 228CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
212 229
213# 230#
@@ -295,7 +312,8 @@ CONFIG_ZERO_PAGE_OFFSET=0x00001000
295CONFIG_BOOT_LINK_OFFSET=0x00800000 312CONFIG_BOOT_LINK_OFFSET=0x00800000
296CONFIG_ENTRY_OFFSET=0x00001000 313CONFIG_ENTRY_OFFSET=0x00001000
297# CONFIG_UBC_WAKEUP is not set 314# CONFIG_UBC_WAKEUP is not set
298CONFIG_CMDLINE_BOOL=y 315CONFIG_CMDLINE_OVERWRITE=y
316# CONFIG_CMDLINE_EXTEND is not set
299CONFIG_CMDLINE="console=ttySC1,115200 root=/dev/sda1" 317CONFIG_CMDLINE="console=ttySC1,115200 root=/dev/sda1"
300 318
301# 319#
@@ -411,6 +429,7 @@ CONFIG_NETFILTER_ADVANCED=y
411# CONFIG_IP_NF_ARPTABLES is not set 429# CONFIG_IP_NF_ARPTABLES is not set
412# CONFIG_IP_DCCP is not set 430# CONFIG_IP_DCCP is not set
413# CONFIG_IP_SCTP is not set 431# CONFIG_IP_SCTP is not set
432# CONFIG_RDS is not set
414# CONFIG_TIPC is not set 433# CONFIG_TIPC is not set
415# CONFIG_ATM is not set 434# CONFIG_ATM is not set
416# CONFIG_BRIDGE is not set 435# CONFIG_BRIDGE is not set
@@ -440,6 +459,7 @@ CONFIG_NETFILTER_ADVANCED=y
440# CONFIG_AF_RXRPC is not set 459# CONFIG_AF_RXRPC is not set
441CONFIG_WIRELESS=y 460CONFIG_WIRELESS=y
442# CONFIG_CFG80211 is not set 461# CONFIG_CFG80211 is not set
462CONFIG_CFG80211_DEFAULT_PS_VALUE=0
443# CONFIG_WIRELESS_OLD_REGULATORY is not set 463# CONFIG_WIRELESS_OLD_REGULATORY is not set
444# CONFIG_WIRELESS_EXT is not set 464# CONFIG_WIRELESS_EXT is not set
445# CONFIG_LIB80211 is not set 465# CONFIG_LIB80211 is not set
@@ -447,7 +467,6 @@ CONFIG_WIRELESS=y
447# 467#
448# CFG80211 needs to be enabled for MAC80211 468# CFG80211 needs to be enabled for MAC80211
449# 469#
450CONFIG_MAC80211_DEFAULT_PS_VALUE=0
451# CONFIG_WIMAX is not set 470# CONFIG_WIMAX is not set
452# CONFIG_RFKILL is not set 471# CONFIG_RFKILL is not set
453# CONFIG_NET_9P is not set 472# CONFIG_NET_9P is not set
@@ -460,6 +479,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
460# Generic Driver Options 479# Generic Driver Options
461# 480#
462CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 481CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
482# CONFIG_DEVTMPFS is not set
463CONFIG_STANDALONE=y 483CONFIG_STANDALONE=y
464CONFIG_PREVENT_FIRMWARE_BUILD=y 484CONFIG_PREVENT_FIRMWARE_BUILD=y
465CONFIG_FW_LOADER=y 485CONFIG_FW_LOADER=y
@@ -572,12 +592,14 @@ CONFIG_SCSI_LOWLEVEL=y
572# CONFIG_SCSI_DC390T is not set 592# CONFIG_SCSI_DC390T is not set
573# CONFIG_SCSI_NSP32 is not set 593# CONFIG_SCSI_NSP32 is not set
574# CONFIG_SCSI_DEBUG is not set 594# CONFIG_SCSI_DEBUG is not set
595# CONFIG_SCSI_PMCRAID is not set
575# CONFIG_SCSI_SRP is not set 596# CONFIG_SCSI_SRP is not set
576# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 597# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
577# CONFIG_SCSI_DH is not set 598# CONFIG_SCSI_DH is not set
578# CONFIG_SCSI_OSD_INITIATOR is not set 599# CONFIG_SCSI_OSD_INITIATOR is not set
579CONFIG_ATA=y 600CONFIG_ATA=y
580# CONFIG_ATA_NONSTANDARD is not set 601# CONFIG_ATA_NONSTANDARD is not set
602CONFIG_ATA_VERBOSE_ERROR=y
581CONFIG_SATA_PMP=y 603CONFIG_SATA_PMP=y
582# CONFIG_SATA_AHCI is not set 604# CONFIG_SATA_AHCI is not set
583# CONFIG_SATA_SIL24 is not set 605# CONFIG_SATA_SIL24 is not set
@@ -599,6 +621,7 @@ CONFIG_ATA_SFF=y
599# CONFIG_PATA_ALI is not set 621# CONFIG_PATA_ALI is not set
600# CONFIG_PATA_AMD is not set 622# CONFIG_PATA_AMD is not set
601# CONFIG_PATA_ARTOP is not set 623# CONFIG_PATA_ARTOP is not set
624# CONFIG_PATA_ATP867X is not set
602# CONFIG_PATA_ATIIXP is not set 625# CONFIG_PATA_ATIIXP is not set
603# CONFIG_PATA_CMD640_PCI is not set 626# CONFIG_PATA_CMD640_PCI is not set
604# CONFIG_PATA_CMD64X is not set 627# CONFIG_PATA_CMD64X is not set
@@ -627,6 +650,7 @@ CONFIG_ATA_SFF=y
627# CONFIG_PATA_PCMCIA is not set 650# CONFIG_PATA_PCMCIA is not set
628# CONFIG_PATA_PDC_OLD is not set 651# CONFIG_PATA_PDC_OLD is not set
629# CONFIG_PATA_RADISYS is not set 652# CONFIG_PATA_RADISYS is not set
653# CONFIG_PATA_RDC is not set
630# CONFIG_PATA_RZ1000 is not set 654# CONFIG_PATA_RZ1000 is not set
631# CONFIG_PATA_SC1200 is not set 655# CONFIG_PATA_SC1200 is not set
632# CONFIG_PATA_SERVERWORKS is not set 656# CONFIG_PATA_SERVERWORKS is not set
@@ -645,7 +669,11 @@ CONFIG_PATA_PLATFORM=y
645# 669#
646 670
647# 671#
648# Enable only one of the two stacks, unless you know what you are doing 672# You can enable one or both FireWire driver stacks.
673#
674
675#
676# See the help texts for more information.
649# 677#
650# CONFIG_FIREWIRE is not set 678# CONFIG_FIREWIRE is not set
651# CONFIG_IEEE1394 is not set 679# CONFIG_IEEE1394 is not set
@@ -725,6 +753,7 @@ CONFIG_NETDEV_1000=y
725# CONFIG_VIA_VELOCITY is not set 753# CONFIG_VIA_VELOCITY is not set
726# CONFIG_TIGON3 is not set 754# CONFIG_TIGON3 is not set
727# CONFIG_BNX2 is not set 755# CONFIG_BNX2 is not set
756# CONFIG_CNIC is not set
728# CONFIG_QLA3XXX is not set 757# CONFIG_QLA3XXX is not set
729# CONFIG_ATL1 is not set 758# CONFIG_ATL1 is not set
730# CONFIG_ATL1E is not set 759# CONFIG_ATL1E is not set
@@ -750,10 +779,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
750# CONFIG_SFC is not set 779# CONFIG_SFC is not set
751# CONFIG_BE2NET is not set 780# CONFIG_BE2NET is not set
752# CONFIG_TR is not set 781# CONFIG_TR is not set
753 782CONFIG_WLAN=y
754#
755# Wireless LAN
756#
757# CONFIG_WLAN_PRE80211 is not set 783# CONFIG_WLAN_PRE80211 is not set
758# CONFIG_WLAN_80211 is not set 784# CONFIG_WLAN_80211 is not set
759 785
@@ -863,10 +889,20 @@ CONFIG_HW_RANDOM=y
863CONFIG_DEVPORT=y 889CONFIG_DEVPORT=y
864# CONFIG_I2C is not set 890# CONFIG_I2C is not set
865# CONFIG_SPI is not set 891# CONFIG_SPI is not set
892
893#
894# PPS support
895#
896# CONFIG_PPS is not set
866# CONFIG_W1 is not set 897# CONFIG_W1 is not set
867# CONFIG_POWER_SUPPLY is not set 898# CONFIG_POWER_SUPPLY is not set
868CONFIG_HWMON=y 899CONFIG_HWMON=y
869# CONFIG_HWMON_VID is not set 900# CONFIG_HWMON_VID is not set
901# CONFIG_HWMON_DEBUG_CHIP is not set
902
903#
904# Native drivers
905#
870# CONFIG_SENSORS_I5K_AMB is not set 906# CONFIG_SENSORS_I5K_AMB is not set
871# CONFIG_SENSORS_F71805F is not set 907# CONFIG_SENSORS_F71805F is not set
872# CONFIG_SENSORS_F71882FG is not set 908# CONFIG_SENSORS_F71882FG is not set
@@ -881,9 +917,7 @@ CONFIG_HWMON=y
881# CONFIG_SENSORS_VT8231 is not set 917# CONFIG_SENSORS_VT8231 is not set
882# CONFIG_SENSORS_W83627HF is not set 918# CONFIG_SENSORS_W83627HF is not set
883# CONFIG_SENSORS_W83627EHF is not set 919# CONFIG_SENSORS_W83627EHF is not set
884# CONFIG_HWMON_DEBUG_CHIP is not set
885# CONFIG_THERMAL is not set 920# CONFIG_THERMAL is not set
886# CONFIG_THERMAL_HWMON is not set
887# CONFIG_WATCHDOG is not set 921# CONFIG_WATCHDOG is not set
888CONFIG_SSB_POSSIBLE=y 922CONFIG_SSB_POSSIBLE=y
889 923
@@ -905,6 +939,7 @@ CONFIG_SSB_POSSIBLE=y
905# 939#
906# Graphics support 940# Graphics support
907# 941#
942CONFIG_VGA_ARB=y
908# CONFIG_DRM is not set 943# CONFIG_DRM is not set
909# CONFIG_VGASTATE is not set 944# CONFIG_VGASTATE is not set
910# CONFIG_VIDEO_OUTPUT_CONTROL is not set 945# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -923,7 +958,6 @@ CONFIG_DUMMY_CONSOLE=y
923# CONFIG_SOUND is not set 958# CONFIG_SOUND is not set
924CONFIG_HID_SUPPORT=y 959CONFIG_HID_SUPPORT=y
925CONFIG_HID=y 960CONFIG_HID=y
926# CONFIG_HID_DEBUG is not set
927# CONFIG_HIDRAW is not set 961# CONFIG_HIDRAW is not set
928# CONFIG_HID_PID is not set 962# CONFIG_HID_PID is not set
929 963
@@ -1021,8 +1055,10 @@ CONFIG_FS_MBCACHE=y
1021# CONFIG_JFS_FS is not set 1055# CONFIG_JFS_FS is not set
1022# CONFIG_FS_POSIX_ACL is not set 1056# CONFIG_FS_POSIX_ACL is not set
1023# CONFIG_XFS_FS is not set 1057# CONFIG_XFS_FS is not set
1058# CONFIG_GFS2_FS is not set
1024# CONFIG_OCFS2_FS is not set 1059# CONFIG_OCFS2_FS is not set
1025# CONFIG_BTRFS_FS is not set 1060# CONFIG_BTRFS_FS is not set
1061# CONFIG_NILFS2_FS is not set
1026CONFIG_FILE_LOCKING=y 1062CONFIG_FILE_LOCKING=y
1027CONFIG_FSNOTIFY=y 1063CONFIG_FSNOTIFY=y
1028CONFIG_DNOTIFY=y 1064CONFIG_DNOTIFY=y
@@ -1089,7 +1125,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
1089CONFIG_ROMFS_ON_BLOCK=y 1125CONFIG_ROMFS_ON_BLOCK=y
1090# CONFIG_SYSV_FS is not set 1126# CONFIG_SYSV_FS is not set
1091# CONFIG_UFS_FS is not set 1127# CONFIG_UFS_FS is not set
1092# CONFIG_NILFS2_FS is not set
1093CONFIG_NETWORK_FILESYSTEMS=y 1128CONFIG_NETWORK_FILESYSTEMS=y
1094# CONFIG_NFS_FS is not set 1129# CONFIG_NFS_FS is not set
1095# CONFIG_NFSD is not set 1130# CONFIG_NFSD is not set
@@ -1155,6 +1190,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1155CONFIG_ENABLE_MUST_CHECK=y 1190CONFIG_ENABLE_MUST_CHECK=y
1156CONFIG_FRAME_WARN=1024 1191CONFIG_FRAME_WARN=1024
1157# CONFIG_MAGIC_SYSRQ is not set 1192# CONFIG_MAGIC_SYSRQ is not set
1193# CONFIG_STRIP_ASM_SYMS is not set
1158# CONFIG_UNUSED_SYMBOLS is not set 1194# CONFIG_UNUSED_SYMBOLS is not set
1159# CONFIG_DEBUG_FS is not set 1195# CONFIG_DEBUG_FS is not set
1160# CONFIG_HEADERS_CHECK is not set 1196# CONFIG_HEADERS_CHECK is not set
@@ -1164,8 +1200,11 @@ CONFIG_FRAME_WARN=1024
1164# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1200# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1165# CONFIG_LATENCYTOP is not set 1201# CONFIG_LATENCYTOP is not set
1166CONFIG_HAVE_FUNCTION_TRACER=y 1202CONFIG_HAVE_FUNCTION_TRACER=y
1203CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1204CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1167CONFIG_HAVE_DYNAMIC_FTRACE=y 1205CONFIG_HAVE_DYNAMIC_FTRACE=y
1168CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1206CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1207CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1169CONFIG_TRACING_SUPPORT=y 1208CONFIG_TRACING_SUPPORT=y
1170# CONFIG_FTRACE is not set 1209# CONFIG_FTRACE is not set
1171# CONFIG_DMA_API_DEBUG is not set 1210# CONFIG_DMA_API_DEBUG is not set
@@ -1174,6 +1213,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1174CONFIG_SH_STANDARD_BIOS=y 1213CONFIG_SH_STANDARD_BIOS=y
1175# CONFIG_EARLY_SCIF_CONSOLE is not set 1214# CONFIG_EARLY_SCIF_CONSOLE is not set
1176# CONFIG_EARLY_PRINTK is not set 1215# CONFIG_EARLY_PRINTK is not set
1216# CONFIG_DWARF_UNWINDER is not set
1177 1217
1178# 1218#
1179# Security options 1219# Security options
@@ -1187,7 +1227,6 @@ CONFIG_CRYPTO=y
1187# 1227#
1188# Crypto core or helper 1228# Crypto core or helper
1189# 1229#
1190# CONFIG_CRYPTO_FIPS is not set
1191# CONFIG_CRYPTO_MANAGER is not set 1230# CONFIG_CRYPTO_MANAGER is not set
1192# CONFIG_CRYPTO_MANAGER2 is not set 1231# CONFIG_CRYPTO_MANAGER2 is not set
1193# CONFIG_CRYPTO_GF128MUL is not set 1232# CONFIG_CRYPTO_GF128MUL is not set
@@ -1219,11 +1258,13 @@ CONFIG_CRYPTO=y
1219# 1258#
1220# CONFIG_CRYPTO_HMAC is not set 1259# CONFIG_CRYPTO_HMAC is not set
1221# CONFIG_CRYPTO_XCBC is not set 1260# CONFIG_CRYPTO_XCBC is not set
1261# CONFIG_CRYPTO_VMAC is not set
1222 1262
1223# 1263#
1224# Digest 1264# Digest
1225# 1265#
1226# CONFIG_CRYPTO_CRC32C is not set 1266# CONFIG_CRYPTO_CRC32C is not set
1267# CONFIG_CRYPTO_GHASH is not set
1227# CONFIG_CRYPTO_MD4 is not set 1268# CONFIG_CRYPTO_MD4 is not set
1228# CONFIG_CRYPTO_MD5 is not set 1269# CONFIG_CRYPTO_MD5 is not set
1229# CONFIG_CRYPTO_MICHAEL_MIC is not set 1270# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1286,5 +1327,6 @@ CONFIG_CRC32=y
1286CONFIG_HAS_IOMEM=y 1327CONFIG_HAS_IOMEM=y
1287CONFIG_HAS_IOPORT=y 1328CONFIG_HAS_IOPORT=y
1288CONFIG_HAS_DMA=y 1329CONFIG_HAS_DMA=y
1330CONFIG_HAVE_LMB=y
1289CONFIG_NLATTR=y 1331CONFIG_NLATTR=y
1290CONFIG_GENERIC_ATOMIC64=y 1332CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/magicpanelr2_defconfig b/arch/sh/configs/magicpanelr2_defconfig
index c5859e82d916..79091e3e32c4 100644
--- a/arch/sh/configs/magicpanelr2_defconfig
+++ b/arch/sh/configs/magicpanelr2_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:30:31 2009 4# Thu Sep 24 18:10:49 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,7 +29,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
28# CONFIG_ARCH_HAS_ILOG2_U64 is not set 29# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29CONFIG_ARCH_NO_VIRT_TO_BUS=y 30CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y
32 35
33# 36#
34# General setup 37# General setup
@@ -38,6 +41,12 @@ CONFIG_BROKEN_ON_SMP=y
38CONFIG_INIT_ENV_ARG_LIMIT=32 41CONFIG_INIT_ENV_ARG_LIMIT=32
39CONFIG_LOCALVERSION="" 42CONFIG_LOCALVERSION=""
40# CONFIG_LOCALVERSION_AUTO is not set 43# CONFIG_LOCALVERSION_AUTO is not set
44CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set
41CONFIG_SWAP=y 50CONFIG_SWAP=y
42CONFIG_SYSVIPC=y 51CONFIG_SYSVIPC=y
43CONFIG_SYSVIPC_SYSCTL=y 52CONFIG_SYSVIPC_SYSCTL=y
@@ -52,11 +61,12 @@ CONFIG_AUDIT=y
52# 61#
53# RCU Subsystem 62# RCU Subsystem
54# 63#
55CONFIG_CLASSIC_RCU=y 64CONFIG_TREE_RCU=y
56# CONFIG_TREE_RCU is not set 65# CONFIG_TREE_PREEMPT_RCU is not set
57# CONFIG_PREEMPT_RCU is not set 66# CONFIG_RCU_TRACE is not set
67CONFIG_RCU_FANOUT=32
68# CONFIG_RCU_FANOUT_EXACT is not set
58# CONFIG_TREE_RCU_TRACE is not set 69# CONFIG_TREE_RCU_TRACE is not set
59# CONFIG_PREEMPT_RCU_TRACE is not set
60# CONFIG_IKCONFIG is not set 70# CONFIG_IKCONFIG is not set
61CONFIG_LOG_BUF_SHIFT=17 71CONFIG_LOG_BUF_SHIFT=17
62# CONFIG_GROUP_SCHED is not set 72# CONFIG_GROUP_SCHED is not set
@@ -91,18 +101,19 @@ CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 102CONFIG_SHMEM=y
93CONFIG_AIO=y 103CONFIG_AIO=y
104CONFIG_HAVE_PERF_EVENTS=y
94 105
95# 106#
96# Performance Counters 107# Kernel Performance Events And Counters
97# 108#
109# CONFIG_PERF_EVENTS is not set
110# CONFIG_PERF_COUNTERS is not set
98CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
99# CONFIG_STRIP_ASM_SYMS is not set
100CONFIG_COMPAT_BRK=y 112CONFIG_COMPAT_BRK=y
101CONFIG_SLAB=y 113CONFIG_SLAB=y
102# CONFIG_SLUB is not set 114# CONFIG_SLUB is not set
103# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
104# CONFIG_PROFILING is not set 116# CONFIG_PROFILING is not set
105# CONFIG_MARKERS is not set
106CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
107# CONFIG_KPROBES is not set 118# CONFIG_KPROBES is not set
108CONFIG_HAVE_IOREMAP_PROT=y 119CONFIG_HAVE_IOREMAP_PROT=y
@@ -111,6 +122,10 @@ CONFIG_HAVE_KRETPROBES=y
111CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
112CONFIG_HAVE_CLK=y 123CONFIG_HAVE_CLK=y
113CONFIG_HAVE_DMA_API_DEBUG=y 124CONFIG_HAVE_DMA_API_DEBUG=y
125
126#
127# GCOV-based kernel profiling
128#
114# CONFIG_SLOW_WORK is not set 129# CONFIG_SLOW_WORK is not set
115CONFIG_HAVE_GENERIC_DMA_COHERENT=y 130CONFIG_HAVE_GENERIC_DMA_COHERENT=y
116CONFIG_SLABINFO=y 131CONFIG_SLABINFO=y
@@ -123,7 +138,7 @@ CONFIG_MODULE_UNLOAD=y
123CONFIG_MODVERSIONS=y 138CONFIG_MODVERSIONS=y
124CONFIG_MODULE_SRCVERSION_ALL=y 139CONFIG_MODULE_SRCVERSION_ALL=y
125CONFIG_BLOCK=y 140CONFIG_BLOCK=y
126# CONFIG_LBD is not set 141CONFIG_LBDAF=y
127# CONFIG_BLK_DEV_BSG is not set 142# CONFIG_BLK_DEV_BSG is not set
128# CONFIG_BLK_DEV_INTEGRITY is not set 143# CONFIG_BLK_DEV_INTEGRITY is not set
129 144
@@ -170,6 +185,7 @@ CONFIG_CPU_SUBTYPE_SH7720=y
170# CONFIG_CPU_SUBTYPE_SH4_202 is not set 185# CONFIG_CPU_SUBTYPE_SH4_202 is not set
171# CONFIG_CPU_SUBTYPE_SH7723 is not set 186# CONFIG_CPU_SUBTYPE_SH7723 is not set
172# CONFIG_CPU_SUBTYPE_SH7724 is not set 187# CONFIG_CPU_SUBTYPE_SH7724 is not set
188# CONFIG_CPU_SUBTYPE_SH7757 is not set
173# CONFIG_CPU_SUBTYPE_SH7763 is not set 189# CONFIG_CPU_SUBTYPE_SH7763 is not set
174# CONFIG_CPU_SUBTYPE_SH7770 is not set 190# CONFIG_CPU_SUBTYPE_SH7770 is not set
175# CONFIG_CPU_SUBTYPE_SH7780 is not set 191# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -215,6 +231,7 @@ CONFIG_ZONE_DMA_FLAG=0
215CONFIG_NR_QUICK=2 231CONFIG_NR_QUICK=2
216CONFIG_HAVE_MLOCK=y 232CONFIG_HAVE_MLOCK=y
217CONFIG_HAVE_MLOCKED_PAGE_BIT=y 233CONFIG_HAVE_MLOCKED_PAGE_BIT=y
234# CONFIG_KSM is not set
218CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 235CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
219 236
220# 237#
@@ -306,7 +323,8 @@ CONFIG_GUSA=y
306CONFIG_ZERO_PAGE_OFFSET=0x00001000 323CONFIG_ZERO_PAGE_OFFSET=0x00001000
307CONFIG_BOOT_LINK_OFFSET=0x00800000 324CONFIG_BOOT_LINK_OFFSET=0x00800000
308CONFIG_ENTRY_OFFSET=0x00001000 325CONFIG_ENTRY_OFFSET=0x00001000
309# CONFIG_CMDLINE_BOOL is not set 326# CONFIG_CMDLINE_OVERWRITE is not set
327# CONFIG_CMDLINE_EXTEND is not set
310 328
311# 329#
312# Bus options 330# Bus options
@@ -368,6 +386,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
368# CONFIG_NETFILTER is not set 386# CONFIG_NETFILTER is not set
369# CONFIG_IP_DCCP is not set 387# CONFIG_IP_DCCP is not set
370# CONFIG_IP_SCTP is not set 388# CONFIG_IP_SCTP is not set
389# CONFIG_RDS is not set
371# CONFIG_TIPC is not set 390# CONFIG_TIPC is not set
372# CONFIG_ATM is not set 391# CONFIG_ATM is not set
373# CONFIG_BRIDGE is not set 392# CONFIG_BRIDGE is not set
@@ -397,6 +416,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
397# CONFIG_AF_RXRPC is not set 416# CONFIG_AF_RXRPC is not set
398CONFIG_WIRELESS=y 417CONFIG_WIRELESS=y
399# CONFIG_CFG80211 is not set 418# CONFIG_CFG80211 is not set
419CONFIG_CFG80211_DEFAULT_PS_VALUE=0
400# CONFIG_WIRELESS_OLD_REGULATORY is not set 420# CONFIG_WIRELESS_OLD_REGULATORY is not set
401# CONFIG_WIRELESS_EXT is not set 421# CONFIG_WIRELESS_EXT is not set
402# CONFIG_LIB80211 is not set 422# CONFIG_LIB80211 is not set
@@ -404,7 +424,6 @@ CONFIG_WIRELESS=y
404# 424#
405# CFG80211 needs to be enabled for MAC80211 425# CFG80211 needs to be enabled for MAC80211
406# 426#
407CONFIG_MAC80211_DEFAULT_PS_VALUE=0
408# CONFIG_WIMAX is not set 427# CONFIG_WIMAX is not set
409# CONFIG_RFKILL is not set 428# CONFIG_RFKILL is not set
410# CONFIG_NET_9P is not set 429# CONFIG_NET_9P is not set
@@ -417,6 +436,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
417# Generic Driver Options 436# Generic Driver Options
418# 437#
419CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 438CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
439# CONFIG_DEVTMPFS is not set
420# CONFIG_STANDALONE is not set 440# CONFIG_STANDALONE is not set
421# CONFIG_PREVENT_FIRMWARE_BUILD is not set 441# CONFIG_PREVENT_FIRMWARE_BUILD is not set
422CONFIG_FW_LOADER=y 442CONFIG_FW_LOADER=y
@@ -428,9 +448,9 @@ CONFIG_EXTRA_FIRMWARE=""
428# CONFIG_CONNECTOR is not set 448# CONFIG_CONNECTOR is not set
429CONFIG_MTD=y 449CONFIG_MTD=y
430# CONFIG_MTD_DEBUG is not set 450# CONFIG_MTD_DEBUG is not set
451# CONFIG_MTD_TESTS is not set
431# CONFIG_MTD_CONCAT is not set 452# CONFIG_MTD_CONCAT is not set
432CONFIG_MTD_PARTITIONS=y 453CONFIG_MTD_PARTITIONS=y
433# CONFIG_MTD_TESTS is not set
434CONFIG_MTD_REDBOOT_PARTS=y 454CONFIG_MTD_REDBOOT_PARTS=y
435CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 455CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
436# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set 456# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -589,10 +609,7 @@ CONFIG_SMSC911X=y
589# CONFIG_KS8842 is not set 609# CONFIG_KS8842 is not set
590# CONFIG_NETDEV_1000 is not set 610# CONFIG_NETDEV_1000 is not set
591# CONFIG_NETDEV_10000 is not set 611# CONFIG_NETDEV_10000 is not set
592 612CONFIG_WLAN=y
593#
594# Wireless LAN
595#
596# CONFIG_WLAN_PRE80211 is not set 613# CONFIG_WLAN_PRE80211 is not set
597# CONFIG_WLAN_80211 is not set 614# CONFIG_WLAN_80211 is not set
598 615
@@ -631,13 +648,15 @@ CONFIG_INPUT_EVDEV=y
631# 648#
632CONFIG_INPUT_KEYBOARD=y 649CONFIG_INPUT_KEYBOARD=y
633CONFIG_KEYBOARD_ATKBD=y 650CONFIG_KEYBOARD_ATKBD=y
634# CONFIG_KEYBOARD_SUNKBD is not set
635# CONFIG_KEYBOARD_LKKBD is not set 651# CONFIG_KEYBOARD_LKKBD is not set
636# CONFIG_KEYBOARD_XTKBD is not set 652# CONFIG_KEYBOARD_GPIO is not set
653# CONFIG_KEYBOARD_MATRIX is not set
637# CONFIG_KEYBOARD_NEWTON is not set 654# CONFIG_KEYBOARD_NEWTON is not set
655# CONFIG_KEYBOARD_OPENCORES is not set
638# CONFIG_KEYBOARD_STOWAWAY is not set 656# CONFIG_KEYBOARD_STOWAWAY is not set
639# CONFIG_KEYBOARD_GPIO is not set 657# CONFIG_KEYBOARD_SUNKBD is not set
640# CONFIG_KEYBOARD_SH_KEYSC is not set 658# CONFIG_KEYBOARD_SH_KEYSC is not set
659# CONFIG_KEYBOARD_XTKBD is not set
641CONFIG_INPUT_MOUSE=y 660CONFIG_INPUT_MOUSE=y
642# CONFIG_MOUSE_PS2 is not set 661# CONFIG_MOUSE_PS2 is not set
643# CONFIG_MOUSE_SERIAL is not set 662# CONFIG_MOUSE_SERIAL is not set
@@ -701,6 +720,11 @@ CONFIG_LEGACY_PTY_COUNT=256
701# CONFIG_TCG_TPM is not set 720# CONFIG_TCG_TPM is not set
702# CONFIG_I2C is not set 721# CONFIG_I2C is not set
703# CONFIG_SPI is not set 722# CONFIG_SPI is not set
723
724#
725# PPS support
726#
727# CONFIG_PPS is not set
704CONFIG_ARCH_REQUIRE_GPIOLIB=y 728CONFIG_ARCH_REQUIRE_GPIOLIB=y
705CONFIG_GPIOLIB=y 729CONFIG_GPIOLIB=y
706# CONFIG_DEBUG_GPIO is not set 730# CONFIG_DEBUG_GPIO is not set
@@ -721,11 +745,14 @@ CONFIG_GPIOLIB=y
721# 745#
722# SPI GPIO expanders: 746# SPI GPIO expanders:
723# 747#
748
749#
750# AC97 GPIO expanders:
751#
724# CONFIG_W1 is not set 752# CONFIG_W1 is not set
725# CONFIG_POWER_SUPPLY is not set 753# CONFIG_POWER_SUPPLY is not set
726# CONFIG_HWMON is not set 754# CONFIG_HWMON is not set
727# CONFIG_THERMAL is not set 755# CONFIG_THERMAL is not set
728# CONFIG_THERMAL_HWMON is not set
729# CONFIG_WATCHDOG is not set 756# CONFIG_WATCHDOG is not set
730CONFIG_SSB_POSSIBLE=y 757CONFIG_SSB_POSSIBLE=y
731 758
@@ -829,8 +856,10 @@ CONFIG_JBD=y
829# CONFIG_JFS_FS is not set 856# CONFIG_JFS_FS is not set
830# CONFIG_FS_POSIX_ACL is not set 857# CONFIG_FS_POSIX_ACL is not set
831# CONFIG_XFS_FS is not set 858# CONFIG_XFS_FS is not set
859# CONFIG_GFS2_FS is not set
832# CONFIG_OCFS2_FS is not set 860# CONFIG_OCFS2_FS is not set
833# CONFIG_BTRFS_FS is not set 861# CONFIG_BTRFS_FS is not set
862# CONFIG_NILFS2_FS is not set
834CONFIG_FILE_LOCKING=y 863CONFIG_FILE_LOCKING=y
835CONFIG_FSNOTIFY=y 864CONFIG_FSNOTIFY=y
836# CONFIG_DNOTIFY is not set 865# CONFIG_DNOTIFY is not set
@@ -900,7 +929,6 @@ CONFIG_JFFS2_RTIME=y
900# CONFIG_ROMFS_FS is not set 929# CONFIG_ROMFS_FS is not set
901# CONFIG_SYSV_FS is not set 930# CONFIG_SYSV_FS is not set
902# CONFIG_UFS_FS is not set 931# CONFIG_UFS_FS is not set
903# CONFIG_NILFS2_FS is not set
904CONFIG_NETWORK_FILESYSTEMS=y 932CONFIG_NETWORK_FILESYSTEMS=y
905CONFIG_NFS_FS=y 933CONFIG_NFS_FS=y
906CONFIG_NFS_V3=y 934CONFIG_NFS_V3=y
@@ -976,6 +1004,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
976CONFIG_ENABLE_MUST_CHECK=y 1004CONFIG_ENABLE_MUST_CHECK=y
977CONFIG_FRAME_WARN=1024 1005CONFIG_FRAME_WARN=1024
978CONFIG_MAGIC_SYSRQ=y 1006CONFIG_MAGIC_SYSRQ=y
1007# CONFIG_STRIP_ASM_SYMS is not set
979# CONFIG_UNUSED_SYMBOLS is not set 1008# CONFIG_UNUSED_SYMBOLS is not set
980# CONFIG_DEBUG_FS is not set 1009# CONFIG_DEBUG_FS is not set
981# CONFIG_HEADERS_CHECK is not set 1010# CONFIG_HEADERS_CHECK is not set
@@ -1006,24 +1035,30 @@ CONFIG_DEBUG_INFO=y
1006# CONFIG_DEBUG_LIST is not set 1035# CONFIG_DEBUG_LIST is not set
1007# CONFIG_DEBUG_SG is not set 1036# CONFIG_DEBUG_SG is not set
1008# CONFIG_DEBUG_NOTIFIERS is not set 1037# CONFIG_DEBUG_NOTIFIERS is not set
1038# CONFIG_DEBUG_CREDENTIALS is not set
1009CONFIG_FRAME_POINTER=y 1039CONFIG_FRAME_POINTER=y
1010# CONFIG_RCU_TORTURE_TEST is not set 1040# CONFIG_RCU_TORTURE_TEST is not set
1011# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1041# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1012# CONFIG_BACKTRACE_SELF_TEST is not set 1042# CONFIG_BACKTRACE_SELF_TEST is not set
1013# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1043# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1044# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1014# CONFIG_FAULT_INJECTION is not set 1045# CONFIG_FAULT_INJECTION is not set
1015# CONFIG_LATENCYTOP is not set 1046# CONFIG_LATENCYTOP is not set
1016CONFIG_SYSCTL_SYSCALL_CHECK=y 1047CONFIG_SYSCTL_SYSCALL_CHECK=y
1017# CONFIG_PAGE_POISONING is not set 1048# CONFIG_PAGE_POISONING is not set
1018CONFIG_HAVE_FUNCTION_TRACER=y 1049CONFIG_HAVE_FUNCTION_TRACER=y
1050CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1051CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1019CONFIG_HAVE_DYNAMIC_FTRACE=y 1052CONFIG_HAVE_DYNAMIC_FTRACE=y
1020CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1053CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1054CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1021CONFIG_TRACING_SUPPORT=y 1055CONFIG_TRACING_SUPPORT=y
1022CONFIG_FTRACE=y 1056CONFIG_FTRACE=y
1023# CONFIG_FUNCTION_TRACER is not set 1057# CONFIG_FUNCTION_TRACER is not set
1024# CONFIG_IRQSOFF_TRACER is not set 1058# CONFIG_IRQSOFF_TRACER is not set
1025# CONFIG_SCHED_TRACER is not set 1059# CONFIG_SCHED_TRACER is not set
1026# CONFIG_ENABLE_DEFAULT_TRACERS is not set 1060# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1061# CONFIG_FTRACE_SYSCALLS is not set
1027# CONFIG_BOOT_TRACER is not set 1062# CONFIG_BOOT_TRACER is not set
1028CONFIG_BRANCH_PROFILE_NONE=y 1063CONFIG_BRANCH_PROFILE_NONE=y
1029# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1064# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -1036,16 +1071,15 @@ CONFIG_BRANCH_PROFILE_NONE=y
1036# CONFIG_SAMPLES is not set 1071# CONFIG_SAMPLES is not set
1037CONFIG_HAVE_ARCH_KGDB=y 1072CONFIG_HAVE_ARCH_KGDB=y
1038# CONFIG_KGDB is not set 1073# CONFIG_KGDB is not set
1039# CONFIG_KMEMCHECK is not set
1040# CONFIG_SH_STANDARD_BIOS is not set 1074# CONFIG_SH_STANDARD_BIOS is not set
1041CONFIG_EARLY_SCIF_CONSOLE=y 1075CONFIG_EARLY_SCIF_CONSOLE=y
1042CONFIG_EARLY_SCIF_CONSOLE_PORT=0xa4430000 1076CONFIG_EARLY_SCIF_CONSOLE_PORT=0xa4430000
1043CONFIG_EARLY_PRINTK=y 1077CONFIG_EARLY_PRINTK=y
1044# CONFIG_DEBUG_BOOTMEM is not set 1078# CONFIG_STACK_DEBUG is not set
1045# CONFIG_DEBUG_STACKOVERFLOW is not set
1046# CONFIG_DEBUG_STACK_USAGE is not set 1079# CONFIG_DEBUG_STACK_USAGE is not set
1047# CONFIG_4KSTACKS is not set 1080# CONFIG_4KSTACKS is not set
1048CONFIG_DUMP_CODE=y 1081CONFIG_DUMP_CODE=y
1082# CONFIG_DWARF_UNWINDER is not set
1049# CONFIG_SH_NO_BSS_INIT is not set 1083# CONFIG_SH_NO_BSS_INIT is not set
1050 1084
1051# 1085#
@@ -1077,5 +1111,6 @@ CONFIG_DECOMPRESS_GZIP=y
1077CONFIG_HAS_IOMEM=y 1111CONFIG_HAS_IOMEM=y
1078CONFIG_HAS_IOPORT=y 1112CONFIG_HAS_IOPORT=y
1079CONFIG_HAS_DMA=y 1113CONFIG_HAS_DMA=y
1114CONFIG_HAVE_LMB=y
1080CONFIG_NLATTR=y 1115CONFIG_NLATTR=y
1081CONFIG_GENERIC_ATOMIC64=y 1116CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/microdev_defconfig b/arch/sh/configs/microdev_defconfig
index e5a21e1d625c..6bb5976aff2a 100644
--- a/arch/sh/configs/microdev_defconfig
+++ b/arch/sh/configs/microdev_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:31:56 2009 4# Thu Sep 24 18:14:35 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -27,7 +28,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 28# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 29CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y
31 34
32# 35#
33# General setup 36# General setup
@@ -38,6 +41,12 @@ CONFIG_LOCK_KERNEL=y
38CONFIG_INIT_ENV_ARG_LIMIT=32 41CONFIG_INIT_ENV_ARG_LIMIT=32
39CONFIG_LOCALVERSION="" 42CONFIG_LOCALVERSION=""
40CONFIG_LOCALVERSION_AUTO=y 43CONFIG_LOCALVERSION_AUTO=y
44CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set
41CONFIG_SWAP=y 50CONFIG_SWAP=y
42# CONFIG_SYSVIPC is not set 51# CONFIG_SYSVIPC is not set
43# CONFIG_POSIX_MQUEUE is not set 52# CONFIG_POSIX_MQUEUE is not set
@@ -49,11 +58,12 @@ CONFIG_BSD_PROCESS_ACCT=y
49# 58#
50# RCU Subsystem 59# RCU Subsystem
51# 60#
52CONFIG_CLASSIC_RCU=y 61CONFIG_TREE_RCU=y
53# CONFIG_TREE_RCU is not set 62# CONFIG_TREE_PREEMPT_RCU is not set
54# CONFIG_PREEMPT_RCU is not set 63# CONFIG_RCU_TRACE is not set
64CONFIG_RCU_FANOUT=32
65# CONFIG_RCU_FANOUT_EXACT is not set
55# CONFIG_TREE_RCU_TRACE is not set 66# CONFIG_TREE_RCU_TRACE is not set
56# CONFIG_PREEMPT_RCU_TRACE is not set
57# CONFIG_IKCONFIG is not set 67# CONFIG_IKCONFIG is not set
58CONFIG_LOG_BUF_SHIFT=14 68CONFIG_LOG_BUF_SHIFT=14
59# CONFIG_GROUP_SCHED is not set 69# CONFIG_GROUP_SCHED is not set
@@ -87,18 +97,19 @@ CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 97CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 98CONFIG_SHMEM=y
89CONFIG_AIO=y 99CONFIG_AIO=y
100CONFIG_HAVE_PERF_EVENTS=y
90 101
91# 102#
92# Performance Counters 103# Kernel Performance Events And Counters
93# 104#
105# CONFIG_PERF_EVENTS is not set
106# CONFIG_PERF_COUNTERS is not set
94CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
95# CONFIG_STRIP_ASM_SYMS is not set
96CONFIG_COMPAT_BRK=y 108CONFIG_COMPAT_BRK=y
97CONFIG_SLAB=y 109CONFIG_SLAB=y
98# CONFIG_SLUB is not set 110# CONFIG_SLUB is not set
99# CONFIG_SLOB is not set 111# CONFIG_SLOB is not set
100# CONFIG_PROFILING is not set 112# CONFIG_PROFILING is not set
101# CONFIG_MARKERS is not set
102CONFIG_HAVE_OPROFILE=y 113CONFIG_HAVE_OPROFILE=y
103CONFIG_HAVE_IOREMAP_PROT=y 114CONFIG_HAVE_IOREMAP_PROT=y
104CONFIG_HAVE_KPROBES=y 115CONFIG_HAVE_KPROBES=y
@@ -106,6 +117,10 @@ CONFIG_HAVE_KRETPROBES=y
106CONFIG_HAVE_ARCH_TRACEHOOK=y 117CONFIG_HAVE_ARCH_TRACEHOOK=y
107CONFIG_HAVE_CLK=y 118CONFIG_HAVE_CLK=y
108CONFIG_HAVE_DMA_API_DEBUG=y 119CONFIG_HAVE_DMA_API_DEBUG=y
120
121#
122# GCOV-based kernel profiling
123#
109# CONFIG_SLOW_WORK is not set 124# CONFIG_SLOW_WORK is not set
110CONFIG_HAVE_GENERIC_DMA_COHERENT=y 125CONFIG_HAVE_GENERIC_DMA_COHERENT=y
111CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
@@ -113,7 +128,7 @@ CONFIG_RT_MUTEXES=y
113CONFIG_BASE_SMALL=0 128CONFIG_BASE_SMALL=0
114# CONFIG_MODULES is not set 129# CONFIG_MODULES is not set
115CONFIG_BLOCK=y 130CONFIG_BLOCK=y
116# CONFIG_LBD is not set 131CONFIG_LBDAF=y
117# CONFIG_BLK_DEV_BSG is not set 132# CONFIG_BLK_DEV_BSG is not set
118# CONFIG_BLK_DEV_INTEGRITY is not set 133# CONFIG_BLK_DEV_INTEGRITY is not set
119 134
@@ -160,6 +175,7 @@ CONFIG_CPU_SH4=y
160CONFIG_CPU_SUBTYPE_SH4_202=y 175CONFIG_CPU_SUBTYPE_SH4_202=y
161# CONFIG_CPU_SUBTYPE_SH7723 is not set 176# CONFIG_CPU_SUBTYPE_SH7723 is not set
162# CONFIG_CPU_SUBTYPE_SH7724 is not set 177# CONFIG_CPU_SUBTYPE_SH7724 is not set
178# CONFIG_CPU_SUBTYPE_SH7757 is not set
163# CONFIG_CPU_SUBTYPE_SH7763 is not set 179# CONFIG_CPU_SUBTYPE_SH7763 is not set
164# CONFIG_CPU_SUBTYPE_SH7770 is not set 180# CONFIG_CPU_SUBTYPE_SH7770 is not set
165# CONFIG_CPU_SUBTYPE_SH7780 is not set 181# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -211,6 +227,7 @@ CONFIG_ZONE_DMA_FLAG=0
211CONFIG_NR_QUICK=2 227CONFIG_NR_QUICK=2
212CONFIG_HAVE_MLOCK=y 228CONFIG_HAVE_MLOCK=y
213CONFIG_HAVE_MLOCKED_PAGE_BIT=y 229CONFIG_HAVE_MLOCKED_PAGE_BIT=y
230# CONFIG_KSM is not set
214CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 231CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
215 232
216# 233#
@@ -296,7 +313,8 @@ CONFIG_ZERO_PAGE_OFFSET=0x00001000
296CONFIG_BOOT_LINK_OFFSET=0x00800000 313CONFIG_BOOT_LINK_OFFSET=0x00800000
297CONFIG_ENTRY_OFFSET=0x00001000 314CONFIG_ENTRY_OFFSET=0x00001000
298# CONFIG_UBC_WAKEUP is not set 315# CONFIG_UBC_WAKEUP is not set
299CONFIG_CMDLINE_BOOL=y 316CONFIG_CMDLINE_OVERWRITE=y
317# CONFIG_CMDLINE_EXTEND is not set
300CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/hda1" 318CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/hda1"
301 319
302# 320#
@@ -364,6 +382,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
364# CONFIG_NETFILTER is not set 382# CONFIG_NETFILTER is not set
365# CONFIG_IP_DCCP is not set 383# CONFIG_IP_DCCP is not set
366# CONFIG_IP_SCTP is not set 384# CONFIG_IP_SCTP is not set
385# CONFIG_RDS is not set
367# CONFIG_TIPC is not set 386# CONFIG_TIPC is not set
368# CONFIG_ATM is not set 387# CONFIG_ATM is not set
369# CONFIG_BRIDGE is not set 388# CONFIG_BRIDGE is not set
@@ -393,6 +412,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
393# CONFIG_AF_RXRPC is not set 412# CONFIG_AF_RXRPC is not set
394CONFIG_WIRELESS=y 413CONFIG_WIRELESS=y
395# CONFIG_CFG80211 is not set 414# CONFIG_CFG80211 is not set
415CONFIG_CFG80211_DEFAULT_PS_VALUE=0
396# CONFIG_WIRELESS_OLD_REGULATORY is not set 416# CONFIG_WIRELESS_OLD_REGULATORY is not set
397# CONFIG_WIRELESS_EXT is not set 417# CONFIG_WIRELESS_EXT is not set
398# CONFIG_LIB80211 is not set 418# CONFIG_LIB80211 is not set
@@ -400,7 +420,6 @@ CONFIG_WIRELESS=y
400# 420#
401# CFG80211 needs to be enabled for MAC80211 421# CFG80211 needs to be enabled for MAC80211
402# 422#
403CONFIG_MAC80211_DEFAULT_PS_VALUE=0
404# CONFIG_WIMAX is not set 423# CONFIG_WIMAX is not set
405# CONFIG_RFKILL is not set 424# CONFIG_RFKILL is not set
406# CONFIG_NET_9P is not set 425# CONFIG_NET_9P is not set
@@ -413,6 +432,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
413# Generic Driver Options 432# Generic Driver Options
414# 433#
415CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 434CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
435# CONFIG_DEVTMPFS is not set
416CONFIG_STANDALONE=y 436CONFIG_STANDALONE=y
417CONFIG_PREVENT_FIRMWARE_BUILD=y 437CONFIG_PREVENT_FIRMWARE_BUILD=y
418# CONFIG_FW_LOADER is not set 438# CONFIG_FW_LOADER is not set
@@ -499,10 +519,7 @@ CONFIG_SMC91X=y
499# CONFIG_KS8842 is not set 519# CONFIG_KS8842 is not set
500CONFIG_NETDEV_1000=y 520CONFIG_NETDEV_1000=y
501CONFIG_NETDEV_10000=y 521CONFIG_NETDEV_10000=y
502 522CONFIG_WLAN=y
503#
504# Wireless LAN
505#
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 525
@@ -561,10 +578,20 @@ CONFIG_HW_RANDOM=y
561# CONFIG_TCG_TPM is not set 578# CONFIG_TCG_TPM is not set
562# CONFIG_I2C is not set 579# CONFIG_I2C is not set
563# CONFIG_SPI is not set 580# CONFIG_SPI is not set
581
582#
583# PPS support
584#
585# CONFIG_PPS is not set
564# CONFIG_W1 is not set 586# CONFIG_W1 is not set
565# CONFIG_POWER_SUPPLY is not set 587# CONFIG_POWER_SUPPLY is not set
566CONFIG_HWMON=y 588CONFIG_HWMON=y
567# CONFIG_HWMON_VID is not set 589# CONFIG_HWMON_VID is not set
590# CONFIG_HWMON_DEBUG_CHIP is not set
591
592#
593# Native drivers
594#
568# CONFIG_SENSORS_F71805F is not set 595# CONFIG_SENSORS_F71805F is not set
569# CONFIG_SENSORS_F71882FG is not set 596# CONFIG_SENSORS_F71882FG is not set
570# CONFIG_SENSORS_IT87 is not set 597# CONFIG_SENSORS_IT87 is not set
@@ -575,9 +602,7 @@ CONFIG_HWMON=y
575# CONFIG_SENSORS_VT1211 is not set 602# CONFIG_SENSORS_VT1211 is not set
576# CONFIG_SENSORS_W83627HF is not set 603# CONFIG_SENSORS_W83627HF is not set
577# CONFIG_SENSORS_W83627EHF is not set 604# CONFIG_SENSORS_W83627EHF is not set
578# CONFIG_HWMON_DEBUG_CHIP is not set
579# CONFIG_THERMAL is not set 605# CONFIG_THERMAL is not set
580# CONFIG_THERMAL_HWMON is not set
581# CONFIG_WATCHDOG is not set 606# CONFIG_WATCHDOG is not set
582CONFIG_SSB_POSSIBLE=y 607CONFIG_SSB_POSSIBLE=y
583 608
@@ -662,8 +687,10 @@ CONFIG_FS_MBCACHE=y
662# CONFIG_JFS_FS is not set 687# CONFIG_JFS_FS is not set
663# CONFIG_FS_POSIX_ACL is not set 688# CONFIG_FS_POSIX_ACL is not set
664# CONFIG_XFS_FS is not set 689# CONFIG_XFS_FS is not set
690# CONFIG_GFS2_FS is not set
665# CONFIG_OCFS2_FS is not set 691# CONFIG_OCFS2_FS is not set
666# CONFIG_BTRFS_FS is not set 692# CONFIG_BTRFS_FS is not set
693# CONFIG_NILFS2_FS is not set
667CONFIG_FILE_LOCKING=y 694CONFIG_FILE_LOCKING=y
668CONFIG_FSNOTIFY=y 695CONFIG_FSNOTIFY=y
669CONFIG_DNOTIFY=y 696CONFIG_DNOTIFY=y
@@ -726,12 +753,12 @@ CONFIG_MISC_FILESYSTEMS=y
726# CONFIG_ROMFS_FS is not set 753# CONFIG_ROMFS_FS is not set
727# CONFIG_SYSV_FS is not set 754# CONFIG_SYSV_FS is not set
728# CONFIG_UFS_FS is not set 755# CONFIG_UFS_FS is not set
729# CONFIG_NILFS2_FS is not set
730CONFIG_NETWORK_FILESYSTEMS=y 756CONFIG_NETWORK_FILESYSTEMS=y
731CONFIG_NFS_FS=y 757CONFIG_NFS_FS=y
732CONFIG_NFS_V3=y 758CONFIG_NFS_V3=y
733# CONFIG_NFS_V3_ACL is not set 759# CONFIG_NFS_V3_ACL is not set
734CONFIG_NFS_V4=y 760CONFIG_NFS_V4=y
761# CONFIG_NFS_V4_1 is not set
735CONFIG_ROOT_NFS=y 762CONFIG_ROOT_NFS=y
736# CONFIG_NFSD is not set 763# CONFIG_NFSD is not set
737CONFIG_LOCKD=y 764CONFIG_LOCKD=y
@@ -803,6 +830,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
803CONFIG_ENABLE_MUST_CHECK=y 830CONFIG_ENABLE_MUST_CHECK=y
804CONFIG_FRAME_WARN=1024 831CONFIG_FRAME_WARN=1024
805# CONFIG_MAGIC_SYSRQ is not set 832# CONFIG_MAGIC_SYSRQ is not set
833# CONFIG_STRIP_ASM_SYMS is not set
806# CONFIG_UNUSED_SYMBOLS is not set 834# CONFIG_UNUSED_SYMBOLS is not set
807# CONFIG_DEBUG_FS is not set 835# CONFIG_DEBUG_FS is not set
808# CONFIG_HEADERS_CHECK is not set 836# CONFIG_HEADERS_CHECK is not set
@@ -812,8 +840,11 @@ CONFIG_FRAME_WARN=1024
812# CONFIG_RCU_CPU_STALL_DETECTOR is not set 840# CONFIG_RCU_CPU_STALL_DETECTOR is not set
813# CONFIG_LATENCYTOP is not set 841# CONFIG_LATENCYTOP is not set
814CONFIG_HAVE_FUNCTION_TRACER=y 842CONFIG_HAVE_FUNCTION_TRACER=y
843CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
844CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
815CONFIG_HAVE_DYNAMIC_FTRACE=y 845CONFIG_HAVE_DYNAMIC_FTRACE=y
816CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 846CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
847CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
817CONFIG_TRACING_SUPPORT=y 848CONFIG_TRACING_SUPPORT=y
818# CONFIG_FTRACE is not set 849# CONFIG_FTRACE is not set
819# CONFIG_DMA_API_DEBUG is not set 850# CONFIG_DMA_API_DEBUG is not set
@@ -821,6 +852,7 @@ CONFIG_TRACING_SUPPORT=y
821CONFIG_HAVE_ARCH_KGDB=y 852CONFIG_HAVE_ARCH_KGDB=y
822# CONFIG_SH_STANDARD_BIOS is not set 853# CONFIG_SH_STANDARD_BIOS is not set
823# CONFIG_EARLY_SCIF_CONSOLE is not set 854# CONFIG_EARLY_SCIF_CONSOLE is not set
855# CONFIG_DWARF_UNWINDER is not set
824 856
825# 857#
826# Security options 858# Security options
@@ -834,7 +866,6 @@ CONFIG_CRYPTO=y
834# 866#
835# Crypto core or helper 867# Crypto core or helper
836# 868#
837# CONFIG_CRYPTO_FIPS is not set
838CONFIG_CRYPTO_ALGAPI=y 869CONFIG_CRYPTO_ALGAPI=y
839CONFIG_CRYPTO_ALGAPI2=y 870CONFIG_CRYPTO_ALGAPI2=y
840CONFIG_CRYPTO_AEAD2=y 871CONFIG_CRYPTO_AEAD2=y
@@ -875,11 +906,13 @@ CONFIG_CRYPTO_ECB=y
875# 906#
876# CONFIG_CRYPTO_HMAC is not set 907# CONFIG_CRYPTO_HMAC is not set
877# CONFIG_CRYPTO_XCBC is not set 908# CONFIG_CRYPTO_XCBC is not set
909# CONFIG_CRYPTO_VMAC is not set
878 910
879# 911#
880# Digest 912# Digest
881# 913#
882# CONFIG_CRYPTO_CRC32C is not set 914# CONFIG_CRYPTO_CRC32C is not set
915# CONFIG_CRYPTO_GHASH is not set
883# CONFIG_CRYPTO_MD4 is not set 916# CONFIG_CRYPTO_MD4 is not set
884CONFIG_CRYPTO_MD5=y 917CONFIG_CRYPTO_MD5=y
885# CONFIG_CRYPTO_MICHAEL_MIC is not set 918# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -943,5 +976,6 @@ CONFIG_DECOMPRESS_GZIP=y
943CONFIG_HAS_IOMEM=y 976CONFIG_HAS_IOMEM=y
944CONFIG_HAS_IOPORT=y 977CONFIG_HAS_IOPORT=y
945CONFIG_HAS_DMA=y 978CONFIG_HAS_DMA=y
979CONFIG_HAVE_LMB=y
946CONFIG_NLATTR=y 980CONFIG_NLATTR=y
947CONFIG_GENERIC_ATOMIC64=y 981CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig
index b18cfd39cac6..65018283c3a8 100644
--- a/arch/sh/configs/migor_defconfig
+++ b/arch/sh/configs/migor_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 16:06:48 2009 4# Thu Sep 24 18:17:41 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -29,7 +30,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
29# CONFIG_ARCH_HAS_ILOG2_U64 is not set 30# CONFIG_ARCH_HAS_ILOG2_U64 is not set
30CONFIG_ARCH_NO_VIRT_TO_BUS=y 31CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y
33 36
34# 37#
35# General setup 38# General setup
@@ -39,6 +42,12 @@ CONFIG_BROKEN_ON_SMP=y
39CONFIG_INIT_ENV_ARG_LIMIT=32 42CONFIG_INIT_ENV_ARG_LIMIT=32
40CONFIG_LOCALVERSION="" 43CONFIG_LOCALVERSION=""
41CONFIG_LOCALVERSION_AUTO=y 44CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y
48CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set
42CONFIG_SWAP=y 51CONFIG_SWAP=y
43CONFIG_SYSVIPC=y 52CONFIG_SYSVIPC=y
44CONFIG_SYSVIPC_SYSCTL=y 53CONFIG_SYSVIPC_SYSCTL=y
@@ -50,11 +59,12 @@ CONFIG_SYSVIPC_SYSCTL=y
50# 59#
51# RCU Subsystem 60# RCU Subsystem
52# 61#
53CONFIG_CLASSIC_RCU=y 62CONFIG_TREE_RCU=y
54# CONFIG_TREE_RCU is not set 63# CONFIG_TREE_PREEMPT_RCU is not set
55# CONFIG_PREEMPT_RCU is not set 64# CONFIG_RCU_TRACE is not set
65CONFIG_RCU_FANOUT=32
66# CONFIG_RCU_FANOUT_EXACT is not set
56# CONFIG_TREE_RCU_TRACE is not set 67# CONFIG_TREE_RCU_TRACE is not set
57# CONFIG_PREEMPT_RCU_TRACE is not set
58CONFIG_IKCONFIG=y 68CONFIG_IKCONFIG=y
59CONFIG_IKCONFIG_PROC=y 69CONFIG_IKCONFIG_PROC=y
60CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
@@ -89,19 +99,21 @@ CONFIG_TIMERFD=y
89CONFIG_EVENTFD=y 99CONFIG_EVENTFD=y
90CONFIG_SHMEM=y 100CONFIG_SHMEM=y
91CONFIG_AIO=y 101CONFIG_AIO=y
102CONFIG_HAVE_PERF_EVENTS=y
92 103
93# 104#
94# Performance Counters 105# Kernel Performance Events And Counters
95# 106#
107CONFIG_PERF_EVENTS=y
108CONFIG_EVENT_PROFILE=y
109# CONFIG_PERF_COUNTERS is not set
96CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
97# CONFIG_STRIP_ASM_SYMS is not set
98CONFIG_COMPAT_BRK=y 111CONFIG_COMPAT_BRK=y
99CONFIG_SLAB=y 112CONFIG_SLAB=y
100# CONFIG_SLUB is not set 113# CONFIG_SLUB is not set
101# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
102CONFIG_PROFILING=y 115CONFIG_PROFILING=y
103CONFIG_TRACEPOINTS=y 116CONFIG_TRACEPOINTS=y
104CONFIG_MARKERS=y
105CONFIG_OPROFILE=y 117CONFIG_OPROFILE=y
106CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
107# CONFIG_KPROBES is not set 119# CONFIG_KPROBES is not set
@@ -111,6 +123,11 @@ CONFIG_HAVE_KRETPROBES=y
111CONFIG_HAVE_ARCH_TRACEHOOK=y 123CONFIG_HAVE_ARCH_TRACEHOOK=y
112CONFIG_HAVE_CLK=y 124CONFIG_HAVE_CLK=y
113CONFIG_HAVE_DMA_API_DEBUG=y 125CONFIG_HAVE_DMA_API_DEBUG=y
126
127#
128# GCOV-based kernel profiling
129#
130# CONFIG_GCOV_KERNEL is not set
114# CONFIG_SLOW_WORK is not set 131# CONFIG_SLOW_WORK is not set
115CONFIG_HAVE_GENERIC_DMA_COHERENT=y 132CONFIG_HAVE_GENERIC_DMA_COHERENT=y
116CONFIG_SLABINFO=y 133CONFIG_SLABINFO=y
@@ -122,7 +139,7 @@ CONFIG_MODULES=y
122# CONFIG_MODVERSIONS is not set 139# CONFIG_MODVERSIONS is not set
123# CONFIG_MODULE_SRCVERSION_ALL is not set 140# CONFIG_MODULE_SRCVERSION_ALL is not set
124CONFIG_BLOCK=y 141CONFIG_BLOCK=y
125# CONFIG_LBD is not set 142CONFIG_LBDAF=y
126# CONFIG_BLK_DEV_BSG is not set 143# CONFIG_BLK_DEV_BSG is not set
127# CONFIG_BLK_DEV_INTEGRITY is not set 144# CONFIG_BLK_DEV_INTEGRITY is not set
128 145
@@ -138,7 +155,7 @@ CONFIG_DEFAULT_AS=y
138# CONFIG_DEFAULT_CFQ is not set 155# CONFIG_DEFAULT_CFQ is not set
139# CONFIG_DEFAULT_NOOP is not set 156# CONFIG_DEFAULT_NOOP is not set
140CONFIG_DEFAULT_IOSCHED="anticipatory" 157CONFIG_DEFAULT_IOSCHED="anticipatory"
141# CONFIG_FREEZER is not set 158CONFIG_FREEZER=y
142 159
143# 160#
144# System type 161# System type
@@ -173,6 +190,7 @@ CONFIG_ARCH_SHMOBILE=y
173# CONFIG_CPU_SUBTYPE_SH4_202 is not set 190# CONFIG_CPU_SUBTYPE_SH4_202 is not set
174# CONFIG_CPU_SUBTYPE_SH7723 is not set 191# CONFIG_CPU_SUBTYPE_SH7723 is not set
175# CONFIG_CPU_SUBTYPE_SH7724 is not set 192# CONFIG_CPU_SUBTYPE_SH7724 is not set
193# CONFIG_CPU_SUBTYPE_SH7757 is not set
176# CONFIG_CPU_SUBTYPE_SH7763 is not set 194# CONFIG_CPU_SUBTYPE_SH7763 is not set
177# CONFIG_CPU_SUBTYPE_SH7770 is not set 195# CONFIG_CPU_SUBTYPE_SH7770 is not set
178# CONFIG_CPU_SUBTYPE_SH7780 is not set 196# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -224,6 +242,7 @@ CONFIG_ZONE_DMA_FLAG=0
224CONFIG_NR_QUICK=2 242CONFIG_NR_QUICK=2
225CONFIG_HAVE_MLOCK=y 243CONFIG_HAVE_MLOCK=y
226CONFIG_HAVE_MLOCKED_PAGE_BIT=y 244CONFIG_HAVE_MLOCKED_PAGE_BIT=y
245# CONFIG_KSM is not set
227CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 246CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
228 247
229# 248#
@@ -308,7 +327,8 @@ CONFIG_GUSA=y
308CONFIG_ZERO_PAGE_OFFSET=0x00001000 327CONFIG_ZERO_PAGE_OFFSET=0x00001000
309CONFIG_BOOT_LINK_OFFSET=0x00800000 328CONFIG_BOOT_LINK_OFFSET=0x00800000
310CONFIG_ENTRY_OFFSET=0x00001000 329CONFIG_ENTRY_OFFSET=0x00001000
311CONFIG_CMDLINE_BOOL=y 330CONFIG_CMDLINE_OVERWRITE=y
331# CONFIG_CMDLINE_EXTEND is not set
312CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 earlyprintk=serial ip=on root=/dev/nfs ip=dhcp" 332CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 earlyprintk=serial ip=on root=/dev/nfs ip=dhcp"
313 333
314# 334#
@@ -328,7 +348,13 @@ CONFIG_BINFMT_ELF=y
328# 348#
329# Power management options (EXPERIMENTAL) 349# Power management options (EXPERIMENTAL)
330# 350#
331# CONFIG_PM is not set 351CONFIG_PM=y
352# CONFIG_PM_DEBUG is not set
353CONFIG_PM_SLEEP=y
354CONFIG_SUSPEND=y
355CONFIG_SUSPEND_FREEZER=y
356# CONFIG_HIBERNATION is not set
357CONFIG_PM_RUNTIME=y
332# CONFIG_CPU_IDLE is not set 358# CONFIG_CPU_IDLE is not set
333CONFIG_NET=y 359CONFIG_NET=y
334 360
@@ -376,6 +402,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
376# CONFIG_NETFILTER is not set 402# CONFIG_NETFILTER is not set
377# CONFIG_IP_DCCP is not set 403# CONFIG_IP_DCCP is not set
378# CONFIG_IP_SCTP is not set 404# CONFIG_IP_SCTP is not set
405# CONFIG_RDS is not set
379# CONFIG_TIPC is not set 406# CONFIG_TIPC is not set
380# CONFIG_ATM is not set 407# CONFIG_ATM is not set
381# CONFIG_BRIDGE is not set 408# CONFIG_BRIDGE is not set
@@ -406,6 +433,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
406# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
407CONFIG_WIRELESS=y 434CONFIG_WIRELESS=y
408# CONFIG_CFG80211 is not set 435# CONFIG_CFG80211 is not set
436CONFIG_CFG80211_DEFAULT_PS_VALUE=0
409# CONFIG_WIRELESS_OLD_REGULATORY is not set 437# CONFIG_WIRELESS_OLD_REGULATORY is not set
410CONFIG_WIRELESS_EXT=y 438CONFIG_WIRELESS_EXT=y
411CONFIG_WIRELESS_EXT_SYSFS=y 439CONFIG_WIRELESS_EXT_SYSFS=y
@@ -414,7 +442,6 @@ CONFIG_WIRELESS_EXT_SYSFS=y
414# 442#
415# CFG80211 needs to be enabled for MAC80211 443# CFG80211 needs to be enabled for MAC80211
416# 444#
417CONFIG_MAC80211_DEFAULT_PS_VALUE=0
418# CONFIG_WIMAX is not set 445# CONFIG_WIMAX is not set
419# CONFIG_RFKILL is not set 446# CONFIG_RFKILL is not set
420# CONFIG_NET_9P is not set 447# CONFIG_NET_9P is not set
@@ -427,6 +454,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
427# Generic Driver Options 454# Generic Driver Options
428# 455#
429CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 456CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
457# CONFIG_DEVTMPFS is not set
430CONFIG_STANDALONE=y 458CONFIG_STANDALONE=y
431CONFIG_PREVENT_FIRMWARE_BUILD=y 459CONFIG_PREVENT_FIRMWARE_BUILD=y
432CONFIG_FW_LOADER=m 460CONFIG_FW_LOADER=m
@@ -436,9 +464,9 @@ CONFIG_EXTRA_FIRMWARE=""
436# CONFIG_CONNECTOR is not set 464# CONFIG_CONNECTOR is not set
437CONFIG_MTD=y 465CONFIG_MTD=y
438# CONFIG_MTD_DEBUG is not set 466# CONFIG_MTD_DEBUG is not set
467# CONFIG_MTD_TESTS is not set
439CONFIG_MTD_CONCAT=y 468CONFIG_MTD_CONCAT=y
440CONFIG_MTD_PARTITIONS=y 469CONFIG_MTD_PARTITIONS=y
441# CONFIG_MTD_TESTS is not set
442# CONFIG_MTD_REDBOOT_PARTS is not set 470# CONFIG_MTD_REDBOOT_PARTS is not set
443CONFIG_MTD_CMDLINE_PARTS=y 471CONFIG_MTD_CMDLINE_PARTS=y
444# CONFIG_MTD_AR7_PARTS is not set 472# CONFIG_MTD_AR7_PARTS is not set
@@ -585,7 +613,6 @@ CONFIG_SCSI_WAIT_SCAN=m
585# CONFIG_SCSI_SRP_ATTRS is not set 613# CONFIG_SCSI_SRP_ATTRS is not set
586CONFIG_SCSI_LOWLEVEL=y 614CONFIG_SCSI_LOWLEVEL=y
587# CONFIG_ISCSI_TCP is not set 615# CONFIG_ISCSI_TCP is not set
588# CONFIG_SCSI_BNX2_ISCSI is not set
589# CONFIG_LIBFC is not set 616# CONFIG_LIBFC is not set
590# CONFIG_LIBFCOE is not set 617# CONFIG_LIBFCOE is not set
591# CONFIG_SCSI_DEBUG is not set 618# CONFIG_SCSI_DEBUG is not set
@@ -621,10 +648,7 @@ CONFIG_SMC91X=y
621# CONFIG_KS8842 is not set 648# CONFIG_KS8842 is not set
622# CONFIG_NETDEV_1000 is not set 649# CONFIG_NETDEV_1000 is not set
623# CONFIG_NETDEV_10000 is not set 650# CONFIG_NETDEV_10000 is not set
624 651CONFIG_WLAN=y
625#
626# Wireless LAN
627#
628# CONFIG_WLAN_PRE80211 is not set 652# CONFIG_WLAN_PRE80211 is not set
629# CONFIG_WLAN_80211 is not set 653# CONFIG_WLAN_80211 is not set
630 654
@@ -659,14 +683,19 @@ CONFIG_INPUT_EVDEV=y
659# Input Device Drivers 683# Input Device Drivers
660# 684#
661CONFIG_INPUT_KEYBOARD=y 685CONFIG_INPUT_KEYBOARD=y
686# CONFIG_KEYBOARD_ADP5588 is not set
662# CONFIG_KEYBOARD_ATKBD is not set 687# CONFIG_KEYBOARD_ATKBD is not set
663# CONFIG_KEYBOARD_SUNKBD is not set 688# CONFIG_QT2160 is not set
664# CONFIG_KEYBOARD_LKKBD is not set 689# CONFIG_KEYBOARD_LKKBD is not set
665# CONFIG_KEYBOARD_XTKBD is not set 690# CONFIG_KEYBOARD_GPIO is not set
691# CONFIG_KEYBOARD_MATRIX is not set
692# CONFIG_KEYBOARD_MAX7359 is not set
666# CONFIG_KEYBOARD_NEWTON is not set 693# CONFIG_KEYBOARD_NEWTON is not set
694# CONFIG_KEYBOARD_OPENCORES is not set
667# CONFIG_KEYBOARD_STOWAWAY is not set 695# CONFIG_KEYBOARD_STOWAWAY is not set
668# CONFIG_KEYBOARD_GPIO is not set 696# CONFIG_KEYBOARD_SUNKBD is not set
669CONFIG_KEYBOARD_SH_KEYSC=y 697CONFIG_KEYBOARD_SH_KEYSC=y
698# CONFIG_KEYBOARD_XTKBD is not set
670# CONFIG_INPUT_MOUSE is not set 699# CONFIG_INPUT_MOUSE is not set
671# CONFIG_INPUT_JOYSTICK is not set 700# CONFIG_INPUT_JOYSTICK is not set
672# CONFIG_INPUT_TABLET is not set 701# CONFIG_INPUT_TABLET is not set
@@ -715,6 +744,7 @@ CONFIG_HW_RANDOM=y
715# CONFIG_TCG_TPM is not set 744# CONFIG_TCG_TPM is not set
716CONFIG_I2C=y 745CONFIG_I2C=y
717CONFIG_I2C_BOARDINFO=y 746CONFIG_I2C_BOARDINFO=y
747CONFIG_I2C_COMPAT=y
718# CONFIG_I2C_CHARDEV is not set 748# CONFIG_I2C_CHARDEV is not set
719CONFIG_I2C_HELPER_AUTO=y 749CONFIG_I2C_HELPER_AUTO=y
720 750
@@ -725,6 +755,7 @@ CONFIG_I2C_HELPER_AUTO=y
725# 755#
726# I2C system bus drivers (mostly embedded / system-on-chip) 756# I2C system bus drivers (mostly embedded / system-on-chip)
727# 757#
758# CONFIG_I2C_DESIGNWARE is not set
728# CONFIG_I2C_GPIO is not set 759# CONFIG_I2C_GPIO is not set
729# CONFIG_I2C_OCORES is not set 760# CONFIG_I2C_OCORES is not set
730CONFIG_I2C_SH_MOBILE=y 761CONFIG_I2C_SH_MOBILE=y
@@ -746,15 +777,17 @@ CONFIG_I2C_SH_MOBILE=y
746# Miscellaneous I2C Chip support 777# Miscellaneous I2C Chip support
747# 778#
748# CONFIG_DS1682 is not set 779# CONFIG_DS1682 is not set
749# CONFIG_SENSORS_PCF8574 is not set
750# CONFIG_PCF8575 is not set
751# CONFIG_SENSORS_PCA9539 is not set
752# CONFIG_SENSORS_TSL2550 is not set 780# CONFIG_SENSORS_TSL2550 is not set
753# CONFIG_I2C_DEBUG_CORE is not set 781# CONFIG_I2C_DEBUG_CORE is not set
754# CONFIG_I2C_DEBUG_ALGO is not set 782# CONFIG_I2C_DEBUG_ALGO is not set
755# CONFIG_I2C_DEBUG_BUS is not set 783# CONFIG_I2C_DEBUG_BUS is not set
756# CONFIG_I2C_DEBUG_CHIP is not set 784# CONFIG_I2C_DEBUG_CHIP is not set
757# CONFIG_SPI is not set 785# CONFIG_SPI is not set
786
787#
788# PPS support
789#
790# CONFIG_PPS is not set
758CONFIG_ARCH_REQUIRE_GPIOLIB=y 791CONFIG_ARCH_REQUIRE_GPIOLIB=y
759CONFIG_GPIOLIB=y 792CONFIG_GPIOLIB=y
760# CONFIG_GPIO_SYSFS is not set 793# CONFIG_GPIO_SYSFS is not set
@@ -777,11 +810,14 @@ CONFIG_GPIOLIB=y
777# 810#
778# SPI GPIO expanders: 811# SPI GPIO expanders:
779# 812#
813
814#
815# AC97 GPIO expanders:
816#
780# CONFIG_W1 is not set 817# CONFIG_W1 is not set
781# CONFIG_POWER_SUPPLY is not set 818# CONFIG_POWER_SUPPLY is not set
782# CONFIG_HWMON is not set 819# CONFIG_HWMON is not set
783# CONFIG_THERMAL is not set 820# CONFIG_THERMAL is not set
784# CONFIG_THERMAL_HWMON is not set
785# CONFIG_WATCHDOG is not set 821# CONFIG_WATCHDOG is not set
786CONFIG_SSB_POSSIBLE=y 822CONFIG_SSB_POSSIBLE=y
787 823
@@ -801,8 +837,10 @@ CONFIG_SSB_POSSIBLE=y
801# CONFIG_MFD_TMIO is not set 837# CONFIG_MFD_TMIO is not set
802# CONFIG_PMIC_DA903X is not set 838# CONFIG_PMIC_DA903X is not set
803# CONFIG_MFD_WM8400 is not set 839# CONFIG_MFD_WM8400 is not set
840# CONFIG_MFD_WM831X is not set
804# CONFIG_MFD_WM8350_I2C is not set 841# CONFIG_MFD_WM8350_I2C is not set
805# CONFIG_MFD_PCF50633 is not set 842# CONFIG_MFD_PCF50633 is not set
843# CONFIG_AB3100_CORE is not set
806# CONFIG_REGULATOR is not set 844# CONFIG_REGULATOR is not set
807CONFIG_MEDIA_SUPPORT=y 845CONFIG_MEDIA_SUPPORT=y
808 846
@@ -922,7 +960,6 @@ CONFIG_LOGO_SUPERH_VGA16=y
922# CONFIG_SOUND is not set 960# CONFIG_SOUND is not set
923CONFIG_HID_SUPPORT=y 961CONFIG_HID_SUPPORT=y
924CONFIG_HID=y 962CONFIG_HID=y
925# CONFIG_HID_DEBUG is not set
926# CONFIG_HIDRAW is not set 963# CONFIG_HIDRAW is not set
927# CONFIG_HID_PID is not set 964# CONFIG_HID_PID is not set
928 965
@@ -952,13 +989,13 @@ CONFIG_USB_GADGET_SELECTED=y
952# CONFIG_USB_GADGET_LH7A40X is not set 989# CONFIG_USB_GADGET_LH7A40X is not set
953# CONFIG_USB_GADGET_OMAP is not set 990# CONFIG_USB_GADGET_OMAP is not set
954# CONFIG_USB_GADGET_PXA25X is not set 991# CONFIG_USB_GADGET_PXA25X is not set
992# CONFIG_USB_GADGET_R8A66597 is not set
955# CONFIG_USB_GADGET_PXA27X is not set 993# CONFIG_USB_GADGET_PXA27X is not set
956# CONFIG_USB_GADGET_S3C_HSOTG is not set 994# CONFIG_USB_GADGET_S3C_HSOTG is not set
957# CONFIG_USB_GADGET_S3C2410 is not set
958# CONFIG_USB_GADGET_IMX is not set 995# CONFIG_USB_GADGET_IMX is not set
996# CONFIG_USB_GADGET_S3C2410 is not set
959CONFIG_USB_GADGET_M66592=y 997CONFIG_USB_GADGET_M66592=y
960CONFIG_USB_M66592=y 998CONFIG_USB_M66592=y
961CONFIG_SUPERH_BUILT_IN_M66592=y
962# CONFIG_USB_GADGET_AMD5536UDC is not set 999# CONFIG_USB_GADGET_AMD5536UDC is not set
963# CONFIG_USB_GADGET_FSL_QE is not set 1000# CONFIG_USB_GADGET_FSL_QE is not set
964# CONFIG_USB_GADGET_CI13XXX is not set 1001# CONFIG_USB_GADGET_CI13XXX is not set
@@ -1017,6 +1054,7 @@ CONFIG_RTC_DRV_RS5C372=y
1017# CONFIG_RTC_DRV_S35390A is not set 1054# CONFIG_RTC_DRV_S35390A is not set
1018# CONFIG_RTC_DRV_FM3130 is not set 1055# CONFIG_RTC_DRV_FM3130 is not set
1019# CONFIG_RTC_DRV_RX8581 is not set 1056# CONFIG_RTC_DRV_RX8581 is not set
1057# CONFIG_RTC_DRV_RX8025 is not set
1020 1058
1021# 1059#
1022# SPI RTC drivers 1060# SPI RTC drivers
@@ -1064,8 +1102,10 @@ CONFIG_UIO_PDRV_GENIRQ=y
1064# CONFIG_JFS_FS is not set 1102# CONFIG_JFS_FS is not set
1065# CONFIG_FS_POSIX_ACL is not set 1103# CONFIG_FS_POSIX_ACL is not set
1066# CONFIG_XFS_FS is not set 1104# CONFIG_XFS_FS is not set
1105# CONFIG_GFS2_FS is not set
1067# CONFIG_OCFS2_FS is not set 1106# CONFIG_OCFS2_FS is not set
1068# CONFIG_BTRFS_FS is not set 1107# CONFIG_BTRFS_FS is not set
1108# CONFIG_NILFS2_FS is not set
1069CONFIG_FILE_LOCKING=y 1109CONFIG_FILE_LOCKING=y
1070CONFIG_FSNOTIFY=y 1110CONFIG_FSNOTIFY=y
1071# CONFIG_DNOTIFY is not set 1111# CONFIG_DNOTIFY is not set
@@ -1126,7 +1166,6 @@ CONFIG_MISC_FILESYSTEMS=y
1126# CONFIG_ROMFS_FS is not set 1166# CONFIG_ROMFS_FS is not set
1127# CONFIG_SYSV_FS is not set 1167# CONFIG_SYSV_FS is not set
1128# CONFIG_UFS_FS is not set 1168# CONFIG_UFS_FS is not set
1129# CONFIG_NILFS2_FS is not set
1130CONFIG_NETWORK_FILESYSTEMS=y 1169CONFIG_NETWORK_FILESYSTEMS=y
1131CONFIG_NFS_FS=y 1170CONFIG_NFS_FS=y
1132# CONFIG_NFS_V3 is not set 1171# CONFIG_NFS_V3 is not set
@@ -1161,6 +1200,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1161CONFIG_ENABLE_MUST_CHECK=y 1200CONFIG_ENABLE_MUST_CHECK=y
1162CONFIG_FRAME_WARN=1024 1201CONFIG_FRAME_WARN=1024
1163# CONFIG_MAGIC_SYSRQ is not set 1202# CONFIG_MAGIC_SYSRQ is not set
1203# CONFIG_STRIP_ASM_SYMS is not set
1164# CONFIG_UNUSED_SYMBOLS is not set 1204# CONFIG_UNUSED_SYMBOLS is not set
1165CONFIG_DEBUG_FS=y 1205CONFIG_DEBUG_FS=y
1166# CONFIG_HEADERS_CHECK is not set 1206# CONFIG_HEADERS_CHECK is not set
@@ -1172,11 +1212,15 @@ CONFIG_STACKTRACE=y
1172# CONFIG_LATENCYTOP is not set 1212# CONFIG_LATENCYTOP is not set
1173CONFIG_NOP_TRACER=y 1213CONFIG_NOP_TRACER=y
1174CONFIG_HAVE_FUNCTION_TRACER=y 1214CONFIG_HAVE_FUNCTION_TRACER=y
1215CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1216CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1175CONFIG_HAVE_DYNAMIC_FTRACE=y 1217CONFIG_HAVE_DYNAMIC_FTRACE=y
1176CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1218CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1219CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1177CONFIG_RING_BUFFER=y 1220CONFIG_RING_BUFFER=y
1178CONFIG_EVENT_TRACING=y 1221CONFIG_EVENT_TRACING=y
1179CONFIG_CONTEXT_SWITCH_TRACER=y 1222CONFIG_CONTEXT_SWITCH_TRACER=y
1223CONFIG_RING_BUFFER_ALLOW_SWAP=y
1180CONFIG_TRACING=y 1224CONFIG_TRACING=y
1181CONFIG_TRACING_SUPPORT=y 1225CONFIG_TRACING_SUPPORT=y
1182# CONFIG_FTRACE is not set 1226# CONFIG_FTRACE is not set
@@ -1188,6 +1232,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1188CONFIG_EARLY_SCIF_CONSOLE=y 1232CONFIG_EARLY_SCIF_CONSOLE=y
1189CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe00000 1233CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe00000
1190CONFIG_EARLY_PRINTK=y 1234CONFIG_EARLY_PRINTK=y
1235# CONFIG_DWARF_UNWINDER is not set
1191 1236
1192# 1237#
1193# Security options 1238# Security options
@@ -1201,7 +1246,6 @@ CONFIG_CRYPTO=y
1201# 1246#
1202# Crypto core or helper 1247# Crypto core or helper
1203# 1248#
1204# CONFIG_CRYPTO_FIPS is not set
1205CONFIG_CRYPTO_ALGAPI2=y 1249CONFIG_CRYPTO_ALGAPI2=y
1206CONFIG_CRYPTO_AEAD2=y 1250CONFIG_CRYPTO_AEAD2=y
1207CONFIG_CRYPTO_BLKCIPHER2=y 1251CONFIG_CRYPTO_BLKCIPHER2=y
@@ -1240,11 +1284,13 @@ CONFIG_CRYPTO_WORKQUEUE=y
1240# 1284#
1241# CONFIG_CRYPTO_HMAC is not set 1285# CONFIG_CRYPTO_HMAC is not set
1242# CONFIG_CRYPTO_XCBC is not set 1286# CONFIG_CRYPTO_XCBC is not set
1287# CONFIG_CRYPTO_VMAC is not set
1243 1288
1244# 1289#
1245# Digest 1290# Digest
1246# 1291#
1247# CONFIG_CRYPTO_CRC32C is not set 1292# CONFIG_CRYPTO_CRC32C is not set
1293# CONFIG_CRYPTO_GHASH is not set
1248# CONFIG_CRYPTO_MD4 is not set 1294# CONFIG_CRYPTO_MD4 is not set
1249# CONFIG_CRYPTO_MD5 is not set 1295# CONFIG_CRYPTO_MD5 is not set
1250# CONFIG_CRYPTO_MICHAEL_MIC is not set 1296# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1308,5 +1354,6 @@ CONFIG_DECOMPRESS_GZIP=y
1308CONFIG_HAS_IOMEM=y 1354CONFIG_HAS_IOMEM=y
1309CONFIG_HAS_IOPORT=y 1355CONFIG_HAS_IOPORT=y
1310CONFIG_HAS_DMA=y 1356CONFIG_HAS_DMA=y
1357CONFIG_HAVE_LMB=y
1311CONFIG_NLATTR=y 1358CONFIG_NLATTR=y
1312CONFIG_GENERIC_ATOMIC64=y 1359CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/polaris_defconfig b/arch/sh/configs/polaris_defconfig
index 67edd3f3f9ba..7fc1952419aa 100644
--- a/arch/sh/configs/polaris_defconfig
+++ b/arch/sh/configs/polaris_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:33:28 2009 4# Thu Sep 24 18:20:53 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -27,7 +28,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 28# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 29CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y
31 34
32# 35#
33# General setup 36# General setup
@@ -38,6 +41,12 @@ CONFIG_LOCK_KERNEL=y
38CONFIG_INIT_ENV_ARG_LIMIT=32 41CONFIG_INIT_ENV_ARG_LIMIT=32
39CONFIG_LOCALVERSION="" 42CONFIG_LOCALVERSION=""
40# CONFIG_LOCALVERSION_AUTO is not set 43# CONFIG_LOCALVERSION_AUTO is not set
44CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set
41# CONFIG_SWAP is not set 50# CONFIG_SWAP is not set
42CONFIG_SYSVIPC=y 51CONFIG_SYSVIPC=y
43CONFIG_SYSVIPC_SYSCTL=y 52CONFIG_SYSVIPC_SYSCTL=y
@@ -52,11 +61,12 @@ CONFIG_AUDIT=y
52# 61#
53# RCU Subsystem 62# RCU Subsystem
54# 63#
55CONFIG_CLASSIC_RCU=y 64CONFIG_TREE_RCU=y
56# CONFIG_TREE_RCU is not set 65# CONFIG_TREE_PREEMPT_RCU is not set
57# CONFIG_PREEMPT_RCU is not set 66# CONFIG_RCU_TRACE is not set
67CONFIG_RCU_FANOUT=32
68# CONFIG_RCU_FANOUT_EXACT is not set
58# CONFIG_TREE_RCU_TRACE is not set 69# CONFIG_TREE_RCU_TRACE is not set
59# CONFIG_PREEMPT_RCU_TRACE is not set
60# CONFIG_IKCONFIG is not set 70# CONFIG_IKCONFIG is not set
61CONFIG_LOG_BUF_SHIFT=14 71CONFIG_LOG_BUF_SHIFT=14
62CONFIG_GROUP_SCHED=y 72CONFIG_GROUP_SCHED=y
@@ -91,18 +101,19 @@ CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 102CONFIG_SHMEM=y
93CONFIG_AIO=y 103CONFIG_AIO=y
104CONFIG_HAVE_PERF_EVENTS=y
94 105
95# 106#
96# Performance Counters 107# Kernel Performance Events And Counters
97# 108#
109# CONFIG_PERF_EVENTS is not set
110# CONFIG_PERF_COUNTERS is not set
98CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
99# CONFIG_STRIP_ASM_SYMS is not set
100CONFIG_COMPAT_BRK=y 112CONFIG_COMPAT_BRK=y
101CONFIG_SLAB=y 113CONFIG_SLAB=y
102# CONFIG_SLUB is not set 114# CONFIG_SLUB is not set
103# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
104# CONFIG_PROFILING is not set 116# CONFIG_PROFILING is not set
105# CONFIG_MARKERS is not set
106CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
107# CONFIG_KPROBES is not set 118# CONFIG_KPROBES is not set
108CONFIG_HAVE_IOREMAP_PROT=y 119CONFIG_HAVE_IOREMAP_PROT=y
@@ -111,6 +122,10 @@ CONFIG_HAVE_KRETPROBES=y
111CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
112CONFIG_HAVE_CLK=y 123CONFIG_HAVE_CLK=y
113CONFIG_HAVE_DMA_API_DEBUG=y 124CONFIG_HAVE_DMA_API_DEBUG=y
125
126#
127# GCOV-based kernel profiling
128#
114# CONFIG_SLOW_WORK is not set 129# CONFIG_SLOW_WORK is not set
115CONFIG_HAVE_GENERIC_DMA_COHERENT=y 130CONFIG_HAVE_GENERIC_DMA_COHERENT=y
116CONFIG_SLABINFO=y 131CONFIG_SLABINFO=y
@@ -123,7 +138,7 @@ CONFIG_MODULE_UNLOAD=y
123CONFIG_MODVERSIONS=y 138CONFIG_MODVERSIONS=y
124# CONFIG_MODULE_SRCVERSION_ALL is not set 139# CONFIG_MODULE_SRCVERSION_ALL is not set
125CONFIG_BLOCK=y 140CONFIG_BLOCK=y
126# CONFIG_LBD is not set 141CONFIG_LBDAF=y
127# CONFIG_BLK_DEV_BSG is not set 142# CONFIG_BLK_DEV_BSG is not set
128# CONFIG_BLK_DEV_INTEGRITY is not set 143# CONFIG_BLK_DEV_INTEGRITY is not set
129 144
@@ -170,6 +185,7 @@ CONFIG_CPU_SUBTYPE_SH7709=y
170# CONFIG_CPU_SUBTYPE_SH4_202 is not set 185# CONFIG_CPU_SUBTYPE_SH4_202 is not set
171# CONFIG_CPU_SUBTYPE_SH7723 is not set 186# CONFIG_CPU_SUBTYPE_SH7723 is not set
172# CONFIG_CPU_SUBTYPE_SH7724 is not set 187# CONFIG_CPU_SUBTYPE_SH7724 is not set
188# CONFIG_CPU_SUBTYPE_SH7757 is not set
173# CONFIG_CPU_SUBTYPE_SH7763 is not set 189# CONFIG_CPU_SUBTYPE_SH7763 is not set
174# CONFIG_CPU_SUBTYPE_SH7770 is not set 190# CONFIG_CPU_SUBTYPE_SH7770 is not set
175# CONFIG_CPU_SUBTYPE_SH7780 is not set 191# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -215,6 +231,7 @@ CONFIG_ZONE_DMA_FLAG=0
215CONFIG_NR_QUICK=2 231CONFIG_NR_QUICK=2
216CONFIG_HAVE_MLOCK=y 232CONFIG_HAVE_MLOCK=y
217CONFIG_HAVE_MLOCKED_PAGE_BIT=y 233CONFIG_HAVE_MLOCKED_PAGE_BIT=y
234# CONFIG_KSM is not set
218CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 235CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
219 236
220# 237#
@@ -302,7 +319,8 @@ CONFIG_GUSA=y
302CONFIG_ZERO_PAGE_OFFSET=0x00001000 319CONFIG_ZERO_PAGE_OFFSET=0x00001000
303CONFIG_BOOT_LINK_OFFSET=0x00800000 320CONFIG_BOOT_LINK_OFFSET=0x00800000
304CONFIG_ENTRY_OFFSET=0x00001000 321CONFIG_ENTRY_OFFSET=0x00001000
305CONFIG_CMDLINE_BOOL=y 322CONFIG_CMDLINE_OVERWRITE=y
323# CONFIG_CMDLINE_EXTEND is not set
306CONFIG_CMDLINE="console=ttySC1,115200 root=/dev/mtdblock2 rootfstype=jffs2 mem=63M mtdparts=physmap-flash.0:0x00100000(bootloader)ro,0x00500000(Kernel)ro,0x00A00000(Filesystem)" 324CONFIG_CMDLINE="console=ttySC1,115200 root=/dev/mtdblock2 rootfstype=jffs2 mem=63M mtdparts=physmap-flash.0:0x00100000(bootloader)ro,0x00500000(Kernel)ro,0x00A00000(Filesystem)"
307 325
308# 326#
@@ -363,6 +381,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
363# CONFIG_NETFILTER is not set 381# CONFIG_NETFILTER is not set
364# CONFIG_IP_DCCP is not set 382# CONFIG_IP_DCCP is not set
365# CONFIG_IP_SCTP is not set 383# CONFIG_IP_SCTP is not set
384# CONFIG_RDS is not set
366# CONFIG_TIPC is not set 385# CONFIG_TIPC is not set
367# CONFIG_ATM is not set 386# CONFIG_ATM is not set
368# CONFIG_BRIDGE is not set 387# CONFIG_BRIDGE is not set
@@ -403,6 +422,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
403# Generic Driver Options 422# Generic Driver Options
404# 423#
405CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 424CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
425# CONFIG_DEVTMPFS is not set
406CONFIG_STANDALONE=y 426CONFIG_STANDALONE=y
407CONFIG_PREVENT_FIRMWARE_BUILD=y 427CONFIG_PREVENT_FIRMWARE_BUILD=y
408CONFIG_FW_LOADER=y 428CONFIG_FW_LOADER=y
@@ -414,9 +434,9 @@ CONFIG_EXTRA_FIRMWARE=""
414# CONFIG_CONNECTOR is not set 434# CONFIG_CONNECTOR is not set
415CONFIG_MTD=y 435CONFIG_MTD=y
416# CONFIG_MTD_DEBUG is not set 436# CONFIG_MTD_DEBUG is not set
437# CONFIG_MTD_TESTS is not set
417# CONFIG_MTD_CONCAT is not set 438# CONFIG_MTD_CONCAT is not set
418CONFIG_MTD_PARTITIONS=y 439CONFIG_MTD_PARTITIONS=y
419# CONFIG_MTD_TESTS is not set
420# CONFIG_MTD_REDBOOT_PARTS is not set 440# CONFIG_MTD_REDBOOT_PARTS is not set
421CONFIG_MTD_CMDLINE_PARTS=y 441CONFIG_MTD_CMDLINE_PARTS=y
422# CONFIG_MTD_AR7_PARTS is not set 442# CONFIG_MTD_AR7_PARTS is not set
@@ -577,10 +597,7 @@ CONFIG_SMSC911X=y
577# CONFIG_KS8842 is not set 597# CONFIG_KS8842 is not set
578# CONFIG_NETDEV_1000 is not set 598# CONFIG_NETDEV_1000 is not set
579# CONFIG_NETDEV_10000 is not set 599# CONFIG_NETDEV_10000 is not set
580 600CONFIG_WLAN=y
581#
582# Wireless LAN
583#
584# CONFIG_WLAN_PRE80211 is not set 601# CONFIG_WLAN_PRE80211 is not set
585# CONFIG_WLAN_80211 is not set 602# CONFIG_WLAN_80211 is not set
586 603
@@ -666,11 +683,15 @@ CONFIG_UNIX98_PTYS=y
666# CONFIG_TCG_TPM is not set 683# CONFIG_TCG_TPM is not set
667# CONFIG_I2C is not set 684# CONFIG_I2C is not set
668# CONFIG_SPI is not set 685# CONFIG_SPI is not set
686
687#
688# PPS support
689#
690# CONFIG_PPS is not set
669# CONFIG_W1 is not set 691# CONFIG_W1 is not set
670# CONFIG_POWER_SUPPLY is not set 692# CONFIG_POWER_SUPPLY is not set
671# CONFIG_HWMON is not set 693# CONFIG_HWMON is not set
672# CONFIG_THERMAL is not set 694# CONFIG_THERMAL is not set
673# CONFIG_THERMAL_HWMON is not set
674# CONFIG_WATCHDOG is not set 695# CONFIG_WATCHDOG is not set
675CONFIG_SSB_POSSIBLE=y 696CONFIG_SSB_POSSIBLE=y
676 697
@@ -770,8 +791,10 @@ CONFIG_RTC_DRV_SH=y
770# CONFIG_JFS_FS is not set 791# CONFIG_JFS_FS is not set
771# CONFIG_FS_POSIX_ACL is not set 792# CONFIG_FS_POSIX_ACL is not set
772# CONFIG_XFS_FS is not set 793# CONFIG_XFS_FS is not set
794# CONFIG_GFS2_FS is not set
773# CONFIG_OCFS2_FS is not set 795# CONFIG_OCFS2_FS is not set
774# CONFIG_BTRFS_FS is not set 796# CONFIG_BTRFS_FS is not set
797# CONFIG_NILFS2_FS is not set
775CONFIG_FILE_LOCKING=y 798CONFIG_FILE_LOCKING=y
776CONFIG_FSNOTIFY=y 799CONFIG_FSNOTIFY=y
777# CONFIG_DNOTIFY is not set 800# CONFIG_DNOTIFY is not set
@@ -841,7 +864,6 @@ CONFIG_JFFS2_RTIME=y
841# CONFIG_ROMFS_FS is not set 864# CONFIG_ROMFS_FS is not set
842# CONFIG_SYSV_FS is not set 865# CONFIG_SYSV_FS is not set
843# CONFIG_UFS_FS is not set 866# CONFIG_UFS_FS is not set
844# CONFIG_NILFS2_FS is not set
845CONFIG_NETWORK_FILESYSTEMS=y 867CONFIG_NETWORK_FILESYSTEMS=y
846CONFIG_NFS_FS=y 868CONFIG_NFS_FS=y
847CONFIG_NFS_V3=y 869CONFIG_NFS_V3=y
@@ -877,6 +899,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
877CONFIG_ENABLE_MUST_CHECK=y 899CONFIG_ENABLE_MUST_CHECK=y
878CONFIG_FRAME_WARN=1024 900CONFIG_FRAME_WARN=1024
879# CONFIG_MAGIC_SYSRQ is not set 901# CONFIG_MAGIC_SYSRQ is not set
902# CONFIG_STRIP_ASM_SYMS is not set
880# CONFIG_UNUSED_SYMBOLS is not set 903# CONFIG_UNUSED_SYMBOLS is not set
881# CONFIG_DEBUG_FS is not set 904# CONFIG_DEBUG_FS is not set
882# CONFIG_HEADERS_CHECK is not set 905# CONFIG_HEADERS_CHECK is not set
@@ -916,18 +939,23 @@ CONFIG_DEBUG_INFO=y
916# CONFIG_DEBUG_LIST is not set 939# CONFIG_DEBUG_LIST is not set
917CONFIG_DEBUG_SG=y 940CONFIG_DEBUG_SG=y
918# CONFIG_DEBUG_NOTIFIERS is not set 941# CONFIG_DEBUG_NOTIFIERS is not set
942# CONFIG_DEBUG_CREDENTIALS is not set
919CONFIG_FRAME_POINTER=y 943CONFIG_FRAME_POINTER=y
920# CONFIG_RCU_TORTURE_TEST is not set 944# CONFIG_RCU_TORTURE_TEST is not set
921# CONFIG_RCU_CPU_STALL_DETECTOR is not set 945# CONFIG_RCU_CPU_STALL_DETECTOR is not set
922# CONFIG_BACKTRACE_SELF_TEST is not set 946# CONFIG_BACKTRACE_SELF_TEST is not set
923# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 947# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
948# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
924# CONFIG_FAULT_INJECTION is not set 949# CONFIG_FAULT_INJECTION is not set
925# CONFIG_LATENCYTOP is not set 950# CONFIG_LATENCYTOP is not set
926CONFIG_SYSCTL_SYSCALL_CHECK=y 951CONFIG_SYSCTL_SYSCALL_CHECK=y
927# CONFIG_PAGE_POISONING is not set 952# CONFIG_PAGE_POISONING is not set
928CONFIG_HAVE_FUNCTION_TRACER=y 953CONFIG_HAVE_FUNCTION_TRACER=y
954CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
955CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
929CONFIG_HAVE_DYNAMIC_FTRACE=y 956CONFIG_HAVE_DYNAMIC_FTRACE=y
930CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 957CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
958CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
931CONFIG_TRACING_SUPPORT=y 959CONFIG_TRACING_SUPPORT=y
932CONFIG_FTRACE=y 960CONFIG_FTRACE=y
933# CONFIG_FUNCTION_TRACER is not set 961# CONFIG_FUNCTION_TRACER is not set
@@ -935,6 +963,7 @@ CONFIG_FTRACE=y
935# CONFIG_PREEMPT_TRACER is not set 963# CONFIG_PREEMPT_TRACER is not set
936# CONFIG_SCHED_TRACER is not set 964# CONFIG_SCHED_TRACER is not set
937# CONFIG_ENABLE_DEFAULT_TRACERS is not set 965# CONFIG_ENABLE_DEFAULT_TRACERS is not set
966# CONFIG_FTRACE_SYSCALLS is not set
938# CONFIG_BOOT_TRACER is not set 967# CONFIG_BOOT_TRACER is not set
939CONFIG_BRANCH_PROFILE_NONE=y 968CONFIG_BRANCH_PROFILE_NONE=y
940# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 969# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -947,16 +976,15 @@ CONFIG_BRANCH_PROFILE_NONE=y
947# CONFIG_SAMPLES is not set 976# CONFIG_SAMPLES is not set
948CONFIG_HAVE_ARCH_KGDB=y 977CONFIG_HAVE_ARCH_KGDB=y
949# CONFIG_KGDB is not set 978# CONFIG_KGDB is not set
950# CONFIG_KMEMCHECK is not set
951# CONFIG_SH_STANDARD_BIOS is not set 979# CONFIG_SH_STANDARD_BIOS is not set
952CONFIG_EARLY_SCIF_CONSOLE=y 980CONFIG_EARLY_SCIF_CONSOLE=y
953CONFIG_EARLY_SCIF_CONSOLE_PORT=0x00000000 981CONFIG_EARLY_SCIF_CONSOLE_PORT=0xa4000150
954CONFIG_EARLY_PRINTK=y 982CONFIG_EARLY_PRINTK=y
955# CONFIG_DEBUG_BOOTMEM is not set 983# CONFIG_STACK_DEBUG is not set
956# CONFIG_DEBUG_STACKOVERFLOW is not set
957# CONFIG_DEBUG_STACK_USAGE is not set 984# CONFIG_DEBUG_STACK_USAGE is not set
958# CONFIG_4KSTACKS is not set 985# CONFIG_4KSTACKS is not set
959CONFIG_DUMP_CODE=y 986CONFIG_DUMP_CODE=y
987# CONFIG_DWARF_UNWINDER is not set
960# CONFIG_SH_NO_BSS_INIT is not set 988# CONFIG_SH_NO_BSS_INIT is not set
961 989
962# 990#
@@ -987,5 +1015,6 @@ CONFIG_ZLIB_DEFLATE=y
987CONFIG_HAS_IOMEM=y 1015CONFIG_HAS_IOMEM=y
988CONFIG_HAS_IOPORT=y 1016CONFIG_HAS_IOPORT=y
989CONFIG_HAS_DMA=y 1017CONFIG_HAS_DMA=y
1018CONFIG_HAVE_LMB=y
990CONFIG_NLATTR=y 1019CONFIG_NLATTR=y
991CONFIG_GENERIC_ATOMIC64=y 1020CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/r7780mp_defconfig b/arch/sh/configs/r7780mp_defconfig
index 107a8e337ecc..903b021e8d93 100644
--- a/arch/sh/configs/r7780mp_defconfig
+++ b/arch/sh/configs/r7780mp_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:34:44 2009 4# Thu Sep 24 18:24:31 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,8 +29,10 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
28# CONFIG_ARCH_HAS_ILOG2_U64 is not set 29# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29CONFIG_ARCH_NO_VIRT_TO_BUS=y 30CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_IO_TRAPPED=y 33CONFIG_IO_TRAPPED=y
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y
33 36
34# 37#
35# General setup 38# General setup
@@ -40,6 +43,12 @@ CONFIG_LOCK_KERNEL=y
40CONFIG_INIT_ENV_ARG_LIMIT=32 43CONFIG_INIT_ENV_ARG_LIMIT=32
41CONFIG_LOCALVERSION="" 44CONFIG_LOCALVERSION=""
42CONFIG_LOCALVERSION_AUTO=y 45CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set
43CONFIG_SWAP=y 52CONFIG_SWAP=y
44CONFIG_SYSVIPC=y 53CONFIG_SYSVIPC=y
45CONFIG_SYSVIPC_SYSCTL=y 54CONFIG_SYSVIPC_SYSCTL=y
@@ -52,11 +61,12 @@ CONFIG_BSD_PROCESS_ACCT=y
52# 61#
53# RCU Subsystem 62# RCU Subsystem
54# 63#
55CONFIG_CLASSIC_RCU=y 64CONFIG_TREE_RCU=y
56# CONFIG_TREE_RCU is not set 65# CONFIG_TREE_PREEMPT_RCU is not set
57# CONFIG_PREEMPT_RCU is not set 66# CONFIG_RCU_TRACE is not set
67CONFIG_RCU_FANOUT=32
68# CONFIG_RCU_FANOUT_EXACT is not set
58# CONFIG_TREE_RCU_TRACE is not set 69# CONFIG_TREE_RCU_TRACE is not set
59# CONFIG_PREEMPT_RCU_TRACE is not set
60CONFIG_IKCONFIG=y 70CONFIG_IKCONFIG=y
61CONFIG_IKCONFIG_PROC=y 71CONFIG_IKCONFIG_PROC=y
62CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
@@ -92,20 +102,22 @@ CONFIG_TIMERFD=y
92CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
93CONFIG_SHMEM=y 103CONFIG_SHMEM=y
94CONFIG_AIO=y 104CONFIG_AIO=y
105CONFIG_HAVE_PERF_EVENTS=y
95 106
96# 107#
97# Performance Counters 108# Kernel Performance Events And Counters
98# 109#
110CONFIG_PERF_EVENTS=y
111CONFIG_EVENT_PROFILE=y
112# CONFIG_PERF_COUNTERS is not set
99CONFIG_VM_EVENT_COUNTERS=y 113CONFIG_VM_EVENT_COUNTERS=y
100CONFIG_PCI_QUIRKS=y 114CONFIG_PCI_QUIRKS=y
101# CONFIG_STRIP_ASM_SYMS is not set
102CONFIG_COMPAT_BRK=y 115CONFIG_COMPAT_BRK=y
103CONFIG_SLAB=y 116CONFIG_SLAB=y
104# CONFIG_SLUB is not set 117# CONFIG_SLUB is not set
105# CONFIG_SLOB is not set 118# CONFIG_SLOB is not set
106CONFIG_PROFILING=y 119CONFIG_PROFILING=y
107CONFIG_TRACEPOINTS=y 120CONFIG_TRACEPOINTS=y
108CONFIG_MARKERS=y
109CONFIG_OPROFILE=m 121CONFIG_OPROFILE=m
110CONFIG_HAVE_OPROFILE=y 122CONFIG_HAVE_OPROFILE=y
111# CONFIG_KPROBES is not set 123# CONFIG_KPROBES is not set
@@ -115,6 +127,11 @@ CONFIG_HAVE_KRETPROBES=y
115CONFIG_HAVE_ARCH_TRACEHOOK=y 127CONFIG_HAVE_ARCH_TRACEHOOK=y
116CONFIG_HAVE_CLK=y 128CONFIG_HAVE_CLK=y
117CONFIG_HAVE_DMA_API_DEBUG=y 129CONFIG_HAVE_DMA_API_DEBUG=y
130
131#
132# GCOV-based kernel profiling
133#
134# CONFIG_GCOV_KERNEL is not set
118# CONFIG_SLOW_WORK is not set 135# CONFIG_SLOW_WORK is not set
119CONFIG_HAVE_GENERIC_DMA_COHERENT=y 136CONFIG_HAVE_GENERIC_DMA_COHERENT=y
120CONFIG_SLABINFO=y 137CONFIG_SLABINFO=y
@@ -126,7 +143,7 @@ CONFIG_MODULE_UNLOAD=y
126# CONFIG_MODVERSIONS is not set 143# CONFIG_MODVERSIONS is not set
127# CONFIG_MODULE_SRCVERSION_ALL is not set 144# CONFIG_MODULE_SRCVERSION_ALL is not set
128CONFIG_BLOCK=y 145CONFIG_BLOCK=y
129# CONFIG_LBD is not set 146CONFIG_LBDAF=y
130# CONFIG_BLK_DEV_BSG is not set 147# CONFIG_BLK_DEV_BSG is not set
131# CONFIG_BLK_DEV_INTEGRITY is not set 148# CONFIG_BLK_DEV_INTEGRITY is not set
132 149
@@ -174,6 +191,7 @@ CONFIG_CPU_SH4A=y
174# CONFIG_CPU_SUBTYPE_SH4_202 is not set 191# CONFIG_CPU_SUBTYPE_SH4_202 is not set
175# CONFIG_CPU_SUBTYPE_SH7723 is not set 192# CONFIG_CPU_SUBTYPE_SH7723 is not set
176# CONFIG_CPU_SUBTYPE_SH7724 is not set 193# CONFIG_CPU_SUBTYPE_SH7724 is not set
194# CONFIG_CPU_SUBTYPE_SH7757 is not set
177# CONFIG_CPU_SUBTYPE_SH7763 is not set 195# CONFIG_CPU_SUBTYPE_SH7763 is not set
178# CONFIG_CPU_SUBTYPE_SH7770 is not set 196# CONFIG_CPU_SUBTYPE_SH7770 is not set
179CONFIG_CPU_SUBTYPE_SH7780=y 197CONFIG_CPU_SUBTYPE_SH7780=y
@@ -229,6 +247,7 @@ CONFIG_ZONE_DMA_FLAG=0
229CONFIG_NR_QUICK=2 247CONFIG_NR_QUICK=2
230CONFIG_HAVE_MLOCK=y 248CONFIG_HAVE_MLOCK=y
231CONFIG_HAVE_MLOCKED_PAGE_BIT=y 249CONFIG_HAVE_MLOCKED_PAGE_BIT=y
250# CONFIG_KSM is not set
232CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 251CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
233 252
234# 253#
@@ -315,7 +334,8 @@ CONFIG_GUSA=y
315CONFIG_ZERO_PAGE_OFFSET=0x00001000 334CONFIG_ZERO_PAGE_OFFSET=0x00001000
316CONFIG_BOOT_LINK_OFFSET=0x00800000 335CONFIG_BOOT_LINK_OFFSET=0x00800000
317CONFIG_ENTRY_OFFSET=0x00001000 336CONFIG_ENTRY_OFFSET=0x00001000
318CONFIG_CMDLINE_BOOL=y 337CONFIG_CMDLINE_OVERWRITE=y
338# CONFIG_CMDLINE_EXTEND is not set
319CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1" 339CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
320 340
321# 341#
@@ -396,6 +416,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
396# CONFIG_NETFILTER is not set 416# CONFIG_NETFILTER is not set
397# CONFIG_IP_DCCP is not set 417# CONFIG_IP_DCCP is not set
398# CONFIG_IP_SCTP is not set 418# CONFIG_IP_SCTP is not set
419# CONFIG_RDS is not set
399# CONFIG_TIPC is not set 420# CONFIG_TIPC is not set
400# CONFIG_ATM is not set 421# CONFIG_ATM is not set
401CONFIG_STP=m 422CONFIG_STP=m
@@ -428,6 +449,7 @@ CONFIG_LLC=m
428# CONFIG_AF_RXRPC is not set 449# CONFIG_AF_RXRPC is not set
429CONFIG_WIRELESS=y 450CONFIG_WIRELESS=y
430# CONFIG_CFG80211 is not set 451# CONFIG_CFG80211 is not set
452CONFIG_CFG80211_DEFAULT_PS_VALUE=0
431# CONFIG_WIRELESS_OLD_REGULATORY is not set 453# CONFIG_WIRELESS_OLD_REGULATORY is not set
432CONFIG_WIRELESS_EXT=y 454CONFIG_WIRELESS_EXT=y
433CONFIG_WIRELESS_EXT_SYSFS=y 455CONFIG_WIRELESS_EXT_SYSFS=y
@@ -436,7 +458,6 @@ CONFIG_WIRELESS_EXT_SYSFS=y
436# 458#
437# CFG80211 needs to be enabled for MAC80211 459# CFG80211 needs to be enabled for MAC80211
438# 460#
439CONFIG_MAC80211_DEFAULT_PS_VALUE=0
440# CONFIG_WIMAX is not set 461# CONFIG_WIMAX is not set
441# CONFIG_RFKILL is not set 462# CONFIG_RFKILL is not set
442# CONFIG_NET_9P is not set 463# CONFIG_NET_9P is not set
@@ -449,6 +470,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
449# Generic Driver Options 470# Generic Driver Options
450# 471#
451CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 472CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
473# CONFIG_DEVTMPFS is not set
452CONFIG_STANDALONE=y 474CONFIG_STANDALONE=y
453CONFIG_PREVENT_FIRMWARE_BUILD=y 475CONFIG_PREVENT_FIRMWARE_BUILD=y
454CONFIG_FW_LOADER=m 476CONFIG_FW_LOADER=m
@@ -460,9 +482,9 @@ CONFIG_EXTRA_FIRMWARE=""
460# CONFIG_CONNECTOR is not set 482# CONFIG_CONNECTOR is not set
461CONFIG_MTD=y 483CONFIG_MTD=y
462# CONFIG_MTD_DEBUG is not set 484# CONFIG_MTD_DEBUG is not set
485# CONFIG_MTD_TESTS is not set
463# CONFIG_MTD_CONCAT is not set 486# CONFIG_MTD_CONCAT is not set
464CONFIG_MTD_PARTITIONS=y 487CONFIG_MTD_PARTITIONS=y
465# CONFIG_MTD_TESTS is not set
466# CONFIG_MTD_REDBOOT_PARTS is not set 488# CONFIG_MTD_REDBOOT_PARTS is not set
467# CONFIG_MTD_CMDLINE_PARTS is not set 489# CONFIG_MTD_CMDLINE_PARTS is not set
468# CONFIG_MTD_AR7_PARTS is not set 490# CONFIG_MTD_AR7_PARTS is not set
@@ -513,6 +535,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
513CONFIG_MTD_PHYSMAP=y 535CONFIG_MTD_PHYSMAP=y
514# CONFIG_MTD_PHYSMAP_COMPAT is not set 536# CONFIG_MTD_PHYSMAP_COMPAT is not set
515# CONFIG_MTD_PCI is not set 537# CONFIG_MTD_PCI is not set
538# CONFIG_MTD_GPIO_ADDR is not set
516# CONFIG_MTD_INTEL_VR_NOR is not set 539# CONFIG_MTD_INTEL_VR_NOR is not set
517# CONFIG_MTD_PLATRAM is not set 540# CONFIG_MTD_PLATRAM is not set
518 541
@@ -651,11 +674,13 @@ CONFIG_SCSI_LOWLEVEL=y
651# CONFIG_SCSI_DC390T is not set 674# CONFIG_SCSI_DC390T is not set
652# CONFIG_SCSI_NSP32 is not set 675# CONFIG_SCSI_NSP32 is not set
653# CONFIG_SCSI_DEBUG is not set 676# CONFIG_SCSI_DEBUG is not set
677# CONFIG_SCSI_PMCRAID is not set
654# CONFIG_SCSI_SRP is not set 678# CONFIG_SCSI_SRP is not set
655# CONFIG_SCSI_DH is not set 679# CONFIG_SCSI_DH is not set
656# CONFIG_SCSI_OSD_INITIATOR is not set 680# CONFIG_SCSI_OSD_INITIATOR is not set
657CONFIG_ATA=y 681CONFIG_ATA=y
658# CONFIG_ATA_NONSTANDARD is not set 682# CONFIG_ATA_NONSTANDARD is not set
683CONFIG_ATA_VERBOSE_ERROR=y
659CONFIG_SATA_PMP=y 684CONFIG_SATA_PMP=y
660# CONFIG_SATA_AHCI is not set 685# CONFIG_SATA_AHCI is not set
661# CONFIG_SATA_SIL24 is not set 686# CONFIG_SATA_SIL24 is not set
@@ -677,6 +702,7 @@ CONFIG_SATA_SIL=y
677# CONFIG_PATA_ALI is not set 702# CONFIG_PATA_ALI is not set
678# CONFIG_PATA_AMD is not set 703# CONFIG_PATA_AMD is not set
679# CONFIG_PATA_ARTOP is not set 704# CONFIG_PATA_ARTOP is not set
705# CONFIG_PATA_ATP867X is not set
680# CONFIG_PATA_ATIIXP is not set 706# CONFIG_PATA_ATIIXP is not set
681# CONFIG_PATA_CMD640_PCI is not set 707# CONFIG_PATA_CMD640_PCI is not set
682# CONFIG_PATA_CMD64X is not set 708# CONFIG_PATA_CMD64X is not set
@@ -704,6 +730,7 @@ CONFIG_SATA_SIL=y
704# CONFIG_PATA_OPTIDMA is not set 730# CONFIG_PATA_OPTIDMA is not set
705# CONFIG_PATA_PDC_OLD is not set 731# CONFIG_PATA_PDC_OLD is not set
706# CONFIG_PATA_RADISYS is not set 732# CONFIG_PATA_RADISYS is not set
733# CONFIG_PATA_RDC is not set
707# CONFIG_PATA_RZ1000 is not set 734# CONFIG_PATA_RZ1000 is not set
708# CONFIG_PATA_SC1200 is not set 735# CONFIG_PATA_SC1200 is not set
709# CONFIG_PATA_SERVERWORKS is not set 736# CONFIG_PATA_SERVERWORKS is not set
@@ -722,7 +749,11 @@ CONFIG_PATA_PLATFORM=y
722# 749#
723 750
724# 751#
725# Enable only one of the two stacks, unless you know what you are doing 752# You can enable one or both FireWire driver stacks.
753#
754
755#
756# See the help texts for more information.
726# 757#
727# CONFIG_FIREWIRE is not set 758# CONFIG_FIREWIRE is not set
728# CONFIG_IEEE1394 is not set 759# CONFIG_IEEE1394 is not set
@@ -804,6 +835,7 @@ CONFIG_R8169=y
804# CONFIG_VIA_VELOCITY is not set 835# CONFIG_VIA_VELOCITY is not set
805# CONFIG_TIGON3 is not set 836# CONFIG_TIGON3 is not set
806# CONFIG_BNX2 is not set 837# CONFIG_BNX2 is not set
838# CONFIG_CNIC is not set
807# CONFIG_QLA3XXX is not set 839# CONFIG_QLA3XXX is not set
808# CONFIG_ATL1 is not set 840# CONFIG_ATL1 is not set
809# CONFIG_ATL1E is not set 841# CONFIG_ATL1E is not set
@@ -829,10 +861,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
829# CONFIG_SFC is not set 861# CONFIG_SFC is not set
830# CONFIG_BE2NET is not set 862# CONFIG_BE2NET is not set
831# CONFIG_TR is not set 863# CONFIG_TR is not set
832 864CONFIG_WLAN=y
833#
834# Wireless LAN
835#
836# CONFIG_WLAN_PRE80211 is not set 865# CONFIG_WLAN_PRE80211 is not set
837# CONFIG_WLAN_80211 is not set 866# CONFIG_WLAN_80211 is not set
838 867
@@ -873,13 +902,17 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
873# Input Device Drivers 902# Input Device Drivers
874# 903#
875CONFIG_INPUT_KEYBOARD=y 904CONFIG_INPUT_KEYBOARD=y
905# CONFIG_KEYBOARD_ADP5588 is not set
876CONFIG_KEYBOARD_ATKBD=y 906CONFIG_KEYBOARD_ATKBD=y
877# CONFIG_KEYBOARD_SUNKBD is not set 907# CONFIG_QT2160 is not set
878# CONFIG_KEYBOARD_LKKBD is not set 908# CONFIG_KEYBOARD_LKKBD is not set
879# CONFIG_KEYBOARD_XTKBD is not set 909# CONFIG_KEYBOARD_MAX7359 is not set
880# CONFIG_KEYBOARD_NEWTON is not set 910# CONFIG_KEYBOARD_NEWTON is not set
911# CONFIG_KEYBOARD_OPENCORES is not set
881# CONFIG_KEYBOARD_STOWAWAY is not set 912# CONFIG_KEYBOARD_STOWAWAY is not set
913# CONFIG_KEYBOARD_SUNKBD is not set
882# CONFIG_KEYBOARD_SH_KEYSC is not set 914# CONFIG_KEYBOARD_SH_KEYSC is not set
915# CONFIG_KEYBOARD_XTKBD is not set
883# CONFIG_INPUT_MOUSE is not set 916# CONFIG_INPUT_MOUSE is not set
884# CONFIG_INPUT_JOYSTICK is not set 917# CONFIG_INPUT_JOYSTICK is not set
885# CONFIG_INPUT_TABLET is not set 918# CONFIG_INPUT_TABLET is not set
@@ -933,6 +966,7 @@ CONFIG_HW_RANDOM=y
933CONFIG_DEVPORT=y 966CONFIG_DEVPORT=y
934CONFIG_I2C=y 967CONFIG_I2C=y
935CONFIG_I2C_BOARDINFO=y 968CONFIG_I2C_BOARDINFO=y
969CONFIG_I2C_COMPAT=y
936CONFIG_I2C_CHARDEV=y 970CONFIG_I2C_CHARDEV=y
937CONFIG_I2C_HELPER_AUTO=y 971CONFIG_I2C_HELPER_AUTO=y
938 972
@@ -961,6 +995,7 @@ CONFIG_I2C_HELPER_AUTO=y
961# 995#
962# I2C system bus drivers (mostly embedded / system-on-chip) 996# I2C system bus drivers (mostly embedded / system-on-chip)
963# 997#
998# CONFIG_I2C_DESIGNWARE is not set
964CONFIG_I2C_HIGHLANDER=y 999CONFIG_I2C_HIGHLANDER=y
965# CONFIG_I2C_OCORES is not set 1000# CONFIG_I2C_OCORES is not set
966# CONFIG_I2C_SH_MOBILE is not set 1001# CONFIG_I2C_SH_MOBILE is not set
@@ -987,19 +1022,26 @@ CONFIG_I2C_HIGHLANDER=y
987# Miscellaneous I2C Chip support 1022# Miscellaneous I2C Chip support
988# 1023#
989# CONFIG_DS1682 is not set 1024# CONFIG_DS1682 is not set
990# CONFIG_SENSORS_PCF8574 is not set
991# CONFIG_PCF8575 is not set
992# CONFIG_SENSORS_PCA9539 is not set
993# CONFIG_SENSORS_TSL2550 is not set 1025# CONFIG_SENSORS_TSL2550 is not set
994# CONFIG_I2C_DEBUG_CORE is not set 1026# CONFIG_I2C_DEBUG_CORE is not set
995# CONFIG_I2C_DEBUG_ALGO is not set 1027# CONFIG_I2C_DEBUG_ALGO is not set
996# CONFIG_I2C_DEBUG_BUS is not set 1028# CONFIG_I2C_DEBUG_BUS is not set
997# CONFIG_I2C_DEBUG_CHIP is not set 1029# CONFIG_I2C_DEBUG_CHIP is not set
998# CONFIG_SPI is not set 1030# CONFIG_SPI is not set
1031
1032#
1033# PPS support
1034#
1035# CONFIG_PPS is not set
999# CONFIG_W1 is not set 1036# CONFIG_W1 is not set
1000# CONFIG_POWER_SUPPLY is not set 1037# CONFIG_POWER_SUPPLY is not set
1001CONFIG_HWMON=y 1038CONFIG_HWMON=y
1002# CONFIG_HWMON_VID is not set 1039# CONFIG_HWMON_VID is not set
1040# CONFIG_HWMON_DEBUG_CHIP is not set
1041
1042#
1043# Native drivers
1044#
1003# CONFIG_SENSORS_AD7414 is not set 1045# CONFIG_SENSORS_AD7414 is not set
1004# CONFIG_SENSORS_AD7418 is not set 1046# CONFIG_SENSORS_AD7418 is not set
1005# CONFIG_SENSORS_ADM1021 is not set 1047# CONFIG_SENSORS_ADM1021 is not set
@@ -1049,6 +1091,7 @@ CONFIG_HWMON=y
1049# CONFIG_SENSORS_ADS7828 is not set 1091# CONFIG_SENSORS_ADS7828 is not set
1050# CONFIG_SENSORS_THMC50 is not set 1092# CONFIG_SENSORS_THMC50 is not set
1051# CONFIG_SENSORS_TMP401 is not set 1093# CONFIG_SENSORS_TMP401 is not set
1094# CONFIG_SENSORS_TMP421 is not set
1052# CONFIG_SENSORS_VIA686A is not set 1095# CONFIG_SENSORS_VIA686A is not set
1053# CONFIG_SENSORS_VT1211 is not set 1096# CONFIG_SENSORS_VT1211 is not set
1054# CONFIG_SENSORS_VT8231 is not set 1097# CONFIG_SENSORS_VT8231 is not set
@@ -1060,7 +1103,6 @@ CONFIG_HWMON=y
1060# CONFIG_SENSORS_W83L786NG is not set 1103# CONFIG_SENSORS_W83L786NG is not set
1061# CONFIG_SENSORS_W83627HF is not set 1104# CONFIG_SENSORS_W83627HF is not set
1062# CONFIG_SENSORS_W83627EHF is not set 1105# CONFIG_SENSORS_W83627EHF is not set
1063# CONFIG_HWMON_DEBUG_CHIP is not set
1064CONFIG_THERMAL=y 1106CONFIG_THERMAL=y
1065# CONFIG_THERMAL_HWMON is not set 1107# CONFIG_THERMAL_HWMON is not set
1066# CONFIG_WATCHDOG is not set 1108# CONFIG_WATCHDOG is not set
@@ -1081,14 +1123,17 @@ CONFIG_SSB_POSSIBLE=y
1081# CONFIG_MFD_TMIO is not set 1123# CONFIG_MFD_TMIO is not set
1082# CONFIG_PMIC_DA903X is not set 1124# CONFIG_PMIC_DA903X is not set
1083# CONFIG_MFD_WM8400 is not set 1125# CONFIG_MFD_WM8400 is not set
1126# CONFIG_MFD_WM831X is not set
1084# CONFIG_MFD_WM8350_I2C is not set 1127# CONFIG_MFD_WM8350_I2C is not set
1085# CONFIG_MFD_PCF50633 is not set 1128# CONFIG_MFD_PCF50633 is not set
1129# CONFIG_AB3100_CORE is not set
1086# CONFIG_REGULATOR is not set 1130# CONFIG_REGULATOR is not set
1087# CONFIG_MEDIA_SUPPORT is not set 1131# CONFIG_MEDIA_SUPPORT is not set
1088 1132
1089# 1133#
1090# Graphics support 1134# Graphics support
1091# 1135#
1136CONFIG_VGA_ARB=y
1092# CONFIG_DRM is not set 1137# CONFIG_DRM is not set
1093# CONFIG_VGASTATE is not set 1138# CONFIG_VGASTATE is not set
1094# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1139# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1101,11 +1146,11 @@ CONFIG_SSB_POSSIBLE=y
1101# CONFIG_DISPLAY_SUPPORT is not set 1146# CONFIG_DISPLAY_SUPPORT is not set
1102CONFIG_SOUND=m 1147CONFIG_SOUND=m
1103CONFIG_SOUND_OSS_CORE=y 1148CONFIG_SOUND_OSS_CORE=y
1149CONFIG_SOUND_OSS_CORE_PRECLAIM=y
1104# CONFIG_SND is not set 1150# CONFIG_SND is not set
1105CONFIG_SOUND_PRIME=m 1151CONFIG_SOUND_PRIME=m
1106CONFIG_HID_SUPPORT=y 1152CONFIG_HID_SUPPORT=y
1107CONFIG_HID=y 1153CONFIG_HID=y
1108# CONFIG_HID_DEBUG is not set
1109# CONFIG_HIDRAW is not set 1154# CONFIG_HIDRAW is not set
1110# CONFIG_HID_PID is not set 1155# CONFIG_HID_PID is not set
1111 1156
@@ -1169,6 +1214,7 @@ CONFIG_RTC_DRV_RS5C372=y
1169# CONFIG_RTC_DRV_S35390A is not set 1214# CONFIG_RTC_DRV_S35390A is not set
1170# CONFIG_RTC_DRV_FM3130 is not set 1215# CONFIG_RTC_DRV_FM3130 is not set
1171# CONFIG_RTC_DRV_RX8581 is not set 1216# CONFIG_RTC_DRV_RX8581 is not set
1217# CONFIG_RTC_DRV_RX8025 is not set
1172 1218
1173# 1219#
1174# SPI RTC drivers 1220# SPI RTC drivers
@@ -1221,8 +1267,10 @@ CONFIG_FS_MBCACHE=y
1221# CONFIG_JFS_FS is not set 1267# CONFIG_JFS_FS is not set
1222CONFIG_FS_POSIX_ACL=y 1268CONFIG_FS_POSIX_ACL=y
1223# CONFIG_XFS_FS is not set 1269# CONFIG_XFS_FS is not set
1270# CONFIG_GFS2_FS is not set
1224# CONFIG_OCFS2_FS is not set 1271# CONFIG_OCFS2_FS is not set
1225# CONFIG_BTRFS_FS is not set 1272# CONFIG_BTRFS_FS is not set
1273# CONFIG_NILFS2_FS is not set
1226CONFIG_FILE_LOCKING=y 1274CONFIG_FILE_LOCKING=y
1227CONFIG_FSNOTIFY=y 1275CONFIG_FSNOTIFY=y
1228CONFIG_DNOTIFY=y 1276CONFIG_DNOTIFY=y
@@ -1289,12 +1337,12 @@ CONFIG_MINIX_FS=y
1289# CONFIG_ROMFS_FS is not set 1337# CONFIG_ROMFS_FS is not set
1290# CONFIG_SYSV_FS is not set 1338# CONFIG_SYSV_FS is not set
1291# CONFIG_UFS_FS is not set 1339# CONFIG_UFS_FS is not set
1292# CONFIG_NILFS2_FS is not set
1293CONFIG_NETWORK_FILESYSTEMS=y 1340CONFIG_NETWORK_FILESYSTEMS=y
1294CONFIG_NFS_FS=y 1341CONFIG_NFS_FS=y
1295CONFIG_NFS_V3=y 1342CONFIG_NFS_V3=y
1296# CONFIG_NFS_V3_ACL is not set 1343# CONFIG_NFS_V3_ACL is not set
1297CONFIG_NFS_V4=y 1344CONFIG_NFS_V4=y
1345# CONFIG_NFS_V4_1 is not set
1298CONFIG_ROOT_NFS=y 1346CONFIG_ROOT_NFS=y
1299CONFIG_NFSD=y 1347CONFIG_NFSD=y
1300CONFIG_NFSD_V3=y 1348CONFIG_NFSD_V3=y
@@ -1370,6 +1418,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1370CONFIG_ENABLE_MUST_CHECK=y 1418CONFIG_ENABLE_MUST_CHECK=y
1371CONFIG_FRAME_WARN=1024 1419CONFIG_FRAME_WARN=1024
1372CONFIG_MAGIC_SYSRQ=y 1420CONFIG_MAGIC_SYSRQ=y
1421# CONFIG_STRIP_ASM_SYMS is not set
1373# CONFIG_UNUSED_SYMBOLS is not set 1422# CONFIG_UNUSED_SYMBOLS is not set
1374CONFIG_DEBUG_FS=y 1423CONFIG_DEBUG_FS=y
1375# CONFIG_HEADERS_CHECK is not set 1424# CONFIG_HEADERS_CHECK is not set
@@ -1404,21 +1453,27 @@ CONFIG_DEBUG_INFO=y
1404# CONFIG_DEBUG_LIST is not set 1453# CONFIG_DEBUG_LIST is not set
1405# CONFIG_DEBUG_SG is not set 1454# CONFIG_DEBUG_SG is not set
1406# CONFIG_DEBUG_NOTIFIERS is not set 1455# CONFIG_DEBUG_NOTIFIERS is not set
1456# CONFIG_DEBUG_CREDENTIALS is not set
1407# CONFIG_FRAME_POINTER is not set 1457# CONFIG_FRAME_POINTER is not set
1408# CONFIG_RCU_TORTURE_TEST is not set 1458# CONFIG_RCU_TORTURE_TEST is not set
1409# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1459# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1410# CONFIG_BACKTRACE_SELF_TEST is not set 1460# CONFIG_BACKTRACE_SELF_TEST is not set
1411# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1461# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1462# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1412# CONFIG_FAULT_INJECTION is not set 1463# CONFIG_FAULT_INJECTION is not set
1413# CONFIG_LATENCYTOP is not set 1464# CONFIG_LATENCYTOP is not set
1414# CONFIG_PAGE_POISONING is not set 1465# CONFIG_PAGE_POISONING is not set
1415CONFIG_NOP_TRACER=y 1466CONFIG_NOP_TRACER=y
1416CONFIG_HAVE_FUNCTION_TRACER=y 1467CONFIG_HAVE_FUNCTION_TRACER=y
1468CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1469CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1417CONFIG_HAVE_DYNAMIC_FTRACE=y 1470CONFIG_HAVE_DYNAMIC_FTRACE=y
1418CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1471CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1472CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1419CONFIG_RING_BUFFER=y 1473CONFIG_RING_BUFFER=y
1420CONFIG_EVENT_TRACING=y 1474CONFIG_EVENT_TRACING=y
1421CONFIG_CONTEXT_SWITCH_TRACER=y 1475CONFIG_CONTEXT_SWITCH_TRACER=y
1476CONFIG_RING_BUFFER_ALLOW_SWAP=y
1422CONFIG_TRACING=y 1477CONFIG_TRACING=y
1423CONFIG_TRACING_SUPPORT=y 1478CONFIG_TRACING_SUPPORT=y
1424CONFIG_FTRACE=y 1479CONFIG_FTRACE=y
@@ -1427,6 +1482,7 @@ CONFIG_FTRACE=y
1427# CONFIG_PREEMPT_TRACER is not set 1482# CONFIG_PREEMPT_TRACER is not set
1428# CONFIG_SCHED_TRACER is not set 1483# CONFIG_SCHED_TRACER is not set
1429# CONFIG_ENABLE_DEFAULT_TRACERS is not set 1484# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1485# CONFIG_FTRACE_SYSCALLS is not set
1430# CONFIG_BOOT_TRACER is not set 1486# CONFIG_BOOT_TRACER is not set
1431CONFIG_BRANCH_PROFILE_NONE=y 1487CONFIG_BRANCH_PROFILE_NONE=y
1432# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1488# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -1445,11 +1501,11 @@ CONFIG_HAVE_ARCH_KGDB=y
1445CONFIG_EARLY_SCIF_CONSOLE=y 1501CONFIG_EARLY_SCIF_CONSOLE=y
1446CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe00000 1502CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe00000
1447# CONFIG_EARLY_PRINTK is not set 1503# CONFIG_EARLY_PRINTK is not set
1448# CONFIG_DEBUG_BOOTMEM is not set 1504# CONFIG_STACK_DEBUG is not set
1449CONFIG_DEBUG_STACKOVERFLOW=y
1450# CONFIG_DEBUG_STACK_USAGE is not set 1505# CONFIG_DEBUG_STACK_USAGE is not set
1451# CONFIG_4KSTACKS is not set 1506# CONFIG_4KSTACKS is not set
1452CONFIG_DUMP_CODE=y 1507CONFIG_DUMP_CODE=y
1508# CONFIG_DWARF_UNWINDER is not set
1453# CONFIG_SH_NO_BSS_INIT is not set 1509# CONFIG_SH_NO_BSS_INIT is not set
1454 1510
1455# 1511#
@@ -1464,7 +1520,6 @@ CONFIG_CRYPTO=y
1464# 1520#
1465# Crypto core or helper 1521# Crypto core or helper
1466# 1522#
1467# CONFIG_CRYPTO_FIPS is not set
1468CONFIG_CRYPTO_ALGAPI=y 1523CONFIG_CRYPTO_ALGAPI=y
1469CONFIG_CRYPTO_ALGAPI2=y 1524CONFIG_CRYPTO_ALGAPI2=y
1470CONFIG_CRYPTO_AEAD2=y 1525CONFIG_CRYPTO_AEAD2=y
@@ -1506,11 +1561,13 @@ CONFIG_CRYPTO_PCBC=m
1506# 1561#
1507CONFIG_CRYPTO_HMAC=y 1562CONFIG_CRYPTO_HMAC=y
1508# CONFIG_CRYPTO_XCBC is not set 1563# CONFIG_CRYPTO_XCBC is not set
1564# CONFIG_CRYPTO_VMAC is not set
1509 1565
1510# 1566#
1511# Digest 1567# Digest
1512# 1568#
1513# CONFIG_CRYPTO_CRC32C is not set 1569# CONFIG_CRYPTO_CRC32C is not set
1570# CONFIG_CRYPTO_GHASH is not set
1514# CONFIG_CRYPTO_MD4 is not set 1571# CONFIG_CRYPTO_MD4 is not set
1515CONFIG_CRYPTO_MD5=y 1572CONFIG_CRYPTO_MD5=y
1516# CONFIG_CRYPTO_MICHAEL_MIC is not set 1573# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1573,5 +1630,6 @@ CONFIG_CRC32=y
1573CONFIG_HAS_IOMEM=y 1630CONFIG_HAS_IOMEM=y
1574CONFIG_HAS_IOPORT=y 1631CONFIG_HAS_IOPORT=y
1575CONFIG_HAS_DMA=y 1632CONFIG_HAS_DMA=y
1633CONFIG_HAVE_LMB=y
1576CONFIG_NLATTR=y 1634CONFIG_NLATTR=y
1577CONFIG_GENERIC_ATOMIC64=y 1635CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/r7785rp_defconfig b/arch/sh/configs/r7785rp_defconfig
index 8a3dc300db4a..27ff46c13a87 100644
--- a/arch/sh/configs/r7785rp_defconfig
+++ b/arch/sh/configs/r7785rp_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:37:20 2009 4# Thu Sep 24 18:29:23 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -29,8 +30,10 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
29# CONFIG_ARCH_HAS_ILOG2_U64 is not set 30# CONFIG_ARCH_HAS_ILOG2_U64 is not set
30CONFIG_ARCH_NO_VIRT_TO_BUS=y 31CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_IO_TRAPPED=y 34CONFIG_IO_TRAPPED=y
33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y
34 37
35# 38#
36# General setup 39# General setup
@@ -41,6 +44,12 @@ CONFIG_LOCK_KERNEL=y
41CONFIG_INIT_ENV_ARG_LIMIT=32 44CONFIG_INIT_ENV_ARG_LIMIT=32
42CONFIG_LOCALVERSION="" 45CONFIG_LOCALVERSION=""
43CONFIG_LOCALVERSION_AUTO=y 46CONFIG_LOCALVERSION_AUTO=y
47CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_KERNEL_GZIP=y
51# CONFIG_KERNEL_BZIP2 is not set
52# CONFIG_KERNEL_LZMA is not set
44CONFIG_SWAP=y 53CONFIG_SWAP=y
45CONFIG_SYSVIPC=y 54CONFIG_SYSVIPC=y
46CONFIG_SYSVIPC_SYSCTL=y 55CONFIG_SYSVIPC_SYSCTL=y
@@ -56,12 +65,12 @@ CONFIG_AUDIT_TREE=y
56# 65#
57# RCU Subsystem 66# RCU Subsystem
58# 67#
59# CONFIG_CLASSIC_RCU is not set 68CONFIG_TREE_RCU=y
60# CONFIG_TREE_RCU is not set 69# CONFIG_TREE_PREEMPT_RCU is not set
61CONFIG_PREEMPT_RCU=y
62CONFIG_RCU_TRACE=y 70CONFIG_RCU_TRACE=y
63# CONFIG_TREE_RCU_TRACE is not set 71CONFIG_RCU_FANOUT=32
64CONFIG_PREEMPT_RCU_TRACE=y 72# CONFIG_RCU_FANOUT_EXACT is not set
73CONFIG_TREE_RCU_TRACE=y
65CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
66CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
67CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
@@ -93,20 +102,22 @@ CONFIG_TIMERFD=y
93CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
94CONFIG_SHMEM=y 103CONFIG_SHMEM=y
95CONFIG_AIO=y 104CONFIG_AIO=y
105CONFIG_HAVE_PERF_EVENTS=y
96 106
97# 107#
98# Performance Counters 108# Kernel Performance Events And Counters
99# 109#
110CONFIG_PERF_EVENTS=y
111CONFIG_EVENT_PROFILE=y
112# CONFIG_PERF_COUNTERS is not set
100CONFIG_VM_EVENT_COUNTERS=y 113CONFIG_VM_EVENT_COUNTERS=y
101CONFIG_PCI_QUIRKS=y 114CONFIG_PCI_QUIRKS=y
102# CONFIG_STRIP_ASM_SYMS is not set
103CONFIG_COMPAT_BRK=y 115CONFIG_COMPAT_BRK=y
104CONFIG_SLAB=y 116CONFIG_SLAB=y
105# CONFIG_SLUB is not set 117# CONFIG_SLUB is not set
106# CONFIG_SLOB is not set 118# CONFIG_SLOB is not set
107CONFIG_PROFILING=y 119CONFIG_PROFILING=y
108CONFIG_TRACEPOINTS=y 120CONFIG_TRACEPOINTS=y
109CONFIG_MARKERS=y
110CONFIG_OPROFILE=y 121CONFIG_OPROFILE=y
111CONFIG_HAVE_OPROFILE=y 122CONFIG_HAVE_OPROFILE=y
112CONFIG_KPROBES=y 123CONFIG_KPROBES=y
@@ -117,6 +128,11 @@ CONFIG_HAVE_KRETPROBES=y
117CONFIG_HAVE_ARCH_TRACEHOOK=y 128CONFIG_HAVE_ARCH_TRACEHOOK=y
118CONFIG_HAVE_CLK=y 129CONFIG_HAVE_CLK=y
119CONFIG_HAVE_DMA_API_DEBUG=y 130CONFIG_HAVE_DMA_API_DEBUG=y
131
132#
133# GCOV-based kernel profiling
134#
135# CONFIG_GCOV_KERNEL is not set
120# CONFIG_SLOW_WORK is not set 136# CONFIG_SLOW_WORK is not set
121CONFIG_HAVE_GENERIC_DMA_COHERENT=y 137CONFIG_HAVE_GENERIC_DMA_COHERENT=y
122CONFIG_SLABINFO=y 138CONFIG_SLABINFO=y
@@ -129,7 +145,7 @@ CONFIG_MODULE_UNLOAD=y
129# CONFIG_MODVERSIONS is not set 145# CONFIG_MODVERSIONS is not set
130# CONFIG_MODULE_SRCVERSION_ALL is not set 146# CONFIG_MODULE_SRCVERSION_ALL is not set
131CONFIG_BLOCK=y 147CONFIG_BLOCK=y
132# CONFIG_LBD is not set 148CONFIG_LBDAF=y
133# CONFIG_BLK_DEV_BSG is not set 149# CONFIG_BLK_DEV_BSG is not set
134# CONFIG_BLK_DEV_INTEGRITY is not set 150# CONFIG_BLK_DEV_INTEGRITY is not set
135 151
@@ -178,6 +194,7 @@ CONFIG_CPU_SHX2=y
178# CONFIG_CPU_SUBTYPE_SH4_202 is not set 194# CONFIG_CPU_SUBTYPE_SH4_202 is not set
179# CONFIG_CPU_SUBTYPE_SH7723 is not set 195# CONFIG_CPU_SUBTYPE_SH7723 is not set
180# CONFIG_CPU_SUBTYPE_SH7724 is not set 196# CONFIG_CPU_SUBTYPE_SH7724 is not set
197# CONFIG_CPU_SUBTYPE_SH7757 is not set
181# CONFIG_CPU_SUBTYPE_SH7763 is not set 198# CONFIG_CPU_SUBTYPE_SH7763 is not set
182# CONFIG_CPU_SUBTYPE_SH7770 is not set 199# CONFIG_CPU_SUBTYPE_SH7770 is not set
183# CONFIG_CPU_SUBTYPE_SH7780 is not set 200# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -231,7 +248,6 @@ CONFIG_SPARSEMEM=y
231CONFIG_HAVE_MEMORY_PRESENT=y 248CONFIG_HAVE_MEMORY_PRESENT=y
232CONFIG_SPARSEMEM_STATIC=y 249CONFIG_SPARSEMEM_STATIC=y
233# CONFIG_MEMORY_HOTPLUG is not set 250# CONFIG_MEMORY_HOTPLUG is not set
234CONFIG_PAGEFLAGS_EXTENDED=y
235CONFIG_SPLIT_PTLOCK_CPUS=4 251CONFIG_SPLIT_PTLOCK_CPUS=4
236CONFIG_MIGRATION=y 252CONFIG_MIGRATION=y
237# CONFIG_PHYS_ADDR_T_64BIT is not set 253# CONFIG_PHYS_ADDR_T_64BIT is not set
@@ -239,6 +255,7 @@ CONFIG_ZONE_DMA_FLAG=0
239CONFIG_NR_QUICK=2 255CONFIG_NR_QUICK=2
240CONFIG_HAVE_MLOCK=y 256CONFIG_HAVE_MLOCK=y
241CONFIG_HAVE_MLOCKED_PAGE_BIT=y 257CONFIG_HAVE_MLOCKED_PAGE_BIT=y
258# CONFIG_KSM is not set
242CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 259CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
243 260
244# 261#
@@ -338,7 +355,8 @@ CONFIG_GUSA=y
338CONFIG_ZERO_PAGE_OFFSET=0x00001000 355CONFIG_ZERO_PAGE_OFFSET=0x00001000
339CONFIG_BOOT_LINK_OFFSET=0x00800000 356CONFIG_BOOT_LINK_OFFSET=0x00800000
340CONFIG_ENTRY_OFFSET=0x00001000 357CONFIG_ENTRY_OFFSET=0x00001000
341CONFIG_CMDLINE_BOOL=y 358CONFIG_CMDLINE_OVERWRITE=y
359# CONFIG_CMDLINE_EXTEND is not set
342CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1" 360CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
343 361
344# 362#
@@ -419,6 +437,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
419# CONFIG_NETFILTER is not set 437# CONFIG_NETFILTER is not set
420# CONFIG_IP_DCCP is not set 438# CONFIG_IP_DCCP is not set
421# CONFIG_IP_SCTP is not set 439# CONFIG_IP_SCTP is not set
440# CONFIG_RDS is not set
422# CONFIG_TIPC is not set 441# CONFIG_TIPC is not set
423# CONFIG_ATM is not set 442# CONFIG_ATM is not set
424CONFIG_STP=m 443CONFIG_STP=m
@@ -452,6 +471,7 @@ CONFIG_LLC=m
452# CONFIG_AF_RXRPC is not set 471# CONFIG_AF_RXRPC is not set
453CONFIG_WIRELESS=y 472CONFIG_WIRELESS=y
454# CONFIG_CFG80211 is not set 473# CONFIG_CFG80211 is not set
474CONFIG_CFG80211_DEFAULT_PS_VALUE=0
455# CONFIG_WIRELESS_OLD_REGULATORY is not set 475# CONFIG_WIRELESS_OLD_REGULATORY is not set
456CONFIG_WIRELESS_EXT=y 476CONFIG_WIRELESS_EXT=y
457CONFIG_WIRELESS_EXT_SYSFS=y 477CONFIG_WIRELESS_EXT_SYSFS=y
@@ -460,7 +480,6 @@ CONFIG_WIRELESS_EXT_SYSFS=y
460# 480#
461# CFG80211 needs to be enabled for MAC80211 481# CFG80211 needs to be enabled for MAC80211
462# 482#
463CONFIG_MAC80211_DEFAULT_PS_VALUE=0
464# CONFIG_WIMAX is not set 483# CONFIG_WIMAX is not set
465# CONFIG_RFKILL is not set 484# CONFIG_RFKILL is not set
466# CONFIG_NET_9P is not set 485# CONFIG_NET_9P is not set
@@ -473,6 +492,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
473# Generic Driver Options 492# Generic Driver Options
474# 493#
475CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 494CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
495# CONFIG_DEVTMPFS is not set
476CONFIG_STANDALONE=y 496CONFIG_STANDALONE=y
477CONFIG_PREVENT_FIRMWARE_BUILD=y 497CONFIG_PREVENT_FIRMWARE_BUILD=y
478CONFIG_FW_LOADER=m 498CONFIG_FW_LOADER=m
@@ -591,11 +611,13 @@ CONFIG_SCSI_LOWLEVEL=y
591# CONFIG_SCSI_DC390T is not set 611# CONFIG_SCSI_DC390T is not set
592# CONFIG_SCSI_NSP32 is not set 612# CONFIG_SCSI_NSP32 is not set
593# CONFIG_SCSI_DEBUG is not set 613# CONFIG_SCSI_DEBUG is not set
614# CONFIG_SCSI_PMCRAID is not set
594# CONFIG_SCSI_SRP is not set 615# CONFIG_SCSI_SRP is not set
595# CONFIG_SCSI_DH is not set 616# CONFIG_SCSI_DH is not set
596# CONFIG_SCSI_OSD_INITIATOR is not set 617# CONFIG_SCSI_OSD_INITIATOR is not set
597CONFIG_ATA=y 618CONFIG_ATA=y
598# CONFIG_ATA_NONSTANDARD is not set 619# CONFIG_ATA_NONSTANDARD is not set
620CONFIG_ATA_VERBOSE_ERROR=y
599CONFIG_SATA_PMP=y 621CONFIG_SATA_PMP=y
600# CONFIG_SATA_AHCI is not set 622# CONFIG_SATA_AHCI is not set
601# CONFIG_SATA_SIL24 is not set 623# CONFIG_SATA_SIL24 is not set
@@ -617,6 +639,7 @@ CONFIG_SATA_SIL=y
617# CONFIG_PATA_ALI is not set 639# CONFIG_PATA_ALI is not set
618# CONFIG_PATA_AMD is not set 640# CONFIG_PATA_AMD is not set
619# CONFIG_PATA_ARTOP is not set 641# CONFIG_PATA_ARTOP is not set
642# CONFIG_PATA_ATP867X is not set
620# CONFIG_PATA_ATIIXP is not set 643# CONFIG_PATA_ATIIXP is not set
621# CONFIG_PATA_CMD640_PCI is not set 644# CONFIG_PATA_CMD640_PCI is not set
622# CONFIG_PATA_CMD64X is not set 645# CONFIG_PATA_CMD64X is not set
@@ -644,6 +667,7 @@ CONFIG_SATA_SIL=y
644# CONFIG_PATA_OPTIDMA is not set 667# CONFIG_PATA_OPTIDMA is not set
645# CONFIG_PATA_PDC_OLD is not set 668# CONFIG_PATA_PDC_OLD is not set
646# CONFIG_PATA_RADISYS is not set 669# CONFIG_PATA_RADISYS is not set
670# CONFIG_PATA_RDC is not set
647# CONFIG_PATA_RZ1000 is not set 671# CONFIG_PATA_RZ1000 is not set
648# CONFIG_PATA_SC1200 is not set 672# CONFIG_PATA_SC1200 is not set
649# CONFIG_PATA_SERVERWORKS is not set 673# CONFIG_PATA_SERVERWORKS is not set
@@ -662,7 +686,11 @@ CONFIG_PATA_PLATFORM=y
662# 686#
663 687
664# 688#
665# Enable only one of the two stacks, unless you know what you are doing 689# You can enable one or both FireWire driver stacks.
690#
691
692#
693# See the help texts for more information.
666# 694#
667# CONFIG_FIREWIRE is not set 695# CONFIG_FIREWIRE is not set
668# CONFIG_IEEE1394 is not set 696# CONFIG_IEEE1394 is not set
@@ -721,6 +749,7 @@ CONFIG_R8169=y
721# CONFIG_VIA_VELOCITY is not set 749# CONFIG_VIA_VELOCITY is not set
722# CONFIG_TIGON3 is not set 750# CONFIG_TIGON3 is not set
723# CONFIG_BNX2 is not set 751# CONFIG_BNX2 is not set
752# CONFIG_CNIC is not set
724# CONFIG_QLA3XXX is not set 753# CONFIG_QLA3XXX is not set
725# CONFIG_ATL1 is not set 754# CONFIG_ATL1 is not set
726# CONFIG_ATL1E is not set 755# CONFIG_ATL1E is not set
@@ -746,10 +775,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
746# CONFIG_SFC is not set 775# CONFIG_SFC is not set
747# CONFIG_BE2NET is not set 776# CONFIG_BE2NET is not set
748# CONFIG_TR is not set 777# CONFIG_TR is not set
749 778CONFIG_WLAN=y
750#
751# Wireless LAN
752#
753# CONFIG_WLAN_PRE80211 is not set 779# CONFIG_WLAN_PRE80211 is not set
754# CONFIG_WLAN_80211 is not set 780# CONFIG_WLAN_80211 is not set
755 781
@@ -790,14 +816,19 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
790# Input Device Drivers 816# Input Device Drivers
791# 817#
792CONFIG_INPUT_KEYBOARD=y 818CONFIG_INPUT_KEYBOARD=y
819# CONFIG_KEYBOARD_ADP5588 is not set
793CONFIG_KEYBOARD_ATKBD=y 820CONFIG_KEYBOARD_ATKBD=y
794# CONFIG_KEYBOARD_SUNKBD is not set 821# CONFIG_QT2160 is not set
795# CONFIG_KEYBOARD_LKKBD is not set 822# CONFIG_KEYBOARD_LKKBD is not set
796# CONFIG_KEYBOARD_XTKBD is not set 823# CONFIG_KEYBOARD_GPIO is not set
824# CONFIG_KEYBOARD_MATRIX is not set
825# CONFIG_KEYBOARD_MAX7359 is not set
797# CONFIG_KEYBOARD_NEWTON is not set 826# CONFIG_KEYBOARD_NEWTON is not set
827# CONFIG_KEYBOARD_OPENCORES is not set
798# CONFIG_KEYBOARD_STOWAWAY is not set 828# CONFIG_KEYBOARD_STOWAWAY is not set
799# CONFIG_KEYBOARD_GPIO is not set 829# CONFIG_KEYBOARD_SUNKBD is not set
800# CONFIG_KEYBOARD_SH_KEYSC is not set 830# CONFIG_KEYBOARD_SH_KEYSC is not set
831# CONFIG_KEYBOARD_XTKBD is not set
801# CONFIG_INPUT_MOUSE is not set 832# CONFIG_INPUT_MOUSE is not set
802# CONFIG_INPUT_JOYSTICK is not set 833# CONFIG_INPUT_JOYSTICK is not set
803# CONFIG_INPUT_TABLET is not set 834# CONFIG_INPUT_TABLET is not set
@@ -851,6 +882,7 @@ CONFIG_HW_RANDOM=y
851CONFIG_DEVPORT=y 882CONFIG_DEVPORT=y
852CONFIG_I2C=y 883CONFIG_I2C=y
853CONFIG_I2C_BOARDINFO=y 884CONFIG_I2C_BOARDINFO=y
885CONFIG_I2C_COMPAT=y
854CONFIG_I2C_CHARDEV=y 886CONFIG_I2C_CHARDEV=y
855CONFIG_I2C_HELPER_AUTO=y 887CONFIG_I2C_HELPER_AUTO=y
856 888
@@ -879,6 +911,7 @@ CONFIG_I2C_HELPER_AUTO=y
879# 911#
880# I2C system bus drivers (mostly embedded / system-on-chip) 912# I2C system bus drivers (mostly embedded / system-on-chip)
881# 913#
914# CONFIG_I2C_DESIGNWARE is not set
882# CONFIG_I2C_GPIO is not set 915# CONFIG_I2C_GPIO is not set
883CONFIG_I2C_HIGHLANDER=y 916CONFIG_I2C_HIGHLANDER=y
884# CONFIG_I2C_OCORES is not set 917# CONFIG_I2C_OCORES is not set
@@ -906,15 +939,17 @@ CONFIG_I2C_HIGHLANDER=y
906# Miscellaneous I2C Chip support 939# Miscellaneous I2C Chip support
907# 940#
908# CONFIG_DS1682 is not set 941# CONFIG_DS1682 is not set
909# CONFIG_SENSORS_PCF8574 is not set
910# CONFIG_PCF8575 is not set
911# CONFIG_SENSORS_PCA9539 is not set
912# CONFIG_SENSORS_TSL2550 is not set 942# CONFIG_SENSORS_TSL2550 is not set
913# CONFIG_I2C_DEBUG_CORE is not set 943# CONFIG_I2C_DEBUG_CORE is not set
914# CONFIG_I2C_DEBUG_ALGO is not set 944# CONFIG_I2C_DEBUG_ALGO is not set
915# CONFIG_I2C_DEBUG_BUS is not set 945# CONFIG_I2C_DEBUG_BUS is not set
916# CONFIG_I2C_DEBUG_CHIP is not set 946# CONFIG_I2C_DEBUG_CHIP is not set
917# CONFIG_SPI is not set 947# CONFIG_SPI is not set
948
949#
950# PPS support
951#
952# CONFIG_PPS is not set
918CONFIG_ARCH_REQUIRE_GPIOLIB=y 953CONFIG_ARCH_REQUIRE_GPIOLIB=y
919CONFIG_GPIOLIB=y 954CONFIG_GPIOLIB=y
920# CONFIG_DEBUG_GPIO is not set 955# CONFIG_DEBUG_GPIO is not set
@@ -935,14 +970,24 @@ CONFIG_GPIOLIB=y
935# PCI GPIO expanders: 970# PCI GPIO expanders:
936# 971#
937# CONFIG_GPIO_BT8XX is not set 972# CONFIG_GPIO_BT8XX is not set
973# CONFIG_GPIO_LANGWELL is not set
938 974
939# 975#
940# SPI GPIO expanders: 976# SPI GPIO expanders:
941# 977#
978
979#
980# AC97 GPIO expanders:
981#
942# CONFIG_W1 is not set 982# CONFIG_W1 is not set
943# CONFIG_POWER_SUPPLY is not set 983# CONFIG_POWER_SUPPLY is not set
944CONFIG_HWMON=y 984CONFIG_HWMON=y
945# CONFIG_HWMON_VID is not set 985# CONFIG_HWMON_VID is not set
986# CONFIG_HWMON_DEBUG_CHIP is not set
987
988#
989# Native drivers
990#
946# CONFIG_SENSORS_AD7414 is not set 991# CONFIG_SENSORS_AD7414 is not set
947# CONFIG_SENSORS_AD7418 is not set 992# CONFIG_SENSORS_AD7418 is not set
948# CONFIG_SENSORS_ADM1021 is not set 993# CONFIG_SENSORS_ADM1021 is not set
@@ -993,6 +1038,7 @@ CONFIG_HWMON=y
993# CONFIG_SENSORS_ADS7828 is not set 1038# CONFIG_SENSORS_ADS7828 is not set
994# CONFIG_SENSORS_THMC50 is not set 1039# CONFIG_SENSORS_THMC50 is not set
995# CONFIG_SENSORS_TMP401 is not set 1040# CONFIG_SENSORS_TMP401 is not set
1041# CONFIG_SENSORS_TMP421 is not set
996# CONFIG_SENSORS_VIA686A is not set 1042# CONFIG_SENSORS_VIA686A is not set
997# CONFIG_SENSORS_VT1211 is not set 1043# CONFIG_SENSORS_VT1211 is not set
998# CONFIG_SENSORS_VT8231 is not set 1044# CONFIG_SENSORS_VT8231 is not set
@@ -1004,9 +1050,7 @@ CONFIG_HWMON=y
1004# CONFIG_SENSORS_W83L786NG is not set 1050# CONFIG_SENSORS_W83L786NG is not set
1005# CONFIG_SENSORS_W83627HF is not set 1051# CONFIG_SENSORS_W83627HF is not set
1006# CONFIG_SENSORS_W83627EHF is not set 1052# CONFIG_SENSORS_W83627EHF is not set
1007# CONFIG_HWMON_DEBUG_CHIP is not set
1008# CONFIG_THERMAL is not set 1053# CONFIG_THERMAL is not set
1009# CONFIG_THERMAL_HWMON is not set
1010# CONFIG_WATCHDOG is not set 1054# CONFIG_WATCHDOG is not set
1011CONFIG_SSB_POSSIBLE=y 1055CONFIG_SSB_POSSIBLE=y
1012 1056
@@ -1026,14 +1070,17 @@ CONFIG_SSB_POSSIBLE=y
1026# CONFIG_MFD_TMIO is not set 1070# CONFIG_MFD_TMIO is not set
1027# CONFIG_PMIC_DA903X is not set 1071# CONFIG_PMIC_DA903X is not set
1028# CONFIG_MFD_WM8400 is not set 1072# CONFIG_MFD_WM8400 is not set
1073# CONFIG_MFD_WM831X is not set
1029# CONFIG_MFD_WM8350_I2C is not set 1074# CONFIG_MFD_WM8350_I2C is not set
1030# CONFIG_MFD_PCF50633 is not set 1075# CONFIG_MFD_PCF50633 is not set
1076# CONFIG_AB3100_CORE is not set
1031# CONFIG_REGULATOR is not set 1077# CONFIG_REGULATOR is not set
1032# CONFIG_MEDIA_SUPPORT is not set 1078# CONFIG_MEDIA_SUPPORT is not set
1033 1079
1034# 1080#
1035# Graphics support 1081# Graphics support
1036# 1082#
1083CONFIG_VGA_ARB=y
1037# CONFIG_DRM is not set 1084# CONFIG_DRM is not set
1038# CONFIG_VGASTATE is not set 1085# CONFIG_VGASTATE is not set
1039# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1086# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1099,11 +1146,11 @@ CONFIG_FB_SH_MOBILE_LCDC=m
1099# CONFIG_LOGO is not set 1146# CONFIG_LOGO is not set
1100CONFIG_SOUND=m 1147CONFIG_SOUND=m
1101CONFIG_SOUND_OSS_CORE=y 1148CONFIG_SOUND_OSS_CORE=y
1149CONFIG_SOUND_OSS_CORE_PRECLAIM=y
1102# CONFIG_SND is not set 1150# CONFIG_SND is not set
1103CONFIG_SOUND_PRIME=m 1151CONFIG_SOUND_PRIME=m
1104CONFIG_HID_SUPPORT=y 1152CONFIG_HID_SUPPORT=y
1105CONFIG_HID=y 1153CONFIG_HID=y
1106# CONFIG_HID_DEBUG is not set
1107# CONFIG_HIDRAW is not set 1154# CONFIG_HIDRAW is not set
1108# CONFIG_HID_PID is not set 1155# CONFIG_HID_PID is not set
1109 1156
@@ -1167,6 +1214,7 @@ CONFIG_RTC_DRV_RS5C372=y
1167# CONFIG_RTC_DRV_S35390A is not set 1214# CONFIG_RTC_DRV_S35390A is not set
1168# CONFIG_RTC_DRV_FM3130 is not set 1215# CONFIG_RTC_DRV_FM3130 is not set
1169# CONFIG_RTC_DRV_RX8581 is not set 1216# CONFIG_RTC_DRV_RX8581 is not set
1217# CONFIG_RTC_DRV_RX8025 is not set
1170 1218
1171# 1219#
1172# SPI RTC drivers 1220# SPI RTC drivers
@@ -1219,8 +1267,10 @@ CONFIG_FS_MBCACHE=y
1219# CONFIG_JFS_FS is not set 1267# CONFIG_JFS_FS is not set
1220CONFIG_FS_POSIX_ACL=y 1268CONFIG_FS_POSIX_ACL=y
1221# CONFIG_XFS_FS is not set 1269# CONFIG_XFS_FS is not set
1270# CONFIG_GFS2_FS is not set
1222# CONFIG_OCFS2_FS is not set 1271# CONFIG_OCFS2_FS is not set
1223# CONFIG_BTRFS_FS is not set 1272# CONFIG_BTRFS_FS is not set
1273# CONFIG_NILFS2_FS is not set
1224CONFIG_FILE_LOCKING=y 1274CONFIG_FILE_LOCKING=y
1225CONFIG_FSNOTIFY=y 1275CONFIG_FSNOTIFY=y
1226CONFIG_DNOTIFY=y 1276CONFIG_DNOTIFY=y
@@ -1286,12 +1336,12 @@ CONFIG_MINIX_FS=y
1286# CONFIG_ROMFS_FS is not set 1336# CONFIG_ROMFS_FS is not set
1287# CONFIG_SYSV_FS is not set 1337# CONFIG_SYSV_FS is not set
1288# CONFIG_UFS_FS is not set 1338# CONFIG_UFS_FS is not set
1289# CONFIG_NILFS2_FS is not set
1290CONFIG_NETWORK_FILESYSTEMS=y 1339CONFIG_NETWORK_FILESYSTEMS=y
1291CONFIG_NFS_FS=y 1340CONFIG_NFS_FS=y
1292CONFIG_NFS_V3=y 1341CONFIG_NFS_V3=y
1293# CONFIG_NFS_V3_ACL is not set 1342# CONFIG_NFS_V3_ACL is not set
1294CONFIG_NFS_V4=y 1343CONFIG_NFS_V4=y
1344# CONFIG_NFS_V4_1 is not set
1295CONFIG_ROOT_NFS=y 1345CONFIG_ROOT_NFS=y
1296CONFIG_NFSD=y 1346CONFIG_NFSD=y
1297CONFIG_NFSD_V3=y 1347CONFIG_NFSD_V3=y
@@ -1367,6 +1417,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1367CONFIG_ENABLE_MUST_CHECK=y 1417CONFIG_ENABLE_MUST_CHECK=y
1368CONFIG_FRAME_WARN=1024 1418CONFIG_FRAME_WARN=1024
1369CONFIG_MAGIC_SYSRQ=y 1419CONFIG_MAGIC_SYSRQ=y
1420# CONFIG_STRIP_ASM_SYMS is not set
1370# CONFIG_UNUSED_SYMBOLS is not set 1421# CONFIG_UNUSED_SYMBOLS is not set
1371CONFIG_DEBUG_FS=y 1422CONFIG_DEBUG_FS=y
1372# CONFIG_HEADERS_CHECK is not set 1423# CONFIG_HEADERS_CHECK is not set
@@ -1401,22 +1452,29 @@ CONFIG_DEBUG_INFO=y
1401# CONFIG_DEBUG_LIST is not set 1452# CONFIG_DEBUG_LIST is not set
1402# CONFIG_DEBUG_SG is not set 1453# CONFIG_DEBUG_SG is not set
1403# CONFIG_DEBUG_NOTIFIERS is not set 1454# CONFIG_DEBUG_NOTIFIERS is not set
1455# CONFIG_DEBUG_CREDENTIALS is not set
1404CONFIG_FRAME_POINTER=y 1456CONFIG_FRAME_POINTER=y
1405# CONFIG_RCU_TORTURE_TEST is not set 1457# CONFIG_RCU_TORTURE_TEST is not set
1458# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1406# CONFIG_KPROBES_SANITY_TEST is not set 1459# CONFIG_KPROBES_SANITY_TEST is not set
1407# CONFIG_BACKTRACE_SELF_TEST is not set 1460# CONFIG_BACKTRACE_SELF_TEST is not set
1408# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1461# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1462# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1409# CONFIG_LKDTM is not set 1463# CONFIG_LKDTM is not set
1410# CONFIG_FAULT_INJECTION is not set 1464# CONFIG_FAULT_INJECTION is not set
1411# CONFIG_LATENCYTOP is not set 1465# CONFIG_LATENCYTOP is not set
1412# CONFIG_PAGE_POISONING is not set 1466# CONFIG_PAGE_POISONING is not set
1413CONFIG_NOP_TRACER=y 1467CONFIG_NOP_TRACER=y
1414CONFIG_HAVE_FUNCTION_TRACER=y 1468CONFIG_HAVE_FUNCTION_TRACER=y
1469CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1470CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1415CONFIG_HAVE_DYNAMIC_FTRACE=y 1471CONFIG_HAVE_DYNAMIC_FTRACE=y
1416CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1472CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1473CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1417CONFIG_RING_BUFFER=y 1474CONFIG_RING_BUFFER=y
1418CONFIG_EVENT_TRACING=y 1475CONFIG_EVENT_TRACING=y
1419CONFIG_CONTEXT_SWITCH_TRACER=y 1476CONFIG_CONTEXT_SWITCH_TRACER=y
1477CONFIG_RING_BUFFER_ALLOW_SWAP=y
1420CONFIG_TRACING=y 1478CONFIG_TRACING=y
1421CONFIG_TRACING_SUPPORT=y 1479CONFIG_TRACING_SUPPORT=y
1422CONFIG_FTRACE=y 1480CONFIG_FTRACE=y
@@ -1425,6 +1483,7 @@ CONFIG_FTRACE=y
1425# CONFIG_PREEMPT_TRACER is not set 1483# CONFIG_PREEMPT_TRACER is not set
1426# CONFIG_SCHED_TRACER is not set 1484# CONFIG_SCHED_TRACER is not set
1427# CONFIG_ENABLE_DEFAULT_TRACERS is not set 1485# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1486# CONFIG_FTRACE_SYSCALLS is not set
1428# CONFIG_BOOT_TRACER is not set 1487# CONFIG_BOOT_TRACER is not set
1429CONFIG_BRANCH_PROFILE_NONE=y 1488CONFIG_BRANCH_PROFILE_NONE=y
1430# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1489# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -1442,11 +1501,11 @@ CONFIG_HAVE_ARCH_KGDB=y
1442CONFIG_SH_STANDARD_BIOS=y 1501CONFIG_SH_STANDARD_BIOS=y
1443# CONFIG_EARLY_SCIF_CONSOLE is not set 1502# CONFIG_EARLY_SCIF_CONSOLE is not set
1444CONFIG_EARLY_PRINTK=y 1503CONFIG_EARLY_PRINTK=y
1445# CONFIG_DEBUG_BOOTMEM is not set 1504# CONFIG_STACK_DEBUG is not set
1446CONFIG_DEBUG_STACKOVERFLOW=y
1447CONFIG_DEBUG_STACK_USAGE=y 1505CONFIG_DEBUG_STACK_USAGE=y
1448CONFIG_4KSTACKS=y 1506CONFIG_4KSTACKS=y
1449CONFIG_DUMP_CODE=y 1507CONFIG_DUMP_CODE=y
1508# CONFIG_DWARF_UNWINDER is not set
1450# CONFIG_SH_NO_BSS_INIT is not set 1509# CONFIG_SH_NO_BSS_INIT is not set
1451 1510
1452# 1511#
@@ -1461,7 +1520,6 @@ CONFIG_CRYPTO=y
1461# 1520#
1462# Crypto core or helper 1521# Crypto core or helper
1463# 1522#
1464# CONFIG_CRYPTO_FIPS is not set
1465CONFIG_CRYPTO_ALGAPI=y 1523CONFIG_CRYPTO_ALGAPI=y
1466CONFIG_CRYPTO_ALGAPI2=y 1524CONFIG_CRYPTO_ALGAPI2=y
1467CONFIG_CRYPTO_AEAD2=y 1525CONFIG_CRYPTO_AEAD2=y
@@ -1503,11 +1561,13 @@ CONFIG_CRYPTO_PCBC=m
1503# 1561#
1504CONFIG_CRYPTO_HMAC=y 1562CONFIG_CRYPTO_HMAC=y
1505# CONFIG_CRYPTO_XCBC is not set 1563# CONFIG_CRYPTO_XCBC is not set
1564# CONFIG_CRYPTO_VMAC is not set
1506 1565
1507# 1566#
1508# Digest 1567# Digest
1509# 1568#
1510# CONFIG_CRYPTO_CRC32C is not set 1569# CONFIG_CRYPTO_CRC32C is not set
1570# CONFIG_CRYPTO_GHASH is not set
1511# CONFIG_CRYPTO_MD4 is not set 1571# CONFIG_CRYPTO_MD4 is not set
1512CONFIG_CRYPTO_MD5=y 1572CONFIG_CRYPTO_MD5=y
1513# CONFIG_CRYPTO_MICHAEL_MIC is not set 1573# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1571,5 +1631,6 @@ CONFIG_AUDIT_GENERIC=y
1571CONFIG_HAS_IOMEM=y 1631CONFIG_HAS_IOMEM=y
1572CONFIG_HAS_IOPORT=y 1632CONFIG_HAS_IOPORT=y
1573CONFIG_HAS_DMA=y 1633CONFIG_HAS_DMA=y
1634CONFIG_HAVE_LMB=y
1574CONFIG_NLATTR=y 1635CONFIG_NLATTR=y
1575CONFIG_GENERIC_ATOMIC64=y 1636CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/rsk7201_defconfig b/arch/sh/configs/rsk7201_defconfig
index 55c3656a75c1..c40db12e9ad7 100644
--- a/arch/sh/configs/rsk7201_defconfig
+++ b/arch/sh/configs/rsk7201_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:39:54 2009 4# Thu Sep 24 18:34:29 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -27,7 +28,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 28# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 29CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y
31 34
32# 35#
33# General setup 36# General setup
@@ -37,6 +40,12 @@ CONFIG_BROKEN_ON_SMP=y
37CONFIG_INIT_ENV_ARG_LIMIT=32 40CONFIG_INIT_ENV_ARG_LIMIT=32
38CONFIG_LOCALVERSION="" 41CONFIG_LOCALVERSION=""
39# CONFIG_LOCALVERSION_AUTO is not set 42# CONFIG_LOCALVERSION_AUTO is not set
43CONFIG_HAVE_KERNEL_GZIP=y
44CONFIG_HAVE_KERNEL_BZIP2=y
45CONFIG_HAVE_KERNEL_LZMA=y
46CONFIG_KERNEL_GZIP=y
47# CONFIG_KERNEL_BZIP2 is not set
48# CONFIG_KERNEL_LZMA is not set
40CONFIG_SYSVIPC=y 49CONFIG_SYSVIPC=y
41CONFIG_SYSVIPC_SYSCTL=y 50CONFIG_SYSVIPC_SYSCTL=y
42CONFIG_BSD_PROCESS_ACCT=y 51CONFIG_BSD_PROCESS_ACCT=y
@@ -45,11 +54,12 @@ CONFIG_BSD_PROCESS_ACCT=y
45# 54#
46# RCU Subsystem 55# RCU Subsystem
47# 56#
48CONFIG_CLASSIC_RCU=y 57CONFIG_TREE_RCU=y
49# CONFIG_TREE_RCU is not set 58# CONFIG_TREE_PREEMPT_RCU is not set
50# CONFIG_PREEMPT_RCU is not set 59# CONFIG_RCU_TRACE is not set
60CONFIG_RCU_FANOUT=32
61# CONFIG_RCU_FANOUT_EXACT is not set
51# CONFIG_TREE_RCU_TRACE is not set 62# CONFIG_TREE_RCU_TRACE is not set
52# CONFIG_PREEMPT_RCU_TRACE is not set
53CONFIG_IKCONFIG=y 63CONFIG_IKCONFIG=y
54# CONFIG_IKCONFIG_PROC is not set 64# CONFIG_IKCONFIG_PROC is not set
55CONFIG_LOG_BUF_SHIFT=14 65CONFIG_LOG_BUF_SHIFT=14
@@ -86,19 +96,21 @@ CONFIG_SIGNALFD=y
86CONFIG_TIMERFD=y 96CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 97CONFIG_EVENTFD=y
88# CONFIG_AIO is not set 98# CONFIG_AIO is not set
99CONFIG_HAVE_PERF_EVENTS=y
89 100
90# 101#
91# Performance Counters 102# Kernel Performance Events And Counters
92# 103#
104CONFIG_PERF_EVENTS=y
105CONFIG_EVENT_PROFILE=y
106# CONFIG_PERF_COUNTERS is not set
93CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
94# CONFIG_STRIP_ASM_SYMS is not set
95CONFIG_COMPAT_BRK=y 108CONFIG_COMPAT_BRK=y
96# CONFIG_SLAB is not set 109# CONFIG_SLAB is not set
97# CONFIG_SLUB is not set 110# CONFIG_SLUB is not set
98CONFIG_SLOB=y 111CONFIG_SLOB=y
99CONFIG_PROFILING=y 112CONFIG_PROFILING=y
100CONFIG_TRACEPOINTS=y 113CONFIG_TRACEPOINTS=y
101CONFIG_MARKERS=y
102CONFIG_OPROFILE=y 114CONFIG_OPROFILE=y
103CONFIG_HAVE_OPROFILE=y 115CONFIG_HAVE_OPROFILE=y
104# CONFIG_KPROBES is not set 116# CONFIG_KPROBES is not set
@@ -107,6 +119,11 @@ CONFIG_HAVE_KRETPROBES=y
107CONFIG_HAVE_ARCH_TRACEHOOK=y 119CONFIG_HAVE_ARCH_TRACEHOOK=y
108CONFIG_HAVE_CLK=y 120CONFIG_HAVE_CLK=y
109CONFIG_HAVE_DMA_API_DEBUG=y 121CONFIG_HAVE_DMA_API_DEBUG=y
122
123#
124# GCOV-based kernel profiling
125#
126# CONFIG_GCOV_KERNEL is not set
110# CONFIG_SLOW_WORK is not set 127# CONFIG_SLOW_WORK is not set
111CONFIG_HAVE_GENERIC_DMA_COHERENT=y 128CONFIG_HAVE_GENERIC_DMA_COHERENT=y
112CONFIG_RT_MUTEXES=y 129CONFIG_RT_MUTEXES=y
@@ -117,7 +134,7 @@ CONFIG_MODULES=y
117# CONFIG_MODVERSIONS is not set 134# CONFIG_MODVERSIONS is not set
118# CONFIG_MODULE_SRCVERSION_ALL is not set 135# CONFIG_MODULE_SRCVERSION_ALL is not set
119CONFIG_BLOCK=y 136CONFIG_BLOCK=y
120# CONFIG_LBD is not set 137CONFIG_LBDAF=y
121# CONFIG_BLK_DEV_BSG is not set 138# CONFIG_BLK_DEV_BSG is not set
122# CONFIG_BLK_DEV_INTEGRITY is not set 139# CONFIG_BLK_DEV_INTEGRITY is not set
123 140
@@ -165,6 +182,7 @@ CONFIG_CPU_SUBTYPE_SH7201=y
165# CONFIG_CPU_SUBTYPE_SH4_202 is not set 182# CONFIG_CPU_SUBTYPE_SH4_202 is not set
166# CONFIG_CPU_SUBTYPE_SH7723 is not set 183# CONFIG_CPU_SUBTYPE_SH7723 is not set
167# CONFIG_CPU_SUBTYPE_SH7724 is not set 184# CONFIG_CPU_SUBTYPE_SH7724 is not set
185# CONFIG_CPU_SUBTYPE_SH7757 is not set
168# CONFIG_CPU_SUBTYPE_SH7763 is not set 186# CONFIG_CPU_SUBTYPE_SH7763 is not set
169# CONFIG_CPU_SUBTYPE_SH7770 is not set 187# CONFIG_CPU_SUBTYPE_SH7770 is not set
170# CONFIG_CPU_SUBTYPE_SH7780 is not set 188# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -285,7 +303,8 @@ CONFIG_GUSA=y
285CONFIG_ZERO_PAGE_OFFSET=0x00001000 303CONFIG_ZERO_PAGE_OFFSET=0x00001000
286CONFIG_BOOT_LINK_OFFSET=0x00800000 304CONFIG_BOOT_LINK_OFFSET=0x00800000
287CONFIG_ENTRY_OFFSET=0x00001000 305CONFIG_ENTRY_OFFSET=0x00001000
288CONFIG_CMDLINE_BOOL=y 306CONFIG_CMDLINE_OVERWRITE=y
307# CONFIG_CMDLINE_EXTEND is not set
289CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ignore_loglevel" 308CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ignore_loglevel"
290 309
291# 310#
@@ -309,6 +328,7 @@ CONFIG_BINFMT_SHARED_FLAT=y
309# 328#
310CONFIG_PM=y 329CONFIG_PM=y
311# CONFIG_PM_DEBUG is not set 330# CONFIG_PM_DEBUG is not set
331# CONFIG_PM_RUNTIME is not set
312CONFIG_CPU_IDLE=y 332CONFIG_CPU_IDLE=y
313CONFIG_CPU_IDLE_GOV_LADDER=y 333CONFIG_CPU_IDLE_GOV_LADDER=y
314# CONFIG_NET is not set 334# CONFIG_NET is not set
@@ -327,9 +347,9 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
327# CONFIG_SYS_HYPERVISOR is not set 347# CONFIG_SYS_HYPERVISOR is not set
328CONFIG_MTD=y 348CONFIG_MTD=y
329# CONFIG_MTD_DEBUG is not set 349# CONFIG_MTD_DEBUG is not set
350# CONFIG_MTD_TESTS is not set
330CONFIG_MTD_CONCAT=y 351CONFIG_MTD_CONCAT=y
331CONFIG_MTD_PARTITIONS=y 352CONFIG_MTD_PARTITIONS=y
332# CONFIG_MTD_TESTS is not set
333CONFIG_MTD_REDBOOT_PARTS=y 353CONFIG_MTD_REDBOOT_PARTS=y
334CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 354CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
335# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set 355# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -498,6 +518,11 @@ CONFIG_SERIAL_CORE_CONSOLE=y
498# CONFIG_TCG_TPM is not set 518# CONFIG_TCG_TPM is not set
499# CONFIG_I2C is not set 519# CONFIG_I2C is not set
500# CONFIG_SPI is not set 520# CONFIG_SPI is not set
521
522#
523# PPS support
524#
525# CONFIG_PPS is not set
501# CONFIG_W1 is not set 526# CONFIG_W1 is not set
502# CONFIG_POWER_SUPPLY is not set 527# CONFIG_POWER_SUPPLY is not set
503# CONFIG_HWMON is not set 528# CONFIG_HWMON is not set
@@ -597,7 +622,9 @@ CONFIG_EXT2_FS=y
597# CONFIG_JFS_FS is not set 622# CONFIG_JFS_FS is not set
598# CONFIG_FS_POSIX_ACL is not set 623# CONFIG_FS_POSIX_ACL is not set
599# CONFIG_XFS_FS is not set 624# CONFIG_XFS_FS is not set
625# CONFIG_GFS2_FS is not set
600# CONFIG_BTRFS_FS is not set 626# CONFIG_BTRFS_FS is not set
627# CONFIG_NILFS2_FS is not set
601# CONFIG_FILE_LOCKING is not set 628# CONFIG_FILE_LOCKING is not set
602CONFIG_FSNOTIFY=y 629CONFIG_FSNOTIFY=y
603# CONFIG_DNOTIFY is not set 630# CONFIG_DNOTIFY is not set
@@ -632,7 +659,6 @@ CONFIG_INOTIFY_USER=y
632CONFIG_PROC_FS=y 659CONFIG_PROC_FS=y
633CONFIG_PROC_SYSCTL=y 660CONFIG_PROC_SYSCTL=y
634CONFIG_SYSFS=y 661CONFIG_SYSFS=y
635# CONFIG_TMPFS is not set
636# CONFIG_HUGETLB_PAGE is not set 662# CONFIG_HUGETLB_PAGE is not set
637# CONFIG_CONFIGFS_FS is not set 663# CONFIG_CONFIGFS_FS is not set
638CONFIG_MISC_FILESYSTEMS=y 664CONFIG_MISC_FILESYSTEMS=y
@@ -668,7 +694,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
668CONFIG_ROMFS_ON_BLOCK=y 694CONFIG_ROMFS_ON_BLOCK=y
669# CONFIG_SYSV_FS is not set 695# CONFIG_SYSV_FS is not set
670# CONFIG_UFS_FS is not set 696# CONFIG_UFS_FS is not set
671# CONFIG_NILFS2_FS is not set
672 697
673# 698#
674# Partition Types 699# Partition Types
@@ -686,6 +711,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
686# CONFIG_ENABLE_MUST_CHECK is not set 711# CONFIG_ENABLE_MUST_CHECK is not set
687CONFIG_FRAME_WARN=1024 712CONFIG_FRAME_WARN=1024
688CONFIG_MAGIC_SYSRQ=y 713CONFIG_MAGIC_SYSRQ=y
714# CONFIG_STRIP_ASM_SYMS is not set
689# CONFIG_UNUSED_SYMBOLS is not set 715# CONFIG_UNUSED_SYMBOLS is not set
690CONFIG_DEBUG_FS=y 716CONFIG_DEBUG_FS=y
691# CONFIG_HEADERS_CHECK is not set 717# CONFIG_HEADERS_CHECK is not set
@@ -698,11 +724,15 @@ CONFIG_STACKTRACE=y
698CONFIG_SYSCTL_SYSCALL_CHECK=y 724CONFIG_SYSCTL_SYSCALL_CHECK=y
699CONFIG_NOP_TRACER=y 725CONFIG_NOP_TRACER=y
700CONFIG_HAVE_FUNCTION_TRACER=y 726CONFIG_HAVE_FUNCTION_TRACER=y
727CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
728CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
701CONFIG_HAVE_DYNAMIC_FTRACE=y 729CONFIG_HAVE_DYNAMIC_FTRACE=y
702CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 730CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
731CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
703CONFIG_RING_BUFFER=y 732CONFIG_RING_BUFFER=y
704CONFIG_EVENT_TRACING=y 733CONFIG_EVENT_TRACING=y
705CONFIG_CONTEXT_SWITCH_TRACER=y 734CONFIG_CONTEXT_SWITCH_TRACER=y
735CONFIG_RING_BUFFER_ALLOW_SWAP=y
706CONFIG_TRACING=y 736CONFIG_TRACING=y
707CONFIG_TRACING_SUPPORT=y 737CONFIG_TRACING_SUPPORT=y
708# CONFIG_FTRACE is not set 738# CONFIG_FTRACE is not set
@@ -712,6 +742,7 @@ CONFIG_TRACING_SUPPORT=y
712CONFIG_HAVE_ARCH_KGDB=y 742CONFIG_HAVE_ARCH_KGDB=y
713# CONFIG_SH_STANDARD_BIOS is not set 743# CONFIG_SH_STANDARD_BIOS is not set
714# CONFIG_EARLY_SCIF_CONSOLE is not set 744# CONFIG_EARLY_SCIF_CONSOLE is not set
745# CONFIG_DWARF_UNWINDER is not set
715 746
716# 747#
717# Security options 748# Security options
@@ -741,4 +772,5 @@ CONFIG_DECOMPRESS_GZIP=y
741CONFIG_HAS_IOMEM=y 772CONFIG_HAS_IOMEM=y
742CONFIG_HAS_IOPORT=y 773CONFIG_HAS_IOPORT=y
743CONFIG_HAS_DMA=y 774CONFIG_HAS_DMA=y
775CONFIG_HAVE_LMB=y
744CONFIG_GENERIC_ATOMIC64=y 776CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/rsk7203_defconfig b/arch/sh/configs/rsk7203_defconfig
index 69e619967b7b..5cabdb3a84fb 100644
--- a/arch/sh/configs/rsk7203_defconfig
+++ b/arch/sh/configs/rsk7203_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:40:44 2009 4# Thu Sep 24 18:35:04 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,7 +29,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
28# CONFIG_ARCH_HAS_ILOG2_U64 is not set 29# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29CONFIG_ARCH_NO_VIRT_TO_BUS=y 30CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y
32 35
33# 36#
34# General setup 37# General setup
@@ -38,6 +41,12 @@ CONFIG_BROKEN_ON_SMP=y
38CONFIG_INIT_ENV_ARG_LIMIT=32 41CONFIG_INIT_ENV_ARG_LIMIT=32
39CONFIG_LOCALVERSION="" 42CONFIG_LOCALVERSION=""
40# CONFIG_LOCALVERSION_AUTO is not set 43# CONFIG_LOCALVERSION_AUTO is not set
44CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set
41CONFIG_SYSVIPC=y 50CONFIG_SYSVIPC=y
42CONFIG_SYSVIPC_SYSCTL=y 51CONFIG_SYSVIPC_SYSCTL=y
43CONFIG_POSIX_MQUEUE=y 52CONFIG_POSIX_MQUEUE=y
@@ -50,11 +59,12 @@ CONFIG_BSD_PROCESS_ACCT=y
50# 59#
51# RCU Subsystem 60# RCU Subsystem
52# 61#
53CONFIG_CLASSIC_RCU=y 62CONFIG_TREE_RCU=y
54# CONFIG_TREE_RCU is not set 63# CONFIG_TREE_PREEMPT_RCU is not set
55# CONFIG_PREEMPT_RCU is not set 64# CONFIG_RCU_TRACE is not set
65CONFIG_RCU_FANOUT=32
66# CONFIG_RCU_FANOUT_EXACT is not set
56# CONFIG_TREE_RCU_TRACE is not set 67# CONFIG_TREE_RCU_TRACE is not set
57# CONFIG_PREEMPT_RCU_TRACE is not set
58CONFIG_IKCONFIG=y 68CONFIG_IKCONFIG=y
59# CONFIG_IKCONFIG_PROC is not set 69# CONFIG_IKCONFIG_PROC is not set
60CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
@@ -93,19 +103,21 @@ CONFIG_SIGNALFD=y
93CONFIG_TIMERFD=y 103CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y 104CONFIG_EVENTFD=y
95CONFIG_AIO=y 105CONFIG_AIO=y
106CONFIG_HAVE_PERF_EVENTS=y
96 107
97# 108#
98# Performance Counters 109# Kernel Performance Events And Counters
99# 110#
111CONFIG_PERF_EVENTS=y
112CONFIG_EVENT_PROFILE=y
113# CONFIG_PERF_COUNTERS is not set
100CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
101# CONFIG_STRIP_ASM_SYMS is not set
102CONFIG_COMPAT_BRK=y 115CONFIG_COMPAT_BRK=y
103# CONFIG_SLAB is not set 116# CONFIG_SLAB is not set
104# CONFIG_SLUB is not set 117# CONFIG_SLUB is not set
105CONFIG_SLOB=y 118CONFIG_SLOB=y
106CONFIG_PROFILING=y 119CONFIG_PROFILING=y
107CONFIG_TRACEPOINTS=y 120CONFIG_TRACEPOINTS=y
108CONFIG_MARKERS=y
109CONFIG_OPROFILE=y 121CONFIG_OPROFILE=y
110CONFIG_HAVE_OPROFILE=y 122CONFIG_HAVE_OPROFILE=y
111# CONFIG_KPROBES is not set 123# CONFIG_KPROBES is not set
@@ -114,6 +126,11 @@ CONFIG_HAVE_KRETPROBES=y
114CONFIG_HAVE_ARCH_TRACEHOOK=y 126CONFIG_HAVE_ARCH_TRACEHOOK=y
115CONFIG_HAVE_CLK=y 127CONFIG_HAVE_CLK=y
116CONFIG_HAVE_DMA_API_DEBUG=y 128CONFIG_HAVE_DMA_API_DEBUG=y
129
130#
131# GCOV-based kernel profiling
132#
133# CONFIG_GCOV_KERNEL is not set
117# CONFIG_SLOW_WORK is not set 134# CONFIG_SLOW_WORK is not set
118CONFIG_HAVE_GENERIC_DMA_COHERENT=y 135CONFIG_HAVE_GENERIC_DMA_COHERENT=y
119CONFIG_RT_MUTEXES=y 136CONFIG_RT_MUTEXES=y
@@ -124,7 +141,7 @@ CONFIG_MODULES=y
124# CONFIG_MODVERSIONS is not set 141# CONFIG_MODVERSIONS is not set
125# CONFIG_MODULE_SRCVERSION_ALL is not set 142# CONFIG_MODULE_SRCVERSION_ALL is not set
126CONFIG_BLOCK=y 143CONFIG_BLOCK=y
127# CONFIG_LBD is not set 144CONFIG_LBDAF=y
128# CONFIG_BLK_DEV_BSG is not set 145# CONFIG_BLK_DEV_BSG is not set
129# CONFIG_BLK_DEV_INTEGRITY is not set 146# CONFIG_BLK_DEV_INTEGRITY is not set
130 147
@@ -172,6 +189,7 @@ CONFIG_CPU_SUBTYPE_SH7203=y
172# CONFIG_CPU_SUBTYPE_SH4_202 is not set 189# CONFIG_CPU_SUBTYPE_SH4_202 is not set
173# CONFIG_CPU_SUBTYPE_SH7723 is not set 190# CONFIG_CPU_SUBTYPE_SH7723 is not set
174# CONFIG_CPU_SUBTYPE_SH7724 is not set 191# CONFIG_CPU_SUBTYPE_SH7724 is not set
192# CONFIG_CPU_SUBTYPE_SH7757 is not set
175# CONFIG_CPU_SUBTYPE_SH7763 is not set 193# CONFIG_CPU_SUBTYPE_SH7763 is not set
176# CONFIG_CPU_SUBTYPE_SH7770 is not set 194# CONFIG_CPU_SUBTYPE_SH7770 is not set
177# CONFIG_CPU_SUBTYPE_SH7780 is not set 195# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -308,7 +326,8 @@ CONFIG_GUSA=y
308CONFIG_ZERO_PAGE_OFFSET=0x00001000 326CONFIG_ZERO_PAGE_OFFSET=0x00001000
309CONFIG_BOOT_LINK_OFFSET=0x00800000 327CONFIG_BOOT_LINK_OFFSET=0x00800000
310CONFIG_ENTRY_OFFSET=0x00001000 328CONFIG_ENTRY_OFFSET=0x00001000
311CONFIG_CMDLINE_BOOL=y 329CONFIG_CMDLINE_OVERWRITE=y
330# CONFIG_CMDLINE_EXTEND is not set
312CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ignore_loglevel" 331CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ignore_loglevel"
313 332
314# 333#
@@ -332,6 +351,7 @@ CONFIG_BINFMT_SHARED_FLAT=y
332# 351#
333CONFIG_PM=y 352CONFIG_PM=y
334# CONFIG_PM_DEBUG is not set 353# CONFIG_PM_DEBUG is not set
354# CONFIG_PM_RUNTIME is not set
335CONFIG_CPU_IDLE=y 355CONFIG_CPU_IDLE=y
336CONFIG_CPU_IDLE_GOV_LADDER=y 356CONFIG_CPU_IDLE_GOV_LADDER=y
337CONFIG_NET=y 357CONFIG_NET=y
@@ -373,6 +393,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
373# CONFIG_NETFILTER is not set 393# CONFIG_NETFILTER is not set
374# CONFIG_IP_DCCP is not set 394# CONFIG_IP_DCCP is not set
375# CONFIG_IP_SCTP is not set 395# CONFIG_IP_SCTP is not set
396# CONFIG_RDS is not set
376# CONFIG_TIPC is not set 397# CONFIG_TIPC is not set
377# CONFIG_ATM is not set 398# CONFIG_ATM is not set
378# CONFIG_BRIDGE is not set 399# CONFIG_BRIDGE is not set
@@ -403,6 +424,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
403# CONFIG_AF_RXRPC is not set 424# CONFIG_AF_RXRPC is not set
404CONFIG_WIRELESS=y 425CONFIG_WIRELESS=y
405# CONFIG_CFG80211 is not set 426# CONFIG_CFG80211 is not set
427CONFIG_CFG80211_DEFAULT_PS_VALUE=0
406# CONFIG_WIRELESS_OLD_REGULATORY is not set 428# CONFIG_WIRELESS_OLD_REGULATORY is not set
407# CONFIG_WIRELESS_EXT is not set 429# CONFIG_WIRELESS_EXT is not set
408# CONFIG_LIB80211 is not set 430# CONFIG_LIB80211 is not set
@@ -410,7 +432,6 @@ CONFIG_WIRELESS=y
410# 432#
411# CFG80211 needs to be enabled for MAC80211 433# CFG80211 needs to be enabled for MAC80211
412# 434#
413CONFIG_MAC80211_DEFAULT_PS_VALUE=0
414# CONFIG_WIMAX is not set 435# CONFIG_WIMAX is not set
415# CONFIG_RFKILL is not set 436# CONFIG_RFKILL is not set
416# CONFIG_NET_9P is not set 437# CONFIG_NET_9P is not set
@@ -432,9 +453,9 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
432# CONFIG_CONNECTOR is not set 453# CONFIG_CONNECTOR is not set
433CONFIG_MTD=y 454CONFIG_MTD=y
434# CONFIG_MTD_DEBUG is not set 455# CONFIG_MTD_DEBUG is not set
456# CONFIG_MTD_TESTS is not set
435CONFIG_MTD_CONCAT=y 457CONFIG_MTD_CONCAT=y
436CONFIG_MTD_PARTITIONS=y 458CONFIG_MTD_PARTITIONS=y
437# CONFIG_MTD_TESTS is not set
438CONFIG_MTD_REDBOOT_PARTS=y 459CONFIG_MTD_REDBOOT_PARTS=y
439CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 460CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
440# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set 461# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -591,10 +612,7 @@ CONFIG_SMSC911X=y
591# CONFIG_KS8842 is not set 612# CONFIG_KS8842 is not set
592# CONFIG_NETDEV_1000 is not set 613# CONFIG_NETDEV_1000 is not set
593# CONFIG_NETDEV_10000 is not set 614# CONFIG_NETDEV_10000 is not set
594 615CONFIG_WLAN=y
595#
596# Wireless LAN
597#
598# CONFIG_WLAN_PRE80211 is not set 616# CONFIG_WLAN_PRE80211 is not set
599# CONFIG_WLAN_80211 is not set 617# CONFIG_WLAN_80211 is not set
600 618
@@ -679,6 +697,11 @@ CONFIG_SERIAL_CORE_CONSOLE=y
679# CONFIG_TCG_TPM is not set 697# CONFIG_TCG_TPM is not set
680# CONFIG_I2C is not set 698# CONFIG_I2C is not set
681# CONFIG_SPI is not set 699# CONFIG_SPI is not set
700
701#
702# PPS support
703#
704# CONFIG_PPS is not set
682CONFIG_ARCH_REQUIRE_GPIOLIB=y 705CONFIG_ARCH_REQUIRE_GPIOLIB=y
683CONFIG_GPIOLIB=y 706CONFIG_GPIOLIB=y
684# CONFIG_DEBUG_GPIO is not set 707# CONFIG_DEBUG_GPIO is not set
@@ -699,6 +722,10 @@ CONFIG_GPIOLIB=y
699# 722#
700# SPI GPIO expanders: 723# SPI GPIO expanders:
701# 724#
725
726#
727# AC97 GPIO expanders:
728#
702# CONFIG_W1 is not set 729# CONFIG_W1 is not set
703# CONFIG_POWER_SUPPLY is not set 730# CONFIG_POWER_SUPPLY is not set
704# CONFIG_HWMON is not set 731# CONFIG_HWMON is not set
@@ -741,7 +768,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
741# CONFIG_SOUND is not set 768# CONFIG_SOUND is not set
742CONFIG_HID_SUPPORT=y 769CONFIG_HID_SUPPORT=y
743CONFIG_HID=y 770CONFIG_HID=y
744# CONFIG_HID_DEBUG is not set
745# CONFIG_HIDRAW is not set 771# CONFIG_HIDRAW is not set
746 772
747# 773#
@@ -764,6 +790,7 @@ CONFIG_HID_CYPRESS=y
764CONFIG_HID_EZKEY=y 790CONFIG_HID_EZKEY=y
765# CONFIG_HID_KYE is not set 791# CONFIG_HID_KYE is not set
766CONFIG_HID_GYRATION=y 792CONFIG_HID_GYRATION=y
793# CONFIG_HID_TWINHAN is not set
767# CONFIG_HID_KENSINGTON is not set 794# CONFIG_HID_KENSINGTON is not set
768CONFIG_HID_LOGITECH=y 795CONFIG_HID_LOGITECH=y
769# CONFIG_LOGITECH_FF is not set 796# CONFIG_LOGITECH_FF is not set
@@ -811,6 +838,7 @@ CONFIG_USB_MON=y
811# CONFIG_USB_OXU210HP_HCD is not set 838# CONFIG_USB_OXU210HP_HCD is not set
812# CONFIG_USB_ISP116X_HCD is not set 839# CONFIG_USB_ISP116X_HCD is not set
813# CONFIG_USB_ISP1760_HCD is not set 840# CONFIG_USB_ISP1760_HCD is not set
841# CONFIG_USB_ISP1362_HCD is not set
814# CONFIG_USB_SL811_HCD is not set 842# CONFIG_USB_SL811_HCD is not set
815CONFIG_USB_R8A66597_HCD=y 843CONFIG_USB_R8A66597_HCD=y
816# CONFIG_USB_HWA_HCD is not set 844# CONFIG_USB_HWA_HCD is not set
@@ -954,8 +982,10 @@ CONFIG_RTC_DRV_SH=y
954# CONFIG_JFS_FS is not set 982# CONFIG_JFS_FS is not set
955# CONFIG_FS_POSIX_ACL is not set 983# CONFIG_FS_POSIX_ACL is not set
956# CONFIG_XFS_FS is not set 984# CONFIG_XFS_FS is not set
985# CONFIG_GFS2_FS is not set
957# CONFIG_OCFS2_FS is not set 986# CONFIG_OCFS2_FS is not set
958# CONFIG_BTRFS_FS is not set 987# CONFIG_BTRFS_FS is not set
988# CONFIG_NILFS2_FS is not set
959CONFIG_FILE_LOCKING=y 989CONFIG_FILE_LOCKING=y
960CONFIG_FSNOTIFY=y 990CONFIG_FSNOTIFY=y
961# CONFIG_DNOTIFY is not set 991# CONFIG_DNOTIFY is not set
@@ -990,7 +1020,6 @@ CONFIG_INOTIFY_USER=y
990CONFIG_PROC_FS=y 1020CONFIG_PROC_FS=y
991CONFIG_PROC_SYSCTL=y 1021CONFIG_PROC_SYSCTL=y
992CONFIG_SYSFS=y 1022CONFIG_SYSFS=y
993# CONFIG_TMPFS is not set
994# CONFIG_HUGETLB_PAGE is not set 1023# CONFIG_HUGETLB_PAGE is not set
995# CONFIG_CONFIGFS_FS is not set 1024# CONFIG_CONFIGFS_FS is not set
996CONFIG_MISC_FILESYSTEMS=y 1025CONFIG_MISC_FILESYSTEMS=y
@@ -1016,7 +1045,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
1016CONFIG_ROMFS_ON_BLOCK=y 1045CONFIG_ROMFS_ON_BLOCK=y
1017# CONFIG_SYSV_FS is not set 1046# CONFIG_SYSV_FS is not set
1018# CONFIG_UFS_FS is not set 1047# CONFIG_UFS_FS is not set
1019# CONFIG_NILFS2_FS is not set
1020CONFIG_NETWORK_FILESYSTEMS=y 1048CONFIG_NETWORK_FILESYSTEMS=y
1021CONFIG_NFS_FS=y 1049CONFIG_NFS_FS=y
1022# CONFIG_NFS_V3 is not set 1050# CONFIG_NFS_V3 is not set
@@ -1090,6 +1118,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1090# CONFIG_ENABLE_MUST_CHECK is not set 1118# CONFIG_ENABLE_MUST_CHECK is not set
1091CONFIG_FRAME_WARN=1024 1119CONFIG_FRAME_WARN=1024
1092CONFIG_MAGIC_SYSRQ=y 1120CONFIG_MAGIC_SYSRQ=y
1121# CONFIG_STRIP_ASM_SYMS is not set
1093# CONFIG_UNUSED_SYMBOLS is not set 1122# CONFIG_UNUSED_SYMBOLS is not set
1094CONFIG_DEBUG_FS=y 1123CONFIG_DEBUG_FS=y
1095# CONFIG_HEADERS_CHECK is not set 1124# CONFIG_HEADERS_CHECK is not set
@@ -1129,22 +1158,28 @@ CONFIG_DEBUG_WRITECOUNT=y
1129CONFIG_DEBUG_LIST=y 1158CONFIG_DEBUG_LIST=y
1130CONFIG_DEBUG_SG=y 1159CONFIG_DEBUG_SG=y
1131# CONFIG_DEBUG_NOTIFIERS is not set 1160# CONFIG_DEBUG_NOTIFIERS is not set
1161# CONFIG_DEBUG_CREDENTIALS is not set
1132CONFIG_FRAME_POINTER=y 1162CONFIG_FRAME_POINTER=y
1133# CONFIG_RCU_TORTURE_TEST is not set 1163# CONFIG_RCU_TORTURE_TEST is not set
1134# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1164# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1135# CONFIG_BACKTRACE_SELF_TEST is not set 1165# CONFIG_BACKTRACE_SELF_TEST is not set
1136# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1166# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1167# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1137# CONFIG_FAULT_INJECTION is not set 1168# CONFIG_FAULT_INJECTION is not set
1138# CONFIG_LATENCYTOP is not set 1169# CONFIG_LATENCYTOP is not set
1139CONFIG_SYSCTL_SYSCALL_CHECK=y 1170CONFIG_SYSCTL_SYSCALL_CHECK=y
1140# CONFIG_PAGE_POISONING is not set 1171# CONFIG_PAGE_POISONING is not set
1141CONFIG_NOP_TRACER=y 1172CONFIG_NOP_TRACER=y
1142CONFIG_HAVE_FUNCTION_TRACER=y 1173CONFIG_HAVE_FUNCTION_TRACER=y
1174CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1175CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1143CONFIG_HAVE_DYNAMIC_FTRACE=y 1176CONFIG_HAVE_DYNAMIC_FTRACE=y
1144CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1177CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1178CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1145CONFIG_RING_BUFFER=y 1179CONFIG_RING_BUFFER=y
1146CONFIG_EVENT_TRACING=y 1180CONFIG_EVENT_TRACING=y
1147CONFIG_CONTEXT_SWITCH_TRACER=y 1181CONFIG_CONTEXT_SWITCH_TRACER=y
1182CONFIG_RING_BUFFER_ALLOW_SWAP=y
1148CONFIG_TRACING=y 1183CONFIG_TRACING=y
1149CONFIG_TRACING_SUPPORT=y 1184CONFIG_TRACING_SUPPORT=y
1150CONFIG_FTRACE=y 1185CONFIG_FTRACE=y
@@ -1152,6 +1187,7 @@ CONFIG_FTRACE=y
1152# CONFIG_IRQSOFF_TRACER is not set 1187# CONFIG_IRQSOFF_TRACER is not set
1153# CONFIG_SCHED_TRACER is not set 1188# CONFIG_SCHED_TRACER is not set
1154# CONFIG_ENABLE_DEFAULT_TRACERS is not set 1189# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1190# CONFIG_FTRACE_SYSCALLS is not set
1155# CONFIG_BOOT_TRACER is not set 1191# CONFIG_BOOT_TRACER is not set
1156CONFIG_BRANCH_PROFILE_NONE=y 1192CONFIG_BRANCH_PROFILE_NONE=y
1157# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1193# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -1170,10 +1206,10 @@ CONFIG_HAVE_ARCH_KGDB=y
1170CONFIG_EARLY_SCIF_CONSOLE=y 1206CONFIG_EARLY_SCIF_CONSOLE=y
1171CONFIG_EARLY_SCIF_CONSOLE_PORT=0xfffe8000 1207CONFIG_EARLY_SCIF_CONSOLE_PORT=0xfffe8000
1172CONFIG_EARLY_PRINTK=y 1208CONFIG_EARLY_PRINTK=y
1173CONFIG_DEBUG_BOOTMEM=y 1209# CONFIG_STACK_DEBUG is not set
1174CONFIG_DEBUG_STACKOVERFLOW=y
1175CONFIG_DEBUG_STACK_USAGE=y 1210CONFIG_DEBUG_STACK_USAGE=y
1176CONFIG_DUMP_CODE=y 1211CONFIG_DUMP_CODE=y
1212# CONFIG_DWARF_UNWINDER is not set
1177# CONFIG_SH_NO_BSS_INIT is not set 1213# CONFIG_SH_NO_BSS_INIT is not set
1178 1214
1179# 1215#
@@ -1203,5 +1239,6 @@ CONFIG_DECOMPRESS_GZIP=y
1203CONFIG_HAS_IOMEM=y 1239CONFIG_HAS_IOMEM=y
1204CONFIG_HAS_IOPORT=y 1240CONFIG_HAS_IOPORT=y
1205CONFIG_HAS_DMA=y 1241CONFIG_HAS_DMA=y
1242CONFIG_HAVE_LMB=y
1206CONFIG_NLATTR=y 1243CONFIG_NLATTR=y
1207CONFIG_GENERIC_ATOMIC64=y 1244CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/rts7751r2d1_defconfig b/arch/sh/configs/rts7751r2d1_defconfig
index c6e9b1c0fa3e..f521e82cc19e 100644
--- a/arch/sh/configs/rts7751r2d1_defconfig
+++ b/arch/sh/configs/rts7751r2d1_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:42:26 2009 4# Thu Sep 24 18:36:25 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,8 +29,10 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
28# CONFIG_ARCH_HAS_ILOG2_U64 is not set 29# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29CONFIG_ARCH_NO_VIRT_TO_BUS=y 30CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_IO_TRAPPED=y 33CONFIG_IO_TRAPPED=y
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y
33 36
34# 37#
35# General setup 38# General setup
@@ -39,6 +42,12 @@ CONFIG_BROKEN_ON_SMP=y
39CONFIG_INIT_ENV_ARG_LIMIT=32 42CONFIG_INIT_ENV_ARG_LIMIT=32
40CONFIG_LOCALVERSION="" 43CONFIG_LOCALVERSION=""
41CONFIG_LOCALVERSION_AUTO=y 44CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y
48CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set
42CONFIG_SWAP=y 51CONFIG_SWAP=y
43CONFIG_SYSVIPC=y 52CONFIG_SYSVIPC=y
44CONFIG_SYSVIPC_SYSCTL=y 53CONFIG_SYSVIPC_SYSCTL=y
@@ -50,11 +59,12 @@ CONFIG_SYSVIPC_SYSCTL=y
50# 59#
51# RCU Subsystem 60# RCU Subsystem
52# 61#
53CONFIG_CLASSIC_RCU=y 62CONFIG_TREE_RCU=y
54# CONFIG_TREE_RCU is not set 63# CONFIG_TREE_PREEMPT_RCU is not set
55# CONFIG_PREEMPT_RCU is not set 64# CONFIG_RCU_TRACE is not set
65CONFIG_RCU_FANOUT=32
66# CONFIG_RCU_FANOUT_EXACT is not set
56# CONFIG_TREE_RCU_TRACE is not set 67# CONFIG_TREE_RCU_TRACE is not set
57# CONFIG_PREEMPT_RCU_TRACE is not set
58# CONFIG_IKCONFIG is not set 68# CONFIG_IKCONFIG is not set
59CONFIG_LOG_BUF_SHIFT=14 69CONFIG_LOG_BUF_SHIFT=14
60# CONFIG_GROUP_SCHED is not set 70# CONFIG_GROUP_SCHED is not set
@@ -84,20 +94,22 @@ CONFIG_TIMERFD=y
84CONFIG_EVENTFD=y 94CONFIG_EVENTFD=y
85CONFIG_SHMEM=y 95CONFIG_SHMEM=y
86CONFIG_AIO=y 96CONFIG_AIO=y
97CONFIG_HAVE_PERF_EVENTS=y
87 98
88# 99#
89# Performance Counters 100# Kernel Performance Events And Counters
90# 101#
102CONFIG_PERF_EVENTS=y
103CONFIG_EVENT_PROFILE=y
104# CONFIG_PERF_COUNTERS is not set
91CONFIG_VM_EVENT_COUNTERS=y 105CONFIG_VM_EVENT_COUNTERS=y
92CONFIG_PCI_QUIRKS=y 106CONFIG_PCI_QUIRKS=y
93# CONFIG_STRIP_ASM_SYMS is not set
94CONFIG_COMPAT_BRK=y 107CONFIG_COMPAT_BRK=y
95CONFIG_SLAB=y 108CONFIG_SLAB=y
96# CONFIG_SLUB is not set 109# CONFIG_SLUB is not set
97# CONFIG_SLOB is not set 110# CONFIG_SLOB is not set
98CONFIG_PROFILING=y 111CONFIG_PROFILING=y
99CONFIG_TRACEPOINTS=y 112CONFIG_TRACEPOINTS=y
100CONFIG_MARKERS=y
101CONFIG_OPROFILE=y 113CONFIG_OPROFILE=y
102CONFIG_HAVE_OPROFILE=y 114CONFIG_HAVE_OPROFILE=y
103# CONFIG_KPROBES is not set 115# CONFIG_KPROBES is not set
@@ -107,6 +119,11 @@ CONFIG_HAVE_KRETPROBES=y
107CONFIG_HAVE_ARCH_TRACEHOOK=y 119CONFIG_HAVE_ARCH_TRACEHOOK=y
108CONFIG_HAVE_CLK=y 120CONFIG_HAVE_CLK=y
109CONFIG_HAVE_DMA_API_DEBUG=y 121CONFIG_HAVE_DMA_API_DEBUG=y
122
123#
124# GCOV-based kernel profiling
125#
126# CONFIG_GCOV_KERNEL is not set
110# CONFIG_SLOW_WORK is not set 127# CONFIG_SLOW_WORK is not set
111CONFIG_HAVE_GENERIC_DMA_COHERENT=y 128CONFIG_HAVE_GENERIC_DMA_COHERENT=y
112CONFIG_SLABINFO=y 129CONFIG_SLABINFO=y
@@ -118,7 +135,7 @@ CONFIG_MODULES=y
118# CONFIG_MODVERSIONS is not set 135# CONFIG_MODVERSIONS is not set
119# CONFIG_MODULE_SRCVERSION_ALL is not set 136# CONFIG_MODULE_SRCVERSION_ALL is not set
120CONFIG_BLOCK=y 137CONFIG_BLOCK=y
121# CONFIG_LBD is not set 138CONFIG_LBDAF=y
122# CONFIG_BLK_DEV_BSG is not set 139# CONFIG_BLK_DEV_BSG is not set
123# CONFIG_BLK_DEV_INTEGRITY is not set 140# CONFIG_BLK_DEV_INTEGRITY is not set
124 141
@@ -165,6 +182,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
165# CONFIG_CPU_SUBTYPE_SH4_202 is not set 182# CONFIG_CPU_SUBTYPE_SH4_202 is not set
166# CONFIG_CPU_SUBTYPE_SH7723 is not set 183# CONFIG_CPU_SUBTYPE_SH7723 is not set
167# CONFIG_CPU_SUBTYPE_SH7724 is not set 184# CONFIG_CPU_SUBTYPE_SH7724 is not set
185# CONFIG_CPU_SUBTYPE_SH7757 is not set
168# CONFIG_CPU_SUBTYPE_SH7763 is not set 186# CONFIG_CPU_SUBTYPE_SH7763 is not set
169# CONFIG_CPU_SUBTYPE_SH7770 is not set 187# CONFIG_CPU_SUBTYPE_SH7770 is not set
170# CONFIG_CPU_SUBTYPE_SH7780 is not set 188# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -210,6 +228,7 @@ CONFIG_ZONE_DMA_FLAG=0
210CONFIG_NR_QUICK=2 228CONFIG_NR_QUICK=2
211CONFIG_HAVE_MLOCK=y 229CONFIG_HAVE_MLOCK=y
212CONFIG_HAVE_MLOCKED_PAGE_BIT=y 230CONFIG_HAVE_MLOCKED_PAGE_BIT=y
231# CONFIG_KSM is not set
213CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 232CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
214 233
215# 234#
@@ -303,7 +322,8 @@ CONFIG_ZERO_PAGE_OFFSET=0x00010000
303CONFIG_BOOT_LINK_OFFSET=0x00800000 322CONFIG_BOOT_LINK_OFFSET=0x00800000
304CONFIG_ENTRY_OFFSET=0x00001000 323CONFIG_ENTRY_OFFSET=0x00001000
305# CONFIG_UBC_WAKEUP is not set 324# CONFIG_UBC_WAKEUP is not set
306CONFIG_CMDLINE_BOOL=y 325CONFIG_CMDLINE_OVERWRITE=y
326# CONFIG_CMDLINE_EXTEND is not set
307CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=serial" 327CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=serial"
308 328
309# 329#
@@ -378,6 +398,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
378# CONFIG_NETFILTER is not set 398# CONFIG_NETFILTER is not set
379# CONFIG_IP_DCCP is not set 399# CONFIG_IP_DCCP is not set
380# CONFIG_IP_SCTP is not set 400# CONFIG_IP_SCTP is not set
401# CONFIG_RDS is not set
381# CONFIG_TIPC is not set 402# CONFIG_TIPC is not set
382# CONFIG_ATM is not set 403# CONFIG_ATM is not set
383# CONFIG_BRIDGE is not set 404# CONFIG_BRIDGE is not set
@@ -408,6 +429,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
408# CONFIG_AF_RXRPC is not set 429# CONFIG_AF_RXRPC is not set
409CONFIG_WIRELESS=y 430CONFIG_WIRELESS=y
410# CONFIG_CFG80211 is not set 431# CONFIG_CFG80211 is not set
432CONFIG_CFG80211_DEFAULT_PS_VALUE=0
411# CONFIG_WIRELESS_OLD_REGULATORY is not set 433# CONFIG_WIRELESS_OLD_REGULATORY is not set
412CONFIG_WIRELESS_EXT=y 434CONFIG_WIRELESS_EXT=y
413CONFIG_WIRELESS_EXT_SYSFS=y 435CONFIG_WIRELESS_EXT_SYSFS=y
@@ -416,7 +438,6 @@ CONFIG_WIRELESS_EXT_SYSFS=y
416# 438#
417# CFG80211 needs to be enabled for MAC80211 439# CFG80211 needs to be enabled for MAC80211
418# 440#
419CONFIG_MAC80211_DEFAULT_PS_VALUE=0
420# CONFIG_WIMAX is not set 441# CONFIG_WIMAX is not set
421# CONFIG_RFKILL is not set 442# CONFIG_RFKILL is not set
422# CONFIG_NET_9P is not set 443# CONFIG_NET_9P is not set
@@ -429,6 +450,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
429# Generic Driver Options 450# Generic Driver Options
430# 451#
431CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 452CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
453# CONFIG_DEVTMPFS is not set
432CONFIG_STANDALONE=y 454CONFIG_STANDALONE=y
433CONFIG_PREVENT_FIRMWARE_BUILD=y 455CONFIG_PREVENT_FIRMWARE_BUILD=y
434CONFIG_FW_LOADER=m 456CONFIG_FW_LOADER=m
@@ -542,11 +564,13 @@ CONFIG_SCSI_LOWLEVEL=y
542# CONFIG_SCSI_DC390T is not set 564# CONFIG_SCSI_DC390T is not set
543# CONFIG_SCSI_NSP32 is not set 565# CONFIG_SCSI_NSP32 is not set
544# CONFIG_SCSI_DEBUG is not set 566# CONFIG_SCSI_DEBUG is not set
567# CONFIG_SCSI_PMCRAID is not set
545# CONFIG_SCSI_SRP is not set 568# CONFIG_SCSI_SRP is not set
546# CONFIG_SCSI_DH is not set 569# CONFIG_SCSI_DH is not set
547# CONFIG_SCSI_OSD_INITIATOR is not set 570# CONFIG_SCSI_OSD_INITIATOR is not set
548CONFIG_ATA=y 571CONFIG_ATA=y
549# CONFIG_ATA_NONSTANDARD is not set 572# CONFIG_ATA_NONSTANDARD is not set
573CONFIG_ATA_VERBOSE_ERROR=y
550CONFIG_SATA_PMP=y 574CONFIG_SATA_PMP=y
551# CONFIG_SATA_AHCI is not set 575# CONFIG_SATA_AHCI is not set
552# CONFIG_SATA_SIL24 is not set 576# CONFIG_SATA_SIL24 is not set
@@ -568,6 +592,7 @@ CONFIG_ATA_SFF=y
568# CONFIG_PATA_ALI is not set 592# CONFIG_PATA_ALI is not set
569# CONFIG_PATA_AMD is not set 593# CONFIG_PATA_AMD is not set
570# CONFIG_PATA_ARTOP is not set 594# CONFIG_PATA_ARTOP is not set
595# CONFIG_PATA_ATP867X is not set
571# CONFIG_PATA_ATIIXP is not set 596# CONFIG_PATA_ATIIXP is not set
572# CONFIG_PATA_CMD640_PCI is not set 597# CONFIG_PATA_CMD640_PCI is not set
573# CONFIG_PATA_CMD64X is not set 598# CONFIG_PATA_CMD64X is not set
@@ -595,6 +620,7 @@ CONFIG_ATA_SFF=y
595# CONFIG_PATA_OPTIDMA is not set 620# CONFIG_PATA_OPTIDMA is not set
596# CONFIG_PATA_PDC_OLD is not set 621# CONFIG_PATA_PDC_OLD is not set
597# CONFIG_PATA_RADISYS is not set 622# CONFIG_PATA_RADISYS is not set
623# CONFIG_PATA_RDC is not set
598# CONFIG_PATA_RZ1000 is not set 624# CONFIG_PATA_RZ1000 is not set
599# CONFIG_PATA_SC1200 is not set 625# CONFIG_PATA_SC1200 is not set
600# CONFIG_PATA_SERVERWORKS is not set 626# CONFIG_PATA_SERVERWORKS is not set
@@ -613,7 +639,11 @@ CONFIG_PATA_PLATFORM=y
613# 639#
614 640
615# 641#
616# Enable only one of the two stacks, unless you know what you are doing 642# You can enable one or both FireWire driver stacks.
643#
644
645#
646# See the help texts for more information.
617# 647#
618# CONFIG_FIREWIRE is not set 648# CONFIG_FIREWIRE is not set
619# CONFIG_IEEE1394 is not set 649# CONFIG_IEEE1394 is not set
@@ -673,6 +703,7 @@ CONFIG_8139TOO=y
673# CONFIG_SUNDANCE is not set 703# CONFIG_SUNDANCE is not set
674# CONFIG_TLAN is not set 704# CONFIG_TLAN is not set
675# CONFIG_KS8842 is not set 705# CONFIG_KS8842 is not set
706# CONFIG_KS8851 is not set
676# CONFIG_VIA_RHINE is not set 707# CONFIG_VIA_RHINE is not set
677# CONFIG_SC92031 is not set 708# CONFIG_SC92031 is not set
678# CONFIG_ATL2 is not set 709# CONFIG_ATL2 is not set
@@ -694,6 +725,7 @@ CONFIG_NETDEV_1000=y
694# CONFIG_VIA_VELOCITY is not set 725# CONFIG_VIA_VELOCITY is not set
695# CONFIG_TIGON3 is not set 726# CONFIG_TIGON3 is not set
696# CONFIG_BNX2 is not set 727# CONFIG_BNX2 is not set
728# CONFIG_CNIC is not set
697# CONFIG_QLA3XXX is not set 729# CONFIG_QLA3XXX is not set
698# CONFIG_ATL1 is not set 730# CONFIG_ATL1 is not set
699# CONFIG_ATL1E is not set 731# CONFIG_ATL1E is not set
@@ -719,10 +751,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
719# CONFIG_SFC is not set 751# CONFIG_SFC is not set
720# CONFIG_BE2NET is not set 752# CONFIG_BE2NET is not set
721# CONFIG_TR is not set 753# CONFIG_TR is not set
722 754CONFIG_WLAN=y
723#
724# Wireless LAN
725#
726# CONFIG_WLAN_PRE80211 is not set 755# CONFIG_WLAN_PRE80211 is not set
727# CONFIG_WLAN_80211 is not set 756# CONFIG_WLAN_80211 is not set
728 757
@@ -840,10 +869,20 @@ CONFIG_SPI_SH_SCI=y
840# 869#
841# CONFIG_SPI_SPIDEV is not set 870# CONFIG_SPI_SPIDEV is not set
842# CONFIG_SPI_TLE62X0 is not set 871# CONFIG_SPI_TLE62X0 is not set
872
873#
874# PPS support
875#
876# CONFIG_PPS is not set
843# CONFIG_W1 is not set 877# CONFIG_W1 is not set
844# CONFIG_POWER_SUPPLY is not set 878# CONFIG_POWER_SUPPLY is not set
845CONFIG_HWMON=y 879CONFIG_HWMON=y
846# CONFIG_HWMON_VID is not set 880# CONFIG_HWMON_VID is not set
881# CONFIG_HWMON_DEBUG_CHIP is not set
882
883#
884# Native drivers
885#
847# CONFIG_SENSORS_ADCXX is not set 886# CONFIG_SENSORS_ADCXX is not set
848# CONFIG_SENSORS_I5K_AMB is not set 887# CONFIG_SENSORS_I5K_AMB is not set
849# CONFIG_SENSORS_F71805F is not set 888# CONFIG_SENSORS_F71805F is not set
@@ -862,9 +901,7 @@ CONFIG_HWMON=y
862# CONFIG_SENSORS_W83627HF is not set 901# CONFIG_SENSORS_W83627HF is not set
863# CONFIG_SENSORS_W83627EHF is not set 902# CONFIG_SENSORS_W83627EHF is not set
864# CONFIG_SENSORS_LIS3_SPI is not set 903# CONFIG_SENSORS_LIS3_SPI is not set
865# CONFIG_HWMON_DEBUG_CHIP is not set
866# CONFIG_THERMAL is not set 904# CONFIG_THERMAL is not set
867# CONFIG_THERMAL_HWMON is not set
868# CONFIG_WATCHDOG is not set 905# CONFIG_WATCHDOG is not set
869CONFIG_SSB_POSSIBLE=y 906CONFIG_SSB_POSSIBLE=y
870 907
@@ -880,12 +917,15 @@ CONFIG_SSB_POSSIBLE=y
880CONFIG_MFD_SM501=y 917CONFIG_MFD_SM501=y
881# CONFIG_HTC_PASIC3 is not set 918# CONFIG_HTC_PASIC3 is not set
882# CONFIG_MFD_TMIO is not set 919# CONFIG_MFD_TMIO is not set
920# CONFIG_MFD_MC13783 is not set
921# CONFIG_EZX_PCAP is not set
883# CONFIG_REGULATOR is not set 922# CONFIG_REGULATOR is not set
884# CONFIG_MEDIA_SUPPORT is not set 923# CONFIG_MEDIA_SUPPORT is not set
885 924
886# 925#
887# Graphics support 926# Graphics support
888# 927#
928CONFIG_VGA_ARB=y
889# CONFIG_DRM is not set 929# CONFIG_DRM is not set
890# CONFIG_VGASTATE is not set 930# CONFIG_VGASTATE is not set
891CONFIG_VIDEO_OUTPUT_CONTROL=m 931CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -969,6 +1009,7 @@ CONFIG_LOGO=y
969CONFIG_LOGO_SUPERH_CLUT224=y 1009CONFIG_LOGO_SUPERH_CLUT224=y
970CONFIG_SOUND=y 1010CONFIG_SOUND=y
971CONFIG_SOUND_OSS_CORE=y 1011CONFIG_SOUND_OSS_CORE=y
1012CONFIG_SOUND_OSS_CORE_PRECLAIM=y
972CONFIG_SND=m 1013CONFIG_SND=m
973CONFIG_SND_TIMER=m 1014CONFIG_SND_TIMER=m
974CONFIG_SND_PCM=m 1015CONFIG_SND_PCM=m
@@ -1071,7 +1112,6 @@ CONFIG_SOUND_PRIME=m
1071CONFIG_AC97_BUS=m 1112CONFIG_AC97_BUS=m
1072CONFIG_HID_SUPPORT=y 1113CONFIG_HID_SUPPORT=y
1073CONFIG_HID=y 1114CONFIG_HID=y
1074# CONFIG_HID_DEBUG is not set
1075# CONFIG_HIDRAW is not set 1115# CONFIG_HIDRAW is not set
1076 1116
1077# 1117#
@@ -1094,6 +1134,7 @@ CONFIG_HID_CYPRESS=y
1094CONFIG_HID_EZKEY=y 1134CONFIG_HID_EZKEY=y
1095# CONFIG_HID_KYE is not set 1135# CONFIG_HID_KYE is not set
1096CONFIG_HID_GYRATION=y 1136CONFIG_HID_GYRATION=y
1137# CONFIG_HID_TWINHAN is not set
1097# CONFIG_HID_KENSINGTON is not set 1138# CONFIG_HID_KENSINGTON is not set
1098CONFIG_HID_LOGITECH=y 1139CONFIG_HID_LOGITECH=y
1099# CONFIG_LOGITECH_FF is not set 1140# CONFIG_LOGITECH_FF is not set
@@ -1142,6 +1183,7 @@ CONFIG_USB_DEVICE_CLASS=y
1142# CONFIG_USB_OXU210HP_HCD is not set 1183# CONFIG_USB_OXU210HP_HCD is not set
1143# CONFIG_USB_ISP116X_HCD is not set 1184# CONFIG_USB_ISP116X_HCD is not set
1144# CONFIG_USB_ISP1760_HCD is not set 1185# CONFIG_USB_ISP1760_HCD is not set
1186# CONFIG_USB_ISP1362_HCD is not set
1145CONFIG_USB_OHCI_HCD=y 1187CONFIG_USB_OHCI_HCD=y
1146# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 1188# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1147# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 1189# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -1213,6 +1255,7 @@ CONFIG_USB_LIBUSUAL=y
1213# CONFIG_USB_LD is not set 1255# CONFIG_USB_LD is not set
1214# CONFIG_USB_TRANCEVIBRATOR is not set 1256# CONFIG_USB_TRANCEVIBRATOR is not set
1215# CONFIG_USB_IOWARRIOR is not set 1257# CONFIG_USB_IOWARRIOR is not set
1258# CONFIG_USB_TEST is not set
1216# CONFIG_USB_ISIGHTFW is not set 1259# CONFIG_USB_ISIGHTFW is not set
1217# CONFIG_USB_VST is not set 1260# CONFIG_USB_VST is not set
1218# CONFIG_USB_GADGET is not set 1261# CONFIG_USB_GADGET is not set
@@ -1252,6 +1295,7 @@ CONFIG_RTC_INTF_DEV=y
1252CONFIG_RTC_DRV_R9701=y 1295CONFIG_RTC_DRV_R9701=y
1253# CONFIG_RTC_DRV_RS5C348 is not set 1296# CONFIG_RTC_DRV_RS5C348 is not set
1254# CONFIG_RTC_DRV_DS3234 is not set 1297# CONFIG_RTC_DRV_DS3234 is not set
1298# CONFIG_RTC_DRV_PCF2123 is not set
1255 1299
1256# 1300#
1257# Platform RTC drivers 1301# Platform RTC drivers
@@ -1293,8 +1337,10 @@ CONFIG_EXT2_FS=y
1293# CONFIG_JFS_FS is not set 1337# CONFIG_JFS_FS is not set
1294# CONFIG_FS_POSIX_ACL is not set 1338# CONFIG_FS_POSIX_ACL is not set
1295# CONFIG_XFS_FS is not set 1339# CONFIG_XFS_FS is not set
1340# CONFIG_GFS2_FS is not set
1296# CONFIG_OCFS2_FS is not set 1341# CONFIG_OCFS2_FS is not set
1297# CONFIG_BTRFS_FS is not set 1342# CONFIG_BTRFS_FS is not set
1343# CONFIG_NILFS2_FS is not set
1298CONFIG_FILE_LOCKING=y 1344CONFIG_FILE_LOCKING=y
1299CONFIG_FSNOTIFY=y 1345CONFIG_FSNOTIFY=y
1300CONFIG_DNOTIFY=y 1346CONFIG_DNOTIFY=y
@@ -1357,7 +1403,6 @@ CONFIG_MINIX_FS=y
1357# CONFIG_ROMFS_FS is not set 1403# CONFIG_ROMFS_FS is not set
1358# CONFIG_SYSV_FS is not set 1404# CONFIG_SYSV_FS is not set
1359# CONFIG_UFS_FS is not set 1405# CONFIG_UFS_FS is not set
1360# CONFIG_NILFS2_FS is not set
1361CONFIG_NETWORK_FILESYSTEMS=y 1406CONFIG_NETWORK_FILESYSTEMS=y
1362# CONFIG_NFS_FS is not set 1407# CONFIG_NFS_FS is not set
1363# CONFIG_NFSD is not set 1408# CONFIG_NFSD is not set
@@ -1423,6 +1468,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1423CONFIG_ENABLE_MUST_CHECK=y 1468CONFIG_ENABLE_MUST_CHECK=y
1424CONFIG_FRAME_WARN=1024 1469CONFIG_FRAME_WARN=1024
1425# CONFIG_MAGIC_SYSRQ is not set 1470# CONFIG_MAGIC_SYSRQ is not set
1471# CONFIG_STRIP_ASM_SYMS is not set
1426# CONFIG_UNUSED_SYMBOLS is not set 1472# CONFIG_UNUSED_SYMBOLS is not set
1427CONFIG_DEBUG_FS=y 1473CONFIG_DEBUG_FS=y
1428# CONFIG_HEADERS_CHECK is not set 1474# CONFIG_HEADERS_CHECK is not set
@@ -1434,11 +1480,15 @@ CONFIG_STACKTRACE=y
1434# CONFIG_LATENCYTOP is not set 1480# CONFIG_LATENCYTOP is not set
1435CONFIG_NOP_TRACER=y 1481CONFIG_NOP_TRACER=y
1436CONFIG_HAVE_FUNCTION_TRACER=y 1482CONFIG_HAVE_FUNCTION_TRACER=y
1483CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1484CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1437CONFIG_HAVE_DYNAMIC_FTRACE=y 1485CONFIG_HAVE_DYNAMIC_FTRACE=y
1438CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1486CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1487CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1439CONFIG_RING_BUFFER=y 1488CONFIG_RING_BUFFER=y
1440CONFIG_EVENT_TRACING=y 1489CONFIG_EVENT_TRACING=y
1441CONFIG_CONTEXT_SWITCH_TRACER=y 1490CONFIG_CONTEXT_SWITCH_TRACER=y
1491CONFIG_RING_BUFFER_ALLOW_SWAP=y
1442CONFIG_TRACING=y 1492CONFIG_TRACING=y
1443CONFIG_TRACING_SUPPORT=y 1493CONFIG_TRACING_SUPPORT=y
1444# CONFIG_FTRACE is not set 1494# CONFIG_FTRACE is not set
@@ -1450,6 +1500,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1450CONFIG_EARLY_SCIF_CONSOLE=y 1500CONFIG_EARLY_SCIF_CONSOLE=y
1451CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000 1501CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000
1452CONFIG_EARLY_PRINTK=y 1502CONFIG_EARLY_PRINTK=y
1503# CONFIG_DWARF_UNWINDER is not set
1453 1504
1454# 1505#
1455# Security options 1506# Security options
@@ -1463,7 +1514,6 @@ CONFIG_CRYPTO=y
1463# 1514#
1464# Crypto core or helper 1515# Crypto core or helper
1465# 1516#
1466# CONFIG_CRYPTO_FIPS is not set
1467# CONFIG_CRYPTO_MANAGER is not set 1517# CONFIG_CRYPTO_MANAGER is not set
1468# CONFIG_CRYPTO_MANAGER2 is not set 1518# CONFIG_CRYPTO_MANAGER2 is not set
1469# CONFIG_CRYPTO_GF128MUL is not set 1519# CONFIG_CRYPTO_GF128MUL is not set
@@ -1495,11 +1545,13 @@ CONFIG_CRYPTO=y
1495# 1545#
1496# CONFIG_CRYPTO_HMAC is not set 1546# CONFIG_CRYPTO_HMAC is not set
1497# CONFIG_CRYPTO_XCBC is not set 1547# CONFIG_CRYPTO_XCBC is not set
1548# CONFIG_CRYPTO_VMAC is not set
1498 1549
1499# 1550#
1500# Digest 1551# Digest
1501# 1552#
1502# CONFIG_CRYPTO_CRC32C is not set 1553# CONFIG_CRYPTO_CRC32C is not set
1554# CONFIG_CRYPTO_GHASH is not set
1503# CONFIG_CRYPTO_MD4 is not set 1555# CONFIG_CRYPTO_MD4 is not set
1504# CONFIG_CRYPTO_MD5 is not set 1556# CONFIG_CRYPTO_MD5 is not set
1505# CONFIG_CRYPTO_MICHAEL_MIC is not set 1557# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1562,5 +1614,6 @@ CONFIG_CRC32=y
1562CONFIG_HAS_IOMEM=y 1614CONFIG_HAS_IOMEM=y
1563CONFIG_HAS_IOPORT=y 1615CONFIG_HAS_IOPORT=y
1564CONFIG_HAS_DMA=y 1616CONFIG_HAS_DMA=y
1617CONFIG_HAVE_LMB=y
1565CONFIG_NLATTR=y 1618CONFIG_NLATTR=y
1566CONFIG_GENERIC_ATOMIC64=y 1619CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/rts7751r2dplus_defconfig b/arch/sh/configs/rts7751r2dplus_defconfig
index bc10469d31f0..a156cd1e0617 100644
--- a/arch/sh/configs/rts7751r2dplus_defconfig
+++ b/arch/sh/configs/rts7751r2dplus_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:43:19 2009 4# Thu Sep 24 18:39:48 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,8 +29,10 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
28# CONFIG_ARCH_HAS_ILOG2_U64 is not set 29# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29CONFIG_ARCH_NO_VIRT_TO_BUS=y 30CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_IO_TRAPPED=y 33CONFIG_IO_TRAPPED=y
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y
33 36
34# 37#
35# General setup 38# General setup
@@ -39,6 +42,12 @@ CONFIG_BROKEN_ON_SMP=y
39CONFIG_INIT_ENV_ARG_LIMIT=32 42CONFIG_INIT_ENV_ARG_LIMIT=32
40CONFIG_LOCALVERSION="" 43CONFIG_LOCALVERSION=""
41CONFIG_LOCALVERSION_AUTO=y 44CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y
48CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set
42CONFIG_SWAP=y 51CONFIG_SWAP=y
43CONFIG_SYSVIPC=y 52CONFIG_SYSVIPC=y
44CONFIG_SYSVIPC_SYSCTL=y 53CONFIG_SYSVIPC_SYSCTL=y
@@ -50,11 +59,12 @@ CONFIG_SYSVIPC_SYSCTL=y
50# 59#
51# RCU Subsystem 60# RCU Subsystem
52# 61#
53CONFIG_CLASSIC_RCU=y 62CONFIG_TREE_RCU=y
54# CONFIG_TREE_RCU is not set 63# CONFIG_TREE_PREEMPT_RCU is not set
55# CONFIG_PREEMPT_RCU is not set 64# CONFIG_RCU_TRACE is not set
65CONFIG_RCU_FANOUT=32
66# CONFIG_RCU_FANOUT_EXACT is not set
56# CONFIG_TREE_RCU_TRACE is not set 67# CONFIG_TREE_RCU_TRACE is not set
57# CONFIG_PREEMPT_RCU_TRACE is not set
58# CONFIG_IKCONFIG is not set 68# CONFIG_IKCONFIG is not set
59CONFIG_LOG_BUF_SHIFT=14 69CONFIG_LOG_BUF_SHIFT=14
60# CONFIG_GROUP_SCHED is not set 70# CONFIG_GROUP_SCHED is not set
@@ -84,20 +94,22 @@ CONFIG_TIMERFD=y
84CONFIG_EVENTFD=y 94CONFIG_EVENTFD=y
85CONFIG_SHMEM=y 95CONFIG_SHMEM=y
86CONFIG_AIO=y 96CONFIG_AIO=y
97CONFIG_HAVE_PERF_EVENTS=y
87 98
88# 99#
89# Performance Counters 100# Kernel Performance Events And Counters
90# 101#
102CONFIG_PERF_EVENTS=y
103CONFIG_EVENT_PROFILE=y
104# CONFIG_PERF_COUNTERS is not set
91CONFIG_VM_EVENT_COUNTERS=y 105CONFIG_VM_EVENT_COUNTERS=y
92CONFIG_PCI_QUIRKS=y 106CONFIG_PCI_QUIRKS=y
93# CONFIG_STRIP_ASM_SYMS is not set
94CONFIG_COMPAT_BRK=y 107CONFIG_COMPAT_BRK=y
95CONFIG_SLAB=y 108CONFIG_SLAB=y
96# CONFIG_SLUB is not set 109# CONFIG_SLUB is not set
97# CONFIG_SLOB is not set 110# CONFIG_SLOB is not set
98CONFIG_PROFILING=y 111CONFIG_PROFILING=y
99CONFIG_TRACEPOINTS=y 112CONFIG_TRACEPOINTS=y
100CONFIG_MARKERS=y
101CONFIG_OPROFILE=y 113CONFIG_OPROFILE=y
102CONFIG_HAVE_OPROFILE=y 114CONFIG_HAVE_OPROFILE=y
103# CONFIG_KPROBES is not set 115# CONFIG_KPROBES is not set
@@ -107,6 +119,11 @@ CONFIG_HAVE_KRETPROBES=y
107CONFIG_HAVE_ARCH_TRACEHOOK=y 119CONFIG_HAVE_ARCH_TRACEHOOK=y
108CONFIG_HAVE_CLK=y 120CONFIG_HAVE_CLK=y
109CONFIG_HAVE_DMA_API_DEBUG=y 121CONFIG_HAVE_DMA_API_DEBUG=y
122
123#
124# GCOV-based kernel profiling
125#
126# CONFIG_GCOV_KERNEL is not set
110# CONFIG_SLOW_WORK is not set 127# CONFIG_SLOW_WORK is not set
111CONFIG_HAVE_GENERIC_DMA_COHERENT=y 128CONFIG_HAVE_GENERIC_DMA_COHERENT=y
112CONFIG_SLABINFO=y 129CONFIG_SLABINFO=y
@@ -118,7 +135,7 @@ CONFIG_MODULES=y
118# CONFIG_MODVERSIONS is not set 135# CONFIG_MODVERSIONS is not set
119# CONFIG_MODULE_SRCVERSION_ALL is not set 136# CONFIG_MODULE_SRCVERSION_ALL is not set
120CONFIG_BLOCK=y 137CONFIG_BLOCK=y
121# CONFIG_LBD is not set 138CONFIG_LBDAF=y
122# CONFIG_BLK_DEV_BSG is not set 139# CONFIG_BLK_DEV_BSG is not set
123# CONFIG_BLK_DEV_INTEGRITY is not set 140# CONFIG_BLK_DEV_INTEGRITY is not set
124 141
@@ -165,6 +182,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
165# CONFIG_CPU_SUBTYPE_SH4_202 is not set 182# CONFIG_CPU_SUBTYPE_SH4_202 is not set
166# CONFIG_CPU_SUBTYPE_SH7723 is not set 183# CONFIG_CPU_SUBTYPE_SH7723 is not set
167# CONFIG_CPU_SUBTYPE_SH7724 is not set 184# CONFIG_CPU_SUBTYPE_SH7724 is not set
185# CONFIG_CPU_SUBTYPE_SH7757 is not set
168# CONFIG_CPU_SUBTYPE_SH7763 is not set 186# CONFIG_CPU_SUBTYPE_SH7763 is not set
169# CONFIG_CPU_SUBTYPE_SH7770 is not set 187# CONFIG_CPU_SUBTYPE_SH7770 is not set
170# CONFIG_CPU_SUBTYPE_SH7780 is not set 188# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -210,6 +228,7 @@ CONFIG_ZONE_DMA_FLAG=0
210CONFIG_NR_QUICK=2 228CONFIG_NR_QUICK=2
211CONFIG_HAVE_MLOCK=y 229CONFIG_HAVE_MLOCK=y
212CONFIG_HAVE_MLOCKED_PAGE_BIT=y 230CONFIG_HAVE_MLOCKED_PAGE_BIT=y
231# CONFIG_KSM is not set
213CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 232CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
214 233
215# 234#
@@ -303,7 +322,8 @@ CONFIG_ZERO_PAGE_OFFSET=0x00010000
303CONFIG_BOOT_LINK_OFFSET=0x00800000 322CONFIG_BOOT_LINK_OFFSET=0x00800000
304CONFIG_ENTRY_OFFSET=0x00001000 323CONFIG_ENTRY_OFFSET=0x00001000
305# CONFIG_UBC_WAKEUP is not set 324# CONFIG_UBC_WAKEUP is not set
306CONFIG_CMDLINE_BOOL=y 325CONFIG_CMDLINE_OVERWRITE=y
326# CONFIG_CMDLINE_EXTEND is not set
307CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=serial" 327CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=serial"
308 328
309# 329#
@@ -378,6 +398,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
378# CONFIG_NETFILTER is not set 398# CONFIG_NETFILTER is not set
379# CONFIG_IP_DCCP is not set 399# CONFIG_IP_DCCP is not set
380# CONFIG_IP_SCTP is not set 400# CONFIG_IP_SCTP is not set
401# CONFIG_RDS is not set
381# CONFIG_TIPC is not set 402# CONFIG_TIPC is not set
382# CONFIG_ATM is not set 403# CONFIG_ATM is not set
383# CONFIG_BRIDGE is not set 404# CONFIG_BRIDGE is not set
@@ -408,6 +429,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
408# CONFIG_AF_RXRPC is not set 429# CONFIG_AF_RXRPC is not set
409CONFIG_WIRELESS=y 430CONFIG_WIRELESS=y
410# CONFIG_CFG80211 is not set 431# CONFIG_CFG80211 is not set
432CONFIG_CFG80211_DEFAULT_PS_VALUE=0
411# CONFIG_WIRELESS_OLD_REGULATORY is not set 433# CONFIG_WIRELESS_OLD_REGULATORY is not set
412CONFIG_WIRELESS_EXT=y 434CONFIG_WIRELESS_EXT=y
413CONFIG_WIRELESS_EXT_SYSFS=y 435CONFIG_WIRELESS_EXT_SYSFS=y
@@ -416,7 +438,6 @@ CONFIG_WIRELESS_EXT_SYSFS=y
416# 438#
417# CFG80211 needs to be enabled for MAC80211 439# CFG80211 needs to be enabled for MAC80211
418# 440#
419CONFIG_MAC80211_DEFAULT_PS_VALUE=0
420# CONFIG_WIMAX is not set 441# CONFIG_WIMAX is not set
421# CONFIG_RFKILL is not set 442# CONFIG_RFKILL is not set
422# CONFIG_NET_9P is not set 443# CONFIG_NET_9P is not set
@@ -429,6 +450,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
429# Generic Driver Options 450# Generic Driver Options
430# 451#
431CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 452CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
453# CONFIG_DEVTMPFS is not set
432CONFIG_STANDALONE=y 454CONFIG_STANDALONE=y
433CONFIG_PREVENT_FIRMWARE_BUILD=y 455CONFIG_PREVENT_FIRMWARE_BUILD=y
434CONFIG_FW_LOADER=m 456CONFIG_FW_LOADER=m
@@ -438,9 +460,9 @@ CONFIG_EXTRA_FIRMWARE=""
438# CONFIG_CONNECTOR is not set 460# CONFIG_CONNECTOR is not set
439CONFIG_MTD=y 461CONFIG_MTD=y
440# CONFIG_MTD_DEBUG is not set 462# CONFIG_MTD_DEBUG is not set
463# CONFIG_MTD_TESTS is not set
441CONFIG_MTD_CONCAT=y 464CONFIG_MTD_CONCAT=y
442CONFIG_MTD_PARTITIONS=y 465CONFIG_MTD_PARTITIONS=y
443# CONFIG_MTD_TESTS is not set
444# CONFIG_MTD_REDBOOT_PARTS is not set 466# CONFIG_MTD_REDBOOT_PARTS is not set
445CONFIG_MTD_CMDLINE_PARTS=y 467CONFIG_MTD_CMDLINE_PARTS=y
446# CONFIG_MTD_AR7_PARTS is not set 468# CONFIG_MTD_AR7_PARTS is not set
@@ -499,6 +521,7 @@ CONFIG_MTD_PHYSMAP=y
499# CONFIG_MTD_PMC551 is not set 521# CONFIG_MTD_PMC551 is not set
500# CONFIG_MTD_DATAFLASH is not set 522# CONFIG_MTD_DATAFLASH is not set
501# CONFIG_MTD_M25P80 is not set 523# CONFIG_MTD_M25P80 is not set
524# CONFIG_MTD_SST25L is not set
502# CONFIG_MTD_SLRAM is not set 525# CONFIG_MTD_SLRAM is not set
503# CONFIG_MTD_PHRAM is not set 526# CONFIG_MTD_PHRAM is not set
504# CONFIG_MTD_MTDRAM is not set 527# CONFIG_MTD_MTDRAM is not set
@@ -627,11 +650,13 @@ CONFIG_SCSI_LOWLEVEL=y
627# CONFIG_SCSI_DC390T is not set 650# CONFIG_SCSI_DC390T is not set
628# CONFIG_SCSI_NSP32 is not set 651# CONFIG_SCSI_NSP32 is not set
629# CONFIG_SCSI_DEBUG is not set 652# CONFIG_SCSI_DEBUG is not set
653# CONFIG_SCSI_PMCRAID is not set
630# CONFIG_SCSI_SRP is not set 654# CONFIG_SCSI_SRP is not set
631# CONFIG_SCSI_DH is not set 655# CONFIG_SCSI_DH is not set
632# CONFIG_SCSI_OSD_INITIATOR is not set 656# CONFIG_SCSI_OSD_INITIATOR is not set
633CONFIG_ATA=y 657CONFIG_ATA=y
634# CONFIG_ATA_NONSTANDARD is not set 658# CONFIG_ATA_NONSTANDARD is not set
659CONFIG_ATA_VERBOSE_ERROR=y
635CONFIG_SATA_PMP=y 660CONFIG_SATA_PMP=y
636# CONFIG_SATA_AHCI is not set 661# CONFIG_SATA_AHCI is not set
637# CONFIG_SATA_SIL24 is not set 662# CONFIG_SATA_SIL24 is not set
@@ -653,6 +678,7 @@ CONFIG_ATA_SFF=y
653# CONFIG_PATA_ALI is not set 678# CONFIG_PATA_ALI is not set
654# CONFIG_PATA_AMD is not set 679# CONFIG_PATA_AMD is not set
655# CONFIG_PATA_ARTOP is not set 680# CONFIG_PATA_ARTOP is not set
681# CONFIG_PATA_ATP867X is not set
656# CONFIG_PATA_ATIIXP is not set 682# CONFIG_PATA_ATIIXP is not set
657# CONFIG_PATA_CMD640_PCI is not set 683# CONFIG_PATA_CMD640_PCI is not set
658# CONFIG_PATA_CMD64X is not set 684# CONFIG_PATA_CMD64X is not set
@@ -680,6 +706,7 @@ CONFIG_ATA_SFF=y
680# CONFIG_PATA_OPTIDMA is not set 706# CONFIG_PATA_OPTIDMA is not set
681# CONFIG_PATA_PDC_OLD is not set 707# CONFIG_PATA_PDC_OLD is not set
682# CONFIG_PATA_RADISYS is not set 708# CONFIG_PATA_RADISYS is not set
709# CONFIG_PATA_RDC is not set
683# CONFIG_PATA_RZ1000 is not set 710# CONFIG_PATA_RZ1000 is not set
684# CONFIG_PATA_SC1200 is not set 711# CONFIG_PATA_SC1200 is not set
685# CONFIG_PATA_SERVERWORKS is not set 712# CONFIG_PATA_SERVERWORKS is not set
@@ -698,7 +725,11 @@ CONFIG_PATA_PLATFORM=y
698# 725#
699 726
700# 727#
701# Enable only one of the two stacks, unless you know what you are doing 728# You can enable one or both FireWire driver stacks.
729#
730
731#
732# See the help texts for more information.
702# 733#
703# CONFIG_FIREWIRE is not set 734# CONFIG_FIREWIRE is not set
704# CONFIG_IEEE1394 is not set 735# CONFIG_IEEE1394 is not set
@@ -758,6 +789,7 @@ CONFIG_8139TOO=y
758# CONFIG_SUNDANCE is not set 789# CONFIG_SUNDANCE is not set
759# CONFIG_TLAN is not set 790# CONFIG_TLAN is not set
760# CONFIG_KS8842 is not set 791# CONFIG_KS8842 is not set
792# CONFIG_KS8851 is not set
761# CONFIG_VIA_RHINE is not set 793# CONFIG_VIA_RHINE is not set
762# CONFIG_SC92031 is not set 794# CONFIG_SC92031 is not set
763# CONFIG_ATL2 is not set 795# CONFIG_ATL2 is not set
@@ -779,6 +811,7 @@ CONFIG_NETDEV_1000=y
779# CONFIG_VIA_VELOCITY is not set 811# CONFIG_VIA_VELOCITY is not set
780# CONFIG_TIGON3 is not set 812# CONFIG_TIGON3 is not set
781# CONFIG_BNX2 is not set 813# CONFIG_BNX2 is not set
814# CONFIG_CNIC is not set
782# CONFIG_QLA3XXX is not set 815# CONFIG_QLA3XXX is not set
783# CONFIG_ATL1 is not set 816# CONFIG_ATL1 is not set
784# CONFIG_ATL1E is not set 817# CONFIG_ATL1E is not set
@@ -804,10 +837,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
804# CONFIG_SFC is not set 837# CONFIG_SFC is not set
805# CONFIG_BE2NET is not set 838# CONFIG_BE2NET is not set
806# CONFIG_TR is not set 839# CONFIG_TR is not set
807 840CONFIG_WLAN=y
808#
809# Wireless LAN
810#
811# CONFIG_WLAN_PRE80211 is not set 841# CONFIG_WLAN_PRE80211 is not set
812# CONFIG_WLAN_80211 is not set 842# CONFIG_WLAN_80211 is not set
813 843
@@ -925,10 +955,20 @@ CONFIG_SPI_SH_SCI=y
925# 955#
926# CONFIG_SPI_SPIDEV is not set 956# CONFIG_SPI_SPIDEV is not set
927# CONFIG_SPI_TLE62X0 is not set 957# CONFIG_SPI_TLE62X0 is not set
958
959#
960# PPS support
961#
962# CONFIG_PPS is not set
928# CONFIG_W1 is not set 963# CONFIG_W1 is not set
929# CONFIG_POWER_SUPPLY is not set 964# CONFIG_POWER_SUPPLY is not set
930CONFIG_HWMON=y 965CONFIG_HWMON=y
931# CONFIG_HWMON_VID is not set 966# CONFIG_HWMON_VID is not set
967# CONFIG_HWMON_DEBUG_CHIP is not set
968
969#
970# Native drivers
971#
932# CONFIG_SENSORS_ADCXX is not set 972# CONFIG_SENSORS_ADCXX is not set
933# CONFIG_SENSORS_I5K_AMB is not set 973# CONFIG_SENSORS_I5K_AMB is not set
934# CONFIG_SENSORS_F71805F is not set 974# CONFIG_SENSORS_F71805F is not set
@@ -947,9 +987,7 @@ CONFIG_HWMON=y
947# CONFIG_SENSORS_W83627HF is not set 987# CONFIG_SENSORS_W83627HF is not set
948# CONFIG_SENSORS_W83627EHF is not set 988# CONFIG_SENSORS_W83627EHF is not set
949# CONFIG_SENSORS_LIS3_SPI is not set 989# CONFIG_SENSORS_LIS3_SPI is not set
950# CONFIG_HWMON_DEBUG_CHIP is not set
951# CONFIG_THERMAL is not set 990# CONFIG_THERMAL is not set
952# CONFIG_THERMAL_HWMON is not set
953# CONFIG_WATCHDOG is not set 991# CONFIG_WATCHDOG is not set
954CONFIG_SSB_POSSIBLE=y 992CONFIG_SSB_POSSIBLE=y
955 993
@@ -965,12 +1003,15 @@ CONFIG_SSB_POSSIBLE=y
965CONFIG_MFD_SM501=y 1003CONFIG_MFD_SM501=y
966# CONFIG_HTC_PASIC3 is not set 1004# CONFIG_HTC_PASIC3 is not set
967# CONFIG_MFD_TMIO is not set 1005# CONFIG_MFD_TMIO is not set
1006# CONFIG_MFD_MC13783 is not set
1007# CONFIG_EZX_PCAP is not set
968# CONFIG_REGULATOR is not set 1008# CONFIG_REGULATOR is not set
969# CONFIG_MEDIA_SUPPORT is not set 1009# CONFIG_MEDIA_SUPPORT is not set
970 1010
971# 1011#
972# Graphics support 1012# Graphics support
973# 1013#
1014CONFIG_VGA_ARB=y
974# CONFIG_DRM is not set 1015# CONFIG_DRM is not set
975# CONFIG_VGASTATE is not set 1016# CONFIG_VGASTATE is not set
976CONFIG_VIDEO_OUTPUT_CONTROL=m 1017CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1054,6 +1095,7 @@ CONFIG_LOGO=y
1054CONFIG_LOGO_SUPERH_CLUT224=y 1095CONFIG_LOGO_SUPERH_CLUT224=y
1055CONFIG_SOUND=y 1096CONFIG_SOUND=y
1056CONFIG_SOUND_OSS_CORE=y 1097CONFIG_SOUND_OSS_CORE=y
1098CONFIG_SOUND_OSS_CORE_PRECLAIM=y
1057CONFIG_SND=m 1099CONFIG_SND=m
1058CONFIG_SND_TIMER=m 1100CONFIG_SND_TIMER=m
1059CONFIG_SND_PCM=m 1101CONFIG_SND_PCM=m
@@ -1156,7 +1198,6 @@ CONFIG_SOUND_PRIME=m
1156CONFIG_AC97_BUS=m 1198CONFIG_AC97_BUS=m
1157CONFIG_HID_SUPPORT=y 1199CONFIG_HID_SUPPORT=y
1158CONFIG_HID=y 1200CONFIG_HID=y
1159# CONFIG_HID_DEBUG is not set
1160# CONFIG_HIDRAW is not set 1201# CONFIG_HIDRAW is not set
1161 1202
1162# 1203#
@@ -1179,6 +1220,7 @@ CONFIG_HID_CYPRESS=y
1179CONFIG_HID_EZKEY=y 1220CONFIG_HID_EZKEY=y
1180# CONFIG_HID_KYE is not set 1221# CONFIG_HID_KYE is not set
1181CONFIG_HID_GYRATION=y 1222CONFIG_HID_GYRATION=y
1223# CONFIG_HID_TWINHAN is not set
1182# CONFIG_HID_KENSINGTON is not set 1224# CONFIG_HID_KENSINGTON is not set
1183CONFIG_HID_LOGITECH=y 1225CONFIG_HID_LOGITECH=y
1184# CONFIG_LOGITECH_FF is not set 1226# CONFIG_LOGITECH_FF is not set
@@ -1227,6 +1269,7 @@ CONFIG_USB_DEVICE_CLASS=y
1227# CONFIG_USB_OXU210HP_HCD is not set 1269# CONFIG_USB_OXU210HP_HCD is not set
1228# CONFIG_USB_ISP116X_HCD is not set 1270# CONFIG_USB_ISP116X_HCD is not set
1229# CONFIG_USB_ISP1760_HCD is not set 1271# CONFIG_USB_ISP1760_HCD is not set
1272# CONFIG_USB_ISP1362_HCD is not set
1230CONFIG_USB_OHCI_HCD=y 1273CONFIG_USB_OHCI_HCD=y
1231# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 1274# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1232# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 1275# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -1298,6 +1341,7 @@ CONFIG_USB_LIBUSUAL=y
1298# CONFIG_USB_LD is not set 1341# CONFIG_USB_LD is not set
1299# CONFIG_USB_TRANCEVIBRATOR is not set 1342# CONFIG_USB_TRANCEVIBRATOR is not set
1300# CONFIG_USB_IOWARRIOR is not set 1343# CONFIG_USB_IOWARRIOR is not set
1344# CONFIG_USB_TEST is not set
1301# CONFIG_USB_ISIGHTFW is not set 1345# CONFIG_USB_ISIGHTFW is not set
1302# CONFIG_USB_VST is not set 1346# CONFIG_USB_VST is not set
1303# CONFIG_USB_GADGET is not set 1347# CONFIG_USB_GADGET is not set
@@ -1337,6 +1381,7 @@ CONFIG_RTC_INTF_DEV=y
1337CONFIG_RTC_DRV_R9701=y 1381CONFIG_RTC_DRV_R9701=y
1338# CONFIG_RTC_DRV_RS5C348 is not set 1382# CONFIG_RTC_DRV_RS5C348 is not set
1339# CONFIG_RTC_DRV_DS3234 is not set 1383# CONFIG_RTC_DRV_DS3234 is not set
1384# CONFIG_RTC_DRV_PCF2123 is not set
1340 1385
1341# 1386#
1342# Platform RTC drivers 1387# Platform RTC drivers
@@ -1378,8 +1423,10 @@ CONFIG_EXT2_FS=y
1378# CONFIG_JFS_FS is not set 1423# CONFIG_JFS_FS is not set
1379# CONFIG_FS_POSIX_ACL is not set 1424# CONFIG_FS_POSIX_ACL is not set
1380# CONFIG_XFS_FS is not set 1425# CONFIG_XFS_FS is not set
1426# CONFIG_GFS2_FS is not set
1381# CONFIG_OCFS2_FS is not set 1427# CONFIG_OCFS2_FS is not set
1382# CONFIG_BTRFS_FS is not set 1428# CONFIG_BTRFS_FS is not set
1429# CONFIG_NILFS2_FS is not set
1383CONFIG_FILE_LOCKING=y 1430CONFIG_FILE_LOCKING=y
1384CONFIG_FSNOTIFY=y 1431CONFIG_FSNOTIFY=y
1385CONFIG_DNOTIFY=y 1432CONFIG_DNOTIFY=y
@@ -1443,7 +1490,6 @@ CONFIG_MINIX_FS=y
1443# CONFIG_ROMFS_FS is not set 1490# CONFIG_ROMFS_FS is not set
1444# CONFIG_SYSV_FS is not set 1491# CONFIG_SYSV_FS is not set
1445# CONFIG_UFS_FS is not set 1492# CONFIG_UFS_FS is not set
1446# CONFIG_NILFS2_FS is not set
1447CONFIG_NETWORK_FILESYSTEMS=y 1493CONFIG_NETWORK_FILESYSTEMS=y
1448# CONFIG_NFS_FS is not set 1494# CONFIG_NFS_FS is not set
1449# CONFIG_NFSD is not set 1495# CONFIG_NFSD is not set
@@ -1509,6 +1555,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1509CONFIG_ENABLE_MUST_CHECK=y 1555CONFIG_ENABLE_MUST_CHECK=y
1510CONFIG_FRAME_WARN=1024 1556CONFIG_FRAME_WARN=1024
1511# CONFIG_MAGIC_SYSRQ is not set 1557# CONFIG_MAGIC_SYSRQ is not set
1558# CONFIG_STRIP_ASM_SYMS is not set
1512# CONFIG_UNUSED_SYMBOLS is not set 1559# CONFIG_UNUSED_SYMBOLS is not set
1513CONFIG_DEBUG_FS=y 1560CONFIG_DEBUG_FS=y
1514# CONFIG_HEADERS_CHECK is not set 1561# CONFIG_HEADERS_CHECK is not set
@@ -1520,11 +1567,15 @@ CONFIG_STACKTRACE=y
1520# CONFIG_LATENCYTOP is not set 1567# CONFIG_LATENCYTOP is not set
1521CONFIG_NOP_TRACER=y 1568CONFIG_NOP_TRACER=y
1522CONFIG_HAVE_FUNCTION_TRACER=y 1569CONFIG_HAVE_FUNCTION_TRACER=y
1570CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1571CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1523CONFIG_HAVE_DYNAMIC_FTRACE=y 1572CONFIG_HAVE_DYNAMIC_FTRACE=y
1524CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1573CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1574CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1525CONFIG_RING_BUFFER=y 1575CONFIG_RING_BUFFER=y
1526CONFIG_EVENT_TRACING=y 1576CONFIG_EVENT_TRACING=y
1527CONFIG_CONTEXT_SWITCH_TRACER=y 1577CONFIG_CONTEXT_SWITCH_TRACER=y
1578CONFIG_RING_BUFFER_ALLOW_SWAP=y
1528CONFIG_TRACING=y 1579CONFIG_TRACING=y
1529CONFIG_TRACING_SUPPORT=y 1580CONFIG_TRACING_SUPPORT=y
1530# CONFIG_FTRACE is not set 1581# CONFIG_FTRACE is not set
@@ -1536,6 +1587,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1536CONFIG_EARLY_SCIF_CONSOLE=y 1587CONFIG_EARLY_SCIF_CONSOLE=y
1537CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000 1588CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000
1538CONFIG_EARLY_PRINTK=y 1589CONFIG_EARLY_PRINTK=y
1590# CONFIG_DWARF_UNWINDER is not set
1539 1591
1540# 1592#
1541# Security options 1593# Security options
@@ -1549,7 +1601,6 @@ CONFIG_CRYPTO=y
1549# 1601#
1550# Crypto core or helper 1602# Crypto core or helper
1551# 1603#
1552# CONFIG_CRYPTO_FIPS is not set
1553# CONFIG_CRYPTO_MANAGER is not set 1604# CONFIG_CRYPTO_MANAGER is not set
1554# CONFIG_CRYPTO_MANAGER2 is not set 1605# CONFIG_CRYPTO_MANAGER2 is not set
1555# CONFIG_CRYPTO_GF128MUL is not set 1606# CONFIG_CRYPTO_GF128MUL is not set
@@ -1581,11 +1632,13 @@ CONFIG_CRYPTO=y
1581# 1632#
1582# CONFIG_CRYPTO_HMAC is not set 1633# CONFIG_CRYPTO_HMAC is not set
1583# CONFIG_CRYPTO_XCBC is not set 1634# CONFIG_CRYPTO_XCBC is not set
1635# CONFIG_CRYPTO_VMAC is not set
1584 1636
1585# 1637#
1586# Digest 1638# Digest
1587# 1639#
1588# CONFIG_CRYPTO_CRC32C is not set 1640# CONFIG_CRYPTO_CRC32C is not set
1641# CONFIG_CRYPTO_GHASH is not set
1589# CONFIG_CRYPTO_MD4 is not set 1642# CONFIG_CRYPTO_MD4 is not set
1590# CONFIG_CRYPTO_MD5 is not set 1643# CONFIG_CRYPTO_MD5 is not set
1591# CONFIG_CRYPTO_MICHAEL_MIC is not set 1644# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1648,5 +1701,6 @@ CONFIG_CRC32=y
1648CONFIG_HAS_IOMEM=y 1701CONFIG_HAS_IOMEM=y
1649CONFIG_HAS_IOPORT=y 1702CONFIG_HAS_IOPORT=y
1650CONFIG_HAS_DMA=y 1703CONFIG_HAS_DMA=y
1704CONFIG_HAVE_LMB=y
1651CONFIG_NLATTR=y 1705CONFIG_NLATTR=y
1652CONFIG_GENERIC_ATOMIC64=y 1706CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/sdk7780_defconfig b/arch/sh/configs/sdk7780_defconfig
index 753fb276e9f5..055536b5c5cd 100644
--- a/arch/sh/configs/sdk7780_defconfig
+++ b/arch/sh/configs/sdk7780_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:43:54 2009 4# Thu Sep 24 18:40:25 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,7 +29,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
28# CONFIG_ARCH_HAS_ILOG2_U64 is not set 29# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29CONFIG_ARCH_NO_VIRT_TO_BUS=y 30CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y
32 35
33# 36#
34# General setup 37# General setup
@@ -39,6 +42,12 @@ CONFIG_LOCK_KERNEL=y
39CONFIG_INIT_ENV_ARG_LIMIT=32 42CONFIG_INIT_ENV_ARG_LIMIT=32
40CONFIG_LOCALVERSION="_SDK7780" 43CONFIG_LOCALVERSION="_SDK7780"
41CONFIG_LOCALVERSION_AUTO=y 44CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y
48CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set
42CONFIG_SWAP=y 51CONFIG_SWAP=y
43CONFIG_SYSVIPC=y 52CONFIG_SYSVIPC=y
44CONFIG_SYSVIPC_SYSCTL=y 53CONFIG_SYSVIPC_SYSCTL=y
@@ -52,11 +61,12 @@ CONFIG_BSD_PROCESS_ACCT=y
52# 61#
53# RCU Subsystem 62# RCU Subsystem
54# 63#
55CONFIG_CLASSIC_RCU=y 64CONFIG_TREE_RCU=y
56# CONFIG_TREE_RCU is not set 65# CONFIG_TREE_PREEMPT_RCU is not set
57# CONFIG_PREEMPT_RCU is not set 66# CONFIG_RCU_TRACE is not set
67CONFIG_RCU_FANOUT=32
68# CONFIG_RCU_FANOUT_EXACT is not set
58# CONFIG_TREE_RCU_TRACE is not set 69# CONFIG_TREE_RCU_TRACE is not set
59# CONFIG_PREEMPT_RCU_TRACE is not set
60CONFIG_IKCONFIG=y 70CONFIG_IKCONFIG=y
61CONFIG_IKCONFIG_PROC=y 71CONFIG_IKCONFIG_PROC=y
62CONFIG_LOG_BUF_SHIFT=18 72CONFIG_LOG_BUF_SHIFT=18
@@ -88,20 +98,21 @@ CONFIG_TIMERFD=y
88CONFIG_EVENTFD=y 98CONFIG_EVENTFD=y
89CONFIG_SHMEM=y 99CONFIG_SHMEM=y
90CONFIG_AIO=y 100CONFIG_AIO=y
101CONFIG_HAVE_PERF_EVENTS=y
91 102
92# 103#
93# Performance Counters 104# Kernel Performance Events And Counters
94# 105#
106# CONFIG_PERF_EVENTS is not set
107# CONFIG_PERF_COUNTERS is not set
95CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
96CONFIG_PCI_QUIRKS=y 109CONFIG_PCI_QUIRKS=y
97CONFIG_SLUB_DEBUG=y 110CONFIG_SLUB_DEBUG=y
98# CONFIG_STRIP_ASM_SYMS is not set
99CONFIG_COMPAT_BRK=y 111CONFIG_COMPAT_BRK=y
100# CONFIG_SLAB is not set 112# CONFIG_SLAB is not set
101CONFIG_SLUB=y 113CONFIG_SLUB=y
102# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
103# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
104# CONFIG_MARKERS is not set
105CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
106# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
107CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -110,6 +121,10 @@ CONFIG_HAVE_KRETPROBES=y
110CONFIG_HAVE_ARCH_TRACEHOOK=y 121CONFIG_HAVE_ARCH_TRACEHOOK=y
111CONFIG_HAVE_CLK=y 122CONFIG_HAVE_CLK=y
112CONFIG_HAVE_DMA_API_DEBUG=y 123CONFIG_HAVE_DMA_API_DEBUG=y
124
125#
126# GCOV-based kernel profiling
127#
113# CONFIG_SLOW_WORK is not set 128# CONFIG_SLOW_WORK is not set
114CONFIG_HAVE_GENERIC_DMA_COHERENT=y 129CONFIG_HAVE_GENERIC_DMA_COHERENT=y
115CONFIG_SLABINFO=y 130CONFIG_SLABINFO=y
@@ -122,7 +137,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
122# CONFIG_MODVERSIONS is not set 137# CONFIG_MODVERSIONS is not set
123# CONFIG_MODULE_SRCVERSION_ALL is not set 138# CONFIG_MODULE_SRCVERSION_ALL is not set
124CONFIG_BLOCK=y 139CONFIG_BLOCK=y
125CONFIG_LBD=y 140CONFIG_LBDAF=y
126# CONFIG_BLK_DEV_BSG is not set 141# CONFIG_BLK_DEV_BSG is not set
127# CONFIG_BLK_DEV_INTEGRITY is not set 142# CONFIG_BLK_DEV_INTEGRITY is not set
128 143
@@ -170,6 +185,7 @@ CONFIG_CPU_SH4A=y
170# CONFIG_CPU_SUBTYPE_SH4_202 is not set 185# CONFIG_CPU_SUBTYPE_SH4_202 is not set
171# CONFIG_CPU_SUBTYPE_SH7723 is not set 186# CONFIG_CPU_SUBTYPE_SH7723 is not set
172# CONFIG_CPU_SUBTYPE_SH7724 is not set 187# CONFIG_CPU_SUBTYPE_SH7724 is not set
188# CONFIG_CPU_SUBTYPE_SH7757 is not set
173# CONFIG_CPU_SUBTYPE_SH7763 is not set 189# CONFIG_CPU_SUBTYPE_SH7763 is not set
174# CONFIG_CPU_SUBTYPE_SH7770 is not set 190# CONFIG_CPU_SUBTYPE_SH7770 is not set
175CONFIG_CPU_SUBTYPE_SH7780=y 191CONFIG_CPU_SUBTYPE_SH7780=y
@@ -225,6 +241,7 @@ CONFIG_ZONE_DMA_FLAG=0
225CONFIG_NR_QUICK=2 241CONFIG_NR_QUICK=2
226CONFIG_HAVE_MLOCK=y 242CONFIG_HAVE_MLOCK=y
227CONFIG_HAVE_MLOCKED_PAGE_BIT=y 243CONFIG_HAVE_MLOCKED_PAGE_BIT=y
244# CONFIG_KSM is not set
228CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 245CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
229 246
230# 247#
@@ -314,7 +331,8 @@ CONFIG_GUSA=y
314CONFIG_ZERO_PAGE_OFFSET=0x00001000 331CONFIG_ZERO_PAGE_OFFSET=0x00001000
315CONFIG_BOOT_LINK_OFFSET=0x01800000 332CONFIG_BOOT_LINK_OFFSET=0x01800000
316CONFIG_ENTRY_OFFSET=0x00001000 333CONFIG_ENTRY_OFFSET=0x00001000
317CONFIG_CMDLINE_BOOL=y 334CONFIG_CMDLINE_OVERWRITE=y
335# CONFIG_CMDLINE_EXTEND is not set
318CONFIG_CMDLINE="mem=128M console=tty0 console=ttySC0,115200 ip=bootp root=/dev/nfs nfsroot=192.168.0.1:/home/rootfs" 336CONFIG_CMDLINE="mem=128M console=tty0 console=ttySC0,115200 ip=bootp root=/dev/nfs nfsroot=192.168.0.1:/home/rootfs"
319 337
320# 338#
@@ -435,6 +453,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
435# CONFIG_NETFILTER is not set 453# CONFIG_NETFILTER is not set
436# CONFIG_IP_DCCP is not set 454# CONFIG_IP_DCCP is not set
437# CONFIG_IP_SCTP is not set 455# CONFIG_IP_SCTP is not set
456# CONFIG_RDS is not set
438# CONFIG_TIPC is not set 457# CONFIG_TIPC is not set
439# CONFIG_ATM is not set 458# CONFIG_ATM is not set
440# CONFIG_BRIDGE is not set 459# CONFIG_BRIDGE is not set
@@ -496,6 +515,7 @@ CONFIG_NET_SCH_FIFO=y
496# CONFIG_AF_RXRPC is not set 515# CONFIG_AF_RXRPC is not set
497CONFIG_WIRELESS=y 516CONFIG_WIRELESS=y
498# CONFIG_CFG80211 is not set 517# CONFIG_CFG80211 is not set
518CONFIG_CFG80211_DEFAULT_PS_VALUE=0
499# CONFIG_WIRELESS_OLD_REGULATORY is not set 519# CONFIG_WIRELESS_OLD_REGULATORY is not set
500# CONFIG_WIRELESS_EXT is not set 520# CONFIG_WIRELESS_EXT is not set
501# CONFIG_LIB80211 is not set 521# CONFIG_LIB80211 is not set
@@ -503,7 +523,6 @@ CONFIG_WIRELESS=y
503# 523#
504# CFG80211 needs to be enabled for MAC80211 524# CFG80211 needs to be enabled for MAC80211
505# 525#
506CONFIG_MAC80211_DEFAULT_PS_VALUE=0
507# CONFIG_WIMAX is not set 526# CONFIG_WIMAX is not set
508# CONFIG_RFKILL is not set 527# CONFIG_RFKILL is not set
509# CONFIG_NET_9P is not set 528# CONFIG_NET_9P is not set
@@ -516,6 +535,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
516# Generic Driver Options 535# Generic Driver Options
517# 536#
518CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 537CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
538# CONFIG_DEVTMPFS is not set
519CONFIG_STANDALONE=y 539CONFIG_STANDALONE=y
520CONFIG_PREVENT_FIRMWARE_BUILD=y 540CONFIG_PREVENT_FIRMWARE_BUILD=y
521CONFIG_FW_LOADER=y 541CONFIG_FW_LOADER=y
@@ -677,12 +697,14 @@ CONFIG_SCSI_LOWLEVEL=y
677# CONFIG_SCSI_DC390T is not set 697# CONFIG_SCSI_DC390T is not set
678# CONFIG_SCSI_NSP32 is not set 698# CONFIG_SCSI_NSP32 is not set
679# CONFIG_SCSI_DEBUG is not set 699# CONFIG_SCSI_DEBUG is not set
700# CONFIG_SCSI_PMCRAID is not set
680# CONFIG_SCSI_SRP is not set 701# CONFIG_SCSI_SRP is not set
681# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 702# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
682# CONFIG_SCSI_DH is not set 703# CONFIG_SCSI_DH is not set
683# CONFIG_SCSI_OSD_INITIATOR is not set 704# CONFIG_SCSI_OSD_INITIATOR is not set
684CONFIG_ATA=y 705CONFIG_ATA=y
685# CONFIG_ATA_NONSTANDARD is not set 706# CONFIG_ATA_NONSTANDARD is not set
707CONFIG_ATA_VERBOSE_ERROR=y
686CONFIG_SATA_PMP=y 708CONFIG_SATA_PMP=y
687# CONFIG_SATA_AHCI is not set 709# CONFIG_SATA_AHCI is not set
688# CONFIG_SATA_SIL24 is not set 710# CONFIG_SATA_SIL24 is not set
@@ -704,6 +726,7 @@ CONFIG_ATA_SFF=y
704# CONFIG_PATA_ALI is not set 726# CONFIG_PATA_ALI is not set
705# CONFIG_PATA_AMD is not set 727# CONFIG_PATA_AMD is not set
706# CONFIG_PATA_ARTOP is not set 728# CONFIG_PATA_ARTOP is not set
729# CONFIG_PATA_ATP867X is not set
707# CONFIG_PATA_ATIIXP is not set 730# CONFIG_PATA_ATIIXP is not set
708# CONFIG_PATA_CMD640_PCI is not set 731# CONFIG_PATA_CMD640_PCI is not set
709# CONFIG_PATA_CMD64X is not set 732# CONFIG_PATA_CMD64X is not set
@@ -732,6 +755,7 @@ CONFIG_ATA_SFF=y
732# CONFIG_PATA_PCMCIA is not set 755# CONFIG_PATA_PCMCIA is not set
733# CONFIG_PATA_PDC_OLD is not set 756# CONFIG_PATA_PDC_OLD is not set
734# CONFIG_PATA_RADISYS is not set 757# CONFIG_PATA_RADISYS is not set
758# CONFIG_PATA_RDC is not set
735# CONFIG_PATA_RZ1000 is not set 759# CONFIG_PATA_RZ1000 is not set
736# CONFIG_PATA_SC1200 is not set 760# CONFIG_PATA_SC1200 is not set
737# CONFIG_PATA_SERVERWORKS is not set 761# CONFIG_PATA_SERVERWORKS is not set
@@ -760,7 +784,11 @@ CONFIG_BLK_DEV_DM=y
760# 784#
761 785
762# 786#
763# Enable only one of the two stacks, unless you know what you are doing 787# You can enable one or both FireWire driver stacks.
788#
789
790#
791# See the help texts for more information.
764# 792#
765# CONFIG_FIREWIRE is not set 793# CONFIG_FIREWIRE is not set
766# CONFIG_IEEE1394 is not set 794# CONFIG_IEEE1394 is not set
@@ -804,10 +832,7 @@ CONFIG_SMC91X=y
804# CONFIG_NETDEV_1000 is not set 832# CONFIG_NETDEV_1000 is not set
805# CONFIG_NETDEV_10000 is not set 833# CONFIG_NETDEV_10000 is not set
806# CONFIG_TR is not set 834# CONFIG_TR is not set
807 835CONFIG_WLAN=y
808#
809# Wireless LAN
810#
811# CONFIG_WLAN_PRE80211 is not set 836# CONFIG_WLAN_PRE80211 is not set
812# CONFIG_WLAN_80211 is not set 837# CONFIG_WLAN_80211 is not set
813 838
@@ -862,12 +887,13 @@ CONFIG_INPUT_EVDEV=y
862# 887#
863CONFIG_INPUT_KEYBOARD=y 888CONFIG_INPUT_KEYBOARD=y
864CONFIG_KEYBOARD_ATKBD=y 889CONFIG_KEYBOARD_ATKBD=y
865# CONFIG_KEYBOARD_SUNKBD is not set
866# CONFIG_KEYBOARD_LKKBD is not set 890# CONFIG_KEYBOARD_LKKBD is not set
867# CONFIG_KEYBOARD_XTKBD is not set
868# CONFIG_KEYBOARD_NEWTON is not set 891# CONFIG_KEYBOARD_NEWTON is not set
892# CONFIG_KEYBOARD_OPENCORES is not set
869# CONFIG_KEYBOARD_STOWAWAY is not set 893# CONFIG_KEYBOARD_STOWAWAY is not set
894# CONFIG_KEYBOARD_SUNKBD is not set
870# CONFIG_KEYBOARD_SH_KEYSC is not set 895# CONFIG_KEYBOARD_SH_KEYSC is not set
896# CONFIG_KEYBOARD_XTKBD is not set
871CONFIG_INPUT_MOUSE=y 897CONFIG_INPUT_MOUSE=y
872CONFIG_MOUSE_PS2=y 898CONFIG_MOUSE_PS2=y
873CONFIG_MOUSE_PS2_ALPS=y 899CONFIG_MOUSE_PS2_ALPS=y
@@ -875,6 +901,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
875CONFIG_MOUSE_PS2_SYNAPTICS=y 901CONFIG_MOUSE_PS2_SYNAPTICS=y
876CONFIG_MOUSE_PS2_TRACKPOINT=y 902CONFIG_MOUSE_PS2_TRACKPOINT=y
877# CONFIG_MOUSE_PS2_ELANTECH is not set 903# CONFIG_MOUSE_PS2_ELANTECH is not set
904# CONFIG_MOUSE_PS2_SENTELIC is not set
878# CONFIG_MOUSE_PS2_TOUCHKIT is not set 905# CONFIG_MOUSE_PS2_TOUCHKIT is not set
879# CONFIG_MOUSE_SERIAL is not set 906# CONFIG_MOUSE_SERIAL is not set
880# CONFIG_MOUSE_APPLETOUCH is not set 907# CONFIG_MOUSE_APPLETOUCH is not set
@@ -947,6 +974,11 @@ CONFIG_HW_RANDOM=y
947CONFIG_DEVPORT=y 974CONFIG_DEVPORT=y
948# CONFIG_I2C is not set 975# CONFIG_I2C is not set
949# CONFIG_SPI is not set 976# CONFIG_SPI is not set
977
978#
979# PPS support
980#
981# CONFIG_PPS is not set
950# CONFIG_W1 is not set 982# CONFIG_W1 is not set
951CONFIG_POWER_SUPPLY=y 983CONFIG_POWER_SUPPLY=y
952# CONFIG_POWER_SUPPLY_DEBUG is not set 984# CONFIG_POWER_SUPPLY_DEBUG is not set
@@ -954,7 +986,6 @@ CONFIG_POWER_SUPPLY=y
954# CONFIG_BATTERY_DS2760 is not set 986# CONFIG_BATTERY_DS2760 is not set
955# CONFIG_HWMON is not set 987# CONFIG_HWMON is not set
956# CONFIG_THERMAL is not set 988# CONFIG_THERMAL is not set
957# CONFIG_THERMAL_HWMON is not set
958# CONFIG_WATCHDOG is not set 989# CONFIG_WATCHDOG is not set
959CONFIG_SSB_POSSIBLE=y 990CONFIG_SSB_POSSIBLE=y
960 991
@@ -986,6 +1017,7 @@ CONFIG_SSB_DRIVER_PCICORE=y
986# 1017#
987# Graphics support 1018# Graphics support
988# 1019#
1020CONFIG_VGA_ARB=y
989# CONFIG_DRM is not set 1021# CONFIG_DRM is not set
990# CONFIG_VGASTATE is not set 1022# CONFIG_VGASTATE is not set
991# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1023# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1072,11 +1104,11 @@ CONFIG_LOGO_SUPERH_VGA16=y
1072CONFIG_LOGO_SUPERH_CLUT224=y 1104CONFIG_LOGO_SUPERH_CLUT224=y
1073CONFIG_SOUND=y 1105CONFIG_SOUND=y
1074CONFIG_SOUND_OSS_CORE=y 1106CONFIG_SOUND_OSS_CORE=y
1107CONFIG_SOUND_OSS_CORE_PRECLAIM=y
1075# CONFIG_SND is not set 1108# CONFIG_SND is not set
1076CONFIG_SOUND_PRIME=y 1109CONFIG_SOUND_PRIME=y
1077CONFIG_HID_SUPPORT=y 1110CONFIG_HID_SUPPORT=y
1078CONFIG_HID=y 1111CONFIG_HID=y
1079# CONFIG_HID_DEBUG is not set
1080# CONFIG_HIDRAW is not set 1112# CONFIG_HIDRAW is not set
1081 1113
1082# 1114#
@@ -1099,6 +1131,7 @@ CONFIG_HID_CYPRESS=y
1099CONFIG_HID_EZKEY=y 1131CONFIG_HID_EZKEY=y
1100# CONFIG_HID_KYE is not set 1132# CONFIG_HID_KYE is not set
1101CONFIG_HID_GYRATION=y 1133CONFIG_HID_GYRATION=y
1134# CONFIG_HID_TWINHAN is not set
1102# CONFIG_HID_KENSINGTON is not set 1135# CONFIG_HID_KENSINGTON is not set
1103CONFIG_HID_LOGITECH=y 1136CONFIG_HID_LOGITECH=y
1104# CONFIG_LOGITECH_FF is not set 1137# CONFIG_LOGITECH_FF is not set
@@ -1149,6 +1182,7 @@ CONFIG_USB_EHCI_HCD=y
1149# CONFIG_USB_OXU210HP_HCD is not set 1182# CONFIG_USB_OXU210HP_HCD is not set
1150# CONFIG_USB_ISP116X_HCD is not set 1183# CONFIG_USB_ISP116X_HCD is not set
1151# CONFIG_USB_ISP1760_HCD is not set 1184# CONFIG_USB_ISP1760_HCD is not set
1185# CONFIG_USB_ISP1362_HCD is not set
1152# CONFIG_USB_OHCI_HCD is not set 1186# CONFIG_USB_OHCI_HCD is not set
1153# CONFIG_USB_UHCI_HCD is not set 1187# CONFIG_USB_UHCI_HCD is not set
1154# CONFIG_USB_SL811_HCD is not set 1188# CONFIG_USB_SL811_HCD is not set
@@ -1278,6 +1312,7 @@ CONFIG_FS_POSIX_ACL=y
1278# CONFIG_GFS2_FS is not set 1312# CONFIG_GFS2_FS is not set
1279# CONFIG_OCFS2_FS is not set 1313# CONFIG_OCFS2_FS is not set
1280# CONFIG_BTRFS_FS is not set 1314# CONFIG_BTRFS_FS is not set
1315# CONFIG_NILFS2_FS is not set
1281CONFIG_FILE_LOCKING=y 1316CONFIG_FILE_LOCKING=y
1282CONFIG_FSNOTIFY=y 1317CONFIG_FSNOTIFY=y
1283CONFIG_DNOTIFY=y 1318CONFIG_DNOTIFY=y
@@ -1345,7 +1380,6 @@ CONFIG_MINIX_FS=y
1345# CONFIG_ROMFS_FS is not set 1380# CONFIG_ROMFS_FS is not set
1346# CONFIG_SYSV_FS is not set 1381# CONFIG_SYSV_FS is not set
1347# CONFIG_UFS_FS is not set 1382# CONFIG_UFS_FS is not set
1348# CONFIG_NILFS2_FS is not set
1349CONFIG_NETWORK_FILESYSTEMS=y 1383CONFIG_NETWORK_FILESYSTEMS=y
1350CONFIG_NFS_FS=y 1384CONFIG_NFS_FS=y
1351CONFIG_NFS_V3=y 1385CONFIG_NFS_V3=y
@@ -1425,6 +1459,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1425# CONFIG_ENABLE_MUST_CHECK is not set 1459# CONFIG_ENABLE_MUST_CHECK is not set
1426CONFIG_FRAME_WARN=1024 1460CONFIG_FRAME_WARN=1024
1427CONFIG_MAGIC_SYSRQ=y 1461CONFIG_MAGIC_SYSRQ=y
1462# CONFIG_STRIP_ASM_SYMS is not set
1428CONFIG_UNUSED_SYMBOLS=y 1463CONFIG_UNUSED_SYMBOLS=y
1429# CONFIG_DEBUG_FS is not set 1464# CONFIG_DEBUG_FS is not set
1430# CONFIG_HEADERS_CHECK is not set 1465# CONFIG_HEADERS_CHECK is not set
@@ -1461,18 +1496,23 @@ CONFIG_DEBUG_INFO=y
1461# CONFIG_DEBUG_LIST is not set 1496# CONFIG_DEBUG_LIST is not set
1462# CONFIG_DEBUG_SG is not set 1497# CONFIG_DEBUG_SG is not set
1463# CONFIG_DEBUG_NOTIFIERS is not set 1498# CONFIG_DEBUG_NOTIFIERS is not set
1499# CONFIG_DEBUG_CREDENTIALS is not set
1464# CONFIG_FRAME_POINTER is not set 1500# CONFIG_FRAME_POINTER is not set
1465# CONFIG_RCU_TORTURE_TEST is not set 1501# CONFIG_RCU_TORTURE_TEST is not set
1466# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1502# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1467# CONFIG_BACKTRACE_SELF_TEST is not set 1503# CONFIG_BACKTRACE_SELF_TEST is not set
1468# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1504# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1505# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1469# CONFIG_FAULT_INJECTION is not set 1506# CONFIG_FAULT_INJECTION is not set
1470# CONFIG_LATENCYTOP is not set 1507# CONFIG_LATENCYTOP is not set
1471CONFIG_SYSCTL_SYSCALL_CHECK=y 1508CONFIG_SYSCTL_SYSCALL_CHECK=y
1472# CONFIG_PAGE_POISONING is not set 1509# CONFIG_PAGE_POISONING is not set
1473CONFIG_HAVE_FUNCTION_TRACER=y 1510CONFIG_HAVE_FUNCTION_TRACER=y
1511CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1512CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1474CONFIG_HAVE_DYNAMIC_FTRACE=y 1513CONFIG_HAVE_DYNAMIC_FTRACE=y
1475CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1514CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1515CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1476CONFIG_TRACING_SUPPORT=y 1516CONFIG_TRACING_SUPPORT=y
1477CONFIG_FTRACE=y 1517CONFIG_FTRACE=y
1478# CONFIG_FUNCTION_TRACER is not set 1518# CONFIG_FUNCTION_TRACER is not set
@@ -1480,6 +1520,7 @@ CONFIG_FTRACE=y
1480# CONFIG_PREEMPT_TRACER is not set 1520# CONFIG_PREEMPT_TRACER is not set
1481# CONFIG_SCHED_TRACER is not set 1521# CONFIG_SCHED_TRACER is not set
1482# CONFIG_ENABLE_DEFAULT_TRACERS is not set 1522# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1523# CONFIG_FTRACE_SYSCALLS is not set
1483# CONFIG_BOOT_TRACER is not set 1524# CONFIG_BOOT_TRACER is not set
1484CONFIG_BRANCH_PROFILE_NONE=y 1525CONFIG_BRANCH_PROFILE_NONE=y
1485# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1526# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -1495,11 +1536,11 @@ CONFIG_HAVE_ARCH_KGDB=y
1495CONFIG_SH_STANDARD_BIOS=y 1536CONFIG_SH_STANDARD_BIOS=y
1496# CONFIG_EARLY_SCIF_CONSOLE is not set 1537# CONFIG_EARLY_SCIF_CONSOLE is not set
1497# CONFIG_EARLY_PRINTK is not set 1538# CONFIG_EARLY_PRINTK is not set
1498# CONFIG_DEBUG_BOOTMEM is not set 1539# CONFIG_STACK_DEBUG is not set
1499CONFIG_DEBUG_STACKOVERFLOW=y
1500# CONFIG_DEBUG_STACK_USAGE is not set 1540# CONFIG_DEBUG_STACK_USAGE is not set
1501# CONFIG_4KSTACKS is not set 1541# CONFIG_4KSTACKS is not set
1502CONFIG_DUMP_CODE=y 1542CONFIG_DUMP_CODE=y
1543# CONFIG_DWARF_UNWINDER is not set
1503# CONFIG_SH_NO_BSS_INIT is not set 1544# CONFIG_SH_NO_BSS_INIT is not set
1504 1545
1505# 1546#
@@ -1514,7 +1555,6 @@ CONFIG_CRYPTO=y
1514# 1555#
1515# Crypto core or helper 1556# Crypto core or helper
1516# 1557#
1517# CONFIG_CRYPTO_FIPS is not set
1518CONFIG_CRYPTO_ALGAPI=y 1558CONFIG_CRYPTO_ALGAPI=y
1519CONFIG_CRYPTO_ALGAPI2=y 1559CONFIG_CRYPTO_ALGAPI2=y
1520CONFIG_CRYPTO_HASH=y 1560CONFIG_CRYPTO_HASH=y
@@ -1550,11 +1590,13 @@ CONFIG_CRYPTO_HASH2=y
1550# 1590#
1551# CONFIG_CRYPTO_HMAC is not set 1591# CONFIG_CRYPTO_HMAC is not set
1552# CONFIG_CRYPTO_XCBC is not set 1592# CONFIG_CRYPTO_XCBC is not set
1593# CONFIG_CRYPTO_VMAC is not set
1553 1594
1554# 1595#
1555# Digest 1596# Digest
1556# 1597#
1557# CONFIG_CRYPTO_CRC32C is not set 1598# CONFIG_CRYPTO_CRC32C is not set
1599# CONFIG_CRYPTO_GHASH is not set
1558# CONFIG_CRYPTO_MD4 is not set 1600# CONFIG_CRYPTO_MD4 is not set
1559CONFIG_CRYPTO_MD5=y 1601CONFIG_CRYPTO_MD5=y
1560# CONFIG_CRYPTO_MICHAEL_MIC is not set 1602# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1617,5 +1659,6 @@ CONFIG_CRC32=y
1617CONFIG_HAS_IOMEM=y 1659CONFIG_HAS_IOMEM=y
1618CONFIG_HAS_IOPORT=y 1660CONFIG_HAS_IOPORT=y
1619CONFIG_HAS_DMA=y 1661CONFIG_HAS_DMA=y
1662CONFIG_HAVE_LMB=y
1620CONFIG_NLATTR=y 1663CONFIG_NLATTR=y
1621CONFIG_GENERIC_ATOMIC64=y 1664CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig
index 8dd2f130e491..1cd1777aa436 100644
--- a/arch/sh/configs/se7206_defconfig
+++ b/arch/sh/configs/se7206_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:46:15 2009 4# Thu Sep 24 18:45:28 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,7 +29,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
28# CONFIG_ARCH_HAS_ILOG2_U64 is not set 29# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29CONFIG_ARCH_NO_VIRT_TO_BUS=y 30CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y
32 35
33# 36#
34# General setup 37# General setup
@@ -39,6 +42,12 @@ CONFIG_LOCK_KERNEL=y
39CONFIG_INIT_ENV_ARG_LIMIT=32 42CONFIG_INIT_ENV_ARG_LIMIT=32
40CONFIG_LOCALVERSION="" 43CONFIG_LOCALVERSION=""
41CONFIG_LOCALVERSION_AUTO=y 44CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y
48CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set
42CONFIG_SYSVIPC=y 51CONFIG_SYSVIPC=y
43CONFIG_SYSVIPC_SYSCTL=y 52CONFIG_SYSVIPC_SYSCTL=y
44CONFIG_POSIX_MQUEUE=y 53CONFIG_POSIX_MQUEUE=y
@@ -53,12 +62,12 @@ CONFIG_AUDIT_TREE=y
53# 62#
54# RCU Subsystem 63# RCU Subsystem
55# 64#
56# CONFIG_CLASSIC_RCU is not set 65CONFIG_TREE_RCU=y
57# CONFIG_TREE_RCU is not set 66# CONFIG_TREE_PREEMPT_RCU is not set
58CONFIG_PREEMPT_RCU=y
59CONFIG_RCU_TRACE=y 67CONFIG_RCU_TRACE=y
60# CONFIG_TREE_RCU_TRACE is not set 68CONFIG_RCU_FANOUT=32
61CONFIG_PREEMPT_RCU_TRACE=y 69# CONFIG_RCU_FANOUT_EXACT is not set
70CONFIG_TREE_RCU_TRACE=y
62# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
63CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
64# CONFIG_GROUP_SCHED is not set 73# CONFIG_GROUP_SCHED is not set
@@ -105,19 +114,21 @@ CONFIG_SIGNALFD=y
105CONFIG_TIMERFD=y 114CONFIG_TIMERFD=y
106CONFIG_EVENTFD=y 115CONFIG_EVENTFD=y
107CONFIG_AIO=y 116CONFIG_AIO=y
117CONFIG_HAVE_PERF_EVENTS=y
108 118
109# 119#
110# Performance Counters 120# Kernel Performance Events And Counters
111# 121#
122CONFIG_PERF_EVENTS=y
123CONFIG_EVENT_PROFILE=y
124# CONFIG_PERF_COUNTERS is not set
112CONFIG_VM_EVENT_COUNTERS=y 125CONFIG_VM_EVENT_COUNTERS=y
113# CONFIG_STRIP_ASM_SYMS is not set
114# CONFIG_COMPAT_BRK is not set 126# CONFIG_COMPAT_BRK is not set
115# CONFIG_SLAB is not set 127# CONFIG_SLAB is not set
116# CONFIG_SLUB is not set 128# CONFIG_SLUB is not set
117CONFIG_SLOB=y 129CONFIG_SLOB=y
118CONFIG_PROFILING=y 130CONFIG_PROFILING=y
119CONFIG_TRACEPOINTS=y 131CONFIG_TRACEPOINTS=y
120CONFIG_MARKERS=y
121CONFIG_OPROFILE=y 132CONFIG_OPROFILE=y
122CONFIG_HAVE_OPROFILE=y 133CONFIG_HAVE_OPROFILE=y
123# CONFIG_KPROBES is not set 134# CONFIG_KPROBES is not set
@@ -126,6 +137,11 @@ CONFIG_HAVE_KRETPROBES=y
126CONFIG_HAVE_ARCH_TRACEHOOK=y 137CONFIG_HAVE_ARCH_TRACEHOOK=y
127CONFIG_HAVE_CLK=y 138CONFIG_HAVE_CLK=y
128CONFIG_HAVE_DMA_API_DEBUG=y 139CONFIG_HAVE_DMA_API_DEBUG=y
140
141#
142# GCOV-based kernel profiling
143#
144# CONFIG_GCOV_KERNEL is not set
129# CONFIG_SLOW_WORK is not set 145# CONFIG_SLOW_WORK is not set
130CONFIG_HAVE_GENERIC_DMA_COHERENT=y 146CONFIG_HAVE_GENERIC_DMA_COHERENT=y
131CONFIG_RT_MUTEXES=y 147CONFIG_RT_MUTEXES=y
@@ -137,7 +153,7 @@ CONFIG_MODULE_UNLOAD=y
137# CONFIG_MODVERSIONS is not set 153# CONFIG_MODVERSIONS is not set
138# CONFIG_MODULE_SRCVERSION_ALL is not set 154# CONFIG_MODULE_SRCVERSION_ALL is not set
139CONFIG_BLOCK=y 155CONFIG_BLOCK=y
140# CONFIG_LBD is not set 156CONFIG_LBDAF=y
141# CONFIG_BLK_DEV_BSG is not set 157# CONFIG_BLK_DEV_BSG is not set
142# CONFIG_BLK_DEV_INTEGRITY is not set 158# CONFIG_BLK_DEV_INTEGRITY is not set
143 159
@@ -185,6 +201,7 @@ CONFIG_CPU_SUBTYPE_SH7206=y
185# CONFIG_CPU_SUBTYPE_SH4_202 is not set 201# CONFIG_CPU_SUBTYPE_SH4_202 is not set
186# CONFIG_CPU_SUBTYPE_SH7723 is not set 202# CONFIG_CPU_SUBTYPE_SH7723 is not set
187# CONFIG_CPU_SUBTYPE_SH7724 is not set 203# CONFIG_CPU_SUBTYPE_SH7724 is not set
204# CONFIG_CPU_SUBTYPE_SH7757 is not set
188# CONFIG_CPU_SUBTYPE_SH7763 is not set 205# CONFIG_CPU_SUBTYPE_SH7763 is not set
189# CONFIG_CPU_SUBTYPE_SH7770 is not set 206# CONFIG_CPU_SUBTYPE_SH7770 is not set
190# CONFIG_CPU_SUBTYPE_SH7780 is not set 207# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -319,7 +336,8 @@ CONFIG_GUSA=y
319CONFIG_ZERO_PAGE_OFFSET=0x00001000 336CONFIG_ZERO_PAGE_OFFSET=0x00001000
320CONFIG_BOOT_LINK_OFFSET=0x00800000 337CONFIG_BOOT_LINK_OFFSET=0x00800000
321CONFIG_ENTRY_OFFSET=0x00001000 338CONFIG_ENTRY_OFFSET=0x00001000
322CONFIG_CMDLINE_BOOL=y 339CONFIG_CMDLINE_OVERWRITE=y
340# CONFIG_CMDLINE_EXTEND is not set
323CONFIG_CMDLINE="console=ttySC3,115200 ignore_loglevel earlyprintk=serial" 341CONFIG_CMDLINE="console=ttySC3,115200 ignore_loglevel earlyprintk=serial"
324 342
325# 343#
@@ -389,6 +407,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
389# CONFIG_NETFILTER is not set 407# CONFIG_NETFILTER is not set
390# CONFIG_IP_DCCP is not set 408# CONFIG_IP_DCCP is not set
391# CONFIG_IP_SCTP is not set 409# CONFIG_IP_SCTP is not set
410# CONFIG_RDS is not set
392# CONFIG_TIPC is not set 411# CONFIG_TIPC is not set
393# CONFIG_ATM is not set 412# CONFIG_ATM is not set
394# CONFIG_BRIDGE is not set 413# CONFIG_BRIDGE is not set
@@ -419,6 +438,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
419# CONFIG_AF_RXRPC is not set 438# CONFIG_AF_RXRPC is not set
420CONFIG_WIRELESS=y 439CONFIG_WIRELESS=y
421# CONFIG_CFG80211 is not set 440# CONFIG_CFG80211 is not set
441CONFIG_CFG80211_DEFAULT_PS_VALUE=0
422# CONFIG_WIRELESS_OLD_REGULATORY is not set 442# CONFIG_WIRELESS_OLD_REGULATORY is not set
423# CONFIG_WIRELESS_EXT is not set 443# CONFIG_WIRELESS_EXT is not set
424# CONFIG_LIB80211 is not set 444# CONFIG_LIB80211 is not set
@@ -426,7 +446,6 @@ CONFIG_WIRELESS=y
426# 446#
427# CFG80211 needs to be enabled for MAC80211 447# CFG80211 needs to be enabled for MAC80211
428# 448#
429CONFIG_MAC80211_DEFAULT_PS_VALUE=0
430# CONFIG_WIMAX is not set 449# CONFIG_WIMAX is not set
431# CONFIG_RFKILL is not set 450# CONFIG_RFKILL is not set
432# CONFIG_NET_9P is not set 451# CONFIG_NET_9P is not set
@@ -448,9 +467,9 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
448# CONFIG_CONNECTOR is not set 467# CONFIG_CONNECTOR is not set
449CONFIG_MTD=y 468CONFIG_MTD=y
450# CONFIG_MTD_DEBUG is not set 469# CONFIG_MTD_DEBUG is not set
470# CONFIG_MTD_TESTS is not set
451CONFIG_MTD_CONCAT=y 471CONFIG_MTD_CONCAT=y
452CONFIG_MTD_PARTITIONS=y 472CONFIG_MTD_PARTITIONS=y
453# CONFIG_MTD_TESTS is not set
454# CONFIG_MTD_REDBOOT_PARTS is not set 473# CONFIG_MTD_REDBOOT_PARTS is not set
455# CONFIG_MTD_CMDLINE_PARTS is not set 474# CONFIG_MTD_CMDLINE_PARTS is not set
456# CONFIG_MTD_AR7_PARTS is not set 475# CONFIG_MTD_AR7_PARTS is not set
@@ -588,10 +607,7 @@ CONFIG_SMC91X=y
588# CONFIG_KS8842 is not set 607# CONFIG_KS8842 is not set
589# CONFIG_NETDEV_1000 is not set 608# CONFIG_NETDEV_1000 is not set
590# CONFIG_NETDEV_10000 is not set 609# CONFIG_NETDEV_10000 is not set
591 610CONFIG_WLAN=y
592#
593# Wireless LAN
594#
595# CONFIG_WLAN_PRE80211 is not set 611# CONFIG_WLAN_PRE80211 is not set
596# CONFIG_WLAN_80211 is not set 612# CONFIG_WLAN_80211 is not set
597 613
@@ -647,11 +663,15 @@ CONFIG_SERIAL_CORE_CONSOLE=y
647# CONFIG_TCG_TPM is not set 663# CONFIG_TCG_TPM is not set
648# CONFIG_I2C is not set 664# CONFIG_I2C is not set
649# CONFIG_SPI is not set 665# CONFIG_SPI is not set
666
667#
668# PPS support
669#
670# CONFIG_PPS is not set
650# CONFIG_W1 is not set 671# CONFIG_W1 is not set
651# CONFIG_POWER_SUPPLY is not set 672# CONFIG_POWER_SUPPLY is not set
652# CONFIG_HWMON is not set 673# CONFIG_HWMON is not set
653# CONFIG_THERMAL is not set 674# CONFIG_THERMAL is not set
654# CONFIG_THERMAL_HWMON is not set
655# CONFIG_WATCHDOG is not set 675# CONFIG_WATCHDOG is not set
656CONFIG_SSB_POSSIBLE=y 676CONFIG_SSB_POSSIBLE=y
657 677
@@ -746,8 +766,10 @@ CONFIG_EXT2_FS=y
746# CONFIG_JFS_FS is not set 766# CONFIG_JFS_FS is not set
747# CONFIG_FS_POSIX_ACL is not set 767# CONFIG_FS_POSIX_ACL is not set
748# CONFIG_XFS_FS is not set 768# CONFIG_XFS_FS is not set
769# CONFIG_GFS2_FS is not set
749# CONFIG_OCFS2_FS is not set 770# CONFIG_OCFS2_FS is not set
750# CONFIG_BTRFS_FS is not set 771# CONFIG_BTRFS_FS is not set
772# CONFIG_NILFS2_FS is not set
751CONFIG_FILE_LOCKING=y 773CONFIG_FILE_LOCKING=y
752CONFIG_FSNOTIFY=y 774CONFIG_FSNOTIFY=y
753# CONFIG_DNOTIFY is not set 775# CONFIG_DNOTIFY is not set
@@ -782,8 +804,6 @@ CONFIG_INOTIFY_USER=y
782CONFIG_PROC_FS=y 804CONFIG_PROC_FS=y
783CONFIG_PROC_SYSCTL=y 805CONFIG_PROC_SYSCTL=y
784CONFIG_SYSFS=y 806CONFIG_SYSFS=y
785CONFIG_TMPFS=y
786# CONFIG_TMPFS_POSIX_ACL is not set
787# CONFIG_HUGETLB_PAGE is not set 807# CONFIG_HUGETLB_PAGE is not set
788CONFIG_CONFIGFS_FS=y 808CONFIG_CONFIGFS_FS=y
789CONFIG_MISC_FILESYSTEMS=y 809CONFIG_MISC_FILESYSTEMS=y
@@ -809,7 +829,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
809CONFIG_ROMFS_ON_BLOCK=y 829CONFIG_ROMFS_ON_BLOCK=y
810# CONFIG_SYSV_FS is not set 830# CONFIG_SYSV_FS is not set
811# CONFIG_UFS_FS is not set 831# CONFIG_UFS_FS is not set
812# CONFIG_NILFS2_FS is not set
813CONFIG_NETWORK_FILESYSTEMS=y 832CONFIG_NETWORK_FILESYSTEMS=y
814CONFIG_NFS_FS=y 833CONFIG_NFS_FS=y
815CONFIG_NFS_V3=y 834CONFIG_NFS_V3=y
@@ -846,6 +865,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
846# CONFIG_ENABLE_MUST_CHECK is not set 865# CONFIG_ENABLE_MUST_CHECK is not set
847CONFIG_FRAME_WARN=1024 866CONFIG_FRAME_WARN=1024
848# CONFIG_MAGIC_SYSRQ is not set 867# CONFIG_MAGIC_SYSRQ is not set
868# CONFIG_STRIP_ASM_SYMS is not set
849# CONFIG_UNUSED_SYMBOLS is not set 869# CONFIG_UNUSED_SYMBOLS is not set
850CONFIG_DEBUG_FS=y 870CONFIG_DEBUG_FS=y
851# CONFIG_HEADERS_CHECK is not set 871# CONFIG_HEADERS_CHECK is not set
@@ -882,20 +902,27 @@ CONFIG_DEBUG_VM=y
882CONFIG_DEBUG_LIST=y 902CONFIG_DEBUG_LIST=y
883# CONFIG_DEBUG_SG is not set 903# CONFIG_DEBUG_SG is not set
884# CONFIG_DEBUG_NOTIFIERS is not set 904# CONFIG_DEBUG_NOTIFIERS is not set
905# CONFIG_DEBUG_CREDENTIALS is not set
885CONFIG_FRAME_POINTER=y 906CONFIG_FRAME_POINTER=y
886# CONFIG_RCU_TORTURE_TEST is not set 907# CONFIG_RCU_TORTURE_TEST is not set
908# CONFIG_RCU_CPU_STALL_DETECTOR is not set
887# CONFIG_BACKTRACE_SELF_TEST is not set 909# CONFIG_BACKTRACE_SELF_TEST is not set
888# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 910# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
911# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
889# CONFIG_FAULT_INJECTION is not set 912# CONFIG_FAULT_INJECTION is not set
890# CONFIG_LATENCYTOP is not set 913# CONFIG_LATENCYTOP is not set
891# CONFIG_PAGE_POISONING is not set 914# CONFIG_PAGE_POISONING is not set
892CONFIG_NOP_TRACER=y 915CONFIG_NOP_TRACER=y
893CONFIG_HAVE_FUNCTION_TRACER=y 916CONFIG_HAVE_FUNCTION_TRACER=y
917CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
918CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
894CONFIG_HAVE_DYNAMIC_FTRACE=y 919CONFIG_HAVE_DYNAMIC_FTRACE=y
895CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 920CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
921CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
896CONFIG_RING_BUFFER=y 922CONFIG_RING_BUFFER=y
897CONFIG_EVENT_TRACING=y 923CONFIG_EVENT_TRACING=y
898CONFIG_CONTEXT_SWITCH_TRACER=y 924CONFIG_CONTEXT_SWITCH_TRACER=y
925CONFIG_RING_BUFFER_ALLOW_SWAP=y
899CONFIG_TRACING=y 926CONFIG_TRACING=y
900CONFIG_TRACING_SUPPORT=y 927CONFIG_TRACING_SUPPORT=y
901CONFIG_FTRACE=y 928CONFIG_FTRACE=y
@@ -904,6 +931,7 @@ CONFIG_FTRACE=y
904# CONFIG_PREEMPT_TRACER is not set 931# CONFIG_PREEMPT_TRACER is not set
905# CONFIG_SCHED_TRACER is not set 932# CONFIG_SCHED_TRACER is not set
906# CONFIG_ENABLE_DEFAULT_TRACERS is not set 933# CONFIG_ENABLE_DEFAULT_TRACERS is not set
934# CONFIG_FTRACE_SYSCALLS is not set
907# CONFIG_BOOT_TRACER is not set 935# CONFIG_BOOT_TRACER is not set
908CONFIG_BRANCH_PROFILE_NONE=y 936CONFIG_BRANCH_PROFILE_NONE=y
909# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 937# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -920,10 +948,10 @@ CONFIG_HAVE_ARCH_KGDB=y
920# CONFIG_KGDB is not set 948# CONFIG_KGDB is not set
921# CONFIG_SH_STANDARD_BIOS is not set 949# CONFIG_SH_STANDARD_BIOS is not set
922# CONFIG_EARLY_SCIF_CONSOLE is not set 950# CONFIG_EARLY_SCIF_CONSOLE is not set
923# CONFIG_DEBUG_BOOTMEM is not set 951# CONFIG_STACK_DEBUG is not set
924CONFIG_DEBUG_STACKOVERFLOW=y
925CONFIG_DEBUG_STACK_USAGE=y 952CONFIG_DEBUG_STACK_USAGE=y
926CONFIG_DUMP_CODE=y 953CONFIG_DUMP_CODE=y
954# CONFIG_DWARF_UNWINDER is not set
927# CONFIG_SH_NO_BSS_INIT is not set 955# CONFIG_SH_NO_BSS_INIT is not set
928 956
929# 957#
@@ -938,7 +966,6 @@ CONFIG_CRYPTO=y
938# 966#
939# Crypto core or helper 967# Crypto core or helper
940# 968#
941# CONFIG_CRYPTO_FIPS is not set
942CONFIG_CRYPTO_ALGAPI=y 969CONFIG_CRYPTO_ALGAPI=y
943CONFIG_CRYPTO_ALGAPI2=y 970CONFIG_CRYPTO_ALGAPI2=y
944CONFIG_CRYPTO_HASH=y 971CONFIG_CRYPTO_HASH=y
@@ -974,11 +1001,13 @@ CONFIG_CRYPTO_HASH2=y
974# 1001#
975# CONFIG_CRYPTO_HMAC is not set 1002# CONFIG_CRYPTO_HMAC is not set
976# CONFIG_CRYPTO_XCBC is not set 1003# CONFIG_CRYPTO_XCBC is not set
1004# CONFIG_CRYPTO_VMAC is not set
977 1005
978# 1006#
979# Digest 1007# Digest
980# 1008#
981CONFIG_CRYPTO_CRC32C=y 1009CONFIG_CRYPTO_CRC32C=y
1010# CONFIG_CRYPTO_GHASH is not set
982# CONFIG_CRYPTO_MD4 is not set 1011# CONFIG_CRYPTO_MD4 is not set
983# CONFIG_CRYPTO_MD5 is not set 1012# CONFIG_CRYPTO_MD5 is not set
984# CONFIG_CRYPTO_MICHAEL_MIC is not set 1013# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1046,5 +1075,6 @@ CONFIG_DECOMPRESS_GZIP=y
1046CONFIG_HAS_IOMEM=y 1075CONFIG_HAS_IOMEM=y
1047CONFIG_HAS_IOPORT=y 1076CONFIG_HAS_IOPORT=y
1048CONFIG_HAS_DMA=y 1077CONFIG_HAS_DMA=y
1078CONFIG_HAVE_LMB=y
1049CONFIG_NLATTR=y 1079CONFIG_NLATTR=y
1050CONFIG_GENERIC_ATOMIC64=y 1080CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7343_defconfig b/arch/sh/configs/se7343_defconfig
index 18f46debf92a..5531444b808c 100644
--- a/arch/sh/configs/se7343_defconfig
+++ b/arch/sh/configs/se7343_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:47:07 2009 4# Thu Sep 24 18:46:55 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,7 +29,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
28# CONFIG_ARCH_HAS_ILOG2_U64 is not set 29# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29CONFIG_ARCH_NO_VIRT_TO_BUS=y 30CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y
32 35
33# 36#
34# General setup 37# General setup
@@ -38,6 +41,12 @@ CONFIG_BROKEN_ON_SMP=y
38CONFIG_INIT_ENV_ARG_LIMIT=32 41CONFIG_INIT_ENV_ARG_LIMIT=32
39CONFIG_LOCALVERSION="" 42CONFIG_LOCALVERSION=""
40CONFIG_LOCALVERSION_AUTO=y 43CONFIG_LOCALVERSION_AUTO=y
44CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set
41# CONFIG_SWAP is not set 50# CONFIG_SWAP is not set
42CONFIG_SYSVIPC=y 51CONFIG_SYSVIPC=y
43CONFIG_SYSVIPC_SYSCTL=y 52CONFIG_SYSVIPC_SYSCTL=y
@@ -50,11 +59,12 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
50# 59#
51# RCU Subsystem 60# RCU Subsystem
52# 61#
53CONFIG_CLASSIC_RCU=y 62CONFIG_TREE_RCU=y
54# CONFIG_TREE_RCU is not set 63# CONFIG_TREE_PREEMPT_RCU is not set
55# CONFIG_PREEMPT_RCU is not set 64# CONFIG_RCU_TRACE is not set
65CONFIG_RCU_FANOUT=32
66# CONFIG_RCU_FANOUT_EXACT is not set
56# CONFIG_TREE_RCU_TRACE is not set 67# CONFIG_TREE_RCU_TRACE is not set
57# CONFIG_PREEMPT_RCU_TRACE is not set
58# CONFIG_IKCONFIG is not set 68# CONFIG_IKCONFIG is not set
59CONFIG_LOG_BUF_SHIFT=14 69CONFIG_LOG_BUF_SHIFT=14
60CONFIG_GROUP_SCHED=y 70CONFIG_GROUP_SCHED=y
@@ -88,18 +98,19 @@ CONFIG_TIMERFD=y
88CONFIG_EVENTFD=y 98CONFIG_EVENTFD=y
89# CONFIG_SHMEM is not set 99# CONFIG_SHMEM is not set
90CONFIG_AIO=y 100CONFIG_AIO=y
101CONFIG_HAVE_PERF_EVENTS=y
91 102
92# 103#
93# Performance Counters 104# Kernel Performance Events And Counters
94# 105#
106# CONFIG_PERF_EVENTS is not set
107# CONFIG_PERF_COUNTERS is not set
95CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
96# CONFIG_STRIP_ASM_SYMS is not set
97CONFIG_COMPAT_BRK=y 109CONFIG_COMPAT_BRK=y
98CONFIG_SLAB=y 110CONFIG_SLAB=y
99# CONFIG_SLUB is not set 111# CONFIG_SLUB is not set
100# CONFIG_SLOB is not set 112# CONFIG_SLOB is not set
101# CONFIG_PROFILING is not set 113# CONFIG_PROFILING is not set
102# CONFIG_MARKERS is not set
103CONFIG_HAVE_OPROFILE=y 114CONFIG_HAVE_OPROFILE=y
104# CONFIG_KPROBES is not set 115# CONFIG_KPROBES is not set
105CONFIG_HAVE_IOREMAP_PROT=y 116CONFIG_HAVE_IOREMAP_PROT=y
@@ -108,6 +119,10 @@ CONFIG_HAVE_KRETPROBES=y
108CONFIG_HAVE_ARCH_TRACEHOOK=y 119CONFIG_HAVE_ARCH_TRACEHOOK=y
109CONFIG_HAVE_CLK=y 120CONFIG_HAVE_CLK=y
110CONFIG_HAVE_DMA_API_DEBUG=y 121CONFIG_HAVE_DMA_API_DEBUG=y
122
123#
124# GCOV-based kernel profiling
125#
111# CONFIG_SLOW_WORK is not set 126# CONFIG_SLOW_WORK is not set
112CONFIG_HAVE_GENERIC_DMA_COHERENT=y 127CONFIG_HAVE_GENERIC_DMA_COHERENT=y
113CONFIG_SLABINFO=y 128CONFIG_SLABINFO=y
@@ -119,7 +134,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
119# CONFIG_MODVERSIONS is not set 134# CONFIG_MODVERSIONS is not set
120# CONFIG_MODULE_SRCVERSION_ALL is not set 135# CONFIG_MODULE_SRCVERSION_ALL is not set
121CONFIG_BLOCK=y 136CONFIG_BLOCK=y
122# CONFIG_LBD is not set 137CONFIG_LBDAF=y
123# CONFIG_BLK_DEV_BSG is not set 138# CONFIG_BLK_DEV_BSG is not set
124# CONFIG_BLK_DEV_INTEGRITY is not set 139# CONFIG_BLK_DEV_INTEGRITY is not set
125 140
@@ -135,7 +150,7 @@ CONFIG_DEFAULT_DEADLINE=y
135# CONFIG_DEFAULT_CFQ is not set 150# CONFIG_DEFAULT_CFQ is not set
136# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
137CONFIG_DEFAULT_IOSCHED="deadline" 152CONFIG_DEFAULT_IOSCHED="deadline"
138# CONFIG_FREEZER is not set 153CONFIG_FREEZER=y
139 154
140# 155#
141# System type 156# System type
@@ -169,6 +184,7 @@ CONFIG_ARCH_SHMOBILE=y
169# CONFIG_CPU_SUBTYPE_SH4_202 is not set 184# CONFIG_CPU_SUBTYPE_SH4_202 is not set
170# CONFIG_CPU_SUBTYPE_SH7723 is not set 185# CONFIG_CPU_SUBTYPE_SH7723 is not set
171# CONFIG_CPU_SUBTYPE_SH7724 is not set 186# CONFIG_CPU_SUBTYPE_SH7724 is not set
187# CONFIG_CPU_SUBTYPE_SH7757 is not set
172# CONFIG_CPU_SUBTYPE_SH7763 is not set 188# CONFIG_CPU_SUBTYPE_SH7763 is not set
173# CONFIG_CPU_SUBTYPE_SH7770 is not set 189# CONFIG_CPU_SUBTYPE_SH7770 is not set
174# CONFIG_CPU_SUBTYPE_SH7780 is not set 190# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -214,6 +230,7 @@ CONFIG_ZONE_DMA_FLAG=0
214CONFIG_NR_QUICK=2 230CONFIG_NR_QUICK=2
215CONFIG_HAVE_MLOCK=y 231CONFIG_HAVE_MLOCK=y
216CONFIG_HAVE_MLOCKED_PAGE_BIT=y 232CONFIG_HAVE_MLOCKED_PAGE_BIT=y
233# CONFIG_KSM is not set
217CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 234CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
218 235
219# 236#
@@ -296,7 +313,8 @@ CONFIG_GUSA=y
296CONFIG_ZERO_PAGE_OFFSET=0x00001000 313CONFIG_ZERO_PAGE_OFFSET=0x00001000
297CONFIG_BOOT_LINK_OFFSET=0x00800000 314CONFIG_BOOT_LINK_OFFSET=0x00800000
298CONFIG_ENTRY_OFFSET=0x00001000 315CONFIG_ENTRY_OFFSET=0x00001000
299CONFIG_CMDLINE_BOOL=y 316CONFIG_CMDLINE_OVERWRITE=y
317# CONFIG_CMDLINE_EXTEND is not set
300CONFIG_CMDLINE="console=ttySC0,115200" 318CONFIG_CMDLINE="console=ttySC0,115200"
301 319
302# 320#
@@ -316,7 +334,12 @@ CONFIG_BINFMT_ELF=y
316# 334#
317# Power management options (EXPERIMENTAL) 335# Power management options (EXPERIMENTAL)
318# 336#
319# CONFIG_PM is not set 337CONFIG_PM=y
338# CONFIG_PM_DEBUG is not set
339CONFIG_PM_SLEEP=y
340CONFIG_SUSPEND=y
341CONFIG_SUSPEND_FREEZER=y
342CONFIG_PM_RUNTIME=y
320# CONFIG_CPU_IDLE is not set 343# CONFIG_CPU_IDLE is not set
321CONFIG_NET=y 344CONFIG_NET=y
322 345
@@ -360,6 +383,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
360# CONFIG_NETFILTER is not set 383# CONFIG_NETFILTER is not set
361# CONFIG_IP_DCCP is not set 384# CONFIG_IP_DCCP is not set
362# CONFIG_IP_SCTP is not set 385# CONFIG_IP_SCTP is not set
386# CONFIG_RDS is not set
363# CONFIG_TIPC is not set 387# CONFIG_TIPC is not set
364# CONFIG_ATM is not set 388# CONFIG_ATM is not set
365# CONFIG_BRIDGE is not set 389# CONFIG_BRIDGE is not set
@@ -389,6 +413,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
389# CONFIG_AF_RXRPC is not set 413# CONFIG_AF_RXRPC is not set
390CONFIG_WIRELESS=y 414CONFIG_WIRELESS=y
391# CONFIG_CFG80211 is not set 415# CONFIG_CFG80211 is not set
416CONFIG_CFG80211_DEFAULT_PS_VALUE=0
392# CONFIG_WIRELESS_OLD_REGULATORY is not set 417# CONFIG_WIRELESS_OLD_REGULATORY is not set
393# CONFIG_WIRELESS_EXT is not set 418# CONFIG_WIRELESS_EXT is not set
394# CONFIG_LIB80211 is not set 419# CONFIG_LIB80211 is not set
@@ -396,7 +421,6 @@ CONFIG_WIRELESS=y
396# 421#
397# CFG80211 needs to be enabled for MAC80211 422# CFG80211 needs to be enabled for MAC80211
398# 423#
399CONFIG_MAC80211_DEFAULT_PS_VALUE=0
400# CONFIG_WIMAX is not set 424# CONFIG_WIMAX is not set
401# CONFIG_RFKILL is not set 425# CONFIG_RFKILL is not set
402# CONFIG_NET_9P is not set 426# CONFIG_NET_9P is not set
@@ -418,9 +442,9 @@ CONFIG_EXTRA_FIRMWARE=""
418# CONFIG_CONNECTOR is not set 442# CONFIG_CONNECTOR is not set
419CONFIG_MTD=y 443CONFIG_MTD=y
420# CONFIG_MTD_DEBUG is not set 444# CONFIG_MTD_DEBUG is not set
445# CONFIG_MTD_TESTS is not set
421CONFIG_MTD_CONCAT=y 446CONFIG_MTD_CONCAT=y
422CONFIG_MTD_PARTITIONS=y 447CONFIG_MTD_PARTITIONS=y
423# CONFIG_MTD_TESTS is not set
424# CONFIG_MTD_REDBOOT_PARTS is not set 448# CONFIG_MTD_REDBOOT_PARTS is not set
425# CONFIG_MTD_CMDLINE_PARTS is not set 449# CONFIG_MTD_CMDLINE_PARTS is not set
426# CONFIG_MTD_AR7_PARTS is not set 450# CONFIG_MTD_AR7_PARTS is not set
@@ -560,10 +584,7 @@ CONFIG_NETDEVICES=y
560CONFIG_MII=y 584CONFIG_MII=y
561# CONFIG_NETDEV_1000 is not set 585# CONFIG_NETDEV_1000 is not set
562# CONFIG_NETDEV_10000 is not set 586# CONFIG_NETDEV_10000 is not set
563 587CONFIG_WLAN=y
564#
565# Wireless LAN
566#
567# CONFIG_WLAN_PRE80211 is not set 588# CONFIG_WLAN_PRE80211 is not set
568# CONFIG_WLAN_80211 is not set 589# CONFIG_WLAN_80211 is not set
569 590
@@ -671,6 +692,7 @@ CONFIG_HW_RANDOM=y
671# CONFIG_TCG_TPM is not set 692# CONFIG_TCG_TPM is not set
672CONFIG_I2C=y 693CONFIG_I2C=y
673CONFIG_I2C_BOARDINFO=y 694CONFIG_I2C_BOARDINFO=y
695CONFIG_I2C_COMPAT=y
674# CONFIG_I2C_CHARDEV is not set 696# CONFIG_I2C_CHARDEV is not set
675CONFIG_I2C_HELPER_AUTO=y 697CONFIG_I2C_HELPER_AUTO=y
676 698
@@ -681,6 +703,7 @@ CONFIG_I2C_HELPER_AUTO=y
681# 703#
682# I2C system bus drivers (mostly embedded / system-on-chip) 704# I2C system bus drivers (mostly embedded / system-on-chip)
683# 705#
706# CONFIG_I2C_DESIGNWARE is not set
684# CONFIG_I2C_OCORES is not set 707# CONFIG_I2C_OCORES is not set
685CONFIG_I2C_SH_MOBILE=y 708CONFIG_I2C_SH_MOBILE=y
686# CONFIG_I2C_SIMTEC is not set 709# CONFIG_I2C_SIMTEC is not set
@@ -702,20 +725,21 @@ CONFIG_I2C_SH_MOBILE=y
702# Miscellaneous I2C Chip support 725# Miscellaneous I2C Chip support
703# 726#
704# CONFIG_DS1682 is not set 727# CONFIG_DS1682 is not set
705# CONFIG_SENSORS_PCF8574 is not set
706# CONFIG_PCF8575 is not set
707# CONFIG_SENSORS_PCA9539 is not set
708# CONFIG_SENSORS_TSL2550 is not set 728# CONFIG_SENSORS_TSL2550 is not set
709# CONFIG_I2C_DEBUG_CORE is not set 729# CONFIG_I2C_DEBUG_CORE is not set
710# CONFIG_I2C_DEBUG_ALGO is not set 730# CONFIG_I2C_DEBUG_ALGO is not set
711# CONFIG_I2C_DEBUG_BUS is not set 731# CONFIG_I2C_DEBUG_BUS is not set
712# CONFIG_I2C_DEBUG_CHIP is not set 732# CONFIG_I2C_DEBUG_CHIP is not set
713# CONFIG_SPI is not set 733# CONFIG_SPI is not set
734
735#
736# PPS support
737#
738# CONFIG_PPS is not set
714# CONFIG_W1 is not set 739# CONFIG_W1 is not set
715# CONFIG_POWER_SUPPLY is not set 740# CONFIG_POWER_SUPPLY is not set
716# CONFIG_HWMON is not set 741# CONFIG_HWMON is not set
717# CONFIG_THERMAL is not set 742# CONFIG_THERMAL is not set
718# CONFIG_THERMAL_HWMON is not set
719# CONFIG_WATCHDOG is not set 743# CONFIG_WATCHDOG is not set
720CONFIG_SSB_POSSIBLE=y 744CONFIG_SSB_POSSIBLE=y
721 745
@@ -734,8 +758,10 @@ CONFIG_SSB_POSSIBLE=y
734# CONFIG_MFD_TMIO is not set 758# CONFIG_MFD_TMIO is not set
735# CONFIG_PMIC_DA903X is not set 759# CONFIG_PMIC_DA903X is not set
736# CONFIG_MFD_WM8400 is not set 760# CONFIG_MFD_WM8400 is not set
761# CONFIG_MFD_WM831X is not set
737# CONFIG_MFD_WM8350_I2C is not set 762# CONFIG_MFD_WM8350_I2C is not set
738# CONFIG_MFD_PCF50633 is not set 763# CONFIG_MFD_PCF50633 is not set
764# CONFIG_AB3100_CORE is not set
739# CONFIG_REGULATOR is not set 765# CONFIG_REGULATOR is not set
740# CONFIG_MEDIA_SUPPORT is not set 766# CONFIG_MEDIA_SUPPORT is not set
741 767
@@ -788,6 +814,7 @@ CONFIG_DUMMY_CONSOLE=y
788# CONFIG_LOGO is not set 814# CONFIG_LOGO is not set
789CONFIG_SOUND=y 815CONFIG_SOUND=y
790CONFIG_SOUND_OSS_CORE=y 816CONFIG_SOUND_OSS_CORE=y
817CONFIG_SOUND_OSS_CORE_PRECLAIM=y
791CONFIG_SND=y 818CONFIG_SND=y
792CONFIG_SND_TIMER=y 819CONFIG_SND_TIMER=y
793CONFIG_SND_PCM=y 820CONFIG_SND_PCM=y
@@ -822,7 +849,6 @@ CONFIG_SND_USB=y
822# CONFIG_SOUND_PRIME is not set 849# CONFIG_SOUND_PRIME is not set
823CONFIG_HID_SUPPORT=y 850CONFIG_HID_SUPPORT=y
824CONFIG_HID=y 851CONFIG_HID=y
825# CONFIG_HID_DEBUG is not set
826# CONFIG_HIDRAW is not set 852# CONFIG_HIDRAW is not set
827 853
828# 854#
@@ -845,6 +871,7 @@ CONFIG_HID_CYPRESS=y
845CONFIG_HID_EZKEY=y 871CONFIG_HID_EZKEY=y
846# CONFIG_HID_KYE is not set 872# CONFIG_HID_KYE is not set
847CONFIG_HID_GYRATION=y 873CONFIG_HID_GYRATION=y
874# CONFIG_HID_TWINHAN is not set
848# CONFIG_HID_KENSINGTON is not set 875# CONFIG_HID_KENSINGTON is not set
849CONFIG_HID_LOGITECH=y 876CONFIG_HID_LOGITECH=y
850# CONFIG_LOGITECH_FF is not set 877# CONFIG_LOGITECH_FF is not set
@@ -877,6 +904,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
877CONFIG_USB_DEVICEFS=y 904CONFIG_USB_DEVICEFS=y
878CONFIG_USB_DEVICE_CLASS=y 905CONFIG_USB_DEVICE_CLASS=y
879# CONFIG_USB_DYNAMIC_MINORS is not set 906# CONFIG_USB_DYNAMIC_MINORS is not set
907# CONFIG_USB_SUSPEND is not set
880# CONFIG_USB_OTG is not set 908# CONFIG_USB_OTG is not set
881# CONFIG_USB_OTG_WHITELIST is not set 909# CONFIG_USB_OTG_WHITELIST is not set
882# CONFIG_USB_OTG_BLACKLIST_HUB is not set 910# CONFIG_USB_OTG_BLACKLIST_HUB is not set
@@ -891,6 +919,7 @@ CONFIG_USB_DEVICE_CLASS=y
891# CONFIG_USB_OXU210HP_HCD is not set 919# CONFIG_USB_OXU210HP_HCD is not set
892CONFIG_USB_ISP116X_HCD=y 920CONFIG_USB_ISP116X_HCD=y
893# CONFIG_USB_ISP1760_HCD is not set 921# CONFIG_USB_ISP1760_HCD is not set
922# CONFIG_USB_ISP1362_HCD is not set
894# CONFIG_USB_SL811_HCD is not set 923# CONFIG_USB_SL811_HCD is not set
895# CONFIG_USB_R8A66597_HCD is not set 924# CONFIG_USB_R8A66597_HCD is not set
896# CONFIG_USB_HWA_HCD is not set 925# CONFIG_USB_HWA_HCD is not set
@@ -990,8 +1019,10 @@ CONFIG_FS_MBCACHE=y
990# CONFIG_JFS_FS is not set 1019# CONFIG_JFS_FS is not set
991# CONFIG_FS_POSIX_ACL is not set 1020# CONFIG_FS_POSIX_ACL is not set
992# CONFIG_XFS_FS is not set 1021# CONFIG_XFS_FS is not set
1022# CONFIG_GFS2_FS is not set
993# CONFIG_OCFS2_FS is not set 1023# CONFIG_OCFS2_FS is not set
994# CONFIG_BTRFS_FS is not set 1024# CONFIG_BTRFS_FS is not set
1025# CONFIG_NILFS2_FS is not set
995CONFIG_FILE_LOCKING=y 1026CONFIG_FILE_LOCKING=y
996CONFIG_FSNOTIFY=y 1027CONFIG_FSNOTIFY=y
997# CONFIG_DNOTIFY is not set 1028# CONFIG_DNOTIFY is not set
@@ -1028,8 +1059,6 @@ CONFIG_PROC_FS=y
1028CONFIG_PROC_SYSCTL=y 1059CONFIG_PROC_SYSCTL=y
1029CONFIG_PROC_PAGE_MONITOR=y 1060CONFIG_PROC_PAGE_MONITOR=y
1030CONFIG_SYSFS=y 1061CONFIG_SYSFS=y
1031CONFIG_TMPFS=y
1032# CONFIG_TMPFS_POSIX_ACL is not set
1033# CONFIG_HUGETLBFS is not set 1062# CONFIG_HUGETLBFS is not set
1034# CONFIG_HUGETLB_PAGE is not set 1063# CONFIG_HUGETLB_PAGE is not set
1035# CONFIG_CONFIGFS_FS is not set 1064# CONFIG_CONFIGFS_FS is not set
@@ -1062,7 +1091,6 @@ CONFIG_CRAMFS=y
1062# CONFIG_ROMFS_FS is not set 1091# CONFIG_ROMFS_FS is not set
1063# CONFIG_SYSV_FS is not set 1092# CONFIG_SYSV_FS is not set
1064# CONFIG_UFS_FS is not set 1093# CONFIG_UFS_FS is not set
1065# CONFIG_NILFS2_FS is not set
1066CONFIG_NETWORK_FILESYSTEMS=y 1094CONFIG_NETWORK_FILESYSTEMS=y
1067CONFIG_NFS_FS=y 1095CONFIG_NFS_FS=y
1068CONFIG_NFS_V3=y 1096CONFIG_NFS_V3=y
@@ -1140,6 +1168,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1140CONFIG_ENABLE_MUST_CHECK=y 1168CONFIG_ENABLE_MUST_CHECK=y
1141CONFIG_FRAME_WARN=1024 1169CONFIG_FRAME_WARN=1024
1142# CONFIG_MAGIC_SYSRQ is not set 1170# CONFIG_MAGIC_SYSRQ is not set
1171# CONFIG_STRIP_ASM_SYMS is not set
1143# CONFIG_UNUSED_SYMBOLS is not set 1172# CONFIG_UNUSED_SYMBOLS is not set
1144# CONFIG_DEBUG_FS is not set 1173# CONFIG_DEBUG_FS is not set
1145# CONFIG_HEADERS_CHECK is not set 1174# CONFIG_HEADERS_CHECK is not set
@@ -1149,8 +1178,11 @@ CONFIG_FRAME_WARN=1024
1149# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1178# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1150# CONFIG_LATENCYTOP is not set 1179# CONFIG_LATENCYTOP is not set
1151CONFIG_HAVE_FUNCTION_TRACER=y 1180CONFIG_HAVE_FUNCTION_TRACER=y
1181CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1182CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1152CONFIG_HAVE_DYNAMIC_FTRACE=y 1183CONFIG_HAVE_DYNAMIC_FTRACE=y
1153CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1184CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1185CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1154CONFIG_TRACING_SUPPORT=y 1186CONFIG_TRACING_SUPPORT=y
1155# CONFIG_FTRACE is not set 1187# CONFIG_FTRACE is not set
1156# CONFIG_DMA_API_DEBUG is not set 1188# CONFIG_DMA_API_DEBUG is not set
@@ -1160,6 +1192,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1160CONFIG_EARLY_SCIF_CONSOLE=y 1192CONFIG_EARLY_SCIF_CONSOLE=y
1161CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe00000 1193CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe00000
1162CONFIG_EARLY_PRINTK=y 1194CONFIG_EARLY_PRINTK=y
1195# CONFIG_DWARF_UNWINDER is not set
1163 1196
1164# 1197#
1165# Security options 1198# Security options
@@ -1173,7 +1206,6 @@ CONFIG_CRYPTO=y
1173# 1206#
1174# Crypto core or helper 1207# Crypto core or helper
1175# 1208#
1176# CONFIG_CRYPTO_FIPS is not set
1177# CONFIG_CRYPTO_MANAGER is not set 1209# CONFIG_CRYPTO_MANAGER is not set
1178# CONFIG_CRYPTO_MANAGER2 is not set 1210# CONFIG_CRYPTO_MANAGER2 is not set
1179# CONFIG_CRYPTO_GF128MUL is not set 1211# CONFIG_CRYPTO_GF128MUL is not set
@@ -1205,11 +1237,13 @@ CONFIG_CRYPTO=y
1205# 1237#
1206# CONFIG_CRYPTO_HMAC is not set 1238# CONFIG_CRYPTO_HMAC is not set
1207# CONFIG_CRYPTO_XCBC is not set 1239# CONFIG_CRYPTO_XCBC is not set
1240# CONFIG_CRYPTO_VMAC is not set
1208 1241
1209# 1242#
1210# Digest 1243# Digest
1211# 1244#
1212# CONFIG_CRYPTO_CRC32C is not set 1245# CONFIG_CRYPTO_CRC32C is not set
1246# CONFIG_CRYPTO_GHASH is not set
1213# CONFIG_CRYPTO_MD4 is not set 1247# CONFIG_CRYPTO_MD4 is not set
1214# CONFIG_CRYPTO_MD5 is not set 1248# CONFIG_CRYPTO_MD5 is not set
1215# CONFIG_CRYPTO_MICHAEL_MIC is not set 1249# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1273,5 +1307,6 @@ CONFIG_ZLIB_DEFLATE=y
1273CONFIG_HAS_IOMEM=y 1307CONFIG_HAS_IOMEM=y
1274CONFIG_HAS_IOPORT=y 1308CONFIG_HAS_IOPORT=y
1275CONFIG_HAS_DMA=y 1309CONFIG_HAS_DMA=y
1310CONFIG_HAVE_LMB=y
1276CONFIG_NLATTR=y 1311CONFIG_NLATTR=y
1277CONFIG_GENERIC_ATOMIC64=y 1312CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7619_defconfig b/arch/sh/configs/se7619_defconfig
index 724bb77c9dc9..6921b199b1d6 100644
--- a/arch/sh/configs/se7619_defconfig
+++ b/arch/sh/configs/se7619_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:47:56 2009 4# Thu Sep 24 18:50:05 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -27,7 +28,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 28# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 29CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y
31 34
32# 35#
33# General setup 36# General setup
@@ -37,17 +40,24 @@ CONFIG_BROKEN_ON_SMP=y
37CONFIG_INIT_ENV_ARG_LIMIT=32 40CONFIG_INIT_ENV_ARG_LIMIT=32
38CONFIG_LOCALVERSION="" 41CONFIG_LOCALVERSION=""
39# CONFIG_LOCALVERSION_AUTO is not set 42# CONFIG_LOCALVERSION_AUTO is not set
43CONFIG_HAVE_KERNEL_GZIP=y
44CONFIG_HAVE_KERNEL_BZIP2=y
45CONFIG_HAVE_KERNEL_LZMA=y
46CONFIG_KERNEL_GZIP=y
47# CONFIG_KERNEL_BZIP2 is not set
48# CONFIG_KERNEL_LZMA is not set
40# CONFIG_SYSVIPC is not set 49# CONFIG_SYSVIPC is not set
41# CONFIG_BSD_PROCESS_ACCT is not set 50# CONFIG_BSD_PROCESS_ACCT is not set
42 51
43# 52#
44# RCU Subsystem 53# RCU Subsystem
45# 54#
46CONFIG_CLASSIC_RCU=y 55CONFIG_TREE_RCU=y
47# CONFIG_TREE_RCU is not set 56# CONFIG_TREE_PREEMPT_RCU is not set
48# CONFIG_PREEMPT_RCU is not set 57# CONFIG_RCU_TRACE is not set
58CONFIG_RCU_FANOUT=32
59# CONFIG_RCU_FANOUT_EXACT is not set
49# CONFIG_TREE_RCU_TRACE is not set 60# CONFIG_TREE_RCU_TRACE is not set
50# CONFIG_PREEMPT_RCU_TRACE is not set
51# CONFIG_IKCONFIG is not set 61# CONFIG_IKCONFIG is not set
52CONFIG_LOG_BUF_SHIFT=14 62CONFIG_LOG_BUF_SHIFT=14
53# CONFIG_GROUP_SCHED is not set 63# CONFIG_GROUP_SCHED is not set
@@ -73,31 +83,36 @@ CONFIG_SIGNALFD=y
73CONFIG_TIMERFD=y 83CONFIG_TIMERFD=y
74CONFIG_EVENTFD=y 84CONFIG_EVENTFD=y
75CONFIG_AIO=y 85CONFIG_AIO=y
86CONFIG_HAVE_PERF_EVENTS=y
76 87
77# 88#
78# Performance Counters 89# Kernel Performance Events And Counters
79# 90#
91# CONFIG_PERF_EVENTS is not set
92# CONFIG_PERF_COUNTERS is not set
80# CONFIG_VM_EVENT_COUNTERS is not set 93# CONFIG_VM_EVENT_COUNTERS is not set
81# CONFIG_STRIP_ASM_SYMS is not set
82CONFIG_COMPAT_BRK=y 94CONFIG_COMPAT_BRK=y
83CONFIG_SLAB=y 95CONFIG_SLAB=y
84# CONFIG_SLUB is not set 96# CONFIG_SLUB is not set
85# CONFIG_SLOB is not set 97# CONFIG_SLOB is not set
86# CONFIG_PROFILING is not set 98# CONFIG_PROFILING is not set
87# CONFIG_MARKERS is not set
88CONFIG_HAVE_OPROFILE=y 99CONFIG_HAVE_OPROFILE=y
89CONFIG_HAVE_KPROBES=y 100CONFIG_HAVE_KPROBES=y
90CONFIG_HAVE_KRETPROBES=y 101CONFIG_HAVE_KRETPROBES=y
91CONFIG_HAVE_ARCH_TRACEHOOK=y 102CONFIG_HAVE_ARCH_TRACEHOOK=y
92CONFIG_HAVE_CLK=y 103CONFIG_HAVE_CLK=y
93CONFIG_HAVE_DMA_API_DEBUG=y 104CONFIG_HAVE_DMA_API_DEBUG=y
105
106#
107# GCOV-based kernel profiling
108#
94# CONFIG_SLOW_WORK is not set 109# CONFIG_SLOW_WORK is not set
95CONFIG_HAVE_GENERIC_DMA_COHERENT=y 110CONFIG_HAVE_GENERIC_DMA_COHERENT=y
96CONFIG_SLABINFO=y 111CONFIG_SLABINFO=y
97CONFIG_BASE_SMALL=1 112CONFIG_BASE_SMALL=1
98# CONFIG_MODULES is not set 113# CONFIG_MODULES is not set
99CONFIG_BLOCK=y 114CONFIG_BLOCK=y
100# CONFIG_LBD is not set 115CONFIG_LBDAF=y
101# CONFIG_BLK_DEV_BSG is not set 116# CONFIG_BLK_DEV_BSG is not set
102# CONFIG_BLK_DEV_INTEGRITY is not set 117# CONFIG_BLK_DEV_INTEGRITY is not set
103 118
@@ -144,6 +159,7 @@ CONFIG_CPU_SUBTYPE_SH7619=y
144# CONFIG_CPU_SUBTYPE_SH4_202 is not set 159# CONFIG_CPU_SUBTYPE_SH4_202 is not set
145# CONFIG_CPU_SUBTYPE_SH7723 is not set 160# CONFIG_CPU_SUBTYPE_SH7723 is not set
146# CONFIG_CPU_SUBTYPE_SH7724 is not set 161# CONFIG_CPU_SUBTYPE_SH7724 is not set
162# CONFIG_CPU_SUBTYPE_SH7757 is not set
147# CONFIG_CPU_SUBTYPE_SH7763 is not set 163# CONFIG_CPU_SUBTYPE_SH7763 is not set
148# CONFIG_CPU_SUBTYPE_SH7770 is not set 164# CONFIG_CPU_SUBTYPE_SH7770 is not set
149# CONFIG_CPU_SUBTYPE_SH7780 is not set 165# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -262,7 +278,8 @@ CONFIG_GUSA=y
262CONFIG_ZERO_PAGE_OFFSET=0x00001000 278CONFIG_ZERO_PAGE_OFFSET=0x00001000
263CONFIG_BOOT_LINK_OFFSET=0x00800000 279CONFIG_BOOT_LINK_OFFSET=0x00800000
264CONFIG_ENTRY_OFFSET=0x00001000 280CONFIG_ENTRY_OFFSET=0x00001000
265# CONFIG_CMDLINE_BOOL is not set 281# CONFIG_CMDLINE_OVERWRITE is not set
282# CONFIG_CMDLINE_EXTEND is not set
266 283
267# 284#
268# Bus options 285# Bus options
@@ -469,11 +486,15 @@ CONFIG_SERIAL_CORE_CONSOLE=y
469# CONFIG_TCG_TPM is not set 486# CONFIG_TCG_TPM is not set
470# CONFIG_I2C is not set 487# CONFIG_I2C is not set
471# CONFIG_SPI is not set 488# CONFIG_SPI is not set
489
490#
491# PPS support
492#
493# CONFIG_PPS is not set
472# CONFIG_W1 is not set 494# CONFIG_W1 is not set
473# CONFIG_POWER_SUPPLY is not set 495# CONFIG_POWER_SUPPLY is not set
474# CONFIG_HWMON is not set 496# CONFIG_HWMON is not set
475# CONFIG_THERMAL is not set 497# CONFIG_THERMAL is not set
476# CONFIG_THERMAL_HWMON is not set
477# CONFIG_WATCHDOG is not set 498# CONFIG_WATCHDOG is not set
478CONFIG_SSB_POSSIBLE=y 499CONFIG_SSB_POSSIBLE=y
479 500
@@ -507,7 +528,6 @@ CONFIG_SSB_POSSIBLE=y
507# CONFIG_SOUND is not set 528# CONFIG_SOUND is not set
508CONFIG_HID_SUPPORT=y 529CONFIG_HID_SUPPORT=y
509CONFIG_HID=y 530CONFIG_HID=y
510# CONFIG_HID_DEBUG is not set
511# CONFIG_HIDRAW is not set 531# CONFIG_HIDRAW is not set
512# CONFIG_HID_PID is not set 532# CONFIG_HID_PID is not set
513 533
@@ -559,7 +579,9 @@ CONFIG_RTC_LIB=y
559# CONFIG_JFS_FS is not set 579# CONFIG_JFS_FS is not set
560# CONFIG_FS_POSIX_ACL is not set 580# CONFIG_FS_POSIX_ACL is not set
561# CONFIG_XFS_FS is not set 581# CONFIG_XFS_FS is not set
582# CONFIG_GFS2_FS is not set
562# CONFIG_BTRFS_FS is not set 583# CONFIG_BTRFS_FS is not set
584# CONFIG_NILFS2_FS is not set
563CONFIG_FILE_LOCKING=y 585CONFIG_FILE_LOCKING=y
564CONFIG_FSNOTIFY=y 586CONFIG_FSNOTIFY=y
565# CONFIG_DNOTIFY is not set 587# CONFIG_DNOTIFY is not set
@@ -594,7 +616,6 @@ CONFIG_INOTIFY_USER=y
594CONFIG_PROC_FS=y 616CONFIG_PROC_FS=y
595CONFIG_PROC_SYSCTL=y 617CONFIG_PROC_SYSCTL=y
596# CONFIG_SYSFS is not set 618# CONFIG_SYSFS is not set
597# CONFIG_TMPFS is not set
598# CONFIG_HUGETLB_PAGE is not set 619# CONFIG_HUGETLB_PAGE is not set
599CONFIG_MISC_FILESYSTEMS=y 620CONFIG_MISC_FILESYSTEMS=y
600# CONFIG_ADFS_FS is not set 621# CONFIG_ADFS_FS is not set
@@ -619,7 +640,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
619CONFIG_ROMFS_ON_BLOCK=y 640CONFIG_ROMFS_ON_BLOCK=y
620# CONFIG_SYSV_FS is not set 641# CONFIG_SYSV_FS is not set
621# CONFIG_UFS_FS is not set 642# CONFIG_UFS_FS is not set
622# CONFIG_NILFS2_FS is not set
623 643
624# 644#
625# Partition Types 645# Partition Types
@@ -637,6 +657,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
637# CONFIG_ENABLE_MUST_CHECK is not set 657# CONFIG_ENABLE_MUST_CHECK is not set
638CONFIG_FRAME_WARN=1024 658CONFIG_FRAME_WARN=1024
639# CONFIG_MAGIC_SYSRQ is not set 659# CONFIG_MAGIC_SYSRQ is not set
660# CONFIG_STRIP_ASM_SYMS is not set
640# CONFIG_UNUSED_SYMBOLS is not set 661# CONFIG_UNUSED_SYMBOLS is not set
641# CONFIG_HEADERS_CHECK is not set 662# CONFIG_HEADERS_CHECK is not set
642# CONFIG_DEBUG_KERNEL is not set 663# CONFIG_DEBUG_KERNEL is not set
@@ -645,8 +666,11 @@ CONFIG_FRAME_WARN=1024
645# CONFIG_RCU_CPU_STALL_DETECTOR is not set 666# CONFIG_RCU_CPU_STALL_DETECTOR is not set
646# CONFIG_LATENCYTOP is not set 667# CONFIG_LATENCYTOP is not set
647CONFIG_HAVE_FUNCTION_TRACER=y 668CONFIG_HAVE_FUNCTION_TRACER=y
669CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
670CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
648CONFIG_HAVE_DYNAMIC_FTRACE=y 671CONFIG_HAVE_DYNAMIC_FTRACE=y
649CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 672CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
673CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
650CONFIG_TRACING_SUPPORT=y 674CONFIG_TRACING_SUPPORT=y
651# CONFIG_FTRACE is not set 675# CONFIG_FTRACE is not set
652# CONFIG_DMA_API_DEBUG is not set 676# CONFIG_DMA_API_DEBUG is not set
@@ -654,6 +678,7 @@ CONFIG_TRACING_SUPPORT=y
654CONFIG_HAVE_ARCH_KGDB=y 678CONFIG_HAVE_ARCH_KGDB=y
655# CONFIG_SH_STANDARD_BIOS is not set 679# CONFIG_SH_STANDARD_BIOS is not set
656# CONFIG_EARLY_SCIF_CONSOLE is not set 680# CONFIG_EARLY_SCIF_CONSOLE is not set
681# CONFIG_DWARF_UNWINDER is not set
657 682
658# 683#
659# Security options 684# Security options
@@ -680,4 +705,5 @@ CONFIG_ZLIB_INFLATE=y
680CONFIG_HAS_IOMEM=y 705CONFIG_HAS_IOMEM=y
681CONFIG_HAS_IOPORT=y 706CONFIG_HAS_IOPORT=y
682CONFIG_HAS_DMA=y 707CONFIG_HAS_DMA=y
708CONFIG_HAVE_LMB=y
683CONFIG_GENERIC_ATOMIC64=y 709CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7705_defconfig b/arch/sh/configs/se7705_defconfig
index 6ca6a2fc06e9..3abb06879f02 100644
--- a/arch/sh/configs/se7705_defconfig
+++ b/arch/sh/configs/se7705_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:48:18 2009 4# Thu Sep 24 18:50:52 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -27,7 +28,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 28# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 29CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y
31 34
32# 35#
33# General setup 36# General setup
@@ -38,6 +41,12 @@ CONFIG_LOCK_KERNEL=y
38CONFIG_INIT_ENV_ARG_LIMIT=32 41CONFIG_INIT_ENV_ARG_LIMIT=32
39CONFIG_LOCALVERSION="" 42CONFIG_LOCALVERSION=""
40CONFIG_LOCALVERSION_AUTO=y 43CONFIG_LOCALVERSION_AUTO=y
44CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set
41# CONFIG_SWAP is not set 50# CONFIG_SWAP is not set
42# CONFIG_SYSVIPC is not set 51# CONFIG_SYSVIPC is not set
43# CONFIG_POSIX_MQUEUE is not set 52# CONFIG_POSIX_MQUEUE is not set
@@ -48,11 +57,12 @@ CONFIG_LOCALVERSION_AUTO=y
48# 57#
49# RCU Subsystem 58# RCU Subsystem
50# 59#
51CONFIG_CLASSIC_RCU=y 60CONFIG_TREE_RCU=y
52# CONFIG_TREE_RCU is not set 61# CONFIG_TREE_PREEMPT_RCU is not set
53# CONFIG_PREEMPT_RCU is not set 62# CONFIG_RCU_TRACE is not set
63CONFIG_RCU_FANOUT=32
64# CONFIG_RCU_FANOUT_EXACT is not set
54# CONFIG_TREE_RCU_TRACE is not set 65# CONFIG_TREE_RCU_TRACE is not set
55# CONFIG_PREEMPT_RCU_TRACE is not set
56# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
57CONFIG_LOG_BUF_SHIFT=14 67CONFIG_LOG_BUF_SHIFT=14
58# CONFIG_GROUP_SCHED is not set 68# CONFIG_GROUP_SCHED is not set
@@ -83,18 +93,19 @@ CONFIG_TIMERFD=y
83CONFIG_EVENTFD=y 93CONFIG_EVENTFD=y
84CONFIG_SHMEM=y 94CONFIG_SHMEM=y
85CONFIG_AIO=y 95CONFIG_AIO=y
96CONFIG_HAVE_PERF_EVENTS=y
86 97
87# 98#
88# Performance Counters 99# Kernel Performance Events And Counters
89# 100#
101# CONFIG_PERF_EVENTS is not set
102# CONFIG_PERF_COUNTERS is not set
90CONFIG_VM_EVENT_COUNTERS=y 103CONFIG_VM_EVENT_COUNTERS=y
91# CONFIG_STRIP_ASM_SYMS is not set
92CONFIG_COMPAT_BRK=y 104CONFIG_COMPAT_BRK=y
93CONFIG_SLAB=y 105CONFIG_SLAB=y
94# CONFIG_SLUB is not set 106# CONFIG_SLUB is not set
95# CONFIG_SLOB is not set 107# CONFIG_SLOB is not set
96# CONFIG_PROFILING is not set 108# CONFIG_PROFILING is not set
97# CONFIG_MARKERS is not set
98CONFIG_HAVE_OPROFILE=y 109CONFIG_HAVE_OPROFILE=y
99CONFIG_HAVE_IOREMAP_PROT=y 110CONFIG_HAVE_IOREMAP_PROT=y
100CONFIG_HAVE_KPROBES=y 111CONFIG_HAVE_KPROBES=y
@@ -102,6 +113,10 @@ CONFIG_HAVE_KRETPROBES=y
102CONFIG_HAVE_ARCH_TRACEHOOK=y 113CONFIG_HAVE_ARCH_TRACEHOOK=y
103CONFIG_HAVE_CLK=y 114CONFIG_HAVE_CLK=y
104CONFIG_HAVE_DMA_API_DEBUG=y 115CONFIG_HAVE_DMA_API_DEBUG=y
116
117#
118# GCOV-based kernel profiling
119#
105# CONFIG_SLOW_WORK is not set 120# CONFIG_SLOW_WORK is not set
106CONFIG_HAVE_GENERIC_DMA_COHERENT=y 121CONFIG_HAVE_GENERIC_DMA_COHERENT=y
107CONFIG_SLABINFO=y 122CONFIG_SLABINFO=y
@@ -113,7 +128,7 @@ CONFIG_MODULES=y
113# CONFIG_MODVERSIONS is not set 128# CONFIG_MODVERSIONS is not set
114# CONFIG_MODULE_SRCVERSION_ALL is not set 129# CONFIG_MODULE_SRCVERSION_ALL is not set
115CONFIG_BLOCK=y 130CONFIG_BLOCK=y
116# CONFIG_LBD is not set 131CONFIG_LBDAF=y
117# CONFIG_BLK_DEV_BSG is not set 132# CONFIG_BLK_DEV_BSG is not set
118# CONFIG_BLK_DEV_INTEGRITY is not set 133# CONFIG_BLK_DEV_INTEGRITY is not set
119 134
@@ -160,6 +175,7 @@ CONFIG_CPU_SUBTYPE_SH7705=y
160# CONFIG_CPU_SUBTYPE_SH4_202 is not set 175# CONFIG_CPU_SUBTYPE_SH4_202 is not set
161# CONFIG_CPU_SUBTYPE_SH7723 is not set 176# CONFIG_CPU_SUBTYPE_SH7723 is not set
162# CONFIG_CPU_SUBTYPE_SH7724 is not set 177# CONFIG_CPU_SUBTYPE_SH7724 is not set
178# CONFIG_CPU_SUBTYPE_SH7757 is not set
163# CONFIG_CPU_SUBTYPE_SH7763 is not set 179# CONFIG_CPU_SUBTYPE_SH7763 is not set
164# CONFIG_CPU_SUBTYPE_SH7770 is not set 180# CONFIG_CPU_SUBTYPE_SH7770 is not set
165# CONFIG_CPU_SUBTYPE_SH7780 is not set 181# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -205,6 +221,7 @@ CONFIG_ZONE_DMA_FLAG=0
205CONFIG_NR_QUICK=2 221CONFIG_NR_QUICK=2
206CONFIG_HAVE_MLOCK=y 222CONFIG_HAVE_MLOCK=y
207CONFIG_HAVE_MLOCKED_PAGE_BIT=y 223CONFIG_HAVE_MLOCKED_PAGE_BIT=y
224# CONFIG_KSM is not set
208CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 225CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
209 226
210# 227#
@@ -289,7 +306,8 @@ CONFIG_GUSA=y
289CONFIG_ZERO_PAGE_OFFSET=0x00001000 306CONFIG_ZERO_PAGE_OFFSET=0x00001000
290CONFIG_BOOT_LINK_OFFSET=0x00800000 307CONFIG_BOOT_LINK_OFFSET=0x00800000
291CONFIG_ENTRY_OFFSET=0x00001000 308CONFIG_ENTRY_OFFSET=0x00001000
292# CONFIG_CMDLINE_BOOL is not set 309# CONFIG_CMDLINE_OVERWRITE is not set
310# CONFIG_CMDLINE_EXTEND is not set
293 311
294# 312#
295# Bus options 313# Bus options
@@ -355,6 +373,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
355# CONFIG_NETFILTER is not set 373# CONFIG_NETFILTER is not set
356# CONFIG_IP_DCCP is not set 374# CONFIG_IP_DCCP is not set
357# CONFIG_IP_SCTP is not set 375# CONFIG_IP_SCTP is not set
376# CONFIG_RDS is not set
358# CONFIG_TIPC is not set 377# CONFIG_TIPC is not set
359# CONFIG_ATM is not set 378# CONFIG_ATM is not set
360# CONFIG_BRIDGE is not set 379# CONFIG_BRIDGE is not set
@@ -384,6 +403,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
384# CONFIG_AF_RXRPC is not set 403# CONFIG_AF_RXRPC is not set
385CONFIG_WIRELESS=y 404CONFIG_WIRELESS=y
386# CONFIG_CFG80211 is not set 405# CONFIG_CFG80211 is not set
406CONFIG_CFG80211_DEFAULT_PS_VALUE=0
387# CONFIG_WIRELESS_OLD_REGULATORY is not set 407# CONFIG_WIRELESS_OLD_REGULATORY is not set
388# CONFIG_WIRELESS_EXT is not set 408# CONFIG_WIRELESS_EXT is not set
389# CONFIG_LIB80211 is not set 409# CONFIG_LIB80211 is not set
@@ -391,7 +411,6 @@ CONFIG_WIRELESS=y
391# 411#
392# CFG80211 needs to be enabled for MAC80211 412# CFG80211 needs to be enabled for MAC80211
393# 413#
394CONFIG_MAC80211_DEFAULT_PS_VALUE=0
395# CONFIG_WIMAX is not set 414# CONFIG_WIMAX is not set
396# CONFIG_RFKILL is not set 415# CONFIG_RFKILL is not set
397# CONFIG_NET_9P is not set 416# CONFIG_NET_9P is not set
@@ -409,9 +428,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
409# CONFIG_CONNECTOR is not set 428# CONFIG_CONNECTOR is not set
410CONFIG_MTD=y 429CONFIG_MTD=y
411# CONFIG_MTD_DEBUG is not set 430# CONFIG_MTD_DEBUG is not set
431# CONFIG_MTD_TESTS is not set
412# CONFIG_MTD_CONCAT is not set 432# CONFIG_MTD_CONCAT is not set
413CONFIG_MTD_PARTITIONS=y 433CONFIG_MTD_PARTITIONS=y
414# CONFIG_MTD_TESTS is not set
415# CONFIG_MTD_REDBOOT_PARTS is not set 434# CONFIG_MTD_REDBOOT_PARTS is not set
416# CONFIG_MTD_CMDLINE_PARTS is not set 435# CONFIG_MTD_CMDLINE_PARTS is not set
417# CONFIG_MTD_AR7_PARTS is not set 436# CONFIG_MTD_AR7_PARTS is not set
@@ -547,10 +566,7 @@ CONFIG_STNIC=y
547# CONFIG_KS8842 is not set 566# CONFIG_KS8842 is not set
548CONFIG_NETDEV_1000=y 567CONFIG_NETDEV_1000=y
549CONFIG_NETDEV_10000=y 568CONFIG_NETDEV_10000=y
550 569CONFIG_WLAN=y
551#
552# Wireless LAN
553#
554# CONFIG_WLAN_PRE80211 is not set 570# CONFIG_WLAN_PRE80211 is not set
555# CONFIG_WLAN_80211 is not set 571# CONFIG_WLAN_80211 is not set
556 572
@@ -642,10 +658,20 @@ CONFIG_HW_RANDOM=y
642# CONFIG_TCG_TPM is not set 658# CONFIG_TCG_TPM is not set
643# CONFIG_I2C is not set 659# CONFIG_I2C is not set
644# CONFIG_SPI is not set 660# CONFIG_SPI is not set
661
662#
663# PPS support
664#
665# CONFIG_PPS is not set
645# CONFIG_W1 is not set 666# CONFIG_W1 is not set
646# CONFIG_POWER_SUPPLY is not set 667# CONFIG_POWER_SUPPLY is not set
647CONFIG_HWMON=y 668CONFIG_HWMON=y
648# CONFIG_HWMON_VID is not set 669# CONFIG_HWMON_VID is not set
670# CONFIG_HWMON_DEBUG_CHIP is not set
671
672#
673# Native drivers
674#
649# CONFIG_SENSORS_F71805F is not set 675# CONFIG_SENSORS_F71805F is not set
650# CONFIG_SENSORS_F71882FG is not set 676# CONFIG_SENSORS_F71882FG is not set
651# CONFIG_SENSORS_IT87 is not set 677# CONFIG_SENSORS_IT87 is not set
@@ -656,9 +682,7 @@ CONFIG_HWMON=y
656# CONFIG_SENSORS_VT1211 is not set 682# CONFIG_SENSORS_VT1211 is not set
657# CONFIG_SENSORS_W83627HF is not set 683# CONFIG_SENSORS_W83627HF is not set
658# CONFIG_SENSORS_W83627EHF is not set 684# CONFIG_SENSORS_W83627EHF is not set
659# CONFIG_HWMON_DEBUG_CHIP is not set
660# CONFIG_THERMAL is not set 685# CONFIG_THERMAL is not set
661# CONFIG_THERMAL_HWMON is not set
662# CONFIG_WATCHDOG is not set 686# CONFIG_WATCHDOG is not set
663CONFIG_SSB_POSSIBLE=y 687CONFIG_SSB_POSSIBLE=y
664 688
@@ -692,7 +716,6 @@ CONFIG_SSB_POSSIBLE=y
692# CONFIG_SOUND is not set 716# CONFIG_SOUND is not set
693CONFIG_HID_SUPPORT=y 717CONFIG_HID_SUPPORT=y
694CONFIG_HID=y 718CONFIG_HID=y
695# CONFIG_HID_DEBUG is not set
696# CONFIG_HIDRAW is not set 719# CONFIG_HIDRAW is not set
697# CONFIG_HID_PID is not set 720# CONFIG_HID_PID is not set
698 721
@@ -746,7 +769,9 @@ CONFIG_EXT2_FS=y
746# CONFIG_JFS_FS is not set 769# CONFIG_JFS_FS is not set
747# CONFIG_FS_POSIX_ACL is not set 770# CONFIG_FS_POSIX_ACL is not set
748# CONFIG_XFS_FS is not set 771# CONFIG_XFS_FS is not set
772# CONFIG_GFS2_FS is not set
749# CONFIG_BTRFS_FS is not set 773# CONFIG_BTRFS_FS is not set
774# CONFIG_NILFS2_FS is not set
750CONFIG_FILE_LOCKING=y 775CONFIG_FILE_LOCKING=y
751CONFIG_FSNOTIFY=y 776CONFIG_FSNOTIFY=y
752CONFIG_DNOTIFY=y 777CONFIG_DNOTIFY=y
@@ -815,7 +840,6 @@ CONFIG_JFFS2_RTIME=y
815# CONFIG_ROMFS_FS is not set 840# CONFIG_ROMFS_FS is not set
816# CONFIG_SYSV_FS is not set 841# CONFIG_SYSV_FS is not set
817# CONFIG_UFS_FS is not set 842# CONFIG_UFS_FS is not set
818# CONFIG_NILFS2_FS is not set
819CONFIG_NETWORK_FILESYSTEMS=y 843CONFIG_NETWORK_FILESYSTEMS=y
820CONFIG_NFS_FS=y 844CONFIG_NFS_FS=y
821# CONFIG_NFS_V3 is not set 845# CONFIG_NFS_V3 is not set
@@ -849,6 +873,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
849CONFIG_ENABLE_MUST_CHECK=y 873CONFIG_ENABLE_MUST_CHECK=y
850CONFIG_FRAME_WARN=1024 874CONFIG_FRAME_WARN=1024
851# CONFIG_MAGIC_SYSRQ is not set 875# CONFIG_MAGIC_SYSRQ is not set
876# CONFIG_STRIP_ASM_SYMS is not set
852# CONFIG_UNUSED_SYMBOLS is not set 877# CONFIG_UNUSED_SYMBOLS is not set
853# CONFIG_HEADERS_CHECK is not set 878# CONFIG_HEADERS_CHECK is not set
854# CONFIG_DEBUG_KERNEL is not set 879# CONFIG_DEBUG_KERNEL is not set
@@ -857,8 +882,11 @@ CONFIG_FRAME_WARN=1024
857# CONFIG_RCU_CPU_STALL_DETECTOR is not set 882# CONFIG_RCU_CPU_STALL_DETECTOR is not set
858# CONFIG_LATENCYTOP is not set 883# CONFIG_LATENCYTOP is not set
859CONFIG_HAVE_FUNCTION_TRACER=y 884CONFIG_HAVE_FUNCTION_TRACER=y
885CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
886CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
860CONFIG_HAVE_DYNAMIC_FTRACE=y 887CONFIG_HAVE_DYNAMIC_FTRACE=y
861CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 888CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
889CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
862CONFIG_TRACING_SUPPORT=y 890CONFIG_TRACING_SUPPORT=y
863# CONFIG_FTRACE is not set 891# CONFIG_FTRACE is not set
864# CONFIG_DMA_API_DEBUG is not set 892# CONFIG_DMA_API_DEBUG is not set
@@ -866,6 +894,7 @@ CONFIG_TRACING_SUPPORT=y
866CONFIG_HAVE_ARCH_KGDB=y 894CONFIG_HAVE_ARCH_KGDB=y
867# CONFIG_SH_STANDARD_BIOS is not set 895# CONFIG_SH_STANDARD_BIOS is not set
868# CONFIG_EARLY_SCIF_CONSOLE is not set 896# CONFIG_EARLY_SCIF_CONSOLE is not set
897# CONFIG_DWARF_UNWINDER is not set
869 898
870# 899#
871# Security options 900# Security options
@@ -878,7 +907,6 @@ CONFIG_CRYPTO=y
878# 907#
879# Crypto core or helper 908# Crypto core or helper
880# 909#
881# CONFIG_CRYPTO_FIPS is not set
882# CONFIG_CRYPTO_MANAGER is not set 910# CONFIG_CRYPTO_MANAGER is not set
883# CONFIG_CRYPTO_MANAGER2 is not set 911# CONFIG_CRYPTO_MANAGER2 is not set
884# CONFIG_CRYPTO_GF128MUL is not set 912# CONFIG_CRYPTO_GF128MUL is not set
@@ -910,11 +938,13 @@ CONFIG_CRYPTO=y
910# 938#
911# CONFIG_CRYPTO_HMAC is not set 939# CONFIG_CRYPTO_HMAC is not set
912# CONFIG_CRYPTO_XCBC is not set 940# CONFIG_CRYPTO_XCBC is not set
941# CONFIG_CRYPTO_VMAC is not set
913 942
914# 943#
915# Digest 944# Digest
916# 945#
917# CONFIG_CRYPTO_CRC32C is not set 946# CONFIG_CRYPTO_CRC32C is not set
947# CONFIG_CRYPTO_GHASH is not set
918# CONFIG_CRYPTO_MD4 is not set 948# CONFIG_CRYPTO_MD4 is not set
919# CONFIG_CRYPTO_MD5 is not set 949# CONFIG_CRYPTO_MD5 is not set
920# CONFIG_CRYPTO_MICHAEL_MIC is not set 950# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -979,5 +1009,6 @@ CONFIG_DECOMPRESS_GZIP=y
979CONFIG_HAS_IOMEM=y 1009CONFIG_HAS_IOMEM=y
980CONFIG_HAS_IOPORT=y 1010CONFIG_HAS_IOPORT=y
981CONFIG_HAS_DMA=y 1011CONFIG_HAS_DMA=y
1012CONFIG_HAVE_LMB=y
982CONFIG_NLATTR=y 1013CONFIG_NLATTR=y
983CONFIG_GENERIC_ATOMIC64=y 1014CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7712_defconfig b/arch/sh/configs/se7712_defconfig
index b8aae11bc8fa..1a43cfecb392 100644
--- a/arch/sh/configs/se7712_defconfig
+++ b/arch/sh/configs/se7712_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:49:00 2009 4# Thu Sep 24 18:53:32 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,6 +13,7 @@ CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_HARDIRQS=y 13CONFIG_GENERIC_HARDIRQS=y
14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
15CONFIG_GENERIC_IRQ_PROBE=y 15CONFIG_GENERIC_IRQ_PROBE=y
16CONFIG_IRQ_PER_CPU=y
16# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
17CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
@@ -26,7 +27,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 27# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 28CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y 29CONFIG_ARCH_HAS_DEFAULT_IDLE=y
30CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
32CONFIG_CONSTRUCTORS=y
30 33
31# 34#
32# General setup 35# General setup
@@ -36,6 +39,12 @@ CONFIG_BROKEN_ON_SMP=y
36CONFIG_INIT_ENV_ARG_LIMIT=32 39CONFIG_INIT_ENV_ARG_LIMIT=32
37CONFIG_LOCALVERSION="" 40CONFIG_LOCALVERSION=""
38# CONFIG_LOCALVERSION_AUTO is not set 41# CONFIG_LOCALVERSION_AUTO is not set
42CONFIG_HAVE_KERNEL_GZIP=y
43CONFIG_HAVE_KERNEL_BZIP2=y
44CONFIG_HAVE_KERNEL_LZMA=y
45CONFIG_KERNEL_GZIP=y
46# CONFIG_KERNEL_BZIP2 is not set
47# CONFIG_KERNEL_LZMA is not set
39# CONFIG_SWAP is not set 48# CONFIG_SWAP is not set
40CONFIG_SYSVIPC=y 49CONFIG_SYSVIPC=y
41CONFIG_SYSVIPC_SYSCTL=y 50CONFIG_SYSVIPC_SYSCTL=y
@@ -49,11 +58,12 @@ CONFIG_BSD_PROCESS_ACCT=y
49# 58#
50# RCU Subsystem 59# RCU Subsystem
51# 60#
52CONFIG_CLASSIC_RCU=y 61CONFIG_TREE_RCU=y
53# CONFIG_TREE_RCU is not set 62# CONFIG_TREE_PREEMPT_RCU is not set
54# CONFIG_PREEMPT_RCU is not set 63# CONFIG_RCU_TRACE is not set
64CONFIG_RCU_FANOUT=32
65# CONFIG_RCU_FANOUT_EXACT is not set
55# CONFIG_TREE_RCU_TRACE is not set 66# CONFIG_TREE_RCU_TRACE is not set
56# CONFIG_PREEMPT_RCU_TRACE is not set
57# CONFIG_IKCONFIG is not set 67# CONFIG_IKCONFIG is not set
58CONFIG_LOG_BUF_SHIFT=14 68CONFIG_LOG_BUF_SHIFT=14
59# CONFIG_GROUP_SCHED is not set 69# CONFIG_GROUP_SCHED is not set
@@ -84,18 +94,19 @@ CONFIG_TIMERFD=y
84CONFIG_EVENTFD=y 94CONFIG_EVENTFD=y
85# CONFIG_SHMEM is not set 95# CONFIG_SHMEM is not set
86CONFIG_AIO=y 96CONFIG_AIO=y
97CONFIG_HAVE_PERF_EVENTS=y
87 98
88# 99#
89# Performance Counters 100# Kernel Performance Events And Counters
90# 101#
102# CONFIG_PERF_EVENTS is not set
103# CONFIG_PERF_COUNTERS is not set
91CONFIG_VM_EVENT_COUNTERS=y 104CONFIG_VM_EVENT_COUNTERS=y
92# CONFIG_STRIP_ASM_SYMS is not set
93CONFIG_COMPAT_BRK=y 105CONFIG_COMPAT_BRK=y
94CONFIG_SLAB=y 106CONFIG_SLAB=y
95# CONFIG_SLUB is not set 107# CONFIG_SLUB is not set
96# CONFIG_SLOB is not set 108# CONFIG_SLOB is not set
97# CONFIG_PROFILING is not set 109# CONFIG_PROFILING is not set
98# CONFIG_MARKERS is not set
99CONFIG_HAVE_OPROFILE=y 110CONFIG_HAVE_OPROFILE=y
100# CONFIG_KPROBES is not set 111# CONFIG_KPROBES is not set
101CONFIG_HAVE_IOREMAP_PROT=y 112CONFIG_HAVE_IOREMAP_PROT=y
@@ -104,6 +115,10 @@ CONFIG_HAVE_KRETPROBES=y
104CONFIG_HAVE_ARCH_TRACEHOOK=y 115CONFIG_HAVE_ARCH_TRACEHOOK=y
105CONFIG_HAVE_CLK=y 116CONFIG_HAVE_CLK=y
106CONFIG_HAVE_DMA_API_DEBUG=y 117CONFIG_HAVE_DMA_API_DEBUG=y
118
119#
120# GCOV-based kernel profiling
121#
107# CONFIG_SLOW_WORK is not set 122# CONFIG_SLOW_WORK is not set
108CONFIG_HAVE_GENERIC_DMA_COHERENT=y 123CONFIG_HAVE_GENERIC_DMA_COHERENT=y
109CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
@@ -115,7 +130,7 @@ CONFIG_MODULES=y
115# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
116# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
117CONFIG_BLOCK=y 132CONFIG_BLOCK=y
118# CONFIG_LBD is not set 133CONFIG_LBDAF=y
119# CONFIG_BLK_DEV_BSG is not set 134# CONFIG_BLK_DEV_BSG is not set
120# CONFIG_BLK_DEV_INTEGRITY is not set 135# CONFIG_BLK_DEV_INTEGRITY is not set
121 136
@@ -162,6 +177,7 @@ CONFIG_CPU_SUBTYPE_SH7712=y
162# CONFIG_CPU_SUBTYPE_SH4_202 is not set 177# CONFIG_CPU_SUBTYPE_SH4_202 is not set
163# CONFIG_CPU_SUBTYPE_SH7723 is not set 178# CONFIG_CPU_SUBTYPE_SH7723 is not set
164# CONFIG_CPU_SUBTYPE_SH7724 is not set 179# CONFIG_CPU_SUBTYPE_SH7724 is not set
180# CONFIG_CPU_SUBTYPE_SH7757 is not set
165# CONFIG_CPU_SUBTYPE_SH7763 is not set 181# CONFIG_CPU_SUBTYPE_SH7763 is not set
166# CONFIG_CPU_SUBTYPE_SH7770 is not set 182# CONFIG_CPU_SUBTYPE_SH7770 is not set
167# CONFIG_CPU_SUBTYPE_SH7780 is not set 183# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -207,6 +223,7 @@ CONFIG_ZONE_DMA_FLAG=0
207CONFIG_NR_QUICK=2 223CONFIG_NR_QUICK=2
208CONFIG_HAVE_MLOCK=y 224CONFIG_HAVE_MLOCK=y
209CONFIG_HAVE_MLOCKED_PAGE_BIT=y 225CONFIG_HAVE_MLOCKED_PAGE_BIT=y
226# CONFIG_KSM is not set
210CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 227CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
211 228
212# 229#
@@ -291,7 +308,8 @@ CONFIG_GUSA=y
291CONFIG_ZERO_PAGE_OFFSET=0x00001000 308CONFIG_ZERO_PAGE_OFFSET=0x00001000
292CONFIG_BOOT_LINK_OFFSET=0x00800000 309CONFIG_BOOT_LINK_OFFSET=0x00800000
293CONFIG_ENTRY_OFFSET=0x00001000 310CONFIG_ENTRY_OFFSET=0x00001000
294CONFIG_CMDLINE_BOOL=y 311CONFIG_CMDLINE_OVERWRITE=y
312# CONFIG_CMDLINE_EXTEND is not set
295CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1" 313CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
296 314
297# 315#
@@ -368,6 +386,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
368# CONFIG_NETFILTER is not set 386# CONFIG_NETFILTER is not set
369# CONFIG_IP_DCCP is not set 387# CONFIG_IP_DCCP is not set
370# CONFIG_IP_SCTP is not set 388# CONFIG_IP_SCTP is not set
389# CONFIG_RDS is not set
371# CONFIG_TIPC is not set 390# CONFIG_TIPC is not set
372# CONFIG_ATM is not set 391# CONFIG_ATM is not set
373# CONFIG_BRIDGE is not set 392# CONFIG_BRIDGE is not set
@@ -433,6 +452,7 @@ CONFIG_NET_SCH_FIFO=y
433CONFIG_FIB_RULES=y 452CONFIG_FIB_RULES=y
434CONFIG_WIRELESS=y 453CONFIG_WIRELESS=y
435# CONFIG_CFG80211 is not set 454# CONFIG_CFG80211 is not set
455CONFIG_CFG80211_DEFAULT_PS_VALUE=0
436# CONFIG_WIRELESS_OLD_REGULATORY is not set 456# CONFIG_WIRELESS_OLD_REGULATORY is not set
437# CONFIG_WIRELESS_EXT is not set 457# CONFIG_WIRELESS_EXT is not set
438# CONFIG_LIB80211 is not set 458# CONFIG_LIB80211 is not set
@@ -440,7 +460,6 @@ CONFIG_WIRELESS=y
440# 460#
441# CFG80211 needs to be enabled for MAC80211 461# CFG80211 needs to be enabled for MAC80211
442# 462#
443CONFIG_MAC80211_DEFAULT_PS_VALUE=0
444# CONFIG_WIMAX is not set 463# CONFIG_WIMAX is not set
445# CONFIG_RFKILL is not set 464# CONFIG_RFKILL is not set
446# CONFIG_NET_9P is not set 465# CONFIG_NET_9P is not set
@@ -464,9 +483,9 @@ CONFIG_EXTRA_FIRMWARE=""
464# CONFIG_CONNECTOR is not set 483# CONFIG_CONNECTOR is not set
465CONFIG_MTD=y 484CONFIG_MTD=y
466# CONFIG_MTD_DEBUG is not set 485# CONFIG_MTD_DEBUG is not set
486# CONFIG_MTD_TESTS is not set
467CONFIG_MTD_CONCAT=y 487CONFIG_MTD_CONCAT=y
468CONFIG_MTD_PARTITIONS=y 488CONFIG_MTD_PARTITIONS=y
469# CONFIG_MTD_TESTS is not set
470# CONFIG_MTD_REDBOOT_PARTS is not set 489# CONFIG_MTD_REDBOOT_PARTS is not set
471# CONFIG_MTD_CMDLINE_PARTS is not set 490# CONFIG_MTD_CMDLINE_PARTS is not set
472# CONFIG_MTD_AR7_PARTS is not set 491# CONFIG_MTD_AR7_PARTS is not set
@@ -597,7 +616,6 @@ CONFIG_SCSI_WAIT_SCAN=m
597# CONFIG_SCSI_SRP_ATTRS is not set 616# CONFIG_SCSI_SRP_ATTRS is not set
598CONFIG_SCSI_LOWLEVEL=y 617CONFIG_SCSI_LOWLEVEL=y
599# CONFIG_ISCSI_TCP is not set 618# CONFIG_ISCSI_TCP is not set
600# CONFIG_SCSI_BNX2_ISCSI is not set
601# CONFIG_LIBFC is not set 619# CONFIG_LIBFC is not set
602# CONFIG_LIBFCOE is not set 620# CONFIG_LIBFCOE is not set
603# CONFIG_SCSI_DEBUG is not set 621# CONFIG_SCSI_DEBUG is not set
@@ -605,6 +623,7 @@ CONFIG_SCSI_LOWLEVEL=y
605# CONFIG_SCSI_OSD_INITIATOR is not set 623# CONFIG_SCSI_OSD_INITIATOR is not set
606CONFIG_ATA=y 624CONFIG_ATA=y
607# CONFIG_ATA_NONSTANDARD is not set 625# CONFIG_ATA_NONSTANDARD is not set
626CONFIG_ATA_VERBOSE_ERROR=y
608CONFIG_SATA_PMP=y 627CONFIG_SATA_PMP=y
609CONFIG_ATA_SFF=y 628CONFIG_ATA_SFF=y
610# CONFIG_SATA_MV is not set 629# CONFIG_SATA_MV is not set
@@ -658,10 +677,7 @@ CONFIG_SH_ETH=y
658# CONFIG_KS8842 is not set 677# CONFIG_KS8842 is not set
659CONFIG_NETDEV_1000=y 678CONFIG_NETDEV_1000=y
660CONFIG_NETDEV_10000=y 679CONFIG_NETDEV_10000=y
661 680CONFIG_WLAN=y
662#
663# Wireless LAN
664#
665# CONFIG_WLAN_PRE80211 is not set 681# CONFIG_WLAN_PRE80211 is not set
666# CONFIG_WLAN_80211 is not set 682# CONFIG_WLAN_80211 is not set
667 683
@@ -719,11 +735,15 @@ CONFIG_HW_RANDOM=m
719# CONFIG_TCG_TPM is not set 735# CONFIG_TCG_TPM is not set
720# CONFIG_I2C is not set 736# CONFIG_I2C is not set
721# CONFIG_SPI is not set 737# CONFIG_SPI is not set
738
739#
740# PPS support
741#
742# CONFIG_PPS is not set
722# CONFIG_W1 is not set 743# CONFIG_W1 is not set
723# CONFIG_POWER_SUPPLY is not set 744# CONFIG_POWER_SUPPLY is not set
724# CONFIG_HWMON is not set 745# CONFIG_HWMON is not set
725# CONFIG_THERMAL is not set 746# CONFIG_THERMAL is not set
726# CONFIG_THERMAL_HWMON is not set
727# CONFIG_WATCHDOG is not set 747# CONFIG_WATCHDOG is not set
728CONFIG_SSB_POSSIBLE=y 748CONFIG_SSB_POSSIBLE=y
729 749
@@ -828,8 +848,10 @@ CONFIG_FS_MBCACHE=y
828# CONFIG_JFS_FS is not set 848# CONFIG_JFS_FS is not set
829CONFIG_FS_POSIX_ACL=y 849CONFIG_FS_POSIX_ACL=y
830# CONFIG_XFS_FS is not set 850# CONFIG_XFS_FS is not set
851# CONFIG_GFS2_FS is not set
831# CONFIG_OCFS2_FS is not set 852# CONFIG_OCFS2_FS is not set
832# CONFIG_BTRFS_FS is not set 853# CONFIG_BTRFS_FS is not set
854# CONFIG_NILFS2_FS is not set
833CONFIG_FILE_LOCKING=y 855CONFIG_FILE_LOCKING=y
834CONFIG_FSNOTIFY=y 856CONFIG_FSNOTIFY=y
835# CONFIG_DNOTIFY is not set 857# CONFIG_DNOTIFY is not set
@@ -866,8 +888,6 @@ CONFIG_PROC_FS=y
866CONFIG_PROC_SYSCTL=y 888CONFIG_PROC_SYSCTL=y
867CONFIG_PROC_PAGE_MONITOR=y 889CONFIG_PROC_PAGE_MONITOR=y
868CONFIG_SYSFS=y 890CONFIG_SYSFS=y
869CONFIG_TMPFS=y
870# CONFIG_TMPFS_POSIX_ACL is not set
871# CONFIG_HUGETLBFS is not set 891# CONFIG_HUGETLBFS is not set
872# CONFIG_HUGETLB_PAGE is not set 892# CONFIG_HUGETLB_PAGE is not set
873# CONFIG_CONFIGFS_FS is not set 893# CONFIG_CONFIGFS_FS is not set
@@ -900,7 +920,6 @@ CONFIG_CRAMFS=y
900# CONFIG_ROMFS_FS is not set 920# CONFIG_ROMFS_FS is not set
901# CONFIG_SYSV_FS is not set 921# CONFIG_SYSV_FS is not set
902# CONFIG_UFS_FS is not set 922# CONFIG_UFS_FS is not set
903# CONFIG_NILFS2_FS is not set
904CONFIG_NETWORK_FILESYSTEMS=y 923CONFIG_NETWORK_FILESYSTEMS=y
905CONFIG_NFS_FS=y 924CONFIG_NFS_FS=y
906# CONFIG_NFS_V3 is not set 925# CONFIG_NFS_V3 is not set
@@ -935,6 +954,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
935CONFIG_ENABLE_MUST_CHECK=y 954CONFIG_ENABLE_MUST_CHECK=y
936CONFIG_FRAME_WARN=1024 955CONFIG_FRAME_WARN=1024
937# CONFIG_MAGIC_SYSRQ is not set 956# CONFIG_MAGIC_SYSRQ is not set
957# CONFIG_STRIP_ASM_SYMS is not set
938# CONFIG_UNUSED_SYMBOLS is not set 958# CONFIG_UNUSED_SYMBOLS is not set
939# CONFIG_DEBUG_FS is not set 959# CONFIG_DEBUG_FS is not set
940# CONFIG_HEADERS_CHECK is not set 960# CONFIG_HEADERS_CHECK is not set
@@ -964,24 +984,30 @@ CONFIG_DEBUG_INFO=y
964# CONFIG_DEBUG_LIST is not set 984# CONFIG_DEBUG_LIST is not set
965# CONFIG_DEBUG_SG is not set 985# CONFIG_DEBUG_SG is not set
966# CONFIG_DEBUG_NOTIFIERS is not set 986# CONFIG_DEBUG_NOTIFIERS is not set
987# CONFIG_DEBUG_CREDENTIALS is not set
967CONFIG_FRAME_POINTER=y 988CONFIG_FRAME_POINTER=y
968# CONFIG_RCU_TORTURE_TEST is not set 989# CONFIG_RCU_TORTURE_TEST is not set
969# CONFIG_RCU_CPU_STALL_DETECTOR is not set 990# CONFIG_RCU_CPU_STALL_DETECTOR is not set
970# CONFIG_BACKTRACE_SELF_TEST is not set 991# CONFIG_BACKTRACE_SELF_TEST is not set
971# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 992# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
993# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
972# CONFIG_FAULT_INJECTION is not set 994# CONFIG_FAULT_INJECTION is not set
973# CONFIG_LATENCYTOP is not set 995# CONFIG_LATENCYTOP is not set
974CONFIG_SYSCTL_SYSCALL_CHECK=y 996CONFIG_SYSCTL_SYSCALL_CHECK=y
975# CONFIG_PAGE_POISONING is not set 997# CONFIG_PAGE_POISONING is not set
976CONFIG_HAVE_FUNCTION_TRACER=y 998CONFIG_HAVE_FUNCTION_TRACER=y
999CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1000CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
977CONFIG_HAVE_DYNAMIC_FTRACE=y 1001CONFIG_HAVE_DYNAMIC_FTRACE=y
978CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1002CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1003CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
979CONFIG_TRACING_SUPPORT=y 1004CONFIG_TRACING_SUPPORT=y
980CONFIG_FTRACE=y 1005CONFIG_FTRACE=y
981# CONFIG_FUNCTION_TRACER is not set 1006# CONFIG_FUNCTION_TRACER is not set
982# CONFIG_IRQSOFF_TRACER is not set 1007# CONFIG_IRQSOFF_TRACER is not set
983# CONFIG_SCHED_TRACER is not set 1008# CONFIG_SCHED_TRACER is not set
984# CONFIG_ENABLE_DEFAULT_TRACERS is not set 1009# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1010# CONFIG_FTRACE_SYSCALLS is not set
985# CONFIG_BOOT_TRACER is not set 1011# CONFIG_BOOT_TRACER is not set
986CONFIG_BRANCH_PROFILE_NONE=y 1012CONFIG_BRANCH_PROFILE_NONE=y
987# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1013# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -994,14 +1020,13 @@ CONFIG_BRANCH_PROFILE_NONE=y
994# CONFIG_SAMPLES is not set 1020# CONFIG_SAMPLES is not set
995CONFIG_HAVE_ARCH_KGDB=y 1021CONFIG_HAVE_ARCH_KGDB=y
996# CONFIG_KGDB is not set 1022# CONFIG_KGDB is not set
997# CONFIG_KMEMCHECK is not set
998# CONFIG_SH_STANDARD_BIOS is not set 1023# CONFIG_SH_STANDARD_BIOS is not set
999# CONFIG_EARLY_SCIF_CONSOLE is not set 1024# CONFIG_EARLY_SCIF_CONSOLE is not set
1000# CONFIG_DEBUG_BOOTMEM is not set 1025# CONFIG_STACK_DEBUG is not set
1001# CONFIG_DEBUG_STACKOVERFLOW is not set
1002# CONFIG_DEBUG_STACK_USAGE is not set 1026# CONFIG_DEBUG_STACK_USAGE is not set
1003# CONFIG_4KSTACKS is not set 1027# CONFIG_4KSTACKS is not set
1004# CONFIG_DUMP_CODE is not set 1028# CONFIG_DUMP_CODE is not set
1029# CONFIG_DWARF_UNWINDER is not set
1005# CONFIG_SH_NO_BSS_INIT is not set 1030# CONFIG_SH_NO_BSS_INIT is not set
1006 1031
1007# 1032#
@@ -1016,7 +1041,6 @@ CONFIG_CRYPTO=y
1016# 1041#
1017# Crypto core or helper 1042# Crypto core or helper
1018# 1043#
1019# CONFIG_CRYPTO_FIPS is not set
1020CONFIG_CRYPTO_ALGAPI=y 1044CONFIG_CRYPTO_ALGAPI=y
1021CONFIG_CRYPTO_ALGAPI2=y 1045CONFIG_CRYPTO_ALGAPI2=y
1022CONFIG_CRYPTO_AEAD=y 1046CONFIG_CRYPTO_AEAD=y
@@ -1059,11 +1083,13 @@ CONFIG_CRYPTO_PCBC=m
1059# 1083#
1060CONFIG_CRYPTO_HMAC=y 1084CONFIG_CRYPTO_HMAC=y
1061# CONFIG_CRYPTO_XCBC is not set 1085# CONFIG_CRYPTO_XCBC is not set
1086# CONFIG_CRYPTO_VMAC is not set
1062 1087
1063# 1088#
1064# Digest 1089# Digest
1065# 1090#
1066# CONFIG_CRYPTO_CRC32C is not set 1091# CONFIG_CRYPTO_CRC32C is not set
1092# CONFIG_CRYPTO_GHASH is not set
1067# CONFIG_CRYPTO_MD4 is not set 1093# CONFIG_CRYPTO_MD4 is not set
1068CONFIG_CRYPTO_MD5=y 1094CONFIG_CRYPTO_MD5=y
1069# CONFIG_CRYPTO_MICHAEL_MIC is not set 1095# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1127,5 +1153,6 @@ CONFIG_ZLIB_DEFLATE=y
1127CONFIG_HAS_IOMEM=y 1153CONFIG_HAS_IOMEM=y
1128CONFIG_HAS_IOPORT=y 1154CONFIG_HAS_IOPORT=y
1129CONFIG_HAS_DMA=y 1155CONFIG_HAS_DMA=y
1156CONFIG_HAVE_LMB=y
1130CONFIG_NLATTR=y 1157CONFIG_NLATTR=y
1131CONFIG_GENERIC_ATOMIC64=y 1158CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7721_defconfig b/arch/sh/configs/se7721_defconfig
index 306e21c4253d..b8a3c8c4bac3 100644
--- a/arch/sh/configs/se7721_defconfig
+++ b/arch/sh/configs/se7721_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:50:49 2009 4# Thu Sep 24 18:57:11 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,6 +13,7 @@ CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_HARDIRQS=y 13CONFIG_GENERIC_HARDIRQS=y
14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
15CONFIG_GENERIC_IRQ_PROBE=y 15CONFIG_GENERIC_IRQ_PROBE=y
16CONFIG_IRQ_PER_CPU=y
16# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
17CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
@@ -27,7 +28,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 28# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 29CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y
31 34
32# 35#
33# General setup 36# General setup
@@ -37,6 +40,12 @@ CONFIG_BROKEN_ON_SMP=y
37CONFIG_INIT_ENV_ARG_LIMIT=32 40CONFIG_INIT_ENV_ARG_LIMIT=32
38CONFIG_LOCALVERSION="" 41CONFIG_LOCALVERSION=""
39# CONFIG_LOCALVERSION_AUTO is not set 42# CONFIG_LOCALVERSION_AUTO is not set
43CONFIG_HAVE_KERNEL_GZIP=y
44CONFIG_HAVE_KERNEL_BZIP2=y
45CONFIG_HAVE_KERNEL_LZMA=y
46CONFIG_KERNEL_GZIP=y
47# CONFIG_KERNEL_BZIP2 is not set
48# CONFIG_KERNEL_LZMA is not set
40# CONFIG_SWAP is not set 49# CONFIG_SWAP is not set
41CONFIG_SYSVIPC=y 50CONFIG_SYSVIPC=y
42CONFIG_SYSVIPC_SYSCTL=y 51CONFIG_SYSVIPC_SYSCTL=y
@@ -50,11 +59,12 @@ CONFIG_BSD_PROCESS_ACCT=y
50# 59#
51# RCU Subsystem 60# RCU Subsystem
52# 61#
53CONFIG_CLASSIC_RCU=y 62CONFIG_TREE_RCU=y
54# CONFIG_TREE_RCU is not set 63# CONFIG_TREE_PREEMPT_RCU is not set
55# CONFIG_PREEMPT_RCU is not set 64# CONFIG_RCU_TRACE is not set
65CONFIG_RCU_FANOUT=32
66# CONFIG_RCU_FANOUT_EXACT is not set
56# CONFIG_TREE_RCU_TRACE is not set 67# CONFIG_TREE_RCU_TRACE is not set
57# CONFIG_PREEMPT_RCU_TRACE is not set
58# CONFIG_IKCONFIG is not set 68# CONFIG_IKCONFIG is not set
59CONFIG_LOG_BUF_SHIFT=14 69CONFIG_LOG_BUF_SHIFT=14
60CONFIG_GROUP_SCHED=y 70CONFIG_GROUP_SCHED=y
@@ -89,18 +99,19 @@ CONFIG_TIMERFD=y
89CONFIG_EVENTFD=y 99CONFIG_EVENTFD=y
90# CONFIG_SHMEM is not set 100# CONFIG_SHMEM is not set
91CONFIG_AIO=y 101CONFIG_AIO=y
102CONFIG_HAVE_PERF_EVENTS=y
92 103
93# 104#
94# Performance Counters 105# Kernel Performance Events And Counters
95# 106#
107# CONFIG_PERF_EVENTS is not set
108# CONFIG_PERF_COUNTERS is not set
96CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
97# CONFIG_STRIP_ASM_SYMS is not set
98CONFIG_COMPAT_BRK=y 110CONFIG_COMPAT_BRK=y
99CONFIG_SLAB=y 111CONFIG_SLAB=y
100# CONFIG_SLUB is not set 112# CONFIG_SLUB is not set
101# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
102# CONFIG_PROFILING is not set 114# CONFIG_PROFILING is not set
103# CONFIG_MARKERS is not set
104CONFIG_HAVE_OPROFILE=y 115CONFIG_HAVE_OPROFILE=y
105# CONFIG_KPROBES is not set 116# CONFIG_KPROBES is not set
106CONFIG_HAVE_IOREMAP_PROT=y 117CONFIG_HAVE_IOREMAP_PROT=y
@@ -109,6 +120,10 @@ CONFIG_HAVE_KRETPROBES=y
109CONFIG_HAVE_ARCH_TRACEHOOK=y 120CONFIG_HAVE_ARCH_TRACEHOOK=y
110CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
111CONFIG_HAVE_DMA_API_DEBUG=y 122CONFIG_HAVE_DMA_API_DEBUG=y
123
124#
125# GCOV-based kernel profiling
126#
112# CONFIG_SLOW_WORK is not set 127# CONFIG_SLOW_WORK is not set
113CONFIG_HAVE_GENERIC_DMA_COHERENT=y 128CONFIG_HAVE_GENERIC_DMA_COHERENT=y
114CONFIG_SLABINFO=y 129CONFIG_SLABINFO=y
@@ -120,7 +135,7 @@ CONFIG_MODULES=y
120# CONFIG_MODVERSIONS is not set 135# CONFIG_MODVERSIONS is not set
121# CONFIG_MODULE_SRCVERSION_ALL is not set 136# CONFIG_MODULE_SRCVERSION_ALL is not set
122CONFIG_BLOCK=y 137CONFIG_BLOCK=y
123# CONFIG_LBD is not set 138CONFIG_LBDAF=y
124# CONFIG_BLK_DEV_BSG is not set 139# CONFIG_BLK_DEV_BSG is not set
125# CONFIG_BLK_DEV_INTEGRITY is not set 140# CONFIG_BLK_DEV_INTEGRITY is not set
126 141
@@ -167,6 +182,7 @@ CONFIG_CPU_SUBTYPE_SH7721=y
167# CONFIG_CPU_SUBTYPE_SH4_202 is not set 182# CONFIG_CPU_SUBTYPE_SH4_202 is not set
168# CONFIG_CPU_SUBTYPE_SH7723 is not set 183# CONFIG_CPU_SUBTYPE_SH7723 is not set
169# CONFIG_CPU_SUBTYPE_SH7724 is not set 184# CONFIG_CPU_SUBTYPE_SH7724 is not set
185# CONFIG_CPU_SUBTYPE_SH7757 is not set
170# CONFIG_CPU_SUBTYPE_SH7763 is not set 186# CONFIG_CPU_SUBTYPE_SH7763 is not set
171# CONFIG_CPU_SUBTYPE_SH7770 is not set 187# CONFIG_CPU_SUBTYPE_SH7770 is not set
172# CONFIG_CPU_SUBTYPE_SH7780 is not set 188# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -212,6 +228,7 @@ CONFIG_ZONE_DMA_FLAG=0
212CONFIG_NR_QUICK=2 228CONFIG_NR_QUICK=2
213CONFIG_HAVE_MLOCK=y 229CONFIG_HAVE_MLOCK=y
214CONFIG_HAVE_MLOCKED_PAGE_BIT=y 230CONFIG_HAVE_MLOCKED_PAGE_BIT=y
231# CONFIG_KSM is not set
215CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 232CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
216 233
217# 234#
@@ -296,7 +313,8 @@ CONFIG_GUSA=y
296CONFIG_ZERO_PAGE_OFFSET=0x00001000 313CONFIG_ZERO_PAGE_OFFSET=0x00001000
297CONFIG_BOOT_LINK_OFFSET=0x00800000 314CONFIG_BOOT_LINK_OFFSET=0x00800000
298CONFIG_ENTRY_OFFSET=0x00001000 315CONFIG_ENTRY_OFFSET=0x00001000
299CONFIG_CMDLINE_BOOL=y 316CONFIG_CMDLINE_OVERWRITE=y
317# CONFIG_CMDLINE_EXTEND is not set
300CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda2" 318CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda2"
301 319
302# 320#
@@ -373,6 +391,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
373# CONFIG_NETFILTER is not set 391# CONFIG_NETFILTER is not set
374# CONFIG_IP_DCCP is not set 392# CONFIG_IP_DCCP is not set
375# CONFIG_IP_SCTP is not set 393# CONFIG_IP_SCTP is not set
394# CONFIG_RDS is not set
376# CONFIG_TIPC is not set 395# CONFIG_TIPC is not set
377# CONFIG_ATM is not set 396# CONFIG_ATM is not set
378# CONFIG_BRIDGE is not set 397# CONFIG_BRIDGE is not set
@@ -438,6 +457,7 @@ CONFIG_NET_SCH_FIFO=y
438CONFIG_FIB_RULES=y 457CONFIG_FIB_RULES=y
439CONFIG_WIRELESS=y 458CONFIG_WIRELESS=y
440# CONFIG_CFG80211 is not set 459# CONFIG_CFG80211 is not set
460CONFIG_CFG80211_DEFAULT_PS_VALUE=0
441# CONFIG_WIRELESS_OLD_REGULATORY is not set 461# CONFIG_WIRELESS_OLD_REGULATORY is not set
442# CONFIG_WIRELESS_EXT is not set 462# CONFIG_WIRELESS_EXT is not set
443# CONFIG_LIB80211 is not set 463# CONFIG_LIB80211 is not set
@@ -445,7 +465,6 @@ CONFIG_WIRELESS=y
445# 465#
446# CFG80211 needs to be enabled for MAC80211 466# CFG80211 needs to be enabled for MAC80211
447# 467#
448CONFIG_MAC80211_DEFAULT_PS_VALUE=0
449# CONFIG_WIMAX is not set 468# CONFIG_WIMAX is not set
450# CONFIG_RFKILL is not set 469# CONFIG_RFKILL is not set
451# CONFIG_NET_9P is not set 470# CONFIG_NET_9P is not set
@@ -469,9 +488,9 @@ CONFIG_EXTRA_FIRMWARE=""
469# CONFIG_CONNECTOR is not set 488# CONFIG_CONNECTOR is not set
470CONFIG_MTD=y 489CONFIG_MTD=y
471# CONFIG_MTD_DEBUG is not set 490# CONFIG_MTD_DEBUG is not set
491# CONFIG_MTD_TESTS is not set
472CONFIG_MTD_CONCAT=y 492CONFIG_MTD_CONCAT=y
473CONFIG_MTD_PARTITIONS=y 493CONFIG_MTD_PARTITIONS=y
474# CONFIG_MTD_TESTS is not set
475# CONFIG_MTD_REDBOOT_PARTS is not set 494# CONFIG_MTD_REDBOOT_PARTS is not set
476# CONFIG_MTD_CMDLINE_PARTS is not set 495# CONFIG_MTD_CMDLINE_PARTS is not set
477# CONFIG_MTD_AR7_PARTS is not set 496# CONFIG_MTD_AR7_PARTS is not set
@@ -606,6 +625,7 @@ CONFIG_SCSI_WAIT_SCAN=m
606# CONFIG_SCSI_OSD_INITIATOR is not set 625# CONFIG_SCSI_OSD_INITIATOR is not set
607CONFIG_ATA=y 626CONFIG_ATA=y
608# CONFIG_ATA_NONSTANDARD is not set 627# CONFIG_ATA_NONSTANDARD is not set
628CONFIG_ATA_VERBOSE_ERROR=y
609CONFIG_SATA_PMP=y 629CONFIG_SATA_PMP=y
610CONFIG_ATA_SFF=y 630CONFIG_ATA_SFF=y
611# CONFIG_SATA_MV is not set 631# CONFIG_SATA_MV is not set
@@ -621,10 +641,7 @@ CONFIG_NETDEVICES=y
621# CONFIG_NET_ETHERNET is not set 641# CONFIG_NET_ETHERNET is not set
622CONFIG_NETDEV_1000=y 642CONFIG_NETDEV_1000=y
623CONFIG_NETDEV_10000=y 643CONFIG_NETDEV_10000=y
624 644CONFIG_WLAN=y
625#
626# Wireless LAN
627#
628# CONFIG_WLAN_PRE80211 is not set 645# CONFIG_WLAN_PRE80211 is not set
629# CONFIG_WLAN_80211 is not set 646# CONFIG_WLAN_80211 is not set
630 647
@@ -672,12 +689,13 @@ CONFIG_INPUT_EVDEV=y
672# 689#
673CONFIG_INPUT_KEYBOARD=y 690CONFIG_INPUT_KEYBOARD=y
674# CONFIG_KEYBOARD_ATKBD is not set 691# CONFIG_KEYBOARD_ATKBD is not set
675# CONFIG_KEYBOARD_SUNKBD is not set
676# CONFIG_KEYBOARD_LKKBD is not set 692# CONFIG_KEYBOARD_LKKBD is not set
677# CONFIG_KEYBOARD_XTKBD is not set
678# CONFIG_KEYBOARD_NEWTON is not set 693# CONFIG_KEYBOARD_NEWTON is not set
694# CONFIG_KEYBOARD_OPENCORES is not set
679# CONFIG_KEYBOARD_STOWAWAY is not set 695# CONFIG_KEYBOARD_STOWAWAY is not set
696# CONFIG_KEYBOARD_SUNKBD is not set
680# CONFIG_KEYBOARD_SH_KEYSC is not set 697# CONFIG_KEYBOARD_SH_KEYSC is not set
698# CONFIG_KEYBOARD_XTKBD is not set
681CONFIG_INPUT_MOUSE=y 699CONFIG_INPUT_MOUSE=y
682# CONFIG_MOUSE_PS2 is not set 700# CONFIG_MOUSE_PS2 is not set
683# CONFIG_MOUSE_SERIAL is not set 701# CONFIG_MOUSE_SERIAL is not set
@@ -725,6 +743,11 @@ CONFIG_UNIX98_PTYS=y
725# CONFIG_TCG_TPM is not set 743# CONFIG_TCG_TPM is not set
726# CONFIG_I2C is not set 744# CONFIG_I2C is not set
727# CONFIG_SPI is not set 745# CONFIG_SPI is not set
746
747#
748# PPS support
749#
750# CONFIG_PPS is not set
728# CONFIG_W1 is not set 751# CONFIG_W1 is not set
729# CONFIG_POWER_SUPPLY is not set 752# CONFIG_POWER_SUPPLY is not set
730# CONFIG_HWMON is not set 753# CONFIG_HWMON is not set
@@ -762,7 +785,6 @@ CONFIG_SSB_POSSIBLE=y
762# CONFIG_SOUND is not set 785# CONFIG_SOUND is not set
763CONFIG_HID_SUPPORT=y 786CONFIG_HID_SUPPORT=y
764CONFIG_HID=y 787CONFIG_HID=y
765# CONFIG_HID_DEBUG is not set
766# CONFIG_HIDRAW is not set 788# CONFIG_HIDRAW is not set
767 789
768# 790#
@@ -785,6 +807,7 @@ CONFIG_HID_CYPRESS=y
785CONFIG_HID_EZKEY=y 807CONFIG_HID_EZKEY=y
786# CONFIG_HID_KYE is not set 808# CONFIG_HID_KYE is not set
787CONFIG_HID_GYRATION=y 809CONFIG_HID_GYRATION=y
810# CONFIG_HID_TWINHAN is not set
788# CONFIG_HID_KENSINGTON is not set 811# CONFIG_HID_KENSINGTON is not set
789CONFIG_HID_LOGITECH=y 812CONFIG_HID_LOGITECH=y
790# CONFIG_LOGITECH_FF is not set 813# CONFIG_LOGITECH_FF is not set
@@ -831,6 +854,7 @@ CONFIG_USB_MON=y
831# CONFIG_USB_OXU210HP_HCD is not set 854# CONFIG_USB_OXU210HP_HCD is not set
832# CONFIG_USB_ISP116X_HCD is not set 855# CONFIG_USB_ISP116X_HCD is not set
833# CONFIG_USB_ISP1760_HCD is not set 856# CONFIG_USB_ISP1760_HCD is not set
857# CONFIG_USB_ISP1362_HCD is not set
834CONFIG_USB_OHCI_HCD=y 858CONFIG_USB_OHCI_HCD=y
835# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 859# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
836# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 860# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -900,6 +924,7 @@ CONFIG_USB_STORAGE=y
900# CONFIG_USB_LD is not set 924# CONFIG_USB_LD is not set
901# CONFIG_USB_TRANCEVIBRATOR is not set 925# CONFIG_USB_TRANCEVIBRATOR is not set
902# CONFIG_USB_IOWARRIOR is not set 926# CONFIG_USB_IOWARRIOR is not set
927# CONFIG_USB_TEST is not set
903# CONFIG_USB_ISIGHTFW is not set 928# CONFIG_USB_ISIGHTFW is not set
904# CONFIG_USB_VST is not set 929# CONFIG_USB_VST is not set
905# CONFIG_USB_GADGET is not set 930# CONFIG_USB_GADGET is not set
@@ -961,8 +986,10 @@ CONFIG_FS_MBCACHE=y
961# CONFIG_JFS_FS is not set 986# CONFIG_JFS_FS is not set
962CONFIG_FS_POSIX_ACL=y 987CONFIG_FS_POSIX_ACL=y
963# CONFIG_XFS_FS is not set 988# CONFIG_XFS_FS is not set
989# CONFIG_GFS2_FS is not set
964# CONFIG_OCFS2_FS is not set 990# CONFIG_OCFS2_FS is not set
965# CONFIG_BTRFS_FS is not set 991# CONFIG_BTRFS_FS is not set
992# CONFIG_NILFS2_FS is not set
966CONFIG_FILE_LOCKING=y 993CONFIG_FILE_LOCKING=y
967CONFIG_FSNOTIFY=y 994CONFIG_FSNOTIFY=y
968# CONFIG_DNOTIFY is not set 995# CONFIG_DNOTIFY is not set
@@ -1002,8 +1029,6 @@ CONFIG_PROC_FS=y
1002CONFIG_PROC_SYSCTL=y 1029CONFIG_PROC_SYSCTL=y
1003CONFIG_PROC_PAGE_MONITOR=y 1030CONFIG_PROC_PAGE_MONITOR=y
1004CONFIG_SYSFS=y 1031CONFIG_SYSFS=y
1005CONFIG_TMPFS=y
1006# CONFIG_TMPFS_POSIX_ACL is not set
1007# CONFIG_HUGETLBFS is not set 1032# CONFIG_HUGETLBFS is not set
1008# CONFIG_HUGETLB_PAGE is not set 1033# CONFIG_HUGETLB_PAGE is not set
1009# CONFIG_CONFIGFS_FS is not set 1034# CONFIG_CONFIGFS_FS is not set
@@ -1036,7 +1061,6 @@ CONFIG_CRAMFS=y
1036# CONFIG_ROMFS_FS is not set 1061# CONFIG_ROMFS_FS is not set
1037# CONFIG_SYSV_FS is not set 1062# CONFIG_SYSV_FS is not set
1038# CONFIG_UFS_FS is not set 1063# CONFIG_UFS_FS is not set
1039# CONFIG_NILFS2_FS is not set
1040# CONFIG_NETWORK_FILESYSTEMS is not set 1064# CONFIG_NETWORK_FILESYSTEMS is not set
1041 1065
1042# 1066#
@@ -1095,6 +1119,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1095CONFIG_ENABLE_MUST_CHECK=y 1119CONFIG_ENABLE_MUST_CHECK=y
1096CONFIG_FRAME_WARN=1024 1120CONFIG_FRAME_WARN=1024
1097# CONFIG_MAGIC_SYSRQ is not set 1121# CONFIG_MAGIC_SYSRQ is not set
1122# CONFIG_STRIP_ASM_SYMS is not set
1098# CONFIG_UNUSED_SYMBOLS is not set 1123# CONFIG_UNUSED_SYMBOLS is not set
1099# CONFIG_DEBUG_FS is not set 1124# CONFIG_DEBUG_FS is not set
1100# CONFIG_HEADERS_CHECK is not set 1125# CONFIG_HEADERS_CHECK is not set
@@ -1124,24 +1149,30 @@ CONFIG_DEBUG_INFO=y
1124# CONFIG_DEBUG_LIST is not set 1149# CONFIG_DEBUG_LIST is not set
1125# CONFIG_DEBUG_SG is not set 1150# CONFIG_DEBUG_SG is not set
1126# CONFIG_DEBUG_NOTIFIERS is not set 1151# CONFIG_DEBUG_NOTIFIERS is not set
1152# CONFIG_DEBUG_CREDENTIALS is not set
1127CONFIG_FRAME_POINTER=y 1153CONFIG_FRAME_POINTER=y
1128# CONFIG_RCU_TORTURE_TEST is not set 1154# CONFIG_RCU_TORTURE_TEST is not set
1129# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1155# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1130# CONFIG_BACKTRACE_SELF_TEST is not set 1156# CONFIG_BACKTRACE_SELF_TEST is not set
1131# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1157# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1158# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1132# CONFIG_FAULT_INJECTION is not set 1159# CONFIG_FAULT_INJECTION is not set
1133# CONFIG_LATENCYTOP is not set 1160# CONFIG_LATENCYTOP is not set
1134# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1161# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1135# CONFIG_PAGE_POISONING is not set 1162# CONFIG_PAGE_POISONING is not set
1136CONFIG_HAVE_FUNCTION_TRACER=y 1163CONFIG_HAVE_FUNCTION_TRACER=y
1164CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1165CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1137CONFIG_HAVE_DYNAMIC_FTRACE=y 1166CONFIG_HAVE_DYNAMIC_FTRACE=y
1138CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1167CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1168CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1139CONFIG_TRACING_SUPPORT=y 1169CONFIG_TRACING_SUPPORT=y
1140CONFIG_FTRACE=y 1170CONFIG_FTRACE=y
1141# CONFIG_FUNCTION_TRACER is not set 1171# CONFIG_FUNCTION_TRACER is not set
1142# CONFIG_IRQSOFF_TRACER is not set 1172# CONFIG_IRQSOFF_TRACER is not set
1143# CONFIG_SCHED_TRACER is not set 1173# CONFIG_SCHED_TRACER is not set
1144# CONFIG_ENABLE_DEFAULT_TRACERS is not set 1174# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1175# CONFIG_FTRACE_SYSCALLS is not set
1145# CONFIG_BOOT_TRACER is not set 1176# CONFIG_BOOT_TRACER is not set
1146CONFIG_BRANCH_PROFILE_NONE=y 1177CONFIG_BRANCH_PROFILE_NONE=y
1147# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1178# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -1154,14 +1185,13 @@ CONFIG_BRANCH_PROFILE_NONE=y
1154# CONFIG_SAMPLES is not set 1185# CONFIG_SAMPLES is not set
1155CONFIG_HAVE_ARCH_KGDB=y 1186CONFIG_HAVE_ARCH_KGDB=y
1156# CONFIG_KGDB is not set 1187# CONFIG_KGDB is not set
1157# CONFIG_KMEMCHECK is not set
1158# CONFIG_SH_STANDARD_BIOS is not set 1188# CONFIG_SH_STANDARD_BIOS is not set
1159# CONFIG_EARLY_SCIF_CONSOLE is not set 1189# CONFIG_EARLY_SCIF_CONSOLE is not set
1160# CONFIG_DEBUG_BOOTMEM is not set 1190# CONFIG_STACK_DEBUG is not set
1161# CONFIG_DEBUG_STACKOVERFLOW is not set
1162# CONFIG_DEBUG_STACK_USAGE is not set 1191# CONFIG_DEBUG_STACK_USAGE is not set
1163# CONFIG_4KSTACKS is not set 1192# CONFIG_4KSTACKS is not set
1164# CONFIG_DUMP_CODE is not set 1193# CONFIG_DUMP_CODE is not set
1194# CONFIG_DWARF_UNWINDER is not set
1165# CONFIG_SH_NO_BSS_INIT is not set 1195# CONFIG_SH_NO_BSS_INIT is not set
1166 1196
1167# 1197#
@@ -1176,7 +1206,6 @@ CONFIG_CRYPTO=y
1176# 1206#
1177# Crypto core or helper 1207# Crypto core or helper
1178# 1208#
1179# CONFIG_CRYPTO_FIPS is not set
1180CONFIG_CRYPTO_ALGAPI=y 1209CONFIG_CRYPTO_ALGAPI=y
1181CONFIG_CRYPTO_ALGAPI2=y 1210CONFIG_CRYPTO_ALGAPI2=y
1182CONFIG_CRYPTO_AEAD=y 1211CONFIG_CRYPTO_AEAD=y
@@ -1219,11 +1248,13 @@ CONFIG_CRYPTO_CBC=y
1219# 1248#
1220CONFIG_CRYPTO_HMAC=y 1249CONFIG_CRYPTO_HMAC=y
1221# CONFIG_CRYPTO_XCBC is not set 1250# CONFIG_CRYPTO_XCBC is not set
1251# CONFIG_CRYPTO_VMAC is not set
1222 1252
1223# 1253#
1224# Digest 1254# Digest
1225# 1255#
1226# CONFIG_CRYPTO_CRC32C is not set 1256# CONFIG_CRYPTO_CRC32C is not set
1257# CONFIG_CRYPTO_GHASH is not set
1227# CONFIG_CRYPTO_MD4 is not set 1258# CONFIG_CRYPTO_MD4 is not set
1228CONFIG_CRYPTO_MD5=y 1259CONFIG_CRYPTO_MD5=y
1229# CONFIG_CRYPTO_MICHAEL_MIC is not set 1260# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1287,5 +1318,6 @@ CONFIG_ZLIB_DEFLATE=y
1287CONFIG_HAS_IOMEM=y 1318CONFIG_HAS_IOMEM=y
1288CONFIG_HAS_IOPORT=y 1319CONFIG_HAS_IOPORT=y
1289CONFIG_HAS_DMA=y 1320CONFIG_HAS_DMA=y
1321CONFIG_HAVE_LMB=y
1290CONFIG_NLATTR=y 1322CONFIG_NLATTR=y
1291CONFIG_GENERIC_ATOMIC64=y 1323CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7722_defconfig b/arch/sh/configs/se7722_defconfig
index 619438299847..d709b7f35ace 100644
--- a/arch/sh/configs/se7722_defconfig
+++ b/arch/sh/configs/se7722_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 12:54:24 2009 4# Thu Sep 24 18:57:41 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -29,7 +30,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
29# CONFIG_ARCH_HAS_ILOG2_U64 is not set 30# CONFIG_ARCH_HAS_ILOG2_U64 is not set
30CONFIG_ARCH_NO_VIRT_TO_BUS=y 31CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y
33 36
34# 37#
35# General setup 38# General setup
@@ -40,6 +43,12 @@ CONFIG_LOCK_KERNEL=y
40CONFIG_INIT_ENV_ARG_LIMIT=32 43CONFIG_INIT_ENV_ARG_LIMIT=32
41CONFIG_LOCALVERSION="" 44CONFIG_LOCALVERSION=""
42CONFIG_LOCALVERSION_AUTO=y 45CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set
43CONFIG_SWAP=y 52CONFIG_SWAP=y
44CONFIG_SYSVIPC=y 53CONFIG_SYSVIPC=y
45CONFIG_SYSVIPC_SYSCTL=y 54CONFIG_SYSVIPC_SYSCTL=y
@@ -52,11 +61,12 @@ CONFIG_BSD_PROCESS_ACCT=y
52# 61#
53# RCU Subsystem 62# RCU Subsystem
54# 63#
55CONFIG_CLASSIC_RCU=y 64CONFIG_TREE_RCU=y
56# CONFIG_TREE_RCU is not set 65# CONFIG_TREE_PREEMPT_RCU is not set
57# CONFIG_PREEMPT_RCU is not set 66# CONFIG_RCU_TRACE is not set
67CONFIG_RCU_FANOUT=32
68# CONFIG_RCU_FANOUT_EXACT is not set
58# CONFIG_TREE_RCU_TRACE is not set 69# CONFIG_TREE_RCU_TRACE is not set
59# CONFIG_PREEMPT_RCU_TRACE is not set
60CONFIG_IKCONFIG=y 70CONFIG_IKCONFIG=y
61CONFIG_IKCONFIG_PROC=y 71CONFIG_IKCONFIG_PROC=y
62CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
@@ -91,19 +101,20 @@ CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 102CONFIG_SHMEM=y
93CONFIG_AIO=y 103CONFIG_AIO=y
104CONFIG_HAVE_PERF_EVENTS=y
94 105
95# 106#
96# Performance Counters 107# Kernel Performance Events And Counters
97# 108#
109CONFIG_PERF_EVENTS=y
110# CONFIG_PERF_COUNTERS is not set
98CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
99CONFIG_SLUB_DEBUG=y 112CONFIG_SLUB_DEBUG=y
100# CONFIG_STRIP_ASM_SYMS is not set
101CONFIG_COMPAT_BRK=y 113CONFIG_COMPAT_BRK=y
102# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
103CONFIG_SLUB=y 115CONFIG_SLUB=y
104# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
105CONFIG_PROFILING=y 117CONFIG_PROFILING=y
106# CONFIG_MARKERS is not set
107# CONFIG_OPROFILE is not set 118# CONFIG_OPROFILE is not set
108CONFIG_HAVE_OPROFILE=y 119CONFIG_HAVE_OPROFILE=y
109# CONFIG_KPROBES is not set 120# CONFIG_KPROBES is not set
@@ -113,6 +124,11 @@ CONFIG_HAVE_KRETPROBES=y
113CONFIG_HAVE_ARCH_TRACEHOOK=y 124CONFIG_HAVE_ARCH_TRACEHOOK=y
114CONFIG_HAVE_CLK=y 125CONFIG_HAVE_CLK=y
115CONFIG_HAVE_DMA_API_DEBUG=y 126CONFIG_HAVE_DMA_API_DEBUG=y
127
128#
129# GCOV-based kernel profiling
130#
131# CONFIG_GCOV_KERNEL is not set
116# CONFIG_SLOW_WORK is not set 132# CONFIG_SLOW_WORK is not set
117CONFIG_HAVE_GENERIC_DMA_COHERENT=y 133CONFIG_HAVE_GENERIC_DMA_COHERENT=y
118CONFIG_SLABINFO=y 134CONFIG_SLABINFO=y
@@ -125,7 +141,7 @@ CONFIG_MODULE_UNLOAD=y
125# CONFIG_MODVERSIONS is not set 141# CONFIG_MODVERSIONS is not set
126# CONFIG_MODULE_SRCVERSION_ALL is not set 142# CONFIG_MODULE_SRCVERSION_ALL is not set
127CONFIG_BLOCK=y 143CONFIG_BLOCK=y
128# CONFIG_LBD is not set 144CONFIG_LBDAF=y
129# CONFIG_BLK_DEV_BSG is not set 145# CONFIG_BLK_DEV_BSG is not set
130# CONFIG_BLK_DEV_INTEGRITY is not set 146# CONFIG_BLK_DEV_INTEGRITY is not set
131 147
@@ -141,7 +157,7 @@ CONFIG_IOSCHED_NOOP=y
141# CONFIG_DEFAULT_CFQ is not set 157# CONFIG_DEFAULT_CFQ is not set
142CONFIG_DEFAULT_NOOP=y 158CONFIG_DEFAULT_NOOP=y
143CONFIG_DEFAULT_IOSCHED="noop" 159CONFIG_DEFAULT_IOSCHED="noop"
144# CONFIG_FREEZER is not set 160CONFIG_FREEZER=y
145 161
146# 162#
147# System type 163# System type
@@ -176,6 +192,7 @@ CONFIG_ARCH_SHMOBILE=y
176# CONFIG_CPU_SUBTYPE_SH4_202 is not set 192# CONFIG_CPU_SUBTYPE_SH4_202 is not set
177# CONFIG_CPU_SUBTYPE_SH7723 is not set 193# CONFIG_CPU_SUBTYPE_SH7723 is not set
178# CONFIG_CPU_SUBTYPE_SH7724 is not set 194# CONFIG_CPU_SUBTYPE_SH7724 is not set
195# CONFIG_CPU_SUBTYPE_SH7757 is not set
179# CONFIG_CPU_SUBTYPE_SH7763 is not set 196# CONFIG_CPU_SUBTYPE_SH7763 is not set
180# CONFIG_CPU_SUBTYPE_SH7770 is not set 197# CONFIG_CPU_SUBTYPE_SH7770 is not set
181# CONFIG_CPU_SUBTYPE_SH7780 is not set 198# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -233,6 +250,7 @@ CONFIG_ZONE_DMA_FLAG=0
233CONFIG_NR_QUICK=2 250CONFIG_NR_QUICK=2
234CONFIG_HAVE_MLOCK=y 251CONFIG_HAVE_MLOCK=y
235CONFIG_HAVE_MLOCKED_PAGE_BIT=y 252CONFIG_HAVE_MLOCKED_PAGE_BIT=y
253# CONFIG_KSM is not set
236CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 254CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
237 255
238# 256#
@@ -317,7 +335,8 @@ CONFIG_GUSA=y
317CONFIG_ZERO_PAGE_OFFSET=0x00001000 335CONFIG_ZERO_PAGE_OFFSET=0x00001000
318CONFIG_BOOT_LINK_OFFSET=0x00800000 336CONFIG_BOOT_LINK_OFFSET=0x00800000
319CONFIG_ENTRY_OFFSET=0x00001000 337CONFIG_ENTRY_OFFSET=0x00001000
320# CONFIG_CMDLINE_BOOL is not set 338# CONFIG_CMDLINE_OVERWRITE is not set
339# CONFIG_CMDLINE_EXTEND is not set
321 340
322# 341#
323# Bus options 342# Bus options
@@ -336,7 +355,13 @@ CONFIG_BINFMT_ELF=y
336# 355#
337# Power management options (EXPERIMENTAL) 356# Power management options (EXPERIMENTAL)
338# 357#
339# CONFIG_PM is not set 358CONFIG_PM=y
359# CONFIG_PM_DEBUG is not set
360CONFIG_PM_SLEEP=y
361CONFIG_SUSPEND=y
362CONFIG_SUSPEND_FREEZER=y
363# CONFIG_HIBERNATION is not set
364CONFIG_PM_RUNTIME=y
340# CONFIG_CPU_IDLE is not set 365# CONFIG_CPU_IDLE is not set
341CONFIG_NET=y 366CONFIG_NET=y
342 367
@@ -381,6 +406,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
381# CONFIG_NETFILTER is not set 406# CONFIG_NETFILTER is not set
382# CONFIG_IP_DCCP is not set 407# CONFIG_IP_DCCP is not set
383# CONFIG_IP_SCTP is not set 408# CONFIG_IP_SCTP is not set
409# CONFIG_RDS is not set
384# CONFIG_TIPC is not set 410# CONFIG_TIPC is not set
385# CONFIG_ATM is not set 411# CONFIG_ATM is not set
386# CONFIG_BRIDGE is not set 412# CONFIG_BRIDGE is not set
@@ -410,6 +436,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
410# CONFIG_AF_RXRPC is not set 436# CONFIG_AF_RXRPC is not set
411CONFIG_WIRELESS=y 437CONFIG_WIRELESS=y
412# CONFIG_CFG80211 is not set 438# CONFIG_CFG80211 is not set
439CONFIG_CFG80211_DEFAULT_PS_VALUE=0
413# CONFIG_WIRELESS_OLD_REGULATORY is not set 440# CONFIG_WIRELESS_OLD_REGULATORY is not set
414# CONFIG_WIRELESS_EXT is not set 441# CONFIG_WIRELESS_EXT is not set
415# CONFIG_LIB80211 is not set 442# CONFIG_LIB80211 is not set
@@ -417,7 +444,6 @@ CONFIG_WIRELESS=y
417# 444#
418# CFG80211 needs to be enabled for MAC80211 445# CFG80211 needs to be enabled for MAC80211
419# 446#
420CONFIG_MAC80211_DEFAULT_PS_VALUE=0
421# CONFIG_WIMAX is not set 447# CONFIG_WIMAX is not set
422# CONFIG_RFKILL is not set 448# CONFIG_RFKILL is not set
423# CONFIG_NET_9P is not set 449# CONFIG_NET_9P is not set
@@ -430,6 +456,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
430# Generic Driver Options 456# Generic Driver Options
431# 457#
432CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 458CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
459# CONFIG_DEVTMPFS is not set
433CONFIG_STANDALONE=y 460CONFIG_STANDALONE=y
434CONFIG_PREVENT_FIRMWARE_BUILD=y 461CONFIG_PREVENT_FIRMWARE_BUILD=y
435# CONFIG_FW_LOADER is not set 462# CONFIG_FW_LOADER is not set
@@ -494,7 +521,6 @@ CONFIG_SCSI_WAIT_SCAN=m
494# CONFIG_SCSI_SRP_ATTRS is not set 521# CONFIG_SCSI_SRP_ATTRS is not set
495CONFIG_SCSI_LOWLEVEL=y 522CONFIG_SCSI_LOWLEVEL=y
496# CONFIG_ISCSI_TCP is not set 523# CONFIG_ISCSI_TCP is not set
497# CONFIG_SCSI_BNX2_ISCSI is not set
498# CONFIG_LIBFC is not set 524# CONFIG_LIBFC is not set
499# CONFIG_LIBFCOE is not set 525# CONFIG_LIBFCOE is not set
500# CONFIG_SCSI_DEBUG is not set 526# CONFIG_SCSI_DEBUG is not set
@@ -502,6 +528,7 @@ CONFIG_SCSI_LOWLEVEL=y
502# CONFIG_SCSI_OSD_INITIATOR is not set 528# CONFIG_SCSI_OSD_INITIATOR is not set
503CONFIG_ATA=y 529CONFIG_ATA=y
504# CONFIG_ATA_NONSTANDARD is not set 530# CONFIG_ATA_NONSTANDARD is not set
531CONFIG_ATA_VERBOSE_ERROR=y
505CONFIG_SATA_PMP=y 532CONFIG_SATA_PMP=y
506CONFIG_ATA_SFF=y 533CONFIG_ATA_SFF=y
507# CONFIG_SATA_MV is not set 534# CONFIG_SATA_MV is not set
@@ -535,10 +562,7 @@ CONFIG_SMC91X=y
535# CONFIG_KS8842 is not set 562# CONFIG_KS8842 is not set
536CONFIG_NETDEV_1000=y 563CONFIG_NETDEV_1000=y
537CONFIG_NETDEV_10000=y 564CONFIG_NETDEV_10000=y
538 565CONFIG_WLAN=y
539#
540# Wireless LAN
541#
542# CONFIG_WLAN_PRE80211 is not set 566# CONFIG_WLAN_PRE80211 is not set
543# CONFIG_WLAN_80211 is not set 567# CONFIG_WLAN_80211 is not set
544 568
@@ -577,12 +601,13 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
577# 601#
578CONFIG_INPUT_KEYBOARD=y 602CONFIG_INPUT_KEYBOARD=y
579CONFIG_KEYBOARD_ATKBD=y 603CONFIG_KEYBOARD_ATKBD=y
580# CONFIG_KEYBOARD_SUNKBD is not set
581# CONFIG_KEYBOARD_LKKBD is not set 604# CONFIG_KEYBOARD_LKKBD is not set
582# CONFIG_KEYBOARD_XTKBD is not set
583# CONFIG_KEYBOARD_NEWTON is not set 605# CONFIG_KEYBOARD_NEWTON is not set
606# CONFIG_KEYBOARD_OPENCORES is not set
584# CONFIG_KEYBOARD_STOWAWAY is not set 607# CONFIG_KEYBOARD_STOWAWAY is not set
608# CONFIG_KEYBOARD_SUNKBD is not set
585# CONFIG_KEYBOARD_SH_KEYSC is not set 609# CONFIG_KEYBOARD_SH_KEYSC is not set
610# CONFIG_KEYBOARD_XTKBD is not set
586# CONFIG_INPUT_MOUSE is not set 611# CONFIG_INPUT_MOUSE is not set
587# CONFIG_INPUT_JOYSTICK is not set 612# CONFIG_INPUT_JOYSTICK is not set
588# CONFIG_INPUT_TABLET is not set 613# CONFIG_INPUT_TABLET is not set
@@ -631,10 +656,20 @@ CONFIG_HW_RANDOM=y
631# CONFIG_TCG_TPM is not set 656# CONFIG_TCG_TPM is not set
632# CONFIG_I2C is not set 657# CONFIG_I2C is not set
633# CONFIG_SPI is not set 658# CONFIG_SPI is not set
659
660#
661# PPS support
662#
663# CONFIG_PPS is not set
634# CONFIG_W1 is not set 664# CONFIG_W1 is not set
635# CONFIG_POWER_SUPPLY is not set 665# CONFIG_POWER_SUPPLY is not set
636CONFIG_HWMON=y 666CONFIG_HWMON=y
637# CONFIG_HWMON_VID is not set 667# CONFIG_HWMON_VID is not set
668# CONFIG_HWMON_DEBUG_CHIP is not set
669
670#
671# Native drivers
672#
638# CONFIG_SENSORS_F71805F is not set 673# CONFIG_SENSORS_F71805F is not set
639# CONFIG_SENSORS_F71882FG is not set 674# CONFIG_SENSORS_F71882FG is not set
640# CONFIG_SENSORS_IT87 is not set 675# CONFIG_SENSORS_IT87 is not set
@@ -645,9 +680,7 @@ CONFIG_HWMON=y
645# CONFIG_SENSORS_VT1211 is not set 680# CONFIG_SENSORS_VT1211 is not set
646# CONFIG_SENSORS_W83627HF is not set 681# CONFIG_SENSORS_W83627HF is not set
647# CONFIG_SENSORS_W83627EHF is not set 682# CONFIG_SENSORS_W83627EHF is not set
648# CONFIG_HWMON_DEBUG_CHIP is not set
649# CONFIG_THERMAL is not set 683# CONFIG_THERMAL is not set
650# CONFIG_THERMAL_HWMON is not set
651# CONFIG_WATCHDOG is not set 684# CONFIG_WATCHDOG is not set
652CONFIG_SSB_POSSIBLE=y 685CONFIG_SSB_POSSIBLE=y
653 686
@@ -681,7 +714,6 @@ CONFIG_SSB_POSSIBLE=y
681# CONFIG_SOUND is not set 714# CONFIG_SOUND is not set
682CONFIG_HID_SUPPORT=y 715CONFIG_HID_SUPPORT=y
683CONFIG_HID=y 716CONFIG_HID=y
684# CONFIG_HID_DEBUG is not set
685# CONFIG_HIDRAW is not set 717# CONFIG_HIDRAW is not set
686# CONFIG_HID_PID is not set 718# CONFIG_HID_PID is not set
687 719
@@ -778,8 +810,10 @@ CONFIG_FS_MBCACHE=y
778# CONFIG_JFS_FS is not set 810# CONFIG_JFS_FS is not set
779# CONFIG_FS_POSIX_ACL is not set 811# CONFIG_FS_POSIX_ACL is not set
780# CONFIG_XFS_FS is not set 812# CONFIG_XFS_FS is not set
813# CONFIG_GFS2_FS is not set
781# CONFIG_OCFS2_FS is not set 814# CONFIG_OCFS2_FS is not set
782# CONFIG_BTRFS_FS is not set 815# CONFIG_BTRFS_FS is not set
816# CONFIG_NILFS2_FS is not set
783CONFIG_FILE_LOCKING=y 817CONFIG_FILE_LOCKING=y
784CONFIG_FSNOTIFY=y 818CONFIG_FSNOTIFY=y
785CONFIG_DNOTIFY=y 819CONFIG_DNOTIFY=y
@@ -839,7 +873,6 @@ CONFIG_MISC_FILESYSTEMS=y
839# CONFIG_ROMFS_FS is not set 873# CONFIG_ROMFS_FS is not set
840# CONFIG_SYSV_FS is not set 874# CONFIG_SYSV_FS is not set
841# CONFIG_UFS_FS is not set 875# CONFIG_UFS_FS is not set
842# CONFIG_NILFS2_FS is not set
843CONFIG_NETWORK_FILESYSTEMS=y 876CONFIG_NETWORK_FILESYSTEMS=y
844# CONFIG_NFS_FS is not set 877# CONFIG_NFS_FS is not set
845# CONFIG_NFSD is not set 878# CONFIG_NFSD is not set
@@ -866,6 +899,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
866# CONFIG_ENABLE_MUST_CHECK is not set 899# CONFIG_ENABLE_MUST_CHECK is not set
867CONFIG_FRAME_WARN=1024 900CONFIG_FRAME_WARN=1024
868CONFIG_MAGIC_SYSRQ=y 901CONFIG_MAGIC_SYSRQ=y
902# CONFIG_STRIP_ASM_SYMS is not set
869# CONFIG_UNUSED_SYMBOLS is not set 903# CONFIG_UNUSED_SYMBOLS is not set
870CONFIG_DEBUG_FS=y 904CONFIG_DEBUG_FS=y
871# CONFIG_HEADERS_CHECK is not set 905# CONFIG_HEADERS_CHECK is not set
@@ -878,8 +912,11 @@ CONFIG_DEBUG_FS=y
878# CONFIG_LATENCYTOP is not set 912# CONFIG_LATENCYTOP is not set
879# CONFIG_SYSCTL_SYSCALL_CHECK is not set 913# CONFIG_SYSCTL_SYSCALL_CHECK is not set
880CONFIG_HAVE_FUNCTION_TRACER=y 914CONFIG_HAVE_FUNCTION_TRACER=y
915CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
916CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
881CONFIG_HAVE_DYNAMIC_FTRACE=y 917CONFIG_HAVE_DYNAMIC_FTRACE=y
882CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 918CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
919CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
883CONFIG_TRACING_SUPPORT=y 920CONFIG_TRACING_SUPPORT=y
884# CONFIG_FTRACE is not set 921# CONFIG_FTRACE is not set
885# CONFIG_DYNAMIC_DEBUG is not set 922# CONFIG_DYNAMIC_DEBUG is not set
@@ -889,6 +926,7 @@ CONFIG_HAVE_ARCH_KGDB=y
889CONFIG_SH_STANDARD_BIOS=y 926CONFIG_SH_STANDARD_BIOS=y
890# CONFIG_EARLY_SCIF_CONSOLE is not set 927# CONFIG_EARLY_SCIF_CONSOLE is not set
891# CONFIG_EARLY_PRINTK is not set 928# CONFIG_EARLY_PRINTK is not set
929# CONFIG_DWARF_UNWINDER is not set
892 930
893# 931#
894# Security options 932# Security options
@@ -902,7 +940,6 @@ CONFIG_CRYPTO=y
902# 940#
903# Crypto core or helper 941# Crypto core or helper
904# 942#
905# CONFIG_CRYPTO_FIPS is not set
906# CONFIG_CRYPTO_MANAGER is not set 943# CONFIG_CRYPTO_MANAGER is not set
907# CONFIG_CRYPTO_MANAGER2 is not set 944# CONFIG_CRYPTO_MANAGER2 is not set
908# CONFIG_CRYPTO_GF128MUL is not set 945# CONFIG_CRYPTO_GF128MUL is not set
@@ -934,11 +971,13 @@ CONFIG_CRYPTO=y
934# 971#
935# CONFIG_CRYPTO_HMAC is not set 972# CONFIG_CRYPTO_HMAC is not set
936# CONFIG_CRYPTO_XCBC is not set 973# CONFIG_CRYPTO_XCBC is not set
974# CONFIG_CRYPTO_VMAC is not set
937 975
938# 976#
939# Digest 977# Digest
940# 978#
941# CONFIG_CRYPTO_CRC32C is not set 979# CONFIG_CRYPTO_CRC32C is not set
980# CONFIG_CRYPTO_GHASH is not set
942# CONFIG_CRYPTO_MD4 is not set 981# CONFIG_CRYPTO_MD4 is not set
943# CONFIG_CRYPTO_MD5 is not set 982# CONFIG_CRYPTO_MD5 is not set
944# CONFIG_CRYPTO_MICHAEL_MIC is not set 983# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1002,5 +1041,6 @@ CONFIG_DECOMPRESS_GZIP=y
1002CONFIG_HAS_IOMEM=y 1041CONFIG_HAS_IOMEM=y
1003CONFIG_HAS_IOPORT=y 1042CONFIG_HAS_IOPORT=y
1004CONFIG_HAS_DMA=y 1043CONFIG_HAS_DMA=y
1044CONFIG_HAVE_LMB=y
1005CONFIG_NLATTR=y 1045CONFIG_NLATTR=y
1006CONFIG_GENERIC_ATOMIC64=y 1046CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7724_defconfig b/arch/sh/configs/se7724_defconfig
index 3ee783a0a075..56b0b9ff9e05 100644
--- a/arch/sh/configs/se7724_defconfig
+++ b/arch/sh/configs/se7724_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.30 3# Linux kernel version: 2.6.31
4# Mon Jun 29 16:28:43 2009 4# Fri Sep 25 11:50:59 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -42,6 +42,12 @@ CONFIG_LOCK_KERNEL=y
42CONFIG_INIT_ENV_ARG_LIMIT=32 42CONFIG_INIT_ENV_ARG_LIMIT=32
43CONFIG_LOCALVERSION="" 43CONFIG_LOCALVERSION=""
44# CONFIG_LOCALVERSION_AUTO is not set 44# CONFIG_LOCALVERSION_AUTO is not set
45CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y
48CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set
45CONFIG_SWAP=y 51CONFIG_SWAP=y
46CONFIG_SYSVIPC=y 52CONFIG_SYSVIPC=y
47CONFIG_SYSVIPC_SYSCTL=y 53CONFIG_SYSVIPC_SYSCTL=y
@@ -54,11 +60,12 @@ CONFIG_BSD_PROCESS_ACCT=y
54# 60#
55# RCU Subsystem 61# RCU Subsystem
56# 62#
57CONFIG_CLASSIC_RCU=y 63CONFIG_TREE_RCU=y
58# CONFIG_TREE_RCU is not set 64# CONFIG_TREE_PREEMPT_RCU is not set
59# CONFIG_PREEMPT_RCU is not set 65# CONFIG_RCU_TRACE is not set
66CONFIG_RCU_FANOUT=32
67# CONFIG_RCU_FANOUT_EXACT is not set
60# CONFIG_TREE_RCU_TRACE is not set 68# CONFIG_TREE_RCU_TRACE is not set
61# CONFIG_PREEMPT_RCU_TRACE is not set
62# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
63CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
64CONFIG_GROUP_SCHED=y 71CONFIG_GROUP_SCHED=y
@@ -91,20 +98,19 @@ CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 98CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 99CONFIG_SHMEM=y
93CONFIG_AIO=y 100CONFIG_AIO=y
94CONFIG_HAVE_PERF_COUNTERS=y 101CONFIG_HAVE_PERF_EVENTS=y
95 102
96# 103#
97# Performance Counters 104# Kernel Performance Events And Counters
98# 105#
106# CONFIG_PERF_EVENTS is not set
99# CONFIG_PERF_COUNTERS is not set 107# CONFIG_PERF_COUNTERS is not set
100CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
101# CONFIG_STRIP_ASM_SYMS is not set
102CONFIG_COMPAT_BRK=y 109CONFIG_COMPAT_BRK=y
103CONFIG_SLAB=y 110CONFIG_SLAB=y
104# CONFIG_SLUB is not set 111# CONFIG_SLUB is not set
105# CONFIG_SLOB is not set 112# CONFIG_SLOB is not set
106# CONFIG_PROFILING is not set 113# CONFIG_PROFILING is not set
107# CONFIG_MARKERS is not set
108CONFIG_HAVE_OPROFILE=y 114CONFIG_HAVE_OPROFILE=y
109CONFIG_HAVE_IOREMAP_PROT=y 115CONFIG_HAVE_IOREMAP_PROT=y
110CONFIG_HAVE_KPROBES=y 116CONFIG_HAVE_KPROBES=y
@@ -144,7 +150,7 @@ CONFIG_IOSCHED_CFQ=y
144CONFIG_DEFAULT_CFQ=y 150CONFIG_DEFAULT_CFQ=y
145# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
146CONFIG_DEFAULT_IOSCHED="cfq" 152CONFIG_DEFAULT_IOSCHED="cfq"
147# CONFIG_FREEZER is not set 153CONFIG_FREEZER=y
148 154
149# 155#
150# System type 156# System type
@@ -178,6 +184,7 @@ CONFIG_ARCH_SHMOBILE=y
178# CONFIG_CPU_SUBTYPE_SH4_202 is not set 184# CONFIG_CPU_SUBTYPE_SH4_202 is not set
179# CONFIG_CPU_SUBTYPE_SH7723 is not set 185# CONFIG_CPU_SUBTYPE_SH7723 is not set
180CONFIG_CPU_SUBTYPE_SH7724=y 186CONFIG_CPU_SUBTYPE_SH7724=y
187# CONFIG_CPU_SUBTYPE_SH7757 is not set
181# CONFIG_CPU_SUBTYPE_SH7763 is not set 188# CONFIG_CPU_SUBTYPE_SH7763 is not set
182# CONFIG_CPU_SUBTYPE_SH7770 is not set 189# CONFIG_CPU_SUBTYPE_SH7770 is not set
183# CONFIG_CPU_SUBTYPE_SH7780 is not set 190# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -224,6 +231,7 @@ CONFIG_ZONE_DMA_FLAG=0
224CONFIG_NR_QUICK=2 231CONFIG_NR_QUICK=2
225CONFIG_HAVE_MLOCK=y 232CONFIG_HAVE_MLOCK=y
226CONFIG_HAVE_MLOCKED_PAGE_BIT=y 233CONFIG_HAVE_MLOCKED_PAGE_BIT=y
234# CONFIG_KSM is not set
227CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 235CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
228 236
229# 237#
@@ -249,6 +257,8 @@ CONFIG_CPU_HAS_FPU=y
249# 257#
250CONFIG_SOLUTION_ENGINE=y 258CONFIG_SOLUTION_ENGINE=y
251CONFIG_SH_7724_SOLUTION_ENGINE=y 259CONFIG_SH_7724_SOLUTION_ENGINE=y
260# CONFIG_SH_KFR2R09 is not set
261# CONFIG_SH_ECOVEC is not set
252 262
253# 263#
254# Timer and clock configuration 264# Timer and clock configuration
@@ -269,7 +279,10 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
269# 279#
270# DMA support 280# DMA support
271# 281#
272# CONFIG_SH_DMA is not set 282CONFIG_SH_DMA_API=y
283CONFIG_SH_DMA=y
284CONFIG_NR_ONCHIP_DMA_CHANNELS=12
285# CONFIG_NR_DMA_CHANNELS_BOOL is not set
273 286
274# 287#
275# Companion Chips 288# Companion Chips
@@ -305,7 +318,8 @@ CONFIG_GUSA=y
305CONFIG_ZERO_PAGE_OFFSET=0x00001000 318CONFIG_ZERO_PAGE_OFFSET=0x00001000
306CONFIG_BOOT_LINK_OFFSET=0x00800000 319CONFIG_BOOT_LINK_OFFSET=0x00800000
307CONFIG_ENTRY_OFFSET=0x00001000 320CONFIG_ENTRY_OFFSET=0x00001000
308CONFIG_CMDLINE_BOOL=y 321CONFIG_CMDLINE_OVERWRITE=y
322# CONFIG_CMDLINE_EXTEND is not set
309CONFIG_CMDLINE="console=tty1 console=ttySC3,115200 root=/dev/nfs ip=dhcp memchunk.vpu=4m" 323CONFIG_CMDLINE="console=tty1 console=ttySC3,115200 root=/dev/nfs ip=dhcp memchunk.vpu=4m"
310 324
311# 325#
@@ -325,7 +339,13 @@ CONFIG_BINFMT_ELF=y
325# 339#
326# Power management options (EXPERIMENTAL) 340# Power management options (EXPERIMENTAL)
327# 341#
328# CONFIG_PM is not set 342CONFIG_PM=y
343# CONFIG_PM_DEBUG is not set
344CONFIG_PM_SLEEP=y
345CONFIG_SUSPEND=y
346CONFIG_SUSPEND_FREEZER=y
347# CONFIG_HIBERNATION is not set
348CONFIG_PM_RUNTIME=y
329# CONFIG_CPU_IDLE is not set 349# CONFIG_CPU_IDLE is not set
330CONFIG_NET=y 350CONFIG_NET=y
331 351
@@ -373,6 +393,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
373# CONFIG_NETFILTER is not set 393# CONFIG_NETFILTER is not set
374# CONFIG_IP_DCCP is not set 394# CONFIG_IP_DCCP is not set
375# CONFIG_IP_SCTP is not set 395# CONFIG_IP_SCTP is not set
396# CONFIG_RDS is not set
376# CONFIG_TIPC is not set 397# CONFIG_TIPC is not set
377# CONFIG_ATM is not set 398# CONFIG_ATM is not set
378# CONFIG_BRIDGE is not set 399# CONFIG_BRIDGE is not set
@@ -402,6 +423,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
402# CONFIG_AF_RXRPC is not set 423# CONFIG_AF_RXRPC is not set
403CONFIG_WIRELESS=y 424CONFIG_WIRELESS=y
404# CONFIG_CFG80211 is not set 425# CONFIG_CFG80211 is not set
426CONFIG_CFG80211_DEFAULT_PS_VALUE=0
405# CONFIG_WIRELESS_OLD_REGULATORY is not set 427# CONFIG_WIRELESS_OLD_REGULATORY is not set
406# CONFIG_WIRELESS_EXT is not set 428# CONFIG_WIRELESS_EXT is not set
407# CONFIG_LIB80211 is not set 429# CONFIG_LIB80211 is not set
@@ -409,7 +431,6 @@ CONFIG_WIRELESS=y
409# 431#
410# CFG80211 needs to be enabled for MAC80211 432# CFG80211 needs to be enabled for MAC80211
411# 433#
412CONFIG_MAC80211_DEFAULT_PS_VALUE=0
413# CONFIG_WIMAX is not set 434# CONFIG_WIMAX is not set
414# CONFIG_RFKILL is not set 435# CONFIG_RFKILL is not set
415# CONFIG_NET_9P is not set 436# CONFIG_NET_9P is not set
@@ -422,6 +443,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
422# Generic Driver Options 443# Generic Driver Options
423# 444#
424CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 445CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
446# CONFIG_DEVTMPFS is not set
425CONFIG_STANDALONE=y 447CONFIG_STANDALONE=y
426CONFIG_PREVENT_FIRMWARE_BUILD=y 448CONFIG_PREVENT_FIRMWARE_BUILD=y
427CONFIG_FW_LOADER=y 449CONFIG_FW_LOADER=y
@@ -431,9 +453,9 @@ CONFIG_EXTRA_FIRMWARE=""
431# CONFIG_CONNECTOR is not set 453# CONFIG_CONNECTOR is not set
432CONFIG_MTD=y 454CONFIG_MTD=y
433# CONFIG_MTD_DEBUG is not set 455# CONFIG_MTD_DEBUG is not set
456# CONFIG_MTD_TESTS is not set
434CONFIG_MTD_CONCAT=y 457CONFIG_MTD_CONCAT=y
435CONFIG_MTD_PARTITIONS=y 458CONFIG_MTD_PARTITIONS=y
436# CONFIG_MTD_TESTS is not set
437# CONFIG_MTD_REDBOOT_PARTS is not set 459# CONFIG_MTD_REDBOOT_PARTS is not set
438CONFIG_MTD_CMDLINE_PARTS=y 460CONFIG_MTD_CMDLINE_PARTS=y
439# CONFIG_MTD_AR7_PARTS is not set 461# CONFIG_MTD_AR7_PARTS is not set
@@ -489,6 +511,7 @@ CONFIG_MTD_PHYSMAP=y
489# 511#
490# CONFIG_MTD_DATAFLASH is not set 512# CONFIG_MTD_DATAFLASH is not set
491# CONFIG_MTD_M25P80 is not set 513# CONFIG_MTD_M25P80 is not set
514# CONFIG_MTD_SST25L is not set
492# CONFIG_MTD_SLRAM is not set 515# CONFIG_MTD_SLRAM is not set
493# CONFIG_MTD_PHRAM is not set 516# CONFIG_MTD_PHRAM is not set
494# CONFIG_MTD_MTDRAM is not set 517# CONFIG_MTD_MTDRAM is not set
@@ -648,12 +671,10 @@ CONFIG_SMC91X=y
648# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 671# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
649# CONFIG_B44 is not set 672# CONFIG_B44 is not set
650# CONFIG_KS8842 is not set 673# CONFIG_KS8842 is not set
674# CONFIG_KS8851 is not set
651# CONFIG_NETDEV_1000 is not set 675# CONFIG_NETDEV_1000 is not set
652# CONFIG_NETDEV_10000 is not set 676# CONFIG_NETDEV_10000 is not set
653 677CONFIG_WLAN=y
654#
655# Wireless LAN
656#
657# CONFIG_WLAN_PRE80211 is not set 678# CONFIG_WLAN_PRE80211 is not set
658# CONFIG_WLAN_80211 is not set 679# CONFIG_WLAN_80211 is not set
659 680
@@ -697,14 +718,19 @@ CONFIG_INPUT_EVDEV=y
697# Input Device Drivers 718# Input Device Drivers
698# 719#
699CONFIG_INPUT_KEYBOARD=y 720CONFIG_INPUT_KEYBOARD=y
721# CONFIG_KEYBOARD_ADP5588 is not set
700# CONFIG_KEYBOARD_ATKBD is not set 722# CONFIG_KEYBOARD_ATKBD is not set
701# CONFIG_KEYBOARD_SUNKBD is not set 723# CONFIG_QT2160 is not set
702# CONFIG_KEYBOARD_LKKBD is not set 724# CONFIG_KEYBOARD_LKKBD is not set
703# CONFIG_KEYBOARD_XTKBD is not set 725# CONFIG_KEYBOARD_GPIO is not set
726# CONFIG_KEYBOARD_MATRIX is not set
727# CONFIG_KEYBOARD_MAX7359 is not set
704# CONFIG_KEYBOARD_NEWTON is not set 728# CONFIG_KEYBOARD_NEWTON is not set
729# CONFIG_KEYBOARD_OPENCORES is not set
705# CONFIG_KEYBOARD_STOWAWAY is not set 730# CONFIG_KEYBOARD_STOWAWAY is not set
706# CONFIG_KEYBOARD_GPIO is not set 731# CONFIG_KEYBOARD_SUNKBD is not set
707CONFIG_KEYBOARD_SH_KEYSC=y 732CONFIG_KEYBOARD_SH_KEYSC=y
733# CONFIG_KEYBOARD_XTKBD is not set
708# CONFIG_INPUT_MOUSE is not set 734# CONFIG_INPUT_MOUSE is not set
709# CONFIG_INPUT_JOYSTICK is not set 735# CONFIG_INPUT_JOYSTICK is not set
710# CONFIG_INPUT_TABLET is not set 736# CONFIG_INPUT_TABLET is not set
@@ -754,6 +780,7 @@ CONFIG_HW_RANDOM=y
754# CONFIG_TCG_TPM is not set 780# CONFIG_TCG_TPM is not set
755CONFIG_I2C=y 781CONFIG_I2C=y
756CONFIG_I2C_BOARDINFO=y 782CONFIG_I2C_BOARDINFO=y
783CONFIG_I2C_COMPAT=y
757CONFIG_I2C_CHARDEV=y 784CONFIG_I2C_CHARDEV=y
758CONFIG_I2C_HELPER_AUTO=y 785CONFIG_I2C_HELPER_AUTO=y
759 786
@@ -764,6 +791,7 @@ CONFIG_I2C_HELPER_AUTO=y
764# 791#
765# I2C system bus drivers (mostly embedded / system-on-chip) 792# I2C system bus drivers (mostly embedded / system-on-chip)
766# 793#
794# CONFIG_I2C_DESIGNWARE is not set
767# CONFIG_I2C_GPIO is not set 795# CONFIG_I2C_GPIO is not set
768# CONFIG_I2C_OCORES is not set 796# CONFIG_I2C_OCORES is not set
769CONFIG_I2C_SH_MOBILE=y 797CONFIG_I2C_SH_MOBILE=y
@@ -786,9 +814,6 @@ CONFIG_I2C_SH_MOBILE=y
786# Miscellaneous I2C Chip support 814# Miscellaneous I2C Chip support
787# 815#
788# CONFIG_DS1682 is not set 816# CONFIG_DS1682 is not set
789# CONFIG_SENSORS_PCF8574 is not set
790# CONFIG_PCF8575 is not set
791# CONFIG_SENSORS_PCA9539 is not set
792# CONFIG_SENSORS_TSL2550 is not set 817# CONFIG_SENSORS_TSL2550 is not set
793# CONFIG_I2C_DEBUG_CORE is not set 818# CONFIG_I2C_DEBUG_CORE is not set
794# CONFIG_I2C_DEBUG_ALGO is not set 819# CONFIG_I2C_DEBUG_ALGO is not set
@@ -838,11 +863,15 @@ CONFIG_GPIOLIB=y
838# 863#
839# CONFIG_GPIO_MAX7301 is not set 864# CONFIG_GPIO_MAX7301 is not set
840# CONFIG_GPIO_MCP23S08 is not set 865# CONFIG_GPIO_MCP23S08 is not set
866# CONFIG_GPIO_MC33880 is not set
867
868#
869# AC97 GPIO expanders:
870#
841# CONFIG_W1 is not set 871# CONFIG_W1 is not set
842# CONFIG_POWER_SUPPLY is not set 872# CONFIG_POWER_SUPPLY is not set
843# CONFIG_HWMON is not set 873# CONFIG_HWMON is not set
844# CONFIG_THERMAL is not set 874# CONFIG_THERMAL is not set
845# CONFIG_THERMAL_HWMON is not set
846# CONFIG_WATCHDOG is not set 875# CONFIG_WATCHDOG is not set
847CONFIG_SSB_POSSIBLE=y 876CONFIG_SSB_POSSIBLE=y
848 877
@@ -862,8 +891,10 @@ CONFIG_SSB_POSSIBLE=y
862# CONFIG_MFD_TMIO is not set 891# CONFIG_MFD_TMIO is not set
863# CONFIG_PMIC_DA903X is not set 892# CONFIG_PMIC_DA903X is not set
864# CONFIG_MFD_WM8400 is not set 893# CONFIG_MFD_WM8400 is not set
894# CONFIG_MFD_WM831X is not set
865# CONFIG_MFD_WM8350_I2C is not set 895# CONFIG_MFD_WM8350_I2C is not set
866# CONFIG_MFD_PCF50633 is not set 896# CONFIG_MFD_PCF50633 is not set
897# CONFIG_MFD_MC13783 is not set
867# CONFIG_AB3100_CORE is not set 898# CONFIG_AB3100_CORE is not set
868# CONFIG_EZX_PCAP is not set 899# CONFIG_EZX_PCAP is not set
869# CONFIG_REGULATOR is not set 900# CONFIG_REGULATOR is not set
@@ -876,24 +907,24 @@ CONFIG_VIDEO_DEV=y
876CONFIG_VIDEO_V4L2_COMMON=y 907CONFIG_VIDEO_V4L2_COMMON=y
877# CONFIG_VIDEO_ALLOW_V4L1 is not set 908# CONFIG_VIDEO_ALLOW_V4L1 is not set
878CONFIG_VIDEO_V4L1_COMPAT=y 909CONFIG_VIDEO_V4L1_COMPAT=y
879# CONFIG_DVB_CORE is not set 910CONFIG_DVB_CORE=m
880CONFIG_VIDEO_MEDIA=y 911CONFIG_VIDEO_MEDIA=m
881 912
882# 913#
883# Multimedia drivers 914# Multimedia drivers
884# 915#
885# CONFIG_MEDIA_ATTACH is not set 916# CONFIG_MEDIA_ATTACH is not set
886CONFIG_MEDIA_TUNER=y 917CONFIG_MEDIA_TUNER=m
887# CONFIG_MEDIA_TUNER_CUSTOMISE is not set 918# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
888CONFIG_MEDIA_TUNER_SIMPLE=y 919CONFIG_MEDIA_TUNER_SIMPLE=m
889CONFIG_MEDIA_TUNER_TDA8290=y 920CONFIG_MEDIA_TUNER_TDA8290=m
890CONFIG_MEDIA_TUNER_TDA9887=y 921CONFIG_MEDIA_TUNER_TDA9887=m
891CONFIG_MEDIA_TUNER_TEA5761=y 922CONFIG_MEDIA_TUNER_TEA5761=m
892CONFIG_MEDIA_TUNER_TEA5767=y 923CONFIG_MEDIA_TUNER_TEA5767=m
893CONFIG_MEDIA_TUNER_MT20XX=y 924CONFIG_MEDIA_TUNER_MT20XX=m
894CONFIG_MEDIA_TUNER_XC2028=y 925CONFIG_MEDIA_TUNER_XC2028=m
895CONFIG_MEDIA_TUNER_XC5000=y 926CONFIG_MEDIA_TUNER_XC5000=m
896CONFIG_MEDIA_TUNER_MC44S803=y 927CONFIG_MEDIA_TUNER_MC44S803=m
897CONFIG_VIDEO_V4L2=y 928CONFIG_VIDEO_V4L2=y
898CONFIG_VIDEOBUF_GEN=y 929CONFIG_VIDEOBUF_GEN=y
899CONFIG_VIDEOBUF_DMA_CONTIG=y 930CONFIG_VIDEOBUF_DMA_CONTIG=y
@@ -904,6 +935,7 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
904# CONFIG_VIDEO_VIVI is not set 935# CONFIG_VIDEO_VIVI is not set
905# CONFIG_VIDEO_SAA5246A is not set 936# CONFIG_VIDEO_SAA5246A is not set
906# CONFIG_VIDEO_SAA5249 is not set 937# CONFIG_VIDEO_SAA5249 is not set
938# CONFIG_VIDEO_AU0828 is not set
907CONFIG_SOC_CAMERA=y 939CONFIG_SOC_CAMERA=y
908# CONFIG_SOC_CAMERA_MT9M001 is not set 940# CONFIG_SOC_CAMERA_MT9M001 is not set
909# CONFIG_SOC_CAMERA_MT9M111 is not set 941# CONFIG_SOC_CAMERA_MT9M111 is not set
@@ -919,15 +951,18 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
919CONFIG_USB_GSPCA=m 951CONFIG_USB_GSPCA=m
920# CONFIG_USB_M5602 is not set 952# CONFIG_USB_M5602 is not set
921# CONFIG_USB_STV06XX is not set 953# CONFIG_USB_STV06XX is not set
954# CONFIG_USB_GL860 is not set
922# CONFIG_USB_GSPCA_CONEX is not set 955# CONFIG_USB_GSPCA_CONEX is not set
923# CONFIG_USB_GSPCA_ETOMS is not set 956# CONFIG_USB_GSPCA_ETOMS is not set
924# CONFIG_USB_GSPCA_FINEPIX is not set 957# CONFIG_USB_GSPCA_FINEPIX is not set
958# CONFIG_USB_GSPCA_JEILINJ is not set
925# CONFIG_USB_GSPCA_MARS is not set 959# CONFIG_USB_GSPCA_MARS is not set
926# CONFIG_USB_GSPCA_MR97310A is not set 960# CONFIG_USB_GSPCA_MR97310A is not set
927# CONFIG_USB_GSPCA_OV519 is not set 961# CONFIG_USB_GSPCA_OV519 is not set
928# CONFIG_USB_GSPCA_OV534 is not set 962# CONFIG_USB_GSPCA_OV534 is not set
929# CONFIG_USB_GSPCA_PAC207 is not set 963# CONFIG_USB_GSPCA_PAC207 is not set
930# CONFIG_USB_GSPCA_PAC7311 is not set 964# CONFIG_USB_GSPCA_PAC7311 is not set
965# CONFIG_USB_GSPCA_SN9C20X is not set
931# CONFIG_USB_GSPCA_SONIXB is not set 966# CONFIG_USB_GSPCA_SONIXB is not set
932# CONFIG_USB_GSPCA_SONIXJ is not set 967# CONFIG_USB_GSPCA_SONIXJ is not set
933# CONFIG_USB_GSPCA_SPCA500 is not set 968# CONFIG_USB_GSPCA_SPCA500 is not set
@@ -957,6 +992,26 @@ CONFIG_USB_PWC_INPUT_EVDEV=y
957# CONFIG_USB_STKWEBCAM is not set 992# CONFIG_USB_STKWEBCAM is not set
958# CONFIG_USB_S2255 is not set 993# CONFIG_USB_S2255 is not set
959# CONFIG_RADIO_ADAPTERS is not set 994# CONFIG_RADIO_ADAPTERS is not set
995CONFIG_DVB_MAX_ADAPTERS=8
996# CONFIG_DVB_DYNAMIC_MINORS is not set
997CONFIG_DVB_CAPTURE_DRIVERS=y
998# CONFIG_TTPCI_EEPROM is not set
999
1000#
1001# Supported USB Adapters
1002#
1003# CONFIG_DVB_USB is not set
1004# CONFIG_SMS_SIANO_MDTV is not set
1005
1006#
1007# Supported FlexCopII (B2C2) Adapters
1008#
1009# CONFIG_DVB_B2C2_FLEXCOP is not set
1010
1011#
1012# Supported DVB Frontends
1013#
1014# CONFIG_DVB_FE_CUSTOMISE is not set
960# CONFIG_DAB is not set 1015# CONFIG_DAB is not set
961 1016
962# 1017#
@@ -1017,10 +1072,80 @@ CONFIG_LOGO=y
1017# CONFIG_LOGO_SUPERH_MONO is not set 1072# CONFIG_LOGO_SUPERH_MONO is not set
1018# CONFIG_LOGO_SUPERH_VGA16 is not set 1073# CONFIG_LOGO_SUPERH_VGA16 is not set
1019CONFIG_LOGO_SUPERH_CLUT224=y 1074CONFIG_LOGO_SUPERH_CLUT224=y
1020# CONFIG_SOUND is not set 1075CONFIG_SOUND=y
1076# CONFIG_SOUND_OSS_CORE is not set
1077CONFIG_SND=m
1078CONFIG_SND_TIMER=m
1079CONFIG_SND_PCM=m
1080CONFIG_SND_JACK=y
1081# CONFIG_SND_SEQUENCER is not set
1082# CONFIG_SND_MIXER_OSS is not set
1083# CONFIG_SND_PCM_OSS is not set
1084# CONFIG_SND_DYNAMIC_MINORS is not set
1085# CONFIG_SND_SUPPORT_OLD_API is not set
1086CONFIG_SND_VERBOSE_PROCFS=y
1087# CONFIG_SND_VERBOSE_PRINTK is not set
1088# CONFIG_SND_DEBUG is not set
1089# CONFIG_SND_RAWMIDI_SEQ is not set
1090# CONFIG_SND_OPL3_LIB_SEQ is not set
1091# CONFIG_SND_OPL4_LIB_SEQ is not set
1092# CONFIG_SND_SBAWE_SEQ is not set
1093# CONFIG_SND_EMU10K1_SEQ is not set
1094# CONFIG_SND_DRIVERS is not set
1095# CONFIG_SND_SPI is not set
1096# CONFIG_SND_SUPERH is not set
1097CONFIG_SND_USB=y
1098# CONFIG_SND_USB_AUDIO is not set
1099# CONFIG_SND_USB_CAIAQ is not set
1100CONFIG_SND_SOC=m
1101
1102#
1103# SoC Audio support for SuperH
1104#
1105CONFIG_SND_SOC_SH4_FSI=m
1106CONFIG_SND_FSI_AK4642=y
1107CONFIG_SND_SOC_I2C_AND_SPI=m
1108CONFIG_SND_SOC_ALL_CODECS=m
1109CONFIG_SND_SOC_WM_HUBS=m
1110CONFIG_SND_SOC_AD1836=m
1111CONFIG_SND_SOC_AD1938=m
1112CONFIG_SND_SOC_AD73311=m
1113CONFIG_SND_SOC_AK4104=m
1114CONFIG_SND_SOC_AK4535=m
1115CONFIG_SND_SOC_AK4642=m
1116CONFIG_SND_SOC_CS4270=m
1117CONFIG_SND_SOC_L3=m
1118CONFIG_SND_SOC_PCM3008=m
1119CONFIG_SND_SOC_SPDIF=m
1120CONFIG_SND_SOC_SSM2602=m
1121CONFIG_SND_SOC_TLV320AIC23=m
1122CONFIG_SND_SOC_TLV320AIC26=m
1123CONFIG_SND_SOC_TLV320AIC3X=m
1124CONFIG_SND_SOC_UDA134X=m
1125CONFIG_SND_SOC_UDA1380=m
1126CONFIG_SND_SOC_WM8510=m
1127CONFIG_SND_SOC_WM8523=m
1128CONFIG_SND_SOC_WM8580=m
1129CONFIG_SND_SOC_WM8728=m
1130CONFIG_SND_SOC_WM8731=m
1131CONFIG_SND_SOC_WM8750=m
1132CONFIG_SND_SOC_WM8753=m
1133CONFIG_SND_SOC_WM8776=m
1134CONFIG_SND_SOC_WM8900=m
1135CONFIG_SND_SOC_WM8903=m
1136CONFIG_SND_SOC_WM8940=m
1137CONFIG_SND_SOC_WM8960=m
1138CONFIG_SND_SOC_WM8961=m
1139CONFIG_SND_SOC_WM8971=m
1140CONFIG_SND_SOC_WM8974=m
1141CONFIG_SND_SOC_WM8988=m
1142CONFIG_SND_SOC_WM8990=m
1143CONFIG_SND_SOC_WM8993=m
1144CONFIG_SND_SOC_WM9081=m
1145CONFIG_SND_SOC_MAX9877=m
1146# CONFIG_SOUND_PRIME is not set
1021CONFIG_HID_SUPPORT=y 1147CONFIG_HID_SUPPORT=y
1022CONFIG_HID=y 1148CONFIG_HID=y
1023# CONFIG_HID_DEBUG is not set
1024# CONFIG_HIDRAW is not set 1149# CONFIG_HIDRAW is not set
1025 1150
1026# 1151#
@@ -1043,6 +1168,7 @@ CONFIG_USB_HID=y
1043# CONFIG_HID_EZKEY is not set 1168# CONFIG_HID_EZKEY is not set
1044# CONFIG_HID_KYE is not set 1169# CONFIG_HID_KYE is not set
1045# CONFIG_HID_GYRATION is not set 1170# CONFIG_HID_GYRATION is not set
1171# CONFIG_HID_TWINHAN is not set
1046# CONFIG_HID_KENSINGTON is not set 1172# CONFIG_HID_KENSINGTON is not set
1047# CONFIG_HID_LOGITECH is not set 1173# CONFIG_HID_LOGITECH is not set
1048# CONFIG_HID_MICROSOFT is not set 1174# CONFIG_HID_MICROSOFT is not set
@@ -1072,6 +1198,7 @@ CONFIG_USB=y
1072# CONFIG_USB_DEVICEFS is not set 1198# CONFIG_USB_DEVICEFS is not set
1073CONFIG_USB_DEVICE_CLASS=y 1199CONFIG_USB_DEVICE_CLASS=y
1074# CONFIG_USB_DYNAMIC_MINORS is not set 1200# CONFIG_USB_DYNAMIC_MINORS is not set
1201# CONFIG_USB_SUSPEND is not set
1075# CONFIG_USB_OTG is not set 1202# CONFIG_USB_OTG is not set
1076# CONFIG_USB_OTG_WHITELIST is not set 1203# CONFIG_USB_OTG_WHITELIST is not set
1077# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1204# CONFIG_USB_OTG_BLACKLIST_HUB is not set
@@ -1086,9 +1213,11 @@ CONFIG_USB_MON=y
1086# CONFIG_USB_OXU210HP_HCD is not set 1213# CONFIG_USB_OXU210HP_HCD is not set
1087# CONFIG_USB_ISP116X_HCD is not set 1214# CONFIG_USB_ISP116X_HCD is not set
1088# CONFIG_USB_ISP1760_HCD is not set 1215# CONFIG_USB_ISP1760_HCD is not set
1216# CONFIG_USB_ISP1362_HCD is not set
1089# CONFIG_USB_SL811_HCD is not set 1217# CONFIG_USB_SL811_HCD is not set
1090CONFIG_USB_R8A66597_HCD=y 1218CONFIG_USB_R8A66597_HCD=y
1091# CONFIG_USB_HWA_HCD is not set 1219# CONFIG_USB_HWA_HCD is not set
1220# CONFIG_USB_GADGET_MUSB_HDRC is not set
1092 1221
1093# 1222#
1094# USB Device Class drivers 1223# USB Device Class drivers
@@ -1151,9 +1280,46 @@ CONFIG_USB_STORAGE=y
1151# CONFIG_USB_LD is not set 1280# CONFIG_USB_LD is not set
1152# CONFIG_USB_TRANCEVIBRATOR is not set 1281# CONFIG_USB_TRANCEVIBRATOR is not set
1153# CONFIG_USB_IOWARRIOR is not set 1282# CONFIG_USB_IOWARRIOR is not set
1283# CONFIG_USB_TEST is not set
1154# CONFIG_USB_ISIGHTFW is not set 1284# CONFIG_USB_ISIGHTFW is not set
1155# CONFIG_USB_VST is not set 1285# CONFIG_USB_VST is not set
1156# CONFIG_USB_GADGET is not set 1286CONFIG_USB_GADGET=y
1287# CONFIG_USB_GADGET_DEBUG_FILES is not set
1288CONFIG_USB_GADGET_VBUS_DRAW=2
1289CONFIG_USB_GADGET_SELECTED=y
1290# CONFIG_USB_GADGET_AT91 is not set
1291# CONFIG_USB_GADGET_ATMEL_USBA is not set
1292# CONFIG_USB_GADGET_FSL_USB2 is not set
1293# CONFIG_USB_GADGET_LH7A40X is not set
1294# CONFIG_USB_GADGET_OMAP is not set
1295# CONFIG_USB_GADGET_PXA25X is not set
1296CONFIG_USB_GADGET_R8A66597=y
1297CONFIG_USB_R8A66597=y
1298# CONFIG_USB_GADGET_PXA27X is not set
1299# CONFIG_USB_GADGET_S3C_HSOTG is not set
1300# CONFIG_USB_GADGET_IMX is not set
1301# CONFIG_USB_GADGET_S3C2410 is not set
1302# CONFIG_USB_GADGET_M66592 is not set
1303# CONFIG_USB_GADGET_AMD5536UDC is not set
1304# CONFIG_USB_GADGET_FSL_QE is not set
1305# CONFIG_USB_GADGET_CI13XXX is not set
1306# CONFIG_USB_GADGET_NET2280 is not set
1307# CONFIG_USB_GADGET_GOKU is not set
1308# CONFIG_USB_GADGET_LANGWELL is not set
1309# CONFIG_USB_GADGET_DUMMY_HCD is not set
1310CONFIG_USB_GADGET_DUALSPEED=y
1311# CONFIG_USB_ZERO is not set
1312# CONFIG_USB_AUDIO is not set
1313CONFIG_USB_ETH=m
1314CONFIG_USB_ETH_RNDIS=y
1315# CONFIG_USB_ETH_EEM is not set
1316CONFIG_USB_GADGETFS=m
1317CONFIG_USB_FILE_STORAGE=m
1318# CONFIG_USB_FILE_STORAGE_TEST is not set
1319CONFIG_USB_G_SERIAL=m
1320# CONFIG_USB_MIDI_GADGET is not set
1321# CONFIG_USB_G_PRINTER is not set
1322# CONFIG_USB_CDC_COMPOSITE is not set
1157 1323
1158# 1324#
1159# OTG and related infrastructure 1325# OTG and related infrastructure
@@ -1176,6 +1342,8 @@ CONFIG_MMC_BLOCK_BOUNCE=y
1176# MMC/SD/SDIO Host Controller Drivers 1342# MMC/SD/SDIO Host Controller Drivers
1177# 1343#
1178# CONFIG_MMC_SDHCI is not set 1344# CONFIG_MMC_SDHCI is not set
1345# CONFIG_MMC_AT91 is not set
1346# CONFIG_MMC_ATMELMCI is not set
1179CONFIG_MMC_SPI=y 1347CONFIG_MMC_SPI=y
1180# CONFIG_MEMSTICK is not set 1348# CONFIG_MEMSTICK is not set
1181# CONFIG_NEW_LEDS is not set 1349# CONFIG_NEW_LEDS is not set
@@ -1223,6 +1391,7 @@ CONFIG_RTC_DRV_PCF8563=y
1223# CONFIG_RTC_DRV_R9701 is not set 1391# CONFIG_RTC_DRV_R9701 is not set
1224# CONFIG_RTC_DRV_RS5C348 is not set 1392# CONFIG_RTC_DRV_RS5C348 is not set
1225# CONFIG_RTC_DRV_DS3234 is not set 1393# CONFIG_RTC_DRV_DS3234 is not set
1394# CONFIG_RTC_DRV_PCF2123 is not set
1226 1395
1227# 1396#
1228# Platform RTC drivers 1397# Platform RTC drivers
@@ -1279,6 +1448,7 @@ CONFIG_FS_POSIX_ACL=y
1279# CONFIG_GFS2_FS is not set 1448# CONFIG_GFS2_FS is not set
1280# CONFIG_OCFS2_FS is not set 1449# CONFIG_OCFS2_FS is not set
1281# CONFIG_BTRFS_FS is not set 1450# CONFIG_BTRFS_FS is not set
1451# CONFIG_NILFS2_FS is not set
1282CONFIG_FILE_LOCKING=y 1452CONFIG_FILE_LOCKING=y
1283CONFIG_FSNOTIFY=y 1453CONFIG_FSNOTIFY=y
1284CONFIG_DNOTIFY=y 1454CONFIG_DNOTIFY=y
@@ -1343,7 +1513,6 @@ CONFIG_MISC_FILESYSTEMS=y
1343# CONFIG_ROMFS_FS is not set 1513# CONFIG_ROMFS_FS is not set
1344# CONFIG_SYSV_FS is not set 1514# CONFIG_SYSV_FS is not set
1345# CONFIG_UFS_FS is not set 1515# CONFIG_UFS_FS is not set
1346# CONFIG_NILFS2_FS is not set
1347CONFIG_NETWORK_FILESYSTEMS=y 1516CONFIG_NETWORK_FILESYSTEMS=y
1348CONFIG_NFS_FS=y 1517CONFIG_NFS_FS=y
1349CONFIG_NFS_V3=y 1518CONFIG_NFS_V3=y
@@ -1423,6 +1592,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1423# CONFIG_ENABLE_MUST_CHECK is not set 1592# CONFIG_ENABLE_MUST_CHECK is not set
1424CONFIG_FRAME_WARN=1024 1593CONFIG_FRAME_WARN=1024
1425# CONFIG_MAGIC_SYSRQ is not set 1594# CONFIG_MAGIC_SYSRQ is not set
1595# CONFIG_STRIP_ASM_SYMS is not set
1426# CONFIG_UNUSED_SYMBOLS is not set 1596# CONFIG_UNUSED_SYMBOLS is not set
1427# CONFIG_DEBUG_FS is not set 1597# CONFIG_DEBUG_FS is not set
1428# CONFIG_HEADERS_CHECK is not set 1598# CONFIG_HEADERS_CHECK is not set
@@ -1433,8 +1603,11 @@ CONFIG_FRAME_WARN=1024
1433# CONFIG_LATENCYTOP is not set 1603# CONFIG_LATENCYTOP is not set
1434CONFIG_SYSCTL_SYSCALL_CHECK=y 1604CONFIG_SYSCTL_SYSCALL_CHECK=y
1435CONFIG_HAVE_FUNCTION_TRACER=y 1605CONFIG_HAVE_FUNCTION_TRACER=y
1606CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1607CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1436CONFIG_HAVE_DYNAMIC_FTRACE=y 1608CONFIG_HAVE_DYNAMIC_FTRACE=y
1437CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1609CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1610CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1438CONFIG_TRACING_SUPPORT=y 1611CONFIG_TRACING_SUPPORT=y
1439# CONFIG_FTRACE is not set 1612# CONFIG_FTRACE is not set
1440# CONFIG_DMA_API_DEBUG is not set 1613# CONFIG_DMA_API_DEBUG is not set
@@ -1442,6 +1615,7 @@ CONFIG_TRACING_SUPPORT=y
1442CONFIG_HAVE_ARCH_KGDB=y 1615CONFIG_HAVE_ARCH_KGDB=y
1443# CONFIG_SH_STANDARD_BIOS is not set 1616# CONFIG_SH_STANDARD_BIOS is not set
1444# CONFIG_EARLY_SCIF_CONSOLE is not set 1617# CONFIG_EARLY_SCIF_CONSOLE is not set
1618# CONFIG_DWARF_UNWINDER is not set
1445 1619
1446# 1620#
1447# Security options 1621# Security options
@@ -1455,7 +1629,6 @@ CONFIG_CRYPTO=y
1455# 1629#
1456# Crypto core or helper 1630# Crypto core or helper
1457# 1631#
1458# CONFIG_CRYPTO_FIPS is not set
1459CONFIG_CRYPTO_ALGAPI=y 1632CONFIG_CRYPTO_ALGAPI=y
1460CONFIG_CRYPTO_ALGAPI2=y 1633CONFIG_CRYPTO_ALGAPI2=y
1461CONFIG_CRYPTO_AEAD2=y 1634CONFIG_CRYPTO_AEAD2=y
@@ -1496,11 +1669,13 @@ CONFIG_CRYPTO_CBC=y
1496# 1669#
1497# CONFIG_CRYPTO_HMAC is not set 1670# CONFIG_CRYPTO_HMAC is not set
1498# CONFIG_CRYPTO_XCBC is not set 1671# CONFIG_CRYPTO_XCBC is not set
1672# CONFIG_CRYPTO_VMAC is not set
1499 1673
1500# 1674#
1501# Digest 1675# Digest
1502# 1676#
1503# CONFIG_CRYPTO_CRC32C is not set 1677# CONFIG_CRYPTO_CRC32C is not set
1678# CONFIG_CRYPTO_GHASH is not set
1504# CONFIG_CRYPTO_MD4 is not set 1679# CONFIG_CRYPTO_MD4 is not set
1505# CONFIG_CRYPTO_MD5 is not set 1680# CONFIG_CRYPTO_MD5 is not set
1506# CONFIG_CRYPTO_MICHAEL_MIC is not set 1681# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1562,5 +1737,6 @@ CONFIG_CRC7=y
1562CONFIG_HAS_IOMEM=y 1737CONFIG_HAS_IOMEM=y
1563CONFIG_HAS_IOPORT=y 1738CONFIG_HAS_IOPORT=y
1564CONFIG_HAS_DMA=y 1739CONFIG_HAS_DMA=y
1740CONFIG_HAVE_LMB=y
1565CONFIG_NLATTR=y 1741CONFIG_NLATTR=y
1566CONFIG_GENERIC_ATOMIC64=y 1742CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7750_defconfig b/arch/sh/configs/se7750_defconfig
index 564bf7bdce6b..7bc926c17b79 100644
--- a/arch/sh/configs/se7750_defconfig
+++ b/arch/sh/configs/se7750_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 13:00:01 2009 4# Thu Sep 24 18:58:58 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -27,7 +28,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 28# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 29CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y
31 34
32# 35#
33# General setup 36# General setup
@@ -37,6 +40,12 @@ CONFIG_BROKEN_ON_SMP=y
37CONFIG_INIT_ENV_ARG_LIMIT=32 40CONFIG_INIT_ENV_ARG_LIMIT=32
38CONFIG_LOCALVERSION="" 41CONFIG_LOCALVERSION=""
39CONFIG_LOCALVERSION_AUTO=y 42CONFIG_LOCALVERSION_AUTO=y
43CONFIG_HAVE_KERNEL_GZIP=y
44CONFIG_HAVE_KERNEL_BZIP2=y
45CONFIG_HAVE_KERNEL_LZMA=y
46CONFIG_KERNEL_GZIP=y
47# CONFIG_KERNEL_BZIP2 is not set
48# CONFIG_KERNEL_LZMA is not set
40# CONFIG_SWAP is not set 49# CONFIG_SWAP is not set
41CONFIG_SYSVIPC=y 50CONFIG_SYSVIPC=y
42CONFIG_SYSVIPC_SYSCTL=y 51CONFIG_SYSVIPC_SYSCTL=y
@@ -49,11 +58,12 @@ CONFIG_BSD_PROCESS_ACCT=y
49# 58#
50# RCU Subsystem 59# RCU Subsystem
51# 60#
52CONFIG_CLASSIC_RCU=y 61CONFIG_TREE_RCU=y
53# CONFIG_TREE_RCU is not set 62# CONFIG_TREE_PREEMPT_RCU is not set
54# CONFIG_PREEMPT_RCU is not set 63# CONFIG_RCU_TRACE is not set
64CONFIG_RCU_FANOUT=32
65# CONFIG_RCU_FANOUT_EXACT is not set
55# CONFIG_TREE_RCU_TRACE is not set 66# CONFIG_TREE_RCU_TRACE is not set
56# CONFIG_PREEMPT_RCU_TRACE is not set
57CONFIG_IKCONFIG=y 67CONFIG_IKCONFIG=y
58CONFIG_IKCONFIG_PROC=y 68CONFIG_IKCONFIG_PROC=y
59CONFIG_LOG_BUF_SHIFT=14 69CONFIG_LOG_BUF_SHIFT=14
@@ -84,18 +94,19 @@ CONFIG_TIMERFD=y
84CONFIG_EVENTFD=y 94CONFIG_EVENTFD=y
85CONFIG_SHMEM=y 95CONFIG_SHMEM=y
86CONFIG_AIO=y 96CONFIG_AIO=y
97CONFIG_HAVE_PERF_EVENTS=y
87 98
88# 99#
89# Performance Counters 100# Kernel Performance Events And Counters
90# 101#
102# CONFIG_PERF_EVENTS is not set
103# CONFIG_PERF_COUNTERS is not set
91CONFIG_VM_EVENT_COUNTERS=y 104CONFIG_VM_EVENT_COUNTERS=y
92# CONFIG_STRIP_ASM_SYMS is not set
93CONFIG_COMPAT_BRK=y 105CONFIG_COMPAT_BRK=y
94CONFIG_SLAB=y 106CONFIG_SLAB=y
95# CONFIG_SLUB is not set 107# CONFIG_SLUB is not set
96# CONFIG_SLOB is not set 108# CONFIG_SLOB is not set
97# CONFIG_PROFILING is not set 109# CONFIG_PROFILING is not set
98# CONFIG_MARKERS is not set
99CONFIG_HAVE_OPROFILE=y 110CONFIG_HAVE_OPROFILE=y
100# CONFIG_KPROBES is not set 111# CONFIG_KPROBES is not set
101CONFIG_HAVE_IOREMAP_PROT=y 112CONFIG_HAVE_IOREMAP_PROT=y
@@ -104,6 +115,10 @@ CONFIG_HAVE_KRETPROBES=y
104CONFIG_HAVE_ARCH_TRACEHOOK=y 115CONFIG_HAVE_ARCH_TRACEHOOK=y
105CONFIG_HAVE_CLK=y 116CONFIG_HAVE_CLK=y
106CONFIG_HAVE_DMA_API_DEBUG=y 117CONFIG_HAVE_DMA_API_DEBUG=y
118
119#
120# GCOV-based kernel profiling
121#
107# CONFIG_SLOW_WORK is not set 122# CONFIG_SLOW_WORK is not set
108CONFIG_HAVE_GENERIC_DMA_COHERENT=y 123CONFIG_HAVE_GENERIC_DMA_COHERENT=y
109CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
@@ -115,7 +130,7 @@ CONFIG_MODULES=y
115# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
116# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
117CONFIG_BLOCK=y 132CONFIG_BLOCK=y
118# CONFIG_LBD is not set 133CONFIG_LBDAF=y
119# CONFIG_BLK_DEV_BSG is not set 134# CONFIG_BLK_DEV_BSG is not set
120# CONFIG_BLK_DEV_INTEGRITY is not set 135# CONFIG_BLK_DEV_INTEGRITY is not set
121 136
@@ -162,6 +177,7 @@ CONFIG_CPU_SUBTYPE_SH7750=y
162# CONFIG_CPU_SUBTYPE_SH4_202 is not set 177# CONFIG_CPU_SUBTYPE_SH4_202 is not set
163# CONFIG_CPU_SUBTYPE_SH7723 is not set 178# CONFIG_CPU_SUBTYPE_SH7723 is not set
164# CONFIG_CPU_SUBTYPE_SH7724 is not set 179# CONFIG_CPU_SUBTYPE_SH7724 is not set
180# CONFIG_CPU_SUBTYPE_SH7757 is not set
165# CONFIG_CPU_SUBTYPE_SH7763 is not set 181# CONFIG_CPU_SUBTYPE_SH7763 is not set
166# CONFIG_CPU_SUBTYPE_SH7770 is not set 182# CONFIG_CPU_SUBTYPE_SH7770 is not set
167# CONFIG_CPU_SUBTYPE_SH7780 is not set 183# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -207,6 +223,7 @@ CONFIG_ZONE_DMA_FLAG=0
207CONFIG_NR_QUICK=2 223CONFIG_NR_QUICK=2
208CONFIG_HAVE_MLOCK=y 224CONFIG_HAVE_MLOCK=y
209CONFIG_HAVE_MLOCKED_PAGE_BIT=y 225CONFIG_HAVE_MLOCKED_PAGE_BIT=y
226# CONFIG_KSM is not set
210CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 227CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
211 228
212# 229#
@@ -291,7 +308,8 @@ CONFIG_ZERO_PAGE_OFFSET=0x00001000
291CONFIG_BOOT_LINK_OFFSET=0x00800000 308CONFIG_BOOT_LINK_OFFSET=0x00800000
292CONFIG_ENTRY_OFFSET=0x00001000 309CONFIG_ENTRY_OFFSET=0x00001000
293# CONFIG_UBC_WAKEUP is not set 310# CONFIG_UBC_WAKEUP is not set
294# CONFIG_CMDLINE_BOOL is not set 311# CONFIG_CMDLINE_OVERWRITE is not set
312# CONFIG_CMDLINE_EXTEND is not set
295 313
296# 314#
297# Bus options 315# Bus options
@@ -358,6 +376,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
358# CONFIG_NETFILTER is not set 376# CONFIG_NETFILTER is not set
359# CONFIG_IP_DCCP is not set 377# CONFIG_IP_DCCP is not set
360# CONFIG_IP_SCTP is not set 378# CONFIG_IP_SCTP is not set
379# CONFIG_RDS is not set
361# CONFIG_TIPC is not set 380# CONFIG_TIPC is not set
362# CONFIG_ATM is not set 381# CONFIG_ATM is not set
363# CONFIG_BRIDGE is not set 382# CONFIG_BRIDGE is not set
@@ -387,6 +406,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
387# CONFIG_AF_RXRPC is not set 406# CONFIG_AF_RXRPC is not set
388CONFIG_WIRELESS=y 407CONFIG_WIRELESS=y
389# CONFIG_CFG80211 is not set 408# CONFIG_CFG80211 is not set
409CONFIG_CFG80211_DEFAULT_PS_VALUE=0
390# CONFIG_WIRELESS_OLD_REGULATORY is not set 410# CONFIG_WIRELESS_OLD_REGULATORY is not set
391# CONFIG_WIRELESS_EXT is not set 411# CONFIG_WIRELESS_EXT is not set
392# CONFIG_LIB80211 is not set 412# CONFIG_LIB80211 is not set
@@ -394,7 +414,6 @@ CONFIG_WIRELESS=y
394# 414#
395# CFG80211 needs to be enabled for MAC80211 415# CFG80211 needs to be enabled for MAC80211
396# 416#
397CONFIG_MAC80211_DEFAULT_PS_VALUE=0
398# CONFIG_WIMAX is not set 417# CONFIG_WIMAX is not set
399# CONFIG_RFKILL is not set 418# CONFIG_RFKILL is not set
400# CONFIG_NET_9P is not set 419# CONFIG_NET_9P is not set
@@ -412,9 +431,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
412# CONFIG_CONNECTOR is not set 431# CONFIG_CONNECTOR is not set
413CONFIG_MTD=y 432CONFIG_MTD=y
414# CONFIG_MTD_DEBUG is not set 433# CONFIG_MTD_DEBUG is not set
434# CONFIG_MTD_TESTS is not set
415# CONFIG_MTD_CONCAT is not set 435# CONFIG_MTD_CONCAT is not set
416CONFIG_MTD_PARTITIONS=y 436CONFIG_MTD_PARTITIONS=y
417# CONFIG_MTD_TESTS is not set
418# CONFIG_MTD_REDBOOT_PARTS is not set 437# CONFIG_MTD_REDBOOT_PARTS is not set
419# CONFIG_MTD_CMDLINE_PARTS is not set 438# CONFIG_MTD_CMDLINE_PARTS is not set
420# CONFIG_MTD_AR7_PARTS is not set 439# CONFIG_MTD_AR7_PARTS is not set
@@ -563,7 +582,6 @@ CONFIG_SCSI_WAIT_SCAN=m
563# CONFIG_SCSI_SRP_ATTRS is not set 582# CONFIG_SCSI_SRP_ATTRS is not set
564CONFIG_SCSI_LOWLEVEL=y 583CONFIG_SCSI_LOWLEVEL=y
565# CONFIG_ISCSI_TCP is not set 584# CONFIG_ISCSI_TCP is not set
566# CONFIG_SCSI_BNX2_ISCSI is not set
567# CONFIG_LIBFC is not set 585# CONFIG_LIBFC is not set
568# CONFIG_LIBFCOE is not set 586# CONFIG_LIBFCOE is not set
569# CONFIG_SCSI_DEBUG is not set 587# CONFIG_SCSI_DEBUG is not set
@@ -599,10 +617,7 @@ CONFIG_STNIC=y
599# CONFIG_KS8842 is not set 617# CONFIG_KS8842 is not set
600CONFIG_NETDEV_1000=y 618CONFIG_NETDEV_1000=y
601CONFIG_NETDEV_10000=y 619CONFIG_NETDEV_10000=y
602 620CONFIG_WLAN=y
603#
604# Wireless LAN
605#
606# CONFIG_WLAN_PRE80211 is not set 621# CONFIG_WLAN_PRE80211 is not set
607# CONFIG_WLAN_80211 is not set 622# CONFIG_WLAN_80211 is not set
608 623
@@ -665,10 +680,20 @@ CONFIG_HW_RANDOM=y
665# CONFIG_TCG_TPM is not set 680# CONFIG_TCG_TPM is not set
666# CONFIG_I2C is not set 681# CONFIG_I2C is not set
667# CONFIG_SPI is not set 682# CONFIG_SPI is not set
683
684#
685# PPS support
686#
687# CONFIG_PPS is not set
668# CONFIG_W1 is not set 688# CONFIG_W1 is not set
669# CONFIG_POWER_SUPPLY is not set 689# CONFIG_POWER_SUPPLY is not set
670CONFIG_HWMON=y 690CONFIG_HWMON=y
671# CONFIG_HWMON_VID is not set 691# CONFIG_HWMON_VID is not set
692# CONFIG_HWMON_DEBUG_CHIP is not set
693
694#
695# Native drivers
696#
672# CONFIG_SENSORS_F71805F is not set 697# CONFIG_SENSORS_F71805F is not set
673# CONFIG_SENSORS_F71882FG is not set 698# CONFIG_SENSORS_F71882FG is not set
674# CONFIG_SENSORS_IT87 is not set 699# CONFIG_SENSORS_IT87 is not set
@@ -679,9 +704,7 @@ CONFIG_HWMON=y
679# CONFIG_SENSORS_VT1211 is not set 704# CONFIG_SENSORS_VT1211 is not set
680# CONFIG_SENSORS_W83627HF is not set 705# CONFIG_SENSORS_W83627HF is not set
681# CONFIG_SENSORS_W83627EHF is not set 706# CONFIG_SENSORS_W83627EHF is not set
682# CONFIG_HWMON_DEBUG_CHIP is not set
683# CONFIG_THERMAL is not set 707# CONFIG_THERMAL is not set
684# CONFIG_THERMAL_HWMON is not set
685CONFIG_WATCHDOG=y 708CONFIG_WATCHDOG=y
686# CONFIG_WATCHDOG_NOWAYOUT is not set 709# CONFIG_WATCHDOG_NOWAYOUT is not set
687 710
@@ -766,8 +789,10 @@ CONFIG_RTC_LIB=y
766# CONFIG_JFS_FS is not set 789# CONFIG_JFS_FS is not set
767# CONFIG_FS_POSIX_ACL is not set 790# CONFIG_FS_POSIX_ACL is not set
768# CONFIG_XFS_FS is not set 791# CONFIG_XFS_FS is not set
792# CONFIG_GFS2_FS is not set
769# CONFIG_OCFS2_FS is not set 793# CONFIG_OCFS2_FS is not set
770# CONFIG_BTRFS_FS is not set 794# CONFIG_BTRFS_FS is not set
795# CONFIG_NILFS2_FS is not set
771CONFIG_FILE_LOCKING=y 796CONFIG_FILE_LOCKING=y
772CONFIG_FSNOTIFY=y 797CONFIG_FSNOTIFY=y
773CONFIG_DNOTIFY=y 798CONFIG_DNOTIFY=y
@@ -838,7 +863,6 @@ CONFIG_JFFS2_RTIME=y
838# CONFIG_ROMFS_FS is not set 863# CONFIG_ROMFS_FS is not set
839# CONFIG_SYSV_FS is not set 864# CONFIG_SYSV_FS is not set
840# CONFIG_UFS_FS is not set 865# CONFIG_UFS_FS is not set
841# CONFIG_NILFS2_FS is not set
842CONFIG_NETWORK_FILESYSTEMS=y 866CONFIG_NETWORK_FILESYSTEMS=y
843CONFIG_NFS_FS=y 867CONFIG_NFS_FS=y
844# CONFIG_NFS_V3 is not set 868# CONFIG_NFS_V3 is not set
@@ -885,6 +909,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
885# CONFIG_ENABLE_MUST_CHECK is not set 909# CONFIG_ENABLE_MUST_CHECK is not set
886CONFIG_FRAME_WARN=1024 910CONFIG_FRAME_WARN=1024
887# CONFIG_MAGIC_SYSRQ is not set 911# CONFIG_MAGIC_SYSRQ is not set
912# CONFIG_STRIP_ASM_SYMS is not set
888# CONFIG_UNUSED_SYMBOLS is not set 913# CONFIG_UNUSED_SYMBOLS is not set
889# CONFIG_DEBUG_FS is not set 914# CONFIG_DEBUG_FS is not set
890# CONFIG_HEADERS_CHECK is not set 915# CONFIG_HEADERS_CHECK is not set
@@ -894,8 +919,11 @@ CONFIG_FRAME_WARN=1024
894# CONFIG_RCU_CPU_STALL_DETECTOR is not set 919# CONFIG_RCU_CPU_STALL_DETECTOR is not set
895# CONFIG_LATENCYTOP is not set 920# CONFIG_LATENCYTOP is not set
896CONFIG_HAVE_FUNCTION_TRACER=y 921CONFIG_HAVE_FUNCTION_TRACER=y
922CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
923CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
897CONFIG_HAVE_DYNAMIC_FTRACE=y 924CONFIG_HAVE_DYNAMIC_FTRACE=y
898CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 925CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
926CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
899CONFIG_TRACING_SUPPORT=y 927CONFIG_TRACING_SUPPORT=y
900# CONFIG_FTRACE is not set 928# CONFIG_FTRACE is not set
901# CONFIG_DMA_API_DEBUG is not set 929# CONFIG_DMA_API_DEBUG is not set
@@ -903,6 +931,7 @@ CONFIG_TRACING_SUPPORT=y
903CONFIG_HAVE_ARCH_KGDB=y 931CONFIG_HAVE_ARCH_KGDB=y
904# CONFIG_SH_STANDARD_BIOS is not set 932# CONFIG_SH_STANDARD_BIOS is not set
905# CONFIG_EARLY_SCIF_CONSOLE is not set 933# CONFIG_EARLY_SCIF_CONSOLE is not set
934# CONFIG_DWARF_UNWINDER is not set
906 935
907# 936#
908# Security options 937# Security options
@@ -916,7 +945,6 @@ CONFIG_CRYPTO=y
916# 945#
917# Crypto core or helper 946# Crypto core or helper
918# 947#
919# CONFIG_CRYPTO_FIPS is not set
920# CONFIG_CRYPTO_MANAGER is not set 948# CONFIG_CRYPTO_MANAGER is not set
921# CONFIG_CRYPTO_MANAGER2 is not set 949# CONFIG_CRYPTO_MANAGER2 is not set
922# CONFIG_CRYPTO_GF128MUL is not set 950# CONFIG_CRYPTO_GF128MUL is not set
@@ -948,11 +976,13 @@ CONFIG_CRYPTO=y
948# 976#
949# CONFIG_CRYPTO_HMAC is not set 977# CONFIG_CRYPTO_HMAC is not set
950# CONFIG_CRYPTO_XCBC is not set 978# CONFIG_CRYPTO_XCBC is not set
979# CONFIG_CRYPTO_VMAC is not set
951 980
952# 981#
953# Digest 982# Digest
954# 983#
955# CONFIG_CRYPTO_CRC32C is not set 984# CONFIG_CRYPTO_CRC32C is not set
985# CONFIG_CRYPTO_GHASH is not set
956# CONFIG_CRYPTO_MD4 is not set 986# CONFIG_CRYPTO_MD4 is not set
957# CONFIG_CRYPTO_MD5 is not set 987# CONFIG_CRYPTO_MD5 is not set
958# CONFIG_CRYPTO_MICHAEL_MIC is not set 988# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1016,5 +1046,6 @@ CONFIG_ZLIB_DEFLATE=y
1016CONFIG_HAS_IOMEM=y 1046CONFIG_HAS_IOMEM=y
1017CONFIG_HAS_IOPORT=y 1047CONFIG_HAS_IOPORT=y
1018CONFIG_HAS_DMA=y 1048CONFIG_HAS_DMA=y
1049CONFIG_HAVE_LMB=y
1019CONFIG_NLATTR=y 1050CONFIG_NLATTR=y
1020CONFIG_GENERIC_ATOMIC64=y 1051CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7751_defconfig b/arch/sh/configs/se7751_defconfig
index eb431c43e994..c20ae5e35c81 100644
--- a/arch/sh/configs/se7751_defconfig
+++ b/arch/sh/configs/se7751_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 13:02:26 2009 4# Thu Sep 24 19:01:41 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -27,7 +28,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 28# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 29CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y
31 34
32# 35#
33# General setup 36# General setup
@@ -37,6 +40,12 @@ CONFIG_BROKEN_ON_SMP=y
37CONFIG_INIT_ENV_ARG_LIMIT=32 40CONFIG_INIT_ENV_ARG_LIMIT=32
38CONFIG_LOCALVERSION="" 41CONFIG_LOCALVERSION=""
39CONFIG_LOCALVERSION_AUTO=y 42CONFIG_LOCALVERSION_AUTO=y
43CONFIG_HAVE_KERNEL_GZIP=y
44CONFIG_HAVE_KERNEL_BZIP2=y
45CONFIG_HAVE_KERNEL_LZMA=y
46CONFIG_KERNEL_GZIP=y
47# CONFIG_KERNEL_BZIP2 is not set
48# CONFIG_KERNEL_LZMA is not set
40CONFIG_SWAP=y 49CONFIG_SWAP=y
41CONFIG_SYSVIPC=y 50CONFIG_SYSVIPC=y
42CONFIG_SYSVIPC_SYSCTL=y 51CONFIG_SYSVIPC_SYSCTL=y
@@ -49,11 +58,12 @@ CONFIG_BSD_PROCESS_ACCT=y
49# 58#
50# RCU Subsystem 59# RCU Subsystem
51# 60#
52CONFIG_CLASSIC_RCU=y 61CONFIG_TREE_RCU=y
53# CONFIG_TREE_RCU is not set 62# CONFIG_TREE_PREEMPT_RCU is not set
54# CONFIG_PREEMPT_RCU is not set 63# CONFIG_RCU_TRACE is not set
64CONFIG_RCU_FANOUT=32
65# CONFIG_RCU_FANOUT_EXACT is not set
55# CONFIG_TREE_RCU_TRACE is not set 66# CONFIG_TREE_RCU_TRACE is not set
56# CONFIG_PREEMPT_RCU_TRACE is not set
57# CONFIG_IKCONFIG is not set 67# CONFIG_IKCONFIG is not set
58CONFIG_LOG_BUF_SHIFT=14 68CONFIG_LOG_BUF_SHIFT=14
59# CONFIG_GROUP_SCHED is not set 69# CONFIG_GROUP_SCHED is not set
@@ -87,18 +97,19 @@ CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 97CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 98CONFIG_SHMEM=y
89CONFIG_AIO=y 99CONFIG_AIO=y
100CONFIG_HAVE_PERF_EVENTS=y
90 101
91# 102#
92# Performance Counters 103# Kernel Performance Events And Counters
93# 104#
105# CONFIG_PERF_EVENTS is not set
106# CONFIG_PERF_COUNTERS is not set
94CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
95# CONFIG_STRIP_ASM_SYMS is not set
96CONFIG_COMPAT_BRK=y 108CONFIG_COMPAT_BRK=y
97CONFIG_SLAB=y 109CONFIG_SLAB=y
98# CONFIG_SLUB is not set 110# CONFIG_SLUB is not set
99# CONFIG_SLOB is not set 111# CONFIG_SLOB is not set
100# CONFIG_PROFILING is not set 112# CONFIG_PROFILING is not set
101# CONFIG_MARKERS is not set
102CONFIG_HAVE_OPROFILE=y 113CONFIG_HAVE_OPROFILE=y
103# CONFIG_KPROBES is not set 114# CONFIG_KPROBES is not set
104CONFIG_HAVE_IOREMAP_PROT=y 115CONFIG_HAVE_IOREMAP_PROT=y
@@ -107,6 +118,10 @@ CONFIG_HAVE_KRETPROBES=y
107CONFIG_HAVE_ARCH_TRACEHOOK=y 118CONFIG_HAVE_ARCH_TRACEHOOK=y
108CONFIG_HAVE_CLK=y 119CONFIG_HAVE_CLK=y
109CONFIG_HAVE_DMA_API_DEBUG=y 120CONFIG_HAVE_DMA_API_DEBUG=y
121
122#
123# GCOV-based kernel profiling
124#
110# CONFIG_SLOW_WORK is not set 125# CONFIG_SLOW_WORK is not set
111CONFIG_HAVE_GENERIC_DMA_COHERENT=y 126CONFIG_HAVE_GENERIC_DMA_COHERENT=y
112CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
@@ -118,7 +133,7 @@ CONFIG_MODULES=y
118# CONFIG_MODVERSIONS is not set 133# CONFIG_MODVERSIONS is not set
119# CONFIG_MODULE_SRCVERSION_ALL is not set 134# CONFIG_MODULE_SRCVERSION_ALL is not set
120CONFIG_BLOCK=y 135CONFIG_BLOCK=y
121# CONFIG_LBD is not set 136CONFIG_LBDAF=y
122# CONFIG_BLK_DEV_BSG is not set 137# CONFIG_BLK_DEV_BSG is not set
123# CONFIG_BLK_DEV_INTEGRITY is not set 138# CONFIG_BLK_DEV_INTEGRITY is not set
124 139
@@ -165,6 +180,7 @@ CONFIG_CPU_SUBTYPE_SH7751=y
165# CONFIG_CPU_SUBTYPE_SH4_202 is not set 180# CONFIG_CPU_SUBTYPE_SH4_202 is not set
166# CONFIG_CPU_SUBTYPE_SH7723 is not set 181# CONFIG_CPU_SUBTYPE_SH7723 is not set
167# CONFIG_CPU_SUBTYPE_SH7724 is not set 182# CONFIG_CPU_SUBTYPE_SH7724 is not set
183# CONFIG_CPU_SUBTYPE_SH7757 is not set
168# CONFIG_CPU_SUBTYPE_SH7763 is not set 184# CONFIG_CPU_SUBTYPE_SH7763 is not set
169# CONFIG_CPU_SUBTYPE_SH7770 is not set 185# CONFIG_CPU_SUBTYPE_SH7770 is not set
170# CONFIG_CPU_SUBTYPE_SH7780 is not set 186# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -210,6 +226,7 @@ CONFIG_ZONE_DMA_FLAG=0
210CONFIG_NR_QUICK=2 226CONFIG_NR_QUICK=2
211CONFIG_HAVE_MLOCK=y 227CONFIG_HAVE_MLOCK=y
212CONFIG_HAVE_MLOCKED_PAGE_BIT=y 228CONFIG_HAVE_MLOCKED_PAGE_BIT=y
229# CONFIG_KSM is not set
213CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 230CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
214 231
215# 232#
@@ -295,7 +312,8 @@ CONFIG_ZERO_PAGE_OFFSET=0x00010000
295CONFIG_BOOT_LINK_OFFSET=0x00800000 312CONFIG_BOOT_LINK_OFFSET=0x00800000
296CONFIG_ENTRY_OFFSET=0x00001000 313CONFIG_ENTRY_OFFSET=0x00001000
297# CONFIG_UBC_WAKEUP is not set 314# CONFIG_UBC_WAKEUP is not set
298CONFIG_CMDLINE_BOOL=y 315CONFIG_CMDLINE_OVERWRITE=y
316# CONFIG_CMDLINE_EXTEND is not set
299CONFIG_CMDLINE="console=ttySC1,38400" 317CONFIG_CMDLINE="console=ttySC1,38400"
300 318
301# 319#
@@ -382,6 +400,7 @@ CONFIG_IP_NF_QUEUE=y
382# CONFIG_IP_NF_ARPTABLES is not set 400# CONFIG_IP_NF_ARPTABLES is not set
383# CONFIG_IP_DCCP is not set 401# CONFIG_IP_DCCP is not set
384# CONFIG_IP_SCTP is not set 402# CONFIG_IP_SCTP is not set
403# CONFIG_RDS is not set
385# CONFIG_TIPC is not set 404# CONFIG_TIPC is not set
386# CONFIG_ATM is not set 405# CONFIG_ATM is not set
387# CONFIG_BRIDGE is not set 406# CONFIG_BRIDGE is not set
@@ -411,6 +430,7 @@ CONFIG_IP_NF_QUEUE=y
411# CONFIG_AF_RXRPC is not set 430# CONFIG_AF_RXRPC is not set
412CONFIG_WIRELESS=y 431CONFIG_WIRELESS=y
413# CONFIG_CFG80211 is not set 432# CONFIG_CFG80211 is not set
433CONFIG_CFG80211_DEFAULT_PS_VALUE=0
414# CONFIG_WIRELESS_OLD_REGULATORY is not set 434# CONFIG_WIRELESS_OLD_REGULATORY is not set
415# CONFIG_WIRELESS_EXT is not set 435# CONFIG_WIRELESS_EXT is not set
416# CONFIG_LIB80211 is not set 436# CONFIG_LIB80211 is not set
@@ -418,7 +438,6 @@ CONFIG_WIRELESS=y
418# 438#
419# CFG80211 needs to be enabled for MAC80211 439# CFG80211 needs to be enabled for MAC80211
420# 440#
421CONFIG_MAC80211_DEFAULT_PS_VALUE=0
422# CONFIG_WIMAX is not set 441# CONFIG_WIMAX is not set
423# CONFIG_RFKILL is not set 442# CONFIG_RFKILL is not set
424# CONFIG_NET_9P is not set 443# CONFIG_NET_9P is not set
@@ -436,9 +455,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
436# CONFIG_CONNECTOR is not set 455# CONFIG_CONNECTOR is not set
437CONFIG_MTD=y 456CONFIG_MTD=y
438# CONFIG_MTD_DEBUG is not set 457# CONFIG_MTD_DEBUG is not set
458# CONFIG_MTD_TESTS is not set
439# CONFIG_MTD_CONCAT is not set 459# CONFIG_MTD_CONCAT is not set
440CONFIG_MTD_PARTITIONS=y 460CONFIG_MTD_PARTITIONS=y
441# CONFIG_MTD_TESTS is not set
442# CONFIG_MTD_REDBOOT_PARTS is not set 461# CONFIG_MTD_REDBOOT_PARTS is not set
443# CONFIG_MTD_CMDLINE_PARTS is not set 462# CONFIG_MTD_CMDLINE_PARTS is not set
444# CONFIG_MTD_AR7_PARTS is not set 463# CONFIG_MTD_AR7_PARTS is not set
@@ -574,10 +593,7 @@ CONFIG_MII=y
574# CONFIG_KS8842 is not set 593# CONFIG_KS8842 is not set
575CONFIG_NETDEV_1000=y 594CONFIG_NETDEV_1000=y
576CONFIG_NETDEV_10000=y 595CONFIG_NETDEV_10000=y
577 596CONFIG_WLAN=y
578#
579# Wireless LAN
580#
581# CONFIG_WLAN_PRE80211 is not set 597# CONFIG_WLAN_PRE80211 is not set
582# CONFIG_WLAN_80211 is not set 598# CONFIG_WLAN_80211 is not set
583 599
@@ -632,10 +648,20 @@ CONFIG_HW_RANDOM=y
632# CONFIG_TCG_TPM is not set 648# CONFIG_TCG_TPM is not set
633# CONFIG_I2C is not set 649# CONFIG_I2C is not set
634# CONFIG_SPI is not set 650# CONFIG_SPI is not set
651
652#
653# PPS support
654#
655# CONFIG_PPS is not set
635# CONFIG_W1 is not set 656# CONFIG_W1 is not set
636# CONFIG_POWER_SUPPLY is not set 657# CONFIG_POWER_SUPPLY is not set
637CONFIG_HWMON=y 658CONFIG_HWMON=y
638# CONFIG_HWMON_VID is not set 659# CONFIG_HWMON_VID is not set
660# CONFIG_HWMON_DEBUG_CHIP is not set
661
662#
663# Native drivers
664#
639# CONFIG_SENSORS_F71805F is not set 665# CONFIG_SENSORS_F71805F is not set
640# CONFIG_SENSORS_F71882FG is not set 666# CONFIG_SENSORS_F71882FG is not set
641# CONFIG_SENSORS_IT87 is not set 667# CONFIG_SENSORS_IT87 is not set
@@ -646,9 +672,7 @@ CONFIG_HWMON=y
646# CONFIG_SENSORS_VT1211 is not set 672# CONFIG_SENSORS_VT1211 is not set
647# CONFIG_SENSORS_W83627HF is not set 673# CONFIG_SENSORS_W83627HF is not set
648# CONFIG_SENSORS_W83627EHF is not set 674# CONFIG_SENSORS_W83627EHF is not set
649# CONFIG_HWMON_DEBUG_CHIP is not set
650# CONFIG_THERMAL is not set 675# CONFIG_THERMAL is not set
651# CONFIG_THERMAL_HWMON is not set
652CONFIG_WATCHDOG=y 676CONFIG_WATCHDOG=y
653# CONFIG_WATCHDOG_NOWAYOUT is not set 677# CONFIG_WATCHDOG_NOWAYOUT is not set
654 678
@@ -734,8 +758,10 @@ CONFIG_EXT2_FS=y
734# CONFIG_JFS_FS is not set 758# CONFIG_JFS_FS is not set
735# CONFIG_FS_POSIX_ACL is not set 759# CONFIG_FS_POSIX_ACL is not set
736# CONFIG_XFS_FS is not set 760# CONFIG_XFS_FS is not set
761# CONFIG_GFS2_FS is not set
737# CONFIG_OCFS2_FS is not set 762# CONFIG_OCFS2_FS is not set
738# CONFIG_BTRFS_FS is not set 763# CONFIG_BTRFS_FS is not set
764# CONFIG_NILFS2_FS is not set
739CONFIG_FILE_LOCKING=y 765CONFIG_FILE_LOCKING=y
740CONFIG_FSNOTIFY=y 766CONFIG_FSNOTIFY=y
741CONFIG_DNOTIFY=y 767CONFIG_DNOTIFY=y
@@ -806,7 +832,6 @@ CONFIG_JFFS2_RTIME=y
806# CONFIG_ROMFS_FS is not set 832# CONFIG_ROMFS_FS is not set
807# CONFIG_SYSV_FS is not set 833# CONFIG_SYSV_FS is not set
808# CONFIG_UFS_FS is not set 834# CONFIG_UFS_FS is not set
809# CONFIG_NILFS2_FS is not set
810CONFIG_NETWORK_FILESYSTEMS=y 835CONFIG_NETWORK_FILESYSTEMS=y
811# CONFIG_NFS_FS is not set 836# CONFIG_NFS_FS is not set
812# CONFIG_NFSD is not set 837# CONFIG_NFSD is not set
@@ -833,6 +858,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
833CONFIG_ENABLE_MUST_CHECK=y 858CONFIG_ENABLE_MUST_CHECK=y
834CONFIG_FRAME_WARN=1024 859CONFIG_FRAME_WARN=1024
835# CONFIG_MAGIC_SYSRQ is not set 860# CONFIG_MAGIC_SYSRQ is not set
861# CONFIG_STRIP_ASM_SYMS is not set
836# CONFIG_UNUSED_SYMBOLS is not set 862# CONFIG_UNUSED_SYMBOLS is not set
837# CONFIG_DEBUG_FS is not set 863# CONFIG_DEBUG_FS is not set
838# CONFIG_HEADERS_CHECK is not set 864# CONFIG_HEADERS_CHECK is not set
@@ -842,8 +868,11 @@ CONFIG_FRAME_WARN=1024
842# CONFIG_RCU_CPU_STALL_DETECTOR is not set 868# CONFIG_RCU_CPU_STALL_DETECTOR is not set
843# CONFIG_LATENCYTOP is not set 869# CONFIG_LATENCYTOP is not set
844CONFIG_HAVE_FUNCTION_TRACER=y 870CONFIG_HAVE_FUNCTION_TRACER=y
871CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
872CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
845CONFIG_HAVE_DYNAMIC_FTRACE=y 873CONFIG_HAVE_DYNAMIC_FTRACE=y
846CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 874CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
875CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
847CONFIG_TRACING_SUPPORT=y 876CONFIG_TRACING_SUPPORT=y
848# CONFIG_FTRACE is not set 877# CONFIG_FTRACE is not set
849# CONFIG_DMA_API_DEBUG is not set 878# CONFIG_DMA_API_DEBUG is not set
@@ -851,6 +880,7 @@ CONFIG_TRACING_SUPPORT=y
851CONFIG_HAVE_ARCH_KGDB=y 880CONFIG_HAVE_ARCH_KGDB=y
852# CONFIG_SH_STANDARD_BIOS is not set 881# CONFIG_SH_STANDARD_BIOS is not set
853# CONFIG_EARLY_SCIF_CONSOLE is not set 882# CONFIG_EARLY_SCIF_CONSOLE is not set
883# CONFIG_DWARF_UNWINDER is not set
854 884
855# 885#
856# Security options 886# Security options
@@ -864,7 +894,6 @@ CONFIG_CRYPTO=y
864# 894#
865# Crypto core or helper 895# Crypto core or helper
866# 896#
867# CONFIG_CRYPTO_FIPS is not set
868# CONFIG_CRYPTO_MANAGER is not set 897# CONFIG_CRYPTO_MANAGER is not set
869# CONFIG_CRYPTO_MANAGER2 is not set 898# CONFIG_CRYPTO_MANAGER2 is not set
870# CONFIG_CRYPTO_GF128MUL is not set 899# CONFIG_CRYPTO_GF128MUL is not set
@@ -896,11 +925,13 @@ CONFIG_CRYPTO=y
896# 925#
897# CONFIG_CRYPTO_HMAC is not set 926# CONFIG_CRYPTO_HMAC is not set
898# CONFIG_CRYPTO_XCBC is not set 927# CONFIG_CRYPTO_XCBC is not set
928# CONFIG_CRYPTO_VMAC is not set
899 929
900# 930#
901# Digest 931# Digest
902# 932#
903# CONFIG_CRYPTO_CRC32C is not set 933# CONFIG_CRYPTO_CRC32C is not set
934# CONFIG_CRYPTO_GHASH is not set
904# CONFIG_CRYPTO_MD4 is not set 935# CONFIG_CRYPTO_MD4 is not set
905# CONFIG_CRYPTO_MD5 is not set 936# CONFIG_CRYPTO_MD5 is not set
906# CONFIG_CRYPTO_MICHAEL_MIC is not set 937# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -965,5 +996,6 @@ CONFIG_DECOMPRESS_GZIP=y
965CONFIG_HAS_IOMEM=y 996CONFIG_HAS_IOMEM=y
966CONFIG_HAS_IOPORT=y 997CONFIG_HAS_IOPORT=y
967CONFIG_HAS_DMA=y 998CONFIG_HAS_DMA=y
999CONFIG_HAVE_LMB=y
968CONFIG_NLATTR=y 1000CONFIG_NLATTR=y
969CONFIG_GENERIC_ATOMIC64=y 1001CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7780_defconfig b/arch/sh/configs/se7780_defconfig
index 756beec5fb28..82baeef40a96 100644
--- a/arch/sh/configs/se7780_defconfig
+++ b/arch/sh/configs/se7780_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 13:03:56 2009 4# Thu Sep 24 19:03:59 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,7 +29,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
28# CONFIG_ARCH_HAS_ILOG2_U64 is not set 29# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29CONFIG_ARCH_NO_VIRT_TO_BUS=y 30CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y
32 35
33# 36#
34# General setup 37# General setup
@@ -38,6 +41,12 @@ CONFIG_BROKEN_ON_SMP=y
38CONFIG_INIT_ENV_ARG_LIMIT=32 41CONFIG_INIT_ENV_ARG_LIMIT=32
39CONFIG_LOCALVERSION="" 42CONFIG_LOCALVERSION=""
40CONFIG_LOCALVERSION_AUTO=y 43CONFIG_LOCALVERSION_AUTO=y
44CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set
41# CONFIG_SWAP is not set 50# CONFIG_SWAP is not set
42CONFIG_SYSVIPC=y 51CONFIG_SYSVIPC=y
43CONFIG_SYSVIPC_SYSCTL=y 52CONFIG_SYSVIPC_SYSCTL=y
@@ -48,11 +57,12 @@ CONFIG_SYSVIPC_SYSCTL=y
48# 57#
49# RCU Subsystem 58# RCU Subsystem
50# 59#
51CONFIG_CLASSIC_RCU=y 60CONFIG_TREE_RCU=y
52# CONFIG_TREE_RCU is not set 61# CONFIG_TREE_PREEMPT_RCU is not set
53# CONFIG_PREEMPT_RCU is not set 62# CONFIG_RCU_TRACE is not set
63CONFIG_RCU_FANOUT=32
64# CONFIG_RCU_FANOUT_EXACT is not set
54# CONFIG_TREE_RCU_TRACE is not set 65# CONFIG_TREE_RCU_TRACE is not set
55# CONFIG_PREEMPT_RCU_TRACE is not set
56CONFIG_IKCONFIG=y 66CONFIG_IKCONFIG=y
57CONFIG_IKCONFIG_PROC=y 67CONFIG_IKCONFIG_PROC=y
58CONFIG_LOG_BUF_SHIFT=14 68CONFIG_LOG_BUF_SHIFT=14
@@ -81,19 +91,20 @@ CONFIG_TIMERFD=y
81CONFIG_EVENTFD=y 91CONFIG_EVENTFD=y
82CONFIG_SHMEM=y 92CONFIG_SHMEM=y
83CONFIG_AIO=y 93CONFIG_AIO=y
94CONFIG_HAVE_PERF_EVENTS=y
84 95
85# 96#
86# Performance Counters 97# Kernel Performance Events And Counters
87# 98#
99# CONFIG_PERF_EVENTS is not set
100# CONFIG_PERF_COUNTERS is not set
88CONFIG_VM_EVENT_COUNTERS=y 101CONFIG_VM_EVENT_COUNTERS=y
89CONFIG_PCI_QUIRKS=y 102CONFIG_PCI_QUIRKS=y
90# CONFIG_STRIP_ASM_SYMS is not set
91CONFIG_COMPAT_BRK=y 103CONFIG_COMPAT_BRK=y
92CONFIG_SLAB=y 104CONFIG_SLAB=y
93# CONFIG_SLUB is not set 105# CONFIG_SLUB is not set
94# CONFIG_SLOB is not set 106# CONFIG_SLOB is not set
95# CONFIG_PROFILING is not set 107# CONFIG_PROFILING is not set
96# CONFIG_MARKERS is not set
97CONFIG_HAVE_OPROFILE=y 108CONFIG_HAVE_OPROFILE=y
98CONFIG_HAVE_IOREMAP_PROT=y 109CONFIG_HAVE_IOREMAP_PROT=y
99CONFIG_HAVE_KPROBES=y 110CONFIG_HAVE_KPROBES=y
@@ -101,6 +112,11 @@ CONFIG_HAVE_KRETPROBES=y
101CONFIG_HAVE_ARCH_TRACEHOOK=y 112CONFIG_HAVE_ARCH_TRACEHOOK=y
102CONFIG_HAVE_CLK=y 113CONFIG_HAVE_CLK=y
103CONFIG_HAVE_DMA_API_DEBUG=y 114CONFIG_HAVE_DMA_API_DEBUG=y
115
116#
117# GCOV-based kernel profiling
118#
119# CONFIG_GCOV_KERNEL is not set
104# CONFIG_SLOW_WORK is not set 120# CONFIG_SLOW_WORK is not set
105CONFIG_HAVE_GENERIC_DMA_COHERENT=y 121CONFIG_HAVE_GENERIC_DMA_COHERENT=y
106CONFIG_SLABINFO=y 122CONFIG_SLABINFO=y
@@ -112,7 +128,8 @@ CONFIG_MODULE_UNLOAD=y
112# CONFIG_MODVERSIONS is not set 128# CONFIG_MODVERSIONS is not set
113# CONFIG_MODULE_SRCVERSION_ALL is not set 129# CONFIG_MODULE_SRCVERSION_ALL is not set
114CONFIG_BLOCK=y 130CONFIG_BLOCK=y
115# CONFIG_LBD is not set 131CONFIG_LBDAF=y
132CONFIG_BLK_DEV_BSG=y
116# CONFIG_BLK_DEV_INTEGRITY is not set 133# CONFIG_BLK_DEV_INTEGRITY is not set
117 134
118# 135#
@@ -159,6 +176,7 @@ CONFIG_CPU_SH4A=y
159# CONFIG_CPU_SUBTYPE_SH4_202 is not set 176# CONFIG_CPU_SUBTYPE_SH4_202 is not set
160# CONFIG_CPU_SUBTYPE_SH7723 is not set 177# CONFIG_CPU_SUBTYPE_SH7723 is not set
161# CONFIG_CPU_SUBTYPE_SH7724 is not set 178# CONFIG_CPU_SUBTYPE_SH7724 is not set
179# CONFIG_CPU_SUBTYPE_SH7757 is not set
162# CONFIG_CPU_SUBTYPE_SH7763 is not set 180# CONFIG_CPU_SUBTYPE_SH7763 is not set
163# CONFIG_CPU_SUBTYPE_SH7770 is not set 181# CONFIG_CPU_SUBTYPE_SH7770 is not set
164CONFIG_CPU_SUBTYPE_SH7780=y 182CONFIG_CPU_SUBTYPE_SH7780=y
@@ -199,7 +217,6 @@ CONFIG_SPARSEMEM_MANUAL=y
199CONFIG_SPARSEMEM=y 217CONFIG_SPARSEMEM=y
200CONFIG_HAVE_MEMORY_PRESENT=y 218CONFIG_HAVE_MEMORY_PRESENT=y
201CONFIG_SPARSEMEM_STATIC=y 219CONFIG_SPARSEMEM_STATIC=y
202CONFIG_PAGEFLAGS_EXTENDED=y
203CONFIG_SPLIT_PTLOCK_CPUS=4 220CONFIG_SPLIT_PTLOCK_CPUS=4
204CONFIG_MIGRATION=y 221CONFIG_MIGRATION=y
205# CONFIG_PHYS_ADDR_T_64BIT is not set 222# CONFIG_PHYS_ADDR_T_64BIT is not set
@@ -207,6 +224,7 @@ CONFIG_ZONE_DMA_FLAG=0
207CONFIG_NR_QUICK=2 224CONFIG_NR_QUICK=2
208CONFIG_HAVE_MLOCK=y 225CONFIG_HAVE_MLOCK=y
209CONFIG_HAVE_MLOCKED_PAGE_BIT=y 226CONFIG_HAVE_MLOCKED_PAGE_BIT=y
227# CONFIG_KSM is not set
210CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 228CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
211 229
212# 230#
@@ -287,8 +305,9 @@ CONFIG_GUSA=y
287CONFIG_ZERO_PAGE_OFFSET=0x00001000 305CONFIG_ZERO_PAGE_OFFSET=0x00001000
288CONFIG_BOOT_LINK_OFFSET=0x00810000 306CONFIG_BOOT_LINK_OFFSET=0x00810000
289CONFIG_ENTRY_OFFSET=0x00001000 307CONFIG_ENTRY_OFFSET=0x00001000
290CONFIG_CMDLINE_BOOL=y 308CONFIG_CMDLINE_OVERWRITE=y
291CONFIG_CMDLINE="console=ttySC0.115200 root=/dev/sda1" 309# CONFIG_CMDLINE_EXTEND is not set
310CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
292 311
293# 312#
294# Bus options 313# Bus options
@@ -382,6 +401,7 @@ CONFIG_IPV6=y
382# CONFIG_BT is not set 401# CONFIG_BT is not set
383CONFIG_WIRELESS=y 402CONFIG_WIRELESS=y
384# CONFIG_CFG80211 is not set 403# CONFIG_CFG80211 is not set
404CONFIG_CFG80211_DEFAULT_PS_VALUE=0
385# CONFIG_WIRELESS_OLD_REGULATORY is not set 405# CONFIG_WIRELESS_OLD_REGULATORY is not set
386# CONFIG_WIRELESS_EXT is not set 406# CONFIG_WIRELESS_EXT is not set
387# CONFIG_LIB80211 is not set 407# CONFIG_LIB80211 is not set
@@ -389,7 +409,6 @@ CONFIG_WIRELESS=y
389# 409#
390# CFG80211 needs to be enabled for MAC80211 410# CFG80211 needs to be enabled for MAC80211
391# 411#
392CONFIG_MAC80211_DEFAULT_PS_VALUE=0
393# CONFIG_WIMAX is not set 412# CONFIG_WIMAX is not set
394# CONFIG_RFKILL is not set 413# CONFIG_RFKILL is not set
395 414
@@ -406,9 +425,9 @@ CONFIG_STANDALONE=y
406# CONFIG_CONNECTOR is not set 425# CONFIG_CONNECTOR is not set
407CONFIG_MTD=y 426CONFIG_MTD=y
408# CONFIG_MTD_DEBUG is not set 427# CONFIG_MTD_DEBUG is not set
428# CONFIG_MTD_TESTS is not set
409# CONFIG_MTD_CONCAT is not set 429# CONFIG_MTD_CONCAT is not set
410CONFIG_MTD_PARTITIONS=y 430CONFIG_MTD_PARTITIONS=y
411# CONFIG_MTD_TESTS is not set
412# CONFIG_MTD_REDBOOT_PARTS is not set 431# CONFIG_MTD_REDBOOT_PARTS is not set
413# CONFIG_MTD_CMDLINE_PARTS is not set 432# CONFIG_MTD_CMDLINE_PARTS is not set
414# CONFIG_MTD_AR7_PARTS is not set 433# CONFIG_MTD_AR7_PARTS is not set
@@ -549,6 +568,7 @@ CONFIG_SCSI_WAIT_SCAN=m
549# CONFIG_SCSI_SPI_ATTRS is not set 568# CONFIG_SCSI_SPI_ATTRS is not set
550# CONFIG_SCSI_FC_ATTRS is not set 569# CONFIG_SCSI_FC_ATTRS is not set
551# CONFIG_SCSI_ISCSI_ATTRS is not set 570# CONFIG_SCSI_ISCSI_ATTRS is not set
571# CONFIG_SCSI_SAS_ATTRS is not set
552# CONFIG_SCSI_SAS_LIBSAS is not set 572# CONFIG_SCSI_SAS_LIBSAS is not set
553# CONFIG_SCSI_SRP_ATTRS is not set 573# CONFIG_SCSI_SRP_ATTRS is not set
554CONFIG_SCSI_LOWLEVEL=y 574CONFIG_SCSI_LOWLEVEL=y
@@ -587,11 +607,13 @@ CONFIG_SCSI_LOWLEVEL=y
587# CONFIG_SCSI_DC390T is not set 607# CONFIG_SCSI_DC390T is not set
588# CONFIG_SCSI_NSP32 is not set 608# CONFIG_SCSI_NSP32 is not set
589# CONFIG_SCSI_DEBUG is not set 609# CONFIG_SCSI_DEBUG is not set
610# CONFIG_SCSI_PMCRAID is not set
590# CONFIG_SCSI_SRP is not set 611# CONFIG_SCSI_SRP is not set
591# CONFIG_SCSI_DH is not set 612# CONFIG_SCSI_DH is not set
592# CONFIG_SCSI_OSD_INITIATOR is not set 613# CONFIG_SCSI_OSD_INITIATOR is not set
593CONFIG_ATA=y 614CONFIG_ATA=y
594# CONFIG_ATA_NONSTANDARD is not set 615# CONFIG_ATA_NONSTANDARD is not set
616CONFIG_ATA_VERBOSE_ERROR=y
595CONFIG_SATA_PMP=y 617CONFIG_SATA_PMP=y
596# CONFIG_SATA_AHCI is not set 618# CONFIG_SATA_AHCI is not set
597# CONFIG_SATA_SIL24 is not set 619# CONFIG_SATA_SIL24 is not set
@@ -612,6 +634,7 @@ CONFIG_SATA_SIL=y
612# CONFIG_PATA_ALI is not set 634# CONFIG_PATA_ALI is not set
613# CONFIG_PATA_AMD is not set 635# CONFIG_PATA_AMD is not set
614# CONFIG_PATA_ARTOP is not set 636# CONFIG_PATA_ARTOP is not set
637# CONFIG_PATA_ATP867X is not set
615# CONFIG_PATA_ATIIXP is not set 638# CONFIG_PATA_ATIIXP is not set
616# CONFIG_PATA_CMD64X is not set 639# CONFIG_PATA_CMD64X is not set
617# CONFIG_PATA_CS5520 is not set 640# CONFIG_PATA_CS5520 is not set
@@ -630,6 +653,7 @@ CONFIG_SATA_SIL=y
630# CONFIG_PATA_NS87410 is not set 653# CONFIG_PATA_NS87410 is not set
631# CONFIG_PATA_NS87415 is not set 654# CONFIG_PATA_NS87415 is not set
632# CONFIG_PATA_PDC_OLD is not set 655# CONFIG_PATA_PDC_OLD is not set
656# CONFIG_PATA_RDC is not set
633# CONFIG_PATA_RZ1000 is not set 657# CONFIG_PATA_RZ1000 is not set
634# CONFIG_PATA_SC1200 is not set 658# CONFIG_PATA_SC1200 is not set
635# CONFIG_PATA_SERVERWORKS is not set 659# CONFIG_PATA_SERVERWORKS is not set
@@ -648,8 +672,13 @@ CONFIG_SATA_SIL=y
648# 672#
649 673
650# 674#
651# A new alternative FireWire stack is available with EXPERIMENTAL=y 675# You can enable one or both FireWire driver stacks.
652# 676#
677
678#
679# See the help texts for more information.
680#
681# CONFIG_FIREWIRE is not set
653# CONFIG_IEEE1394 is not set 682# CONFIG_IEEE1394 is not set
654# CONFIG_I2O is not set 683# CONFIG_I2O is not set
655CONFIG_NETDEVICES=y 684CONFIG_NETDEVICES=y
@@ -724,10 +753,7 @@ CONFIG_NET_PCI=y
724# CONFIG_NETDEV_1000 is not set 753# CONFIG_NETDEV_1000 is not set
725# CONFIG_NETDEV_10000 is not set 754# CONFIG_NETDEV_10000 is not set
726# CONFIG_TR is not set 755# CONFIG_TR is not set
727 756CONFIG_WLAN=y
728#
729# Wireless LAN
730#
731# CONFIG_WLAN_PRE80211 is not set 757# CONFIG_WLAN_PRE80211 is not set
732# CONFIG_WLAN_80211 is not set 758# CONFIG_WLAN_80211 is not set
733 759
@@ -821,10 +847,19 @@ CONFIG_UNIX98_PTYS=y
821CONFIG_DEVPORT=y 847CONFIG_DEVPORT=y
822# CONFIG_I2C is not set 848# CONFIG_I2C is not set
823# CONFIG_SPI is not set 849# CONFIG_SPI is not set
850
851#
852# PPS support
853#
824# CONFIG_W1 is not set 854# CONFIG_W1 is not set
825# CONFIG_POWER_SUPPLY is not set 855# CONFIG_POWER_SUPPLY is not set
826CONFIG_HWMON=y 856CONFIG_HWMON=y
827# CONFIG_HWMON_VID is not set 857# CONFIG_HWMON_VID is not set
858# CONFIG_HWMON_DEBUG_CHIP is not set
859
860#
861# Native drivers
862#
828# CONFIG_SENSORS_IT87 is not set 863# CONFIG_SENSORS_IT87 is not set
829# CONFIG_SENSORS_PC87360 is not set 864# CONFIG_SENSORS_PC87360 is not set
830# CONFIG_SENSORS_SIS5595 is not set 865# CONFIG_SENSORS_SIS5595 is not set
@@ -833,7 +868,6 @@ CONFIG_HWMON=y
833# CONFIG_SENSORS_VT8231 is not set 868# CONFIG_SENSORS_VT8231 is not set
834# CONFIG_SENSORS_W83627HF is not set 869# CONFIG_SENSORS_W83627HF is not set
835# CONFIG_SENSORS_W83627EHF is not set 870# CONFIG_SENSORS_W83627EHF is not set
836# CONFIG_HWMON_DEBUG_CHIP is not set
837CONFIG_THERMAL=y 871CONFIG_THERMAL=y
838# CONFIG_THERMAL_HWMON is not set 872# CONFIG_THERMAL_HWMON is not set
839# CONFIG_WATCHDOG is not set 873# CONFIG_WATCHDOG is not set
@@ -857,6 +891,7 @@ CONFIG_SSB_POSSIBLE=y
857# 891#
858# Graphics support 892# Graphics support
859# 893#
894CONFIG_VGA_ARB=y
860# CONFIG_DRM is not set 895# CONFIG_DRM is not set
861# CONFIG_VGASTATE is not set 896# CONFIG_VGASTATE is not set
862# CONFIG_VIDEO_OUTPUT_CONTROL is not set 897# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -937,11 +972,11 @@ CONFIG_LOGO_LINUX_CLUT224=y
937CONFIG_LOGO_SUPERH_CLUT224=y 972CONFIG_LOGO_SUPERH_CLUT224=y
938CONFIG_SOUND=y 973CONFIG_SOUND=y
939CONFIG_SOUND_OSS_CORE=y 974CONFIG_SOUND_OSS_CORE=y
975CONFIG_SOUND_OSS_CORE_PRECLAIM=y
940# CONFIG_SND is not set 976# CONFIG_SND is not set
941CONFIG_SOUND_PRIME=y 977CONFIG_SOUND_PRIME=y
942CONFIG_HID_SUPPORT=y 978CONFIG_HID_SUPPORT=y
943CONFIG_HID=y 979CONFIG_HID=y
944# CONFIG_HID_DEBUG is not set
945# CONFIG_HIDRAW is not set 980# CONFIG_HIDRAW is not set
946 981
947# 982#
@@ -964,6 +999,7 @@ CONFIG_HID_CYPRESS=y
964CONFIG_HID_EZKEY=y 999CONFIG_HID_EZKEY=y
965# CONFIG_HID_KYE is not set 1000# CONFIG_HID_KYE is not set
966CONFIG_HID_GYRATION=y 1001CONFIG_HID_GYRATION=y
1002# CONFIG_HID_TWINHAN is not set
967# CONFIG_HID_KENSINGTON is not set 1003# CONFIG_HID_KENSINGTON is not set
968CONFIG_HID_LOGITECH=y 1004CONFIG_HID_LOGITECH=y
969# CONFIG_LOGITECH_FF is not set 1005# CONFIG_LOGITECH_FF is not set
@@ -1009,6 +1045,7 @@ CONFIG_USB_EHCI_HCD=y
1009# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1045# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1010# CONFIG_USB_OXU210HP_HCD is not set 1046# CONFIG_USB_OXU210HP_HCD is not set
1011# CONFIG_USB_ISP116X_HCD is not set 1047# CONFIG_USB_ISP116X_HCD is not set
1048# CONFIG_USB_ISP1362_HCD is not set
1012CONFIG_USB_OHCI_HCD=y 1049CONFIG_USB_OHCI_HCD=y
1013# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 1050# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1014# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 1051# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -1243,6 +1280,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1243CONFIG_ENABLE_MUST_CHECK=y 1280CONFIG_ENABLE_MUST_CHECK=y
1244CONFIG_FRAME_WARN=1024 1281CONFIG_FRAME_WARN=1024
1245# CONFIG_MAGIC_SYSRQ is not set 1282# CONFIG_MAGIC_SYSRQ is not set
1283# CONFIG_STRIP_ASM_SYMS is not set
1246# CONFIG_UNUSED_SYMBOLS is not set 1284# CONFIG_UNUSED_SYMBOLS is not set
1247CONFIG_DEBUG_FS=y 1285CONFIG_DEBUG_FS=y
1248# CONFIG_HEADERS_CHECK is not set 1286# CONFIG_HEADERS_CHECK is not set
@@ -1253,8 +1291,11 @@ CONFIG_DEBUG_FS=y
1253# CONFIG_LATENCYTOP is not set 1291# CONFIG_LATENCYTOP is not set
1254# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1292# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1255CONFIG_HAVE_FUNCTION_TRACER=y 1293CONFIG_HAVE_FUNCTION_TRACER=y
1294CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1295CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1256CONFIG_HAVE_DYNAMIC_FTRACE=y 1296CONFIG_HAVE_DYNAMIC_FTRACE=y
1257CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1297CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1298CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1258CONFIG_TRACING_SUPPORT=y 1299CONFIG_TRACING_SUPPORT=y
1259# CONFIG_FTRACE is not set 1300# CONFIG_FTRACE is not set
1260# CONFIG_DYNAMIC_DEBUG is not set 1301# CONFIG_DYNAMIC_DEBUG is not set
@@ -1263,6 +1304,7 @@ CONFIG_TRACING_SUPPORT=y
1263CONFIG_HAVE_ARCH_KGDB=y 1304CONFIG_HAVE_ARCH_KGDB=y
1264# CONFIG_SH_STANDARD_BIOS is not set 1305# CONFIG_SH_STANDARD_BIOS is not set
1265# CONFIG_EARLY_SCIF_CONSOLE is not set 1306# CONFIG_EARLY_SCIF_CONSOLE is not set
1307# CONFIG_DWARF_UNWINDER is not set
1266 1308
1267# 1309#
1268# Security options 1310# Security options
@@ -1276,7 +1318,6 @@ CONFIG_CRYPTO=y
1276# 1318#
1277# Crypto core or helper 1319# Crypto core or helper
1278# 1320#
1279# CONFIG_CRYPTO_FIPS is not set
1280# CONFIG_CRYPTO_MANAGER is not set 1321# CONFIG_CRYPTO_MANAGER is not set
1281# CONFIG_CRYPTO_MANAGER2 is not set 1322# CONFIG_CRYPTO_MANAGER2 is not set
1282# CONFIG_CRYPTO_NULL is not set 1323# CONFIG_CRYPTO_NULL is not set
@@ -1309,6 +1350,7 @@ CONFIG_CRYPTO=y
1309# Digest 1350# Digest
1310# 1351#
1311# CONFIG_CRYPTO_CRC32C is not set 1352# CONFIG_CRYPTO_CRC32C is not set
1353# CONFIG_CRYPTO_GHASH is not set
1312# CONFIG_CRYPTO_MD4 is not set 1354# CONFIG_CRYPTO_MD4 is not set
1313# CONFIG_CRYPTO_MD5 is not set 1355# CONFIG_CRYPTO_MD5 is not set
1314# CONFIG_CRYPTO_MICHAEL_MIC is not set 1356# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1371,5 +1413,6 @@ CONFIG_ZLIB_INFLATE=y
1371CONFIG_HAS_IOMEM=y 1413CONFIG_HAS_IOMEM=y
1372CONFIG_HAS_IOPORT=y 1414CONFIG_HAS_IOPORT=y
1373CONFIG_HAS_DMA=y 1415CONFIG_HAS_DMA=y
1416CONFIG_HAVE_LMB=y
1374CONFIG_NLATTR=y 1417CONFIG_NLATTR=y
1375CONFIG_GENERIC_ATOMIC64=y 1418CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/sh03_defconfig b/arch/sh/configs/sh03_defconfig
index 7fedaaee861d..dd0e8900afb7 100644
--- a/arch/sh/configs/sh03_defconfig
+++ b/arch/sh/configs/sh03_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 13:04:41 2009 4# Thu Sep 24 19:07:14 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -29,7 +30,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
29# CONFIG_ARCH_HAS_ILOG2_U64 is not set 30# CONFIG_ARCH_HAS_ILOG2_U64 is not set
30CONFIG_ARCH_NO_VIRT_TO_BUS=y 31CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y
33 36
34# 37#
35# General setup 38# General setup
@@ -40,6 +43,12 @@ CONFIG_LOCK_KERNEL=y
40CONFIG_INIT_ENV_ARG_LIMIT=32 43CONFIG_INIT_ENV_ARG_LIMIT=32
41CONFIG_LOCALVERSION="" 44CONFIG_LOCALVERSION=""
42CONFIG_LOCALVERSION_AUTO=y 45CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set
43CONFIG_SWAP=y 52CONFIG_SWAP=y
44CONFIG_SYSVIPC=y 53CONFIG_SYSVIPC=y
45CONFIG_SYSVIPC_SYSCTL=y 54CONFIG_SYSVIPC_SYSCTL=y
@@ -53,11 +62,12 @@ CONFIG_BSD_PROCESS_ACCT=y
53# 62#
54# RCU Subsystem 63# RCU Subsystem
55# 64#
56CONFIG_CLASSIC_RCU=y 65CONFIG_TREE_RCU=y
57# CONFIG_TREE_RCU is not set 66# CONFIG_TREE_PREEMPT_RCU is not set
58# CONFIG_PREEMPT_RCU is not set 67# CONFIG_RCU_TRACE is not set
68CONFIG_RCU_FANOUT=32
69# CONFIG_RCU_FANOUT_EXACT is not set
59# CONFIG_TREE_RCU_TRACE is not set 70# CONFIG_TREE_RCU_TRACE is not set
60# CONFIG_PREEMPT_RCU_TRACE is not set
61# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
62CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
63# CONFIG_GROUP_SCHED is not set 73# CONFIG_GROUP_SCHED is not set
@@ -91,20 +101,22 @@ CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 102CONFIG_SHMEM=y
93CONFIG_AIO=y 103CONFIG_AIO=y
104CONFIG_HAVE_PERF_EVENTS=y
94 105
95# 106#
96# Performance Counters 107# Kernel Performance Events And Counters
97# 108#
109CONFIG_PERF_EVENTS=y
110CONFIG_EVENT_PROFILE=y
111# CONFIG_PERF_COUNTERS is not set
98CONFIG_VM_EVENT_COUNTERS=y 112CONFIG_VM_EVENT_COUNTERS=y
99CONFIG_PCI_QUIRKS=y 113CONFIG_PCI_QUIRKS=y
100# CONFIG_STRIP_ASM_SYMS is not set
101CONFIG_COMPAT_BRK=y 114CONFIG_COMPAT_BRK=y
102CONFIG_SLAB=y 115CONFIG_SLAB=y
103# CONFIG_SLUB is not set 116# CONFIG_SLUB is not set
104# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
105CONFIG_PROFILING=y 118CONFIG_PROFILING=y
106CONFIG_TRACEPOINTS=y 119CONFIG_TRACEPOINTS=y
107CONFIG_MARKERS=y
108CONFIG_OPROFILE=m 120CONFIG_OPROFILE=m
109CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
110# CONFIG_KPROBES is not set 122# CONFIG_KPROBES is not set
@@ -114,6 +126,11 @@ CONFIG_HAVE_KRETPROBES=y
114CONFIG_HAVE_ARCH_TRACEHOOK=y 126CONFIG_HAVE_ARCH_TRACEHOOK=y
115CONFIG_HAVE_CLK=y 127CONFIG_HAVE_CLK=y
116CONFIG_HAVE_DMA_API_DEBUG=y 128CONFIG_HAVE_DMA_API_DEBUG=y
129
130#
131# GCOV-based kernel profiling
132#
133# CONFIG_GCOV_KERNEL is not set
117# CONFIG_SLOW_WORK is not set 134# CONFIG_SLOW_WORK is not set
118CONFIG_HAVE_GENERIC_DMA_COHERENT=y 135CONFIG_HAVE_GENERIC_DMA_COHERENT=y
119CONFIG_SLABINFO=y 136CONFIG_SLABINFO=y
@@ -126,7 +143,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
126CONFIG_MODVERSIONS=y 143CONFIG_MODVERSIONS=y
127# CONFIG_MODULE_SRCVERSION_ALL is not set 144# CONFIG_MODULE_SRCVERSION_ALL is not set
128CONFIG_BLOCK=y 145CONFIG_BLOCK=y
129# CONFIG_LBD is not set 146CONFIG_LBDAF=y
130# CONFIG_BLK_DEV_BSG is not set 147# CONFIG_BLK_DEV_BSG is not set
131# CONFIG_BLK_DEV_INTEGRITY is not set 148# CONFIG_BLK_DEV_INTEGRITY is not set
132 149
@@ -173,6 +190,7 @@ CONFIG_CPU_SUBTYPE_SH7751=y
173# CONFIG_CPU_SUBTYPE_SH4_202 is not set 190# CONFIG_CPU_SUBTYPE_SH4_202 is not set
174# CONFIG_CPU_SUBTYPE_SH7723 is not set 191# CONFIG_CPU_SUBTYPE_SH7723 is not set
175# CONFIG_CPU_SUBTYPE_SH7724 is not set 192# CONFIG_CPU_SUBTYPE_SH7724 is not set
193# CONFIG_CPU_SUBTYPE_SH7757 is not set
176# CONFIG_CPU_SUBTYPE_SH7763 is not set 194# CONFIG_CPU_SUBTYPE_SH7763 is not set
177# CONFIG_CPU_SUBTYPE_SH7770 is not set 195# CONFIG_CPU_SUBTYPE_SH7770 is not set
178# CONFIG_CPU_SUBTYPE_SH7780 is not set 196# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -218,6 +236,7 @@ CONFIG_ZONE_DMA_FLAG=0
218CONFIG_NR_QUICK=2 236CONFIG_NR_QUICK=2
219CONFIG_HAVE_MLOCK=y 237CONFIG_HAVE_MLOCK=y
220CONFIG_HAVE_MLOCKED_PAGE_BIT=y 238CONFIG_HAVE_MLOCKED_PAGE_BIT=y
239# CONFIG_KSM is not set
221CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 240CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
222 241
223# 242#
@@ -302,7 +321,8 @@ CONFIG_ZERO_PAGE_OFFSET=0x00004000
302CONFIG_BOOT_LINK_OFFSET=0x00800000 321CONFIG_BOOT_LINK_OFFSET=0x00800000
303CONFIG_ENTRY_OFFSET=0x00001000 322CONFIG_ENTRY_OFFSET=0x00001000
304# CONFIG_UBC_WAKEUP is not set 323# CONFIG_UBC_WAKEUP is not set
305CONFIG_CMDLINE_BOOL=y 324CONFIG_CMDLINE_OVERWRITE=y
325# CONFIG_CMDLINE_EXTEND is not set
306CONFIG_CMDLINE="console=ttySC1,115200 mem=64M root=/dev/nfs" 326CONFIG_CMDLINE="console=ttySC1,115200 mem=64M root=/dev/nfs"
307 327
308# 328#
@@ -382,6 +402,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
382# CONFIG_NETFILTER is not set 402# CONFIG_NETFILTER is not set
383# CONFIG_IP_DCCP is not set 403# CONFIG_IP_DCCP is not set
384# CONFIG_IP_SCTP is not set 404# CONFIG_IP_SCTP is not set
405# CONFIG_RDS is not set
385# CONFIG_TIPC is not set 406# CONFIG_TIPC is not set
386# CONFIG_ATM is not set 407# CONFIG_ATM is not set
387# CONFIG_BRIDGE is not set 408# CONFIG_BRIDGE is not set
@@ -412,6 +433,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
412# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
413CONFIG_WIRELESS=y 434CONFIG_WIRELESS=y
414# CONFIG_CFG80211 is not set 435# CONFIG_CFG80211 is not set
436CONFIG_CFG80211_DEFAULT_PS_VALUE=0
415# CONFIG_WIRELESS_OLD_REGULATORY is not set 437# CONFIG_WIRELESS_OLD_REGULATORY is not set
416# CONFIG_WIRELESS_EXT is not set 438# CONFIG_WIRELESS_EXT is not set
417# CONFIG_LIB80211 is not set 439# CONFIG_LIB80211 is not set
@@ -419,7 +441,6 @@ CONFIG_WIRELESS=y
419# 441#
420# CFG80211 needs to be enabled for MAC80211 442# CFG80211 needs to be enabled for MAC80211
421# 443#
422CONFIG_MAC80211_DEFAULT_PS_VALUE=0
423# CONFIG_WIMAX is not set 444# CONFIG_WIMAX is not set
424# CONFIG_RFKILL is not set 445# CONFIG_RFKILL is not set
425# CONFIG_NET_9P is not set 446# CONFIG_NET_9P is not set
@@ -432,6 +453,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
432# Generic Driver Options 453# Generic Driver Options
433# 454#
434CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 455CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
456# CONFIG_DEVTMPFS is not set
435# CONFIG_STANDALONE is not set 457# CONFIG_STANDALONE is not set
436# CONFIG_PREVENT_FIRMWARE_BUILD is not set 458# CONFIG_PREVENT_FIRMWARE_BUILD is not set
437# CONFIG_FW_LOADER is not set 459# CONFIG_FW_LOADER is not set
@@ -591,6 +613,7 @@ CONFIG_SCSI_LOWLEVEL=y
591# CONFIG_SCSI_DC390T is not set 613# CONFIG_SCSI_DC390T is not set
592# CONFIG_SCSI_NSP32 is not set 614# CONFIG_SCSI_NSP32 is not set
593# CONFIG_SCSI_DEBUG is not set 615# CONFIG_SCSI_DEBUG is not set
616# CONFIG_SCSI_PMCRAID is not set
594# CONFIG_SCSI_SRP is not set 617# CONFIG_SCSI_SRP is not set
595# CONFIG_SCSI_DH is not set 618# CONFIG_SCSI_DH is not set
596# CONFIG_SCSI_OSD_INITIATOR is not set 619# CONFIG_SCSI_OSD_INITIATOR is not set
@@ -603,7 +626,11 @@ CONFIG_SCSI_LOWLEVEL=y
603# 626#
604 627
605# 628#
606# Enable only one of the two stacks, unless you know what you are doing 629# You can enable one or both FireWire driver stacks.
630#
631
632#
633# See the help texts for more information.
607# 634#
608# CONFIG_FIREWIRE is not set 635# CONFIG_FIREWIRE is not set
609# CONFIG_IEEE1394 is not set 636# CONFIG_IEEE1394 is not set
@@ -679,6 +706,7 @@ CONFIG_NETDEV_1000=y
679# CONFIG_VIA_VELOCITY is not set 706# CONFIG_VIA_VELOCITY is not set
680# CONFIG_TIGON3 is not set 707# CONFIG_TIGON3 is not set
681# CONFIG_BNX2 is not set 708# CONFIG_BNX2 is not set
709# CONFIG_CNIC is not set
682# CONFIG_QLA3XXX is not set 710# CONFIG_QLA3XXX is not set
683# CONFIG_ATL1 is not set 711# CONFIG_ATL1 is not set
684# CONFIG_ATL1E is not set 712# CONFIG_ATL1E is not set
@@ -704,10 +732,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
704# CONFIG_SFC is not set 732# CONFIG_SFC is not set
705# CONFIG_BE2NET is not set 733# CONFIG_BE2NET is not set
706# CONFIG_TR is not set 734# CONFIG_TR is not set
707 735CONFIG_WLAN=y
708#
709# Wireless LAN
710#
711# CONFIG_WLAN_PRE80211 is not set 736# CONFIG_WLAN_PRE80211 is not set
712# CONFIG_WLAN_80211 is not set 737# CONFIG_WLAN_80211 is not set
713 738
@@ -804,10 +829,20 @@ CONFIG_HW_RANDOM=y
804CONFIG_DEVPORT=y 829CONFIG_DEVPORT=y
805# CONFIG_I2C is not set 830# CONFIG_I2C is not set
806# CONFIG_SPI is not set 831# CONFIG_SPI is not set
832
833#
834# PPS support
835#
836# CONFIG_PPS is not set
807# CONFIG_W1 is not set 837# CONFIG_W1 is not set
808# CONFIG_POWER_SUPPLY is not set 838# CONFIG_POWER_SUPPLY is not set
809CONFIG_HWMON=y 839CONFIG_HWMON=y
810# CONFIG_HWMON_VID is not set 840# CONFIG_HWMON_VID is not set
841# CONFIG_HWMON_DEBUG_CHIP is not set
842
843#
844# Native drivers
845#
811# CONFIG_SENSORS_I5K_AMB is not set 846# CONFIG_SENSORS_I5K_AMB is not set
812# CONFIG_SENSORS_F71805F is not set 847# CONFIG_SENSORS_F71805F is not set
813# CONFIG_SENSORS_F71882FG is not set 848# CONFIG_SENSORS_F71882FG is not set
@@ -822,9 +857,7 @@ CONFIG_HWMON=y
822# CONFIG_SENSORS_VT8231 is not set 857# CONFIG_SENSORS_VT8231 is not set
823# CONFIG_SENSORS_W83627HF is not set 858# CONFIG_SENSORS_W83627HF is not set
824# CONFIG_SENSORS_W83627EHF is not set 859# CONFIG_SENSORS_W83627EHF is not set
825# CONFIG_HWMON_DEBUG_CHIP is not set
826# CONFIG_THERMAL is not set 860# CONFIG_THERMAL is not set
827# CONFIG_THERMAL_HWMON is not set
828CONFIG_WATCHDOG=y 861CONFIG_WATCHDOG=y
829# CONFIG_WATCHDOG_NOWAYOUT is not set 862# CONFIG_WATCHDOG_NOWAYOUT is not set
830 863
@@ -861,6 +894,7 @@ CONFIG_SSB_POSSIBLE=y
861# 894#
862# Graphics support 895# Graphics support
863# 896#
897CONFIG_VGA_ARB=y
864# CONFIG_DRM is not set 898# CONFIG_DRM is not set
865# CONFIG_VGASTATE is not set 899# CONFIG_VGASTATE is not set
866# CONFIG_VIDEO_OUTPUT_CONTROL is not set 900# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -879,7 +913,6 @@ CONFIG_DUMMY_CONSOLE=y
879# CONFIG_SOUND is not set 913# CONFIG_SOUND is not set
880CONFIG_HID_SUPPORT=y 914CONFIG_HID_SUPPORT=y
881CONFIG_HID=y 915CONFIG_HID=y
882# CONFIG_HID_DEBUG is not set
883# CONFIG_HIDRAW is not set 916# CONFIG_HIDRAW is not set
884# CONFIG_HID_PID is not set 917# CONFIG_HID_PID is not set
885 918
@@ -944,8 +977,10 @@ CONFIG_FS_MBCACHE=y
944# CONFIG_JFS_FS is not set 977# CONFIG_JFS_FS is not set
945CONFIG_FS_POSIX_ACL=y 978CONFIG_FS_POSIX_ACL=y
946# CONFIG_XFS_FS is not set 979# CONFIG_XFS_FS is not set
980# CONFIG_GFS2_FS is not set
947# CONFIG_OCFS2_FS is not set 981# CONFIG_OCFS2_FS is not set
948# CONFIG_BTRFS_FS is not set 982# CONFIG_BTRFS_FS is not set
983# CONFIG_NILFS2_FS is not set
949CONFIG_FILE_LOCKING=y 984CONFIG_FILE_LOCKING=y
950CONFIG_FSNOTIFY=y 985CONFIG_FSNOTIFY=y
951CONFIG_DNOTIFY=y 986CONFIG_DNOTIFY=y
@@ -1011,12 +1046,12 @@ CONFIG_MISC_FILESYSTEMS=y
1011# CONFIG_ROMFS_FS is not set 1046# CONFIG_ROMFS_FS is not set
1012# CONFIG_SYSV_FS is not set 1047# CONFIG_SYSV_FS is not set
1013# CONFIG_UFS_FS is not set 1048# CONFIG_UFS_FS is not set
1014# CONFIG_NILFS2_FS is not set
1015CONFIG_NETWORK_FILESYSTEMS=y 1049CONFIG_NETWORK_FILESYSTEMS=y
1016CONFIG_NFS_FS=y 1050CONFIG_NFS_FS=y
1017CONFIG_NFS_V3=y 1051CONFIG_NFS_V3=y
1018# CONFIG_NFS_V3_ACL is not set 1052# CONFIG_NFS_V3_ACL is not set
1019CONFIG_NFS_V4=y 1053CONFIG_NFS_V4=y
1054# CONFIG_NFS_V4_1 is not set
1020CONFIG_ROOT_NFS=y 1055CONFIG_ROOT_NFS=y
1021CONFIG_NFSD=y 1056CONFIG_NFSD=y
1022CONFIG_NFSD_V3=y 1057CONFIG_NFSD_V3=y
@@ -1108,6 +1143,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1108CONFIG_ENABLE_MUST_CHECK=y 1143CONFIG_ENABLE_MUST_CHECK=y
1109CONFIG_FRAME_WARN=1024 1144CONFIG_FRAME_WARN=1024
1110# CONFIG_MAGIC_SYSRQ is not set 1145# CONFIG_MAGIC_SYSRQ is not set
1146# CONFIG_STRIP_ASM_SYMS is not set
1111# CONFIG_UNUSED_SYMBOLS is not set 1147# CONFIG_UNUSED_SYMBOLS is not set
1112CONFIG_DEBUG_FS=y 1148CONFIG_DEBUG_FS=y
1113# CONFIG_HEADERS_CHECK is not set 1149# CONFIG_HEADERS_CHECK is not set
@@ -1119,11 +1155,15 @@ CONFIG_STACKTRACE=y
1119# CONFIG_LATENCYTOP is not set 1155# CONFIG_LATENCYTOP is not set
1120CONFIG_NOP_TRACER=y 1156CONFIG_NOP_TRACER=y
1121CONFIG_HAVE_FUNCTION_TRACER=y 1157CONFIG_HAVE_FUNCTION_TRACER=y
1158CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1159CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1122CONFIG_HAVE_DYNAMIC_FTRACE=y 1160CONFIG_HAVE_DYNAMIC_FTRACE=y
1123CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1161CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1162CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1124CONFIG_RING_BUFFER=y 1163CONFIG_RING_BUFFER=y
1125CONFIG_EVENT_TRACING=y 1164CONFIG_EVENT_TRACING=y
1126CONFIG_CONTEXT_SWITCH_TRACER=y 1165CONFIG_CONTEXT_SWITCH_TRACER=y
1166CONFIG_RING_BUFFER_ALLOW_SWAP=y
1127CONFIG_TRACING=y 1167CONFIG_TRACING=y
1128CONFIG_TRACING_SUPPORT=y 1168CONFIG_TRACING_SUPPORT=y
1129# CONFIG_FTRACE is not set 1169# CONFIG_FTRACE is not set
@@ -1134,6 +1174,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1134CONFIG_SH_STANDARD_BIOS=y 1174CONFIG_SH_STANDARD_BIOS=y
1135# CONFIG_EARLY_SCIF_CONSOLE is not set 1175# CONFIG_EARLY_SCIF_CONSOLE is not set
1136# CONFIG_EARLY_PRINTK is not set 1176# CONFIG_EARLY_PRINTK is not set
1177# CONFIG_DWARF_UNWINDER is not set
1137 1178
1138# 1179#
1139# Security options 1180# Security options
@@ -1147,7 +1188,6 @@ CONFIG_CRYPTO=y
1147# 1188#
1148# Crypto core or helper 1189# Crypto core or helper
1149# 1190#
1150# CONFIG_CRYPTO_FIPS is not set
1151CONFIG_CRYPTO_ALGAPI=y 1191CONFIG_CRYPTO_ALGAPI=y
1152CONFIG_CRYPTO_ALGAPI2=y 1192CONFIG_CRYPTO_ALGAPI2=y
1153CONFIG_CRYPTO_AEAD2=y 1193CONFIG_CRYPTO_AEAD2=y
@@ -1189,11 +1229,13 @@ CONFIG_CRYPTO_ECB=m
1189# 1229#
1190CONFIG_CRYPTO_HMAC=y 1230CONFIG_CRYPTO_HMAC=y
1191# CONFIG_CRYPTO_XCBC is not set 1231# CONFIG_CRYPTO_XCBC is not set
1232# CONFIG_CRYPTO_VMAC is not set
1192 1233
1193# 1234#
1194# Digest 1235# Digest
1195# 1236#
1196# CONFIG_CRYPTO_CRC32C is not set 1237# CONFIG_CRYPTO_CRC32C is not set
1238# CONFIG_CRYPTO_GHASH is not set
1197# CONFIG_CRYPTO_MD4 is not set 1239# CONFIG_CRYPTO_MD4 is not set
1198CONFIG_CRYPTO_MD5=y 1240CONFIG_CRYPTO_MD5=y
1199# CONFIG_CRYPTO_MICHAEL_MIC is not set 1241# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1259,5 +1301,6 @@ CONFIG_DECOMPRESS_GZIP=y
1259CONFIG_HAS_IOMEM=y 1301CONFIG_HAS_IOMEM=y
1260CONFIG_HAS_IOPORT=y 1302CONFIG_HAS_IOPORT=y
1261CONFIG_HAS_DMA=y 1303CONFIG_HAS_DMA=y
1304CONFIG_HAVE_LMB=y
1262CONFIG_NLATTR=y 1305CONFIG_NLATTR=y
1263CONFIG_GENERIC_ATOMIC64=y 1306CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/sh7710voipgw_defconfig b/arch/sh/configs/sh7710voipgw_defconfig
index c296ca5d95cb..662156ec9211 100644
--- a/arch/sh/configs/sh7710voipgw_defconfig
+++ b/arch/sh/configs/sh7710voipgw_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 13:06:13 2009 4# Thu Sep 24 19:11:49 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -27,7 +28,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 28# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 29CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y
31 34
32# 35#
33# General setup 36# General setup
@@ -37,6 +40,12 @@ CONFIG_BROKEN_ON_SMP=y
37CONFIG_INIT_ENV_ARG_LIMIT=32 40CONFIG_INIT_ENV_ARG_LIMIT=32
38CONFIG_LOCALVERSION="" 41CONFIG_LOCALVERSION=""
39CONFIG_LOCALVERSION_AUTO=y 42CONFIG_LOCALVERSION_AUTO=y
43CONFIG_HAVE_KERNEL_GZIP=y
44CONFIG_HAVE_KERNEL_BZIP2=y
45CONFIG_HAVE_KERNEL_LZMA=y
46CONFIG_KERNEL_GZIP=y
47# CONFIG_KERNEL_BZIP2 is not set
48# CONFIG_KERNEL_LZMA is not set
40# CONFIG_SWAP is not set 49# CONFIG_SWAP is not set
41CONFIG_SYSVIPC=y 50CONFIG_SYSVIPC=y
42CONFIG_SYSVIPC_SYSCTL=y 51CONFIG_SYSVIPC_SYSCTL=y
@@ -49,11 +58,12 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
49# 58#
50# RCU Subsystem 59# RCU Subsystem
51# 60#
52CONFIG_CLASSIC_RCU=y 61CONFIG_TREE_RCU=y
53# CONFIG_TREE_RCU is not set 62# CONFIG_TREE_PREEMPT_RCU is not set
54# CONFIG_PREEMPT_RCU is not set 63# CONFIG_RCU_TRACE is not set
64CONFIG_RCU_FANOUT=32
65# CONFIG_RCU_FANOUT_EXACT is not set
55# CONFIG_TREE_RCU_TRACE is not set 66# CONFIG_TREE_RCU_TRACE is not set
56# CONFIG_PREEMPT_RCU_TRACE is not set
57# CONFIG_IKCONFIG is not set 67# CONFIG_IKCONFIG is not set
58CONFIG_LOG_BUF_SHIFT=14 68CONFIG_LOG_BUF_SHIFT=14
59CONFIG_GROUP_SCHED=y 69CONFIG_GROUP_SCHED=y
@@ -87,18 +97,19 @@ CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 97CONFIG_EVENTFD=y
88# CONFIG_SHMEM is not set 98# CONFIG_SHMEM is not set
89CONFIG_AIO=y 99CONFIG_AIO=y
100CONFIG_HAVE_PERF_EVENTS=y
90 101
91# 102#
92# Performance Counters 103# Kernel Performance Events And Counters
93# 104#
105# CONFIG_PERF_EVENTS is not set
106# CONFIG_PERF_COUNTERS is not set
94CONFIG_VM_EVENT_COUNTERS=y 107CONFIG_VM_EVENT_COUNTERS=y
95# CONFIG_STRIP_ASM_SYMS is not set
96CONFIG_COMPAT_BRK=y 108CONFIG_COMPAT_BRK=y
97CONFIG_SLAB=y 109CONFIG_SLAB=y
98# CONFIG_SLUB is not set 110# CONFIG_SLUB is not set
99# CONFIG_SLOB is not set 111# CONFIG_SLOB is not set
100# CONFIG_PROFILING is not set 112# CONFIG_PROFILING is not set
101# CONFIG_MARKERS is not set
102CONFIG_HAVE_OPROFILE=y 113CONFIG_HAVE_OPROFILE=y
103# CONFIG_KPROBES is not set 114# CONFIG_KPROBES is not set
104CONFIG_HAVE_IOREMAP_PROT=y 115CONFIG_HAVE_IOREMAP_PROT=y
@@ -107,6 +118,11 @@ CONFIG_HAVE_KRETPROBES=y
107CONFIG_HAVE_ARCH_TRACEHOOK=y 118CONFIG_HAVE_ARCH_TRACEHOOK=y
108CONFIG_HAVE_CLK=y 119CONFIG_HAVE_CLK=y
109CONFIG_HAVE_DMA_API_DEBUG=y 120CONFIG_HAVE_DMA_API_DEBUG=y
121
122#
123# GCOV-based kernel profiling
124#
125# CONFIG_GCOV_KERNEL is not set
110# CONFIG_SLOW_WORK is not set 126# CONFIG_SLOW_WORK is not set
111CONFIG_HAVE_GENERIC_DMA_COHERENT=y 127CONFIG_HAVE_GENERIC_DMA_COHERENT=y
112CONFIG_SLABINFO=y 128CONFIG_SLABINFO=y
@@ -118,7 +134,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
118# CONFIG_MODVERSIONS is not set 134# CONFIG_MODVERSIONS is not set
119# CONFIG_MODULE_SRCVERSION_ALL is not set 135# CONFIG_MODULE_SRCVERSION_ALL is not set
120CONFIG_BLOCK=y 136CONFIG_BLOCK=y
121# CONFIG_LBD is not set 137CONFIG_LBDAF=y
122# CONFIG_BLK_DEV_BSG is not set 138# CONFIG_BLK_DEV_BSG is not set
123# CONFIG_BLK_DEV_INTEGRITY is not set 139# CONFIG_BLK_DEV_INTEGRITY is not set
124 140
@@ -165,6 +181,7 @@ CONFIG_CPU_SUBTYPE_SH7710=y
165# CONFIG_CPU_SUBTYPE_SH4_202 is not set 181# CONFIG_CPU_SUBTYPE_SH4_202 is not set
166# CONFIG_CPU_SUBTYPE_SH7723 is not set 182# CONFIG_CPU_SUBTYPE_SH7723 is not set
167# CONFIG_CPU_SUBTYPE_SH7724 is not set 183# CONFIG_CPU_SUBTYPE_SH7724 is not set
184# CONFIG_CPU_SUBTYPE_SH7757 is not set
168# CONFIG_CPU_SUBTYPE_SH7763 is not set 185# CONFIG_CPU_SUBTYPE_SH7763 is not set
169# CONFIG_CPU_SUBTYPE_SH7770 is not set 186# CONFIG_CPU_SUBTYPE_SH7770 is not set
170# CONFIG_CPU_SUBTYPE_SH7780 is not set 187# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -210,6 +227,7 @@ CONFIG_ZONE_DMA_FLAG=0
210CONFIG_NR_QUICK=2 227CONFIG_NR_QUICK=2
211CONFIG_HAVE_MLOCK=y 228CONFIG_HAVE_MLOCK=y
212CONFIG_HAVE_MLOCKED_PAGE_BIT=y 229CONFIG_HAVE_MLOCKED_PAGE_BIT=y
230# CONFIG_KSM is not set
213CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 231CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
214 232
215# 233#
@@ -292,7 +310,8 @@ CONFIG_GUSA=y
292CONFIG_ZERO_PAGE_OFFSET=0x00001000 310CONFIG_ZERO_PAGE_OFFSET=0x00001000
293CONFIG_BOOT_LINK_OFFSET=0x00800000 311CONFIG_BOOT_LINK_OFFSET=0x00800000
294CONFIG_ENTRY_OFFSET=0x00001000 312CONFIG_ENTRY_OFFSET=0x00001000
295# CONFIG_CMDLINE_BOOL is not set 313# CONFIG_CMDLINE_OVERWRITE is not set
314# CONFIG_CMDLINE_EXTEND is not set
296 315
297# 316#
298# Bus options 317# Bus options
@@ -374,6 +393,7 @@ CONFIG_NETFILTER_ADVANCED=y
374# CONFIG_IP_NF_ARPTABLES is not set 393# CONFIG_IP_NF_ARPTABLES is not set
375# CONFIG_IP_DCCP is not set 394# CONFIG_IP_DCCP is not set
376# CONFIG_IP_SCTP is not set 395# CONFIG_IP_SCTP is not set
396# CONFIG_RDS is not set
377# CONFIG_TIPC is not set 397# CONFIG_TIPC is not set
378# CONFIG_ATM is not set 398# CONFIG_ATM is not set
379# CONFIG_BRIDGE is not set 399# CONFIG_BRIDGE is not set
@@ -440,6 +460,7 @@ CONFIG_NET_SCH_FIFO=y
440# CONFIG_AF_RXRPC is not set 460# CONFIG_AF_RXRPC is not set
441CONFIG_WIRELESS=y 461CONFIG_WIRELESS=y
442# CONFIG_CFG80211 is not set 462# CONFIG_CFG80211 is not set
463CONFIG_CFG80211_DEFAULT_PS_VALUE=0
443# CONFIG_WIRELESS_OLD_REGULATORY is not set 464# CONFIG_WIRELESS_OLD_REGULATORY is not set
444# CONFIG_WIRELESS_EXT is not set 465# CONFIG_WIRELESS_EXT is not set
445# CONFIG_LIB80211 is not set 466# CONFIG_LIB80211 is not set
@@ -447,7 +468,6 @@ CONFIG_WIRELESS=y
447# 468#
448# CFG80211 needs to be enabled for MAC80211 469# CFG80211 needs to be enabled for MAC80211
449# 470#
450CONFIG_MAC80211_DEFAULT_PS_VALUE=0
451# CONFIG_WIMAX is not set 471# CONFIG_WIMAX is not set
452# CONFIG_RFKILL is not set 472# CONFIG_RFKILL is not set
453# CONFIG_NET_9P is not set 473# CONFIG_NET_9P is not set
@@ -469,9 +489,9 @@ CONFIG_EXTRA_FIRMWARE=""
469# CONFIG_CONNECTOR is not set 489# CONFIG_CONNECTOR is not set
470CONFIG_MTD=y 490CONFIG_MTD=y
471# CONFIG_MTD_DEBUG is not set 491# CONFIG_MTD_DEBUG is not set
492# CONFIG_MTD_TESTS is not set
472# CONFIG_MTD_CONCAT is not set 493# CONFIG_MTD_CONCAT is not set
473CONFIG_MTD_PARTITIONS=y 494CONFIG_MTD_PARTITIONS=y
474# CONFIG_MTD_TESTS is not set
475# CONFIG_MTD_REDBOOT_PARTS is not set 495# CONFIG_MTD_REDBOOT_PARTS is not set
476# CONFIG_MTD_CMDLINE_PARTS is not set 496# CONFIG_MTD_CMDLINE_PARTS is not set
477# CONFIG_MTD_AR7_PARTS is not set 497# CONFIG_MTD_AR7_PARTS is not set
@@ -605,10 +625,7 @@ CONFIG_NET_ETHERNET=y
605# CONFIG_KS8842 is not set 625# CONFIG_KS8842 is not set
606CONFIG_NETDEV_1000=y 626CONFIG_NETDEV_1000=y
607CONFIG_NETDEV_10000=y 627CONFIG_NETDEV_10000=y
608 628CONFIG_WLAN=y
609#
610# Wireless LAN
611#
612# CONFIG_WLAN_PRE80211 is not set 629# CONFIG_WLAN_PRE80211 is not set
613# CONFIG_WLAN_80211 is not set 630# CONFIG_WLAN_80211 is not set
614 631
@@ -686,6 +703,11 @@ CONFIG_HW_RANDOM=y
686# CONFIG_TCG_TPM is not set 703# CONFIG_TCG_TPM is not set
687# CONFIG_I2C is not set 704# CONFIG_I2C is not set
688# CONFIG_SPI is not set 705# CONFIG_SPI is not set
706
707#
708# PPS support
709#
710# CONFIG_PPS is not set
689# CONFIG_W1 is not set 711# CONFIG_W1 is not set
690# CONFIG_POWER_SUPPLY is not set 712# CONFIG_POWER_SUPPLY is not set
691# CONFIG_HWMON is not set 713# CONFIG_HWMON is not set
@@ -723,7 +745,6 @@ CONFIG_SSB_POSSIBLE=y
723# CONFIG_SOUND is not set 745# CONFIG_SOUND is not set
724CONFIG_HID_SUPPORT=y 746CONFIG_HID_SUPPORT=y
725CONFIG_HID=y 747CONFIG_HID=y
726# CONFIG_HID_DEBUG is not set
727# CONFIG_HIDRAW is not set 748# CONFIG_HIDRAW is not set
728# CONFIG_HID_PID is not set 749# CONFIG_HID_PID is not set
729 750
@@ -775,8 +796,10 @@ CONFIG_RTC_LIB=y
775# CONFIG_JFS_FS is not set 796# CONFIG_JFS_FS is not set
776# CONFIG_FS_POSIX_ACL is not set 797# CONFIG_FS_POSIX_ACL is not set
777# CONFIG_XFS_FS is not set 798# CONFIG_XFS_FS is not set
799# CONFIG_GFS2_FS is not set
778# CONFIG_OCFS2_FS is not set 800# CONFIG_OCFS2_FS is not set
779# CONFIG_BTRFS_FS is not set 801# CONFIG_BTRFS_FS is not set
802# CONFIG_NILFS2_FS is not set
780CONFIG_FILE_LOCKING=y 803CONFIG_FILE_LOCKING=y
781CONFIG_FSNOTIFY=y 804CONFIG_FSNOTIFY=y
782# CONFIG_DNOTIFY is not set 805# CONFIG_DNOTIFY is not set
@@ -813,8 +836,6 @@ CONFIG_PROC_FS=y
813CONFIG_PROC_SYSCTL=y 836CONFIG_PROC_SYSCTL=y
814CONFIG_PROC_PAGE_MONITOR=y 837CONFIG_PROC_PAGE_MONITOR=y
815CONFIG_SYSFS=y 838CONFIG_SYSFS=y
816CONFIG_TMPFS=y
817# CONFIG_TMPFS_POSIX_ACL is not set
818# CONFIG_HUGETLBFS is not set 839# CONFIG_HUGETLBFS is not set
819# CONFIG_HUGETLB_PAGE is not set 840# CONFIG_HUGETLB_PAGE is not set
820# CONFIG_CONFIGFS_FS is not set 841# CONFIG_CONFIGFS_FS is not set
@@ -847,7 +868,6 @@ CONFIG_JFFS2_RTIME=y
847# CONFIG_ROMFS_FS is not set 868# CONFIG_ROMFS_FS is not set
848# CONFIG_SYSV_FS is not set 869# CONFIG_SYSV_FS is not set
849# CONFIG_UFS_FS is not set 870# CONFIG_UFS_FS is not set
850# CONFIG_NILFS2_FS is not set
851CONFIG_NETWORK_FILESYSTEMS=y 871CONFIG_NETWORK_FILESYSTEMS=y
852# CONFIG_NFS_FS is not set 872# CONFIG_NFS_FS is not set
853# CONFIG_NFSD is not set 873# CONFIG_NFSD is not set
@@ -874,6 +894,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
874CONFIG_ENABLE_MUST_CHECK=y 894CONFIG_ENABLE_MUST_CHECK=y
875CONFIG_FRAME_WARN=1024 895CONFIG_FRAME_WARN=1024
876# CONFIG_MAGIC_SYSRQ is not set 896# CONFIG_MAGIC_SYSRQ is not set
897# CONFIG_STRIP_ASM_SYMS is not set
877# CONFIG_UNUSED_SYMBOLS is not set 898# CONFIG_UNUSED_SYMBOLS is not set
878CONFIG_DEBUG_FS=y 899CONFIG_DEBUG_FS=y
879# CONFIG_HEADERS_CHECK is not set 900# CONFIG_HEADERS_CHECK is not set
@@ -883,8 +904,11 @@ CONFIG_DEBUG_FS=y
883# CONFIG_RCU_CPU_STALL_DETECTOR is not set 904# CONFIG_RCU_CPU_STALL_DETECTOR is not set
884# CONFIG_LATENCYTOP is not set 905# CONFIG_LATENCYTOP is not set
885CONFIG_HAVE_FUNCTION_TRACER=y 906CONFIG_HAVE_FUNCTION_TRACER=y
907CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
908CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
886CONFIG_HAVE_DYNAMIC_FTRACE=y 909CONFIG_HAVE_DYNAMIC_FTRACE=y
887CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 910CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
911CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
888CONFIG_TRACING_SUPPORT=y 912CONFIG_TRACING_SUPPORT=y
889# CONFIG_FTRACE is not set 913# CONFIG_FTRACE is not set
890# CONFIG_DYNAMIC_DEBUG is not set 914# CONFIG_DYNAMIC_DEBUG is not set
@@ -893,6 +917,7 @@ CONFIG_TRACING_SUPPORT=y
893CONFIG_HAVE_ARCH_KGDB=y 917CONFIG_HAVE_ARCH_KGDB=y
894# CONFIG_SH_STANDARD_BIOS is not set 918# CONFIG_SH_STANDARD_BIOS is not set
895# CONFIG_EARLY_SCIF_CONSOLE is not set 919# CONFIG_EARLY_SCIF_CONSOLE is not set
920# CONFIG_DWARF_UNWINDER is not set
896 921
897# 922#
898# Security options 923# Security options
@@ -906,7 +931,6 @@ CONFIG_CRYPTO=y
906# 931#
907# Crypto core or helper 932# Crypto core or helper
908# 933#
909# CONFIG_CRYPTO_FIPS is not set
910# CONFIG_CRYPTO_MANAGER is not set 934# CONFIG_CRYPTO_MANAGER is not set
911# CONFIG_CRYPTO_MANAGER2 is not set 935# CONFIG_CRYPTO_MANAGER2 is not set
912# CONFIG_CRYPTO_GF128MUL is not set 936# CONFIG_CRYPTO_GF128MUL is not set
@@ -938,11 +962,13 @@ CONFIG_CRYPTO=y
938# 962#
939# CONFIG_CRYPTO_HMAC is not set 963# CONFIG_CRYPTO_HMAC is not set
940# CONFIG_CRYPTO_XCBC is not set 964# CONFIG_CRYPTO_XCBC is not set
965# CONFIG_CRYPTO_VMAC is not set
941 966
942# 967#
943# Digest 968# Digest
944# 969#
945# CONFIG_CRYPTO_CRC32C is not set 970# CONFIG_CRYPTO_CRC32C is not set
971# CONFIG_CRYPTO_GHASH is not set
946# CONFIG_CRYPTO_MD4 is not set 972# CONFIG_CRYPTO_MD4 is not set
947# CONFIG_CRYPTO_MD5 is not set 973# CONFIG_CRYPTO_MD5 is not set
948# CONFIG_CRYPTO_MICHAEL_MIC is not set 974# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1006,5 +1032,6 @@ CONFIG_ZLIB_DEFLATE=y
1006CONFIG_HAS_IOMEM=y 1032CONFIG_HAS_IOMEM=y
1007CONFIG_HAS_IOPORT=y 1033CONFIG_HAS_IOPORT=y
1008CONFIG_HAS_DMA=y 1034CONFIG_HAS_DMA=y
1035CONFIG_HAVE_LMB=y
1009CONFIG_NLATTR=y 1036CONFIG_NLATTR=y
1010CONFIG_GENERIC_ATOMIC64=y 1037CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/sh7724_generic_defconfig b/arch/sh/configs/sh7724_generic_defconfig
index ba26be1b4134..e06719a30ba1 100644
--- a/arch/sh/configs/sh7724_generic_defconfig
+++ b/arch/sh/configs/sh7724_generic_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 13:06:48 2009 4# Thu Sep 24 19:14:00 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,7 +29,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
28# CONFIG_ARCH_HAS_ILOG2_U64 is not set 29# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29CONFIG_ARCH_NO_VIRT_TO_BUS=y 30CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y
32 35
33# 36#
34# General setup 37# General setup
@@ -38,6 +41,12 @@ CONFIG_BROKEN_ON_SMP=y
38CONFIG_INIT_ENV_ARG_LIMIT=32 41CONFIG_INIT_ENV_ARG_LIMIT=32
39CONFIG_LOCALVERSION="" 42CONFIG_LOCALVERSION=""
40# CONFIG_LOCALVERSION_AUTO is not set 43# CONFIG_LOCALVERSION_AUTO is not set
44CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set
41CONFIG_SWAP=y 50CONFIG_SWAP=y
42CONFIG_SYSVIPC=y 51CONFIG_SYSVIPC=y
43CONFIG_SYSVIPC_SYSCTL=y 52CONFIG_SYSVIPC_SYSCTL=y
@@ -46,14 +55,12 @@ CONFIG_SYSVIPC_SYSCTL=y
46# 55#
47# RCU Subsystem 56# RCU Subsystem
48# 57#
49# CONFIG_CLASSIC_RCU is not set
50CONFIG_TREE_RCU=y 58CONFIG_TREE_RCU=y
51# CONFIG_PREEMPT_RCU is not set 59# CONFIG_TREE_PREEMPT_RCU is not set
52# CONFIG_RCU_TRACE is not set 60# CONFIG_RCU_TRACE is not set
53CONFIG_RCU_FANOUT=32 61CONFIG_RCU_FANOUT=32
54# CONFIG_RCU_FANOUT_EXACT is not set 62# CONFIG_RCU_FANOUT_EXACT is not set
55# CONFIG_TREE_RCU_TRACE is not set 63# CONFIG_TREE_RCU_TRACE is not set
56# CONFIG_PREEMPT_RCU_TRACE is not set
57# CONFIG_IKCONFIG is not set 64# CONFIG_IKCONFIG is not set
58CONFIG_LOG_BUF_SHIFT=17 65CONFIG_LOG_BUF_SHIFT=17
59CONFIG_GROUP_SCHED=y 66CONFIG_GROUP_SCHED=y
@@ -92,19 +99,21 @@ CONFIG_TIMERFD=y
92CONFIG_EVENTFD=y 99CONFIG_EVENTFD=y
93CONFIG_SHMEM=y 100CONFIG_SHMEM=y
94CONFIG_AIO=y 101CONFIG_AIO=y
102CONFIG_HAVE_PERF_EVENTS=y
95 103
96# 104#
97# Performance Counters 105# Kernel Performance Events And Counters
98# 106#
107CONFIG_PERF_EVENTS=y
108CONFIG_EVENT_PROFILE=y
109# CONFIG_PERF_COUNTERS is not set
99CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
100# CONFIG_STRIP_ASM_SYMS is not set
101# CONFIG_COMPAT_BRK is not set 111# CONFIG_COMPAT_BRK is not set
102# CONFIG_SLAB is not set 112# CONFIG_SLAB is not set
103CONFIG_SLUB=y 113CONFIG_SLUB=y
104# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
105CONFIG_PROFILING=y 115CONFIG_PROFILING=y
106CONFIG_TRACEPOINTS=y 116CONFIG_TRACEPOINTS=y
107CONFIG_MARKERS=y
108CONFIG_OPROFILE=y 117CONFIG_OPROFILE=y
109CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
110CONFIG_HAVE_IOREMAP_PROT=y 119CONFIG_HAVE_IOREMAP_PROT=y
@@ -113,13 +122,18 @@ CONFIG_HAVE_KRETPROBES=y
113CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
114CONFIG_HAVE_CLK=y 123CONFIG_HAVE_CLK=y
115CONFIG_HAVE_DMA_API_DEBUG=y 124CONFIG_HAVE_DMA_API_DEBUG=y
125
126#
127# GCOV-based kernel profiling
128#
129# CONFIG_GCOV_KERNEL is not set
116# CONFIG_SLOW_WORK is not set 130# CONFIG_SLOW_WORK is not set
117CONFIG_HAVE_GENERIC_DMA_COHERENT=y 131CONFIG_HAVE_GENERIC_DMA_COHERENT=y
118CONFIG_RT_MUTEXES=y 132CONFIG_RT_MUTEXES=y
119CONFIG_BASE_SMALL=0 133CONFIG_BASE_SMALL=0
120# CONFIG_MODULES is not set 134# CONFIG_MODULES is not set
121CONFIG_BLOCK=y 135CONFIG_BLOCK=y
122# CONFIG_LBD is not set 136CONFIG_LBDAF=y
123# CONFIG_BLK_DEV_BSG is not set 137# CONFIG_BLK_DEV_BSG is not set
124# CONFIG_BLK_DEV_INTEGRITY is not set 138# CONFIG_BLK_DEV_INTEGRITY is not set
125 139
@@ -169,6 +183,7 @@ CONFIG_ARCH_SHMOBILE=y
169# CONFIG_CPU_SUBTYPE_SH4_202 is not set 183# CONFIG_CPU_SUBTYPE_SH4_202 is not set
170# CONFIG_CPU_SUBTYPE_SH7723 is not set 184# CONFIG_CPU_SUBTYPE_SH7723 is not set
171CONFIG_CPU_SUBTYPE_SH7724=y 185CONFIG_CPU_SUBTYPE_SH7724=y
186# CONFIG_CPU_SUBTYPE_SH7757 is not set
172# CONFIG_CPU_SUBTYPE_SH7763 is not set 187# CONFIG_CPU_SUBTYPE_SH7763 is not set
173# CONFIG_CPU_SUBTYPE_SH7770 is not set 188# CONFIG_CPU_SUBTYPE_SH7770 is not set
174# CONFIG_CPU_SUBTYPE_SH7780 is not set 189# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -214,7 +229,6 @@ CONFIG_SPARSEMEM_STATIC=y
214# 229#
215# Memory hotplug is currently incompatible with Software Suspend 230# Memory hotplug is currently incompatible with Software Suspend
216# 231#
217CONFIG_PAGEFLAGS_EXTENDED=y
218CONFIG_SPLIT_PTLOCK_CPUS=4 232CONFIG_SPLIT_PTLOCK_CPUS=4
219CONFIG_MIGRATION=y 233CONFIG_MIGRATION=y
220# CONFIG_PHYS_ADDR_T_64BIT is not set 234# CONFIG_PHYS_ADDR_T_64BIT is not set
@@ -222,6 +236,7 @@ CONFIG_ZONE_DMA_FLAG=0
222CONFIG_NR_QUICK=2 236CONFIG_NR_QUICK=2
223CONFIG_HAVE_MLOCK=y 237CONFIG_HAVE_MLOCK=y
224CONFIG_HAVE_MLOCKED_PAGE_BIT=y 238CONFIG_HAVE_MLOCKED_PAGE_BIT=y
239# CONFIG_KSM is not set
225CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 240CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
226 241
227# 242#
@@ -246,6 +261,8 @@ CONFIG_CPU_HAS_FPU=y
246# Board support 261# Board support
247# 262#
248# CONFIG_SH_7724_SOLUTION_ENGINE is not set 263# CONFIG_SH_7724_SOLUTION_ENGINE is not set
264# CONFIG_SH_KFR2R09 is not set
265# CONFIG_SH_ECOVEC is not set
249 266
250# 267#
251# Timer and clock configuration 268# Timer and clock configuration
@@ -318,7 +335,8 @@ CONFIG_GUSA=y
318CONFIG_ZERO_PAGE_OFFSET=0x00001000 335CONFIG_ZERO_PAGE_OFFSET=0x00001000
319CONFIG_BOOT_LINK_OFFSET=0x00800000 336CONFIG_BOOT_LINK_OFFSET=0x00800000
320CONFIG_ENTRY_OFFSET=0x00001000 337CONFIG_ENTRY_OFFSET=0x00001000
321# CONFIG_CMDLINE_BOOL is not set 338# CONFIG_CMDLINE_OVERWRITE is not set
339# CONFIG_CMDLINE_EXTEND is not set
322 340
323# 341#
324# Bus options 342# Bus options
@@ -345,6 +363,7 @@ CONFIG_SUSPEND_FREEZER=y
345CONFIG_HIBERNATION_NVS=y 363CONFIG_HIBERNATION_NVS=y
346CONFIG_HIBERNATION=y 364CONFIG_HIBERNATION=y
347CONFIG_PM_STD_PARTITION="" 365CONFIG_PM_STD_PARTITION=""
366CONFIG_PM_RUNTIME=y
348CONFIG_CPU_IDLE=y 367CONFIG_CPU_IDLE=y
349CONFIG_CPU_IDLE_GOV_LADDER=y 368CONFIG_CPU_IDLE_GOV_LADDER=y
350CONFIG_CPU_IDLE_GOV_MENU=y 369CONFIG_CPU_IDLE_GOV_MENU=y
@@ -427,6 +446,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
427# CONFIG_TCG_TPM is not set 446# CONFIG_TCG_TPM is not set
428CONFIG_I2C=y 447CONFIG_I2C=y
429CONFIG_I2C_BOARDINFO=y 448CONFIG_I2C_BOARDINFO=y
449CONFIG_I2C_COMPAT=y
430CONFIG_I2C_CHARDEV=y 450CONFIG_I2C_CHARDEV=y
431CONFIG_I2C_HELPER_AUTO=y 451CONFIG_I2C_HELPER_AUTO=y
432 452
@@ -437,6 +457,7 @@ CONFIG_I2C_HELPER_AUTO=y
437# 457#
438# I2C system bus drivers (mostly embedded / system-on-chip) 458# I2C system bus drivers (mostly embedded / system-on-chip)
439# 459#
460# CONFIG_I2C_DESIGNWARE is not set
440# CONFIG_I2C_OCORES is not set 461# CONFIG_I2C_OCORES is not set
441CONFIG_I2C_SH_MOBILE=y 462CONFIG_I2C_SH_MOBILE=y
442# CONFIG_I2C_SIMTEC is not set 463# CONFIG_I2C_SIMTEC is not set
@@ -456,20 +477,21 @@ CONFIG_I2C_SH_MOBILE=y
456# Miscellaneous I2C Chip support 477# Miscellaneous I2C Chip support
457# 478#
458# CONFIG_DS1682 is not set 479# CONFIG_DS1682 is not set
459# CONFIG_SENSORS_PCF8574 is not set
460# CONFIG_PCF8575 is not set
461# CONFIG_SENSORS_PCA9539 is not set
462# CONFIG_SENSORS_TSL2550 is not set 480# CONFIG_SENSORS_TSL2550 is not set
463# CONFIG_I2C_DEBUG_CORE is not set 481# CONFIG_I2C_DEBUG_CORE is not set
464# CONFIG_I2C_DEBUG_ALGO is not set 482# CONFIG_I2C_DEBUG_ALGO is not set
465# CONFIG_I2C_DEBUG_BUS is not set 483# CONFIG_I2C_DEBUG_BUS is not set
466# CONFIG_I2C_DEBUG_CHIP is not set 484# CONFIG_I2C_DEBUG_CHIP is not set
467# CONFIG_SPI is not set 485# CONFIG_SPI is not set
486
487#
488# PPS support
489#
490# CONFIG_PPS is not set
468# CONFIG_W1 is not set 491# CONFIG_W1 is not set
469# CONFIG_POWER_SUPPLY is not set 492# CONFIG_POWER_SUPPLY is not set
470# CONFIG_HWMON is not set 493# CONFIG_HWMON is not set
471# CONFIG_THERMAL is not set 494# CONFIG_THERMAL is not set
472# CONFIG_THERMAL_HWMON is not set
473# CONFIG_WATCHDOG is not set 495# CONFIG_WATCHDOG is not set
474CONFIG_SSB_POSSIBLE=y 496CONFIG_SSB_POSSIBLE=y
475 497
@@ -488,8 +510,10 @@ CONFIG_SSB_POSSIBLE=y
488# CONFIG_MFD_TMIO is not set 510# CONFIG_MFD_TMIO is not set
489# CONFIG_PMIC_DA903X is not set 511# CONFIG_PMIC_DA903X is not set
490# CONFIG_MFD_WM8400 is not set 512# CONFIG_MFD_WM8400 is not set
513# CONFIG_MFD_WM831X is not set
491# CONFIG_MFD_WM8350_I2C is not set 514# CONFIG_MFD_WM8350_I2C is not set
492# CONFIG_MFD_PCF50633 is not set 515# CONFIG_MFD_PCF50633 is not set
516# CONFIG_AB3100_CORE is not set
493# CONFIG_REGULATOR is not set 517# CONFIG_REGULATOR is not set
494# CONFIG_MEDIA_SUPPORT is not set 518# CONFIG_MEDIA_SUPPORT is not set
495 519
@@ -540,6 +564,7 @@ CONFIG_RTC_INTF_DEV=y
540# CONFIG_RTC_DRV_S35390A is not set 564# CONFIG_RTC_DRV_S35390A is not set
541# CONFIG_RTC_DRV_FM3130 is not set 565# CONFIG_RTC_DRV_FM3130 is not set
542# CONFIG_RTC_DRV_RX8581 is not set 566# CONFIG_RTC_DRV_RX8581 is not set
567# CONFIG_RTC_DRV_RX8025 is not set
543 568
544# 569#
545# SPI RTC drivers 570# SPI RTC drivers
@@ -587,7 +612,9 @@ CONFIG_UIO_PDRV_GENIRQ=y
587# CONFIG_JFS_FS is not set 612# CONFIG_JFS_FS is not set
588# CONFIG_FS_POSIX_ACL is not set 613# CONFIG_FS_POSIX_ACL is not set
589# CONFIG_XFS_FS is not set 614# CONFIG_XFS_FS is not set
615# CONFIG_GFS2_FS is not set
590# CONFIG_BTRFS_FS is not set 616# CONFIG_BTRFS_FS is not set
617# CONFIG_NILFS2_FS is not set
591CONFIG_FILE_LOCKING=y 618CONFIG_FILE_LOCKING=y
592CONFIG_FSNOTIFY=y 619CONFIG_FSNOTIFY=y
593# CONFIG_DNOTIFY is not set 620# CONFIG_DNOTIFY is not set
@@ -642,6 +669,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
642# CONFIG_ENABLE_MUST_CHECK is not set 669# CONFIG_ENABLE_MUST_CHECK is not set
643CONFIG_FRAME_WARN=1024 670CONFIG_FRAME_WARN=1024
644# CONFIG_MAGIC_SYSRQ is not set 671# CONFIG_MAGIC_SYSRQ is not set
672# CONFIG_STRIP_ASM_SYMS is not set
645# CONFIG_UNUSED_SYMBOLS is not set 673# CONFIG_UNUSED_SYMBOLS is not set
646CONFIG_DEBUG_FS=y 674CONFIG_DEBUG_FS=y
647# CONFIG_HEADERS_CHECK is not set 675# CONFIG_HEADERS_CHECK is not set
@@ -654,11 +682,15 @@ CONFIG_STACKTRACE=y
654# CONFIG_SYSCTL_SYSCALL_CHECK is not set 682# CONFIG_SYSCTL_SYSCALL_CHECK is not set
655CONFIG_NOP_TRACER=y 683CONFIG_NOP_TRACER=y
656CONFIG_HAVE_FUNCTION_TRACER=y 684CONFIG_HAVE_FUNCTION_TRACER=y
685CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
686CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
657CONFIG_HAVE_DYNAMIC_FTRACE=y 687CONFIG_HAVE_DYNAMIC_FTRACE=y
658CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 688CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
689CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
659CONFIG_RING_BUFFER=y 690CONFIG_RING_BUFFER=y
660CONFIG_EVENT_TRACING=y 691CONFIG_EVENT_TRACING=y
661CONFIG_CONTEXT_SWITCH_TRACER=y 692CONFIG_CONTEXT_SWITCH_TRACER=y
693CONFIG_RING_BUFFER_ALLOW_SWAP=y
662CONFIG_TRACING=y 694CONFIG_TRACING=y
663CONFIG_TRACING_SUPPORT=y 695CONFIG_TRACING_SUPPORT=y
664# CONFIG_FTRACE is not set 696# CONFIG_FTRACE is not set
@@ -668,6 +700,7 @@ CONFIG_TRACING_SUPPORT=y
668CONFIG_HAVE_ARCH_KGDB=y 700CONFIG_HAVE_ARCH_KGDB=y
669# CONFIG_SH_STANDARD_BIOS is not set 701# CONFIG_SH_STANDARD_BIOS is not set
670# CONFIG_EARLY_SCIF_CONSOLE is not set 702# CONFIG_EARLY_SCIF_CONSOLE is not set
703# CONFIG_DWARF_UNWINDER is not set
671 704
672# 705#
673# Security options 706# Security options
@@ -692,4 +725,5 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
692CONFIG_HAS_IOMEM=y 725CONFIG_HAS_IOMEM=y
693CONFIG_HAS_IOPORT=y 726CONFIG_HAS_IOPORT=y
694CONFIG_HAS_DMA=y 727CONFIG_HAS_DMA=y
728CONFIG_HAVE_LMB=y
695CONFIG_GENERIC_ATOMIC64=y 729CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/sh7763rdp_defconfig b/arch/sh/configs/sh7763rdp_defconfig
index b1d9b2311e3c..194ff703e23d 100644
--- a/arch/sh/configs/sh7763rdp_defconfig
+++ b/arch/sh/configs/sh7763rdp_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 13:07:15 2009 4# Thu Sep 24 19:15:37 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -27,7 +28,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 28# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 29CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y
31 34
32# 35#
33# General setup 36# General setup
@@ -37,6 +40,12 @@ CONFIG_BROKEN_ON_SMP=y
37CONFIG_INIT_ENV_ARG_LIMIT=32 40CONFIG_INIT_ENV_ARG_LIMIT=32
38CONFIG_LOCALVERSION="" 41CONFIG_LOCALVERSION=""
39CONFIG_LOCALVERSION_AUTO=y 42CONFIG_LOCALVERSION_AUTO=y
43CONFIG_HAVE_KERNEL_GZIP=y
44CONFIG_HAVE_KERNEL_BZIP2=y
45CONFIG_HAVE_KERNEL_LZMA=y
46CONFIG_KERNEL_GZIP=y
47# CONFIG_KERNEL_BZIP2 is not set
48# CONFIG_KERNEL_LZMA is not set
40CONFIG_SWAP=y 49CONFIG_SWAP=y
41CONFIG_SYSVIPC=y 50CONFIG_SYSVIPC=y
42CONFIG_SYSVIPC_SYSCTL=y 51CONFIG_SYSVIPC_SYSCTL=y
@@ -48,11 +57,12 @@ CONFIG_SYSVIPC_SYSCTL=y
48# 57#
49# RCU Subsystem 58# RCU Subsystem
50# 59#
51CONFIG_CLASSIC_RCU=y 60CONFIG_TREE_RCU=y
52# CONFIG_TREE_RCU is not set 61# CONFIG_TREE_PREEMPT_RCU is not set
53# CONFIG_PREEMPT_RCU is not set 62# CONFIG_RCU_TRACE is not set
63CONFIG_RCU_FANOUT=32
64# CONFIG_RCU_FANOUT_EXACT is not set
54# CONFIG_TREE_RCU_TRACE is not set 65# CONFIG_TREE_RCU_TRACE is not set
55# CONFIG_PREEMPT_RCU_TRACE is not set
56CONFIG_IKCONFIG=y 66CONFIG_IKCONFIG=y
57CONFIG_IKCONFIG_PROC=y 67CONFIG_IKCONFIG_PROC=y
58CONFIG_LOG_BUF_SHIFT=14 68CONFIG_LOG_BUF_SHIFT=14
@@ -92,19 +102,21 @@ CONFIG_TIMERFD=y
92CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
93CONFIG_SHMEM=y 103CONFIG_SHMEM=y
94CONFIG_AIO=y 104CONFIG_AIO=y
105CONFIG_HAVE_PERF_EVENTS=y
95 106
96# 107#
97# Performance Counters 108# Kernel Performance Events And Counters
98# 109#
110CONFIG_PERF_EVENTS=y
111CONFIG_EVENT_PROFILE=y
112# CONFIG_PERF_COUNTERS is not set
99CONFIG_VM_EVENT_COUNTERS=y 113CONFIG_VM_EVENT_COUNTERS=y
100# CONFIG_STRIP_ASM_SYMS is not set
101CONFIG_COMPAT_BRK=y 114CONFIG_COMPAT_BRK=y
102CONFIG_SLAB=y 115CONFIG_SLAB=y
103# CONFIG_SLUB is not set 116# CONFIG_SLUB is not set
104# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
105CONFIG_PROFILING=y 118CONFIG_PROFILING=y
106CONFIG_TRACEPOINTS=y 119CONFIG_TRACEPOINTS=y
107CONFIG_MARKERS=y
108CONFIG_OPROFILE=y 120CONFIG_OPROFILE=y
109CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
110# CONFIG_KPROBES is not set 122# CONFIG_KPROBES is not set
@@ -114,6 +126,11 @@ CONFIG_HAVE_KRETPROBES=y
114CONFIG_HAVE_ARCH_TRACEHOOK=y 126CONFIG_HAVE_ARCH_TRACEHOOK=y
115CONFIG_HAVE_CLK=y 127CONFIG_HAVE_CLK=y
116CONFIG_HAVE_DMA_API_DEBUG=y 128CONFIG_HAVE_DMA_API_DEBUG=y
129
130#
131# GCOV-based kernel profiling
132#
133# CONFIG_GCOV_KERNEL is not set
117# CONFIG_SLOW_WORK is not set 134# CONFIG_SLOW_WORK is not set
118CONFIG_HAVE_GENERIC_DMA_COHERENT=y 135CONFIG_HAVE_GENERIC_DMA_COHERENT=y
119CONFIG_SLABINFO=y 136CONFIG_SLABINFO=y
@@ -125,7 +142,7 @@ CONFIG_MODULES=y
125# CONFIG_MODVERSIONS is not set 142# CONFIG_MODVERSIONS is not set
126# CONFIG_MODULE_SRCVERSION_ALL is not set 143# CONFIG_MODULE_SRCVERSION_ALL is not set
127CONFIG_BLOCK=y 144CONFIG_BLOCK=y
128# CONFIG_LBD is not set 145CONFIG_LBDAF=y
129# CONFIG_BLK_DEV_BSG is not set 146# CONFIG_BLK_DEV_BSG is not set
130# CONFIG_BLK_DEV_INTEGRITY is not set 147# CONFIG_BLK_DEV_INTEGRITY is not set
131 148
@@ -173,6 +190,7 @@ CONFIG_CPU_SH4A=y
173# CONFIG_CPU_SUBTYPE_SH4_202 is not set 190# CONFIG_CPU_SUBTYPE_SH4_202 is not set
174# CONFIG_CPU_SUBTYPE_SH7723 is not set 191# CONFIG_CPU_SUBTYPE_SH7723 is not set
175# CONFIG_CPU_SUBTYPE_SH7724 is not set 192# CONFIG_CPU_SUBTYPE_SH7724 is not set
193# CONFIG_CPU_SUBTYPE_SH7757 is not set
176CONFIG_CPU_SUBTYPE_SH7763=y 194CONFIG_CPU_SUBTYPE_SH7763=y
177# CONFIG_CPU_SUBTYPE_SH7770 is not set 195# CONFIG_CPU_SUBTYPE_SH7770 is not set
178# CONFIG_CPU_SUBTYPE_SH7780 is not set 196# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -214,7 +232,6 @@ CONFIG_SPARSEMEM=y
214CONFIG_HAVE_MEMORY_PRESENT=y 232CONFIG_HAVE_MEMORY_PRESENT=y
215CONFIG_SPARSEMEM_STATIC=y 233CONFIG_SPARSEMEM_STATIC=y
216# CONFIG_MEMORY_HOTPLUG is not set 234# CONFIG_MEMORY_HOTPLUG is not set
217CONFIG_PAGEFLAGS_EXTENDED=y
218CONFIG_SPLIT_PTLOCK_CPUS=4 235CONFIG_SPLIT_PTLOCK_CPUS=4
219CONFIG_MIGRATION=y 236CONFIG_MIGRATION=y
220# CONFIG_PHYS_ADDR_T_64BIT is not set 237# CONFIG_PHYS_ADDR_T_64BIT is not set
@@ -222,6 +239,7 @@ CONFIG_ZONE_DMA_FLAG=0
222CONFIG_NR_QUICK=2 239CONFIG_NR_QUICK=2
223CONFIG_HAVE_MLOCK=y 240CONFIG_HAVE_MLOCK=y
224CONFIG_HAVE_MLOCKED_PAGE_BIT=y 241CONFIG_HAVE_MLOCKED_PAGE_BIT=y
242# CONFIG_KSM is not set
225CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 243CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
226 244
227# 245#
@@ -303,7 +321,8 @@ CONFIG_GUSA=y
303CONFIG_ZERO_PAGE_OFFSET=0x00001000 321CONFIG_ZERO_PAGE_OFFSET=0x00001000
304CONFIG_BOOT_LINK_OFFSET=0x00800000 322CONFIG_BOOT_LINK_OFFSET=0x00800000
305CONFIG_ENTRY_OFFSET=0x00001000 323CONFIG_ENTRY_OFFSET=0x00001000
306CONFIG_CMDLINE_BOOL=y 324CONFIG_CMDLINE_OVERWRITE=y
325# CONFIG_CMDLINE_EXTEND is not set
307CONFIG_CMDLINE="console=ttySC2,115200 root=/dev/sda1 rootdelay=10" 326CONFIG_CMDLINE="console=ttySC2,115200 root=/dev/sda1 rootdelay=10"
308 327
309# 328#
@@ -371,6 +390,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
371# CONFIG_NETFILTER is not set 390# CONFIG_NETFILTER is not set
372# CONFIG_IP_DCCP is not set 391# CONFIG_IP_DCCP is not set
373# CONFIG_IP_SCTP is not set 392# CONFIG_IP_SCTP is not set
393# CONFIG_RDS is not set
374# CONFIG_TIPC is not set 394# CONFIG_TIPC is not set
375# CONFIG_ATM is not set 395# CONFIG_ATM is not set
376# CONFIG_BRIDGE is not set 396# CONFIG_BRIDGE is not set
@@ -401,6 +421,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
401# CONFIG_AF_RXRPC is not set 421# CONFIG_AF_RXRPC is not set
402CONFIG_WIRELESS=y 422CONFIG_WIRELESS=y
403# CONFIG_CFG80211 is not set 423# CONFIG_CFG80211 is not set
424CONFIG_CFG80211_DEFAULT_PS_VALUE=0
404# CONFIG_WIRELESS_OLD_REGULATORY is not set 425# CONFIG_WIRELESS_OLD_REGULATORY is not set
405CONFIG_WIRELESS_EXT=y 426CONFIG_WIRELESS_EXT=y
406CONFIG_WIRELESS_EXT_SYSFS=y 427CONFIG_WIRELESS_EXT_SYSFS=y
@@ -409,7 +430,6 @@ CONFIG_WIRELESS_EXT_SYSFS=y
409# 430#
410# CFG80211 needs to be enabled for MAC80211 431# CFG80211 needs to be enabled for MAC80211
411# 432#
412CONFIG_MAC80211_DEFAULT_PS_VALUE=0
413# CONFIG_WIMAX is not set 433# CONFIG_WIMAX is not set
414# CONFIG_RFKILL is not set 434# CONFIG_RFKILL is not set
415# CONFIG_NET_9P is not set 435# CONFIG_NET_9P is not set
@@ -422,6 +442,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
422# Generic Driver Options 442# Generic Driver Options
423# 443#
424CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 444CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
445# CONFIG_DEVTMPFS is not set
425CONFIG_STANDALONE=y 446CONFIG_STANDALONE=y
426CONFIG_PREVENT_FIRMWARE_BUILD=y 447CONFIG_PREVENT_FIRMWARE_BUILD=y
427CONFIG_FW_LOADER=y 448CONFIG_FW_LOADER=y
@@ -431,9 +452,9 @@ CONFIG_EXTRA_FIRMWARE=""
431# CONFIG_CONNECTOR is not set 452# CONFIG_CONNECTOR is not set
432CONFIG_MTD=y 453CONFIG_MTD=y
433# CONFIG_MTD_DEBUG is not set 454# CONFIG_MTD_DEBUG is not set
455# CONFIG_MTD_TESTS is not set
434# CONFIG_MTD_CONCAT is not set 456# CONFIG_MTD_CONCAT is not set
435CONFIG_MTD_PARTITIONS=y 457CONFIG_MTD_PARTITIONS=y
436# CONFIG_MTD_TESTS is not set
437# CONFIG_MTD_REDBOOT_PARTS is not set 458# CONFIG_MTD_REDBOOT_PARTS is not set
438CONFIG_MTD_CMDLINE_PARTS=y 459CONFIG_MTD_CMDLINE_PARTS=y
439# CONFIG_MTD_AR7_PARTS is not set 460# CONFIG_MTD_AR7_PARTS is not set
@@ -488,6 +509,7 @@ CONFIG_MTD_CFI_UTIL=y
488CONFIG_MTD_COMPLEX_MAPPINGS=y 509CONFIG_MTD_COMPLEX_MAPPINGS=y
489CONFIG_MTD_PHYSMAP=y 510CONFIG_MTD_PHYSMAP=y
490# CONFIG_MTD_PHYSMAP_COMPAT is not set 511# CONFIG_MTD_PHYSMAP_COMPAT is not set
512# CONFIG_MTD_GPIO_ADDR is not set
491# CONFIG_MTD_PLATRAM is not set 513# CONFIG_MTD_PLATRAM is not set
492 514
493# 515#
@@ -565,7 +587,6 @@ CONFIG_SCSI_WAIT_SCAN=m
565# CONFIG_SCSI_SRP_ATTRS is not set 587# CONFIG_SCSI_SRP_ATTRS is not set
566CONFIG_SCSI_LOWLEVEL=y 588CONFIG_SCSI_LOWLEVEL=y
567# CONFIG_ISCSI_TCP is not set 589# CONFIG_ISCSI_TCP is not set
568# CONFIG_SCSI_BNX2_ISCSI is not set
569# CONFIG_LIBFC is not set 590# CONFIG_LIBFC is not set
570# CONFIG_LIBFCOE is not set 591# CONFIG_LIBFCOE is not set
571# CONFIG_SCSI_DEBUG is not set 592# CONFIG_SCSI_DEBUG is not set
@@ -621,10 +642,7 @@ CONFIG_SH_ETH=y
621# CONFIG_KS8842 is not set 642# CONFIG_KS8842 is not set
622# CONFIG_NETDEV_1000 is not set 643# CONFIG_NETDEV_1000 is not set
623# CONFIG_NETDEV_10000 is not set 644# CONFIG_NETDEV_10000 is not set
624 645CONFIG_WLAN=y
625#
626# Wireless LAN
627#
628# CONFIG_WLAN_PRE80211 is not set 646# CONFIG_WLAN_PRE80211 is not set
629# CONFIG_WLAN_80211 is not set 647# CONFIG_WLAN_80211 is not set
630 648
@@ -716,11 +734,15 @@ CONFIG_HW_RANDOM=y
716# CONFIG_TCG_TPM is not set 734# CONFIG_TCG_TPM is not set
717# CONFIG_I2C is not set 735# CONFIG_I2C is not set
718# CONFIG_SPI is not set 736# CONFIG_SPI is not set
737
738#
739# PPS support
740#
741# CONFIG_PPS is not set
719# CONFIG_W1 is not set 742# CONFIG_W1 is not set
720# CONFIG_POWER_SUPPLY is not set 743# CONFIG_POWER_SUPPLY is not set
721# CONFIG_HWMON is not set 744# CONFIG_HWMON is not set
722# CONFIG_THERMAL is not set 745# CONFIG_THERMAL is not set
723# CONFIG_THERMAL_HWMON is not set
724# CONFIG_WATCHDOG is not set 746# CONFIG_WATCHDOG is not set
725CONFIG_SSB_POSSIBLE=y 747CONFIG_SSB_POSSIBLE=y
726 748
@@ -830,6 +852,7 @@ CONFIG_USB_MON=y
830# CONFIG_USB_OXU210HP_HCD is not set 852# CONFIG_USB_OXU210HP_HCD is not set
831# CONFIG_USB_ISP116X_HCD is not set 853# CONFIG_USB_ISP116X_HCD is not set
832# CONFIG_USB_ISP1760_HCD is not set 854# CONFIG_USB_ISP1760_HCD is not set
855# CONFIG_USB_ISP1362_HCD is not set
833CONFIG_USB_OHCI_HCD=y 856CONFIG_USB_OHCI_HCD=y
834# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 857# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
835# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 858# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -899,6 +922,7 @@ CONFIG_USB_STORAGE=y
899# CONFIG_USB_LD is not set 922# CONFIG_USB_LD is not set
900# CONFIG_USB_TRANCEVIBRATOR is not set 923# CONFIG_USB_TRANCEVIBRATOR is not set
901# CONFIG_USB_IOWARRIOR is not set 924# CONFIG_USB_IOWARRIOR is not set
925# CONFIG_USB_TEST is not set
902# CONFIG_USB_ISIGHTFW is not set 926# CONFIG_USB_ISIGHTFW is not set
903# CONFIG_USB_VST is not set 927# CONFIG_USB_VST is not set
904# CONFIG_USB_GADGET is not set 928# CONFIG_USB_GADGET is not set
@@ -923,6 +947,8 @@ CONFIG_MMC_BLOCK_BOUNCE=y
923# MMC/SD/SDIO Host Controller Drivers 947# MMC/SD/SDIO Host Controller Drivers
924# 948#
925# CONFIG_MMC_SDHCI is not set 949# CONFIG_MMC_SDHCI is not set
950# CONFIG_MMC_AT91 is not set
951# CONFIG_MMC_ATMELMCI is not set
926# CONFIG_MEMSTICK is not set 952# CONFIG_MEMSTICK is not set
927# CONFIG_NEW_LEDS is not set 953# CONFIG_NEW_LEDS is not set
928# CONFIG_ACCESSIBILITY is not set 954# CONFIG_ACCESSIBILITY is not set
@@ -956,8 +982,10 @@ CONFIG_FS_MBCACHE=y
956# CONFIG_JFS_FS is not set 982# CONFIG_JFS_FS is not set
957CONFIG_FS_POSIX_ACL=y 983CONFIG_FS_POSIX_ACL=y
958# CONFIG_XFS_FS is not set 984# CONFIG_XFS_FS is not set
985# CONFIG_GFS2_FS is not set
959# CONFIG_OCFS2_FS is not set 986# CONFIG_OCFS2_FS is not set
960# CONFIG_BTRFS_FS is not set 987# CONFIG_BTRFS_FS is not set
988# CONFIG_NILFS2_FS is not set
961CONFIG_FILE_LOCKING=y 989CONFIG_FILE_LOCKING=y
962CONFIG_FSNOTIFY=y 990CONFIG_FSNOTIFY=y
963CONFIG_DNOTIFY=y 991CONFIG_DNOTIFY=y
@@ -1022,7 +1050,6 @@ CONFIG_MISC_FILESYSTEMS=y
1022# CONFIG_ROMFS_FS is not set 1050# CONFIG_ROMFS_FS is not set
1023# CONFIG_SYSV_FS is not set 1051# CONFIG_SYSV_FS is not set
1024# CONFIG_UFS_FS is not set 1052# CONFIG_UFS_FS is not set
1025# CONFIG_NILFS2_FS is not set
1026CONFIG_NETWORK_FILESYSTEMS=y 1053CONFIG_NETWORK_FILESYSTEMS=y
1027CONFIG_NFS_FS=y 1054CONFIG_NFS_FS=y
1028# CONFIG_NFS_V3 is not set 1055# CONFIG_NFS_V3 is not set
@@ -1096,6 +1123,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1096# CONFIG_ENABLE_MUST_CHECK is not set 1123# CONFIG_ENABLE_MUST_CHECK is not set
1097CONFIG_FRAME_WARN=1024 1124CONFIG_FRAME_WARN=1024
1098# CONFIG_MAGIC_SYSRQ is not set 1125# CONFIG_MAGIC_SYSRQ is not set
1126# CONFIG_STRIP_ASM_SYMS is not set
1099# CONFIG_UNUSED_SYMBOLS is not set 1127# CONFIG_UNUSED_SYMBOLS is not set
1100CONFIG_DEBUG_FS=y 1128CONFIG_DEBUG_FS=y
1101# CONFIG_HEADERS_CHECK is not set 1129# CONFIG_HEADERS_CHECK is not set
@@ -1107,11 +1135,15 @@ CONFIG_STACKTRACE=y
1107# CONFIG_LATENCYTOP is not set 1135# CONFIG_LATENCYTOP is not set
1108CONFIG_NOP_TRACER=y 1136CONFIG_NOP_TRACER=y
1109CONFIG_HAVE_FUNCTION_TRACER=y 1137CONFIG_HAVE_FUNCTION_TRACER=y
1138CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1139CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1110CONFIG_HAVE_DYNAMIC_FTRACE=y 1140CONFIG_HAVE_DYNAMIC_FTRACE=y
1111CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1141CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1142CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1112CONFIG_RING_BUFFER=y 1143CONFIG_RING_BUFFER=y
1113CONFIG_EVENT_TRACING=y 1144CONFIG_EVENT_TRACING=y
1114CONFIG_CONTEXT_SWITCH_TRACER=y 1145CONFIG_CONTEXT_SWITCH_TRACER=y
1146CONFIG_RING_BUFFER_ALLOW_SWAP=y
1115CONFIG_TRACING=y 1147CONFIG_TRACING=y
1116CONFIG_TRACING_SUPPORT=y 1148CONFIG_TRACING_SUPPORT=y
1117# CONFIG_FTRACE is not set 1149# CONFIG_FTRACE is not set
@@ -1121,6 +1153,7 @@ CONFIG_TRACING_SUPPORT=y
1121CONFIG_HAVE_ARCH_KGDB=y 1153CONFIG_HAVE_ARCH_KGDB=y
1122# CONFIG_SH_STANDARD_BIOS is not set 1154# CONFIG_SH_STANDARD_BIOS is not set
1123# CONFIG_EARLY_SCIF_CONSOLE is not set 1155# CONFIG_EARLY_SCIF_CONSOLE is not set
1156# CONFIG_DWARF_UNWINDER is not set
1124 1157
1125# 1158#
1126# Security options 1159# Security options
@@ -1134,7 +1167,6 @@ CONFIG_CRYPTO=y
1134# 1167#
1135# Crypto core or helper 1168# Crypto core or helper
1136# 1169#
1137# CONFIG_CRYPTO_FIPS is not set
1138# CONFIG_CRYPTO_MANAGER is not set 1170# CONFIG_CRYPTO_MANAGER is not set
1139# CONFIG_CRYPTO_MANAGER2 is not set 1171# CONFIG_CRYPTO_MANAGER2 is not set
1140# CONFIG_CRYPTO_GF128MUL is not set 1172# CONFIG_CRYPTO_GF128MUL is not set
@@ -1166,11 +1198,13 @@ CONFIG_CRYPTO=y
1166# 1198#
1167# CONFIG_CRYPTO_HMAC is not set 1199# CONFIG_CRYPTO_HMAC is not set
1168# CONFIG_CRYPTO_XCBC is not set 1200# CONFIG_CRYPTO_XCBC is not set
1201# CONFIG_CRYPTO_VMAC is not set
1169 1202
1170# 1203#
1171# Digest 1204# Digest
1172# 1205#
1173# CONFIG_CRYPTO_CRC32C is not set 1206# CONFIG_CRYPTO_CRC32C is not set
1207# CONFIG_CRYPTO_GHASH is not set
1174# CONFIG_CRYPTO_MD4 is not set 1208# CONFIG_CRYPTO_MD4 is not set
1175# CONFIG_CRYPTO_MD5 is not set 1209# CONFIG_CRYPTO_MD5 is not set
1176# CONFIG_CRYPTO_MICHAEL_MIC is not set 1210# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1232,5 +1266,6 @@ CONFIG_CRC32=y
1232CONFIG_HAS_IOMEM=y 1266CONFIG_HAS_IOMEM=y
1233CONFIG_HAS_IOPORT=y 1267CONFIG_HAS_IOPORT=y
1234CONFIG_HAS_DMA=y 1268CONFIG_HAS_DMA=y
1269CONFIG_HAVE_LMB=y
1235CONFIG_NLATTR=y 1270CONFIG_NLATTR=y
1236CONFIG_GENERIC_ATOMIC64=y 1271CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/sh7770_generic_defconfig b/arch/sh/configs/sh7770_generic_defconfig
index 426a88f7a23b..34bed5541f31 100644
--- a/arch/sh/configs/sh7770_generic_defconfig
+++ b/arch/sh/configs/sh7770_generic_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 13:08:05 2009 4# Thu Sep 24 19:17:16 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -27,7 +28,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 28# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 29CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y
31 34
32# 35#
33# General setup 36# General setup
@@ -37,6 +40,12 @@ CONFIG_BROKEN_ON_SMP=y
37CONFIG_INIT_ENV_ARG_LIMIT=32 40CONFIG_INIT_ENV_ARG_LIMIT=32
38CONFIG_LOCALVERSION="" 41CONFIG_LOCALVERSION=""
39# CONFIG_LOCALVERSION_AUTO is not set 42# CONFIG_LOCALVERSION_AUTO is not set
43CONFIG_HAVE_KERNEL_GZIP=y
44CONFIG_HAVE_KERNEL_BZIP2=y
45CONFIG_HAVE_KERNEL_LZMA=y
46CONFIG_KERNEL_GZIP=y
47# CONFIG_KERNEL_BZIP2 is not set
48# CONFIG_KERNEL_LZMA is not set
40CONFIG_SWAP=y 49CONFIG_SWAP=y
41CONFIG_SYSVIPC=y 50CONFIG_SYSVIPC=y
42CONFIG_SYSVIPC_SYSCTL=y 51CONFIG_SYSVIPC_SYSCTL=y
@@ -45,14 +54,12 @@ CONFIG_SYSVIPC_SYSCTL=y
45# 54#
46# RCU Subsystem 55# RCU Subsystem
47# 56#
48# CONFIG_CLASSIC_RCU is not set
49CONFIG_TREE_RCU=y 57CONFIG_TREE_RCU=y
50# CONFIG_PREEMPT_RCU is not set 58# CONFIG_TREE_PREEMPT_RCU is not set
51# CONFIG_RCU_TRACE is not set 59# CONFIG_RCU_TRACE is not set
52CONFIG_RCU_FANOUT=32 60CONFIG_RCU_FANOUT=32
53# CONFIG_RCU_FANOUT_EXACT is not set 61# CONFIG_RCU_FANOUT_EXACT is not set
54# CONFIG_TREE_RCU_TRACE is not set 62# CONFIG_TREE_RCU_TRACE is not set
55# CONFIG_PREEMPT_RCU_TRACE is not set
56# CONFIG_IKCONFIG is not set 63# CONFIG_IKCONFIG is not set
57CONFIG_LOG_BUF_SHIFT=17 64CONFIG_LOG_BUF_SHIFT=17
58CONFIG_GROUP_SCHED=y 65CONFIG_GROUP_SCHED=y
@@ -91,19 +98,21 @@ CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 98CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 99CONFIG_SHMEM=y
93CONFIG_AIO=y 100CONFIG_AIO=y
101CONFIG_HAVE_PERF_EVENTS=y
94 102
95# 103#
96# Performance Counters 104# Kernel Performance Events And Counters
97# 105#
106CONFIG_PERF_EVENTS=y
107CONFIG_EVENT_PROFILE=y
108# CONFIG_PERF_COUNTERS is not set
98CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
99# CONFIG_STRIP_ASM_SYMS is not set
100# CONFIG_COMPAT_BRK is not set 110# CONFIG_COMPAT_BRK is not set
101# CONFIG_SLAB is not set 111# CONFIG_SLAB is not set
102CONFIG_SLUB=y 112CONFIG_SLUB=y
103# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
104CONFIG_PROFILING=y 114CONFIG_PROFILING=y
105CONFIG_TRACEPOINTS=y 115CONFIG_TRACEPOINTS=y
106CONFIG_MARKERS=y
107CONFIG_OPROFILE=y 116CONFIG_OPROFILE=y
108CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
109CONFIG_HAVE_IOREMAP_PROT=y 118CONFIG_HAVE_IOREMAP_PROT=y
@@ -112,13 +121,18 @@ CONFIG_HAVE_KRETPROBES=y
112CONFIG_HAVE_ARCH_TRACEHOOK=y 121CONFIG_HAVE_ARCH_TRACEHOOK=y
113CONFIG_HAVE_CLK=y 122CONFIG_HAVE_CLK=y
114CONFIG_HAVE_DMA_API_DEBUG=y 123CONFIG_HAVE_DMA_API_DEBUG=y
124
125#
126# GCOV-based kernel profiling
127#
128# CONFIG_GCOV_KERNEL is not set
115# CONFIG_SLOW_WORK is not set 129# CONFIG_SLOW_WORK is not set
116CONFIG_HAVE_GENERIC_DMA_COHERENT=y 130CONFIG_HAVE_GENERIC_DMA_COHERENT=y
117CONFIG_RT_MUTEXES=y 131CONFIG_RT_MUTEXES=y
118CONFIG_BASE_SMALL=0 132CONFIG_BASE_SMALL=0
119# CONFIG_MODULES is not set 133# CONFIG_MODULES is not set
120CONFIG_BLOCK=y 134CONFIG_BLOCK=y
121# CONFIG_LBD is not set 135CONFIG_LBDAF=y
122# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
123# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
124 138
@@ -166,6 +180,7 @@ CONFIG_CPU_SH4A=y
166# CONFIG_CPU_SUBTYPE_SH4_202 is not set 180# CONFIG_CPU_SUBTYPE_SH4_202 is not set
167# CONFIG_CPU_SUBTYPE_SH7723 is not set 181# CONFIG_CPU_SUBTYPE_SH7723 is not set
168# CONFIG_CPU_SUBTYPE_SH7724 is not set 182# CONFIG_CPU_SUBTYPE_SH7724 is not set
183# CONFIG_CPU_SUBTYPE_SH7757 is not set
169# CONFIG_CPU_SUBTYPE_SH7763 is not set 184# CONFIG_CPU_SUBTYPE_SH7763 is not set
170CONFIG_CPU_SUBTYPE_SH7770=y 185CONFIG_CPU_SUBTYPE_SH7770=y
171# CONFIG_CPU_SUBTYPE_SH7780 is not set 186# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -210,7 +225,6 @@ CONFIG_SPARSEMEM_STATIC=y
210# 225#
211# Memory hotplug is currently incompatible with Software Suspend 226# Memory hotplug is currently incompatible with Software Suspend
212# 227#
213CONFIG_PAGEFLAGS_EXTENDED=y
214CONFIG_SPLIT_PTLOCK_CPUS=4 228CONFIG_SPLIT_PTLOCK_CPUS=4
215CONFIG_MIGRATION=y 229CONFIG_MIGRATION=y
216# CONFIG_PHYS_ADDR_T_64BIT is not set 230# CONFIG_PHYS_ADDR_T_64BIT is not set
@@ -218,6 +232,7 @@ CONFIG_ZONE_DMA_FLAG=0
218CONFIG_NR_QUICK=2 232CONFIG_NR_QUICK=2
219CONFIG_HAVE_MLOCK=y 233CONFIG_HAVE_MLOCK=y
220CONFIG_HAVE_MLOCKED_PAGE_BIT=y 234CONFIG_HAVE_MLOCKED_PAGE_BIT=y
235# CONFIG_KSM is not set
221CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 236CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
222 237
223# 238#
@@ -313,7 +328,8 @@ CONFIG_GUSA=y
313CONFIG_ZERO_PAGE_OFFSET=0x00001000 328CONFIG_ZERO_PAGE_OFFSET=0x00001000
314CONFIG_BOOT_LINK_OFFSET=0x00800000 329CONFIG_BOOT_LINK_OFFSET=0x00800000
315CONFIG_ENTRY_OFFSET=0x00001000 330CONFIG_ENTRY_OFFSET=0x00001000
316# CONFIG_CMDLINE_BOOL is not set 331# CONFIG_CMDLINE_OVERWRITE is not set
332# CONFIG_CMDLINE_EXTEND is not set
317 333
318# 334#
319# Bus options 335# Bus options
@@ -338,6 +354,7 @@ CONFIG_PM_SLEEP=y
338CONFIG_HIBERNATION_NVS=y 354CONFIG_HIBERNATION_NVS=y
339CONFIG_HIBERNATION=y 355CONFIG_HIBERNATION=y
340CONFIG_PM_STD_PARTITION="" 356CONFIG_PM_STD_PARTITION=""
357# CONFIG_PM_RUNTIME is not set
341CONFIG_CPU_IDLE=y 358CONFIG_CPU_IDLE=y
342CONFIG_CPU_IDLE_GOV_LADDER=y 359CONFIG_CPU_IDLE_GOV_LADDER=y
343CONFIG_CPU_IDLE_GOV_MENU=y 360CONFIG_CPU_IDLE_GOV_MENU=y
@@ -420,6 +437,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
420# CONFIG_TCG_TPM is not set 437# CONFIG_TCG_TPM is not set
421CONFIG_I2C=y 438CONFIG_I2C=y
422CONFIG_I2C_BOARDINFO=y 439CONFIG_I2C_BOARDINFO=y
440CONFIG_I2C_COMPAT=y
423CONFIG_I2C_CHARDEV=y 441CONFIG_I2C_CHARDEV=y
424CONFIG_I2C_HELPER_AUTO=y 442CONFIG_I2C_HELPER_AUTO=y
425 443
@@ -430,6 +448,7 @@ CONFIG_I2C_HELPER_AUTO=y
430# 448#
431# I2C system bus drivers (mostly embedded / system-on-chip) 449# I2C system bus drivers (mostly embedded / system-on-chip)
432# 450#
451# CONFIG_I2C_DESIGNWARE is not set
433# CONFIG_I2C_OCORES is not set 452# CONFIG_I2C_OCORES is not set
434CONFIG_I2C_SH_MOBILE=y 453CONFIG_I2C_SH_MOBILE=y
435# CONFIG_I2C_SIMTEC is not set 454# CONFIG_I2C_SIMTEC is not set
@@ -449,20 +468,21 @@ CONFIG_I2C_SH_MOBILE=y
449# Miscellaneous I2C Chip support 468# Miscellaneous I2C Chip support
450# 469#
451# CONFIG_DS1682 is not set 470# CONFIG_DS1682 is not set
452# CONFIG_SENSORS_PCF8574 is not set
453# CONFIG_PCF8575 is not set
454# CONFIG_SENSORS_PCA9539 is not set
455# CONFIG_SENSORS_TSL2550 is not set 471# CONFIG_SENSORS_TSL2550 is not set
456# CONFIG_I2C_DEBUG_CORE is not set 472# CONFIG_I2C_DEBUG_CORE is not set
457# CONFIG_I2C_DEBUG_ALGO is not set 473# CONFIG_I2C_DEBUG_ALGO is not set
458# CONFIG_I2C_DEBUG_BUS is not set 474# CONFIG_I2C_DEBUG_BUS is not set
459# CONFIG_I2C_DEBUG_CHIP is not set 475# CONFIG_I2C_DEBUG_CHIP is not set
460# CONFIG_SPI is not set 476# CONFIG_SPI is not set
477
478#
479# PPS support
480#
481# CONFIG_PPS is not set
461# CONFIG_W1 is not set 482# CONFIG_W1 is not set
462# CONFIG_POWER_SUPPLY is not set 483# CONFIG_POWER_SUPPLY is not set
463# CONFIG_HWMON is not set 484# CONFIG_HWMON is not set
464# CONFIG_THERMAL is not set 485# CONFIG_THERMAL is not set
465# CONFIG_THERMAL_HWMON is not set
466# CONFIG_WATCHDOG is not set 486# CONFIG_WATCHDOG is not set
467CONFIG_SSB_POSSIBLE=y 487CONFIG_SSB_POSSIBLE=y
468 488
@@ -481,8 +501,10 @@ CONFIG_SSB_POSSIBLE=y
481# CONFIG_MFD_TMIO is not set 501# CONFIG_MFD_TMIO is not set
482# CONFIG_PMIC_DA903X is not set 502# CONFIG_PMIC_DA903X is not set
483# CONFIG_MFD_WM8400 is not set 503# CONFIG_MFD_WM8400 is not set
504# CONFIG_MFD_WM831X is not set
484# CONFIG_MFD_WM8350_I2C is not set 505# CONFIG_MFD_WM8350_I2C is not set
485# CONFIG_MFD_PCF50633 is not set 506# CONFIG_MFD_PCF50633 is not set
507# CONFIG_AB3100_CORE is not set
486# CONFIG_REGULATOR is not set 508# CONFIG_REGULATOR is not set
487# CONFIG_MEDIA_SUPPORT is not set 509# CONFIG_MEDIA_SUPPORT is not set
488 510
@@ -533,6 +555,7 @@ CONFIG_RTC_INTF_DEV=y
533# CONFIG_RTC_DRV_S35390A is not set 555# CONFIG_RTC_DRV_S35390A is not set
534# CONFIG_RTC_DRV_FM3130 is not set 556# CONFIG_RTC_DRV_FM3130 is not set
535# CONFIG_RTC_DRV_RX8581 is not set 557# CONFIG_RTC_DRV_RX8581 is not set
558# CONFIG_RTC_DRV_RX8025 is not set
536 559
537# 560#
538# SPI RTC drivers 561# SPI RTC drivers
@@ -580,7 +603,9 @@ CONFIG_UIO_PDRV_GENIRQ=y
580# CONFIG_JFS_FS is not set 603# CONFIG_JFS_FS is not set
581# CONFIG_FS_POSIX_ACL is not set 604# CONFIG_FS_POSIX_ACL is not set
582# CONFIG_XFS_FS is not set 605# CONFIG_XFS_FS is not set
606# CONFIG_GFS2_FS is not set
583# CONFIG_BTRFS_FS is not set 607# CONFIG_BTRFS_FS is not set
608# CONFIG_NILFS2_FS is not set
584CONFIG_FILE_LOCKING=y 609CONFIG_FILE_LOCKING=y
585CONFIG_FSNOTIFY=y 610CONFIG_FSNOTIFY=y
586# CONFIG_DNOTIFY is not set 611# CONFIG_DNOTIFY is not set
@@ -635,6 +660,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
635# CONFIG_ENABLE_MUST_CHECK is not set 660# CONFIG_ENABLE_MUST_CHECK is not set
636CONFIG_FRAME_WARN=1024 661CONFIG_FRAME_WARN=1024
637# CONFIG_MAGIC_SYSRQ is not set 662# CONFIG_MAGIC_SYSRQ is not set
663# CONFIG_STRIP_ASM_SYMS is not set
638# CONFIG_UNUSED_SYMBOLS is not set 664# CONFIG_UNUSED_SYMBOLS is not set
639CONFIG_DEBUG_FS=y 665CONFIG_DEBUG_FS=y
640# CONFIG_HEADERS_CHECK is not set 666# CONFIG_HEADERS_CHECK is not set
@@ -647,11 +673,15 @@ CONFIG_STACKTRACE=y
647# CONFIG_SYSCTL_SYSCALL_CHECK is not set 673# CONFIG_SYSCTL_SYSCALL_CHECK is not set
648CONFIG_NOP_TRACER=y 674CONFIG_NOP_TRACER=y
649CONFIG_HAVE_FUNCTION_TRACER=y 675CONFIG_HAVE_FUNCTION_TRACER=y
676CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
677CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
650CONFIG_HAVE_DYNAMIC_FTRACE=y 678CONFIG_HAVE_DYNAMIC_FTRACE=y
651CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 679CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
680CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
652CONFIG_RING_BUFFER=y 681CONFIG_RING_BUFFER=y
653CONFIG_EVENT_TRACING=y 682CONFIG_EVENT_TRACING=y
654CONFIG_CONTEXT_SWITCH_TRACER=y 683CONFIG_CONTEXT_SWITCH_TRACER=y
684CONFIG_RING_BUFFER_ALLOW_SWAP=y
655CONFIG_TRACING=y 685CONFIG_TRACING=y
656CONFIG_TRACING_SUPPORT=y 686CONFIG_TRACING_SUPPORT=y
657# CONFIG_FTRACE is not set 687# CONFIG_FTRACE is not set
@@ -661,6 +691,7 @@ CONFIG_TRACING_SUPPORT=y
661CONFIG_HAVE_ARCH_KGDB=y 691CONFIG_HAVE_ARCH_KGDB=y
662# CONFIG_SH_STANDARD_BIOS is not set 692# CONFIG_SH_STANDARD_BIOS is not set
663# CONFIG_EARLY_SCIF_CONSOLE is not set 693# CONFIG_EARLY_SCIF_CONSOLE is not set
694# CONFIG_DWARF_UNWINDER is not set
664 695
665# 696#
666# Security options 697# Security options
@@ -685,4 +716,5 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
685CONFIG_HAS_IOMEM=y 716CONFIG_HAS_IOMEM=y
686CONFIG_HAS_IOPORT=y 717CONFIG_HAS_IOPORT=y
687CONFIG_HAS_DMA=y 718CONFIG_HAS_DMA=y
719CONFIG_HAVE_LMB=y
688CONFIG_GENERIC_ATOMIC64=y 720CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/sh7785lcr_32bit_defconfig b/arch/sh/configs/sh7785lcr_32bit_defconfig
index ed316f602db6..51cbaedf7a56 100644
--- a/arch/sh/configs/sh7785lcr_32bit_defconfig
+++ b/arch/sh/configs/sh7785lcr_32bit_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 13:08:29 2009 4# Fri Sep 25 11:39:20 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -29,8 +30,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
29# CONFIG_ARCH_HAS_ILOG2_U64 is not set 30# CONFIG_ARCH_HAS_ILOG2_U64 is not set
30CONFIG_ARCH_NO_VIRT_TO_BUS=y 31CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_IO_TRAPPED=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y
34 36
35# 37#
36# General setup 38# General setup
@@ -41,10 +43,17 @@ CONFIG_LOCK_KERNEL=y
41CONFIG_INIT_ENV_ARG_LIMIT=32 43CONFIG_INIT_ENV_ARG_LIMIT=32
42CONFIG_LOCALVERSION="" 44CONFIG_LOCALVERSION=""
43CONFIG_LOCALVERSION_AUTO=y 45CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set
44CONFIG_SWAP=y 52CONFIG_SWAP=y
45CONFIG_SYSVIPC=y 53CONFIG_SYSVIPC=y
46CONFIG_SYSVIPC_SYSCTL=y 54CONFIG_SYSVIPC_SYSCTL=y
47# CONFIG_POSIX_MQUEUE is not set 55CONFIG_POSIX_MQUEUE=y
56CONFIG_POSIX_MQUEUE_SYSCTL=y
48CONFIG_BSD_PROCESS_ACCT=y 57CONFIG_BSD_PROCESS_ACCT=y
49# CONFIG_BSD_PROCESS_ACCT_V3 is not set 58# CONFIG_BSD_PROCESS_ACCT_V3 is not set
50# CONFIG_TASKSTATS is not set 59# CONFIG_TASKSTATS is not set
@@ -53,11 +62,12 @@ CONFIG_BSD_PROCESS_ACCT=y
53# 62#
54# RCU Subsystem 63# RCU Subsystem
55# 64#
56CONFIG_CLASSIC_RCU=y 65CONFIG_TREE_RCU=y
57# CONFIG_TREE_RCU is not set 66# CONFIG_TREE_PREEMPT_RCU is not set
58# CONFIG_PREEMPT_RCU is not set 67# CONFIG_RCU_TRACE is not set
68CONFIG_RCU_FANOUT=32
69# CONFIG_RCU_FANOUT_EXACT is not set
59# CONFIG_TREE_RCU_TRACE is not set 70# CONFIG_TREE_RCU_TRACE is not set
60# CONFIG_PREEMPT_RCU_TRACE is not set
61CONFIG_IKCONFIG=y 71CONFIG_IKCONFIG=y
62CONFIG_IKCONFIG_PROC=y 72CONFIG_IKCONFIG_PROC=y
63CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
@@ -67,8 +77,7 @@ CONFIG_FAIR_GROUP_SCHED=y
67CONFIG_USER_SCHED=y 77CONFIG_USER_SCHED=y
68# CONFIG_CGROUP_SCHED is not set 78# CONFIG_CGROUP_SCHED is not set
69# CONFIG_CGROUPS is not set 79# CONFIG_CGROUPS is not set
70CONFIG_SYSFS_DEPRECATED=y 80# CONFIG_SYSFS_DEPRECATED_V2 is not set
71CONFIG_SYSFS_DEPRECATED_V2=y
72# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
73# CONFIG_NAMESPACES is not set 82# CONFIG_NAMESPACES is not set
74# CONFIG_BLK_DEV_INITRD is not set 83# CONFIG_BLK_DEV_INITRD is not set
@@ -79,7 +88,7 @@ CONFIG_EMBEDDED=y
79CONFIG_UID16=y 88CONFIG_UID16=y
80CONFIG_SYSCTL_SYSCALL=y 89CONFIG_SYSCTL_SYSCALL=y
81CONFIG_KALLSYMS=y 90CONFIG_KALLSYMS=y
82# CONFIG_KALLSYMS_ALL is not set 91CONFIG_KALLSYMS_ALL=y
83# CONFIG_KALLSYMS_EXTRA_PASS is not set 92# CONFIG_KALLSYMS_EXTRA_PASS is not set
84CONFIG_HOTPLUG=y 93CONFIG_HOTPLUG=y
85CONFIG_PRINTK=y 94CONFIG_PRINTK=y
@@ -93,28 +102,37 @@ CONFIG_TIMERFD=y
93CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
94CONFIG_SHMEM=y 103CONFIG_SHMEM=y
95CONFIG_AIO=y 104CONFIG_AIO=y
105CONFIG_HAVE_PERF_EVENTS=y
96 106
97# 107#
98# Performance Counters 108# Kernel Performance Events And Counters
99# 109#
110CONFIG_PERF_EVENTS=y
111CONFIG_EVENT_PROFILE=y
112CONFIG_PERF_COUNTERS=y
100CONFIG_VM_EVENT_COUNTERS=y 113CONFIG_VM_EVENT_COUNTERS=y
101CONFIG_PCI_QUIRKS=y 114CONFIG_PCI_QUIRKS=y
102# CONFIG_STRIP_ASM_SYMS is not set
103CONFIG_COMPAT_BRK=y 115CONFIG_COMPAT_BRK=y
104CONFIG_SLAB=y 116CONFIG_SLAB=y
105# CONFIG_SLUB is not set 117# CONFIG_SLUB is not set
106# CONFIG_SLOB is not set 118# CONFIG_SLOB is not set
107CONFIG_PROFILING=y 119CONFIG_PROFILING=y
108# CONFIG_MARKERS is not set 120CONFIG_TRACEPOINTS=y
109# CONFIG_OPROFILE is not set 121CONFIG_OPROFILE=y
110CONFIG_HAVE_OPROFILE=y 122CONFIG_HAVE_OPROFILE=y
111# CONFIG_KPROBES is not set 123CONFIG_KPROBES=y
124CONFIG_KRETPROBES=y
112CONFIG_HAVE_IOREMAP_PROT=y 125CONFIG_HAVE_IOREMAP_PROT=y
113CONFIG_HAVE_KPROBES=y 126CONFIG_HAVE_KPROBES=y
114CONFIG_HAVE_KRETPROBES=y 127CONFIG_HAVE_KRETPROBES=y
115CONFIG_HAVE_ARCH_TRACEHOOK=y 128CONFIG_HAVE_ARCH_TRACEHOOK=y
116CONFIG_HAVE_CLK=y 129CONFIG_HAVE_CLK=y
117CONFIG_HAVE_DMA_API_DEBUG=y 130CONFIG_HAVE_DMA_API_DEBUG=y
131
132#
133# GCOV-based kernel profiling
134#
135CONFIG_GCOV_KERNEL=y
118# CONFIG_SLOW_WORK is not set 136# CONFIG_SLOW_WORK is not set
119CONFIG_HAVE_GENERIC_DMA_COHERENT=y 137CONFIG_HAVE_GENERIC_DMA_COHERENT=y
120CONFIG_SLABINFO=y 138CONFIG_SLABINFO=y
@@ -127,7 +145,7 @@ CONFIG_MODULE_UNLOAD=y
127# CONFIG_MODVERSIONS is not set 145# CONFIG_MODVERSIONS is not set
128# CONFIG_MODULE_SRCVERSION_ALL is not set 146# CONFIG_MODULE_SRCVERSION_ALL is not set
129CONFIG_BLOCK=y 147CONFIG_BLOCK=y
130# CONFIG_LBD is not set 148# CONFIG_LBDAF is not set
131# CONFIG_BLK_DEV_BSG is not set 149# CONFIG_BLK_DEV_BSG is not set
132# CONFIG_BLK_DEV_INTEGRITY is not set 150# CONFIG_BLK_DEV_INTEGRITY is not set
133 151
@@ -176,6 +194,7 @@ CONFIG_CPU_SHX2=y
176# CONFIG_CPU_SUBTYPE_SH4_202 is not set 194# CONFIG_CPU_SUBTYPE_SH4_202 is not set
177# CONFIG_CPU_SUBTYPE_SH7723 is not set 195# CONFIG_CPU_SUBTYPE_SH7723 is not set
178# CONFIG_CPU_SUBTYPE_SH7724 is not set 196# CONFIG_CPU_SUBTYPE_SH7724 is not set
197# CONFIG_CPU_SUBTYPE_SH7757 is not set
179# CONFIG_CPU_SUBTYPE_SH7763 is not set 198# CONFIG_CPU_SUBTYPE_SH7763 is not set
180# CONFIG_CPU_SUBTYPE_SH7770 is not set 199# CONFIG_CPU_SUBTYPE_SH7770 is not set
181# CONFIG_CPU_SUBTYPE_SH7780 is not set 200# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -215,6 +234,12 @@ CONFIG_PAGE_SIZE_4KB=y
215# CONFIG_PAGE_SIZE_8KB is not set 234# CONFIG_PAGE_SIZE_8KB is not set
216# CONFIG_PAGE_SIZE_16KB is not set 235# CONFIG_PAGE_SIZE_16KB is not set
217# CONFIG_PAGE_SIZE_64KB is not set 236# CONFIG_PAGE_SIZE_64KB is not set
237CONFIG_HUGETLB_PAGE_SIZE_64K=y
238# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
239# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
240# CONFIG_HUGETLB_PAGE_SIZE_4MB is not set
241# CONFIG_HUGETLB_PAGE_SIZE_64MB is not set
242# CONFIG_HUGETLB_PAGE_SIZE_512MB is not set
218CONFIG_SELECT_MEMORY_MODEL=y 243CONFIG_SELECT_MEMORY_MODEL=y
219# CONFIG_FLATMEM_MANUAL is not set 244# CONFIG_FLATMEM_MANUAL is not set
220# CONFIG_DISCONTIGMEM_MANUAL is not set 245# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -223,7 +248,6 @@ CONFIG_SPARSEMEM=y
223CONFIG_HAVE_MEMORY_PRESENT=y 248CONFIG_HAVE_MEMORY_PRESENT=y
224CONFIG_SPARSEMEM_STATIC=y 249CONFIG_SPARSEMEM_STATIC=y
225# CONFIG_MEMORY_HOTPLUG is not set 250# CONFIG_MEMORY_HOTPLUG is not set
226CONFIG_PAGEFLAGS_EXTENDED=y
227CONFIG_SPLIT_PTLOCK_CPUS=4 251CONFIG_SPLIT_PTLOCK_CPUS=4
228CONFIG_MIGRATION=y 252CONFIG_MIGRATION=y
229# CONFIG_PHYS_ADDR_T_64BIT is not set 253# CONFIG_PHYS_ADDR_T_64BIT is not set
@@ -231,6 +255,7 @@ CONFIG_ZONE_DMA_FLAG=0
231CONFIG_NR_QUICK=2 255CONFIG_NR_QUICK=2
232CONFIG_HAVE_MLOCK=y 256CONFIG_HAVE_MLOCK=y
233CONFIG_HAVE_MLOCKED_PAGE_BIT=y 257CONFIG_HAVE_MLOCKED_PAGE_BIT=y
258# CONFIG_KSM is not set
234CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 259CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
235 260
236# 261#
@@ -256,6 +281,7 @@ CONFIG_CPU_HAS_FPU=y
256# 281#
257# CONFIG_SH_HIGHLANDER is not set 282# CONFIG_SH_HIGHLANDER is not set
258CONFIG_SH_SH7785LCR=y 283CONFIG_SH_SH7785LCR=y
284# CONFIG_SH_SH7785LCR_PT is not set
259 285
260# 286#
261# Timer and clock configuration 287# Timer and clock configuration
@@ -264,14 +290,29 @@ CONFIG_SH_TIMER_TMU=y
264CONFIG_SH_PCLK_FREQ=50000000 290CONFIG_SH_PCLK_FREQ=50000000
265CONFIG_SH_CLK_CPG=y 291CONFIG_SH_CLK_CPG=y
266CONFIG_TICK_ONESHOT=y 292CONFIG_TICK_ONESHOT=y
267# CONFIG_NO_HZ is not set 293CONFIG_NO_HZ=y
268CONFIG_HIGH_RES_TIMERS=y 294CONFIG_HIGH_RES_TIMERS=y
269CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 295CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
270 296
271# 297#
272# CPU Frequency scaling 298# CPU Frequency scaling
273# 299#
274# CONFIG_CPU_FREQ is not set 300CONFIG_CPU_FREQ=y
301CONFIG_CPU_FREQ_TABLE=y
302# CONFIG_CPU_FREQ_DEBUG is not set
303CONFIG_CPU_FREQ_STAT=y
304CONFIG_CPU_FREQ_STAT_DETAILS=y
305# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
306# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
307# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
308CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
309# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
310CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
311# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
312# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
313CONFIG_CPU_FREQ_GOV_ONDEMAND=y
314# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
315CONFIG_SH_CPU_FREQ=y
275 316
276# 317#
277# DMA support 318# DMA support
@@ -299,12 +340,12 @@ CONFIG_HZ=250
299CONFIG_SCHED_HRTICK=y 340CONFIG_SCHED_HRTICK=y
300CONFIG_KEXEC=y 341CONFIG_KEXEC=y
301# CONFIG_CRASH_DUMP is not set 342# CONFIG_CRASH_DUMP is not set
302# CONFIG_SECCOMP is not set 343CONFIG_SECCOMP=y
303# CONFIG_PREEMPT_NONE is not set 344# CONFIG_PREEMPT_NONE is not set
304# CONFIG_PREEMPT_VOLUNTARY is not set 345# CONFIG_PREEMPT_VOLUNTARY is not set
305CONFIG_PREEMPT=y 346CONFIG_PREEMPT=y
306CONFIG_GUSA=y 347CONFIG_GUSA=y
307# CONFIG_SPARSE_IRQ is not set 348CONFIG_SPARSE_IRQ=y
308 349
309# 350#
310# Boot options 351# Boot options
@@ -312,7 +353,8 @@ CONFIG_GUSA=y
312CONFIG_ZERO_PAGE_OFFSET=0x00001000 353CONFIG_ZERO_PAGE_OFFSET=0x00001000
313CONFIG_BOOT_LINK_OFFSET=0x00800000 354CONFIG_BOOT_LINK_OFFSET=0x00800000
314CONFIG_ENTRY_OFFSET=0x00001000 355CONFIG_ENTRY_OFFSET=0x00001000
315# CONFIG_CMDLINE_BOOL is not set 356# CONFIG_CMDLINE_OVERWRITE is not set
357# CONFIG_CMDLINE_EXTEND is not set
316 358
317# 359#
318# Bus options 360# Bus options
@@ -321,8 +363,7 @@ CONFIG_PCI=y
321CONFIG_SH_PCIDMA_NONCOHERENT=y 363CONFIG_SH_PCIDMA_NONCOHERENT=y
322# CONFIG_PCIEPORTBUS is not set 364# CONFIG_PCIEPORTBUS is not set
323# CONFIG_ARCH_SUPPORTS_MSI is not set 365# CONFIG_ARCH_SUPPORTS_MSI is not set
324CONFIG_PCI_LEGACY=y 366# CONFIG_PCI_LEGACY is not set
325# CONFIG_PCI_DEBUG is not set
326# CONFIG_PCI_STUB is not set 367# CONFIG_PCI_STUB is not set
327# CONFIG_PCI_IOV is not set 368# CONFIG_PCI_IOV is not set
328# CONFIG_PCCARD is not set 369# CONFIG_PCCARD is not set
@@ -339,8 +380,13 @@ CONFIG_BINFMT_ELF=y
339# 380#
340# Power management options (EXPERIMENTAL) 381# Power management options (EXPERIMENTAL)
341# 382#
342# CONFIG_PM is not set 383CONFIG_PM=y
343# CONFIG_CPU_IDLE is not set 384# CONFIG_PM_DEBUG is not set
385# CONFIG_HIBERNATION is not set
386# CONFIG_PM_RUNTIME is not set
387CONFIG_CPU_IDLE=y
388CONFIG_CPU_IDLE_GOV_LADDER=y
389CONFIG_CPU_IDLE_GOV_MENU=y
344CONFIG_NET=y 390CONFIG_NET=y
345 391
346# 392#
@@ -392,6 +438,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
392# CONFIG_NETFILTER is not set 438# CONFIG_NETFILTER is not set
393# CONFIG_IP_DCCP is not set 439# CONFIG_IP_DCCP is not set
394# CONFIG_IP_SCTP is not set 440# CONFIG_IP_SCTP is not set
441# CONFIG_RDS is not set
395# CONFIG_TIPC is not set 442# CONFIG_TIPC is not set
396# CONFIG_ATM is not set 443# CONFIG_ATM is not set
397# CONFIG_BRIDGE is not set 444# CONFIG_BRIDGE is not set
@@ -414,6 +461,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
414# Network testing 461# Network testing
415# 462#
416# CONFIG_NET_PKTGEN is not set 463# CONFIG_NET_PKTGEN is not set
464# CONFIG_NET_TCPPROBE is not set
465# CONFIG_NET_DROP_MONITOR is not set
417# CONFIG_HAMRADIO is not set 466# CONFIG_HAMRADIO is not set
418# CONFIG_CAN is not set 467# CONFIG_CAN is not set
419# CONFIG_IRDA is not set 468# CONFIG_IRDA is not set
@@ -421,6 +470,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
421# CONFIG_AF_RXRPC is not set 470# CONFIG_AF_RXRPC is not set
422CONFIG_WIRELESS=y 471CONFIG_WIRELESS=y
423# CONFIG_CFG80211 is not set 472# CONFIG_CFG80211 is not set
473CONFIG_CFG80211_DEFAULT_PS_VALUE=0
424# CONFIG_WIRELESS_OLD_REGULATORY is not set 474# CONFIG_WIRELESS_OLD_REGULATORY is not set
425CONFIG_WIRELESS_EXT=y 475CONFIG_WIRELESS_EXT=y
426CONFIG_WIRELESS_EXT_SYSFS=y 476CONFIG_WIRELESS_EXT_SYSFS=y
@@ -429,7 +479,6 @@ CONFIG_WIRELESS_EXT_SYSFS=y
429# 479#
430# CFG80211 needs to be enabled for MAC80211 480# CFG80211 needs to be enabled for MAC80211
431# 481#
432CONFIG_MAC80211_DEFAULT_PS_VALUE=0
433# CONFIG_WIMAX is not set 482# CONFIG_WIMAX is not set
434# CONFIG_RFKILL is not set 483# CONFIG_RFKILL is not set
435# CONFIG_NET_9P is not set 484# CONFIG_NET_9P is not set
@@ -442,18 +491,17 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
442# Generic Driver Options 491# Generic Driver Options
443# 492#
444CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 493CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
494# CONFIG_DEVTMPFS is not set
445CONFIG_STANDALONE=y 495CONFIG_STANDALONE=y
446CONFIG_PREVENT_FIRMWARE_BUILD=y 496CONFIG_PREVENT_FIRMWARE_BUILD=y
447# CONFIG_FW_LOADER is not set 497# CONFIG_FW_LOADER is not set
448# CONFIG_DEBUG_DRIVER is not set
449# CONFIG_DEBUG_DEVRES is not set
450# CONFIG_SYS_HYPERVISOR is not set 498# CONFIG_SYS_HYPERVISOR is not set
451# CONFIG_CONNECTOR is not set 499# CONFIG_CONNECTOR is not set
452CONFIG_MTD=y 500CONFIG_MTD=y
453# CONFIG_MTD_DEBUG is not set 501# CONFIG_MTD_DEBUG is not set
502# CONFIG_MTD_TESTS is not set
454CONFIG_MTD_CONCAT=y 503CONFIG_MTD_CONCAT=y
455CONFIG_MTD_PARTITIONS=y 504CONFIG_MTD_PARTITIONS=y
456# CONFIG_MTD_TESTS is not set
457# CONFIG_MTD_REDBOOT_PARTS is not set 505# CONFIG_MTD_REDBOOT_PARTS is not set
458# CONFIG_MTD_CMDLINE_PARTS is not set 506# CONFIG_MTD_CMDLINE_PARTS is not set
459# CONFIG_MTD_AR7_PARTS is not set 507# CONFIG_MTD_AR7_PARTS is not set
@@ -538,7 +586,8 @@ CONFIG_BLK_DEV=y
538# CONFIG_BLK_DEV_DAC960 is not set 586# CONFIG_BLK_DEV_DAC960 is not set
539# CONFIG_BLK_DEV_UMEM is not set 587# CONFIG_BLK_DEV_UMEM is not set
540# CONFIG_BLK_DEV_COW_COMMON is not set 588# CONFIG_BLK_DEV_COW_COMMON is not set
541# CONFIG_BLK_DEV_LOOP is not set 589CONFIG_BLK_DEV_LOOP=y
590CONFIG_BLK_DEV_CRYPTOLOOP=m
542# CONFIG_BLK_DEV_NBD is not set 591# CONFIG_BLK_DEV_NBD is not set
543# CONFIG_BLK_DEV_SX8 is not set 592# CONFIG_BLK_DEV_SX8 is not set
544# CONFIG_BLK_DEV_UB is not set 593# CONFIG_BLK_DEV_UB is not set
@@ -561,7 +610,7 @@ CONFIG_SCSI=y
561CONFIG_SCSI_DMA=y 610CONFIG_SCSI_DMA=y
562# CONFIG_SCSI_TGT is not set 611# CONFIG_SCSI_TGT is not set
563# CONFIG_SCSI_NETLINK is not set 612# CONFIG_SCSI_NETLINK is not set
564CONFIG_SCSI_PROC_FS=y 613# CONFIG_SCSI_PROC_FS is not set
565 614
566# 615#
567# SCSI support type (disk, tape, CD-ROM) 616# SCSI support type (disk, tape, CD-ROM)
@@ -591,6 +640,7 @@ CONFIG_SCSI_WAIT_SCAN=m
591# CONFIG_SCSI_OSD_INITIATOR is not set 640# CONFIG_SCSI_OSD_INITIATOR is not set
592CONFIG_ATA=y 641CONFIG_ATA=y
593# CONFIG_ATA_NONSTANDARD is not set 642# CONFIG_ATA_NONSTANDARD is not set
643CONFIG_ATA_VERBOSE_ERROR=y
594CONFIG_SATA_PMP=y 644CONFIG_SATA_PMP=y
595# CONFIG_SATA_AHCI is not set 645# CONFIG_SATA_AHCI is not set
596# CONFIG_SATA_SIL24 is not set 646# CONFIG_SATA_SIL24 is not set
@@ -612,6 +662,7 @@ CONFIG_SATA_SIL=y
612# CONFIG_PATA_ALI is not set 662# CONFIG_PATA_ALI is not set
613# CONFIG_PATA_AMD is not set 663# CONFIG_PATA_AMD is not set
614# CONFIG_PATA_ARTOP is not set 664# CONFIG_PATA_ARTOP is not set
665# CONFIG_PATA_ATP867X is not set
615# CONFIG_PATA_ATIIXP is not set 666# CONFIG_PATA_ATIIXP is not set
616# CONFIG_PATA_CMD640_PCI is not set 667# CONFIG_PATA_CMD640_PCI is not set
617# CONFIG_PATA_CMD64X is not set 668# CONFIG_PATA_CMD64X is not set
@@ -639,6 +690,7 @@ CONFIG_SATA_SIL=y
639# CONFIG_PATA_OPTIDMA is not set 690# CONFIG_PATA_OPTIDMA is not set
640# CONFIG_PATA_PDC_OLD is not set 691# CONFIG_PATA_PDC_OLD is not set
641# CONFIG_PATA_RADISYS is not set 692# CONFIG_PATA_RADISYS is not set
693# CONFIG_PATA_RDC is not set
642# CONFIG_PATA_RZ1000 is not set 694# CONFIG_PATA_RZ1000 is not set
643# CONFIG_PATA_SC1200 is not set 695# CONFIG_PATA_SC1200 is not set
644# CONFIG_PATA_SERVERWORKS is not set 696# CONFIG_PATA_SERVERWORKS is not set
@@ -657,7 +709,11 @@ CONFIG_SATA_SIL=y
657# 709#
658 710
659# 711#
660# Enable only one of the two stacks, unless you know what you are doing 712# You can enable one or both FireWire driver stacks.
713#
714
715#
716# See the help texts for more information.
661# 717#
662# CONFIG_FIREWIRE is not set 718# CONFIG_FIREWIRE is not set
663# CONFIG_IEEE1394 is not set 719# CONFIG_IEEE1394 is not set
@@ -690,6 +746,7 @@ CONFIG_R8169=y
690# CONFIG_VIA_VELOCITY is not set 746# CONFIG_VIA_VELOCITY is not set
691# CONFIG_TIGON3 is not set 747# CONFIG_TIGON3 is not set
692# CONFIG_BNX2 is not set 748# CONFIG_BNX2 is not set
749# CONFIG_CNIC is not set
693# CONFIG_QLA3XXX is not set 750# CONFIG_QLA3XXX is not set
694# CONFIG_ATL1 is not set 751# CONFIG_ATL1 is not set
695# CONFIG_ATL1E is not set 752# CONFIG_ATL1E is not set
@@ -697,12 +754,7 @@ CONFIG_R8169=y
697# CONFIG_JME is not set 754# CONFIG_JME is not set
698# CONFIG_NETDEV_10000 is not set 755# CONFIG_NETDEV_10000 is not set
699# CONFIG_TR is not set 756# CONFIG_TR is not set
700 757# CONFIG_WLAN is not set
701#
702# Wireless LAN
703#
704# CONFIG_WLAN_PRE80211 is not set
705# CONFIG_WLAN_80211 is not set
706 758
707# 759#
708# Enable WiMAX (Networking options) to see the WiMAX drivers 760# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -739,25 +791,42 @@ CONFIG_INPUT_FF_MEMLESS=m
739# Userland interfaces 791# Userland interfaces
740# 792#
741CONFIG_INPUT_MOUSEDEV=y 793CONFIG_INPUT_MOUSEDEV=y
742# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 794CONFIG_INPUT_MOUSEDEV_PSAUX=y
743CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 795CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
744CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 796CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
745# CONFIG_INPUT_JOYDEV is not set 797# CONFIG_INPUT_JOYDEV is not set
746# CONFIG_INPUT_EVDEV is not set 798CONFIG_INPUT_EVDEV=y
747# CONFIG_INPUT_EVBUG is not set 799CONFIG_INPUT_EVBUG=m
748 800
749# 801#
750# Input Device Drivers 802# Input Device Drivers
751# 803#
752CONFIG_INPUT_KEYBOARD=y 804CONFIG_INPUT_KEYBOARD=y
753# CONFIG_KEYBOARD_ATKBD is not set 805# CONFIG_KEYBOARD_ADP5588 is not set
754# CONFIG_KEYBOARD_SUNKBD is not set 806CONFIG_KEYBOARD_ATKBD=y
807# CONFIG_QT2160 is not set
755# CONFIG_KEYBOARD_LKKBD is not set 808# CONFIG_KEYBOARD_LKKBD is not set
756# CONFIG_KEYBOARD_XTKBD is not set 809# CONFIG_KEYBOARD_MAX7359 is not set
757# CONFIG_KEYBOARD_NEWTON is not set 810# CONFIG_KEYBOARD_NEWTON is not set
811# CONFIG_KEYBOARD_OPENCORES is not set
758# CONFIG_KEYBOARD_STOWAWAY is not set 812# CONFIG_KEYBOARD_STOWAWAY is not set
813# CONFIG_KEYBOARD_SUNKBD is not set
759# CONFIG_KEYBOARD_SH_KEYSC is not set 814# CONFIG_KEYBOARD_SH_KEYSC is not set
760# CONFIG_INPUT_MOUSE is not set 815# CONFIG_KEYBOARD_XTKBD is not set
816CONFIG_INPUT_MOUSE=y
817CONFIG_MOUSE_PS2=y
818CONFIG_MOUSE_PS2_ALPS=y
819CONFIG_MOUSE_PS2_LOGIPS2PP=y
820CONFIG_MOUSE_PS2_SYNAPTICS=y
821CONFIG_MOUSE_PS2_TRACKPOINT=y
822# CONFIG_MOUSE_PS2_ELANTECH is not set
823# CONFIG_MOUSE_PS2_SENTELIC is not set
824# CONFIG_MOUSE_PS2_TOUCHKIT is not set
825# CONFIG_MOUSE_SERIAL is not set
826# CONFIG_MOUSE_APPLETOUCH is not set
827# CONFIG_MOUSE_BCM5974 is not set
828# CONFIG_MOUSE_VSXXXAA is not set
829# CONFIG_MOUSE_SYNAPTICS_I2C is not set
761# CONFIG_INPUT_JOYSTICK is not set 830# CONFIG_INPUT_JOYSTICK is not set
762# CONFIG_INPUT_TABLET is not set 831# CONFIG_INPUT_TABLET is not set
763# CONFIG_INPUT_TOUCHSCREEN is not set 832# CONFIG_INPUT_TOUCHSCREEN is not set
@@ -766,7 +835,12 @@ CONFIG_INPUT_KEYBOARD=y
766# 835#
767# Hardware I/O ports 836# Hardware I/O ports
768# 837#
769# CONFIG_SERIO is not set 838CONFIG_SERIO=y
839CONFIG_SERIO_I8042=y
840CONFIG_SERIO_SERPORT=y
841# CONFIG_SERIO_PCIPS2 is not set
842CONFIG_SERIO_LIBPS2=y
843# CONFIG_SERIO_RAW is not set
770# CONFIG_GAMEPORT is not set 844# CONFIG_GAMEPORT is not set
771 845
772# 846#
@@ -777,7 +851,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y
777CONFIG_VT_CONSOLE=y 851CONFIG_VT_CONSOLE=y
778CONFIG_HW_CONSOLE=y 852CONFIG_HW_CONSOLE=y
779CONFIG_VT_HW_CONSOLE_BINDING=y 853CONFIG_VT_HW_CONSOLE_BINDING=y
780CONFIG_DEVKMEM=y 854# CONFIG_DEVKMEM is not set
781# CONFIG_SERIAL_NONSTANDARD is not set 855# CONFIG_SERIAL_NONSTANDARD is not set
782# CONFIG_NOZOMI is not set 856# CONFIG_NOZOMI is not set
783 857
@@ -796,12 +870,10 @@ CONFIG_SERIAL_CORE=y
796CONFIG_SERIAL_CORE_CONSOLE=y 870CONFIG_SERIAL_CORE_CONSOLE=y
797# CONFIG_SERIAL_JSM is not set 871# CONFIG_SERIAL_JSM is not set
798CONFIG_UNIX98_PTYS=y 872CONFIG_UNIX98_PTYS=y
799# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 873CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
800CONFIG_LEGACY_PTYS=y 874# CONFIG_LEGACY_PTYS is not set
801CONFIG_LEGACY_PTY_COUNT=256
802# CONFIG_IPMI_HANDLER is not set 875# CONFIG_IPMI_HANDLER is not set
803CONFIG_HW_RANDOM=y 876# CONFIG_HW_RANDOM is not set
804# CONFIG_HW_RANDOM_TIMERIOMEM is not set
805# CONFIG_R3964 is not set 877# CONFIG_R3964 is not set
806# CONFIG_APPLICOM is not set 878# CONFIG_APPLICOM is not set
807# CONFIG_RAW_DRIVER is not set 879# CONFIG_RAW_DRIVER is not set
@@ -809,6 +881,7 @@ CONFIG_HW_RANDOM=y
809CONFIG_DEVPORT=y 881CONFIG_DEVPORT=y
810CONFIG_I2C=y 882CONFIG_I2C=y
811CONFIG_I2C_BOARDINFO=y 883CONFIG_I2C_BOARDINFO=y
884CONFIG_I2C_COMPAT=y
812# CONFIG_I2C_CHARDEV is not set 885# CONFIG_I2C_CHARDEV is not set
813CONFIG_I2C_HELPER_AUTO=y 886CONFIG_I2C_HELPER_AUTO=y
814CONFIG_I2C_ALGOPCA=y 887CONFIG_I2C_ALGOPCA=y
@@ -838,6 +911,7 @@ CONFIG_I2C_ALGOPCA=y
838# 911#
839# I2C system bus drivers (mostly embedded / system-on-chip) 912# I2C system bus drivers (mostly embedded / system-on-chip)
840# 913#
914# CONFIG_I2C_DESIGNWARE is not set
841# CONFIG_I2C_OCORES is not set 915# CONFIG_I2C_OCORES is not set
842# CONFIG_I2C_SH_MOBILE is not set 916# CONFIG_I2C_SH_MOBILE is not set
843# CONFIG_I2C_SIMTEC is not set 917# CONFIG_I2C_SIMTEC is not set
@@ -864,21 +938,42 @@ CONFIG_I2C_PCA_PLATFORM=y
864# Miscellaneous I2C Chip support 938# Miscellaneous I2C Chip support
865# 939#
866# CONFIG_DS1682 is not set 940# CONFIG_DS1682 is not set
867# CONFIG_SENSORS_PCF8574 is not set
868# CONFIG_PCF8575 is not set
869# CONFIG_SENSORS_PCA9539 is not set
870# CONFIG_SENSORS_TSL2550 is not set 941# CONFIG_SENSORS_TSL2550 is not set
871# CONFIG_I2C_DEBUG_CORE is not set 942# CONFIG_I2C_DEBUG_CORE is not set
872# CONFIG_I2C_DEBUG_ALGO is not set 943# CONFIG_I2C_DEBUG_ALGO is not set
873# CONFIG_I2C_DEBUG_BUS is not set 944# CONFIG_I2C_DEBUG_BUS is not set
874# CONFIG_I2C_DEBUG_CHIP is not set 945# CONFIG_I2C_DEBUG_CHIP is not set
875# CONFIG_SPI is not set 946# CONFIG_SPI is not set
947
948#
949# PPS support
950#
951# CONFIG_PPS is not set
876# CONFIG_W1 is not set 952# CONFIG_W1 is not set
877# CONFIG_POWER_SUPPLY is not set 953# CONFIG_POWER_SUPPLY is not set
878# CONFIG_HWMON is not set 954# CONFIG_HWMON is not set
879# CONFIG_THERMAL is not set 955# CONFIG_THERMAL is not set
880# CONFIG_THERMAL_HWMON is not set 956CONFIG_WATCHDOG=y
881# CONFIG_WATCHDOG is not set 957# CONFIG_WATCHDOG_NOWAYOUT is not set
958
959#
960# Watchdog Device Drivers
961#
962# CONFIG_SOFT_WATCHDOG is not set
963# CONFIG_ALIM7101_WDT is not set
964CONFIG_SH_WDT=y
965# CONFIG_SH_WDT_MMAP is not set
966
967#
968# PCI-based Watchdog Cards
969#
970# CONFIG_PCIPCWATCHDOG is not set
971# CONFIG_WDTPCI is not set
972
973#
974# USB-based Watchdog Cards
975#
976# CONFIG_USBPCWATCHDOG is not set
882CONFIG_SSB_POSSIBLE=y 977CONFIG_SSB_POSSIBLE=y
883 978
884# 979#
@@ -896,14 +991,17 @@ CONFIG_MFD_SM501=y
896# CONFIG_MFD_TMIO is not set 991# CONFIG_MFD_TMIO is not set
897# CONFIG_PMIC_DA903X is not set 992# CONFIG_PMIC_DA903X is not set
898# CONFIG_MFD_WM8400 is not set 993# CONFIG_MFD_WM8400 is not set
994# CONFIG_MFD_WM831X is not set
899# CONFIG_MFD_WM8350_I2C is not set 995# CONFIG_MFD_WM8350_I2C is not set
900# CONFIG_MFD_PCF50633 is not set 996# CONFIG_MFD_PCF50633 is not set
997# CONFIG_AB3100_CORE is not set
901# CONFIG_REGULATOR is not set 998# CONFIG_REGULATOR is not set
902# CONFIG_MEDIA_SUPPORT is not set 999# CONFIG_MEDIA_SUPPORT is not set
903 1000
904# 1001#
905# Graphics support 1002# Graphics support
906# 1003#
1004# CONFIG_VGA_ARB is not set
907# CONFIG_DRM is not set 1005# CONFIG_DRM is not set
908# CONFIG_VGASTATE is not set 1006# CONFIG_VGASTATE is not set
909# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1007# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -915,12 +1013,11 @@ CONFIG_FB_CFB_FILLRECT=y
915CONFIG_FB_CFB_COPYAREA=y 1013CONFIG_FB_CFB_COPYAREA=y
916CONFIG_FB_CFB_IMAGEBLIT=y 1014CONFIG_FB_CFB_IMAGEBLIT=y
917# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set 1015# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
918CONFIG_FB_SYS_FILLRECT=m 1016# CONFIG_FB_SYS_FILLRECT is not set
919CONFIG_FB_SYS_COPYAREA=m 1017# CONFIG_FB_SYS_COPYAREA is not set
920CONFIG_FB_SYS_IMAGEBLIT=m 1018# CONFIG_FB_SYS_IMAGEBLIT is not set
921# CONFIG_FB_FOREIGN_ENDIAN is not set 1019# CONFIG_FB_FOREIGN_ENDIAN is not set
922CONFIG_FB_SYS_FOPS=m 1020# CONFIG_FB_SYS_FOPS is not set
923CONFIG_FB_DEFERRED_IO=y
924# CONFIG_FB_SVGALIB is not set 1021# CONFIG_FB_SVGALIB is not set
925# CONFIG_FB_MACMODES is not set 1022# CONFIG_FB_MACMODES is not set
926# CONFIG_FB_BACKLIGHT is not set 1023# CONFIG_FB_BACKLIGHT is not set
@@ -955,7 +1052,7 @@ CONFIG_FB_DEFERRED_IO=y
955# CONFIG_FB_ARK is not set 1052# CONFIG_FB_ARK is not set
956# CONFIG_FB_PM3 is not set 1053# CONFIG_FB_PM3 is not set
957# CONFIG_FB_CARMINE is not set 1054# CONFIG_FB_CARMINE is not set
958CONFIG_FB_SH_MOBILE_LCDC=m 1055# CONFIG_FB_SH_MOBILE_LCDC is not set
959CONFIG_FB_SM501=y 1056CONFIG_FB_SM501=y
960# CONFIG_FB_VIRTUAL is not set 1057# CONFIG_FB_VIRTUAL is not set
961# CONFIG_FB_METRONOME is not set 1058# CONFIG_FB_METRONOME is not set
@@ -981,14 +1078,112 @@ CONFIG_FONT_8x16=y
981CONFIG_LOGO=y 1078CONFIG_LOGO=y
982# CONFIG_LOGO_LINUX_MONO is not set 1079# CONFIG_LOGO_LINUX_MONO is not set
983# CONFIG_LOGO_LINUX_VGA16 is not set 1080# CONFIG_LOGO_LINUX_VGA16 is not set
984CONFIG_LOGO_LINUX_CLUT224=y 1081# CONFIG_LOGO_LINUX_CLUT224 is not set
985# CONFIG_LOGO_SUPERH_MONO is not set 1082CONFIG_LOGO_SUPERH_MONO=y
986# CONFIG_LOGO_SUPERH_VGA16 is not set 1083CONFIG_LOGO_SUPERH_VGA16=y
987# CONFIG_LOGO_SUPERH_CLUT224 is not set 1084CONFIG_LOGO_SUPERH_CLUT224=y
988# CONFIG_SOUND is not set 1085CONFIG_SOUND=y
1086CONFIG_SOUND_OSS_CORE=y
1087CONFIG_SOUND_OSS_CORE_PRECLAIM=y
1088CONFIG_SND=y
1089CONFIG_SND_TIMER=y
1090CONFIG_SND_PCM=y
1091CONFIG_SND_HWDEP=y
1092CONFIG_SND_RAWMIDI=y
1093CONFIG_SND_SEQUENCER=y
1094# CONFIG_SND_SEQ_DUMMY is not set
1095CONFIG_SND_OSSEMUL=y
1096CONFIG_SND_MIXER_OSS=y
1097CONFIG_SND_PCM_OSS=y
1098CONFIG_SND_PCM_OSS_PLUGINS=y
1099CONFIG_SND_SEQUENCER_OSS=y
1100CONFIG_SND_HRTIMER=y
1101CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
1102CONFIG_SND_DYNAMIC_MINORS=y
1103# CONFIG_SND_SUPPORT_OLD_API is not set
1104# CONFIG_SND_VERBOSE_PROCFS is not set
1105# CONFIG_SND_VERBOSE_PRINTK is not set
1106# CONFIG_SND_DEBUG is not set
1107CONFIG_SND_RAWMIDI_SEQ=y
1108CONFIG_SND_OPL3_LIB_SEQ=y
1109# CONFIG_SND_OPL4_LIB_SEQ is not set
1110# CONFIG_SND_SBAWE_SEQ is not set
1111# CONFIG_SND_EMU10K1_SEQ is not set
1112CONFIG_SND_MPU401_UART=y
1113CONFIG_SND_OPL3_LIB=y
1114# CONFIG_SND_DRIVERS is not set
1115CONFIG_SND_PCI=y
1116# CONFIG_SND_AD1889 is not set
1117# CONFIG_SND_ALS300 is not set
1118# CONFIG_SND_ALI5451 is not set
1119# CONFIG_SND_ATIIXP is not set
1120# CONFIG_SND_ATIIXP_MODEM is not set
1121# CONFIG_SND_AU8810 is not set
1122# CONFIG_SND_AU8820 is not set
1123# CONFIG_SND_AU8830 is not set
1124# CONFIG_SND_AW2 is not set
1125# CONFIG_SND_AZT3328 is not set
1126# CONFIG_SND_BT87X is not set
1127# CONFIG_SND_CA0106 is not set
1128CONFIG_SND_CMIPCI=y
1129# CONFIG_SND_OXYGEN is not set
1130# CONFIG_SND_CS4281 is not set
1131# CONFIG_SND_CS46XX is not set
1132# CONFIG_SND_CTXFI is not set
1133# CONFIG_SND_DARLA20 is not set
1134# CONFIG_SND_GINA20 is not set
1135# CONFIG_SND_LAYLA20 is not set
1136# CONFIG_SND_DARLA24 is not set
1137# CONFIG_SND_GINA24 is not set
1138# CONFIG_SND_LAYLA24 is not set
1139# CONFIG_SND_MONA is not set
1140# CONFIG_SND_MIA is not set
1141# CONFIG_SND_ECHO3G is not set
1142# CONFIG_SND_INDIGO is not set
1143# CONFIG_SND_INDIGOIO is not set
1144# CONFIG_SND_INDIGODJ is not set
1145# CONFIG_SND_INDIGOIOX is not set
1146# CONFIG_SND_INDIGODJX is not set
1147# CONFIG_SND_EMU10K1 is not set
1148# CONFIG_SND_EMU10K1X is not set
1149# CONFIG_SND_ENS1370 is not set
1150# CONFIG_SND_ENS1371 is not set
1151# CONFIG_SND_ES1938 is not set
1152# CONFIG_SND_ES1968 is not set
1153# CONFIG_SND_FM801 is not set
1154# CONFIG_SND_HDA_INTEL is not set
1155# CONFIG_SND_HDSP is not set
1156# CONFIG_SND_HDSPM is not set
1157# CONFIG_SND_HIFIER is not set
1158# CONFIG_SND_ICE1712 is not set
1159# CONFIG_SND_ICE1724 is not set
1160# CONFIG_SND_INTEL8X0 is not set
1161# CONFIG_SND_INTEL8X0M is not set
1162# CONFIG_SND_KORG1212 is not set
1163# CONFIG_SND_LX6464ES is not set
1164# CONFIG_SND_MAESTRO3 is not set
1165# CONFIG_SND_MIXART is not set
1166# CONFIG_SND_NM256 is not set
1167# CONFIG_SND_PCXHR is not set
1168# CONFIG_SND_RIPTIDE is not set
1169# CONFIG_SND_RME32 is not set
1170# CONFIG_SND_RME96 is not set
1171# CONFIG_SND_RME9652 is not set
1172# CONFIG_SND_SONICVIBES is not set
1173# CONFIG_SND_TRIDENT is not set
1174# CONFIG_SND_VIA82XX is not set
1175# CONFIG_SND_VIA82XX_MODEM is not set
1176# CONFIG_SND_VIRTUOSO is not set
1177# CONFIG_SND_VX222 is not set
1178# CONFIG_SND_YMFPCI is not set
1179# CONFIG_SND_SUPERH is not set
1180CONFIG_SND_USB=y
1181# CONFIG_SND_USB_AUDIO is not set
1182# CONFIG_SND_USB_CAIAQ is not set
1183# CONFIG_SND_SOC is not set
1184# CONFIG_SOUND_PRIME is not set
989CONFIG_HID_SUPPORT=y 1185CONFIG_HID_SUPPORT=y
990CONFIG_HID=y 1186CONFIG_HID=y
991# CONFIG_HID_DEBUG is not set
992# CONFIG_HIDRAW is not set 1187# CONFIG_HIDRAW is not set
993 1188
994# 1189#
@@ -1001,34 +1196,39 @@ CONFIG_USB_HID=y
1001# 1196#
1002# Special HID drivers 1197# Special HID drivers
1003# 1198#
1004CONFIG_HID_A4TECH=y 1199CONFIG_HID_A4TECH=m
1005CONFIG_HID_APPLE=y 1200CONFIG_HID_APPLE=m
1006CONFIG_HID_BELKIN=y 1201CONFIG_HID_BELKIN=m
1007CONFIG_HID_CHERRY=y 1202CONFIG_HID_CHERRY=m
1008CONFIG_HID_CHICONY=y 1203CONFIG_HID_CHICONY=m
1009CONFIG_HID_CYPRESS=y 1204CONFIG_HID_CYPRESS=m
1010# CONFIG_HID_DRAGONRISE is not set 1205CONFIG_HID_DRAGONRISE=m
1011CONFIG_HID_EZKEY=y 1206# CONFIG_DRAGONRISE_FF is not set
1012# CONFIG_HID_KYE is not set 1207CONFIG_HID_EZKEY=m
1013CONFIG_HID_GYRATION=y 1208CONFIG_HID_KYE=m
1014# CONFIG_HID_KENSINGTON is not set 1209CONFIG_HID_GYRATION=m
1015CONFIG_HID_LOGITECH=y 1210CONFIG_HID_TWINHAN=m
1211CONFIG_HID_KENSINGTON=m
1212CONFIG_HID_LOGITECH=m
1016# CONFIG_LOGITECH_FF is not set 1213# CONFIG_LOGITECH_FF is not set
1017# CONFIG_LOGIRUMBLEPAD2_FF is not set 1214# CONFIG_LOGIRUMBLEPAD2_FF is not set
1018CONFIG_HID_MICROSOFT=y 1215CONFIG_HID_MICROSOFT=m
1019CONFIG_HID_MONTEREY=y 1216CONFIG_HID_MONTEREY=m
1020# CONFIG_HID_NTRIG is not set 1217CONFIG_HID_NTRIG=m
1021CONFIG_HID_PANTHERLORD=y 1218CONFIG_HID_PANTHERLORD=m
1022# CONFIG_PANTHERLORD_FF is not set 1219# CONFIG_PANTHERLORD_FF is not set
1023CONFIG_HID_PETALYNX=y 1220CONFIG_HID_PETALYNX=m
1024CONFIG_HID_SAMSUNG=y 1221CONFIG_HID_SAMSUNG=m
1025CONFIG_HID_SONY=y 1222CONFIG_HID_SONY=m
1026CONFIG_HID_SUNPLUS=y 1223CONFIG_HID_SUNPLUS=m
1027# CONFIG_HID_GREENASIA is not set 1224CONFIG_HID_GREENASIA=m
1028# CONFIG_HID_SMARTJOYPLUS is not set 1225# CONFIG_GREENASIA_FF is not set
1029# CONFIG_HID_TOPSEED is not set 1226CONFIG_HID_SMARTJOYPLUS=m
1227# CONFIG_SMARTJOYPLUS_FF is not set
1228CONFIG_HID_TOPSEED=m
1030# CONFIG_HID_THRUSTMASTER is not set 1229# CONFIG_HID_THRUSTMASTER is not set
1031# CONFIG_HID_ZEROPLUS is not set 1230CONFIG_HID_ZEROPLUS=m
1231# CONFIG_ZEROPLUS_FF is not set
1032CONFIG_USB_SUPPORT=y 1232CONFIG_USB_SUPPORT=y
1033CONFIG_USB_ARCH_HAS_HCD=y 1233CONFIG_USB_ARCH_HAS_HCD=y
1034CONFIG_USB_ARCH_HAS_OHCI=y 1234CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1040,13 +1240,14 @@ CONFIG_USB=y
1040# 1240#
1041# Miscellaneous USB options 1241# Miscellaneous USB options
1042# 1242#
1043CONFIG_USB_DEVICEFS=y 1243# CONFIG_USB_DEVICEFS is not set
1044CONFIG_USB_DEVICE_CLASS=y 1244CONFIG_USB_DEVICE_CLASS=y
1045# CONFIG_USB_DYNAMIC_MINORS is not set 1245# CONFIG_USB_DYNAMIC_MINORS is not set
1246# CONFIG_USB_SUSPEND is not set
1046# CONFIG_USB_OTG is not set 1247# CONFIG_USB_OTG is not set
1047# CONFIG_USB_OTG_WHITELIST is not set 1248# CONFIG_USB_OTG_WHITELIST is not set
1048# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1249# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1049CONFIG_USB_MON=y 1250# CONFIG_USB_MON is not set
1050# CONFIG_USB_WUSB is not set 1251# CONFIG_USB_WUSB is not set
1051# CONFIG_USB_WUSB_CBAF is not set 1252# CONFIG_USB_WUSB_CBAF is not set
1052 1253
@@ -1061,10 +1262,8 @@ CONFIG_USB_EHCI_HCD=m
1061# CONFIG_USB_OXU210HP_HCD is not set 1262# CONFIG_USB_OXU210HP_HCD is not set
1062# CONFIG_USB_ISP116X_HCD is not set 1263# CONFIG_USB_ISP116X_HCD is not set
1063# CONFIG_USB_ISP1760_HCD is not set 1264# CONFIG_USB_ISP1760_HCD is not set
1064CONFIG_USB_OHCI_HCD=m 1265# CONFIG_USB_ISP1362_HCD is not set
1065# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 1266# CONFIG_USB_OHCI_HCD is not set
1066# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
1067CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1068# CONFIG_USB_UHCI_HCD is not set 1267# CONFIG_USB_UHCI_HCD is not set
1069# CONFIG_USB_SL811_HCD is not set 1268# CONFIG_USB_SL811_HCD is not set
1070CONFIG_USB_R8A66597_HCD=y 1269CONFIG_USB_R8A66597_HCD=y
@@ -1133,7 +1332,7 @@ CONFIG_USB_STORAGE=y
1133# CONFIG_USB_LD is not set 1332# CONFIG_USB_LD is not set
1134# CONFIG_USB_TRANCEVIBRATOR is not set 1333# CONFIG_USB_TRANCEVIBRATOR is not set
1135# CONFIG_USB_IOWARRIOR is not set 1334# CONFIG_USB_IOWARRIOR is not set
1136CONFIG_USB_TEST=m 1335# CONFIG_USB_TEST is not set
1137# CONFIG_USB_ISIGHTFW is not set 1336# CONFIG_USB_ISIGHTFW is not set
1138# CONFIG_USB_VST is not set 1337# CONFIG_USB_VST is not set
1139# CONFIG_USB_GADGET is not set 1338# CONFIG_USB_GADGET is not set
@@ -1143,7 +1342,29 @@ CONFIG_USB_TEST=m
1143# 1342#
1144# CONFIG_NOP_USB_XCEIV is not set 1343# CONFIG_NOP_USB_XCEIV is not set
1145# CONFIG_UWB is not set 1344# CONFIG_UWB is not set
1146# CONFIG_MMC is not set 1345CONFIG_MMC=y
1346# CONFIG_MMC_DEBUG is not set
1347# CONFIG_MMC_UNSAFE_RESUME is not set
1348
1349#
1350# MMC/SD/SDIO Card Drivers
1351#
1352CONFIG_MMC_BLOCK=y
1353CONFIG_MMC_BLOCK_BOUNCE=y
1354# CONFIG_SDIO_UART is not set
1355# CONFIG_MMC_TEST is not set
1356
1357#
1358# MMC/SD/SDIO Host Controller Drivers
1359#
1360CONFIG_MMC_SDHCI=m
1361# CONFIG_MMC_SDHCI_PCI is not set
1362CONFIG_MMC_SDHCI_PLTFM=m
1363# CONFIG_MMC_AT91 is not set
1364# CONFIG_MMC_ATMELMCI is not set
1365# CONFIG_MMC_TIFM_SD is not set
1366# CONFIG_MMC_CB710 is not set
1367# CONFIG_MMC_VIA_SDMMC is not set
1147# CONFIG_MEMSTICK is not set 1368# CONFIG_MEMSTICK is not set
1148# CONFIG_NEW_LEDS is not set 1369# CONFIG_NEW_LEDS is not set
1149# CONFIG_ACCESSIBILITY is not set 1370# CONFIG_ACCESSIBILITY is not set
@@ -1179,6 +1400,7 @@ CONFIG_RTC_DRV_RS5C372=y
1179# CONFIG_RTC_DRV_S35390A is not set 1400# CONFIG_RTC_DRV_S35390A is not set
1180# CONFIG_RTC_DRV_FM3130 is not set 1401# CONFIG_RTC_DRV_FM3130 is not set
1181# CONFIG_RTC_DRV_RX8581 is not set 1402# CONFIG_RTC_DRV_RX8581 is not set
1403# CONFIG_RTC_DRV_RX8025 is not set
1182 1404
1183# 1405#
1184# SPI RTC drivers 1406# SPI RTC drivers
@@ -1203,9 +1425,20 @@ CONFIG_RTC_DRV_RS5C372=y
1203# 1425#
1204# CONFIG_RTC_DRV_SH is not set 1426# CONFIG_RTC_DRV_SH is not set
1205# CONFIG_RTC_DRV_GENERIC is not set 1427# CONFIG_RTC_DRV_GENERIC is not set
1206# CONFIG_DMADEVICES is not set 1428CONFIG_DMADEVICES=y
1429
1430#
1431# DMA Devices
1432#
1207# CONFIG_AUXDISPLAY is not set 1433# CONFIG_AUXDISPLAY is not set
1208# CONFIG_UIO is not set 1434CONFIG_UIO=m
1435# CONFIG_UIO_CIF is not set
1436# CONFIG_UIO_PDRV is not set
1437# CONFIG_UIO_PDRV_GENIRQ is not set
1438# CONFIG_UIO_SMX is not set
1439# CONFIG_UIO_AEC is not set
1440# CONFIG_UIO_SERCOS3 is not set
1441# CONFIG_UIO_PCI_GENERIC is not set
1209 1442
1210# 1443#
1211# TI VLYNQ 1444# TI VLYNQ
@@ -1225,13 +1458,15 @@ CONFIG_EXT3_FS_XATTR=y
1225# CONFIG_EXT3_FS_SECURITY is not set 1458# CONFIG_EXT3_FS_SECURITY is not set
1226# CONFIG_EXT4_FS is not set 1459# CONFIG_EXT4_FS is not set
1227CONFIG_JBD=y 1460CONFIG_JBD=y
1461# CONFIG_JBD_DEBUG is not set
1228CONFIG_FS_MBCACHE=y 1462CONFIG_FS_MBCACHE=y
1229# CONFIG_REISERFS_FS is not set 1463# CONFIG_REISERFS_FS is not set
1230# CONFIG_JFS_FS is not set 1464# CONFIG_JFS_FS is not set
1231CONFIG_FS_POSIX_ACL=y 1465# CONFIG_FS_POSIX_ACL is not set
1232# CONFIG_XFS_FS is not set 1466# CONFIG_XFS_FS is not set
1233# CONFIG_OCFS2_FS is not set 1467# CONFIG_OCFS2_FS is not set
1234# CONFIG_BTRFS_FS is not set 1468# CONFIG_BTRFS_FS is not set
1469# CONFIG_NILFS2_FS is not set
1235CONFIG_FILE_LOCKING=y 1470CONFIG_FILE_LOCKING=y
1236CONFIG_FSNOTIFY=y 1471CONFIG_FSNOTIFY=y
1237CONFIG_DNOTIFY=y 1472CONFIG_DNOTIFY=y
@@ -1275,9 +1510,9 @@ CONFIG_PROC_PAGE_MONITOR=y
1275CONFIG_SYSFS=y 1510CONFIG_SYSFS=y
1276CONFIG_TMPFS=y 1511CONFIG_TMPFS=y
1277# CONFIG_TMPFS_POSIX_ACL is not set 1512# CONFIG_TMPFS_POSIX_ACL is not set
1278# CONFIG_HUGETLBFS is not set 1513CONFIG_HUGETLBFS=y
1279# CONFIG_HUGETLB_PAGE is not set 1514CONFIG_HUGETLB_PAGE=y
1280# CONFIG_CONFIGFS_FS is not set 1515CONFIG_CONFIGFS_FS=y
1281CONFIG_MISC_FILESYSTEMS=y 1516CONFIG_MISC_FILESYSTEMS=y
1282# CONFIG_ADFS_FS is not set 1517# CONFIG_ADFS_FS is not set
1283# CONFIG_AFFS_FS is not set 1518# CONFIG_AFFS_FS is not set
@@ -1297,20 +1532,20 @@ CONFIG_MINIX_FS=y
1297# CONFIG_ROMFS_FS is not set 1532# CONFIG_ROMFS_FS is not set
1298# CONFIG_SYSV_FS is not set 1533# CONFIG_SYSV_FS is not set
1299# CONFIG_UFS_FS is not set 1534# CONFIG_UFS_FS is not set
1300# CONFIG_NILFS2_FS is not set
1301CONFIG_NETWORK_FILESYSTEMS=y 1535CONFIG_NETWORK_FILESYSTEMS=y
1302CONFIG_NFS_FS=y 1536CONFIG_NFS_FS=y
1303CONFIG_NFS_V3=y 1537CONFIG_NFS_V3=y
1304# CONFIG_NFS_V3_ACL is not set 1538# CONFIG_NFS_V3_ACL is not set
1305CONFIG_NFS_V4=y 1539CONFIG_NFS_V4=y
1540# CONFIG_NFS_V4_1 is not set
1306CONFIG_ROOT_NFS=y 1541CONFIG_ROOT_NFS=y
1307CONFIG_NFSD=y 1542CONFIG_NFSD=m
1308CONFIG_NFSD_V3=y 1543CONFIG_NFSD_V3=y
1309# CONFIG_NFSD_V3_ACL is not set 1544# CONFIG_NFSD_V3_ACL is not set
1310CONFIG_NFSD_V4=y 1545# CONFIG_NFSD_V4 is not set
1311CONFIG_LOCKD=y 1546CONFIG_LOCKD=y
1312CONFIG_LOCKD_V4=y 1547CONFIG_LOCKD_V4=y
1313CONFIG_EXPORTFS=y 1548CONFIG_EXPORTFS=m
1314CONFIG_NFS_COMMON=y 1549CONFIG_NFS_COMMON=y
1315CONFIG_SUNRPC=y 1550CONFIG_SUNRPC=y
1316CONFIG_SUNRPC_GSS=y 1551CONFIG_SUNRPC_GSS=y
@@ -1373,85 +1608,69 @@ CONFIG_NLS_ISO8859_1=y
1373# Kernel hacking 1608# Kernel hacking
1374# 1609#
1375CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1610CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1376# CONFIG_PRINTK_TIME is not set 1611CONFIG_PRINTK_TIME=y
1377# CONFIG_ENABLE_WARN_DEPRECATED is not set 1612CONFIG_ENABLE_WARN_DEPRECATED=y
1378# CONFIG_ENABLE_MUST_CHECK is not set 1613# CONFIG_ENABLE_MUST_CHECK is not set
1379CONFIG_FRAME_WARN=1024 1614CONFIG_FRAME_WARN=1024
1380# CONFIG_MAGIC_SYSRQ is not set 1615CONFIG_MAGIC_SYSRQ=y
1616# CONFIG_STRIP_ASM_SYMS is not set
1381# CONFIG_UNUSED_SYMBOLS is not set 1617# CONFIG_UNUSED_SYMBOLS is not set
1382# CONFIG_DEBUG_FS is not set 1618CONFIG_DEBUG_FS=y
1383# CONFIG_HEADERS_CHECK is not set 1619# CONFIG_HEADERS_CHECK is not set
1384CONFIG_DEBUG_KERNEL=y 1620# CONFIG_DEBUG_KERNEL is not set
1385# CONFIG_DEBUG_SHIRQ is not set
1386CONFIG_DETECT_SOFTLOCKUP=y
1387# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1388CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1389CONFIG_DETECT_HUNG_TASK=y
1390# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1391CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1392CONFIG_SCHED_DEBUG=y 1621CONFIG_SCHED_DEBUG=y
1393# CONFIG_SCHEDSTATS is not set 1622CONFIG_SCHEDSTATS=y
1394# CONFIG_TIMER_STATS is not set 1623CONFIG_TRACE_IRQFLAGS=y
1395# CONFIG_DEBUG_OBJECTS is not set 1624CONFIG_STACKTRACE=y
1396# CONFIG_DEBUG_SLAB is not set
1397CONFIG_DEBUG_PREEMPT=y
1398# CONFIG_DEBUG_RT_MUTEXES is not set
1399# CONFIG_RT_MUTEX_TESTER is not set
1400# CONFIG_DEBUG_SPINLOCK is not set
1401# CONFIG_DEBUG_MUTEXES is not set
1402# CONFIG_DEBUG_LOCK_ALLOC is not set
1403# CONFIG_PROVE_LOCKING is not set
1404# CONFIG_LOCK_STAT is not set
1405# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1406# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1407# CONFIG_DEBUG_KOBJECT is not set
1408# CONFIG_DEBUG_BUGVERBOSE is not set 1625# CONFIG_DEBUG_BUGVERBOSE is not set
1409# CONFIG_DEBUG_INFO is not set
1410# CONFIG_DEBUG_VM is not set
1411# CONFIG_DEBUG_WRITECOUNT is not set
1412# CONFIG_DEBUG_MEMORY_INIT is not set 1626# CONFIG_DEBUG_MEMORY_INIT is not set
1413# CONFIG_DEBUG_LIST is not set 1627CONFIG_FRAME_POINTER=y
1414# CONFIG_DEBUG_SG is not set
1415# CONFIG_DEBUG_NOTIFIERS is not set
1416# CONFIG_FRAME_POINTER is not set
1417# CONFIG_RCU_TORTURE_TEST is not set
1418# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1628# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1419# CONFIG_BACKTRACE_SELF_TEST is not set 1629CONFIG_LATENCYTOP=y
1420# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1421# CONFIG_FAULT_INJECTION is not set
1422# CONFIG_LATENCYTOP is not set
1423CONFIG_SYSCTL_SYSCALL_CHECK=y 1630CONFIG_SYSCTL_SYSCALL_CHECK=y
1424# CONFIG_PAGE_POISONING is not set 1631CONFIG_NOP_TRACER=y
1425CONFIG_HAVE_FUNCTION_TRACER=y 1632CONFIG_HAVE_FUNCTION_TRACER=y
1633CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1634CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1426CONFIG_HAVE_DYNAMIC_FTRACE=y 1635CONFIG_HAVE_DYNAMIC_FTRACE=y
1427CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1636CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1637CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1638CONFIG_TRACER_MAX_TRACE=y
1639CONFIG_RING_BUFFER=y
1640CONFIG_EVENT_TRACING=y
1641CONFIG_CONTEXT_SWITCH_TRACER=y
1642CONFIG_RING_BUFFER_ALLOW_SWAP=y
1643CONFIG_TRACING=y
1644CONFIG_GENERIC_TRACER=y
1428CONFIG_TRACING_SUPPORT=y 1645CONFIG_TRACING_SUPPORT=y
1429CONFIG_FTRACE=y 1646CONFIG_FTRACE=y
1430# CONFIG_FUNCTION_TRACER is not set 1647CONFIG_FUNCTION_TRACER=y
1431# CONFIG_IRQSOFF_TRACER is not set 1648CONFIG_FUNCTION_GRAPH_TRACER=y
1649CONFIG_IRQSOFF_TRACER=y
1432# CONFIG_PREEMPT_TRACER is not set 1650# CONFIG_PREEMPT_TRACER is not set
1433# CONFIG_SCHED_TRACER is not set 1651CONFIG_SCHED_TRACER=y
1434# CONFIG_ENABLE_DEFAULT_TRACERS is not set 1652# CONFIG_FTRACE_SYSCALLS is not set
1435# CONFIG_BOOT_TRACER is not set 1653# CONFIG_BOOT_TRACER is not set
1436CONFIG_BRANCH_PROFILE_NONE=y 1654CONFIG_BRANCH_PROFILE_NONE=y
1437# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1655# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1438# CONFIG_PROFILE_ALL_BRANCHES is not set 1656# CONFIG_PROFILE_ALL_BRANCHES is not set
1439# CONFIG_STACK_TRACER is not set 1657CONFIG_STACK_TRACER=y
1440# CONFIG_KMEMTRACE is not set 1658CONFIG_KMEMTRACE=y
1441# CONFIG_WORKQUEUE_TRACER is not set 1659CONFIG_WORKQUEUE_TRACER=y
1442# CONFIG_BLK_DEV_IO_TRACE is not set 1660# CONFIG_BLK_DEV_IO_TRACE is not set
1661CONFIG_DYNAMIC_FTRACE=y
1662# CONFIG_FUNCTION_PROFILER is not set
1663CONFIG_FTRACE_MCOUNT_RECORD=y
1664# CONFIG_FTRACE_STARTUP_TEST is not set
1665# CONFIG_RING_BUFFER_BENCHMARK is not set
1666# CONFIG_DYNAMIC_DEBUG is not set
1443# CONFIG_DMA_API_DEBUG is not set 1667# CONFIG_DMA_API_DEBUG is not set
1444# CONFIG_SAMPLES is not set 1668# CONFIG_SAMPLES is not set
1445CONFIG_HAVE_ARCH_KGDB=y 1669CONFIG_HAVE_ARCH_KGDB=y
1446# CONFIG_KGDB is not set
1447# CONFIG_SH_STANDARD_BIOS is not set 1670# CONFIG_SH_STANDARD_BIOS is not set
1448# CONFIG_EARLY_SCIF_CONSOLE is not set 1671# CONFIG_EARLY_SCIF_CONSOLE is not set
1449# CONFIG_DEBUG_BOOTMEM is not set 1672CONFIG_DWARF_UNWINDER=y
1450# CONFIG_DEBUG_STACKOVERFLOW is not set 1673CONFIG_MCOUNT=y
1451# CONFIG_DEBUG_STACK_USAGE is not set
1452# CONFIG_4KSTACKS is not set
1453# CONFIG_DUMP_CODE is not set
1454# CONFIG_SH_NO_BSS_INIT is not set
1455 1674
1456# 1675#
1457# Security options 1676# Security options
@@ -1465,7 +1684,6 @@ CONFIG_CRYPTO=y
1465# 1684#
1466# Crypto core or helper 1685# Crypto core or helper
1467# 1686#
1468# CONFIG_CRYPTO_FIPS is not set
1469CONFIG_CRYPTO_ALGAPI=y 1687CONFIG_CRYPTO_ALGAPI=y
1470CONFIG_CRYPTO_ALGAPI2=y 1688CONFIG_CRYPTO_ALGAPI2=y
1471CONFIG_CRYPTO_AEAD2=y 1689CONFIG_CRYPTO_AEAD2=y
@@ -1507,11 +1725,13 @@ CONFIG_CRYPTO_CBC=y
1507# 1725#
1508CONFIG_CRYPTO_HMAC=y 1726CONFIG_CRYPTO_HMAC=y
1509# CONFIG_CRYPTO_XCBC is not set 1727# CONFIG_CRYPTO_XCBC is not set
1728# CONFIG_CRYPTO_VMAC is not set
1510 1729
1511# 1730#
1512# Digest 1731# Digest
1513# 1732#
1514# CONFIG_CRYPTO_CRC32C is not set 1733# CONFIG_CRYPTO_CRC32C is not set
1734# CONFIG_CRYPTO_GHASH is not set
1515# CONFIG_CRYPTO_MD4 is not set 1735# CONFIG_CRYPTO_MD4 is not set
1516CONFIG_CRYPTO_MD5=y 1736CONFIG_CRYPTO_MD5=y
1517# CONFIG_CRYPTO_MICHAEL_MIC is not set 1737# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1556,7 +1776,7 @@ CONFIG_CRYPTO_DES=y
1556# 1776#
1557# CONFIG_CRYPTO_ANSI_CPRNG is not set 1777# CONFIG_CRYPTO_ANSI_CPRNG is not set
1558# CONFIG_CRYPTO_HW is not set 1778# CONFIG_CRYPTO_HW is not set
1559# CONFIG_BINARY_PRINTF is not set 1779CONFIG_BINARY_PRINTF=y
1560 1780
1561# 1781#
1562# Library routines 1782# Library routines
@@ -1573,5 +1793,6 @@ CONFIG_CRC32=y
1573CONFIG_HAS_IOMEM=y 1793CONFIG_HAS_IOMEM=y
1574CONFIG_HAS_IOPORT=y 1794CONFIG_HAS_IOPORT=y
1575CONFIG_HAS_DMA=y 1795CONFIG_HAS_DMA=y
1796CONFIG_HAVE_LMB=y
1576CONFIG_NLATTR=y 1797CONFIG_NLATTR=y
1577CONFIG_GENERIC_ATOMIC64=y 1798CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/sh7785lcr_defconfig b/arch/sh/configs/sh7785lcr_defconfig
index 004e6f5e8a68..8c2c47ed3991 100644
--- a/arch/sh/configs/sh7785lcr_defconfig
+++ b/arch/sh/configs/sh7785lcr_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 13:09:34 2009 4# Thu Sep 24 19:23:18 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -29,8 +30,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
29# CONFIG_ARCH_HAS_ILOG2_U64 is not set 30# CONFIG_ARCH_HAS_ILOG2_U64 is not set
30CONFIG_ARCH_NO_VIRT_TO_BUS=y 31CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_IO_TRAPPED=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y
34 36
35# 37#
36# General setup 38# General setup
@@ -41,6 +43,12 @@ CONFIG_LOCK_KERNEL=y
41CONFIG_INIT_ENV_ARG_LIMIT=32 43CONFIG_INIT_ENV_ARG_LIMIT=32
42CONFIG_LOCALVERSION="" 44CONFIG_LOCALVERSION=""
43CONFIG_LOCALVERSION_AUTO=y 45CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set
44CONFIG_SWAP=y 52CONFIG_SWAP=y
45CONFIG_SYSVIPC=y 53CONFIG_SYSVIPC=y
46CONFIG_SYSVIPC_SYSCTL=y 54CONFIG_SYSVIPC_SYSCTL=y
@@ -53,11 +61,12 @@ CONFIG_BSD_PROCESS_ACCT=y
53# 61#
54# RCU Subsystem 62# RCU Subsystem
55# 63#
56CONFIG_CLASSIC_RCU=y 64CONFIG_TREE_RCU=y
57# CONFIG_TREE_RCU is not set 65# CONFIG_TREE_PREEMPT_RCU is not set
58# CONFIG_PREEMPT_RCU is not set 66# CONFIG_RCU_TRACE is not set
67CONFIG_RCU_FANOUT=32
68# CONFIG_RCU_FANOUT_EXACT is not set
59# CONFIG_TREE_RCU_TRACE is not set 69# CONFIG_TREE_RCU_TRACE is not set
60# CONFIG_PREEMPT_RCU_TRACE is not set
61CONFIG_IKCONFIG=y 70CONFIG_IKCONFIG=y
62CONFIG_IKCONFIG_PROC=y 71CONFIG_IKCONFIG_PROC=y
63CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
@@ -93,19 +102,20 @@ CONFIG_TIMERFD=y
93CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
94CONFIG_SHMEM=y 103CONFIG_SHMEM=y
95CONFIG_AIO=y 104CONFIG_AIO=y
105CONFIG_HAVE_PERF_EVENTS=y
96 106
97# 107#
98# Performance Counters 108# Kernel Performance Events And Counters
99# 109#
110CONFIG_PERF_EVENTS=y
111# CONFIG_PERF_COUNTERS is not set
100CONFIG_VM_EVENT_COUNTERS=y 112CONFIG_VM_EVENT_COUNTERS=y
101CONFIG_PCI_QUIRKS=y 113CONFIG_PCI_QUIRKS=y
102# CONFIG_STRIP_ASM_SYMS is not set
103CONFIG_COMPAT_BRK=y 114CONFIG_COMPAT_BRK=y
104CONFIG_SLAB=y 115CONFIG_SLAB=y
105# CONFIG_SLUB is not set 116# CONFIG_SLUB is not set
106# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
107CONFIG_PROFILING=y 118CONFIG_PROFILING=y
108# CONFIG_MARKERS is not set
109# CONFIG_OPROFILE is not set 119# CONFIG_OPROFILE is not set
110CONFIG_HAVE_OPROFILE=y 120CONFIG_HAVE_OPROFILE=y
111# CONFIG_KPROBES is not set 121# CONFIG_KPROBES is not set
@@ -115,6 +125,10 @@ CONFIG_HAVE_KRETPROBES=y
115CONFIG_HAVE_ARCH_TRACEHOOK=y 125CONFIG_HAVE_ARCH_TRACEHOOK=y
116CONFIG_HAVE_CLK=y 126CONFIG_HAVE_CLK=y
117CONFIG_HAVE_DMA_API_DEBUG=y 127CONFIG_HAVE_DMA_API_DEBUG=y
128
129#
130# GCOV-based kernel profiling
131#
118# CONFIG_SLOW_WORK is not set 132# CONFIG_SLOW_WORK is not set
119CONFIG_HAVE_GENERIC_DMA_COHERENT=y 133CONFIG_HAVE_GENERIC_DMA_COHERENT=y
120CONFIG_SLABINFO=y 134CONFIG_SLABINFO=y
@@ -127,7 +141,7 @@ CONFIG_MODULE_UNLOAD=y
127# CONFIG_MODVERSIONS is not set 141# CONFIG_MODVERSIONS is not set
128# CONFIG_MODULE_SRCVERSION_ALL is not set 142# CONFIG_MODULE_SRCVERSION_ALL is not set
129CONFIG_BLOCK=y 143CONFIG_BLOCK=y
130# CONFIG_LBD is not set 144CONFIG_LBDAF=y
131# CONFIG_BLK_DEV_BSG is not set 145# CONFIG_BLK_DEV_BSG is not set
132# CONFIG_BLK_DEV_INTEGRITY is not set 146# CONFIG_BLK_DEV_INTEGRITY is not set
133 147
@@ -176,6 +190,7 @@ CONFIG_CPU_SHX2=y
176# CONFIG_CPU_SUBTYPE_SH4_202 is not set 190# CONFIG_CPU_SUBTYPE_SH4_202 is not set
177# CONFIG_CPU_SUBTYPE_SH7723 is not set 191# CONFIG_CPU_SUBTYPE_SH7723 is not set
178# CONFIG_CPU_SUBTYPE_SH7724 is not set 192# CONFIG_CPU_SUBTYPE_SH7724 is not set
193# CONFIG_CPU_SUBTYPE_SH7757 is not set
179# CONFIG_CPU_SUBTYPE_SH7763 is not set 194# CONFIG_CPU_SUBTYPE_SH7763 is not set
180# CONFIG_CPU_SUBTYPE_SH7770 is not set 195# CONFIG_CPU_SUBTYPE_SH7770 is not set
181# CONFIG_CPU_SUBTYPE_SH7780 is not set 196# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -224,6 +239,7 @@ CONFIG_ZONE_DMA_FLAG=0
224CONFIG_NR_QUICK=2 239CONFIG_NR_QUICK=2
225CONFIG_HAVE_MLOCK=y 240CONFIG_HAVE_MLOCK=y
226CONFIG_HAVE_MLOCKED_PAGE_BIT=y 241CONFIG_HAVE_MLOCKED_PAGE_BIT=y
242# CONFIG_KSM is not set
227CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 243CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
228 244
229# 245#
@@ -306,7 +322,8 @@ CONFIG_GUSA=y
306CONFIG_ZERO_PAGE_OFFSET=0x00001000 322CONFIG_ZERO_PAGE_OFFSET=0x00001000
307CONFIG_BOOT_LINK_OFFSET=0x00800000 323CONFIG_BOOT_LINK_OFFSET=0x00800000
308CONFIG_ENTRY_OFFSET=0x00001000 324CONFIG_ENTRY_OFFSET=0x00001000
309# CONFIG_CMDLINE_BOOL is not set 325# CONFIG_CMDLINE_OVERWRITE is not set
326# CONFIG_CMDLINE_EXTEND is not set
310 327
311# 328#
312# Bus options 329# Bus options
@@ -386,6 +403,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
386# CONFIG_NETFILTER is not set 403# CONFIG_NETFILTER is not set
387# CONFIG_IP_DCCP is not set 404# CONFIG_IP_DCCP is not set
388# CONFIG_IP_SCTP is not set 405# CONFIG_IP_SCTP is not set
406# CONFIG_RDS is not set
389# CONFIG_TIPC is not set 407# CONFIG_TIPC is not set
390# CONFIG_ATM is not set 408# CONFIG_ATM is not set
391# CONFIG_BRIDGE is not set 409# CONFIG_BRIDGE is not set
@@ -415,6 +433,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
415# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
416CONFIG_WIRELESS=y 434CONFIG_WIRELESS=y
417# CONFIG_CFG80211 is not set 435# CONFIG_CFG80211 is not set
436CONFIG_CFG80211_DEFAULT_PS_VALUE=0
418# CONFIG_WIRELESS_OLD_REGULATORY is not set 437# CONFIG_WIRELESS_OLD_REGULATORY is not set
419CONFIG_WIRELESS_EXT=y 438CONFIG_WIRELESS_EXT=y
420CONFIG_WIRELESS_EXT_SYSFS=y 439CONFIG_WIRELESS_EXT_SYSFS=y
@@ -423,7 +442,6 @@ CONFIG_WIRELESS_EXT_SYSFS=y
423# 442#
424# CFG80211 needs to be enabled for MAC80211 443# CFG80211 needs to be enabled for MAC80211
425# 444#
426CONFIG_MAC80211_DEFAULT_PS_VALUE=0
427# CONFIG_WIMAX is not set 445# CONFIG_WIMAX is not set
428# CONFIG_RFKILL is not set 446# CONFIG_RFKILL is not set
429# CONFIG_NET_9P is not set 447# CONFIG_NET_9P is not set
@@ -436,6 +454,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
436# Generic Driver Options 454# Generic Driver Options
437# 455#
438CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 456CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
457# CONFIG_DEVTMPFS is not set
439CONFIG_STANDALONE=y 458CONFIG_STANDALONE=y
440CONFIG_PREVENT_FIRMWARE_BUILD=y 459CONFIG_PREVENT_FIRMWARE_BUILD=y
441# CONFIG_FW_LOADER is not set 460# CONFIG_FW_LOADER is not set
@@ -445,9 +464,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
445# CONFIG_CONNECTOR is not set 464# CONFIG_CONNECTOR is not set
446CONFIG_MTD=y 465CONFIG_MTD=y
447# CONFIG_MTD_DEBUG is not set 466# CONFIG_MTD_DEBUG is not set
467# CONFIG_MTD_TESTS is not set
448CONFIG_MTD_CONCAT=y 468CONFIG_MTD_CONCAT=y
449CONFIG_MTD_PARTITIONS=y 469CONFIG_MTD_PARTITIONS=y
450# CONFIG_MTD_TESTS is not set
451# CONFIG_MTD_REDBOOT_PARTS is not set 470# CONFIG_MTD_REDBOOT_PARTS is not set
452# CONFIG_MTD_CMDLINE_PARTS is not set 471# CONFIG_MTD_CMDLINE_PARTS is not set
453# CONFIG_MTD_AR7_PARTS is not set 472# CONFIG_MTD_AR7_PARTS is not set
@@ -585,6 +604,7 @@ CONFIG_SCSI_WAIT_SCAN=m
585# CONFIG_SCSI_OSD_INITIATOR is not set 604# CONFIG_SCSI_OSD_INITIATOR is not set
586CONFIG_ATA=y 605CONFIG_ATA=y
587# CONFIG_ATA_NONSTANDARD is not set 606# CONFIG_ATA_NONSTANDARD is not set
607CONFIG_ATA_VERBOSE_ERROR=y
588CONFIG_SATA_PMP=y 608CONFIG_SATA_PMP=y
589# CONFIG_SATA_AHCI is not set 609# CONFIG_SATA_AHCI is not set
590# CONFIG_SATA_SIL24 is not set 610# CONFIG_SATA_SIL24 is not set
@@ -606,6 +626,7 @@ CONFIG_SATA_SIL=y
606# CONFIG_PATA_ALI is not set 626# CONFIG_PATA_ALI is not set
607# CONFIG_PATA_AMD is not set 627# CONFIG_PATA_AMD is not set
608# CONFIG_PATA_ARTOP is not set 628# CONFIG_PATA_ARTOP is not set
629# CONFIG_PATA_ATP867X is not set
609# CONFIG_PATA_ATIIXP is not set 630# CONFIG_PATA_ATIIXP is not set
610# CONFIG_PATA_CMD640_PCI is not set 631# CONFIG_PATA_CMD640_PCI is not set
611# CONFIG_PATA_CMD64X is not set 632# CONFIG_PATA_CMD64X is not set
@@ -633,6 +654,7 @@ CONFIG_SATA_SIL=y
633# CONFIG_PATA_OPTIDMA is not set 654# CONFIG_PATA_OPTIDMA is not set
634# CONFIG_PATA_PDC_OLD is not set 655# CONFIG_PATA_PDC_OLD is not set
635# CONFIG_PATA_RADISYS is not set 656# CONFIG_PATA_RADISYS is not set
657# CONFIG_PATA_RDC is not set
636# CONFIG_PATA_RZ1000 is not set 658# CONFIG_PATA_RZ1000 is not set
637# CONFIG_PATA_SC1200 is not set 659# CONFIG_PATA_SC1200 is not set
638# CONFIG_PATA_SERVERWORKS is not set 660# CONFIG_PATA_SERVERWORKS is not set
@@ -651,7 +673,11 @@ CONFIG_SATA_SIL=y
651# 673#
652 674
653# 675#
654# Enable only one of the two stacks, unless you know what you are doing 676# You can enable one or both FireWire driver stacks.
677#
678
679#
680# See the help texts for more information.
655# 681#
656# CONFIG_FIREWIRE is not set 682# CONFIG_FIREWIRE is not set
657# CONFIG_IEEE1394 is not set 683# CONFIG_IEEE1394 is not set
@@ -684,6 +710,7 @@ CONFIG_R8169=y
684# CONFIG_VIA_VELOCITY is not set 710# CONFIG_VIA_VELOCITY is not set
685# CONFIG_TIGON3 is not set 711# CONFIG_TIGON3 is not set
686# CONFIG_BNX2 is not set 712# CONFIG_BNX2 is not set
713# CONFIG_CNIC is not set
687# CONFIG_QLA3XXX is not set 714# CONFIG_QLA3XXX is not set
688# CONFIG_ATL1 is not set 715# CONFIG_ATL1 is not set
689# CONFIG_ATL1E is not set 716# CONFIG_ATL1E is not set
@@ -691,10 +718,7 @@ CONFIG_R8169=y
691# CONFIG_JME is not set 718# CONFIG_JME is not set
692# CONFIG_NETDEV_10000 is not set 719# CONFIG_NETDEV_10000 is not set
693# CONFIG_TR is not set 720# CONFIG_TR is not set
694 721CONFIG_WLAN=y
695#
696# Wireless LAN
697#
698# CONFIG_WLAN_PRE80211 is not set 722# CONFIG_WLAN_PRE80211 is not set
699# CONFIG_WLAN_80211 is not set 723# CONFIG_WLAN_80211 is not set
700 724
@@ -744,13 +768,17 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
744# Input Device Drivers 768# Input Device Drivers
745# 769#
746CONFIG_INPUT_KEYBOARD=y 770CONFIG_INPUT_KEYBOARD=y
771# CONFIG_KEYBOARD_ADP5588 is not set
747# CONFIG_KEYBOARD_ATKBD is not set 772# CONFIG_KEYBOARD_ATKBD is not set
748# CONFIG_KEYBOARD_SUNKBD is not set 773# CONFIG_QT2160 is not set
749# CONFIG_KEYBOARD_LKKBD is not set 774# CONFIG_KEYBOARD_LKKBD is not set
750# CONFIG_KEYBOARD_XTKBD is not set 775# CONFIG_KEYBOARD_MAX7359 is not set
751# CONFIG_KEYBOARD_NEWTON is not set 776# CONFIG_KEYBOARD_NEWTON is not set
777# CONFIG_KEYBOARD_OPENCORES is not set
752# CONFIG_KEYBOARD_STOWAWAY is not set 778# CONFIG_KEYBOARD_STOWAWAY is not set
779# CONFIG_KEYBOARD_SUNKBD is not set
753# CONFIG_KEYBOARD_SH_KEYSC is not set 780# CONFIG_KEYBOARD_SH_KEYSC is not set
781# CONFIG_KEYBOARD_XTKBD is not set
754# CONFIG_INPUT_MOUSE is not set 782# CONFIG_INPUT_MOUSE is not set
755# CONFIG_INPUT_JOYSTICK is not set 783# CONFIG_INPUT_JOYSTICK is not set
756# CONFIG_INPUT_TABLET is not set 784# CONFIG_INPUT_TABLET is not set
@@ -803,6 +831,7 @@ CONFIG_HW_RANDOM=y
803CONFIG_DEVPORT=y 831CONFIG_DEVPORT=y
804CONFIG_I2C=y 832CONFIG_I2C=y
805CONFIG_I2C_BOARDINFO=y 833CONFIG_I2C_BOARDINFO=y
834CONFIG_I2C_COMPAT=y
806# CONFIG_I2C_CHARDEV is not set 835# CONFIG_I2C_CHARDEV is not set
807CONFIG_I2C_HELPER_AUTO=y 836CONFIG_I2C_HELPER_AUTO=y
808CONFIG_I2C_ALGOPCA=y 837CONFIG_I2C_ALGOPCA=y
@@ -832,6 +861,7 @@ CONFIG_I2C_ALGOPCA=y
832# 861#
833# I2C system bus drivers (mostly embedded / system-on-chip) 862# I2C system bus drivers (mostly embedded / system-on-chip)
834# 863#
864# CONFIG_I2C_DESIGNWARE is not set
835# CONFIG_I2C_OCORES is not set 865# CONFIG_I2C_OCORES is not set
836# CONFIG_I2C_SH_MOBILE is not set 866# CONFIG_I2C_SH_MOBILE is not set
837# CONFIG_I2C_SIMTEC is not set 867# CONFIG_I2C_SIMTEC is not set
@@ -858,20 +888,21 @@ CONFIG_I2C_PCA_PLATFORM=y
858# Miscellaneous I2C Chip support 888# Miscellaneous I2C Chip support
859# 889#
860# CONFIG_DS1682 is not set 890# CONFIG_DS1682 is not set
861# CONFIG_SENSORS_PCF8574 is not set
862# CONFIG_PCF8575 is not set
863# CONFIG_SENSORS_PCA9539 is not set
864# CONFIG_SENSORS_TSL2550 is not set 891# CONFIG_SENSORS_TSL2550 is not set
865# CONFIG_I2C_DEBUG_CORE is not set 892# CONFIG_I2C_DEBUG_CORE is not set
866# CONFIG_I2C_DEBUG_ALGO is not set 893# CONFIG_I2C_DEBUG_ALGO is not set
867# CONFIG_I2C_DEBUG_BUS is not set 894# CONFIG_I2C_DEBUG_BUS is not set
868# CONFIG_I2C_DEBUG_CHIP is not set 895# CONFIG_I2C_DEBUG_CHIP is not set
869# CONFIG_SPI is not set 896# CONFIG_SPI is not set
897
898#
899# PPS support
900#
901# CONFIG_PPS is not set
870# CONFIG_W1 is not set 902# CONFIG_W1 is not set
871# CONFIG_POWER_SUPPLY is not set 903# CONFIG_POWER_SUPPLY is not set
872# CONFIG_HWMON is not set 904# CONFIG_HWMON is not set
873# CONFIG_THERMAL is not set 905# CONFIG_THERMAL is not set
874# CONFIG_THERMAL_HWMON is not set
875# CONFIG_WATCHDOG is not set 906# CONFIG_WATCHDOG is not set
876CONFIG_SSB_POSSIBLE=y 907CONFIG_SSB_POSSIBLE=y
877 908
@@ -890,14 +921,17 @@ CONFIG_MFD_SM501=y
890# CONFIG_MFD_TMIO is not set 921# CONFIG_MFD_TMIO is not set
891# CONFIG_PMIC_DA903X is not set 922# CONFIG_PMIC_DA903X is not set
892# CONFIG_MFD_WM8400 is not set 923# CONFIG_MFD_WM8400 is not set
924# CONFIG_MFD_WM831X is not set
893# CONFIG_MFD_WM8350_I2C is not set 925# CONFIG_MFD_WM8350_I2C is not set
894# CONFIG_MFD_PCF50633 is not set 926# CONFIG_MFD_PCF50633 is not set
927# CONFIG_AB3100_CORE is not set
895# CONFIG_REGULATOR is not set 928# CONFIG_REGULATOR is not set
896# CONFIG_MEDIA_SUPPORT is not set 929# CONFIG_MEDIA_SUPPORT is not set
897 930
898# 931#
899# Graphics support 932# Graphics support
900# 933#
934CONFIG_VGA_ARB=y
901# CONFIG_DRM is not set 935# CONFIG_DRM is not set
902# CONFIG_VGASTATE is not set 936# CONFIG_VGASTATE is not set
903# CONFIG_VIDEO_OUTPUT_CONTROL is not set 937# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -982,7 +1016,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
982# CONFIG_SOUND is not set 1016# CONFIG_SOUND is not set
983CONFIG_HID_SUPPORT=y 1017CONFIG_HID_SUPPORT=y
984CONFIG_HID=y 1018CONFIG_HID=y
985# CONFIG_HID_DEBUG is not set
986# CONFIG_HIDRAW is not set 1019# CONFIG_HIDRAW is not set
987 1020
988# 1021#
@@ -1005,6 +1038,7 @@ CONFIG_HID_CYPRESS=y
1005CONFIG_HID_EZKEY=y 1038CONFIG_HID_EZKEY=y
1006# CONFIG_HID_KYE is not set 1039# CONFIG_HID_KYE is not set
1007CONFIG_HID_GYRATION=y 1040CONFIG_HID_GYRATION=y
1041# CONFIG_HID_TWINHAN is not set
1008# CONFIG_HID_KENSINGTON is not set 1042# CONFIG_HID_KENSINGTON is not set
1009CONFIG_HID_LOGITECH=y 1043CONFIG_HID_LOGITECH=y
1010# CONFIG_LOGITECH_FF is not set 1044# CONFIG_LOGITECH_FF is not set
@@ -1055,6 +1089,7 @@ CONFIG_USB_EHCI_HCD=m
1055# CONFIG_USB_OXU210HP_HCD is not set 1089# CONFIG_USB_OXU210HP_HCD is not set
1056# CONFIG_USB_ISP116X_HCD is not set 1090# CONFIG_USB_ISP116X_HCD is not set
1057# CONFIG_USB_ISP1760_HCD is not set 1091# CONFIG_USB_ISP1760_HCD is not set
1092# CONFIG_USB_ISP1362_HCD is not set
1058CONFIG_USB_OHCI_HCD=m 1093CONFIG_USB_OHCI_HCD=m
1059# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 1094# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1060# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 1095# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -1173,6 +1208,7 @@ CONFIG_RTC_DRV_RS5C372=y
1173# CONFIG_RTC_DRV_S35390A is not set 1208# CONFIG_RTC_DRV_S35390A is not set
1174# CONFIG_RTC_DRV_FM3130 is not set 1209# CONFIG_RTC_DRV_FM3130 is not set
1175# CONFIG_RTC_DRV_RX8581 is not set 1210# CONFIG_RTC_DRV_RX8581 is not set
1211# CONFIG_RTC_DRV_RX8025 is not set
1176 1212
1177# 1213#
1178# SPI RTC drivers 1214# SPI RTC drivers
@@ -1224,8 +1260,10 @@ CONFIG_FS_MBCACHE=y
1224# CONFIG_JFS_FS is not set 1260# CONFIG_JFS_FS is not set
1225CONFIG_FS_POSIX_ACL=y 1261CONFIG_FS_POSIX_ACL=y
1226# CONFIG_XFS_FS is not set 1262# CONFIG_XFS_FS is not set
1263# CONFIG_GFS2_FS is not set
1227# CONFIG_OCFS2_FS is not set 1264# CONFIG_OCFS2_FS is not set
1228# CONFIG_BTRFS_FS is not set 1265# CONFIG_BTRFS_FS is not set
1266# CONFIG_NILFS2_FS is not set
1229CONFIG_FILE_LOCKING=y 1267CONFIG_FILE_LOCKING=y
1230CONFIG_FSNOTIFY=y 1268CONFIG_FSNOTIFY=y
1231CONFIG_DNOTIFY=y 1269CONFIG_DNOTIFY=y
@@ -1291,12 +1329,12 @@ CONFIG_MINIX_FS=y
1291# CONFIG_ROMFS_FS is not set 1329# CONFIG_ROMFS_FS is not set
1292# CONFIG_SYSV_FS is not set 1330# CONFIG_SYSV_FS is not set
1293# CONFIG_UFS_FS is not set 1331# CONFIG_UFS_FS is not set
1294# CONFIG_NILFS2_FS is not set
1295CONFIG_NETWORK_FILESYSTEMS=y 1332CONFIG_NETWORK_FILESYSTEMS=y
1296CONFIG_NFS_FS=y 1333CONFIG_NFS_FS=y
1297CONFIG_NFS_V3=y 1334CONFIG_NFS_V3=y
1298# CONFIG_NFS_V3_ACL is not set 1335# CONFIG_NFS_V3_ACL is not set
1299CONFIG_NFS_V4=y 1336CONFIG_NFS_V4=y
1337# CONFIG_NFS_V4_1 is not set
1300CONFIG_ROOT_NFS=y 1338CONFIG_ROOT_NFS=y
1301CONFIG_NFSD=y 1339CONFIG_NFSD=y
1302CONFIG_NFSD_V3=y 1340CONFIG_NFSD_V3=y
@@ -1372,6 +1410,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1372# CONFIG_ENABLE_MUST_CHECK is not set 1410# CONFIG_ENABLE_MUST_CHECK is not set
1373CONFIG_FRAME_WARN=1024 1411CONFIG_FRAME_WARN=1024
1374# CONFIG_MAGIC_SYSRQ is not set 1412# CONFIG_MAGIC_SYSRQ is not set
1413# CONFIG_STRIP_ASM_SYMS is not set
1375# CONFIG_UNUSED_SYMBOLS is not set 1414# CONFIG_UNUSED_SYMBOLS is not set
1376# CONFIG_DEBUG_FS is not set 1415# CONFIG_DEBUG_FS is not set
1377# CONFIG_HEADERS_CHECK is not set 1416# CONFIG_HEADERS_CHECK is not set
@@ -1407,18 +1446,23 @@ CONFIG_DEBUG_PREEMPT=y
1407# CONFIG_DEBUG_LIST is not set 1446# CONFIG_DEBUG_LIST is not set
1408# CONFIG_DEBUG_SG is not set 1447# CONFIG_DEBUG_SG is not set
1409# CONFIG_DEBUG_NOTIFIERS is not set 1448# CONFIG_DEBUG_NOTIFIERS is not set
1449# CONFIG_DEBUG_CREDENTIALS is not set
1410# CONFIG_FRAME_POINTER is not set 1450# CONFIG_FRAME_POINTER is not set
1411# CONFIG_RCU_TORTURE_TEST is not set 1451# CONFIG_RCU_TORTURE_TEST is not set
1412# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1452# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1413# CONFIG_BACKTRACE_SELF_TEST is not set 1453# CONFIG_BACKTRACE_SELF_TEST is not set
1414# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1454# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1455# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1415# CONFIG_FAULT_INJECTION is not set 1456# CONFIG_FAULT_INJECTION is not set
1416# CONFIG_LATENCYTOP is not set 1457# CONFIG_LATENCYTOP is not set
1417CONFIG_SYSCTL_SYSCALL_CHECK=y 1458CONFIG_SYSCTL_SYSCALL_CHECK=y
1418# CONFIG_PAGE_POISONING is not set 1459# CONFIG_PAGE_POISONING is not set
1419CONFIG_HAVE_FUNCTION_TRACER=y 1460CONFIG_HAVE_FUNCTION_TRACER=y
1461CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1462CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1420CONFIG_HAVE_DYNAMIC_FTRACE=y 1463CONFIG_HAVE_DYNAMIC_FTRACE=y
1421CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1464CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1465CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1422CONFIG_TRACING_SUPPORT=y 1466CONFIG_TRACING_SUPPORT=y
1423CONFIG_FTRACE=y 1467CONFIG_FTRACE=y
1424# CONFIG_FUNCTION_TRACER is not set 1468# CONFIG_FUNCTION_TRACER is not set
@@ -1426,6 +1470,7 @@ CONFIG_FTRACE=y
1426# CONFIG_PREEMPT_TRACER is not set 1470# CONFIG_PREEMPT_TRACER is not set
1427# CONFIG_SCHED_TRACER is not set 1471# CONFIG_SCHED_TRACER is not set
1428# CONFIG_ENABLE_DEFAULT_TRACERS is not set 1472# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1473# CONFIG_FTRACE_SYSCALLS is not set
1429# CONFIG_BOOT_TRACER is not set 1474# CONFIG_BOOT_TRACER is not set
1430CONFIG_BRANCH_PROFILE_NONE=y 1475CONFIG_BRANCH_PROFILE_NONE=y
1431# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1476# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -1440,11 +1485,11 @@ CONFIG_HAVE_ARCH_KGDB=y
1440# CONFIG_KGDB is not set 1485# CONFIG_KGDB is not set
1441# CONFIG_SH_STANDARD_BIOS is not set 1486# CONFIG_SH_STANDARD_BIOS is not set
1442# CONFIG_EARLY_SCIF_CONSOLE is not set 1487# CONFIG_EARLY_SCIF_CONSOLE is not set
1443# CONFIG_DEBUG_BOOTMEM is not set 1488# CONFIG_STACK_DEBUG is not set
1444# CONFIG_DEBUG_STACKOVERFLOW is not set
1445# CONFIG_DEBUG_STACK_USAGE is not set 1489# CONFIG_DEBUG_STACK_USAGE is not set
1446# CONFIG_4KSTACKS is not set 1490# CONFIG_4KSTACKS is not set
1447# CONFIG_DUMP_CODE is not set 1491# CONFIG_DUMP_CODE is not set
1492# CONFIG_DWARF_UNWINDER is not set
1448# CONFIG_SH_NO_BSS_INIT is not set 1493# CONFIG_SH_NO_BSS_INIT is not set
1449 1494
1450# 1495#
@@ -1459,7 +1504,6 @@ CONFIG_CRYPTO=y
1459# 1504#
1460# Crypto core or helper 1505# Crypto core or helper
1461# 1506#
1462# CONFIG_CRYPTO_FIPS is not set
1463CONFIG_CRYPTO_ALGAPI=y 1507CONFIG_CRYPTO_ALGAPI=y
1464CONFIG_CRYPTO_ALGAPI2=y 1508CONFIG_CRYPTO_ALGAPI2=y
1465CONFIG_CRYPTO_AEAD2=y 1509CONFIG_CRYPTO_AEAD2=y
@@ -1501,11 +1545,13 @@ CONFIG_CRYPTO_CBC=y
1501# 1545#
1502CONFIG_CRYPTO_HMAC=y 1546CONFIG_CRYPTO_HMAC=y
1503# CONFIG_CRYPTO_XCBC is not set 1547# CONFIG_CRYPTO_XCBC is not set
1548# CONFIG_CRYPTO_VMAC is not set
1504 1549
1505# 1550#
1506# Digest 1551# Digest
1507# 1552#
1508# CONFIG_CRYPTO_CRC32C is not set 1553# CONFIG_CRYPTO_CRC32C is not set
1554# CONFIG_CRYPTO_GHASH is not set
1509# CONFIG_CRYPTO_MD4 is not set 1555# CONFIG_CRYPTO_MD4 is not set
1510CONFIG_CRYPTO_MD5=y 1556CONFIG_CRYPTO_MD5=y
1511# CONFIG_CRYPTO_MICHAEL_MIC is not set 1557# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1567,5 +1613,6 @@ CONFIG_CRC32=y
1567CONFIG_HAS_IOMEM=y 1613CONFIG_HAS_IOMEM=y
1568CONFIG_HAS_IOPORT=y 1614CONFIG_HAS_IOPORT=y
1569CONFIG_HAS_DMA=y 1615CONFIG_HAS_DMA=y
1616CONFIG_HAVE_LMB=y
1570CONFIG_NLATTR=y 1617CONFIG_NLATTR=y
1571CONFIG_GENERIC_ATOMIC64=y 1618CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/shmin_defconfig b/arch/sh/configs/shmin_defconfig
index ad7d60972fcf..92115e612750 100644
--- a/arch/sh/configs/shmin_defconfig
+++ b/arch/sh/configs/shmin_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 13:10:33 2009 4# Thu Sep 24 19:27:17 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,6 +13,7 @@ CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_HARDIRQS=y 13CONFIG_GENERIC_HARDIRQS=y
14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
15CONFIG_GENERIC_IRQ_PROBE=y 15CONFIG_GENERIC_IRQ_PROBE=y
16CONFIG_IRQ_PER_CPU=y
16# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
17CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
@@ -26,7 +27,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 27# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 28CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y 29CONFIG_ARCH_HAS_DEFAULT_IDLE=y
30CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
32CONFIG_CONSTRUCTORS=y
30 33
31# 34#
32# General setup 35# General setup
@@ -36,6 +39,12 @@ CONFIG_BROKEN_ON_SMP=y
36CONFIG_INIT_ENV_ARG_LIMIT=32 39CONFIG_INIT_ENV_ARG_LIMIT=32
37CONFIG_LOCALVERSION="" 40CONFIG_LOCALVERSION=""
38CONFIG_LOCALVERSION_AUTO=y 41CONFIG_LOCALVERSION_AUTO=y
42CONFIG_HAVE_KERNEL_GZIP=y
43CONFIG_HAVE_KERNEL_BZIP2=y
44CONFIG_HAVE_KERNEL_LZMA=y
45CONFIG_KERNEL_GZIP=y
46# CONFIG_KERNEL_BZIP2 is not set
47# CONFIG_KERNEL_LZMA is not set
39# CONFIG_SWAP is not set 48# CONFIG_SWAP is not set
40# CONFIG_SYSVIPC is not set 49# CONFIG_SYSVIPC is not set
41# CONFIG_POSIX_MQUEUE is not set 50# CONFIG_POSIX_MQUEUE is not set
@@ -46,11 +55,12 @@ CONFIG_LOCALVERSION_AUTO=y
46# 55#
47# RCU Subsystem 56# RCU Subsystem
48# 57#
49CONFIG_CLASSIC_RCU=y 58CONFIG_TREE_RCU=y
50# CONFIG_TREE_RCU is not set 59# CONFIG_TREE_PREEMPT_RCU is not set
51# CONFIG_PREEMPT_RCU is not set 60# CONFIG_RCU_TRACE is not set
61CONFIG_RCU_FANOUT=32
62# CONFIG_RCU_FANOUT_EXACT is not set
52# CONFIG_TREE_RCU_TRACE is not set 63# CONFIG_TREE_RCU_TRACE is not set
53# CONFIG_PREEMPT_RCU_TRACE is not set
54# CONFIG_IKCONFIG is not set 64# CONFIG_IKCONFIG is not set
55CONFIG_LOG_BUF_SHIFT=14 65CONFIG_LOG_BUF_SHIFT=14
56# CONFIG_GROUP_SCHED is not set 66# CONFIG_GROUP_SCHED is not set
@@ -77,18 +87,19 @@ CONFIG_TIMERFD=y
77CONFIG_EVENTFD=y 87CONFIG_EVENTFD=y
78# CONFIG_SHMEM is not set 88# CONFIG_SHMEM is not set
79CONFIG_AIO=y 89CONFIG_AIO=y
90CONFIG_HAVE_PERF_EVENTS=y
80 91
81# 92#
82# Performance Counters 93# Kernel Performance Events And Counters
83# 94#
95# CONFIG_PERF_EVENTS is not set
96# CONFIG_PERF_COUNTERS is not set
84CONFIG_VM_EVENT_COUNTERS=y 97CONFIG_VM_EVENT_COUNTERS=y
85# CONFIG_STRIP_ASM_SYMS is not set
86CONFIG_COMPAT_BRK=y 98CONFIG_COMPAT_BRK=y
87# CONFIG_SLAB is not set 99# CONFIG_SLAB is not set
88# CONFIG_SLUB is not set 100# CONFIG_SLUB is not set
89CONFIG_SLOB=y 101CONFIG_SLOB=y
90# CONFIG_PROFILING is not set 102# CONFIG_PROFILING is not set
91# CONFIG_MARKERS is not set
92CONFIG_HAVE_OPROFILE=y 103CONFIG_HAVE_OPROFILE=y
93CONFIG_HAVE_IOREMAP_PROT=y 104CONFIG_HAVE_IOREMAP_PROT=y
94CONFIG_HAVE_KPROBES=y 105CONFIG_HAVE_KPROBES=y
@@ -96,12 +107,16 @@ CONFIG_HAVE_KRETPROBES=y
96CONFIG_HAVE_ARCH_TRACEHOOK=y 107CONFIG_HAVE_ARCH_TRACEHOOK=y
97CONFIG_HAVE_CLK=y 108CONFIG_HAVE_CLK=y
98CONFIG_HAVE_DMA_API_DEBUG=y 109CONFIG_HAVE_DMA_API_DEBUG=y
110
111#
112# GCOV-based kernel profiling
113#
99# CONFIG_SLOW_WORK is not set 114# CONFIG_SLOW_WORK is not set
100CONFIG_HAVE_GENERIC_DMA_COHERENT=y 115CONFIG_HAVE_GENERIC_DMA_COHERENT=y
101CONFIG_BASE_SMALL=1 116CONFIG_BASE_SMALL=1
102# CONFIG_MODULES is not set 117# CONFIG_MODULES is not set
103CONFIG_BLOCK=y 118CONFIG_BLOCK=y
104# CONFIG_LBD is not set 119CONFIG_LBDAF=y
105# CONFIG_BLK_DEV_BSG is not set 120# CONFIG_BLK_DEV_BSG is not set
106# CONFIG_BLK_DEV_INTEGRITY is not set 121# CONFIG_BLK_DEV_INTEGRITY is not set
107 122
@@ -148,6 +163,7 @@ CONFIG_CPU_SUBTYPE_SH7706=y
148# CONFIG_CPU_SUBTYPE_SH4_202 is not set 163# CONFIG_CPU_SUBTYPE_SH4_202 is not set
149# CONFIG_CPU_SUBTYPE_SH7723 is not set 164# CONFIG_CPU_SUBTYPE_SH7723 is not set
150# CONFIG_CPU_SUBTYPE_SH7724 is not set 165# CONFIG_CPU_SUBTYPE_SH7724 is not set
166# CONFIG_CPU_SUBTYPE_SH7757 is not set
151# CONFIG_CPU_SUBTYPE_SH7763 is not set 167# CONFIG_CPU_SUBTYPE_SH7763 is not set
152# CONFIG_CPU_SUBTYPE_SH7770 is not set 168# CONFIG_CPU_SUBTYPE_SH7770 is not set
153# CONFIG_CPU_SUBTYPE_SH7780 is not set 169# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -193,6 +209,7 @@ CONFIG_ZONE_DMA_FLAG=0
193CONFIG_NR_QUICK=2 209CONFIG_NR_QUICK=2
194CONFIG_HAVE_MLOCK=y 210CONFIG_HAVE_MLOCK=y
195CONFIG_HAVE_MLOCKED_PAGE_BIT=y 211CONFIG_HAVE_MLOCKED_PAGE_BIT=y
212# CONFIG_KSM is not set
196CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 213CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
197 214
198# 215#
@@ -274,7 +291,8 @@ CONFIG_GUSA=y
274CONFIG_ZERO_PAGE_OFFSET=0x00001000 291CONFIG_ZERO_PAGE_OFFSET=0x00001000
275CONFIG_BOOT_LINK_OFFSET=0x00210000 292CONFIG_BOOT_LINK_OFFSET=0x00210000
276CONFIG_ENTRY_OFFSET=0x00001000 293CONFIG_ENTRY_OFFSET=0x00001000
277CONFIG_CMDLINE_BOOL=y 294CONFIG_CMDLINE_OVERWRITE=y
295# CONFIG_CMDLINE_EXTEND is not set
278CONFIG_CMDLINE="console=ttySC1,115200 root=1f01 mtdparts=phys_mapped_flash:64k(firm)ro,-(sys) netdev=34,0x300,eth0 " 296CONFIG_CMDLINE="console=ttySC1,115200 root=1f01 mtdparts=phys_mapped_flash:64k(firm)ro,-(sys) netdev=34,0x300,eth0 "
279 297
280# 298#
@@ -339,6 +357,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
339# CONFIG_NETFILTER is not set 357# CONFIG_NETFILTER is not set
340# CONFIG_IP_DCCP is not set 358# CONFIG_IP_DCCP is not set
341# CONFIG_IP_SCTP is not set 359# CONFIG_IP_SCTP is not set
360# CONFIG_RDS is not set
342# CONFIG_TIPC is not set 361# CONFIG_TIPC is not set
343# CONFIG_ATM is not set 362# CONFIG_ATM is not set
344# CONFIG_BRIDGE is not set 363# CONFIG_BRIDGE is not set
@@ -368,6 +387,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
368# CONFIG_AF_RXRPC is not set 387# CONFIG_AF_RXRPC is not set
369CONFIG_WIRELESS=y 388CONFIG_WIRELESS=y
370# CONFIG_CFG80211 is not set 389# CONFIG_CFG80211 is not set
390CONFIG_CFG80211_DEFAULT_PS_VALUE=0
371# CONFIG_WIRELESS_OLD_REGULATORY is not set 391# CONFIG_WIRELESS_OLD_REGULATORY is not set
372# CONFIG_WIRELESS_EXT is not set 392# CONFIG_WIRELESS_EXT is not set
373# CONFIG_LIB80211 is not set 393# CONFIG_LIB80211 is not set
@@ -375,7 +395,6 @@ CONFIG_WIRELESS=y
375# 395#
376# CFG80211 needs to be enabled for MAC80211 396# CFG80211 needs to be enabled for MAC80211
377# 397#
378CONFIG_MAC80211_DEFAULT_PS_VALUE=0
379# CONFIG_WIMAX is not set 398# CONFIG_WIMAX is not set
380# CONFIG_RFKILL is not set 399# CONFIG_RFKILL is not set
381# CONFIG_NET_9P is not set 400# CONFIG_NET_9P is not set
@@ -529,10 +548,7 @@ CONFIG_NET_ETHERNET=y
529# CONFIG_KS8842 is not set 548# CONFIG_KS8842 is not set
530CONFIG_NETDEV_1000=y 549CONFIG_NETDEV_1000=y
531CONFIG_NETDEV_10000=y 550CONFIG_NETDEV_10000=y
532 551CONFIG_WLAN=y
533#
534# Wireless LAN
535#
536# CONFIG_WLAN_PRE80211 is not set 552# CONFIG_WLAN_PRE80211 is not set
537# CONFIG_WLAN_80211 is not set 553# CONFIG_WLAN_80211 is not set
538 554
@@ -591,11 +607,15 @@ CONFIG_HW_RANDOM=y
591# CONFIG_TCG_TPM is not set 607# CONFIG_TCG_TPM is not set
592# CONFIG_I2C is not set 608# CONFIG_I2C is not set
593# CONFIG_SPI is not set 609# CONFIG_SPI is not set
610
611#
612# PPS support
613#
614# CONFIG_PPS is not set
594# CONFIG_W1 is not set 615# CONFIG_W1 is not set
595# CONFIG_POWER_SUPPLY is not set 616# CONFIG_POWER_SUPPLY is not set
596# CONFIG_HWMON is not set 617# CONFIG_HWMON is not set
597# CONFIG_THERMAL is not set 618# CONFIG_THERMAL is not set
598# CONFIG_THERMAL_HWMON is not set
599# CONFIG_WATCHDOG is not set 619# CONFIG_WATCHDOG is not set
600CONFIG_SSB_POSSIBLE=y 620CONFIG_SSB_POSSIBLE=y
601 621
@@ -672,7 +692,9 @@ CONFIG_RTC_LIB=y
672# CONFIG_JFS_FS is not set 692# CONFIG_JFS_FS is not set
673# CONFIG_FS_POSIX_ACL is not set 693# CONFIG_FS_POSIX_ACL is not set
674# CONFIG_XFS_FS is not set 694# CONFIG_XFS_FS is not set
695# CONFIG_GFS2_FS is not set
675# CONFIG_BTRFS_FS is not set 696# CONFIG_BTRFS_FS is not set
697# CONFIG_NILFS2_FS is not set
676CONFIG_FILE_LOCKING=y 698CONFIG_FILE_LOCKING=y
677CONFIG_FSNOTIFY=y 699CONFIG_FSNOTIFY=y
678# CONFIG_DNOTIFY is not set 700# CONFIG_DNOTIFY is not set
@@ -709,8 +731,6 @@ CONFIG_PROC_FS=y
709CONFIG_PROC_SYSCTL=y 731CONFIG_PROC_SYSCTL=y
710CONFIG_PROC_PAGE_MONITOR=y 732CONFIG_PROC_PAGE_MONITOR=y
711# CONFIG_SYSFS is not set 733# CONFIG_SYSFS is not set
712CONFIG_TMPFS=y
713# CONFIG_TMPFS_POSIX_ACL is not set
714# CONFIG_HUGETLBFS is not set 734# CONFIG_HUGETLBFS is not set
715# CONFIG_HUGETLB_PAGE is not set 735# CONFIG_HUGETLB_PAGE is not set
716CONFIG_MISC_FILESYSTEMS=y 736CONFIG_MISC_FILESYSTEMS=y
@@ -732,7 +752,6 @@ CONFIG_CRAMFS=y
732# CONFIG_ROMFS_FS is not set 752# CONFIG_ROMFS_FS is not set
733# CONFIG_SYSV_FS is not set 753# CONFIG_SYSV_FS is not set
734# CONFIG_UFS_FS is not set 754# CONFIG_UFS_FS is not set
735# CONFIG_NILFS2_FS is not set
736CONFIG_NETWORK_FILESYSTEMS=y 755CONFIG_NETWORK_FILESYSTEMS=y
737CONFIG_NFS_FS=y 756CONFIG_NFS_FS=y
738CONFIG_NFS_V3=y 757CONFIG_NFS_V3=y
@@ -768,6 +787,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
768CONFIG_ENABLE_MUST_CHECK=y 787CONFIG_ENABLE_MUST_CHECK=y
769CONFIG_FRAME_WARN=1024 788CONFIG_FRAME_WARN=1024
770# CONFIG_MAGIC_SYSRQ is not set 789# CONFIG_MAGIC_SYSRQ is not set
790# CONFIG_STRIP_ASM_SYMS is not set
771# CONFIG_UNUSED_SYMBOLS is not set 791# CONFIG_UNUSED_SYMBOLS is not set
772# CONFIG_HEADERS_CHECK is not set 792# CONFIG_HEADERS_CHECK is not set
773# CONFIG_DEBUG_KERNEL is not set 793# CONFIG_DEBUG_KERNEL is not set
@@ -775,8 +795,11 @@ CONFIG_FRAME_WARN=1024
775# CONFIG_RCU_CPU_STALL_DETECTOR is not set 795# CONFIG_RCU_CPU_STALL_DETECTOR is not set
776# CONFIG_LATENCYTOP is not set 796# CONFIG_LATENCYTOP is not set
777CONFIG_HAVE_FUNCTION_TRACER=y 797CONFIG_HAVE_FUNCTION_TRACER=y
798CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
799CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
778CONFIG_HAVE_DYNAMIC_FTRACE=y 800CONFIG_HAVE_DYNAMIC_FTRACE=y
779CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 801CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
802CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
780CONFIG_TRACING_SUPPORT=y 803CONFIG_TRACING_SUPPORT=y
781# CONFIG_FTRACE is not set 804# CONFIG_FTRACE is not set
782# CONFIG_DMA_API_DEBUG is not set 805# CONFIG_DMA_API_DEBUG is not set
@@ -785,6 +808,7 @@ CONFIG_HAVE_ARCH_KGDB=y
785CONFIG_SH_STANDARD_BIOS=y 808CONFIG_SH_STANDARD_BIOS=y
786# CONFIG_EARLY_SCIF_CONSOLE is not set 809# CONFIG_EARLY_SCIF_CONSOLE is not set
787CONFIG_EARLY_PRINTK=y 810CONFIG_EARLY_PRINTK=y
811# CONFIG_DWARF_UNWINDER is not set
788 812
789# 813#
790# Security options 814# Security options
@@ -797,7 +821,6 @@ CONFIG_CRYPTO=y
797# 821#
798# Crypto core or helper 822# Crypto core or helper
799# 823#
800# CONFIG_CRYPTO_FIPS is not set
801# CONFIG_CRYPTO_MANAGER is not set 824# CONFIG_CRYPTO_MANAGER is not set
802# CONFIG_CRYPTO_MANAGER2 is not set 825# CONFIG_CRYPTO_MANAGER2 is not set
803# CONFIG_CRYPTO_GF128MUL is not set 826# CONFIG_CRYPTO_GF128MUL is not set
@@ -828,11 +851,13 @@ CONFIG_CRYPTO=y
828# 851#
829# CONFIG_CRYPTO_HMAC is not set 852# CONFIG_CRYPTO_HMAC is not set
830# CONFIG_CRYPTO_XCBC is not set 853# CONFIG_CRYPTO_XCBC is not set
854# CONFIG_CRYPTO_VMAC is not set
831 855
832# 856#
833# Digest 857# Digest
834# 858#
835# CONFIG_CRYPTO_CRC32C is not set 859# CONFIG_CRYPTO_CRC32C is not set
860# CONFIG_CRYPTO_GHASH is not set
836# CONFIG_CRYPTO_MD4 is not set 861# CONFIG_CRYPTO_MD4 is not set
837# CONFIG_CRYPTO_MD5 is not set 862# CONFIG_CRYPTO_MD5 is not set
838# CONFIG_CRYPTO_MICHAEL_MIC is not set 863# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -895,5 +920,6 @@ CONFIG_ZLIB_INFLATE=y
895CONFIG_HAS_IOMEM=y 920CONFIG_HAS_IOMEM=y
896CONFIG_HAS_IOPORT=y 921CONFIG_HAS_IOPORT=y
897CONFIG_HAS_DMA=y 922CONFIG_HAS_DMA=y
923CONFIG_HAVE_LMB=y
898CONFIG_NLATTR=y 924CONFIG_NLATTR=y
899CONFIG_GENERIC_ATOMIC64=y 925CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig
index 207b0c9a8cdf..e3858d757d5e 100644
--- a/arch/sh/configs/shx3_defconfig
+++ b/arch/sh/configs/shx3_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 13:11:03 2009 4# Thu Sep 24 19:29:26 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -30,7 +31,9 @@ CONFIG_LOCKDEP_SUPPORT=y
30# CONFIG_ARCH_HAS_ILOG2_U64 is not set 31# CONFIG_ARCH_HAS_ILOG2_U64 is not set
31CONFIG_ARCH_NO_VIRT_TO_BUS=y 32CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 33CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y
34 37
35# 38#
36# General setup 39# General setup
@@ -40,6 +43,12 @@ CONFIG_LOCK_KERNEL=y
40CONFIG_INIT_ENV_ARG_LIMIT=32 43CONFIG_INIT_ENV_ARG_LIMIT=32
41CONFIG_LOCALVERSION="" 44CONFIG_LOCALVERSION=""
42CONFIG_LOCALVERSION_AUTO=y 45CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set
43CONFIG_SWAP=y 52CONFIG_SWAP=y
44CONFIG_SYSVIPC=y 53CONFIG_SYSVIPC=y
45CONFIG_SYSVIPC_SYSCTL=y 54CONFIG_SYSVIPC_SYSCTL=y
@@ -55,12 +64,12 @@ CONFIG_AUDIT_TREE=y
55# 64#
56# RCU Subsystem 65# RCU Subsystem
57# 66#
58# CONFIG_CLASSIC_RCU is not set 67CONFIG_TREE_RCU=y
59# CONFIG_TREE_RCU is not set 68# CONFIG_TREE_PREEMPT_RCU is not set
60CONFIG_PREEMPT_RCU=y
61CONFIG_RCU_TRACE=y 69CONFIG_RCU_TRACE=y
62# CONFIG_TREE_RCU_TRACE is not set 70CONFIG_RCU_FANOUT=32
63CONFIG_PREEMPT_RCU_TRACE=y 71# CONFIG_RCU_FANOUT_EXACT is not set
72CONFIG_TREE_RCU_TRACE=y
64CONFIG_IKCONFIG=y 73CONFIG_IKCONFIG=y
65CONFIG_IKCONFIG_PROC=y 74CONFIG_IKCONFIG_PROC=y
66CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
@@ -111,19 +120,21 @@ CONFIG_TIMERFD=y
111CONFIG_EVENTFD=y 120CONFIG_EVENTFD=y
112CONFIG_SHMEM=y 121CONFIG_SHMEM=y
113CONFIG_AIO=y 122CONFIG_AIO=y
123CONFIG_HAVE_PERF_EVENTS=y
114 124
115# 125#
116# Performance Counters 126# Kernel Performance Events And Counters
117# 127#
128CONFIG_PERF_EVENTS=y
129CONFIG_EVENT_PROFILE=y
130# CONFIG_PERF_COUNTERS is not set
118CONFIG_VM_EVENT_COUNTERS=y 131CONFIG_VM_EVENT_COUNTERS=y
119# CONFIG_STRIP_ASM_SYMS is not set
120CONFIG_COMPAT_BRK=y 132CONFIG_COMPAT_BRK=y
121# CONFIG_SLAB is not set 133# CONFIG_SLAB is not set
122# CONFIG_SLUB is not set 134# CONFIG_SLUB is not set
123CONFIG_SLOB=y 135CONFIG_SLOB=y
124CONFIG_PROFILING=y 136CONFIG_PROFILING=y
125CONFIG_TRACEPOINTS=y 137CONFIG_TRACEPOINTS=y
126CONFIG_MARKERS=y
127CONFIG_OPROFILE=y 138CONFIG_OPROFILE=y
128CONFIG_HAVE_OPROFILE=y 139CONFIG_HAVE_OPROFILE=y
129CONFIG_KPROBES=y 140CONFIG_KPROBES=y
@@ -135,6 +146,11 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
135CONFIG_USE_GENERIC_SMP_HELPERS=y 146CONFIG_USE_GENERIC_SMP_HELPERS=y
136CONFIG_HAVE_CLK=y 147CONFIG_HAVE_CLK=y
137CONFIG_HAVE_DMA_API_DEBUG=y 148CONFIG_HAVE_DMA_API_DEBUG=y
149
150#
151# GCOV-based kernel profiling
152#
153# CONFIG_GCOV_KERNEL is not set
138# CONFIG_SLOW_WORK is not set 154# CONFIG_SLOW_WORK is not set
139CONFIG_HAVE_GENERIC_DMA_COHERENT=y 155CONFIG_HAVE_GENERIC_DMA_COHERENT=y
140CONFIG_RT_MUTEXES=y 156CONFIG_RT_MUTEXES=y
@@ -147,7 +163,7 @@ CONFIG_MODULE_UNLOAD=y
147# CONFIG_MODULE_SRCVERSION_ALL is not set 163# CONFIG_MODULE_SRCVERSION_ALL is not set
148CONFIG_STOP_MACHINE=y 164CONFIG_STOP_MACHINE=y
149CONFIG_BLOCK=y 165CONFIG_BLOCK=y
150# CONFIG_LBD is not set 166CONFIG_LBDAF=y
151# CONFIG_BLK_DEV_BSG is not set 167# CONFIG_BLK_DEV_BSG is not set
152# CONFIG_BLK_DEV_INTEGRITY is not set 168# CONFIG_BLK_DEV_INTEGRITY is not set
153 169
@@ -196,6 +212,7 @@ CONFIG_CPU_SHX3=y
196# CONFIG_CPU_SUBTYPE_SH4_202 is not set 212# CONFIG_CPU_SUBTYPE_SH4_202 is not set
197# CONFIG_CPU_SUBTYPE_SH7723 is not set 213# CONFIG_CPU_SUBTYPE_SH7723 is not set
198# CONFIG_CPU_SUBTYPE_SH7724 is not set 214# CONFIG_CPU_SUBTYPE_SH7724 is not set
215# CONFIG_CPU_SUBTYPE_SH7757 is not set
199# CONFIG_CPU_SUBTYPE_SH7763 is not set 216# CONFIG_CPU_SUBTYPE_SH7763 is not set
200# CONFIG_CPU_SUBTYPE_SH7770 is not set 217# CONFIG_CPU_SUBTYPE_SH7770 is not set
201# CONFIG_CPU_SUBTYPE_SH7780 is not set 218# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -256,6 +273,7 @@ CONFIG_ZONE_DMA_FLAG=0
256CONFIG_NR_QUICK=2 273CONFIG_NR_QUICK=2
257CONFIG_HAVE_MLOCK=y 274CONFIG_HAVE_MLOCK=y
258CONFIG_HAVE_MLOCKED_PAGE_BIT=y 275CONFIG_HAVE_MLOCKED_PAGE_BIT=y
276# CONFIG_KSM is not set
259CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 277CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
260 278
261# 279#
@@ -353,7 +371,8 @@ CONFIG_PREEMPT=y
353CONFIG_ZERO_PAGE_OFFSET=0x00010000 371CONFIG_ZERO_PAGE_OFFSET=0x00010000
354CONFIG_BOOT_LINK_OFFSET=0x00800000 372CONFIG_BOOT_LINK_OFFSET=0x00800000
355CONFIG_ENTRY_OFFSET=0x00010000 373CONFIG_ENTRY_OFFSET=0x00010000
356CONFIG_CMDLINE_BOOL=y 374CONFIG_CMDLINE_OVERWRITE=y
375# CONFIG_CMDLINE_EXTEND is not set
357CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=bios ignore_loglevel" 376CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=bios ignore_loglevel"
358 377
359# 378#
@@ -438,6 +457,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
438# CONFIG_NETFILTER is not set 457# CONFIG_NETFILTER is not set
439# CONFIG_IP_DCCP is not set 458# CONFIG_IP_DCCP is not set
440# CONFIG_IP_SCTP is not set 459# CONFIG_IP_SCTP is not set
460# CONFIG_RDS is not set
441# CONFIG_TIPC is not set 461# CONFIG_TIPC is not set
442# CONFIG_ATM is not set 462# CONFIG_ATM is not set
443# CONFIG_BRIDGE is not set 463# CONFIG_BRIDGE is not set
@@ -489,6 +509,7 @@ CONFIG_CAN_VCAN=m
489# Generic Driver Options 509# Generic Driver Options
490# 510#
491CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 511CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
512# CONFIG_DEVTMPFS is not set
492CONFIG_STANDALONE=y 513CONFIG_STANDALONE=y
493CONFIG_PREVENT_FIRMWARE_BUILD=y 514CONFIG_PREVENT_FIRMWARE_BUILD=y
494# CONFIG_FW_LOADER is not set 515# CONFIG_FW_LOADER is not set
@@ -562,7 +583,6 @@ CONFIG_SCSI_WAIT_SCAN=m
562# CONFIG_SCSI_SRP_ATTRS is not set 583# CONFIG_SCSI_SRP_ATTRS is not set
563CONFIG_SCSI_LOWLEVEL=y 584CONFIG_SCSI_LOWLEVEL=y
564# CONFIG_ISCSI_TCP is not set 585# CONFIG_ISCSI_TCP is not set
565# CONFIG_SCSI_BNX2_ISCSI is not set
566# CONFIG_LIBFC is not set 586# CONFIG_LIBFC is not set
567# CONFIG_LIBFCOE is not set 587# CONFIG_LIBFCOE is not set
568# CONFIG_SCSI_DEBUG is not set 588# CONFIG_SCSI_DEBUG is not set
@@ -570,6 +590,7 @@ CONFIG_SCSI_LOWLEVEL=y
570# CONFIG_SCSI_OSD_INITIATOR is not set 590# CONFIG_SCSI_OSD_INITIATOR is not set
571CONFIG_ATA=y 591CONFIG_ATA=y
572# CONFIG_ATA_NONSTANDARD is not set 592# CONFIG_ATA_NONSTANDARD is not set
593CONFIG_ATA_VERBOSE_ERROR=y
573CONFIG_SATA_PMP=y 594CONFIG_SATA_PMP=y
574CONFIG_ATA_SFF=y 595CONFIG_ATA_SFF=y
575# CONFIG_SATA_MV is not set 596# CONFIG_SATA_MV is not set
@@ -602,12 +623,10 @@ CONFIG_SMC91X=y
602# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 623# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
603# CONFIG_B44 is not set 624# CONFIG_B44 is not set
604# CONFIG_KS8842 is not set 625# CONFIG_KS8842 is not set
626# CONFIG_KS8851 is not set
605# CONFIG_NETDEV_1000 is not set 627# CONFIG_NETDEV_1000 is not set
606# CONFIG_NETDEV_10000 is not set 628# CONFIG_NETDEV_10000 is not set
607 629CONFIG_WLAN=y
608#
609# Wireless LAN
610#
611# CONFIG_WLAN_PRE80211 is not set 630# CONFIG_WLAN_PRE80211 is not set
612# CONFIG_WLAN_80211 is not set 631# CONFIG_WLAN_80211 is not set
613 632
@@ -675,6 +694,7 @@ CONFIG_LEGACY_PTY_COUNT=256
675# CONFIG_TCG_TPM is not set 694# CONFIG_TCG_TPM is not set
676CONFIG_I2C=m 695CONFIG_I2C=m
677CONFIG_I2C_BOARDINFO=y 696CONFIG_I2C_BOARDINFO=y
697CONFIG_I2C_COMPAT=y
678# CONFIG_I2C_CHARDEV is not set 698# CONFIG_I2C_CHARDEV is not set
679CONFIG_I2C_HELPER_AUTO=y 699CONFIG_I2C_HELPER_AUTO=y
680 700
@@ -685,6 +705,7 @@ CONFIG_I2C_HELPER_AUTO=y
685# 705#
686# I2C system bus drivers (mostly embedded / system-on-chip) 706# I2C system bus drivers (mostly embedded / system-on-chip)
687# 707#
708# CONFIG_I2C_DESIGNWARE is not set
688# CONFIG_I2C_OCORES is not set 709# CONFIG_I2C_OCORES is not set
689# CONFIG_I2C_SH_MOBILE is not set 710# CONFIG_I2C_SH_MOBILE is not set
690# CONFIG_I2C_SIMTEC is not set 711# CONFIG_I2C_SIMTEC is not set
@@ -706,9 +727,6 @@ CONFIG_I2C_HELPER_AUTO=y
706# Miscellaneous I2C Chip support 727# Miscellaneous I2C Chip support
707# 728#
708# CONFIG_DS1682 is not set 729# CONFIG_DS1682 is not set
709# CONFIG_SENSORS_PCF8574 is not set
710# CONFIG_PCF8575 is not set
711# CONFIG_SENSORS_PCA9539 is not set
712# CONFIG_SENSORS_TSL2550 is not set 730# CONFIG_SENSORS_TSL2550 is not set
713# CONFIG_I2C_DEBUG_CORE is not set 731# CONFIG_I2C_DEBUG_CORE is not set
714# CONFIG_I2C_DEBUG_ALGO is not set 732# CONFIG_I2C_DEBUG_ALGO is not set
@@ -729,11 +747,15 @@ CONFIG_SPI_MASTER=y
729# 747#
730# CONFIG_SPI_SPIDEV is not set 748# CONFIG_SPI_SPIDEV is not set
731# CONFIG_SPI_TLE62X0 is not set 749# CONFIG_SPI_TLE62X0 is not set
750
751#
752# PPS support
753#
754# CONFIG_PPS is not set
732# CONFIG_W1 is not set 755# CONFIG_W1 is not set
733# CONFIG_POWER_SUPPLY is not set 756# CONFIG_POWER_SUPPLY is not set
734# CONFIG_HWMON is not set 757# CONFIG_HWMON is not set
735# CONFIG_THERMAL is not set 758# CONFIG_THERMAL is not set
736# CONFIG_THERMAL_HWMON is not set
737CONFIG_WATCHDOG=y 759CONFIG_WATCHDOG=y
738# CONFIG_WATCHDOG_NOWAYOUT is not set 760# CONFIG_WATCHDOG_NOWAYOUT is not set
739 761
@@ -762,8 +784,12 @@ CONFIG_SSB_POSSIBLE=y
762# CONFIG_HTC_PASIC3 is not set 784# CONFIG_HTC_PASIC3 is not set
763# CONFIG_MFD_TMIO is not set 785# CONFIG_MFD_TMIO is not set
764# CONFIG_MFD_WM8400 is not set 786# CONFIG_MFD_WM8400 is not set
787# CONFIG_MFD_WM831X is not set
765# CONFIG_MFD_WM8350_I2C is not set 788# CONFIG_MFD_WM8350_I2C is not set
766# CONFIG_MFD_PCF50633 is not set 789# CONFIG_MFD_PCF50633 is not set
790# CONFIG_MFD_MC13783 is not set
791# CONFIG_AB3100_CORE is not set
792# CONFIG_EZX_PCAP is not set
767# CONFIG_REGULATOR is not set 793# CONFIG_REGULATOR is not set
768# CONFIG_MEDIA_SUPPORT is not set 794# CONFIG_MEDIA_SUPPORT is not set
769 795
@@ -808,6 +834,7 @@ CONFIG_USB_MON=y
808# CONFIG_USB_OXU210HP_HCD is not set 834# CONFIG_USB_OXU210HP_HCD is not set
809# CONFIG_USB_ISP116X_HCD is not set 835# CONFIG_USB_ISP116X_HCD is not set
810# CONFIG_USB_ISP1760_HCD is not set 836# CONFIG_USB_ISP1760_HCD is not set
837# CONFIG_USB_ISP1362_HCD is not set
811# CONFIG_USB_SL811_HCD is not set 838# CONFIG_USB_SL811_HCD is not set
812CONFIG_USB_R8A66597_HCD=m 839CONFIG_USB_R8A66597_HCD=m
813# CONFIG_USB_HWA_HCD is not set 840# CONFIG_USB_HWA_HCD is not set
@@ -862,6 +889,7 @@ CONFIG_USB_R8A66597_HCD=m
862# CONFIG_USB_LD is not set 889# CONFIG_USB_LD is not set
863# CONFIG_USB_TRANCEVIBRATOR is not set 890# CONFIG_USB_TRANCEVIBRATOR is not set
864# CONFIG_USB_IOWARRIOR is not set 891# CONFIG_USB_IOWARRIOR is not set
892# CONFIG_USB_TEST is not set
865# CONFIG_USB_ISIGHTFW is not set 893# CONFIG_USB_ISIGHTFW is not set
866# CONFIG_USB_VST is not set 894# CONFIG_USB_VST is not set
867CONFIG_USB_GADGET=y 895CONFIG_USB_GADGET=y
@@ -876,10 +904,11 @@ CONFIG_USB_GADGET_SELECTED=y
876# CONFIG_USB_GADGET_LH7A40X is not set 904# CONFIG_USB_GADGET_LH7A40X is not set
877# CONFIG_USB_GADGET_OMAP is not set 905# CONFIG_USB_GADGET_OMAP is not set
878# CONFIG_USB_GADGET_PXA25X is not set 906# CONFIG_USB_GADGET_PXA25X is not set
907# CONFIG_USB_GADGET_R8A66597 is not set
879# CONFIG_USB_GADGET_PXA27X is not set 908# CONFIG_USB_GADGET_PXA27X is not set
880# CONFIG_USB_GADGET_S3C_HSOTG is not set 909# CONFIG_USB_GADGET_S3C_HSOTG is not set
881# CONFIG_USB_GADGET_S3C2410 is not set
882# CONFIG_USB_GADGET_IMX is not set 910# CONFIG_USB_GADGET_IMX is not set
911# CONFIG_USB_GADGET_S3C2410 is not set
883CONFIG_USB_GADGET_M66592=y 912CONFIG_USB_GADGET_M66592=y
884CONFIG_USB_M66592=y 913CONFIG_USB_M66592=y
885# CONFIG_USB_GADGET_AMD5536UDC is not set 914# CONFIG_USB_GADGET_AMD5536UDC is not set
@@ -939,6 +968,7 @@ CONFIG_RTC_INTF_DEV=y
939# CONFIG_RTC_DRV_S35390A is not set 968# CONFIG_RTC_DRV_S35390A is not set
940# CONFIG_RTC_DRV_FM3130 is not set 969# CONFIG_RTC_DRV_FM3130 is not set
941# CONFIG_RTC_DRV_RX8581 is not set 970# CONFIG_RTC_DRV_RX8581 is not set
971# CONFIG_RTC_DRV_RX8025 is not set
942 972
943# 973#
944# SPI RTC drivers 974# SPI RTC drivers
@@ -950,6 +980,7 @@ CONFIG_RTC_INTF_DEV=y
950# CONFIG_RTC_DRV_R9701 is not set 980# CONFIG_RTC_DRV_R9701 is not set
951# CONFIG_RTC_DRV_RS5C348 is not set 981# CONFIG_RTC_DRV_RS5C348 is not set
952# CONFIG_RTC_DRV_DS3234 is not set 982# CONFIG_RTC_DRV_DS3234 is not set
983# CONFIG_RTC_DRV_PCF2123 is not set
953 984
954# 985#
955# Platform RTC drivers 986# Platform RTC drivers
@@ -1002,8 +1033,10 @@ CONFIG_FS_MBCACHE=y
1002# CONFIG_JFS_FS is not set 1033# CONFIG_JFS_FS is not set
1003# CONFIG_FS_POSIX_ACL is not set 1034# CONFIG_FS_POSIX_ACL is not set
1004# CONFIG_XFS_FS is not set 1035# CONFIG_XFS_FS is not set
1036# CONFIG_GFS2_FS is not set
1005# CONFIG_OCFS2_FS is not set 1037# CONFIG_OCFS2_FS is not set
1006# CONFIG_BTRFS_FS is not set 1038# CONFIG_BTRFS_FS is not set
1039# CONFIG_NILFS2_FS is not set
1007CONFIG_FILE_LOCKING=y 1040CONFIG_FILE_LOCKING=y
1008CONFIG_FSNOTIFY=y 1041CONFIG_FSNOTIFY=y
1009CONFIG_DNOTIFY=y 1042CONFIG_DNOTIFY=y
@@ -1063,7 +1096,6 @@ CONFIG_MISC_FILESYSTEMS=y
1063# CONFIG_ROMFS_FS is not set 1096# CONFIG_ROMFS_FS is not set
1064# CONFIG_SYSV_FS is not set 1097# CONFIG_SYSV_FS is not set
1065# CONFIG_UFS_FS is not set 1098# CONFIG_UFS_FS is not set
1066# CONFIG_NILFS2_FS is not set
1067CONFIG_NETWORK_FILESYSTEMS=y 1099CONFIG_NETWORK_FILESYSTEMS=y
1068# CONFIG_NFS_FS is not set 1100# CONFIG_NFS_FS is not set
1069# CONFIG_NFSD is not set 1101# CONFIG_NFSD is not set
@@ -1129,6 +1161,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1129# CONFIG_ENABLE_MUST_CHECK is not set 1161# CONFIG_ENABLE_MUST_CHECK is not set
1130CONFIG_FRAME_WARN=1024 1162CONFIG_FRAME_WARN=1024
1131CONFIG_MAGIC_SYSRQ=y 1163CONFIG_MAGIC_SYSRQ=y
1164# CONFIG_STRIP_ASM_SYMS is not set
1132# CONFIG_UNUSED_SYMBOLS is not set 1165# CONFIG_UNUSED_SYMBOLS is not set
1133CONFIG_DEBUG_FS=y 1166CONFIG_DEBUG_FS=y
1134# CONFIG_HEADERS_CHECK is not set 1167# CONFIG_HEADERS_CHECK is not set
@@ -1164,22 +1197,29 @@ CONFIG_DEBUG_VM=y
1164# CONFIG_DEBUG_LIST is not set 1197# CONFIG_DEBUG_LIST is not set
1165# CONFIG_DEBUG_SG is not set 1198# CONFIG_DEBUG_SG is not set
1166# CONFIG_DEBUG_NOTIFIERS is not set 1199# CONFIG_DEBUG_NOTIFIERS is not set
1200# CONFIG_DEBUG_CREDENTIALS is not set
1167CONFIG_FRAME_POINTER=y 1201CONFIG_FRAME_POINTER=y
1168# CONFIG_RCU_TORTURE_TEST is not set 1202# CONFIG_RCU_TORTURE_TEST is not set
1203# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1169# CONFIG_KPROBES_SANITY_TEST is not set 1204# CONFIG_KPROBES_SANITY_TEST is not set
1170# CONFIG_BACKTRACE_SELF_TEST is not set 1205# CONFIG_BACKTRACE_SELF_TEST is not set
1171# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1206# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1207# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1172# CONFIG_LKDTM is not set 1208# CONFIG_LKDTM is not set
1173# CONFIG_FAULT_INJECTION is not set 1209# CONFIG_FAULT_INJECTION is not set
1174# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1210# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1175# CONFIG_PAGE_POISONING is not set 1211# CONFIG_PAGE_POISONING is not set
1176CONFIG_NOP_TRACER=y 1212CONFIG_NOP_TRACER=y
1177CONFIG_HAVE_FUNCTION_TRACER=y 1213CONFIG_HAVE_FUNCTION_TRACER=y
1214CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1215CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1178CONFIG_HAVE_DYNAMIC_FTRACE=y 1216CONFIG_HAVE_DYNAMIC_FTRACE=y
1179CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1217CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1218CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1180CONFIG_RING_BUFFER=y 1219CONFIG_RING_BUFFER=y
1181CONFIG_EVENT_TRACING=y 1220CONFIG_EVENT_TRACING=y
1182CONFIG_CONTEXT_SWITCH_TRACER=y 1221CONFIG_CONTEXT_SWITCH_TRACER=y
1222CONFIG_RING_BUFFER_ALLOW_SWAP=y
1183CONFIG_TRACING=y 1223CONFIG_TRACING=y
1184CONFIG_TRACING_SUPPORT=y 1224CONFIG_TRACING_SUPPORT=y
1185CONFIG_FTRACE=y 1225CONFIG_FTRACE=y
@@ -1188,6 +1228,7 @@ CONFIG_FTRACE=y
1188# CONFIG_PREEMPT_TRACER is not set 1228# CONFIG_PREEMPT_TRACER is not set
1189# CONFIG_SCHED_TRACER is not set 1229# CONFIG_SCHED_TRACER is not set
1190# CONFIG_ENABLE_DEFAULT_TRACERS is not set 1230# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1231# CONFIG_FTRACE_SYSCALLS is not set
1191# CONFIG_BOOT_TRACER is not set 1232# CONFIG_BOOT_TRACER is not set
1192CONFIG_BRANCH_PROFILE_NONE=y 1233CONFIG_BRANCH_PROFILE_NONE=y
1193# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1234# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -1205,10 +1246,10 @@ CONFIG_HAVE_ARCH_KGDB=y
1205CONFIG_SH_STANDARD_BIOS=y 1246CONFIG_SH_STANDARD_BIOS=y
1206# CONFIG_EARLY_SCIF_CONSOLE is not set 1247# CONFIG_EARLY_SCIF_CONSOLE is not set
1207CONFIG_EARLY_PRINTK=y 1248CONFIG_EARLY_PRINTK=y
1208# CONFIG_DEBUG_BOOTMEM is not set 1249# CONFIG_STACK_DEBUG is not set
1209CONFIG_DEBUG_STACKOVERFLOW=y
1210CONFIG_DEBUG_STACK_USAGE=y 1250CONFIG_DEBUG_STACK_USAGE=y
1211CONFIG_DUMP_CODE=y 1251CONFIG_DUMP_CODE=y
1252# CONFIG_DWARF_UNWINDER is not set
1212# CONFIG_SH_NO_BSS_INIT is not set 1253# CONFIG_SH_NO_BSS_INIT is not set
1213 1254
1214# 1255#
@@ -1223,7 +1264,6 @@ CONFIG_CRYPTO=y
1223# 1264#
1224# Crypto core or helper 1265# Crypto core or helper
1225# 1266#
1226# CONFIG_CRYPTO_FIPS is not set
1227# CONFIG_CRYPTO_MANAGER is not set 1267# CONFIG_CRYPTO_MANAGER is not set
1228# CONFIG_CRYPTO_MANAGER2 is not set 1268# CONFIG_CRYPTO_MANAGER2 is not set
1229# CONFIG_CRYPTO_GF128MUL is not set 1269# CONFIG_CRYPTO_GF128MUL is not set
@@ -1255,11 +1295,13 @@ CONFIG_CRYPTO=y
1255# 1295#
1256# CONFIG_CRYPTO_HMAC is not set 1296# CONFIG_CRYPTO_HMAC is not set
1257# CONFIG_CRYPTO_XCBC is not set 1297# CONFIG_CRYPTO_XCBC is not set
1298# CONFIG_CRYPTO_VMAC is not set
1258 1299
1259# 1300#
1260# Digest 1301# Digest
1261# 1302#
1262# CONFIG_CRYPTO_CRC32C is not set 1303# CONFIG_CRYPTO_CRC32C is not set
1304# CONFIG_CRYPTO_GHASH is not set
1263# CONFIG_CRYPTO_MD4 is not set 1305# CONFIG_CRYPTO_MD4 is not set
1264# CONFIG_CRYPTO_MD5 is not set 1306# CONFIG_CRYPTO_MD5 is not set
1265# CONFIG_CRYPTO_MICHAEL_MIC is not set 1307# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1322,5 +1364,6 @@ CONFIG_AUDIT_GENERIC=y
1322CONFIG_HAS_IOMEM=y 1364CONFIG_HAS_IOMEM=y
1323CONFIG_HAS_IOPORT=y 1365CONFIG_HAS_IOPORT=y
1324CONFIG_HAS_DMA=y 1366CONFIG_HAS_DMA=y
1367CONFIG_HAVE_LMB=y
1325CONFIG_NLATTR=y 1368CONFIG_NLATTR=y
1326CONFIG_GENERIC_ATOMIC64=y 1369CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/snapgear_defconfig b/arch/sh/configs/snapgear_defconfig
index 2be2d75adbb7..cb919a0de4b2 100644
--- a/arch/sh/configs/snapgear_defconfig
+++ b/arch/sh/configs/snapgear_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.31-rc6 3# Linux kernel version: 2.6.31
4# Thu Aug 20 15:03:04 2009 4# Thu Sep 24 19:33:00 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -57,11 +57,12 @@ CONFIG_KERNEL_GZIP=y
57# 57#
58# RCU Subsystem 58# RCU Subsystem
59# 59#
60CONFIG_CLASSIC_RCU=y 60CONFIG_TREE_RCU=y
61# CONFIG_TREE_RCU is not set 61# CONFIG_TREE_PREEMPT_RCU is not set
62# CONFIG_PREEMPT_RCU is not set 62# CONFIG_RCU_TRACE is not set
63CONFIG_RCU_FANOUT=32
64# CONFIG_RCU_FANOUT_EXACT is not set
63# CONFIG_TREE_RCU_TRACE is not set 65# CONFIG_TREE_RCU_TRACE is not set
64# CONFIG_PREEMPT_RCU_TRACE is not set
65# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
66CONFIG_LOG_BUF_SHIFT=14 67CONFIG_LOG_BUF_SHIFT=14
67# CONFIG_GROUP_SCHED is not set 68# CONFIG_GROUP_SCHED is not set
@@ -95,21 +96,20 @@ CONFIG_TIMERFD=y
95CONFIG_EVENTFD=y 96CONFIG_EVENTFD=y
96CONFIG_SHMEM=y 97CONFIG_SHMEM=y
97CONFIG_AIO=y 98CONFIG_AIO=y
98CONFIG_HAVE_PERF_COUNTERS=y 99CONFIG_HAVE_PERF_EVENTS=y
99 100
100# 101#
101# Performance Counters 102# Kernel Performance Events And Counters
102# 103#
104# CONFIG_PERF_EVENTS is not set
103# CONFIG_PERF_COUNTERS is not set 105# CONFIG_PERF_COUNTERS is not set
104CONFIG_VM_EVENT_COUNTERS=y 106CONFIG_VM_EVENT_COUNTERS=y
105CONFIG_PCI_QUIRKS=y 107CONFIG_PCI_QUIRKS=y
106# CONFIG_STRIP_ASM_SYMS is not set
107CONFIG_COMPAT_BRK=y 108CONFIG_COMPAT_BRK=y
108CONFIG_SLAB=y 109CONFIG_SLAB=y
109# CONFIG_SLUB is not set 110# CONFIG_SLUB is not set
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_IOREMAP_PROT=y 114CONFIG_HAVE_IOREMAP_PROT=y
115CONFIG_HAVE_KPROBES=y 115CONFIG_HAVE_KPROBES=y
@@ -175,6 +175,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
175# CONFIG_CPU_SUBTYPE_SH4_202 is not set 175# CONFIG_CPU_SUBTYPE_SH4_202 is not set
176# CONFIG_CPU_SUBTYPE_SH7723 is not set 176# CONFIG_CPU_SUBTYPE_SH7723 is not set
177# CONFIG_CPU_SUBTYPE_SH7724 is not set 177# CONFIG_CPU_SUBTYPE_SH7724 is not set
178# CONFIG_CPU_SUBTYPE_SH7757 is not set
178# CONFIG_CPU_SUBTYPE_SH7763 is not set 179# CONFIG_CPU_SUBTYPE_SH7763 is not set
179# CONFIG_CPU_SUBTYPE_SH7770 is not set 180# CONFIG_CPU_SUBTYPE_SH7770 is not set
180# CONFIG_CPU_SUBTYPE_SH7780 is not set 181# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -220,6 +221,7 @@ CONFIG_ZONE_DMA_FLAG=0
220CONFIG_NR_QUICK=2 221CONFIG_NR_QUICK=2
221CONFIG_HAVE_MLOCK=y 222CONFIG_HAVE_MLOCK=y
222CONFIG_HAVE_MLOCKED_PAGE_BIT=y 223CONFIG_HAVE_MLOCKED_PAGE_BIT=y
224# CONFIG_KSM is not set
223CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 225CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
224 226
225# 227#
@@ -312,7 +314,8 @@ CONFIG_ZERO_PAGE_OFFSET=0x00001000
312CONFIG_BOOT_LINK_OFFSET=0x00800000 314CONFIG_BOOT_LINK_OFFSET=0x00800000
313CONFIG_ENTRY_OFFSET=0x00001000 315CONFIG_ENTRY_OFFSET=0x00001000
314# CONFIG_UBC_WAKEUP is not set 316# CONFIG_UBC_WAKEUP is not set
315# CONFIG_CMDLINE_BOOL is not set 317# CONFIG_CMDLINE_OVERWRITE is not set
318# CONFIG_CMDLINE_EXTEND is not set
316 319
317# 320#
318# Bus options 321# Bus options
@@ -374,6 +377,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
374# CONFIG_NETFILTER is not set 377# CONFIG_NETFILTER is not set
375# CONFIG_IP_DCCP is not set 378# CONFIG_IP_DCCP is not set
376# CONFIG_IP_SCTP is not set 379# CONFIG_IP_SCTP is not set
380# CONFIG_RDS is not set
377# CONFIG_TIPC is not set 381# CONFIG_TIPC is not set
378# CONFIG_ATM is not set 382# CONFIG_ATM is not set
379# CONFIG_BRIDGE is not set 383# CONFIG_BRIDGE is not set
@@ -403,6 +407,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
403# CONFIG_AF_RXRPC is not set 407# CONFIG_AF_RXRPC is not set
404CONFIG_WIRELESS=y 408CONFIG_WIRELESS=y
405# CONFIG_CFG80211 is not set 409# CONFIG_CFG80211 is not set
410CONFIG_CFG80211_DEFAULT_PS_VALUE=0
406# CONFIG_WIRELESS_OLD_REGULATORY is not set 411# CONFIG_WIRELESS_OLD_REGULATORY is not set
407# CONFIG_WIRELESS_EXT is not set 412# CONFIG_WIRELESS_EXT is not set
408# CONFIG_LIB80211 is not set 413# CONFIG_LIB80211 is not set
@@ -410,7 +415,6 @@ CONFIG_WIRELESS=y
410# 415#
411# CFG80211 needs to be enabled for MAC80211 416# CFG80211 needs to be enabled for MAC80211
412# 417#
413CONFIG_MAC80211_DEFAULT_PS_VALUE=0
414# CONFIG_WIMAX is not set 418# CONFIG_WIMAX is not set
415# CONFIG_RFKILL is not set 419# CONFIG_RFKILL is not set
416# CONFIG_NET_9P is not set 420# CONFIG_NET_9P is not set
@@ -618,10 +622,7 @@ CONFIG_8139TOO_PIO=y
618# CONFIG_NETDEV_1000 is not set 622# CONFIG_NETDEV_1000 is not set
619# CONFIG_NETDEV_10000 is not set 623# CONFIG_NETDEV_10000 is not set
620# CONFIG_TR is not set 624# CONFIG_TR is not set
621 625CONFIG_WLAN=y
622#
623# Wireless LAN
624#
625# CONFIG_WLAN_PRE80211 is not set 626# CONFIG_WLAN_PRE80211 is not set
626# CONFIG_WLAN_80211 is not set 627# CONFIG_WLAN_80211 is not set
627 628
@@ -714,7 +715,6 @@ CONFIG_DEVPORT=y
714# CONFIG_POWER_SUPPLY is not set 715# CONFIG_POWER_SUPPLY is not set
715# CONFIG_HWMON is not set 716# CONFIG_HWMON is not set
716# CONFIG_THERMAL is not set 717# CONFIG_THERMAL is not set
717# CONFIG_THERMAL_HWMON is not set
718# CONFIG_WATCHDOG is not set 718# CONFIG_WATCHDOG is not set
719CONFIG_SSB_POSSIBLE=y 719CONFIG_SSB_POSSIBLE=y
720 720
@@ -736,6 +736,7 @@ CONFIG_SSB_POSSIBLE=y
736# 736#
737# Graphics support 737# Graphics support
738# 738#
739CONFIG_VGA_ARB=y
739# CONFIG_DRM is not set 740# CONFIG_DRM is not set
740# CONFIG_VGASTATE is not set 741# CONFIG_VGASTATE is not set
741# CONFIG_VIDEO_OUTPUT_CONTROL is not set 742# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -818,6 +819,7 @@ CONFIG_EXT2_FS=y
818# CONFIG_GFS2_FS is not set 819# CONFIG_GFS2_FS is not set
819# CONFIG_OCFS2_FS is not set 820# CONFIG_OCFS2_FS is not set
820# CONFIG_BTRFS_FS is not set 821# CONFIG_BTRFS_FS is not set
822# CONFIG_NILFS2_FS is not set
821CONFIG_FILE_LOCKING=y 823CONFIG_FILE_LOCKING=y
822CONFIG_FSNOTIFY=y 824CONFIG_FSNOTIFY=y
823# CONFIG_DNOTIFY is not set 825# CONFIG_DNOTIFY is not set
@@ -882,7 +884,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
882CONFIG_ROMFS_ON_BLOCK=y 884CONFIG_ROMFS_ON_BLOCK=y
883# CONFIG_SYSV_FS is not set 885# CONFIG_SYSV_FS is not set
884# CONFIG_UFS_FS is not set 886# CONFIG_UFS_FS is not set
885# CONFIG_NILFS2_FS is not set
886CONFIG_NETWORK_FILESYSTEMS=y 887CONFIG_NETWORK_FILESYSTEMS=y
887# CONFIG_NFS_FS is not set 888# CONFIG_NFS_FS is not set
888# CONFIG_NFSD is not set 889# CONFIG_NFSD is not set
@@ -909,6 +910,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
909CONFIG_ENABLE_MUST_CHECK=y 910CONFIG_ENABLE_MUST_CHECK=y
910CONFIG_FRAME_WARN=1024 911CONFIG_FRAME_WARN=1024
911# CONFIG_MAGIC_SYSRQ is not set 912# CONFIG_MAGIC_SYSRQ is not set
913# CONFIG_STRIP_ASM_SYMS is not set
912# CONFIG_UNUSED_SYMBOLS is not set 914# CONFIG_UNUSED_SYMBOLS is not set
913# CONFIG_DEBUG_FS is not set 915# CONFIG_DEBUG_FS is not set
914# CONFIG_HEADERS_CHECK is not set 916# CONFIG_HEADERS_CHECK is not set
@@ -922,7 +924,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
922CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 924CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
923CONFIG_HAVE_DYNAMIC_FTRACE=y 925CONFIG_HAVE_DYNAMIC_FTRACE=y
924CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 926CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
925CONFIG_HAVE_FTRACE_SYSCALLS=y 927CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
926CONFIG_TRACING_SUPPORT=y 928CONFIG_TRACING_SUPPORT=y
927# CONFIG_FTRACE is not set 929# CONFIG_FTRACE is not set
928# CONFIG_DMA_API_DEBUG is not set 930# CONFIG_DMA_API_DEBUG is not set
diff --git a/arch/sh/configs/systemh_defconfig b/arch/sh/configs/systemh_defconfig
index 5d970263c096..b9fe960309f5 100644
--- a/arch/sh/configs/systemh_defconfig
+++ b/arch/sh/configs/systemh_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 13:12:28 2009 4# Thu Sep 24 19:35:03 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -27,7 +28,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 28# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 29CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y
31 34
32# 35#
33# General setup 36# General setup
@@ -38,6 +41,12 @@ CONFIG_LOCK_KERNEL=y
38CONFIG_INIT_ENV_ARG_LIMIT=32 41CONFIG_INIT_ENV_ARG_LIMIT=32
39CONFIG_LOCALVERSION="" 42CONFIG_LOCALVERSION=""
40CONFIG_LOCALVERSION_AUTO=y 43CONFIG_LOCALVERSION_AUTO=y
44CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set
41CONFIG_SWAP=y 50CONFIG_SWAP=y
42# CONFIG_SYSVIPC is not set 51# CONFIG_SYSVIPC is not set
43# CONFIG_BSD_PROCESS_ACCT is not set 52# CONFIG_BSD_PROCESS_ACCT is not set
@@ -45,11 +54,12 @@ CONFIG_SWAP=y
45# 54#
46# RCU Subsystem 55# RCU Subsystem
47# 56#
48CONFIG_CLASSIC_RCU=y 57CONFIG_TREE_RCU=y
49# CONFIG_TREE_RCU is not set 58# CONFIG_TREE_PREEMPT_RCU is not set
50# CONFIG_PREEMPT_RCU is not set 59# CONFIG_RCU_TRACE is not set
60CONFIG_RCU_FANOUT=32
61# CONFIG_RCU_FANOUT_EXACT is not set
51# CONFIG_TREE_RCU_TRACE is not set 62# CONFIG_TREE_RCU_TRACE is not set
52# CONFIG_PREEMPT_RCU_TRACE is not set
53# CONFIG_IKCONFIG is not set 63# CONFIG_IKCONFIG is not set
54CONFIG_LOG_BUF_SHIFT=14 64CONFIG_LOG_BUF_SHIFT=14
55# CONFIG_GROUP_SCHED is not set 65# CONFIG_GROUP_SCHED is not set
@@ -83,18 +93,19 @@ CONFIG_TIMERFD=y
83CONFIG_EVENTFD=y 93CONFIG_EVENTFD=y
84CONFIG_SHMEM=y 94CONFIG_SHMEM=y
85CONFIG_AIO=y 95CONFIG_AIO=y
96CONFIG_HAVE_PERF_EVENTS=y
86 97
87# 98#
88# Performance Counters 99# Kernel Performance Events And Counters
89# 100#
101# CONFIG_PERF_EVENTS is not set
102# CONFIG_PERF_COUNTERS is not set
90CONFIG_VM_EVENT_COUNTERS=y 103CONFIG_VM_EVENT_COUNTERS=y
91# CONFIG_STRIP_ASM_SYMS is not set
92CONFIG_COMPAT_BRK=y 104CONFIG_COMPAT_BRK=y
93CONFIG_SLAB=y 105CONFIG_SLAB=y
94# CONFIG_SLUB is not set 106# CONFIG_SLUB is not set
95# CONFIG_SLOB is not set 107# CONFIG_SLOB is not set
96# CONFIG_PROFILING is not set 108# CONFIG_PROFILING is not set
97# CONFIG_MARKERS is not set
98CONFIG_HAVE_OPROFILE=y 109CONFIG_HAVE_OPROFILE=y
99# CONFIG_KPROBES is not set 110# CONFIG_KPROBES is not set
100CONFIG_HAVE_IOREMAP_PROT=y 111CONFIG_HAVE_IOREMAP_PROT=y
@@ -103,6 +114,10 @@ CONFIG_HAVE_KRETPROBES=y
103CONFIG_HAVE_ARCH_TRACEHOOK=y 114CONFIG_HAVE_ARCH_TRACEHOOK=y
104CONFIG_HAVE_CLK=y 115CONFIG_HAVE_CLK=y
105CONFIG_HAVE_DMA_API_DEBUG=y 116CONFIG_HAVE_DMA_API_DEBUG=y
117
118#
119# GCOV-based kernel profiling
120#
106# CONFIG_SLOW_WORK is not set 121# CONFIG_SLOW_WORK is not set
107CONFIG_HAVE_GENERIC_DMA_COHERENT=y 122CONFIG_HAVE_GENERIC_DMA_COHERENT=y
108CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
@@ -115,7 +130,7 @@ CONFIG_MODULE_UNLOAD=y
115# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
116# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
117CONFIG_BLOCK=y 132CONFIG_BLOCK=y
118# CONFIG_LBD is not set 133CONFIG_LBDAF=y
119# CONFIG_BLK_DEV_BSG is not set 134# CONFIG_BLK_DEV_BSG is not set
120# CONFIG_BLK_DEV_INTEGRITY is not set 135# CONFIG_BLK_DEV_INTEGRITY is not set
121 136
@@ -162,6 +177,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
162# CONFIG_CPU_SUBTYPE_SH4_202 is not set 177# CONFIG_CPU_SUBTYPE_SH4_202 is not set
163# CONFIG_CPU_SUBTYPE_SH7723 is not set 178# CONFIG_CPU_SUBTYPE_SH7723 is not set
164# CONFIG_CPU_SUBTYPE_SH7724 is not set 179# CONFIG_CPU_SUBTYPE_SH7724 is not set
180# CONFIG_CPU_SUBTYPE_SH7757 is not set
165# CONFIG_CPU_SUBTYPE_SH7763 is not set 181# CONFIG_CPU_SUBTYPE_SH7763 is not set
166# CONFIG_CPU_SUBTYPE_SH7770 is not set 182# CONFIG_CPU_SUBTYPE_SH7770 is not set
167# CONFIG_CPU_SUBTYPE_SH7780 is not set 183# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -207,6 +223,7 @@ CONFIG_ZONE_DMA_FLAG=0
207CONFIG_NR_QUICK=2 223CONFIG_NR_QUICK=2
208CONFIG_HAVE_MLOCK=y 224CONFIG_HAVE_MLOCK=y
209CONFIG_HAVE_MLOCKED_PAGE_BIT=y 225CONFIG_HAVE_MLOCKED_PAGE_BIT=y
226# CONFIG_KSM is not set
210CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 227CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
211 228
212# 229#
@@ -294,7 +311,8 @@ CONFIG_ZERO_PAGE_OFFSET=0x00001000
294CONFIG_BOOT_LINK_OFFSET=0x00800000 311CONFIG_BOOT_LINK_OFFSET=0x00800000
295CONFIG_ENTRY_OFFSET=0x00001000 312CONFIG_ENTRY_OFFSET=0x00001000
296# CONFIG_UBC_WAKEUP is not set 313# CONFIG_UBC_WAKEUP is not set
297# CONFIG_CMDLINE_BOOL is not set 314# CONFIG_CMDLINE_OVERWRITE is not set
315# CONFIG_CMDLINE_EXTEND is not set
298 316
299# 317#
300# Bus options 318# Bus options
@@ -402,10 +420,20 @@ CONFIG_HW_RANDOM=y
402# CONFIG_TCG_TPM is not set 420# CONFIG_TCG_TPM is not set
403# CONFIG_I2C is not set 421# CONFIG_I2C is not set
404# CONFIG_SPI is not set 422# CONFIG_SPI is not set
423
424#
425# PPS support
426#
427# CONFIG_PPS is not set
405# CONFIG_W1 is not set 428# CONFIG_W1 is not set
406# CONFIG_POWER_SUPPLY is not set 429# CONFIG_POWER_SUPPLY is not set
407CONFIG_HWMON=y 430CONFIG_HWMON=y
408# CONFIG_HWMON_VID is not set 431# CONFIG_HWMON_VID is not set
432# CONFIG_HWMON_DEBUG_CHIP is not set
433
434#
435# Native drivers
436#
409# CONFIG_SENSORS_F71805F is not set 437# CONFIG_SENSORS_F71805F is not set
410# CONFIG_SENSORS_F71882FG is not set 438# CONFIG_SENSORS_F71882FG is not set
411# CONFIG_SENSORS_IT87 is not set 439# CONFIG_SENSORS_IT87 is not set
@@ -416,9 +444,7 @@ CONFIG_HWMON=y
416# CONFIG_SENSORS_VT1211 is not set 444# CONFIG_SENSORS_VT1211 is not set
417# CONFIG_SENSORS_W83627HF is not set 445# CONFIG_SENSORS_W83627HF is not set
418# CONFIG_SENSORS_W83627EHF is not set 446# CONFIG_SENSORS_W83627EHF is not set
419# CONFIG_HWMON_DEBUG_CHIP is not set
420# CONFIG_THERMAL is not set 447# CONFIG_THERMAL is not set
421# CONFIG_THERMAL_HWMON is not set
422# CONFIG_WATCHDOG is not set 448# CONFIG_WATCHDOG is not set
423CONFIG_SSB_POSSIBLE=y 449CONFIG_SSB_POSSIBLE=y
424 450
@@ -495,7 +521,9 @@ CONFIG_RTC_LIB=y
495# CONFIG_JFS_FS is not set 521# CONFIG_JFS_FS is not set
496# CONFIG_FS_POSIX_ACL is not set 522# CONFIG_FS_POSIX_ACL is not set
497# CONFIG_XFS_FS is not set 523# CONFIG_XFS_FS is not set
524# CONFIG_GFS2_FS is not set
498# CONFIG_BTRFS_FS is not set 525# CONFIG_BTRFS_FS is not set
526# CONFIG_NILFS2_FS is not set
499CONFIG_FILE_LOCKING=y 527CONFIG_FILE_LOCKING=y
500CONFIG_FSNOTIFY=y 528CONFIG_FSNOTIFY=y
501CONFIG_DNOTIFY=y 529CONFIG_DNOTIFY=y
@@ -559,7 +587,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
559CONFIG_ROMFS_ON_BLOCK=y 587CONFIG_ROMFS_ON_BLOCK=y
560# CONFIG_SYSV_FS is not set 588# CONFIG_SYSV_FS is not set
561# CONFIG_UFS_FS is not set 589# CONFIG_UFS_FS is not set
562# CONFIG_NILFS2_FS is not set
563 590
564# 591#
565# Partition Types 592# Partition Types
@@ -577,6 +604,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
577CONFIG_ENABLE_MUST_CHECK=y 604CONFIG_ENABLE_MUST_CHECK=y
578CONFIG_FRAME_WARN=1024 605CONFIG_FRAME_WARN=1024
579# CONFIG_MAGIC_SYSRQ is not set 606# CONFIG_MAGIC_SYSRQ is not set
607# CONFIG_STRIP_ASM_SYMS is not set
580# CONFIG_UNUSED_SYMBOLS is not set 608# CONFIG_UNUSED_SYMBOLS is not set
581# CONFIG_DEBUG_FS is not set 609# CONFIG_DEBUG_FS is not set
582# CONFIG_HEADERS_CHECK is not set 610# CONFIG_HEADERS_CHECK is not set
@@ -586,8 +614,11 @@ CONFIG_FRAME_WARN=1024
586# CONFIG_RCU_CPU_STALL_DETECTOR is not set 614# CONFIG_RCU_CPU_STALL_DETECTOR is not set
587# CONFIG_LATENCYTOP is not set 615# CONFIG_LATENCYTOP is not set
588CONFIG_HAVE_FUNCTION_TRACER=y 616CONFIG_HAVE_FUNCTION_TRACER=y
617CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
618CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
589CONFIG_HAVE_DYNAMIC_FTRACE=y 619CONFIG_HAVE_DYNAMIC_FTRACE=y
590CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 620CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
621CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
591CONFIG_TRACING_SUPPORT=y 622CONFIG_TRACING_SUPPORT=y
592# CONFIG_FTRACE is not set 623# CONFIG_FTRACE is not set
593# CONFIG_DMA_API_DEBUG is not set 624# CONFIG_DMA_API_DEBUG is not set
@@ -595,6 +626,7 @@ CONFIG_TRACING_SUPPORT=y
595CONFIG_HAVE_ARCH_KGDB=y 626CONFIG_HAVE_ARCH_KGDB=y
596# CONFIG_SH_STANDARD_BIOS is not set 627# CONFIG_SH_STANDARD_BIOS is not set
597# CONFIG_EARLY_SCIF_CONSOLE is not set 628# CONFIG_EARLY_SCIF_CONSOLE is not set
629# CONFIG_DWARF_UNWINDER is not set
598 630
599# 631#
600# Security options 632# Security options
@@ -623,4 +655,5 @@ CONFIG_DECOMPRESS_GZIP=y
623CONFIG_HAS_IOMEM=y 655CONFIG_HAS_IOMEM=y
624CONFIG_HAS_IOPORT=y 656CONFIG_HAS_IOPORT=y
625CONFIG_HAS_DMA=y 657CONFIG_HAS_DMA=y
658CONFIG_HAVE_LMB=y
626CONFIG_GENERIC_ATOMIC64=y 659CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig
index 7ad080e820ce..2ca79ed9fb62 100644
--- a/arch/sh/configs/titan_defconfig
+++ b/arch/sh/configs/titan_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 13:12:54 2009 4# Thu Sep 24 19:36:36 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,7 +29,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
28# CONFIG_ARCH_HAS_ILOG2_U64 is not set 29# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29CONFIG_ARCH_NO_VIRT_TO_BUS=y 30CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y
32 35
33# 36#
34# General setup 37# General setup
@@ -38,6 +41,12 @@ CONFIG_BROKEN_ON_SMP=y
38CONFIG_INIT_ENV_ARG_LIMIT=32 41CONFIG_INIT_ENV_ARG_LIMIT=32
39CONFIG_LOCALVERSION="" 42CONFIG_LOCALVERSION=""
40# CONFIG_LOCALVERSION_AUTO is not set 43# CONFIG_LOCALVERSION_AUTO is not set
44CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set
41CONFIG_SWAP=y 50CONFIG_SWAP=y
42CONFIG_SYSVIPC=y 51CONFIG_SYSVIPC=y
43CONFIG_SYSVIPC_SYSCTL=y 52CONFIG_SYSVIPC_SYSCTL=y
@@ -50,11 +59,12 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
50# 59#
51# RCU Subsystem 60# RCU Subsystem
52# 61#
53CONFIG_CLASSIC_RCU=y 62CONFIG_TREE_RCU=y
54# CONFIG_TREE_RCU is not set 63# CONFIG_TREE_PREEMPT_RCU is not set
55# CONFIG_PREEMPT_RCU is not set 64# CONFIG_RCU_TRACE is not set
65CONFIG_RCU_FANOUT=32
66# CONFIG_RCU_FANOUT_EXACT is not set
56# CONFIG_TREE_RCU_TRACE is not set 67# CONFIG_TREE_RCU_TRACE is not set
57# CONFIG_PREEMPT_RCU_TRACE is not set
58CONFIG_IKCONFIG=y 68CONFIG_IKCONFIG=y
59CONFIG_IKCONFIG_PROC=y 69CONFIG_IKCONFIG_PROC=y
60CONFIG_LOG_BUF_SHIFT=16 70CONFIG_LOG_BUF_SHIFT=16
@@ -90,19 +100,20 @@ CONFIG_TIMERFD=y
90CONFIG_EVENTFD=y 100CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 101CONFIG_SHMEM=y
92CONFIG_AIO=y 102CONFIG_AIO=y
103CONFIG_HAVE_PERF_EVENTS=y
93 104
94# 105#
95# Performance Counters 106# Kernel Performance Events And Counters
96# 107#
108# CONFIG_PERF_EVENTS is not set
109# CONFIG_PERF_COUNTERS is not set
97CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
98CONFIG_PCI_QUIRKS=y 111CONFIG_PCI_QUIRKS=y
99# CONFIG_STRIP_ASM_SYMS is not set
100CONFIG_COMPAT_BRK=y 112CONFIG_COMPAT_BRK=y
101CONFIG_SLAB=y 113CONFIG_SLAB=y
102# CONFIG_SLUB is not set 114# CONFIG_SLUB is not set
103# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
104# CONFIG_PROFILING is not set 116# CONFIG_PROFILING is not set
105# CONFIG_MARKERS is not set
106CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
107# CONFIG_KPROBES is not set 118# CONFIG_KPROBES is not set
108CONFIG_HAVE_IOREMAP_PROT=y 119CONFIG_HAVE_IOREMAP_PROT=y
@@ -111,6 +122,10 @@ CONFIG_HAVE_KRETPROBES=y
111CONFIG_HAVE_ARCH_TRACEHOOK=y 122CONFIG_HAVE_ARCH_TRACEHOOK=y
112CONFIG_HAVE_CLK=y 123CONFIG_HAVE_CLK=y
113CONFIG_HAVE_DMA_API_DEBUG=y 124CONFIG_HAVE_DMA_API_DEBUG=y
125
126#
127# GCOV-based kernel profiling
128#
114# CONFIG_SLOW_WORK is not set 129# CONFIG_SLOW_WORK is not set
115CONFIG_HAVE_GENERIC_DMA_COHERENT=y 130CONFIG_HAVE_GENERIC_DMA_COHERENT=y
116CONFIG_SLABINFO=y 131CONFIG_SLABINFO=y
@@ -123,7 +138,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
123# CONFIG_MODVERSIONS is not set 138# CONFIG_MODVERSIONS is not set
124# CONFIG_MODULE_SRCVERSION_ALL is not set 139# CONFIG_MODULE_SRCVERSION_ALL is not set
125CONFIG_BLOCK=y 140CONFIG_BLOCK=y
126# CONFIG_LBD is not set 141CONFIG_LBDAF=y
127# CONFIG_BLK_DEV_BSG is not set 142# CONFIG_BLK_DEV_BSG is not set
128# CONFIG_BLK_DEV_INTEGRITY is not set 143# CONFIG_BLK_DEV_INTEGRITY is not set
129 144
@@ -170,6 +185,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
170# CONFIG_CPU_SUBTYPE_SH4_202 is not set 185# CONFIG_CPU_SUBTYPE_SH4_202 is not set
171# CONFIG_CPU_SUBTYPE_SH7723 is not set 186# CONFIG_CPU_SUBTYPE_SH7723 is not set
172# CONFIG_CPU_SUBTYPE_SH7724 is not set 187# CONFIG_CPU_SUBTYPE_SH7724 is not set
188# CONFIG_CPU_SUBTYPE_SH7757 is not set
173# CONFIG_CPU_SUBTYPE_SH7763 is not set 189# CONFIG_CPU_SUBTYPE_SH7763 is not set
174# CONFIG_CPU_SUBTYPE_SH7770 is not set 190# CONFIG_CPU_SUBTYPE_SH7770 is not set
175# CONFIG_CPU_SUBTYPE_SH7780 is not set 191# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -215,6 +231,7 @@ CONFIG_ZONE_DMA_FLAG=0
215CONFIG_NR_QUICK=2 231CONFIG_NR_QUICK=2
216CONFIG_HAVE_MLOCK=y 232CONFIG_HAVE_MLOCK=y
217CONFIG_HAVE_MLOCKED_PAGE_BIT=y 233CONFIG_HAVE_MLOCKED_PAGE_BIT=y
234# CONFIG_KSM is not set
218CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 235CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
219 236
220# 237#
@@ -307,7 +324,8 @@ CONFIG_ZERO_PAGE_OFFSET=0x00001000
307CONFIG_BOOT_LINK_OFFSET=0x009e0000 324CONFIG_BOOT_LINK_OFFSET=0x009e0000
308CONFIG_ENTRY_OFFSET=0x00001000 325CONFIG_ENTRY_OFFSET=0x00001000
309# CONFIG_UBC_WAKEUP is not set 326# CONFIG_UBC_WAKEUP is not set
310CONFIG_CMDLINE_BOOL=y 327CONFIG_CMDLINE_OVERWRITE=y
328# CONFIG_CMDLINE_EXTEND is not set
311CONFIG_CMDLINE="console=ttySC1,38400N81 root=/dev/nfs ip=:::::eth1:autoconf rw" 329CONFIG_CMDLINE="console=ttySC1,38400N81 root=/dev/nfs ip=:::::eth1:autoconf rw"
312 330
313# 331#
@@ -509,6 +527,7 @@ CONFIG_IP6_NF_RAW=m
509# CONFIG_BRIDGE_NF_EBTABLES is not set 527# CONFIG_BRIDGE_NF_EBTABLES is not set
510# CONFIG_IP_DCCP is not set 528# CONFIG_IP_DCCP is not set
511# CONFIG_IP_SCTP is not set 529# CONFIG_IP_SCTP is not set
530# CONFIG_RDS is not set
512# CONFIG_TIPC is not set 531# CONFIG_TIPC is not set
513# CONFIG_ATM is not set 532# CONFIG_ATM is not set
514CONFIG_STP=y 533CONFIG_STP=y
@@ -595,6 +614,7 @@ CONFIG_NET_SCH_FIFO=y
595CONFIG_FIB_RULES=y 614CONFIG_FIB_RULES=y
596CONFIG_WIRELESS=y 615CONFIG_WIRELESS=y
597# CONFIG_CFG80211 is not set 616# CONFIG_CFG80211 is not set
617CONFIG_CFG80211_DEFAULT_PS_VALUE=0
598# CONFIG_WIRELESS_OLD_REGULATORY is not set 618# CONFIG_WIRELESS_OLD_REGULATORY is not set
599CONFIG_WIRELESS_EXT=y 619CONFIG_WIRELESS_EXT=y
600CONFIG_WIRELESS_EXT_SYSFS=y 620CONFIG_WIRELESS_EXT_SYSFS=y
@@ -603,7 +623,6 @@ CONFIG_WIRELESS_EXT_SYSFS=y
603# 623#
604# CFG80211 needs to be enabled for MAC80211 624# CFG80211 needs to be enabled for MAC80211
605# 625#
606CONFIG_MAC80211_DEFAULT_PS_VALUE=0
607# CONFIG_WIMAX is not set 626# CONFIG_WIMAX is not set
608# CONFIG_RFKILL is not set 627# CONFIG_RFKILL is not set
609# CONFIG_NET_9P is not set 628# CONFIG_NET_9P is not set
@@ -616,6 +635,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
616# Generic Driver Options 635# Generic Driver Options
617# 636#
618CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 637CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
638# CONFIG_DEVTMPFS is not set
619CONFIG_STANDALONE=y 639CONFIG_STANDALONE=y
620CONFIG_PREVENT_FIRMWARE_BUILD=y 640CONFIG_PREVENT_FIRMWARE_BUILD=y
621CONFIG_FW_LOADER=m 641CONFIG_FW_LOADER=m
@@ -628,9 +648,9 @@ CONFIG_CONNECTOR=m
628CONFIG_MTD=m 648CONFIG_MTD=m
629CONFIG_MTD_DEBUG=y 649CONFIG_MTD_DEBUG=y
630CONFIG_MTD_DEBUG_VERBOSE=0 650CONFIG_MTD_DEBUG_VERBOSE=0
651# CONFIG_MTD_TESTS is not set
631# CONFIG_MTD_CONCAT is not set 652# CONFIG_MTD_CONCAT is not set
632# CONFIG_MTD_PARTITIONS is not set 653# CONFIG_MTD_PARTITIONS is not set
633# CONFIG_MTD_TESTS is not set
634 654
635# 655#
636# User Modules And Translation Layers 656# User Modules And Translation Layers
@@ -820,6 +840,7 @@ CONFIG_SCSI_LOWLEVEL=y
820# CONFIG_SCSI_DC390T is not set 840# CONFIG_SCSI_DC390T is not set
821# CONFIG_SCSI_NSP32 is not set 841# CONFIG_SCSI_NSP32 is not set
822# CONFIG_SCSI_DEBUG is not set 842# CONFIG_SCSI_DEBUG is not set
843# CONFIG_SCSI_PMCRAID is not set
823# CONFIG_SCSI_SRP is not set 844# CONFIG_SCSI_SRP is not set
824# CONFIG_SCSI_DH is not set 845# CONFIG_SCSI_DH is not set
825# CONFIG_SCSI_OSD_INITIATOR is not set 846# CONFIG_SCSI_OSD_INITIATOR is not set
@@ -832,7 +853,11 @@ CONFIG_SCSI_LOWLEVEL=y
832# 853#
833 854
834# 855#
835# Enable only one of the two stacks, unless you know what you are doing 856# You can enable one or both FireWire driver stacks.
857#
858
859#
860# See the help texts for more information.
836# 861#
837# CONFIG_FIREWIRE is not set 862# CONFIG_FIREWIRE is not set
838# CONFIG_IEEE1394 is not set 863# CONFIG_IEEE1394 is not set
@@ -931,6 +956,7 @@ CONFIG_NETDEV_1000=y
931# CONFIG_VIA_VELOCITY is not set 956# CONFIG_VIA_VELOCITY is not set
932# CONFIG_TIGON3 is not set 957# CONFIG_TIGON3 is not set
933# CONFIG_BNX2 is not set 958# CONFIG_BNX2 is not set
959# CONFIG_CNIC is not set
934# CONFIG_QLA3XXX is not set 960# CONFIG_QLA3XXX is not set
935# CONFIG_ATL1 is not set 961# CONFIG_ATL1 is not set
936# CONFIG_ATL1E is not set 962# CONFIG_ATL1E is not set
@@ -956,10 +982,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
956# CONFIG_SFC is not set 982# CONFIG_SFC is not set
957# CONFIG_BE2NET is not set 983# CONFIG_BE2NET is not set
958# CONFIG_TR is not set 984# CONFIG_TR is not set
959 985CONFIG_WLAN=y
960#
961# Wireless LAN
962#
963# CONFIG_WLAN_PRE80211 is not set 986# CONFIG_WLAN_PRE80211 is not set
964# CONFIG_WLAN_80211 is not set 987# CONFIG_WLAN_80211 is not set
965 988
@@ -1087,10 +1110,20 @@ CONFIG_HW_RANDOM=y
1087CONFIG_DEVPORT=y 1110CONFIG_DEVPORT=y
1088# CONFIG_I2C is not set 1111# CONFIG_I2C is not set
1089# CONFIG_SPI is not set 1112# CONFIG_SPI is not set
1113
1114#
1115# PPS support
1116#
1117# CONFIG_PPS is not set
1090# CONFIG_W1 is not set 1118# CONFIG_W1 is not set
1091# CONFIG_POWER_SUPPLY is not set 1119# CONFIG_POWER_SUPPLY is not set
1092CONFIG_HWMON=y 1120CONFIG_HWMON=y
1093# CONFIG_HWMON_VID is not set 1121# CONFIG_HWMON_VID is not set
1122# CONFIG_HWMON_DEBUG_CHIP is not set
1123
1124#
1125# Native drivers
1126#
1094# CONFIG_SENSORS_I5K_AMB is not set 1127# CONFIG_SENSORS_I5K_AMB is not set
1095# CONFIG_SENSORS_F71805F is not set 1128# CONFIG_SENSORS_F71805F is not set
1096# CONFIG_SENSORS_F71882FG is not set 1129# CONFIG_SENSORS_F71882FG is not set
@@ -1105,9 +1138,7 @@ CONFIG_HWMON=y
1105# CONFIG_SENSORS_VT8231 is not set 1138# CONFIG_SENSORS_VT8231 is not set
1106# CONFIG_SENSORS_W83627HF is not set 1139# CONFIG_SENSORS_W83627HF is not set
1107# CONFIG_SENSORS_W83627EHF is not set 1140# CONFIG_SENSORS_W83627EHF is not set
1108# CONFIG_HWMON_DEBUG_CHIP is not set
1109# CONFIG_THERMAL is not set 1141# CONFIG_THERMAL is not set
1110# CONFIG_THERMAL_HWMON is not set
1111CONFIG_WATCHDOG=y 1142CONFIG_WATCHDOG=y
1112# CONFIG_WATCHDOG_NOWAYOUT is not set 1143# CONFIG_WATCHDOG_NOWAYOUT is not set
1113 1144
@@ -1149,6 +1180,7 @@ CONFIG_SSB_POSSIBLE=y
1149# 1180#
1150# Graphics support 1181# Graphics support
1151# 1182#
1183CONFIG_VGA_ARB=y
1152# CONFIG_DRM is not set 1184# CONFIG_DRM is not set
1153# CONFIG_VGASTATE is not set 1185# CONFIG_VGASTATE is not set
1154# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1186# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1167,7 +1199,6 @@ CONFIG_DUMMY_CONSOLE=y
1167# CONFIG_SOUND is not set 1199# CONFIG_SOUND is not set
1168CONFIG_HID_SUPPORT=y 1200CONFIG_HID_SUPPORT=y
1169CONFIG_HID=y 1201CONFIG_HID=y
1170# CONFIG_HID_DEBUG is not set
1171# CONFIG_HIDRAW is not set 1202# CONFIG_HIDRAW is not set
1172 1203
1173# 1204#
@@ -1217,6 +1248,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
1217# CONFIG_USB_OXU210HP_HCD is not set 1248# CONFIG_USB_OXU210HP_HCD is not set
1218# CONFIG_USB_ISP116X_HCD is not set 1249# CONFIG_USB_ISP116X_HCD is not set
1219# CONFIG_USB_ISP1760_HCD is not set 1250# CONFIG_USB_ISP1760_HCD is not set
1251# CONFIG_USB_ISP1362_HCD is not set
1220CONFIG_USB_OHCI_HCD=y 1252CONFIG_USB_OHCI_HCD=y
1221# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 1253# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1222# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 1254# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -1416,8 +1448,10 @@ CONFIG_XFS_FS=m
1416# CONFIG_XFS_POSIX_ACL is not set 1448# CONFIG_XFS_POSIX_ACL is not set
1417# CONFIG_XFS_RT is not set 1449# CONFIG_XFS_RT is not set
1418# CONFIG_XFS_DEBUG is not set 1450# CONFIG_XFS_DEBUG is not set
1451# CONFIG_GFS2_FS is not set
1419# CONFIG_OCFS2_FS is not set 1452# CONFIG_OCFS2_FS is not set
1420# CONFIG_BTRFS_FS is not set 1453# CONFIG_BTRFS_FS is not set
1454# CONFIG_NILFS2_FS is not set
1421CONFIG_FILE_LOCKING=y 1455CONFIG_FILE_LOCKING=y
1422CONFIG_FSNOTIFY=y 1456CONFIG_FSNOTIFY=y
1423CONFIG_DNOTIFY=y 1457CONFIG_DNOTIFY=y
@@ -1489,7 +1523,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
1489CONFIG_ROMFS_ON_BLOCK=y 1523CONFIG_ROMFS_ON_BLOCK=y
1490# CONFIG_SYSV_FS is not set 1524# CONFIG_SYSV_FS is not set
1491# CONFIG_UFS_FS is not set 1525# CONFIG_UFS_FS is not set
1492# CONFIG_NILFS2_FS is not set
1493CONFIG_NETWORK_FILESYSTEMS=y 1526CONFIG_NETWORK_FILESYSTEMS=y
1494CONFIG_NFS_FS=y 1527CONFIG_NFS_FS=y
1495CONFIG_NFS_V3=y 1528CONFIG_NFS_V3=y
@@ -1591,6 +1624,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
1591CONFIG_ENABLE_MUST_CHECK=y 1624CONFIG_ENABLE_MUST_CHECK=y
1592CONFIG_FRAME_WARN=1024 1625CONFIG_FRAME_WARN=1024
1593CONFIG_MAGIC_SYSRQ=y 1626CONFIG_MAGIC_SYSRQ=y
1627# CONFIG_STRIP_ASM_SYMS is not set
1594# CONFIG_UNUSED_SYMBOLS is not set 1628# CONFIG_UNUSED_SYMBOLS is not set
1595# CONFIG_DEBUG_FS is not set 1629# CONFIG_DEBUG_FS is not set
1596# CONFIG_HEADERS_CHECK is not set 1630# CONFIG_HEADERS_CHECK is not set
@@ -1621,23 +1655,29 @@ CONFIG_SCHED_DEBUG=y
1621# CONFIG_DEBUG_LIST is not set 1655# CONFIG_DEBUG_LIST is not set
1622# CONFIG_DEBUG_SG is not set 1656# CONFIG_DEBUG_SG is not set
1623# CONFIG_DEBUG_NOTIFIERS is not set 1657# CONFIG_DEBUG_NOTIFIERS is not set
1658# CONFIG_DEBUG_CREDENTIALS is not set
1624# CONFIG_FRAME_POINTER is not set 1659# CONFIG_FRAME_POINTER is not set
1625# CONFIG_RCU_TORTURE_TEST is not set 1660# CONFIG_RCU_TORTURE_TEST is not set
1626# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1661# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1627# CONFIG_BACKTRACE_SELF_TEST is not set 1662# CONFIG_BACKTRACE_SELF_TEST is not set
1628# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1663# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1664# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1629# CONFIG_FAULT_INJECTION is not set 1665# CONFIG_FAULT_INJECTION is not set
1630# CONFIG_LATENCYTOP is not set 1666# CONFIG_LATENCYTOP is not set
1631# CONFIG_PAGE_POISONING is not set 1667# CONFIG_PAGE_POISONING is not set
1632CONFIG_HAVE_FUNCTION_TRACER=y 1668CONFIG_HAVE_FUNCTION_TRACER=y
1669CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1670CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1633CONFIG_HAVE_DYNAMIC_FTRACE=y 1671CONFIG_HAVE_DYNAMIC_FTRACE=y
1634CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1672CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1673CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1635CONFIG_TRACING_SUPPORT=y 1674CONFIG_TRACING_SUPPORT=y
1636CONFIG_FTRACE=y 1675CONFIG_FTRACE=y
1637# CONFIG_FUNCTION_TRACER is not set 1676# CONFIG_FUNCTION_TRACER is not set
1638# CONFIG_IRQSOFF_TRACER is not set 1677# CONFIG_IRQSOFF_TRACER is not set
1639# CONFIG_SCHED_TRACER is not set 1678# CONFIG_SCHED_TRACER is not set
1640# CONFIG_ENABLE_DEFAULT_TRACERS is not set 1679# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1680# CONFIG_FTRACE_SYSCALLS is not set
1641# CONFIG_BOOT_TRACER is not set 1681# CONFIG_BOOT_TRACER is not set
1642CONFIG_BRANCH_PROFILE_NONE=y 1682CONFIG_BRANCH_PROFILE_NONE=y
1643# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1683# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
@@ -1650,14 +1690,13 @@ CONFIG_BRANCH_PROFILE_NONE=y
1650# CONFIG_SAMPLES is not set 1690# CONFIG_SAMPLES is not set
1651CONFIG_HAVE_ARCH_KGDB=y 1691CONFIG_HAVE_ARCH_KGDB=y
1652# CONFIG_KGDB is not set 1692# CONFIG_KGDB is not set
1653# CONFIG_KMEMCHECK is not set
1654# CONFIG_SH_STANDARD_BIOS is not set 1693# CONFIG_SH_STANDARD_BIOS is not set
1655# CONFIG_EARLY_SCIF_CONSOLE is not set 1694# CONFIG_EARLY_SCIF_CONSOLE is not set
1656# CONFIG_DEBUG_BOOTMEM is not set 1695# CONFIG_STACK_DEBUG is not set
1657# CONFIG_DEBUG_STACKOVERFLOW is not set
1658# CONFIG_DEBUG_STACK_USAGE is not set 1696# CONFIG_DEBUG_STACK_USAGE is not set
1659# CONFIG_4KSTACKS is not set 1697# CONFIG_4KSTACKS is not set
1660# CONFIG_DUMP_CODE is not set 1698# CONFIG_DUMP_CODE is not set
1699# CONFIG_DWARF_UNWINDER is not set
1661# CONFIG_SH_NO_BSS_INIT is not set 1700# CONFIG_SH_NO_BSS_INIT is not set
1662 1701
1663# 1702#
@@ -1672,7 +1711,6 @@ CONFIG_CRYPTO=y
1672# 1711#
1673# Crypto core or helper 1712# Crypto core or helper
1674# 1713#
1675# CONFIG_CRYPTO_FIPS is not set
1676CONFIG_CRYPTO_ALGAPI=y 1714CONFIG_CRYPTO_ALGAPI=y
1677CONFIG_CRYPTO_ALGAPI2=y 1715CONFIG_CRYPTO_ALGAPI2=y
1678CONFIG_CRYPTO_AEAD=y 1716CONFIG_CRYPTO_AEAD=y
@@ -1715,11 +1753,13 @@ CONFIG_CRYPTO_ECB=y
1715# 1753#
1716CONFIG_CRYPTO_HMAC=y 1754CONFIG_CRYPTO_HMAC=y
1717# CONFIG_CRYPTO_XCBC is not set 1755# CONFIG_CRYPTO_XCBC is not set
1756# CONFIG_CRYPTO_VMAC is not set
1718 1757
1719# 1758#
1720# Digest 1759# Digest
1721# 1760#
1722CONFIG_CRYPTO_CRC32C=m 1761CONFIG_CRYPTO_CRC32C=m
1762# CONFIG_CRYPTO_GHASH is not set
1723CONFIG_CRYPTO_MD4=m 1763CONFIG_CRYPTO_MD4=m
1724CONFIG_CRYPTO_MD5=y 1764CONFIG_CRYPTO_MD5=y
1725CONFIG_CRYPTO_MICHAEL_MIC=y 1765CONFIG_CRYPTO_MICHAEL_MIC=y
@@ -1790,5 +1830,6 @@ CONFIG_TEXTSEARCH_FSM=m
1790CONFIG_HAS_IOMEM=y 1830CONFIG_HAS_IOMEM=y
1791CONFIG_HAS_IOPORT=y 1831CONFIG_HAS_IOPORT=y
1792CONFIG_HAS_DMA=y 1832CONFIG_HAS_DMA=y
1833CONFIG_HAVE_LMB=y
1793CONFIG_NLATTR=y 1834CONFIG_NLATTR=y
1794CONFIG_GENERIC_ATOMIC64=y 1835CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/ul2_defconfig b/arch/sh/configs/ul2_defconfig
index 608fe563614c..b012ca77f029 100644
--- a/arch/sh/configs/ul2_defconfig
+++ b/arch/sh/configs/ul2_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 13:14:36 2009 4# Thu Sep 24 19:42:33 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -29,7 +30,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
29# CONFIG_ARCH_HAS_ILOG2_U64 is not set 30# CONFIG_ARCH_HAS_ILOG2_U64 is not set
30CONFIG_ARCH_NO_VIRT_TO_BUS=y 31CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y
33 36
34# 37#
35# General setup 38# General setup
@@ -40,6 +43,12 @@ CONFIG_LOCK_KERNEL=y
40CONFIG_INIT_ENV_ARG_LIMIT=32 43CONFIG_INIT_ENV_ARG_LIMIT=32
41CONFIG_LOCALVERSION="" 44CONFIG_LOCALVERSION=""
42CONFIG_LOCALVERSION_AUTO=y 45CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set
43CONFIG_SWAP=y 52CONFIG_SWAP=y
44CONFIG_SYSVIPC=y 53CONFIG_SYSVIPC=y
45CONFIG_SYSVIPC_SYSCTL=y 54CONFIG_SYSVIPC_SYSCTL=y
@@ -52,11 +61,12 @@ CONFIG_BSD_PROCESS_ACCT=y
52# 61#
53# RCU Subsystem 62# RCU Subsystem
54# 63#
55CONFIG_CLASSIC_RCU=y 64CONFIG_TREE_RCU=y
56# CONFIG_TREE_RCU is not set 65# CONFIG_TREE_PREEMPT_RCU is not set
57# CONFIG_PREEMPT_RCU is not set 66# CONFIG_RCU_TRACE is not set
67CONFIG_RCU_FANOUT=32
68# CONFIG_RCU_FANOUT_EXACT is not set
58# CONFIG_TREE_RCU_TRACE is not set 69# CONFIG_TREE_RCU_TRACE is not set
59# CONFIG_PREEMPT_RCU_TRACE is not set
60CONFIG_IKCONFIG=y 70CONFIG_IKCONFIG=y
61CONFIG_IKCONFIG_PROC=y 71CONFIG_IKCONFIG_PROC=y
62CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
@@ -91,19 +101,20 @@ CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 102CONFIG_SHMEM=y
93CONFIG_AIO=y 103CONFIG_AIO=y
104CONFIG_HAVE_PERF_EVENTS=y
94 105
95# 106#
96# Performance Counters 107# Kernel Performance Events And Counters
97# 108#
109CONFIG_PERF_EVENTS=y
110# CONFIG_PERF_COUNTERS is not set
98CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
99CONFIG_SLUB_DEBUG=y 112CONFIG_SLUB_DEBUG=y
100# CONFIG_STRIP_ASM_SYMS is not set
101CONFIG_COMPAT_BRK=y 113CONFIG_COMPAT_BRK=y
102# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
103CONFIG_SLUB=y 115CONFIG_SLUB=y
104# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
105CONFIG_PROFILING=y 117CONFIG_PROFILING=y
106# CONFIG_MARKERS is not set
107# CONFIG_OPROFILE is not set 118# CONFIG_OPROFILE is not set
108CONFIG_HAVE_OPROFILE=y 119CONFIG_HAVE_OPROFILE=y
109# CONFIG_KPROBES is not set 120# CONFIG_KPROBES is not set
@@ -113,6 +124,10 @@ CONFIG_HAVE_KRETPROBES=y
113CONFIG_HAVE_ARCH_TRACEHOOK=y 124CONFIG_HAVE_ARCH_TRACEHOOK=y
114CONFIG_HAVE_CLK=y 125CONFIG_HAVE_CLK=y
115CONFIG_HAVE_DMA_API_DEBUG=y 126CONFIG_HAVE_DMA_API_DEBUG=y
127
128#
129# GCOV-based kernel profiling
130#
116# CONFIG_SLOW_WORK is not set 131# CONFIG_SLOW_WORK is not set
117CONFIG_HAVE_GENERIC_DMA_COHERENT=y 132CONFIG_HAVE_GENERIC_DMA_COHERENT=y
118CONFIG_SLABINFO=y 133CONFIG_SLABINFO=y
@@ -125,7 +140,7 @@ CONFIG_MODULE_UNLOAD=y
125# CONFIG_MODVERSIONS is not set 140# CONFIG_MODVERSIONS is not set
126# CONFIG_MODULE_SRCVERSION_ALL is not set 141# CONFIG_MODULE_SRCVERSION_ALL is not set
127CONFIG_BLOCK=y 142CONFIG_BLOCK=y
128# CONFIG_LBD is not set 143CONFIG_LBDAF=y
129# CONFIG_BLK_DEV_BSG is not set 144# CONFIG_BLK_DEV_BSG is not set
130# CONFIG_BLK_DEV_INTEGRITY is not set 145# CONFIG_BLK_DEV_INTEGRITY is not set
131 146
@@ -141,7 +156,7 @@ CONFIG_IOSCHED_NOOP=y
141# CONFIG_DEFAULT_CFQ is not set 156# CONFIG_DEFAULT_CFQ is not set
142CONFIG_DEFAULT_NOOP=y 157CONFIG_DEFAULT_NOOP=y
143CONFIG_DEFAULT_IOSCHED="noop" 158CONFIG_DEFAULT_IOSCHED="noop"
144# CONFIG_FREEZER is not set 159CONFIG_FREEZER=y
145 160
146# 161#
147# System type 162# System type
@@ -176,6 +191,7 @@ CONFIG_ARCH_SHMOBILE=y
176# CONFIG_CPU_SUBTYPE_SH4_202 is not set 191# CONFIG_CPU_SUBTYPE_SH4_202 is not set
177# CONFIG_CPU_SUBTYPE_SH7723 is not set 192# CONFIG_CPU_SUBTYPE_SH7723 is not set
178# CONFIG_CPU_SUBTYPE_SH7724 is not set 193# CONFIG_CPU_SUBTYPE_SH7724 is not set
194# CONFIG_CPU_SUBTYPE_SH7757 is not set
179# CONFIG_CPU_SUBTYPE_SH7763 is not set 195# CONFIG_CPU_SUBTYPE_SH7763 is not set
180# CONFIG_CPU_SUBTYPE_SH7770 is not set 196# CONFIG_CPU_SUBTYPE_SH7770 is not set
181# CONFIG_CPU_SUBTYPE_SH7780 is not set 197# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -233,6 +249,7 @@ CONFIG_ZONE_DMA_FLAG=0
233CONFIG_NR_QUICK=2 249CONFIG_NR_QUICK=2
234CONFIG_HAVE_MLOCK=y 250CONFIG_HAVE_MLOCK=y
235CONFIG_HAVE_MLOCKED_PAGE_BIT=y 251CONFIG_HAVE_MLOCKED_PAGE_BIT=y
252# CONFIG_KSM is not set
236CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 253CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
237 254
238# 255#
@@ -314,7 +331,8 @@ CONFIG_GUSA=y
314CONFIG_ZERO_PAGE_OFFSET=0x00001000 331CONFIG_ZERO_PAGE_OFFSET=0x00001000
315CONFIG_BOOT_LINK_OFFSET=0x00800000 332CONFIG_BOOT_LINK_OFFSET=0x00800000
316CONFIG_ENTRY_OFFSET=0x00001000 333CONFIG_ENTRY_OFFSET=0x00001000
317CONFIG_CMDLINE_BOOL=y 334CONFIG_CMDLINE_OVERWRITE=y
335# CONFIG_CMDLINE_EXTEND is not set
318CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/nfs ip=dhcp" 336CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/nfs ip=dhcp"
319 337
320# 338#
@@ -334,7 +352,13 @@ CONFIG_BINFMT_ELF=y
334# 352#
335# Power management options (EXPERIMENTAL) 353# Power management options (EXPERIMENTAL)
336# 354#
337# CONFIG_PM is not set 355CONFIG_PM=y
356# CONFIG_PM_DEBUG is not set
357CONFIG_PM_SLEEP=y
358CONFIG_SUSPEND=y
359CONFIG_SUSPEND_FREEZER=y
360# CONFIG_HIBERNATION is not set
361CONFIG_PM_RUNTIME=y
338# CONFIG_CPU_IDLE is not set 362# CONFIG_CPU_IDLE is not set
339CONFIG_NET=y 363CONFIG_NET=y
340 364
@@ -382,6 +406,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
382# CONFIG_NETFILTER is not set 406# CONFIG_NETFILTER is not set
383# CONFIG_IP_DCCP is not set 407# CONFIG_IP_DCCP is not set
384# CONFIG_IP_SCTP is not set 408# CONFIG_IP_SCTP is not set
409# CONFIG_RDS is not set
385# CONFIG_TIPC is not set 410# CONFIG_TIPC is not set
386# CONFIG_ATM is not set 411# CONFIG_ATM is not set
387# CONFIG_BRIDGE is not set 412# CONFIG_BRIDGE is not set
@@ -411,19 +436,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
411# CONFIG_AF_RXRPC is not set 436# CONFIG_AF_RXRPC is not set
412CONFIG_WIRELESS=y 437CONFIG_WIRELESS=y
413CONFIG_CFG80211=y 438CONFIG_CFG80211=y
439# CONFIG_NL80211_TESTMODE is not set
440# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
414# CONFIG_CFG80211_REG_DEBUG is not set 441# CONFIG_CFG80211_REG_DEBUG is not set
442CONFIG_CFG80211_DEFAULT_PS=y
443CONFIG_CFG80211_DEFAULT_PS_VALUE=1
415# CONFIG_WIRELESS_OLD_REGULATORY is not set 444# CONFIG_WIRELESS_OLD_REGULATORY is not set
416CONFIG_WIRELESS_EXT=y 445CONFIG_WIRELESS_EXT=y
417CONFIG_WIRELESS_EXT_SYSFS=y 446CONFIG_WIRELESS_EXT_SYSFS=y
418CONFIG_LIB80211=m 447CONFIG_LIB80211=m
419# CONFIG_LIB80211_DEBUG is not set 448# CONFIG_LIB80211_DEBUG is not set
420CONFIG_MAC80211=y 449CONFIG_MAC80211=y
421CONFIG_MAC80211_DEFAULT_PS=y
422CONFIG_MAC80211_DEFAULT_PS_VALUE=1
423
424#
425# Rate control algorithm selection
426#
427CONFIG_MAC80211_RC_PID=y 450CONFIG_MAC80211_RC_PID=y
428# CONFIG_MAC80211_RC_MINSTREL is not set 451# CONFIG_MAC80211_RC_MINSTREL is not set
429CONFIG_MAC80211_RC_DEFAULT_PID=y 452CONFIG_MAC80211_RC_DEFAULT_PID=y
@@ -444,6 +467,7 @@ CONFIG_MAC80211_RC_DEFAULT="pid"
444# Generic Driver Options 467# Generic Driver Options
445# 468#
446CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 469CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
470# CONFIG_DEVTMPFS is not set
447CONFIG_STANDALONE=y 471CONFIG_STANDALONE=y
448CONFIG_PREVENT_FIRMWARE_BUILD=y 472CONFIG_PREVENT_FIRMWARE_BUILD=y
449CONFIG_FW_LOADER=y 473CONFIG_FW_LOADER=y
@@ -453,9 +477,9 @@ CONFIG_EXTRA_FIRMWARE=""
453# CONFIG_CONNECTOR is not set 477# CONFIG_CONNECTOR is not set
454CONFIG_MTD=y 478CONFIG_MTD=y
455# CONFIG_MTD_DEBUG is not set 479# CONFIG_MTD_DEBUG is not set
480# CONFIG_MTD_TESTS is not set
456CONFIG_MTD_CONCAT=y 481CONFIG_MTD_CONCAT=y
457CONFIG_MTD_PARTITIONS=y 482CONFIG_MTD_PARTITIONS=y
458# CONFIG_MTD_TESTS is not set
459# CONFIG_MTD_REDBOOT_PARTS is not set 483# CONFIG_MTD_REDBOOT_PARTS is not set
460# CONFIG_MTD_CMDLINE_PARTS is not set 484# CONFIG_MTD_CMDLINE_PARTS is not set
461# CONFIG_MTD_AR7_PARTS is not set 485# CONFIG_MTD_AR7_PARTS is not set
@@ -590,7 +614,6 @@ CONFIG_SCSI_WAIT_SCAN=m
590# CONFIG_SCSI_SRP_ATTRS is not set 614# CONFIG_SCSI_SRP_ATTRS is not set
591CONFIG_SCSI_LOWLEVEL=y 615CONFIG_SCSI_LOWLEVEL=y
592# CONFIG_ISCSI_TCP is not set 616# CONFIG_ISCSI_TCP is not set
593# CONFIG_SCSI_BNX2_ISCSI is not set
594# CONFIG_LIBFC is not set 617# CONFIG_LIBFC is not set
595# CONFIG_LIBFCOE is not set 618# CONFIG_LIBFCOE is not set
596# CONFIG_SCSI_DEBUG is not set 619# CONFIG_SCSI_DEBUG is not set
@@ -598,6 +621,7 @@ CONFIG_SCSI_LOWLEVEL=y
598# CONFIG_SCSI_OSD_INITIATOR is not set 621# CONFIG_SCSI_OSD_INITIATOR is not set
599CONFIG_ATA=y 622CONFIG_ATA=y
600# CONFIG_ATA_NONSTANDARD is not set 623# CONFIG_ATA_NONSTANDARD is not set
624CONFIG_ATA_VERBOSE_ERROR=y
601CONFIG_SATA_PMP=y 625CONFIG_SATA_PMP=y
602CONFIG_ATA_SFF=y 626CONFIG_ATA_SFF=y
603# CONFIG_SATA_MV is not set 627# CONFIG_SATA_MV is not set
@@ -631,10 +655,7 @@ CONFIG_MII=y
631# CONFIG_KS8842 is not set 655# CONFIG_KS8842 is not set
632# CONFIG_NETDEV_1000 is not set 656# CONFIG_NETDEV_1000 is not set
633# CONFIG_NETDEV_10000 is not set 657# CONFIG_NETDEV_10000 is not set
634 658CONFIG_WLAN=y
635#
636# Wireless LAN
637#
638# CONFIG_WLAN_PRE80211 is not set 659# CONFIG_WLAN_PRE80211 is not set
639CONFIG_WLAN_80211=y 660CONFIG_WLAN_80211=y
640CONFIG_LIBERTAS=m 661CONFIG_LIBERTAS=m
@@ -648,12 +669,13 @@ CONFIG_LIBERTAS_DEBUG=y
648# CONFIG_RTL8187 is not set 669# CONFIG_RTL8187 is not set
649# CONFIG_MAC80211_HWSIM is not set 670# CONFIG_MAC80211_HWSIM is not set
650# CONFIG_P54_COMMON is not set 671# CONFIG_P54_COMMON is not set
651# CONFIG_AR9170_USB is not set 672# CONFIG_ATH_COMMON is not set
652# CONFIG_HOSTAP is not set 673# CONFIG_HOSTAP is not set
653# CONFIG_B43 is not set 674# CONFIG_B43 is not set
654# CONFIG_B43LEGACY is not set 675# CONFIG_B43LEGACY is not set
655# CONFIG_ZD1211RW is not set 676# CONFIG_ZD1211RW is not set
656# CONFIG_RT2X00 is not set 677# CONFIG_RT2X00 is not set
678# CONFIG_WL12XX is not set
657# CONFIG_IWM is not set 679# CONFIG_IWM is not set
658 680
659# 681#
@@ -750,10 +772,20 @@ CONFIG_SERIAL_CORE_CONSOLE=y
750# CONFIG_TCG_TPM is not set 772# CONFIG_TCG_TPM is not set
751# CONFIG_I2C is not set 773# CONFIG_I2C is not set
752# CONFIG_SPI is not set 774# CONFIG_SPI is not set
775
776#
777# PPS support
778#
779# CONFIG_PPS is not set
753# CONFIG_W1 is not set 780# CONFIG_W1 is not set
754# CONFIG_POWER_SUPPLY is not set 781# CONFIG_POWER_SUPPLY is not set
755CONFIG_HWMON=y 782CONFIG_HWMON=y
756# CONFIG_HWMON_VID is not set 783# CONFIG_HWMON_VID is not set
784# CONFIG_HWMON_DEBUG_CHIP is not set
785
786#
787# Native drivers
788#
757# CONFIG_SENSORS_F71805F is not set 789# CONFIG_SENSORS_F71805F is not set
758# CONFIG_SENSORS_F71882FG is not set 790# CONFIG_SENSORS_F71882FG is not set
759# CONFIG_SENSORS_IT87 is not set 791# CONFIG_SENSORS_IT87 is not set
@@ -764,9 +796,7 @@ CONFIG_HWMON=y
764# CONFIG_SENSORS_VT1211 is not set 796# CONFIG_SENSORS_VT1211 is not set
765# CONFIG_SENSORS_W83627HF is not set 797# CONFIG_SENSORS_W83627HF is not set
766# CONFIG_SENSORS_W83627EHF is not set 798# CONFIG_SENSORS_W83627EHF is not set
767# CONFIG_HWMON_DEBUG_CHIP is not set
768# CONFIG_THERMAL is not set 799# CONFIG_THERMAL is not set
769# CONFIG_THERMAL_HWMON is not set
770# CONFIG_WATCHDOG is not set 800# CONFIG_WATCHDOG is not set
771CONFIG_SSB_POSSIBLE=y 801CONFIG_SSB_POSSIBLE=y
772 802
@@ -813,6 +843,7 @@ CONFIG_USB=y
813# CONFIG_USB_DEVICEFS is not set 843# CONFIG_USB_DEVICEFS is not set
814CONFIG_USB_DEVICE_CLASS=y 844CONFIG_USB_DEVICE_CLASS=y
815# CONFIG_USB_DYNAMIC_MINORS is not set 845# CONFIG_USB_DYNAMIC_MINORS is not set
846# CONFIG_USB_SUSPEND is not set
816# CONFIG_USB_OTG is not set 847# CONFIG_USB_OTG is not set
817# CONFIG_USB_OTG_WHITELIST is not set 848# CONFIG_USB_OTG_WHITELIST is not set
818# CONFIG_USB_OTG_BLACKLIST_HUB is not set 849# CONFIG_USB_OTG_BLACKLIST_HUB is not set
@@ -827,9 +858,9 @@ CONFIG_USB_MON=y
827# CONFIG_USB_OXU210HP_HCD is not set 858# CONFIG_USB_OXU210HP_HCD is not set
828# CONFIG_USB_ISP116X_HCD is not set 859# CONFIG_USB_ISP116X_HCD is not set
829# CONFIG_USB_ISP1760_HCD is not set 860# CONFIG_USB_ISP1760_HCD is not set
861# CONFIG_USB_ISP1362_HCD is not set
830# CONFIG_USB_SL811_HCD is not set 862# CONFIG_USB_SL811_HCD is not set
831CONFIG_USB_R8A66597_HCD=y 863CONFIG_USB_R8A66597_HCD=y
832# CONFIG_SUPERH_ON_CHIP_R8A66597 is not set
833# CONFIG_USB_HWA_HCD is not set 864# CONFIG_USB_HWA_HCD is not set
834 865
835# 866#
@@ -893,6 +924,7 @@ CONFIG_USB_STORAGE=y
893# CONFIG_USB_LD is not set 924# CONFIG_USB_LD is not set
894# CONFIG_USB_TRANCEVIBRATOR is not set 925# CONFIG_USB_TRANCEVIBRATOR is not set
895# CONFIG_USB_IOWARRIOR is not set 926# CONFIG_USB_IOWARRIOR is not set
927# CONFIG_USB_TEST is not set
896# CONFIG_USB_ISIGHTFW is not set 928# CONFIG_USB_ISIGHTFW is not set
897# CONFIG_USB_VST is not set 929# CONFIG_USB_VST is not set
898# CONFIG_USB_GADGET is not set 930# CONFIG_USB_GADGET is not set
@@ -917,6 +949,8 @@ CONFIG_MMC_BLOCK_BOUNCE=y
917# MMC/SD/SDIO Host Controller Drivers 949# MMC/SD/SDIO Host Controller Drivers
918# 950#
919# CONFIG_MMC_SDHCI is not set 951# CONFIG_MMC_SDHCI is not set
952# CONFIG_MMC_AT91 is not set
953# CONFIG_MMC_ATMELMCI is not set
920# CONFIG_MEMSTICK is not set 954# CONFIG_MEMSTICK is not set
921# CONFIG_NEW_LEDS is not set 955# CONFIG_NEW_LEDS is not set
922# CONFIG_ACCESSIBILITY is not set 956# CONFIG_ACCESSIBILITY is not set
@@ -949,8 +983,10 @@ CONFIG_FS_MBCACHE=y
949# CONFIG_JFS_FS is not set 983# CONFIG_JFS_FS is not set
950# CONFIG_FS_POSIX_ACL is not set 984# CONFIG_FS_POSIX_ACL is not set
951# CONFIG_XFS_FS is not set 985# CONFIG_XFS_FS is not set
986# CONFIG_GFS2_FS is not set
952# CONFIG_OCFS2_FS is not set 987# CONFIG_OCFS2_FS is not set
953# CONFIG_BTRFS_FS is not set 988# CONFIG_BTRFS_FS is not set
989# CONFIG_NILFS2_FS is not set
954CONFIG_FILE_LOCKING=y 990CONFIG_FILE_LOCKING=y
955CONFIG_FSNOTIFY=y 991CONFIG_FSNOTIFY=y
956CONFIG_DNOTIFY=y 992CONFIG_DNOTIFY=y
@@ -1014,7 +1050,6 @@ CONFIG_CRAMFS=y
1014# CONFIG_ROMFS_FS is not set 1050# CONFIG_ROMFS_FS is not set
1015# CONFIG_SYSV_FS is not set 1051# CONFIG_SYSV_FS is not set
1016# CONFIG_UFS_FS is not set 1052# CONFIG_UFS_FS is not set
1017# CONFIG_NILFS2_FS is not set
1018CONFIG_NETWORK_FILESYSTEMS=y 1053CONFIG_NETWORK_FILESYSTEMS=y
1019CONFIG_NFS_FS=y 1054CONFIG_NFS_FS=y
1020# CONFIG_NFS_V3 is not set 1055# CONFIG_NFS_V3 is not set
@@ -1091,6 +1126,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1091# CONFIG_ENABLE_MUST_CHECK is not set 1126# CONFIG_ENABLE_MUST_CHECK is not set
1092CONFIG_FRAME_WARN=1024 1127CONFIG_FRAME_WARN=1024
1093# CONFIG_MAGIC_SYSRQ is not set 1128# CONFIG_MAGIC_SYSRQ is not set
1129# CONFIG_STRIP_ASM_SYMS is not set
1094# CONFIG_UNUSED_SYMBOLS is not set 1130# CONFIG_UNUSED_SYMBOLS is not set
1095# CONFIG_DEBUG_FS is not set 1131# CONFIG_DEBUG_FS is not set
1096# CONFIG_HEADERS_CHECK is not set 1132# CONFIG_HEADERS_CHECK is not set
@@ -1103,8 +1139,11 @@ CONFIG_FRAME_WARN=1024
1103# CONFIG_LATENCYTOP is not set 1139# CONFIG_LATENCYTOP is not set
1104# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1140# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1105CONFIG_HAVE_FUNCTION_TRACER=y 1141CONFIG_HAVE_FUNCTION_TRACER=y
1142CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1143CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1106CONFIG_HAVE_DYNAMIC_FTRACE=y 1144CONFIG_HAVE_DYNAMIC_FTRACE=y
1107CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1145CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1146CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1108CONFIG_TRACING_SUPPORT=y 1147CONFIG_TRACING_SUPPORT=y
1109# CONFIG_FTRACE is not set 1148# CONFIG_FTRACE is not set
1110# CONFIG_DMA_API_DEBUG is not set 1149# CONFIG_DMA_API_DEBUG is not set
@@ -1112,6 +1151,7 @@ CONFIG_TRACING_SUPPORT=y
1112CONFIG_HAVE_ARCH_KGDB=y 1151CONFIG_HAVE_ARCH_KGDB=y
1113# CONFIG_SH_STANDARD_BIOS is not set 1152# CONFIG_SH_STANDARD_BIOS is not set
1114# CONFIG_EARLY_SCIF_CONSOLE is not set 1153# CONFIG_EARLY_SCIF_CONSOLE is not set
1154# CONFIG_DWARF_UNWINDER is not set
1115 1155
1116# 1156#
1117# Security options 1157# Security options
@@ -1125,7 +1165,6 @@ CONFIG_CRYPTO=y
1125# 1165#
1126# Crypto core or helper 1166# Crypto core or helper
1127# 1167#
1128# CONFIG_CRYPTO_FIPS is not set
1129CONFIG_CRYPTO_ALGAPI=y 1168CONFIG_CRYPTO_ALGAPI=y
1130CONFIG_CRYPTO_ALGAPI2=y 1169CONFIG_CRYPTO_ALGAPI2=y
1131CONFIG_CRYPTO_AEAD2=y 1170CONFIG_CRYPTO_AEAD2=y
@@ -1167,11 +1206,13 @@ CONFIG_CRYPTO_ECB=y
1167# 1206#
1168# CONFIG_CRYPTO_HMAC is not set 1207# CONFIG_CRYPTO_HMAC is not set
1169# CONFIG_CRYPTO_XCBC is not set 1208# CONFIG_CRYPTO_XCBC is not set
1209# CONFIG_CRYPTO_VMAC is not set
1170 1210
1171# 1211#
1172# Digest 1212# Digest
1173# 1213#
1174# CONFIG_CRYPTO_CRC32C is not set 1214# CONFIG_CRYPTO_CRC32C is not set
1215# CONFIG_CRYPTO_GHASH is not set
1175# CONFIG_CRYPTO_MD4 is not set 1216# CONFIG_CRYPTO_MD4 is not set
1176# CONFIG_CRYPTO_MD5 is not set 1217# CONFIG_CRYPTO_MD5 is not set
1177CONFIG_CRYPTO_MICHAEL_MIC=y 1218CONFIG_CRYPTO_MICHAEL_MIC=y
@@ -1235,5 +1276,6 @@ CONFIG_DECOMPRESS_GZIP=y
1235CONFIG_HAS_IOMEM=y 1276CONFIG_HAS_IOMEM=y
1236CONFIG_HAS_IOPORT=y 1277CONFIG_HAS_IOPORT=y
1237CONFIG_HAS_DMA=y 1278CONFIG_HAS_DMA=y
1279CONFIG_HAVE_LMB=y
1238CONFIG_NLATTR=y 1280CONFIG_NLATTR=y
1239CONFIG_GENERIC_ATOMIC64=y 1281CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/urquell_defconfig b/arch/sh/configs/urquell_defconfig
index ee1987e6cc59..9f8aee5bc559 100644
--- a/arch/sh/configs/urquell_defconfig
+++ b/arch/sh/configs/urquell_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.30 3# Linux kernel version: 2.6.31
4# Thu Jun 18 13:15:28 2009 4# Thu Sep 24 19:46:13 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -14,11 +14,13 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y
17CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
18CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 21# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 22CONFIG_ARCH_HIBERNATION_POSSIBLE=y
23CONFIG_SYS_SUPPORTS_SMP=y
22CONFIG_SYS_SUPPORTS_NUMA=y 24CONFIG_SYS_SUPPORTS_NUMA=y
23CONFIG_SYS_SUPPORTS_PCI=y 25CONFIG_SYS_SUPPORTS_PCI=y
24CONFIG_SYS_SUPPORTS_TMU=y 26CONFIG_SYS_SUPPORTS_TMU=y
@@ -29,7 +31,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
29# CONFIG_ARCH_HAS_ILOG2_U64 is not set 31# CONFIG_ARCH_HAS_ILOG2_U64 is not set
30CONFIG_ARCH_NO_VIRT_TO_BUS=y 32CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 33CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y
33 37
34# 38#
35# General setup 39# General setup
@@ -39,6 +43,12 @@ CONFIG_BROKEN_ON_SMP=y
39CONFIG_INIT_ENV_ARG_LIMIT=32 43CONFIG_INIT_ENV_ARG_LIMIT=32
40CONFIG_LOCALVERSION="" 44CONFIG_LOCALVERSION=""
41CONFIG_LOCALVERSION_AUTO=y 45CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set
42CONFIG_SWAP=y 52CONFIG_SWAP=y
43CONFIG_SYSVIPC=y 53CONFIG_SYSVIPC=y
44CONFIG_SYSVIPC_SYSCTL=y 54CONFIG_SYSVIPC_SYSCTL=y
@@ -54,14 +64,12 @@ CONFIG_AUDIT_TREE=y
54# 64#
55# RCU Subsystem 65# RCU Subsystem
56# 66#
57# CONFIG_CLASSIC_RCU is not set
58CONFIG_TREE_RCU=y 67CONFIG_TREE_RCU=y
59# CONFIG_PREEMPT_RCU is not set 68# CONFIG_TREE_PREEMPT_RCU is not set
60# CONFIG_RCU_TRACE is not set 69# CONFIG_RCU_TRACE is not set
61CONFIG_RCU_FANOUT=32 70CONFIG_RCU_FANOUT=32
62# CONFIG_RCU_FANOUT_EXACT is not set 71# CONFIG_RCU_FANOUT_EXACT is not set
63# CONFIG_TREE_RCU_TRACE is not set 72# CONFIG_TREE_RCU_TRACE is not set
64# CONFIG_PREEMPT_RCU_TRACE is not set
65CONFIG_IKCONFIG=y 73CONFIG_IKCONFIG=y
66CONFIG_IKCONFIG_PROC=y 74CONFIG_IKCONFIG_PROC=y
67CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
@@ -111,20 +119,20 @@ CONFIG_TIMERFD=y
111CONFIG_EVENTFD=y 119CONFIG_EVENTFD=y
112CONFIG_SHMEM=y 120CONFIG_SHMEM=y
113CONFIG_AIO=y 121CONFIG_AIO=y
122CONFIG_HAVE_PERF_EVENTS=y
114 123
115# 124#
116# Performance Counters 125# Kernel Performance Events And Counters
117# 126#
127CONFIG_PERF_EVENTS=y
128# CONFIG_PERF_COUNTERS is not set
118CONFIG_VM_EVENT_COUNTERS=y 129CONFIG_VM_EVENT_COUNTERS=y
119CONFIG_PCI_QUIRKS=y 130CONFIG_PCI_QUIRKS=y
120# CONFIG_STRIP_ASM_SYMS is not set
121CONFIG_COMPAT_BRK=y 131CONFIG_COMPAT_BRK=y
122CONFIG_SLAB=y 132CONFIG_SLAB=y
123# CONFIG_SLUB is not set 133# CONFIG_SLUB is not set
124# CONFIG_SLOB is not set 134# CONFIG_SLOB is not set
125CONFIG_PROFILING=y 135CONFIG_PROFILING=y
126CONFIG_TRACEPOINTS=y
127CONFIG_MARKERS=y
128# CONFIG_OPROFILE is not set 136# CONFIG_OPROFILE is not set
129CONFIG_HAVE_OPROFILE=y 137CONFIG_HAVE_OPROFILE=y
130# CONFIG_KPROBES is not set 138# CONFIG_KPROBES is not set
@@ -134,6 +142,11 @@ CONFIG_HAVE_KRETPROBES=y
134CONFIG_HAVE_ARCH_TRACEHOOK=y 142CONFIG_HAVE_ARCH_TRACEHOOK=y
135CONFIG_HAVE_CLK=y 143CONFIG_HAVE_CLK=y
136CONFIG_HAVE_DMA_API_DEBUG=y 144CONFIG_HAVE_DMA_API_DEBUG=y
145
146#
147# GCOV-based kernel profiling
148#
149# CONFIG_GCOV_KERNEL is not set
137# CONFIG_SLOW_WORK is not set 150# CONFIG_SLOW_WORK is not set
138CONFIG_HAVE_GENERIC_DMA_COHERENT=y 151CONFIG_HAVE_GENERIC_DMA_COHERENT=y
139CONFIG_SLABINFO=y 152CONFIG_SLABINFO=y
@@ -146,7 +159,7 @@ CONFIG_MODULE_UNLOAD=y
146# CONFIG_MODVERSIONS is not set 159# CONFIG_MODVERSIONS is not set
147# CONFIG_MODULE_SRCVERSION_ALL is not set 160# CONFIG_MODULE_SRCVERSION_ALL is not set
148CONFIG_BLOCK=y 161CONFIG_BLOCK=y
149# CONFIG_LBD is not set 162CONFIG_LBDAF=y
150# CONFIG_BLK_DEV_BSG is not set 163# CONFIG_BLK_DEV_BSG is not set
151# CONFIG_BLK_DEV_INTEGRITY is not set 164# CONFIG_BLK_DEV_INTEGRITY is not set
152 165
@@ -195,6 +208,7 @@ CONFIG_CPU_SHX3=y
195# CONFIG_CPU_SUBTYPE_SH4_202 is not set 208# CONFIG_CPU_SUBTYPE_SH4_202 is not set
196# CONFIG_CPU_SUBTYPE_SH7723 is not set 209# CONFIG_CPU_SUBTYPE_SH7723 is not set
197# CONFIG_CPU_SUBTYPE_SH7724 is not set 210# CONFIG_CPU_SUBTYPE_SH7724 is not set
211# CONFIG_CPU_SUBTYPE_SH7757 is not set
198# CONFIG_CPU_SUBTYPE_SH7763 is not set 212# CONFIG_CPU_SUBTYPE_SH7763 is not set
199# CONFIG_CPU_SUBTYPE_SH7770 is not set 213# CONFIG_CPU_SUBTYPE_SH7770 is not set
200# CONFIG_CPU_SUBTYPE_SH7780 is not set 214# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -244,7 +258,6 @@ CONFIG_SPARSEMEM=y
244CONFIG_HAVE_MEMORY_PRESENT=y 258CONFIG_HAVE_MEMORY_PRESENT=y
245CONFIG_SPARSEMEM_STATIC=y 259CONFIG_SPARSEMEM_STATIC=y
246# CONFIG_MEMORY_HOTPLUG is not set 260# CONFIG_MEMORY_HOTPLUG is not set
247CONFIG_PAGEFLAGS_EXTENDED=y
248CONFIG_SPLIT_PTLOCK_CPUS=4 261CONFIG_SPLIT_PTLOCK_CPUS=4
249CONFIG_MIGRATION=y 262CONFIG_MIGRATION=y
250# CONFIG_PHYS_ADDR_T_64BIT is not set 263# CONFIG_PHYS_ADDR_T_64BIT is not set
@@ -252,6 +265,7 @@ CONFIG_ZONE_DMA_FLAG=0
252CONFIG_NR_QUICK=2 265CONFIG_NR_QUICK=2
253CONFIG_HAVE_MLOCK=y 266CONFIG_HAVE_MLOCK=y
254CONFIG_HAVE_MLOCKED_PAGE_BIT=y 267CONFIG_HAVE_MLOCKED_PAGE_BIT=y
268# CONFIG_KSM is not set
255CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 269CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
256 270
257# 271#
@@ -322,6 +336,7 @@ CONFIG_SCHED_HRTICK=y
322CONFIG_KEXEC=y 336CONFIG_KEXEC=y
323# CONFIG_CRASH_DUMP is not set 337# CONFIG_CRASH_DUMP is not set
324CONFIG_SECCOMP=y 338CONFIG_SECCOMP=y
339# CONFIG_SMP is not set
325CONFIG_PREEMPT_NONE=y 340CONFIG_PREEMPT_NONE=y
326# CONFIG_PREEMPT_VOLUNTARY is not set 341# CONFIG_PREEMPT_VOLUNTARY is not set
327# CONFIG_PREEMPT is not set 342# CONFIG_PREEMPT is not set
@@ -334,7 +349,8 @@ CONFIG_SPARSE_IRQ=y
334CONFIG_ZERO_PAGE_OFFSET=0x00001000 349CONFIG_ZERO_PAGE_OFFSET=0x00001000
335CONFIG_BOOT_LINK_OFFSET=0x00800000 350CONFIG_BOOT_LINK_OFFSET=0x00800000
336CONFIG_ENTRY_OFFSET=0x00001000 351CONFIG_ENTRY_OFFSET=0x00001000
337# CONFIG_CMDLINE_BOOL is not set 352# CONFIG_CMDLINE_OVERWRITE is not set
353# CONFIG_CMDLINE_EXTEND is not set
338 354
339# 355#
340# Bus options 356# Bus options
@@ -343,6 +359,8 @@ CONFIG_PCI=y
343# CONFIG_SH_PCIDMA_NONCOHERENT is not set 359# CONFIG_SH_PCIDMA_NONCOHERENT is not set
344CONFIG_PCIEPORTBUS=y 360CONFIG_PCIEPORTBUS=y
345CONFIG_PCIEAER=y 361CONFIG_PCIEAER=y
362# CONFIG_PCIE_ECRC is not set
363# CONFIG_PCIEAER_INJECT is not set
346CONFIG_PCIEASPM=y 364CONFIG_PCIEASPM=y
347CONFIG_PCIEASPM_DEBUG=y 365CONFIG_PCIEASPM_DEBUG=y
348# CONFIG_ARCH_SUPPORTS_MSI is not set 366# CONFIG_ARCH_SUPPORTS_MSI is not set
@@ -367,6 +385,7 @@ CONFIG_BINFMT_MISC=y
367CONFIG_PM=y 385CONFIG_PM=y
368# CONFIG_PM_DEBUG is not set 386# CONFIG_PM_DEBUG is not set
369# CONFIG_HIBERNATION is not set 387# CONFIG_HIBERNATION is not set
388# CONFIG_PM_RUNTIME is not set
370CONFIG_CPU_IDLE=y 389CONFIG_CPU_IDLE=y
371CONFIG_CPU_IDLE_GOV_LADDER=y 390CONFIG_CPU_IDLE_GOV_LADDER=y
372CONFIG_NET=y 391CONFIG_NET=y
@@ -420,6 +439,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
420# CONFIG_NETFILTER is not set 439# CONFIG_NETFILTER is not set
421# CONFIG_IP_DCCP is not set 440# CONFIG_IP_DCCP is not set
422# CONFIG_IP_SCTP is not set 441# CONFIG_IP_SCTP is not set
442# CONFIG_RDS is not set
423# CONFIG_TIPC is not set 443# CONFIG_TIPC is not set
424# CONFIG_ATM is not set 444# CONFIG_ATM is not set
425# CONFIG_BRIDGE is not set 445# CONFIG_BRIDGE is not set
@@ -442,7 +462,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
442# Network testing 462# Network testing
443# 463#
444# CONFIG_NET_PKTGEN is not set 464# CONFIG_NET_PKTGEN is not set
445# CONFIG_NET_DROP_MONITOR is not set
446# CONFIG_HAMRADIO is not set 465# CONFIG_HAMRADIO is not set
447# CONFIG_CAN is not set 466# CONFIG_CAN is not set
448# CONFIG_IRDA is not set 467# CONFIG_IRDA is not set
@@ -450,6 +469,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
450# CONFIG_AF_RXRPC is not set 469# CONFIG_AF_RXRPC is not set
451CONFIG_WIRELESS=y 470CONFIG_WIRELESS=y
452# CONFIG_CFG80211 is not set 471# CONFIG_CFG80211 is not set
472CONFIG_CFG80211_DEFAULT_PS_VALUE=0
453# CONFIG_WIRELESS_OLD_REGULATORY is not set 473# CONFIG_WIRELESS_OLD_REGULATORY is not set
454CONFIG_WIRELESS_EXT=y 474CONFIG_WIRELESS_EXT=y
455CONFIG_WIRELESS_EXT_SYSFS=y 475CONFIG_WIRELESS_EXT_SYSFS=y
@@ -458,7 +478,6 @@ CONFIG_WIRELESS_EXT_SYSFS=y
458# 478#
459# CFG80211 needs to be enabled for MAC80211 479# CFG80211 needs to be enabled for MAC80211
460# 480#
461CONFIG_MAC80211_DEFAULT_PS_VALUE=0
462# CONFIG_WIMAX is not set 481# CONFIG_WIMAX is not set
463# CONFIG_RFKILL is not set 482# CONFIG_RFKILL is not set
464# CONFIG_NET_9P is not set 483# CONFIG_NET_9P is not set
@@ -471,6 +490,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
471# Generic Driver Options 490# Generic Driver Options
472# 491#
473CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 492CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
493# CONFIG_DEVTMPFS is not set
474CONFIG_STANDALONE=y 494CONFIG_STANDALONE=y
475CONFIG_PREVENT_FIRMWARE_BUILD=y 495CONFIG_PREVENT_FIRMWARE_BUILD=y
476# CONFIG_FW_LOADER is not set 496# CONFIG_FW_LOADER is not set
@@ -480,9 +500,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
480# CONFIG_CONNECTOR is not set 500# CONFIG_CONNECTOR is not set
481CONFIG_MTD=y 501CONFIG_MTD=y
482# CONFIG_MTD_DEBUG is not set 502# CONFIG_MTD_DEBUG is not set
503# CONFIG_MTD_TESTS is not set
483CONFIG_MTD_CONCAT=y 504CONFIG_MTD_CONCAT=y
484CONFIG_MTD_PARTITIONS=y 505CONFIG_MTD_PARTITIONS=y
485# CONFIG_MTD_TESTS is not set
486# CONFIG_MTD_REDBOOT_PARTS is not set 506# CONFIG_MTD_REDBOOT_PARTS is not set
487# CONFIG_MTD_CMDLINE_PARTS is not set 507# CONFIG_MTD_CMDLINE_PARTS is not set
488# CONFIG_MTD_AR7_PARTS is not set 508# CONFIG_MTD_AR7_PARTS is not set
@@ -620,6 +640,7 @@ CONFIG_SCSI_WAIT_SCAN=m
620# CONFIG_SCSI_OSD_INITIATOR is not set 640# CONFIG_SCSI_OSD_INITIATOR is not set
621CONFIG_ATA=y 641CONFIG_ATA=y
622# CONFIG_ATA_NONSTANDARD is not set 642# CONFIG_ATA_NONSTANDARD is not set
643CONFIG_ATA_VERBOSE_ERROR=y
623CONFIG_SATA_PMP=y 644CONFIG_SATA_PMP=y
624# CONFIG_SATA_AHCI is not set 645# CONFIG_SATA_AHCI is not set
625CONFIG_SATA_SIL24=y 646CONFIG_SATA_SIL24=y
@@ -641,6 +662,7 @@ CONFIG_ATA_SFF=y
641# CONFIG_PATA_ALI is not set 662# CONFIG_PATA_ALI is not set
642# CONFIG_PATA_AMD is not set 663# CONFIG_PATA_AMD is not set
643# CONFIG_PATA_ARTOP is not set 664# CONFIG_PATA_ARTOP is not set
665# CONFIG_PATA_ATP867X is not set
644# CONFIG_PATA_ATIIXP is not set 666# CONFIG_PATA_ATIIXP is not set
645# CONFIG_PATA_CMD640_PCI is not set 667# CONFIG_PATA_CMD640_PCI is not set
646# CONFIG_PATA_CMD64X is not set 668# CONFIG_PATA_CMD64X is not set
@@ -668,6 +690,7 @@ CONFIG_ATA_SFF=y
668# CONFIG_PATA_OPTIDMA is not set 690# CONFIG_PATA_OPTIDMA is not set
669# CONFIG_PATA_PDC_OLD is not set 691# CONFIG_PATA_PDC_OLD is not set
670# CONFIG_PATA_RADISYS is not set 692# CONFIG_PATA_RADISYS is not set
693# CONFIG_PATA_RDC is not set
671# CONFIG_PATA_RZ1000 is not set 694# CONFIG_PATA_RZ1000 is not set
672# CONFIG_PATA_SC1200 is not set 695# CONFIG_PATA_SC1200 is not set
673# CONFIG_PATA_SERVERWORKS is not set 696# CONFIG_PATA_SERVERWORKS is not set
@@ -686,7 +709,11 @@ CONFIG_ATA_SFF=y
686# 709#
687 710
688# 711#
689# Enable only one of the two stacks, unless you know what you are doing 712# You can enable one or both FireWire driver stacks.
713#
714
715#
716# See the help texts for more information.
690# 717#
691# CONFIG_FIREWIRE is not set 718# CONFIG_FIREWIRE is not set
692# CONFIG_IEEE1394 is not set 719# CONFIG_IEEE1394 is not set
@@ -782,6 +809,7 @@ CONFIG_SKY2_DEBUG=y
782# CONFIG_VIA_VELOCITY is not set 809# CONFIG_VIA_VELOCITY is not set
783# CONFIG_TIGON3 is not set 810# CONFIG_TIGON3 is not set
784# CONFIG_BNX2 is not set 811# CONFIG_BNX2 is not set
812# CONFIG_CNIC is not set
785# CONFIG_QLA3XXX is not set 813# CONFIG_QLA3XXX is not set
786# CONFIG_ATL1 is not set 814# CONFIG_ATL1 is not set
787# CONFIG_ATL1E is not set 815# CONFIG_ATL1E is not set
@@ -789,10 +817,7 @@ CONFIG_SKY2_DEBUG=y
789# CONFIG_JME is not set 817# CONFIG_JME is not set
790# CONFIG_NETDEV_10000 is not set 818# CONFIG_NETDEV_10000 is not set
791# CONFIG_TR is not set 819# CONFIG_TR is not set
792 820CONFIG_WLAN=y
793#
794# Wireless LAN
795#
796# CONFIG_WLAN_PRE80211 is not set 821# CONFIG_WLAN_PRE80211 is not set
797# CONFIG_WLAN_80211 is not set 822# CONFIG_WLAN_80211 is not set
798 823
@@ -842,14 +867,19 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
842# Input Device Drivers 867# Input Device Drivers
843# 868#
844CONFIG_INPUT_KEYBOARD=y 869CONFIG_INPUT_KEYBOARD=y
870# CONFIG_KEYBOARD_ADP5588 is not set
845# CONFIG_KEYBOARD_ATKBD is not set 871# CONFIG_KEYBOARD_ATKBD is not set
846# CONFIG_KEYBOARD_SUNKBD is not set 872# CONFIG_QT2160 is not set
847# CONFIG_KEYBOARD_LKKBD is not set 873# CONFIG_KEYBOARD_LKKBD is not set
848# CONFIG_KEYBOARD_XTKBD is not set 874# CONFIG_KEYBOARD_GPIO is not set
875# CONFIG_KEYBOARD_MATRIX is not set
876# CONFIG_KEYBOARD_MAX7359 is not set
849# CONFIG_KEYBOARD_NEWTON is not set 877# CONFIG_KEYBOARD_NEWTON is not set
878# CONFIG_KEYBOARD_OPENCORES is not set
850# CONFIG_KEYBOARD_STOWAWAY is not set 879# CONFIG_KEYBOARD_STOWAWAY is not set
851# CONFIG_KEYBOARD_GPIO is not set 880# CONFIG_KEYBOARD_SUNKBD is not set
852# CONFIG_KEYBOARD_SH_KEYSC is not set 881# CONFIG_KEYBOARD_SH_KEYSC is not set
882# CONFIG_KEYBOARD_XTKBD is not set
853# CONFIG_INPUT_MOUSE is not set 883# CONFIG_INPUT_MOUSE is not set
854# CONFIG_INPUT_JOYSTICK is not set 884# CONFIG_INPUT_JOYSTICK is not set
855# CONFIG_INPUT_TABLET is not set 885# CONFIG_INPUT_TABLET is not set
@@ -902,6 +932,7 @@ CONFIG_HW_RANDOM=y
902CONFIG_DEVPORT=y 932CONFIG_DEVPORT=y
903CONFIG_I2C=y 933CONFIG_I2C=y
904CONFIG_I2C_BOARDINFO=y 934CONFIG_I2C_BOARDINFO=y
935CONFIG_I2C_COMPAT=y
905# CONFIG_I2C_CHARDEV is not set 936# CONFIG_I2C_CHARDEV is not set
906CONFIG_I2C_HELPER_AUTO=y 937CONFIG_I2C_HELPER_AUTO=y
907CONFIG_I2C_ALGOPCA=y 938CONFIG_I2C_ALGOPCA=y
@@ -931,6 +962,7 @@ CONFIG_I2C_ALGOPCA=y
931# 962#
932# I2C system bus drivers (mostly embedded / system-on-chip) 963# I2C system bus drivers (mostly embedded / system-on-chip)
933# 964#
965# CONFIG_I2C_DESIGNWARE is not set
934# CONFIG_I2C_GPIO is not set 966# CONFIG_I2C_GPIO is not set
935# CONFIG_I2C_OCORES is not set 967# CONFIG_I2C_OCORES is not set
936# CONFIG_I2C_SH_MOBILE is not set 968# CONFIG_I2C_SH_MOBILE is not set
@@ -958,15 +990,17 @@ CONFIG_I2C_PCA_PLATFORM=y
958# Miscellaneous I2C Chip support 990# Miscellaneous I2C Chip support
959# 991#
960# CONFIG_DS1682 is not set 992# CONFIG_DS1682 is not set
961# CONFIG_SENSORS_PCF8574 is not set
962# CONFIG_PCF8575 is not set
963# CONFIG_SENSORS_PCA9539 is not set
964# CONFIG_SENSORS_TSL2550 is not set 993# CONFIG_SENSORS_TSL2550 is not set
965# CONFIG_I2C_DEBUG_CORE is not set 994# CONFIG_I2C_DEBUG_CORE is not set
966# CONFIG_I2C_DEBUG_ALGO is not set 995# CONFIG_I2C_DEBUG_ALGO is not set
967# CONFIG_I2C_DEBUG_BUS is not set 996# CONFIG_I2C_DEBUG_BUS is not set
968# CONFIG_I2C_DEBUG_CHIP is not set 997# CONFIG_I2C_DEBUG_CHIP is not set
969# CONFIG_SPI is not set 998# CONFIG_SPI is not set
999
1000#
1001# PPS support
1002#
1003# CONFIG_PPS is not set
970CONFIG_ARCH_REQUIRE_GPIOLIB=y 1004CONFIG_ARCH_REQUIRE_GPIOLIB=y
971CONFIG_GPIOLIB=y 1005CONFIG_GPIOLIB=y
972# CONFIG_DEBUG_GPIO is not set 1006# CONFIG_DEBUG_GPIO is not set
@@ -987,14 +1021,24 @@ CONFIG_GPIOLIB=y
987# PCI GPIO expanders: 1021# PCI GPIO expanders:
988# 1022#
989# CONFIG_GPIO_BT8XX is not set 1023# CONFIG_GPIO_BT8XX is not set
1024# CONFIG_GPIO_LANGWELL is not set
990 1025
991# 1026#
992# SPI GPIO expanders: 1027# SPI GPIO expanders:
993# 1028#
1029
1030#
1031# AC97 GPIO expanders:
1032#
994# CONFIG_W1 is not set 1033# CONFIG_W1 is not set
995# CONFIG_POWER_SUPPLY is not set 1034# CONFIG_POWER_SUPPLY is not set
996CONFIG_HWMON=y 1035CONFIG_HWMON=y
997# CONFIG_HWMON_VID is not set 1036# CONFIG_HWMON_VID is not set
1037# CONFIG_HWMON_DEBUG_CHIP is not set
1038
1039#
1040# Native drivers
1041#
998# CONFIG_SENSORS_AD7414 is not set 1042# CONFIG_SENSORS_AD7414 is not set
999# CONFIG_SENSORS_AD7418 is not set 1043# CONFIG_SENSORS_AD7418 is not set
1000# CONFIG_SENSORS_ADM1021 is not set 1044# CONFIG_SENSORS_ADM1021 is not set
@@ -1045,6 +1089,7 @@ CONFIG_HWMON=y
1045# CONFIG_SENSORS_ADS7828 is not set 1089# CONFIG_SENSORS_ADS7828 is not set
1046# CONFIG_SENSORS_THMC50 is not set 1090# CONFIG_SENSORS_THMC50 is not set
1047# CONFIG_SENSORS_TMP401 is not set 1091# CONFIG_SENSORS_TMP401 is not set
1092# CONFIG_SENSORS_TMP421 is not set
1048# CONFIG_SENSORS_VIA686A is not set 1093# CONFIG_SENSORS_VIA686A is not set
1049# CONFIG_SENSORS_VT1211 is not set 1094# CONFIG_SENSORS_VT1211 is not set
1050# CONFIG_SENSORS_VT8231 is not set 1095# CONFIG_SENSORS_VT8231 is not set
@@ -1056,9 +1101,7 @@ CONFIG_HWMON=y
1056# CONFIG_SENSORS_W83L786NG is not set 1101# CONFIG_SENSORS_W83L786NG is not set
1057# CONFIG_SENSORS_W83627HF is not set 1102# CONFIG_SENSORS_W83627HF is not set
1058# CONFIG_SENSORS_W83627EHF is not set 1103# CONFIG_SENSORS_W83627EHF is not set
1059# CONFIG_HWMON_DEBUG_CHIP is not set
1060# CONFIG_THERMAL is not set 1104# CONFIG_THERMAL is not set
1061CONFIG_THERMAL_HWMON=y
1062# CONFIG_WATCHDOG is not set 1105# CONFIG_WATCHDOG is not set
1063CONFIG_SSB_POSSIBLE=y 1106CONFIG_SSB_POSSIBLE=y
1064 1107
@@ -1079,8 +1122,10 @@ CONFIG_MFD_SM501=y
1079# CONFIG_MFD_TMIO is not set 1122# CONFIG_MFD_TMIO is not set
1080# CONFIG_PMIC_DA903X is not set 1123# CONFIG_PMIC_DA903X is not set
1081# CONFIG_MFD_WM8400 is not set 1124# CONFIG_MFD_WM8400 is not set
1125# CONFIG_MFD_WM831X is not set
1082# CONFIG_MFD_WM8350_I2C is not set 1126# CONFIG_MFD_WM8350_I2C is not set
1083# CONFIG_MFD_PCF50633 is not set 1127# CONFIG_MFD_PCF50633 is not set
1128# CONFIG_AB3100_CORE is not set
1084# CONFIG_REGULATOR is not set 1129# CONFIG_REGULATOR is not set
1085CONFIG_MEDIA_SUPPORT=y 1130CONFIG_MEDIA_SUPPORT=y
1086 1131
@@ -1099,6 +1144,7 @@ CONFIG_MEDIA_SUPPORT=y
1099# 1144#
1100# Graphics support 1145# Graphics support
1101# 1146#
1147CONFIG_VGA_ARB=y
1102# CONFIG_DRM is not set 1148# CONFIG_DRM is not set
1103# CONFIG_VGASTATE is not set 1149# CONFIG_VGASTATE is not set
1104# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1150# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1183,7 +1229,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
1183# CONFIG_SOUND is not set 1229# CONFIG_SOUND is not set
1184CONFIG_HID_SUPPORT=y 1230CONFIG_HID_SUPPORT=y
1185CONFIG_HID=y 1231CONFIG_HID=y
1186# CONFIG_HID_DEBUG is not set
1187# CONFIG_HIDRAW is not set 1232# CONFIG_HIDRAW is not set
1188 1233
1189# 1234#
@@ -1206,6 +1251,7 @@ CONFIG_HID_CYPRESS=y
1206CONFIG_HID_EZKEY=y 1251CONFIG_HID_EZKEY=y
1207# CONFIG_HID_KYE is not set 1252# CONFIG_HID_KYE is not set
1208CONFIG_HID_GYRATION=y 1253CONFIG_HID_GYRATION=y
1254# CONFIG_HID_TWINHAN is not set
1209# CONFIG_HID_KENSINGTON is not set 1255# CONFIG_HID_KENSINGTON is not set
1210CONFIG_HID_LOGITECH=y 1256CONFIG_HID_LOGITECH=y
1211# CONFIG_LOGITECH_FF is not set 1257# CONFIG_LOGITECH_FF is not set
@@ -1255,6 +1301,7 @@ CONFIG_USB_MON=y
1255# CONFIG_USB_OXU210HP_HCD is not set 1301# CONFIG_USB_OXU210HP_HCD is not set
1256# CONFIG_USB_ISP116X_HCD is not set 1302# CONFIG_USB_ISP116X_HCD is not set
1257# CONFIG_USB_ISP1760_HCD is not set 1303# CONFIG_USB_ISP1760_HCD is not set
1304# CONFIG_USB_ISP1362_HCD is not set
1258CONFIG_USB_OHCI_HCD=y 1305CONFIG_USB_OHCI_HCD=y
1259# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 1306# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1260# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 1307# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -1373,6 +1420,7 @@ CONFIG_RTC_INTF_DEV=y
1373# CONFIG_RTC_DRV_S35390A is not set 1420# CONFIG_RTC_DRV_S35390A is not set
1374# CONFIG_RTC_DRV_FM3130 is not set 1421# CONFIG_RTC_DRV_FM3130 is not set
1375# CONFIG_RTC_DRV_RX8581 is not set 1422# CONFIG_RTC_DRV_RX8581 is not set
1423# CONFIG_RTC_DRV_RX8025 is not set
1376 1424
1377# 1425#
1378# SPI RTC drivers 1426# SPI RTC drivers
@@ -1422,6 +1470,7 @@ CONFIG_EXT4_FS=y
1422CONFIG_EXT4_FS_XATTR=y 1470CONFIG_EXT4_FS_XATTR=y
1423# CONFIG_EXT4_FS_POSIX_ACL is not set 1471# CONFIG_EXT4_FS_POSIX_ACL is not set
1424# CONFIG_EXT4_FS_SECURITY is not set 1472# CONFIG_EXT4_FS_SECURITY is not set
1473# CONFIG_EXT4_DEBUG is not set
1425CONFIG_JBD=y 1474CONFIG_JBD=y
1426# CONFIG_JBD_DEBUG is not set 1475# CONFIG_JBD_DEBUG is not set
1427CONFIG_JBD2=y 1476CONFIG_JBD2=y
@@ -1431,9 +1480,11 @@ CONFIG_FS_MBCACHE=y
1431# CONFIG_JFS_FS is not set 1480# CONFIG_JFS_FS is not set
1432# CONFIG_FS_POSIX_ACL is not set 1481# CONFIG_FS_POSIX_ACL is not set
1433# CONFIG_XFS_FS is not set 1482# CONFIG_XFS_FS is not set
1483# CONFIG_GFS2_FS is not set
1434# CONFIG_OCFS2_FS is not set 1484# CONFIG_OCFS2_FS is not set
1435CONFIG_BTRFS_FS=y 1485CONFIG_BTRFS_FS=y
1436# CONFIG_BTRFS_FS_POSIX_ACL is not set 1486# CONFIG_BTRFS_FS_POSIX_ACL is not set
1487# CONFIG_NILFS2_FS is not set
1437CONFIG_FILE_LOCKING=y 1488CONFIG_FILE_LOCKING=y
1438CONFIG_FSNOTIFY=y 1489CONFIG_FSNOTIFY=y
1439CONFIG_DNOTIFY=y 1490CONFIG_DNOTIFY=y
@@ -1499,12 +1550,12 @@ CONFIG_MISC_FILESYSTEMS=y
1499# CONFIG_ROMFS_FS is not set 1550# CONFIG_ROMFS_FS is not set
1500# CONFIG_SYSV_FS is not set 1551# CONFIG_SYSV_FS is not set
1501# CONFIG_UFS_FS is not set 1552# CONFIG_UFS_FS is not set
1502# CONFIG_NILFS2_FS is not set
1503CONFIG_NETWORK_FILESYSTEMS=y 1553CONFIG_NETWORK_FILESYSTEMS=y
1504CONFIG_NFS_FS=y 1554CONFIG_NFS_FS=y
1505CONFIG_NFS_V3=y 1555CONFIG_NFS_V3=y
1506# CONFIG_NFS_V3_ACL is not set 1556# CONFIG_NFS_V3_ACL is not set
1507CONFIG_NFS_V4=y 1557CONFIG_NFS_V4=y
1558# CONFIG_NFS_V4_1 is not set
1508CONFIG_ROOT_NFS=y 1559CONFIG_ROOT_NFS=y
1509# CONFIG_NFSD is not set 1560# CONFIG_NFSD is not set
1510CONFIG_LOCKD=y 1561CONFIG_LOCKD=y
@@ -1576,6 +1627,7 @@ CONFIG_PRINTK_TIME=y
1576# CONFIG_ENABLE_MUST_CHECK is not set 1627# CONFIG_ENABLE_MUST_CHECK is not set
1577CONFIG_FRAME_WARN=1024 1628CONFIG_FRAME_WARN=1024
1578# CONFIG_MAGIC_SYSRQ is not set 1629# CONFIG_MAGIC_SYSRQ is not set
1630# CONFIG_STRIP_ASM_SYMS is not set
1579# CONFIG_UNUSED_SYMBOLS is not set 1631# CONFIG_UNUSED_SYMBOLS is not set
1580CONFIG_DEBUG_FS=y 1632CONFIG_DEBUG_FS=y
1581# CONFIG_HEADERS_CHECK is not set 1633# CONFIG_HEADERS_CHECK is not set
@@ -1610,18 +1662,23 @@ CONFIG_DEBUG_INFO=y
1610# CONFIG_DEBUG_LIST is not set 1662# CONFIG_DEBUG_LIST is not set
1611# CONFIG_DEBUG_SG is not set 1663# CONFIG_DEBUG_SG is not set
1612# CONFIG_DEBUG_NOTIFIERS is not set 1664# CONFIG_DEBUG_NOTIFIERS is not set
1665# CONFIG_DEBUG_CREDENTIALS is not set
1613CONFIG_FRAME_POINTER=y 1666CONFIG_FRAME_POINTER=y
1614# CONFIG_RCU_TORTURE_TEST is not set 1667# CONFIG_RCU_TORTURE_TEST is not set
1615# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1668# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1616# CONFIG_BACKTRACE_SELF_TEST is not set 1669# CONFIG_BACKTRACE_SELF_TEST is not set
1617# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1670# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1671# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1618# CONFIG_FAULT_INJECTION is not set 1672# CONFIG_FAULT_INJECTION is not set
1619# CONFIG_LATENCYTOP is not set 1673# CONFIG_LATENCYTOP is not set
1620CONFIG_SYSCTL_SYSCALL_CHECK=y 1674CONFIG_SYSCTL_SYSCALL_CHECK=y
1621# CONFIG_PAGE_POISONING is not set 1675# CONFIG_PAGE_POISONING is not set
1622CONFIG_HAVE_FUNCTION_TRACER=y 1676CONFIG_HAVE_FUNCTION_TRACER=y
1677CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1678CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
1623CONFIG_HAVE_DYNAMIC_FTRACE=y 1679CONFIG_HAVE_DYNAMIC_FTRACE=y
1624CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1680CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1681CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1625CONFIG_TRACING_SUPPORT=y 1682CONFIG_TRACING_SUPPORT=y
1626# CONFIG_FTRACE is not set 1683# CONFIG_FTRACE is not set
1627# CONFIG_DYNAMIC_DEBUG is not set 1684# CONFIG_DYNAMIC_DEBUG is not set
@@ -1633,11 +1690,11 @@ CONFIG_HAVE_ARCH_KGDB=y
1633CONFIG_EARLY_SCIF_CONSOLE=y 1690CONFIG_EARLY_SCIF_CONSOLE=y
1634CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffeb0000 1691CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffeb0000
1635CONFIG_EARLY_PRINTK=y 1692CONFIG_EARLY_PRINTK=y
1636# CONFIG_DEBUG_BOOTMEM is not set 1693# CONFIG_STACK_DEBUG is not set
1637# CONFIG_DEBUG_STACKOVERFLOW is not set
1638# CONFIG_DEBUG_STACK_USAGE is not set 1694# CONFIG_DEBUG_STACK_USAGE is not set
1639# CONFIG_4KSTACKS is not set 1695# CONFIG_4KSTACKS is not set
1640# CONFIG_DUMP_CODE is not set 1696# CONFIG_DUMP_CODE is not set
1697# CONFIG_DWARF_UNWINDER is not set
1641# CONFIG_SH_NO_BSS_INIT is not set 1698# CONFIG_SH_NO_BSS_INIT is not set
1642 1699
1643# 1700#
@@ -1652,7 +1709,6 @@ CONFIG_CRYPTO=y
1652# 1709#
1653# Crypto core or helper 1710# Crypto core or helper
1654# 1711#
1655# CONFIG_CRYPTO_FIPS is not set
1656CONFIG_CRYPTO_ALGAPI=y 1712CONFIG_CRYPTO_ALGAPI=y
1657CONFIG_CRYPTO_ALGAPI2=y 1713CONFIG_CRYPTO_ALGAPI2=y
1658CONFIG_CRYPTO_AEAD2=y 1714CONFIG_CRYPTO_AEAD2=y
@@ -1694,11 +1750,13 @@ CONFIG_CRYPTO_CBC=y
1694# 1750#
1695CONFIG_CRYPTO_HMAC=y 1751CONFIG_CRYPTO_HMAC=y
1696# CONFIG_CRYPTO_XCBC is not set 1752# CONFIG_CRYPTO_XCBC is not set
1753# CONFIG_CRYPTO_VMAC is not set
1697 1754
1698# 1755#
1699# Digest 1756# Digest
1700# 1757#
1701CONFIG_CRYPTO_CRC32C=y 1758CONFIG_CRYPTO_CRC32C=y
1759# CONFIG_CRYPTO_GHASH is not set
1702# CONFIG_CRYPTO_MD4 is not set 1760# CONFIG_CRYPTO_MD4 is not set
1703CONFIG_CRYPTO_MD5=y 1761CONFIG_CRYPTO_MD5=y
1704# CONFIG_CRYPTO_MICHAEL_MIC is not set 1762# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1764,5 +1822,6 @@ CONFIG_DECOMPRESS_GZIP=y
1764CONFIG_HAS_IOMEM=y 1822CONFIG_HAS_IOMEM=y
1765CONFIG_HAS_IOPORT=y 1823CONFIG_HAS_IOPORT=y
1766CONFIG_HAS_DMA=y 1824CONFIG_HAS_DMA=y
1825CONFIG_HAVE_LMB=y
1767CONFIG_NLATTR=y 1826CONFIG_NLATTR=y
1768CONFIG_GENERIC_ATOMIC64=y 1827CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index 35097753456c..5491b094cf05 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -17,6 +17,7 @@
17#include <linux/sh_timer.h> 17#include <linux/sh_timer.h>
18#include <asm/clock.h> 18#include <asm/clock.h>
19#include <asm/mmzone.h> 19#include <asm/mmzone.h>
20#include <asm/dma-sh.h>
20#include <cpu/sh7722.h> 21#include <cpu/sh7722.h>
21 22
22static struct resource rtc_resources[] = { 23static struct resource rtc_resources[] = {
@@ -373,6 +374,18 @@ static struct platform_device sci_device = {
373 }, 374 },
374}; 375};
375 376
377static struct sh_dmae_pdata dma_platform_data = {
378 .mode = 0,
379};
380
381static struct platform_device dma_device = {
382 .name = "sh-dma-engine",
383 .id = -1,
384 .dev = {
385 .platform_data = &dma_platform_data,
386 },
387};
388
376static struct platform_device *sh7722_devices[] __initdata = { 389static struct platform_device *sh7722_devices[] __initdata = {
377 &cmt_device, 390 &cmt_device,
378 &tmu0_device, 391 &tmu0_device,
@@ -385,6 +398,7 @@ static struct platform_device *sh7722_devices[] __initdata = {
385 &vpu_device, 398 &vpu_device,
386 &veu_device, 399 &veu_device,
387 &jpu_device, 400 &jpu_device,
401 &dma_device,
388}; 402};
389 403
390static int __init sh7722_devices_setup(void) 404static int __init sh7722_devices_setup(void)
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
index 2c901f446959..12ff56f19c5c 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
@@ -13,6 +13,7 @@
13#include <linux/io.h> 13#include <linux/io.h>
14#include <linux/serial_sci.h> 14#include <linux/serial_sci.h>
15#include <linux/sh_timer.h> 15#include <linux/sh_timer.h>
16#include <asm/dma-sh.h>
16 17
17static struct sh_timer_config tmu0_platform_data = { 18static struct sh_timer_config tmu0_platform_data = {
18 .name = "TMU0", 19 .name = "TMU0",
@@ -240,6 +241,18 @@ static struct platform_device sci_device = {
240 }, 241 },
241}; 242};
242 243
244static struct sh_dmae_pdata dma_platform_data = {
245 .mode = (SHDMA_MIX_IRQ | SHDMA_DMAOR1),
246};
247
248static struct platform_device dma_device = {
249 .name = "sh-dma-engine",
250 .id = -1,
251 .dev = {
252 .platform_data = &dma_platform_data,
253 },
254};
255
243static struct platform_device *sh7780_devices[] __initdata = { 256static struct platform_device *sh7780_devices[] __initdata = {
244 &tmu0_device, 257 &tmu0_device,
245 &tmu1_device, 258 &tmu1_device,
@@ -249,6 +262,7 @@ static struct platform_device *sh7780_devices[] __initdata = {
249 &tmu5_device, 262 &tmu5_device,
250 &rtc_device, 263 &rtc_device,
251 &sci_device, 264 &sci_device,
265 &dma_device,
252}; 266};
253 267
254static int __init sh7780_devices_setup(void) 268static int __init sh7780_devices_setup(void)
diff --git a/arch/sh/kernel/dwarf.c b/arch/sh/kernel/dwarf.c
index bc4d8d75332b..03b3616c80a5 100644
--- a/arch/sh/kernel/dwarf.c
+++ b/arch/sh/kernel/dwarf.c
@@ -24,7 +24,6 @@
24#include <asm/unwinder.h> 24#include <asm/unwinder.h>
25#include <asm/sections.h> 25#include <asm/sections.h>
26#include <asm/unaligned.h> 26#include <asm/unaligned.h>
27#include <asm/dwarf.h>
28#include <asm/stacktrace.h> 27#include <asm/stacktrace.h>
29 28
30/* Reserve enough memory for two stack frames */ 29/* Reserve enough memory for two stack frames */
diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c
index 6aba9af79eaf..69bb1652eccd 100644
--- a/arch/sh/kernel/traps_32.c
+++ b/arch/sh/kernel/traps_32.c
@@ -452,6 +452,12 @@ int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs,
452 u_int rm; 452 u_int rm;
453 int ret, index; 453 int ret, index;
454 454
455 /*
456 * XXX: We can't handle mixed 16/32-bit instructions yet
457 */
458 if (instruction_size(instruction) != 2)
459 return -EINVAL;
460
455 index = (instruction>>8)&15; /* 0x0F00 */ 461 index = (instruction>>8)&15; /* 0x0F00 */
456 rm = regs->regs[index]; 462 rm = regs->regs[index];
457 463
@@ -619,9 +625,9 @@ asmlinkage void do_address_error(struct pt_regs *regs,
619 625
620 se_user += 1; 626 se_user += 1;
621 627
622#ifndef CONFIG_CPU_SH2A
623 set_fs(USER_DS); 628 set_fs(USER_DS);
624 if (copy_from_user(&instruction, (u16 *)(regs->pc & ~1), 2)) { 629 if (copy_from_user(&instruction, (insn_size_t *)(regs->pc & ~1),
630 sizeof(instruction))) {
625 set_fs(oldfs); 631 set_fs(oldfs);
626 goto uspace_segv; 632 goto uspace_segv;
627 } 633 }
@@ -633,7 +639,6 @@ asmlinkage void do_address_error(struct pt_regs *regs,
633 "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n", 639 "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
634 current->comm, current->pid, (void *)regs->pc, 640 current->comm, current->pid, (void *)regs->pc,
635 instruction); 641 instruction);
636#endif
637 642
638 if (se_usermode & 2) 643 if (se_usermode & 2)
639 goto fixup; 644 goto fixup;
@@ -673,12 +678,6 @@ uspace_segv:
673 } else { 678 } else {
674 se_sys += 1; 679 se_sys += 1;
675 680
676 if (se_kernmode_warn)
677 printk(KERN_NOTICE "Unaligned kernel access "
678 "on behalf of \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
679 current->comm, current->pid, (void *)regs->pc,
680 instruction);
681
682 if (regs->pc & 1) 681 if (regs->pc & 1)
683 die("unaligned program counter", regs, error_code); 682 die("unaligned program counter", regs, error_code);
684 683
@@ -692,6 +691,12 @@ uspace_segv:
692 die("insn faulting in do_address_error", regs, 0); 691 die("insn faulting in do_address_error", regs, 0);
693 } 692 }
694 693
694 if (se_kernmode_warn)
695 printk(KERN_NOTICE "Unaligned kernel access "
696 "on behalf of \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
697 current->comm, current->pid, (void *)regs->pc,
698 instruction);
699
695 handle_unaligned_access(instruction, regs, 700 handle_unaligned_access(instruction, regs,
696 &user_mem_access, 0); 701 &user_mem_access, 0);
697 set_fs(oldfs); 702 set_fs(oldfs);
diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c
index 5ab7c5aefd62..65ac474c517a 100644
--- a/drivers/media/video/sh_mobile_ceu_camera.c
+++ b/drivers/media/video/sh_mobile_ceu_camera.c
@@ -404,7 +404,7 @@ static int sh_mobile_ceu_add_device(struct soc_camera_device *icd)
404 "SuperH Mobile CEU driver attached to camera %d\n", 404 "SuperH Mobile CEU driver attached to camera %d\n",
405 icd->devnum); 405 icd->devnum);
406 406
407 clk_enable(pcdev->clk); 407 pm_runtime_get_sync(ici->v4l2_dev.dev);
408 408
409 ceu_write(pcdev, CAPSR, 1 << 16); /* reset */ 409 ceu_write(pcdev, CAPSR, 1 << 16); /* reset */
410 while (ceu_read(pcdev, CSTSR) & 1) 410 while (ceu_read(pcdev, CSTSR) & 1)
@@ -438,7 +438,7 @@ static void sh_mobile_ceu_remove_device(struct soc_camera_device *icd)
438 } 438 }
439 spin_unlock_irqrestore(&pcdev->lock, flags); 439 spin_unlock_irqrestore(&pcdev->lock, flags);
440 440
441 clk_disable(pcdev->clk); 441 pm_runtime_put_sync(ici->v4l2_dev.dev);
442 442
443 dev_info(icd->dev.parent, 443 dev_info(icd->dev.parent,
444 "SuperH Mobile CEU driver detached from camera %d\n", 444 "SuperH Mobile CEU driver detached from camera %d\n",
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-07 07:42:58 -0500