aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/sh/configs/ap325rxa_defconfig56
-rw-r--r--arch/sh/configs/cayman_defconfig46
-rw-r--r--arch/sh/configs/dreamcast_defconfig29
-rw-r--r--arch/sh/configs/ecovec24-romimage_defconfig54
-rw-r--r--arch/sh/configs/ecovec24_defconfig7
-rw-r--r--arch/sh/configs/edosk7705_defconfig21
-rw-r--r--arch/sh/configs/edosk7760_defconfig38
-rw-r--r--arch/sh/configs/espt_defconfig42
-rw-r--r--arch/sh/configs/hp6xx_defconfig24
-rw-r--r--arch/sh/configs/kfr2r09-romimage_defconfig50
-rw-r--r--arch/sh/configs/kfr2r09_defconfig57
-rw-r--r--arch/sh/configs/landisk_defconfig45
-rw-r--r--arch/sh/configs/lboxre2_defconfig35
-rw-r--r--arch/sh/configs/magicpanelr2_defconfig28
-rw-r--r--arch/sh/configs/microdev_defconfig23
-rw-r--r--arch/sh/configs/migor_defconfig60
-rw-r--r--arch/sh/configs/polaris_defconfig31
-rw-r--r--arch/sh/configs/r7780mp_defconfig72
-rw-r--r--arch/sh/configs/r7785rp_defconfig76
-rw-r--r--arch/sh/configs/rsk7201_defconfig31
-rw-r--r--arch/sh/configs/rsk7203_defconfig49
-rw-r--r--arch/sh/configs/rts7751r2d1_defconfig54
-rw-r--r--arch/sh/configs/rts7751r2dplus_defconfig54
-rw-r--r--arch/sh/configs/sdk7780_defconfig53
-rw-r--r--arch/sh/configs/sdk7786_defconfig14
-rw-r--r--arch/sh/configs/se7206_defconfig38
-rw-r--r--arch/sh/configs/se7343_defconfig53
-rw-r--r--arch/sh/configs/se7619_defconfig22
-rw-r--r--arch/sh/configs/se7705_defconfig25
-rw-r--r--arch/sh/configs/se7712_defconfig28
-rw-r--r--arch/sh/configs/se7721_defconfig40
-rw-r--r--arch/sh/configs/se7722_defconfig29
-rw-r--r--arch/sh/configs/se7724_defconfig78
-rw-r--r--arch/sh/configs/se7750_defconfig24
-rw-r--r--arch/sh/configs/se7751_defconfig25
-rw-r--r--arch/sh/configs/se7780_defconfig39
-rw-r--r--arch/sh/configs/sh03_defconfig43
-rw-r--r--arch/sh/configs/sh7710voipgw_defconfig29
-rw-r--r--arch/sh/configs/sh7724_generic_defconfig58
-rw-r--r--arch/sh/configs/sh7763rdp_defconfig45
-rw-r--r--arch/sh/configs/sh7770_generic_defconfig54
-rw-r--r--arch/sh/configs/sh7785lcr_32bit_defconfig75
-rw-r--r--arch/sh/configs/sh7785lcr_defconfig62
-rw-r--r--arch/sh/configs/shmin_defconfig23
-rw-r--r--arch/sh/configs/shx3_defconfig67
-rw-r--r--arch/sh/configs/snapgear_defconfig31
-rw-r--r--arch/sh/configs/systemh_defconfig23
-rw-r--r--arch/sh/configs/titan_defconfig49
-rw-r--r--arch/sh/configs/ul2_defconfig38
-rw-r--r--arch/sh/configs/urquell_defconfig82
50 files changed, 1237 insertions, 892 deletions
diff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig
index 8931a60e37a4..7fefa2b9e28c 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 11:10:59 2010 4# Tue May 18 15:04:35 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -47,9 +48,11 @@ CONFIG_LOCALVERSION=""
47CONFIG_HAVE_KERNEL_GZIP=y 48CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y 49CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y 50CONFIG_HAVE_KERNEL_LZMA=y
51CONFIG_HAVE_KERNEL_LZO=y
50CONFIG_KERNEL_GZIP=y 52CONFIG_KERNEL_GZIP=y
51# CONFIG_KERNEL_BZIP2 is not set 53# CONFIG_KERNEL_BZIP2 is not set
52# CONFIG_KERNEL_LZMA is not set 54# CONFIG_KERNEL_LZMA is not set
55# CONFIG_KERNEL_LZO is not set
53CONFIG_SWAP=y 56CONFIG_SWAP=y
54CONFIG_SYSVIPC=y 57CONFIG_SYSVIPC=y
55CONFIG_SYSVIPC_SYSCTL=y 58CONFIG_SYSVIPC_SYSCTL=y
@@ -71,11 +74,6 @@ CONFIG_RCU_FANOUT=32
71# CONFIG_TREE_RCU_TRACE is not set 74# CONFIG_TREE_RCU_TRACE is not set
72# CONFIG_IKCONFIG is not set 75# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
74CONFIG_GROUP_SCHED=y
75CONFIG_FAIR_GROUP_SCHED=y
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
79# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 79CONFIG_SYSFS_DEPRECATED_V2=y
@@ -107,7 +105,7 @@ CONFIG_PERF_USE_VMALLOC=y
107# 105#
108# Kernel Performance Events And Counters 106# Kernel Performance Events And Counters
109# 107#
110# CONFIG_PERF_EVENTS is not set 108CONFIG_PERF_EVENTS=y
111# CONFIG_PERF_COUNTERS is not set 109# CONFIG_PERF_COUNTERS is not set
112CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_COMPAT_BRK=y 111CONFIG_COMPAT_BRK=y
@@ -116,13 +114,13 @@ CONFIG_SLAB=y
116# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
118CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
119CONFIG_HAVE_IOREMAP_PROT=y
120CONFIG_HAVE_KPROBES=y 117CONFIG_HAVE_KPROBES=y
121CONFIG_HAVE_KRETPROBES=y 118CONFIG_HAVE_KRETPROBES=y
122CONFIG_HAVE_ARCH_TRACEHOOK=y 119CONFIG_HAVE_ARCH_TRACEHOOK=y
123CONFIG_HAVE_DMA_ATTRS=y 120CONFIG_HAVE_DMA_ATTRS=y
124CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
125CONFIG_HAVE_DMA_API_DEBUG=y 122CONFIG_HAVE_DMA_API_DEBUG=y
123CONFIG_HAVE_HW_BREAKPOINT=y
126 124
127# 125#
128# GCOV-based kernel profiling 126# GCOV-based kernel profiling
@@ -237,8 +235,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
237CONFIG_MEMORY_START=0x08000000 235CONFIG_MEMORY_START=0x08000000
238CONFIG_MEMORY_SIZE=0x08000000 236CONFIG_MEMORY_SIZE=0x08000000
239CONFIG_29BIT=y 237CONFIG_29BIT=y
240# CONFIG_PMB_ENABLE is not set 238# CONFIG_PMB is not set
241# CONFIG_X2TLB is not set 239CONFIG_X2TLB=y
242CONFIG_VSYSCALL=y 240CONFIG_VSYSCALL=y
243CONFIG_ARCH_FLATMEM_ENABLE=y 241CONFIG_ARCH_FLATMEM_ENABLE=y
244CONFIG_ARCH_SPARSEMEM_ENABLE=y 242CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -246,6 +244,8 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
246CONFIG_MAX_ACTIVE_REGIONS=1 244CONFIG_MAX_ACTIVE_REGIONS=1
247CONFIG_ARCH_POPULATES_NODE_MAP=y 245CONFIG_ARCH_POPULATES_NODE_MAP=y
248CONFIG_ARCH_SELECT_MEMORY_MODEL=y 246CONFIG_ARCH_SELECT_MEMORY_MODEL=y
247CONFIG_IOREMAP_FIXED=y
248CONFIG_UNCACHED_MAPPING=y
249CONFIG_PAGE_SIZE_4KB=y 249CONFIG_PAGE_SIZE_4KB=y
250# CONFIG_PAGE_SIZE_8KB is not set 250# CONFIG_PAGE_SIZE_8KB is not set
251# CONFIG_PAGE_SIZE_16KB is not set 251# CONFIG_PAGE_SIZE_16KB is not set
@@ -261,7 +261,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
261CONFIG_SPLIT_PTLOCK_CPUS=4 261CONFIG_SPLIT_PTLOCK_CPUS=4
262# CONFIG_PHYS_ADDR_T_64BIT is not set 262# CONFIG_PHYS_ADDR_T_64BIT is not set
263CONFIG_ZONE_DMA_FLAG=0 263CONFIG_ZONE_DMA_FLAG=0
264CONFIG_NR_QUICK=2 264CONFIG_NR_QUICK=1
265# CONFIG_KSM is not set 265# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267 267
@@ -335,7 +335,7 @@ CONFIG_SECCOMP=y
335# CONFIG_PREEMPT_VOLUNTARY is not set 335# CONFIG_PREEMPT_VOLUNTARY is not set
336CONFIG_PREEMPT=y 336CONFIG_PREEMPT=y
337CONFIG_GUSA=y 337CONFIG_GUSA=y
338# CONFIG_SPARSE_IRQ is not set 338# CONFIG_INTC_USERIMASK is not set
339 339
340# 340#
341# Boot options 341# Boot options
@@ -371,6 +371,7 @@ CONFIG_SUSPEND=y
371CONFIG_SUSPEND_FREEZER=y 371CONFIG_SUSPEND_FREEZER=y
372# CONFIG_HIBERNATION is not set 372# CONFIG_HIBERNATION is not set
373CONFIG_PM_RUNTIME=y 373CONFIG_PM_RUNTIME=y
374CONFIG_PM_OPS=y
374# CONFIG_CPU_IDLE is not set 375# CONFIG_CPU_IDLE is not set
375CONFIG_NET=y 376CONFIG_NET=y
376 377
@@ -378,7 +379,6 @@ CONFIG_NET=y
378# Networking options 379# Networking options
379# 380#
380CONFIG_PACKET=y 381CONFIG_PACKET=y
381# CONFIG_PACKET_MMAP is not set
382CONFIG_UNIX=y 382CONFIG_UNIX=y
383# CONFIG_NET_KEY is not set 383# CONFIG_NET_KEY is not set
384CONFIG_INET=y 384CONFIG_INET=y
@@ -594,6 +594,7 @@ CONFIG_MISC_DEVICES=y
594# CONFIG_ICS932S401 is not set 594# CONFIG_ICS932S401 is not set
595# CONFIG_ENCLOSURE_SERVICES is not set 595# CONFIG_ENCLOSURE_SERVICES is not set
596# CONFIG_ISL29003 is not set 596# CONFIG_ISL29003 is not set
597# CONFIG_SENSORS_TSL2550 is not set
597# CONFIG_DS1682 is not set 598# CONFIG_DS1682 is not set
598# CONFIG_TI_DAC7512 is not set 599# CONFIG_TI_DAC7512 is not set
599# CONFIG_C2PORT is not set 600# CONFIG_C2PORT is not set
@@ -613,6 +614,7 @@ CONFIG_HAVE_IDE=y
613# 614#
614# SCSI device support 615# SCSI device support
615# 616#
617CONFIG_SCSI_MOD=y
616# CONFIG_RAID_ATTRS is not set 618# CONFIG_RAID_ATTRS is not set
617CONFIG_SCSI=y 619CONFIG_SCSI=y
618CONFIG_SCSI_DMA=y 620CONFIG_SCSI_DMA=y
@@ -774,6 +776,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6
774CONFIG_SERIAL_SH_SCI_CONSOLE=y 776CONFIG_SERIAL_SH_SCI_CONSOLE=y
775CONFIG_SERIAL_CORE=y 777CONFIG_SERIAL_CORE=y
776CONFIG_SERIAL_CORE_CONSOLE=y 778CONFIG_SERIAL_CORE_CONSOLE=y
779# CONFIG_SERIAL_TIMBERDALE is not set
777CONFIG_UNIX98_PTYS=y 780CONFIG_UNIX98_PTYS=y
778# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 781# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
779CONFIG_LEGACY_PTYS=y 782CONFIG_LEGACY_PTYS=y
@@ -802,6 +805,7 @@ CONFIG_I2C_HELPER_AUTO=y
802# CONFIG_I2C_OCORES is not set 805# CONFIG_I2C_OCORES is not set
803CONFIG_I2C_SH_MOBILE=y 806CONFIG_I2C_SH_MOBILE=y
804# CONFIG_I2C_SIMTEC is not set 807# CONFIG_I2C_SIMTEC is not set
808# CONFIG_I2C_XILINX is not set
805 809
806# 810#
807# External I2C/SMBus adapter drivers 811# External I2C/SMBus adapter drivers
@@ -814,15 +818,9 @@ CONFIG_I2C_SH_MOBILE=y
814# 818#
815# CONFIG_I2C_PCA_PLATFORM is not set 819# CONFIG_I2C_PCA_PLATFORM is not set
816# CONFIG_I2C_STUB is not set 820# CONFIG_I2C_STUB is not set
817
818#
819# Miscellaneous I2C Chip support
820#
821# CONFIG_SENSORS_TSL2550 is not set
822# CONFIG_I2C_DEBUG_CORE is not set 821# CONFIG_I2C_DEBUG_CORE is not set
823# CONFIG_I2C_DEBUG_ALGO is not set 822# CONFIG_I2C_DEBUG_ALGO is not set
824# CONFIG_I2C_DEBUG_BUS is not set 823# CONFIG_I2C_DEBUG_BUS is not set
825# CONFIG_I2C_DEBUG_CHIP is not set
826CONFIG_SPI=y 824CONFIG_SPI=y
827CONFIG_SPI_MASTER=y 825CONFIG_SPI_MASTER=y
828 826
@@ -853,13 +851,16 @@ CONFIG_GPIOLIB=y
853# 851#
854# Memory mapped GPIO expanders: 852# Memory mapped GPIO expanders:
855# 853#
854# CONFIG_GPIO_IT8761E is not set
856 855
857# 856#
858# I2C GPIO expanders: 857# I2C GPIO expanders:
859# 858#
859# CONFIG_GPIO_MAX7300 is not set
860# CONFIG_GPIO_MAX732X is not set 860# CONFIG_GPIO_MAX732X is not set
861# CONFIG_GPIO_PCA953X is not set 861# CONFIG_GPIO_PCA953X is not set
862# CONFIG_GPIO_PCF857X is not set 862# CONFIG_GPIO_PCF857X is not set
863# CONFIG_GPIO_ADP5588 is not set
863 864
864# 865#
865# PCI GPIO expanders: 866# PCI GPIO expanders:
@@ -891,22 +892,25 @@ CONFIG_SSB_POSSIBLE=y
891# Multifunction device drivers 892# Multifunction device drivers
892# 893#
893# CONFIG_MFD_CORE is not set 894# CONFIG_MFD_CORE is not set
895# CONFIG_MFD_88PM860X is not set
894# CONFIG_MFD_SM501 is not set 896# CONFIG_MFD_SM501 is not set
895# CONFIG_MFD_SH_MOBILE_SDHI is not set 897# CONFIG_MFD_SH_MOBILE_SDHI is not set
896# CONFIG_HTC_PASIC3 is not set 898# CONFIG_HTC_PASIC3 is not set
899# CONFIG_HTC_I2CPLD is not set
897# CONFIG_TPS65010 is not set 900# CONFIG_TPS65010 is not set
898# CONFIG_TWL4030_CORE is not set 901# CONFIG_TWL4030_CORE is not set
899# CONFIG_MFD_TMIO is not set 902# CONFIG_MFD_TMIO is not set
900# CONFIG_PMIC_DA903X is not set 903# CONFIG_PMIC_DA903X is not set
901# CONFIG_PMIC_ADP5520 is not set 904# CONFIG_PMIC_ADP5520 is not set
905# CONFIG_MFD_MAX8925 is not set
902# CONFIG_MFD_WM8400 is not set 906# CONFIG_MFD_WM8400 is not set
903# CONFIG_MFD_WM831X is not set 907# CONFIG_MFD_WM831X is not set
904# CONFIG_MFD_WM8350_I2C is not set 908# CONFIG_MFD_WM8350_I2C is not set
909# CONFIG_MFD_WM8994 is not set
905# CONFIG_MFD_PCF50633 is not set 910# CONFIG_MFD_PCF50633 is not set
906# CONFIG_MFD_MC13783 is not set 911# CONFIG_MFD_MC13783 is not set
907# CONFIG_AB3100_CORE is not set 912# CONFIG_AB3100_CORE is not set
908# CONFIG_EZX_PCAP is not set 913# CONFIG_EZX_PCAP is not set
909# CONFIG_MFD_88PM8607 is not set
910# CONFIG_AB4500_CORE is not set 914# CONFIG_AB4500_CORE is not set
911# CONFIG_REGULATOR is not set 915# CONFIG_REGULATOR is not set
912CONFIG_MEDIA_SUPPORT=y 916CONFIG_MEDIA_SUPPORT=y
@@ -1041,10 +1045,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
1041# MMC/SD/SDIO Host Controller Drivers 1045# MMC/SD/SDIO Host Controller Drivers
1042# 1046#
1043# CONFIG_MMC_SDHCI is not set 1047# CONFIG_MMC_SDHCI is not set
1044# CONFIG_MMC_AT91 is not set
1045# CONFIG_MMC_ATMELMCI is not set
1046CONFIG_MMC_SPI=y 1048CONFIG_MMC_SPI=y
1047# CONFIG_MMC_TMIO is not set
1048# CONFIG_MEMSTICK is not set 1049# CONFIG_MEMSTICK is not set
1049# CONFIG_NEW_LEDS is not set 1050# CONFIG_NEW_LEDS is not set
1050# CONFIG_ACCESSIBILITY is not set 1051# CONFIG_ACCESSIBILITY is not set
@@ -1120,8 +1121,6 @@ CONFIG_RTC_DRV_PCF8563=y
1120CONFIG_UIO=y 1121CONFIG_UIO=y
1121# CONFIG_UIO_PDRV is not set 1122# CONFIG_UIO_PDRV is not set
1122CONFIG_UIO_PDRV_GENIRQ=y 1123CONFIG_UIO_PDRV_GENIRQ=y
1123# CONFIG_UIO_SMX is not set
1124# CONFIG_UIO_SERCOS3 is not set
1125 1124
1126# 1125#
1127# TI VLYNQ 1126# TI VLYNQ
@@ -1206,6 +1205,7 @@ CONFIG_MISC_FILESYSTEMS=y
1206# CONFIG_EFS_FS is not set 1205# CONFIG_EFS_FS is not set
1207# CONFIG_JFFS2_FS is not set 1206# CONFIG_JFFS2_FS is not set
1208# CONFIG_UBIFS_FS is not set 1207# CONFIG_UBIFS_FS is not set
1208# CONFIG_LOGFS is not set
1209# CONFIG_CRAMFS is not set 1209# CONFIG_CRAMFS is not set
1210# CONFIG_SQUASHFS is not set 1210# CONFIG_SQUASHFS is not set
1211# CONFIG_VXFS_FS is not set 1211# CONFIG_VXFS_FS is not set
@@ -1234,6 +1234,7 @@ CONFIG_SUNRPC=y
1234# CONFIG_RPCSEC_GSS_KRB5 is not set 1234# CONFIG_RPCSEC_GSS_KRB5 is not set
1235# CONFIG_RPCSEC_GSS_SPKM3 is not set 1235# CONFIG_RPCSEC_GSS_SPKM3 is not set
1236# CONFIG_SMB_FS is not set 1236# CONFIG_SMB_FS is not set
1237# CONFIG_CEPH_FS is not set
1237# CONFIG_CIFS is not set 1238# CONFIG_CIFS is not set
1238# CONFIG_NCP_FS is not set 1239# CONFIG_NCP_FS is not set
1239# CONFIG_CODA_FS is not set 1240# CONFIG_CODA_FS is not set
@@ -1426,6 +1427,7 @@ CONFIG_CRYPTO_CBC=y
1426# 1427#
1427# CONFIG_CRYPTO_ANSI_CPRNG is not set 1428# CONFIG_CRYPTO_ANSI_CPRNG is not set
1428CONFIG_CRYPTO_HW=y 1429CONFIG_CRYPTO_HW=y
1430# CONFIG_VIRTUALIZATION is not set
1429# CONFIG_BINARY_PRINTF is not set 1431# CONFIG_BINARY_PRINTF is not set
1430 1432
1431# 1433#
diff --git a/arch/sh/configs/cayman_defconfig b/arch/sh/configs/cayman_defconfig
index 92589a950d07..edae0a6830da 100644
--- a/arch/sh/configs/cayman_defconfig
+++ b/arch/sh/configs/cayman_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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 11:14:50 2010 4# Tue May 18 18:01:02 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7# CONFIG_SUPERH32 is not set 7# CONFIG_SUPERH32 is not set
@@ -13,7 +13,6 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
18# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
@@ -32,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
37 37
@@ -47,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
47CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
50CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
51# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
52# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
53CONFIG_SWAP=y 55CONFIG_SWAP=y
54# CONFIG_SYSVIPC is not set 56# CONFIG_SYSVIPC is not set
55CONFIG_POSIX_MQUEUE=y 57CONFIG_POSIX_MQUEUE=y
@@ -70,7 +72,6 @@ CONFIG_RCU_FANOUT=32
70# CONFIG_TREE_RCU_TRACE is not set 72# CONFIG_TREE_RCU_TRACE is not set
71# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
72CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
73# CONFIG_GROUP_SCHED is not set
74# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
75CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
76CONFIG_SYSFS_DEPRECATED_V2=y 77CONFIG_SYSFS_DEPRECATED_V2=y
@@ -114,7 +115,6 @@ CONFIG_SLAB=y
114# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 116# CONFIG_PROFILING is not set
116CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
117CONFIG_HAVE_IOREMAP_PROT=y
118CONFIG_HAVE_ARCH_TRACEHOOK=y 118CONFIG_HAVE_ARCH_TRACEHOOK=y
119CONFIG_HAVE_DMA_ATTRS=y 119CONFIG_HAVE_DMA_ATTRS=y
120CONFIG_HAVE_CLK=y 120CONFIG_HAVE_CLK=y
@@ -204,6 +204,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
204CONFIG_MAX_ACTIVE_REGIONS=1 204CONFIG_MAX_ACTIVE_REGIONS=1
205CONFIG_ARCH_POPULATES_NODE_MAP=y 205CONFIG_ARCH_POPULATES_NODE_MAP=y
206CONFIG_ARCH_SELECT_MEMORY_MODEL=y 206CONFIG_ARCH_SELECT_MEMORY_MODEL=y
207CONFIG_IOREMAP_FIXED=y
207CONFIG_PAGE_SIZE_4KB=y 208CONFIG_PAGE_SIZE_4KB=y
208# CONFIG_PAGE_SIZE_8KB is not set 209# CONFIG_PAGE_SIZE_8KB is not set
209# CONFIG_PAGE_SIZE_16KB is not set 210# CONFIG_PAGE_SIZE_16KB is not set
@@ -225,7 +226,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
225CONFIG_SPLIT_PTLOCK_CPUS=4 226CONFIG_SPLIT_PTLOCK_CPUS=4
226# CONFIG_PHYS_ADDR_T_64BIT is not set 227# CONFIG_PHYS_ADDR_T_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=0 228CONFIG_ZONE_DMA_FLAG=0
228CONFIG_NR_QUICK=2 229CONFIG_NR_QUICK=1
229# CONFIG_KSM is not set 230# CONFIG_KSM is not set
230CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 231CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
231 232
@@ -294,7 +295,6 @@ CONFIG_HZ=250
294# CONFIG_PREEMPT_NONE is not set 295# CONFIG_PREEMPT_NONE is not set
295# CONFIG_PREEMPT_VOLUNTARY is not set 296# CONFIG_PREEMPT_VOLUNTARY is not set
296CONFIG_PREEMPT=y 297CONFIG_PREEMPT=y
297# CONFIG_SPARSE_IRQ is not set
298 298
299# 299#
300# Boot options 300# Boot options
@@ -309,9 +309,9 @@ CONFIG_ENTRY_OFFSET=0x00001000
309# Bus options 309# Bus options
310# 310#
311CONFIG_PCI=y 311CONFIG_PCI=y
312CONFIG_PCI_DOMAINS=y
312# CONFIG_PCIEPORTBUS is not set 313# CONFIG_PCIEPORTBUS is not set
313# CONFIG_ARCH_SUPPORTS_MSI is not set 314# CONFIG_ARCH_SUPPORTS_MSI is not set
314CONFIG_PCI_LEGACY=y
315# CONFIG_PCI_DEBUG is not set 315# CONFIG_PCI_DEBUG is not set
316# CONFIG_PCI_STUB is not set 316# CONFIG_PCI_STUB is not set
317# CONFIG_PCI_IOV is not set 317# CONFIG_PCI_IOV is not set
@@ -337,7 +337,6 @@ CONFIG_NET=y
337# Networking options 337# Networking options
338# 338#
339CONFIG_PACKET=y 339CONFIG_PACKET=y
340# CONFIG_PACKET_MMAP is not set
341CONFIG_UNIX=y 340CONFIG_UNIX=y
342CONFIG_XFRM=y 341CONFIG_XFRM=y
343# CONFIG_XFRM_USER is not set 342# CONFIG_XFRM_USER is not set
@@ -463,6 +462,7 @@ CONFIG_MISC_DEVICES=y
463# CONFIG_ENCLOSURE_SERVICES is not set 462# CONFIG_ENCLOSURE_SERVICES is not set
464# CONFIG_HP_ILO is not set 463# CONFIG_HP_ILO is not set
465# CONFIG_ISL29003 is not set 464# CONFIG_ISL29003 is not set
465# CONFIG_SENSORS_TSL2550 is not set
466# CONFIG_DS1682 is not set 466# CONFIG_DS1682 is not set
467# CONFIG_C2PORT is not set 467# CONFIG_C2PORT is not set
468 468
@@ -480,6 +480,7 @@ CONFIG_HAVE_IDE=y
480# 480#
481# SCSI device support 481# SCSI device support
482# 482#
483CONFIG_SCSI_MOD=y
483# CONFIG_RAID_ATTRS is not set 484# CONFIG_RAID_ATTRS is not set
484CONFIG_SCSI=y 485CONFIG_SCSI=y
485CONFIG_SCSI_DMA=y 486CONFIG_SCSI_DMA=y
@@ -569,7 +570,7 @@ CONFIG_SCSI_LOWLEVEL=y
569# 570#
570 571
571# 572#
572# See the help texts for more information. 573# The newer stack is recommended.
573# 574#
574# CONFIG_FIREWIRE is not set 575# CONFIG_FIREWIRE is not set
575# CONFIG_IEEE1394 is not set 576# CONFIG_IEEE1394 is not set
@@ -638,6 +639,8 @@ CONFIG_NETDEV_10000=y
638# CONFIG_CHELSIO_T1 is not set 639# CONFIG_CHELSIO_T1 is not set
639CONFIG_CHELSIO_T3_DEPENDS=y 640CONFIG_CHELSIO_T3_DEPENDS=y
640# CONFIG_CHELSIO_T3 is not set 641# CONFIG_CHELSIO_T3 is not set
642CONFIG_CHELSIO_T4_DEPENDS=y
643# CONFIG_CHELSIO_T4 is not set
641# CONFIG_ENIC is not set 644# CONFIG_ENIC is not set
642# CONFIG_IXGBE is not set 645# CONFIG_IXGBE is not set
643# CONFIG_IXGB is not set 646# CONFIG_IXGB is not set
@@ -650,6 +653,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
650# CONFIG_MLX4_CORE is not set 653# CONFIG_MLX4_CORE is not set
651# CONFIG_TEHUTI is not set 654# CONFIG_TEHUTI is not set
652# CONFIG_BNX2X is not set 655# CONFIG_BNX2X is not set
656# CONFIG_QLCNIC is not set
653# CONFIG_QLGE is not set 657# CONFIG_QLGE is not set
654# CONFIG_SFC is not set 658# CONFIG_SFC is not set
655# CONFIG_BE2NET is not set 659# CONFIG_BE2NET is not set
@@ -732,6 +736,7 @@ CONFIG_DEVKMEM=y
732# 736#
733# CONFIG_SERIAL_SH_SCI is not set 737# CONFIG_SERIAL_SH_SCI is not set
734# CONFIG_SERIAL_JSM is not set 738# CONFIG_SERIAL_JSM is not set
739# CONFIG_SERIAL_TIMBERDALE is not set
735CONFIG_UNIX98_PTYS=y 740CONFIG_UNIX98_PTYS=y
736# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 741# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
737CONFIG_LEGACY_PTYS=y 742CONFIG_LEGACY_PTYS=y
@@ -779,6 +784,7 @@ CONFIG_I2C_HELPER_AUTO=y
779# CONFIG_I2C_OCORES is not set 784# CONFIG_I2C_OCORES is not set
780# CONFIG_I2C_SH_MOBILE is not set 785# CONFIG_I2C_SH_MOBILE is not set
781# CONFIG_I2C_SIMTEC is not set 786# CONFIG_I2C_SIMTEC is not set
787# CONFIG_I2C_XILINX is not set
782 788
783# 789#
784# External I2C/SMBus adapter drivers 790# External I2C/SMBus adapter drivers
@@ -791,15 +797,9 @@ CONFIG_I2C_HELPER_AUTO=y
791# 797#
792# CONFIG_I2C_PCA_PLATFORM is not set 798# CONFIG_I2C_PCA_PLATFORM is not set
793# CONFIG_I2C_STUB is not set 799# CONFIG_I2C_STUB is not set
794
795#
796# Miscellaneous I2C Chip support
797#
798# CONFIG_SENSORS_TSL2550 is not set
799# CONFIG_I2C_DEBUG_CORE is not set 800# CONFIG_I2C_DEBUG_CORE is not set
800# CONFIG_I2C_DEBUG_ALGO is not set 801# CONFIG_I2C_DEBUG_ALGO is not set
801# CONFIG_I2C_DEBUG_BUS is not set 802# CONFIG_I2C_DEBUG_BUS is not set
802# CONFIG_I2C_DEBUG_CHIP is not set
803# CONFIG_SPI is not set 803# CONFIG_SPI is not set
804 804
805# 805#
@@ -823,10 +823,11 @@ CONFIG_HWMON=y
823# CONFIG_SENSORS_ADM1029 is not set 823# CONFIG_SENSORS_ADM1029 is not set
824# CONFIG_SENSORS_ADM1031 is not set 824# CONFIG_SENSORS_ADM1031 is not set
825# CONFIG_SENSORS_ADM9240 is not set 825# CONFIG_SENSORS_ADM9240 is not set
826# CONFIG_SENSORS_ADT7411 is not set
826# CONFIG_SENSORS_ADT7462 is not set 827# CONFIG_SENSORS_ADT7462 is not set
827# CONFIG_SENSORS_ADT7470 is not set 828# CONFIG_SENSORS_ADT7470 is not set
828# CONFIG_SENSORS_ADT7473 is not set
829# CONFIG_SENSORS_ADT7475 is not set 829# CONFIG_SENSORS_ADT7475 is not set
830# CONFIG_SENSORS_ASC7621 is not set
830# CONFIG_SENSORS_ATXP1 is not set 831# CONFIG_SENSORS_ATXP1 is not set
831# CONFIG_SENSORS_DS1621 is not set 832# CONFIG_SENSORS_DS1621 is not set
832# CONFIG_SENSORS_I5K_AMB is not set 833# CONFIG_SENSORS_I5K_AMB is not set
@@ -863,6 +864,7 @@ CONFIG_HWMON=y
863# CONFIG_SENSORS_SMSC47M192 is not set 864# CONFIG_SENSORS_SMSC47M192 is not set
864# CONFIG_SENSORS_SMSC47B397 is not set 865# CONFIG_SENSORS_SMSC47B397 is not set
865# CONFIG_SENSORS_ADS7828 is not set 866# CONFIG_SENSORS_ADS7828 is not set
867# CONFIG_SENSORS_AMC6821 is not set
866# CONFIG_SENSORS_THMC50 is not set 868# CONFIG_SENSORS_THMC50 is not set
867# CONFIG_SENSORS_TMP401 is not set 869# CONFIG_SENSORS_TMP401 is not set
868# CONFIG_SENSORS_TMP421 is not set 870# CONFIG_SENSORS_TMP421 is not set
@@ -909,9 +911,9 @@ CONFIG_SSB_POSSIBLE=y
909# CONFIG_HTC_PASIC3 is not set 911# CONFIG_HTC_PASIC3 is not set
910# CONFIG_MFD_TMIO is not set 912# CONFIG_MFD_TMIO is not set
911# CONFIG_MFD_WM8400 is not set 913# CONFIG_MFD_WM8400 is not set
912# CONFIG_MFD_WM8350_I2C is not set 914# CONFIG_MFD_WM8994 is not set
913# CONFIG_MFD_PCF50633 is not set 915# CONFIG_MFD_PCF50633 is not set
914# CONFIG_AB3100_CORE is not set 916# CONFIG_LPC_SCH is not set
915# CONFIG_REGULATOR is not set 917# CONFIG_REGULATOR is not set
916# CONFIG_MEDIA_SUPPORT is not set 918# CONFIG_MEDIA_SUPPORT is not set
917 919
@@ -919,6 +921,7 @@ CONFIG_SSB_POSSIBLE=y
919# Graphics support 921# Graphics support
920# 922#
921CONFIG_VGA_ARB=y 923CONFIG_VGA_ARB=y
924CONFIG_VGA_ARB_MAX_GPUS=16
922# CONFIG_DRM is not set 925# CONFIG_DRM is not set
923# CONFIG_VGASTATE is not set 926# CONFIG_VGASTATE is not set
924CONFIG_VIDEO_OUTPUT_CONTROL=y 927CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -1125,6 +1128,7 @@ CONFIG_MISC_FILESYSTEMS=y
1125# CONFIG_BEFS_FS is not set 1128# CONFIG_BEFS_FS is not set
1126# CONFIG_BFS_FS is not set 1129# CONFIG_BFS_FS is not set
1127# CONFIG_EFS_FS is not set 1130# CONFIG_EFS_FS is not set
1131# CONFIG_LOGFS is not set
1128# CONFIG_CRAMFS is not set 1132# CONFIG_CRAMFS is not set
1129# CONFIG_SQUASHFS is not set 1133# CONFIG_SQUASHFS is not set
1130# CONFIG_VXFS_FS is not set 1134# CONFIG_VXFS_FS is not set
@@ -1153,6 +1157,7 @@ CONFIG_SUNRPC=y
1153# CONFIG_RPCSEC_GSS_KRB5 is not set 1157# CONFIG_RPCSEC_GSS_KRB5 is not set
1154# CONFIG_RPCSEC_GSS_SPKM3 is not set 1158# CONFIG_RPCSEC_GSS_SPKM3 is not set
1155# CONFIG_SMB_FS is not set 1159# CONFIG_SMB_FS is not set
1160# CONFIG_CEPH_FS is not set
1156# CONFIG_CIFS is not set 1161# CONFIG_CIFS is not set
1157# CONFIG_NCP_FS is not set 1162# CONFIG_NCP_FS is not set
1158# CONFIG_CODA_FS is not set 1163# CONFIG_CODA_FS is not set
@@ -1208,6 +1213,7 @@ CONFIG_SCHEDSTATS=y
1208# CONFIG_TIMER_STATS is not set 1213# CONFIG_TIMER_STATS is not set
1209# CONFIG_DEBUG_OBJECTS is not set 1214# CONFIG_DEBUG_OBJECTS is not set
1210# CONFIG_DEBUG_SLAB is not set 1215# CONFIG_DEBUG_SLAB is not set
1216# CONFIG_DEBUG_KMEMLEAK is not set
1211CONFIG_DEBUG_PREEMPT=y 1217CONFIG_DEBUG_PREEMPT=y
1212# CONFIG_DEBUG_RT_MUTEXES is not set 1218# CONFIG_DEBUG_RT_MUTEXES is not set
1213# CONFIG_RT_MUTEX_TESTER is not set 1219# CONFIG_RT_MUTEX_TESTER is not set
@@ -1234,6 +1240,7 @@ CONFIG_FRAME_POINTER=y
1234# CONFIG_BACKTRACE_SELF_TEST is not set 1240# CONFIG_BACKTRACE_SELF_TEST is not set
1235# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1241# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1236# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1242# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1243# CONFIG_LKDTM is not set
1237# CONFIG_FAULT_INJECTION is not set 1244# CONFIG_FAULT_INJECTION is not set
1238# CONFIG_LATENCYTOP is not set 1245# CONFIG_LATENCYTOP is not set
1239# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1246# CONFIG_SYSCTL_SYSCALL_CHECK is not set
@@ -1361,6 +1368,7 @@ CONFIG_CRYPTO=y
1361# CONFIG_CRYPTO_ANSI_CPRNG is not set 1368# CONFIG_CRYPTO_ANSI_CPRNG is not set
1362CONFIG_CRYPTO_HW=y 1369CONFIG_CRYPTO_HW=y
1363# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1370# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1371# CONFIG_VIRTUALIZATION is not set
1364# CONFIG_BINARY_PRINTF is not set 1372# CONFIG_BINARY_PRINTF is not set
1365 1373
1366# 1374#
diff --git a/arch/sh/configs/dreamcast_defconfig b/arch/sh/configs/dreamcast_defconfig
index 55f652be954b..b96bf3d2cd01 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 11:17:35 2010 4# Tue May 18 15:11:55 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
33CONFIG_ARCH_HAS_DEFAULT_IDLE=y 33CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -48,9 +49,11 @@ CONFIG_LOCALVERSION_AUTO=y
48CONFIG_HAVE_KERNEL_GZIP=y 49CONFIG_HAVE_KERNEL_GZIP=y
49CONFIG_HAVE_KERNEL_BZIP2=y 50CONFIG_HAVE_KERNEL_BZIP2=y
50CONFIG_HAVE_KERNEL_LZMA=y 51CONFIG_HAVE_KERNEL_LZMA=y
52CONFIG_HAVE_KERNEL_LZO=y
51CONFIG_KERNEL_GZIP=y 53CONFIG_KERNEL_GZIP=y
52# CONFIG_KERNEL_BZIP2 is not set 54# CONFIG_KERNEL_BZIP2 is not set
53# CONFIG_KERNEL_LZMA is not set 55# CONFIG_KERNEL_LZMA is not set
56# CONFIG_KERNEL_LZO is not set
54CONFIG_SWAP=y 57CONFIG_SWAP=y
55CONFIG_SYSVIPC=y 58CONFIG_SYSVIPC=y
56CONFIG_SYSVIPC_SYSCTL=y 59CONFIG_SYSVIPC_SYSCTL=y
@@ -72,7 +75,6 @@ CONFIG_RCU_FANOUT=32
72# CONFIG_TREE_RCU_TRACE is not set 75# CONFIG_TREE_RCU_TRACE is not set
73# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_GROUP_SCHED is not set
76# CONFIG_CGROUPS is not set 78# CONFIG_CGROUPS is not set
77CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
78CONFIG_SYSFS_DEPRECATED_V2=y 80CONFIG_SYSFS_DEPRECATED_V2=y
@@ -124,6 +126,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124CONFIG_HAVE_DMA_ATTRS=y 126CONFIG_HAVE_DMA_ATTRS=y
125CONFIG_HAVE_CLK=y 127CONFIG_HAVE_CLK=y
126CONFIG_HAVE_DMA_API_DEBUG=y 128CONFIG_HAVE_DMA_API_DEBUG=y
129CONFIG_HAVE_HW_BREAKPOINT=y
127 130
128# 131#
129# GCOV-based kernel profiling 132# GCOV-based kernel profiling
@@ -242,6 +245,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
242CONFIG_MAX_ACTIVE_REGIONS=1 245CONFIG_MAX_ACTIVE_REGIONS=1
243CONFIG_ARCH_POPULATES_NODE_MAP=y 246CONFIG_ARCH_POPULATES_NODE_MAP=y
244CONFIG_ARCH_SELECT_MEMORY_MODEL=y 247CONFIG_ARCH_SELECT_MEMORY_MODEL=y
248CONFIG_UNCACHED_MAPPING=y
245CONFIG_PAGE_SIZE_4KB=y 249CONFIG_PAGE_SIZE_4KB=y
246# CONFIG_PAGE_SIZE_8KB is not set 250# CONFIG_PAGE_SIZE_8KB is not set
247# CONFIG_PAGE_SIZE_16KB is not set 251# CONFIG_PAGE_SIZE_16KB is not set
@@ -263,7 +267,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
263CONFIG_SPLIT_PTLOCK_CPUS=4 267CONFIG_SPLIT_PTLOCK_CPUS=4
264# CONFIG_PHYS_ADDR_T_64BIT is not set 268# CONFIG_PHYS_ADDR_T_64BIT is not set
265CONFIG_ZONE_DMA_FLAG=0 269CONFIG_ZONE_DMA_FLAG=0
266CONFIG_NR_QUICK=2 270CONFIG_NR_QUICK=1
267# CONFIG_KSM is not set 271# CONFIG_KSM is not set
268CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 272CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
269 273
@@ -360,7 +364,6 @@ CONFIG_SECCOMP=y
360CONFIG_PREEMPT=y 364CONFIG_PREEMPT=y
361CONFIG_GUSA=y 365CONFIG_GUSA=y
362# CONFIG_GUSA_RB is not set 366# CONFIG_GUSA_RB is not set
363# CONFIG_SPARSE_IRQ is not set
364 367
365# 368#
366# Boot options 369# Boot options
@@ -377,9 +380,9 @@ CONFIG_CMDLINE="console=ttySC1,115200 panic=3"
377# 380#
378CONFIG_MAPLE=y 381CONFIG_MAPLE=y
379CONFIG_PCI=y 382CONFIG_PCI=y
383CONFIG_PCI_DOMAINS=y
380# CONFIG_PCIEPORTBUS is not set 384# CONFIG_PCIEPORTBUS is not set
381# CONFIG_ARCH_SUPPORTS_MSI is not set 385# CONFIG_ARCH_SUPPORTS_MSI is not set
382CONFIG_PCI_LEGACY=y
383# CONFIG_PCI_STUB is not set 386# CONFIG_PCI_STUB is not set
384# CONFIG_PCI_IOV is not set 387# CONFIG_PCI_IOV is not set
385# CONFIG_PCCARD is not set 388# CONFIG_PCCARD is not set
@@ -404,7 +407,6 @@ CONFIG_NET=y
404# Networking options 407# Networking options
405# 408#
406CONFIG_PACKET=y 409CONFIG_PACKET=y
407# CONFIG_PACKET_MMAP is not set
408CONFIG_UNIX=y 410CONFIG_UNIX=y
409CONFIG_XFRM=y 411CONFIG_XFRM=y
410# CONFIG_XFRM_USER is not set 412# CONFIG_XFRM_USER is not set
@@ -532,6 +534,7 @@ CONFIG_HAVE_IDE=y
532# 534#
533# SCSI device support 535# SCSI device support
534# 536#
537CONFIG_SCSI_MOD=y
535# CONFIG_RAID_ATTRS is not set 538# CONFIG_RAID_ATTRS is not set
536# CONFIG_SCSI is not set 539# CONFIG_SCSI is not set
537# CONFIG_SCSI_DMA is not set 540# CONFIG_SCSI_DMA is not set
@@ -549,7 +552,7 @@ CONFIG_HAVE_IDE=y
549# 552#
550 553
551# 554#
552# See the help texts for more information. 555# The newer stack is recommended.
553# 556#
554# CONFIG_FIREWIRE is not set 557# CONFIG_FIREWIRE is not set
555# CONFIG_IEEE1394 is not set 558# CONFIG_IEEE1394 is not set
@@ -589,6 +592,7 @@ CONFIG_NET_PCI=y
589# CONFIG_PCNET32 is not set 592# CONFIG_PCNET32 is not set
590# CONFIG_AMD8111_ETH is not set 593# CONFIG_AMD8111_ETH is not set
591# CONFIG_ADAPTEC_STARFIRE is not set 594# CONFIG_ADAPTEC_STARFIRE is not set
595# CONFIG_KSZ884X_PCI is not set
592# CONFIG_B44 is not set 596# CONFIG_B44 is not set
593# CONFIG_FORCEDETH is not set 597# CONFIG_FORCEDETH is not set
594# CONFIG_E100 is not set 598# CONFIG_E100 is not set
@@ -717,6 +721,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
717CONFIG_SERIAL_CORE=y 721CONFIG_SERIAL_CORE=y
718CONFIG_SERIAL_CORE_CONSOLE=y 722CONFIG_SERIAL_CORE_CONSOLE=y
719# CONFIG_SERIAL_JSM is not set 723# CONFIG_SERIAL_JSM is not set
724# CONFIG_SERIAL_TIMBERDALE is not set
720CONFIG_UNIX98_PTYS=y 725CONFIG_UNIX98_PTYS=y
721# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 726# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
722CONFIG_LEGACY_PTYS=y 727CONFIG_LEGACY_PTYS=y
@@ -771,6 +776,7 @@ CONFIG_SSB_POSSIBLE=y
771# CONFIG_MFD_SH_MOBILE_SDHI is not set 776# CONFIG_MFD_SH_MOBILE_SDHI is not set
772# CONFIG_HTC_PASIC3 is not set 777# CONFIG_HTC_PASIC3 is not set
773# CONFIG_MFD_TMIO is not set 778# CONFIG_MFD_TMIO is not set
779# CONFIG_LPC_SCH is not set
774# CONFIG_REGULATOR is not set 780# CONFIG_REGULATOR is not set
775# CONFIG_MEDIA_SUPPORT is not set 781# CONFIG_MEDIA_SUPPORT is not set
776 782
@@ -778,6 +784,7 @@ CONFIG_SSB_POSSIBLE=y
778# Graphics support 784# Graphics support
779# 785#
780CONFIG_VGA_ARB=y 786CONFIG_VGA_ARB=y
787CONFIG_VGA_ARB_MAX_GPUS=16
781# CONFIG_DRM is not set 788# CONFIG_DRM is not set
782# CONFIG_VGASTATE is not set 789# CONFIG_VGASTATE is not set
783CONFIG_VIDEO_OUTPUT_CONTROL=m 790CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -918,7 +925,6 @@ CONFIG_RTC_LIB=y
918# CONFIG_EXT2_FS is not set 925# CONFIG_EXT2_FS is not set
919# CONFIG_EXT3_FS is not set 926# CONFIG_EXT3_FS is not set
920# CONFIG_EXT4_FS is not set 927# CONFIG_EXT4_FS is not set
921CONFIG_EXT4_USE_FOR_EXT23=y
922# CONFIG_REISERFS_FS is not set 928# CONFIG_REISERFS_FS is not set
923# CONFIG_JFS_FS is not set 929# CONFIG_JFS_FS is not set
924# CONFIG_FS_POSIX_ACL is not set 930# CONFIG_FS_POSIX_ACL is not set
@@ -976,6 +982,7 @@ CONFIG_MISC_FILESYSTEMS=y
976# CONFIG_BEFS_FS is not set 982# CONFIG_BEFS_FS is not set
977# CONFIG_BFS_FS is not set 983# CONFIG_BFS_FS is not set
978# CONFIG_EFS_FS is not set 984# CONFIG_EFS_FS is not set
985# CONFIG_LOGFS is not set
979# CONFIG_CRAMFS is not set 986# CONFIG_CRAMFS is not set
980# CONFIG_SQUASHFS is not set 987# CONFIG_SQUASHFS is not set
981# CONFIG_VXFS_FS is not set 988# CONFIG_VXFS_FS is not set
@@ -990,6 +997,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
990# CONFIG_NFS_FS is not set 997# CONFIG_NFS_FS is not set
991# CONFIG_NFSD is not set 998# CONFIG_NFSD is not set
992# CONFIG_SMB_FS is not set 999# CONFIG_SMB_FS is not set
1000# CONFIG_CEPH_FS is not set
993# CONFIG_CIFS is not set 1001# CONFIG_CIFS is not set
994# CONFIG_NCP_FS is not set 1002# CONFIG_NCP_FS is not set
995# CONFIG_CODA_FS is not set 1003# CONFIG_CODA_FS is not set
@@ -1135,6 +1143,7 @@ CONFIG_CRYPTO=y
1135# CONFIG_CRYPTO_ANSI_CPRNG is not set 1143# CONFIG_CRYPTO_ANSI_CPRNG is not set
1136CONFIG_CRYPTO_HW=y 1144CONFIG_CRYPTO_HW=y
1137# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1145# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1146# CONFIG_VIRTUALIZATION is not set
1138# CONFIG_BINARY_PRINTF is not set 1147# CONFIG_BINARY_PRINTF is not set
1139 1148
1140# 1149#
diff --git a/arch/sh/configs/ecovec24-romimage_defconfig b/arch/sh/configs/ecovec24-romimage_defconfig
index 662c1ad20494..58aec9dd5630 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 11:18:17 2010 4# Tue May 18 15:14:56 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION=""
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SWAP=y 55CONFIG_SWAP=y
53CONFIG_SYSVIPC=y 56CONFIG_SYSVIPC=y
54CONFIG_SYSVIPC_SYSCTL=y 57CONFIG_SYSVIPC_SYSCTL=y
@@ -71,11 +74,6 @@ CONFIG_RCU_FANOUT=32
71CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
72CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
73CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
74CONFIG_GROUP_SCHED=y
75CONFIG_FAIR_GROUP_SCHED=y
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
79# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 79CONFIG_SYSFS_DEPRECATED_V2=y
@@ -86,6 +84,7 @@ CONFIG_INITRAMFS_SOURCE=""
86CONFIG_RD_GZIP=y 84CONFIG_RD_GZIP=y
87# CONFIG_RD_BZIP2 is not set 85# CONFIG_RD_BZIP2 is not set
88# CONFIG_RD_LZMA is not set 86# CONFIG_RD_LZMA is not set
87# CONFIG_RD_LZO is not set
89CONFIG_CC_OPTIMIZE_FOR_SIZE=y 88CONFIG_CC_OPTIMIZE_FOR_SIZE=y
90CONFIG_SYSCTL=y 89CONFIG_SYSCTL=y
91CONFIG_ANON_INODES=y 90CONFIG_ANON_INODES=y
@@ -111,7 +110,7 @@ CONFIG_PERF_USE_VMALLOC=y
111# 110#
112# Kernel Performance Events And Counters 111# Kernel Performance Events And Counters
113# 112#
114# CONFIG_PERF_EVENTS is not set 113CONFIG_PERF_EVENTS=y
115# CONFIG_PERF_COUNTERS is not set 114# CONFIG_PERF_COUNTERS is not set
116CONFIG_VM_EVENT_COUNTERS=y 115CONFIG_VM_EVENT_COUNTERS=y
117CONFIG_COMPAT_BRK=y 116CONFIG_COMPAT_BRK=y
@@ -120,13 +119,13 @@ CONFIG_SLAB=y
120# CONFIG_SLOB is not set 119# CONFIG_SLOB is not set
121# CONFIG_PROFILING is not set 120# CONFIG_PROFILING is not set
122CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
123CONFIG_HAVE_IOREMAP_PROT=y
124CONFIG_HAVE_KPROBES=y 122CONFIG_HAVE_KPROBES=y
125CONFIG_HAVE_KRETPROBES=y 123CONFIG_HAVE_KRETPROBES=y
126CONFIG_HAVE_ARCH_TRACEHOOK=y 124CONFIG_HAVE_ARCH_TRACEHOOK=y
127CONFIG_HAVE_DMA_ATTRS=y 125CONFIG_HAVE_DMA_ATTRS=y
128CONFIG_HAVE_CLK=y 126CONFIG_HAVE_CLK=y
129CONFIG_HAVE_DMA_API_DEBUG=y 127CONFIG_HAVE_DMA_API_DEBUG=y
128CONFIG_HAVE_HW_BREAKPOINT=y
130 129
131# 130#
132# GCOV-based kernel profiling 131# GCOV-based kernel profiling
@@ -237,8 +236,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
237CONFIG_MEMORY_START=0x08000000 236CONFIG_MEMORY_START=0x08000000
238CONFIG_MEMORY_SIZE=0x10000000 237CONFIG_MEMORY_SIZE=0x10000000
239CONFIG_29BIT=y 238CONFIG_29BIT=y
240# CONFIG_PMB_ENABLE is not set 239# CONFIG_PMB is not set
241# CONFIG_X2TLB is not set 240CONFIG_X2TLB=y
242CONFIG_VSYSCALL=y 241CONFIG_VSYSCALL=y
243CONFIG_ARCH_FLATMEM_ENABLE=y 242CONFIG_ARCH_FLATMEM_ENABLE=y
244CONFIG_ARCH_SPARSEMEM_ENABLE=y 243CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -246,6 +245,8 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
246CONFIG_MAX_ACTIVE_REGIONS=1 245CONFIG_MAX_ACTIVE_REGIONS=1
247CONFIG_ARCH_POPULATES_NODE_MAP=y 246CONFIG_ARCH_POPULATES_NODE_MAP=y
248CONFIG_ARCH_SELECT_MEMORY_MODEL=y 247CONFIG_ARCH_SELECT_MEMORY_MODEL=y
248CONFIG_IOREMAP_FIXED=y
249CONFIG_UNCACHED_MAPPING=y
249CONFIG_PAGE_SIZE_4KB=y 250CONFIG_PAGE_SIZE_4KB=y
250# CONFIG_PAGE_SIZE_8KB is not set 251# CONFIG_PAGE_SIZE_8KB is not set
251# CONFIG_PAGE_SIZE_16KB is not set 252# CONFIG_PAGE_SIZE_16KB is not set
@@ -261,7 +262,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
261CONFIG_SPLIT_PTLOCK_CPUS=4 262CONFIG_SPLIT_PTLOCK_CPUS=4
262# CONFIG_PHYS_ADDR_T_64BIT is not set 263# CONFIG_PHYS_ADDR_T_64BIT is not set
263CONFIG_ZONE_DMA_FLAG=0 264CONFIG_ZONE_DMA_FLAG=0
264CONFIG_NR_QUICK=2 265CONFIG_NR_QUICK=1
265# CONFIG_KSM is not set 266# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 267CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267 268
@@ -336,7 +337,7 @@ CONFIG_PREEMPT_NONE=y
336# CONFIG_PREEMPT_VOLUNTARY is not set 337# CONFIG_PREEMPT_VOLUNTARY is not set
337# CONFIG_PREEMPT is not set 338# CONFIG_PREEMPT is not set
338CONFIG_GUSA=y 339CONFIG_GUSA=y
339# CONFIG_SPARSE_IRQ is not set 340# CONFIG_INTC_USERIMASK is not set
340 341
341# 342#
342# Boot options 343# Boot options
@@ -370,6 +371,7 @@ CONFIG_PM=y
370# CONFIG_SUSPEND is not set 371# CONFIG_SUSPEND is not set
371# CONFIG_HIBERNATION is not set 372# CONFIG_HIBERNATION is not set
372CONFIG_PM_RUNTIME=y 373CONFIG_PM_RUNTIME=y
374CONFIG_PM_OPS=y
373# CONFIG_CPU_IDLE is not set 375# CONFIG_CPU_IDLE is not set
374CONFIG_NET=y 376CONFIG_NET=y
375 377
@@ -377,7 +379,6 @@ CONFIG_NET=y
377# Networking options 379# Networking options
378# 380#
379CONFIG_PACKET=y 381CONFIG_PACKET=y
380CONFIG_PACKET_MMAP=y
381CONFIG_UNIX=y 382CONFIG_UNIX=y
382# CONFIG_NET_KEY is not set 383# CONFIG_NET_KEY is not set
383CONFIG_INET=y 384CONFIG_INET=y
@@ -485,6 +486,7 @@ CONFIG_HAVE_IDE=y
485# 486#
486# SCSI device support 487# SCSI device support
487# 488#
489CONFIG_SCSI_MOD=y
488# CONFIG_RAID_ATTRS is not set 490# CONFIG_RAID_ATTRS is not set
489CONFIG_SCSI=y 491CONFIG_SCSI=y
490CONFIG_SCSI_DMA=y 492CONFIG_SCSI_DMA=y
@@ -585,6 +587,7 @@ CONFIG_WLAN=y
585# CONFIG_USB_PEGASUS is not set 587# CONFIG_USB_PEGASUS is not set
586# CONFIG_USB_RTL8150 is not set 588# CONFIG_USB_RTL8150 is not set
587# CONFIG_USB_USBNET is not set 589# CONFIG_USB_USBNET is not set
590# CONFIG_USB_IPHETH is not set
588# CONFIG_WAN is not set 591# CONFIG_WAN is not set
589# CONFIG_PPP is not set 592# CONFIG_PPP is not set
590# CONFIG_SLIP is not set 593# CONFIG_SLIP is not set
@@ -650,6 +653,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6
650CONFIG_SERIAL_SH_SCI_CONSOLE=y 653CONFIG_SERIAL_SH_SCI_CONSOLE=y
651CONFIG_SERIAL_CORE=y 654CONFIG_SERIAL_CORE=y
652CONFIG_SERIAL_CORE_CONSOLE=y 655CONFIG_SERIAL_CORE_CONSOLE=y
656# CONFIG_SERIAL_TIMBERDALE is not set
653CONFIG_UNIX98_PTYS=y 657CONFIG_UNIX98_PTYS=y
654# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 658# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
655CONFIG_LEGACY_PTYS=y 659CONFIG_LEGACY_PTYS=y
@@ -678,6 +682,7 @@ CONFIG_I2C_HELPER_AUTO=y
678# CONFIG_I2C_OCORES is not set 682# CONFIG_I2C_OCORES is not set
679CONFIG_I2C_SH_MOBILE=y 683CONFIG_I2C_SH_MOBILE=y
680# CONFIG_I2C_SIMTEC is not set 684# CONFIG_I2C_SIMTEC is not set
685# CONFIG_I2C_XILINX is not set
681 686
682# 687#
683# External I2C/SMBus adapter drivers 688# External I2C/SMBus adapter drivers
@@ -690,15 +695,9 @@ CONFIG_I2C_SH_MOBILE=y
690# Other I2C/SMBus bus drivers 695# Other I2C/SMBus bus drivers
691# 696#
692# CONFIG_I2C_PCA_PLATFORM is not set 697# CONFIG_I2C_PCA_PLATFORM is not set
693
694#
695# Miscellaneous I2C Chip support
696#
697# CONFIG_SENSORS_TSL2550 is not set
698# CONFIG_I2C_DEBUG_CORE is not set 698# CONFIG_I2C_DEBUG_CORE is not set
699# CONFIG_I2C_DEBUG_ALGO is not set 699# CONFIG_I2C_DEBUG_ALGO is not set
700# CONFIG_I2C_DEBUG_BUS is not set 700# CONFIG_I2C_DEBUG_BUS is not set
701# CONFIG_I2C_DEBUG_CHIP is not set
702# CONFIG_SPI is not set 701# CONFIG_SPI is not set
703 702
704# 703#
@@ -712,13 +711,16 @@ CONFIG_GPIO_SYSFS=y
712# 711#
713# Memory mapped GPIO expanders: 712# Memory mapped GPIO expanders:
714# 713#
714# CONFIG_GPIO_IT8761E is not set
715 715
716# 716#
717# I2C GPIO expanders: 717# I2C GPIO expanders:
718# 718#
719# CONFIG_GPIO_MAX7300 is not set
719# CONFIG_GPIO_MAX732X is not set 720# CONFIG_GPIO_MAX732X is not set
720# CONFIG_GPIO_PCA953X is not set 721# CONFIG_GPIO_PCA953X is not set
721# CONFIG_GPIO_PCF857X is not set 722# CONFIG_GPIO_PCF857X is not set
723# CONFIG_GPIO_ADP5588 is not set
722 724
723# 725#
724# PCI GPIO expanders: 726# PCI GPIO expanders:
@@ -747,20 +749,23 @@ CONFIG_SSB_POSSIBLE=y
747# Multifunction device drivers 749# Multifunction device drivers
748# 750#
749# CONFIG_MFD_CORE is not set 751# CONFIG_MFD_CORE is not set
752# CONFIG_MFD_88PM860X is not set
750# CONFIG_MFD_SM501 is not set 753# CONFIG_MFD_SM501 is not set
751# CONFIG_MFD_SH_MOBILE_SDHI is not set 754# CONFIG_MFD_SH_MOBILE_SDHI is not set
752# CONFIG_HTC_PASIC3 is not set 755# CONFIG_HTC_PASIC3 is not set
756# CONFIG_HTC_I2CPLD is not set
753# CONFIG_TPS65010 is not set 757# CONFIG_TPS65010 is not set
754# CONFIG_TWL4030_CORE is not set 758# CONFIG_TWL4030_CORE is not set
755# CONFIG_MFD_TMIO is not set 759# CONFIG_MFD_TMIO is not set
756# CONFIG_PMIC_DA903X is not set 760# CONFIG_PMIC_DA903X is not set
757# CONFIG_PMIC_ADP5520 is not set 761# CONFIG_PMIC_ADP5520 is not set
762# CONFIG_MFD_MAX8925 is not set
758# CONFIG_MFD_WM8400 is not set 763# CONFIG_MFD_WM8400 is not set
759# CONFIG_MFD_WM831X is not set 764# CONFIG_MFD_WM831X is not set
760# CONFIG_MFD_WM8350_I2C is not set 765# CONFIG_MFD_WM8350_I2C is not set
766# CONFIG_MFD_WM8994 is not set
761# CONFIG_MFD_PCF50633 is not set 767# CONFIG_MFD_PCF50633 is not set
762# CONFIG_AB3100_CORE is not set 768# CONFIG_AB3100_CORE is not set
763# CONFIG_MFD_88PM8607 is not set
764# CONFIG_REGULATOR is not set 769# CONFIG_REGULATOR is not set
765# CONFIG_MEDIA_SUPPORT is not set 770# CONFIG_MEDIA_SUPPORT is not set
766 771
@@ -868,7 +873,6 @@ CONFIG_USB_STORAGE=y
868# CONFIG_USB_RIO500 is not set 873# CONFIG_USB_RIO500 is not set
869# CONFIG_USB_LEGOTOWER is not set 874# CONFIG_USB_LEGOTOWER is not set
870# CONFIG_USB_LCD is not set 875# CONFIG_USB_LCD is not set
871# CONFIG_USB_BERRY_CHARGE is not set
872# CONFIG_USB_LED is not set 876# CONFIG_USB_LED is not set
873# CONFIG_USB_CYPRESS_CY7C63 is not set 877# CONFIG_USB_CYPRESS_CY7C63 is not set
874# CONFIG_USB_CYTHERM is not set 878# CONFIG_USB_CYTHERM is not set
@@ -880,7 +884,6 @@ CONFIG_USB_STORAGE=y
880# CONFIG_USB_IOWARRIOR is not set 884# CONFIG_USB_IOWARRIOR is not set
881# CONFIG_USB_TEST is not set 885# CONFIG_USB_TEST is not set
882# CONFIG_USB_ISIGHTFW is not set 886# CONFIG_USB_ISIGHTFW is not set
883# CONFIG_USB_VST is not set
884# CONFIG_USB_GADGET is not set 887# CONFIG_USB_GADGET is not set
885 888
886# 889#
@@ -911,7 +914,6 @@ CONFIG_EXT2_FS=y
911# CONFIG_EXT2_FS_XIP is not set 914# CONFIG_EXT2_FS_XIP is not set
912# CONFIG_EXT3_FS is not set 915# CONFIG_EXT3_FS is not set
913# CONFIG_EXT4_FS is not set 916# CONFIG_EXT4_FS is not set
914CONFIG_EXT4_USE_FOR_EXT23=y
915# CONFIG_REISERFS_FS is not set 917# CONFIG_REISERFS_FS is not set
916# CONFIG_JFS_FS is not set 918# CONFIG_JFS_FS is not set
917# CONFIG_FS_POSIX_ACL is not set 919# CONFIG_FS_POSIX_ACL is not set
@@ -1027,6 +1029,7 @@ CONFIG_DEBUG_FS=y
1027CONFIG_DEBUG_BUGVERBOSE=y 1029CONFIG_DEBUG_BUGVERBOSE=y
1028# CONFIG_DEBUG_MEMORY_INIT is not set 1030# CONFIG_DEBUG_MEMORY_INIT is not set
1029# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1031# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1032# CONFIG_LKDTM is not set
1030# CONFIG_LATENCYTOP is not set 1033# CONFIG_LATENCYTOP is not set
1031# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1034# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1032CONFIG_HAVE_FUNCTION_TRACER=y 1035CONFIG_HAVE_FUNCTION_TRACER=y
@@ -1056,6 +1059,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1056CONFIG_DEFAULT_SECURITY_DAC=y 1059CONFIG_DEFAULT_SECURITY_DAC=y
1057CONFIG_DEFAULT_SECURITY="" 1060CONFIG_DEFAULT_SECURITY=""
1058# CONFIG_CRYPTO is not set 1061# CONFIG_CRYPTO is not set
1062# CONFIG_VIRTUALIZATION is not set
1059# CONFIG_BINARY_PRINTF is not set 1063# CONFIG_BINARY_PRINTF is not set
1060 1064
1061# 1065#
diff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_defconfig
index 6041c66dd10e..67c665671c6c 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.34-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Mar 29 02:21:58 2010 4# Tue May 18 15:17:28 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -336,6 +336,7 @@ CONFIG_SECCOMP=y
336# CONFIG_PREEMPT_VOLUNTARY is not set 336# CONFIG_PREEMPT_VOLUNTARY is not set
337CONFIG_PREEMPT=y 337CONFIG_PREEMPT=y
338CONFIG_GUSA=y 338CONFIG_GUSA=y
339# CONFIG_INTC_USERIMASK is not set
339 340
340# 341#
341# Boot options 342# Boot options
@@ -762,6 +763,7 @@ CONFIG_WLAN=y
762# CONFIG_USB_PEGASUS is not set 763# CONFIG_USB_PEGASUS is not set
763# CONFIG_USB_RTL8150 is not set 764# CONFIG_USB_RTL8150 is not set
764# CONFIG_USB_USBNET is not set 765# CONFIG_USB_USBNET is not set
766# CONFIG_USB_IPHETH is not set
765# CONFIG_WAN is not set 767# CONFIG_WAN is not set
766# CONFIG_PPP is not set 768# CONFIG_PPP is not set
767# CONFIG_SLIP is not set 769# CONFIG_SLIP is not set
@@ -1755,6 +1757,7 @@ CONFIG_CRYPTO_CBC=y
1755# 1757#
1756# CONFIG_CRYPTO_ANSI_CPRNG is not set 1758# CONFIG_CRYPTO_ANSI_CPRNG is not set
1757CONFIG_CRYPTO_HW=y 1759CONFIG_CRYPTO_HW=y
1760# CONFIG_VIRTUALIZATION is not set
1758# CONFIG_BINARY_PRINTF is not set 1761# CONFIG_BINARY_PRINTF is not set
1759 1762
1760# 1763#
diff --git a/arch/sh/configs/edosk7705_defconfig b/arch/sh/configs/edosk7705_defconfig
index 72f8718dd738..0883d873ea64 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 11:24:26 2010 4# Tue May 18 15:21:52 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -12,8 +12,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
12CONFIG_GENERIC_HWEIGHT=y 12CONFIG_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
16CONFIG_IRQ_PER_CPU=y 15CONFIG_IRQ_PER_CPU=y
16CONFIG_SPARSE_IRQ=y
17# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
@@ -29,6 +29,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 29CONFIG_ARCH_HAS_DEFAULT_IDLE=y
30CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 30CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DMA_NONCOHERENT=y 31CONFIG_DMA_NONCOHERENT=y
32CONFIG_NEED_DMA_MAP_STATE=y
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y 34CONFIG_CONSTRUCTORS=y
34 35
@@ -43,9 +44,11 @@ CONFIG_LOCALVERSION=""
43CONFIG_HAVE_KERNEL_GZIP=y 44CONFIG_HAVE_KERNEL_GZIP=y
44CONFIG_HAVE_KERNEL_BZIP2=y 45CONFIG_HAVE_KERNEL_BZIP2=y
45CONFIG_HAVE_KERNEL_LZMA=y 46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_HAVE_KERNEL_LZO=y
46CONFIG_KERNEL_GZIP=y 48CONFIG_KERNEL_GZIP=y
47# CONFIG_KERNEL_BZIP2 is not set 49# CONFIG_KERNEL_BZIP2 is not set
48# CONFIG_KERNEL_LZMA is not set 50# CONFIG_KERNEL_LZMA is not set
51# CONFIG_KERNEL_LZO is not set
49# CONFIG_SYSVIPC is not set 52# CONFIG_SYSVIPC is not set
50# CONFIG_BSD_PROCESS_ACCT is not set 53# CONFIG_BSD_PROCESS_ACCT is not set
51 54
@@ -61,11 +64,11 @@ CONFIG_RCU_FANOUT=32
61# CONFIG_TREE_RCU_TRACE is not set 64# CONFIG_TREE_RCU_TRACE is not set
62# CONFIG_IKCONFIG is not set 65# CONFIG_IKCONFIG is not set
63CONFIG_LOG_BUF_SHIFT=17 66CONFIG_LOG_BUF_SHIFT=17
64# CONFIG_CGROUPS is not set
65# CONFIG_RELAY is not set 67# CONFIG_RELAY is not set
66# CONFIG_NAMESPACES is not set 68# CONFIG_NAMESPACES is not set
67# CONFIG_BLK_DEV_INITRD is not set 69# CONFIG_BLK_DEV_INITRD is not set
68# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 70# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
71CONFIG_ANON_INODES=y
69CONFIG_EMBEDDED=y 72CONFIG_EMBEDDED=y
70# CONFIG_UID16 is not set 73# CONFIG_UID16 is not set
71# CONFIG_KALLSYMS is not set 74# CONFIG_KALLSYMS is not set
@@ -87,7 +90,7 @@ CONFIG_PERF_USE_VMALLOC=y
87# 90#
88# Kernel Performance Events And Counters 91# Kernel Performance Events And Counters
89# 92#
90# CONFIG_PERF_EVENTS is not set 93CONFIG_PERF_EVENTS=y
91# CONFIG_PERF_COUNTERS is not set 94# CONFIG_PERF_COUNTERS is not set
92# CONFIG_VM_EVENT_COUNTERS is not set 95# CONFIG_VM_EVENT_COUNTERS is not set
93# CONFIG_COMPAT_BRK is not set 96# CONFIG_COMPAT_BRK is not set
@@ -103,6 +106,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
103CONFIG_HAVE_DMA_ATTRS=y 106CONFIG_HAVE_DMA_ATTRS=y
104CONFIG_HAVE_CLK=y 107CONFIG_HAVE_CLK=y
105CONFIG_HAVE_DMA_API_DEBUG=y 108CONFIG_HAVE_DMA_API_DEBUG=y
109CONFIG_HAVE_HW_BREAKPOINT=y
106 110
107# 111#
108# GCOV-based kernel profiling 112# GCOV-based kernel profiling
@@ -202,6 +206,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
202CONFIG_ARCH_SELECT_MEMORY_MODEL=y 206CONFIG_ARCH_SELECT_MEMORY_MODEL=y
203CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 207CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
204CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 208CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
209CONFIG_UNCACHED_MAPPING=y
205CONFIG_PAGE_SIZE_4KB=y 210CONFIG_PAGE_SIZE_4KB=y
206# CONFIG_PAGE_SIZE_8KB is not set 211# CONFIG_PAGE_SIZE_8KB is not set
207# CONFIG_PAGE_SIZE_16KB is not set 212# CONFIG_PAGE_SIZE_16KB is not set
@@ -217,7 +222,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
217CONFIG_MIGRATION=y 222CONFIG_MIGRATION=y
218# CONFIG_PHYS_ADDR_T_64BIT is not set 223# CONFIG_PHYS_ADDR_T_64BIT is not set
219CONFIG_ZONE_DMA_FLAG=0 224CONFIG_ZONE_DMA_FLAG=0
220CONFIG_NR_QUICK=2 225CONFIG_NR_QUICK=1
221# CONFIG_KSM is not set 226# CONFIG_KSM is not set
222CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 227CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
223 228
@@ -330,6 +335,7 @@ CONFIG_HAVE_IDE=y
330# 335#
331# SCSI device support 336# SCSI device support
332# 337#
338CONFIG_SCSI_MOD=y
333# CONFIG_SCSI_DMA is not set 339# CONFIG_SCSI_DMA is not set
334# CONFIG_SCSI_NETLINK is not set 340# CONFIG_SCSI_NETLINK is not set
335# CONFIG_PHONE is not set 341# CONFIG_PHONE is not set
@@ -361,6 +367,7 @@ CONFIG_HAVE_IDE=y
361# Non-8250 serial port support 367# Non-8250 serial port support
362# 368#
363# CONFIG_SERIAL_SH_SCI is not set 369# CONFIG_SERIAL_SH_SCI is not set
370# CONFIG_SERIAL_TIMBERDALE is not set
364# CONFIG_UNIX98_PTYS is not set 371# CONFIG_UNIX98_PTYS is not set
365# CONFIG_LEGACY_PTYS is not set 372# CONFIG_LEGACY_PTYS is not set
366# CONFIG_IPMI_HANDLER is not set 373# CONFIG_IPMI_HANDLER is not set
@@ -440,6 +447,7 @@ CONFIG_INOTIFY_USER=y
440# 447#
441# Caches 448# Caches
442# 449#
450# CONFIG_FSCACHE is not set
443 451
444# 452#
445# Pseudo filesystems 453# Pseudo filesystems
@@ -491,6 +499,7 @@ CONFIG_HAVE_ARCH_KGDB=y
491CONFIG_DEFAULT_SECURITY_DAC=y 499CONFIG_DEFAULT_SECURITY_DAC=y
492CONFIG_DEFAULT_SECURITY="" 500CONFIG_DEFAULT_SECURITY=""
493# CONFIG_CRYPTO is not set 501# CONFIG_CRYPTO is not set
502# CONFIG_VIRTUALIZATION is not set
494# CONFIG_BINARY_PRINTF is not set 503# CONFIG_BINARY_PRINTF is not set
495 504
496# 505#
diff --git a/arch/sh/configs/edosk7760_defconfig b/arch/sh/configs/edosk7760_defconfig
index 0932e6d656eb..8257f5776374 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 11:24:44 2010 4# Tue May 18 15:23:10 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SWAP=y 55CONFIG_SWAP=y
53CONFIG_SYSVIPC=y 56CONFIG_SYSVIPC=y
54CONFIG_SYSVIPC_SYSCTL=y 57CONFIG_SYSVIPC_SYSCTL=y
@@ -72,7 +75,6 @@ CONFIG_RCU_FANOUT=32
72CONFIG_IKCONFIG=y 75CONFIG_IKCONFIG=y
73CONFIG_IKCONFIG_PROC=y 76CONFIG_IKCONFIG_PROC=y
74CONFIG_LOG_BUF_SHIFT=17 77CONFIG_LOG_BUF_SHIFT=17
75# CONFIG_GROUP_SCHED is not set
76# CONFIG_CGROUPS is not set 78# CONFIG_CGROUPS is not set
77CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
78CONFIG_SYSFS_DEPRECATED_V2=y 80CONFIG_SYSFS_DEPRECATED_V2=y
@@ -83,6 +85,7 @@ CONFIG_INITRAMFS_SOURCE=""
83CONFIG_RD_GZIP=y 85CONFIG_RD_GZIP=y
84# CONFIG_RD_BZIP2 is not set 86# CONFIG_RD_BZIP2 is not set
85# CONFIG_RD_LZMA is not set 87# CONFIG_RD_LZMA is not set
88# CONFIG_RD_LZO is not set
86CONFIG_CC_OPTIMIZE_FOR_SIZE=y 89CONFIG_CC_OPTIMIZE_FOR_SIZE=y
87CONFIG_SYSCTL=y 90CONFIG_SYSCTL=y
88CONFIG_ANON_INODES=y 91CONFIG_ANON_INODES=y
@@ -110,8 +113,9 @@ CONFIG_PERF_USE_VMALLOC=y
110# 113#
111# Kernel Performance Events And Counters 114# Kernel Performance Events And Counters
112# 115#
113# CONFIG_PERF_EVENTS is not set 116CONFIG_PERF_EVENTS=y
114# CONFIG_PERF_COUNTERS is not set 117# CONFIG_PERF_COUNTERS is not set
118# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
115CONFIG_VM_EVENT_COUNTERS=y 119CONFIG_VM_EVENT_COUNTERS=y
116CONFIG_SLUB_DEBUG=y 120CONFIG_SLUB_DEBUG=y
117CONFIG_COMPAT_BRK=y 121CONFIG_COMPAT_BRK=y
@@ -128,6 +132,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
128CONFIG_HAVE_DMA_ATTRS=y 132CONFIG_HAVE_DMA_ATTRS=y
129CONFIG_HAVE_CLK=y 133CONFIG_HAVE_CLK=y
130CONFIG_HAVE_DMA_API_DEBUG=y 134CONFIG_HAVE_DMA_API_DEBUG=y
135CONFIG_HAVE_HW_BREAKPOINT=y
131 136
132# 137#
133# GCOV-based kernel profiling 138# GCOV-based kernel profiling
@@ -246,6 +251,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
246CONFIG_MAX_ACTIVE_REGIONS=1 251CONFIG_MAX_ACTIVE_REGIONS=1
247CONFIG_ARCH_POPULATES_NODE_MAP=y 252CONFIG_ARCH_POPULATES_NODE_MAP=y
248CONFIG_ARCH_SELECT_MEMORY_MODEL=y 253CONFIG_ARCH_SELECT_MEMORY_MODEL=y
254CONFIG_UNCACHED_MAPPING=y
249CONFIG_PAGE_SIZE_4KB=y 255CONFIG_PAGE_SIZE_4KB=y
250# CONFIG_PAGE_SIZE_8KB is not set 256# CONFIG_PAGE_SIZE_8KB is not set
251# CONFIG_PAGE_SIZE_16KB is not set 257# CONFIG_PAGE_SIZE_16KB is not set
@@ -261,7 +267,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
261CONFIG_SPLIT_PTLOCK_CPUS=4 267CONFIG_SPLIT_PTLOCK_CPUS=4
262# CONFIG_PHYS_ADDR_T_64BIT is not set 268# CONFIG_PHYS_ADDR_T_64BIT is not set
263CONFIG_ZONE_DMA_FLAG=0 269CONFIG_ZONE_DMA_FLAG=0
264CONFIG_NR_QUICK=2 270CONFIG_NR_QUICK=1
265# CONFIG_KSM is not set 271# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 272CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267 273
@@ -342,7 +348,6 @@ CONFIG_SCHED_HRTICK=y
342CONFIG_PREEMPT=y 348CONFIG_PREEMPT=y
343CONFIG_GUSA=y 349CONFIG_GUSA=y
344# CONFIG_GUSA_RB is not set 350# CONFIG_GUSA_RB is not set
345# CONFIG_SPARSE_IRQ is not set
346 351
347# 352#
348# Boot options 353# Boot options
@@ -379,7 +384,6 @@ CONFIG_NET=y
379# Networking options 384# Networking options
380# 385#
381CONFIG_PACKET=y 386CONFIG_PACKET=y
382# CONFIG_PACKET_MMAP is not set
383CONFIG_UNIX=y 387CONFIG_UNIX=y
384# CONFIG_NET_KEY is not set 388# CONFIG_NET_KEY is not set
385CONFIG_INET=y 389CONFIG_INET=y
@@ -579,6 +583,7 @@ CONFIG_HAVE_IDE=y
579# 583#
580# SCSI device support 584# SCSI device support
581# 585#
586CONFIG_SCSI_MOD=y
582# CONFIG_RAID_ATTRS is not set 587# CONFIG_RAID_ATTRS is not set
583# CONFIG_SCSI is not set 588# CONFIG_SCSI is not set
584# CONFIG_SCSI_DMA is not set 589# CONFIG_SCSI_DMA is not set
@@ -685,6 +690,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=3
685CONFIG_SERIAL_SH_SCI_CONSOLE=y 690CONFIG_SERIAL_SH_SCI_CONSOLE=y
686CONFIG_SERIAL_CORE=y 691CONFIG_SERIAL_CORE=y
687CONFIG_SERIAL_CORE_CONSOLE=y 692CONFIG_SERIAL_CORE_CONSOLE=y
693# CONFIG_SERIAL_TIMBERDALE is not set
688CONFIG_UNIX98_PTYS=y 694CONFIG_UNIX98_PTYS=y
689# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 695# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
690CONFIG_LEGACY_PTYS=y 696CONFIG_LEGACY_PTYS=y
@@ -713,6 +719,7 @@ CONFIG_I2C_HELPER_AUTO=y
713CONFIG_I2C_SH7760=y 719CONFIG_I2C_SH7760=y
714# CONFIG_I2C_SH_MOBILE is not set 720# CONFIG_I2C_SH_MOBILE is not set
715# CONFIG_I2C_SIMTEC is not set 721# CONFIG_I2C_SIMTEC is not set
722# CONFIG_I2C_XILINX is not set
716 723
717# 724#
718# External I2C/SMBus adapter drivers 725# External I2C/SMBus adapter drivers
@@ -725,15 +732,9 @@ CONFIG_I2C_SH7760=y
725# 732#
726# CONFIG_I2C_PCA_PLATFORM is not set 733# CONFIG_I2C_PCA_PLATFORM is not set
727# CONFIG_I2C_STUB is not set 734# CONFIG_I2C_STUB is not set
728
729#
730# Miscellaneous I2C Chip support
731#
732# CONFIG_SENSORS_TSL2550 is not set
733CONFIG_I2C_DEBUG_CORE=y 735CONFIG_I2C_DEBUG_CORE=y
734CONFIG_I2C_DEBUG_ALGO=y 736CONFIG_I2C_DEBUG_ALGO=y
735CONFIG_I2C_DEBUG_BUS=y 737CONFIG_I2C_DEBUG_BUS=y
736CONFIG_I2C_DEBUG_CHIP=y
737# CONFIG_SPI is not set 738# CONFIG_SPI is not set
738 739
739# 740#
@@ -756,6 +757,7 @@ CONFIG_SSB_POSSIBLE=y
756# Multifunction device drivers 757# Multifunction device drivers
757# 758#
758# CONFIG_MFD_CORE is not set 759# CONFIG_MFD_CORE is not set
760# CONFIG_MFD_88PM860X is not set
759# CONFIG_MFD_SM501 is not set 761# CONFIG_MFD_SM501 is not set
760# CONFIG_MFD_SH_MOBILE_SDHI is not set 762# CONFIG_MFD_SH_MOBILE_SDHI is not set
761# CONFIG_HTC_PASIC3 is not set 763# CONFIG_HTC_PASIC3 is not set
@@ -763,12 +765,13 @@ CONFIG_SSB_POSSIBLE=y
763# CONFIG_MFD_TMIO is not set 765# CONFIG_MFD_TMIO is not set
764# CONFIG_PMIC_DA903X is not set 766# CONFIG_PMIC_DA903X is not set
765# CONFIG_PMIC_ADP5520 is not set 767# CONFIG_PMIC_ADP5520 is not set
768# CONFIG_MFD_MAX8925 is not set
766# CONFIG_MFD_WM8400 is not set 769# CONFIG_MFD_WM8400 is not set
767# CONFIG_MFD_WM831X is not set 770# CONFIG_MFD_WM831X is not set
768# CONFIG_MFD_WM8350_I2C is not set 771# CONFIG_MFD_WM8350_I2C is not set
772# CONFIG_MFD_WM8994 is not set
769# CONFIG_MFD_PCF50633 is not set 773# CONFIG_MFD_PCF50633 is not set
770# CONFIG_AB3100_CORE is not set 774# CONFIG_AB3100_CORE is not set
771# CONFIG_MFD_88PM8607 is not set
772# CONFIG_REGULATOR is not set 775# CONFIG_REGULATOR is not set
773# CONFIG_MEDIA_SUPPORT is not set 776# CONFIG_MEDIA_SUPPORT is not set
774 777
@@ -947,6 +950,7 @@ CONFIG_MISC_FILESYSTEMS=y
947# CONFIG_BFS_FS is not set 950# CONFIG_BFS_FS is not set
948# CONFIG_EFS_FS is not set 951# CONFIG_EFS_FS is not set
949# CONFIG_JFFS2_FS is not set 952# CONFIG_JFFS2_FS is not set
953# CONFIG_LOGFS is not set
950# CONFIG_CRAMFS is not set 954# CONFIG_CRAMFS is not set
951# CONFIG_SQUASHFS is not set 955# CONFIG_SQUASHFS is not set
952# CONFIG_VXFS_FS is not set 956# CONFIG_VXFS_FS is not set
@@ -969,6 +973,7 @@ CONFIG_SUNRPC=y
969# CONFIG_RPCSEC_GSS_KRB5 is not set 973# CONFIG_RPCSEC_GSS_KRB5 is not set
970# CONFIG_RPCSEC_GSS_SPKM3 is not set 974# CONFIG_RPCSEC_GSS_SPKM3 is not set
971# CONFIG_SMB_FS is not set 975# CONFIG_SMB_FS is not set
976# CONFIG_CEPH_FS is not set
972# CONFIG_CIFS is not set 977# CONFIG_CIFS is not set
973# CONFIG_NCP_FS is not set 978# CONFIG_NCP_FS is not set
974# CONFIG_CODA_FS is not set 979# CONFIG_CODA_FS is not set
@@ -1048,6 +1053,7 @@ CONFIG_TIMER_STATS=y
1048# CONFIG_DEBUG_OBJECTS is not set 1053# CONFIG_DEBUG_OBJECTS is not set
1049# CONFIG_SLUB_DEBUG_ON is not set 1054# CONFIG_SLUB_DEBUG_ON is not set
1050# CONFIG_SLUB_STATS is not set 1055# CONFIG_SLUB_STATS is not set
1056# CONFIG_DEBUG_KMEMLEAK is not set
1051CONFIG_DEBUG_PREEMPT=y 1057CONFIG_DEBUG_PREEMPT=y
1052# CONFIG_DEBUG_RT_MUTEXES is not set 1058# CONFIG_DEBUG_RT_MUTEXES is not set
1053# CONFIG_RT_MUTEX_TESTER is not set 1059# CONFIG_RT_MUTEX_TESTER is not set
@@ -1096,6 +1102,7 @@ CONFIG_FTRACE=y
1096CONFIG_BRANCH_PROFILE_NONE=y 1102CONFIG_BRANCH_PROFILE_NONE=y
1097# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1103# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1098# CONFIG_PROFILE_ALL_BRANCHES is not set 1104# CONFIG_PROFILE_ALL_BRANCHES is not set
1105# CONFIG_KSYM_TRACER is not set
1099# CONFIG_STACK_TRACER is not set 1106# CONFIG_STACK_TRACER is not set
1100# CONFIG_KMEMTRACE is not set 1107# CONFIG_KMEMTRACE is not set
1101# CONFIG_WORKQUEUE_TRACER is not set 1108# CONFIG_WORKQUEUE_TRACER is not set
@@ -1214,6 +1221,7 @@ CONFIG_CRYPTO_DES=y
1214# 1221#
1215# CONFIG_CRYPTO_ANSI_CPRNG is not set 1222# CONFIG_CRYPTO_ANSI_CPRNG is not set
1216CONFIG_CRYPTO_HW=y 1223CONFIG_CRYPTO_HW=y
1224# CONFIG_VIRTUALIZATION is not set
1217# CONFIG_BINARY_PRINTF is not set 1225# CONFIG_BINARY_PRINTF is not set
1218 1226
1219# 1227#
diff --git a/arch/sh/configs/espt_defconfig b/arch/sh/configs/espt_defconfig
index f899e5613f86..8acdc374d033 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 11:26:55 2010 4# Tue May 18 15:27:14 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51CONFIG_SWAP=y 54CONFIG_SWAP=y
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
@@ -69,11 +72,6 @@ CONFIG_RCU_FANOUT=32
69CONFIG_IKCONFIG=y 72CONFIG_IKCONFIG=y
70CONFIG_IKCONFIG_PROC=y 73CONFIG_IKCONFIG_PROC=y
71CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
72CONFIG_GROUP_SCHED=y
73CONFIG_FAIR_GROUP_SCHED=y
74# CONFIG_RT_GROUP_SCHED is not set
75CONFIG_USER_SCHED=y
76# CONFIG_CGROUP_SCHED is not set
77# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
78CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y 77CONFIG_SYSFS_DEPRECATED_V2=y
@@ -112,7 +110,6 @@ CONFIG_PERF_USE_VMALLOC=y
112# Kernel Performance Events And Counters 110# Kernel Performance Events And Counters
113# 111#
114CONFIG_PERF_EVENTS=y 112CONFIG_PERF_EVENTS=y
115CONFIG_EVENT_PROFILE=y
116# CONFIG_PERF_COUNTERS is not set 113# CONFIG_PERF_COUNTERS is not set
117CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
118CONFIG_COMPAT_BRK=y 115CONFIG_COMPAT_BRK=y
@@ -120,7 +117,6 @@ CONFIG_SLAB=y
120# CONFIG_SLUB is not set 117# CONFIG_SLUB is not set
121# CONFIG_SLOB is not set 118# CONFIG_SLOB is not set
122CONFIG_PROFILING=y 119CONFIG_PROFILING=y
123CONFIG_TRACEPOINTS=y
124CONFIG_OPROFILE=y 120CONFIG_OPROFILE=y
125CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
126# CONFIG_KPROBES is not set 122# CONFIG_KPROBES is not set
@@ -131,6 +127,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
131CONFIG_HAVE_DMA_ATTRS=y 127CONFIG_HAVE_DMA_ATTRS=y
132CONFIG_HAVE_CLK=y 128CONFIG_HAVE_CLK=y
133CONFIG_HAVE_DMA_API_DEBUG=y 129CONFIG_HAVE_DMA_API_DEBUG=y
130CONFIG_HAVE_HW_BREAKPOINT=y
134 131
135# 132#
136# GCOV-based kernel profiling 133# GCOV-based kernel profiling
@@ -243,7 +240,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
243CONFIG_MEMORY_START=0x0c000000 240CONFIG_MEMORY_START=0x0c000000
244CONFIG_MEMORY_SIZE=0x04000000 241CONFIG_MEMORY_SIZE=0x04000000
245CONFIG_29BIT=y 242CONFIG_29BIT=y
246# CONFIG_PMB_ENABLE is not set 243# CONFIG_PMB is not set
247CONFIG_VSYSCALL=y 244CONFIG_VSYSCALL=y
248CONFIG_ARCH_FLATMEM_ENABLE=y 245CONFIG_ARCH_FLATMEM_ENABLE=y
249CONFIG_ARCH_SPARSEMEM_ENABLE=y 246CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -253,6 +250,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
253CONFIG_ARCH_SELECT_MEMORY_MODEL=y 250CONFIG_ARCH_SELECT_MEMORY_MODEL=y
254CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 251CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
255CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 252CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
253CONFIG_UNCACHED_MAPPING=y
256CONFIG_PAGE_SIZE_4KB=y 254CONFIG_PAGE_SIZE_4KB=y
257# CONFIG_PAGE_SIZE_8KB is not set 255# CONFIG_PAGE_SIZE_8KB is not set
258# CONFIG_PAGE_SIZE_16KB is not set 256# CONFIG_PAGE_SIZE_16KB is not set
@@ -269,7 +267,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
269CONFIG_MIGRATION=y 267CONFIG_MIGRATION=y
270# CONFIG_PHYS_ADDR_T_64BIT is not set 268# CONFIG_PHYS_ADDR_T_64BIT is not set
271CONFIG_ZONE_DMA_FLAG=0 269CONFIG_ZONE_DMA_FLAG=0
272CONFIG_NR_QUICK=2 270CONFIG_NR_QUICK=1
273# CONFIG_KSM is not set 271# CONFIG_KSM is not set
274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 272CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
275 273
@@ -344,7 +342,7 @@ CONFIG_PREEMPT_NONE=y
344# CONFIG_PREEMPT_VOLUNTARY is not set 342# CONFIG_PREEMPT_VOLUNTARY is not set
345# CONFIG_PREEMPT is not set 343# CONFIG_PREEMPT is not set
346CONFIG_GUSA=y 344CONFIG_GUSA=y
347# CONFIG_SPARSE_IRQ is not set 345# CONFIG_INTC_USERIMASK is not set
348 346
349# 347#
350# Boot options 348# Boot options
@@ -381,7 +379,6 @@ CONFIG_NET=y
381# Networking options 379# Networking options
382# 380#
383CONFIG_PACKET=y 381CONFIG_PACKET=y
384# CONFIG_PACKET_MMAP is not set
385CONFIG_UNIX=y 382CONFIG_UNIX=y
386CONFIG_XFRM=y 383CONFIG_XFRM=y
387# CONFIG_XFRM_USER is not set 384# CONFIG_XFRM_USER is not set
@@ -444,7 +441,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
444# Network testing 441# Network testing
445# 442#
446# CONFIG_NET_PKTGEN is not set 443# CONFIG_NET_PKTGEN is not set
447# CONFIG_NET_DROP_MONITOR is not set
448# CONFIG_HAMRADIO is not set 444# CONFIG_HAMRADIO is not set
449# CONFIG_CAN is not set 445# CONFIG_CAN is not set
450# CONFIG_IRDA is not set 446# CONFIG_IRDA is not set
@@ -584,6 +580,7 @@ CONFIG_HAVE_IDE=y
584# 580#
585# SCSI device support 581# SCSI device support
586# 582#
583CONFIG_SCSI_MOD=y
587# CONFIG_RAID_ATTRS is not set 584# CONFIG_RAID_ATTRS is not set
588CONFIG_SCSI=y 585CONFIG_SCSI=y
589CONFIG_SCSI_DMA=y 586CONFIG_SCSI_DMA=y
@@ -688,6 +685,7 @@ CONFIG_WLAN=y
688# CONFIG_USB_PEGASUS is not set 685# CONFIG_USB_PEGASUS is not set
689# CONFIG_USB_RTL8150 is not set 686# CONFIG_USB_RTL8150 is not set
690# CONFIG_USB_USBNET is not set 687# CONFIG_USB_USBNET is not set
688# CONFIG_USB_IPHETH is not set
691# CONFIG_WAN is not set 689# CONFIG_WAN is not set
692# CONFIG_PPP is not set 690# CONFIG_PPP is not set
693# CONFIG_SLIP is not set 691# CONFIG_SLIP is not set
@@ -753,6 +751,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=3
753CONFIG_SERIAL_SH_SCI_CONSOLE=y 751CONFIG_SERIAL_SH_SCI_CONSOLE=y
754CONFIG_SERIAL_CORE=y 752CONFIG_SERIAL_CORE=y
755CONFIG_SERIAL_CORE_CONSOLE=y 753CONFIG_SERIAL_CORE_CONSOLE=y
754# CONFIG_SERIAL_TIMBERDALE is not set
756CONFIG_UNIX98_PTYS=y 755CONFIG_UNIX98_PTYS=y
757# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 756# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
758CONFIG_LEGACY_PTYS=y 757CONFIG_LEGACY_PTYS=y
@@ -944,7 +943,6 @@ CONFIG_USB_STORAGE=y
944# CONFIG_USB_RIO500 is not set 943# CONFIG_USB_RIO500 is not set
945# CONFIG_USB_LEGOTOWER is not set 944# CONFIG_USB_LEGOTOWER is not set
946# CONFIG_USB_LCD is not set 945# CONFIG_USB_LCD is not set
947# CONFIG_USB_BERRY_CHARGE is not set
948# CONFIG_USB_LED is not set 946# CONFIG_USB_LED is not set
949# CONFIG_USB_CYPRESS_CY7C63 is not set 947# CONFIG_USB_CYPRESS_CY7C63 is not set
950# CONFIG_USB_CYTHERM is not set 948# CONFIG_USB_CYTHERM is not set
@@ -956,7 +954,6 @@ CONFIG_USB_STORAGE=y
956# CONFIG_USB_IOWARRIOR is not set 954# CONFIG_USB_IOWARRIOR is not set
957# CONFIG_USB_TEST is not set 955# CONFIG_USB_TEST is not set
958# CONFIG_USB_ISIGHTFW is not set 956# CONFIG_USB_ISIGHTFW is not set
959# CONFIG_USB_VST is not set
960# CONFIG_USB_GADGET is not set 957# CONFIG_USB_GADGET is not set
961 958
962# 959#
@@ -1052,6 +1049,7 @@ CONFIG_MISC_FILESYSTEMS=y
1052# CONFIG_BFS_FS is not set 1049# CONFIG_BFS_FS is not set
1053# CONFIG_EFS_FS is not set 1050# CONFIG_EFS_FS is not set
1054# CONFIG_JFFS2_FS is not set 1051# CONFIG_JFFS2_FS is not set
1052# CONFIG_LOGFS is not set
1055CONFIG_CRAMFS=y 1053CONFIG_CRAMFS=y
1056# CONFIG_SQUASHFS is not set 1054# CONFIG_SQUASHFS is not set
1057# CONFIG_VXFS_FS is not set 1055# CONFIG_VXFS_FS is not set
@@ -1078,6 +1076,7 @@ CONFIG_SUNRPC=y
1078# CONFIG_RPCSEC_GSS_KRB5 is not set 1076# CONFIG_RPCSEC_GSS_KRB5 is not set
1079# CONFIG_RPCSEC_GSS_SPKM3 is not set 1077# CONFIG_RPCSEC_GSS_SPKM3 is not set
1080# CONFIG_SMB_FS is not set 1078# CONFIG_SMB_FS is not set
1079# CONFIG_CEPH_FS is not set
1081# CONFIG_CIFS is not set 1080# CONFIG_CIFS is not set
1082# CONFIG_NCP_FS is not set 1081# CONFIG_NCP_FS is not set
1083# CONFIG_CODA_FS is not set 1082# CONFIG_CODA_FS is not set
@@ -1144,13 +1143,12 @@ CONFIG_FRAME_WARN=1024
1144CONFIG_DEBUG_FS=y 1143CONFIG_DEBUG_FS=y
1145# CONFIG_HEADERS_CHECK is not set 1144# CONFIG_HEADERS_CHECK is not set
1146# CONFIG_DEBUG_KERNEL is not set 1145# CONFIG_DEBUG_KERNEL is not set
1147CONFIG_STACKTRACE=y
1148CONFIG_DEBUG_BUGVERBOSE=y 1146CONFIG_DEBUG_BUGVERBOSE=y
1149# CONFIG_DEBUG_MEMORY_INIT is not set 1147# CONFIG_DEBUG_MEMORY_INIT is not set
1150# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1148# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1149# CONFIG_LKDTM is not set
1151# CONFIG_LATENCYTOP is not set 1150# CONFIG_LATENCYTOP is not set
1152# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1151# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1153CONFIG_NOP_TRACER=y
1154CONFIG_HAVE_FUNCTION_TRACER=y 1152CONFIG_HAVE_FUNCTION_TRACER=y
1155CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1153CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1156CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1154CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1158,10 +1156,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1158CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1156CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1159CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1157CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1160CONFIG_RING_BUFFER=y 1158CONFIG_RING_BUFFER=y
1161CONFIG_EVENT_TRACING=y
1162CONFIG_CONTEXT_SWITCH_TRACER=y
1163CONFIG_RING_BUFFER_ALLOW_SWAP=y 1159CONFIG_RING_BUFFER_ALLOW_SWAP=y
1164CONFIG_TRACING=y
1165CONFIG_TRACING_SUPPORT=y 1160CONFIG_TRACING_SUPPORT=y
1166# CONFIG_FTRACE is not set 1161# CONFIG_FTRACE is not set
1167# CONFIG_DYNAMIC_DEBUG is not set 1162# CONFIG_DYNAMIC_DEBUG is not set
@@ -1269,7 +1264,8 @@ CONFIG_CRYPTO=y
1269# 1264#
1270# CONFIG_CRYPTO_ANSI_CPRNG is not set 1265# CONFIG_CRYPTO_ANSI_CPRNG is not set
1271CONFIG_CRYPTO_HW=y 1266CONFIG_CRYPTO_HW=y
1272CONFIG_BINARY_PRINTF=y 1267# CONFIG_VIRTUALIZATION is not set
1268# CONFIG_BINARY_PRINTF is not set
1273 1269
1274# 1270#
1275# Library routines 1271# Library routines
diff --git a/arch/sh/configs/hp6xx_defconfig b/arch/sh/configs/hp6xx_defconfig
index 06644908631e..f894bdc97a65 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 11:30:31 2010 4# Tue May 18 15:30:50 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51CONFIG_SWAP=y 54CONFIG_SWAP=y
52# CONFIG_SYSVIPC is not set 55# CONFIG_SYSVIPC is not set
53CONFIG_BSD_PROCESS_ACCT=y 56CONFIG_BSD_PROCESS_ACCT=y
@@ -66,7 +69,6 @@ CONFIG_RCU_FANOUT=32
66CONFIG_IKCONFIG=y 69CONFIG_IKCONFIG=y
67CONFIG_IKCONFIG_PROC=y 70CONFIG_IKCONFIG_PROC=y
68CONFIG_LOG_BUF_SHIFT=14 71CONFIG_LOG_BUF_SHIFT=14
69# CONFIG_GROUP_SCHED is not set
70# CONFIG_CGROUPS is not set 72# CONFIG_CGROUPS is not set
71CONFIG_SYSFS_DEPRECATED=y 73CONFIG_SYSFS_DEPRECATED=y
72CONFIG_SYSFS_DEPRECATED_V2=y 74CONFIG_SYSFS_DEPRECATED_V2=y
@@ -99,7 +101,7 @@ CONFIG_PERF_USE_VMALLOC=y
99# 101#
100# Kernel Performance Events And Counters 102# Kernel Performance Events And Counters
101# 103#
102# CONFIG_PERF_EVENTS is not set 104CONFIG_PERF_EVENTS=y
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_COMPAT_BRK=y 107CONFIG_COMPAT_BRK=y
@@ -115,6 +117,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
115CONFIG_HAVE_DMA_ATTRS=y 117CONFIG_HAVE_DMA_ATTRS=y
116CONFIG_HAVE_CLK=y 118CONFIG_HAVE_CLK=y
117CONFIG_HAVE_DMA_API_DEBUG=y 119CONFIG_HAVE_DMA_API_DEBUG=y
120CONFIG_HAVE_HW_BREAKPOINT=y
118 121
119# 122#
120# GCOV-based kernel profiling 123# GCOV-based kernel profiling
@@ -228,6 +231,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
228CONFIG_MAX_ACTIVE_REGIONS=1 231CONFIG_MAX_ACTIVE_REGIONS=1
229CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
230CONFIG_ARCH_SELECT_MEMORY_MODEL=y 233CONFIG_ARCH_SELECT_MEMORY_MODEL=y
234CONFIG_UNCACHED_MAPPING=y
231CONFIG_PAGE_SIZE_4KB=y 235CONFIG_PAGE_SIZE_4KB=y
232# CONFIG_PAGE_SIZE_8KB is not set 236# CONFIG_PAGE_SIZE_8KB is not set
233# CONFIG_PAGE_SIZE_16KB is not set 237# CONFIG_PAGE_SIZE_16KB is not set
@@ -243,7 +247,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
243CONFIG_SPLIT_PTLOCK_CPUS=4 247CONFIG_SPLIT_PTLOCK_CPUS=4
244# CONFIG_PHYS_ADDR_T_64BIT is not set 248# CONFIG_PHYS_ADDR_T_64BIT is not set
245CONFIG_ZONE_DMA_FLAG=0 249CONFIG_ZONE_DMA_FLAG=0
246CONFIG_NR_QUICK=2 250CONFIG_NR_QUICK=1
247# CONFIG_KSM is not set 251# CONFIG_KSM is not set
248CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 252CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
249 253
@@ -326,7 +330,6 @@ CONFIG_PREEMPT_NONE=y
326# CONFIG_PREEMPT is not set 330# CONFIG_PREEMPT is not set
327CONFIG_GUSA=y 331CONFIG_GUSA=y
328# CONFIG_GUSA_RB is not set 332# CONFIG_GUSA_RB is not set
329# CONFIG_SPARSE_IRQ is not set
330 333
331# 334#
332# Boot options 335# Boot options
@@ -344,7 +347,6 @@ CONFIG_ENTRY_OFFSET=0x00001000
344CONFIG_PCCARD=y 347CONFIG_PCCARD=y
345CONFIG_PCMCIA=y 348CONFIG_PCMCIA=y
346CONFIG_PCMCIA_LOAD_CIS=y 349CONFIG_PCMCIA_LOAD_CIS=y
347CONFIG_PCMCIA_IOCTL=y
348 350
349# 351#
350# PC-card bridges 352# PC-card bridges
@@ -369,6 +371,7 @@ CONFIG_SUSPEND_FREEZER=y
369# CONFIG_HIBERNATION is not set 371# CONFIG_HIBERNATION is not set
370CONFIG_APM_EMULATION=y 372CONFIG_APM_EMULATION=y
371# CONFIG_PM_RUNTIME is not set 373# CONFIG_PM_RUNTIME is not set
374CONFIG_PM_OPS=y
372# CONFIG_CPU_IDLE is not set 375# CONFIG_CPU_IDLE is not set
373# CONFIG_NET is not set 376# CONFIG_NET is not set
374 377
@@ -412,6 +415,7 @@ CONFIG_HAVE_IDE=y
412# 415#
413# SCSI device support 416# SCSI device support
414# 417#
418CONFIG_SCSI_MOD=y
415# CONFIG_RAID_ATTRS is not set 419# CONFIG_RAID_ATTRS is not set
416CONFIG_SCSI=y 420CONFIG_SCSI=y
417CONFIG_SCSI_DMA=y 421CONFIG_SCSI_DMA=y
@@ -544,6 +548,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=3
544CONFIG_SERIAL_SH_SCI_CONSOLE=y 548CONFIG_SERIAL_SH_SCI_CONSOLE=y
545CONFIG_SERIAL_CORE=y 549CONFIG_SERIAL_CORE=y
546CONFIG_SERIAL_CORE_CONSOLE=y 550CONFIG_SERIAL_CORE_CONSOLE=y
551# CONFIG_SERIAL_TIMBERDALE is not set
547CONFIG_UNIX98_PTYS=y 552CONFIG_UNIX98_PTYS=y
548# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 553# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
549CONFIG_LEGACY_PTYS=y 554CONFIG_LEGACY_PTYS=y
@@ -722,7 +727,6 @@ CONFIG_EXT2_FS=y
722# CONFIG_EXT2_FS_XIP is not set 727# CONFIG_EXT2_FS_XIP is not set
723# CONFIG_EXT3_FS is not set 728# CONFIG_EXT3_FS is not set
724# CONFIG_EXT4_FS is not set 729# CONFIG_EXT4_FS is not set
725CONFIG_EXT4_USE_FOR_EXT23=y
726# CONFIG_REISERFS_FS is not set 730# CONFIG_REISERFS_FS is not set
727# CONFIG_JFS_FS is not set 731# CONFIG_JFS_FS is not set
728# CONFIG_FS_POSIX_ACL is not set 732# CONFIG_FS_POSIX_ACL is not set
@@ -780,6 +784,7 @@ CONFIG_MISC_FILESYSTEMS=y
780# CONFIG_BEFS_FS is not set 784# CONFIG_BEFS_FS is not set
781# CONFIG_BFS_FS is not set 785# CONFIG_BFS_FS is not set
782# CONFIG_EFS_FS is not set 786# CONFIG_EFS_FS is not set
787# CONFIG_LOGFS is not set
783# CONFIG_CRAMFS is not set 788# CONFIG_CRAMFS is not set
784# CONFIG_SQUASHFS is not set 789# CONFIG_SQUASHFS is not set
785# CONFIG_VXFS_FS is not set 790# CONFIG_VXFS_FS is not set
@@ -977,6 +982,7 @@ CONFIG_CRYPTO_MD5=y
977# 982#
978# CONFIG_CRYPTO_ANSI_CPRNG is not set 983# CONFIG_CRYPTO_ANSI_CPRNG is not set
979# CONFIG_CRYPTO_HW is not set 984# CONFIG_CRYPTO_HW is not set
985# CONFIG_VIRTUALIZATION is not set
980# CONFIG_BINARY_PRINTF is not set 986# CONFIG_BINARY_PRINTF is not set
981 987
982# 988#
diff --git a/arch/sh/configs/kfr2r09-romimage_defconfig b/arch/sh/configs/kfr2r09-romimage_defconfig
index 3d834e59e8f9..8c54e1620e95 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 11:31:09 2010 4# Tue May 18 15:33:23 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION=""
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
54# CONFIG_POSIX_MQUEUE is not set 57# CONFIG_POSIX_MQUEUE is not set
@@ -70,11 +73,6 @@ CONFIG_RCU_FANOUT=32
70CONFIG_IKCONFIG=y 73CONFIG_IKCONFIG=y
71CONFIG_IKCONFIG_PROC=y 74CONFIG_IKCONFIG_PROC=y
72CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
73CONFIG_GROUP_SCHED=y
74CONFIG_FAIR_GROUP_SCHED=y
75# CONFIG_RT_GROUP_SCHED is not set
76CONFIG_USER_SCHED=y
77# CONFIG_CGROUP_SCHED is not set
78# CONFIG_CGROUPS is not set 76# CONFIG_CGROUPS is not set
79CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y 78CONFIG_SYSFS_DEPRECATED_V2=y
@@ -85,6 +83,7 @@ CONFIG_INITRAMFS_SOURCE=""
85CONFIG_RD_GZIP=y 83CONFIG_RD_GZIP=y
86# CONFIG_RD_BZIP2 is not set 84# CONFIG_RD_BZIP2 is not set
87# CONFIG_RD_LZMA is not set 85# CONFIG_RD_LZMA is not set
86# CONFIG_RD_LZO is not set
88CONFIG_CC_OPTIMIZE_FOR_SIZE=y 87CONFIG_CC_OPTIMIZE_FOR_SIZE=y
89CONFIG_SYSCTL=y 88CONFIG_SYSCTL=y
90CONFIG_ANON_INODES=y 89CONFIG_ANON_INODES=y
@@ -110,7 +109,7 @@ CONFIG_PERF_USE_VMALLOC=y
110# 109#
111# Kernel Performance Events And Counters 110# Kernel Performance Events And Counters
112# 111#
113# CONFIG_PERF_EVENTS is not set 112CONFIG_PERF_EVENTS=y
114# CONFIG_PERF_COUNTERS is not set 113# CONFIG_PERF_COUNTERS is not set
115CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
116CONFIG_COMPAT_BRK=y 115CONFIG_COMPAT_BRK=y
@@ -119,13 +118,13 @@ CONFIG_SLAB=y
119# CONFIG_SLOB is not set 118# CONFIG_SLOB is not set
120# CONFIG_PROFILING is not set 119# CONFIG_PROFILING is not set
121CONFIG_HAVE_OPROFILE=y 120CONFIG_HAVE_OPROFILE=y
122CONFIG_HAVE_IOREMAP_PROT=y
123CONFIG_HAVE_KPROBES=y 121CONFIG_HAVE_KPROBES=y
124CONFIG_HAVE_KRETPROBES=y 122CONFIG_HAVE_KRETPROBES=y
125CONFIG_HAVE_ARCH_TRACEHOOK=y 123CONFIG_HAVE_ARCH_TRACEHOOK=y
126CONFIG_HAVE_DMA_ATTRS=y 124CONFIG_HAVE_DMA_ATTRS=y
127CONFIG_HAVE_CLK=y 125CONFIG_HAVE_CLK=y
128CONFIG_HAVE_DMA_API_DEBUG=y 126CONFIG_HAVE_DMA_API_DEBUG=y
127CONFIG_HAVE_HW_BREAKPOINT=y
129 128
130# 129#
131# GCOV-based kernel profiling 130# GCOV-based kernel profiling
@@ -222,8 +221,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
222CONFIG_MEMORY_START=0x08000000 221CONFIG_MEMORY_START=0x08000000
223CONFIG_MEMORY_SIZE=0x08000000 222CONFIG_MEMORY_SIZE=0x08000000
224CONFIG_29BIT=y 223CONFIG_29BIT=y
225# CONFIG_PMB_ENABLE is not set 224# CONFIG_PMB is not set
226# CONFIG_X2TLB is not set 225CONFIG_X2TLB=y
227CONFIG_VSYSCALL=y 226CONFIG_VSYSCALL=y
228CONFIG_ARCH_FLATMEM_ENABLE=y 227CONFIG_ARCH_FLATMEM_ENABLE=y
229CONFIG_ARCH_SPARSEMEM_ENABLE=y 228CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -231,6 +230,8 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
231CONFIG_MAX_ACTIVE_REGIONS=1 230CONFIG_MAX_ACTIVE_REGIONS=1
232CONFIG_ARCH_POPULATES_NODE_MAP=y 231CONFIG_ARCH_POPULATES_NODE_MAP=y
233CONFIG_ARCH_SELECT_MEMORY_MODEL=y 232CONFIG_ARCH_SELECT_MEMORY_MODEL=y
233CONFIG_IOREMAP_FIXED=y
234CONFIG_UNCACHED_MAPPING=y
234CONFIG_PAGE_SIZE_4KB=y 235CONFIG_PAGE_SIZE_4KB=y
235# CONFIG_PAGE_SIZE_8KB is not set 236# CONFIG_PAGE_SIZE_8KB is not set
236# CONFIG_PAGE_SIZE_16KB is not set 237# CONFIG_PAGE_SIZE_16KB is not set
@@ -246,7 +247,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
246CONFIG_SPLIT_PTLOCK_CPUS=4 247CONFIG_SPLIT_PTLOCK_CPUS=4
247# CONFIG_PHYS_ADDR_T_64BIT is not set 248# CONFIG_PHYS_ADDR_T_64BIT is not set
248CONFIG_ZONE_DMA_FLAG=0 249CONFIG_ZONE_DMA_FLAG=0
249CONFIG_NR_QUICK=2 250CONFIG_NR_QUICK=1
250# CONFIG_KSM is not set 251# CONFIG_KSM is not set
251CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 252CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
252 253
@@ -321,7 +322,7 @@ CONFIG_PREEMPT_NONE=y
321# CONFIG_PREEMPT_VOLUNTARY is not set 322# CONFIG_PREEMPT_VOLUNTARY is not set
322# CONFIG_PREEMPT is not set 323# CONFIG_PREEMPT is not set
323CONFIG_GUSA=y 324CONFIG_GUSA=y
324# CONFIG_SPARSE_IRQ is not set 325# CONFIG_INTC_USERIMASK is not set
325 326
326# 327#
327# Boot options 328# Boot options
@@ -354,6 +355,7 @@ CONFIG_PM=y
354# CONFIG_PM_DEBUG is not set 355# CONFIG_PM_DEBUG is not set
355# CONFIG_SUSPEND is not set 356# CONFIG_SUSPEND is not set
356CONFIG_PM_RUNTIME=y 357CONFIG_PM_RUNTIME=y
358CONFIG_PM_OPS=y
357# CONFIG_CPU_IDLE is not set 359# CONFIG_CPU_IDLE is not set
358CONFIG_NET=y 360CONFIG_NET=y
359 361
@@ -361,7 +363,6 @@ CONFIG_NET=y
361# Networking options 363# Networking options
362# 364#
363CONFIG_PACKET=y 365CONFIG_PACKET=y
364CONFIG_PACKET_MMAP=y
365CONFIG_UNIX=y 366CONFIG_UNIX=y
366# CONFIG_NET_KEY is not set 367# CONFIG_NET_KEY is not set
367CONFIG_INET=y 368CONFIG_INET=y
@@ -449,6 +450,7 @@ CONFIG_HAVE_IDE=y
449# 450#
450# SCSI device support 451# SCSI device support
451# 452#
453CONFIG_SCSI_MOD=y
452# CONFIG_SCSI_DMA is not set 454# CONFIG_SCSI_DMA is not set
453# CONFIG_SCSI_NETLINK is not set 455# CONFIG_SCSI_NETLINK is not set
454# CONFIG_NETDEVICES is not set 456# CONFIG_NETDEVICES is not set
@@ -511,6 +513,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6
511CONFIG_SERIAL_SH_SCI_CONSOLE=y 513CONFIG_SERIAL_SH_SCI_CONSOLE=y
512CONFIG_SERIAL_CORE=y 514CONFIG_SERIAL_CORE=y
513CONFIG_SERIAL_CORE_CONSOLE=y 515CONFIG_SERIAL_CORE_CONSOLE=y
516# CONFIG_SERIAL_TIMBERDALE is not set
514CONFIG_UNIX98_PTYS=y 517CONFIG_UNIX98_PTYS=y
515# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 518# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
516CONFIG_LEGACY_PTYS=y 519CONFIG_LEGACY_PTYS=y
@@ -538,6 +541,7 @@ CONFIG_I2C_HELPER_AUTO=y
538# CONFIG_I2C_OCORES is not set 541# CONFIG_I2C_OCORES is not set
539CONFIG_I2C_SH_MOBILE=y 542CONFIG_I2C_SH_MOBILE=y
540# CONFIG_I2C_SIMTEC is not set 543# CONFIG_I2C_SIMTEC is not set
544# CONFIG_I2C_XILINX is not set
541 545
542# 546#
543# External I2C/SMBus adapter drivers 547# External I2C/SMBus adapter drivers
@@ -549,15 +553,9 @@ CONFIG_I2C_SH_MOBILE=y
549# Other I2C/SMBus bus drivers 553# Other I2C/SMBus bus drivers
550# 554#
551# CONFIG_I2C_PCA_PLATFORM is not set 555# CONFIG_I2C_PCA_PLATFORM is not set
552
553#
554# Miscellaneous I2C Chip support
555#
556# CONFIG_SENSORS_TSL2550 is not set
557# CONFIG_I2C_DEBUG_CORE is not set 556# CONFIG_I2C_DEBUG_CORE is not set
558# CONFIG_I2C_DEBUG_ALGO is not set 557# CONFIG_I2C_DEBUG_ALGO is not set
559# CONFIG_I2C_DEBUG_BUS is not set 558# CONFIG_I2C_DEBUG_BUS is not set
560# CONFIG_I2C_DEBUG_CHIP is not set
561# CONFIG_SPI is not set 559# CONFIG_SPI is not set
562 560
563# 561#
@@ -571,13 +569,16 @@ CONFIG_GPIO_SYSFS=y
571# 569#
572# Memory mapped GPIO expanders: 570# Memory mapped GPIO expanders:
573# 571#
572# CONFIG_GPIO_IT8761E is not set
574 573
575# 574#
576# I2C GPIO expanders: 575# I2C GPIO expanders:
577# 576#
577# CONFIG_GPIO_MAX7300 is not set
578# CONFIG_GPIO_MAX732X is not set 578# CONFIG_GPIO_MAX732X is not set
579# CONFIG_GPIO_PCA953X is not set 579# CONFIG_GPIO_PCA953X is not set
580# CONFIG_GPIO_PCF857X is not set 580# CONFIG_GPIO_PCF857X is not set
581# CONFIG_GPIO_ADP5588 is not set
581 582
582# 583#
583# PCI GPIO expanders: 584# PCI GPIO expanders:
@@ -606,20 +607,23 @@ CONFIG_SSB_POSSIBLE=y
606# Multifunction device drivers 607# Multifunction device drivers
607# 608#
608# CONFIG_MFD_CORE is not set 609# CONFIG_MFD_CORE is not set
610# CONFIG_MFD_88PM860X is not set
609# CONFIG_MFD_SM501 is not set 611# CONFIG_MFD_SM501 is not set
610# CONFIG_MFD_SH_MOBILE_SDHI is not set 612# CONFIG_MFD_SH_MOBILE_SDHI is not set
611# CONFIG_HTC_PASIC3 is not set 613# CONFIG_HTC_PASIC3 is not set
614# CONFIG_HTC_I2CPLD is not set
612# CONFIG_TPS65010 is not set 615# CONFIG_TPS65010 is not set
613# CONFIG_TWL4030_CORE is not set 616# CONFIG_TWL4030_CORE is not set
614# CONFIG_MFD_TMIO is not set 617# CONFIG_MFD_TMIO is not set
615# CONFIG_PMIC_DA903X is not set 618# CONFIG_PMIC_DA903X is not set
616# CONFIG_PMIC_ADP5520 is not set 619# CONFIG_PMIC_ADP5520 is not set
620# CONFIG_MFD_MAX8925 is not set
617# CONFIG_MFD_WM8400 is not set 621# CONFIG_MFD_WM8400 is not set
618# CONFIG_MFD_WM831X is not set 622# CONFIG_MFD_WM831X is not set
619# CONFIG_MFD_WM8350_I2C is not set 623# CONFIG_MFD_WM8350_I2C is not set
624# CONFIG_MFD_WM8994 is not set
620# CONFIG_MFD_PCF50633 is not set 625# CONFIG_MFD_PCF50633 is not set
621# CONFIG_AB3100_CORE is not set 626# CONFIG_AB3100_CORE is not set
622# CONFIG_MFD_88PM8607 is not set
623# CONFIG_REGULATOR is not set 627# CONFIG_REGULATOR is not set
624# CONFIG_MEDIA_SUPPORT is not set 628# CONFIG_MEDIA_SUPPORT is not set
625 629
@@ -690,6 +694,7 @@ CONFIG_USB_GADGET_DUALSPEED=y
690# CONFIG_USB_MIDI_GADGET is not set 694# CONFIG_USB_MIDI_GADGET is not set
691# CONFIG_USB_G_PRINTER is not set 695# CONFIG_USB_G_PRINTER is not set
692CONFIG_USB_CDC_COMPOSITE=y 696CONFIG_USB_CDC_COMPOSITE=y
697# CONFIG_USB_G_NOKIA is not set
693# CONFIG_USB_G_MULTI is not set 698# CONFIG_USB_G_MULTI is not set
694 699
695# 700#
@@ -794,6 +799,7 @@ CONFIG_HAVE_ARCH_KGDB=y
794CONFIG_DEFAULT_SECURITY_DAC=y 799CONFIG_DEFAULT_SECURITY_DAC=y
795CONFIG_DEFAULT_SECURITY="" 800CONFIG_DEFAULT_SECURITY=""
796# CONFIG_CRYPTO is not set 801# CONFIG_CRYPTO is not set
802# CONFIG_VIRTUALIZATION is not set
797# CONFIG_BINARY_PRINTF is not set 803# CONFIG_BINARY_PRINTF is not set
798 804
799# 805#
diff --git a/arch/sh/configs/kfr2r09_defconfig b/arch/sh/configs/kfr2r09_defconfig
index f22be494ed99..2e74b08ca14d 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 11:32:55 2010 4# Tue May 18 15:35:20 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -47,9 +48,11 @@ CONFIG_LOCALVERSION=""
47CONFIG_HAVE_KERNEL_GZIP=y 48CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y 49CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y 50CONFIG_HAVE_KERNEL_LZMA=y
51CONFIG_HAVE_KERNEL_LZO=y
50CONFIG_KERNEL_GZIP=y 52CONFIG_KERNEL_GZIP=y
51# CONFIG_KERNEL_BZIP2 is not set 53# CONFIG_KERNEL_BZIP2 is not set
52# CONFIG_KERNEL_LZMA is not set 54# CONFIG_KERNEL_LZMA is not set
55# CONFIG_KERNEL_LZO is not set
53CONFIG_SWAP=y 56CONFIG_SWAP=y
54CONFIG_SYSVIPC=y 57CONFIG_SYSVIPC=y
55CONFIG_SYSVIPC_SYSCTL=y 58CONFIG_SYSVIPC_SYSCTL=y
@@ -72,11 +75,6 @@ CONFIG_RCU_FANOUT=32
72CONFIG_IKCONFIG=y 75CONFIG_IKCONFIG=y
73CONFIG_IKCONFIG_PROC=y 76CONFIG_IKCONFIG_PROC=y
74CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
75CONFIG_GROUP_SCHED=y
76CONFIG_FAIR_GROUP_SCHED=y
77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set
80# CONFIG_CGROUPS is not set 78# CONFIG_CGROUPS is not set
81CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
82CONFIG_SYSFS_DEPRECATED_V2=y 80CONFIG_SYSFS_DEPRECATED_V2=y
@@ -87,6 +85,7 @@ CONFIG_INITRAMFS_SOURCE=""
87CONFIG_RD_GZIP=y 85CONFIG_RD_GZIP=y
88# CONFIG_RD_BZIP2 is not set 86# CONFIG_RD_BZIP2 is not set
89# CONFIG_RD_LZMA is not set 87# CONFIG_RD_LZMA is not set
88# CONFIG_RD_LZO is not set
90CONFIG_CC_OPTIMIZE_FOR_SIZE=y 89CONFIG_CC_OPTIMIZE_FOR_SIZE=y
91CONFIG_SYSCTL=y 90CONFIG_SYSCTL=y
92CONFIG_ANON_INODES=y 91CONFIG_ANON_INODES=y
@@ -112,7 +111,7 @@ CONFIG_PERF_USE_VMALLOC=y
112# 111#
113# Kernel Performance Events And Counters 112# Kernel Performance Events And Counters
114# 113#
115# CONFIG_PERF_EVENTS is not set 114CONFIG_PERF_EVENTS=y
116# CONFIG_PERF_COUNTERS is not set 115# CONFIG_PERF_COUNTERS is not set
117CONFIG_VM_EVENT_COUNTERS=y 116CONFIG_VM_EVENT_COUNTERS=y
118CONFIG_COMPAT_BRK=y 117CONFIG_COMPAT_BRK=y
@@ -121,13 +120,13 @@ CONFIG_SLAB=y
121# CONFIG_SLOB is not set 120# CONFIG_SLOB is not set
122# CONFIG_PROFILING is not set 121# CONFIG_PROFILING is not set
123CONFIG_HAVE_OPROFILE=y 122CONFIG_HAVE_OPROFILE=y
124CONFIG_HAVE_IOREMAP_PROT=y
125CONFIG_HAVE_KPROBES=y 123CONFIG_HAVE_KPROBES=y
126CONFIG_HAVE_KRETPROBES=y 124CONFIG_HAVE_KRETPROBES=y
127CONFIG_HAVE_ARCH_TRACEHOOK=y 125CONFIG_HAVE_ARCH_TRACEHOOK=y
128CONFIG_HAVE_DMA_ATTRS=y 126CONFIG_HAVE_DMA_ATTRS=y
129CONFIG_HAVE_CLK=y 127CONFIG_HAVE_CLK=y
130CONFIG_HAVE_DMA_API_DEBUG=y 128CONFIG_HAVE_DMA_API_DEBUG=y
129CONFIG_HAVE_HW_BREAKPOINT=y
131 130
132# 131#
133# GCOV-based kernel profiling 132# GCOV-based kernel profiling
@@ -243,8 +242,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
243CONFIG_MEMORY_START=0x08000000 242CONFIG_MEMORY_START=0x08000000
244CONFIG_MEMORY_SIZE=0x08000000 243CONFIG_MEMORY_SIZE=0x08000000
245CONFIG_29BIT=y 244CONFIG_29BIT=y
246# CONFIG_PMB_ENABLE is not set 245# CONFIG_PMB is not set
247# CONFIG_X2TLB is not set 246CONFIG_X2TLB=y
248CONFIG_VSYSCALL=y 247CONFIG_VSYSCALL=y
249CONFIG_ARCH_FLATMEM_ENABLE=y 248CONFIG_ARCH_FLATMEM_ENABLE=y
250CONFIG_ARCH_SPARSEMEM_ENABLE=y 249CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -252,6 +251,8 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
252CONFIG_MAX_ACTIVE_REGIONS=1 251CONFIG_MAX_ACTIVE_REGIONS=1
253CONFIG_ARCH_POPULATES_NODE_MAP=y 252CONFIG_ARCH_POPULATES_NODE_MAP=y
254CONFIG_ARCH_SELECT_MEMORY_MODEL=y 253CONFIG_ARCH_SELECT_MEMORY_MODEL=y
254CONFIG_IOREMAP_FIXED=y
255CONFIG_UNCACHED_MAPPING=y
255CONFIG_PAGE_SIZE_4KB=y 256CONFIG_PAGE_SIZE_4KB=y
256# CONFIG_PAGE_SIZE_8KB is not set 257# CONFIG_PAGE_SIZE_8KB is not set
257# CONFIG_PAGE_SIZE_16KB is not set 258# CONFIG_PAGE_SIZE_16KB is not set
@@ -267,7 +268,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
267CONFIG_SPLIT_PTLOCK_CPUS=4 268CONFIG_SPLIT_PTLOCK_CPUS=4
268# CONFIG_PHYS_ADDR_T_64BIT is not set 269# CONFIG_PHYS_ADDR_T_64BIT is not set
269CONFIG_ZONE_DMA_FLAG=0 270CONFIG_ZONE_DMA_FLAG=0
270CONFIG_NR_QUICK=2 271CONFIG_NR_QUICK=1
271# CONFIG_KSM is not set 272# CONFIG_KSM is not set
272CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 273CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
273 274
@@ -343,7 +344,7 @@ CONFIG_KEXEC=y
343# CONFIG_PREEMPT_VOLUNTARY is not set 344# CONFIG_PREEMPT_VOLUNTARY is not set
344CONFIG_PREEMPT=y 345CONFIG_PREEMPT=y
345CONFIG_GUSA=y 346CONFIG_GUSA=y
346# CONFIG_SPARSE_IRQ is not set 347# CONFIG_INTC_USERIMASK is not set
347 348
348# 349#
349# Boot options 350# Boot options
@@ -377,6 +378,7 @@ CONFIG_PM=y
377# CONFIG_SUSPEND is not set 378# CONFIG_SUSPEND is not set
378# CONFIG_HIBERNATION is not set 379# CONFIG_HIBERNATION is not set
379CONFIG_PM_RUNTIME=y 380CONFIG_PM_RUNTIME=y
381CONFIG_PM_OPS=y
380CONFIG_CPU_IDLE=y 382CONFIG_CPU_IDLE=y
381CONFIG_CPU_IDLE_GOV_LADDER=y 383CONFIG_CPU_IDLE_GOV_LADDER=y
382CONFIG_CPU_IDLE_GOV_MENU=y 384CONFIG_CPU_IDLE_GOV_MENU=y
@@ -386,7 +388,6 @@ CONFIG_NET=y
386# Networking options 388# Networking options
387# 389#
388CONFIG_PACKET=y 390CONFIG_PACKET=y
389CONFIG_PACKET_MMAP=y
390CONFIG_UNIX=y 391CONFIG_UNIX=y
391# CONFIG_NET_KEY is not set 392# CONFIG_NET_KEY is not set
392CONFIG_INET=y 393CONFIG_INET=y
@@ -580,6 +581,7 @@ CONFIG_HAVE_IDE=y
580# 581#
581# SCSI device support 582# SCSI device support
582# 583#
584CONFIG_SCSI_MOD=y
583# CONFIG_RAID_ATTRS is not set 585# CONFIG_RAID_ATTRS is not set
584# CONFIG_SCSI is not set 586# CONFIG_SCSI is not set
585# CONFIG_SCSI_DMA is not set 587# CONFIG_SCSI_DMA is not set
@@ -659,6 +661,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6
659CONFIG_SERIAL_SH_SCI_CONSOLE=y 661CONFIG_SERIAL_SH_SCI_CONSOLE=y
660CONFIG_SERIAL_CORE=y 662CONFIG_SERIAL_CORE=y
661CONFIG_SERIAL_CORE_CONSOLE=y 663CONFIG_SERIAL_CORE_CONSOLE=y
664# CONFIG_SERIAL_TIMBERDALE is not set
662CONFIG_UNIX98_PTYS=y 665CONFIG_UNIX98_PTYS=y
663# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 666# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
664CONFIG_LEGACY_PTYS=y 667CONFIG_LEGACY_PTYS=y
@@ -687,6 +690,7 @@ CONFIG_I2C_HELPER_AUTO=y
687# CONFIG_I2C_OCORES is not set 690# CONFIG_I2C_OCORES is not set
688CONFIG_I2C_SH_MOBILE=y 691CONFIG_I2C_SH_MOBILE=y
689# CONFIG_I2C_SIMTEC is not set 692# CONFIG_I2C_SIMTEC is not set
693# CONFIG_I2C_XILINX is not set
690 694
691# 695#
692# External I2C/SMBus adapter drivers 696# External I2C/SMBus adapter drivers
@@ -699,15 +703,9 @@ CONFIG_I2C_SH_MOBILE=y
699# 703#
700# CONFIG_I2C_PCA_PLATFORM is not set 704# CONFIG_I2C_PCA_PLATFORM is not set
701# CONFIG_I2C_STUB is not set 705# CONFIG_I2C_STUB is not set
702
703#
704# Miscellaneous I2C Chip support
705#
706# CONFIG_SENSORS_TSL2550 is not set
707# CONFIG_I2C_DEBUG_CORE is not set 706# CONFIG_I2C_DEBUG_CORE is not set
708# CONFIG_I2C_DEBUG_ALGO is not set 707# CONFIG_I2C_DEBUG_ALGO is not set
709# CONFIG_I2C_DEBUG_BUS is not set 708# CONFIG_I2C_DEBUG_BUS is not set
710# CONFIG_I2C_DEBUG_CHIP is not set
711# CONFIG_SPI is not set 709# CONFIG_SPI is not set
712 710
713# 711#
@@ -721,13 +719,16 @@ CONFIG_GPIO_SYSFS=y
721# 719#
722# Memory mapped GPIO expanders: 720# Memory mapped GPIO expanders:
723# 721#
722# CONFIG_GPIO_IT8761E is not set
724 723
725# 724#
726# I2C GPIO expanders: 725# I2C GPIO expanders:
727# 726#
727# CONFIG_GPIO_MAX7300 is not set
728# CONFIG_GPIO_MAX732X is not set 728# CONFIG_GPIO_MAX732X is not set
729# CONFIG_GPIO_PCA953X is not set 729# CONFIG_GPIO_PCA953X is not set
730# CONFIG_GPIO_PCF857X is not set 730# CONFIG_GPIO_PCF857X is not set
731# CONFIG_GPIO_ADP5588 is not set
731 732
732# 733#
733# PCI GPIO expanders: 734# PCI GPIO expanders:
@@ -756,20 +757,23 @@ CONFIG_SSB_POSSIBLE=y
756# Multifunction device drivers 757# Multifunction device drivers
757# 758#
758# CONFIG_MFD_CORE is not set 759# CONFIG_MFD_CORE is not set
760# CONFIG_MFD_88PM860X is not set
759# CONFIG_MFD_SM501 is not set 761# CONFIG_MFD_SM501 is not set
760# CONFIG_MFD_SH_MOBILE_SDHI is not set 762# CONFIG_MFD_SH_MOBILE_SDHI is not set
761# CONFIG_HTC_PASIC3 is not set 763# CONFIG_HTC_PASIC3 is not set
764# CONFIG_HTC_I2CPLD is not set
762# CONFIG_TPS65010 is not set 765# CONFIG_TPS65010 is not set
763# CONFIG_TWL4030_CORE is not set 766# CONFIG_TWL4030_CORE is not set
764# CONFIG_MFD_TMIO is not set 767# CONFIG_MFD_TMIO is not set
765# CONFIG_PMIC_DA903X is not set 768# CONFIG_PMIC_DA903X is not set
766# CONFIG_PMIC_ADP5520 is not set 769# CONFIG_PMIC_ADP5520 is not set
770# CONFIG_MFD_MAX8925 is not set
767# CONFIG_MFD_WM8400 is not set 771# CONFIG_MFD_WM8400 is not set
768# CONFIG_MFD_WM831X is not set 772# CONFIG_MFD_WM831X is not set
769# CONFIG_MFD_WM8350_I2C is not set 773# CONFIG_MFD_WM8350_I2C is not set
774# CONFIG_MFD_WM8994 is not set
770# CONFIG_MFD_PCF50633 is not set 775# CONFIG_MFD_PCF50633 is not set
771# CONFIG_AB3100_CORE is not set 776# CONFIG_AB3100_CORE is not set
772# CONFIG_MFD_88PM8607 is not set
773# CONFIG_REGULATOR is not set 777# CONFIG_REGULATOR is not set
774# CONFIG_MEDIA_SUPPORT is not set 778# CONFIG_MEDIA_SUPPORT is not set
775 779
@@ -889,6 +893,7 @@ CONFIG_USB_GADGET_DUALSPEED=y
889# CONFIG_USB_MIDI_GADGET is not set 893# CONFIG_USB_MIDI_GADGET is not set
890# CONFIG_USB_G_PRINTER is not set 894# CONFIG_USB_G_PRINTER is not set
891CONFIG_USB_CDC_COMPOSITE=m 895CONFIG_USB_CDC_COMPOSITE=m
896# CONFIG_USB_G_NOKIA is not set
892# CONFIG_USB_G_MULTI is not set 897# CONFIG_USB_G_MULTI is not set
893 898
894# 899#
@@ -912,9 +917,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y
912# MMC/SD/SDIO Host Controller Drivers 917# MMC/SD/SDIO Host Controller Drivers
913# 918#
914# CONFIG_MMC_SDHCI is not set 919# CONFIG_MMC_SDHCI is not set
915# CONFIG_MMC_AT91 is not set
916# CONFIG_MMC_ATMELMCI is not set
917# CONFIG_MMC_TMIO is not set
918# CONFIG_MEMSTICK is not set 920# CONFIG_MEMSTICK is not set
919# CONFIG_NEW_LEDS is not set 921# CONFIG_NEW_LEDS is not set
920# CONFIG_ACCESSIBILITY is not set 922# CONFIG_ACCESSIBILITY is not set
@@ -982,8 +984,6 @@ CONFIG_RTC_DRV_SH=y
982CONFIG_UIO=y 984CONFIG_UIO=y
983# CONFIG_UIO_PDRV is not set 985# CONFIG_UIO_PDRV is not set
984CONFIG_UIO_PDRV_GENIRQ=y 986CONFIG_UIO_PDRV_GENIRQ=y
985# CONFIG_UIO_SMX is not set
986# CONFIG_UIO_SERCOS3 is not set
987 987
988# 988#
989# TI VLYNQ 989# TI VLYNQ
@@ -996,7 +996,6 @@ CONFIG_UIO_PDRV_GENIRQ=y
996# CONFIG_EXT2_FS is not set 996# CONFIG_EXT2_FS is not set
997# CONFIG_EXT3_FS is not set 997# CONFIG_EXT3_FS is not set
998# CONFIG_EXT4_FS is not set 998# CONFIG_EXT4_FS is not set
999CONFIG_EXT4_USE_FOR_EXT23=y
1000# CONFIG_REISERFS_FS is not set 999# CONFIG_REISERFS_FS is not set
1001# CONFIG_JFS_FS is not set 1000# CONFIG_JFS_FS is not set
1002# CONFIG_FS_POSIX_ACL is not set 1001# CONFIG_FS_POSIX_ACL is not set
@@ -1074,6 +1073,7 @@ CONFIG_DEBUG_FS=y
1074CONFIG_DEBUG_BUGVERBOSE=y 1073CONFIG_DEBUG_BUGVERBOSE=y
1075# CONFIG_DEBUG_MEMORY_INIT is not set 1074# CONFIG_DEBUG_MEMORY_INIT is not set
1076# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1075# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1076# CONFIG_LKDTM is not set
1077# CONFIG_LATENCYTOP is not set 1077# CONFIG_LATENCYTOP is not set
1078# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1078# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1079CONFIG_HAVE_FUNCTION_TRACER=y 1079CONFIG_HAVE_FUNCTION_TRACER=y
@@ -1103,6 +1103,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1103CONFIG_DEFAULT_SECURITY_DAC=y 1103CONFIG_DEFAULT_SECURITY_DAC=y
1104CONFIG_DEFAULT_SECURITY="" 1104CONFIG_DEFAULT_SECURITY=""
1105# CONFIG_CRYPTO is not set 1105# CONFIG_CRYPTO is not set
1106# CONFIG_VIRTUALIZATION is not set
1106# CONFIG_BINARY_PRINTF is not set 1107# CONFIG_BINARY_PRINTF is not set
1107 1108
1108# 1109#
diff --git a/arch/sh/configs/landisk_defconfig b/arch/sh/configs/landisk_defconfig
index 2a42d4977fe4..87789345d47f 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 11:35:31 2010 4# Tue May 18 15:38:08 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SWAP=y 55CONFIG_SWAP=y
53CONFIG_SYSVIPC=y 56CONFIG_SYSVIPC=y
54CONFIG_SYSVIPC_SYSCTL=y 57CONFIG_SYSVIPC_SYSCTL=y
@@ -69,7 +72,6 @@ CONFIG_RCU_FANOUT=32
69# CONFIG_TREE_RCU_TRACE is not set 72# CONFIG_TREE_RCU_TRACE is not set
70# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
72# CONFIG_GROUP_SCHED is not set
73# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
74CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
75CONFIG_SYSFS_DEPRECATED_V2=y 77CONFIG_SYSFS_DEPRECATED_V2=y
@@ -102,7 +104,7 @@ CONFIG_PERF_USE_VMALLOC=y
102# 104#
103# Kernel Performance Events And Counters 105# Kernel Performance Events And Counters
104# 106#
105# CONFIG_PERF_EVENTS is not set 107CONFIG_PERF_EVENTS=y
106# CONFIG_PERF_COUNTERS is not set 108# CONFIG_PERF_COUNTERS is not set
107CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_PCI_QUIRKS=y 110CONFIG_PCI_QUIRKS=y
@@ -120,6 +122,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
120CONFIG_HAVE_DMA_ATTRS=y 122CONFIG_HAVE_DMA_ATTRS=y
121CONFIG_HAVE_CLK=y 123CONFIG_HAVE_CLK=y
122CONFIG_HAVE_DMA_API_DEBUG=y 124CONFIG_HAVE_DMA_API_DEBUG=y
125CONFIG_HAVE_HW_BREAKPOINT=y
123 126
124# 127#
125# GCOV-based kernel profiling 128# GCOV-based kernel profiling
@@ -238,6 +241,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
238CONFIG_MAX_ACTIVE_REGIONS=1 241CONFIG_MAX_ACTIVE_REGIONS=1
239CONFIG_ARCH_POPULATES_NODE_MAP=y 242CONFIG_ARCH_POPULATES_NODE_MAP=y
240CONFIG_ARCH_SELECT_MEMORY_MODEL=y 243CONFIG_ARCH_SELECT_MEMORY_MODEL=y
244CONFIG_UNCACHED_MAPPING=y
241CONFIG_PAGE_SIZE_4KB=y 245CONFIG_PAGE_SIZE_4KB=y
242# CONFIG_PAGE_SIZE_8KB is not set 246# CONFIG_PAGE_SIZE_8KB is not set
243# CONFIG_PAGE_SIZE_16KB is not set 247# CONFIG_PAGE_SIZE_16KB is not set
@@ -253,7 +257,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
253CONFIG_SPLIT_PTLOCK_CPUS=4 257CONFIG_SPLIT_PTLOCK_CPUS=4
254# CONFIG_PHYS_ADDR_T_64BIT is not set 258# CONFIG_PHYS_ADDR_T_64BIT is not set
255CONFIG_ZONE_DMA_FLAG=0 259CONFIG_ZONE_DMA_FLAG=0
256CONFIG_NR_QUICK=2 260CONFIG_NR_QUICK=1
257# CONFIG_KSM is not set 261# CONFIG_KSM is not set
258CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
259 263
@@ -333,7 +337,6 @@ CONFIG_PREEMPT_NONE=y
333# CONFIG_PREEMPT is not set 337# CONFIG_PREEMPT is not set
334CONFIG_GUSA=y 338CONFIG_GUSA=y
335# CONFIG_GUSA_RB is not set 339# CONFIG_GUSA_RB is not set
336# CONFIG_SPARSE_IRQ is not set
337 340
338# 341#
339# Boot options 342# Boot options
@@ -348,15 +351,14 @@ CONFIG_ENTRY_OFFSET=0x00001000
348# Bus options 351# Bus options
349# 352#
350CONFIG_PCI=y 353CONFIG_PCI=y
354CONFIG_PCI_DOMAINS=y
351# CONFIG_PCIEPORTBUS is not set 355# CONFIG_PCIEPORTBUS is not set
352# CONFIG_ARCH_SUPPORTS_MSI is not set 356# CONFIG_ARCH_SUPPORTS_MSI is not set
353CONFIG_PCI_LEGACY=y
354# CONFIG_PCI_STUB is not set 357# CONFIG_PCI_STUB is not set
355# CONFIG_PCI_IOV is not set 358# CONFIG_PCI_IOV is not set
356CONFIG_PCCARD=y 359CONFIG_PCCARD=y
357CONFIG_PCMCIA=y 360CONFIG_PCMCIA=y
358CONFIG_PCMCIA_LOAD_CIS=y 361CONFIG_PCMCIA_LOAD_CIS=y
359CONFIG_PCMCIA_IOCTL=y
360CONFIG_CARDBUS=y 362CONFIG_CARDBUS=y
361 363
362# 364#
@@ -392,7 +394,6 @@ CONFIG_NET=y
392# Networking options 394# Networking options
393# 395#
394CONFIG_PACKET=y 396CONFIG_PACKET=y
395# CONFIG_PACKET_MMAP is not set
396CONFIG_UNIX=y 397CONFIG_UNIX=y
397CONFIG_XFRM=y 398CONFIG_XFRM=y
398# CONFIG_XFRM_USER is not set 399# CONFIG_XFRM_USER is not set
@@ -612,6 +613,7 @@ CONFIG_BLK_DEV_IDEDMA=y
612# 613#
613# SCSI device support 614# SCSI device support
614# 615#
616CONFIG_SCSI_MOD=y
615# CONFIG_RAID_ATTRS is not set 617# CONFIG_RAID_ATTRS is not set
616CONFIG_SCSI=y 618CONFIG_SCSI=y
617CONFIG_SCSI_DMA=y 619CONFIG_SCSI_DMA=y
@@ -711,7 +713,7 @@ CONFIG_MD_RAID1=m
711# 713#
712 714
713# 715#
714# See the help texts for more information. 716# The newer stack is recommended.
715# 717#
716# CONFIG_FIREWIRE is not set 718# CONFIG_FIREWIRE is not set
717# CONFIG_IEEE1394 is not set 719# CONFIG_IEEE1394 is not set
@@ -751,6 +753,7 @@ CONFIG_NET_PCI=y
751# CONFIG_PCNET32 is not set 753# CONFIG_PCNET32 is not set
752# CONFIG_AMD8111_ETH is not set 754# CONFIG_AMD8111_ETH is not set
753# CONFIG_ADAPTEC_STARFIRE is not set 755# CONFIG_ADAPTEC_STARFIRE is not set
756# CONFIG_KSZ884X_PCI is not set
754# CONFIG_B44 is not set 757# CONFIG_B44 is not set
755# CONFIG_FORCEDETH is not set 758# CONFIG_FORCEDETH is not set
756# CONFIG_E100 is not set 759# CONFIG_E100 is not set
@@ -798,6 +801,8 @@ CONFIG_NETDEV_10000=y
798# CONFIG_CHELSIO_T1 is not set 801# CONFIG_CHELSIO_T1 is not set
799CONFIG_CHELSIO_T3_DEPENDS=y 802CONFIG_CHELSIO_T3_DEPENDS=y
800# CONFIG_CHELSIO_T3 is not set 803# CONFIG_CHELSIO_T3 is not set
804CONFIG_CHELSIO_T4_DEPENDS=y
805# CONFIG_CHELSIO_T4 is not set
801# CONFIG_ENIC is not set 806# CONFIG_ENIC is not set
802# CONFIG_IXGBE is not set 807# CONFIG_IXGBE is not set
803# CONFIG_IXGB is not set 808# CONFIG_IXGB is not set
@@ -810,6 +815,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
810# CONFIG_MLX4_CORE is not set 815# CONFIG_MLX4_CORE is not set
811# CONFIG_TEHUTI is not set 816# CONFIG_TEHUTI is not set
812# CONFIG_BNX2X is not set 817# CONFIG_BNX2X is not set
818# CONFIG_QLCNIC is not set
813# CONFIG_QLGE is not set 819# CONFIG_QLGE is not set
814# CONFIG_SFC is not set 820# CONFIG_SFC is not set
815# CONFIG_BE2NET is not set 821# CONFIG_BE2NET is not set
@@ -835,6 +841,7 @@ CONFIG_WLAN=y
835CONFIG_USB_PEGASUS=m 841CONFIG_USB_PEGASUS=m
836CONFIG_USB_RTL8150=m 842CONFIG_USB_RTL8150=m
837# CONFIG_USB_USBNET is not set 843# CONFIG_USB_USBNET is not set
844# CONFIG_USB_IPHETH is not set
838# CONFIG_NET_PCMCIA is not set 845# CONFIG_NET_PCMCIA is not set
839# CONFIG_WAN is not set 846# CONFIG_WAN is not set
840# CONFIG_FDDI is not set 847# CONFIG_FDDI is not set
@@ -910,6 +917,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
910CONFIG_SERIAL_CORE=y 917CONFIG_SERIAL_CORE=y
911CONFIG_SERIAL_CORE_CONSOLE=y 918CONFIG_SERIAL_CORE_CONSOLE=y
912# CONFIG_SERIAL_JSM is not set 919# CONFIG_SERIAL_JSM is not set
920# CONFIG_SERIAL_TIMBERDALE is not set
913CONFIG_UNIX98_PTYS=y 921CONFIG_UNIX98_PTYS=y
914# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 922# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
915CONFIG_LEGACY_PTYS=y 923CONFIG_LEGACY_PTYS=y
@@ -977,6 +985,7 @@ CONFIG_SSB_POSSIBLE=y
977# CONFIG_MFD_SH_MOBILE_SDHI is not set 985# CONFIG_MFD_SH_MOBILE_SDHI is not set
978# CONFIG_HTC_PASIC3 is not set 986# CONFIG_HTC_PASIC3 is not set
979# CONFIG_MFD_TMIO is not set 987# CONFIG_MFD_TMIO is not set
988# CONFIG_LPC_SCH is not set
980# CONFIG_REGULATOR is not set 989# CONFIG_REGULATOR is not set
981# CONFIG_MEDIA_SUPPORT is not set 990# CONFIG_MEDIA_SUPPORT is not set
982 991
@@ -984,6 +993,7 @@ CONFIG_SSB_POSSIBLE=y
984# Graphics support 993# Graphics support
985# 994#
986CONFIG_VGA_ARB=y 995CONFIG_VGA_ARB=y
996CONFIG_VGA_ARB_MAX_GPUS=16
987# CONFIG_DRM is not set 997# CONFIG_DRM is not set
988# CONFIG_VGASTATE is not set 998# CONFIG_VGASTATE is not set
989# CONFIG_VIDEO_OUTPUT_CONTROL is not set 999# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1025,6 +1035,7 @@ CONFIG_USB_HID=m
1025# 1035#
1026# Special HID drivers 1036# Special HID drivers
1027# 1037#
1038# CONFIG_HID_3M_PCT is not set
1028CONFIG_HID_A4TECH=m 1039CONFIG_HID_A4TECH=m
1029CONFIG_HID_APPLE=m 1040CONFIG_HID_APPLE=m
1030CONFIG_HID_BELKIN=m 1041CONFIG_HID_BELKIN=m
@@ -1040,14 +1051,19 @@ CONFIG_HID_GYRATION=m
1040CONFIG_HID_LOGITECH=m 1051CONFIG_HID_LOGITECH=m
1041# CONFIG_LOGITECH_FF is not set 1052# CONFIG_LOGITECH_FF is not set
1042# CONFIG_LOGIRUMBLEPAD2_FF is not set 1053# CONFIG_LOGIRUMBLEPAD2_FF is not set
1054# CONFIG_LOGIG940_FF is not set
1043CONFIG_HID_MICROSOFT=m 1055CONFIG_HID_MICROSOFT=m
1056# CONFIG_HID_MOSART is not set
1044CONFIG_HID_MONTEREY=m 1057CONFIG_HID_MONTEREY=m
1045# CONFIG_HID_NTRIG is not set 1058# CONFIG_HID_NTRIG is not set
1059# CONFIG_HID_ORTEK is not set
1046CONFIG_HID_PANTHERLORD=m 1060CONFIG_HID_PANTHERLORD=m
1047# CONFIG_PANTHERLORD_FF is not set 1061# CONFIG_PANTHERLORD_FF is not set
1048CONFIG_HID_PETALYNX=m 1062CONFIG_HID_PETALYNX=m
1063# CONFIG_HID_QUANTA is not set
1049CONFIG_HID_SAMSUNG=m 1064CONFIG_HID_SAMSUNG=m
1050CONFIG_HID_SONY=m 1065CONFIG_HID_SONY=m
1066# CONFIG_HID_STANTUM is not set
1051CONFIG_HID_SUNPLUS=m 1067CONFIG_HID_SUNPLUS=m
1052# CONFIG_HID_GREENASIA is not set 1068# CONFIG_HID_GREENASIA is not set
1053# CONFIG_HID_SMARTJOYPLUS is not set 1069# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1169,6 +1185,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
1169# CONFIG_USB_SERIAL_NAVMAN is not set 1185# CONFIG_USB_SERIAL_NAVMAN is not set
1170CONFIG_USB_SERIAL_PL2303=m 1186CONFIG_USB_SERIAL_PL2303=m
1171# CONFIG_USB_SERIAL_OTI6858 is not set 1187# CONFIG_USB_SERIAL_OTI6858 is not set
1188# CONFIG_USB_SERIAL_QCAUX is not set
1172# CONFIG_USB_SERIAL_QUALCOMM is not set 1189# CONFIG_USB_SERIAL_QUALCOMM is not set
1173# CONFIG_USB_SERIAL_SPCP8X5 is not set 1190# CONFIG_USB_SERIAL_SPCP8X5 is not set
1174# CONFIG_USB_SERIAL_HP4X is not set 1191# CONFIG_USB_SERIAL_HP4X is not set
@@ -1182,6 +1199,7 @@ CONFIG_USB_SERIAL_PL2303=m
1182# CONFIG_USB_SERIAL_OPTION is not set 1199# CONFIG_USB_SERIAL_OPTION is not set
1183# CONFIG_USB_SERIAL_OMNINET is not set 1200# CONFIG_USB_SERIAL_OMNINET is not set
1184# CONFIG_USB_SERIAL_OPTICON is not set 1201# CONFIG_USB_SERIAL_OPTICON is not set
1202# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
1185# CONFIG_USB_SERIAL_DEBUG is not set 1203# CONFIG_USB_SERIAL_DEBUG is not set
1186 1204
1187# 1205#
@@ -1194,7 +1212,6 @@ CONFIG_USB_EMI26=m
1194# CONFIG_USB_RIO500 is not set 1212# CONFIG_USB_RIO500 is not set
1195# CONFIG_USB_LEGOTOWER is not set 1213# CONFIG_USB_LEGOTOWER is not set
1196# CONFIG_USB_LCD is not set 1214# CONFIG_USB_LCD is not set
1197# CONFIG_USB_BERRY_CHARGE is not set
1198# CONFIG_USB_LED is not set 1215# CONFIG_USB_LED is not set
1199# CONFIG_USB_CYPRESS_CY7C63 is not set 1216# CONFIG_USB_CYPRESS_CY7C63 is not set
1200# CONFIG_USB_CYTHERM is not set 1217# CONFIG_USB_CYTHERM is not set
@@ -1208,7 +1225,6 @@ CONFIG_USB_SISUSBVGA_CON=y
1208# CONFIG_USB_IOWARRIOR is not set 1225# CONFIG_USB_IOWARRIOR is not set
1209# CONFIG_USB_TEST is not set 1226# CONFIG_USB_TEST is not set
1210# CONFIG_USB_ISIGHTFW is not set 1227# CONFIG_USB_ISIGHTFW is not set
1211# CONFIG_USB_VST is not set
1212# CONFIG_USB_GADGET is not set 1228# CONFIG_USB_GADGET is not set
1213 1229
1214# 1230#
@@ -1313,6 +1329,7 @@ CONFIG_MISC_FILESYSTEMS=y
1313# CONFIG_BEFS_FS is not set 1329# CONFIG_BEFS_FS is not set
1314# CONFIG_BFS_FS is not set 1330# CONFIG_BFS_FS is not set
1315# CONFIG_EFS_FS is not set 1331# CONFIG_EFS_FS is not set
1332# CONFIG_LOGFS is not set
1316# CONFIG_CRAMFS is not set 1333# CONFIG_CRAMFS is not set
1317# CONFIG_SQUASHFS is not set 1334# CONFIG_SQUASHFS is not set
1318# CONFIG_VXFS_FS is not set 1335# CONFIG_VXFS_FS is not set
@@ -1347,6 +1364,7 @@ CONFIG_SUNRPC=m
1347# CONFIG_RPCSEC_GSS_SPKM3 is not set 1364# CONFIG_RPCSEC_GSS_SPKM3 is not set
1348CONFIG_SMB_FS=m 1365CONFIG_SMB_FS=m
1349# CONFIG_SMB_NLS_DEFAULT is not set 1366# CONFIG_SMB_NLS_DEFAULT is not set
1367# CONFIG_CEPH_FS is not set
1350# CONFIG_CIFS is not set 1368# CONFIG_CIFS is not set
1351# CONFIG_NCP_FS is not set 1369# CONFIG_NCP_FS is not set
1352# CONFIG_CODA_FS is not set 1370# CONFIG_CODA_FS is not set
@@ -1531,6 +1549,7 @@ CONFIG_CRYPTO=y
1531# CONFIG_CRYPTO_ANSI_CPRNG is not set 1549# CONFIG_CRYPTO_ANSI_CPRNG is not set
1532CONFIG_CRYPTO_HW=y 1550CONFIG_CRYPTO_HW=y
1533# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1551# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1552# CONFIG_VIRTUALIZATION is not set
1534# CONFIG_BINARY_PRINTF is not set 1553# CONFIG_BINARY_PRINTF is not set
1535 1554
1536# 1555#
diff --git a/arch/sh/configs/lboxre2_defconfig b/arch/sh/configs/lboxre2_defconfig
index f2f1f8c73b2f..6088a76bd21c 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 11:37:01 2010 4# Tue May 18 15:42:57 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SWAP=y 55CONFIG_SWAP=y
53CONFIG_SYSVIPC=y 56CONFIG_SYSVIPC=y
54CONFIG_SYSVIPC_SYSCTL=y 57CONFIG_SYSVIPC_SYSCTL=y
@@ -69,7 +72,6 @@ CONFIG_RCU_FANOUT=32
69# CONFIG_TREE_RCU_TRACE is not set 72# CONFIG_TREE_RCU_TRACE is not set
70# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
72# CONFIG_GROUP_SCHED is not set
73# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
74CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
75CONFIG_SYSFS_DEPRECATED_V2=y 77CONFIG_SYSFS_DEPRECATED_V2=y
@@ -102,7 +104,7 @@ CONFIG_PERF_USE_VMALLOC=y
102# 104#
103# Kernel Performance Events And Counters 105# Kernel Performance Events And Counters
104# 106#
105# CONFIG_PERF_EVENTS is not set 107CONFIG_PERF_EVENTS=y
106# CONFIG_PERF_COUNTERS is not set 108# CONFIG_PERF_COUNTERS is not set
107CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_PCI_QUIRKS=y 110CONFIG_PCI_QUIRKS=y
@@ -120,6 +122,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
120CONFIG_HAVE_DMA_ATTRS=y 122CONFIG_HAVE_DMA_ATTRS=y
121CONFIG_HAVE_CLK=y 123CONFIG_HAVE_CLK=y
122CONFIG_HAVE_DMA_API_DEBUG=y 124CONFIG_HAVE_DMA_API_DEBUG=y
125CONFIG_HAVE_HW_BREAKPOINT=y
123 126
124# 127#
125# GCOV-based kernel profiling 128# GCOV-based kernel profiling
@@ -238,6 +241,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
238CONFIG_MAX_ACTIVE_REGIONS=1 241CONFIG_MAX_ACTIVE_REGIONS=1
239CONFIG_ARCH_POPULATES_NODE_MAP=y 242CONFIG_ARCH_POPULATES_NODE_MAP=y
240CONFIG_ARCH_SELECT_MEMORY_MODEL=y 243CONFIG_ARCH_SELECT_MEMORY_MODEL=y
244CONFIG_UNCACHED_MAPPING=y
241CONFIG_PAGE_SIZE_4KB=y 245CONFIG_PAGE_SIZE_4KB=y
242# CONFIG_PAGE_SIZE_8KB is not set 246# CONFIG_PAGE_SIZE_8KB is not set
243# CONFIG_PAGE_SIZE_16KB is not set 247# CONFIG_PAGE_SIZE_16KB is not set
@@ -253,7 +257,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
253CONFIG_SPLIT_PTLOCK_CPUS=4 257CONFIG_SPLIT_PTLOCK_CPUS=4
254# CONFIG_PHYS_ADDR_T_64BIT is not set 258# CONFIG_PHYS_ADDR_T_64BIT is not set
255CONFIG_ZONE_DMA_FLAG=0 259CONFIG_ZONE_DMA_FLAG=0
256CONFIG_NR_QUICK=2 260CONFIG_NR_QUICK=1
257# CONFIG_KSM is not set 261# CONFIG_KSM is not set
258CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
259 263
@@ -333,7 +337,6 @@ CONFIG_PREEMPT_NONE=y
333# CONFIG_PREEMPT is not set 337# CONFIG_PREEMPT is not set
334CONFIG_GUSA=y 338CONFIG_GUSA=y
335# CONFIG_GUSA_RB is not set 339# CONFIG_GUSA_RB is not set
336# CONFIG_SPARSE_IRQ is not set
337 340
338# 341#
339# Boot options 342# Boot options
@@ -349,15 +352,14 @@ CONFIG_CMDLINE="console=ttySC1,115200 root=/dev/sda1"
349# Bus options 352# Bus options
350# 353#
351CONFIG_PCI=y 354CONFIG_PCI=y
355CONFIG_PCI_DOMAINS=y
352# CONFIG_PCIEPORTBUS is not set 356# CONFIG_PCIEPORTBUS is not set
353# CONFIG_ARCH_SUPPORTS_MSI is not set 357# CONFIG_ARCH_SUPPORTS_MSI is not set
354CONFIG_PCI_LEGACY=y
355# CONFIG_PCI_STUB is not set 358# CONFIG_PCI_STUB is not set
356# CONFIG_PCI_IOV is not set 359# CONFIG_PCI_IOV is not set
357CONFIG_PCCARD=y 360CONFIG_PCCARD=y
358CONFIG_PCMCIA=y 361CONFIG_PCMCIA=y
359CONFIG_PCMCIA_LOAD_CIS=y 362CONFIG_PCMCIA_LOAD_CIS=y
360CONFIG_PCMCIA_IOCTL=y
361CONFIG_CARDBUS=y 363CONFIG_CARDBUS=y
362 364
363# 365#
@@ -392,7 +394,6 @@ CONFIG_NET=y
392# Networking options 394# Networking options
393# 395#
394CONFIG_PACKET=y 396CONFIG_PACKET=y
395# CONFIG_PACKET_MMAP is not set
396CONFIG_UNIX=y 397CONFIG_UNIX=y
397CONFIG_XFRM=y 398CONFIG_XFRM=y
398# CONFIG_XFRM_USER is not set 399# CONFIG_XFRM_USER is not set
@@ -552,6 +553,7 @@ CONFIG_HAVE_IDE=y
552# 553#
553# SCSI device support 554# SCSI device support
554# 555#
556CONFIG_SCSI_MOD=y
555# CONFIG_RAID_ATTRS is not set 557# CONFIG_RAID_ATTRS is not set
556CONFIG_SCSI=y 558CONFIG_SCSI=y
557CONFIG_SCSI_DMA=y 559CONFIG_SCSI_DMA=y
@@ -670,6 +672,7 @@ CONFIG_ATA_SFF=y
670# CONFIG_PATA_IT821X is not set 672# CONFIG_PATA_IT821X is not set
671# CONFIG_PATA_IT8213 is not set 673# CONFIG_PATA_IT8213 is not set
672# CONFIG_PATA_JMICRON is not set 674# CONFIG_PATA_JMICRON is not set
675# CONFIG_PATA_LEGACY is not set
673# CONFIG_PATA_TRIFLEX is not set 676# CONFIG_PATA_TRIFLEX is not set
674# CONFIG_PATA_MARVELL is not set 677# CONFIG_PATA_MARVELL is not set
675# CONFIG_PATA_MPIIX is not set 678# CONFIG_PATA_MPIIX is not set
@@ -707,7 +710,7 @@ CONFIG_PATA_PLATFORM=y
707# 710#
708 711
709# 712#
710# See the help texts for more information. 713# The newer stack is recommended.
711# 714#
712# CONFIG_FIREWIRE is not set 715# CONFIG_FIREWIRE is not set
713# CONFIG_IEEE1394 is not set 716# CONFIG_IEEE1394 is not set
@@ -747,6 +750,7 @@ CONFIG_NET_PCI=y
747# CONFIG_PCNET32 is not set 750# CONFIG_PCNET32 is not set
748# CONFIG_AMD8111_ETH is not set 751# CONFIG_AMD8111_ETH is not set
749# CONFIG_ADAPTEC_STARFIRE is not set 752# CONFIG_ADAPTEC_STARFIRE is not set
753# CONFIG_KSZ884X_PCI is not set
750# CONFIG_B44 is not set 754# CONFIG_B44 is not set
751# CONFIG_FORCEDETH is not set 755# CONFIG_FORCEDETH is not set
752# CONFIG_E100 is not set 756# CONFIG_E100 is not set
@@ -798,6 +802,8 @@ CONFIG_NETDEV_10000=y
798# CONFIG_CHELSIO_T1 is not set 802# CONFIG_CHELSIO_T1 is not set
799CONFIG_CHELSIO_T3_DEPENDS=y 803CONFIG_CHELSIO_T3_DEPENDS=y
800# CONFIG_CHELSIO_T3 is not set 804# CONFIG_CHELSIO_T3 is not set
805CONFIG_CHELSIO_T4_DEPENDS=y
806# CONFIG_CHELSIO_T4 is not set
801# CONFIG_ENIC is not set 807# CONFIG_ENIC is not set
802# CONFIG_IXGBE is not set 808# CONFIG_IXGBE is not set
803# CONFIG_IXGB is not set 809# CONFIG_IXGB is not set
@@ -810,6 +816,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
810# CONFIG_MLX4_CORE is not set 816# CONFIG_MLX4_CORE is not set
811# CONFIG_TEHUTI is not set 817# CONFIG_TEHUTI is not set
812# CONFIG_BNX2X is not set 818# CONFIG_BNX2X is not set
819# CONFIG_QLCNIC is not set
813# CONFIG_QLGE is not set 820# CONFIG_QLGE is not set
814# CONFIG_SFC is not set 821# CONFIG_SFC is not set
815# CONFIG_BE2NET is not set 822# CONFIG_BE2NET is not set
@@ -908,6 +915,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
908CONFIG_SERIAL_CORE=y 915CONFIG_SERIAL_CORE=y
909CONFIG_SERIAL_CORE_CONSOLE=y 916CONFIG_SERIAL_CORE_CONSOLE=y
910# CONFIG_SERIAL_JSM is not set 917# CONFIG_SERIAL_JSM is not set
918# CONFIG_SERIAL_TIMBERDALE is not set
911CONFIG_UNIX98_PTYS=y 919CONFIG_UNIX98_PTYS=y
912# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 920# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
913CONFIG_LEGACY_PTYS=y 921CONFIG_LEGACY_PTYS=y
@@ -975,6 +983,7 @@ CONFIG_SSB_POSSIBLE=y
975# CONFIG_MFD_SH_MOBILE_SDHI is not set 983# CONFIG_MFD_SH_MOBILE_SDHI is not set
976# CONFIG_HTC_PASIC3 is not set 984# CONFIG_HTC_PASIC3 is not set
977# CONFIG_MFD_TMIO is not set 985# CONFIG_MFD_TMIO is not set
986# CONFIG_LPC_SCH is not set
978# CONFIG_REGULATOR is not set 987# CONFIG_REGULATOR is not set
979# CONFIG_MEDIA_SUPPORT is not set 988# CONFIG_MEDIA_SUPPORT is not set
980 989
@@ -982,6 +991,7 @@ CONFIG_SSB_POSSIBLE=y
982# Graphics support 991# Graphics support
983# 992#
984CONFIG_VGA_ARB=y 993CONFIG_VGA_ARB=y
994CONFIG_VGA_ARB_MAX_GPUS=16
985# CONFIG_DRM is not set 995# CONFIG_DRM is not set
986# CONFIG_VGASTATE is not set 996# CONFIG_VGASTATE is not set
987# CONFIG_VIDEO_OUTPUT_CONTROL is not set 997# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1155,6 +1165,7 @@ CONFIG_MISC_FILESYSTEMS=y
1155# CONFIG_BEFS_FS is not set 1165# CONFIG_BEFS_FS is not set
1156# CONFIG_BFS_FS is not set 1166# CONFIG_BFS_FS is not set
1157# CONFIG_EFS_FS is not set 1167# CONFIG_EFS_FS is not set
1168# CONFIG_LOGFS is not set
1158# CONFIG_CRAMFS is not set 1169# CONFIG_CRAMFS is not set
1159# CONFIG_SQUASHFS is not set 1170# CONFIG_SQUASHFS is not set
1160# CONFIG_VXFS_FS is not set 1171# CONFIG_VXFS_FS is not set
@@ -1173,6 +1184,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
1173# CONFIG_NFS_FS is not set 1184# CONFIG_NFS_FS is not set
1174# CONFIG_NFSD is not set 1185# CONFIG_NFSD is not set
1175# CONFIG_SMB_FS is not set 1186# CONFIG_SMB_FS is not set
1187# CONFIG_CEPH_FS is not set
1176# CONFIG_CIFS is not set 1188# CONFIG_CIFS is not set
1177# CONFIG_NCP_FS is not set 1189# CONFIG_NCP_FS is not set
1178# CONFIG_CODA_FS is not set 1190# CONFIG_CODA_FS is not set
@@ -1357,6 +1369,7 @@ CONFIG_CRYPTO=y
1357# CONFIG_CRYPTO_ANSI_CPRNG is not set 1369# CONFIG_CRYPTO_ANSI_CPRNG is not set
1358CONFIG_CRYPTO_HW=y 1370CONFIG_CRYPTO_HW=y
1359# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1371# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1372# CONFIG_VIRTUALIZATION is not set
1360# CONFIG_BINARY_PRINTF is not set 1373# CONFIG_BINARY_PRINTF is not set
1361 1374
1362# 1375#
diff --git a/arch/sh/configs/magicpanelr2_defconfig b/arch/sh/configs/magicpanelr2_defconfig
index a7a16ce357ad..28c104da0ba1 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 11:37:42 2010 4# Tue May 18 15:44:00 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION=""
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51CONFIG_SWAP=y 54CONFIG_SWAP=y
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
@@ -71,7 +74,6 @@ CONFIG_RCU_FANOUT=32
71# CONFIG_TREE_RCU_TRACE is not set 74# CONFIG_TREE_RCU_TRACE is not set
72# CONFIG_IKCONFIG is not set 75# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=17 76CONFIG_LOG_BUF_SHIFT=17
74# CONFIG_GROUP_SCHED is not set
75# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
76CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
77CONFIG_SYSFS_DEPRECATED_V2=y 79CONFIG_SYSFS_DEPRECATED_V2=y
@@ -82,6 +84,7 @@ CONFIG_INITRAMFS_SOURCE=""
82CONFIG_RD_GZIP=y 84CONFIG_RD_GZIP=y
83# CONFIG_RD_BZIP2 is not set 85# CONFIG_RD_BZIP2 is not set
84# CONFIG_RD_LZMA is not set 86# CONFIG_RD_LZMA is not set
87# CONFIG_RD_LZO is not set
85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 88# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
86CONFIG_SYSCTL=y 89CONFIG_SYSCTL=y
87CONFIG_ANON_INODES=y 90CONFIG_ANON_INODES=y
@@ -109,8 +112,9 @@ CONFIG_PERF_USE_VMALLOC=y
109# 112#
110# Kernel Performance Events And Counters 113# Kernel Performance Events And Counters
111# 114#
112# CONFIG_PERF_EVENTS is not set 115CONFIG_PERF_EVENTS=y
113# CONFIG_PERF_COUNTERS is not set 116# CONFIG_PERF_COUNTERS is not set
117# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
114CONFIG_VM_EVENT_COUNTERS=y 118CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_COMPAT_BRK=y 119CONFIG_COMPAT_BRK=y
116CONFIG_SLAB=y 120CONFIG_SLAB=y
@@ -126,6 +130,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
126CONFIG_HAVE_DMA_ATTRS=y 130CONFIG_HAVE_DMA_ATTRS=y
127CONFIG_HAVE_CLK=y 131CONFIG_HAVE_CLK=y
128CONFIG_HAVE_DMA_API_DEBUG=y 132CONFIG_HAVE_DMA_API_DEBUG=y
133CONFIG_HAVE_HW_BREAKPOINT=y
129 134
130# 135#
131# GCOV-based kernel profiling 136# GCOV-based kernel profiling
@@ -244,6 +249,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
244CONFIG_MAX_ACTIVE_REGIONS=1 249CONFIG_MAX_ACTIVE_REGIONS=1
245CONFIG_ARCH_POPULATES_NODE_MAP=y 250CONFIG_ARCH_POPULATES_NODE_MAP=y
246CONFIG_ARCH_SELECT_MEMORY_MODEL=y 251CONFIG_ARCH_SELECT_MEMORY_MODEL=y
252CONFIG_UNCACHED_MAPPING=y
247CONFIG_PAGE_SIZE_4KB=y 253CONFIG_PAGE_SIZE_4KB=y
248# CONFIG_PAGE_SIZE_8KB is not set 254# CONFIG_PAGE_SIZE_8KB is not set
249# CONFIG_PAGE_SIZE_16KB is not set 255# CONFIG_PAGE_SIZE_16KB is not set
@@ -259,7 +265,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
259CONFIG_SPLIT_PTLOCK_CPUS=4 265CONFIG_SPLIT_PTLOCK_CPUS=4
260# CONFIG_PHYS_ADDR_T_64BIT is not set 266# CONFIG_PHYS_ADDR_T_64BIT is not set
261CONFIG_ZONE_DMA_FLAG=0 267CONFIG_ZONE_DMA_FLAG=0
262CONFIG_NR_QUICK=2 268CONFIG_NR_QUICK=1
263# CONFIG_KSM is not set 269# CONFIG_KSM is not set
264CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 270CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
265 271
@@ -344,7 +350,6 @@ CONFIG_PREEMPT_NONE=y
344# CONFIG_PREEMPT is not set 350# CONFIG_PREEMPT is not set
345CONFIG_GUSA=y 351CONFIG_GUSA=y
346# CONFIG_GUSA_RB is not set 352# CONFIG_GUSA_RB is not set
347# CONFIG_SPARSE_IRQ is not set
348 353
349# 354#
350# Boot options 355# Boot options
@@ -380,7 +385,6 @@ CONFIG_NET=y
380# Networking options 385# Networking options
381# 386#
382CONFIG_PACKET=y 387CONFIG_PACKET=y
383CONFIG_PACKET_MMAP=y
384CONFIG_UNIX=y 388CONFIG_UNIX=y
385# CONFIG_NET_KEY is not set 389# CONFIG_NET_KEY is not set
386CONFIG_INET=y 390CONFIG_INET=y
@@ -586,6 +590,7 @@ CONFIG_HAVE_IDE=y
586# 590#
587# SCSI device support 591# SCSI device support
588# 592#
593CONFIG_SCSI_MOD=y
589# CONFIG_RAID_ATTRS is not set 594# CONFIG_RAID_ATTRS is not set
590# CONFIG_SCSI is not set 595# CONFIG_SCSI is not set
591# CONFIG_SCSI_DMA is not set 596# CONFIG_SCSI_DMA is not set
@@ -741,6 +746,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
741CONFIG_SERIAL_SH_SCI_CONSOLE=y 746CONFIG_SERIAL_SH_SCI_CONSOLE=y
742CONFIG_SERIAL_CORE=y 747CONFIG_SERIAL_CORE=y
743CONFIG_SERIAL_CORE_CONSOLE=y 748CONFIG_SERIAL_CORE_CONSOLE=y
749# CONFIG_SERIAL_TIMBERDALE is not set
744CONFIG_UNIX98_PTYS=y 750CONFIG_UNIX98_PTYS=y
745# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 751# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
746CONFIG_LEGACY_PTYS=y 752CONFIG_LEGACY_PTYS=y
@@ -765,6 +771,7 @@ CONFIG_GPIOLIB=y
765# 771#
766# Memory mapped GPIO expanders: 772# Memory mapped GPIO expanders:
767# 773#
774# CONFIG_GPIO_IT8761E is not set
768 775
769# 776#
770# I2C GPIO expanders: 777# I2C GPIO expanders:
@@ -953,6 +960,7 @@ CONFIG_JFFS2_ZLIB=y
953# CONFIG_JFFS2_LZO is not set 960# CONFIG_JFFS2_LZO is not set
954CONFIG_JFFS2_RTIME=y 961CONFIG_JFFS2_RTIME=y
955# CONFIG_JFFS2_RUBIN is not set 962# CONFIG_JFFS2_RUBIN is not set
963# CONFIG_LOGFS is not set
956# CONFIG_CRAMFS is not set 964# CONFIG_CRAMFS is not set
957# CONFIG_SQUASHFS is not set 965# CONFIG_SQUASHFS is not set
958# CONFIG_VXFS_FS is not set 966# CONFIG_VXFS_FS is not set
@@ -977,6 +985,7 @@ CONFIG_SUNRPC=y
977# CONFIG_RPCSEC_GSS_KRB5 is not set 985# CONFIG_RPCSEC_GSS_KRB5 is not set
978# CONFIG_RPCSEC_GSS_SPKM3 is not set 986# CONFIG_RPCSEC_GSS_SPKM3 is not set
979# CONFIG_SMB_FS is not set 987# CONFIG_SMB_FS is not set
988# CONFIG_CEPH_FS is not set
980# CONFIG_CIFS is not set 989# CONFIG_CIFS is not set
981# CONFIG_NCP_FS is not set 990# CONFIG_NCP_FS is not set
982# CONFIG_CODA_FS is not set 991# CONFIG_CODA_FS is not set
@@ -1051,6 +1060,7 @@ CONFIG_DEBUG_KERNEL=y
1051# CONFIG_TIMER_STATS is not set 1060# CONFIG_TIMER_STATS is not set
1052# CONFIG_DEBUG_OBJECTS is not set 1061# CONFIG_DEBUG_OBJECTS is not set
1053# CONFIG_DEBUG_SLAB is not set 1062# CONFIG_DEBUG_SLAB is not set
1063# CONFIG_DEBUG_KMEMLEAK is not set
1054# CONFIG_DEBUG_RT_MUTEXES is not set 1064# CONFIG_DEBUG_RT_MUTEXES is not set
1055# CONFIG_RT_MUTEX_TESTER is not set 1065# CONFIG_RT_MUTEX_TESTER is not set
1056# CONFIG_DEBUG_SPINLOCK is not set 1066# CONFIG_DEBUG_SPINLOCK is not set
@@ -1097,6 +1107,7 @@ CONFIG_FTRACE=y
1097CONFIG_BRANCH_PROFILE_NONE=y 1107CONFIG_BRANCH_PROFILE_NONE=y
1098# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1108# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1099# CONFIG_PROFILE_ALL_BRANCHES is not set 1109# CONFIG_PROFILE_ALL_BRANCHES is not set
1110# CONFIG_KSYM_TRACER is not set
1100# CONFIG_STACK_TRACER is not set 1111# CONFIG_STACK_TRACER is not set
1101# CONFIG_KMEMTRACE is not set 1112# CONFIG_KMEMTRACE is not set
1102# CONFIG_WORKQUEUE_TRACER is not set 1113# CONFIG_WORKQUEUE_TRACER is not set
@@ -1125,6 +1136,7 @@ CONFIG_DUMP_CODE=y
1125CONFIG_DEFAULT_SECURITY_DAC=y 1136CONFIG_DEFAULT_SECURITY_DAC=y
1126CONFIG_DEFAULT_SECURITY="" 1137CONFIG_DEFAULT_SECURITY=""
1127# CONFIG_CRYPTO is not set 1138# CONFIG_CRYPTO is not set
1139# CONFIG_VIRTUALIZATION is not set
1128# CONFIG_BINARY_PRINTF is not set 1140# CONFIG_BINARY_PRINTF is not set
1129 1141
1130# 1142#
diff --git a/arch/sh/configs/microdev_defconfig b/arch/sh/configs/microdev_defconfig
index 7d43fabdc073..41cefa490ec1 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 11:40:41 2010 4# Tue May 18 15:48:22 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SWAP=y 55CONFIG_SWAP=y
53# CONFIG_SYSVIPC is not set 56# CONFIG_SYSVIPC is not set
54# CONFIG_POSIX_MQUEUE is not set 57# CONFIG_POSIX_MQUEUE is not set
@@ -69,7 +72,6 @@ CONFIG_RCU_FANOUT=32
69# CONFIG_TREE_RCU_TRACE is not set 72# CONFIG_TREE_RCU_TRACE is not set
70# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
72# CONFIG_GROUP_SCHED is not set
73# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
74CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
75CONFIG_SYSFS_DEPRECATED_V2=y 77CONFIG_SYSFS_DEPRECATED_V2=y
@@ -80,6 +82,7 @@ CONFIG_INITRAMFS_SOURCE=""
80CONFIG_RD_GZIP=y 82CONFIG_RD_GZIP=y
81# CONFIG_RD_BZIP2 is not set 83# CONFIG_RD_BZIP2 is not set
82# CONFIG_RD_LZMA is not set 84# CONFIG_RD_LZMA is not set
85# CONFIG_RD_LZO is not set
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
84CONFIG_SYSCTL=y 87CONFIG_SYSCTL=y
85CONFIG_ANON_INODES=y 88CONFIG_ANON_INODES=y
@@ -106,7 +109,7 @@ CONFIG_PERF_USE_VMALLOC=y
106# 109#
107# Kernel Performance Events And Counters 110# Kernel Performance Events And Counters
108# 111#
109# CONFIG_PERF_EVENTS is not set 112CONFIG_PERF_EVENTS=y
110# CONFIG_PERF_COUNTERS is not set 113# CONFIG_PERF_COUNTERS is not set
111CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_COMPAT_BRK=y 115CONFIG_COMPAT_BRK=y
@@ -122,6 +125,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122CONFIG_HAVE_DMA_ATTRS=y 125CONFIG_HAVE_DMA_ATTRS=y
123CONFIG_HAVE_CLK=y 126CONFIG_HAVE_CLK=y
124CONFIG_HAVE_DMA_API_DEBUG=y 127CONFIG_HAVE_DMA_API_DEBUG=y
128CONFIG_HAVE_HW_BREAKPOINT=y
125 129
126# 130#
127# GCOV-based kernel profiling 131# GCOV-based kernel profiling
@@ -235,6 +239,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
235CONFIG_MAX_ACTIVE_REGIONS=1 239CONFIG_MAX_ACTIVE_REGIONS=1
236CONFIG_ARCH_POPULATES_NODE_MAP=y 240CONFIG_ARCH_POPULATES_NODE_MAP=y
237CONFIG_ARCH_SELECT_MEMORY_MODEL=y 241CONFIG_ARCH_SELECT_MEMORY_MODEL=y
242CONFIG_UNCACHED_MAPPING=y
238CONFIG_PAGE_SIZE_4KB=y 243CONFIG_PAGE_SIZE_4KB=y
239# CONFIG_PAGE_SIZE_8KB is not set 244# CONFIG_PAGE_SIZE_8KB is not set
240# CONFIG_PAGE_SIZE_16KB is not set 245# CONFIG_PAGE_SIZE_16KB is not set
@@ -256,7 +261,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
256CONFIG_SPLIT_PTLOCK_CPUS=4 261CONFIG_SPLIT_PTLOCK_CPUS=4
257# CONFIG_PHYS_ADDR_T_64BIT is not set 262# CONFIG_PHYS_ADDR_T_64BIT is not set
258CONFIG_ZONE_DMA_FLAG=0 263CONFIG_ZONE_DMA_FLAG=0
259CONFIG_NR_QUICK=2 264CONFIG_NR_QUICK=1
260# CONFIG_KSM is not set 265# CONFIG_KSM is not set
261CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
262 267
@@ -334,7 +339,6 @@ CONFIG_HZ=250
334CONFIG_PREEMPT=y 339CONFIG_PREEMPT=y
335CONFIG_GUSA=y 340CONFIG_GUSA=y
336# CONFIG_GUSA_RB is not set 341# CONFIG_GUSA_RB is not set
337# CONFIG_SPARSE_IRQ is not set
338 342
339# 343#
340# Boot options 344# Boot options
@@ -515,6 +519,7 @@ CONFIG_IDE_PROC_FS=y
515# 519#
516# SCSI device support 520# SCSI device support
517# 521#
522CONFIG_SCSI_MOD=y
518# CONFIG_RAID_ATTRS is not set 523# CONFIG_RAID_ATTRS is not set
519# CONFIG_SCSI is not set 524# CONFIG_SCSI is not set
520# CONFIG_SCSI_DMA is not set 525# CONFIG_SCSI_DMA is not set
@@ -596,6 +601,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
596CONFIG_SERIAL_SH_SCI_CONSOLE=y 601CONFIG_SERIAL_SH_SCI_CONSOLE=y
597CONFIG_SERIAL_CORE=y 602CONFIG_SERIAL_CORE=y
598CONFIG_SERIAL_CORE_CONSOLE=y 603CONFIG_SERIAL_CORE_CONSOLE=y
604# CONFIG_SERIAL_TIMBERDALE is not set
599CONFIG_UNIX98_PTYS=y 605CONFIG_UNIX98_PTYS=y
600# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 606# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
601CONFIG_LEGACY_PTYS=y 607CONFIG_LEGACY_PTYS=y
@@ -774,6 +780,7 @@ CONFIG_MISC_FILESYSTEMS=y
774# CONFIG_BEFS_FS is not set 780# CONFIG_BEFS_FS is not set
775# CONFIG_BFS_FS is not set 781# CONFIG_BFS_FS is not set
776# CONFIG_EFS_FS is not set 782# CONFIG_EFS_FS is not set
783# CONFIG_LOGFS is not set
777# CONFIG_CRAMFS is not set 784# CONFIG_CRAMFS is not set
778# CONFIG_SQUASHFS is not set 785# CONFIG_SQUASHFS is not set
779# CONFIG_VXFS_FS is not set 786# CONFIG_VXFS_FS is not set
@@ -800,6 +807,7 @@ CONFIG_SUNRPC_GSS=y
800CONFIG_RPCSEC_GSS_KRB5=y 807CONFIG_RPCSEC_GSS_KRB5=y
801# CONFIG_RPCSEC_GSS_SPKM3 is not set 808# CONFIG_RPCSEC_GSS_SPKM3 is not set
802# CONFIG_SMB_FS is not set 809# CONFIG_SMB_FS is not set
810# CONFIG_CEPH_FS is not set
803# CONFIG_CIFS is not set 811# CONFIG_CIFS is not set
804# CONFIG_NCP_FS is not set 812# CONFIG_NCP_FS is not set
805# CONFIG_CODA_FS is not set 813# CONFIG_CODA_FS is not set
@@ -992,6 +1000,7 @@ CONFIG_CRYPTO_DES=y
992# 1000#
993# CONFIG_CRYPTO_ANSI_CPRNG is not set 1001# CONFIG_CRYPTO_ANSI_CPRNG is not set
994CONFIG_CRYPTO_HW=y 1002CONFIG_CRYPTO_HW=y
1003# CONFIG_VIRTUALIZATION is not set
995# CONFIG_BINARY_PRINTF is not set 1004# CONFIG_BINARY_PRINTF is not set
996 1005
997# 1006#
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig
index d2b183117771..1c889b74cd57 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 11:41:41 2010 4# Tue May 18 18:01:29 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
33CONFIG_ARCH_HAS_DEFAULT_IDLE=y 33CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -47,9 +48,11 @@ CONFIG_LOCALVERSION_AUTO=y
47CONFIG_HAVE_KERNEL_GZIP=y 48CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y 49CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y 50CONFIG_HAVE_KERNEL_LZMA=y
51CONFIG_HAVE_KERNEL_LZO=y
50CONFIG_KERNEL_GZIP=y 52CONFIG_KERNEL_GZIP=y
51# CONFIG_KERNEL_BZIP2 is not set 53# CONFIG_KERNEL_BZIP2 is not set
52# CONFIG_KERNEL_LZMA is not set 54# CONFIG_KERNEL_LZMA is not set
55# CONFIG_KERNEL_LZO is not set
53CONFIG_SWAP=y 56CONFIG_SWAP=y
54CONFIG_SYSVIPC=y 57CONFIG_SYSVIPC=y
55CONFIG_SYSVIPC_SYSCTL=y 58CONFIG_SYSVIPC_SYSCTL=y
@@ -71,7 +74,6 @@ CONFIG_RCU_FANOUT=32
71CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
72CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
73CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_GROUP_SCHED is not set
75# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
76CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
77CONFIG_SYSFS_DEPRECATED_V2=y 79CONFIG_SYSFS_DEPRECATED_V2=y
@@ -82,6 +84,7 @@ CONFIG_INITRAMFS_SOURCE=""
82CONFIG_RD_GZIP=y 84CONFIG_RD_GZIP=y
83# CONFIG_RD_BZIP2 is not set 85# CONFIG_RD_BZIP2 is not set
84# CONFIG_RD_LZMA is not set 86# CONFIG_RD_LZMA is not set
87# CONFIG_RD_LZO is not set
85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 88# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
86CONFIG_SYSCTL=y 89CONFIG_SYSCTL=y
87CONFIG_ANON_INODES=y 90CONFIG_ANON_INODES=y
@@ -109,7 +112,6 @@ CONFIG_PERF_USE_VMALLOC=y
109# Kernel Performance Events And Counters 112# Kernel Performance Events And Counters
110# 113#
111CONFIG_PERF_EVENTS=y 114CONFIG_PERF_EVENTS=y
112CONFIG_EVENT_PROFILE=y
113# CONFIG_PERF_COUNTERS is not set 115# CONFIG_PERF_COUNTERS is not set
114CONFIG_VM_EVENT_COUNTERS=y 116CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_COMPAT_BRK=y 117CONFIG_COMPAT_BRK=y
@@ -117,17 +119,16 @@ CONFIG_SLAB=y
117# CONFIG_SLUB is not set 119# CONFIG_SLUB is not set
118# CONFIG_SLOB is not set 120# CONFIG_SLOB is not set
119CONFIG_PROFILING=y 121CONFIG_PROFILING=y
120CONFIG_TRACEPOINTS=y
121CONFIG_OPROFILE=y 122CONFIG_OPROFILE=y
122CONFIG_HAVE_OPROFILE=y 123CONFIG_HAVE_OPROFILE=y
123# CONFIG_KPROBES is not set 124# CONFIG_KPROBES is not set
124CONFIG_HAVE_IOREMAP_PROT=y
125CONFIG_HAVE_KPROBES=y 125CONFIG_HAVE_KPROBES=y
126CONFIG_HAVE_KRETPROBES=y 126CONFIG_HAVE_KRETPROBES=y
127CONFIG_HAVE_ARCH_TRACEHOOK=y 127CONFIG_HAVE_ARCH_TRACEHOOK=y
128CONFIG_HAVE_DMA_ATTRS=y 128CONFIG_HAVE_DMA_ATTRS=y
129CONFIG_HAVE_CLK=y 129CONFIG_HAVE_CLK=y
130CONFIG_HAVE_DMA_API_DEBUG=y 130CONFIG_HAVE_DMA_API_DEBUG=y
131CONFIG_HAVE_HW_BREAKPOINT=y
131 132
132# 133#
133# GCOV-based kernel profiling 134# GCOV-based kernel profiling
@@ -243,7 +244,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
243CONFIG_MEMORY_START=0x0c000000 244CONFIG_MEMORY_START=0x0c000000
244CONFIG_MEMORY_SIZE=0x04000000 245CONFIG_MEMORY_SIZE=0x04000000
245CONFIG_29BIT=y 246CONFIG_29BIT=y
246# CONFIG_X2TLB is not set 247CONFIG_X2TLB=y
247CONFIG_VSYSCALL=y 248CONFIG_VSYSCALL=y
248CONFIG_NUMA=y 249CONFIG_NUMA=y
249CONFIG_NODES_SHIFT=1 250CONFIG_NODES_SHIFT=1
@@ -254,6 +255,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
254CONFIG_ARCH_SELECT_MEMORY_MODEL=y 255CONFIG_ARCH_SELECT_MEMORY_MODEL=y
255CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 256CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
256CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 257CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
258CONFIG_IOREMAP_FIXED=y
259CONFIG_UNCACHED_MAPPING=y
257CONFIG_PAGE_SIZE_4KB=y 260CONFIG_PAGE_SIZE_4KB=y
258# CONFIG_PAGE_SIZE_8KB is not set 261# CONFIG_PAGE_SIZE_8KB is not set
259# CONFIG_PAGE_SIZE_16KB is not set 262# CONFIG_PAGE_SIZE_16KB is not set
@@ -271,7 +274,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
271# CONFIG_MIGRATION is not set 274# CONFIG_MIGRATION is not set
272# CONFIG_PHYS_ADDR_T_64BIT is not set 275# CONFIG_PHYS_ADDR_T_64BIT is not set
273CONFIG_ZONE_DMA_FLAG=0 276CONFIG_ZONE_DMA_FLAG=0
274CONFIG_NR_QUICK=2 277CONFIG_NR_QUICK=1
275# CONFIG_KSM is not set 278# CONFIG_KSM is not set
276CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 279CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
277 280
@@ -348,7 +351,7 @@ CONFIG_PREEMPT_NONE=y
348# CONFIG_PREEMPT_VOLUNTARY is not set 351# CONFIG_PREEMPT_VOLUNTARY is not set
349# CONFIG_PREEMPT is not set 352# CONFIG_PREEMPT is not set
350CONFIG_GUSA=y 353CONFIG_GUSA=y
351# CONFIG_SPARSE_IRQ is not set 354# CONFIG_INTC_USERIMASK is not set
352 355
353# 356#
354# Boot options 357# Boot options
@@ -384,6 +387,7 @@ CONFIG_SUSPEND=y
384CONFIG_SUSPEND_FREEZER=y 387CONFIG_SUSPEND_FREEZER=y
385# CONFIG_HIBERNATION is not set 388# CONFIG_HIBERNATION is not set
386CONFIG_PM_RUNTIME=y 389CONFIG_PM_RUNTIME=y
390CONFIG_PM_OPS=y
387# CONFIG_CPU_IDLE is not set 391# CONFIG_CPU_IDLE is not set
388CONFIG_NET=y 392CONFIG_NET=y
389 393
@@ -391,7 +395,6 @@ CONFIG_NET=y
391# Networking options 395# Networking options
392# 396#
393CONFIG_PACKET=y 397CONFIG_PACKET=y
394# CONFIG_PACKET_MMAP is not set
395CONFIG_UNIX=y 398CONFIG_UNIX=y
396CONFIG_XFRM=y 399CONFIG_XFRM=y
397# CONFIG_XFRM_USER is not set 400# CONFIG_XFRM_USER is not set
@@ -454,7 +457,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
454# Network testing 457# Network testing
455# 458#
456# CONFIG_NET_PKTGEN is not set 459# CONFIG_NET_PKTGEN is not set
457# CONFIG_NET_DROP_MONITOR is not set
458# CONFIG_HAMRADIO is not set 460# CONFIG_HAMRADIO is not set
459# CONFIG_CAN is not set 461# CONFIG_CAN is not set
460# CONFIG_IRDA is not set 462# CONFIG_IRDA is not set
@@ -564,6 +566,7 @@ CONFIG_MTD_NAND_IDS=y
564# CONFIG_MTD_NAND_DISKONCHIP is not set 566# CONFIG_MTD_NAND_DISKONCHIP is not set
565# CONFIG_MTD_NAND_NANDSIM is not set 567# CONFIG_MTD_NAND_NANDSIM is not set
566CONFIG_MTD_NAND_PLATFORM=y 568CONFIG_MTD_NAND_PLATFORM=y
569# CONFIG_MTD_NAND_SH_FLCTL is not set
567# CONFIG_MTD_ONENAND is not set 570# CONFIG_MTD_ONENAND is not set
568 571
569# 572#
@@ -596,6 +599,7 @@ CONFIG_MISC_DEVICES=y
596# CONFIG_ICS932S401 is not set 599# CONFIG_ICS932S401 is not set
597# CONFIG_ENCLOSURE_SERVICES is not set 600# CONFIG_ENCLOSURE_SERVICES is not set
598# CONFIG_ISL29003 is not set 601# CONFIG_ISL29003 is not set
602# CONFIG_SENSORS_TSL2550 is not set
599# CONFIG_DS1682 is not set 603# CONFIG_DS1682 is not set
600# CONFIG_C2PORT is not set 604# CONFIG_C2PORT is not set
601 605
@@ -612,6 +616,7 @@ CONFIG_HAVE_IDE=y
612# 616#
613# SCSI device support 617# SCSI device support
614# 618#
619CONFIG_SCSI_MOD=y
615# CONFIG_RAID_ATTRS is not set 620# CONFIG_RAID_ATTRS is not set
616CONFIG_SCSI=y 621CONFIG_SCSI=y
617CONFIG_SCSI_DMA=y 622CONFIG_SCSI_DMA=y
@@ -764,6 +769,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=3
764CONFIG_SERIAL_SH_SCI_CONSOLE=y 769CONFIG_SERIAL_SH_SCI_CONSOLE=y
765CONFIG_SERIAL_CORE=y 770CONFIG_SERIAL_CORE=y
766CONFIG_SERIAL_CORE_CONSOLE=y 771CONFIG_SERIAL_CORE_CONSOLE=y
772# CONFIG_SERIAL_TIMBERDALE is not set
767CONFIG_UNIX98_PTYS=y 773CONFIG_UNIX98_PTYS=y
768# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 774# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
769CONFIG_LEGACY_PTYS=y 775CONFIG_LEGACY_PTYS=y
@@ -792,6 +798,7 @@ CONFIG_I2C_HELPER_AUTO=y
792# CONFIG_I2C_OCORES is not set 798# CONFIG_I2C_OCORES is not set
793CONFIG_I2C_SH_MOBILE=y 799CONFIG_I2C_SH_MOBILE=y
794# CONFIG_I2C_SIMTEC is not set 800# CONFIG_I2C_SIMTEC is not set
801# CONFIG_I2C_XILINX is not set
795 802
796# 803#
797# External I2C/SMBus adapter drivers 804# External I2C/SMBus adapter drivers
@@ -804,15 +811,9 @@ CONFIG_I2C_SH_MOBILE=y
804# 811#
805# CONFIG_I2C_PCA_PLATFORM is not set 812# CONFIG_I2C_PCA_PLATFORM is not set
806# CONFIG_I2C_STUB is not set 813# CONFIG_I2C_STUB is not set
807
808#
809# Miscellaneous I2C Chip support
810#
811# CONFIG_SENSORS_TSL2550 is not set
812# CONFIG_I2C_DEBUG_CORE is not set 814# CONFIG_I2C_DEBUG_CORE is not set
813# CONFIG_I2C_DEBUG_ALGO is not set 815# CONFIG_I2C_DEBUG_ALGO is not set
814# CONFIG_I2C_DEBUG_BUS is not set 816# CONFIG_I2C_DEBUG_BUS is not set
815# CONFIG_I2C_DEBUG_CHIP is not set
816# CONFIG_SPI is not set 817# CONFIG_SPI is not set
817 818
818# 819#
@@ -826,13 +827,16 @@ CONFIG_GPIOLIB=y
826# 827#
827# Memory mapped GPIO expanders: 828# Memory mapped GPIO expanders:
828# 829#
830# CONFIG_GPIO_IT8761E is not set
829 831
830# 832#
831# I2C GPIO expanders: 833# I2C GPIO expanders:
832# 834#
835# CONFIG_GPIO_MAX7300 is not set
833# CONFIG_GPIO_MAX732X is not set 836# CONFIG_GPIO_MAX732X is not set
834# CONFIG_GPIO_PCA953X is not set 837# CONFIG_GPIO_PCA953X is not set
835# CONFIG_GPIO_PCF857X is not set 838# CONFIG_GPIO_PCF857X is not set
839# CONFIG_GPIO_ADP5588 is not set
836 840
837# 841#
838# PCI GPIO expanders: 842# PCI GPIO expanders:
@@ -861,20 +865,23 @@ CONFIG_SSB_POSSIBLE=y
861# Multifunction device drivers 865# Multifunction device drivers
862# 866#
863# CONFIG_MFD_CORE is not set 867# CONFIG_MFD_CORE is not set
868# CONFIG_MFD_88PM860X is not set
864# CONFIG_MFD_SM501 is not set 869# CONFIG_MFD_SM501 is not set
865# CONFIG_MFD_SH_MOBILE_SDHI is not set 870# CONFIG_MFD_SH_MOBILE_SDHI is not set
866# CONFIG_HTC_PASIC3 is not set 871# CONFIG_HTC_PASIC3 is not set
872# CONFIG_HTC_I2CPLD is not set
867# CONFIG_TPS65010 is not set 873# CONFIG_TPS65010 is not set
868# CONFIG_TWL4030_CORE is not set 874# CONFIG_TWL4030_CORE is not set
869# CONFIG_MFD_TMIO is not set 875# CONFIG_MFD_TMIO is not set
870# CONFIG_PMIC_DA903X is not set 876# CONFIG_PMIC_DA903X is not set
871# CONFIG_PMIC_ADP5520 is not set 877# CONFIG_PMIC_ADP5520 is not set
878# CONFIG_MFD_MAX8925 is not set
872# CONFIG_MFD_WM8400 is not set 879# CONFIG_MFD_WM8400 is not set
873# CONFIG_MFD_WM831X is not set 880# CONFIG_MFD_WM831X is not set
874# CONFIG_MFD_WM8350_I2C is not set 881# CONFIG_MFD_WM8350_I2C is not set
882# CONFIG_MFD_WM8994 is not set
875# CONFIG_MFD_PCF50633 is not set 883# CONFIG_MFD_PCF50633 is not set
876# CONFIG_AB3100_CORE is not set 884# CONFIG_AB3100_CORE is not set
877# CONFIG_MFD_88PM8607 is not set
878# CONFIG_REGULATOR is not set 885# CONFIG_REGULATOR is not set
879CONFIG_MEDIA_SUPPORT=y 886CONFIG_MEDIA_SUPPORT=y
880 887
@@ -1054,6 +1061,7 @@ CONFIG_USB_G_SERIAL=m
1054# CONFIG_USB_MIDI_GADGET is not set 1061# CONFIG_USB_MIDI_GADGET is not set
1055# CONFIG_USB_G_PRINTER is not set 1062# CONFIG_USB_G_PRINTER is not set
1056# CONFIG_USB_CDC_COMPOSITE is not set 1063# CONFIG_USB_CDC_COMPOSITE is not set
1064# CONFIG_USB_G_NOKIA is not set
1057# CONFIG_USB_G_MULTI is not set 1065# CONFIG_USB_G_MULTI is not set
1058 1066
1059# 1067#
@@ -1129,8 +1137,6 @@ CONFIG_RTC_DRV_SH=y
1129CONFIG_UIO=y 1137CONFIG_UIO=y
1130# CONFIG_UIO_PDRV is not set 1138# CONFIG_UIO_PDRV is not set
1131CONFIG_UIO_PDRV_GENIRQ=y 1139CONFIG_UIO_PDRV_GENIRQ=y
1132# CONFIG_UIO_SMX is not set
1133# CONFIG_UIO_SERCOS3 is not set
1134 1140
1135# 1141#
1136# TI VLYNQ 1142# TI VLYNQ
@@ -1143,7 +1149,6 @@ CONFIG_UIO_PDRV_GENIRQ=y
1143# CONFIG_EXT2_FS is not set 1149# CONFIG_EXT2_FS is not set
1144# CONFIG_EXT3_FS is not set 1150# CONFIG_EXT3_FS is not set
1145# CONFIG_EXT4_FS is not set 1151# CONFIG_EXT4_FS is not set
1146CONFIG_EXT4_USE_FOR_EXT23=y
1147# CONFIG_REISERFS_FS is not set 1152# CONFIG_REISERFS_FS is not set
1148# CONFIG_JFS_FS is not set 1153# CONFIG_JFS_FS is not set
1149# CONFIG_FS_POSIX_ACL is not set 1154# CONFIG_FS_POSIX_ACL is not set
@@ -1202,6 +1207,7 @@ CONFIG_MISC_FILESYSTEMS=y
1202# CONFIG_BFS_FS is not set 1207# CONFIG_BFS_FS is not set
1203# CONFIG_EFS_FS is not set 1208# CONFIG_EFS_FS is not set
1204# CONFIG_JFFS2_FS is not set 1209# CONFIG_JFFS2_FS is not set
1210# CONFIG_LOGFS is not set
1205# CONFIG_CRAMFS is not set 1211# CONFIG_CRAMFS is not set
1206# CONFIG_SQUASHFS is not set 1212# CONFIG_SQUASHFS is not set
1207# CONFIG_VXFS_FS is not set 1213# CONFIG_VXFS_FS is not set
@@ -1224,6 +1230,7 @@ CONFIG_SUNRPC=y
1224# CONFIG_RPCSEC_GSS_KRB5 is not set 1230# CONFIG_RPCSEC_GSS_KRB5 is not set
1225# CONFIG_RPCSEC_GSS_SPKM3 is not set 1231# CONFIG_RPCSEC_GSS_SPKM3 is not set
1226# CONFIG_SMB_FS is not set 1232# CONFIG_SMB_FS is not set
1233# CONFIG_CEPH_FS is not set
1227# CONFIG_CIFS is not set 1234# CONFIG_CIFS is not set
1228# CONFIG_NCP_FS is not set 1235# CONFIG_NCP_FS is not set
1229# CONFIG_CODA_FS is not set 1236# CONFIG_CODA_FS is not set
@@ -1251,13 +1258,12 @@ CONFIG_FRAME_WARN=1024
1251CONFIG_DEBUG_FS=y 1258CONFIG_DEBUG_FS=y
1252# CONFIG_HEADERS_CHECK is not set 1259# CONFIG_HEADERS_CHECK is not set
1253# CONFIG_DEBUG_KERNEL is not set 1260# CONFIG_DEBUG_KERNEL is not set
1254CONFIG_STACKTRACE=y
1255CONFIG_DEBUG_BUGVERBOSE=y 1261CONFIG_DEBUG_BUGVERBOSE=y
1256# CONFIG_DEBUG_MEMORY_INIT is not set 1262# CONFIG_DEBUG_MEMORY_INIT is not set
1257# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1263# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1264# CONFIG_LKDTM is not set
1258# CONFIG_LATENCYTOP is not set 1265# CONFIG_LATENCYTOP is not set
1259# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1266# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1260CONFIG_NOP_TRACER=y
1261CONFIG_HAVE_FUNCTION_TRACER=y 1267CONFIG_HAVE_FUNCTION_TRACER=y
1262CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1268CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1263CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1269CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1265,10 +1271,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1265CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1271CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1266CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1272CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1267CONFIG_RING_BUFFER=y 1273CONFIG_RING_BUFFER=y
1268CONFIG_EVENT_TRACING=y
1269CONFIG_CONTEXT_SWITCH_TRACER=y
1270CONFIG_RING_BUFFER_ALLOW_SWAP=y 1274CONFIG_RING_BUFFER_ALLOW_SWAP=y
1271CONFIG_TRACING=y
1272CONFIG_TRACING_SUPPORT=y 1275CONFIG_TRACING_SUPPORT=y
1273# CONFIG_FTRACE is not set 1276# CONFIG_FTRACE is not set
1274# CONFIG_DYNAMIC_DEBUG is not set 1277# CONFIG_DYNAMIC_DEBUG is not set
@@ -1383,7 +1386,8 @@ CONFIG_CRYPTO_WORKQUEUE=y
1383# 1386#
1384# CONFIG_CRYPTO_ANSI_CPRNG is not set 1387# CONFIG_CRYPTO_ANSI_CPRNG is not set
1385# CONFIG_CRYPTO_HW is not set 1388# CONFIG_CRYPTO_HW is not set
1386CONFIG_BINARY_PRINTF=y 1389# CONFIG_VIRTUALIZATION is not set
1390# CONFIG_BINARY_PRINTF is not set
1387 1391
1388# 1392#
1389# Library routines 1393# Library routines
diff --git a/arch/sh/configs/polaris_defconfig b/arch/sh/configs/polaris_defconfig
index d50c0314281e..826b1198959f 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 11:45:25 2010 4# Tue May 18 15:53:51 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -30,6 +30,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DMA_NONCOHERENT=y 32CONFIG_DMA_NONCOHERENT=y
33CONFIG_NEED_DMA_MAP_STATE=y
33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y 35CONFIG_CONSTRUCTORS=y
35 36
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION=""
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51# CONFIG_SWAP is not set 54# CONFIG_SWAP is not set
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
@@ -71,11 +74,6 @@ CONFIG_RCU_FANOUT=32
71# CONFIG_TREE_RCU_TRACE is not set 74# CONFIG_TREE_RCU_TRACE is not set
72# CONFIG_IKCONFIG is not set 75# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
74CONFIG_GROUP_SCHED=y
75CONFIG_FAIR_GROUP_SCHED=y
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
79# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 79CONFIG_SYSFS_DEPRECATED_V2=y
@@ -109,8 +107,9 @@ CONFIG_PERF_USE_VMALLOC=y
109# 107#
110# Kernel Performance Events And Counters 108# Kernel Performance Events And Counters
111# 109#
112# CONFIG_PERF_EVENTS is not set 110CONFIG_PERF_EVENTS=y
113# CONFIG_PERF_COUNTERS is not set 111# CONFIG_PERF_COUNTERS is not set
112# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
114CONFIG_VM_EVENT_COUNTERS=y 113CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_COMPAT_BRK=y 114CONFIG_COMPAT_BRK=y
116CONFIG_SLAB=y 115CONFIG_SLAB=y
@@ -126,6 +125,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
126CONFIG_HAVE_DMA_ATTRS=y 125CONFIG_HAVE_DMA_ATTRS=y
127CONFIG_HAVE_CLK=y 126CONFIG_HAVE_CLK=y
128CONFIG_HAVE_DMA_API_DEBUG=y 127CONFIG_HAVE_DMA_API_DEBUG=y
128CONFIG_HAVE_HW_BREAKPOINT=y
129 129
130# 130#
131# GCOV-based kernel profiling 131# GCOV-based kernel profiling
@@ -244,6 +244,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
244CONFIG_MAX_ACTIVE_REGIONS=1 244CONFIG_MAX_ACTIVE_REGIONS=1
245CONFIG_ARCH_POPULATES_NODE_MAP=y 245CONFIG_ARCH_POPULATES_NODE_MAP=y
246CONFIG_ARCH_SELECT_MEMORY_MODEL=y 246CONFIG_ARCH_SELECT_MEMORY_MODEL=y
247CONFIG_UNCACHED_MAPPING=y
247CONFIG_PAGE_SIZE_4KB=y 248CONFIG_PAGE_SIZE_4KB=y
248# CONFIG_PAGE_SIZE_8KB is not set 249# CONFIG_PAGE_SIZE_8KB is not set
249# CONFIG_PAGE_SIZE_16KB is not set 250# CONFIG_PAGE_SIZE_16KB is not set
@@ -259,7 +260,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
259CONFIG_SPLIT_PTLOCK_CPUS=999999 260CONFIG_SPLIT_PTLOCK_CPUS=999999
260# CONFIG_PHYS_ADDR_T_64BIT is not set 261# CONFIG_PHYS_ADDR_T_64BIT is not set
261CONFIG_ZONE_DMA_FLAG=0 262CONFIG_ZONE_DMA_FLAG=0
262CONFIG_NR_QUICK=2 263CONFIG_NR_QUICK=1
263# CONFIG_KSM is not set 264# CONFIG_KSM is not set
264CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 265CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
265 266
@@ -340,7 +341,6 @@ CONFIG_SCHED_HRTICK=y
340CONFIG_PREEMPT=y 341CONFIG_PREEMPT=y
341CONFIG_GUSA=y 342CONFIG_GUSA=y
342# CONFIG_GUSA_RB is not set 343# CONFIG_GUSA_RB is not set
343# CONFIG_SPARSE_IRQ is not set
344 344
345# 345#
346# Boot options 346# Boot options
@@ -377,7 +377,6 @@ CONFIG_NET=y
377# Networking options 377# Networking options
378# 378#
379CONFIG_PACKET=y 379CONFIG_PACKET=y
380CONFIG_PACKET_MMAP=y
381CONFIG_UNIX=y 380CONFIG_UNIX=y
382# CONFIG_NET_KEY is not set 381# CONFIG_NET_KEY is not set
383CONFIG_INET=y 382CONFIG_INET=y
@@ -583,6 +582,7 @@ CONFIG_HAVE_IDE=y
583# 582#
584# SCSI device support 583# SCSI device support
585# 584#
585CONFIG_SCSI_MOD=y
586# CONFIG_RAID_ATTRS is not set 586# CONFIG_RAID_ATTRS is not set
587# CONFIG_SCSI is not set 587# CONFIG_SCSI is not set
588# CONFIG_SCSI_DMA is not set 588# CONFIG_SCSI_DMA is not set
@@ -712,6 +712,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=3
712CONFIG_SERIAL_SH_SCI_CONSOLE=y 712CONFIG_SERIAL_SH_SCI_CONSOLE=y
713CONFIG_SERIAL_CORE=y 713CONFIG_SERIAL_CORE=y
714CONFIG_SERIAL_CORE_CONSOLE=y 714CONFIG_SERIAL_CORE_CONSOLE=y
715# CONFIG_SERIAL_TIMBERDALE is not set
715CONFIG_UNIX98_PTYS=y 716CONFIG_UNIX98_PTYS=y
716# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 717# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
717# CONFIG_LEGACY_PTYS is not set 718# CONFIG_LEGACY_PTYS is not set
@@ -829,7 +830,6 @@ CONFIG_RTC_DRV_SH=y
829# CONFIG_EXT2_FS is not set 830# CONFIG_EXT2_FS is not set
830# CONFIG_EXT3_FS is not set 831# CONFIG_EXT3_FS is not set
831# CONFIG_EXT4_FS is not set 832# CONFIG_EXT4_FS is not set
832CONFIG_EXT4_USE_FOR_EXT23=y
833# CONFIG_REISERFS_FS is not set 833# CONFIG_REISERFS_FS is not set
834# CONFIG_JFS_FS is not set 834# CONFIG_JFS_FS is not set
835# CONFIG_FS_POSIX_ACL is not set 835# CONFIG_FS_POSIX_ACL is not set
@@ -896,6 +896,7 @@ CONFIG_JFFS2_ZLIB=y
896# CONFIG_JFFS2_LZO is not set 896# CONFIG_JFFS2_LZO is not set
897CONFIG_JFFS2_RTIME=y 897CONFIG_JFFS2_RTIME=y
898# CONFIG_JFFS2_RUBIN is not set 898# CONFIG_JFFS2_RUBIN is not set
899# CONFIG_LOGFS is not set
899# CONFIG_CRAMFS is not set 900# CONFIG_CRAMFS is not set
900# CONFIG_SQUASHFS is not set 901# CONFIG_SQUASHFS is not set
901# CONFIG_VXFS_FS is not set 902# CONFIG_VXFS_FS is not set
@@ -919,6 +920,7 @@ CONFIG_SUNRPC=y
919# CONFIG_RPCSEC_GSS_KRB5 is not set 920# CONFIG_RPCSEC_GSS_KRB5 is not set
920# CONFIG_RPCSEC_GSS_SPKM3 is not set 921# CONFIG_RPCSEC_GSS_SPKM3 is not set
921# CONFIG_SMB_FS is not set 922# CONFIG_SMB_FS is not set
923# CONFIG_CEPH_FS is not set
922# CONFIG_CIFS is not set 924# CONFIG_CIFS is not set
923# CONFIG_NCP_FS is not set 925# CONFIG_NCP_FS is not set
924# CONFIG_CODA_FS is not set 926# CONFIG_CODA_FS is not set
@@ -958,6 +960,7 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
958# CONFIG_TIMER_STATS is not set 960# CONFIG_TIMER_STATS is not set
959# CONFIG_DEBUG_OBJECTS is not set 961# CONFIG_DEBUG_OBJECTS is not set
960# CONFIG_DEBUG_SLAB is not set 962# CONFIG_DEBUG_SLAB is not set
963# CONFIG_DEBUG_KMEMLEAK is not set
961CONFIG_DEBUG_PREEMPT=y 964CONFIG_DEBUG_PREEMPT=y
962CONFIG_DEBUG_RT_MUTEXES=y 965CONFIG_DEBUG_RT_MUTEXES=y
963CONFIG_DEBUG_PI_LIST=y 966CONFIG_DEBUG_PI_LIST=y
@@ -1010,6 +1013,7 @@ CONFIG_FTRACE=y
1010CONFIG_BRANCH_PROFILE_NONE=y 1013CONFIG_BRANCH_PROFILE_NONE=y
1011# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1014# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1012# CONFIG_PROFILE_ALL_BRANCHES is not set 1015# CONFIG_PROFILE_ALL_BRANCHES is not set
1016# CONFIG_KSYM_TRACER is not set
1013# CONFIG_STACK_TRACER is not set 1017# CONFIG_STACK_TRACER is not set
1014# CONFIG_KMEMTRACE is not set 1018# CONFIG_KMEMTRACE is not set
1015# CONFIG_WORKQUEUE_TRACER is not set 1019# CONFIG_WORKQUEUE_TRACER is not set
@@ -1038,6 +1042,7 @@ CONFIG_DUMP_CODE=y
1038CONFIG_DEFAULT_SECURITY_DAC=y 1042CONFIG_DEFAULT_SECURITY_DAC=y
1039CONFIG_DEFAULT_SECURITY="" 1043CONFIG_DEFAULT_SECURITY=""
1040# CONFIG_CRYPTO is not set 1044# CONFIG_CRYPTO is not set
1045# CONFIG_VIRTUALIZATION is not set
1041# CONFIG_BINARY_PRINTF is not set 1046# CONFIG_BINARY_PRINTF is not set
1042 1047
1043# 1048#
diff --git a/arch/sh/configs/r7780mp_defconfig b/arch/sh/configs/r7780mp_defconfig
index efda63d4070a..4b751bd37e20 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 13:16:13 2010 4# Tue May 18 15:58:09 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_IO_TRAPPED=y 34CONFIG_IO_TRAPPED=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -48,9 +49,11 @@ CONFIG_LOCALVERSION_AUTO=y
48CONFIG_HAVE_KERNEL_GZIP=y 49CONFIG_HAVE_KERNEL_GZIP=y
49CONFIG_HAVE_KERNEL_BZIP2=y 50CONFIG_HAVE_KERNEL_BZIP2=y
50CONFIG_HAVE_KERNEL_LZMA=y 51CONFIG_HAVE_KERNEL_LZMA=y
52CONFIG_HAVE_KERNEL_LZO=y
51CONFIG_KERNEL_GZIP=y 53CONFIG_KERNEL_GZIP=y
52# CONFIG_KERNEL_BZIP2 is not set 54# CONFIG_KERNEL_BZIP2 is not set
53# CONFIG_KERNEL_LZMA is not set 55# CONFIG_KERNEL_LZMA is not set
56# CONFIG_KERNEL_LZO is not set
54CONFIG_SWAP=y 57CONFIG_SWAP=y
55CONFIG_SYSVIPC=y 58CONFIG_SYSVIPC=y
56CONFIG_SYSVIPC_SYSCTL=y 59CONFIG_SYSVIPC_SYSCTL=y
@@ -73,11 +76,6 @@ CONFIG_RCU_FANOUT=32
73CONFIG_IKCONFIG=y 76CONFIG_IKCONFIG=y
74CONFIG_IKCONFIG_PROC=y 77CONFIG_IKCONFIG_PROC=y
75CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
76CONFIG_GROUP_SCHED=y
77CONFIG_FAIR_GROUP_SCHED=y
78# CONFIG_RT_GROUP_SCHED is not set
79CONFIG_USER_SCHED=y
80# CONFIG_CGROUP_SCHED is not set
81# CONFIG_CGROUPS is not set 79# CONFIG_CGROUPS is not set
82CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
83CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
@@ -112,7 +110,6 @@ CONFIG_PERF_USE_VMALLOC=y
112# Kernel Performance Events And Counters 110# Kernel Performance Events And Counters
113# 111#
114CONFIG_PERF_EVENTS=y 112CONFIG_PERF_EVENTS=y
115CONFIG_EVENT_PROFILE=y
116# CONFIG_PERF_COUNTERS is not set 113# CONFIG_PERF_COUNTERS is not set
117# CONFIG_DEBUG_PERF_USE_VMALLOC is not set 114# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
118CONFIG_VM_EVENT_COUNTERS=y 115CONFIG_VM_EVENT_COUNTERS=y
@@ -122,7 +119,6 @@ CONFIG_SLAB=y
122# CONFIG_SLUB is not set 119# CONFIG_SLUB is not set
123# CONFIG_SLOB is not set 120# CONFIG_SLOB is not set
124CONFIG_PROFILING=y 121CONFIG_PROFILING=y
125CONFIG_TRACEPOINTS=y
126CONFIG_OPROFILE=m 122CONFIG_OPROFILE=m
127CONFIG_HAVE_OPROFILE=y 123CONFIG_HAVE_OPROFILE=y
128# CONFIG_KPROBES is not set 124# CONFIG_KPROBES is not set
@@ -133,6 +129,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
133CONFIG_HAVE_DMA_ATTRS=y 129CONFIG_HAVE_DMA_ATTRS=y
134CONFIG_HAVE_CLK=y 130CONFIG_HAVE_CLK=y
135CONFIG_HAVE_DMA_API_DEBUG=y 131CONFIG_HAVE_DMA_API_DEBUG=y
132CONFIG_HAVE_HW_BREAKPOINT=y
136 133
137# 134#
138# GCOV-based kernel profiling 135# GCOV-based kernel profiling
@@ -245,11 +242,8 @@ CONFIG_PAGE_OFFSET=0x80000000
245CONFIG_FORCE_MAX_ZONEORDER=11 242CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_MEMORY_START=0x08000000 243CONFIG_MEMORY_START=0x08000000
247CONFIG_MEMORY_SIZE=0x08000000 244CONFIG_MEMORY_SIZE=0x08000000
248# CONFIG_29BIT is not set 245CONFIG_29BIT=y
249CONFIG_32BIT=y
250CONFIG_PMB_ENABLE=y
251# CONFIG_PMB is not set 246# CONFIG_PMB is not set
252CONFIG_PMB_FIXED=y
253CONFIG_VSYSCALL=y 247CONFIG_VSYSCALL=y
254CONFIG_ARCH_FLATMEM_ENABLE=y 248CONFIG_ARCH_FLATMEM_ENABLE=y
255CONFIG_ARCH_SPARSEMEM_ENABLE=y 249CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -257,6 +251,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
257CONFIG_MAX_ACTIVE_REGIONS=1 251CONFIG_MAX_ACTIVE_REGIONS=1
258CONFIG_ARCH_POPULATES_NODE_MAP=y 252CONFIG_ARCH_POPULATES_NODE_MAP=y
259CONFIG_ARCH_SELECT_MEMORY_MODEL=y 253CONFIG_ARCH_SELECT_MEMORY_MODEL=y
254CONFIG_UNCACHED_MAPPING=y
260CONFIG_PAGE_SIZE_4KB=y 255CONFIG_PAGE_SIZE_4KB=y
261# CONFIG_PAGE_SIZE_8KB is not set 256# CONFIG_PAGE_SIZE_8KB is not set
262# CONFIG_PAGE_SIZE_16KB is not set 257# CONFIG_PAGE_SIZE_16KB is not set
@@ -278,7 +273,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
278CONFIG_SPLIT_PTLOCK_CPUS=4 273CONFIG_SPLIT_PTLOCK_CPUS=4
279# CONFIG_PHYS_ADDR_T_64BIT is not set 274# CONFIG_PHYS_ADDR_T_64BIT is not set
280CONFIG_ZONE_DMA_FLAG=0 275CONFIG_ZONE_DMA_FLAG=0
281CONFIG_NR_QUICK=2 276CONFIG_NR_QUICK=1
282# CONFIG_KSM is not set 277# CONFIG_KSM is not set
283CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 278CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
284 279
@@ -358,7 +353,7 @@ CONFIG_KEXEC=y
358# CONFIG_PREEMPT_VOLUNTARY is not set 353# CONFIG_PREEMPT_VOLUNTARY is not set
359CONFIG_PREEMPT=y 354CONFIG_PREEMPT=y
360CONFIG_GUSA=y 355CONFIG_GUSA=y
361# CONFIG_SPARSE_IRQ is not set 356# CONFIG_INTC_USERIMASK is not set
362 357
363# 358#
364# Boot options 359# Boot options
@@ -374,9 +369,9 @@ CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
374# Bus options 369# Bus options
375# 370#
376CONFIG_PCI=y 371CONFIG_PCI=y
372CONFIG_PCI_DOMAINS=y
377# CONFIG_PCIEPORTBUS is not set 373# CONFIG_PCIEPORTBUS is not set
378# CONFIG_ARCH_SUPPORTS_MSI is not set 374# CONFIG_ARCH_SUPPORTS_MSI is not set
379CONFIG_PCI_LEGACY=y
380# CONFIG_PCI_DEBUG is not set 375# CONFIG_PCI_DEBUG is not set
381# CONFIG_PCI_STUB is not set 376# CONFIG_PCI_STUB is not set
382# CONFIG_PCI_IOV is not set 377# CONFIG_PCI_IOV is not set
@@ -402,7 +397,6 @@ CONFIG_NET=y
402# Networking options 397# Networking options
403# 398#
404CONFIG_PACKET=y 399CONFIG_PACKET=y
405# CONFIG_PACKET_MMAP is not set
406CONFIG_UNIX=y 400CONFIG_UNIX=y
407CONFIG_XFRM=y 401CONFIG_XFRM=y
408# CONFIG_XFRM_USER is not set 402# CONFIG_XFRM_USER is not set
@@ -452,6 +446,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
452# CONFIG_ATM is not set 446# CONFIG_ATM is not set
453CONFIG_STP=m 447CONFIG_STP=m
454CONFIG_BRIDGE=m 448CONFIG_BRIDGE=m
449CONFIG_BRIDGE_IGMP_SNOOPING=y
455# CONFIG_NET_DSA is not set 450# CONFIG_NET_DSA is not set
456# CONFIG_VLAN_8021Q is not set 451# CONFIG_VLAN_8021Q is not set
457# CONFIG_DECNET is not set 452# CONFIG_DECNET is not set
@@ -472,7 +467,6 @@ CONFIG_LLC=m
472# Network testing 467# Network testing
473# 468#
474# CONFIG_NET_PKTGEN is not set 469# CONFIG_NET_PKTGEN is not set
475# CONFIG_NET_DROP_MONITOR is not set
476# CONFIG_HAMRADIO is not set 470# CONFIG_HAMRADIO is not set
477# CONFIG_CAN is not set 471# CONFIG_CAN is not set
478# CONFIG_IRDA is not set 472# CONFIG_IRDA is not set
@@ -621,6 +615,7 @@ CONFIG_MISC_DEVICES=y
621# CONFIG_ENCLOSURE_SERVICES is not set 615# CONFIG_ENCLOSURE_SERVICES is not set
622# CONFIG_HP_ILO is not set 616# CONFIG_HP_ILO is not set
623# CONFIG_ISL29003 is not set 617# CONFIG_ISL29003 is not set
618# CONFIG_SENSORS_TSL2550 is not set
624# CONFIG_DS1682 is not set 619# CONFIG_DS1682 is not set
625# CONFIG_C2PORT is not set 620# CONFIG_C2PORT is not set
626 621
@@ -638,6 +633,7 @@ CONFIG_HAVE_IDE=y
638# 633#
639# SCSI device support 634# SCSI device support
640# 635#
636CONFIG_SCSI_MOD=y
641# CONFIG_RAID_ATTRS is not set 637# CONFIG_RAID_ATTRS is not set
642CONFIG_SCSI=y 638CONFIG_SCSI=y
643CONFIG_SCSI_DMA=y 639CONFIG_SCSI_DMA=y
@@ -755,6 +751,7 @@ CONFIG_SATA_SIL=y
755# CONFIG_PATA_IT821X is not set 751# CONFIG_PATA_IT821X is not set
756# CONFIG_PATA_IT8213 is not set 752# CONFIG_PATA_IT8213 is not set
757# CONFIG_PATA_JMICRON is not set 753# CONFIG_PATA_JMICRON is not set
754# CONFIG_PATA_LEGACY is not set
758# CONFIG_PATA_TRIFLEX is not set 755# CONFIG_PATA_TRIFLEX is not set
759# CONFIG_PATA_MARVELL is not set 756# CONFIG_PATA_MARVELL is not set
760# CONFIG_PATA_MPIIX is not set 757# CONFIG_PATA_MPIIX is not set
@@ -791,7 +788,7 @@ CONFIG_PATA_PLATFORM=y
791# 788#
792 789
793# 790#
794# See the help texts for more information. 791# The newer stack is recommended.
795# 792#
796# CONFIG_FIREWIRE is not set 793# CONFIG_FIREWIRE is not set
797# CONFIG_IEEE1394 is not set 794# CONFIG_IEEE1394 is not set
@@ -832,6 +829,7 @@ CONFIG_NET_PCI=y
832CONFIG_PCNET32=m 829CONFIG_PCNET32=m
833# CONFIG_AMD8111_ETH is not set 830# CONFIG_AMD8111_ETH is not set
834# CONFIG_ADAPTEC_STARFIRE is not set 831# CONFIG_ADAPTEC_STARFIRE is not set
832# CONFIG_KSZ884X_PCI is not set
835# CONFIG_B44 is not set 833# CONFIG_B44 is not set
836# CONFIG_FORCEDETH is not set 834# CONFIG_FORCEDETH is not set
837# CONFIG_E100 is not set 835# CONFIG_E100 is not set
@@ -884,6 +882,8 @@ CONFIG_NETDEV_10000=y
884# CONFIG_CHELSIO_T1 is not set 882# CONFIG_CHELSIO_T1 is not set
885CONFIG_CHELSIO_T3_DEPENDS=y 883CONFIG_CHELSIO_T3_DEPENDS=y
886# CONFIG_CHELSIO_T3 is not set 884# CONFIG_CHELSIO_T3 is not set
885CONFIG_CHELSIO_T4_DEPENDS=y
886# CONFIG_CHELSIO_T4 is not set
887# CONFIG_ENIC is not set 887# CONFIG_ENIC is not set
888# CONFIG_IXGBE is not set 888# CONFIG_IXGBE is not set
889# CONFIG_IXGB is not set 889# CONFIG_IXGB is not set
@@ -896,6 +896,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
896# CONFIG_MLX4_CORE is not set 896# CONFIG_MLX4_CORE is not set
897# CONFIG_TEHUTI is not set 897# CONFIG_TEHUTI is not set
898# CONFIG_BNX2X is not set 898# CONFIG_BNX2X is not set
899# CONFIG_QLCNIC is not set
899# CONFIG_QLGE is not set 900# CONFIG_QLGE is not set
900# CONFIG_SFC is not set 901# CONFIG_SFC is not set
901# CONFIG_BE2NET is not set 902# CONFIG_BE2NET is not set
@@ -995,6 +996,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
995CONFIG_SERIAL_CORE=y 996CONFIG_SERIAL_CORE=y
996CONFIG_SERIAL_CORE_CONSOLE=y 997CONFIG_SERIAL_CORE_CONSOLE=y
997# CONFIG_SERIAL_JSM is not set 998# CONFIG_SERIAL_JSM is not set
999# CONFIG_SERIAL_TIMBERDALE is not set
998CONFIG_UNIX98_PTYS=y 1000CONFIG_UNIX98_PTYS=y
999# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1001# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1000CONFIG_LEGACY_PTYS=y 1002CONFIG_LEGACY_PTYS=y
@@ -1043,6 +1045,7 @@ CONFIG_I2C_HIGHLANDER=y
1043# CONFIG_I2C_OCORES is not set 1045# CONFIG_I2C_OCORES is not set
1044# CONFIG_I2C_SH_MOBILE is not set 1046# CONFIG_I2C_SH_MOBILE is not set
1045# CONFIG_I2C_SIMTEC is not set 1047# CONFIG_I2C_SIMTEC is not set
1048# CONFIG_I2C_XILINX is not set
1046 1049
1047# 1050#
1048# External I2C/SMBus adapter drivers 1051# External I2C/SMBus adapter drivers
@@ -1055,15 +1058,9 @@ CONFIG_I2C_HIGHLANDER=y
1055# 1058#
1056# CONFIG_I2C_PCA_PLATFORM is not set 1059# CONFIG_I2C_PCA_PLATFORM is not set
1057# CONFIG_I2C_STUB is not set 1060# CONFIG_I2C_STUB is not set
1058
1059#
1060# Miscellaneous I2C Chip support
1061#
1062# CONFIG_SENSORS_TSL2550 is not set
1063# CONFIG_I2C_DEBUG_CORE is not set 1061# CONFIG_I2C_DEBUG_CORE is not set
1064# CONFIG_I2C_DEBUG_ALGO is not set 1062# CONFIG_I2C_DEBUG_ALGO is not set
1065# CONFIG_I2C_DEBUG_BUS is not set 1063# CONFIG_I2C_DEBUG_BUS is not set
1066# CONFIG_I2C_DEBUG_CHIP is not set
1067# CONFIG_SPI is not set 1064# CONFIG_SPI is not set
1068 1065
1069# 1066#
@@ -1087,10 +1084,11 @@ CONFIG_HWMON=y
1087# CONFIG_SENSORS_ADM1029 is not set 1084# CONFIG_SENSORS_ADM1029 is not set
1088# CONFIG_SENSORS_ADM1031 is not set 1085# CONFIG_SENSORS_ADM1031 is not set
1089# CONFIG_SENSORS_ADM9240 is not set 1086# CONFIG_SENSORS_ADM9240 is not set
1087# CONFIG_SENSORS_ADT7411 is not set
1090# CONFIG_SENSORS_ADT7462 is not set 1088# CONFIG_SENSORS_ADT7462 is not set
1091# CONFIG_SENSORS_ADT7470 is not set 1089# CONFIG_SENSORS_ADT7470 is not set
1092# CONFIG_SENSORS_ADT7473 is not set
1093# CONFIG_SENSORS_ADT7475 is not set 1090# CONFIG_SENSORS_ADT7475 is not set
1091# CONFIG_SENSORS_ASC7621 is not set
1094# CONFIG_SENSORS_ATXP1 is not set 1092# CONFIG_SENSORS_ATXP1 is not set
1095# CONFIG_SENSORS_DS1621 is not set 1093# CONFIG_SENSORS_DS1621 is not set
1096# CONFIG_SENSORS_I5K_AMB is not set 1094# CONFIG_SENSORS_I5K_AMB is not set
@@ -1127,6 +1125,7 @@ CONFIG_HWMON=y
1127# CONFIG_SENSORS_SMSC47M192 is not set 1125# CONFIG_SENSORS_SMSC47M192 is not set
1128# CONFIG_SENSORS_SMSC47B397 is not set 1126# CONFIG_SENSORS_SMSC47B397 is not set
1129# CONFIG_SENSORS_ADS7828 is not set 1127# CONFIG_SENSORS_ADS7828 is not set
1128# CONFIG_SENSORS_AMC6821 is not set
1130# CONFIG_SENSORS_THMC50 is not set 1129# CONFIG_SENSORS_THMC50 is not set
1131# CONFIG_SENSORS_TMP401 is not set 1130# CONFIG_SENSORS_TMP401 is not set
1132# CONFIG_SENSORS_TMP421 is not set 1131# CONFIG_SENSORS_TMP421 is not set
@@ -1156,6 +1155,7 @@ CONFIG_SSB_POSSIBLE=y
1156# Multifunction device drivers 1155# Multifunction device drivers
1157# 1156#
1158# CONFIG_MFD_CORE is not set 1157# CONFIG_MFD_CORE is not set
1158# CONFIG_MFD_88PM860X is not set
1159# CONFIG_MFD_SM501 is not set 1159# CONFIG_MFD_SM501 is not set
1160# CONFIG_MFD_SH_MOBILE_SDHI is not set 1160# CONFIG_MFD_SH_MOBILE_SDHI is not set
1161# CONFIG_HTC_PASIC3 is not set 1161# CONFIG_HTC_PASIC3 is not set
@@ -1163,12 +1163,14 @@ CONFIG_SSB_POSSIBLE=y
1163# CONFIG_MFD_TMIO is not set 1163# CONFIG_MFD_TMIO is not set
1164# CONFIG_PMIC_DA903X is not set 1164# CONFIG_PMIC_DA903X is not set
1165# CONFIG_PMIC_ADP5520 is not set 1165# CONFIG_PMIC_ADP5520 is not set
1166# CONFIG_MFD_MAX8925 is not set
1166# CONFIG_MFD_WM8400 is not set 1167# CONFIG_MFD_WM8400 is not set
1167# CONFIG_MFD_WM831X is not set 1168# CONFIG_MFD_WM831X is not set
1168# CONFIG_MFD_WM8350_I2C is not set 1169# CONFIG_MFD_WM8350_I2C is not set
1170# CONFIG_MFD_WM8994 is not set
1169# CONFIG_MFD_PCF50633 is not set 1171# CONFIG_MFD_PCF50633 is not set
1170# CONFIG_AB3100_CORE is not set 1172# CONFIG_AB3100_CORE is not set
1171# CONFIG_MFD_88PM8607 is not set 1173# CONFIG_LPC_SCH is not set
1172# CONFIG_REGULATOR is not set 1174# CONFIG_REGULATOR is not set
1173# CONFIG_MEDIA_SUPPORT is not set 1175# CONFIG_MEDIA_SUPPORT is not set
1174 1176
@@ -1176,6 +1178,7 @@ CONFIG_SSB_POSSIBLE=y
1176# Graphics support 1178# Graphics support
1177# 1179#
1178CONFIG_VGA_ARB=y 1180CONFIG_VGA_ARB=y
1181CONFIG_VGA_ARB_MAX_GPUS=16
1179# CONFIG_DRM is not set 1182# CONFIG_DRM is not set
1180# CONFIG_VGASTATE is not set 1183# CONFIG_VGASTATE is not set
1181# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1184# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1372,6 +1375,7 @@ CONFIG_MISC_FILESYSTEMS=y
1372# CONFIG_BFS_FS is not set 1375# CONFIG_BFS_FS is not set
1373# CONFIG_EFS_FS is not set 1376# CONFIG_EFS_FS is not set
1374# CONFIG_JFFS2_FS is not set 1377# CONFIG_JFFS2_FS is not set
1378# CONFIG_LOGFS is not set
1375# CONFIG_CRAMFS is not set 1379# CONFIG_CRAMFS is not set
1376# CONFIG_SQUASHFS is not set 1380# CONFIG_SQUASHFS is not set
1377# CONFIG_VXFS_FS is not set 1381# CONFIG_VXFS_FS is not set
@@ -1402,6 +1406,7 @@ CONFIG_SUNRPC_GSS=y
1402CONFIG_RPCSEC_GSS_KRB5=y 1406CONFIG_RPCSEC_GSS_KRB5=y
1403# CONFIG_RPCSEC_GSS_SPKM3 is not set 1407# CONFIG_RPCSEC_GSS_SPKM3 is not set
1404# CONFIG_SMB_FS is not set 1408# CONFIG_SMB_FS is not set
1409# CONFIG_CEPH_FS is not set
1405# CONFIG_CIFS is not set 1410# CONFIG_CIFS is not set
1406# CONFIG_NCP_FS is not set 1411# CONFIG_NCP_FS is not set
1407# CONFIG_CODA_FS is not set 1412# CONFIG_CODA_FS is not set
@@ -1480,6 +1485,7 @@ CONFIG_SCHED_DEBUG=y
1480# CONFIG_TIMER_STATS is not set 1485# CONFIG_TIMER_STATS is not set
1481# CONFIG_DEBUG_OBJECTS is not set 1486# CONFIG_DEBUG_OBJECTS is not set
1482# CONFIG_DEBUG_SLAB is not set 1487# CONFIG_DEBUG_SLAB is not set
1488# CONFIG_DEBUG_KMEMLEAK is not set
1483# CONFIG_DEBUG_PREEMPT is not set 1489# CONFIG_DEBUG_PREEMPT is not set
1484# CONFIG_DEBUG_RT_MUTEXES is not set 1490# CONFIG_DEBUG_RT_MUTEXES is not set
1485# CONFIG_RT_MUTEX_TESTER is not set 1491# CONFIG_RT_MUTEX_TESTER is not set
@@ -1490,7 +1496,6 @@ CONFIG_SCHED_DEBUG=y
1490# CONFIG_LOCK_STAT is not set 1496# CONFIG_LOCK_STAT is not set
1491# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1497# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1492# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1498# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1493CONFIG_STACKTRACE=y
1494# CONFIG_DEBUG_KOBJECT is not set 1499# CONFIG_DEBUG_KOBJECT is not set
1495CONFIG_DEBUG_BUGVERBOSE=y 1500CONFIG_DEBUG_BUGVERBOSE=y
1496CONFIG_DEBUG_INFO=y 1501CONFIG_DEBUG_INFO=y
@@ -1507,11 +1512,11 @@ CONFIG_DEBUG_INFO=y
1507# CONFIG_BACKTRACE_SELF_TEST is not set 1512# CONFIG_BACKTRACE_SELF_TEST is not set
1508# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1513# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1509# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1514# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1515# CONFIG_LKDTM is not set
1510# CONFIG_FAULT_INJECTION is not set 1516# CONFIG_FAULT_INJECTION is not set
1511# CONFIG_LATENCYTOP is not set 1517# CONFIG_LATENCYTOP is not set
1512# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1518# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1513# CONFIG_PAGE_POISONING is not set 1519# CONFIG_PAGE_POISONING is not set
1514CONFIG_NOP_TRACER=y
1515CONFIG_HAVE_FUNCTION_TRACER=y 1520CONFIG_HAVE_FUNCTION_TRACER=y
1516CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1521CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1517CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1522CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1519,10 +1524,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1519CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1524CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1520CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1525CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1521CONFIG_RING_BUFFER=y 1526CONFIG_RING_BUFFER=y
1522CONFIG_EVENT_TRACING=y
1523CONFIG_CONTEXT_SWITCH_TRACER=y
1524CONFIG_RING_BUFFER_ALLOW_SWAP=y 1527CONFIG_RING_BUFFER_ALLOW_SWAP=y
1525CONFIG_TRACING=y
1526CONFIG_TRACING_SUPPORT=y 1528CONFIG_TRACING_SUPPORT=y
1527CONFIG_FTRACE=y 1529CONFIG_FTRACE=y
1528# CONFIG_FUNCTION_TRACER is not set 1530# CONFIG_FUNCTION_TRACER is not set
@@ -1535,6 +1537,7 @@ CONFIG_FTRACE=y
1535CONFIG_BRANCH_PROFILE_NONE=y 1537CONFIG_BRANCH_PROFILE_NONE=y
1536# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1538# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1537# CONFIG_PROFILE_ALL_BRANCHES is not set 1539# CONFIG_PROFILE_ALL_BRANCHES is not set
1540# CONFIG_KSYM_TRACER is not set
1538# CONFIG_STACK_TRACER is not set 1541# CONFIG_STACK_TRACER is not set
1539# CONFIG_KMEMTRACE is not set 1542# CONFIG_KMEMTRACE is not set
1540# CONFIG_WORKQUEUE_TRACER is not set 1543# CONFIG_WORKQUEUE_TRACER is not set
@@ -1662,7 +1665,8 @@ CONFIG_CRYPTO_DES=y
1662# CONFIG_CRYPTO_ANSI_CPRNG is not set 1665# CONFIG_CRYPTO_ANSI_CPRNG is not set
1663CONFIG_CRYPTO_HW=y 1666CONFIG_CRYPTO_HW=y
1664# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1667# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1665CONFIG_BINARY_PRINTF=y 1668# CONFIG_VIRTUALIZATION is not set
1669# CONFIG_BINARY_PRINTF is not set
1666 1670
1667# 1671#
1668# Library routines 1672# Library routines
diff --git a/arch/sh/configs/r7785rp_defconfig b/arch/sh/configs/r7785rp_defconfig
index f4b00451dcee..f5e3819469e9 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 13:19:35 2010 4# Tue May 18 16:03:27 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -34,6 +34,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
35CONFIG_IO_TRAPPED=y 35CONFIG_IO_TRAPPED=y
36CONFIG_DMA_NONCOHERENT=y 36CONFIG_DMA_NONCOHERENT=y
37CONFIG_NEED_DMA_MAP_STATE=y
37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 38CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
38CONFIG_CONSTRUCTORS=y 39CONFIG_CONSTRUCTORS=y
39 40
@@ -49,9 +50,11 @@ CONFIG_LOCALVERSION_AUTO=y
49CONFIG_HAVE_KERNEL_GZIP=y 50CONFIG_HAVE_KERNEL_GZIP=y
50CONFIG_HAVE_KERNEL_BZIP2=y 51CONFIG_HAVE_KERNEL_BZIP2=y
51CONFIG_HAVE_KERNEL_LZMA=y 52CONFIG_HAVE_KERNEL_LZMA=y
53CONFIG_HAVE_KERNEL_LZO=y
52CONFIG_KERNEL_GZIP=y 54CONFIG_KERNEL_GZIP=y
53# CONFIG_KERNEL_BZIP2 is not set 55# CONFIG_KERNEL_BZIP2 is not set
54# CONFIG_KERNEL_LZMA is not set 56# CONFIG_KERNEL_LZMA is not set
57# CONFIG_KERNEL_LZO is not set
55CONFIG_SWAP=y 58CONFIG_SWAP=y
56CONFIG_SYSVIPC=y 59CONFIG_SYSVIPC=y
57CONFIG_SYSVIPC_SYSCTL=y 60CONFIG_SYSVIPC_SYSCTL=y
@@ -77,7 +80,6 @@ CONFIG_TREE_RCU_TRACE=y
77CONFIG_IKCONFIG=y 80CONFIG_IKCONFIG=y
78CONFIG_IKCONFIG_PROC=y 81CONFIG_IKCONFIG_PROC=y
79CONFIG_LOG_BUF_SHIFT=14 82CONFIG_LOG_BUF_SHIFT=14
80# CONFIG_GROUP_SCHED is not set
81# CONFIG_CGROUPS is not set 83# CONFIG_CGROUPS is not set
82CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
83CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
@@ -112,7 +114,6 @@ CONFIG_PERF_USE_VMALLOC=y
112# Kernel Performance Events And Counters 114# Kernel Performance Events And Counters
113# 115#
114CONFIG_PERF_EVENTS=y 116CONFIG_PERF_EVENTS=y
115CONFIG_EVENT_PROFILE=y
116# CONFIG_PERF_COUNTERS is not set 117# CONFIG_PERF_COUNTERS is not set
117# CONFIG_DEBUG_PERF_USE_VMALLOC is not set 118# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
118CONFIG_VM_EVENT_COUNTERS=y 119CONFIG_VM_EVENT_COUNTERS=y
@@ -122,18 +123,17 @@ CONFIG_SLAB=y
122# CONFIG_SLUB is not set 123# CONFIG_SLUB is not set
123# CONFIG_SLOB is not set 124# CONFIG_SLOB is not set
124CONFIG_PROFILING=y 125CONFIG_PROFILING=y
125CONFIG_TRACEPOINTS=y
126CONFIG_OPROFILE=y 126CONFIG_OPROFILE=y
127CONFIG_HAVE_OPROFILE=y 127CONFIG_HAVE_OPROFILE=y
128CONFIG_KPROBES=y 128CONFIG_KPROBES=y
129CONFIG_KRETPROBES=y 129CONFIG_KRETPROBES=y
130CONFIG_HAVE_IOREMAP_PROT=y
131CONFIG_HAVE_KPROBES=y 130CONFIG_HAVE_KPROBES=y
132CONFIG_HAVE_KRETPROBES=y 131CONFIG_HAVE_KRETPROBES=y
133CONFIG_HAVE_ARCH_TRACEHOOK=y 132CONFIG_HAVE_ARCH_TRACEHOOK=y
134CONFIG_HAVE_DMA_ATTRS=y 133CONFIG_HAVE_DMA_ATTRS=y
135CONFIG_HAVE_CLK=y 134CONFIG_HAVE_CLK=y
136CONFIG_HAVE_DMA_API_DEBUG=y 135CONFIG_HAVE_DMA_API_DEBUG=y
136CONFIG_HAVE_HW_BREAKPOINT=y
137 137
138# 138#
139# GCOV-based kernel profiling 139# GCOV-based kernel profiling
@@ -247,12 +247,9 @@ CONFIG_PAGE_OFFSET=0x80000000
247CONFIG_FORCE_MAX_ZONEORDER=11 247CONFIG_FORCE_MAX_ZONEORDER=11
248CONFIG_MEMORY_START=0x08000000 248CONFIG_MEMORY_START=0x08000000
249CONFIG_MEMORY_SIZE=0x08000000 249CONFIG_MEMORY_SIZE=0x08000000
250# CONFIG_29BIT is not set 250CONFIG_29BIT=y
251CONFIG_32BIT=y
252CONFIG_PMB_ENABLE=y
253# CONFIG_PMB is not set 251# CONFIG_PMB is not set
254CONFIG_PMB_FIXED=y 252CONFIG_X2TLB=y
255# CONFIG_X2TLB is not set
256CONFIG_VSYSCALL=y 253CONFIG_VSYSCALL=y
257# CONFIG_NUMA is not set 254# CONFIG_NUMA is not set
258CONFIG_ARCH_FLATMEM_ENABLE=y 255CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -263,6 +260,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
263CONFIG_ARCH_SELECT_MEMORY_MODEL=y 260CONFIG_ARCH_SELECT_MEMORY_MODEL=y
264CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 261CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
265CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 262CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
263CONFIG_IOREMAP_FIXED=y
264CONFIG_UNCACHED_MAPPING=y
266CONFIG_PAGE_SIZE_4KB=y 265CONFIG_PAGE_SIZE_4KB=y
267# CONFIG_PAGE_SIZE_8KB is not set 266# CONFIG_PAGE_SIZE_8KB is not set
268# CONFIG_PAGE_SIZE_16KB is not set 267# CONFIG_PAGE_SIZE_16KB is not set
@@ -285,7 +284,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=999999
285CONFIG_MIGRATION=y 284CONFIG_MIGRATION=y
286# CONFIG_PHYS_ADDR_T_64BIT is not set 285# CONFIG_PHYS_ADDR_T_64BIT is not set
287CONFIG_ZONE_DMA_FLAG=0 286CONFIG_ZONE_DMA_FLAG=0
288CONFIG_NR_QUICK=2 287CONFIG_NR_QUICK=1
289# CONFIG_KSM is not set 288# CONFIG_KSM is not set
290CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 289CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
291 290
@@ -303,6 +302,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
303# CONFIG_CPU_BIG_ENDIAN is not set 302# CONFIG_CPU_BIG_ENDIAN is not set
304CONFIG_SH_FPU=y 303CONFIG_SH_FPU=y
305CONFIG_SH_STORE_QUEUES=y 304CONFIG_SH_STORE_QUEUES=y
305# CONFIG_SPECULATIVE_EXECUTION is not set
306CONFIG_CPU_HAS_INTEVT=y 306CONFIG_CPU_HAS_INTEVT=y
307CONFIG_CPU_HAS_SR_RB=y 307CONFIG_CPU_HAS_SR_RB=y
308CONFIG_CPU_HAS_FPU=y 308CONFIG_CPU_HAS_FPU=y
@@ -377,7 +377,7 @@ CONFIG_KEXEC=y
377# CONFIG_PREEMPT_VOLUNTARY is not set 377# CONFIG_PREEMPT_VOLUNTARY is not set
378CONFIG_PREEMPT=y 378CONFIG_PREEMPT=y
379CONFIG_GUSA=y 379CONFIG_GUSA=y
380# CONFIG_SPARSE_IRQ is not set 380# CONFIG_INTC_USERIMASK is not set
381 381
382# 382#
383# Boot options 383# Boot options
@@ -393,9 +393,9 @@ CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
393# Bus options 393# Bus options
394# 394#
395CONFIG_PCI=y 395CONFIG_PCI=y
396CONFIG_PCI_DOMAINS=y
396# CONFIG_PCIEPORTBUS is not set 397# CONFIG_PCIEPORTBUS is not set
397# CONFIG_ARCH_SUPPORTS_MSI is not set 398# CONFIG_ARCH_SUPPORTS_MSI is not set
398# CONFIG_PCI_LEGACY is not set
399# CONFIG_PCI_DEBUG is not set 399# CONFIG_PCI_DEBUG is not set
400# CONFIG_PCI_STUB is not set 400# CONFIG_PCI_STUB is not set
401# CONFIG_PCI_IOV is not set 401# CONFIG_PCI_IOV is not set
@@ -421,7 +421,6 @@ CONFIG_NET=y
421# Networking options 421# Networking options
422# 422#
423CONFIG_PACKET=y 423CONFIG_PACKET=y
424# CONFIG_PACKET_MMAP is not set
425CONFIG_UNIX=y 424CONFIG_UNIX=y
426CONFIG_XFRM=y 425CONFIG_XFRM=y
427# CONFIG_XFRM_USER is not set 426# CONFIG_XFRM_USER is not set
@@ -471,6 +470,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
471# CONFIG_ATM is not set 470# CONFIG_ATM is not set
472CONFIG_STP=m 471CONFIG_STP=m
473CONFIG_BRIDGE=m 472CONFIG_BRIDGE=m
473CONFIG_BRIDGE_IGMP_SNOOPING=y
474# CONFIG_NET_DSA is not set 474# CONFIG_NET_DSA is not set
475# CONFIG_VLAN_8021Q is not set 475# CONFIG_VLAN_8021Q is not set
476# CONFIG_DECNET is not set 476# CONFIG_DECNET is not set
@@ -492,7 +492,6 @@ CONFIG_LLC=m
492# 492#
493# CONFIG_NET_PKTGEN is not set 493# CONFIG_NET_PKTGEN is not set
494# CONFIG_NET_TCPPROBE is not set 494# CONFIG_NET_TCPPROBE is not set
495# CONFIG_NET_DROP_MONITOR is not set
496# CONFIG_HAMRADIO is not set 495# CONFIG_HAMRADIO is not set
497# CONFIG_CAN is not set 496# CONFIG_CAN is not set
498# CONFIG_IRDA is not set 497# CONFIG_IRDA is not set
@@ -557,6 +556,7 @@ CONFIG_MISC_DEVICES=y
557# CONFIG_ENCLOSURE_SERVICES is not set 556# CONFIG_ENCLOSURE_SERVICES is not set
558# CONFIG_HP_ILO is not set 557# CONFIG_HP_ILO is not set
559# CONFIG_ISL29003 is not set 558# CONFIG_ISL29003 is not set
559# CONFIG_SENSORS_TSL2550 is not set
560# CONFIG_DS1682 is not set 560# CONFIG_DS1682 is not set
561# CONFIG_C2PORT is not set 561# CONFIG_C2PORT is not set
562 562
@@ -574,6 +574,7 @@ CONFIG_HAVE_IDE=y
574# 574#
575# SCSI device support 575# SCSI device support
576# 576#
577CONFIG_SCSI_MOD=y
577# CONFIG_RAID_ATTRS is not set 578# CONFIG_RAID_ATTRS is not set
578CONFIG_SCSI=y 579CONFIG_SCSI=y
579CONFIG_SCSI_DMA=y 580CONFIG_SCSI_DMA=y
@@ -691,6 +692,7 @@ CONFIG_SATA_SIL=y
691# CONFIG_PATA_IT821X is not set 692# CONFIG_PATA_IT821X is not set
692# CONFIG_PATA_IT8213 is not set 693# CONFIG_PATA_IT8213 is not set
693# CONFIG_PATA_JMICRON is not set 694# CONFIG_PATA_JMICRON is not set
695# CONFIG_PATA_LEGACY is not set
694# CONFIG_PATA_TRIFLEX is not set 696# CONFIG_PATA_TRIFLEX is not set
695# CONFIG_PATA_MARVELL is not set 697# CONFIG_PATA_MARVELL is not set
696# CONFIG_PATA_MPIIX is not set 698# CONFIG_PATA_MPIIX is not set
@@ -727,7 +729,7 @@ CONFIG_PATA_PLATFORM=y
727# 729#
728 730
729# 731#
730# See the help texts for more information. 732# The newer stack is recommended.
731# 733#
732# CONFIG_FIREWIRE is not set 734# CONFIG_FIREWIRE is not set
733# CONFIG_IEEE1394 is not set 735# CONFIG_IEEE1394 is not set
@@ -797,6 +799,8 @@ CONFIG_NETDEV_10000=y
797# CONFIG_CHELSIO_T1 is not set 799# CONFIG_CHELSIO_T1 is not set
798CONFIG_CHELSIO_T3_DEPENDS=y 800CONFIG_CHELSIO_T3_DEPENDS=y
799# CONFIG_CHELSIO_T3 is not set 801# CONFIG_CHELSIO_T3 is not set
802CONFIG_CHELSIO_T4_DEPENDS=y
803# CONFIG_CHELSIO_T4 is not set
800# CONFIG_ENIC is not set 804# CONFIG_ENIC is not set
801# CONFIG_IXGBE is not set 805# CONFIG_IXGBE is not set
802# CONFIG_IXGB is not set 806# CONFIG_IXGB is not set
@@ -809,6 +813,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
809# CONFIG_MLX4_CORE is not set 813# CONFIG_MLX4_CORE is not set
810# CONFIG_TEHUTI is not set 814# CONFIG_TEHUTI is not set
811# CONFIG_BNX2X is not set 815# CONFIG_BNX2X is not set
816# CONFIG_QLCNIC is not set
812# CONFIG_QLGE is not set 817# CONFIG_QLGE is not set
813# CONFIG_SFC is not set 818# CONFIG_SFC is not set
814# CONFIG_BE2NET is not set 819# CONFIG_BE2NET is not set
@@ -910,6 +915,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
910CONFIG_SERIAL_CORE=y 915CONFIG_SERIAL_CORE=y
911CONFIG_SERIAL_CORE_CONSOLE=y 916CONFIG_SERIAL_CORE_CONSOLE=y
912# CONFIG_SERIAL_JSM is not set 917# CONFIG_SERIAL_JSM is not set
918# CONFIG_SERIAL_TIMBERDALE is not set
913CONFIG_UNIX98_PTYS=y 919CONFIG_UNIX98_PTYS=y
914# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 920# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
915CONFIG_LEGACY_PTYS=y 921CONFIG_LEGACY_PTYS=y
@@ -959,6 +965,7 @@ CONFIG_I2C_HIGHLANDER=y
959# CONFIG_I2C_OCORES is not set 965# CONFIG_I2C_OCORES is not set
960# CONFIG_I2C_SH_MOBILE is not set 966# CONFIG_I2C_SH_MOBILE is not set
961# CONFIG_I2C_SIMTEC is not set 967# CONFIG_I2C_SIMTEC is not set
968# CONFIG_I2C_XILINX is not set
962 969
963# 970#
964# External I2C/SMBus adapter drivers 971# External I2C/SMBus adapter drivers
@@ -971,15 +978,9 @@ CONFIG_I2C_HIGHLANDER=y
971# 978#
972# CONFIG_I2C_PCA_PLATFORM is not set 979# CONFIG_I2C_PCA_PLATFORM is not set
973# CONFIG_I2C_STUB is not set 980# CONFIG_I2C_STUB is not set
974
975#
976# Miscellaneous I2C Chip support
977#
978# CONFIG_SENSORS_TSL2550 is not set
979# CONFIG_I2C_DEBUG_CORE is not set 981# CONFIG_I2C_DEBUG_CORE is not set
980# CONFIG_I2C_DEBUG_ALGO is not set 982# CONFIG_I2C_DEBUG_ALGO is not set
981# CONFIG_I2C_DEBUG_BUS is not set 983# CONFIG_I2C_DEBUG_BUS is not set
982# CONFIG_I2C_DEBUG_CHIP is not set
983# CONFIG_SPI is not set 984# CONFIG_SPI is not set
984 985
985# 986#
@@ -994,13 +995,17 @@ CONFIG_GPIOLIB=y
994# 995#
995# Memory mapped GPIO expanders: 996# Memory mapped GPIO expanders:
996# 997#
998# CONFIG_GPIO_IT8761E is not set
999# CONFIG_GPIO_SCH is not set
997 1000
998# 1001#
999# I2C GPIO expanders: 1002# I2C GPIO expanders:
1000# 1003#
1004# CONFIG_GPIO_MAX7300 is not set
1001# CONFIG_GPIO_MAX732X is not set 1005# CONFIG_GPIO_MAX732X is not set
1002# CONFIG_GPIO_PCA953X is not set 1006# CONFIG_GPIO_PCA953X is not set
1003# CONFIG_GPIO_PCF857X is not set 1007# CONFIG_GPIO_PCF857X is not set
1008# CONFIG_GPIO_ADP5588 is not set
1004 1009
1005# 1010#
1006# PCI GPIO expanders: 1011# PCI GPIO expanders:
@@ -1033,10 +1038,11 @@ CONFIG_HWMON=y
1033# CONFIG_SENSORS_ADM1029 is not set 1038# CONFIG_SENSORS_ADM1029 is not set
1034# CONFIG_SENSORS_ADM1031 is not set 1039# CONFIG_SENSORS_ADM1031 is not set
1035# CONFIG_SENSORS_ADM9240 is not set 1040# CONFIG_SENSORS_ADM9240 is not set
1041# CONFIG_SENSORS_ADT7411 is not set
1036# CONFIG_SENSORS_ADT7462 is not set 1042# CONFIG_SENSORS_ADT7462 is not set
1037# CONFIG_SENSORS_ADT7470 is not set 1043# CONFIG_SENSORS_ADT7470 is not set
1038# CONFIG_SENSORS_ADT7473 is not set
1039# CONFIG_SENSORS_ADT7475 is not set 1044# CONFIG_SENSORS_ADT7475 is not set
1045# CONFIG_SENSORS_ASC7621 is not set
1040# CONFIG_SENSORS_ATXP1 is not set 1046# CONFIG_SENSORS_ATXP1 is not set
1041# CONFIG_SENSORS_DS1621 is not set 1047# CONFIG_SENSORS_DS1621 is not set
1042# CONFIG_SENSORS_I5K_AMB is not set 1048# CONFIG_SENSORS_I5K_AMB is not set
@@ -1074,6 +1080,7 @@ CONFIG_HWMON=y
1074# CONFIG_SENSORS_SMSC47M192 is not set 1080# CONFIG_SENSORS_SMSC47M192 is not set
1075# CONFIG_SENSORS_SMSC47B397 is not set 1081# CONFIG_SENSORS_SMSC47B397 is not set
1076# CONFIG_SENSORS_ADS7828 is not set 1082# CONFIG_SENSORS_ADS7828 is not set
1083# CONFIG_SENSORS_AMC6821 is not set
1077# CONFIG_SENSORS_THMC50 is not set 1084# CONFIG_SENSORS_THMC50 is not set
1078# CONFIG_SENSORS_TMP401 is not set 1085# CONFIG_SENSORS_TMP401 is not set
1079# CONFIG_SENSORS_TMP421 is not set 1086# CONFIG_SENSORS_TMP421 is not set
@@ -1102,20 +1109,25 @@ CONFIG_SSB_POSSIBLE=y
1102# Multifunction device drivers 1109# Multifunction device drivers
1103# 1110#
1104# CONFIG_MFD_CORE is not set 1111# CONFIG_MFD_CORE is not set
1112# CONFIG_MFD_88PM860X is not set
1105# CONFIG_MFD_SM501 is not set 1113# CONFIG_MFD_SM501 is not set
1106# CONFIG_MFD_SH_MOBILE_SDHI is not set 1114# CONFIG_MFD_SH_MOBILE_SDHI is not set
1107# CONFIG_HTC_PASIC3 is not set 1115# CONFIG_HTC_PASIC3 is not set
1116# CONFIG_HTC_I2CPLD is not set
1108# CONFIG_TPS65010 is not set 1117# CONFIG_TPS65010 is not set
1109# CONFIG_TWL4030_CORE is not set 1118# CONFIG_TWL4030_CORE is not set
1110# CONFIG_MFD_TMIO is not set 1119# CONFIG_MFD_TMIO is not set
1111# CONFIG_PMIC_DA903X is not set 1120# CONFIG_PMIC_DA903X is not set
1112# CONFIG_PMIC_ADP5520 is not set 1121# CONFIG_PMIC_ADP5520 is not set
1122# CONFIG_MFD_MAX8925 is not set
1113# CONFIG_MFD_WM8400 is not set 1123# CONFIG_MFD_WM8400 is not set
1114# CONFIG_MFD_WM831X is not set 1124# CONFIG_MFD_WM831X is not set
1115# CONFIG_MFD_WM8350_I2C is not set 1125# CONFIG_MFD_WM8350_I2C is not set
1126# CONFIG_MFD_WM8994 is not set
1116# CONFIG_MFD_PCF50633 is not set 1127# CONFIG_MFD_PCF50633 is not set
1117# CONFIG_AB3100_CORE is not set 1128# CONFIG_AB3100_CORE is not set
1118# CONFIG_MFD_88PM8607 is not set 1129# CONFIG_MFD_TIMBERDALE is not set
1130# CONFIG_LPC_SCH is not set
1119# CONFIG_REGULATOR is not set 1131# CONFIG_REGULATOR is not set
1120# CONFIG_MEDIA_SUPPORT is not set 1132# CONFIG_MEDIA_SUPPORT is not set
1121 1133
@@ -1123,6 +1135,7 @@ CONFIG_SSB_POSSIBLE=y
1123# Graphics support 1135# Graphics support
1124# 1136#
1125CONFIG_VGA_ARB=y 1137CONFIG_VGA_ARB=y
1138CONFIG_VGA_ARB_MAX_GPUS=16
1126# CONFIG_DRM is not set 1139# CONFIG_DRM is not set
1127# CONFIG_VGASTATE is not set 1140# CONFIG_VGASTATE is not set
1128# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1141# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1371,6 +1384,7 @@ CONFIG_MISC_FILESYSTEMS=y
1371# CONFIG_BEFS_FS is not set 1384# CONFIG_BEFS_FS is not set
1372# CONFIG_BFS_FS is not set 1385# CONFIG_BFS_FS is not set
1373# CONFIG_EFS_FS is not set 1386# CONFIG_EFS_FS is not set
1387# CONFIG_LOGFS is not set
1374# CONFIG_CRAMFS is not set 1388# CONFIG_CRAMFS is not set
1375# CONFIG_SQUASHFS is not set 1389# CONFIG_SQUASHFS is not set
1376# CONFIG_VXFS_FS is not set 1390# CONFIG_VXFS_FS is not set
@@ -1401,6 +1415,7 @@ CONFIG_SUNRPC_GSS=y
1401CONFIG_RPCSEC_GSS_KRB5=y 1415CONFIG_RPCSEC_GSS_KRB5=y
1402# CONFIG_RPCSEC_GSS_SPKM3 is not set 1416# CONFIG_RPCSEC_GSS_SPKM3 is not set
1403# CONFIG_SMB_FS is not set 1417# CONFIG_SMB_FS is not set
1418# CONFIG_CEPH_FS is not set
1404# CONFIG_CIFS is not set 1419# CONFIG_CIFS is not set
1405# CONFIG_NCP_FS is not set 1420# CONFIG_NCP_FS is not set
1406# CONFIG_CODA_FS is not set 1421# CONFIG_CODA_FS is not set
@@ -1475,6 +1490,7 @@ CONFIG_SCHED_DEBUG=y
1475# CONFIG_TIMER_STATS is not set 1490# CONFIG_TIMER_STATS is not set
1476# CONFIG_DEBUG_OBJECTS is not set 1491# CONFIG_DEBUG_OBJECTS is not set
1477# CONFIG_DEBUG_SLAB is not set 1492# CONFIG_DEBUG_SLAB is not set
1493# CONFIG_DEBUG_KMEMLEAK is not set
1478# CONFIG_DEBUG_PREEMPT is not set 1494# CONFIG_DEBUG_PREEMPT is not set
1479# CONFIG_DEBUG_RT_MUTEXES is not set 1495# CONFIG_DEBUG_RT_MUTEXES is not set
1480# CONFIG_RT_MUTEX_TESTER is not set 1496# CONFIG_RT_MUTEX_TESTER is not set
@@ -1510,7 +1526,6 @@ CONFIG_FRAME_POINTER=y
1510# CONFIG_LATENCYTOP is not set 1526# CONFIG_LATENCYTOP is not set
1511# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1527# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1512# CONFIG_PAGE_POISONING is not set 1528# CONFIG_PAGE_POISONING is not set
1513CONFIG_NOP_TRACER=y
1514CONFIG_HAVE_FUNCTION_TRACER=y 1529CONFIG_HAVE_FUNCTION_TRACER=y
1515CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1530CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1516CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1531CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1518,10 +1533,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1518CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1533CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1519CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1534CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1520CONFIG_RING_BUFFER=y 1535CONFIG_RING_BUFFER=y
1521CONFIG_EVENT_TRACING=y
1522CONFIG_CONTEXT_SWITCH_TRACER=y
1523CONFIG_RING_BUFFER_ALLOW_SWAP=y 1536CONFIG_RING_BUFFER_ALLOW_SWAP=y
1524CONFIG_TRACING=y
1525CONFIG_TRACING_SUPPORT=y 1537CONFIG_TRACING_SUPPORT=y
1526CONFIG_FTRACE=y 1538CONFIG_FTRACE=y
1527# CONFIG_FUNCTION_TRACER is not set 1539# CONFIG_FUNCTION_TRACER is not set
@@ -1534,6 +1546,7 @@ CONFIG_FTRACE=y
1534CONFIG_BRANCH_PROFILE_NONE=y 1546CONFIG_BRANCH_PROFILE_NONE=y
1535# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1547# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1536# CONFIG_PROFILE_ALL_BRANCHES is not set 1548# CONFIG_PROFILE_ALL_BRANCHES is not set
1549# CONFIG_KSYM_TRACER is not set
1537# CONFIG_STACK_TRACER is not set 1550# CONFIG_STACK_TRACER is not set
1538# CONFIG_KMEMTRACE is not set 1551# CONFIG_KMEMTRACE is not set
1539# CONFIG_WORKQUEUE_TRACER is not set 1552# CONFIG_WORKQUEUE_TRACER is not set
@@ -1661,7 +1674,8 @@ CONFIG_CRYPTO_DES=y
1661# CONFIG_CRYPTO_ANSI_CPRNG is not set 1674# CONFIG_CRYPTO_ANSI_CPRNG is not set
1662CONFIG_CRYPTO_HW=y 1675CONFIG_CRYPTO_HW=y
1663# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1676# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1664CONFIG_BINARY_PRINTF=y 1677# CONFIG_VIRTUALIZATION is not set
1678# CONFIG_BINARY_PRINTF is not set
1665 1679
1666# 1680#
1667# Library routines 1681# Library routines
diff --git a/arch/sh/configs/rsk7201_defconfig b/arch/sh/configs/rsk7201_defconfig
index 2fc635a5a8c5..80e7b41ca620 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 13:23:12 2010 4# Tue May 18 16:09:18 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -30,6 +30,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DMA_NONCOHERENT=y 32CONFIG_DMA_NONCOHERENT=y
33CONFIG_NEED_DMA_MAP_STATE=y
33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y 35CONFIG_CONSTRUCTORS=y
35 36
@@ -44,9 +45,11 @@ CONFIG_LOCALVERSION=""
44CONFIG_HAVE_KERNEL_GZIP=y 45CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y 46CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y 47CONFIG_HAVE_KERNEL_LZMA=y
48CONFIG_HAVE_KERNEL_LZO=y
47CONFIG_KERNEL_GZIP=y 49CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set 50# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set 51# CONFIG_KERNEL_LZMA is not set
52# CONFIG_KERNEL_LZO is not set
50CONFIG_SYSVIPC=y 53CONFIG_SYSVIPC=y
51CONFIG_SYSVIPC_SYSCTL=y 54CONFIG_SYSVIPC_SYSCTL=y
52CONFIG_BSD_PROCESS_ACCT=y 55CONFIG_BSD_PROCESS_ACCT=y
@@ -65,7 +68,6 @@ CONFIG_RCU_FANOUT=32
65CONFIG_IKCONFIG=y 68CONFIG_IKCONFIG=y
66# CONFIG_IKCONFIG_PROC is not set 69# CONFIG_IKCONFIG_PROC is not set
67CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
68# CONFIG_GROUP_SCHED is not set
69# CONFIG_CGROUPS is not set 71# CONFIG_CGROUPS is not set
70# CONFIG_SYSFS_DEPRECATED_V2 is not set 72# CONFIG_SYSFS_DEPRECATED_V2 is not set
71# CONFIG_RELAY is not set 73# CONFIG_RELAY is not set
@@ -79,6 +81,7 @@ CONFIG_INITRAMFS_SOURCE=""
79CONFIG_RD_GZIP=y 81CONFIG_RD_GZIP=y
80# CONFIG_RD_BZIP2 is not set 82# CONFIG_RD_BZIP2 is not set
81# CONFIG_RD_LZMA is not set 83# CONFIG_RD_LZMA is not set
84# CONFIG_RD_LZO is not set
82CONFIG_CC_OPTIMIZE_FOR_SIZE=y 85CONFIG_CC_OPTIMIZE_FOR_SIZE=y
83CONFIG_SYSCTL=y 86CONFIG_SYSCTL=y
84CONFIG_ANON_INODES=y 87CONFIG_ANON_INODES=y
@@ -105,7 +108,6 @@ CONFIG_PERF_USE_VMALLOC=y
105# Kernel Performance Events And Counters 108# Kernel Performance Events And Counters
106# 109#
107CONFIG_PERF_EVENTS=y 110CONFIG_PERF_EVENTS=y
108CONFIG_EVENT_PROFILE=y
109# CONFIG_PERF_COUNTERS is not set 111# CONFIG_PERF_COUNTERS is not set
110CONFIG_VM_EVENT_COUNTERS=y 112CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_COMPAT_BRK=y 113CONFIG_COMPAT_BRK=y
@@ -114,7 +116,6 @@ CONFIG_COMPAT_BRK=y
114CONFIG_SLOB=y 116CONFIG_SLOB=y
115# CONFIG_MMAP_ALLOW_UNINITIALIZED is not set 117# CONFIG_MMAP_ALLOW_UNINITIALIZED is not set
116CONFIG_PROFILING=y 118CONFIG_PROFILING=y
117CONFIG_TRACEPOINTS=y
118CONFIG_OPROFILE=y 119CONFIG_OPROFILE=y
119CONFIG_HAVE_OPROFILE=y 120CONFIG_HAVE_OPROFILE=y
120# CONFIG_KPROBES is not set 121# CONFIG_KPROBES is not set
@@ -124,6 +125,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124CONFIG_HAVE_DMA_ATTRS=y 125CONFIG_HAVE_DMA_ATTRS=y
125CONFIG_HAVE_CLK=y 126CONFIG_HAVE_CLK=y
126CONFIG_HAVE_DMA_API_DEBUG=y 127CONFIG_HAVE_DMA_API_DEBUG=y
128CONFIG_HAVE_HW_BREAKPOINT=y
127 129
128# 130#
129# GCOV-based kernel profiling 131# GCOV-based kernel profiling
@@ -240,6 +242,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
240CONFIG_MAX_ACTIVE_REGIONS=1 242CONFIG_MAX_ACTIVE_REGIONS=1
241CONFIG_ARCH_POPULATES_NODE_MAP=y 243CONFIG_ARCH_POPULATES_NODE_MAP=y
242CONFIG_ARCH_SELECT_MEMORY_MODEL=y 244CONFIG_ARCH_SELECT_MEMORY_MODEL=y
245CONFIG_UNCACHED_MAPPING=y
243CONFIG_PAGE_SIZE_4KB=y 246CONFIG_PAGE_SIZE_4KB=y
244# CONFIG_PAGE_SIZE_8KB is not set 247# CONFIG_PAGE_SIZE_8KB is not set
245# CONFIG_PAGE_SIZE_16KB is not set 248# CONFIG_PAGE_SIZE_16KB is not set
@@ -255,7 +258,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
255CONFIG_SPLIT_PTLOCK_CPUS=4 258CONFIG_SPLIT_PTLOCK_CPUS=4
256# CONFIG_PHYS_ADDR_T_64BIT is not set 259# CONFIG_PHYS_ADDR_T_64BIT is not set
257CONFIG_ZONE_DMA_FLAG=0 260CONFIG_ZONE_DMA_FLAG=0
258CONFIG_NR_QUICK=2 261CONFIG_NR_QUICK=1
259CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1 262CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1
260 263
261# 264#
@@ -326,7 +329,6 @@ CONFIG_PREEMPT_NONE=y
326# CONFIG_PREEMPT_VOLUNTARY is not set 329# CONFIG_PREEMPT_VOLUNTARY is not set
327# CONFIG_PREEMPT is not set 330# CONFIG_PREEMPT is not set
328CONFIG_GUSA=y 331CONFIG_GUSA=y
329# CONFIG_SPARSE_IRQ is not set
330 332
331# 333#
332# Boot options 334# Boot options
@@ -485,6 +487,7 @@ CONFIG_HAVE_IDE=y
485# 487#
486# SCSI device support 488# SCSI device support
487# 489#
490CONFIG_SCSI_MOD=y
488# CONFIG_RAID_ATTRS is not set 491# CONFIG_RAID_ATTRS is not set
489# CONFIG_SCSI is not set 492# CONFIG_SCSI is not set
490# CONFIG_SCSI_DMA is not set 493# CONFIG_SCSI_DMA is not set
@@ -545,6 +548,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=8
545CONFIG_SERIAL_SH_SCI_CONSOLE=y 548CONFIG_SERIAL_SH_SCI_CONSOLE=y
546CONFIG_SERIAL_CORE=y 549CONFIG_SERIAL_CORE=y
547CONFIG_SERIAL_CORE_CONSOLE=y 550CONFIG_SERIAL_CORE_CONSOLE=y
551# CONFIG_SERIAL_TIMBERDALE is not set
548# CONFIG_UNIX98_PTYS is not set 552# CONFIG_UNIX98_PTYS is not set
549# CONFIG_LEGACY_PTYS is not set 553# CONFIG_LEGACY_PTYS is not set
550# CONFIG_IPMI_HANDLER is not set 554# CONFIG_IPMI_HANDLER is not set
@@ -657,7 +661,6 @@ CONFIG_EXT2_FS=y
657# CONFIG_EXT2_FS_XATTR is not set 661# CONFIG_EXT2_FS_XATTR is not set
658# CONFIG_EXT3_FS is not set 662# CONFIG_EXT3_FS is not set
659# CONFIG_EXT4_FS is not set 663# CONFIG_EXT4_FS is not set
660CONFIG_EXT4_USE_FOR_EXT23=y
661# CONFIG_REISERFS_FS is not set 664# CONFIG_REISERFS_FS is not set
662# CONFIG_JFS_FS is not set 665# CONFIG_JFS_FS is not set
663# CONFIG_FS_POSIX_ACL is not set 666# CONFIG_FS_POSIX_ACL is not set
@@ -720,6 +723,7 @@ CONFIG_JFFS2_ZLIB=y
720# CONFIG_JFFS2_LZO is not set 723# CONFIG_JFFS2_LZO is not set
721CONFIG_JFFS2_RTIME=y 724CONFIG_JFFS2_RTIME=y
722# CONFIG_JFFS2_RUBIN is not set 725# CONFIG_JFFS2_RUBIN is not set
726# CONFIG_LOGFS is not set
723# CONFIG_CRAMFS is not set 727# CONFIG_CRAMFS is not set
724# CONFIG_SQUASHFS is not set 728# CONFIG_SQUASHFS is not set
725# CONFIG_VXFS_FS is not set 729# CONFIG_VXFS_FS is not set
@@ -756,13 +760,12 @@ CONFIG_MAGIC_SYSRQ=y
756CONFIG_DEBUG_FS=y 760CONFIG_DEBUG_FS=y
757# CONFIG_HEADERS_CHECK is not set 761# CONFIG_HEADERS_CHECK is not set
758# CONFIG_DEBUG_KERNEL is not set 762# CONFIG_DEBUG_KERNEL is not set
759CONFIG_STACKTRACE=y
760CONFIG_DEBUG_BUGVERBOSE=y 763CONFIG_DEBUG_BUGVERBOSE=y
761# CONFIG_DEBUG_MEMORY_INIT is not set 764# CONFIG_DEBUG_MEMORY_INIT is not set
762# CONFIG_RCU_CPU_STALL_DETECTOR is not set 765# CONFIG_RCU_CPU_STALL_DETECTOR is not set
766# CONFIG_LKDTM is not set
763# CONFIG_LATENCYTOP is not set 767# CONFIG_LATENCYTOP is not set
764CONFIG_SYSCTL_SYSCALL_CHECK=y 768CONFIG_SYSCTL_SYSCALL_CHECK=y
765CONFIG_NOP_TRACER=y
766CONFIG_HAVE_FUNCTION_TRACER=y 769CONFIG_HAVE_FUNCTION_TRACER=y
767CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 770CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
768CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 771CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -770,10 +773,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
770CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 773CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
771CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 774CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
772CONFIG_RING_BUFFER=y 775CONFIG_RING_BUFFER=y
773CONFIG_EVENT_TRACING=y
774CONFIG_CONTEXT_SWITCH_TRACER=y
775CONFIG_RING_BUFFER_ALLOW_SWAP=y 776CONFIG_RING_BUFFER_ALLOW_SWAP=y
776CONFIG_TRACING=y
777CONFIG_TRACING_SUPPORT=y 777CONFIG_TRACING_SUPPORT=y
778# CONFIG_FTRACE is not set 778# CONFIG_FTRACE is not set
779# CONFIG_DYNAMIC_DEBUG is not set 779# CONFIG_DYNAMIC_DEBUG is not set
@@ -795,7 +795,8 @@ CONFIG_HAVE_ARCH_KGDB=y
795CONFIG_DEFAULT_SECURITY_DAC=y 795CONFIG_DEFAULT_SECURITY_DAC=y
796CONFIG_DEFAULT_SECURITY="" 796CONFIG_DEFAULT_SECURITY=""
797# CONFIG_CRYPTO is not set 797# CONFIG_CRYPTO is not set
798CONFIG_BINARY_PRINTF=y 798# CONFIG_VIRTUALIZATION is not set
799# CONFIG_BINARY_PRINTF is not set
799 800
800# 801#
801# Library routines 802# Library routines
diff --git a/arch/sh/configs/rsk7203_defconfig b/arch/sh/configs/rsk7203_defconfig
index 0169e60e0947..66eb7d7dad44 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 13:23:54 2010 4# Tue May 18 16:11:37 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION=""
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51CONFIG_SYSVIPC=y 54CONFIG_SYSVIPC=y
52CONFIG_SYSVIPC_SYSCTL=y 55CONFIG_SYSVIPC_SYSCTL=y
53CONFIG_POSIX_MQUEUE=y 56CONFIG_POSIX_MQUEUE=y
@@ -70,7 +73,6 @@ CONFIG_RCU_FANOUT=32
70CONFIG_IKCONFIG=y 73CONFIG_IKCONFIG=y
71# CONFIG_IKCONFIG_PROC is not set 74# CONFIG_IKCONFIG_PROC is not set
72CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
73# CONFIG_GROUP_SCHED is not set
74# CONFIG_CGROUPS is not set 76# CONFIG_CGROUPS is not set
75# CONFIG_SYSFS_DEPRECATED_V2 is not set 77# CONFIG_SYSFS_DEPRECATED_V2 is not set
76# CONFIG_RELAY is not set 78# CONFIG_RELAY is not set
@@ -85,6 +87,7 @@ CONFIG_INITRAMFS_SOURCE=""
85CONFIG_RD_GZIP=y 87CONFIG_RD_GZIP=y
86# CONFIG_RD_BZIP2 is not set 88# CONFIG_RD_BZIP2 is not set
87# CONFIG_RD_LZMA is not set 89# CONFIG_RD_LZMA is not set
90# CONFIG_RD_LZO is not set
88CONFIG_CC_OPTIMIZE_FOR_SIZE=y 91CONFIG_CC_OPTIMIZE_FOR_SIZE=y
89CONFIG_SYSCTL=y 92CONFIG_SYSCTL=y
90CONFIG_ANON_INODES=y 93CONFIG_ANON_INODES=y
@@ -112,7 +115,6 @@ CONFIG_PERF_USE_VMALLOC=y
112# Kernel Performance Events And Counters 115# Kernel Performance Events And Counters
113# 116#
114CONFIG_PERF_EVENTS=y 117CONFIG_PERF_EVENTS=y
115CONFIG_EVENT_PROFILE=y
116# CONFIG_PERF_COUNTERS is not set 118# CONFIG_PERF_COUNTERS is not set
117# CONFIG_DEBUG_PERF_USE_VMALLOC is not set 119# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
118CONFIG_VM_EVENT_COUNTERS=y 120CONFIG_VM_EVENT_COUNTERS=y
@@ -122,7 +124,6 @@ CONFIG_COMPAT_BRK=y
122CONFIG_SLOB=y 124CONFIG_SLOB=y
123# CONFIG_MMAP_ALLOW_UNINITIALIZED is not set 125# CONFIG_MMAP_ALLOW_UNINITIALIZED is not set
124CONFIG_PROFILING=y 126CONFIG_PROFILING=y
125CONFIG_TRACEPOINTS=y
126CONFIG_OPROFILE=y 127CONFIG_OPROFILE=y
127CONFIG_HAVE_OPROFILE=y 128CONFIG_HAVE_OPROFILE=y
128# CONFIG_KPROBES is not set 129# CONFIG_KPROBES is not set
@@ -132,6 +133,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
132CONFIG_HAVE_DMA_ATTRS=y 133CONFIG_HAVE_DMA_ATTRS=y
133CONFIG_HAVE_CLK=y 134CONFIG_HAVE_CLK=y
134CONFIG_HAVE_DMA_API_DEBUG=y 135CONFIG_HAVE_DMA_API_DEBUG=y
136CONFIG_HAVE_HW_BREAKPOINT=y
135 137
136# 138#
137# GCOV-based kernel profiling 139# GCOV-based kernel profiling
@@ -248,6 +250,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
248CONFIG_MAX_ACTIVE_REGIONS=1 250CONFIG_MAX_ACTIVE_REGIONS=1
249CONFIG_ARCH_POPULATES_NODE_MAP=y 251CONFIG_ARCH_POPULATES_NODE_MAP=y
250CONFIG_ARCH_SELECT_MEMORY_MODEL=y 252CONFIG_ARCH_SELECT_MEMORY_MODEL=y
253CONFIG_UNCACHED_MAPPING=y
251CONFIG_PAGE_SIZE_4KB=y 254CONFIG_PAGE_SIZE_4KB=y
252# CONFIG_PAGE_SIZE_8KB is not set 255# CONFIG_PAGE_SIZE_8KB is not set
253# CONFIG_PAGE_SIZE_16KB is not set 256# CONFIG_PAGE_SIZE_16KB is not set
@@ -263,7 +266,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
263CONFIG_SPLIT_PTLOCK_CPUS=4 266CONFIG_SPLIT_PTLOCK_CPUS=4
264# CONFIG_PHYS_ADDR_T_64BIT is not set 267# CONFIG_PHYS_ADDR_T_64BIT is not set
265CONFIG_ZONE_DMA_FLAG=0 268CONFIG_ZONE_DMA_FLAG=0
266CONFIG_NR_QUICK=2 269CONFIG_NR_QUICK=1
267CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1 270CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1
268 271
269# 272#
@@ -350,7 +353,6 @@ CONFIG_PREEMPT_NONE=y
350# CONFIG_PREEMPT_VOLUNTARY is not set 353# CONFIG_PREEMPT_VOLUNTARY is not set
351# CONFIG_PREEMPT is not set 354# CONFIG_PREEMPT is not set
352CONFIG_GUSA=y 355CONFIG_GUSA=y
353# CONFIG_SPARSE_IRQ is not set
354 356
355# 357#
356# Boot options 358# Boot options
@@ -448,7 +450,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
448# Network testing 450# Network testing
449# 451#
450# CONFIG_NET_PKTGEN is not set 452# CONFIG_NET_PKTGEN is not set
451# CONFIG_NET_DROP_MONITOR is not set
452# CONFIG_HAMRADIO is not set 453# CONFIG_HAMRADIO is not set
453# CONFIG_CAN is not set 454# CONFIG_CAN is not set
454# CONFIG_IRDA is not set 455# CONFIG_IRDA is not set
@@ -592,6 +593,7 @@ CONFIG_HAVE_IDE=y
592# 593#
593# SCSI device support 594# SCSI device support
594# 595#
596CONFIG_SCSI_MOD=y
595# CONFIG_RAID_ATTRS is not set 597# CONFIG_RAID_ATTRS is not set
596# CONFIG_SCSI is not set 598# CONFIG_SCSI is not set
597# CONFIG_SCSI_DMA is not set 599# CONFIG_SCSI_DMA is not set
@@ -662,6 +664,7 @@ CONFIG_WLAN=y
662# CONFIG_USB_PEGASUS is not set 664# CONFIG_USB_PEGASUS is not set
663# CONFIG_USB_RTL8150 is not set 665# CONFIG_USB_RTL8150 is not set
664# CONFIG_USB_USBNET is not set 666# CONFIG_USB_USBNET is not set
667# CONFIG_USB_IPHETH is not set
665# CONFIG_WAN is not set 668# CONFIG_WAN is not set
666# CONFIG_PPP is not set 669# CONFIG_PPP is not set
667# CONFIG_SLIP is not set 670# CONFIG_SLIP is not set
@@ -723,6 +726,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=4
723CONFIG_SERIAL_SH_SCI_CONSOLE=y 726CONFIG_SERIAL_SH_SCI_CONSOLE=y
724CONFIG_SERIAL_CORE=y 727CONFIG_SERIAL_CORE=y
725CONFIG_SERIAL_CORE_CONSOLE=y 728CONFIG_SERIAL_CORE_CONSOLE=y
729# CONFIG_SERIAL_TIMBERDALE is not set
726# CONFIG_UNIX98_PTYS is not set 730# CONFIG_UNIX98_PTYS is not set
727# CONFIG_LEGACY_PTYS is not set 731# CONFIG_LEGACY_PTYS is not set
728# CONFIG_IPMI_HANDLER is not set 732# CONFIG_IPMI_HANDLER is not set
@@ -745,6 +749,7 @@ CONFIG_GPIOLIB=y
745# 749#
746# Memory mapped GPIO expanders: 750# Memory mapped GPIO expanders:
747# 751#
752# CONFIG_GPIO_IT8761E is not set
748 753
749# 754#
750# I2C GPIO expanders: 755# I2C GPIO expanders:
@@ -783,6 +788,7 @@ CONFIG_SSB_POSSIBLE=y
783# CONFIG_MFD_TMIO is not set 788# CONFIG_MFD_TMIO is not set
784CONFIG_REGULATOR=y 789CONFIG_REGULATOR=y
785# CONFIG_REGULATOR_DEBUG is not set 790# CONFIG_REGULATOR_DEBUG is not set
791# CONFIG_REGULATOR_DUMMY is not set
786# CONFIG_REGULATOR_FIXED_VOLTAGE is not set 792# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
787# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set 793# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
788# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set 794# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
@@ -816,6 +822,7 @@ CONFIG_USB_HID=y
816# 822#
817# Special HID drivers 823# Special HID drivers
818# 824#
825# CONFIG_HID_3M_PCT is not set
819CONFIG_HID_A4TECH=y 826CONFIG_HID_A4TECH=y
820CONFIG_HID_APPLE=y 827CONFIG_HID_APPLE=y
821CONFIG_HID_BELKIN=y 828CONFIG_HID_BELKIN=y
@@ -831,14 +838,19 @@ CONFIG_HID_GYRATION=y
831CONFIG_HID_LOGITECH=y 838CONFIG_HID_LOGITECH=y
832# CONFIG_LOGITECH_FF is not set 839# CONFIG_LOGITECH_FF is not set
833# CONFIG_LOGIRUMBLEPAD2_FF is not set 840# CONFIG_LOGIRUMBLEPAD2_FF is not set
841# CONFIG_LOGIG940_FF is not set
834CONFIG_HID_MICROSOFT=y 842CONFIG_HID_MICROSOFT=y
843# CONFIG_HID_MOSART is not set
835CONFIG_HID_MONTEREY=y 844CONFIG_HID_MONTEREY=y
836# CONFIG_HID_NTRIG is not set 845# CONFIG_HID_NTRIG is not set
846# CONFIG_HID_ORTEK is not set
837CONFIG_HID_PANTHERLORD=y 847CONFIG_HID_PANTHERLORD=y
838# CONFIG_PANTHERLORD_FF is not set 848# CONFIG_PANTHERLORD_FF is not set
839CONFIG_HID_PETALYNX=y 849CONFIG_HID_PETALYNX=y
850# CONFIG_HID_QUANTA is not set
840CONFIG_HID_SAMSUNG=y 851CONFIG_HID_SAMSUNG=y
841CONFIG_HID_SONY=y 852CONFIG_HID_SONY=y
853# CONFIG_HID_STANTUM is not set
842CONFIG_HID_SUNPLUS=y 854CONFIG_HID_SUNPLUS=y
843# CONFIG_HID_GREENASIA is not set 855# CONFIG_HID_GREENASIA is not set
844# CONFIG_HID_SMARTJOYPLUS is not set 856# CONFIG_HID_SMARTJOYPLUS is not set
@@ -859,7 +871,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
859CONFIG_USB_DEVICEFS=y 871CONFIG_USB_DEVICEFS=y
860CONFIG_USB_DEVICE_CLASS=y 872CONFIG_USB_DEVICE_CLASS=y
861# CONFIG_USB_DYNAMIC_MINORS is not set 873# CONFIG_USB_DYNAMIC_MINORS is not set
862# CONFIG_USB_SUSPEND is not set
863# CONFIG_USB_OTG is not set 874# CONFIG_USB_OTG is not set
864# CONFIG_USB_OTG_WHITELIST is not set 875# CONFIG_USB_OTG_WHITELIST is not set
865# CONFIG_USB_OTG_BLACKLIST_HUB is not set 876# CONFIG_USB_OTG_BLACKLIST_HUB is not set
@@ -916,7 +927,6 @@ CONFIG_USB_R8A66597_HCD=y
916# CONFIG_USB_RIO500 is not set 927# CONFIG_USB_RIO500 is not set
917# CONFIG_USB_LEGOTOWER is not set 928# CONFIG_USB_LEGOTOWER is not set
918# CONFIG_USB_LCD is not set 929# CONFIG_USB_LCD is not set
919# CONFIG_USB_BERRY_CHARGE is not set
920# CONFIG_USB_LED is not set 930# CONFIG_USB_LED is not set
921# CONFIG_USB_CYPRESS_CY7C63 is not set 931# CONFIG_USB_CYPRESS_CY7C63 is not set
922# CONFIG_USB_CYTHERM is not set 932# CONFIG_USB_CYTHERM is not set
@@ -928,7 +938,6 @@ CONFIG_USB_R8A66597_HCD=y
928# CONFIG_USB_IOWARRIOR is not set 938# CONFIG_USB_IOWARRIOR is not set
929# CONFIG_USB_TEST is not set 939# CONFIG_USB_TEST is not set
930# CONFIG_USB_ISIGHTFW is not set 940# CONFIG_USB_ISIGHTFW is not set
931# CONFIG_USB_VST is not set
932# CONFIG_USB_GADGET is not set 941# CONFIG_USB_GADGET is not set
933 942
934# 943#
@@ -948,11 +957,11 @@ CONFIG_LEDS_GPIO=y
948CONFIG_LEDS_GPIO_PLATFORM=y 957CONFIG_LEDS_GPIO_PLATFORM=y
949# CONFIG_LEDS_REGULATOR is not set 958# CONFIG_LEDS_REGULATOR is not set
950# CONFIG_LEDS_LT3593 is not set 959# CONFIG_LEDS_LT3593 is not set
960CONFIG_LEDS_TRIGGERS=y
951 961
952# 962#
953# LED Triggers 963# LED Triggers
954# 964#
955CONFIG_LEDS_TRIGGERS=y
956CONFIG_LEDS_TRIGGER_TIMER=y 965CONFIG_LEDS_TRIGGER_TIMER=y
957CONFIG_LEDS_TRIGGER_HEARTBEAT=y 966CONFIG_LEDS_TRIGGER_HEARTBEAT=y
958CONFIG_LEDS_TRIGGER_BACKLIGHT=y 967CONFIG_LEDS_TRIGGER_BACKLIGHT=y
@@ -1018,7 +1027,6 @@ CONFIG_RTC_DRV_SH=y
1018# CONFIG_EXT2_FS is not set 1027# CONFIG_EXT2_FS is not set
1019# CONFIG_EXT3_FS is not set 1028# CONFIG_EXT3_FS is not set
1020# CONFIG_EXT4_FS is not set 1029# CONFIG_EXT4_FS is not set
1021CONFIG_EXT4_USE_FOR_EXT23=y
1022# CONFIG_REISERFS_FS is not set 1030# CONFIG_REISERFS_FS is not set
1023# CONFIG_JFS_FS is not set 1031# CONFIG_JFS_FS is not set
1024# CONFIG_FS_POSIX_ACL is not set 1032# CONFIG_FS_POSIX_ACL is not set
@@ -1072,6 +1080,7 @@ CONFIG_MISC_FILESYSTEMS=y
1072# CONFIG_BFS_FS is not set 1080# CONFIG_BFS_FS is not set
1073# CONFIG_EFS_FS is not set 1081# CONFIG_EFS_FS is not set
1074# CONFIG_JFFS2_FS is not set 1082# CONFIG_JFFS2_FS is not set
1083# CONFIG_LOGFS is not set
1075# CONFIG_CRAMFS is not set 1084# CONFIG_CRAMFS is not set
1076# CONFIG_SQUASHFS is not set 1085# CONFIG_SQUASHFS is not set
1077# CONFIG_VXFS_FS is not set 1086# CONFIG_VXFS_FS is not set
@@ -1098,6 +1107,7 @@ CONFIG_SUNRPC=y
1098# CONFIG_RPCSEC_GSS_KRB5 is not set 1107# CONFIG_RPCSEC_GSS_KRB5 is not set
1099# CONFIG_RPCSEC_GSS_SPKM3 is not set 1108# CONFIG_RPCSEC_GSS_SPKM3 is not set
1100# CONFIG_SMB_FS is not set 1109# CONFIG_SMB_FS is not set
1110# CONFIG_CEPH_FS is not set
1101# CONFIG_CIFS is not set 1111# CONFIG_CIFS is not set
1102# CONFIG_NCP_FS is not set 1112# CONFIG_NCP_FS is not set
1103# CONFIG_CODA_FS is not set 1113# CONFIG_CODA_FS is not set
@@ -1180,6 +1190,7 @@ CONFIG_DEBUG_OBJECTS=y
1180# CONFIG_DEBUG_OBJECTS_TIMERS is not set 1190# CONFIG_DEBUG_OBJECTS_TIMERS is not set
1181# CONFIG_DEBUG_OBJECTS_WORK is not set 1191# CONFIG_DEBUG_OBJECTS_WORK is not set
1182CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 1192CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
1193# CONFIG_DEBUG_KMEMLEAK is not set
1183# CONFIG_DEBUG_RT_MUTEXES is not set 1194# CONFIG_DEBUG_RT_MUTEXES is not set
1184# CONFIG_RT_MUTEX_TESTER is not set 1195# CONFIG_RT_MUTEX_TESTER is not set
1185# CONFIG_DEBUG_SPINLOCK is not set 1196# CONFIG_DEBUG_SPINLOCK is not set
@@ -1189,7 +1200,6 @@ CONFIG_DEBUG_MUTEXES=y
1189# CONFIG_LOCK_STAT is not set 1200# CONFIG_LOCK_STAT is not set
1190CONFIG_DEBUG_SPINLOCK_SLEEP=y 1201CONFIG_DEBUG_SPINLOCK_SLEEP=y
1191# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1202# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1192CONFIG_STACKTRACE=y
1193# CONFIG_DEBUG_KOBJECT is not set 1203# CONFIG_DEBUG_KOBJECT is not set
1194CONFIG_DEBUG_BUGVERBOSE=y 1204CONFIG_DEBUG_BUGVERBOSE=y
1195CONFIG_DEBUG_INFO=y 1205CONFIG_DEBUG_INFO=y
@@ -1207,11 +1217,11 @@ CONFIG_FRAME_POINTER=y
1207# CONFIG_BACKTRACE_SELF_TEST is not set 1217# CONFIG_BACKTRACE_SELF_TEST is not set
1208# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1218# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1209# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1219# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1220# CONFIG_LKDTM is not set
1210# CONFIG_FAULT_INJECTION is not set 1221# CONFIG_FAULT_INJECTION is not set
1211# CONFIG_LATENCYTOP is not set 1222# CONFIG_LATENCYTOP is not set
1212CONFIG_SYSCTL_SYSCALL_CHECK=y 1223CONFIG_SYSCTL_SYSCALL_CHECK=y
1213# CONFIG_PAGE_POISONING is not set 1224# CONFIG_PAGE_POISONING is not set
1214CONFIG_NOP_TRACER=y
1215CONFIG_HAVE_FUNCTION_TRACER=y 1225CONFIG_HAVE_FUNCTION_TRACER=y
1216CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1226CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1217CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1227CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1219,10 +1229,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1219CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1229CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1220CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1230CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1221CONFIG_RING_BUFFER=y 1231CONFIG_RING_BUFFER=y
1222CONFIG_EVENT_TRACING=y
1223CONFIG_CONTEXT_SWITCH_TRACER=y
1224CONFIG_RING_BUFFER_ALLOW_SWAP=y 1232CONFIG_RING_BUFFER_ALLOW_SWAP=y
1225CONFIG_TRACING=y
1226CONFIG_TRACING_SUPPORT=y 1233CONFIG_TRACING_SUPPORT=y
1227CONFIG_FTRACE=y 1234CONFIG_FTRACE=y
1228# CONFIG_FUNCTION_TRACER is not set 1235# CONFIG_FUNCTION_TRACER is not set
@@ -1234,6 +1241,7 @@ CONFIG_FTRACE=y
1234CONFIG_BRANCH_PROFILE_NONE=y 1241CONFIG_BRANCH_PROFILE_NONE=y
1235# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1242# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1236# CONFIG_PROFILE_ALL_BRANCHES is not set 1243# CONFIG_PROFILE_ALL_BRANCHES is not set
1244# CONFIG_KSYM_TRACER is not set
1237# CONFIG_STACK_TRACER is not set 1245# CONFIG_STACK_TRACER is not set
1238# CONFIG_KMEMTRACE is not set 1246# CONFIG_KMEMTRACE is not set
1239# CONFIG_WORKQUEUE_TRACER is not set 1247# CONFIG_WORKQUEUE_TRACER is not set
@@ -1263,7 +1271,8 @@ CONFIG_DUMP_CODE=y
1263CONFIG_DEFAULT_SECURITY_DAC=y 1271CONFIG_DEFAULT_SECURITY_DAC=y
1264CONFIG_DEFAULT_SECURITY="" 1272CONFIG_DEFAULT_SECURITY=""
1265# CONFIG_CRYPTO is not set 1273# CONFIG_CRYPTO is not set
1266CONFIG_BINARY_PRINTF=y 1274# CONFIG_VIRTUALIZATION is not set
1275# CONFIG_BINARY_PRINTF is not set
1267 1276
1268# 1277#
1269# Library routines 1278# Library routines
diff --git a/arch/sh/configs/rts7751r2d1_defconfig b/arch/sh/configs/rts7751r2d1_defconfig
index dba024d72a89..6bd3d95d1518 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 13:25:36 2010 4# Tue May 18 16:15:07 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_IO_TRAPPED=y 34CONFIG_IO_TRAPPED=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -47,9 +48,11 @@ CONFIG_LOCALVERSION_AUTO=y
47CONFIG_HAVE_KERNEL_GZIP=y 48CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y 49CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y 50CONFIG_HAVE_KERNEL_LZMA=y
51CONFIG_HAVE_KERNEL_LZO=y
50CONFIG_KERNEL_GZIP=y 52CONFIG_KERNEL_GZIP=y
51# CONFIG_KERNEL_BZIP2 is not set 53# CONFIG_KERNEL_BZIP2 is not set
52# CONFIG_KERNEL_LZMA is not set 54# CONFIG_KERNEL_LZMA is not set
55# CONFIG_KERNEL_LZO is not set
53CONFIG_SWAP=y 56CONFIG_SWAP=y
54CONFIG_SYSVIPC=y 57CONFIG_SYSVIPC=y
55CONFIG_SYSVIPC_SYSCTL=y 58CONFIG_SYSVIPC_SYSCTL=y
@@ -70,7 +73,6 @@ CONFIG_RCU_FANOUT=32
70# CONFIG_TREE_RCU_TRACE is not set 73# CONFIG_TREE_RCU_TRACE is not set
71# CONFIG_IKCONFIG is not set 74# CONFIG_IKCONFIG is not set
72CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
73# CONFIG_GROUP_SCHED is not set
74# CONFIG_CGROUPS is not set 76# CONFIG_CGROUPS is not set
75CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
76CONFIG_SYSFS_DEPRECATED_V2=y 78CONFIG_SYSFS_DEPRECATED_V2=y
@@ -104,7 +106,6 @@ CONFIG_PERF_USE_VMALLOC=y
104# Kernel Performance Events And Counters 106# Kernel Performance Events And Counters
105# 107#
106CONFIG_PERF_EVENTS=y 108CONFIG_PERF_EVENTS=y
107CONFIG_EVENT_PROFILE=y
108# CONFIG_PERF_COUNTERS is not set 109# CONFIG_PERF_COUNTERS is not set
109CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
110CONFIG_PCI_QUIRKS=y 111CONFIG_PCI_QUIRKS=y
@@ -113,7 +114,6 @@ CONFIG_SLAB=y
113# CONFIG_SLUB is not set 114# CONFIG_SLUB is not set
114# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
115CONFIG_PROFILING=y 116CONFIG_PROFILING=y
116CONFIG_TRACEPOINTS=y
117CONFIG_OPROFILE=y 117CONFIG_OPROFILE=y
118CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
119# CONFIG_KPROBES is not set 119# CONFIG_KPROBES is not set
@@ -124,6 +124,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124CONFIG_HAVE_DMA_ATTRS=y 124CONFIG_HAVE_DMA_ATTRS=y
125CONFIG_HAVE_CLK=y 125CONFIG_HAVE_CLK=y
126CONFIG_HAVE_DMA_API_DEBUG=y 126CONFIG_HAVE_DMA_API_DEBUG=y
127CONFIG_HAVE_HW_BREAKPOINT=y
127 128
128# 129#
129# GCOV-based kernel profiling 130# GCOV-based kernel profiling
@@ -242,6 +243,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
242CONFIG_MAX_ACTIVE_REGIONS=1 243CONFIG_MAX_ACTIVE_REGIONS=1
243CONFIG_ARCH_POPULATES_NODE_MAP=y 244CONFIG_ARCH_POPULATES_NODE_MAP=y
244CONFIG_ARCH_SELECT_MEMORY_MODEL=y 245CONFIG_ARCH_SELECT_MEMORY_MODEL=y
246CONFIG_UNCACHED_MAPPING=y
245CONFIG_PAGE_SIZE_4KB=y 247CONFIG_PAGE_SIZE_4KB=y
246# CONFIG_PAGE_SIZE_8KB is not set 248# CONFIG_PAGE_SIZE_8KB is not set
247# CONFIG_PAGE_SIZE_16KB is not set 249# CONFIG_PAGE_SIZE_16KB is not set
@@ -257,7 +259,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
257CONFIG_SPLIT_PTLOCK_CPUS=4 259CONFIG_SPLIT_PTLOCK_CPUS=4
258# CONFIG_PHYS_ADDR_T_64BIT is not set 260# CONFIG_PHYS_ADDR_T_64BIT is not set
259CONFIG_ZONE_DMA_FLAG=0 261CONFIG_ZONE_DMA_FLAG=0
260CONFIG_NR_QUICK=2 262CONFIG_NR_QUICK=1
261# CONFIG_KSM is not set 263# CONFIG_KSM is not set
262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 264CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
263 265
@@ -343,7 +345,6 @@ CONFIG_PREEMPT_NONE=y
343# CONFIG_PREEMPT is not set 345# CONFIG_PREEMPT is not set
344CONFIG_GUSA=y 346CONFIG_GUSA=y
345# CONFIG_GUSA_RB is not set 347# CONFIG_GUSA_RB is not set
346# CONFIG_SPARSE_IRQ is not set
347 348
348# 349#
349# Boot options 350# Boot options
@@ -359,9 +360,9 @@ CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 root=/dev/sda1"
359# Bus options 360# Bus options
360# 361#
361CONFIG_PCI=y 362CONFIG_PCI=y
363CONFIG_PCI_DOMAINS=y
362# CONFIG_PCIEPORTBUS is not set 364# CONFIG_PCIEPORTBUS is not set
363# CONFIG_ARCH_SUPPORTS_MSI is not set 365# CONFIG_ARCH_SUPPORTS_MSI is not set
364CONFIG_PCI_LEGACY=y
365# CONFIG_PCI_STUB is not set 366# CONFIG_PCI_STUB is not set
366# CONFIG_PCI_IOV is not set 367# CONFIG_PCI_IOV is not set
367# CONFIG_PCCARD is not set 368# CONFIG_PCCARD is not set
@@ -389,7 +390,6 @@ CONFIG_NET=y
389# Networking options 390# Networking options
390# 391#
391CONFIG_PACKET=y 392CONFIG_PACKET=y
392# CONFIG_PACKET_MMAP is not set
393CONFIG_UNIX=y 393CONFIG_UNIX=y
394CONFIG_XFRM=y 394CONFIG_XFRM=y
395# CONFIG_XFRM_USER is not set 395# CONFIG_XFRM_USER is not set
@@ -449,7 +449,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
449# Network testing 449# Network testing
450# 450#
451# CONFIG_NET_PKTGEN is not set 451# CONFIG_NET_PKTGEN is not set
452# CONFIG_NET_DROP_MONITOR is not set
453# CONFIG_HAMRADIO is not set 452# CONFIG_HAMRADIO is not set
454# CONFIG_CAN is not set 453# CONFIG_CAN is not set
455# CONFIG_IRDA is not set 454# CONFIG_IRDA is not set
@@ -525,6 +524,7 @@ CONFIG_HAVE_IDE=y
525# 524#
526# SCSI device support 525# SCSI device support
527# 526#
527CONFIG_SCSI_MOD=y
528# CONFIG_RAID_ATTRS is not set 528# CONFIG_RAID_ATTRS is not set
529CONFIG_SCSI=y 529CONFIG_SCSI=y
530CONFIG_SCSI_DMA=y 530CONFIG_SCSI_DMA=y
@@ -642,6 +642,7 @@ CONFIG_ATA_SFF=y
642# CONFIG_PATA_IT821X is not set 642# CONFIG_PATA_IT821X is not set
643# CONFIG_PATA_IT8213 is not set 643# CONFIG_PATA_IT8213 is not set
644# CONFIG_PATA_JMICRON is not set 644# CONFIG_PATA_JMICRON is not set
645# CONFIG_PATA_LEGACY is not set
645# CONFIG_PATA_TRIFLEX is not set 646# CONFIG_PATA_TRIFLEX is not set
646# CONFIG_PATA_MARVELL is not set 647# CONFIG_PATA_MARVELL is not set
647# CONFIG_PATA_MPIIX is not set 648# CONFIG_PATA_MPIIX is not set
@@ -678,7 +679,7 @@ CONFIG_PATA_PLATFORM=y
678# 679#
679 680
680# 681#
681# See the help texts for more information. 682# The newer stack is recommended.
682# 683#
683# CONFIG_FIREWIRE is not set 684# CONFIG_FIREWIRE is not set
684# CONFIG_IEEE1394 is not set 685# CONFIG_IEEE1394 is not set
@@ -719,6 +720,7 @@ CONFIG_NET_PCI=y
719# CONFIG_PCNET32 is not set 720# CONFIG_PCNET32 is not set
720# CONFIG_AMD8111_ETH is not set 721# CONFIG_AMD8111_ETH is not set
721# CONFIG_ADAPTEC_STARFIRE is not set 722# CONFIG_ADAPTEC_STARFIRE is not set
723# CONFIG_KSZ884X_PCI is not set
722# CONFIG_B44 is not set 724# CONFIG_B44 is not set
723# CONFIG_FORCEDETH is not set 725# CONFIG_FORCEDETH is not set
724# CONFIG_E100 is not set 726# CONFIG_E100 is not set
@@ -771,6 +773,8 @@ CONFIG_NETDEV_10000=y
771# CONFIG_CHELSIO_T1 is not set 773# CONFIG_CHELSIO_T1 is not set
772CONFIG_CHELSIO_T3_DEPENDS=y 774CONFIG_CHELSIO_T3_DEPENDS=y
773# CONFIG_CHELSIO_T3 is not set 775# CONFIG_CHELSIO_T3 is not set
776CONFIG_CHELSIO_T4_DEPENDS=y
777# CONFIG_CHELSIO_T4 is not set
774# CONFIG_ENIC is not set 778# CONFIG_ENIC is not set
775# CONFIG_IXGBE is not set 779# CONFIG_IXGBE is not set
776# CONFIG_IXGB is not set 780# CONFIG_IXGB is not set
@@ -783,6 +787,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
783# CONFIG_MLX4_CORE is not set 787# CONFIG_MLX4_CORE is not set
784# CONFIG_TEHUTI is not set 788# CONFIG_TEHUTI is not set
785# CONFIG_BNX2X is not set 789# CONFIG_BNX2X is not set
790# CONFIG_QLCNIC is not set
786# CONFIG_QLGE is not set 791# CONFIG_QLGE is not set
787# CONFIG_SFC is not set 792# CONFIG_SFC is not set
788# CONFIG_BE2NET is not set 793# CONFIG_BE2NET is not set
@@ -805,6 +810,7 @@ CONFIG_WLAN=y
805# CONFIG_USB_PEGASUS is not set 810# CONFIG_USB_PEGASUS is not set
806# CONFIG_USB_RTL8150 is not set 811# CONFIG_USB_RTL8150 is not set
807# CONFIG_USB_USBNET is not set 812# CONFIG_USB_USBNET is not set
813# CONFIG_USB_IPHETH is not set
808# CONFIG_WAN is not set 814# CONFIG_WAN is not set
809# CONFIG_FDDI is not set 815# CONFIG_FDDI is not set
810# CONFIG_HIPPI is not set 816# CONFIG_HIPPI is not set
@@ -882,6 +888,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
882CONFIG_SERIAL_CORE=y 888CONFIG_SERIAL_CORE=y
883CONFIG_SERIAL_CORE_CONSOLE=y 889CONFIG_SERIAL_CORE_CONSOLE=y
884# CONFIG_SERIAL_JSM is not set 890# CONFIG_SERIAL_JSM is not set
891# CONFIG_SERIAL_TIMBERDALE is not set
885CONFIG_UNIX98_PTYS=y 892CONFIG_UNIX98_PTYS=y
886# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 893# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
887CONFIG_LEGACY_PTYS=y 894CONFIG_LEGACY_PTYS=y
@@ -964,6 +971,7 @@ CONFIG_MFD_SM501=y
964# CONFIG_MFD_MC13783 is not set 971# CONFIG_MFD_MC13783 is not set
965# CONFIG_EZX_PCAP is not set 972# CONFIG_EZX_PCAP is not set
966# CONFIG_AB4500_CORE is not set 973# CONFIG_AB4500_CORE is not set
974# CONFIG_LPC_SCH is not set
967# CONFIG_REGULATOR is not set 975# CONFIG_REGULATOR is not set
968# CONFIG_MEDIA_SUPPORT is not set 976# CONFIG_MEDIA_SUPPORT is not set
969 977
@@ -971,6 +979,7 @@ CONFIG_MFD_SM501=y
971# Graphics support 979# Graphics support
972# 980#
973CONFIG_VGA_ARB=y 981CONFIG_VGA_ARB=y
982CONFIG_VGA_ARB_MAX_GPUS=16
974# CONFIG_DRM is not set 983# CONFIG_DRM is not set
975# CONFIG_VGASTATE is not set 984# CONFIG_VGASTATE is not set
976CONFIG_VIDEO_OUTPUT_CONTROL=m 985CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1152,6 +1161,7 @@ CONFIG_SND_SPI=y
1152CONFIG_SND_SUPERH=y 1161CONFIG_SND_SUPERH=y
1153CONFIG_SND_USB=y 1162CONFIG_SND_USB=y
1154# CONFIG_SND_USB_AUDIO is not set 1163# CONFIG_SND_USB_AUDIO is not set
1164# CONFIG_SND_USB_UA101 is not set
1155# CONFIG_SND_USB_CAIAQ is not set 1165# CONFIG_SND_USB_CAIAQ is not set
1156# CONFIG_SND_SOC is not set 1166# CONFIG_SND_SOC is not set
1157CONFIG_SOUND_PRIME=m 1167CONFIG_SOUND_PRIME=m
@@ -1170,6 +1180,7 @@ CONFIG_USB_HID=y
1170# 1180#
1171# Special HID drivers 1181# Special HID drivers
1172# 1182#
1183# CONFIG_HID_3M_PCT is not set
1173CONFIG_HID_A4TECH=y 1184CONFIG_HID_A4TECH=y
1174CONFIG_HID_APPLE=y 1185CONFIG_HID_APPLE=y
1175CONFIG_HID_BELKIN=y 1186CONFIG_HID_BELKIN=y
@@ -1185,14 +1196,19 @@ CONFIG_HID_GYRATION=y
1185CONFIG_HID_LOGITECH=y 1196CONFIG_HID_LOGITECH=y
1186# CONFIG_LOGITECH_FF is not set 1197# CONFIG_LOGITECH_FF is not set
1187# CONFIG_LOGIRUMBLEPAD2_FF is not set 1198# CONFIG_LOGIRUMBLEPAD2_FF is not set
1199# CONFIG_LOGIG940_FF is not set
1188CONFIG_HID_MICROSOFT=y 1200CONFIG_HID_MICROSOFT=y
1201# CONFIG_HID_MOSART is not set
1189CONFIG_HID_MONTEREY=y 1202CONFIG_HID_MONTEREY=y
1190# CONFIG_HID_NTRIG is not set 1203# CONFIG_HID_NTRIG is not set
1204# CONFIG_HID_ORTEK is not set
1191CONFIG_HID_PANTHERLORD=y 1205CONFIG_HID_PANTHERLORD=y
1192# CONFIG_PANTHERLORD_FF is not set 1206# CONFIG_PANTHERLORD_FF is not set
1193CONFIG_HID_PETALYNX=y 1207CONFIG_HID_PETALYNX=y
1208# CONFIG_HID_QUANTA is not set
1194CONFIG_HID_SAMSUNG=y 1209CONFIG_HID_SAMSUNG=y
1195CONFIG_HID_SONY=y 1210CONFIG_HID_SONY=y
1211# CONFIG_HID_STANTUM is not set
1196CONFIG_HID_SUNPLUS=y 1212CONFIG_HID_SUNPLUS=y
1197# CONFIG_HID_GREENASIA is not set 1213# CONFIG_HID_GREENASIA is not set
1198# CONFIG_HID_SMARTJOYPLUS is not set 1214# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1291,7 +1307,6 @@ CONFIG_USB_LIBUSUAL=y
1291# CONFIG_USB_RIO500 is not set 1307# CONFIG_USB_RIO500 is not set
1292# CONFIG_USB_LEGOTOWER is not set 1308# CONFIG_USB_LEGOTOWER is not set
1293# CONFIG_USB_LCD is not set 1309# CONFIG_USB_LCD is not set
1294# CONFIG_USB_BERRY_CHARGE is not set
1295# CONFIG_USB_LED is not set 1310# CONFIG_USB_LED is not set
1296# CONFIG_USB_CYPRESS_CY7C63 is not set 1311# CONFIG_USB_CYPRESS_CY7C63 is not set
1297# CONFIG_USB_CYTHERM is not set 1312# CONFIG_USB_CYTHERM is not set
@@ -1303,7 +1318,6 @@ CONFIG_USB_LIBUSUAL=y
1303# CONFIG_USB_IOWARRIOR is not set 1318# CONFIG_USB_IOWARRIOR is not set
1304# CONFIG_USB_TEST is not set 1319# CONFIG_USB_TEST is not set
1305# CONFIG_USB_ISIGHTFW is not set 1320# CONFIG_USB_ISIGHTFW is not set
1306# CONFIG_USB_VST is not set
1307# CONFIG_USB_GADGET is not set 1321# CONFIG_USB_GADGET is not set
1308 1322
1309# 1323#
@@ -1381,7 +1395,6 @@ CONFIG_EXT2_FS=y
1381# CONFIG_EXT2_FS_XIP is not set 1395# CONFIG_EXT2_FS_XIP is not set
1382# CONFIG_EXT3_FS is not set 1396# CONFIG_EXT3_FS is not set
1383# CONFIG_EXT4_FS is not set 1397# CONFIG_EXT4_FS is not set
1384CONFIG_EXT4_USE_FOR_EXT23=y
1385# CONFIG_REISERFS_FS is not set 1398# CONFIG_REISERFS_FS is not set
1386# CONFIG_JFS_FS is not set 1399# CONFIG_JFS_FS is not set
1387# CONFIG_FS_POSIX_ACL is not set 1400# CONFIG_FS_POSIX_ACL is not set
@@ -1442,6 +1455,7 @@ CONFIG_MISC_FILESYSTEMS=y
1442# CONFIG_BEFS_FS is not set 1455# CONFIG_BEFS_FS is not set
1443# CONFIG_BFS_FS is not set 1456# CONFIG_BFS_FS is not set
1444# CONFIG_EFS_FS is not set 1457# CONFIG_EFS_FS is not set
1458# CONFIG_LOGFS is not set
1445# CONFIG_CRAMFS is not set 1459# CONFIG_CRAMFS is not set
1446# CONFIG_SQUASHFS is not set 1460# CONFIG_SQUASHFS is not set
1447# CONFIG_VXFS_FS is not set 1461# CONFIG_VXFS_FS is not set
@@ -1456,6 +1470,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
1456# CONFIG_NFS_FS is not set 1470# CONFIG_NFS_FS is not set
1457# CONFIG_NFSD is not set 1471# CONFIG_NFSD is not set
1458# CONFIG_SMB_FS is not set 1472# CONFIG_SMB_FS is not set
1473# CONFIG_CEPH_FS is not set
1459# CONFIG_CIFS is not set 1474# CONFIG_CIFS is not set
1460# CONFIG_NCP_FS is not set 1475# CONFIG_NCP_FS is not set
1461# CONFIG_CODA_FS is not set 1476# CONFIG_CODA_FS is not set
@@ -1522,13 +1537,12 @@ CONFIG_FRAME_WARN=1024
1522CONFIG_DEBUG_FS=y 1537CONFIG_DEBUG_FS=y
1523# CONFIG_HEADERS_CHECK is not set 1538# CONFIG_HEADERS_CHECK is not set
1524# CONFIG_DEBUG_KERNEL is not set 1539# CONFIG_DEBUG_KERNEL is not set
1525CONFIG_STACKTRACE=y
1526CONFIG_DEBUG_BUGVERBOSE=y 1540CONFIG_DEBUG_BUGVERBOSE=y
1527# CONFIG_DEBUG_MEMORY_INIT is not set 1541# CONFIG_DEBUG_MEMORY_INIT is not set
1528# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1542# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1543# CONFIG_LKDTM is not set
1529# CONFIG_LATENCYTOP is not set 1544# CONFIG_LATENCYTOP is not set
1530# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1545# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1531CONFIG_NOP_TRACER=y
1532CONFIG_HAVE_FUNCTION_TRACER=y 1546CONFIG_HAVE_FUNCTION_TRACER=y
1533CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1547CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1534CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1548CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1536,10 +1550,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1536CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1550CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1537CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1551CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1538CONFIG_RING_BUFFER=y 1552CONFIG_RING_BUFFER=y
1539CONFIG_EVENT_TRACING=y
1540CONFIG_CONTEXT_SWITCH_TRACER=y
1541CONFIG_RING_BUFFER_ALLOW_SWAP=y 1553CONFIG_RING_BUFFER_ALLOW_SWAP=y
1542CONFIG_TRACING=y
1543CONFIG_TRACING_SUPPORT=y 1554CONFIG_TRACING_SUPPORT=y
1544# CONFIG_FTRACE is not set 1555# CONFIG_FTRACE is not set
1545# CONFIG_DYNAMIC_DEBUG is not set 1556# CONFIG_DYNAMIC_DEBUG is not set
@@ -1648,7 +1659,8 @@ CONFIG_CRYPTO=y
1648# CONFIG_CRYPTO_ANSI_CPRNG is not set 1659# CONFIG_CRYPTO_ANSI_CPRNG is not set
1649CONFIG_CRYPTO_HW=y 1660CONFIG_CRYPTO_HW=y
1650# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1661# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1651CONFIG_BINARY_PRINTF=y 1662# CONFIG_VIRTUALIZATION is not set
1663# CONFIG_BINARY_PRINTF is not set
1652 1664
1653# 1665#
1654# Library routines 1666# Library routines
diff --git a/arch/sh/configs/rts7751r2dplus_defconfig b/arch/sh/configs/rts7751r2dplus_defconfig
index 6d511d06cbf6..487abcc4d4e7 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 13:26:39 2010 4# Tue May 18 16:20:00 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_IO_TRAPPED=y 34CONFIG_IO_TRAPPED=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -47,9 +48,11 @@ CONFIG_LOCALVERSION_AUTO=y
47CONFIG_HAVE_KERNEL_GZIP=y 48CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y 49CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y 50CONFIG_HAVE_KERNEL_LZMA=y
51CONFIG_HAVE_KERNEL_LZO=y
50CONFIG_KERNEL_GZIP=y 52CONFIG_KERNEL_GZIP=y
51# CONFIG_KERNEL_BZIP2 is not set 53# CONFIG_KERNEL_BZIP2 is not set
52# CONFIG_KERNEL_LZMA is not set 54# CONFIG_KERNEL_LZMA is not set
55# CONFIG_KERNEL_LZO is not set
53CONFIG_SWAP=y 56CONFIG_SWAP=y
54CONFIG_SYSVIPC=y 57CONFIG_SYSVIPC=y
55CONFIG_SYSVIPC_SYSCTL=y 58CONFIG_SYSVIPC_SYSCTL=y
@@ -70,7 +73,6 @@ CONFIG_RCU_FANOUT=32
70# CONFIG_TREE_RCU_TRACE is not set 73# CONFIG_TREE_RCU_TRACE is not set
71# CONFIG_IKCONFIG is not set 74# CONFIG_IKCONFIG is not set
72CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
73# CONFIG_GROUP_SCHED is not set
74# CONFIG_CGROUPS is not set 76# CONFIG_CGROUPS is not set
75CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
76CONFIG_SYSFS_DEPRECATED_V2=y 78CONFIG_SYSFS_DEPRECATED_V2=y
@@ -104,7 +106,6 @@ CONFIG_PERF_USE_VMALLOC=y
104# Kernel Performance Events And Counters 106# Kernel Performance Events And Counters
105# 107#
106CONFIG_PERF_EVENTS=y 108CONFIG_PERF_EVENTS=y
107CONFIG_EVENT_PROFILE=y
108# CONFIG_PERF_COUNTERS is not set 109# CONFIG_PERF_COUNTERS is not set
109CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
110CONFIG_PCI_QUIRKS=y 111CONFIG_PCI_QUIRKS=y
@@ -113,7 +114,6 @@ CONFIG_SLAB=y
113# CONFIG_SLUB is not set 114# CONFIG_SLUB is not set
114# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
115CONFIG_PROFILING=y 116CONFIG_PROFILING=y
116CONFIG_TRACEPOINTS=y
117CONFIG_OPROFILE=y 117CONFIG_OPROFILE=y
118CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
119# CONFIG_KPROBES is not set 119# CONFIG_KPROBES is not set
@@ -124,6 +124,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124CONFIG_HAVE_DMA_ATTRS=y 124CONFIG_HAVE_DMA_ATTRS=y
125CONFIG_HAVE_CLK=y 125CONFIG_HAVE_CLK=y
126CONFIG_HAVE_DMA_API_DEBUG=y 126CONFIG_HAVE_DMA_API_DEBUG=y
127CONFIG_HAVE_HW_BREAKPOINT=y
127 128
128# 129#
129# GCOV-based kernel profiling 130# GCOV-based kernel profiling
@@ -242,6 +243,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
242CONFIG_MAX_ACTIVE_REGIONS=1 243CONFIG_MAX_ACTIVE_REGIONS=1
243CONFIG_ARCH_POPULATES_NODE_MAP=y 244CONFIG_ARCH_POPULATES_NODE_MAP=y
244CONFIG_ARCH_SELECT_MEMORY_MODEL=y 245CONFIG_ARCH_SELECT_MEMORY_MODEL=y
246CONFIG_UNCACHED_MAPPING=y
245CONFIG_PAGE_SIZE_4KB=y 247CONFIG_PAGE_SIZE_4KB=y
246# CONFIG_PAGE_SIZE_8KB is not set 248# CONFIG_PAGE_SIZE_8KB is not set
247# CONFIG_PAGE_SIZE_16KB is not set 249# CONFIG_PAGE_SIZE_16KB is not set
@@ -257,7 +259,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
257CONFIG_SPLIT_PTLOCK_CPUS=4 259CONFIG_SPLIT_PTLOCK_CPUS=4
258# CONFIG_PHYS_ADDR_T_64BIT is not set 260# CONFIG_PHYS_ADDR_T_64BIT is not set
259CONFIG_ZONE_DMA_FLAG=0 261CONFIG_ZONE_DMA_FLAG=0
260CONFIG_NR_QUICK=2 262CONFIG_NR_QUICK=1
261# CONFIG_KSM is not set 263# CONFIG_KSM is not set
262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 264CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
263 265
@@ -343,7 +345,6 @@ CONFIG_PREEMPT_NONE=y
343# CONFIG_PREEMPT is not set 345# CONFIG_PREEMPT is not set
344CONFIG_GUSA=y 346CONFIG_GUSA=y
345# CONFIG_GUSA_RB is not set 347# CONFIG_GUSA_RB is not set
346# CONFIG_SPARSE_IRQ is not set
347 348
348# 349#
349# Boot options 350# Boot options
@@ -359,9 +360,9 @@ CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 root=/dev/sda1"
359# Bus options 360# Bus options
360# 361#
361CONFIG_PCI=y 362CONFIG_PCI=y
363CONFIG_PCI_DOMAINS=y
362# CONFIG_PCIEPORTBUS is not set 364# CONFIG_PCIEPORTBUS is not set
363# CONFIG_ARCH_SUPPORTS_MSI is not set 365# CONFIG_ARCH_SUPPORTS_MSI is not set
364CONFIG_PCI_LEGACY=y
365# CONFIG_PCI_STUB is not set 366# CONFIG_PCI_STUB is not set
366# CONFIG_PCI_IOV is not set 367# CONFIG_PCI_IOV is not set
367# CONFIG_PCCARD is not set 368# CONFIG_PCCARD is not set
@@ -389,7 +390,6 @@ CONFIG_NET=y
389# Networking options 390# Networking options
390# 391#
391CONFIG_PACKET=y 392CONFIG_PACKET=y
392# CONFIG_PACKET_MMAP is not set
393CONFIG_UNIX=y 393CONFIG_UNIX=y
394CONFIG_XFRM=y 394CONFIG_XFRM=y
395# CONFIG_XFRM_USER is not set 395# CONFIG_XFRM_USER is not set
@@ -449,7 +449,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
449# Network testing 449# Network testing
450# 450#
451# CONFIG_NET_PKTGEN is not set 451# CONFIG_NET_PKTGEN is not set
452# CONFIG_NET_DROP_MONITOR is not set
453# CONFIG_HAMRADIO is not set 452# CONFIG_HAMRADIO is not set
454# CONFIG_CAN is not set 453# CONFIG_CAN is not set
455# CONFIG_IRDA is not set 454# CONFIG_IRDA is not set
@@ -611,6 +610,7 @@ CONFIG_HAVE_IDE=y
611# 610#
612# SCSI device support 611# SCSI device support
613# 612#
613CONFIG_SCSI_MOD=y
614# CONFIG_RAID_ATTRS is not set 614# CONFIG_RAID_ATTRS is not set
615CONFIG_SCSI=y 615CONFIG_SCSI=y
616CONFIG_SCSI_DMA=y 616CONFIG_SCSI_DMA=y
@@ -728,6 +728,7 @@ CONFIG_ATA_SFF=y
728# CONFIG_PATA_IT821X is not set 728# CONFIG_PATA_IT821X is not set
729# CONFIG_PATA_IT8213 is not set 729# CONFIG_PATA_IT8213 is not set
730# CONFIG_PATA_JMICRON is not set 730# CONFIG_PATA_JMICRON is not set
731# CONFIG_PATA_LEGACY is not set
731# CONFIG_PATA_TRIFLEX is not set 732# CONFIG_PATA_TRIFLEX is not set
732# CONFIG_PATA_MARVELL is not set 733# CONFIG_PATA_MARVELL is not set
733# CONFIG_PATA_MPIIX is not set 734# CONFIG_PATA_MPIIX is not set
@@ -764,7 +765,7 @@ CONFIG_PATA_PLATFORM=y
764# 765#
765 766
766# 767#
767# See the help texts for more information. 768# The newer stack is recommended.
768# 769#
769# CONFIG_FIREWIRE is not set 770# CONFIG_FIREWIRE is not set
770# CONFIG_IEEE1394 is not set 771# CONFIG_IEEE1394 is not set
@@ -805,6 +806,7 @@ CONFIG_NET_PCI=y
805# CONFIG_PCNET32 is not set 806# CONFIG_PCNET32 is not set
806# CONFIG_AMD8111_ETH is not set 807# CONFIG_AMD8111_ETH is not set
807# CONFIG_ADAPTEC_STARFIRE is not set 808# CONFIG_ADAPTEC_STARFIRE is not set
809# CONFIG_KSZ884X_PCI is not set
808# CONFIG_B44 is not set 810# CONFIG_B44 is not set
809# CONFIG_FORCEDETH is not set 811# CONFIG_FORCEDETH is not set
810# CONFIG_E100 is not set 812# CONFIG_E100 is not set
@@ -857,6 +859,8 @@ CONFIG_NETDEV_10000=y
857# CONFIG_CHELSIO_T1 is not set 859# CONFIG_CHELSIO_T1 is not set
858CONFIG_CHELSIO_T3_DEPENDS=y 860CONFIG_CHELSIO_T3_DEPENDS=y
859# CONFIG_CHELSIO_T3 is not set 861# CONFIG_CHELSIO_T3 is not set
862CONFIG_CHELSIO_T4_DEPENDS=y
863# CONFIG_CHELSIO_T4 is not set
860# CONFIG_ENIC is not set 864# CONFIG_ENIC is not set
861# CONFIG_IXGBE is not set 865# CONFIG_IXGBE is not set
862# CONFIG_IXGB is not set 866# CONFIG_IXGB is not set
@@ -869,6 +873,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
869# CONFIG_MLX4_CORE is not set 873# CONFIG_MLX4_CORE is not set
870# CONFIG_TEHUTI is not set 874# CONFIG_TEHUTI is not set
871# CONFIG_BNX2X is not set 875# CONFIG_BNX2X is not set
876# CONFIG_QLCNIC is not set
872# CONFIG_QLGE is not set 877# CONFIG_QLGE is not set
873# CONFIG_SFC is not set 878# CONFIG_SFC is not set
874# CONFIG_BE2NET is not set 879# CONFIG_BE2NET is not set
@@ -891,6 +896,7 @@ CONFIG_WLAN=y
891# CONFIG_USB_PEGASUS is not set 896# CONFIG_USB_PEGASUS is not set
892# CONFIG_USB_RTL8150 is not set 897# CONFIG_USB_RTL8150 is not set
893# CONFIG_USB_USBNET is not set 898# CONFIG_USB_USBNET is not set
899# CONFIG_USB_IPHETH is not set
894# CONFIG_WAN is not set 900# CONFIG_WAN is not set
895# CONFIG_FDDI is not set 901# CONFIG_FDDI is not set
896# CONFIG_HIPPI is not set 902# CONFIG_HIPPI is not set
@@ -968,6 +974,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
968CONFIG_SERIAL_CORE=y 974CONFIG_SERIAL_CORE=y
969CONFIG_SERIAL_CORE_CONSOLE=y 975CONFIG_SERIAL_CORE_CONSOLE=y
970# CONFIG_SERIAL_JSM is not set 976# CONFIG_SERIAL_JSM is not set
977# CONFIG_SERIAL_TIMBERDALE is not set
971CONFIG_UNIX98_PTYS=y 978CONFIG_UNIX98_PTYS=y
972# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 979# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
973CONFIG_LEGACY_PTYS=y 980CONFIG_LEGACY_PTYS=y
@@ -1050,6 +1057,7 @@ CONFIG_MFD_SM501=y
1050# CONFIG_MFD_MC13783 is not set 1057# CONFIG_MFD_MC13783 is not set
1051# CONFIG_EZX_PCAP is not set 1058# CONFIG_EZX_PCAP is not set
1052# CONFIG_AB4500_CORE is not set 1059# CONFIG_AB4500_CORE is not set
1060# CONFIG_LPC_SCH is not set
1053# CONFIG_REGULATOR is not set 1061# CONFIG_REGULATOR is not set
1054# CONFIG_MEDIA_SUPPORT is not set 1062# CONFIG_MEDIA_SUPPORT is not set
1055 1063
@@ -1057,6 +1065,7 @@ CONFIG_MFD_SM501=y
1057# Graphics support 1065# Graphics support
1058# 1066#
1059CONFIG_VGA_ARB=y 1067CONFIG_VGA_ARB=y
1068CONFIG_VGA_ARB_MAX_GPUS=16
1060# CONFIG_DRM is not set 1069# CONFIG_DRM is not set
1061# CONFIG_VGASTATE is not set 1070# CONFIG_VGASTATE is not set
1062CONFIG_VIDEO_OUTPUT_CONTROL=m 1071CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1238,6 +1247,7 @@ CONFIG_SND_SPI=y
1238CONFIG_SND_SUPERH=y 1247CONFIG_SND_SUPERH=y
1239CONFIG_SND_USB=y 1248CONFIG_SND_USB=y
1240# CONFIG_SND_USB_AUDIO is not set 1249# CONFIG_SND_USB_AUDIO is not set
1250# CONFIG_SND_USB_UA101 is not set
1241# CONFIG_SND_USB_CAIAQ is not set 1251# CONFIG_SND_USB_CAIAQ is not set
1242# CONFIG_SND_SOC is not set 1252# CONFIG_SND_SOC is not set
1243CONFIG_SOUND_PRIME=m 1253CONFIG_SOUND_PRIME=m
@@ -1256,6 +1266,7 @@ CONFIG_USB_HID=y
1256# 1266#
1257# Special HID drivers 1267# Special HID drivers
1258# 1268#
1269# CONFIG_HID_3M_PCT is not set
1259CONFIG_HID_A4TECH=y 1270CONFIG_HID_A4TECH=y
1260CONFIG_HID_APPLE=y 1271CONFIG_HID_APPLE=y
1261CONFIG_HID_BELKIN=y 1272CONFIG_HID_BELKIN=y
@@ -1271,14 +1282,19 @@ CONFIG_HID_GYRATION=y
1271CONFIG_HID_LOGITECH=y 1282CONFIG_HID_LOGITECH=y
1272# CONFIG_LOGITECH_FF is not set 1283# CONFIG_LOGITECH_FF is not set
1273# CONFIG_LOGIRUMBLEPAD2_FF is not set 1284# CONFIG_LOGIRUMBLEPAD2_FF is not set
1285# CONFIG_LOGIG940_FF is not set
1274CONFIG_HID_MICROSOFT=y 1286CONFIG_HID_MICROSOFT=y
1287# CONFIG_HID_MOSART is not set
1275CONFIG_HID_MONTEREY=y 1288CONFIG_HID_MONTEREY=y
1276# CONFIG_HID_NTRIG is not set 1289# CONFIG_HID_NTRIG is not set
1290# CONFIG_HID_ORTEK is not set
1277CONFIG_HID_PANTHERLORD=y 1291CONFIG_HID_PANTHERLORD=y
1278# CONFIG_PANTHERLORD_FF is not set 1292# CONFIG_PANTHERLORD_FF is not set
1279CONFIG_HID_PETALYNX=y 1293CONFIG_HID_PETALYNX=y
1294# CONFIG_HID_QUANTA is not set
1280CONFIG_HID_SAMSUNG=y 1295CONFIG_HID_SAMSUNG=y
1281CONFIG_HID_SONY=y 1296CONFIG_HID_SONY=y
1297# CONFIG_HID_STANTUM is not set
1282CONFIG_HID_SUNPLUS=y 1298CONFIG_HID_SUNPLUS=y
1283# CONFIG_HID_GREENASIA is not set 1299# CONFIG_HID_GREENASIA is not set
1284# CONFIG_HID_SMARTJOYPLUS is not set 1300# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1377,7 +1393,6 @@ CONFIG_USB_LIBUSUAL=y
1377# CONFIG_USB_RIO500 is not set 1393# CONFIG_USB_RIO500 is not set
1378# CONFIG_USB_LEGOTOWER is not set 1394# CONFIG_USB_LEGOTOWER is not set
1379# CONFIG_USB_LCD is not set 1395# CONFIG_USB_LCD is not set
1380# CONFIG_USB_BERRY_CHARGE is not set
1381# CONFIG_USB_LED is not set 1396# CONFIG_USB_LED is not set
1382# CONFIG_USB_CYPRESS_CY7C63 is not set 1397# CONFIG_USB_CYPRESS_CY7C63 is not set
1383# CONFIG_USB_CYTHERM is not set 1398# CONFIG_USB_CYTHERM is not set
@@ -1389,7 +1404,6 @@ CONFIG_USB_LIBUSUAL=y
1389# CONFIG_USB_IOWARRIOR is not set 1404# CONFIG_USB_IOWARRIOR is not set
1390# CONFIG_USB_TEST is not set 1405# CONFIG_USB_TEST is not set
1391# CONFIG_USB_ISIGHTFW is not set 1406# CONFIG_USB_ISIGHTFW is not set
1392# CONFIG_USB_VST is not set
1393# CONFIG_USB_GADGET is not set 1407# CONFIG_USB_GADGET is not set
1394 1408
1395# 1409#
@@ -1467,7 +1481,6 @@ CONFIG_EXT2_FS=y
1467# CONFIG_EXT2_FS_XIP is not set 1481# CONFIG_EXT2_FS_XIP is not set
1468# CONFIG_EXT3_FS is not set 1482# CONFIG_EXT3_FS is not set
1469# CONFIG_EXT4_FS is not set 1483# CONFIG_EXT4_FS is not set
1470CONFIG_EXT4_USE_FOR_EXT23=y
1471# CONFIG_REISERFS_FS is not set 1484# CONFIG_REISERFS_FS is not set
1472# CONFIG_JFS_FS is not set 1485# CONFIG_JFS_FS is not set
1473# CONFIG_FS_POSIX_ACL is not set 1486# CONFIG_FS_POSIX_ACL is not set
@@ -1529,6 +1542,7 @@ CONFIG_MISC_FILESYSTEMS=y
1529# CONFIG_BFS_FS is not set 1542# CONFIG_BFS_FS is not set
1530# CONFIG_EFS_FS is not set 1543# CONFIG_EFS_FS is not set
1531# CONFIG_JFFS2_FS is not set 1544# CONFIG_JFFS2_FS is not set
1545# CONFIG_LOGFS is not set
1532# CONFIG_CRAMFS is not set 1546# CONFIG_CRAMFS is not set
1533# CONFIG_SQUASHFS is not set 1547# CONFIG_SQUASHFS is not set
1534# CONFIG_VXFS_FS is not set 1548# CONFIG_VXFS_FS is not set
@@ -1543,6 +1557,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
1543# CONFIG_NFS_FS is not set 1557# CONFIG_NFS_FS is not set
1544# CONFIG_NFSD is not set 1558# CONFIG_NFSD is not set
1545# CONFIG_SMB_FS is not set 1559# CONFIG_SMB_FS is not set
1560# CONFIG_CEPH_FS is not set
1546# CONFIG_CIFS is not set 1561# CONFIG_CIFS is not set
1547# CONFIG_NCP_FS is not set 1562# CONFIG_NCP_FS is not set
1548# CONFIG_CODA_FS is not set 1563# CONFIG_CODA_FS is not set
@@ -1609,13 +1624,12 @@ CONFIG_FRAME_WARN=1024
1609CONFIG_DEBUG_FS=y 1624CONFIG_DEBUG_FS=y
1610# CONFIG_HEADERS_CHECK is not set 1625# CONFIG_HEADERS_CHECK is not set
1611# CONFIG_DEBUG_KERNEL is not set 1626# CONFIG_DEBUG_KERNEL is not set
1612CONFIG_STACKTRACE=y
1613CONFIG_DEBUG_BUGVERBOSE=y 1627CONFIG_DEBUG_BUGVERBOSE=y
1614# CONFIG_DEBUG_MEMORY_INIT is not set 1628# CONFIG_DEBUG_MEMORY_INIT is not set
1615# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1629# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1630# CONFIG_LKDTM is not set
1616# CONFIG_LATENCYTOP is not set 1631# CONFIG_LATENCYTOP is not set
1617# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1632# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1618CONFIG_NOP_TRACER=y
1619CONFIG_HAVE_FUNCTION_TRACER=y 1633CONFIG_HAVE_FUNCTION_TRACER=y
1620CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1634CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1621CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1635CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1623,10 +1637,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1623CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1637CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1624CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1638CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1625CONFIG_RING_BUFFER=y 1639CONFIG_RING_BUFFER=y
1626CONFIG_EVENT_TRACING=y
1627CONFIG_CONTEXT_SWITCH_TRACER=y
1628CONFIG_RING_BUFFER_ALLOW_SWAP=y 1640CONFIG_RING_BUFFER_ALLOW_SWAP=y
1629CONFIG_TRACING=y
1630CONFIG_TRACING_SUPPORT=y 1641CONFIG_TRACING_SUPPORT=y
1631# CONFIG_FTRACE is not set 1642# CONFIG_FTRACE is not set
1632# CONFIG_DYNAMIC_DEBUG is not set 1643# CONFIG_DYNAMIC_DEBUG is not set
@@ -1735,7 +1746,8 @@ CONFIG_CRYPTO=y
1735# CONFIG_CRYPTO_ANSI_CPRNG is not set 1746# CONFIG_CRYPTO_ANSI_CPRNG is not set
1736CONFIG_CRYPTO_HW=y 1747CONFIG_CRYPTO_HW=y
1737# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1748# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1738CONFIG_BINARY_PRINTF=y 1749# CONFIG_VIRTUALIZATION is not set
1750# CONFIG_BINARY_PRINTF is not set
1739 1751
1740# 1752#
1741# Library routines 1753# Library routines
diff --git a/arch/sh/configs/sdk7780_defconfig b/arch/sh/configs/sdk7780_defconfig
index 1859ba099945..fe923142c2cc 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 13:27:20 2010 4# Tue May 18 16:21:00 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -47,9 +48,11 @@ CONFIG_LOCALVERSION_AUTO=y
47CONFIG_HAVE_KERNEL_GZIP=y 48CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y 49CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y 50CONFIG_HAVE_KERNEL_LZMA=y
51CONFIG_HAVE_KERNEL_LZO=y
50CONFIG_KERNEL_GZIP=y 52CONFIG_KERNEL_GZIP=y
51# CONFIG_KERNEL_BZIP2 is not set 53# CONFIG_KERNEL_BZIP2 is not set
52# CONFIG_KERNEL_LZMA is not set 54# CONFIG_KERNEL_LZMA is not set
55# CONFIG_KERNEL_LZO is not set
53CONFIG_SWAP=y 56CONFIG_SWAP=y
54CONFIG_SYSVIPC=y 57CONFIG_SYSVIPC=y
55CONFIG_SYSVIPC_SYSCTL=y 58CONFIG_SYSVIPC_SYSCTL=y
@@ -73,7 +76,6 @@ CONFIG_RCU_FANOUT=32
73CONFIG_IKCONFIG=y 76CONFIG_IKCONFIG=y
74CONFIG_IKCONFIG_PROC=y 77CONFIG_IKCONFIG_PROC=y
75CONFIG_LOG_BUF_SHIFT=18 78CONFIG_LOG_BUF_SHIFT=18
76# CONFIG_GROUP_SCHED is not set
77# CONFIG_CGROUPS is not set 79# CONFIG_CGROUPS is not set
78CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
@@ -107,8 +109,9 @@ CONFIG_PERF_USE_VMALLOC=y
107# 109#
108# Kernel Performance Events And Counters 110# Kernel Performance Events And Counters
109# 111#
110# CONFIG_PERF_EVENTS is not set 112CONFIG_PERF_EVENTS=y
111# CONFIG_PERF_COUNTERS is not set 113# CONFIG_PERF_COUNTERS is not set
114# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
112CONFIG_VM_EVENT_COUNTERS=y 115CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_PCI_QUIRKS=y 116CONFIG_PCI_QUIRKS=y
114CONFIG_SLUB_DEBUG=y 117CONFIG_SLUB_DEBUG=y
@@ -126,6 +129,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
126CONFIG_HAVE_DMA_ATTRS=y 129CONFIG_HAVE_DMA_ATTRS=y
127CONFIG_HAVE_CLK=y 130CONFIG_HAVE_CLK=y
128CONFIG_HAVE_DMA_API_DEBUG=y 131CONFIG_HAVE_DMA_API_DEBUG=y
132CONFIG_HAVE_HW_BREAKPOINT=y
129 133
130# 134#
131# GCOV-based kernel profiling 135# GCOV-based kernel profiling
@@ -237,11 +241,8 @@ CONFIG_PAGE_OFFSET=0x80000000
237CONFIG_FORCE_MAX_ZONEORDER=11 241CONFIG_FORCE_MAX_ZONEORDER=11
238CONFIG_MEMORY_START=0x08000000 242CONFIG_MEMORY_START=0x08000000
239CONFIG_MEMORY_SIZE=0x08000000 243CONFIG_MEMORY_SIZE=0x08000000
240# CONFIG_29BIT is not set 244CONFIG_29BIT=y
241CONFIG_32BIT=y
242CONFIG_PMB_ENABLE=y
243# CONFIG_PMB is not set 245# CONFIG_PMB is not set
244CONFIG_PMB_FIXED=y
245CONFIG_VSYSCALL=y 246CONFIG_VSYSCALL=y
246CONFIG_ARCH_FLATMEM_ENABLE=y 247CONFIG_ARCH_FLATMEM_ENABLE=y
247CONFIG_ARCH_SPARSEMEM_ENABLE=y 248CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -249,6 +250,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
249CONFIG_MAX_ACTIVE_REGIONS=1 250CONFIG_MAX_ACTIVE_REGIONS=1
250CONFIG_ARCH_POPULATES_NODE_MAP=y 251CONFIG_ARCH_POPULATES_NODE_MAP=y
251CONFIG_ARCH_SELECT_MEMORY_MODEL=y 252CONFIG_ARCH_SELECT_MEMORY_MODEL=y
253CONFIG_UNCACHED_MAPPING=y
252CONFIG_PAGE_SIZE_4KB=y 254CONFIG_PAGE_SIZE_4KB=y
253# CONFIG_PAGE_SIZE_8KB is not set 255# CONFIG_PAGE_SIZE_8KB is not set
254# CONFIG_PAGE_SIZE_16KB is not set 256# CONFIG_PAGE_SIZE_16KB is not set
@@ -270,7 +272,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
270CONFIG_SPLIT_PTLOCK_CPUS=4 272CONFIG_SPLIT_PTLOCK_CPUS=4
271# CONFIG_PHYS_ADDR_T_64BIT is not set 273# CONFIG_PHYS_ADDR_T_64BIT is not set
272CONFIG_ZONE_DMA_FLAG=0 274CONFIG_ZONE_DMA_FLAG=0
273CONFIG_NR_QUICK=2 275CONFIG_NR_QUICK=1
274# CONFIG_KSM is not set 276# CONFIG_KSM is not set
275CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 277CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
276 278
@@ -353,7 +355,7 @@ CONFIG_SCHED_HRTICK=y
353# CONFIG_PREEMPT_VOLUNTARY is not set 355# CONFIG_PREEMPT_VOLUNTARY is not set
354CONFIG_PREEMPT=y 356CONFIG_PREEMPT=y
355CONFIG_GUSA=y 357CONFIG_GUSA=y
356# CONFIG_SPARSE_IRQ is not set 358# CONFIG_INTC_USERIMASK is not set
357 359
358# 360#
359# Boot options 361# Boot options
@@ -369,16 +371,15 @@ CONFIG_CMDLINE="mem=128M console=tty0 console=ttySC0,115200 ip=bootp root=/dev/n
369# Bus options 371# Bus options
370# 372#
371CONFIG_PCI=y 373CONFIG_PCI=y
374CONFIG_PCI_DOMAINS=y
372# CONFIG_PCIEPORTBUS is not set 375# CONFIG_PCIEPORTBUS is not set
373# CONFIG_ARCH_SUPPORTS_MSI is not set 376# CONFIG_ARCH_SUPPORTS_MSI is not set
374# CONFIG_PCI_LEGACY is not set
375CONFIG_PCI_DEBUG=y 377CONFIG_PCI_DEBUG=y
376# CONFIG_PCI_STUB is not set 378# CONFIG_PCI_STUB is not set
377# CONFIG_PCI_IOV is not set 379# CONFIG_PCI_IOV is not set
378CONFIG_PCCARD=y 380CONFIG_PCCARD=y
379CONFIG_PCMCIA=y 381CONFIG_PCMCIA=y
380CONFIG_PCMCIA_LOAD_CIS=y 382CONFIG_PCMCIA_LOAD_CIS=y
381CONFIG_PCMCIA_IOCTL=y
382CONFIG_CARDBUS=y 383CONFIG_CARDBUS=y
383 384
384# 385#
@@ -417,7 +418,6 @@ CONFIG_NET=y
417# Networking options 418# Networking options
418# 419#
419CONFIG_PACKET=y 420CONFIG_PACKET=y
420# CONFIG_PACKET_MMAP is not set
421CONFIG_UNIX=y 421CONFIG_UNIX=y
422CONFIG_XFRM=y 422CONFIG_XFRM=y
423# CONFIG_XFRM_USER is not set 423# CONFIG_XFRM_USER is not set
@@ -659,6 +659,7 @@ CONFIG_BLK_DEV_GENERIC=y
659# 659#
660# SCSI device support 660# SCSI device support
661# 661#
662CONFIG_SCSI_MOD=y
662# CONFIG_RAID_ATTRS is not set 663# CONFIG_RAID_ATTRS is not set
663CONFIG_SCSI=y 664CONFIG_SCSI=y
664CONFIG_SCSI_DMA=y 665CONFIG_SCSI_DMA=y
@@ -777,6 +778,7 @@ CONFIG_ATA_SFF=y
777# CONFIG_PATA_IT821X is not set 778# CONFIG_PATA_IT821X is not set
778# CONFIG_PATA_IT8213 is not set 779# CONFIG_PATA_IT8213 is not set
779# CONFIG_PATA_JMICRON is not set 780# CONFIG_PATA_JMICRON is not set
781# CONFIG_PATA_LEGACY is not set
780# CONFIG_PATA_TRIFLEX is not set 782# CONFIG_PATA_TRIFLEX is not set
781# CONFIG_PATA_MARVELL is not set 783# CONFIG_PATA_MARVELL is not set
782# CONFIG_PATA_MPIIX is not set 784# CONFIG_PATA_MPIIX is not set
@@ -824,7 +826,7 @@ CONFIG_BLK_DEV_DM=y
824# 826#
825 827
826# 828#
827# See the help texts for more information. 829# The newer stack is recommended.
828# 830#
829# CONFIG_FIREWIRE is not set 831# CONFIG_FIREWIRE is not set
830# CONFIG_IEEE1394 is not set 832# CONFIG_IEEE1394 is not set
@@ -890,6 +892,7 @@ CONFIG_WLAN=y
890# CONFIG_USB_PEGASUS is not set 892# CONFIG_USB_PEGASUS is not set
891# CONFIG_USB_RTL8150 is not set 893# CONFIG_USB_RTL8150 is not set
892# CONFIG_USB_USBNET is not set 894# CONFIG_USB_USBNET is not set
895# CONFIG_USB_IPHETH is not set
893# CONFIG_NET_PCMCIA is not set 896# CONFIG_NET_PCMCIA is not set
894# CONFIG_WAN is not set 897# CONFIG_WAN is not set
895# CONFIG_FDDI is not set 898# CONFIG_FDDI is not set
@@ -995,6 +998,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
995CONFIG_SERIAL_CORE=y 998CONFIG_SERIAL_CORE=y
996CONFIG_SERIAL_CORE_CONSOLE=y 999CONFIG_SERIAL_CORE_CONSOLE=y
997# CONFIG_SERIAL_JSM is not set 1000# CONFIG_SERIAL_JSM is not set
1001# CONFIG_SERIAL_TIMBERDALE is not set
998CONFIG_UNIX98_PTYS=y 1002CONFIG_UNIX98_PTYS=y
999# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1003# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1000CONFIG_LEGACY_PTYS=y 1004CONFIG_LEGACY_PTYS=y
@@ -1057,6 +1061,7 @@ CONFIG_SSB_DRIVER_PCICORE=y
1057# CONFIG_MFD_SH_MOBILE_SDHI is not set 1061# CONFIG_MFD_SH_MOBILE_SDHI is not set
1058# CONFIG_HTC_PASIC3 is not set 1062# CONFIG_HTC_PASIC3 is not set
1059# CONFIG_MFD_TMIO is not set 1063# CONFIG_MFD_TMIO is not set
1064# CONFIG_LPC_SCH is not set
1060# CONFIG_REGULATOR is not set 1065# CONFIG_REGULATOR is not set
1061# CONFIG_MEDIA_SUPPORT is not set 1066# CONFIG_MEDIA_SUPPORT is not set
1062 1067
@@ -1064,6 +1069,7 @@ CONFIG_SSB_DRIVER_PCICORE=y
1064# Graphics support 1069# Graphics support
1065# 1070#
1066CONFIG_VGA_ARB=y 1071CONFIG_VGA_ARB=y
1072CONFIG_VGA_ARB_MAX_GPUS=16
1067# CONFIG_DRM is not set 1073# CONFIG_DRM is not set
1068# CONFIG_VGASTATE is not set 1074# CONFIG_VGASTATE is not set
1069# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1075# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1167,6 +1173,7 @@ CONFIG_USB_HID=y
1167# 1173#
1168# Special HID drivers 1174# Special HID drivers
1169# 1175#
1176# CONFIG_HID_3M_PCT is not set
1170CONFIG_HID_A4TECH=y 1177CONFIG_HID_A4TECH=y
1171CONFIG_HID_APPLE=y 1178CONFIG_HID_APPLE=y
1172CONFIG_HID_BELKIN=y 1179CONFIG_HID_BELKIN=y
@@ -1182,14 +1189,19 @@ CONFIG_HID_GYRATION=y
1182CONFIG_HID_LOGITECH=y 1189CONFIG_HID_LOGITECH=y
1183# CONFIG_LOGITECH_FF is not set 1190# CONFIG_LOGITECH_FF is not set
1184# CONFIG_LOGIRUMBLEPAD2_FF is not set 1191# CONFIG_LOGIRUMBLEPAD2_FF is not set
1192# CONFIG_LOGIG940_FF is not set
1185CONFIG_HID_MICROSOFT=y 1193CONFIG_HID_MICROSOFT=y
1194# CONFIG_HID_MOSART is not set
1186CONFIG_HID_MONTEREY=y 1195CONFIG_HID_MONTEREY=y
1187# CONFIG_HID_NTRIG is not set 1196# CONFIG_HID_NTRIG is not set
1197# CONFIG_HID_ORTEK is not set
1188CONFIG_HID_PANTHERLORD=y 1198CONFIG_HID_PANTHERLORD=y
1189# CONFIG_PANTHERLORD_FF is not set 1199# CONFIG_PANTHERLORD_FF is not set
1190CONFIG_HID_PETALYNX=y 1200CONFIG_HID_PETALYNX=y
1201# CONFIG_HID_QUANTA is not set
1191CONFIG_HID_SAMSUNG=y 1202CONFIG_HID_SAMSUNG=y
1192CONFIG_HID_SONY=y 1203CONFIG_HID_SONY=y
1204# CONFIG_HID_STANTUM is not set
1193CONFIG_HID_SUNPLUS=y 1205CONFIG_HID_SUNPLUS=y
1194# CONFIG_HID_GREENASIA is not set 1206# CONFIG_HID_GREENASIA is not set
1195# CONFIG_HID_SMARTJOYPLUS is not set 1207# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1288,7 +1300,6 @@ CONFIG_USB_STORAGE=y
1288# CONFIG_USB_RIO500 is not set 1300# CONFIG_USB_RIO500 is not set
1289# CONFIG_USB_LEGOTOWER is not set 1301# CONFIG_USB_LEGOTOWER is not set
1290# CONFIG_USB_LCD is not set 1302# CONFIG_USB_LCD is not set
1291# CONFIG_USB_BERRY_CHARGE is not set
1292# CONFIG_USB_LED is not set 1303# CONFIG_USB_LED is not set
1293# CONFIG_USB_CYPRESS_CY7C63 is not set 1304# CONFIG_USB_CYPRESS_CY7C63 is not set
1294# CONFIG_USB_CYTHERM is not set 1305# CONFIG_USB_CYTHERM is not set
@@ -1301,7 +1312,6 @@ CONFIG_USB_STORAGE=y
1301# CONFIG_USB_IOWARRIOR is not set 1312# CONFIG_USB_IOWARRIOR is not set
1302# CONFIG_USB_TEST is not set 1313# CONFIG_USB_TEST is not set
1303# CONFIG_USB_ISIGHTFW is not set 1314# CONFIG_USB_ISIGHTFW is not set
1304# CONFIG_USB_VST is not set
1305# CONFIG_USB_GADGET is not set 1315# CONFIG_USB_GADGET is not set
1306 1316
1307# 1317#
@@ -1317,10 +1327,6 @@ CONFIG_LEDS_CLASS=y
1317# 1327#
1318# LED drivers 1328# LED drivers
1319# 1329#
1320
1321#
1322# LED Triggers
1323#
1324# CONFIG_LEDS_TRIGGERS is not set 1330# CONFIG_LEDS_TRIGGERS is not set
1325# CONFIG_ACCESSIBILITY is not set 1331# CONFIG_ACCESSIBILITY is not set
1326# CONFIG_INFINIBAND is not set 1332# CONFIG_INFINIBAND is not set
@@ -1416,6 +1422,7 @@ CONFIG_MISC_FILESYSTEMS=y
1416# CONFIG_BEFS_FS is not set 1422# CONFIG_BEFS_FS is not set
1417# CONFIG_BFS_FS is not set 1423# CONFIG_BFS_FS is not set
1418# CONFIG_EFS_FS is not set 1424# CONFIG_EFS_FS is not set
1425# CONFIG_LOGFS is not set
1419# CONFIG_CRAMFS is not set 1426# CONFIG_CRAMFS is not set
1420# CONFIG_SQUASHFS is not set 1427# CONFIG_SQUASHFS is not set
1421# CONFIG_VXFS_FS is not set 1428# CONFIG_VXFS_FS is not set
@@ -1444,6 +1451,7 @@ CONFIG_SUNRPC=y
1444# CONFIG_RPCSEC_GSS_KRB5 is not set 1451# CONFIG_RPCSEC_GSS_KRB5 is not set
1445# CONFIG_RPCSEC_GSS_SPKM3 is not set 1452# CONFIG_RPCSEC_GSS_SPKM3 is not set
1446# CONFIG_SMB_FS is not set 1453# CONFIG_SMB_FS is not set
1454# CONFIG_CEPH_FS is not set
1447# CONFIG_CIFS is not set 1455# CONFIG_CIFS is not set
1448# CONFIG_NCP_FS is not set 1456# CONFIG_NCP_FS is not set
1449# CONFIG_CODA_FS is not set 1457# CONFIG_CODA_FS is not set
@@ -1523,6 +1531,7 @@ CONFIG_TIMER_STATS=y
1523# CONFIG_DEBUG_OBJECTS is not set 1531# CONFIG_DEBUG_OBJECTS is not set
1524# CONFIG_SLUB_DEBUG_ON is not set 1532# CONFIG_SLUB_DEBUG_ON is not set
1525# CONFIG_SLUB_STATS is not set 1533# CONFIG_SLUB_STATS is not set
1534# CONFIG_DEBUG_KMEMLEAK is not set
1526CONFIG_DEBUG_PREEMPT=y 1535CONFIG_DEBUG_PREEMPT=y
1527# CONFIG_DEBUG_RT_MUTEXES is not set 1536# CONFIG_DEBUG_RT_MUTEXES is not set
1528# CONFIG_RT_MUTEX_TESTER is not set 1537# CONFIG_RT_MUTEX_TESTER is not set
@@ -1571,6 +1580,7 @@ CONFIG_FTRACE=y
1571CONFIG_BRANCH_PROFILE_NONE=y 1580CONFIG_BRANCH_PROFILE_NONE=y
1572# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1581# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1573# CONFIG_PROFILE_ALL_BRANCHES is not set 1582# CONFIG_PROFILE_ALL_BRANCHES is not set
1583# CONFIG_KSYM_TRACER is not set
1574# CONFIG_STACK_TRACER is not set 1584# CONFIG_STACK_TRACER is not set
1575# CONFIG_KMEMTRACE is not set 1585# CONFIG_KMEMTRACE is not set
1576# CONFIG_WORKQUEUE_TRACER is not set 1586# CONFIG_WORKQUEUE_TRACER is not set
@@ -1690,6 +1700,7 @@ CONFIG_CRYPTO_DES=y
1690# CONFIG_CRYPTO_ANSI_CPRNG is not set 1700# CONFIG_CRYPTO_ANSI_CPRNG is not set
1691CONFIG_CRYPTO_HW=y 1701CONFIG_CRYPTO_HW=y
1692# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1702# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1703# CONFIG_VIRTUALIZATION is not set
1693# CONFIG_BINARY_PRINTF is not set 1704# CONFIG_BINARY_PRINTF is not set
1694 1705
1695# 1706#
diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig
index 740ada659441..269824598520 100644
--- a/arch/sh/configs/sdk7786_defconfig
+++ b/arch/sh/configs/sdk7786_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.34-rc5 3# Linux kernel version: 2.6.34-rc5
4# Mon Apr 26 16:52:58 2010 4# Tue May 18 18:03:37 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -29,6 +29,7 @@ CONFIG_SYS_SUPPORTS_PCI=y
29CONFIG_SYS_SUPPORTS_TMU=y 29CONFIG_SYS_SUPPORTS_TMU=y
30CONFIG_STACKTRACE_SUPPORT=y 30CONFIG_STACKTRACE_SUPPORT=y
31CONFIG_LOCKDEP_SUPPORT=y 31CONFIG_LOCKDEP_SUPPORT=y
32CONFIG_HAVE_LATENCYTOP_SUPPORT=y
32# CONFIG_ARCH_HAS_ILOG2_U32 is not set 33# CONFIG_ARCH_HAS_ILOG2_U32 is not set
33# CONFIG_ARCH_HAS_ILOG2_U64 is not set 34# CONFIG_ARCH_HAS_ILOG2_U64 is not set
34CONFIG_ARCH_NO_VIRT_TO_BUS=y 35CONFIG_ARCH_NO_VIRT_TO_BUS=y
@@ -277,7 +278,7 @@ CONFIG_QUICKLIST=y
277CONFIG_MMU=y 278CONFIG_MMU=y
278CONFIG_PAGE_OFFSET=0x80000000 279CONFIG_PAGE_OFFSET=0x80000000
279CONFIG_FORCE_MAX_ZONEORDER=11 280CONFIG_FORCE_MAX_ZONEORDER=11
280CONFIG_MEMORY_START=0x60000000 281CONFIG_MEMORY_START=0x40000000
281CONFIG_MEMORY_SIZE=0x20000000 282CONFIG_MEMORY_SIZE=0x20000000
282# CONFIG_29BIT is not set 283# CONFIG_29BIT is not set
283CONFIG_32BIT=y 284CONFIG_32BIT=y
@@ -410,10 +411,10 @@ CONFIG_HZ_1000=y
410CONFIG_HZ=1000 411CONFIG_HZ=1000
411CONFIG_SCHED_HRTICK=y 412CONFIG_SCHED_HRTICK=y
412CONFIG_KEXEC=y 413CONFIG_KEXEC=y
413# CONFIG_CRASH_DUMP is not set
414CONFIG_SECCOMP=y 414CONFIG_SECCOMP=y
415CONFIG_SMP=y 415CONFIG_SMP=y
416CONFIG_NR_CPUS=2 416CONFIG_NR_CPUS=2
417CONFIG_HOTPLUG_CPU=y
417# CONFIG_PREEMPT_NONE is not set 418# CONFIG_PREEMPT_NONE is not set
418# CONFIG_PREEMPT_VOLUNTARY is not set 419# CONFIG_PREEMPT_VOLUNTARY is not set
419CONFIG_PREEMPT=y 420CONFIG_PREEMPT=y
@@ -1101,7 +1102,6 @@ CONFIG_I2C_HELPER_AUTO=y
1101# 1102#
1102# CONFIG_I2C_DESIGNWARE is not set 1103# CONFIG_I2C_DESIGNWARE is not set
1103# CONFIG_I2C_OCORES is not set 1104# CONFIG_I2C_OCORES is not set
1104CONFIG_I2C_SDK7786=y
1105# CONFIG_I2C_SH_MOBILE is not set 1105# CONFIG_I2C_SH_MOBILE is not set
1106# CONFIG_I2C_SIMTEC is not set 1106# CONFIG_I2C_SIMTEC is not set
1107# CONFIG_I2C_XILINX is not set 1107# CONFIG_I2C_XILINX is not set
@@ -1775,8 +1775,8 @@ CONFIG_DETECT_HUNG_TASK=y
1775# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set 1775# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1776CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 1776CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1777CONFIG_SCHED_DEBUG=y 1777CONFIG_SCHED_DEBUG=y
1778# CONFIG_SCHEDSTATS is not set 1778CONFIG_SCHEDSTATS=y
1779# CONFIG_TIMER_STATS is not set 1779CONFIG_TIMER_STATS=y
1780# CONFIG_DEBUG_OBJECTS is not set 1780# CONFIG_DEBUG_OBJECTS is not set
1781# CONFIG_DEBUG_SLAB is not set 1781# CONFIG_DEBUG_SLAB is not set
1782CONFIG_DEBUG_PREEMPT=y 1782CONFIG_DEBUG_PREEMPT=y
@@ -1810,6 +1810,7 @@ CONFIG_RCU_CPU_STALL_DETECTOR=y
1810# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1810# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1811# CONFIG_LKDTM is not set 1811# CONFIG_LKDTM is not set
1812# CONFIG_FAULT_INJECTION is not set 1812# CONFIG_FAULT_INJECTION is not set
1813CONFIG_LATENCYTOP=y
1813CONFIG_SYSCTL_SYSCALL_CHECK=y 1814CONFIG_SYSCTL_SYSCALL_CHECK=y
1814# CONFIG_PAGE_POISONING is not set 1815# CONFIG_PAGE_POISONING is not set
1815CONFIG_NOP_TRACER=y 1816CONFIG_NOP_TRACER=y
@@ -1974,6 +1975,7 @@ CONFIG_CRYPTO_LZO=m
1974# CONFIG_CRYPTO_ANSI_CPRNG is not set 1975# CONFIG_CRYPTO_ANSI_CPRNG is not set
1975CONFIG_CRYPTO_HW=y 1976CONFIG_CRYPTO_HW=y
1976# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1977# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1978# CONFIG_VIRTUALIZATION is not set
1977CONFIG_BINARY_PRINTF=y 1979CONFIG_BINARY_PRINTF=y
1978 1980
1979# 1981#
diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig
index 43e6780a89d1..910eaec934c9 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 13:30:00 2010 4# Tue May 18 16:34:06 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
54CONFIG_POSIX_MQUEUE=y 57CONFIG_POSIX_MQUEUE=y
@@ -72,7 +75,6 @@ CONFIG_RCU_FANOUT=32
72CONFIG_TREE_RCU_TRACE=y 75CONFIG_TREE_RCU_TRACE=y
73# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_GROUP_SCHED is not set
76CONFIG_CGROUPS=y 78CONFIG_CGROUPS=y
77CONFIG_CGROUP_DEBUG=y 79CONFIG_CGROUP_DEBUG=y
78CONFIG_CGROUP_NS=y 80CONFIG_CGROUP_NS=y
@@ -82,6 +84,7 @@ CONFIG_CGROUP_DEVICE=y
82CONFIG_CGROUP_CPUACCT=y 84CONFIG_CGROUP_CPUACCT=y
83CONFIG_RESOURCE_COUNTERS=y 85CONFIG_RESOURCE_COUNTERS=y
84CONFIG_CGROUP_MEM_RES_CTLR=y 86CONFIG_CGROUP_MEM_RES_CTLR=y
87# CONFIG_CGROUP_SCHED is not set
85CONFIG_MM_OWNER=y 88CONFIG_MM_OWNER=y
86# CONFIG_SYSFS_DEPRECATED_V2 is not set 89# CONFIG_SYSFS_DEPRECATED_V2 is not set
87CONFIG_RELAY=y 90CONFIG_RELAY=y
@@ -96,6 +99,7 @@ CONFIG_INITRAMFS_SOURCE=""
96CONFIG_RD_GZIP=y 99CONFIG_RD_GZIP=y
97# CONFIG_RD_BZIP2 is not set 100# CONFIG_RD_BZIP2 is not set
98# CONFIG_RD_LZMA is not set 101# CONFIG_RD_LZMA is not set
102# CONFIG_RD_LZO is not set
99CONFIG_CC_OPTIMIZE_FOR_SIZE=y 103CONFIG_CC_OPTIMIZE_FOR_SIZE=y
100CONFIG_SYSCTL=y 104CONFIG_SYSCTL=y
101CONFIG_ANON_INODES=y 105CONFIG_ANON_INODES=y
@@ -123,7 +127,6 @@ CONFIG_PERF_USE_VMALLOC=y
123# Kernel Performance Events And Counters 127# Kernel Performance Events And Counters
124# 128#
125CONFIG_PERF_EVENTS=y 129CONFIG_PERF_EVENTS=y
126CONFIG_EVENT_PROFILE=y
127# CONFIG_PERF_COUNTERS is not set 130# CONFIG_PERF_COUNTERS is not set
128# CONFIG_DEBUG_PERF_USE_VMALLOC is not set 131# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
129CONFIG_VM_EVENT_COUNTERS=y 132CONFIG_VM_EVENT_COUNTERS=y
@@ -133,7 +136,6 @@ CONFIG_VM_EVENT_COUNTERS=y
133CONFIG_SLOB=y 136CONFIG_SLOB=y
134# CONFIG_MMAP_ALLOW_UNINITIALIZED is not set 137# CONFIG_MMAP_ALLOW_UNINITIALIZED is not set
135CONFIG_PROFILING=y 138CONFIG_PROFILING=y
136CONFIG_TRACEPOINTS=y
137CONFIG_OPROFILE=y 139CONFIG_OPROFILE=y
138CONFIG_HAVE_OPROFILE=y 140CONFIG_HAVE_OPROFILE=y
139# CONFIG_KPROBES is not set 141# CONFIG_KPROBES is not set
@@ -143,6 +145,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
143CONFIG_HAVE_DMA_ATTRS=y 145CONFIG_HAVE_DMA_ATTRS=y
144CONFIG_HAVE_CLK=y 146CONFIG_HAVE_CLK=y
145CONFIG_HAVE_DMA_API_DEBUG=y 147CONFIG_HAVE_DMA_API_DEBUG=y
148CONFIG_HAVE_HW_BREAKPOINT=y
146 149
147# 150#
148# GCOV-based kernel profiling 151# GCOV-based kernel profiling
@@ -162,7 +165,6 @@ CONFIG_BLOCK=y
162CONFIG_LBDAF=y 165CONFIG_LBDAF=y
163# CONFIG_BLK_DEV_BSG is not set 166# CONFIG_BLK_DEV_BSG is not set
164# CONFIG_BLK_DEV_INTEGRITY is not set 167# CONFIG_BLK_DEV_INTEGRITY is not set
165# CONFIG_BLK_CGROUP is not set
166 168
167# 169#
168# IO Schedulers 170# IO Schedulers
@@ -261,6 +263,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
261CONFIG_MAX_ACTIVE_REGIONS=1 263CONFIG_MAX_ACTIVE_REGIONS=1
262CONFIG_ARCH_POPULATES_NODE_MAP=y 264CONFIG_ARCH_POPULATES_NODE_MAP=y
263CONFIG_ARCH_SELECT_MEMORY_MODEL=y 265CONFIG_ARCH_SELECT_MEMORY_MODEL=y
266CONFIG_UNCACHED_MAPPING=y
264CONFIG_PAGE_SIZE_4KB=y 267CONFIG_PAGE_SIZE_4KB=y
265# CONFIG_PAGE_SIZE_8KB is not set 268# CONFIG_PAGE_SIZE_8KB is not set
266# CONFIG_PAGE_SIZE_16KB is not set 269# CONFIG_PAGE_SIZE_16KB is not set
@@ -276,7 +279,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
276CONFIG_SPLIT_PTLOCK_CPUS=4 279CONFIG_SPLIT_PTLOCK_CPUS=4
277# CONFIG_PHYS_ADDR_T_64BIT is not set 280# CONFIG_PHYS_ADDR_T_64BIT is not set
278CONFIG_ZONE_DMA_FLAG=0 281CONFIG_ZONE_DMA_FLAG=0
279CONFIG_NR_QUICK=2 282CONFIG_NR_QUICK=1
280CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1 283CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1
281 284
282# 285#
@@ -361,7 +364,6 @@ CONFIG_HZ=1000
361# CONFIG_PREEMPT_VOLUNTARY is not set 364# CONFIG_PREEMPT_VOLUNTARY is not set
362CONFIG_PREEMPT=y 365CONFIG_PREEMPT=y
363CONFIG_GUSA=y 366CONFIG_GUSA=y
364# CONFIG_SPARSE_IRQ is not set
365 367
366# 368#
367# Boot options 369# Boot options
@@ -400,7 +402,6 @@ CONFIG_NET=y
400# Networking options 402# Networking options
401# 403#
402CONFIG_PACKET=y 404CONFIG_PACKET=y
403# CONFIG_PACKET_MMAP is not set
404CONFIG_UNIX=y 405CONFIG_UNIX=y
405CONFIG_XFRM=y 406CONFIG_XFRM=y
406# CONFIG_XFRM_USER is not set 407# CONFIG_XFRM_USER is not set
@@ -463,7 +464,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
463# Network testing 464# Network testing
464# 465#
465# CONFIG_NET_PKTGEN is not set 466# CONFIG_NET_PKTGEN is not set
466# CONFIG_NET_DROP_MONITOR is not set
467# CONFIG_HAMRADIO is not set 467# CONFIG_HAMRADIO is not set
468# CONFIG_CAN is not set 468# CONFIG_CAN is not set
469# CONFIG_IRDA is not set 469# CONFIG_IRDA is not set
@@ -607,6 +607,7 @@ CONFIG_HAVE_IDE=y
607# 607#
608# SCSI device support 608# SCSI device support
609# 609#
610CONFIG_SCSI_MOD=y
610# CONFIG_RAID_ATTRS is not set 611# CONFIG_RAID_ATTRS is not set
611# CONFIG_SCSI is not set 612# CONFIG_SCSI is not set
612# CONFIG_SCSI_DMA is not set 613# CONFIG_SCSI_DMA is not set
@@ -688,6 +689,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=4
688CONFIG_SERIAL_SH_SCI_CONSOLE=y 689CONFIG_SERIAL_SH_SCI_CONSOLE=y
689CONFIG_SERIAL_CORE=y 690CONFIG_SERIAL_CORE=y
690CONFIG_SERIAL_CORE_CONSOLE=y 691CONFIG_SERIAL_CORE_CONSOLE=y
692# CONFIG_SERIAL_TIMBERDALE is not set
691# CONFIG_UNIX98_PTYS is not set 693# CONFIG_UNIX98_PTYS is not set
692# CONFIG_LEGACY_PTYS is not set 694# CONFIG_LEGACY_PTYS is not set
693# CONFIG_IPMI_HANDLER is not set 695# CONFIG_IPMI_HANDLER is not set
@@ -799,7 +801,6 @@ CONFIG_EXT2_FS=y
799# CONFIG_EXT2_FS_XATTR is not set 801# CONFIG_EXT2_FS_XATTR is not set
800# CONFIG_EXT3_FS is not set 802# CONFIG_EXT3_FS is not set
801# CONFIG_EXT4_FS is not set 803# CONFIG_EXT4_FS is not set
802CONFIG_EXT4_USE_FOR_EXT23=y
803# CONFIG_REISERFS_FS is not set 804# CONFIG_REISERFS_FS is not set
804# CONFIG_JFS_FS is not set 805# CONFIG_JFS_FS is not set
805# CONFIG_FS_POSIX_ACL is not set 806# CONFIG_FS_POSIX_ACL is not set
@@ -853,6 +854,7 @@ CONFIG_MISC_FILESYSTEMS=y
853# CONFIG_BFS_FS is not set 854# CONFIG_BFS_FS is not set
854# CONFIG_EFS_FS is not set 855# CONFIG_EFS_FS is not set
855# CONFIG_JFFS2_FS is not set 856# CONFIG_JFFS2_FS is not set
857# CONFIG_LOGFS is not set
856CONFIG_CRAMFS=y 858CONFIG_CRAMFS=y
857# CONFIG_SQUASHFS is not set 859# CONFIG_SQUASHFS is not set
858# CONFIG_VXFS_FS is not set 860# CONFIG_VXFS_FS is not set
@@ -881,6 +883,7 @@ CONFIG_SUNRPC=y
881# CONFIG_RPCSEC_GSS_KRB5 is not set 883# CONFIG_RPCSEC_GSS_KRB5 is not set
882# CONFIG_RPCSEC_GSS_SPKM3 is not set 884# CONFIG_RPCSEC_GSS_SPKM3 is not set
883# CONFIG_SMB_FS is not set 885# CONFIG_SMB_FS is not set
886# CONFIG_CEPH_FS is not set
884# CONFIG_CIFS is not set 887# CONFIG_CIFS is not set
885# CONFIG_NCP_FS is not set 888# CONFIG_NCP_FS is not set
886# CONFIG_CODA_FS is not set 889# CONFIG_CODA_FS is not set
@@ -919,6 +922,7 @@ CONFIG_SCHED_DEBUG=y
919# CONFIG_SCHEDSTATS is not set 922# CONFIG_SCHEDSTATS is not set
920# CONFIG_TIMER_STATS is not set 923# CONFIG_TIMER_STATS is not set
921# CONFIG_DEBUG_OBJECTS is not set 924# CONFIG_DEBUG_OBJECTS is not set
925# CONFIG_DEBUG_KMEMLEAK is not set
922CONFIG_DEBUG_PREEMPT=y 926CONFIG_DEBUG_PREEMPT=y
923# CONFIG_DEBUG_RT_MUTEXES is not set 927# CONFIG_DEBUG_RT_MUTEXES is not set
924# CONFIG_RT_MUTEX_TESTER is not set 928# CONFIG_RT_MUTEX_TESTER is not set
@@ -929,7 +933,6 @@ CONFIG_DEBUG_PREEMPT=y
929# CONFIG_LOCK_STAT is not set 933# CONFIG_LOCK_STAT is not set
930CONFIG_DEBUG_SPINLOCK_SLEEP=y 934CONFIG_DEBUG_SPINLOCK_SLEEP=y
931# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 935# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
932CONFIG_STACKTRACE=y
933# CONFIG_DEBUG_KOBJECT is not set 936# CONFIG_DEBUG_KOBJECT is not set
934CONFIG_DEBUG_BUGVERBOSE=y 937CONFIG_DEBUG_BUGVERBOSE=y
935# CONFIG_DEBUG_INFO is not set 938# CONFIG_DEBUG_INFO is not set
@@ -947,11 +950,11 @@ CONFIG_FRAME_POINTER=y
947# CONFIG_BACKTRACE_SELF_TEST is not set 950# CONFIG_BACKTRACE_SELF_TEST is not set
948# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 951# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
949# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 952# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
953# CONFIG_LKDTM is not set
950# CONFIG_FAULT_INJECTION is not set 954# CONFIG_FAULT_INJECTION is not set
951# CONFIG_LATENCYTOP is not set 955# CONFIG_LATENCYTOP is not set
952# CONFIG_SYSCTL_SYSCALL_CHECK is not set 956# CONFIG_SYSCTL_SYSCALL_CHECK is not set
953# CONFIG_PAGE_POISONING is not set 957# CONFIG_PAGE_POISONING is not set
954CONFIG_NOP_TRACER=y
955CONFIG_HAVE_FUNCTION_TRACER=y 958CONFIG_HAVE_FUNCTION_TRACER=y
956CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 959CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
957CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 960CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -959,10 +962,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
959CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 962CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
960CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 963CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
961CONFIG_RING_BUFFER=y 964CONFIG_RING_BUFFER=y
962CONFIG_EVENT_TRACING=y
963CONFIG_CONTEXT_SWITCH_TRACER=y
964CONFIG_RING_BUFFER_ALLOW_SWAP=y 965CONFIG_RING_BUFFER_ALLOW_SWAP=y
965CONFIG_TRACING=y
966CONFIG_TRACING_SUPPORT=y 966CONFIG_TRACING_SUPPORT=y
967CONFIG_FTRACE=y 967CONFIG_FTRACE=y
968# CONFIG_FUNCTION_TRACER is not set 968# CONFIG_FUNCTION_TRACER is not set
@@ -975,6 +975,7 @@ CONFIG_FTRACE=y
975CONFIG_BRANCH_PROFILE_NONE=y 975CONFIG_BRANCH_PROFILE_NONE=y
976# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 976# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
977# CONFIG_PROFILE_ALL_BRANCHES is not set 977# CONFIG_PROFILE_ALL_BRANCHES is not set
978# CONFIG_KSYM_TRACER is not set
978# CONFIG_STACK_TRACER is not set 979# CONFIG_STACK_TRACER is not set
979# CONFIG_KMEMTRACE is not set 980# CONFIG_KMEMTRACE is not set
980# CONFIG_WORKQUEUE_TRACER is not set 981# CONFIG_WORKQUEUE_TRACER is not set
@@ -1094,7 +1095,8 @@ CONFIG_CRYPTO_LZO=y
1094# 1095#
1095# CONFIG_CRYPTO_ANSI_CPRNG is not set 1096# CONFIG_CRYPTO_ANSI_CPRNG is not set
1096# CONFIG_CRYPTO_HW is not set 1097# CONFIG_CRYPTO_HW is not set
1097CONFIG_BINARY_PRINTF=y 1098# CONFIG_VIRTUALIZATION is not set
1099# CONFIG_BINARY_PRINTF is not set
1098 1100
1099# 1101#
1100# Library routines 1102# Library routines
diff --git a/arch/sh/configs/se7343_defconfig b/arch/sh/configs/se7343_defconfig
index ec494e32fa2e..586cb1e02be0 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 13:30:41 2010 4# Tue May 18 16:37:31 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52# CONFIG_SWAP is not set 55# CONFIG_SWAP is not set
53CONFIG_SYSVIPC=y 56CONFIG_SYSVIPC=y
54CONFIG_SYSVIPC_SYSCTL=y 57CONFIG_SYSVIPC_SYSCTL=y
@@ -70,11 +73,6 @@ CONFIG_RCU_FANOUT=32
70# CONFIG_TREE_RCU_TRACE is not set 73# CONFIG_TREE_RCU_TRACE is not set
71# CONFIG_IKCONFIG is not set 74# CONFIG_IKCONFIG is not set
72CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
73CONFIG_GROUP_SCHED=y
74CONFIG_FAIR_GROUP_SCHED=y
75# CONFIG_RT_GROUP_SCHED is not set
76CONFIG_USER_SCHED=y
77# CONFIG_CGROUP_SCHED is not set
78# CONFIG_CGROUPS is not set 76# CONFIG_CGROUPS is not set
79CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y 78CONFIG_SYSFS_DEPRECATED_V2=y
@@ -107,7 +105,7 @@ CONFIG_PERF_USE_VMALLOC=y
107# 105#
108# Kernel Performance Events And Counters 106# Kernel Performance Events And Counters
109# 107#
110# CONFIG_PERF_EVENTS is not set 108CONFIG_PERF_EVENTS=y
111# CONFIG_PERF_COUNTERS is not set 109# CONFIG_PERF_COUNTERS is not set
112CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_COMPAT_BRK=y 111CONFIG_COMPAT_BRK=y
@@ -124,6 +122,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124CONFIG_HAVE_DMA_ATTRS=y 122CONFIG_HAVE_DMA_ATTRS=y
125CONFIG_HAVE_CLK=y 123CONFIG_HAVE_CLK=y
126CONFIG_HAVE_DMA_API_DEBUG=y 124CONFIG_HAVE_DMA_API_DEBUG=y
125CONFIG_HAVE_HW_BREAKPOINT=y
127 126
128# 127#
129# GCOV-based kernel profiling 128# GCOV-based kernel profiling
@@ -245,6 +244,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
245CONFIG_MAX_ACTIVE_REGIONS=1 244CONFIG_MAX_ACTIVE_REGIONS=1
246CONFIG_ARCH_POPULATES_NODE_MAP=y 245CONFIG_ARCH_POPULATES_NODE_MAP=y
247CONFIG_ARCH_SELECT_MEMORY_MODEL=y 246CONFIG_ARCH_SELECT_MEMORY_MODEL=y
247CONFIG_UNCACHED_MAPPING=y
248CONFIG_PAGE_SIZE_4KB=y 248CONFIG_PAGE_SIZE_4KB=y
249# CONFIG_PAGE_SIZE_8KB is not set 249# CONFIG_PAGE_SIZE_8KB is not set
250# CONFIG_PAGE_SIZE_16KB is not set 250# CONFIG_PAGE_SIZE_16KB is not set
@@ -260,7 +260,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
260CONFIG_SPLIT_PTLOCK_CPUS=4 260CONFIG_SPLIT_PTLOCK_CPUS=4
261# CONFIG_PHYS_ADDR_T_64BIT is not set 261# CONFIG_PHYS_ADDR_T_64BIT is not set
262CONFIG_ZONE_DMA_FLAG=0 262CONFIG_ZONE_DMA_FLAG=0
263CONFIG_NR_QUICK=2 263CONFIG_NR_QUICK=1
264# CONFIG_KSM is not set 264# CONFIG_KSM is not set
265CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 265CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
266 266
@@ -335,7 +335,7 @@ CONFIG_PREEMPT_NONE=y
335# CONFIG_PREEMPT_VOLUNTARY is not set 335# CONFIG_PREEMPT_VOLUNTARY is not set
336# CONFIG_PREEMPT is not set 336# CONFIG_PREEMPT is not set
337CONFIG_GUSA=y 337CONFIG_GUSA=y
338# CONFIG_SPARSE_IRQ is not set 338# CONFIG_INTC_USERIMASK is not set
339 339
340# 340#
341# Boot options 341# Boot options
@@ -370,6 +370,7 @@ CONFIG_PM_SLEEP=y
370CONFIG_SUSPEND=y 370CONFIG_SUSPEND=y
371CONFIG_SUSPEND_FREEZER=y 371CONFIG_SUSPEND_FREEZER=y
372CONFIG_PM_RUNTIME=y 372CONFIG_PM_RUNTIME=y
373CONFIG_PM_OPS=y
373# CONFIG_CPU_IDLE is not set 374# CONFIG_CPU_IDLE is not set
374CONFIG_NET=y 375CONFIG_NET=y
375 376
@@ -377,7 +378,6 @@ CONFIG_NET=y
377# Networking options 378# Networking options
378# 379#
379CONFIG_PACKET=y 380CONFIG_PACKET=y
380CONFIG_PACKET_MMAP=y
381CONFIG_UNIX=y 381CONFIG_UNIX=y
382CONFIG_XFRM=y 382CONFIG_XFRM=y
383# CONFIG_XFRM_USER is not set 383# CONFIG_XFRM_USER is not set
@@ -569,6 +569,7 @@ CONFIG_HAVE_IDE=y
569# 569#
570# SCSI device support 570# SCSI device support
571# 571#
572CONFIG_SCSI_MOD=y
572# CONFIG_RAID_ATTRS is not set 573# CONFIG_RAID_ATTRS is not set
573CONFIG_SCSI=y 574CONFIG_SCSI=y
574CONFIG_SCSI_DMA=y 575CONFIG_SCSI_DMA=y
@@ -635,6 +636,7 @@ CONFIG_USB_USBNET=y
635CONFIG_USB_NET_CDCETHER=y 636CONFIG_USB_NET_CDCETHER=y
636# CONFIG_USB_NET_CDC_EEM is not set 637# CONFIG_USB_NET_CDC_EEM is not set
637CONFIG_USB_NET_DM9601=y 638CONFIG_USB_NET_DM9601=y
639# CONFIG_USB_NET_SMSC75XX is not set
638# CONFIG_USB_NET_SMSC95XX is not set 640# CONFIG_USB_NET_SMSC95XX is not set
639# CONFIG_USB_NET_GL620A is not set 641# CONFIG_USB_NET_GL620A is not set
640# CONFIG_USB_NET_NET1080 is not set 642# CONFIG_USB_NET_NET1080 is not set
@@ -644,6 +646,7 @@ CONFIG_USB_NET_DM9601=y
644# CONFIG_USB_NET_CDC_SUBSET is not set 646# CONFIG_USB_NET_CDC_SUBSET is not set
645# CONFIG_USB_NET_ZAURUS is not set 647# CONFIG_USB_NET_ZAURUS is not set
646# CONFIG_USB_NET_INT51X1 is not set 648# CONFIG_USB_NET_INT51X1 is not set
649# CONFIG_USB_IPHETH is not set
647# CONFIG_WAN is not set 650# CONFIG_WAN is not set
648# CONFIG_PPP is not set 651# CONFIG_PPP is not set
649# CONFIG_SLIP is not set 652# CONFIG_SLIP is not set
@@ -713,6 +716,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=4
713CONFIG_SERIAL_SH_SCI_CONSOLE=y 716CONFIG_SERIAL_SH_SCI_CONSOLE=y
714CONFIG_SERIAL_CORE=y 717CONFIG_SERIAL_CORE=y
715CONFIG_SERIAL_CORE_CONSOLE=y 718CONFIG_SERIAL_CORE_CONSOLE=y
719# CONFIG_SERIAL_TIMBERDALE is not set
716# CONFIG_UNIX98_PTYS is not set 720# CONFIG_UNIX98_PTYS is not set
717CONFIG_LEGACY_PTYS=y 721CONFIG_LEGACY_PTYS=y
718CONFIG_LEGACY_PTY_COUNT=256 722CONFIG_LEGACY_PTY_COUNT=256
@@ -739,6 +743,7 @@ CONFIG_I2C_HELPER_AUTO=y
739# CONFIG_I2C_OCORES is not set 743# CONFIG_I2C_OCORES is not set
740CONFIG_I2C_SH_MOBILE=y 744CONFIG_I2C_SH_MOBILE=y
741# CONFIG_I2C_SIMTEC is not set 745# CONFIG_I2C_SIMTEC is not set
746# CONFIG_I2C_XILINX is not set
742 747
743# 748#
744# External I2C/SMBus adapter drivers 749# External I2C/SMBus adapter drivers
@@ -752,15 +757,9 @@ CONFIG_I2C_SH_MOBILE=y
752# 757#
753# CONFIG_I2C_PCA_PLATFORM is not set 758# CONFIG_I2C_PCA_PLATFORM is not set
754# CONFIG_I2C_STUB is not set 759# CONFIG_I2C_STUB is not set
755
756#
757# Miscellaneous I2C Chip support
758#
759# CONFIG_SENSORS_TSL2550 is not set
760# CONFIG_I2C_DEBUG_CORE is not set 760# CONFIG_I2C_DEBUG_CORE is not set
761# CONFIG_I2C_DEBUG_ALGO is not set 761# CONFIG_I2C_DEBUG_ALGO is not set
762# CONFIG_I2C_DEBUG_BUS is not set 762# CONFIG_I2C_DEBUG_BUS is not set
763# CONFIG_I2C_DEBUG_CHIP is not set
764# CONFIG_SPI is not set 763# CONFIG_SPI is not set
765 764
766# 765#
@@ -783,6 +782,7 @@ CONFIG_SSB_POSSIBLE=y
783# Multifunction device drivers 782# Multifunction device drivers
784# 783#
785# CONFIG_MFD_CORE is not set 784# CONFIG_MFD_CORE is not set
785# CONFIG_MFD_88PM860X is not set
786# CONFIG_MFD_SM501 is not set 786# CONFIG_MFD_SM501 is not set
787# CONFIG_MFD_SH_MOBILE_SDHI is not set 787# CONFIG_MFD_SH_MOBILE_SDHI is not set
788# CONFIG_HTC_PASIC3 is not set 788# CONFIG_HTC_PASIC3 is not set
@@ -790,12 +790,13 @@ CONFIG_SSB_POSSIBLE=y
790# CONFIG_MFD_TMIO is not set 790# CONFIG_MFD_TMIO is not set
791# CONFIG_PMIC_DA903X is not set 791# CONFIG_PMIC_DA903X is not set
792# CONFIG_PMIC_ADP5520 is not set 792# CONFIG_PMIC_ADP5520 is not set
793# CONFIG_MFD_MAX8925 is not set
793# CONFIG_MFD_WM8400 is not set 794# CONFIG_MFD_WM8400 is not set
794# CONFIG_MFD_WM831X is not set 795# CONFIG_MFD_WM831X is not set
795# CONFIG_MFD_WM8350_I2C is not set 796# CONFIG_MFD_WM8350_I2C is not set
797# CONFIG_MFD_WM8994 is not set
796# CONFIG_MFD_PCF50633 is not set 798# CONFIG_MFD_PCF50633 is not set
797# CONFIG_AB3100_CORE is not set 799# CONFIG_AB3100_CORE is not set
798# CONFIG_MFD_88PM8607 is not set
799# CONFIG_REGULATOR is not set 800# CONFIG_REGULATOR is not set
800# CONFIG_MEDIA_SUPPORT is not set 801# CONFIG_MEDIA_SUPPORT is not set
801 802
@@ -878,6 +879,7 @@ CONFIG_SND_DRIVERS=y
878CONFIG_SND_SUPERH=y 879CONFIG_SND_SUPERH=y
879CONFIG_SND_USB=y 880CONFIG_SND_USB=y
880# CONFIG_SND_USB_AUDIO is not set 881# CONFIG_SND_USB_AUDIO is not set
882# CONFIG_SND_USB_UA101 is not set
881# CONFIG_SND_USB_CAIAQ is not set 883# CONFIG_SND_USB_CAIAQ is not set
882# CONFIG_SND_SOC is not set 884# CONFIG_SND_SOC is not set
883# CONFIG_SOUND_PRIME is not set 885# CONFIG_SOUND_PRIME is not set
@@ -895,6 +897,7 @@ CONFIG_USB_HID=y
895# 897#
896# Special HID drivers 898# Special HID drivers
897# 899#
900# CONFIG_HID_3M_PCT is not set
898CONFIG_HID_A4TECH=y 901CONFIG_HID_A4TECH=y
899CONFIG_HID_APPLE=y 902CONFIG_HID_APPLE=y
900CONFIG_HID_BELKIN=y 903CONFIG_HID_BELKIN=y
@@ -910,14 +913,19 @@ CONFIG_HID_GYRATION=y
910CONFIG_HID_LOGITECH=y 913CONFIG_HID_LOGITECH=y
911# CONFIG_LOGITECH_FF is not set 914# CONFIG_LOGITECH_FF is not set
912# CONFIG_LOGIRUMBLEPAD2_FF is not set 915# CONFIG_LOGIRUMBLEPAD2_FF is not set
916# CONFIG_LOGIG940_FF is not set
913CONFIG_HID_MICROSOFT=y 917CONFIG_HID_MICROSOFT=y
918# CONFIG_HID_MOSART is not set
914CONFIG_HID_MONTEREY=y 919CONFIG_HID_MONTEREY=y
915# CONFIG_HID_NTRIG is not set 920# CONFIG_HID_NTRIG is not set
921# CONFIG_HID_ORTEK is not set
916CONFIG_HID_PANTHERLORD=y 922CONFIG_HID_PANTHERLORD=y
917# CONFIG_PANTHERLORD_FF is not set 923# CONFIG_PANTHERLORD_FF is not set
918CONFIG_HID_PETALYNX=y 924CONFIG_HID_PETALYNX=y
925# CONFIG_HID_QUANTA is not set
919CONFIG_HID_SAMSUNG=y 926CONFIG_HID_SAMSUNG=y
920CONFIG_HID_SONY=y 927CONFIG_HID_SONY=y
928# CONFIG_HID_STANTUM is not set
921CONFIG_HID_SUNPLUS=y 929CONFIG_HID_SUNPLUS=y
922# CONFIG_HID_GREENASIA is not set 930# CONFIG_HID_GREENASIA is not set
923# CONFIG_HID_SMARTJOYPLUS is not set 931# CONFIG_HID_SMARTJOYPLUS is not set
@@ -997,7 +1005,6 @@ CONFIG_USB_ISP116X_HCD=y
997# CONFIG_USB_RIO500 is not set 1005# CONFIG_USB_RIO500 is not set
998# CONFIG_USB_LEGOTOWER is not set 1006# CONFIG_USB_LEGOTOWER is not set
999# CONFIG_USB_LCD is not set 1007# CONFIG_USB_LCD is not set
1000# CONFIG_USB_BERRY_CHARGE is not set
1001# CONFIG_USB_LED is not set 1008# CONFIG_USB_LED is not set
1002# CONFIG_USB_CYPRESS_CY7C63 is not set 1009# CONFIG_USB_CYPRESS_CY7C63 is not set
1003# CONFIG_USB_CYTHERM is not set 1010# CONFIG_USB_CYTHERM is not set
@@ -1009,7 +1016,6 @@ CONFIG_USB_ISP116X_HCD=y
1009# CONFIG_USB_IOWARRIOR is not set 1016# CONFIG_USB_IOWARRIOR is not set
1010# CONFIG_USB_TEST is not set 1017# CONFIG_USB_TEST is not set
1011# CONFIG_USB_ISIGHTFW is not set 1018# CONFIG_USB_ISIGHTFW is not set
1012# CONFIG_USB_VST is not set
1013# CONFIG_USB_GADGET is not set 1019# CONFIG_USB_GADGET is not set
1014 1020
1015# 1021#
@@ -1027,8 +1033,6 @@ CONFIG_RTC_LIB=y
1027CONFIG_UIO=y 1033CONFIG_UIO=y
1028# CONFIG_UIO_PDRV is not set 1034# CONFIG_UIO_PDRV is not set
1029# CONFIG_UIO_PDRV_GENIRQ is not set 1035# CONFIG_UIO_PDRV_GENIRQ is not set
1030# CONFIG_UIO_SMX is not set
1031# CONFIG_UIO_SERCOS3 is not set
1032 1036
1033# 1037#
1034# TI VLYNQ 1038# TI VLYNQ
@@ -1115,6 +1119,7 @@ CONFIG_JFFS2_ZLIB=y
1115# CONFIG_JFFS2_LZO is not set 1119# CONFIG_JFFS2_LZO is not set
1116CONFIG_JFFS2_RTIME=y 1120CONFIG_JFFS2_RTIME=y
1117# CONFIG_JFFS2_RUBIN is not set 1121# CONFIG_JFFS2_RUBIN is not set
1122# CONFIG_LOGFS is not set
1118CONFIG_CRAMFS=y 1123CONFIG_CRAMFS=y
1119# CONFIG_SQUASHFS is not set 1124# CONFIG_SQUASHFS is not set
1120# CONFIG_VXFS_FS is not set 1125# CONFIG_VXFS_FS is not set
@@ -1141,6 +1146,7 @@ CONFIG_SUNRPC=y
1141# CONFIG_RPCSEC_GSS_KRB5 is not set 1146# CONFIG_RPCSEC_GSS_KRB5 is not set
1142# CONFIG_RPCSEC_GSS_SPKM3 is not set 1147# CONFIG_RPCSEC_GSS_SPKM3 is not set
1143# CONFIG_SMB_FS is not set 1148# CONFIG_SMB_FS is not set
1149# CONFIG_CEPH_FS is not set
1144# CONFIG_CIFS is not set 1150# CONFIG_CIFS is not set
1145# CONFIG_NCP_FS is not set 1151# CONFIG_NCP_FS is not set
1146# CONFIG_CODA_FS is not set 1152# CONFIG_CODA_FS is not set
@@ -1324,6 +1330,7 @@ CONFIG_CRYPTO=y
1324# 1330#
1325# CONFIG_CRYPTO_ANSI_CPRNG is not set 1331# CONFIG_CRYPTO_ANSI_CPRNG is not set
1326CONFIG_CRYPTO_HW=y 1332CONFIG_CRYPTO_HW=y
1333# CONFIG_VIRTUALIZATION is not set
1327# CONFIG_BINARY_PRINTF is not set 1334# CONFIG_BINARY_PRINTF is not set
1328 1335
1329# 1336#
diff --git a/arch/sh/configs/se7619_defconfig b/arch/sh/configs/se7619_defconfig
index ee87e2b2168f..acb3e02a7123 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 13:34:15 2010 4# Tue May 18 16:41:13 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -30,6 +30,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DMA_NONCOHERENT=y 32CONFIG_DMA_NONCOHERENT=y
33CONFIG_NEED_DMA_MAP_STATE=y
33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y 35CONFIG_CONSTRUCTORS=y
35 36
@@ -44,9 +45,11 @@ CONFIG_LOCALVERSION=""
44CONFIG_HAVE_KERNEL_GZIP=y 45CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y 46CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y 47CONFIG_HAVE_KERNEL_LZMA=y
48CONFIG_HAVE_KERNEL_LZO=y
47CONFIG_KERNEL_GZIP=y 49CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set 50# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set 51# CONFIG_KERNEL_LZMA is not set
52# CONFIG_KERNEL_LZO is not set
50# CONFIG_SYSVIPC is not set 53# CONFIG_SYSVIPC is not set
51# CONFIG_BSD_PROCESS_ACCT is not set 54# CONFIG_BSD_PROCESS_ACCT is not set
52 55
@@ -62,7 +65,6 @@ CONFIG_RCU_FANOUT=32
62# CONFIG_TREE_RCU_TRACE is not set 65# CONFIG_TREE_RCU_TRACE is not set
63# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
64CONFIG_LOG_BUF_SHIFT=14 67CONFIG_LOG_BUF_SHIFT=14
65# CONFIG_GROUP_SCHED is not set
66# CONFIG_CGROUPS is not set 68# CONFIG_CGROUPS is not set
67# CONFIG_RELAY is not set 69# CONFIG_RELAY is not set
68# CONFIG_NAMESPACES is not set 70# CONFIG_NAMESPACES is not set
@@ -91,7 +93,7 @@ CONFIG_PERF_USE_VMALLOC=y
91# 93#
92# Kernel Performance Events And Counters 94# Kernel Performance Events And Counters
93# 95#
94# CONFIG_PERF_EVENTS is not set 96CONFIG_PERF_EVENTS=y
95# CONFIG_PERF_COUNTERS is not set 97# CONFIG_PERF_COUNTERS is not set
96# CONFIG_VM_EVENT_COUNTERS is not set 98# CONFIG_VM_EVENT_COUNTERS is not set
97CONFIG_COMPAT_BRK=y 99CONFIG_COMPAT_BRK=y
@@ -107,6 +109,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
107CONFIG_HAVE_DMA_ATTRS=y 109CONFIG_HAVE_DMA_ATTRS=y
108CONFIG_HAVE_CLK=y 110CONFIG_HAVE_CLK=y
109CONFIG_HAVE_DMA_API_DEBUG=y 111CONFIG_HAVE_DMA_API_DEBUG=y
112CONFIG_HAVE_HW_BREAKPOINT=y
110 113
111# 114#
112# GCOV-based kernel profiling 115# GCOV-based kernel profiling
@@ -217,6 +220,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
217CONFIG_MAX_ACTIVE_REGIONS=1 220CONFIG_MAX_ACTIVE_REGIONS=1
218CONFIG_ARCH_POPULATES_NODE_MAP=y 221CONFIG_ARCH_POPULATES_NODE_MAP=y
219CONFIG_ARCH_SELECT_MEMORY_MODEL=y 222CONFIG_ARCH_SELECT_MEMORY_MODEL=y
223CONFIG_UNCACHED_MAPPING=y
220CONFIG_PAGE_SIZE_4KB=y 224CONFIG_PAGE_SIZE_4KB=y
221# CONFIG_PAGE_SIZE_8KB is not set 225# CONFIG_PAGE_SIZE_8KB is not set
222# CONFIG_PAGE_SIZE_16KB is not set 226# CONFIG_PAGE_SIZE_16KB is not set
@@ -232,7 +236,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
232CONFIG_SPLIT_PTLOCK_CPUS=4 236CONFIG_SPLIT_PTLOCK_CPUS=4
233# CONFIG_PHYS_ADDR_T_64BIT is not set 237# CONFIG_PHYS_ADDR_T_64BIT is not set
234CONFIG_ZONE_DMA_FLAG=0 238CONFIG_ZONE_DMA_FLAG=0
235CONFIG_NR_QUICK=2 239CONFIG_NR_QUICK=1
236CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1 240CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1
237 241
238# 242#
@@ -301,7 +305,6 @@ CONFIG_PREEMPT_NONE=y
301# CONFIG_PREEMPT_VOLUNTARY is not set 305# CONFIG_PREEMPT_VOLUNTARY is not set
302# CONFIG_PREEMPT is not set 306# CONFIG_PREEMPT is not set
303CONFIG_GUSA=y 307CONFIG_GUSA=y
304# CONFIG_SPARSE_IRQ is not set
305 308
306# 309#
307# Boot options 310# Boot options
@@ -453,6 +456,7 @@ CONFIG_HAVE_IDE=y
453# 456#
454# SCSI device support 457# SCSI device support
455# 458#
459CONFIG_SCSI_MOD=y
456# CONFIG_RAID_ATTRS is not set 460# CONFIG_RAID_ATTRS is not set
457# CONFIG_SCSI is not set 461# CONFIG_SCSI is not set
458# CONFIG_SCSI_DMA is not set 462# CONFIG_SCSI_DMA is not set
@@ -513,6 +517,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=3
513CONFIG_SERIAL_SH_SCI_CONSOLE=y 517CONFIG_SERIAL_SH_SCI_CONSOLE=y
514CONFIG_SERIAL_CORE=y 518CONFIG_SERIAL_CORE=y
515CONFIG_SERIAL_CORE_CONSOLE=y 519CONFIG_SERIAL_CORE_CONSOLE=y
520# CONFIG_SERIAL_TIMBERDALE is not set
516# CONFIG_UNIX98_PTYS is not set 521# CONFIG_UNIX98_PTYS is not set
517# CONFIG_LEGACY_PTYS is not set 522# CONFIG_LEGACY_PTYS is not set
518# CONFIG_IPMI_HANDLER is not set 523# CONFIG_IPMI_HANDLER is not set
@@ -612,7 +617,6 @@ CONFIG_RTC_LIB=y
612# CONFIG_EXT2_FS is not set 617# CONFIG_EXT2_FS is not set
613# CONFIG_EXT3_FS is not set 618# CONFIG_EXT3_FS is not set
614# CONFIG_EXT4_FS is not set 619# CONFIG_EXT4_FS is not set
615CONFIG_EXT4_USE_FOR_EXT23=y
616# CONFIG_REISERFS_FS is not set 620# CONFIG_REISERFS_FS is not set
617# CONFIG_JFS_FS is not set 621# CONFIG_JFS_FS is not set
618# CONFIG_FS_POSIX_ACL is not set 622# CONFIG_FS_POSIX_ACL is not set
@@ -664,6 +668,7 @@ CONFIG_MISC_FILESYSTEMS=y
664# CONFIG_BFS_FS is not set 668# CONFIG_BFS_FS is not set
665# CONFIG_EFS_FS is not set 669# CONFIG_EFS_FS is not set
666# CONFIG_JFFS2_FS is not set 670# CONFIG_JFFS2_FS is not set
671# CONFIG_LOGFS is not set
667# CONFIG_CRAMFS is not set 672# CONFIG_CRAMFS is not set
668# CONFIG_SQUASHFS is not set 673# CONFIG_SQUASHFS is not set
669# CONFIG_VXFS_FS is not set 674# CONFIG_VXFS_FS is not set
@@ -729,6 +734,7 @@ CONFIG_HAVE_ARCH_KGDB=y
729CONFIG_DEFAULT_SECURITY_DAC=y 734CONFIG_DEFAULT_SECURITY_DAC=y
730CONFIG_DEFAULT_SECURITY="" 735CONFIG_DEFAULT_SECURITY=""
731# CONFIG_CRYPTO is not set 736# CONFIG_CRYPTO is not set
737# CONFIG_VIRTUALIZATION is not set
732# CONFIG_BINARY_PRINTF is not set 738# CONFIG_BINARY_PRINTF is not set
733 739
734# 740#
diff --git a/arch/sh/configs/se7705_defconfig b/arch/sh/configs/se7705_defconfig
index 03f4219f2086..084fec9e9050 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 13:34:37 2010 4# Tue May 18 16:42:43 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -30,6 +30,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DMA_NONCOHERENT=y 32CONFIG_DMA_NONCOHERENT=y
33CONFIG_NEED_DMA_MAP_STATE=y
33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y 35CONFIG_CONSTRUCTORS=y
35 36
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51# CONFIG_SWAP is not set 54# CONFIG_SWAP is not set
52# CONFIG_SYSVIPC is not set 55# CONFIG_SYSVIPC is not set
53# CONFIG_POSIX_MQUEUE is not set 56# CONFIG_POSIX_MQUEUE is not set
@@ -67,7 +70,6 @@ CONFIG_RCU_FANOUT=32
67# CONFIG_TREE_RCU_TRACE is not set 70# CONFIG_TREE_RCU_TRACE is not set
68# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
69CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
70# CONFIG_GROUP_SCHED is not set
71# CONFIG_CGROUPS is not set 73# CONFIG_CGROUPS is not set
72# CONFIG_RELAY is not set 74# CONFIG_RELAY is not set
73# CONFIG_NAMESPACES is not set 75# CONFIG_NAMESPACES is not set
@@ -76,6 +78,7 @@ CONFIG_INITRAMFS_SOURCE=""
76CONFIG_RD_GZIP=y 78CONFIG_RD_GZIP=y
77# CONFIG_RD_BZIP2 is not set 79# CONFIG_RD_BZIP2 is not set
78# CONFIG_RD_LZMA is not set 80# CONFIG_RD_LZMA is not set
81# CONFIG_RD_LZO is not set
79# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
80CONFIG_SYSCTL=y 83CONFIG_SYSCTL=y
81CONFIG_ANON_INODES=y 84CONFIG_ANON_INODES=y
@@ -101,7 +104,7 @@ CONFIG_PERF_USE_VMALLOC=y
101# 104#
102# Kernel Performance Events And Counters 105# Kernel Performance Events And Counters
103# 106#
104# CONFIG_PERF_EVENTS is not set 107CONFIG_PERF_EVENTS=y
105# CONFIG_PERF_COUNTERS is not set 108# CONFIG_PERF_COUNTERS is not set
106CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
107CONFIG_COMPAT_BRK=y 110CONFIG_COMPAT_BRK=y
@@ -117,6 +120,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
117CONFIG_HAVE_DMA_ATTRS=y 120CONFIG_HAVE_DMA_ATTRS=y
118CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
119CONFIG_HAVE_DMA_API_DEBUG=y 122CONFIG_HAVE_DMA_API_DEBUG=y
123CONFIG_HAVE_HW_BREAKPOINT=y
120 124
121# 125#
122# GCOV-based kernel profiling 126# GCOV-based kernel profiling
@@ -234,6 +238,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
234CONFIG_MAX_ACTIVE_REGIONS=1 238CONFIG_MAX_ACTIVE_REGIONS=1
235CONFIG_ARCH_POPULATES_NODE_MAP=y 239CONFIG_ARCH_POPULATES_NODE_MAP=y
236CONFIG_ARCH_SELECT_MEMORY_MODEL=y 240CONFIG_ARCH_SELECT_MEMORY_MODEL=y
241CONFIG_UNCACHED_MAPPING=y
237CONFIG_PAGE_SIZE_4KB=y 242CONFIG_PAGE_SIZE_4KB=y
238# CONFIG_PAGE_SIZE_8KB is not set 243# CONFIG_PAGE_SIZE_8KB is not set
239# CONFIG_PAGE_SIZE_16KB is not set 244# CONFIG_PAGE_SIZE_16KB is not set
@@ -249,7 +254,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
249CONFIG_SPLIT_PTLOCK_CPUS=4 254CONFIG_SPLIT_PTLOCK_CPUS=4
250# CONFIG_PHYS_ADDR_T_64BIT is not set 255# CONFIG_PHYS_ADDR_T_64BIT is not set
251CONFIG_ZONE_DMA_FLAG=0 256CONFIG_ZONE_DMA_FLAG=0
252CONFIG_NR_QUICK=2 257CONFIG_NR_QUICK=1
253# CONFIG_KSM is not set 258# CONFIG_KSM is not set
254CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 259CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
255 260
@@ -327,7 +332,6 @@ CONFIG_HZ=250
327CONFIG_PREEMPT=y 332CONFIG_PREEMPT=y
328CONFIG_GUSA=y 333CONFIG_GUSA=y
329# CONFIG_GUSA_RB is not set 334# CONFIG_GUSA_RB is not set
330# CONFIG_SPARSE_IRQ is not set
331 335
332# 336#
333# Boot options 337# Boot options
@@ -362,7 +366,6 @@ CONFIG_NET=y
362# Networking options 366# Networking options
363# 367#
364CONFIG_PACKET=y 368CONFIG_PACKET=y
365# CONFIG_PACKET_MMAP is not set
366CONFIG_UNIX=y 369CONFIG_UNIX=y
367CONFIG_XFRM=y 370CONFIG_XFRM=y
368# CONFIG_XFRM_USER is not set 371# CONFIG_XFRM_USER is not set
@@ -562,6 +565,7 @@ CONFIG_HAVE_IDE=y
562# 565#
563# SCSI device support 566# SCSI device support
564# 567#
568CONFIG_SCSI_MOD=y
565# CONFIG_RAID_ATTRS is not set 569# CONFIG_RAID_ATTRS is not set
566# CONFIG_SCSI is not set 570# CONFIG_SCSI is not set
567# CONFIG_SCSI_DMA is not set 571# CONFIG_SCSI_DMA is not set
@@ -679,6 +683,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
679CONFIG_SERIAL_SH_SCI_CONSOLE=y 683CONFIG_SERIAL_SH_SCI_CONSOLE=y
680CONFIG_SERIAL_CORE=y 684CONFIG_SERIAL_CORE=y
681CONFIG_SERIAL_CORE_CONSOLE=y 685CONFIG_SERIAL_CORE_CONSOLE=y
686# CONFIG_SERIAL_TIMBERDALE is not set
682CONFIG_UNIX98_PTYS=y 687CONFIG_UNIX98_PTYS=y
683# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 688# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
684# CONFIG_LEGACY_PTYS is not set 689# CONFIG_LEGACY_PTYS is not set
@@ -798,7 +803,6 @@ CONFIG_EXT2_FS=y
798# CONFIG_EXT2_FS_XIP is not set 803# CONFIG_EXT2_FS_XIP is not set
799# CONFIG_EXT3_FS is not set 804# CONFIG_EXT3_FS is not set
800# CONFIG_EXT4_FS is not set 805# CONFIG_EXT4_FS is not set
801CONFIG_EXT4_USE_FOR_EXT23=y
802# CONFIG_REISERFS_FS is not set 806# CONFIG_REISERFS_FS is not set
803# CONFIG_JFS_FS is not set 807# CONFIG_JFS_FS is not set
804# CONFIG_FS_POSIX_ACL is not set 808# CONFIG_FS_POSIX_ACL is not set
@@ -863,6 +867,7 @@ CONFIG_JFFS2_ZLIB=y
863# CONFIG_JFFS2_LZO is not set 867# CONFIG_JFFS2_LZO is not set
864CONFIG_JFFS2_RTIME=y 868CONFIG_JFFS2_RTIME=y
865# CONFIG_JFFS2_RUBIN is not set 869# CONFIG_JFFS2_RUBIN is not set
870# CONFIG_LOGFS is not set
866# CONFIG_CRAMFS is not set 871# CONFIG_CRAMFS is not set
867# CONFIG_SQUASHFS is not set 872# CONFIG_SQUASHFS is not set
868# CONFIG_VXFS_FS is not set 873# CONFIG_VXFS_FS is not set
@@ -885,6 +890,7 @@ CONFIG_SUNRPC=y
885# CONFIG_RPCSEC_GSS_KRB5 is not set 890# CONFIG_RPCSEC_GSS_KRB5 is not set
886# CONFIG_RPCSEC_GSS_SPKM3 is not set 891# CONFIG_RPCSEC_GSS_SPKM3 is not set
887# CONFIG_SMB_FS is not set 892# CONFIG_SMB_FS is not set
893# CONFIG_CEPH_FS is not set
888# CONFIG_CIFS is not set 894# CONFIG_CIFS is not set
889# CONFIG_NCP_FS is not set 895# CONFIG_NCP_FS is not set
890# CONFIG_CODA_FS is not set 896# CONFIG_CODA_FS is not set
@@ -1026,6 +1032,7 @@ CONFIG_CRYPTO=y
1026# 1032#
1027# CONFIG_CRYPTO_ANSI_CPRNG is not set 1033# CONFIG_CRYPTO_ANSI_CPRNG is not set
1028CONFIG_CRYPTO_HW=y 1034CONFIG_CRYPTO_HW=y
1035# CONFIG_VIRTUALIZATION is not set
1029# CONFIG_BINARY_PRINTF is not set 1036# CONFIG_BINARY_PRINTF is not set
1030 1037
1031# 1038#
diff --git a/arch/sh/configs/se7712_defconfig b/arch/sh/configs/se7712_defconfig
index cfa58199a368..4487a230466f 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 13:44:56 2010 4# Tue May 18 18:05:15 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -12,8 +12,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
12CONFIG_GENERIC_HWEIGHT=y 12CONFIG_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
16CONFIG_IRQ_PER_CPU=y 15CONFIG_IRQ_PER_CPU=y
16CONFIG_SPARSE_IRQ=y
17# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
@@ -29,6 +29,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 29CONFIG_ARCH_HAS_DEFAULT_IDLE=y
30CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 30CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DMA_NONCOHERENT=y 31CONFIG_DMA_NONCOHERENT=y
32CONFIG_NEED_DMA_MAP_STATE=y
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y 34CONFIG_CONSTRUCTORS=y
34 35
@@ -43,9 +44,11 @@ CONFIG_LOCALVERSION=""
43CONFIG_HAVE_KERNEL_GZIP=y 44CONFIG_HAVE_KERNEL_GZIP=y
44CONFIG_HAVE_KERNEL_BZIP2=y 45CONFIG_HAVE_KERNEL_BZIP2=y
45CONFIG_HAVE_KERNEL_LZMA=y 46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_HAVE_KERNEL_LZO=y
46CONFIG_KERNEL_GZIP=y 48CONFIG_KERNEL_GZIP=y
47# CONFIG_KERNEL_BZIP2 is not set 49# CONFIG_KERNEL_BZIP2 is not set
48# CONFIG_KERNEL_LZMA is not set 50# CONFIG_KERNEL_LZMA is not set
51# CONFIG_KERNEL_LZO is not set
49# CONFIG_SWAP is not set 52# CONFIG_SWAP is not set
50CONFIG_SYSVIPC=y 53CONFIG_SYSVIPC=y
51CONFIG_SYSVIPC_SYSCTL=y 54CONFIG_SYSVIPC_SYSCTL=y
@@ -68,7 +71,6 @@ CONFIG_RCU_FANOUT=32
68# CONFIG_TREE_RCU_TRACE is not set 71# CONFIG_TREE_RCU_TRACE is not set
69# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
70CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
71# CONFIG_GROUP_SCHED is not set
72# CONFIG_CGROUPS is not set 74# CONFIG_CGROUPS is not set
73CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
74CONFIG_SYSFS_DEPRECATED_V2=y 76CONFIG_SYSFS_DEPRECATED_V2=y
@@ -102,8 +104,9 @@ CONFIG_PERF_USE_VMALLOC=y
102# 104#
103# Kernel Performance Events And Counters 105# Kernel Performance Events And Counters
104# 106#
105# CONFIG_PERF_EVENTS is not set 107CONFIG_PERF_EVENTS=y
106# CONFIG_PERF_COUNTERS is not set 108# CONFIG_PERF_COUNTERS is not set
109# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
107CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_COMPAT_BRK=y 111CONFIG_COMPAT_BRK=y
109CONFIG_SLAB=y 112CONFIG_SLAB=y
@@ -119,6 +122,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
119CONFIG_HAVE_DMA_ATTRS=y 122CONFIG_HAVE_DMA_ATTRS=y
120CONFIG_HAVE_CLK=y 123CONFIG_HAVE_CLK=y
121CONFIG_HAVE_DMA_API_DEBUG=y 124CONFIG_HAVE_DMA_API_DEBUG=y
125CONFIG_HAVE_HW_BREAKPOINT=y
122 126
123# 127#
124# GCOV-based kernel profiling 128# GCOV-based kernel profiling
@@ -236,6 +240,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
236CONFIG_MAX_ACTIVE_REGIONS=1 240CONFIG_MAX_ACTIVE_REGIONS=1
237CONFIG_ARCH_POPULATES_NODE_MAP=y 241CONFIG_ARCH_POPULATES_NODE_MAP=y
238CONFIG_ARCH_SELECT_MEMORY_MODEL=y 242CONFIG_ARCH_SELECT_MEMORY_MODEL=y
243CONFIG_UNCACHED_MAPPING=y
239CONFIG_PAGE_SIZE_4KB=y 244CONFIG_PAGE_SIZE_4KB=y
240# CONFIG_PAGE_SIZE_8KB is not set 245# CONFIG_PAGE_SIZE_8KB is not set
241# CONFIG_PAGE_SIZE_16KB is not set 246# CONFIG_PAGE_SIZE_16KB is not set
@@ -251,7 +256,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
251CONFIG_SPLIT_PTLOCK_CPUS=4 256CONFIG_SPLIT_PTLOCK_CPUS=4
252# CONFIG_PHYS_ADDR_T_64BIT is not set 257# CONFIG_PHYS_ADDR_T_64BIT is not set
253CONFIG_ZONE_DMA_FLAG=0 258CONFIG_ZONE_DMA_FLAG=0
254CONFIG_NR_QUICK=2 259CONFIG_NR_QUICK=1
255# CONFIG_KSM is not set 260# CONFIG_KSM is not set
256CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 261CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
257 262
@@ -329,7 +334,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
329# CONFIG_PREEMPT is not set 334# CONFIG_PREEMPT is not set
330CONFIG_GUSA=y 335CONFIG_GUSA=y
331# CONFIG_GUSA_RB is not set 336# CONFIG_GUSA_RB is not set
332# CONFIG_SPARSE_IRQ is not set
333 337
334# 338#
335# Boot options 339# Boot options
@@ -366,7 +370,6 @@ CONFIG_NET=y
366# Networking options 370# Networking options
367# 371#
368CONFIG_PACKET=y 372CONFIG_PACKET=y
369CONFIG_PACKET_MMAP=y
370CONFIG_UNIX=y 373CONFIG_UNIX=y
371CONFIG_XFRM=y 374CONFIG_XFRM=y
372# CONFIG_XFRM_USER is not set 375# CONFIG_XFRM_USER is not set
@@ -614,6 +617,7 @@ CONFIG_HAVE_IDE=y
614# 617#
615# SCSI device support 618# SCSI device support
616# 619#
620CONFIG_SCSI_MOD=y
617# CONFIG_RAID_ATTRS is not set 621# CONFIG_RAID_ATTRS is not set
618CONFIG_SCSI=y 622CONFIG_SCSI=y
619CONFIG_SCSI_DMA=y 623CONFIG_SCSI_DMA=y
@@ -754,6 +758,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
754CONFIG_SERIAL_SH_SCI_CONSOLE=y 758CONFIG_SERIAL_SH_SCI_CONSOLE=y
755CONFIG_SERIAL_CORE=y 759CONFIG_SERIAL_CORE=y
756CONFIG_SERIAL_CORE_CONSOLE=y 760CONFIG_SERIAL_CORE_CONSOLE=y
761# CONFIG_SERIAL_TIMBERDALE is not set
757CONFIG_UNIX98_PTYS=y 762CONFIG_UNIX98_PTYS=y
758# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 763# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
759# CONFIG_LEGACY_PTYS is not set 764# CONFIG_LEGACY_PTYS is not set
@@ -834,11 +839,11 @@ CONFIG_LEDS_CLASS=y
834# 839#
835# LED drivers 840# LED drivers
836# 841#
842CONFIG_LEDS_TRIGGERS=y
837 843
838# 844#
839# LED Triggers 845# LED Triggers
840# 846#
841CONFIG_LEDS_TRIGGERS=y
842# CONFIG_LEDS_TRIGGER_TIMER is not set 847# CONFIG_LEDS_TRIGGER_TIMER is not set
843# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set 848# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
844# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set 849# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
@@ -940,6 +945,7 @@ CONFIG_JFFS2_ZLIB=y
940# CONFIG_JFFS2_LZO is not set 945# CONFIG_JFFS2_LZO is not set
941CONFIG_JFFS2_RTIME=y 946CONFIG_JFFS2_RTIME=y
942# CONFIG_JFFS2_RUBIN is not set 947# CONFIG_JFFS2_RUBIN is not set
948# CONFIG_LOGFS is not set
943CONFIG_CRAMFS=y 949CONFIG_CRAMFS=y
944# CONFIG_SQUASHFS is not set 950# CONFIG_SQUASHFS is not set
945# CONFIG_VXFS_FS is not set 951# CONFIG_VXFS_FS is not set
@@ -962,6 +968,7 @@ CONFIG_SUNRPC=y
962# CONFIG_RPCSEC_GSS_KRB5 is not set 968# CONFIG_RPCSEC_GSS_KRB5 is not set
963# CONFIG_RPCSEC_GSS_SPKM3 is not set 969# CONFIG_RPCSEC_GSS_SPKM3 is not set
964# CONFIG_SMB_FS is not set 970# CONFIG_SMB_FS is not set
971# CONFIG_CEPH_FS is not set
965# CONFIG_CIFS is not set 972# CONFIG_CIFS is not set
966# CONFIG_NCP_FS is not set 973# CONFIG_NCP_FS is not set
967# CONFIG_CODA_FS is not set 974# CONFIG_CODA_FS is not set
@@ -997,6 +1004,7 @@ CONFIG_SCHED_DEBUG=y
997# CONFIG_TIMER_STATS is not set 1004# CONFIG_TIMER_STATS is not set
998# CONFIG_DEBUG_OBJECTS is not set 1005# CONFIG_DEBUG_OBJECTS is not set
999# CONFIG_DEBUG_SLAB is not set 1006# CONFIG_DEBUG_SLAB is not set
1007# CONFIG_DEBUG_KMEMLEAK is not set
1000# CONFIG_DEBUG_RT_MUTEXES is not set 1008# CONFIG_DEBUG_RT_MUTEXES is not set
1001# CONFIG_RT_MUTEX_TESTER is not set 1009# CONFIG_RT_MUTEX_TESTER is not set
1002# CONFIG_DEBUG_SPINLOCK is not set 1010# CONFIG_DEBUG_SPINLOCK is not set
@@ -1042,6 +1050,7 @@ CONFIG_FTRACE=y
1042CONFIG_BRANCH_PROFILE_NONE=y 1050CONFIG_BRANCH_PROFILE_NONE=y
1043# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1051# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1044# CONFIG_PROFILE_ALL_BRANCHES is not set 1052# CONFIG_PROFILE_ALL_BRANCHES is not set
1053# CONFIG_KSYM_TRACER is not set
1045# CONFIG_STACK_TRACER is not set 1054# CONFIG_STACK_TRACER is not set
1046# CONFIG_KMEMTRACE is not set 1055# CONFIG_KMEMTRACE is not set
1047# CONFIG_WORKQUEUE_TRACER is not set 1056# CONFIG_WORKQUEUE_TRACER is not set
@@ -1167,6 +1176,7 @@ CONFIG_CRYPTO_DEFLATE=y
1167# 1176#
1168# CONFIG_CRYPTO_ANSI_CPRNG is not set 1177# CONFIG_CRYPTO_ANSI_CPRNG is not set
1169CONFIG_CRYPTO_HW=y 1178CONFIG_CRYPTO_HW=y
1179# CONFIG_VIRTUALIZATION is not set
1170# CONFIG_BINARY_PRINTF is not set 1180# CONFIG_BINARY_PRINTF is not set
1171 1181
1172# 1182#
diff --git a/arch/sh/configs/se7721_defconfig b/arch/sh/configs/se7721_defconfig
index 201283c829a1..7c06b5c0b49b 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 13:46:58 2010 4# Tue May 18 18:06:03 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -12,8 +12,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
12CONFIG_GENERIC_HWEIGHT=y 12CONFIG_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
16CONFIG_IRQ_PER_CPU=y 15CONFIG_IRQ_PER_CPU=y
16CONFIG_SPARSE_IRQ=y
17# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
@@ -30,6 +30,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DMA_NONCOHERENT=y 32CONFIG_DMA_NONCOHERENT=y
33CONFIG_NEED_DMA_MAP_STATE=y
33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y 35CONFIG_CONSTRUCTORS=y
35 36
@@ -44,9 +45,11 @@ CONFIG_LOCALVERSION=""
44CONFIG_HAVE_KERNEL_GZIP=y 45CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y 46CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y 47CONFIG_HAVE_KERNEL_LZMA=y
48CONFIG_HAVE_KERNEL_LZO=y
47CONFIG_KERNEL_GZIP=y 49CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set 50# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set 51# CONFIG_KERNEL_LZMA is not set
52# CONFIG_KERNEL_LZO is not set
50# CONFIG_SWAP is not set 53# CONFIG_SWAP is not set
51CONFIG_SYSVIPC=y 54CONFIG_SYSVIPC=y
52CONFIG_SYSVIPC_SYSCTL=y 55CONFIG_SYSVIPC_SYSCTL=y
@@ -69,11 +72,6 @@ CONFIG_RCU_FANOUT=32
69# CONFIG_TREE_RCU_TRACE is not set 72# CONFIG_TREE_RCU_TRACE is not set
70# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
72CONFIG_GROUP_SCHED=y
73CONFIG_FAIR_GROUP_SCHED=y
74# CONFIG_RT_GROUP_SCHED is not set
75CONFIG_USER_SCHED=y
76# CONFIG_CGROUP_SCHED is not set
77# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
78CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y 77CONFIG_SYSFS_DEPRECATED_V2=y
@@ -107,8 +105,9 @@ CONFIG_PERF_USE_VMALLOC=y
107# 105#
108# Kernel Performance Events And Counters 106# Kernel Performance Events And Counters
109# 107#
110# CONFIG_PERF_EVENTS is not set 108CONFIG_PERF_EVENTS=y
111# CONFIG_PERF_COUNTERS is not set 109# CONFIG_PERF_COUNTERS is not set
110# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
112CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_COMPAT_BRK=y 112CONFIG_COMPAT_BRK=y
114CONFIG_SLAB=y 113CONFIG_SLAB=y
@@ -124,6 +123,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124CONFIG_HAVE_DMA_ATTRS=y 123CONFIG_HAVE_DMA_ATTRS=y
125CONFIG_HAVE_CLK=y 124CONFIG_HAVE_CLK=y
126CONFIG_HAVE_DMA_API_DEBUG=y 125CONFIG_HAVE_DMA_API_DEBUG=y
126CONFIG_HAVE_HW_BREAKPOINT=y
127 127
128# 128#
129# GCOV-based kernel profiling 129# GCOV-based kernel profiling
@@ -241,6 +241,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
241CONFIG_MAX_ACTIVE_REGIONS=1 241CONFIG_MAX_ACTIVE_REGIONS=1
242CONFIG_ARCH_POPULATES_NODE_MAP=y 242CONFIG_ARCH_POPULATES_NODE_MAP=y
243CONFIG_ARCH_SELECT_MEMORY_MODEL=y 243CONFIG_ARCH_SELECT_MEMORY_MODEL=y
244CONFIG_UNCACHED_MAPPING=y
244CONFIG_PAGE_SIZE_4KB=y 245CONFIG_PAGE_SIZE_4KB=y
245# CONFIG_PAGE_SIZE_8KB is not set 246# CONFIG_PAGE_SIZE_8KB is not set
246# CONFIG_PAGE_SIZE_16KB is not set 247# CONFIG_PAGE_SIZE_16KB is not set
@@ -256,7 +257,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
256CONFIG_SPLIT_PTLOCK_CPUS=4 257CONFIG_SPLIT_PTLOCK_CPUS=4
257# CONFIG_PHYS_ADDR_T_64BIT is not set 258# CONFIG_PHYS_ADDR_T_64BIT is not set
258CONFIG_ZONE_DMA_FLAG=0 259CONFIG_ZONE_DMA_FLAG=0
259CONFIG_NR_QUICK=2 260CONFIG_NR_QUICK=1
260# CONFIG_KSM is not set 261# CONFIG_KSM is not set
261CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
262 263
@@ -334,7 +335,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
334# CONFIG_PREEMPT is not set 335# CONFIG_PREEMPT is not set
335CONFIG_GUSA=y 336CONFIG_GUSA=y
336# CONFIG_GUSA_RB is not set 337# CONFIG_GUSA_RB is not set
337# CONFIG_SPARSE_IRQ is not set
338 338
339# 339#
340# Boot options 340# Boot options
@@ -371,7 +371,6 @@ CONFIG_NET=y
371# Networking options 371# Networking options
372# 372#
373CONFIG_PACKET=y 373CONFIG_PACKET=y
374CONFIG_PACKET_MMAP=y
375CONFIG_UNIX=y 374CONFIG_UNIX=y
376CONFIG_XFRM=y 375CONFIG_XFRM=y
377# CONFIG_XFRM_USER is not set 376# CONFIG_XFRM_USER is not set
@@ -620,6 +619,7 @@ CONFIG_HAVE_IDE=y
620# 619#
621# SCSI device support 620# SCSI device support
622# 621#
622CONFIG_SCSI_MOD=y
623# CONFIG_RAID_ATTRS is not set 623# CONFIG_RAID_ATTRS is not set
624CONFIG_SCSI=y 624CONFIG_SCSI=y
625CONFIG_SCSI_DMA=y 625CONFIG_SCSI_DMA=y
@@ -687,6 +687,7 @@ CONFIG_WLAN=y
687# CONFIG_USB_PEGASUS is not set 687# CONFIG_USB_PEGASUS is not set
688# CONFIG_USB_RTL8150 is not set 688# CONFIG_USB_RTL8150 is not set
689# CONFIG_USB_USBNET is not set 689# CONFIG_USB_USBNET is not set
690# CONFIG_USB_IPHETH is not set
690# CONFIG_WAN is not set 691# CONFIG_WAN is not set
691# CONFIG_PPP is not set 692# CONFIG_PPP is not set
692# CONFIG_SLIP is not set 693# CONFIG_SLIP is not set
@@ -764,6 +765,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
764CONFIG_SERIAL_SH_SCI_CONSOLE=y 765CONFIG_SERIAL_SH_SCI_CONSOLE=y
765CONFIG_SERIAL_CORE=y 766CONFIG_SERIAL_CORE=y
766CONFIG_SERIAL_CORE_CONSOLE=y 767CONFIG_SERIAL_CORE_CONSOLE=y
768# CONFIG_SERIAL_TIMBERDALE is not set
767CONFIG_UNIX98_PTYS=y 769CONFIG_UNIX98_PTYS=y
768# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 770# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
769# CONFIG_LEGACY_PTYS is not set 771# CONFIG_LEGACY_PTYS is not set
@@ -829,6 +831,7 @@ CONFIG_USB_HID=y
829# 831#
830# Special HID drivers 832# Special HID drivers
831# 833#
834# CONFIG_HID_3M_PCT is not set
832CONFIG_HID_A4TECH=y 835CONFIG_HID_A4TECH=y
833CONFIG_HID_APPLE=y 836CONFIG_HID_APPLE=y
834CONFIG_HID_BELKIN=y 837CONFIG_HID_BELKIN=y
@@ -844,14 +847,19 @@ CONFIG_HID_GYRATION=y
844CONFIG_HID_LOGITECH=y 847CONFIG_HID_LOGITECH=y
845# CONFIG_LOGITECH_FF is not set 848# CONFIG_LOGITECH_FF is not set
846# CONFIG_LOGIRUMBLEPAD2_FF is not set 849# CONFIG_LOGIRUMBLEPAD2_FF is not set
850# CONFIG_LOGIG940_FF is not set
847CONFIG_HID_MICROSOFT=y 851CONFIG_HID_MICROSOFT=y
852# CONFIG_HID_MOSART is not set
848CONFIG_HID_MONTEREY=y 853CONFIG_HID_MONTEREY=y
849# CONFIG_HID_NTRIG is not set 854# CONFIG_HID_NTRIG is not set
855# CONFIG_HID_ORTEK is not set
850CONFIG_HID_PANTHERLORD=y 856CONFIG_HID_PANTHERLORD=y
851# CONFIG_PANTHERLORD_FF is not set 857# CONFIG_PANTHERLORD_FF is not set
852CONFIG_HID_PETALYNX=y 858CONFIG_HID_PETALYNX=y
859# CONFIG_HID_QUANTA is not set
853CONFIG_HID_SAMSUNG=y 860CONFIG_HID_SAMSUNG=y
854CONFIG_HID_SONY=y 861CONFIG_HID_SONY=y
862# CONFIG_HID_STANTUM is not set
855CONFIG_HID_SUNPLUS=y 863CONFIG_HID_SUNPLUS=y
856# CONFIG_HID_GREENASIA is not set 864# CONFIG_HID_GREENASIA is not set
857# CONFIG_HID_SMARTJOYPLUS is not set 865# CONFIG_HID_SMARTJOYPLUS is not set
@@ -946,7 +954,6 @@ CONFIG_USB_STORAGE=y
946# CONFIG_USB_RIO500 is not set 954# CONFIG_USB_RIO500 is not set
947# CONFIG_USB_LEGOTOWER is not set 955# CONFIG_USB_LEGOTOWER is not set
948# CONFIG_USB_LCD is not set 956# CONFIG_USB_LCD is not set
949# CONFIG_USB_BERRY_CHARGE is not set
950# CONFIG_USB_LED is not set 957# CONFIG_USB_LED is not set
951# CONFIG_USB_CYPRESS_CY7C63 is not set 958# CONFIG_USB_CYPRESS_CY7C63 is not set
952# CONFIG_USB_CYTHERM is not set 959# CONFIG_USB_CYTHERM is not set
@@ -958,7 +965,6 @@ CONFIG_USB_STORAGE=y
958# CONFIG_USB_IOWARRIOR is not set 965# CONFIG_USB_IOWARRIOR is not set
959# CONFIG_USB_TEST is not set 966# CONFIG_USB_TEST is not set
960# CONFIG_USB_ISIGHTFW is not set 967# CONFIG_USB_ISIGHTFW is not set
961# CONFIG_USB_VST is not set
962# CONFIG_USB_GADGET is not set 968# CONFIG_USB_GADGET is not set
963 969
964# 970#
@@ -973,11 +979,11 @@ CONFIG_LEDS_CLASS=y
973# 979#
974# LED drivers 980# LED drivers
975# 981#
982CONFIG_LEDS_TRIGGERS=y
976 983
977# 984#
978# LED Triggers 985# LED Triggers
979# 986#
980CONFIG_LEDS_TRIGGERS=y
981# CONFIG_LEDS_TRIGGER_TIMER is not set 987# CONFIG_LEDS_TRIGGER_TIMER is not set
982# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set 988# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
983# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set 989# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
@@ -1082,6 +1088,7 @@ CONFIG_JFFS2_ZLIB=y
1082# CONFIG_JFFS2_LZO is not set 1088# CONFIG_JFFS2_LZO is not set
1083CONFIG_JFFS2_RTIME=y 1089CONFIG_JFFS2_RTIME=y
1084# CONFIG_JFFS2_RUBIN is not set 1090# CONFIG_JFFS2_RUBIN is not set
1091# CONFIG_LOGFS is not set
1085CONFIG_CRAMFS=y 1092CONFIG_CRAMFS=y
1086# CONFIG_SQUASHFS is not set 1093# CONFIG_SQUASHFS is not set
1087# CONFIG_VXFS_FS is not set 1094# CONFIG_VXFS_FS is not set
@@ -1163,6 +1170,7 @@ CONFIG_SCHED_DEBUG=y
1163# CONFIG_TIMER_STATS is not set 1170# CONFIG_TIMER_STATS is not set
1164# CONFIG_DEBUG_OBJECTS is not set 1171# CONFIG_DEBUG_OBJECTS is not set
1165# CONFIG_DEBUG_SLAB is not set 1172# CONFIG_DEBUG_SLAB is not set
1173# CONFIG_DEBUG_KMEMLEAK is not set
1166# CONFIG_DEBUG_RT_MUTEXES is not set 1174# CONFIG_DEBUG_RT_MUTEXES is not set
1167# CONFIG_RT_MUTEX_TESTER is not set 1175# CONFIG_RT_MUTEX_TESTER is not set
1168# CONFIG_DEBUG_SPINLOCK is not set 1176# CONFIG_DEBUG_SPINLOCK is not set
@@ -1208,6 +1216,7 @@ CONFIG_FTRACE=y
1208CONFIG_BRANCH_PROFILE_NONE=y 1216CONFIG_BRANCH_PROFILE_NONE=y
1209# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1217# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1210# CONFIG_PROFILE_ALL_BRANCHES is not set 1218# CONFIG_PROFILE_ALL_BRANCHES is not set
1219# CONFIG_KSYM_TRACER is not set
1211# CONFIG_STACK_TRACER is not set 1220# CONFIG_STACK_TRACER is not set
1212# CONFIG_KMEMTRACE is not set 1221# CONFIG_KMEMTRACE is not set
1213# CONFIG_WORKQUEUE_TRACER is not set 1222# CONFIG_WORKQUEUE_TRACER is not set
@@ -1333,6 +1342,7 @@ CONFIG_CRYPTO_DEFLATE=y
1333# 1342#
1334# CONFIG_CRYPTO_ANSI_CPRNG is not set 1343# CONFIG_CRYPTO_ANSI_CPRNG is not set
1335CONFIG_CRYPTO_HW=y 1344CONFIG_CRYPTO_HW=y
1345# CONFIG_VIRTUALIZATION is not set
1336# CONFIG_BINARY_PRINTF is not set 1346# CONFIG_BINARY_PRINTF is not set
1337 1347
1338# 1348#
diff --git a/arch/sh/configs/se7722_defconfig b/arch/sh/configs/se7722_defconfig
index 4a4efd261d03..42782e7ff8ba 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 13:49:15 2010 4# Tue May 18 18:07:07 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
33CONFIG_ARCH_HAS_DEFAULT_IDLE=y 33CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -48,9 +49,11 @@ CONFIG_LOCALVERSION_AUTO=y
48CONFIG_HAVE_KERNEL_GZIP=y 49CONFIG_HAVE_KERNEL_GZIP=y
49CONFIG_HAVE_KERNEL_BZIP2=y 50CONFIG_HAVE_KERNEL_BZIP2=y
50CONFIG_HAVE_KERNEL_LZMA=y 51CONFIG_HAVE_KERNEL_LZMA=y
52CONFIG_HAVE_KERNEL_LZO=y
51CONFIG_KERNEL_GZIP=y 53CONFIG_KERNEL_GZIP=y
52# CONFIG_KERNEL_BZIP2 is not set 54# CONFIG_KERNEL_BZIP2 is not set
53# CONFIG_KERNEL_LZMA is not set 55# CONFIG_KERNEL_LZMA is not set
56# CONFIG_KERNEL_LZO is not set
54CONFIG_SWAP=y 57CONFIG_SWAP=y
55CONFIG_SYSVIPC=y 58CONFIG_SYSVIPC=y
56CONFIG_SYSVIPC_SYSCTL=y 59CONFIG_SYSVIPC_SYSCTL=y
@@ -73,7 +76,6 @@ CONFIG_RCU_FANOUT=32
73CONFIG_IKCONFIG=y 76CONFIG_IKCONFIG=y
74CONFIG_IKCONFIG_PROC=y 77CONFIG_IKCONFIG_PROC=y
75CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
76# CONFIG_GROUP_SCHED is not set
77# CONFIG_CGROUPS is not set 79# CONFIG_CGROUPS is not set
78CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
@@ -84,6 +86,7 @@ CONFIG_INITRAMFS_SOURCE=""
84CONFIG_RD_GZIP=y 86CONFIG_RD_GZIP=y
85# CONFIG_RD_BZIP2 is not set 87# CONFIG_RD_BZIP2 is not set
86# CONFIG_RD_LZMA is not set 88# CONFIG_RD_LZMA is not set
89# CONFIG_RD_LZO is not set
87CONFIG_CC_OPTIMIZE_FOR_SIZE=y 90CONFIG_CC_OPTIMIZE_FOR_SIZE=y
88CONFIG_SYSCTL=y 91CONFIG_SYSCTL=y
89CONFIG_ANON_INODES=y 92CONFIG_ANON_INODES=y
@@ -122,13 +125,13 @@ CONFIG_PROFILING=y
122# CONFIG_OPROFILE is not set 125# CONFIG_OPROFILE is not set
123CONFIG_HAVE_OPROFILE=y 126CONFIG_HAVE_OPROFILE=y
124# CONFIG_KPROBES is not set 127# CONFIG_KPROBES is not set
125CONFIG_HAVE_IOREMAP_PROT=y
126CONFIG_HAVE_KPROBES=y 128CONFIG_HAVE_KPROBES=y
127CONFIG_HAVE_KRETPROBES=y 129CONFIG_HAVE_KRETPROBES=y
128CONFIG_HAVE_ARCH_TRACEHOOK=y 130CONFIG_HAVE_ARCH_TRACEHOOK=y
129CONFIG_HAVE_DMA_ATTRS=y 131CONFIG_HAVE_DMA_ATTRS=y
130CONFIG_HAVE_CLK=y 132CONFIG_HAVE_CLK=y
131CONFIG_HAVE_DMA_API_DEBUG=y 133CONFIG_HAVE_DMA_API_DEBUG=y
134CONFIG_HAVE_HW_BREAKPOINT=y
132 135
133# 136#
134# GCOV-based kernel profiling 137# GCOV-based kernel profiling
@@ -245,7 +248,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
245CONFIG_MEMORY_START=0x0c000000 248CONFIG_MEMORY_START=0x0c000000
246CONFIG_MEMORY_SIZE=0x04000000 249CONFIG_MEMORY_SIZE=0x04000000
247CONFIG_29BIT=y 250CONFIG_29BIT=y
248# CONFIG_X2TLB is not set 251CONFIG_X2TLB=y
249CONFIG_VSYSCALL=y 252CONFIG_VSYSCALL=y
250CONFIG_NUMA=y 253CONFIG_NUMA=y
251CONFIG_NODES_SHIFT=1 254CONFIG_NODES_SHIFT=1
@@ -256,6 +259,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
256CONFIG_ARCH_SELECT_MEMORY_MODEL=y 259CONFIG_ARCH_SELECT_MEMORY_MODEL=y
257CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 260CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
258CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 261CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
262CONFIG_IOREMAP_FIXED=y
263CONFIG_UNCACHED_MAPPING=y
259CONFIG_PAGE_SIZE_4KB=y 264CONFIG_PAGE_SIZE_4KB=y
260# CONFIG_PAGE_SIZE_8KB is not set 265# CONFIG_PAGE_SIZE_8KB is not set
261# CONFIG_PAGE_SIZE_16KB is not set 266# CONFIG_PAGE_SIZE_16KB is not set
@@ -279,7 +284,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
279CONFIG_MIGRATION=y 284CONFIG_MIGRATION=y
280# CONFIG_PHYS_ADDR_T_64BIT is not set 285# CONFIG_PHYS_ADDR_T_64BIT is not set
281CONFIG_ZONE_DMA_FLAG=0 286CONFIG_ZONE_DMA_FLAG=0
282CONFIG_NR_QUICK=2 287CONFIG_NR_QUICK=1
283# CONFIG_KSM is not set 288# CONFIG_KSM is not set
284CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 289CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
285 290
@@ -356,7 +361,7 @@ CONFIG_KEXEC=y
356# CONFIG_PREEMPT_VOLUNTARY is not set 361# CONFIG_PREEMPT_VOLUNTARY is not set
357CONFIG_PREEMPT=y 362CONFIG_PREEMPT=y
358CONFIG_GUSA=y 363CONFIG_GUSA=y
359# CONFIG_SPARSE_IRQ is not set 364# CONFIG_INTC_USERIMASK is not set
360 365
361# 366#
362# Boot options 367# Boot options
@@ -391,6 +396,7 @@ CONFIG_SUSPEND=y
391CONFIG_SUSPEND_FREEZER=y 396CONFIG_SUSPEND_FREEZER=y
392# CONFIG_HIBERNATION is not set 397# CONFIG_HIBERNATION is not set
393CONFIG_PM_RUNTIME=y 398CONFIG_PM_RUNTIME=y
399CONFIG_PM_OPS=y
394# CONFIG_CPU_IDLE is not set 400# CONFIG_CPU_IDLE is not set
395CONFIG_NET=y 401CONFIG_NET=y
396 402
@@ -398,7 +404,6 @@ CONFIG_NET=y
398# Networking options 404# Networking options
399# 405#
400CONFIG_PACKET=y 406CONFIG_PACKET=y
401CONFIG_PACKET_MMAP=y
402CONFIG_UNIX=y 407CONFIG_UNIX=y
403CONFIG_XFRM=y 408CONFIG_XFRM=y
404# CONFIG_XFRM_USER is not set 409# CONFIG_XFRM_USER is not set
@@ -519,6 +524,7 @@ CONFIG_HAVE_IDE=y
519# 524#
520# SCSI device support 525# SCSI device support
521# 526#
527CONFIG_SCSI_MOD=y
522# CONFIG_RAID_ATTRS is not set 528# CONFIG_RAID_ATTRS is not set
523CONFIG_SCSI=y 529CONFIG_SCSI=y
524CONFIG_SCSI_DMA=y 530CONFIG_SCSI_DMA=y
@@ -676,6 +682,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=3
676CONFIG_SERIAL_SH_SCI_CONSOLE=y 682CONFIG_SERIAL_SH_SCI_CONSOLE=y
677CONFIG_SERIAL_CORE=y 683CONFIG_SERIAL_CORE=y
678CONFIG_SERIAL_CORE_CONSOLE=y 684CONFIG_SERIAL_CORE_CONSOLE=y
685# CONFIG_SERIAL_TIMBERDALE is not set
679CONFIG_UNIX98_PTYS=y 686CONFIG_UNIX98_PTYS=y
680# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 687# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
681CONFIG_LEGACY_PTYS=y 688CONFIG_LEGACY_PTYS=y
@@ -898,6 +905,7 @@ CONFIG_MISC_FILESYSTEMS=y
898# CONFIG_BEFS_FS is not set 905# CONFIG_BEFS_FS is not set
899# CONFIG_BFS_FS is not set 906# CONFIG_BFS_FS is not set
900# CONFIG_EFS_FS is not set 907# CONFIG_EFS_FS is not set
908# CONFIG_LOGFS is not set
901# CONFIG_CRAMFS is not set 909# CONFIG_CRAMFS is not set
902# CONFIG_SQUASHFS is not set 910# CONFIG_SQUASHFS is not set
903# CONFIG_VXFS_FS is not set 911# CONFIG_VXFS_FS is not set
@@ -912,6 +920,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
912# CONFIG_NFS_FS is not set 920# CONFIG_NFS_FS is not set
913# CONFIG_NFSD is not set 921# CONFIG_NFSD is not set
914# CONFIG_SMB_FS is not set 922# CONFIG_SMB_FS is not set
923# CONFIG_CEPH_FS is not set
915# CONFIG_CIFS is not set 924# CONFIG_CIFS is not set
916# CONFIG_NCP_FS is not set 925# CONFIG_NCP_FS is not set
917# CONFIG_CODA_FS is not set 926# CONFIG_CODA_FS is not set
@@ -944,6 +953,7 @@ CONFIG_DEBUG_FS=y
944CONFIG_DEBUG_BUGVERBOSE=y 953CONFIG_DEBUG_BUGVERBOSE=y
945# CONFIG_DEBUG_MEMORY_INIT is not set 954# CONFIG_DEBUG_MEMORY_INIT is not set
946# CONFIG_RCU_CPU_STALL_DETECTOR is not set 955# CONFIG_RCU_CPU_STALL_DETECTOR is not set
956# CONFIG_LKDTM is not set
947# CONFIG_LATENCYTOP is not set 957# CONFIG_LATENCYTOP is not set
948# CONFIG_SYSCTL_SYSCALL_CHECK is not set 958# CONFIG_SYSCTL_SYSCALL_CHECK is not set
949CONFIG_HAVE_FUNCTION_TRACER=y 959CONFIG_HAVE_FUNCTION_TRACER=y
@@ -1059,6 +1069,7 @@ CONFIG_CRYPTO=y
1059# 1069#
1060# CONFIG_CRYPTO_ANSI_CPRNG is not set 1070# CONFIG_CRYPTO_ANSI_CPRNG is not set
1061CONFIG_CRYPTO_HW=y 1071CONFIG_CRYPTO_HW=y
1072# CONFIG_VIRTUALIZATION is not set
1062# CONFIG_BINARY_PRINTF is not set 1073# CONFIG_BINARY_PRINTF is not set
1063 1074
1064# 1075#
diff --git a/arch/sh/configs/se7724_defconfig b/arch/sh/configs/se7724_defconfig
index ab371afe3595..ebb4ac4a7d8f 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 14:36:56 2010 4# Tue May 18 16:55:41 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -47,9 +48,11 @@ CONFIG_LOCALVERSION=""
47CONFIG_HAVE_KERNEL_GZIP=y 48CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y 49CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y 50CONFIG_HAVE_KERNEL_LZMA=y
51CONFIG_HAVE_KERNEL_LZO=y
50CONFIG_KERNEL_GZIP=y 52CONFIG_KERNEL_GZIP=y
51# CONFIG_KERNEL_BZIP2 is not set 53# CONFIG_KERNEL_BZIP2 is not set
52# CONFIG_KERNEL_LZMA is not set 54# CONFIG_KERNEL_LZMA is not set
55# CONFIG_KERNEL_LZO is not set
53CONFIG_SWAP=y 56CONFIG_SWAP=y
54CONFIG_SYSVIPC=y 57CONFIG_SYSVIPC=y
55CONFIG_SYSVIPC_SYSCTL=y 58CONFIG_SYSVIPC_SYSCTL=y
@@ -71,11 +74,6 @@ CONFIG_RCU_FANOUT=32
71# CONFIG_TREE_RCU_TRACE is not set 74# CONFIG_TREE_RCU_TRACE is not set
72# CONFIG_IKCONFIG is not set 75# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
74CONFIG_GROUP_SCHED=y
75CONFIG_FAIR_GROUP_SCHED=y
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
79# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 79CONFIG_SYSFS_DEPRECATED_V2=y
@@ -107,7 +105,7 @@ CONFIG_PERF_USE_VMALLOC=y
107# 105#
108# Kernel Performance Events And Counters 106# Kernel Performance Events And Counters
109# 107#
110# CONFIG_PERF_EVENTS is not set 108CONFIG_PERF_EVENTS=y
111# CONFIG_PERF_COUNTERS is not set 109# CONFIG_PERF_COUNTERS is not set
112CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_COMPAT_BRK=y 111CONFIG_COMPAT_BRK=y
@@ -116,13 +114,13 @@ CONFIG_SLAB=y
116# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
118CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
119CONFIG_HAVE_IOREMAP_PROT=y
120CONFIG_HAVE_KPROBES=y 117CONFIG_HAVE_KPROBES=y
121CONFIG_HAVE_KRETPROBES=y 118CONFIG_HAVE_KRETPROBES=y
122CONFIG_HAVE_ARCH_TRACEHOOK=y 119CONFIG_HAVE_ARCH_TRACEHOOK=y
123CONFIG_HAVE_DMA_ATTRS=y 120CONFIG_HAVE_DMA_ATTRS=y
124CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
125CONFIG_HAVE_DMA_API_DEBUG=y 122CONFIG_HAVE_DMA_API_DEBUG=y
123CONFIG_HAVE_HW_BREAKPOINT=y
126 124
127# 125#
128# GCOV-based kernel profiling 126# GCOV-based kernel profiling
@@ -237,8 +235,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
237CONFIG_MEMORY_START=0x08000000 235CONFIG_MEMORY_START=0x08000000
238CONFIG_MEMORY_SIZE=0x08000000 236CONFIG_MEMORY_SIZE=0x08000000
239CONFIG_29BIT=y 237CONFIG_29BIT=y
240# CONFIG_PMB_ENABLE is not set 238# CONFIG_PMB is not set
241# CONFIG_X2TLB is not set 239CONFIG_X2TLB=y
242CONFIG_VSYSCALL=y 240CONFIG_VSYSCALL=y
243CONFIG_ARCH_FLATMEM_ENABLE=y 241CONFIG_ARCH_FLATMEM_ENABLE=y
244CONFIG_ARCH_SPARSEMEM_ENABLE=y 242CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -246,6 +244,8 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
246CONFIG_MAX_ACTIVE_REGIONS=1 244CONFIG_MAX_ACTIVE_REGIONS=1
247CONFIG_ARCH_POPULATES_NODE_MAP=y 245CONFIG_ARCH_POPULATES_NODE_MAP=y
248CONFIG_ARCH_SELECT_MEMORY_MODEL=y 246CONFIG_ARCH_SELECT_MEMORY_MODEL=y
247CONFIG_IOREMAP_FIXED=y
248CONFIG_UNCACHED_MAPPING=y
249CONFIG_PAGE_SIZE_4KB=y 249CONFIG_PAGE_SIZE_4KB=y
250# CONFIG_PAGE_SIZE_8KB is not set 250# CONFIG_PAGE_SIZE_8KB is not set
251# CONFIG_PAGE_SIZE_16KB is not set 251# CONFIG_PAGE_SIZE_16KB is not set
@@ -261,7 +261,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
261CONFIG_SPLIT_PTLOCK_CPUS=4 261CONFIG_SPLIT_PTLOCK_CPUS=4
262# CONFIG_PHYS_ADDR_T_64BIT is not set 262# CONFIG_PHYS_ADDR_T_64BIT is not set
263CONFIG_ZONE_DMA_FLAG=0 263CONFIG_ZONE_DMA_FLAG=0
264CONFIG_NR_QUICK=2 264CONFIG_NR_QUICK=1
265# CONFIG_KSM is not set 265# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267 267
@@ -340,7 +340,7 @@ CONFIG_SECCOMP=y
340# CONFIG_PREEMPT_VOLUNTARY is not set 340# CONFIG_PREEMPT_VOLUNTARY is not set
341CONFIG_PREEMPT=y 341CONFIG_PREEMPT=y
342CONFIG_GUSA=y 342CONFIG_GUSA=y
343# CONFIG_SPARSE_IRQ is not set 343# CONFIG_INTC_USERIMASK is not set
344 344
345# 345#
346# Boot options 346# Boot options
@@ -376,6 +376,7 @@ CONFIG_SUSPEND=y
376CONFIG_SUSPEND_FREEZER=y 376CONFIG_SUSPEND_FREEZER=y
377# CONFIG_HIBERNATION is not set 377# CONFIG_HIBERNATION is not set
378CONFIG_PM_RUNTIME=y 378CONFIG_PM_RUNTIME=y
379CONFIG_PM_OPS=y
379# CONFIG_CPU_IDLE is not set 380# CONFIG_CPU_IDLE is not set
380CONFIG_NET=y 381CONFIG_NET=y
381 382
@@ -383,7 +384,6 @@ CONFIG_NET=y
383# Networking options 384# Networking options
384# 385#
385CONFIG_PACKET=y 386CONFIG_PACKET=y
386# CONFIG_PACKET_MMAP is not set
387CONFIG_UNIX=y 387CONFIG_UNIX=y
388# CONFIG_NET_KEY is not set 388# CONFIG_NET_KEY is not set
389CONFIG_INET=y 389CONFIG_INET=y
@@ -559,6 +559,7 @@ CONFIG_MTD_NAND_IDS=y
559# CONFIG_MTD_NAND_NANDSIM is not set 559# CONFIG_MTD_NAND_NANDSIM is not set
560# CONFIG_MTD_NAND_PLATFORM is not set 560# CONFIG_MTD_NAND_PLATFORM is not set
561# CONFIG_MTD_ALAUDA is not set 561# CONFIG_MTD_ALAUDA is not set
562# CONFIG_MTD_NAND_SH_FLCTL is not set
562# CONFIG_MTD_ONENAND is not set 563# CONFIG_MTD_ONENAND is not set
563 564
564# 565#
@@ -600,6 +601,7 @@ CONFIG_MISC_DEVICES=y
600# CONFIG_ICS932S401 is not set 601# CONFIG_ICS932S401 is not set
601# CONFIG_ENCLOSURE_SERVICES is not set 602# CONFIG_ENCLOSURE_SERVICES is not set
602# CONFIG_ISL29003 is not set 603# CONFIG_ISL29003 is not set
604# CONFIG_SENSORS_TSL2550 is not set
603# CONFIG_DS1682 is not set 605# CONFIG_DS1682 is not set
604# CONFIG_TI_DAC7512 is not set 606# CONFIG_TI_DAC7512 is not set
605# CONFIG_C2PORT is not set 607# CONFIG_C2PORT is not set
@@ -619,6 +621,7 @@ CONFIG_HAVE_IDE=y
619# 621#
620# SCSI device support 622# SCSI device support
621# 623#
624CONFIG_SCSI_MOD=y
622# CONFIG_RAID_ATTRS is not set 625# CONFIG_RAID_ATTRS is not set
623CONFIG_SCSI=y 626CONFIG_SCSI=y
624CONFIG_SCSI_DMA=y 627CONFIG_SCSI_DMA=y
@@ -726,6 +729,7 @@ CONFIG_WLAN=y
726# CONFIG_USB_PEGASUS is not set 729# CONFIG_USB_PEGASUS is not set
727# CONFIG_USB_RTL8150 is not set 730# CONFIG_USB_RTL8150 is not set
728# CONFIG_USB_USBNET is not set 731# CONFIG_USB_USBNET is not set
732# CONFIG_USB_IPHETH is not set
729# CONFIG_WAN is not set 733# CONFIG_WAN is not set
730# CONFIG_PPP is not set 734# CONFIG_PPP is not set
731# CONFIG_SLIP is not set 735# CONFIG_SLIP is not set
@@ -805,6 +809,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6
805CONFIG_SERIAL_SH_SCI_CONSOLE=y 809CONFIG_SERIAL_SH_SCI_CONSOLE=y
806CONFIG_SERIAL_CORE=y 810CONFIG_SERIAL_CORE=y
807CONFIG_SERIAL_CORE_CONSOLE=y 811CONFIG_SERIAL_CORE_CONSOLE=y
812# CONFIG_SERIAL_TIMBERDALE is not set
808CONFIG_UNIX98_PTYS=y 813CONFIG_UNIX98_PTYS=y
809# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 814# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
810CONFIG_LEGACY_PTYS=y 815CONFIG_LEGACY_PTYS=y
@@ -833,6 +838,7 @@ CONFIG_I2C_HELPER_AUTO=y
833# CONFIG_I2C_OCORES is not set 838# CONFIG_I2C_OCORES is not set
834CONFIG_I2C_SH_MOBILE=y 839CONFIG_I2C_SH_MOBILE=y
835# CONFIG_I2C_SIMTEC is not set 840# CONFIG_I2C_SIMTEC is not set
841# CONFIG_I2C_XILINX is not set
836 842
837# 843#
838# External I2C/SMBus adapter drivers 844# External I2C/SMBus adapter drivers
@@ -846,15 +852,9 @@ CONFIG_I2C_SH_MOBILE=y
846# 852#
847# CONFIG_I2C_PCA_PLATFORM is not set 853# CONFIG_I2C_PCA_PLATFORM is not set
848# CONFIG_I2C_STUB is not set 854# CONFIG_I2C_STUB is not set
849
850#
851# Miscellaneous I2C Chip support
852#
853# CONFIG_SENSORS_TSL2550 is not set
854# CONFIG_I2C_DEBUG_CORE is not set 855# CONFIG_I2C_DEBUG_CORE is not set
855# CONFIG_I2C_DEBUG_ALGO is not set 856# CONFIG_I2C_DEBUG_ALGO is not set
856# CONFIG_I2C_DEBUG_BUS is not set 857# CONFIG_I2C_DEBUG_BUS is not set
857# CONFIG_I2C_DEBUG_CHIP is not set
858CONFIG_SPI=y 858CONFIG_SPI=y
859CONFIG_SPI_MASTER=y 859CONFIG_SPI_MASTER=y
860 860
@@ -885,13 +885,16 @@ CONFIG_GPIOLIB=y
885# 885#
886# Memory mapped GPIO expanders: 886# Memory mapped GPIO expanders:
887# 887#
888# CONFIG_GPIO_IT8761E is not set
888 889
889# 890#
890# I2C GPIO expanders: 891# I2C GPIO expanders:
891# 892#
893# CONFIG_GPIO_MAX7300 is not set
892# CONFIG_GPIO_MAX732X is not set 894# CONFIG_GPIO_MAX732X is not set
893# CONFIG_GPIO_PCA953X is not set 895# CONFIG_GPIO_PCA953X is not set
894# CONFIG_GPIO_PCF857X is not set 896# CONFIG_GPIO_PCF857X is not set
897# CONFIG_GPIO_ADP5588 is not set
895 898
896# 899#
897# PCI GPIO expanders: 900# PCI GPIO expanders:
@@ -923,22 +926,25 @@ CONFIG_SSB_POSSIBLE=y
923# Multifunction device drivers 926# Multifunction device drivers
924# 927#
925# CONFIG_MFD_CORE is not set 928# CONFIG_MFD_CORE is not set
929# CONFIG_MFD_88PM860X is not set
926# CONFIG_MFD_SM501 is not set 930# CONFIG_MFD_SM501 is not set
927# CONFIG_MFD_SH_MOBILE_SDHI is not set 931# CONFIG_MFD_SH_MOBILE_SDHI is not set
928# CONFIG_HTC_PASIC3 is not set 932# CONFIG_HTC_PASIC3 is not set
933# CONFIG_HTC_I2CPLD is not set
929# CONFIG_TPS65010 is not set 934# CONFIG_TPS65010 is not set
930# CONFIG_TWL4030_CORE is not set 935# CONFIG_TWL4030_CORE is not set
931# CONFIG_MFD_TMIO is not set 936# CONFIG_MFD_TMIO is not set
932# CONFIG_PMIC_DA903X is not set 937# CONFIG_PMIC_DA903X is not set
933# CONFIG_PMIC_ADP5520 is not set 938# CONFIG_PMIC_ADP5520 is not set
939# CONFIG_MFD_MAX8925 is not set
934# CONFIG_MFD_WM8400 is not set 940# CONFIG_MFD_WM8400 is not set
935# CONFIG_MFD_WM831X is not set 941# CONFIG_MFD_WM831X is not set
936# CONFIG_MFD_WM8350_I2C is not set 942# CONFIG_MFD_WM8350_I2C is not set
943# CONFIG_MFD_WM8994 is not set
937# CONFIG_MFD_PCF50633 is not set 944# CONFIG_MFD_PCF50633 is not set
938# CONFIG_MFD_MC13783 is not set 945# CONFIG_MFD_MC13783 is not set
939# CONFIG_AB3100_CORE is not set 946# CONFIG_AB3100_CORE is not set
940# CONFIG_EZX_PCAP is not set 947# CONFIG_EZX_PCAP is not set
941# CONFIG_MFD_88PM8607 is not set
942# CONFIG_AB4500_CORE is not set 948# CONFIG_AB4500_CORE is not set
943# CONFIG_REGULATOR is not set 949# CONFIG_REGULATOR is not set
944CONFIG_MEDIA_SUPPORT=y 950CONFIG_MEDIA_SUPPORT=y
@@ -1001,7 +1007,9 @@ CONFIG_USB_GSPCA=m
1001# CONFIG_USB_M5602 is not set 1007# CONFIG_USB_M5602 is not set
1002# CONFIG_USB_STV06XX is not set 1008# CONFIG_USB_STV06XX is not set
1003# CONFIG_USB_GL860 is not set 1009# CONFIG_USB_GL860 is not set
1010# CONFIG_USB_GSPCA_BENQ is not set
1004# CONFIG_USB_GSPCA_CONEX is not set 1011# CONFIG_USB_GSPCA_CONEX is not set
1012# CONFIG_USB_GSPCA_CPIA1 is not set
1005# CONFIG_USB_GSPCA_ETOMS is not set 1013# CONFIG_USB_GSPCA_ETOMS is not set
1006# CONFIG_USB_GSPCA_FINEPIX is not set 1014# CONFIG_USB_GSPCA_FINEPIX is not set
1007# CONFIG_USB_GSPCA_JEILINJ is not set 1015# CONFIG_USB_GSPCA_JEILINJ is not set
@@ -1009,9 +1017,11 @@ CONFIG_USB_GSPCA=m
1009# CONFIG_USB_GSPCA_MR97310A is not set 1017# CONFIG_USB_GSPCA_MR97310A is not set
1010# CONFIG_USB_GSPCA_OV519 is not set 1018# CONFIG_USB_GSPCA_OV519 is not set
1011# CONFIG_USB_GSPCA_OV534 is not set 1019# CONFIG_USB_GSPCA_OV534 is not set
1020# CONFIG_USB_GSPCA_OV534_9 is not set
1012# CONFIG_USB_GSPCA_PAC207 is not set 1021# CONFIG_USB_GSPCA_PAC207 is not set
1013# CONFIG_USB_GSPCA_PAC7302 is not set 1022# CONFIG_USB_GSPCA_PAC7302 is not set
1014# CONFIG_USB_GSPCA_PAC7311 is not set 1023# CONFIG_USB_GSPCA_PAC7311 is not set
1024# CONFIG_USB_GSPCA_SN9C2028 is not set
1015# CONFIG_USB_GSPCA_SN9C20X is not set 1025# CONFIG_USB_GSPCA_SN9C20X is not set
1016# CONFIG_USB_GSPCA_SONIXB is not set 1026# CONFIG_USB_GSPCA_SONIXB is not set
1017# CONFIG_USB_GSPCA_SONIXJ is not set 1027# CONFIG_USB_GSPCA_SONIXJ is not set
@@ -1033,6 +1043,7 @@ CONFIG_USB_GSPCA=m
1033# CONFIG_VIDEO_PVRUSB2 is not set 1043# CONFIG_VIDEO_PVRUSB2 is not set
1034# CONFIG_VIDEO_HDPVR is not set 1044# CONFIG_VIDEO_HDPVR is not set
1035# CONFIG_VIDEO_EM28XX is not set 1045# CONFIG_VIDEO_EM28XX is not set
1046# CONFIG_VIDEO_TLG2300 is not set
1036# CONFIG_VIDEO_CX231XX is not set 1047# CONFIG_VIDEO_CX231XX is not set
1037# CONFIG_VIDEO_USBVISION is not set 1048# CONFIG_VIDEO_USBVISION is not set
1038# CONFIG_USB_ET61X251 is not set 1049# CONFIG_USB_ET61X251 is not set
@@ -1147,6 +1158,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
1147# CONFIG_SND_SUPERH is not set 1158# CONFIG_SND_SUPERH is not set
1148CONFIG_SND_USB=y 1159CONFIG_SND_USB=y
1149# CONFIG_SND_USB_AUDIO is not set 1160# CONFIG_SND_USB_AUDIO is not set
1161# CONFIG_SND_USB_UA101 is not set
1150# CONFIG_SND_USB_CAIAQ is not set 1162# CONFIG_SND_USB_CAIAQ is not set
1151CONFIG_SND_SOC=m 1163CONFIG_SND_SOC=m
1152 1164
@@ -1155,6 +1167,7 @@ CONFIG_SND_SOC=m
1155# 1167#
1156CONFIG_SND_SOC_SH4_FSI=m 1168CONFIG_SND_SOC_SH4_FSI=m
1157CONFIG_SND_FSI_AK4642=y 1169CONFIG_SND_FSI_AK4642=y
1170# CONFIG_SND_FSI_DA7210 is not set
1158CONFIG_SND_SOC_I2C_AND_SPI=m 1171CONFIG_SND_SOC_I2C_AND_SPI=m
1159CONFIG_SND_SOC_ALL_CODECS=m 1172CONFIG_SND_SOC_ALL_CODECS=m
1160CONFIG_SND_SOC_WM_HUBS=m 1173CONFIG_SND_SOC_WM_HUBS=m
@@ -1167,6 +1180,7 @@ CONFIG_SND_SOC_AK4535=m
1167CONFIG_SND_SOC_AK4642=m 1180CONFIG_SND_SOC_AK4642=m
1168CONFIG_SND_SOC_AK4671=m 1181CONFIG_SND_SOC_AK4671=m
1169CONFIG_SND_SOC_CS4270=m 1182CONFIG_SND_SOC_CS4270=m
1183CONFIG_SND_SOC_DA7210=m
1170CONFIG_SND_SOC_L3=m 1184CONFIG_SND_SOC_L3=m
1171CONFIG_SND_SOC_PCM3008=m 1185CONFIG_SND_SOC_PCM3008=m
1172CONFIG_SND_SOC_SPDIF=m 1186CONFIG_SND_SOC_SPDIF=m
@@ -1189,17 +1203,21 @@ CONFIG_SND_SOC_WM8753=m
1189CONFIG_SND_SOC_WM8776=m 1203CONFIG_SND_SOC_WM8776=m
1190CONFIG_SND_SOC_WM8900=m 1204CONFIG_SND_SOC_WM8900=m
1191CONFIG_SND_SOC_WM8903=m 1205CONFIG_SND_SOC_WM8903=m
1206CONFIG_SND_SOC_WM8904=m
1192CONFIG_SND_SOC_WM8940=m 1207CONFIG_SND_SOC_WM8940=m
1208CONFIG_SND_SOC_WM8955=m
1193CONFIG_SND_SOC_WM8960=m 1209CONFIG_SND_SOC_WM8960=m
1194CONFIG_SND_SOC_WM8961=m 1210CONFIG_SND_SOC_WM8961=m
1195CONFIG_SND_SOC_WM8971=m 1211CONFIG_SND_SOC_WM8971=m
1196CONFIG_SND_SOC_WM8974=m 1212CONFIG_SND_SOC_WM8974=m
1213CONFIG_SND_SOC_WM8978=m
1197CONFIG_SND_SOC_WM8988=m 1214CONFIG_SND_SOC_WM8988=m
1198CONFIG_SND_SOC_WM8990=m 1215CONFIG_SND_SOC_WM8990=m
1199CONFIG_SND_SOC_WM8993=m 1216CONFIG_SND_SOC_WM8993=m
1200CONFIG_SND_SOC_WM9081=m 1217CONFIG_SND_SOC_WM9081=m
1201CONFIG_SND_SOC_MAX9877=m 1218CONFIG_SND_SOC_MAX9877=m
1202CONFIG_SND_SOC_TPA6130A2=m 1219CONFIG_SND_SOC_TPA6130A2=m
1220CONFIG_SND_SOC_WM2000=m
1203# CONFIG_SOUND_PRIME is not set 1221# CONFIG_SOUND_PRIME is not set
1204CONFIG_HID_SUPPORT=y 1222CONFIG_HID_SUPPORT=y
1205CONFIG_HID=y 1223CONFIG_HID=y
@@ -1215,6 +1233,7 @@ CONFIG_USB_HID=y
1215# 1233#
1216# Special HID drivers 1234# Special HID drivers
1217# 1235#
1236# CONFIG_HID_3M_PCT is not set
1218# CONFIG_HID_A4TECH is not set 1237# CONFIG_HID_A4TECH is not set
1219# CONFIG_HID_APPLE is not set 1238# CONFIG_HID_APPLE is not set
1220# CONFIG_HID_BELKIN is not set 1239# CONFIG_HID_BELKIN is not set
@@ -1229,12 +1248,16 @@ CONFIG_USB_HID=y
1229# CONFIG_HID_KENSINGTON is not set 1248# CONFIG_HID_KENSINGTON is not set
1230# CONFIG_HID_LOGITECH is not set 1249# CONFIG_HID_LOGITECH is not set
1231# CONFIG_HID_MICROSOFT is not set 1250# CONFIG_HID_MICROSOFT is not set
1251# CONFIG_HID_MOSART is not set
1232# CONFIG_HID_MONTEREY is not set 1252# CONFIG_HID_MONTEREY is not set
1233# CONFIG_HID_NTRIG is not set 1253# CONFIG_HID_NTRIG is not set
1254# CONFIG_HID_ORTEK is not set
1234# CONFIG_HID_PANTHERLORD is not set 1255# CONFIG_HID_PANTHERLORD is not set
1235# CONFIG_HID_PETALYNX is not set 1256# CONFIG_HID_PETALYNX is not set
1257# CONFIG_HID_QUANTA is not set
1236# CONFIG_HID_SAMSUNG is not set 1258# CONFIG_HID_SAMSUNG is not set
1237# CONFIG_HID_SONY is not set 1259# CONFIG_HID_SONY is not set
1260# CONFIG_HID_STANTUM is not set
1238# CONFIG_HID_SUNPLUS is not set 1261# CONFIG_HID_SUNPLUS is not set
1239# CONFIG_HID_GREENASIA is not set 1262# CONFIG_HID_GREENASIA is not set
1240# CONFIG_HID_SMARTJOYPLUS is not set 1263# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1327,7 +1350,6 @@ CONFIG_USB_STORAGE=y
1327# CONFIG_USB_RIO500 is not set 1350# CONFIG_USB_RIO500 is not set
1328# CONFIG_USB_LEGOTOWER is not set 1351# CONFIG_USB_LEGOTOWER is not set
1329# CONFIG_USB_LCD is not set 1352# CONFIG_USB_LCD is not set
1330# CONFIG_USB_BERRY_CHARGE is not set
1331# CONFIG_USB_LED is not set 1353# CONFIG_USB_LED is not set
1332# CONFIG_USB_CYPRESS_CY7C63 is not set 1354# CONFIG_USB_CYPRESS_CY7C63 is not set
1333# CONFIG_USB_CYTHERM is not set 1355# CONFIG_USB_CYTHERM is not set
@@ -1339,7 +1361,6 @@ CONFIG_USB_STORAGE=y
1339# CONFIG_USB_IOWARRIOR is not set 1361# CONFIG_USB_IOWARRIOR is not set
1340# CONFIG_USB_TEST is not set 1362# CONFIG_USB_TEST is not set
1341# CONFIG_USB_ISIGHTFW is not set 1363# CONFIG_USB_ISIGHTFW is not set
1342# CONFIG_USB_VST is not set
1343CONFIG_USB_GADGET=y 1364CONFIG_USB_GADGET=y
1344# CONFIG_USB_GADGET_DEBUG_FILES is not set 1365# CONFIG_USB_GADGET_DEBUG_FILES is not set
1345CONFIG_USB_GADGET_VBUS_DRAW=2 1366CONFIG_USB_GADGET_VBUS_DRAW=2
@@ -1378,6 +1399,7 @@ CONFIG_USB_G_SERIAL=m
1378# CONFIG_USB_MIDI_GADGET is not set 1399# CONFIG_USB_MIDI_GADGET is not set
1379# CONFIG_USB_G_PRINTER is not set 1400# CONFIG_USB_G_PRINTER is not set
1380# CONFIG_USB_CDC_COMPOSITE is not set 1401# CONFIG_USB_CDC_COMPOSITE is not set
1402# CONFIG_USB_G_NOKIA is not set
1381# CONFIG_USB_G_MULTI is not set 1403# CONFIG_USB_G_MULTI is not set
1382 1404
1383# 1405#
@@ -1401,10 +1423,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
1401# MMC/SD/SDIO Host Controller Drivers 1423# MMC/SD/SDIO Host Controller Drivers
1402# 1424#
1403# CONFIG_MMC_SDHCI is not set 1425# CONFIG_MMC_SDHCI is not set
1404# CONFIG_MMC_AT91 is not set
1405# CONFIG_MMC_ATMELMCI is not set
1406CONFIG_MMC_SPI=y 1426CONFIG_MMC_SPI=y
1407# CONFIG_MMC_TMIO is not set
1408# CONFIG_MEMSTICK is not set 1427# CONFIG_MEMSTICK is not set
1409# CONFIG_NEW_LEDS is not set 1428# CONFIG_NEW_LEDS is not set
1410# CONFIG_ACCESSIBILITY is not set 1429# CONFIG_ACCESSIBILITY is not set
@@ -1480,8 +1499,6 @@ CONFIG_RTC_DRV_PCF8563=y
1480CONFIG_UIO=y 1499CONFIG_UIO=y
1481# CONFIG_UIO_PDRV is not set 1500# CONFIG_UIO_PDRV is not set
1482CONFIG_UIO_PDRV_GENIRQ=y 1501CONFIG_UIO_PDRV_GENIRQ=y
1483# CONFIG_UIO_SMX is not set
1484# CONFIG_UIO_SERCOS3 is not set
1485 1502
1486# 1503#
1487# TI VLYNQ 1504# TI VLYNQ
@@ -1566,6 +1583,7 @@ CONFIG_MISC_FILESYSTEMS=y
1566# CONFIG_EFS_FS is not set 1583# CONFIG_EFS_FS is not set
1567# CONFIG_JFFS2_FS is not set 1584# CONFIG_JFFS2_FS is not set
1568# CONFIG_UBIFS_FS is not set 1585# CONFIG_UBIFS_FS is not set
1586# CONFIG_LOGFS is not set
1569# CONFIG_CRAMFS is not set 1587# CONFIG_CRAMFS is not set
1570# CONFIG_SQUASHFS is not set 1588# CONFIG_SQUASHFS is not set
1571# CONFIG_VXFS_FS is not set 1589# CONFIG_VXFS_FS is not set
@@ -1594,6 +1612,7 @@ CONFIG_SUNRPC=y
1594# CONFIG_RPCSEC_GSS_KRB5 is not set 1612# CONFIG_RPCSEC_GSS_KRB5 is not set
1595# CONFIG_RPCSEC_GSS_SPKM3 is not set 1613# CONFIG_RPCSEC_GSS_SPKM3 is not set
1596# CONFIG_SMB_FS is not set 1614# CONFIG_SMB_FS is not set
1615# CONFIG_CEPH_FS is not set
1597# CONFIG_CIFS is not set 1616# CONFIG_CIFS is not set
1598# CONFIG_NCP_FS is not set 1617# CONFIG_NCP_FS is not set
1599# CONFIG_CODA_FS is not set 1618# CONFIG_CODA_FS is not set
@@ -1786,6 +1805,7 @@ CONFIG_CRYPTO_CBC=y
1786# 1805#
1787# CONFIG_CRYPTO_ANSI_CPRNG is not set 1806# CONFIG_CRYPTO_ANSI_CPRNG is not set
1788CONFIG_CRYPTO_HW=y 1807CONFIG_CRYPTO_HW=y
1808# CONFIG_VIRTUALIZATION is not set
1789# CONFIG_BINARY_PRINTF is not set 1809# CONFIG_BINARY_PRINTF is not set
1790 1810
1791# 1811#
diff --git a/arch/sh/configs/se7750_defconfig b/arch/sh/configs/se7750_defconfig
index b15a44e2ec43..e096c3e7e18c 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 14:39:10 2010 4# Tue May 18 17:00:16 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51# CONFIG_SWAP is not set 54# CONFIG_SWAP is not set
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
@@ -70,7 +73,6 @@ CONFIG_RCU_FANOUT=32
70CONFIG_IKCONFIG=y 73CONFIG_IKCONFIG=y
71CONFIG_IKCONFIG_PROC=y 74CONFIG_IKCONFIG_PROC=y
72CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
73# CONFIG_GROUP_SCHED is not set
74# CONFIG_CGROUPS is not set 76# CONFIG_CGROUPS is not set
75CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
76CONFIG_SYSFS_DEPRECATED_V2=y 78CONFIG_SYSFS_DEPRECATED_V2=y
@@ -103,7 +105,7 @@ CONFIG_PERF_USE_VMALLOC=y
103# 105#
104# Kernel Performance Events And Counters 106# Kernel Performance Events And Counters
105# 107#
106# CONFIG_PERF_EVENTS is not set 108CONFIG_PERF_EVENTS=y
107# CONFIG_PERF_COUNTERS is not set 109# CONFIG_PERF_COUNTERS is not set
108CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
109CONFIG_COMPAT_BRK=y 111CONFIG_COMPAT_BRK=y
@@ -120,6 +122,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
120CONFIG_HAVE_DMA_ATTRS=y 122CONFIG_HAVE_DMA_ATTRS=y
121CONFIG_HAVE_CLK=y 123CONFIG_HAVE_CLK=y
122CONFIG_HAVE_DMA_API_DEBUG=y 124CONFIG_HAVE_DMA_API_DEBUG=y
125CONFIG_HAVE_HW_BREAKPOINT=y
123 126
124# 127#
125# GCOV-based kernel profiling 128# GCOV-based kernel profiling
@@ -237,6 +240,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
237CONFIG_MAX_ACTIVE_REGIONS=1 240CONFIG_MAX_ACTIVE_REGIONS=1
238CONFIG_ARCH_POPULATES_NODE_MAP=y 241CONFIG_ARCH_POPULATES_NODE_MAP=y
239CONFIG_ARCH_SELECT_MEMORY_MODEL=y 242CONFIG_ARCH_SELECT_MEMORY_MODEL=y
243CONFIG_UNCACHED_MAPPING=y
240CONFIG_PAGE_SIZE_4KB=y 244CONFIG_PAGE_SIZE_4KB=y
241# CONFIG_PAGE_SIZE_8KB is not set 245# CONFIG_PAGE_SIZE_8KB is not set
242# CONFIG_PAGE_SIZE_16KB is not set 246# CONFIG_PAGE_SIZE_16KB is not set
@@ -252,7 +256,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
252CONFIG_SPLIT_PTLOCK_CPUS=4 256CONFIG_SPLIT_PTLOCK_CPUS=4
253# CONFIG_PHYS_ADDR_T_64BIT is not set 257# CONFIG_PHYS_ADDR_T_64BIT is not set
254CONFIG_ZONE_DMA_FLAG=0 258CONFIG_ZONE_DMA_FLAG=0
255CONFIG_NR_QUICK=2 259CONFIG_NR_QUICK=1
256# CONFIG_KSM is not set 260# CONFIG_KSM is not set
257CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 261CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
258 262
@@ -329,7 +333,6 @@ CONFIG_PREEMPT_NONE=y
329# CONFIG_PREEMPT is not set 333# CONFIG_PREEMPT is not set
330CONFIG_GUSA=y 334CONFIG_GUSA=y
331# CONFIG_GUSA_RB is not set 335# CONFIG_GUSA_RB is not set
332# CONFIG_SPARSE_IRQ is not set
333 336
334# 337#
335# Boot options 338# Boot options
@@ -364,7 +367,6 @@ CONFIG_NET=y
364# Networking options 367# Networking options
365# 368#
366CONFIG_PACKET=y 369CONFIG_PACKET=y
367# CONFIG_PACKET_MMAP is not set
368CONFIG_UNIX=y 370CONFIG_UNIX=y
369CONFIG_XFRM=y 371CONFIG_XFRM=y
370# CONFIG_XFRM_USER is not set 372# CONFIG_XFRM_USER is not set
@@ -580,6 +582,7 @@ CONFIG_IDE_PROC_FS=y
580# 582#
581# SCSI device support 583# SCSI device support
582# 584#
585CONFIG_SCSI_MOD=y
583# CONFIG_RAID_ATTRS is not set 586# CONFIG_RAID_ATTRS is not set
584CONFIG_SCSI=y 587CONFIG_SCSI=y
585CONFIG_SCSI_DMA=y 588CONFIG_SCSI_DMA=y
@@ -698,6 +701,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
698CONFIG_SERIAL_SH_SCI_CONSOLE=y 701CONFIG_SERIAL_SH_SCI_CONSOLE=y
699CONFIG_SERIAL_CORE=y 702CONFIG_SERIAL_CORE=y
700CONFIG_SERIAL_CORE_CONSOLE=y 703CONFIG_SERIAL_CORE_CONSOLE=y
704# CONFIG_SERIAL_TIMBERDALE is not set
701CONFIG_UNIX98_PTYS=y 705CONFIG_UNIX98_PTYS=y
702# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 706# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
703CONFIG_LEGACY_PTYS=y 707CONFIG_LEGACY_PTYS=y
@@ -816,7 +820,6 @@ CONFIG_RTC_LIB=y
816# CONFIG_EXT2_FS is not set 820# CONFIG_EXT2_FS is not set
817# CONFIG_EXT3_FS is not set 821# CONFIG_EXT3_FS is not set
818# CONFIG_EXT4_FS is not set 822# CONFIG_EXT4_FS is not set
819CONFIG_EXT4_USE_FOR_EXT23=y
820# CONFIG_REISERFS_FS is not set 823# CONFIG_REISERFS_FS is not set
821# CONFIG_JFS_FS is not set 824# CONFIG_JFS_FS is not set
822# CONFIG_FS_POSIX_ACL is not set 825# CONFIG_FS_POSIX_ACL is not set
@@ -885,6 +888,7 @@ CONFIG_JFFS2_ZLIB=y
885# CONFIG_JFFS2_LZO is not set 888# CONFIG_JFFS2_LZO is not set
886CONFIG_JFFS2_RTIME=y 889CONFIG_JFFS2_RTIME=y
887# CONFIG_JFFS2_RUBIN is not set 890# CONFIG_JFFS2_RUBIN is not set
891# CONFIG_LOGFS is not set
888# CONFIG_CRAMFS is not set 892# CONFIG_CRAMFS is not set
889# CONFIG_SQUASHFS is not set 893# CONFIG_SQUASHFS is not set
890# CONFIG_VXFS_FS is not set 894# CONFIG_VXFS_FS is not set
@@ -907,6 +911,7 @@ CONFIG_SUNRPC=y
907# CONFIG_RPCSEC_GSS_KRB5 is not set 911# CONFIG_RPCSEC_GSS_KRB5 is not set
908# CONFIG_RPCSEC_GSS_SPKM3 is not set 912# CONFIG_RPCSEC_GSS_SPKM3 is not set
909# CONFIG_SMB_FS is not set 913# CONFIG_SMB_FS is not set
914# CONFIG_CEPH_FS is not set
910# CONFIG_CIFS is not set 915# CONFIG_CIFS is not set
911# CONFIG_NCP_FS is not set 916# CONFIG_NCP_FS is not set
912# CONFIG_CODA_FS is not set 917# CONFIG_CODA_FS is not set
@@ -1063,6 +1068,7 @@ CONFIG_CRYPTO=y
1063# 1068#
1064# CONFIG_CRYPTO_ANSI_CPRNG is not set 1069# CONFIG_CRYPTO_ANSI_CPRNG is not set
1065CONFIG_CRYPTO_HW=y 1070CONFIG_CRYPTO_HW=y
1071# CONFIG_VIRTUALIZATION is not set
1066# CONFIG_BINARY_PRINTF is not set 1072# CONFIG_BINARY_PRINTF is not set
1067 1073
1068# 1074#
diff --git a/arch/sh/configs/se7751_defconfig b/arch/sh/configs/se7751_defconfig
index d1effdeaa416..84d3facf6a30 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 14:39:56 2010 4# Tue May 18 17:03:26 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51CONFIG_SWAP=y 54CONFIG_SWAP=y
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
@@ -69,7 +72,6 @@ CONFIG_RCU_FANOUT=32
69# CONFIG_TREE_RCU_TRACE is not set 72# CONFIG_TREE_RCU_TRACE is not set
70# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
72# CONFIG_GROUP_SCHED is not set
73# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
74CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
75CONFIG_SYSFS_DEPRECATED_V2=y 77CONFIG_SYSFS_DEPRECATED_V2=y
@@ -80,6 +82,7 @@ CONFIG_INITRAMFS_SOURCE=""
80CONFIG_RD_GZIP=y 82CONFIG_RD_GZIP=y
81# CONFIG_RD_BZIP2 is not set 83# CONFIG_RD_BZIP2 is not set
82# CONFIG_RD_LZMA is not set 84# CONFIG_RD_LZMA is not set
85# CONFIG_RD_LZO is not set
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
84CONFIG_SYSCTL=y 87CONFIG_SYSCTL=y
85CONFIG_ANON_INODES=y 88CONFIG_ANON_INODES=y
@@ -106,7 +109,7 @@ CONFIG_PERF_USE_VMALLOC=y
106# 109#
107# Kernel Performance Events And Counters 110# Kernel Performance Events And Counters
108# 111#
109# CONFIG_PERF_EVENTS is not set 112CONFIG_PERF_EVENTS=y
110# CONFIG_PERF_COUNTERS is not set 113# CONFIG_PERF_COUNTERS is not set
111CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_COMPAT_BRK=y 115CONFIG_COMPAT_BRK=y
@@ -123,6 +126,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123CONFIG_HAVE_DMA_ATTRS=y 126CONFIG_HAVE_DMA_ATTRS=y
124CONFIG_HAVE_CLK=y 127CONFIG_HAVE_CLK=y
125CONFIG_HAVE_DMA_API_DEBUG=y 128CONFIG_HAVE_DMA_API_DEBUG=y
129CONFIG_HAVE_HW_BREAKPOINT=y
126 130
127# 131#
128# GCOV-based kernel profiling 132# GCOV-based kernel profiling
@@ -240,6 +244,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
240CONFIG_MAX_ACTIVE_REGIONS=1 244CONFIG_MAX_ACTIVE_REGIONS=1
241CONFIG_ARCH_POPULATES_NODE_MAP=y 245CONFIG_ARCH_POPULATES_NODE_MAP=y
242CONFIG_ARCH_SELECT_MEMORY_MODEL=y 246CONFIG_ARCH_SELECT_MEMORY_MODEL=y
247CONFIG_UNCACHED_MAPPING=y
243CONFIG_PAGE_SIZE_4KB=y 248CONFIG_PAGE_SIZE_4KB=y
244# CONFIG_PAGE_SIZE_8KB is not set 249# CONFIG_PAGE_SIZE_8KB is not set
245# CONFIG_PAGE_SIZE_16KB is not set 250# CONFIG_PAGE_SIZE_16KB is not set
@@ -255,7 +260,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
255CONFIG_SPLIT_PTLOCK_CPUS=4 260CONFIG_SPLIT_PTLOCK_CPUS=4
256# CONFIG_PHYS_ADDR_T_64BIT is not set 261# CONFIG_PHYS_ADDR_T_64BIT is not set
257CONFIG_ZONE_DMA_FLAG=0 262CONFIG_ZONE_DMA_FLAG=0
258CONFIG_NR_QUICK=2 263CONFIG_NR_QUICK=1
259# CONFIG_KSM is not set 264# CONFIG_KSM is not set
260CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 265CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
261 266
@@ -333,7 +338,6 @@ CONFIG_PREEMPT_NONE=y
333# CONFIG_PREEMPT is not set 338# CONFIG_PREEMPT is not set
334CONFIG_GUSA=y 339CONFIG_GUSA=y
335# CONFIG_GUSA_RB is not set 340# CONFIG_GUSA_RB is not set
336# CONFIG_SPARSE_IRQ is not set
337 341
338# 342#
339# Boot options 343# Boot options
@@ -369,7 +373,6 @@ CONFIG_NET=y
369# Networking options 373# Networking options
370# 374#
371CONFIG_PACKET=y 375CONFIG_PACKET=y
372# CONFIG_PACKET_MMAP is not set
373CONFIG_UNIX=y 376CONFIG_UNIX=y
374CONFIG_XFRM=y 377CONFIG_XFRM=y
375# CONFIG_XFRM_USER is not set 378# CONFIG_XFRM_USER is not set
@@ -589,6 +592,7 @@ CONFIG_HAVE_IDE=y
589# 592#
590# SCSI device support 593# SCSI device support
591# 594#
595CONFIG_SCSI_MOD=y
592# CONFIG_RAID_ATTRS is not set 596# CONFIG_RAID_ATTRS is not set
593# CONFIG_SCSI is not set 597# CONFIG_SCSI is not set
594# CONFIG_SCSI_DMA is not set 598# CONFIG_SCSI_DMA is not set
@@ -666,6 +670,7 @@ CONFIG_DEVKMEM=y
666# Non-8250 serial port support 670# Non-8250 serial port support
667# 671#
668# CONFIG_SERIAL_SH_SCI is not set 672# CONFIG_SERIAL_SH_SCI is not set
673# CONFIG_SERIAL_TIMBERDALE is not set
669CONFIG_UNIX98_PTYS=y 674CONFIG_UNIX98_PTYS=y
670# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 675# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
671CONFIG_LEGACY_PTYS=y 676CONFIG_LEGACY_PTYS=y
@@ -785,7 +790,6 @@ CONFIG_EXT2_FS=y
785# CONFIG_EXT2_FS_XIP is not set 790# CONFIG_EXT2_FS_XIP is not set
786# CONFIG_EXT3_FS is not set 791# CONFIG_EXT3_FS is not set
787# CONFIG_EXT4_FS is not set 792# CONFIG_EXT4_FS is not set
788CONFIG_EXT4_USE_FOR_EXT23=y
789# CONFIG_REISERFS_FS is not set 793# CONFIG_REISERFS_FS is not set
790# CONFIG_JFS_FS is not set 794# CONFIG_JFS_FS is not set
791# CONFIG_FS_POSIX_ACL is not set 795# CONFIG_FS_POSIX_ACL is not set
@@ -854,6 +858,7 @@ CONFIG_JFFS2_ZLIB=y
854# CONFIG_JFFS2_LZO is not set 858# CONFIG_JFFS2_LZO is not set
855CONFIG_JFFS2_RTIME=y 859CONFIG_JFFS2_RTIME=y
856# CONFIG_JFFS2_RUBIN is not set 860# CONFIG_JFFS2_RUBIN is not set
861# CONFIG_LOGFS is not set
857# CONFIG_CRAMFS is not set 862# CONFIG_CRAMFS is not set
858# CONFIG_SQUASHFS is not set 863# CONFIG_SQUASHFS is not set
859# CONFIG_VXFS_FS is not set 864# CONFIG_VXFS_FS is not set
@@ -868,6 +873,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
868# CONFIG_NFS_FS is not set 873# CONFIG_NFS_FS is not set
869# CONFIG_NFSD is not set 874# CONFIG_NFSD is not set
870# CONFIG_SMB_FS is not set 875# CONFIG_SMB_FS is not set
876# CONFIG_CEPH_FS is not set
871# CONFIG_CIFS is not set 877# CONFIG_CIFS is not set
872# CONFIG_NCP_FS is not set 878# CONFIG_NCP_FS is not set
873# CONFIG_CODA_FS is not set 879# CONFIG_CODA_FS is not set
@@ -1012,6 +1018,7 @@ CONFIG_CRYPTO=y
1012# 1018#
1013# CONFIG_CRYPTO_ANSI_CPRNG is not set 1019# CONFIG_CRYPTO_ANSI_CPRNG is not set
1014CONFIG_CRYPTO_HW=y 1020CONFIG_CRYPTO_HW=y
1021# CONFIG_VIRTUALIZATION is not set
1015# CONFIG_BINARY_PRINTF is not set 1022# CONFIG_BINARY_PRINTF is not set
1016 1023
1017# 1024#
diff --git a/arch/sh/configs/se7780_defconfig b/arch/sh/configs/se7780_defconfig
index 58533d50f06e..f0d7e679e75f 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 14:40:32 2010 4# Tue May 18 17:06:12 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52# CONFIG_SWAP is not set 55# CONFIG_SWAP is not set
53CONFIG_SYSVIPC=y 56CONFIG_SYSVIPC=y
54CONFIG_SYSVIPC_SYSCTL=y 57CONFIG_SYSVIPC_SYSCTL=y
@@ -100,7 +103,7 @@ CONFIG_PERF_USE_VMALLOC=y
100# 103#
101# Kernel Performance Events And Counters 104# Kernel Performance Events And Counters
102# 105#
103# CONFIG_PERF_EVENTS is not set 106CONFIG_PERF_EVENTS=y
104# CONFIG_PERF_COUNTERS is not set 107# CONFIG_PERF_COUNTERS is not set
105CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
106CONFIG_PCI_QUIRKS=y 109CONFIG_PCI_QUIRKS=y
@@ -117,6 +120,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
117CONFIG_HAVE_DMA_ATTRS=y 120CONFIG_HAVE_DMA_ATTRS=y
118CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
119CONFIG_HAVE_DMA_API_DEBUG=y 122CONFIG_HAVE_DMA_API_DEBUG=y
123CONFIG_HAVE_HW_BREAKPOINT=y
120 124
121# 125#
122# GCOV-based kernel profiling 126# GCOV-based kernel profiling
@@ -238,6 +242,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
238CONFIG_ARCH_SELECT_MEMORY_MODEL=y 242CONFIG_ARCH_SELECT_MEMORY_MODEL=y
239CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 243CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
240CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
245CONFIG_UNCACHED_MAPPING=y
241CONFIG_PAGE_SIZE_4KB=y 246CONFIG_PAGE_SIZE_4KB=y
242# CONFIG_PAGE_SIZE_8KB is not set 247# CONFIG_PAGE_SIZE_8KB is not set
243# CONFIG_PAGE_SIZE_16KB is not set 248# CONFIG_PAGE_SIZE_16KB is not set
@@ -253,7 +258,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
253CONFIG_MIGRATION=y 258CONFIG_MIGRATION=y
254# CONFIG_PHYS_ADDR_T_64BIT is not set 259# CONFIG_PHYS_ADDR_T_64BIT is not set
255CONFIG_ZONE_DMA_FLAG=0 260CONFIG_ZONE_DMA_FLAG=0
256CONFIG_NR_QUICK=2 261CONFIG_NR_QUICK=1
257# CONFIG_KSM is not set 262# CONFIG_KSM is not set
258CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 263CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
259 264
@@ -328,6 +333,7 @@ CONFIG_PREEMPT_NONE=y
328# CONFIG_PREEMPT_VOLUNTARY is not set 333# CONFIG_PREEMPT_VOLUNTARY is not set
329# CONFIG_PREEMPT is not set 334# CONFIG_PREEMPT is not set
330CONFIG_GUSA=y 335CONFIG_GUSA=y
336# CONFIG_INTC_USERIMASK is not set
331 337
332# 338#
333# Boot options 339# Boot options
@@ -343,9 +349,9 @@ CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
343# Bus options 349# Bus options
344# 350#
345CONFIG_PCI=y 351CONFIG_PCI=y
352CONFIG_PCI_DOMAINS=y
346# CONFIG_PCIEPORTBUS is not set 353# CONFIG_PCIEPORTBUS is not set
347# CONFIG_ARCH_SUPPORTS_MSI is not set 354# CONFIG_ARCH_SUPPORTS_MSI is not set
348CONFIG_PCI_LEGACY=y
349# CONFIG_PCI_STUB is not set 355# CONFIG_PCI_STUB is not set
350# CONFIG_PCI_IOV is not set 356# CONFIG_PCI_IOV is not set
351 357
@@ -362,7 +368,6 @@ CONFIG_NET=y
362# Networking options 368# Networking options
363# 369#
364CONFIG_PACKET=y 370CONFIG_PACKET=y
365# CONFIG_PACKET_MMAP is not set
366CONFIG_UNIX=y 371CONFIG_UNIX=y
367CONFIG_XFRM=y 372CONFIG_XFRM=y
368# CONFIG_XFRM_USER is not set 373# CONFIG_XFRM_USER is not set
@@ -571,6 +576,7 @@ CONFIG_HAVE_IDE=y
571# 576#
572# SCSI device support 577# SCSI device support
573# 578#
579CONFIG_SCSI_MOD=y
574# CONFIG_RAID_ATTRS is not set 580# CONFIG_RAID_ATTRS is not set
575CONFIG_SCSI=y 581CONFIG_SCSI=y
576CONFIG_SCSI_DMA=y 582CONFIG_SCSI_DMA=y
@@ -714,7 +720,7 @@ CONFIG_SATA_SIL=y
714# 720#
715 721
716# 722#
717# See the help texts for more information. 723# The newer stack is recommended.
718# 724#
719# CONFIG_FIREWIRE is not set 725# CONFIG_FIREWIRE is not set
720# CONFIG_IEEE1394 is not set 726# CONFIG_IEEE1394 is not set
@@ -772,6 +778,7 @@ CONFIG_NET_PCI=y
772# CONFIG_PCNET32 is not set 778# CONFIG_PCNET32 is not set
773# CONFIG_AMD8111_ETH is not set 779# CONFIG_AMD8111_ETH is not set
774# CONFIG_ADAPTEC_STARFIRE is not set 780# CONFIG_ADAPTEC_STARFIRE is not set
781# CONFIG_KSZ884X_PCI is not set
775# CONFIG_B44 is not set 782# CONFIG_B44 is not set
776# CONFIG_FORCEDETH is not set 783# CONFIG_FORCEDETH is not set
777# CONFIG_E100 is not set 784# CONFIG_E100 is not set
@@ -807,6 +814,7 @@ CONFIG_WLAN=y
807# CONFIG_USB_KAWETH is not set 814# CONFIG_USB_KAWETH is not set
808# CONFIG_USB_PEGASUS is not set 815# CONFIG_USB_PEGASUS is not set
809# CONFIG_USB_USBNET is not set 816# CONFIG_USB_USBNET is not set
817# CONFIG_USB_IPHETH is not set
810# CONFIG_WAN is not set 818# CONFIG_WAN is not set
811# CONFIG_FDDI is not set 819# CONFIG_FDDI is not set
812# CONFIG_PPP is not set 820# CONFIG_PPP is not set
@@ -878,6 +886,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
878CONFIG_SERIAL_CORE=y 886CONFIG_SERIAL_CORE=y
879CONFIG_SERIAL_CORE_CONSOLE=y 887CONFIG_SERIAL_CORE_CONSOLE=y
880# CONFIG_SERIAL_JSM is not set 888# CONFIG_SERIAL_JSM is not set
889# CONFIG_SERIAL_TIMBERDALE is not set
881CONFIG_UNIX98_PTYS=y 890CONFIG_UNIX98_PTYS=y
882# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 891# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
883# CONFIG_LEGACY_PTYS is not set 892# CONFIG_LEGACY_PTYS is not set
@@ -928,6 +937,7 @@ CONFIG_SSB_POSSIBLE=y
928# CONFIG_MFD_SH_MOBILE_SDHI is not set 937# CONFIG_MFD_SH_MOBILE_SDHI is not set
929# CONFIG_HTC_PASIC3 is not set 938# CONFIG_HTC_PASIC3 is not set
930# CONFIG_MFD_TMIO is not set 939# CONFIG_MFD_TMIO is not set
940# CONFIG_LPC_SCH is not set
931# CONFIG_REGULATOR is not set 941# CONFIG_REGULATOR is not set
932# CONFIG_MEDIA_SUPPORT is not set 942# CONFIG_MEDIA_SUPPORT is not set
933 943
@@ -935,6 +945,7 @@ CONFIG_SSB_POSSIBLE=y
935# Graphics support 945# Graphics support
936# 946#
937CONFIG_VGA_ARB=y 947CONFIG_VGA_ARB=y
948CONFIG_VGA_ARB_MAX_GPUS=16
938# CONFIG_DRM is not set 949# CONFIG_DRM is not set
939# CONFIG_VGASTATE is not set 950# CONFIG_VGASTATE is not set
940# CONFIG_VIDEO_OUTPUT_CONTROL is not set 951# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1032,6 +1043,7 @@ CONFIG_USB_HID=y
1032# 1043#
1033# Special HID drivers 1044# Special HID drivers
1034# 1045#
1046# CONFIG_HID_3M_PCT is not set
1035CONFIG_HID_A4TECH=y 1047CONFIG_HID_A4TECH=y
1036CONFIG_HID_APPLE=y 1048CONFIG_HID_APPLE=y
1037CONFIG_HID_BELKIN=y 1049CONFIG_HID_BELKIN=y
@@ -1047,14 +1059,19 @@ CONFIG_HID_GYRATION=y
1047CONFIG_HID_LOGITECH=y 1059CONFIG_HID_LOGITECH=y
1048# CONFIG_LOGITECH_FF is not set 1060# CONFIG_LOGITECH_FF is not set
1049# CONFIG_LOGIRUMBLEPAD2_FF is not set 1061# CONFIG_LOGIRUMBLEPAD2_FF is not set
1062# CONFIG_LOGIG940_FF is not set
1050CONFIG_HID_MICROSOFT=y 1063CONFIG_HID_MICROSOFT=y
1064# CONFIG_HID_MOSART is not set
1051CONFIG_HID_MONTEREY=y 1065CONFIG_HID_MONTEREY=y
1052# CONFIG_HID_NTRIG is not set 1066# CONFIG_HID_NTRIG is not set
1067# CONFIG_HID_ORTEK is not set
1053CONFIG_HID_PANTHERLORD=y 1068CONFIG_HID_PANTHERLORD=y
1054# CONFIG_PANTHERLORD_FF is not set 1069# CONFIG_PANTHERLORD_FF is not set
1055CONFIG_HID_PETALYNX=y 1070CONFIG_HID_PETALYNX=y
1071# CONFIG_HID_QUANTA is not set
1056CONFIG_HID_SAMSUNG=y 1072CONFIG_HID_SAMSUNG=y
1057CONFIG_HID_SONY=y 1073CONFIG_HID_SONY=y
1074# CONFIG_HID_STANTUM is not set
1058CONFIG_HID_SUNPLUS=y 1075CONFIG_HID_SUNPLUS=y
1059# CONFIG_HID_GREENASIA is not set 1076# CONFIG_HID_GREENASIA is not set
1060# CONFIG_HID_SMARTJOYPLUS is not set 1077# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1148,7 +1165,6 @@ CONFIG_USB_STORAGE=y
1148# CONFIG_USB_RIO500 is not set 1165# CONFIG_USB_RIO500 is not set
1149# CONFIG_USB_LEGOTOWER is not set 1166# CONFIG_USB_LEGOTOWER is not set
1150# CONFIG_USB_LCD is not set 1167# CONFIG_USB_LCD is not set
1151# CONFIG_USB_BERRY_CHARGE is not set
1152# CONFIG_USB_LED is not set 1168# CONFIG_USB_LED is not set
1153# CONFIG_USB_CYPRESS_CY7C63 is not set 1169# CONFIG_USB_CYPRESS_CY7C63 is not set
1154# CONFIG_USB_CYTHERM is not set 1170# CONFIG_USB_CYTHERM is not set
@@ -1161,7 +1177,6 @@ CONFIG_USB_STORAGE=y
1161# CONFIG_USB_IOWARRIOR is not set 1177# CONFIG_USB_IOWARRIOR is not set
1162# CONFIG_USB_TEST is not set 1178# CONFIG_USB_TEST is not set
1163# CONFIG_USB_ISIGHTFW is not set 1179# CONFIG_USB_ISIGHTFW is not set
1164# CONFIG_USB_VST is not set
1165# CONFIG_USB_GADGET is not set 1180# CONFIG_USB_GADGET is not set
1166 1181
1167# 1182#
@@ -1192,7 +1207,6 @@ CONFIG_EXT2_FS=y
1192# CONFIG_EXT2_FS_XIP is not set 1207# CONFIG_EXT2_FS_XIP is not set
1193# CONFIG_EXT3_FS is not set 1208# CONFIG_EXT3_FS is not set
1194# CONFIG_EXT4_FS is not set 1209# CONFIG_EXT4_FS is not set
1195CONFIG_EXT4_USE_FOR_EXT23=y
1196# CONFIG_REISERFS_FS is not set 1210# CONFIG_REISERFS_FS is not set
1197# CONFIG_JFS_FS is not set 1211# CONFIG_JFS_FS is not set
1198# CONFIG_FS_POSIX_ACL is not set 1212# CONFIG_FS_POSIX_ACL is not set
@@ -1211,6 +1225,7 @@ CONFIG_INOTIFY_USER=y
1211# 1225#
1212# Caches 1226# Caches
1213# 1227#
1228# CONFIG_FSCACHE is not set
1214 1229
1215# 1230#
1216# CD-ROM/DVD Filesystems 1231# CD-ROM/DVD Filesystems
@@ -1332,6 +1347,7 @@ CONFIG_DEBUG_FS=y
1332CONFIG_DEBUG_BUGVERBOSE=y 1347CONFIG_DEBUG_BUGVERBOSE=y
1333# CONFIG_DEBUG_MEMORY_INIT is not set 1348# CONFIG_DEBUG_MEMORY_INIT is not set
1334# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1349# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1350# CONFIG_LKDTM is not set
1335# CONFIG_LATENCYTOP is not set 1351# CONFIG_LATENCYTOP is not set
1336# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1352# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1337CONFIG_HAVE_FUNCTION_TRACER=y 1353CONFIG_HAVE_FUNCTION_TRACER=y
@@ -1442,6 +1458,7 @@ CONFIG_CRYPTO=y
1442# CONFIG_CRYPTO_ANSI_CPRNG is not set 1458# CONFIG_CRYPTO_ANSI_CPRNG is not set
1443CONFIG_CRYPTO_HW=y 1459CONFIG_CRYPTO_HW=y
1444# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1460# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1461# CONFIG_VIRTUALIZATION is not set
1445# CONFIG_BINARY_PRINTF is not set 1462# CONFIG_BINARY_PRINTF is not set
1446 1463
1447# 1464#
diff --git a/arch/sh/configs/sh03_defconfig b/arch/sh/configs/sh03_defconfig
index 666fde110b27..562147d333e3 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 14:41:25 2010 4# Tue May 18 17:10:00 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
33CONFIG_ARCH_HAS_DEFAULT_IDLE=y 33CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -48,9 +49,11 @@ CONFIG_LOCALVERSION_AUTO=y
48CONFIG_HAVE_KERNEL_GZIP=y 49CONFIG_HAVE_KERNEL_GZIP=y
49CONFIG_HAVE_KERNEL_BZIP2=y 50CONFIG_HAVE_KERNEL_BZIP2=y
50CONFIG_HAVE_KERNEL_LZMA=y 51CONFIG_HAVE_KERNEL_LZMA=y
52CONFIG_HAVE_KERNEL_LZO=y
51CONFIG_KERNEL_GZIP=y 53CONFIG_KERNEL_GZIP=y
52# CONFIG_KERNEL_BZIP2 is not set 54# CONFIG_KERNEL_BZIP2 is not set
53# CONFIG_KERNEL_LZMA is not set 55# CONFIG_KERNEL_LZMA is not set
56# CONFIG_KERNEL_LZO is not set
54CONFIG_SWAP=y 57CONFIG_SWAP=y
55CONFIG_SYSVIPC=y 58CONFIG_SYSVIPC=y
56CONFIG_SYSVIPC_SYSCTL=y 59CONFIG_SYSVIPC_SYSCTL=y
@@ -73,7 +76,6 @@ CONFIG_RCU_FANOUT=32
73# CONFIG_TREE_RCU_TRACE is not set 76# CONFIG_TREE_RCU_TRACE is not set
74# CONFIG_IKCONFIG is not set 77# CONFIG_IKCONFIG is not set
75CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
76# CONFIG_GROUP_SCHED is not set
77# CONFIG_CGROUPS is not set 79# CONFIG_CGROUPS is not set
78CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
@@ -84,6 +86,7 @@ CONFIG_INITRAMFS_SOURCE=""
84CONFIG_RD_GZIP=y 86CONFIG_RD_GZIP=y
85# CONFIG_RD_BZIP2 is not set 87# CONFIG_RD_BZIP2 is not set
86# CONFIG_RD_LZMA is not set 88# CONFIG_RD_LZMA is not set
89# CONFIG_RD_LZO is not set
87CONFIG_CC_OPTIMIZE_FOR_SIZE=y 90CONFIG_CC_OPTIMIZE_FOR_SIZE=y
88CONFIG_SYSCTL=y 91CONFIG_SYSCTL=y
89CONFIG_ANON_INODES=y 92CONFIG_ANON_INODES=y
@@ -111,7 +114,6 @@ CONFIG_PERF_USE_VMALLOC=y
111# Kernel Performance Events And Counters 114# Kernel Performance Events And Counters
112# 115#
113CONFIG_PERF_EVENTS=y 116CONFIG_PERF_EVENTS=y
114CONFIG_EVENT_PROFILE=y
115# CONFIG_PERF_COUNTERS is not set 117# CONFIG_PERF_COUNTERS is not set
116CONFIG_VM_EVENT_COUNTERS=y 118CONFIG_VM_EVENT_COUNTERS=y
117CONFIG_PCI_QUIRKS=y 119CONFIG_PCI_QUIRKS=y
@@ -120,7 +122,6 @@ CONFIG_SLAB=y
120# CONFIG_SLUB is not set 122# CONFIG_SLUB is not set
121# CONFIG_SLOB is not set 123# CONFIG_SLOB is not set
122CONFIG_PROFILING=y 124CONFIG_PROFILING=y
123CONFIG_TRACEPOINTS=y
124CONFIG_OPROFILE=m 125CONFIG_OPROFILE=m
125CONFIG_HAVE_OPROFILE=y 126CONFIG_HAVE_OPROFILE=y
126# CONFIG_KPROBES is not set 127# CONFIG_KPROBES is not set
@@ -131,6 +132,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
131CONFIG_HAVE_DMA_ATTRS=y 132CONFIG_HAVE_DMA_ATTRS=y
132CONFIG_HAVE_CLK=y 133CONFIG_HAVE_CLK=y
133CONFIG_HAVE_DMA_API_DEBUG=y 134CONFIG_HAVE_DMA_API_DEBUG=y
135CONFIG_HAVE_HW_BREAKPOINT=y
134 136
135# 137#
136# GCOV-based kernel profiling 138# GCOV-based kernel profiling
@@ -250,6 +252,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
250CONFIG_MAX_ACTIVE_REGIONS=1 252CONFIG_MAX_ACTIVE_REGIONS=1
251CONFIG_ARCH_POPULATES_NODE_MAP=y 253CONFIG_ARCH_POPULATES_NODE_MAP=y
252CONFIG_ARCH_SELECT_MEMORY_MODEL=y 254CONFIG_ARCH_SELECT_MEMORY_MODEL=y
255CONFIG_UNCACHED_MAPPING=y
253CONFIG_PAGE_SIZE_4KB=y 256CONFIG_PAGE_SIZE_4KB=y
254# CONFIG_PAGE_SIZE_8KB is not set 257# CONFIG_PAGE_SIZE_8KB is not set
255# CONFIG_PAGE_SIZE_16KB is not set 258# CONFIG_PAGE_SIZE_16KB is not set
@@ -265,7 +268,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
265CONFIG_SPLIT_PTLOCK_CPUS=4 268CONFIG_SPLIT_PTLOCK_CPUS=4
266# CONFIG_PHYS_ADDR_T_64BIT is not set 269# CONFIG_PHYS_ADDR_T_64BIT is not set
267CONFIG_ZONE_DMA_FLAG=0 270CONFIG_ZONE_DMA_FLAG=0
268CONFIG_NR_QUICK=2 271CONFIG_NR_QUICK=1
269# CONFIG_KSM is not set 272# CONFIG_KSM is not set
270CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 273CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
271 274
@@ -342,7 +345,6 @@ CONFIG_HZ=250
342CONFIG_PREEMPT=y 345CONFIG_PREEMPT=y
343CONFIG_GUSA=y 346CONFIG_GUSA=y
344# CONFIG_GUSA_RB is not set 347# CONFIG_GUSA_RB is not set
345# CONFIG_SPARSE_IRQ is not set
346 348
347# 349#
348# Boot options 350# Boot options
@@ -358,9 +360,9 @@ CONFIG_CMDLINE="console=ttySC1,115200 mem=64M root=/dev/nfs"
358# Bus options 360# Bus options
359# 361#
360CONFIG_PCI=y 362CONFIG_PCI=y
363CONFIG_PCI_DOMAINS=y
361# CONFIG_PCIEPORTBUS is not set 364# CONFIG_PCIEPORTBUS is not set
362# CONFIG_ARCH_SUPPORTS_MSI is not set 365# CONFIG_ARCH_SUPPORTS_MSI is not set
363CONFIG_PCI_LEGACY=y
364# CONFIG_PCI_STUB is not set 366# CONFIG_PCI_STUB is not set
365# CONFIG_PCI_IOV is not set 367# CONFIG_PCI_IOV is not set
366# CONFIG_PCCARD is not set 368# CONFIG_PCCARD is not set
@@ -388,7 +390,6 @@ CONFIG_NET=y
388# Networking options 390# Networking options
389# 391#
390CONFIG_PACKET=y 392CONFIG_PACKET=y
391# CONFIG_PACKET_MMAP is not set
392CONFIG_UNIX=y 393CONFIG_UNIX=y
393CONFIG_XFRM=y 394CONFIG_XFRM=y
394# CONFIG_XFRM_USER is not set 395# CONFIG_XFRM_USER is not set
@@ -453,7 +454,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
453# Network testing 454# Network testing
454# 455#
455# CONFIG_NET_PKTGEN is not set 456# CONFIG_NET_PKTGEN is not set
456# CONFIG_NET_DROP_MONITOR is not set
457# CONFIG_HAMRADIO is not set 457# CONFIG_HAMRADIO is not set
458# CONFIG_CAN is not set 458# CONFIG_CAN is not set
459# CONFIG_IRDA is not set 459# CONFIG_IRDA is not set
@@ -574,6 +574,7 @@ CONFIG_IDE_PROC_FS=y
574# 574#
575# SCSI device support 575# SCSI device support
576# 576#
577CONFIG_SCSI_MOD=m
577# CONFIG_RAID_ATTRS is not set 578# CONFIG_RAID_ATTRS is not set
578CONFIG_SCSI=m 579CONFIG_SCSI=m
579CONFIG_SCSI_DMA=y 580CONFIG_SCSI_DMA=y
@@ -664,7 +665,7 @@ CONFIG_SCSI_LOWLEVEL=y
664# 665#
665 666
666# 667#
667# See the help texts for more information. 668# The newer stack is recommended.
668# 669#
669# CONFIG_FIREWIRE is not set 670# CONFIG_FIREWIRE is not set
670# CONFIG_IEEE1394 is not set 671# CONFIG_IEEE1394 is not set
@@ -704,6 +705,7 @@ CONFIG_NET_PCI=y
704# CONFIG_PCNET32 is not set 705# CONFIG_PCNET32 is not set
705# CONFIG_AMD8111_ETH is not set 706# CONFIG_AMD8111_ETH is not set
706# CONFIG_ADAPTEC_STARFIRE is not set 707# CONFIG_ADAPTEC_STARFIRE is not set
708# CONFIG_KSZ884X_PCI is not set
707# CONFIG_B44 is not set 709# CONFIG_B44 is not set
708# CONFIG_FORCEDETH is not set 710# CONFIG_FORCEDETH is not set
709# CONFIG_E100 is not set 711# CONFIG_E100 is not set
@@ -751,6 +753,8 @@ CONFIG_NETDEV_10000=y
751# CONFIG_CHELSIO_T1 is not set 753# CONFIG_CHELSIO_T1 is not set
752CONFIG_CHELSIO_T3_DEPENDS=y 754CONFIG_CHELSIO_T3_DEPENDS=y
753# CONFIG_CHELSIO_T3 is not set 755# CONFIG_CHELSIO_T3 is not set
756CONFIG_CHELSIO_T4_DEPENDS=y
757# CONFIG_CHELSIO_T4 is not set
754# CONFIG_ENIC is not set 758# CONFIG_ENIC is not set
755# CONFIG_IXGBE is not set 759# CONFIG_IXGBE is not set
756# CONFIG_IXGB is not set 760# CONFIG_IXGB is not set
@@ -763,6 +767,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
763# CONFIG_MLX4_CORE is not set 767# CONFIG_MLX4_CORE is not set
764# CONFIG_TEHUTI is not set 768# CONFIG_TEHUTI is not set
765# CONFIG_BNX2X is not set 769# CONFIG_BNX2X is not set
770# CONFIG_QLCNIC is not set
766# CONFIG_QLGE is not set 771# CONFIG_QLGE is not set
767# CONFIG_SFC is not set 772# CONFIG_SFC is not set
768# CONFIG_BE2NET is not set 773# CONFIG_BE2NET is not set
@@ -853,6 +858,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
853CONFIG_SERIAL_CORE=y 858CONFIG_SERIAL_CORE=y
854CONFIG_SERIAL_CORE_CONSOLE=y 859CONFIG_SERIAL_CORE_CONSOLE=y
855# CONFIG_SERIAL_JSM is not set 860# CONFIG_SERIAL_JSM is not set
861# CONFIG_SERIAL_TIMBERDALE is not set
856CONFIG_UNIX98_PTYS=y 862CONFIG_UNIX98_PTYS=y
857# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 863# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
858CONFIG_LEGACY_PTYS=y 864CONFIG_LEGACY_PTYS=y
@@ -927,6 +933,7 @@ CONFIG_SSB_POSSIBLE=y
927# CONFIG_MFD_SH_MOBILE_SDHI is not set 933# CONFIG_MFD_SH_MOBILE_SDHI is not set
928# CONFIG_HTC_PASIC3 is not set 934# CONFIG_HTC_PASIC3 is not set
929# CONFIG_MFD_TMIO is not set 935# CONFIG_MFD_TMIO is not set
936# CONFIG_LPC_SCH is not set
930# CONFIG_REGULATOR is not set 937# CONFIG_REGULATOR is not set
931# CONFIG_MEDIA_SUPPORT is not set 938# CONFIG_MEDIA_SUPPORT is not set
932 939
@@ -934,6 +941,7 @@ CONFIG_SSB_POSSIBLE=y
934# Graphics support 941# Graphics support
935# 942#
936CONFIG_VGA_ARB=y 943CONFIG_VGA_ARB=y
944CONFIG_VGA_ARB_MAX_GPUS=16
937# CONFIG_DRM is not set 945# CONFIG_DRM is not set
938# CONFIG_VGASTATE is not set 946# CONFIG_VGASTATE is not set
939# CONFIG_VIDEO_OUTPUT_CONTROL is not set 947# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1075,6 +1083,7 @@ CONFIG_MISC_FILESYSTEMS=y
1075# CONFIG_BEFS_FS is not set 1083# CONFIG_BEFS_FS is not set
1076# CONFIG_BFS_FS is not set 1084# CONFIG_BFS_FS is not set
1077# CONFIG_EFS_FS is not set 1085# CONFIG_EFS_FS is not set
1086# CONFIG_LOGFS is not set
1078# CONFIG_CRAMFS is not set 1087# CONFIG_CRAMFS is not set
1079# CONFIG_SQUASHFS is not set 1088# CONFIG_SQUASHFS is not set
1080# CONFIG_VXFS_FS is not set 1089# CONFIG_VXFS_FS is not set
@@ -1105,6 +1114,7 @@ CONFIG_SUNRPC_GSS=y
1105CONFIG_RPCSEC_GSS_KRB5=y 1114CONFIG_RPCSEC_GSS_KRB5=y
1106# CONFIG_RPCSEC_GSS_SPKM3 is not set 1115# CONFIG_RPCSEC_GSS_SPKM3 is not set
1107# CONFIG_SMB_FS is not set 1116# CONFIG_SMB_FS is not set
1117# CONFIG_CEPH_FS is not set
1108# CONFIG_CIFS is not set 1118# CONFIG_CIFS is not set
1109# CONFIG_NCP_FS is not set 1119# CONFIG_NCP_FS is not set
1110# CONFIG_CODA_FS is not set 1120# CONFIG_CODA_FS is not set
@@ -1187,13 +1197,12 @@ CONFIG_FRAME_WARN=1024
1187CONFIG_DEBUG_FS=y 1197CONFIG_DEBUG_FS=y
1188# CONFIG_HEADERS_CHECK is not set 1198# CONFIG_HEADERS_CHECK is not set
1189# CONFIG_DEBUG_KERNEL is not set 1199# CONFIG_DEBUG_KERNEL is not set
1190CONFIG_STACKTRACE=y
1191CONFIG_DEBUG_BUGVERBOSE=y 1200CONFIG_DEBUG_BUGVERBOSE=y
1192# CONFIG_DEBUG_MEMORY_INIT is not set 1201# CONFIG_DEBUG_MEMORY_INIT is not set
1193# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1202# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1203# CONFIG_LKDTM is not set
1194# CONFIG_LATENCYTOP is not set 1204# CONFIG_LATENCYTOP is not set
1195# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1205# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1196CONFIG_NOP_TRACER=y
1197CONFIG_HAVE_FUNCTION_TRACER=y 1206CONFIG_HAVE_FUNCTION_TRACER=y
1198CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1207CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1199CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1208CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1201,10 +1210,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1201CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1210CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1202CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1211CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1203CONFIG_RING_BUFFER=y 1212CONFIG_RING_BUFFER=y
1204CONFIG_EVENT_TRACING=y
1205CONFIG_CONTEXT_SWITCH_TRACER=y
1206CONFIG_RING_BUFFER_ALLOW_SWAP=y 1213CONFIG_RING_BUFFER_ALLOW_SWAP=y
1207CONFIG_TRACING=y
1208CONFIG_TRACING_SUPPORT=y 1214CONFIG_TRACING_SUPPORT=y
1209# CONFIG_FTRACE is not set 1215# CONFIG_FTRACE is not set
1210# CONFIG_DYNAMIC_DEBUG is not set 1216# CONFIG_DYNAMIC_DEBUG is not set
@@ -1323,7 +1329,8 @@ CONFIG_CRYPTO_DEFLATE=y
1323# CONFIG_CRYPTO_ANSI_CPRNG is not set 1329# CONFIG_CRYPTO_ANSI_CPRNG is not set
1324CONFIG_CRYPTO_HW=y 1330CONFIG_CRYPTO_HW=y
1325# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1331# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1326CONFIG_BINARY_PRINTF=y 1332# CONFIG_VIRTUALIZATION is not set
1333# CONFIG_BINARY_PRINTF is not set
1327 1334
1328# 1335#
1329# Library routines 1336# Library routines
diff --git a/arch/sh/configs/sh7710voipgw_defconfig b/arch/sh/configs/sh7710voipgw_defconfig
index 35a3beeba182..98485ca46390 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 14:43:04 2010 4# Tue May 18 17:14:59 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -30,6 +30,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DMA_NONCOHERENT=y 32CONFIG_DMA_NONCOHERENT=y
33CONFIG_NEED_DMA_MAP_STATE=y
33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y 35CONFIG_CONSTRUCTORS=y
35 36
@@ -44,9 +45,11 @@ CONFIG_LOCALVERSION_AUTO=y
44CONFIG_HAVE_KERNEL_GZIP=y 45CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y 46CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y 47CONFIG_HAVE_KERNEL_LZMA=y
48CONFIG_HAVE_KERNEL_LZO=y
47CONFIG_KERNEL_GZIP=y 49CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set 50# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set 51# CONFIG_KERNEL_LZMA is not set
52# CONFIG_KERNEL_LZO is not set
50# CONFIG_SWAP is not set 53# CONFIG_SWAP is not set
51CONFIG_SYSVIPC=y 54CONFIG_SYSVIPC=y
52CONFIG_SYSVIPC_SYSCTL=y 55CONFIG_SYSVIPC_SYSCTL=y
@@ -68,11 +71,6 @@ CONFIG_RCU_FANOUT=32
68# CONFIG_TREE_RCU_TRACE is not set 71# CONFIG_TREE_RCU_TRACE is not set
69# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
70CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
71CONFIG_GROUP_SCHED=y
72CONFIG_FAIR_GROUP_SCHED=y
73# CONFIG_RT_GROUP_SCHED is not set
74CONFIG_USER_SCHED=y
75# CONFIG_CGROUP_SCHED is not set
76# CONFIG_CGROUPS is not set 74# CONFIG_CGROUPS is not set
77CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
78CONFIG_SYSFS_DEPRECATED_V2=y 76CONFIG_SYSFS_DEPRECATED_V2=y
@@ -105,7 +103,7 @@ CONFIG_PERF_USE_VMALLOC=y
105# 103#
106# Kernel Performance Events And Counters 104# Kernel Performance Events And Counters
107# 105#
108# CONFIG_PERF_EVENTS is not set 106CONFIG_PERF_EVENTS=y
109# CONFIG_PERF_COUNTERS is not set 107# CONFIG_PERF_COUNTERS is not set
110CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_COMPAT_BRK=y 109CONFIG_COMPAT_BRK=y
@@ -122,6 +120,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122CONFIG_HAVE_DMA_ATTRS=y 120CONFIG_HAVE_DMA_ATTRS=y
123CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
124CONFIG_HAVE_DMA_API_DEBUG=y 122CONFIG_HAVE_DMA_API_DEBUG=y
123CONFIG_HAVE_HW_BREAKPOINT=y
125 124
126# 125#
127# GCOV-based kernel profiling 126# GCOV-based kernel profiling
@@ -240,6 +239,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
240CONFIG_MAX_ACTIVE_REGIONS=1 239CONFIG_MAX_ACTIVE_REGIONS=1
241CONFIG_ARCH_POPULATES_NODE_MAP=y 240CONFIG_ARCH_POPULATES_NODE_MAP=y
242CONFIG_ARCH_SELECT_MEMORY_MODEL=y 241CONFIG_ARCH_SELECT_MEMORY_MODEL=y
242CONFIG_UNCACHED_MAPPING=y
243CONFIG_PAGE_SIZE_4KB=y 243CONFIG_PAGE_SIZE_4KB=y
244# CONFIG_PAGE_SIZE_8KB is not set 244# CONFIG_PAGE_SIZE_8KB is not set
245# CONFIG_PAGE_SIZE_16KB is not set 245# CONFIG_PAGE_SIZE_16KB is not set
@@ -255,7 +255,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
255CONFIG_SPLIT_PTLOCK_CPUS=4 255CONFIG_SPLIT_PTLOCK_CPUS=4
256# CONFIG_PHYS_ADDR_T_64BIT is not set 256# CONFIG_PHYS_ADDR_T_64BIT is not set
257CONFIG_ZONE_DMA_FLAG=0 257CONFIG_ZONE_DMA_FLAG=0
258CONFIG_NR_QUICK=2 258CONFIG_NR_QUICK=1
259# CONFIG_KSM is not set 259# CONFIG_KSM is not set
260CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 260CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
261 261
@@ -331,7 +331,6 @@ CONFIG_PREEMPT_NONE=y
331# CONFIG_PREEMPT is not set 331# CONFIG_PREEMPT is not set
332CONFIG_GUSA=y 332CONFIG_GUSA=y
333# CONFIG_GUSA_RB is not set 333# CONFIG_GUSA_RB is not set
334# CONFIG_SPARSE_IRQ is not set
335 334
336# 335#
337# Boot options 336# Boot options
@@ -367,7 +366,6 @@ CONFIG_NET=y
367# Networking options 366# Networking options
368# 367#
369CONFIG_PACKET=y 368CONFIG_PACKET=y
370# CONFIG_PACKET_MMAP is not set
371CONFIG_UNIX=y 369CONFIG_UNIX=y
372CONFIG_XFRM=y 370CONFIG_XFRM=y
373# CONFIG_XFRM_USER is not set 371# CONFIG_XFRM_USER is not set
@@ -620,6 +618,7 @@ CONFIG_HAVE_IDE=y
620# 618#
621# SCSI device support 619# SCSI device support
622# 620#
621CONFIG_SCSI_MOD=y
623# CONFIG_RAID_ATTRS is not set 622# CONFIG_RAID_ATTRS is not set
624# CONFIG_SCSI is not set 623# CONFIG_SCSI is not set
625# CONFIG_SCSI_DMA is not set 624# CONFIG_SCSI_DMA is not set
@@ -723,6 +722,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
723CONFIG_SERIAL_SH_SCI_CONSOLE=y 722CONFIG_SERIAL_SH_SCI_CONSOLE=y
724CONFIG_SERIAL_CORE=y 723CONFIG_SERIAL_CORE=y
725CONFIG_SERIAL_CORE_CONSOLE=y 724CONFIG_SERIAL_CORE_CONSOLE=y
725# CONFIG_SERIAL_TIMBERDALE is not set
726# CONFIG_UNIX98_PTYS is not set 726# CONFIG_UNIX98_PTYS is not set
727CONFIG_LEGACY_PTYS=y 727CONFIG_LEGACY_PTYS=y
728CONFIG_LEGACY_PTY_COUNT=256 728CONFIG_LEGACY_PTY_COUNT=256
@@ -824,7 +824,6 @@ CONFIG_RTC_LIB=y
824# CONFIG_EXT2_FS is not set 824# CONFIG_EXT2_FS is not set
825# CONFIG_EXT3_FS is not set 825# CONFIG_EXT3_FS is not set
826# CONFIG_EXT4_FS is not set 826# CONFIG_EXT4_FS is not set
827CONFIG_EXT4_USE_FOR_EXT23=y
828# CONFIG_REISERFS_FS is not set 827# CONFIG_REISERFS_FS is not set
829# CONFIG_JFS_FS is not set 828# CONFIG_JFS_FS is not set
830# CONFIG_FS_POSIX_ACL is not set 829# CONFIG_FS_POSIX_ACL is not set
@@ -890,6 +889,7 @@ CONFIG_JFFS2_ZLIB=y
890# CONFIG_JFFS2_LZO is not set 889# CONFIG_JFFS2_LZO is not set
891CONFIG_JFFS2_RTIME=y 890CONFIG_JFFS2_RTIME=y
892# CONFIG_JFFS2_RUBIN is not set 891# CONFIG_JFFS2_RUBIN is not set
892# CONFIG_LOGFS is not set
893# CONFIG_CRAMFS is not set 893# CONFIG_CRAMFS is not set
894# CONFIG_SQUASHFS is not set 894# CONFIG_SQUASHFS is not set
895# CONFIG_VXFS_FS is not set 895# CONFIG_VXFS_FS is not set
@@ -904,6 +904,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
904# CONFIG_NFS_FS is not set 904# CONFIG_NFS_FS is not set
905# CONFIG_NFSD is not set 905# CONFIG_NFSD is not set
906# CONFIG_SMB_FS is not set 906# CONFIG_SMB_FS is not set
907# CONFIG_CEPH_FS is not set
907# CONFIG_CIFS is not set 908# CONFIG_CIFS is not set
908# CONFIG_NCP_FS is not set 909# CONFIG_NCP_FS is not set
909# CONFIG_CODA_FS is not set 910# CONFIG_CODA_FS is not set
@@ -934,6 +935,7 @@ CONFIG_DEBUG_FS=y
934CONFIG_DEBUG_BUGVERBOSE=y 935CONFIG_DEBUG_BUGVERBOSE=y
935# CONFIG_DEBUG_MEMORY_INIT is not set 936# CONFIG_DEBUG_MEMORY_INIT is not set
936# CONFIG_RCU_CPU_STALL_DETECTOR is not set 937# CONFIG_RCU_CPU_STALL_DETECTOR is not set
938# CONFIG_LKDTM is not set
937# CONFIG_LATENCYTOP is not set 939# CONFIG_LATENCYTOP is not set
938# CONFIG_SYSCTL_SYSCALL_CHECK is not set 940# CONFIG_SYSCTL_SYSCALL_CHECK is not set
939CONFIG_HAVE_FUNCTION_TRACER=y 941CONFIG_HAVE_FUNCTION_TRACER=y
@@ -1049,6 +1051,7 @@ CONFIG_CRYPTO=y
1049# 1051#
1050# CONFIG_CRYPTO_ANSI_CPRNG is not set 1052# CONFIG_CRYPTO_ANSI_CPRNG is not set
1051CONFIG_CRYPTO_HW=y 1053CONFIG_CRYPTO_HW=y
1054# CONFIG_VIRTUALIZATION is not set
1052# CONFIG_BINARY_PRINTF is not set 1055# CONFIG_BINARY_PRINTF is not set
1053 1056
1054# 1057#
diff --git a/arch/sh/configs/sh7724_generic_defconfig b/arch/sh/configs/sh7724_generic_defconfig
index a3056b69d2ba..a6a9e6887ef8 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 15:03:45 2010 4# Tue May 18 17:17:36 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION=""
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SWAP=y 55CONFIG_SWAP=y
53CONFIG_SYSVIPC=y 56CONFIG_SYSVIPC=y
54# CONFIG_BSD_PROCESS_ACCT is not set 57# CONFIG_BSD_PROCESS_ACCT is not set
@@ -65,11 +68,6 @@ CONFIG_RCU_FANOUT=32
65# CONFIG_TREE_RCU_TRACE is not set 68# CONFIG_TREE_RCU_TRACE is not set
66# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
67CONFIG_LOG_BUF_SHIFT=17 70CONFIG_LOG_BUF_SHIFT=17
68CONFIG_GROUP_SCHED=y
69CONFIG_FAIR_GROUP_SCHED=y
70CONFIG_RT_GROUP_SCHED=y
71CONFIG_USER_SCHED=y
72# CONFIG_CGROUP_SCHED is not set
73CONFIG_CGROUPS=y 71CONFIG_CGROUPS=y
74# CONFIG_CGROUP_DEBUG is not set 72# CONFIG_CGROUP_DEBUG is not set
75# CONFIG_CGROUP_NS is not set 73# CONFIG_CGROUP_NS is not set
@@ -78,6 +76,7 @@ CONFIG_CGROUPS=y
78# CONFIG_CPUSETS is not set 76# CONFIG_CPUSETS is not set
79# CONFIG_CGROUP_CPUACCT is not set 77# CONFIG_CGROUP_CPUACCT is not set
80# CONFIG_RESOURCE_COUNTERS is not set 78# CONFIG_RESOURCE_COUNTERS is not set
79# CONFIG_CGROUP_SCHED is not set
81# CONFIG_RELAY is not set 80# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set 81# CONFIG_NAMESPACES is not set
83# CONFIG_BLK_DEV_INITRD is not set 82# CONFIG_BLK_DEV_INITRD is not set
@@ -106,7 +105,6 @@ CONFIG_PERF_USE_VMALLOC=y
106# Kernel Performance Events And Counters 105# Kernel Performance Events And Counters
107# 106#
108CONFIG_PERF_EVENTS=y 107CONFIG_PERF_EVENTS=y
109CONFIG_EVENT_PROFILE=y
110# CONFIG_PERF_COUNTERS is not set 108# CONFIG_PERF_COUNTERS is not set
111CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
112# CONFIG_COMPAT_BRK is not set 110# CONFIG_COMPAT_BRK is not set
@@ -114,21 +112,19 @@ CONFIG_VM_EVENT_COUNTERS=y
114CONFIG_SLUB=y 112CONFIG_SLUB=y
115# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
116CONFIG_PROFILING=y 114CONFIG_PROFILING=y
117CONFIG_TRACEPOINTS=y
118CONFIG_OPROFILE=y 115CONFIG_OPROFILE=y
119CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
120CONFIG_HAVE_IOREMAP_PROT=y
121CONFIG_HAVE_KPROBES=y 117CONFIG_HAVE_KPROBES=y
122CONFIG_HAVE_KRETPROBES=y 118CONFIG_HAVE_KRETPROBES=y
123CONFIG_HAVE_ARCH_TRACEHOOK=y 119CONFIG_HAVE_ARCH_TRACEHOOK=y
124CONFIG_HAVE_DMA_ATTRS=y 120CONFIG_HAVE_DMA_ATTRS=y
125CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
126CONFIG_HAVE_DMA_API_DEBUG=y 122CONFIG_HAVE_DMA_API_DEBUG=y
123CONFIG_HAVE_HW_BREAKPOINT=y
127 124
128# 125#
129# GCOV-based kernel profiling 126# GCOV-based kernel profiling
130# 127#
131# CONFIG_GCOV_KERNEL is not set
132# CONFIG_SLOW_WORK is not set 128# CONFIG_SLOW_WORK is not set
133CONFIG_HAVE_GENERIC_DMA_COHERENT=y 129CONFIG_HAVE_GENERIC_DMA_COHERENT=y
134CONFIG_RT_MUTEXES=y 130CONFIG_RT_MUTEXES=y
@@ -138,7 +134,6 @@ CONFIG_BLOCK=y
138CONFIG_LBDAF=y 134CONFIG_LBDAF=y
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141# CONFIG_BLK_CGROUP is not set
142 137
143# 138#
144# IO Schedulers 139# IO Schedulers
@@ -235,8 +230,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
235CONFIG_MEMORY_START=0x08000000 230CONFIG_MEMORY_START=0x08000000
236CONFIG_MEMORY_SIZE=0x04000000 231CONFIG_MEMORY_SIZE=0x04000000
237CONFIG_29BIT=y 232CONFIG_29BIT=y
238# CONFIG_PMB_ENABLE is not set 233# CONFIG_PMB is not set
239# CONFIG_X2TLB is not set 234CONFIG_X2TLB=y
240CONFIG_VSYSCALL=y 235CONFIG_VSYSCALL=y
241CONFIG_ARCH_FLATMEM_ENABLE=y 236CONFIG_ARCH_FLATMEM_ENABLE=y
242CONFIG_ARCH_SPARSEMEM_ENABLE=y 237CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -246,6 +241,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
246CONFIG_ARCH_SELECT_MEMORY_MODEL=y 241CONFIG_ARCH_SELECT_MEMORY_MODEL=y
247CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 242CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
248CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 243CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
244CONFIG_IOREMAP_FIXED=y
245CONFIG_UNCACHED_MAPPING=y
249CONFIG_PAGE_SIZE_4KB=y 246CONFIG_PAGE_SIZE_4KB=y
250# CONFIG_PAGE_SIZE_8KB is not set 247# CONFIG_PAGE_SIZE_8KB is not set
251# CONFIG_PAGE_SIZE_16KB is not set 248# CONFIG_PAGE_SIZE_16KB is not set
@@ -262,7 +259,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
262CONFIG_MIGRATION=y 259CONFIG_MIGRATION=y
263# CONFIG_PHYS_ADDR_T_64BIT is not set 260# CONFIG_PHYS_ADDR_T_64BIT is not set
264CONFIG_ZONE_DMA_FLAG=0 261CONFIG_ZONE_DMA_FLAG=0
265CONFIG_NR_QUICK=2 262CONFIG_NR_QUICK=1
266# CONFIG_KSM is not set 263# CONFIG_KSM is not set
267CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 264CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
268 265
@@ -353,7 +350,7 @@ CONFIG_PREEMPT_NONE=y
353# CONFIG_PREEMPT_VOLUNTARY is not set 350# CONFIG_PREEMPT_VOLUNTARY is not set
354# CONFIG_PREEMPT is not set 351# CONFIG_PREEMPT is not set
355CONFIG_GUSA=y 352CONFIG_GUSA=y
356# CONFIG_SPARSE_IRQ is not set 353# CONFIG_INTC_USERIMASK is not set
357 354
358# 355#
359# Boot options 356# Boot options
@@ -390,6 +387,7 @@ CONFIG_HIBERNATION_NVS=y
390CONFIG_HIBERNATION=y 387CONFIG_HIBERNATION=y
391CONFIG_PM_STD_PARTITION="" 388CONFIG_PM_STD_PARTITION=""
392CONFIG_PM_RUNTIME=y 389CONFIG_PM_RUNTIME=y
390CONFIG_PM_OPS=y
393CONFIG_CPU_IDLE=y 391CONFIG_CPU_IDLE=y
394CONFIG_CPU_IDLE_GOV_LADDER=y 392CONFIG_CPU_IDLE_GOV_LADDER=y
395CONFIG_CPU_IDLE_GOV_MENU=y 393CONFIG_CPU_IDLE_GOV_MENU=y
@@ -428,6 +426,7 @@ CONFIG_HAVE_IDE=y
428# 426#
429# SCSI device support 427# SCSI device support
430# 428#
429CONFIG_SCSI_MOD=y
431# CONFIG_RAID_ATTRS is not set 430# CONFIG_RAID_ATTRS is not set
432# CONFIG_SCSI is not set 431# CONFIG_SCSI is not set
433# CONFIG_SCSI_DMA is not set 432# CONFIG_SCSI_DMA is not set
@@ -467,6 +466,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6
467CONFIG_SERIAL_SH_SCI_CONSOLE=y 466CONFIG_SERIAL_SH_SCI_CONSOLE=y
468CONFIG_SERIAL_CORE=y 467CONFIG_SERIAL_CORE=y
469CONFIG_SERIAL_CORE_CONSOLE=y 468CONFIG_SERIAL_CORE_CONSOLE=y
469# CONFIG_SERIAL_TIMBERDALE is not set
470# CONFIG_UNIX98_PTYS is not set 470# CONFIG_UNIX98_PTYS is not set
471# CONFIG_LEGACY_PTYS is not set 471# CONFIG_LEGACY_PTYS is not set
472# CONFIG_IPMI_HANDLER is not set 472# CONFIG_IPMI_HANDLER is not set
@@ -491,6 +491,7 @@ CONFIG_I2C_HELPER_AUTO=y
491# CONFIG_I2C_OCORES is not set 491# CONFIG_I2C_OCORES is not set
492CONFIG_I2C_SH_MOBILE=y 492CONFIG_I2C_SH_MOBILE=y
493# CONFIG_I2C_SIMTEC is not set 493# CONFIG_I2C_SIMTEC is not set
494# CONFIG_I2C_XILINX is not set
494 495
495# 496#
496# External I2C/SMBus adapter drivers 497# External I2C/SMBus adapter drivers
@@ -502,15 +503,9 @@ CONFIG_I2C_SH_MOBILE=y
502# Other I2C/SMBus bus drivers 503# Other I2C/SMBus bus drivers
503# 504#
504# CONFIG_I2C_PCA_PLATFORM is not set 505# CONFIG_I2C_PCA_PLATFORM is not set
505
506#
507# Miscellaneous I2C Chip support
508#
509# CONFIG_SENSORS_TSL2550 is not set
510# CONFIG_I2C_DEBUG_CORE is not set 506# CONFIG_I2C_DEBUG_CORE is not set
511# CONFIG_I2C_DEBUG_ALGO is not set 507# CONFIG_I2C_DEBUG_ALGO is not set
512# CONFIG_I2C_DEBUG_BUS is not set 508# CONFIG_I2C_DEBUG_BUS is not set
513# CONFIG_I2C_DEBUG_CHIP is not set
514# CONFIG_SPI is not set 509# CONFIG_SPI is not set
515 510
516# 511#
@@ -533,6 +528,7 @@ CONFIG_SSB_POSSIBLE=y
533# Multifunction device drivers 528# Multifunction device drivers
534# 529#
535# CONFIG_MFD_CORE is not set 530# CONFIG_MFD_CORE is not set
531# CONFIG_MFD_88PM860X is not set
536# CONFIG_MFD_SM501 is not set 532# CONFIG_MFD_SM501 is not set
537# CONFIG_MFD_SH_MOBILE_SDHI is not set 533# CONFIG_MFD_SH_MOBILE_SDHI is not set
538# CONFIG_HTC_PASIC3 is not set 534# CONFIG_HTC_PASIC3 is not set
@@ -540,12 +536,13 @@ CONFIG_SSB_POSSIBLE=y
540# CONFIG_MFD_TMIO is not set 536# CONFIG_MFD_TMIO is not set
541# CONFIG_PMIC_DA903X is not set 537# CONFIG_PMIC_DA903X is not set
542# CONFIG_PMIC_ADP5520 is not set 538# CONFIG_PMIC_ADP5520 is not set
539# CONFIG_MFD_MAX8925 is not set
543# CONFIG_MFD_WM8400 is not set 540# CONFIG_MFD_WM8400 is not set
544# CONFIG_MFD_WM831X is not set 541# CONFIG_MFD_WM831X is not set
545# CONFIG_MFD_WM8350_I2C is not set 542# CONFIG_MFD_WM8350_I2C is not set
543# CONFIG_MFD_WM8994 is not set
546# CONFIG_MFD_PCF50633 is not set 544# CONFIG_MFD_PCF50633 is not set
547# CONFIG_AB3100_CORE is not set 545# CONFIG_AB3100_CORE is not set
548# CONFIG_MFD_88PM8607 is not set
549# CONFIG_REGULATOR is not set 546# CONFIG_REGULATOR is not set
550# CONFIG_MEDIA_SUPPORT is not set 547# CONFIG_MEDIA_SUPPORT is not set
551 548
@@ -629,8 +626,6 @@ CONFIG_RTC_DRV_SH=y
629CONFIG_UIO=y 626CONFIG_UIO=y
630# CONFIG_UIO_PDRV is not set 627# CONFIG_UIO_PDRV is not set
631CONFIG_UIO_PDRV_GENIRQ=y 628CONFIG_UIO_PDRV_GENIRQ=y
632# CONFIG_UIO_SMX is not set
633# CONFIG_UIO_SERCOS3 is not set
634 629
635# 630#
636# TI VLYNQ 631# TI VLYNQ
@@ -643,7 +638,6 @@ CONFIG_UIO_PDRV_GENIRQ=y
643# CONFIG_EXT2_FS is not set 638# CONFIG_EXT2_FS is not set
644# CONFIG_EXT3_FS is not set 639# CONFIG_EXT3_FS is not set
645# CONFIG_EXT4_FS is not set 640# CONFIG_EXT4_FS is not set
646CONFIG_EXT4_USE_FOR_EXT23=y
647# CONFIG_REISERFS_FS is not set 641# CONFIG_REISERFS_FS is not set
648# CONFIG_JFS_FS is not set 642# CONFIG_JFS_FS is not set
649# CONFIG_FS_POSIX_ACL is not set 643# CONFIG_FS_POSIX_ACL is not set
@@ -707,15 +701,12 @@ CONFIG_FRAME_WARN=1024
707# CONFIG_MAGIC_SYSRQ is not set 701# CONFIG_MAGIC_SYSRQ is not set
708# CONFIG_STRIP_ASM_SYMS is not set 702# CONFIG_STRIP_ASM_SYMS is not set
709# CONFIG_UNUSED_SYMBOLS is not set 703# CONFIG_UNUSED_SYMBOLS is not set
710CONFIG_DEBUG_FS=y
711# CONFIG_HEADERS_CHECK is not set 704# CONFIG_HEADERS_CHECK is not set
712# CONFIG_DEBUG_KERNEL is not set 705# CONFIG_DEBUG_KERNEL is not set
713CONFIG_STACKTRACE=y
714CONFIG_DEBUG_BUGVERBOSE=y 706CONFIG_DEBUG_BUGVERBOSE=y
715# CONFIG_DEBUG_MEMORY_INIT is not set 707# CONFIG_DEBUG_MEMORY_INIT is not set
716# CONFIG_RCU_CPU_STALL_DETECTOR is not set 708# CONFIG_RCU_CPU_STALL_DETECTOR is not set
717# CONFIG_LATENCYTOP is not set 709# CONFIG_LATENCYTOP is not set
718CONFIG_NOP_TRACER=y
719CONFIG_HAVE_FUNCTION_TRACER=y 710CONFIG_HAVE_FUNCTION_TRACER=y
720CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 711CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
721CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 712CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -723,13 +714,9 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
723CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 714CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
724CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 715CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
725CONFIG_RING_BUFFER=y 716CONFIG_RING_BUFFER=y
726CONFIG_EVENT_TRACING=y
727CONFIG_CONTEXT_SWITCH_TRACER=y
728CONFIG_RING_BUFFER_ALLOW_SWAP=y 717CONFIG_RING_BUFFER_ALLOW_SWAP=y
729CONFIG_TRACING=y
730CONFIG_TRACING_SUPPORT=y 718CONFIG_TRACING_SUPPORT=y
731# CONFIG_FTRACE is not set 719# CONFIG_FTRACE is not set
732# CONFIG_DYNAMIC_DEBUG is not set
733# CONFIG_DMA_API_DEBUG is not set 720# CONFIG_DMA_API_DEBUG is not set
734# CONFIG_SAMPLES is not set 721# CONFIG_SAMPLES is not set
735CONFIG_HAVE_ARCH_KGDB=y 722CONFIG_HAVE_ARCH_KGDB=y
@@ -747,7 +734,8 @@ CONFIG_HAVE_ARCH_KGDB=y
747CONFIG_DEFAULT_SECURITY_DAC=y 734CONFIG_DEFAULT_SECURITY_DAC=y
748CONFIG_DEFAULT_SECURITY="" 735CONFIG_DEFAULT_SECURITY=""
749# CONFIG_CRYPTO is not set 736# CONFIG_CRYPTO is not set
750CONFIG_BINARY_PRINTF=y 737# CONFIG_VIRTUALIZATION is not set
738# CONFIG_BINARY_PRINTF is not set
751 739
752# 740#
753# Library routines 741# Library routines
diff --git a/arch/sh/configs/sh7763rdp_defconfig b/arch/sh/configs/sh7763rdp_defconfig
index 04b841b29427..6f308b71f81a 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 15:05:29 2010 4# Tue May 18 17:19:21 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51CONFIG_SWAP=y 54CONFIG_SWAP=y
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
@@ -69,11 +72,6 @@ CONFIG_RCU_FANOUT=32
69CONFIG_IKCONFIG=y 72CONFIG_IKCONFIG=y
70CONFIG_IKCONFIG_PROC=y 73CONFIG_IKCONFIG_PROC=y
71CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
72CONFIG_GROUP_SCHED=y
73CONFIG_FAIR_GROUP_SCHED=y
74# CONFIG_RT_GROUP_SCHED is not set
75CONFIG_USER_SCHED=y
76# CONFIG_CGROUP_SCHED is not set
77# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
78CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y 77CONFIG_SYSFS_DEPRECATED_V2=y
@@ -112,7 +110,6 @@ CONFIG_PERF_USE_VMALLOC=y
112# Kernel Performance Events And Counters 110# Kernel Performance Events And Counters
113# 111#
114CONFIG_PERF_EVENTS=y 112CONFIG_PERF_EVENTS=y
115CONFIG_EVENT_PROFILE=y
116# CONFIG_PERF_COUNTERS is not set 113# CONFIG_PERF_COUNTERS is not set
117CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
118CONFIG_COMPAT_BRK=y 115CONFIG_COMPAT_BRK=y
@@ -120,7 +117,6 @@ CONFIG_SLAB=y
120# CONFIG_SLUB is not set 117# CONFIG_SLUB is not set
121# CONFIG_SLOB is not set 118# CONFIG_SLOB is not set
122CONFIG_PROFILING=y 119CONFIG_PROFILING=y
123CONFIG_TRACEPOINTS=y
124CONFIG_OPROFILE=y 120CONFIG_OPROFILE=y
125CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
126# CONFIG_KPROBES is not set 122# CONFIG_KPROBES is not set
@@ -131,6 +127,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
131CONFIG_HAVE_DMA_ATTRS=y 127CONFIG_HAVE_DMA_ATTRS=y
132CONFIG_HAVE_CLK=y 128CONFIG_HAVE_CLK=y
133CONFIG_HAVE_DMA_API_DEBUG=y 129CONFIG_HAVE_DMA_API_DEBUG=y
130CONFIG_HAVE_HW_BREAKPOINT=y
134 131
135# 132#
136# GCOV-based kernel profiling 133# GCOV-based kernel profiling
@@ -243,7 +240,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
243CONFIG_MEMORY_START=0x0c000000 240CONFIG_MEMORY_START=0x0c000000
244CONFIG_MEMORY_SIZE=0x04000000 241CONFIG_MEMORY_SIZE=0x04000000
245CONFIG_29BIT=y 242CONFIG_29BIT=y
246# CONFIG_PMB_ENABLE is not set 243# CONFIG_PMB is not set
247CONFIG_VSYSCALL=y 244CONFIG_VSYSCALL=y
248CONFIG_ARCH_FLATMEM_ENABLE=y 245CONFIG_ARCH_FLATMEM_ENABLE=y
249CONFIG_ARCH_SPARSEMEM_ENABLE=y 246CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -253,6 +250,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
253CONFIG_ARCH_SELECT_MEMORY_MODEL=y 250CONFIG_ARCH_SELECT_MEMORY_MODEL=y
254CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 251CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
255CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 252CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
253CONFIG_UNCACHED_MAPPING=y
256CONFIG_PAGE_SIZE_4KB=y 254CONFIG_PAGE_SIZE_4KB=y
257# CONFIG_PAGE_SIZE_8KB is not set 255# CONFIG_PAGE_SIZE_8KB is not set
258# CONFIG_PAGE_SIZE_16KB is not set 256# CONFIG_PAGE_SIZE_16KB is not set
@@ -269,7 +267,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
269CONFIG_MIGRATION=y 267CONFIG_MIGRATION=y
270# CONFIG_PHYS_ADDR_T_64BIT is not set 268# CONFIG_PHYS_ADDR_T_64BIT is not set
271CONFIG_ZONE_DMA_FLAG=0 269CONFIG_ZONE_DMA_FLAG=0
272CONFIG_NR_QUICK=2 270CONFIG_NR_QUICK=1
273# CONFIG_KSM is not set 271# CONFIG_KSM is not set
274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 272CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
275 273
@@ -344,7 +342,7 @@ CONFIG_PREEMPT_NONE=y
344# CONFIG_PREEMPT_VOLUNTARY is not set 342# CONFIG_PREEMPT_VOLUNTARY is not set
345# CONFIG_PREEMPT is not set 343# CONFIG_PREEMPT is not set
346CONFIG_GUSA=y 344CONFIG_GUSA=y
347# CONFIG_SPARSE_IRQ is not set 345# CONFIG_INTC_USERIMASK is not set
348 346
349# 347#
350# Boot options 348# Boot options
@@ -381,7 +379,6 @@ CONFIG_NET=y
381# Networking options 379# Networking options
382# 380#
383CONFIG_PACKET=y 381CONFIG_PACKET=y
384# CONFIG_PACKET_MMAP is not set
385CONFIG_UNIX=y 382CONFIG_UNIX=y
386CONFIG_XFRM=y 383CONFIG_XFRM=y
387# CONFIG_XFRM_USER is not set 384# CONFIG_XFRM_USER is not set
@@ -444,7 +441,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
444# Network testing 441# Network testing
445# 442#
446# CONFIG_NET_PKTGEN is not set 443# CONFIG_NET_PKTGEN is not set
447# CONFIG_NET_DROP_MONITOR is not set
448# CONFIG_HAMRADIO is not set 444# CONFIG_HAMRADIO is not set
449# CONFIG_CAN is not set 445# CONFIG_CAN is not set
450# CONFIG_IRDA is not set 446# CONFIG_IRDA is not set
@@ -585,6 +581,7 @@ CONFIG_HAVE_IDE=y
585# 581#
586# SCSI device support 582# SCSI device support
587# 583#
584CONFIG_SCSI_MOD=y
588# CONFIG_RAID_ATTRS is not set 585# CONFIG_RAID_ATTRS is not set
589CONFIG_SCSI=y 586CONFIG_SCSI=y
590CONFIG_SCSI_DMA=y 587CONFIG_SCSI_DMA=y
@@ -689,6 +686,7 @@ CONFIG_WLAN=y
689# CONFIG_USB_PEGASUS is not set 686# CONFIG_USB_PEGASUS is not set
690# CONFIG_USB_RTL8150 is not set 687# CONFIG_USB_RTL8150 is not set
691# CONFIG_USB_USBNET is not set 688# CONFIG_USB_USBNET is not set
689# CONFIG_USB_IPHETH is not set
692# CONFIG_WAN is not set 690# CONFIG_WAN is not set
693# CONFIG_PPP is not set 691# CONFIG_PPP is not set
694# CONFIG_SLIP is not set 692# CONFIG_SLIP is not set
@@ -754,6 +752,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=3
754CONFIG_SERIAL_SH_SCI_CONSOLE=y 752CONFIG_SERIAL_SH_SCI_CONSOLE=y
755CONFIG_SERIAL_CORE=y 753CONFIG_SERIAL_CORE=y
756CONFIG_SERIAL_CORE_CONSOLE=y 754CONFIG_SERIAL_CORE_CONSOLE=y
755# CONFIG_SERIAL_TIMBERDALE is not set
757CONFIG_UNIX98_PTYS=y 756CONFIG_UNIX98_PTYS=y
758# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 757# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
759CONFIG_LEGACY_PTYS=y 758CONFIG_LEGACY_PTYS=y
@@ -945,7 +944,6 @@ CONFIG_USB_STORAGE=y
945# CONFIG_USB_RIO500 is not set 944# CONFIG_USB_RIO500 is not set
946# CONFIG_USB_LEGOTOWER is not set 945# CONFIG_USB_LEGOTOWER is not set
947# CONFIG_USB_LCD is not set 946# CONFIG_USB_LCD is not set
948# CONFIG_USB_BERRY_CHARGE is not set
949# CONFIG_USB_LED is not set 947# CONFIG_USB_LED is not set
950# CONFIG_USB_CYPRESS_CY7C63 is not set 948# CONFIG_USB_CYPRESS_CY7C63 is not set
951# CONFIG_USB_CYTHERM is not set 949# CONFIG_USB_CYTHERM is not set
@@ -957,7 +955,6 @@ CONFIG_USB_STORAGE=y
957# CONFIG_USB_IOWARRIOR is not set 955# CONFIG_USB_IOWARRIOR is not set
958# CONFIG_USB_TEST is not set 956# CONFIG_USB_TEST is not set
959# CONFIG_USB_ISIGHTFW is not set 957# CONFIG_USB_ISIGHTFW is not set
960# CONFIG_USB_VST is not set
961# CONFIG_USB_GADGET is not set 958# CONFIG_USB_GADGET is not set
962 959
963# 960#
@@ -980,9 +977,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y
980# MMC/SD/SDIO Host Controller Drivers 977# MMC/SD/SDIO Host Controller Drivers
981# 978#
982# CONFIG_MMC_SDHCI is not set 979# CONFIG_MMC_SDHCI is not set
983# CONFIG_MMC_AT91 is not set
984# CONFIG_MMC_ATMELMCI is not set
985# CONFIG_MMC_TMIO is not set
986# CONFIG_MEMSTICK is not set 980# CONFIG_MEMSTICK is not set
987# CONFIG_NEW_LEDS is not set 981# CONFIG_NEW_LEDS is not set
988# CONFIG_ACCESSIBILITY is not set 982# CONFIG_ACCESSIBILITY is not set
@@ -1074,6 +1068,7 @@ CONFIG_MISC_FILESYSTEMS=y
1074# CONFIG_BFS_FS is not set 1068# CONFIG_BFS_FS is not set
1075# CONFIG_EFS_FS is not set 1069# CONFIG_EFS_FS is not set
1076# CONFIG_JFFS2_FS is not set 1070# CONFIG_JFFS2_FS is not set
1071# CONFIG_LOGFS is not set
1077# CONFIG_CRAMFS is not set 1072# CONFIG_CRAMFS is not set
1078# CONFIG_SQUASHFS is not set 1073# CONFIG_SQUASHFS is not set
1079# CONFIG_VXFS_FS is not set 1074# CONFIG_VXFS_FS is not set
@@ -1096,6 +1091,7 @@ CONFIG_SUNRPC=y
1096# CONFIG_RPCSEC_GSS_KRB5 is not set 1091# CONFIG_RPCSEC_GSS_KRB5 is not set
1097# CONFIG_RPCSEC_GSS_SPKM3 is not set 1092# CONFIG_RPCSEC_GSS_SPKM3 is not set
1098# CONFIG_SMB_FS is not set 1093# CONFIG_SMB_FS is not set
1094# CONFIG_CEPH_FS is not set
1099# CONFIG_CIFS is not set 1095# CONFIG_CIFS is not set
1100# CONFIG_NCP_FS is not set 1096# CONFIG_NCP_FS is not set
1101# CONFIG_CODA_FS is not set 1097# CONFIG_CODA_FS is not set
@@ -1162,13 +1158,12 @@ CONFIG_FRAME_WARN=1024
1162CONFIG_DEBUG_FS=y 1158CONFIG_DEBUG_FS=y
1163# CONFIG_HEADERS_CHECK is not set 1159# CONFIG_HEADERS_CHECK is not set
1164# CONFIG_DEBUG_KERNEL is not set 1160# CONFIG_DEBUG_KERNEL is not set
1165CONFIG_STACKTRACE=y
1166CONFIG_DEBUG_BUGVERBOSE=y 1161CONFIG_DEBUG_BUGVERBOSE=y
1167# CONFIG_DEBUG_MEMORY_INIT is not set 1162# CONFIG_DEBUG_MEMORY_INIT is not set
1168# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1163# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1164# CONFIG_LKDTM is not set
1169# CONFIG_LATENCYTOP is not set 1165# CONFIG_LATENCYTOP is not set
1170# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1166# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1171CONFIG_NOP_TRACER=y
1172CONFIG_HAVE_FUNCTION_TRACER=y 1167CONFIG_HAVE_FUNCTION_TRACER=y
1173CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1168CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1174CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1169CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1176,10 +1171,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1176CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1171CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1177CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1172CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1178CONFIG_RING_BUFFER=y 1173CONFIG_RING_BUFFER=y
1179CONFIG_EVENT_TRACING=y
1180CONFIG_CONTEXT_SWITCH_TRACER=y
1181CONFIG_RING_BUFFER_ALLOW_SWAP=y 1174CONFIG_RING_BUFFER_ALLOW_SWAP=y
1182CONFIG_TRACING=y
1183CONFIG_TRACING_SUPPORT=y 1175CONFIG_TRACING_SUPPORT=y
1184# CONFIG_FTRACE is not set 1176# CONFIG_FTRACE is not set
1185# CONFIG_DYNAMIC_DEBUG is not set 1177# CONFIG_DYNAMIC_DEBUG is not set
@@ -1287,7 +1279,8 @@ CONFIG_CRYPTO=y
1287# 1279#
1288# CONFIG_CRYPTO_ANSI_CPRNG is not set 1280# CONFIG_CRYPTO_ANSI_CPRNG is not set
1289CONFIG_CRYPTO_HW=y 1281CONFIG_CRYPTO_HW=y
1290CONFIG_BINARY_PRINTF=y 1282# CONFIG_VIRTUALIZATION is not set
1283# CONFIG_BINARY_PRINTF is not set
1291 1284
1292# 1285#
1293# Library routines 1286# Library routines
diff --git a/arch/sh/configs/sh7770_generic_defconfig b/arch/sh/configs/sh7770_generic_defconfig
index 7b247053ece6..4327f898baa8 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 15:06:28 2010 4# Tue May 18 17:20:25 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION=""
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51CONFIG_SWAP=y 54CONFIG_SWAP=y
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53# CONFIG_BSD_PROCESS_ACCT is not set 56# CONFIG_BSD_PROCESS_ACCT is not set
@@ -64,11 +67,6 @@ CONFIG_RCU_FANOUT=32
64# CONFIG_TREE_RCU_TRACE is not set 67# CONFIG_TREE_RCU_TRACE is not set
65# CONFIG_IKCONFIG is not set 68# CONFIG_IKCONFIG is not set
66CONFIG_LOG_BUF_SHIFT=17 69CONFIG_LOG_BUF_SHIFT=17
67CONFIG_GROUP_SCHED=y
68CONFIG_FAIR_GROUP_SCHED=y
69CONFIG_RT_GROUP_SCHED=y
70CONFIG_USER_SCHED=y
71# CONFIG_CGROUP_SCHED is not set
72CONFIG_CGROUPS=y 70CONFIG_CGROUPS=y
73# CONFIG_CGROUP_DEBUG is not set 71# CONFIG_CGROUP_DEBUG is not set
74# CONFIG_CGROUP_NS is not set 72# CONFIG_CGROUP_NS is not set
@@ -77,6 +75,7 @@ CONFIG_CGROUPS=y
77# CONFIG_CPUSETS is not set 75# CONFIG_CPUSETS is not set
78# CONFIG_CGROUP_CPUACCT is not set 76# CONFIG_CGROUP_CPUACCT is not set
79# CONFIG_RESOURCE_COUNTERS is not set 77# CONFIG_RESOURCE_COUNTERS is not set
78# CONFIG_CGROUP_SCHED is not set
80# CONFIG_RELAY is not set 79# CONFIG_RELAY is not set
81# CONFIG_NAMESPACES is not set 80# CONFIG_NAMESPACES is not set
82# CONFIG_BLK_DEV_INITRD is not set 81# CONFIG_BLK_DEV_INITRD is not set
@@ -105,7 +104,6 @@ CONFIG_PERF_USE_VMALLOC=y
105# Kernel Performance Events And Counters 104# Kernel Performance Events And Counters
106# 105#
107CONFIG_PERF_EVENTS=y 106CONFIG_PERF_EVENTS=y
108CONFIG_EVENT_PROFILE=y
109# CONFIG_PERF_COUNTERS is not set 107# CONFIG_PERF_COUNTERS is not set
110CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
111# CONFIG_COMPAT_BRK is not set 109# CONFIG_COMPAT_BRK is not set
@@ -113,7 +111,6 @@ CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_SLUB=y 111CONFIG_SLUB=y
114# CONFIG_SLOB is not set 112# CONFIG_SLOB is not set
115CONFIG_PROFILING=y 113CONFIG_PROFILING=y
116CONFIG_TRACEPOINTS=y
117CONFIG_OPROFILE=y 114CONFIG_OPROFILE=y
118CONFIG_HAVE_OPROFILE=y 115CONFIG_HAVE_OPROFILE=y
119CONFIG_HAVE_IOREMAP_PROT=y 116CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,11 +120,11 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123CONFIG_HAVE_DMA_ATTRS=y 120CONFIG_HAVE_DMA_ATTRS=y
124CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
125CONFIG_HAVE_DMA_API_DEBUG=y 122CONFIG_HAVE_DMA_API_DEBUG=y
123CONFIG_HAVE_HW_BREAKPOINT=y
126 124
127# 125#
128# GCOV-based kernel profiling 126# GCOV-based kernel profiling
129# 127#
130# CONFIG_GCOV_KERNEL is not set
131# CONFIG_SLOW_WORK is not set 128# CONFIG_SLOW_WORK is not set
132CONFIG_HAVE_GENERIC_DMA_COHERENT=y 129CONFIG_HAVE_GENERIC_DMA_COHERENT=y
133CONFIG_RT_MUTEXES=y 130CONFIG_RT_MUTEXES=y
@@ -137,7 +134,6 @@ CONFIG_BLOCK=y
137CONFIG_LBDAF=y 134CONFIG_LBDAF=y
138# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
140# CONFIG_BLK_CGROUP is not set
141 137
142# 138#
143# IO Schedulers 139# IO Schedulers
@@ -232,7 +228,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
232CONFIG_MEMORY_START=0x08000000 228CONFIG_MEMORY_START=0x08000000
233CONFIG_MEMORY_SIZE=0x04000000 229CONFIG_MEMORY_SIZE=0x04000000
234CONFIG_29BIT=y 230CONFIG_29BIT=y
235# CONFIG_PMB_ENABLE is not set 231# CONFIG_PMB is not set
236CONFIG_VSYSCALL=y 232CONFIG_VSYSCALL=y
237CONFIG_ARCH_FLATMEM_ENABLE=y 233CONFIG_ARCH_FLATMEM_ENABLE=y
238CONFIG_ARCH_SPARSEMEM_ENABLE=y 234CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -242,6 +238,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
242CONFIG_ARCH_SELECT_MEMORY_MODEL=y 238CONFIG_ARCH_SELECT_MEMORY_MODEL=y
243CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 239CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 240CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
241CONFIG_UNCACHED_MAPPING=y
245CONFIG_PAGE_SIZE_4KB=y 242CONFIG_PAGE_SIZE_4KB=y
246# CONFIG_PAGE_SIZE_8KB is not set 243# CONFIG_PAGE_SIZE_8KB is not set
247# CONFIG_PAGE_SIZE_16KB is not set 244# CONFIG_PAGE_SIZE_16KB is not set
@@ -258,7 +255,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
258CONFIG_MIGRATION=y 255CONFIG_MIGRATION=y
259# CONFIG_PHYS_ADDR_T_64BIT is not set 256# CONFIG_PHYS_ADDR_T_64BIT is not set
260CONFIG_ZONE_DMA_FLAG=0 257CONFIG_ZONE_DMA_FLAG=0
261CONFIG_NR_QUICK=2 258CONFIG_NR_QUICK=1
262# CONFIG_KSM is not set 259# CONFIG_KSM is not set
263CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 260CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
264 261
@@ -347,7 +344,7 @@ CONFIG_PREEMPT_NONE=y
347# CONFIG_PREEMPT_VOLUNTARY is not set 344# CONFIG_PREEMPT_VOLUNTARY is not set
348# CONFIG_PREEMPT is not set 345# CONFIG_PREEMPT is not set
349CONFIG_GUSA=y 346CONFIG_GUSA=y
350# CONFIG_SPARSE_IRQ is not set 347# CONFIG_INTC_USERIMASK is not set
351 348
352# 349#
353# Boot options 350# Boot options
@@ -382,6 +379,7 @@ CONFIG_HIBERNATION_NVS=y
382CONFIG_HIBERNATION=y 379CONFIG_HIBERNATION=y
383CONFIG_PM_STD_PARTITION="" 380CONFIG_PM_STD_PARTITION=""
384# CONFIG_PM_RUNTIME is not set 381# CONFIG_PM_RUNTIME is not set
382CONFIG_PM_OPS=y
385CONFIG_CPU_IDLE=y 383CONFIG_CPU_IDLE=y
386CONFIG_CPU_IDLE_GOV_LADDER=y 384CONFIG_CPU_IDLE_GOV_LADDER=y
387CONFIG_CPU_IDLE_GOV_MENU=y 385CONFIG_CPU_IDLE_GOV_MENU=y
@@ -420,6 +418,7 @@ CONFIG_HAVE_IDE=y
420# 418#
421# SCSI device support 419# SCSI device support
422# 420#
421CONFIG_SCSI_MOD=y
423# CONFIG_RAID_ATTRS is not set 422# CONFIG_RAID_ATTRS is not set
424# CONFIG_SCSI is not set 423# CONFIG_SCSI is not set
425# CONFIG_SCSI_DMA is not set 424# CONFIG_SCSI_DMA is not set
@@ -459,6 +458,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6
459CONFIG_SERIAL_SH_SCI_CONSOLE=y 458CONFIG_SERIAL_SH_SCI_CONSOLE=y
460CONFIG_SERIAL_CORE=y 459CONFIG_SERIAL_CORE=y
461CONFIG_SERIAL_CORE_CONSOLE=y 460CONFIG_SERIAL_CORE_CONSOLE=y
461# CONFIG_SERIAL_TIMBERDALE is not set
462# CONFIG_UNIX98_PTYS is not set 462# CONFIG_UNIX98_PTYS is not set
463# CONFIG_LEGACY_PTYS is not set 463# CONFIG_LEGACY_PTYS is not set
464# CONFIG_IPMI_HANDLER is not set 464# CONFIG_IPMI_HANDLER is not set
@@ -483,6 +483,7 @@ CONFIG_I2C_HELPER_AUTO=y
483# CONFIG_I2C_OCORES is not set 483# CONFIG_I2C_OCORES is not set
484CONFIG_I2C_SH_MOBILE=y 484CONFIG_I2C_SH_MOBILE=y
485# CONFIG_I2C_SIMTEC is not set 485# CONFIG_I2C_SIMTEC is not set
486# CONFIG_I2C_XILINX is not set
486 487
487# 488#
488# External I2C/SMBus adapter drivers 489# External I2C/SMBus adapter drivers
@@ -494,15 +495,9 @@ CONFIG_I2C_SH_MOBILE=y
494# Other I2C/SMBus bus drivers 495# Other I2C/SMBus bus drivers
495# 496#
496# CONFIG_I2C_PCA_PLATFORM is not set 497# CONFIG_I2C_PCA_PLATFORM is not set
497
498#
499# Miscellaneous I2C Chip support
500#
501# CONFIG_SENSORS_TSL2550 is not set
502# CONFIG_I2C_DEBUG_CORE is not set 498# CONFIG_I2C_DEBUG_CORE is not set
503# CONFIG_I2C_DEBUG_ALGO is not set 499# CONFIG_I2C_DEBUG_ALGO is not set
504# CONFIG_I2C_DEBUG_BUS is not set 500# CONFIG_I2C_DEBUG_BUS is not set
505# CONFIG_I2C_DEBUG_CHIP is not set
506# CONFIG_SPI is not set 501# CONFIG_SPI is not set
507 502
508# 503#
@@ -525,6 +520,7 @@ CONFIG_SSB_POSSIBLE=y
525# Multifunction device drivers 520# Multifunction device drivers
526# 521#
527# CONFIG_MFD_CORE is not set 522# CONFIG_MFD_CORE is not set
523# CONFIG_MFD_88PM860X is not set
528# CONFIG_MFD_SM501 is not set 524# CONFIG_MFD_SM501 is not set
529# CONFIG_MFD_SH_MOBILE_SDHI is not set 525# CONFIG_MFD_SH_MOBILE_SDHI is not set
530# CONFIG_HTC_PASIC3 is not set 526# CONFIG_HTC_PASIC3 is not set
@@ -532,12 +528,13 @@ CONFIG_SSB_POSSIBLE=y
532# CONFIG_MFD_TMIO is not set 528# CONFIG_MFD_TMIO is not set
533# CONFIG_PMIC_DA903X is not set 529# CONFIG_PMIC_DA903X is not set
534# CONFIG_PMIC_ADP5520 is not set 530# CONFIG_PMIC_ADP5520 is not set
531# CONFIG_MFD_MAX8925 is not set
535# CONFIG_MFD_WM8400 is not set 532# CONFIG_MFD_WM8400 is not set
536# CONFIG_MFD_WM831X is not set 533# CONFIG_MFD_WM831X is not set
537# CONFIG_MFD_WM8350_I2C is not set 534# CONFIG_MFD_WM8350_I2C is not set
535# CONFIG_MFD_WM8994 is not set
538# CONFIG_MFD_PCF50633 is not set 536# CONFIG_MFD_PCF50633 is not set
539# CONFIG_AB3100_CORE is not set 537# CONFIG_AB3100_CORE is not set
540# CONFIG_MFD_88PM8607 is not set
541# CONFIG_REGULATOR is not set 538# CONFIG_REGULATOR is not set
542# CONFIG_MEDIA_SUPPORT is not set 539# CONFIG_MEDIA_SUPPORT is not set
543 540
@@ -621,8 +618,6 @@ CONFIG_RTC_DRV_SH=y
621CONFIG_UIO=y 618CONFIG_UIO=y
622# CONFIG_UIO_PDRV is not set 619# CONFIG_UIO_PDRV is not set
623CONFIG_UIO_PDRV_GENIRQ=y 620CONFIG_UIO_PDRV_GENIRQ=y
624# CONFIG_UIO_SMX is not set
625# CONFIG_UIO_SERCOS3 is not set
626 621
627# 622#
628# TI VLYNQ 623# TI VLYNQ
@@ -635,7 +630,6 @@ CONFIG_UIO_PDRV_GENIRQ=y
635# CONFIG_EXT2_FS is not set 630# CONFIG_EXT2_FS is not set
636# CONFIG_EXT3_FS is not set 631# CONFIG_EXT3_FS is not set
637# CONFIG_EXT4_FS is not set 632# CONFIG_EXT4_FS is not set
638CONFIG_EXT4_USE_FOR_EXT23=y
639# CONFIG_REISERFS_FS is not set 633# CONFIG_REISERFS_FS is not set
640# CONFIG_JFS_FS is not set 634# CONFIG_JFS_FS is not set
641# CONFIG_FS_POSIX_ACL is not set 635# CONFIG_FS_POSIX_ACL is not set
@@ -699,15 +693,12 @@ CONFIG_FRAME_WARN=1024
699# CONFIG_MAGIC_SYSRQ is not set 693# CONFIG_MAGIC_SYSRQ is not set
700# CONFIG_STRIP_ASM_SYMS is not set 694# CONFIG_STRIP_ASM_SYMS is not set
701# CONFIG_UNUSED_SYMBOLS is not set 695# CONFIG_UNUSED_SYMBOLS is not set
702CONFIG_DEBUG_FS=y
703# CONFIG_HEADERS_CHECK is not set 696# CONFIG_HEADERS_CHECK is not set
704# CONFIG_DEBUG_KERNEL is not set 697# CONFIG_DEBUG_KERNEL is not set
705CONFIG_STACKTRACE=y
706CONFIG_DEBUG_BUGVERBOSE=y 698CONFIG_DEBUG_BUGVERBOSE=y
707# CONFIG_DEBUG_MEMORY_INIT is not set 699# CONFIG_DEBUG_MEMORY_INIT is not set
708# CONFIG_RCU_CPU_STALL_DETECTOR is not set 700# CONFIG_RCU_CPU_STALL_DETECTOR is not set
709# CONFIG_LATENCYTOP is not set 701# CONFIG_LATENCYTOP is not set
710CONFIG_NOP_TRACER=y
711CONFIG_HAVE_FUNCTION_TRACER=y 702CONFIG_HAVE_FUNCTION_TRACER=y
712CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 703CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
713CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 704CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -715,13 +706,9 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
715CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 706CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
716CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 707CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
717CONFIG_RING_BUFFER=y 708CONFIG_RING_BUFFER=y
718CONFIG_EVENT_TRACING=y
719CONFIG_CONTEXT_SWITCH_TRACER=y
720CONFIG_RING_BUFFER_ALLOW_SWAP=y 709CONFIG_RING_BUFFER_ALLOW_SWAP=y
721CONFIG_TRACING=y
722CONFIG_TRACING_SUPPORT=y 710CONFIG_TRACING_SUPPORT=y
723# CONFIG_FTRACE is not set 711# CONFIG_FTRACE is not set
724# CONFIG_DYNAMIC_DEBUG is not set
725# CONFIG_DMA_API_DEBUG is not set 712# CONFIG_DMA_API_DEBUG is not set
726# CONFIG_SAMPLES is not set 713# CONFIG_SAMPLES is not set
727CONFIG_HAVE_ARCH_KGDB=y 714CONFIG_HAVE_ARCH_KGDB=y
@@ -739,7 +726,8 @@ CONFIG_HAVE_ARCH_KGDB=y
739CONFIG_DEFAULT_SECURITY_DAC=y 726CONFIG_DEFAULT_SECURITY_DAC=y
740CONFIG_DEFAULT_SECURITY="" 727CONFIG_DEFAULT_SECURITY=""
741# CONFIG_CRYPTO is not set 728# CONFIG_CRYPTO is not set
742CONFIG_BINARY_PRINTF=y 729# CONFIG_VIRTUALIZATION is not set
730# CONFIG_BINARY_PRINTF is not set
743 731
744# 732#
745# Library routines 733# Library routines
diff --git a/arch/sh/configs/sh7785lcr_32bit_defconfig b/arch/sh/configs/sh7785lcr_32bit_defconfig
index 8330813b0c1d..e9af616b2160 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 15:07:40 2010 4# Tue May 18 17:22:09 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
33CONFIG_ARCH_HAS_DEFAULT_IDLE=y 33CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -48,9 +49,11 @@ CONFIG_LOCALVERSION_AUTO=y
48CONFIG_HAVE_KERNEL_GZIP=y 49CONFIG_HAVE_KERNEL_GZIP=y
49CONFIG_HAVE_KERNEL_BZIP2=y 50CONFIG_HAVE_KERNEL_BZIP2=y
50CONFIG_HAVE_KERNEL_LZMA=y 51CONFIG_HAVE_KERNEL_LZMA=y
52CONFIG_HAVE_KERNEL_LZO=y
51CONFIG_KERNEL_GZIP=y 53CONFIG_KERNEL_GZIP=y
52# CONFIG_KERNEL_BZIP2 is not set 54# CONFIG_KERNEL_BZIP2 is not set
53# CONFIG_KERNEL_LZMA is not set 55# CONFIG_KERNEL_LZMA is not set
56# CONFIG_KERNEL_LZO is not set
54CONFIG_SWAP=y 57CONFIG_SWAP=y
55CONFIG_SYSVIPC=y 58CONFIG_SYSVIPC=y
56CONFIG_SYSVIPC_SYSCTL=y 59CONFIG_SYSVIPC_SYSCTL=y
@@ -74,11 +77,6 @@ CONFIG_RCU_FANOUT=32
74CONFIG_IKCONFIG=y 77CONFIG_IKCONFIG=y
75CONFIG_IKCONFIG_PROC=y 78CONFIG_IKCONFIG_PROC=y
76CONFIG_LOG_BUF_SHIFT=14 79CONFIG_LOG_BUF_SHIFT=14
77CONFIG_GROUP_SCHED=y
78CONFIG_FAIR_GROUP_SCHED=y
79# CONFIG_RT_GROUP_SCHED is not set
80CONFIG_USER_SCHED=y
81# CONFIG_CGROUP_SCHED is not set
82# CONFIG_CGROUPS is not set 80# CONFIG_CGROUPS is not set
83# CONFIG_SYSFS_DEPRECATED_V2 is not set 81# CONFIG_SYSFS_DEPRECATED_V2 is not set
84# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
@@ -112,7 +110,6 @@ CONFIG_PERF_USE_VMALLOC=y
112# Kernel Performance Events And Counters 110# Kernel Performance Events And Counters
113# 111#
114CONFIG_PERF_EVENTS=y 112CONFIG_PERF_EVENTS=y
115CONFIG_EVENT_PROFILE=y
116CONFIG_PERF_COUNTERS=y 113CONFIG_PERF_COUNTERS=y
117CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
118CONFIG_PCI_QUIRKS=y 115CONFIG_PCI_QUIRKS=y
@@ -126,13 +123,13 @@ CONFIG_OPROFILE=y
126CONFIG_HAVE_OPROFILE=y 123CONFIG_HAVE_OPROFILE=y
127CONFIG_KPROBES=y 124CONFIG_KPROBES=y
128CONFIG_KRETPROBES=y 125CONFIG_KRETPROBES=y
129CONFIG_HAVE_IOREMAP_PROT=y
130CONFIG_HAVE_KPROBES=y 126CONFIG_HAVE_KPROBES=y
131CONFIG_HAVE_KRETPROBES=y 127CONFIG_HAVE_KRETPROBES=y
132CONFIG_HAVE_ARCH_TRACEHOOK=y 128CONFIG_HAVE_ARCH_TRACEHOOK=y
133CONFIG_HAVE_DMA_ATTRS=y 129CONFIG_HAVE_DMA_ATTRS=y
134CONFIG_HAVE_CLK=y 130CONFIG_HAVE_CLK=y
135CONFIG_HAVE_DMA_API_DEBUG=y 131CONFIG_HAVE_DMA_API_DEBUG=y
132CONFIG_HAVE_HW_BREAKPOINT=y
136 133
137# 134#
138# GCOV-based kernel profiling 135# GCOV-based kernel profiling
@@ -246,12 +243,9 @@ CONFIG_PAGE_OFFSET=0x80000000
246CONFIG_FORCE_MAX_ZONEORDER=11 243CONFIG_FORCE_MAX_ZONEORDER=11
247CONFIG_MEMORY_START=0x40000000 244CONFIG_MEMORY_START=0x40000000
248CONFIG_MEMORY_SIZE=0x20000000 245CONFIG_MEMORY_SIZE=0x20000000
249# CONFIG_29BIT is not set 246CONFIG_29BIT=y
250CONFIG_32BIT=y
251CONFIG_PMB_ENABLE=y
252# CONFIG_PMB is not set 247# CONFIG_PMB is not set
253CONFIG_PMB_FIXED=y 248CONFIG_X2TLB=y
254# CONFIG_X2TLB is not set
255CONFIG_VSYSCALL=y 249CONFIG_VSYSCALL=y
256# CONFIG_NUMA is not set 250# CONFIG_NUMA is not set
257CONFIG_ARCH_FLATMEM_ENABLE=y 251CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -262,6 +256,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
262CONFIG_ARCH_SELECT_MEMORY_MODEL=y 256CONFIG_ARCH_SELECT_MEMORY_MODEL=y
263CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 257CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
264CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 258CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
259CONFIG_IOREMAP_FIXED=y
260CONFIG_UNCACHED_MAPPING=y
265CONFIG_PAGE_SIZE_4KB=y 261CONFIG_PAGE_SIZE_4KB=y
266# CONFIG_PAGE_SIZE_8KB is not set 262# CONFIG_PAGE_SIZE_8KB is not set
267# CONFIG_PAGE_SIZE_16KB is not set 263# CONFIG_PAGE_SIZE_16KB is not set
@@ -284,7 +280,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
284CONFIG_MIGRATION=y 280CONFIG_MIGRATION=y
285# CONFIG_PHYS_ADDR_T_64BIT is not set 281# CONFIG_PHYS_ADDR_T_64BIT is not set
286CONFIG_ZONE_DMA_FLAG=0 282CONFIG_ZONE_DMA_FLAG=0
287CONFIG_NR_QUICK=2 283CONFIG_NR_QUICK=1
288# CONFIG_KSM is not set 284# CONFIG_KSM is not set
289CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 285CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
290 286
@@ -302,6 +298,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
302# CONFIG_CPU_BIG_ENDIAN is not set 298# CONFIG_CPU_BIG_ENDIAN is not set
303CONFIG_SH_FPU=y 299CONFIG_SH_FPU=y
304CONFIG_SH_STORE_QUEUES=y 300CONFIG_SH_STORE_QUEUES=y
301# CONFIG_SPECULATIVE_EXECUTION is not set
305CONFIG_CPU_HAS_INTEVT=y 302CONFIG_CPU_HAS_INTEVT=y
306CONFIG_CPU_HAS_SR_RB=y 303CONFIG_CPU_HAS_SR_RB=y
307CONFIG_CPU_HAS_FPU=y 304CONFIG_CPU_HAS_FPU=y
@@ -311,7 +308,7 @@ CONFIG_CPU_HAS_FPU=y
311# 308#
312# CONFIG_SH_HIGHLANDER is not set 309# CONFIG_SH_HIGHLANDER is not set
313CONFIG_SH_SH7785LCR=y 310CONFIG_SH_SH7785LCR=y
314# CONFIG_SH_SH7785LCR_PT is not set 311CONFIG_SH_SH7785LCR_29BIT_PHYSMAPS=y
315 312
316# 313#
317# Timer and clock configuration 314# Timer and clock configuration
@@ -374,7 +371,7 @@ CONFIG_SECCOMP=y
374# CONFIG_PREEMPT_VOLUNTARY is not set 371# CONFIG_PREEMPT_VOLUNTARY is not set
375CONFIG_PREEMPT=y 372CONFIG_PREEMPT=y
376CONFIG_GUSA=y 373CONFIG_GUSA=y
377CONFIG_SPARSE_IRQ=y 374# CONFIG_INTC_USERIMASK is not set
378 375
379# 376#
380# Boot options 377# Boot options
@@ -389,9 +386,9 @@ CONFIG_ENTRY_OFFSET=0x00001000
389# Bus options 386# Bus options
390# 387#
391CONFIG_PCI=y 388CONFIG_PCI=y
389CONFIG_PCI_DOMAINS=y
392# CONFIG_PCIEPORTBUS is not set 390# CONFIG_PCIEPORTBUS is not set
393# CONFIG_ARCH_SUPPORTS_MSI is not set 391# CONFIG_ARCH_SUPPORTS_MSI is not set
394# CONFIG_PCI_LEGACY is not set
395# CONFIG_PCI_STUB is not set 392# CONFIG_PCI_STUB is not set
396# CONFIG_PCI_IOV is not set 393# CONFIG_PCI_IOV is not set
397# CONFIG_PCCARD is not set 394# CONFIG_PCCARD is not set
@@ -421,7 +418,6 @@ CONFIG_NET=y
421# Networking options 418# Networking options
422# 419#
423CONFIG_PACKET=y 420CONFIG_PACKET=y
424# CONFIG_PACKET_MMAP is not set
425CONFIG_UNIX=y 421CONFIG_UNIX=y
426CONFIG_XFRM=y 422CONFIG_XFRM=y
427# CONFIG_XFRM_USER is not set 423# CONFIG_XFRM_USER is not set
@@ -633,6 +629,7 @@ CONFIG_HAVE_IDE=y
633# 629#
634# SCSI device support 630# SCSI device support
635# 631#
632CONFIG_SCSI_MOD=y
636# CONFIG_RAID_ATTRS is not set 633# CONFIG_RAID_ATTRS is not set
637CONFIG_SCSI=y 634CONFIG_SCSI=y
638CONFIG_SCSI_DMA=y 635CONFIG_SCSI_DMA=y
@@ -706,6 +703,7 @@ CONFIG_SATA_SIL=y
706# CONFIG_PATA_IT821X is not set 703# CONFIG_PATA_IT821X is not set
707# CONFIG_PATA_IT8213 is not set 704# CONFIG_PATA_IT8213 is not set
708# CONFIG_PATA_JMICRON is not set 705# CONFIG_PATA_JMICRON is not set
706# CONFIG_PATA_LEGACY is not set
709# CONFIG_PATA_TRIFLEX is not set 707# CONFIG_PATA_TRIFLEX is not set
710# CONFIG_PATA_MARVELL is not set 708# CONFIG_PATA_MARVELL is not set
711# CONFIG_PATA_MPIIX is not set 709# CONFIG_PATA_MPIIX is not set
@@ -742,7 +740,7 @@ CONFIG_SATA_SIL=y
742# 740#
743 741
744# 742#
745# See the help texts for more information. 743# The newer stack is recommended.
746# 744#
747# CONFIG_FIREWIRE is not set 745# CONFIG_FIREWIRE is not set
748# CONFIG_IEEE1394 is not set 746# CONFIG_IEEE1394 is not set
@@ -797,6 +795,7 @@ CONFIG_R8169=y
797# CONFIG_USB_PEGASUS is not set 795# CONFIG_USB_PEGASUS is not set
798# CONFIG_USB_RTL8150 is not set 796# CONFIG_USB_RTL8150 is not set
799# CONFIG_USB_USBNET is not set 797# CONFIG_USB_USBNET is not set
798# CONFIG_USB_IPHETH is not set
800# CONFIG_WAN is not set 799# CONFIG_WAN is not set
801# CONFIG_FDDI is not set 800# CONFIG_FDDI is not set
802# CONFIG_HIPPI is not set 801# CONFIG_HIPPI is not set
@@ -901,6 +900,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
901CONFIG_SERIAL_CORE=y 900CONFIG_SERIAL_CORE=y
902CONFIG_SERIAL_CORE_CONSOLE=y 901CONFIG_SERIAL_CORE_CONSOLE=y
903# CONFIG_SERIAL_JSM is not set 902# CONFIG_SERIAL_JSM is not set
903# CONFIG_SERIAL_TIMBERDALE is not set
904CONFIG_UNIX98_PTYS=y 904CONFIG_UNIX98_PTYS=y
905CONFIG_DEVPTS_MULTIPLE_INSTANCES=y 905CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
906# CONFIG_LEGACY_PTYS is not set 906# CONFIG_LEGACY_PTYS is not set
@@ -947,6 +947,7 @@ CONFIG_I2C_ALGOPCA=y
947# CONFIG_I2C_OCORES is not set 947# CONFIG_I2C_OCORES is not set
948# CONFIG_I2C_SH_MOBILE is not set 948# CONFIG_I2C_SH_MOBILE is not set
949# CONFIG_I2C_SIMTEC is not set 949# CONFIG_I2C_SIMTEC is not set
950# CONFIG_I2C_XILINX is not set
950 951
951# 952#
952# External I2C/SMBus adapter drivers 953# External I2C/SMBus adapter drivers
@@ -960,15 +961,9 @@ CONFIG_I2C_ALGOPCA=y
960# 961#
961CONFIG_I2C_PCA_PLATFORM=y 962CONFIG_I2C_PCA_PLATFORM=y
962# CONFIG_I2C_STUB is not set 963# CONFIG_I2C_STUB is not set
963
964#
965# Miscellaneous I2C Chip support
966#
967# CONFIG_SENSORS_TSL2550 is not set
968# CONFIG_I2C_DEBUG_CORE is not set 964# CONFIG_I2C_DEBUG_CORE is not set
969# CONFIG_I2C_DEBUG_ALGO is not set 965# CONFIG_I2C_DEBUG_ALGO is not set
970# CONFIG_I2C_DEBUG_BUS is not set 966# CONFIG_I2C_DEBUG_BUS is not set
971# CONFIG_I2C_DEBUG_CHIP is not set
972# CONFIG_SPI is not set 967# CONFIG_SPI is not set
973 968
974# 969#
@@ -1011,6 +1006,7 @@ CONFIG_SSB_POSSIBLE=y
1011# Multifunction device drivers 1006# Multifunction device drivers
1012# 1007#
1013# CONFIG_MFD_CORE is not set 1008# CONFIG_MFD_CORE is not set
1009# CONFIG_MFD_88PM860X is not set
1014CONFIG_MFD_SM501=y 1010CONFIG_MFD_SM501=y
1015# CONFIG_MFD_SH_MOBILE_SDHI is not set 1011# CONFIG_MFD_SH_MOBILE_SDHI is not set
1016# CONFIG_HTC_PASIC3 is not set 1012# CONFIG_HTC_PASIC3 is not set
@@ -1018,12 +1014,14 @@ CONFIG_MFD_SM501=y
1018# CONFIG_MFD_TMIO is not set 1014# CONFIG_MFD_TMIO is not set
1019# CONFIG_PMIC_DA903X is not set 1015# CONFIG_PMIC_DA903X is not set
1020# CONFIG_PMIC_ADP5520 is not set 1016# CONFIG_PMIC_ADP5520 is not set
1017# CONFIG_MFD_MAX8925 is not set
1021# CONFIG_MFD_WM8400 is not set 1018# CONFIG_MFD_WM8400 is not set
1022# CONFIG_MFD_WM831X is not set 1019# CONFIG_MFD_WM831X is not set
1023# CONFIG_MFD_WM8350_I2C is not set 1020# CONFIG_MFD_WM8350_I2C is not set
1021# CONFIG_MFD_WM8994 is not set
1024# CONFIG_MFD_PCF50633 is not set 1022# CONFIG_MFD_PCF50633 is not set
1025# CONFIG_AB3100_CORE is not set 1023# CONFIG_AB3100_CORE is not set
1026# CONFIG_MFD_88PM8607 is not set 1024# CONFIG_LPC_SCH is not set
1027# CONFIG_REGULATOR is not set 1025# CONFIG_REGULATOR is not set
1028# CONFIG_MEDIA_SUPPORT is not set 1026# CONFIG_MEDIA_SUPPORT is not set
1029 1027
@@ -1209,6 +1207,7 @@ CONFIG_SND_CMIPCI=y
1209# CONFIG_SND_SUPERH is not set 1207# CONFIG_SND_SUPERH is not set
1210CONFIG_SND_USB=y 1208CONFIG_SND_USB=y
1211# CONFIG_SND_USB_AUDIO is not set 1209# CONFIG_SND_USB_AUDIO is not set
1210# CONFIG_SND_USB_UA101 is not set
1212# CONFIG_SND_USB_CAIAQ is not set 1211# CONFIG_SND_USB_CAIAQ is not set
1213# CONFIG_SND_SOC is not set 1212# CONFIG_SND_SOC is not set
1214# CONFIG_SOUND_PRIME is not set 1213# CONFIG_SOUND_PRIME is not set
@@ -1226,6 +1225,7 @@ CONFIG_USB_HID=y
1226# 1225#
1227# Special HID drivers 1226# Special HID drivers
1228# 1227#
1228# CONFIG_HID_3M_PCT is not set
1229CONFIG_HID_A4TECH=m 1229CONFIG_HID_A4TECH=m
1230CONFIG_HID_APPLE=m 1230CONFIG_HID_APPLE=m
1231CONFIG_HID_BELKIN=m 1231CONFIG_HID_BELKIN=m
@@ -1242,14 +1242,19 @@ CONFIG_HID_KENSINGTON=m
1242CONFIG_HID_LOGITECH=m 1242CONFIG_HID_LOGITECH=m
1243# CONFIG_LOGITECH_FF is not set 1243# CONFIG_LOGITECH_FF is not set
1244# CONFIG_LOGIRUMBLEPAD2_FF is not set 1244# CONFIG_LOGIRUMBLEPAD2_FF is not set
1245# CONFIG_LOGIG940_FF is not set
1245CONFIG_HID_MICROSOFT=m 1246CONFIG_HID_MICROSOFT=m
1247# CONFIG_HID_MOSART is not set
1246CONFIG_HID_MONTEREY=m 1248CONFIG_HID_MONTEREY=m
1247CONFIG_HID_NTRIG=m 1249CONFIG_HID_NTRIG=m
1250# CONFIG_HID_ORTEK is not set
1248CONFIG_HID_PANTHERLORD=m 1251CONFIG_HID_PANTHERLORD=m
1249# CONFIG_PANTHERLORD_FF is not set 1252# CONFIG_PANTHERLORD_FF is not set
1250CONFIG_HID_PETALYNX=m 1253CONFIG_HID_PETALYNX=m
1254# CONFIG_HID_QUANTA is not set
1251CONFIG_HID_SAMSUNG=m 1255CONFIG_HID_SAMSUNG=m
1252CONFIG_HID_SONY=m 1256CONFIG_HID_SONY=m
1257# CONFIG_HID_STANTUM is not set
1253CONFIG_HID_SUNPLUS=m 1258CONFIG_HID_SUNPLUS=m
1254CONFIG_HID_GREENASIA=m 1259CONFIG_HID_GREENASIA=m
1255# CONFIG_GREENASIA_FF is not set 1260# CONFIG_GREENASIA_FF is not set
@@ -1273,7 +1278,6 @@ CONFIG_USB=y
1273# CONFIG_USB_DEVICEFS is not set 1278# CONFIG_USB_DEVICEFS is not set
1274CONFIG_USB_DEVICE_CLASS=y 1279CONFIG_USB_DEVICE_CLASS=y
1275# CONFIG_USB_DYNAMIC_MINORS is not set 1280# CONFIG_USB_DYNAMIC_MINORS is not set
1276# CONFIG_USB_SUSPEND is not set
1277# CONFIG_USB_OTG is not set 1281# CONFIG_USB_OTG is not set
1278# CONFIG_USB_OTG_WHITELIST is not set 1282# CONFIG_USB_OTG_WHITELIST is not set
1279# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1283# CONFIG_USB_OTG_BLACKLIST_HUB is not set
@@ -1351,7 +1355,6 @@ CONFIG_USB_STORAGE=y
1351# CONFIG_USB_RIO500 is not set 1355# CONFIG_USB_RIO500 is not set
1352# CONFIG_USB_LEGOTOWER is not set 1356# CONFIG_USB_LEGOTOWER is not set
1353# CONFIG_USB_LCD is not set 1357# CONFIG_USB_LCD is not set
1354# CONFIG_USB_BERRY_CHARGE is not set
1355# CONFIG_USB_LED is not set 1358# CONFIG_USB_LED is not set
1356# CONFIG_USB_CYPRESS_CY7C63 is not set 1359# CONFIG_USB_CYPRESS_CY7C63 is not set
1357# CONFIG_USB_CYTHERM is not set 1360# CONFIG_USB_CYTHERM is not set
@@ -1364,7 +1367,6 @@ CONFIG_USB_STORAGE=y
1364# CONFIG_USB_IOWARRIOR is not set 1367# CONFIG_USB_IOWARRIOR is not set
1365# CONFIG_USB_TEST is not set 1368# CONFIG_USB_TEST is not set
1366# CONFIG_USB_ISIGHTFW is not set 1369# CONFIG_USB_ISIGHTFW is not set
1367# CONFIG_USB_VST is not set
1368# CONFIG_USB_GADGET is not set 1370# CONFIG_USB_GADGET is not set
1369 1371
1370# 1372#
@@ -1390,10 +1392,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
1390CONFIG_MMC_SDHCI=m 1392CONFIG_MMC_SDHCI=m
1391# CONFIG_MMC_SDHCI_PCI is not set 1393# CONFIG_MMC_SDHCI_PCI is not set
1392CONFIG_MMC_SDHCI_PLTFM=m 1394CONFIG_MMC_SDHCI_PLTFM=m
1393# CONFIG_MMC_AT91 is not set
1394# CONFIG_MMC_ATMELMCI is not set
1395# CONFIG_MMC_TIFM_SD is not set 1395# CONFIG_MMC_TIFM_SD is not set
1396# CONFIG_MMC_TMIO is not set
1397# CONFIG_MMC_CB710 is not set 1396# CONFIG_MMC_CB710 is not set
1398# CONFIG_MMC_VIA_SDMMC is not set 1397# CONFIG_MMC_VIA_SDMMC is not set
1399# CONFIG_MEMSTICK is not set 1398# CONFIG_MEMSTICK is not set
@@ -1460,6 +1459,7 @@ CONFIG_RTC_DRV_RS5C372=y
1460# CONFIG_RTC_DRV_SH is not set 1459# CONFIG_RTC_DRV_SH is not set
1461# CONFIG_RTC_DRV_GENERIC is not set 1460# CONFIG_RTC_DRV_GENERIC is not set
1462CONFIG_DMADEVICES=y 1461CONFIG_DMADEVICES=y
1462# CONFIG_DMADEVICES_DEBUG is not set
1463 1463
1464# 1464#
1465# DMA Devices 1465# DMA Devices
@@ -1469,10 +1469,10 @@ CONFIG_UIO=m
1469# CONFIG_UIO_CIF is not set 1469# CONFIG_UIO_CIF is not set
1470# CONFIG_UIO_PDRV is not set 1470# CONFIG_UIO_PDRV is not set
1471# CONFIG_UIO_PDRV_GENIRQ is not set 1471# CONFIG_UIO_PDRV_GENIRQ is not set
1472# CONFIG_UIO_SMX is not set
1473# CONFIG_UIO_AEC is not set 1472# CONFIG_UIO_AEC is not set
1474# CONFIG_UIO_SERCOS3 is not set 1473# CONFIG_UIO_SERCOS3 is not set
1475# CONFIG_UIO_PCI_GENERIC is not set 1474# CONFIG_UIO_PCI_GENERIC is not set
1475# CONFIG_UIO_NETX is not set
1476 1476
1477# 1477#
1478# TI VLYNQ 1478# TI VLYNQ
@@ -1556,6 +1556,7 @@ CONFIG_MISC_FILESYSTEMS=y
1556# CONFIG_BFS_FS is not set 1556# CONFIG_BFS_FS is not set
1557# CONFIG_EFS_FS is not set 1557# CONFIG_EFS_FS is not set
1558# CONFIG_JFFS2_FS is not set 1558# CONFIG_JFFS2_FS is not set
1559# CONFIG_LOGFS is not set
1559# CONFIG_CRAMFS is not set 1560# CONFIG_CRAMFS is not set
1560# CONFIG_SQUASHFS is not set 1561# CONFIG_SQUASHFS is not set
1561# CONFIG_VXFS_FS is not set 1562# CONFIG_VXFS_FS is not set
@@ -1586,6 +1587,7 @@ CONFIG_SUNRPC_GSS=y
1586CONFIG_RPCSEC_GSS_KRB5=y 1587CONFIG_RPCSEC_GSS_KRB5=y
1587# CONFIG_RPCSEC_GSS_SPKM3 is not set 1588# CONFIG_RPCSEC_GSS_SPKM3 is not set
1588# CONFIG_SMB_FS is not set 1589# CONFIG_SMB_FS is not set
1590# CONFIG_CEPH_FS is not set
1589# CONFIG_CIFS is not set 1591# CONFIG_CIFS is not set
1590# CONFIG_NCP_FS is not set 1592# CONFIG_NCP_FS is not set
1591# CONFIG_CODA_FS is not set 1593# CONFIG_CODA_FS is not set
@@ -1660,6 +1662,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
1660# CONFIG_DEBUG_MEMORY_INIT is not set 1662# CONFIG_DEBUG_MEMORY_INIT is not set
1661CONFIG_FRAME_POINTER=y 1663CONFIG_FRAME_POINTER=y
1662# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1664# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1665# CONFIG_LKDTM is not set
1663CONFIG_LATENCYTOP=y 1666CONFIG_LATENCYTOP=y
1664CONFIG_SYSCTL_SYSCALL_CHECK=y 1667CONFIG_SYSCTL_SYSCALL_CHECK=y
1665CONFIG_NOP_TRACER=y 1668CONFIG_NOP_TRACER=y
@@ -1690,6 +1693,7 @@ CONFIG_SCHED_TRACER=y
1690CONFIG_BRANCH_PROFILE_NONE=y 1693CONFIG_BRANCH_PROFILE_NONE=y
1691# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1694# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1692# CONFIG_PROFILE_ALL_BRANCHES is not set 1695# CONFIG_PROFILE_ALL_BRANCHES is not set
1696# CONFIG_KSYM_TRACER is not set
1693CONFIG_STACK_TRACER=y 1697CONFIG_STACK_TRACER=y
1694CONFIG_KMEMTRACE=y 1698CONFIG_KMEMTRACE=y
1695CONFIG_WORKQUEUE_TRACER=y 1699CONFIG_WORKQUEUE_TRACER=y
@@ -1815,6 +1819,7 @@ CONFIG_CRYPTO_DES=y
1815# 1819#
1816# CONFIG_CRYPTO_ANSI_CPRNG is not set 1820# CONFIG_CRYPTO_ANSI_CPRNG is not set
1817# CONFIG_CRYPTO_HW is not set 1821# CONFIG_CRYPTO_HW is not set
1822# CONFIG_VIRTUALIZATION is not set
1818CONFIG_BINARY_PRINTF=y 1823CONFIG_BINARY_PRINTF=y
1819 1824
1820# 1825#
diff --git a/arch/sh/configs/sh7785lcr_defconfig b/arch/sh/configs/sh7785lcr_defconfig
index f196e87c7665..30f38c2767bf 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 15:09:09 2010 4# Tue May 18 17:27:53 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
33CONFIG_ARCH_HAS_DEFAULT_IDLE=y 33CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -48,9 +49,11 @@ CONFIG_LOCALVERSION_AUTO=y
48CONFIG_HAVE_KERNEL_GZIP=y 49CONFIG_HAVE_KERNEL_GZIP=y
49CONFIG_HAVE_KERNEL_BZIP2=y 50CONFIG_HAVE_KERNEL_BZIP2=y
50CONFIG_HAVE_KERNEL_LZMA=y 51CONFIG_HAVE_KERNEL_LZMA=y
52CONFIG_HAVE_KERNEL_LZO=y
51CONFIG_KERNEL_GZIP=y 53CONFIG_KERNEL_GZIP=y
52# CONFIG_KERNEL_BZIP2 is not set 54# CONFIG_KERNEL_BZIP2 is not set
53# CONFIG_KERNEL_LZMA is not set 55# CONFIG_KERNEL_LZMA is not set
56# CONFIG_KERNEL_LZO is not set
54CONFIG_SWAP=y 57CONFIG_SWAP=y
55CONFIG_SYSVIPC=y 58CONFIG_SYSVIPC=y
56CONFIG_SYSVIPC_SYSCTL=y 59CONFIG_SYSVIPC_SYSCTL=y
@@ -73,11 +76,6 @@ CONFIG_RCU_FANOUT=32
73CONFIG_IKCONFIG=y 76CONFIG_IKCONFIG=y
74CONFIG_IKCONFIG_PROC=y 77CONFIG_IKCONFIG_PROC=y
75CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
76CONFIG_GROUP_SCHED=y
77CONFIG_FAIR_GROUP_SCHED=y
78# CONFIG_RT_GROUP_SCHED is not set
79CONFIG_USER_SCHED=y
80# CONFIG_CGROUP_SCHED is not set
81# CONFIG_CGROUPS is not set 79# CONFIG_CGROUPS is not set
82CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
83CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
@@ -124,13 +122,13 @@ CONFIG_PROFILING=y
124# CONFIG_OPROFILE is not set 122# CONFIG_OPROFILE is not set
125CONFIG_HAVE_OPROFILE=y 123CONFIG_HAVE_OPROFILE=y
126# CONFIG_KPROBES is not set 124# CONFIG_KPROBES is not set
127CONFIG_HAVE_IOREMAP_PROT=y
128CONFIG_HAVE_KPROBES=y 125CONFIG_HAVE_KPROBES=y
129CONFIG_HAVE_KRETPROBES=y 126CONFIG_HAVE_KRETPROBES=y
130CONFIG_HAVE_ARCH_TRACEHOOK=y 127CONFIG_HAVE_ARCH_TRACEHOOK=y
131CONFIG_HAVE_DMA_ATTRS=y 128CONFIG_HAVE_DMA_ATTRS=y
132CONFIG_HAVE_CLK=y 129CONFIG_HAVE_CLK=y
133CONFIG_HAVE_DMA_API_DEBUG=y 130CONFIG_HAVE_DMA_API_DEBUG=y
131CONFIG_HAVE_HW_BREAKPOINT=y
134 132
135# 133#
136# GCOV-based kernel profiling 134# GCOV-based kernel profiling
@@ -244,8 +242,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
244CONFIG_MEMORY_START=0x08000000 242CONFIG_MEMORY_START=0x08000000
245CONFIG_MEMORY_SIZE=0x08000000 243CONFIG_MEMORY_SIZE=0x08000000
246CONFIG_29BIT=y 244CONFIG_29BIT=y
247# CONFIG_PMB_ENABLE is not set 245# CONFIG_PMB is not set
248# CONFIG_X2TLB is not set 246CONFIG_X2TLB=y
249CONFIG_VSYSCALL=y 247CONFIG_VSYSCALL=y
250# CONFIG_NUMA is not set 248# CONFIG_NUMA is not set
251CONFIG_ARCH_FLATMEM_ENABLE=y 249CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -254,6 +252,8 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
254CONFIG_MAX_ACTIVE_REGIONS=1 252CONFIG_MAX_ACTIVE_REGIONS=1
255CONFIG_ARCH_POPULATES_NODE_MAP=y 253CONFIG_ARCH_POPULATES_NODE_MAP=y
256CONFIG_ARCH_SELECT_MEMORY_MODEL=y 254CONFIG_ARCH_SELECT_MEMORY_MODEL=y
255CONFIG_IOREMAP_FIXED=y
256CONFIG_UNCACHED_MAPPING=y
257CONFIG_PAGE_SIZE_4KB=y 257CONFIG_PAGE_SIZE_4KB=y
258# CONFIG_PAGE_SIZE_8KB is not set 258# CONFIG_PAGE_SIZE_8KB is not set
259# CONFIG_PAGE_SIZE_16KB is not set 259# CONFIG_PAGE_SIZE_16KB is not set
@@ -269,7 +269,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
269CONFIG_SPLIT_PTLOCK_CPUS=4 269CONFIG_SPLIT_PTLOCK_CPUS=4
270# CONFIG_PHYS_ADDR_T_64BIT is not set 270# CONFIG_PHYS_ADDR_T_64BIT is not set
271CONFIG_ZONE_DMA_FLAG=0 271CONFIG_ZONE_DMA_FLAG=0
272CONFIG_NR_QUICK=2 272CONFIG_NR_QUICK=1
273# CONFIG_KSM is not set 273# CONFIG_KSM is not set
274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
275 275
@@ -287,6 +287,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
287# CONFIG_CPU_BIG_ENDIAN is not set 287# CONFIG_CPU_BIG_ENDIAN is not set
288CONFIG_SH_FPU=y 288CONFIG_SH_FPU=y
289CONFIG_SH_STORE_QUEUES=y 289CONFIG_SH_STORE_QUEUES=y
290# CONFIG_SPECULATIVE_EXECUTION is not set
290CONFIG_CPU_HAS_INTEVT=y 291CONFIG_CPU_HAS_INTEVT=y
291CONFIG_CPU_HAS_SR_RB=y 292CONFIG_CPU_HAS_SR_RB=y
292CONFIG_CPU_HAS_FPU=y 293CONFIG_CPU_HAS_FPU=y
@@ -344,7 +345,7 @@ CONFIG_KEXEC=y
344# CONFIG_PREEMPT_VOLUNTARY is not set 345# CONFIG_PREEMPT_VOLUNTARY is not set
345CONFIG_PREEMPT=y 346CONFIG_PREEMPT=y
346CONFIG_GUSA=y 347CONFIG_GUSA=y
347# CONFIG_SPARSE_IRQ is not set 348# CONFIG_INTC_USERIMASK is not set
348 349
349# 350#
350# Boot options 351# Boot options
@@ -359,9 +360,9 @@ CONFIG_ENTRY_OFFSET=0x00001000
359# Bus options 360# Bus options
360# 361#
361CONFIG_PCI=y 362CONFIG_PCI=y
363CONFIG_PCI_DOMAINS=y
362# CONFIG_PCIEPORTBUS is not set 364# CONFIG_PCIEPORTBUS is not set
363# CONFIG_ARCH_SUPPORTS_MSI is not set 365# CONFIG_ARCH_SUPPORTS_MSI is not set
364CONFIG_PCI_LEGACY=y
365# CONFIG_PCI_DEBUG is not set 366# CONFIG_PCI_DEBUG is not set
366# CONFIG_PCI_STUB is not set 367# CONFIG_PCI_STUB is not set
367# CONFIG_PCI_IOV is not set 368# CONFIG_PCI_IOV is not set
@@ -387,7 +388,6 @@ CONFIG_NET=y
387# Networking options 388# Networking options
388# 389#
389CONFIG_PACKET=y 390CONFIG_PACKET=y
390# CONFIG_PACKET_MMAP is not set
391CONFIG_UNIX=y 391CONFIG_UNIX=y
392CONFIG_XFRM=y 392CONFIG_XFRM=y
393# CONFIG_XFRM_USER is not set 393# CONFIG_XFRM_USER is not set
@@ -598,6 +598,7 @@ CONFIG_HAVE_IDE=y
598# 598#
599# SCSI device support 599# SCSI device support
600# 600#
601CONFIG_SCSI_MOD=y
601# CONFIG_RAID_ATTRS is not set 602# CONFIG_RAID_ATTRS is not set
602CONFIG_SCSI=y 603CONFIG_SCSI=y
603CONFIG_SCSI_DMA=y 604CONFIG_SCSI_DMA=y
@@ -671,6 +672,7 @@ CONFIG_SATA_SIL=y
671# CONFIG_PATA_IT821X is not set 672# CONFIG_PATA_IT821X is not set
672# CONFIG_PATA_IT8213 is not set 673# CONFIG_PATA_IT8213 is not set
673# CONFIG_PATA_JMICRON is not set 674# CONFIG_PATA_JMICRON is not set
675# CONFIG_PATA_LEGACY is not set
674# CONFIG_PATA_TRIFLEX is not set 676# CONFIG_PATA_TRIFLEX is not set
675# CONFIG_PATA_MARVELL is not set 677# CONFIG_PATA_MARVELL is not set
676# CONFIG_PATA_MPIIX is not set 678# CONFIG_PATA_MPIIX is not set
@@ -707,7 +709,7 @@ CONFIG_SATA_SIL=y
707# 709#
708 710
709# 711#
710# See the help texts for more information. 712# The newer stack is recommended.
711# 713#
712# CONFIG_FIREWIRE is not set 714# CONFIG_FIREWIRE is not set
713# CONFIG_IEEE1394 is not set 715# CONFIG_IEEE1394 is not set
@@ -766,6 +768,7 @@ CONFIG_WLAN=y
766# CONFIG_USB_PEGASUS is not set 768# CONFIG_USB_PEGASUS is not set
767# CONFIG_USB_RTL8150 is not set 769# CONFIG_USB_RTL8150 is not set
768# CONFIG_USB_USBNET is not set 770# CONFIG_USB_USBNET is not set
771# CONFIG_USB_IPHETH is not set
769# CONFIG_WAN is not set 772# CONFIG_WAN is not set
770# CONFIG_FDDI is not set 773# CONFIG_FDDI is not set
771# CONFIG_HIPPI is not set 774# CONFIG_HIPPI is not set
@@ -851,6 +854,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
851CONFIG_SERIAL_CORE=y 854CONFIG_SERIAL_CORE=y
852CONFIG_SERIAL_CORE_CONSOLE=y 855CONFIG_SERIAL_CORE_CONSOLE=y
853# CONFIG_SERIAL_JSM is not set 856# CONFIG_SERIAL_JSM is not set
857# CONFIG_SERIAL_TIMBERDALE is not set
854CONFIG_UNIX98_PTYS=y 858CONFIG_UNIX98_PTYS=y
855# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 859# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
856CONFIG_LEGACY_PTYS=y 860CONFIG_LEGACY_PTYS=y
@@ -899,6 +903,7 @@ CONFIG_I2C_ALGOPCA=y
899# CONFIG_I2C_OCORES is not set 903# CONFIG_I2C_OCORES is not set
900# CONFIG_I2C_SH_MOBILE is not set 904# CONFIG_I2C_SH_MOBILE is not set
901# CONFIG_I2C_SIMTEC is not set 905# CONFIG_I2C_SIMTEC is not set
906# CONFIG_I2C_XILINX is not set
902 907
903# 908#
904# External I2C/SMBus adapter drivers 909# External I2C/SMBus adapter drivers
@@ -912,15 +917,9 @@ CONFIG_I2C_ALGOPCA=y
912# 917#
913CONFIG_I2C_PCA_PLATFORM=y 918CONFIG_I2C_PCA_PLATFORM=y
914# CONFIG_I2C_STUB is not set 919# CONFIG_I2C_STUB is not set
915
916#
917# Miscellaneous I2C Chip support
918#
919# CONFIG_SENSORS_TSL2550 is not set
920# CONFIG_I2C_DEBUG_CORE is not set 920# CONFIG_I2C_DEBUG_CORE is not set
921# CONFIG_I2C_DEBUG_ALGO is not set 921# CONFIG_I2C_DEBUG_ALGO is not set
922# CONFIG_I2C_DEBUG_BUS is not set 922# CONFIG_I2C_DEBUG_BUS is not set
923# CONFIG_I2C_DEBUG_CHIP is not set
924# CONFIG_SPI is not set 923# CONFIG_SPI is not set
925 924
926# 925#
@@ -943,6 +942,7 @@ CONFIG_SSB_POSSIBLE=y
943# Multifunction device drivers 942# Multifunction device drivers
944# 943#
945# CONFIG_MFD_CORE is not set 944# CONFIG_MFD_CORE is not set
945# CONFIG_MFD_88PM860X is not set
946CONFIG_MFD_SM501=y 946CONFIG_MFD_SM501=y
947# CONFIG_MFD_SH_MOBILE_SDHI is not set 947# CONFIG_MFD_SH_MOBILE_SDHI is not set
948# CONFIG_HTC_PASIC3 is not set 948# CONFIG_HTC_PASIC3 is not set
@@ -950,12 +950,14 @@ CONFIG_MFD_SM501=y
950# CONFIG_MFD_TMIO is not set 950# CONFIG_MFD_TMIO is not set
951# CONFIG_PMIC_DA903X is not set 951# CONFIG_PMIC_DA903X is not set
952# CONFIG_PMIC_ADP5520 is not set 952# CONFIG_PMIC_ADP5520 is not set
953# CONFIG_MFD_MAX8925 is not set
953# CONFIG_MFD_WM8400 is not set 954# CONFIG_MFD_WM8400 is not set
954# CONFIG_MFD_WM831X is not set 955# CONFIG_MFD_WM831X is not set
955# CONFIG_MFD_WM8350_I2C is not set 956# CONFIG_MFD_WM8350_I2C is not set
957# CONFIG_MFD_WM8994 is not set
956# CONFIG_MFD_PCF50633 is not set 958# CONFIG_MFD_PCF50633 is not set
957# CONFIG_AB3100_CORE is not set 959# CONFIG_AB3100_CORE is not set
958# CONFIG_MFD_88PM8607 is not set 960# CONFIG_LPC_SCH is not set
959# CONFIG_REGULATOR is not set 961# CONFIG_REGULATOR is not set
960# CONFIG_MEDIA_SUPPORT is not set 962# CONFIG_MEDIA_SUPPORT is not set
961 963
@@ -963,6 +965,7 @@ CONFIG_MFD_SM501=y
963# Graphics support 965# Graphics support
964# 966#
965CONFIG_VGA_ARB=y 967CONFIG_VGA_ARB=y
968CONFIG_VGA_ARB_MAX_GPUS=16
966# CONFIG_DRM is not set 969# CONFIG_DRM is not set
967# CONFIG_VGASTATE is not set 970# CONFIG_VGASTATE is not set
968# CONFIG_VIDEO_OUTPUT_CONTROL is not set 971# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1059,6 +1062,7 @@ CONFIG_USB_HID=y
1059# 1062#
1060# Special HID drivers 1063# Special HID drivers
1061# 1064#
1065# CONFIG_HID_3M_PCT is not set
1062CONFIG_HID_A4TECH=y 1066CONFIG_HID_A4TECH=y
1063CONFIG_HID_APPLE=y 1067CONFIG_HID_APPLE=y
1064CONFIG_HID_BELKIN=y 1068CONFIG_HID_BELKIN=y
@@ -1074,14 +1078,19 @@ CONFIG_HID_GYRATION=y
1074CONFIG_HID_LOGITECH=y 1078CONFIG_HID_LOGITECH=y
1075# CONFIG_LOGITECH_FF is not set 1079# CONFIG_LOGITECH_FF is not set
1076# CONFIG_LOGIRUMBLEPAD2_FF is not set 1080# CONFIG_LOGIRUMBLEPAD2_FF is not set
1081# CONFIG_LOGIG940_FF is not set
1077CONFIG_HID_MICROSOFT=y 1082CONFIG_HID_MICROSOFT=y
1083# CONFIG_HID_MOSART is not set
1078CONFIG_HID_MONTEREY=y 1084CONFIG_HID_MONTEREY=y
1079# CONFIG_HID_NTRIG is not set 1085# CONFIG_HID_NTRIG is not set
1086# CONFIG_HID_ORTEK is not set
1080CONFIG_HID_PANTHERLORD=y 1087CONFIG_HID_PANTHERLORD=y
1081# CONFIG_PANTHERLORD_FF is not set 1088# CONFIG_PANTHERLORD_FF is not set
1082CONFIG_HID_PETALYNX=y 1089CONFIG_HID_PETALYNX=y
1090# CONFIG_HID_QUANTA is not set
1083CONFIG_HID_SAMSUNG=y 1091CONFIG_HID_SAMSUNG=y
1084CONFIG_HID_SONY=y 1092CONFIG_HID_SONY=y
1093# CONFIG_HID_STANTUM is not set
1085CONFIG_HID_SUNPLUS=y 1094CONFIG_HID_SUNPLUS=y
1086# CONFIG_HID_GREENASIA is not set 1095# CONFIG_HID_GREENASIA is not set
1087# CONFIG_HID_SMARTJOYPLUS is not set 1096# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1182,7 +1191,6 @@ CONFIG_USB_STORAGE=y
1182# CONFIG_USB_RIO500 is not set 1191# CONFIG_USB_RIO500 is not set
1183# CONFIG_USB_LEGOTOWER is not set 1192# CONFIG_USB_LEGOTOWER is not set
1184# CONFIG_USB_LCD is not set 1193# CONFIG_USB_LCD is not set
1185# CONFIG_USB_BERRY_CHARGE is not set
1186# CONFIG_USB_LED is not set 1194# CONFIG_USB_LED is not set
1187# CONFIG_USB_CYPRESS_CY7C63 is not set 1195# CONFIG_USB_CYPRESS_CY7C63 is not set
1188# CONFIG_USB_CYTHERM is not set 1196# CONFIG_USB_CYTHERM is not set
@@ -1195,7 +1203,6 @@ CONFIG_USB_STORAGE=y
1195# CONFIG_USB_IOWARRIOR is not set 1203# CONFIG_USB_IOWARRIOR is not set
1196CONFIG_USB_TEST=m 1204CONFIG_USB_TEST=m
1197# CONFIG_USB_ISIGHTFW is not set 1205# CONFIG_USB_ISIGHTFW is not set
1198# CONFIG_USB_VST is not set
1199# CONFIG_USB_GADGET is not set 1206# CONFIG_USB_GADGET is not set
1200 1207
1201# 1208#
@@ -1353,6 +1360,7 @@ CONFIG_MISC_FILESYSTEMS=y
1353# CONFIG_BFS_FS is not set 1360# CONFIG_BFS_FS is not set
1354# CONFIG_EFS_FS is not set 1361# CONFIG_EFS_FS is not set
1355# CONFIG_JFFS2_FS is not set 1362# CONFIG_JFFS2_FS is not set
1363# CONFIG_LOGFS is not set
1356# CONFIG_CRAMFS is not set 1364# CONFIG_CRAMFS is not set
1357# CONFIG_SQUASHFS is not set 1365# CONFIG_SQUASHFS is not set
1358# CONFIG_VXFS_FS is not set 1366# CONFIG_VXFS_FS is not set
@@ -1383,6 +1391,7 @@ CONFIG_SUNRPC_GSS=y
1383CONFIG_RPCSEC_GSS_KRB5=y 1391CONFIG_RPCSEC_GSS_KRB5=y
1384# CONFIG_RPCSEC_GSS_SPKM3 is not set 1392# CONFIG_RPCSEC_GSS_SPKM3 is not set
1385# CONFIG_SMB_FS is not set 1393# CONFIG_SMB_FS is not set
1394# CONFIG_CEPH_FS is not set
1386# CONFIG_CIFS is not set 1395# CONFIG_CIFS is not set
1387# CONFIG_NCP_FS is not set 1396# CONFIG_NCP_FS is not set
1388# CONFIG_CODA_FS is not set 1397# CONFIG_CODA_FS is not set
@@ -1461,6 +1470,7 @@ CONFIG_SCHED_DEBUG=y
1461# CONFIG_TIMER_STATS is not set 1470# CONFIG_TIMER_STATS is not set
1462# CONFIG_DEBUG_OBJECTS is not set 1471# CONFIG_DEBUG_OBJECTS is not set
1463# CONFIG_DEBUG_SLAB is not set 1472# CONFIG_DEBUG_SLAB is not set
1473# CONFIG_DEBUG_KMEMLEAK is not set
1464CONFIG_DEBUG_PREEMPT=y 1474CONFIG_DEBUG_PREEMPT=y
1465# CONFIG_DEBUG_RT_MUTEXES is not set 1475# CONFIG_DEBUG_RT_MUTEXES is not set
1466# CONFIG_RT_MUTEX_TESTER is not set 1476# CONFIG_RT_MUTEX_TESTER is not set
@@ -1509,6 +1519,7 @@ CONFIG_FTRACE=y
1509CONFIG_BRANCH_PROFILE_NONE=y 1519CONFIG_BRANCH_PROFILE_NONE=y
1510# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1520# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1511# CONFIG_PROFILE_ALL_BRANCHES is not set 1521# CONFIG_PROFILE_ALL_BRANCHES is not set
1522# CONFIG_KSYM_TRACER is not set
1512# CONFIG_STACK_TRACER is not set 1523# CONFIG_STACK_TRACER is not set
1513# CONFIG_KMEMTRACE is not set 1524# CONFIG_KMEMTRACE is not set
1514# CONFIG_WORKQUEUE_TRACER is not set 1525# CONFIG_WORKQUEUE_TRACER is not set
@@ -1633,6 +1644,7 @@ CONFIG_CRYPTO_DES=y
1633# 1644#
1634# CONFIG_CRYPTO_ANSI_CPRNG is not set 1645# CONFIG_CRYPTO_ANSI_CPRNG is not set
1635# CONFIG_CRYPTO_HW is not set 1646# CONFIG_CRYPTO_HW is not set
1647# CONFIG_VIRTUALIZATION is not set
1636# CONFIG_BINARY_PRINTF is not set 1648# CONFIG_BINARY_PRINTF is not set
1637 1649
1638# 1650#
diff --git a/arch/sh/configs/shmin_defconfig b/arch/sh/configs/shmin_defconfig
index 45441c0ab30c..4ba2705c7a4a 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 15:10:09 2010 4# Tue May 18 17:32:23 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -12,8 +12,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
12CONFIG_GENERIC_HWEIGHT=y 12CONFIG_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
16CONFIG_IRQ_PER_CPU=y 15CONFIG_IRQ_PER_CPU=y
16CONFIG_SPARSE_IRQ=y
17# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
@@ -29,6 +29,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 29CONFIG_ARCH_HAS_DEFAULT_IDLE=y
30CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 30CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DMA_NONCOHERENT=y 31CONFIG_DMA_NONCOHERENT=y
32CONFIG_NEED_DMA_MAP_STATE=y
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y 34CONFIG_CONSTRUCTORS=y
34 35
@@ -43,9 +44,11 @@ CONFIG_LOCALVERSION_AUTO=y
43CONFIG_HAVE_KERNEL_GZIP=y 44CONFIG_HAVE_KERNEL_GZIP=y
44CONFIG_HAVE_KERNEL_BZIP2=y 45CONFIG_HAVE_KERNEL_BZIP2=y
45CONFIG_HAVE_KERNEL_LZMA=y 46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_HAVE_KERNEL_LZO=y
46CONFIG_KERNEL_GZIP=y 48CONFIG_KERNEL_GZIP=y
47# CONFIG_KERNEL_BZIP2 is not set 49# CONFIG_KERNEL_BZIP2 is not set
48# CONFIG_KERNEL_LZMA is not set 50# CONFIG_KERNEL_LZMA is not set
51# CONFIG_KERNEL_LZO is not set
49# CONFIG_SWAP is not set 52# CONFIG_SWAP is not set
50# CONFIG_SYSVIPC is not set 53# CONFIG_SYSVIPC is not set
51# CONFIG_POSIX_MQUEUE is not set 54# CONFIG_POSIX_MQUEUE is not set
@@ -65,7 +68,6 @@ CONFIG_RCU_FANOUT=32
65# CONFIG_TREE_RCU_TRACE is not set 68# CONFIG_TREE_RCU_TRACE is not set
66# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
67CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
68# CONFIG_GROUP_SCHED is not set
69# CONFIG_CGROUPS is not set 71# CONFIG_CGROUPS is not set
70# CONFIG_RELAY is not set 72# CONFIG_RELAY is not set
71# CONFIG_NAMESPACES is not set 73# CONFIG_NAMESPACES is not set
@@ -95,7 +97,7 @@ CONFIG_PERF_USE_VMALLOC=y
95# 97#
96# Kernel Performance Events And Counters 98# Kernel Performance Events And Counters
97# 99#
98# CONFIG_PERF_EVENTS is not set 100CONFIG_PERF_EVENTS=y
99# CONFIG_PERF_COUNTERS is not set 101# CONFIG_PERF_COUNTERS is not set
100CONFIG_VM_EVENT_COUNTERS=y 102CONFIG_VM_EVENT_COUNTERS=y
101CONFIG_COMPAT_BRK=y 103CONFIG_COMPAT_BRK=y
@@ -111,6 +113,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
111CONFIG_HAVE_DMA_ATTRS=y 113CONFIG_HAVE_DMA_ATTRS=y
112CONFIG_HAVE_CLK=y 114CONFIG_HAVE_CLK=y
113CONFIG_HAVE_DMA_API_DEBUG=y 115CONFIG_HAVE_DMA_API_DEBUG=y
116CONFIG_HAVE_HW_BREAKPOINT=y
114 117
115# 118#
116# GCOV-based kernel profiling 119# GCOV-based kernel profiling
@@ -222,6 +225,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
222CONFIG_MAX_ACTIVE_REGIONS=1 225CONFIG_MAX_ACTIVE_REGIONS=1
223CONFIG_ARCH_POPULATES_NODE_MAP=y 226CONFIG_ARCH_POPULATES_NODE_MAP=y
224CONFIG_ARCH_SELECT_MEMORY_MODEL=y 227CONFIG_ARCH_SELECT_MEMORY_MODEL=y
228CONFIG_UNCACHED_MAPPING=y
225CONFIG_PAGE_SIZE_4KB=y 229CONFIG_PAGE_SIZE_4KB=y
226# CONFIG_PAGE_SIZE_8KB is not set 230# CONFIG_PAGE_SIZE_8KB is not set
227# CONFIG_PAGE_SIZE_16KB is not set 231# CONFIG_PAGE_SIZE_16KB is not set
@@ -237,7 +241,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 241CONFIG_SPLIT_PTLOCK_CPUS=4
238# CONFIG_PHYS_ADDR_T_64BIT is not set 242# CONFIG_PHYS_ADDR_T_64BIT is not set
239CONFIG_ZONE_DMA_FLAG=0 243CONFIG_ZONE_DMA_FLAG=0
240CONFIG_NR_QUICK=2 244CONFIG_NR_QUICK=1
241# CONFIG_KSM is not set 245# CONFIG_KSM is not set
242CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 246CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
243 247
@@ -312,7 +316,6 @@ CONFIG_PREEMPT_NONE=y
312# CONFIG_PREEMPT is not set 316# CONFIG_PREEMPT is not set
313CONFIG_GUSA=y 317CONFIG_GUSA=y
314# CONFIG_GUSA_RB is not set 318# CONFIG_GUSA_RB is not set
315# CONFIG_SPARSE_IRQ is not set
316 319
317# 320#
318# Boot options 321# Boot options
@@ -544,6 +547,7 @@ CONFIG_HAVE_IDE=y
544# 547#
545# SCSI device support 548# SCSI device support
546# 549#
550CONFIG_SCSI_MOD=y
547# CONFIG_RAID_ATTRS is not set 551# CONFIG_RAID_ATTRS is not set
548# CONFIG_SCSI is not set 552# CONFIG_SCSI is not set
549# CONFIG_SCSI_DMA is not set 553# CONFIG_SCSI_DMA is not set
@@ -625,6 +629,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
625CONFIG_SERIAL_SH_SCI_CONSOLE=y 629CONFIG_SERIAL_SH_SCI_CONSOLE=y
626CONFIG_SERIAL_CORE=y 630CONFIG_SERIAL_CORE=y
627CONFIG_SERIAL_CORE_CONSOLE=y 631CONFIG_SERIAL_CORE_CONSOLE=y
632# CONFIG_SERIAL_TIMBERDALE is not set
628CONFIG_UNIX98_PTYS=y 633CONFIG_UNIX98_PTYS=y
629# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 634# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
630CONFIG_LEGACY_PTYS=y 635CONFIG_LEGACY_PTYS=y
@@ -719,7 +724,6 @@ CONFIG_RTC_LIB=y
719# CONFIG_EXT2_FS is not set 724# CONFIG_EXT2_FS is not set
720# CONFIG_EXT3_FS is not set 725# CONFIG_EXT3_FS is not set
721# CONFIG_EXT4_FS is not set 726# CONFIG_EXT4_FS is not set
722CONFIG_EXT4_USE_FOR_EXT23=y
723# CONFIG_REISERFS_FS is not set 727# CONFIG_REISERFS_FS is not set
724# CONFIG_JFS_FS is not set 728# CONFIG_JFS_FS is not set
725# CONFIG_FS_POSIX_ACL is not set 729# CONFIG_FS_POSIX_ACL is not set
@@ -773,6 +777,7 @@ CONFIG_MISC_FILESYSTEMS=y
773# CONFIG_BFS_FS is not set 777# CONFIG_BFS_FS is not set
774# CONFIG_EFS_FS is not set 778# CONFIG_EFS_FS is not set
775# CONFIG_JFFS2_FS is not set 779# CONFIG_JFFS2_FS is not set
780# CONFIG_LOGFS is not set
776CONFIG_CRAMFS=y 781CONFIG_CRAMFS=y
777# CONFIG_SQUASHFS is not set 782# CONFIG_SQUASHFS is not set
778# CONFIG_VXFS_FS is not set 783# CONFIG_VXFS_FS is not set
@@ -797,6 +802,7 @@ CONFIG_SUNRPC=y
797# CONFIG_RPCSEC_GSS_KRB5 is not set 802# CONFIG_RPCSEC_GSS_KRB5 is not set
798# CONFIG_RPCSEC_GSS_SPKM3 is not set 803# CONFIG_RPCSEC_GSS_SPKM3 is not set
799# CONFIG_SMB_FS is not set 804# CONFIG_SMB_FS is not set
805# CONFIG_CEPH_FS is not set
800# CONFIG_CIFS is not set 806# CONFIG_CIFS is not set
801# CONFIG_NCP_FS is not set 807# CONFIG_NCP_FS is not set
802# CONFIG_CODA_FS is not set 808# CONFIG_CODA_FS is not set
@@ -936,6 +942,7 @@ CONFIG_CRYPTO=y
936# 942#
937# CONFIG_CRYPTO_ANSI_CPRNG is not set 943# CONFIG_CRYPTO_ANSI_CPRNG is not set
938CONFIG_CRYPTO_HW=y 944CONFIG_CRYPTO_HW=y
945# CONFIG_VIRTUALIZATION is not set
939# CONFIG_BINARY_PRINTF is not set 946# CONFIG_BINARY_PRINTF is not set
940 947
941# 948#
diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig
index ecf50cda4cbc..42f6bd34440d 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 15:10:45 2010 4# Tue May 18 18:08:45 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,6 +28,7 @@ CONFIG_SYS_SUPPORTS_NUMA=y
28CONFIG_SYS_SUPPORTS_TMU=y 28CONFIG_SYS_SUPPORTS_TMU=y
29CONFIG_STACKTRACE_SUPPORT=y 29CONFIG_STACKTRACE_SUPPORT=y
30CONFIG_LOCKDEP_SUPPORT=y 30CONFIG_LOCKDEP_SUPPORT=y
31CONFIG_HAVE_LATENCYTOP_SUPPORT=y
31# CONFIG_ARCH_HAS_ILOG2_U32 is not set 32# CONFIG_ARCH_HAS_ILOG2_U32 is not set
32# CONFIG_ARCH_HAS_ILOG2_U64 is not set 33# CONFIG_ARCH_HAS_ILOG2_U64 is not set
33CONFIG_ARCH_NO_VIRT_TO_BUS=y 34CONFIG_ARCH_NO_VIRT_TO_BUS=y
@@ -35,6 +36,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
35CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 36CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
36CONFIG_DMA_COHERENT=y 37CONFIG_DMA_COHERENT=y
37# CONFIG_DMA_NONCOHERENT is not set 38# CONFIG_DMA_NONCOHERENT is not set
39# CONFIG_NEED_DMA_MAP_STATE is not set
38CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 40CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
39CONFIG_CONSTRUCTORS=y 41CONFIG_CONSTRUCTORS=y
40 42
@@ -49,9 +51,11 @@ CONFIG_LOCALVERSION_AUTO=y
49CONFIG_HAVE_KERNEL_GZIP=y 51CONFIG_HAVE_KERNEL_GZIP=y
50CONFIG_HAVE_KERNEL_BZIP2=y 52CONFIG_HAVE_KERNEL_BZIP2=y
51CONFIG_HAVE_KERNEL_LZMA=y 53CONFIG_HAVE_KERNEL_LZMA=y
54CONFIG_HAVE_KERNEL_LZO=y
52CONFIG_KERNEL_GZIP=y 55CONFIG_KERNEL_GZIP=y
53# CONFIG_KERNEL_BZIP2 is not set 56# CONFIG_KERNEL_BZIP2 is not set
54# CONFIG_KERNEL_LZMA is not set 57# CONFIG_KERNEL_LZMA is not set
58# CONFIG_KERNEL_LZO is not set
55CONFIG_SWAP=y 59CONFIG_SWAP=y
56CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
57CONFIG_SYSVIPC_SYSCTL=y 61CONFIG_SYSVIPC_SYSCTL=y
@@ -73,15 +77,11 @@ CONFIG_TREE_RCU=y
73CONFIG_RCU_TRACE=y 77CONFIG_RCU_TRACE=y
74CONFIG_RCU_FANOUT=32 78CONFIG_RCU_FANOUT=32
75# CONFIG_RCU_FANOUT_EXACT is not set 79# CONFIG_RCU_FANOUT_EXACT is not set
80# CONFIG_RCU_FAST_NO_HZ is not set
76CONFIG_TREE_RCU_TRACE=y 81CONFIG_TREE_RCU_TRACE=y
77CONFIG_IKCONFIG=y 82CONFIG_IKCONFIG=y
78CONFIG_IKCONFIG_PROC=y 83CONFIG_IKCONFIG_PROC=y
79CONFIG_LOG_BUF_SHIFT=14 84CONFIG_LOG_BUF_SHIFT=14
80CONFIG_GROUP_SCHED=y
81CONFIG_FAIR_GROUP_SCHED=y
82CONFIG_RT_GROUP_SCHED=y
83CONFIG_USER_SCHED=y
84# CONFIG_CGROUP_SCHED is not set
85CONFIG_CGROUPS=y 85CONFIG_CGROUPS=y
86# CONFIG_CGROUP_DEBUG is not set 86# CONFIG_CGROUP_DEBUG is not set
87CONFIG_CGROUP_NS=y 87CONFIG_CGROUP_NS=y
@@ -92,6 +92,7 @@ CONFIG_CGROUP_CPUACCT=y
92CONFIG_RESOURCE_COUNTERS=y 92CONFIG_RESOURCE_COUNTERS=y
93CONFIG_CGROUP_MEM_RES_CTLR=y 93CONFIG_CGROUP_MEM_RES_CTLR=y
94# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set 94# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
95# CONFIG_CGROUP_SCHED is not set
95CONFIG_MM_OWNER=y 96CONFIG_MM_OWNER=y
96CONFIG_SYSFS_DEPRECATED=y 97CONFIG_SYSFS_DEPRECATED=y
97CONFIG_SYSFS_DEPRECATED_V2=y 98CONFIG_SYSFS_DEPRECATED_V2=y
@@ -131,7 +132,6 @@ CONFIG_PERF_USE_VMALLOC=y
131# Kernel Performance Events And Counters 132# Kernel Performance Events And Counters
132# 133#
133CONFIG_PERF_EVENTS=y 134CONFIG_PERF_EVENTS=y
134CONFIG_EVENT_PROFILE=y
135# CONFIG_PERF_COUNTERS is not set 135# CONFIG_PERF_COUNTERS is not set
136# CONFIG_DEBUG_PERF_USE_VMALLOC is not set 136# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
137CONFIG_VM_EVENT_COUNTERS=y 137CONFIG_VM_EVENT_COUNTERS=y
@@ -140,12 +140,10 @@ CONFIG_COMPAT_BRK=y
140# CONFIG_SLUB is not set 140# CONFIG_SLUB is not set
141CONFIG_SLOB=y 141CONFIG_SLOB=y
142CONFIG_PROFILING=y 142CONFIG_PROFILING=y
143CONFIG_TRACEPOINTS=y
144CONFIG_OPROFILE=y 143CONFIG_OPROFILE=y
145CONFIG_HAVE_OPROFILE=y 144CONFIG_HAVE_OPROFILE=y
146CONFIG_KPROBES=y 145CONFIG_KPROBES=y
147CONFIG_KRETPROBES=y 146CONFIG_KRETPROBES=y
148CONFIG_HAVE_IOREMAP_PROT=y
149CONFIG_HAVE_KPROBES=y 147CONFIG_HAVE_KPROBES=y
150CONFIG_HAVE_KRETPROBES=y 148CONFIG_HAVE_KRETPROBES=y
151CONFIG_HAVE_ARCH_TRACEHOOK=y 149CONFIG_HAVE_ARCH_TRACEHOOK=y
@@ -153,6 +151,7 @@ CONFIG_HAVE_DMA_ATTRS=y
153CONFIG_USE_GENERIC_SMP_HELPERS=y 151CONFIG_USE_GENERIC_SMP_HELPERS=y
154CONFIG_HAVE_CLK=y 152CONFIG_HAVE_CLK=y
155CONFIG_HAVE_DMA_API_DEBUG=y 153CONFIG_HAVE_DMA_API_DEBUG=y
154CONFIG_HAVE_HW_BREAKPOINT=y
156 155
157# 156#
158# GCOV-based kernel profiling 157# GCOV-based kernel profiling
@@ -173,7 +172,6 @@ CONFIG_BLOCK=y
173CONFIG_LBDAF=y 172CONFIG_LBDAF=y
174# CONFIG_BLK_DEV_BSG is not set 173# CONFIG_BLK_DEV_BSG is not set
175# CONFIG_BLK_DEV_INTEGRITY is not set 174# CONFIG_BLK_DEV_INTEGRITY is not set
176# CONFIG_BLK_CGROUP is not set
177 175
178# 176#
179# IO Schedulers 177# IO Schedulers
@@ -269,8 +267,8 @@ CONFIG_FORCE_MAX_ZONEORDER=7
269CONFIG_MEMORY_START=0x0c000000 267CONFIG_MEMORY_START=0x0c000000
270CONFIG_MEMORY_SIZE=0x04000000 268CONFIG_MEMORY_SIZE=0x04000000
271CONFIG_29BIT=y 269CONFIG_29BIT=y
272# CONFIG_PMB_ENABLE is not set 270# CONFIG_PMB is not set
273# CONFIG_X2TLB is not set 271CONFIG_X2TLB=y
274CONFIG_VSYSCALL=y 272CONFIG_VSYSCALL=y
275CONFIG_NUMA=y 273CONFIG_NUMA=y
276CONFIG_NODES_SHIFT=3 274CONFIG_NODES_SHIFT=3
@@ -282,6 +280,8 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
282CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 280CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
283CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 281CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
284CONFIG_ARCH_MEMORY_PROBE=y 282CONFIG_ARCH_MEMORY_PROBE=y
283CONFIG_IOREMAP_FIXED=y
284CONFIG_UNCACHED_MAPPING=y
285# CONFIG_PAGE_SIZE_4KB is not set 285# CONFIG_PAGE_SIZE_4KB is not set
286# CONFIG_PAGE_SIZE_8KB is not set 286# CONFIG_PAGE_SIZE_8KB is not set
287# CONFIG_PAGE_SIZE_16KB is not set 287# CONFIG_PAGE_SIZE_16KB is not set
@@ -307,7 +307,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
307CONFIG_MIGRATION=y 307CONFIG_MIGRATION=y
308# CONFIG_PHYS_ADDR_T_64BIT is not set 308# CONFIG_PHYS_ADDR_T_64BIT is not set
309CONFIG_ZONE_DMA_FLAG=0 309CONFIG_ZONE_DMA_FLAG=0
310CONFIG_NR_QUICK=2 310CONFIG_NR_QUICK=1
311# CONFIG_KSM is not set 311# CONFIG_KSM is not set
312CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 312CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
313CONFIG_SCHED_MC=y 313CONFIG_SCHED_MC=y
@@ -392,14 +392,14 @@ CONFIG_HZ_250=y
392CONFIG_HZ=250 392CONFIG_HZ=250
393CONFIG_SCHED_HRTICK=y 393CONFIG_SCHED_HRTICK=y
394CONFIG_KEXEC=y 394CONFIG_KEXEC=y
395# CONFIG_CRASH_DUMP is not set
396CONFIG_SECCOMP=y 395CONFIG_SECCOMP=y
397CONFIG_SMP=y 396CONFIG_SMP=y
398CONFIG_NR_CPUS=4 397CONFIG_NR_CPUS=4
398# CONFIG_HOTPLUG_CPU is not set
399# CONFIG_PREEMPT_NONE is not set 399# CONFIG_PREEMPT_NONE is not set
400# CONFIG_PREEMPT_VOLUNTARY is not set 400# CONFIG_PREEMPT_VOLUNTARY is not set
401CONFIG_PREEMPT=y 401CONFIG_PREEMPT=y
402# CONFIG_SPARSE_IRQ is not set 402# CONFIG_INTC_USERIMASK is not set
403 403
404# 404#
405# Boot options 405# Boot options
@@ -518,7 +518,6 @@ CONFIG_IPV6_NDISC_NODETYPE=y
518# 518#
519# CONFIG_NET_PKTGEN is not set 519# CONFIG_NET_PKTGEN is not set
520# CONFIG_NET_TCPPROBE is not set 520# CONFIG_NET_TCPPROBE is not set
521# CONFIG_NET_DROP_MONITOR is not set
522# CONFIG_HAMRADIO is not set 521# CONFIG_HAMRADIO is not set
523CONFIG_CAN=m 522CONFIG_CAN=m
524CONFIG_CAN_RAW=m 523CONFIG_CAN_RAW=m
@@ -583,6 +582,7 @@ CONFIG_MISC_DEVICES=y
583# CONFIG_ICS932S401 is not set 582# CONFIG_ICS932S401 is not set
584# CONFIG_ENCLOSURE_SERVICES is not set 583# CONFIG_ENCLOSURE_SERVICES is not set
585# CONFIG_ISL29003 is not set 584# CONFIG_ISL29003 is not set
585# CONFIG_SENSORS_TSL2550 is not set
586# CONFIG_DS1682 is not set 586# CONFIG_DS1682 is not set
587# CONFIG_TI_DAC7512 is not set 587# CONFIG_TI_DAC7512 is not set
588# CONFIG_C2PORT is not set 588# CONFIG_C2PORT is not set
@@ -601,6 +601,7 @@ CONFIG_HAVE_IDE=y
601# 601#
602# SCSI device support 602# SCSI device support
603# 603#
604CONFIG_SCSI_MOD=y
604# CONFIG_RAID_ATTRS is not set 605# CONFIG_RAID_ATTRS is not set
605CONFIG_SCSI=y 606CONFIG_SCSI=y
606CONFIG_SCSI_DMA=y 607CONFIG_SCSI_DMA=y
@@ -693,6 +694,7 @@ CONFIG_WLAN=y
693# CONFIG_USB_PEGASUS is not set 694# CONFIG_USB_PEGASUS is not set
694# CONFIG_USB_RTL8150 is not set 695# CONFIG_USB_RTL8150 is not set
695# CONFIG_USB_USBNET is not set 696# CONFIG_USB_USBNET is not set
697# CONFIG_USB_IPHETH is not set
696# CONFIG_WAN is not set 698# CONFIG_WAN is not set
697# CONFIG_PPP is not set 699# CONFIG_PPP is not set
698# CONFIG_SLIP is not set 700# CONFIG_SLIP is not set
@@ -734,6 +736,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
734CONFIG_SERIAL_SH_SCI_CONSOLE=y 736CONFIG_SERIAL_SH_SCI_CONSOLE=y
735CONFIG_SERIAL_CORE=y 737CONFIG_SERIAL_CORE=y
736CONFIG_SERIAL_CORE_CONSOLE=y 738CONFIG_SERIAL_CORE_CONSOLE=y
739# CONFIG_SERIAL_TIMBERDALE is not set
737CONFIG_UNIX98_PTYS=y 740CONFIG_UNIX98_PTYS=y
738# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 741# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
739CONFIG_LEGACY_PTYS=y 742CONFIG_LEGACY_PTYS=y
@@ -760,6 +763,7 @@ CONFIG_I2C_HELPER_AUTO=y
760# CONFIG_I2C_OCORES is not set 763# CONFIG_I2C_OCORES is not set
761# CONFIG_I2C_SH_MOBILE is not set 764# CONFIG_I2C_SH_MOBILE is not set
762# CONFIG_I2C_SIMTEC is not set 765# CONFIG_I2C_SIMTEC is not set
766# CONFIG_I2C_XILINX is not set
763 767
764# 768#
765# External I2C/SMBus adapter drivers 769# External I2C/SMBus adapter drivers
@@ -773,15 +777,9 @@ CONFIG_I2C_HELPER_AUTO=y
773# 777#
774# CONFIG_I2C_PCA_PLATFORM is not set 778# CONFIG_I2C_PCA_PLATFORM is not set
775# CONFIG_I2C_STUB is not set 779# CONFIG_I2C_STUB is not set
776
777#
778# Miscellaneous I2C Chip support
779#
780# CONFIG_SENSORS_TSL2550 is not set
781# CONFIG_I2C_DEBUG_CORE is not set 780# CONFIG_I2C_DEBUG_CORE is not set
782# CONFIG_I2C_DEBUG_ALGO is not set 781# CONFIG_I2C_DEBUG_ALGO is not set
783# CONFIG_I2C_DEBUG_BUS is not set 782# CONFIG_I2C_DEBUG_BUS is not set
784# CONFIG_I2C_DEBUG_CHIP is not set
785CONFIG_SPI=y 783CONFIG_SPI=y
786# CONFIG_SPI_DEBUG is not set 784# CONFIG_SPI_DEBUG is not set
787CONFIG_SPI_MASTER=y 785CONFIG_SPI_MASTER=y
@@ -838,10 +836,9 @@ CONFIG_SSB_POSSIBLE=y
838# CONFIG_HTC_PASIC3 is not set 836# CONFIG_HTC_PASIC3 is not set
839# CONFIG_MFD_TMIO is not set 837# CONFIG_MFD_TMIO is not set
840# CONFIG_MFD_WM8400 is not set 838# CONFIG_MFD_WM8400 is not set
841# CONFIG_MFD_WM8350_I2C is not set 839# CONFIG_MFD_WM8994 is not set
842# CONFIG_MFD_PCF50633 is not set 840# CONFIG_MFD_PCF50633 is not set
843# CONFIG_MFD_MC13783 is not set 841# CONFIG_MFD_MC13783 is not set
844# CONFIG_AB3100_CORE is not set
845# CONFIG_EZX_PCAP is not set 842# CONFIG_EZX_PCAP is not set
846# CONFIG_AB4500_CORE is not set 843# CONFIG_AB4500_CORE is not set
847# CONFIG_REGULATOR is not set 844# CONFIG_REGULATOR is not set
@@ -933,7 +930,6 @@ CONFIG_USB_R8A66597_HCD=m
933# CONFIG_USB_RIO500 is not set 930# CONFIG_USB_RIO500 is not set
934# CONFIG_USB_LEGOTOWER is not set 931# CONFIG_USB_LEGOTOWER is not set
935# CONFIG_USB_LCD is not set 932# CONFIG_USB_LCD is not set
936# CONFIG_USB_BERRY_CHARGE is not set
937# CONFIG_USB_LED is not set 933# CONFIG_USB_LED is not set
938# CONFIG_USB_CYPRESS_CY7C63 is not set 934# CONFIG_USB_CYPRESS_CY7C63 is not set
939# CONFIG_USB_CYTHERM is not set 935# CONFIG_USB_CYTHERM is not set
@@ -945,7 +941,6 @@ CONFIG_USB_R8A66597_HCD=m
945# CONFIG_USB_IOWARRIOR is not set 941# CONFIG_USB_IOWARRIOR is not set
946# CONFIG_USB_TEST is not set 942# CONFIG_USB_TEST is not set
947# CONFIG_USB_ISIGHTFW is not set 943# CONFIG_USB_ISIGHTFW is not set
948# CONFIG_USB_VST is not set
949CONFIG_USB_GADGET=y 944CONFIG_USB_GADGET=y
950# CONFIG_USB_GADGET_DEBUG is not set 945# CONFIG_USB_GADGET_DEBUG is not set
951# CONFIG_USB_GADGET_DEBUG_FILES is not set 946# CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -983,6 +978,7 @@ CONFIG_USB_GADGET_DUALSPEED=y
983# CONFIG_USB_MIDI_GADGET is not set 978# CONFIG_USB_MIDI_GADGET is not set
984# CONFIG_USB_G_PRINTER is not set 979# CONFIG_USB_G_PRINTER is not set
985# CONFIG_USB_CDC_COMPOSITE is not set 980# CONFIG_USB_CDC_COMPOSITE is not set
981# CONFIG_USB_G_NOKIA is not set
986# CONFIG_USB_G_MULTI is not set 982# CONFIG_USB_G_MULTI is not set
987 983
988# 984#
@@ -1065,8 +1061,6 @@ CONFIG_RTC_DRV_SH=y
1065CONFIG_UIO=m 1061CONFIG_UIO=m
1066# CONFIG_UIO_PDRV is not set 1062# CONFIG_UIO_PDRV is not set
1067# CONFIG_UIO_PDRV_GENIRQ is not set 1063# CONFIG_UIO_PDRV_GENIRQ is not set
1068# CONFIG_UIO_SMX is not set
1069# CONFIG_UIO_SERCOS3 is not set
1070 1064
1071# 1065#
1072# TI VLYNQ 1066# TI VLYNQ
@@ -1145,6 +1139,7 @@ CONFIG_MISC_FILESYSTEMS=y
1145# CONFIG_BEFS_FS is not set 1139# CONFIG_BEFS_FS is not set
1146# CONFIG_BFS_FS is not set 1140# CONFIG_BFS_FS is not set
1147# CONFIG_EFS_FS is not set 1141# CONFIG_EFS_FS is not set
1142# CONFIG_LOGFS is not set
1148# CONFIG_CRAMFS is not set 1143# CONFIG_CRAMFS is not set
1149# CONFIG_SQUASHFS is not set 1144# CONFIG_SQUASHFS is not set
1150# CONFIG_VXFS_FS is not set 1145# CONFIG_VXFS_FS is not set
@@ -1159,6 +1154,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
1159# CONFIG_NFS_FS is not set 1154# CONFIG_NFS_FS is not set
1160# CONFIG_NFSD is not set 1155# CONFIG_NFSD is not set
1161# CONFIG_SMB_FS is not set 1156# CONFIG_SMB_FS is not set
1157# CONFIG_CEPH_FS is not set
1162# CONFIG_CIFS is not set 1158# CONFIG_CIFS is not set
1163# CONFIG_NCP_FS is not set 1159# CONFIG_NCP_FS is not set
1164# CONFIG_CODA_FS is not set 1160# CONFIG_CODA_FS is not set
@@ -1246,7 +1242,6 @@ CONFIG_DEBUG_PREEMPT=y
1246# CONFIG_LOCK_STAT is not set 1242# CONFIG_LOCK_STAT is not set
1247# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1243# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1248# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1244# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1249CONFIG_STACKTRACE=y
1250# CONFIG_DEBUG_KOBJECT is not set 1245# CONFIG_DEBUG_KOBJECT is not set
1251CONFIG_DEBUG_BUGVERBOSE=y 1246CONFIG_DEBUG_BUGVERBOSE=y
1252# CONFIG_DEBUG_INFO is not set 1247# CONFIG_DEBUG_INFO is not set
@@ -1266,9 +1261,9 @@ CONFIG_FRAME_POINTER=y
1266# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1261# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1267# CONFIG_LKDTM is not set 1262# CONFIG_LKDTM is not set
1268# CONFIG_FAULT_INJECTION is not set 1263# CONFIG_FAULT_INJECTION is not set
1264# CONFIG_LATENCYTOP is not set
1269# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1265# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1270# CONFIG_PAGE_POISONING is not set 1266# CONFIG_PAGE_POISONING is not set
1271CONFIG_NOP_TRACER=y
1272CONFIG_HAVE_FUNCTION_TRACER=y 1267CONFIG_HAVE_FUNCTION_TRACER=y
1273CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1268CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1274CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1269CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1276,10 +1271,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1276CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1271CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1277CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1272CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1278CONFIG_RING_BUFFER=y 1273CONFIG_RING_BUFFER=y
1279CONFIG_EVENT_TRACING=y
1280CONFIG_CONTEXT_SWITCH_TRACER=y
1281CONFIG_RING_BUFFER_ALLOW_SWAP=y 1274CONFIG_RING_BUFFER_ALLOW_SWAP=y
1282CONFIG_TRACING=y
1283CONFIG_TRACING_SUPPORT=y 1275CONFIG_TRACING_SUPPORT=y
1284CONFIG_FTRACE=y 1276CONFIG_FTRACE=y
1285# CONFIG_FUNCTION_TRACER is not set 1277# CONFIG_FUNCTION_TRACER is not set
@@ -1292,6 +1284,7 @@ CONFIG_FTRACE=y
1292CONFIG_BRANCH_PROFILE_NONE=y 1284CONFIG_BRANCH_PROFILE_NONE=y
1293# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1285# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1294# CONFIG_PROFILE_ALL_BRANCHES is not set 1286# CONFIG_PROFILE_ALL_BRANCHES is not set
1287# CONFIG_KSYM_TRACER is not set
1295# CONFIG_STACK_TRACER is not set 1288# CONFIG_STACK_TRACER is not set
1296# CONFIG_KMEMTRACE is not set 1289# CONFIG_KMEMTRACE is not set
1297# CONFIG_WORKQUEUE_TRACER is not set 1290# CONFIG_WORKQUEUE_TRACER is not set
@@ -1329,6 +1322,7 @@ CONFIG_CRYPTO=y
1329# CONFIG_CRYPTO_MANAGER2 is not set 1322# CONFIG_CRYPTO_MANAGER2 is not set
1330# CONFIG_CRYPTO_GF128MUL is not set 1323# CONFIG_CRYPTO_GF128MUL is not set
1331# CONFIG_CRYPTO_NULL is not set 1324# CONFIG_CRYPTO_NULL is not set
1325# CONFIG_CRYPTO_PCRYPT is not set
1332# CONFIG_CRYPTO_CRYPTD is not set 1326# CONFIG_CRYPTO_CRYPTD is not set
1333# CONFIG_CRYPTO_AUTHENC is not set 1327# CONFIG_CRYPTO_AUTHENC is not set
1334# CONFIG_CRYPTO_TEST is not set 1328# CONFIG_CRYPTO_TEST is not set
@@ -1407,7 +1401,8 @@ CONFIG_CRYPTO=y
1407# 1401#
1408# CONFIG_CRYPTO_ANSI_CPRNG is not set 1402# CONFIG_CRYPTO_ANSI_CPRNG is not set
1409CONFIG_CRYPTO_HW=y 1403CONFIG_CRYPTO_HW=y
1410CONFIG_BINARY_PRINTF=y 1404# CONFIG_VIRTUALIZATION is not set
1405# CONFIG_BINARY_PRINTF is not set
1411 1406
1412# 1407#
1413# Library routines 1408# Library routines
diff --git a/arch/sh/configs/snapgear_defconfig b/arch/sh/configs/snapgear_defconfig
index 98352d757851..513834d2b8ab 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 15:14:18 2010 4# Tue May 18 17:36:53 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52# CONFIG_SWAP is not set 55# CONFIG_SWAP is not set
53# CONFIG_SYSVIPC is not set 56# CONFIG_SYSVIPC is not set
54# CONFIG_POSIX_MQUEUE is not set 57# CONFIG_POSIX_MQUEUE is not set
@@ -68,7 +71,6 @@ CONFIG_RCU_FANOUT=32
68# CONFIG_TREE_RCU_TRACE is not set 71# CONFIG_TREE_RCU_TRACE is not set
69# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
70CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
71# CONFIG_GROUP_SCHED is not set
72# CONFIG_CGROUPS is not set 74# CONFIG_CGROUPS is not set
73CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
74CONFIG_SYSFS_DEPRECATED_V2=y 76CONFIG_SYSFS_DEPRECATED_V2=y
@@ -79,6 +81,7 @@ CONFIG_INITRAMFS_SOURCE=""
79CONFIG_RD_GZIP=y 81CONFIG_RD_GZIP=y
80# CONFIG_RD_BZIP2 is not set 82# CONFIG_RD_BZIP2 is not set
81# CONFIG_RD_LZMA is not set 83# CONFIG_RD_LZMA is not set
84# CONFIG_RD_LZO is not set
82CONFIG_CC_OPTIMIZE_FOR_SIZE=y 85CONFIG_CC_OPTIMIZE_FOR_SIZE=y
83CONFIG_SYSCTL=y 86CONFIG_SYSCTL=y
84CONFIG_ANON_INODES=y 87CONFIG_ANON_INODES=y
@@ -105,7 +108,7 @@ CONFIG_PERF_USE_VMALLOC=y
105# 108#
106# Kernel Performance Events And Counters 109# Kernel Performance Events And Counters
107# 110#
108# CONFIG_PERF_EVENTS is not set 111CONFIG_PERF_EVENTS=y
109# CONFIG_PERF_COUNTERS is not set 112# CONFIG_PERF_COUNTERS is not set
110CONFIG_VM_EVENT_COUNTERS=y 113CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y 114CONFIG_PCI_QUIRKS=y
@@ -122,6 +125,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122CONFIG_HAVE_DMA_ATTRS=y 125CONFIG_HAVE_DMA_ATTRS=y
123CONFIG_HAVE_CLK=y 126CONFIG_HAVE_CLK=y
124CONFIG_HAVE_DMA_API_DEBUG=y 127CONFIG_HAVE_DMA_API_DEBUG=y
128CONFIG_HAVE_HW_BREAKPOINT=y
125 129
126# 130#
127# GCOV-based kernel profiling 131# GCOV-based kernel profiling
@@ -235,6 +239,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
235CONFIG_MAX_ACTIVE_REGIONS=1 239CONFIG_MAX_ACTIVE_REGIONS=1
236CONFIG_ARCH_POPULATES_NODE_MAP=y 240CONFIG_ARCH_POPULATES_NODE_MAP=y
237CONFIG_ARCH_SELECT_MEMORY_MODEL=y 241CONFIG_ARCH_SELECT_MEMORY_MODEL=y
242CONFIG_UNCACHED_MAPPING=y
238CONFIG_PAGE_SIZE_4KB=y 243CONFIG_PAGE_SIZE_4KB=y
239# CONFIG_PAGE_SIZE_8KB is not set 244# CONFIG_PAGE_SIZE_8KB is not set
240# CONFIG_PAGE_SIZE_16KB is not set 245# CONFIG_PAGE_SIZE_16KB is not set
@@ -250,7 +255,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
250CONFIG_SPLIT_PTLOCK_CPUS=4 255CONFIG_SPLIT_PTLOCK_CPUS=4
251# CONFIG_PHYS_ADDR_T_64BIT is not set 256# CONFIG_PHYS_ADDR_T_64BIT is not set
252CONFIG_ZONE_DMA_FLAG=0 257CONFIG_ZONE_DMA_FLAG=0
253CONFIG_NR_QUICK=2 258CONFIG_NR_QUICK=1
254# CONFIG_KSM is not set 259# CONFIG_KSM is not set
255CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 260CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
256 261
@@ -335,7 +340,6 @@ CONFIG_PREEMPT_NONE=y
335# CONFIG_PREEMPT is not set 340# CONFIG_PREEMPT is not set
336CONFIG_GUSA=y 341CONFIG_GUSA=y
337# CONFIG_GUSA_RB is not set 342# CONFIG_GUSA_RB is not set
338# CONFIG_SPARSE_IRQ is not set
339 343
340# 344#
341# Boot options 345# Boot options
@@ -350,9 +354,9 @@ CONFIG_ENTRY_OFFSET=0x00001000
350# Bus options 354# Bus options
351# 355#
352CONFIG_PCI=y 356CONFIG_PCI=y
357CONFIG_PCI_DOMAINS=y
353# CONFIG_PCIEPORTBUS is not set 358# CONFIG_PCIEPORTBUS is not set
354# CONFIG_ARCH_SUPPORTS_MSI is not set 359# CONFIG_ARCH_SUPPORTS_MSI is not set
355CONFIG_PCI_LEGACY=y
356# CONFIG_PCI_STUB is not set 360# CONFIG_PCI_STUB is not set
357# CONFIG_PCI_IOV is not set 361# CONFIG_PCI_IOV is not set
358 362
@@ -569,6 +573,7 @@ CONFIG_HAVE_IDE=y
569# 573#
570# SCSI device support 574# SCSI device support
571# 575#
576CONFIG_SCSI_MOD=y
572# CONFIG_RAID_ATTRS is not set 577# CONFIG_RAID_ATTRS is not set
573# CONFIG_SCSI is not set 578# CONFIG_SCSI is not set
574# CONFIG_SCSI_DMA is not set 579# CONFIG_SCSI_DMA is not set
@@ -586,7 +591,7 @@ CONFIG_HAVE_IDE=y
586# 591#
587 592
588# 593#
589# See the help texts for more information. 594# The newer stack is recommended.
590# 595#
591# CONFIG_FIREWIRE is not set 596# CONFIG_FIREWIRE is not set
592# CONFIG_IEEE1394 is not set 597# CONFIG_IEEE1394 is not set
@@ -626,6 +631,7 @@ CONFIG_NET_PCI=y
626# CONFIG_PCNET32 is not set 631# CONFIG_PCNET32 is not set
627# CONFIG_AMD8111_ETH is not set 632# CONFIG_AMD8111_ETH is not set
628# CONFIG_ADAPTEC_STARFIRE is not set 633# CONFIG_ADAPTEC_STARFIRE is not set
634# CONFIG_KSZ884X_PCI is not set
629# CONFIG_B44 is not set 635# CONFIG_B44 is not set
630# CONFIG_FORCEDETH is not set 636# CONFIG_FORCEDETH is not set
631# CONFIG_E100 is not set 637# CONFIG_E100 is not set
@@ -726,6 +732,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
726CONFIG_SERIAL_CORE=y 732CONFIG_SERIAL_CORE=y
727CONFIG_SERIAL_CORE_CONSOLE=y 733CONFIG_SERIAL_CORE_CONSOLE=y
728# CONFIG_SERIAL_JSM is not set 734# CONFIG_SERIAL_JSM is not set
735# CONFIG_SERIAL_TIMBERDALE is not set
729CONFIG_UNIX98_PTYS=y 736CONFIG_UNIX98_PTYS=y
730# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 737# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
731CONFIG_LEGACY_PTYS=y 738CONFIG_LEGACY_PTYS=y
@@ -764,6 +771,7 @@ CONFIG_SSB_POSSIBLE=y
764# CONFIG_MFD_SH_MOBILE_SDHI is not set 771# CONFIG_MFD_SH_MOBILE_SDHI is not set
765# CONFIG_HTC_PASIC3 is not set 772# CONFIG_HTC_PASIC3 is not set
766# CONFIG_MFD_TMIO is not set 773# CONFIG_MFD_TMIO is not set
774# CONFIG_LPC_SCH is not set
767# CONFIG_REGULATOR is not set 775# CONFIG_REGULATOR is not set
768# CONFIG_MEDIA_SUPPORT is not set 776# CONFIG_MEDIA_SUPPORT is not set
769 777
@@ -771,6 +779,7 @@ CONFIG_SSB_POSSIBLE=y
771# Graphics support 779# Graphics support
772# 780#
773CONFIG_VGA_ARB=y 781CONFIG_VGA_ARB=y
782CONFIG_VGA_ARB_MAX_GPUS=16
774# CONFIG_DRM is not set 783# CONFIG_DRM is not set
775# CONFIG_VGASTATE is not set 784# CONFIG_VGASTATE is not set
776# CONFIG_VIDEO_OUTPUT_CONTROL is not set 785# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -848,7 +857,6 @@ CONFIG_EXT2_FS=y
848# CONFIG_EXT2_FS_XIP is not set 857# CONFIG_EXT2_FS_XIP is not set
849# CONFIG_EXT3_FS is not set 858# CONFIG_EXT3_FS is not set
850# CONFIG_EXT4_FS is not set 859# CONFIG_EXT4_FS is not set
851CONFIG_EXT4_USE_FOR_EXT23=y
852# CONFIG_REISERFS_FS is not set 860# CONFIG_REISERFS_FS is not set
853# CONFIG_JFS_FS is not set 861# CONFIG_JFS_FS is not set
854# CONFIG_FS_POSIX_ACL is not set 862# CONFIG_FS_POSIX_ACL is not set
@@ -907,6 +915,7 @@ CONFIG_MISC_FILESYSTEMS=y
907# CONFIG_BFS_FS is not set 915# CONFIG_BFS_FS is not set
908# CONFIG_EFS_FS is not set 916# CONFIG_EFS_FS is not set
909# CONFIG_JFFS2_FS is not set 917# CONFIG_JFFS2_FS is not set
918# CONFIG_LOGFS is not set
910CONFIG_CRAMFS=y 919CONFIG_CRAMFS=y
911# CONFIG_SQUASHFS is not set 920# CONFIG_SQUASHFS is not set
912# CONFIG_VXFS_FS is not set 921# CONFIG_VXFS_FS is not set
@@ -925,6 +934,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
925# CONFIG_NFS_FS is not set 934# CONFIG_NFS_FS is not set
926# CONFIG_NFSD is not set 935# CONFIG_NFSD is not set
927# CONFIG_SMB_FS is not set 936# CONFIG_SMB_FS is not set
937# CONFIG_CEPH_FS is not set
928# CONFIG_CIFS is not set 938# CONFIG_CIFS is not set
929# CONFIG_NCP_FS is not set 939# CONFIG_NCP_FS is not set
930# CONFIG_CODA_FS is not set 940# CONFIG_CODA_FS is not set
@@ -983,6 +993,7 @@ CONFIG_HAVE_ARCH_KGDB=y
983CONFIG_DEFAULT_SECURITY_DAC=y 993CONFIG_DEFAULT_SECURITY_DAC=y
984CONFIG_DEFAULT_SECURITY="" 994CONFIG_DEFAULT_SECURITY=""
985# CONFIG_CRYPTO is not set 995# CONFIG_CRYPTO is not set
996# CONFIG_VIRTUALIZATION is not set
986# CONFIG_BINARY_PRINTF is not set 997# CONFIG_BINARY_PRINTF is not set
987 998
988# 999#
diff --git a/arch/sh/configs/systemh_defconfig b/arch/sh/configs/systemh_defconfig
index 72982e360e3f..14e69a229c0a 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 15:14:50 2010 4# Tue May 18 17:39:19 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SWAP=y 55CONFIG_SWAP=y
53# CONFIG_SYSVIPC is not set 56# CONFIG_SYSVIPC is not set
54# CONFIG_BSD_PROCESS_ACCT is not set 57# CONFIG_BSD_PROCESS_ACCT is not set
@@ -65,7 +68,6 @@ CONFIG_RCU_FANOUT=32
65# CONFIG_TREE_RCU_TRACE is not set 68# CONFIG_TREE_RCU_TRACE is not set
66# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
67CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
68# CONFIG_GROUP_SCHED is not set
69# CONFIG_CGROUPS is not set 71# CONFIG_CGROUPS is not set
70CONFIG_SYSFS_DEPRECATED=y 72CONFIG_SYSFS_DEPRECATED=y
71CONFIG_SYSFS_DEPRECATED_V2=y 73CONFIG_SYSFS_DEPRECATED_V2=y
@@ -76,6 +78,7 @@ CONFIG_INITRAMFS_SOURCE=""
76CONFIG_RD_GZIP=y 78CONFIG_RD_GZIP=y
77# CONFIG_RD_BZIP2 is not set 79# CONFIG_RD_BZIP2 is not set
78# CONFIG_RD_LZMA is not set 80# CONFIG_RD_LZMA is not set
81# CONFIG_RD_LZO is not set
79# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
80CONFIG_SYSCTL=y 83CONFIG_SYSCTL=y
81CONFIG_ANON_INODES=y 84CONFIG_ANON_INODES=y
@@ -102,7 +105,7 @@ CONFIG_PERF_USE_VMALLOC=y
102# 105#
103# Kernel Performance Events And Counters 106# Kernel Performance Events And Counters
104# 107#
105# CONFIG_PERF_EVENTS is not set 108CONFIG_PERF_EVENTS=y
106# CONFIG_PERF_COUNTERS is not set 109# CONFIG_PERF_COUNTERS is not set
107CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_COMPAT_BRK=y 111CONFIG_COMPAT_BRK=y
@@ -119,6 +122,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
119CONFIG_HAVE_DMA_ATTRS=y 122CONFIG_HAVE_DMA_ATTRS=y
120CONFIG_HAVE_CLK=y 123CONFIG_HAVE_CLK=y
121CONFIG_HAVE_DMA_API_DEBUG=y 124CONFIG_HAVE_DMA_API_DEBUG=y
125CONFIG_HAVE_HW_BREAKPOINT=y
122 126
123# 127#
124# GCOV-based kernel profiling 128# GCOV-based kernel profiling
@@ -237,6 +241,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
237CONFIG_MAX_ACTIVE_REGIONS=1 241CONFIG_MAX_ACTIVE_REGIONS=1
238CONFIG_ARCH_POPULATES_NODE_MAP=y 242CONFIG_ARCH_POPULATES_NODE_MAP=y
239CONFIG_ARCH_SELECT_MEMORY_MODEL=y 243CONFIG_ARCH_SELECT_MEMORY_MODEL=y
244CONFIG_UNCACHED_MAPPING=y
240CONFIG_PAGE_SIZE_4KB=y 245CONFIG_PAGE_SIZE_4KB=y
241# CONFIG_PAGE_SIZE_8KB is not set 246# CONFIG_PAGE_SIZE_8KB is not set
242# CONFIG_PAGE_SIZE_16KB is not set 247# CONFIG_PAGE_SIZE_16KB is not set
@@ -252,7 +257,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
252CONFIG_SPLIT_PTLOCK_CPUS=4 257CONFIG_SPLIT_PTLOCK_CPUS=4
253# CONFIG_PHYS_ADDR_T_64BIT is not set 258# CONFIG_PHYS_ADDR_T_64BIT is not set
254CONFIG_ZONE_DMA_FLAG=0 259CONFIG_ZONE_DMA_FLAG=0
255CONFIG_NR_QUICK=2 260CONFIG_NR_QUICK=1
256# CONFIG_KSM is not set 261# CONFIG_KSM is not set
257CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
258 263
@@ -332,7 +337,6 @@ CONFIG_HZ=250
332CONFIG_PREEMPT=y 337CONFIG_PREEMPT=y
333CONFIG_GUSA=y 338CONFIG_GUSA=y
334# CONFIG_GUSA_RB is not set 339# CONFIG_GUSA_RB is not set
335# CONFIG_SPARSE_IRQ is not set
336 340
337# 341#
338# Boot options 342# Boot options
@@ -402,6 +406,7 @@ CONFIG_HAVE_IDE=y
402# 406#
403# SCSI device support 407# SCSI device support
404# 408#
409CONFIG_SCSI_MOD=y
405# CONFIG_RAID_ATTRS is not set 410# CONFIG_RAID_ATTRS is not set
406# CONFIG_SCSI is not set 411# CONFIG_SCSI is not set
407# CONFIG_SCSI_DMA is not set 412# CONFIG_SCSI_DMA is not set
@@ -442,6 +447,7 @@ CONFIG_DEVKMEM=y
442# Non-8250 serial port support 447# Non-8250 serial port support
443# 448#
444# CONFIG_SERIAL_SH_SCI is not set 449# CONFIG_SERIAL_SH_SCI is not set
450# CONFIG_SERIAL_TIMBERDALE is not set
445CONFIG_UNIX98_PTYS=y 451CONFIG_UNIX98_PTYS=y
446# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 452# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
447CONFIG_LEGACY_PTYS=y 453CONFIG_LEGACY_PTYS=y
@@ -552,7 +558,6 @@ CONFIG_RTC_LIB=y
552# CONFIG_EXT2_FS is not set 558# CONFIG_EXT2_FS is not set
553# CONFIG_EXT3_FS is not set 559# CONFIG_EXT3_FS is not set
554# CONFIG_EXT4_FS is not set 560# CONFIG_EXT4_FS is not set
555CONFIG_EXT4_USE_FOR_EXT23=y
556# CONFIG_REISERFS_FS is not set 561# CONFIG_REISERFS_FS is not set
557# CONFIG_JFS_FS is not set 562# CONFIG_JFS_FS is not set
558# CONFIG_FS_POSIX_ACL is not set 563# CONFIG_FS_POSIX_ACL is not set
@@ -609,6 +614,7 @@ CONFIG_MISC_FILESYSTEMS=y
609# CONFIG_BEFS_FS is not set 614# CONFIG_BEFS_FS is not set
610# CONFIG_BFS_FS is not set 615# CONFIG_BFS_FS is not set
611# CONFIG_EFS_FS is not set 616# CONFIG_EFS_FS is not set
617# CONFIG_LOGFS is not set
612CONFIG_CRAMFS=y 618CONFIG_CRAMFS=y
613# CONFIG_SQUASHFS is not set 619# CONFIG_SQUASHFS is not set
614# CONFIG_VXFS_FS is not set 620# CONFIG_VXFS_FS is not set
@@ -676,6 +682,7 @@ CONFIG_HAVE_ARCH_KGDB=y
676CONFIG_DEFAULT_SECURITY_DAC=y 682CONFIG_DEFAULT_SECURITY_DAC=y
677CONFIG_DEFAULT_SECURITY="" 683CONFIG_DEFAULT_SECURITY=""
678# CONFIG_CRYPTO is not set 684# CONFIG_CRYPTO is not set
685# CONFIG_VIRTUALIZATION is not set
679# CONFIG_BINARY_PRINTF is not set 686# CONFIG_BINARY_PRINTF is not set
680 687
681# 688#
diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig
index 78c257053c79..79196b4dfdb1 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 15:17:20 2010 4# Tue May 18 17:41:12 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION=""
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SWAP=y 55CONFIG_SWAP=y
53CONFIG_SYSVIPC=y 56CONFIG_SYSVIPC=y
54CONFIG_SYSVIPC_SYSCTL=y 57CONFIG_SYSVIPC_SYSCTL=y
@@ -71,7 +74,6 @@ CONFIG_RCU_FANOUT=32
71CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
72CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
73CONFIG_LOG_BUF_SHIFT=16 76CONFIG_LOG_BUF_SHIFT=16
74# CONFIG_GROUP_SCHED is not set
75# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
76CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
77CONFIG_SYSFS_DEPRECATED_V2=y 79CONFIG_SYSFS_DEPRECATED_V2=y
@@ -82,6 +84,7 @@ CONFIG_INITRAMFS_SOURCE=""
82CONFIG_RD_GZIP=y 84CONFIG_RD_GZIP=y
83# CONFIG_RD_BZIP2 is not set 85# CONFIG_RD_BZIP2 is not set
84# CONFIG_RD_LZMA is not set 86# CONFIG_RD_LZMA is not set
87# CONFIG_RD_LZO is not set
85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 88# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
86CONFIG_SYSCTL=y 89CONFIG_SYSCTL=y
87CONFIG_ANON_INODES=y 90CONFIG_ANON_INODES=y
@@ -109,8 +112,9 @@ CONFIG_PERF_USE_VMALLOC=y
109# 112#
110# Kernel Performance Events And Counters 113# Kernel Performance Events And Counters
111# 114#
112# CONFIG_PERF_EVENTS is not set 115CONFIG_PERF_EVENTS=y
113# CONFIG_PERF_COUNTERS is not set 116# CONFIG_PERF_COUNTERS is not set
117# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
114CONFIG_VM_EVENT_COUNTERS=y 118CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_PCI_QUIRKS=y 119CONFIG_PCI_QUIRKS=y
116CONFIG_COMPAT_BRK=y 120CONFIG_COMPAT_BRK=y
@@ -127,6 +131,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
127CONFIG_HAVE_DMA_ATTRS=y 131CONFIG_HAVE_DMA_ATTRS=y
128CONFIG_HAVE_CLK=y 132CONFIG_HAVE_CLK=y
129CONFIG_HAVE_DMA_API_DEBUG=y 133CONFIG_HAVE_DMA_API_DEBUG=y
134CONFIG_HAVE_HW_BREAKPOINT=y
130 135
131# 136#
132# GCOV-based kernel profiling 137# GCOV-based kernel profiling
@@ -245,6 +250,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
245CONFIG_MAX_ACTIVE_REGIONS=1 250CONFIG_MAX_ACTIVE_REGIONS=1
246CONFIG_ARCH_POPULATES_NODE_MAP=y 251CONFIG_ARCH_POPULATES_NODE_MAP=y
247CONFIG_ARCH_SELECT_MEMORY_MODEL=y 252CONFIG_ARCH_SELECT_MEMORY_MODEL=y
253CONFIG_UNCACHED_MAPPING=y
248CONFIG_PAGE_SIZE_4KB=y 254CONFIG_PAGE_SIZE_4KB=y
249# CONFIG_PAGE_SIZE_8KB is not set 255# CONFIG_PAGE_SIZE_8KB is not set
250# CONFIG_PAGE_SIZE_16KB is not set 256# CONFIG_PAGE_SIZE_16KB is not set
@@ -260,7 +266,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
260CONFIG_SPLIT_PTLOCK_CPUS=4 266CONFIG_SPLIT_PTLOCK_CPUS=4
261# CONFIG_PHYS_ADDR_T_64BIT is not set 267# CONFIG_PHYS_ADDR_T_64BIT is not set
262CONFIG_ZONE_DMA_FLAG=0 268CONFIG_ZONE_DMA_FLAG=0
263CONFIG_NR_QUICK=2 269CONFIG_NR_QUICK=1
264# CONFIG_KSM is not set 270# CONFIG_KSM is not set
265CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 271CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
266 272
@@ -345,7 +351,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
345# CONFIG_PREEMPT is not set 351# CONFIG_PREEMPT is not set
346CONFIG_GUSA=y 352CONFIG_GUSA=y
347# CONFIG_GUSA_RB is not set 353# CONFIG_GUSA_RB is not set
348# CONFIG_SPARSE_IRQ is not set
349 354
350# 355#
351# Boot options 356# Boot options
@@ -361,9 +366,9 @@ CONFIG_CMDLINE="console=ttySC1,38400N81 root=/dev/nfs ip=:::::eth1:autoconf rw"
361# Bus options 366# Bus options
362# 367#
363CONFIG_PCI=y 368CONFIG_PCI=y
369CONFIG_PCI_DOMAINS=y
364# CONFIG_PCIEPORTBUS is not set 370# CONFIG_PCIEPORTBUS is not set
365# CONFIG_ARCH_SUPPORTS_MSI is not set 371# CONFIG_ARCH_SUPPORTS_MSI is not set
366CONFIG_PCI_LEGACY=y
367# CONFIG_PCI_DEBUG is not set 372# CONFIG_PCI_DEBUG is not set
368# CONFIG_PCI_STUB is not set 373# CONFIG_PCI_STUB is not set
369# CONFIG_PCI_IOV is not set 374# CONFIG_PCI_IOV is not set
@@ -392,7 +397,6 @@ CONFIG_NET=y
392# Networking options 397# Networking options
393# 398#
394CONFIG_PACKET=y 399CONFIG_PACKET=y
395CONFIG_PACKET_MMAP=y
396CONFIG_UNIX=y 400CONFIG_UNIX=y
397CONFIG_XFRM=y 401CONFIG_XFRM=y
398# CONFIG_XFRM_USER is not set 402# CONFIG_XFRM_USER is not set
@@ -561,6 +565,7 @@ CONFIG_IP6_NF_RAW=m
561# CONFIG_ATM is not set 565# CONFIG_ATM is not set
562CONFIG_STP=y 566CONFIG_STP=y
563CONFIG_BRIDGE=y 567CONFIG_BRIDGE=y
568CONFIG_BRIDGE_IGMP_SNOOPING=y
564# CONFIG_NET_DSA is not set 569# CONFIG_NET_DSA is not set
565CONFIG_VLAN_8021Q=y 570CONFIG_VLAN_8021Q=y
566# CONFIG_VLAN_8021Q_GVRP is not set 571# CONFIG_VLAN_8021Q_GVRP is not set
@@ -749,6 +754,7 @@ CONFIG_MTD_NAND_IDS=m
749# CONFIG_MTD_NAND_CAFE is not set 754# CONFIG_MTD_NAND_CAFE is not set
750# CONFIG_MTD_NAND_PLATFORM is not set 755# CONFIG_MTD_NAND_PLATFORM is not set
751# CONFIG_MTD_ALAUDA is not set 756# CONFIG_MTD_ALAUDA is not set
757# CONFIG_MTD_NAND_SH_FLCTL is not set
752# CONFIG_MTD_ONENAND is not set 758# CONFIG_MTD_ONENAND is not set
753 759
754# 760#
@@ -768,10 +774,6 @@ CONFIG_BLK_DEV=y
768# CONFIG_BLK_DEV_COW_COMMON is not set 774# CONFIG_BLK_DEV_COW_COMMON is not set
769CONFIG_BLK_DEV_LOOP=m 775CONFIG_BLK_DEV_LOOP=m
770CONFIG_BLK_DEV_CRYPTOLOOP=m 776CONFIG_BLK_DEV_CRYPTOLOOP=m
771
772#
773# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
774#
775# CONFIG_BLK_DEV_DRBD is not set 777# CONFIG_BLK_DEV_DRBD is not set
776# CONFIG_BLK_DEV_NBD is not set 778# CONFIG_BLK_DEV_NBD is not set
777# CONFIG_BLK_DEV_SX8 is not set 779# CONFIG_BLK_DEV_SX8 is not set
@@ -802,6 +804,7 @@ CONFIG_HAVE_IDE=y
802# 804#
803# SCSI device support 805# SCSI device support
804# 806#
807CONFIG_SCSI_MOD=y
805# CONFIG_RAID_ATTRS is not set 808# CONFIG_RAID_ATTRS is not set
806CONFIG_SCSI=y 809CONFIG_SCSI=y
807CONFIG_SCSI_DMA=y 810CONFIG_SCSI_DMA=y
@@ -892,7 +895,7 @@ CONFIG_SCSI_LOWLEVEL=y
892# 895#
893 896
894# 897#
895# See the help texts for more information. 898# The newer stack is recommended.
896# 899#
897# CONFIG_FIREWIRE is not set 900# CONFIG_FIREWIRE is not set
898# CONFIG_IEEE1394 is not set 901# CONFIG_IEEE1394 is not set
@@ -951,6 +954,7 @@ CONFIG_NET_PCI=y
951# CONFIG_PCNET32 is not set 954# CONFIG_PCNET32 is not set
952# CONFIG_AMD8111_ETH is not set 955# CONFIG_AMD8111_ETH is not set
953# CONFIG_ADAPTEC_STARFIRE is not set 956# CONFIG_ADAPTEC_STARFIRE is not set
957# CONFIG_KSZ884X_PCI is not set
954# CONFIG_B44 is not set 958# CONFIG_B44 is not set
955# CONFIG_FORCEDETH is not set 959# CONFIG_FORCEDETH is not set
956# CONFIG_E100 is not set 960# CONFIG_E100 is not set
@@ -1002,6 +1006,8 @@ CONFIG_NETDEV_10000=y
1002# CONFIG_CHELSIO_T1 is not set 1006# CONFIG_CHELSIO_T1 is not set
1003CONFIG_CHELSIO_T3_DEPENDS=y 1007CONFIG_CHELSIO_T3_DEPENDS=y
1004# CONFIG_CHELSIO_T3 is not set 1008# CONFIG_CHELSIO_T3 is not set
1009CONFIG_CHELSIO_T4_DEPENDS=y
1010# CONFIG_CHELSIO_T4 is not set
1005# CONFIG_ENIC is not set 1011# CONFIG_ENIC is not set
1006# CONFIG_IXGBE is not set 1012# CONFIG_IXGBE is not set
1007# CONFIG_IXGB is not set 1013# CONFIG_IXGB is not set
@@ -1014,6 +1020,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
1014# CONFIG_MLX4_CORE is not set 1020# CONFIG_MLX4_CORE is not set
1015# CONFIG_TEHUTI is not set 1021# CONFIG_TEHUTI is not set
1016# CONFIG_BNX2X is not set 1022# CONFIG_BNX2X is not set
1023# CONFIG_QLCNIC is not set
1017# CONFIG_QLGE is not set 1024# CONFIG_QLGE is not set
1018# CONFIG_SFC is not set 1025# CONFIG_SFC is not set
1019# CONFIG_BE2NET is not set 1026# CONFIG_BE2NET is not set
@@ -1040,6 +1047,7 @@ CONFIG_USB_NET_AX8817X=m
1040CONFIG_USB_NET_CDCETHER=m 1047CONFIG_USB_NET_CDCETHER=m
1041# CONFIG_USB_NET_CDC_EEM is not set 1048# CONFIG_USB_NET_CDC_EEM is not set
1042# CONFIG_USB_NET_DM9601 is not set 1049# CONFIG_USB_NET_DM9601 is not set
1050# CONFIG_USB_NET_SMSC75XX is not set
1043# CONFIG_USB_NET_SMSC95XX is not set 1051# CONFIG_USB_NET_SMSC95XX is not set
1044# CONFIG_USB_NET_GL620A is not set 1052# CONFIG_USB_NET_GL620A is not set
1045CONFIG_USB_NET_NET1080=m 1053CONFIG_USB_NET_NET1080=m
@@ -1049,6 +1057,7 @@ CONFIG_USB_NET_PLUSB=m
1049# CONFIG_USB_NET_CDC_SUBSET is not set 1057# CONFIG_USB_NET_CDC_SUBSET is not set
1050CONFIG_USB_NET_ZAURUS=m 1058CONFIG_USB_NET_ZAURUS=m
1051# CONFIG_USB_NET_INT51X1 is not set 1059# CONFIG_USB_NET_INT51X1 is not set
1060# CONFIG_USB_IPHETH is not set
1052# CONFIG_WAN is not set 1061# CONFIG_WAN is not set
1053# CONFIG_FDDI is not set 1062# CONFIG_FDDI is not set
1054# CONFIG_HIPPI is not set 1063# CONFIG_HIPPI is not set
@@ -1136,6 +1145,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
1136CONFIG_SERIAL_CORE=y 1145CONFIG_SERIAL_CORE=y
1137CONFIG_SERIAL_CORE_CONSOLE=y 1146CONFIG_SERIAL_CORE_CONSOLE=y
1138# CONFIG_SERIAL_JSM is not set 1147# CONFIG_SERIAL_JSM is not set
1148# CONFIG_SERIAL_TIMBERDALE is not set
1139CONFIG_UNIX98_PTYS=y 1149CONFIG_UNIX98_PTYS=y
1140# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1150# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1141CONFIG_LEGACY_PTYS=y 1151CONFIG_LEGACY_PTYS=y
@@ -1215,6 +1225,7 @@ CONFIG_SSB_POSSIBLE=y
1215# CONFIG_MFD_SH_MOBILE_SDHI is not set 1225# CONFIG_MFD_SH_MOBILE_SDHI is not set
1216# CONFIG_HTC_PASIC3 is not set 1226# CONFIG_HTC_PASIC3 is not set
1217# CONFIG_MFD_TMIO is not set 1227# CONFIG_MFD_TMIO is not set
1228# CONFIG_LPC_SCH is not set
1218# CONFIG_REGULATOR is not set 1229# CONFIG_REGULATOR is not set
1219# CONFIG_MEDIA_SUPPORT is not set 1230# CONFIG_MEDIA_SUPPORT is not set
1220 1231
@@ -1222,6 +1233,7 @@ CONFIG_SSB_POSSIBLE=y
1222# Graphics support 1233# Graphics support
1223# 1234#
1224CONFIG_VGA_ARB=y 1235CONFIG_VGA_ARB=y
1236CONFIG_VGA_ARB_MAX_GPUS=16
1225# CONFIG_DRM is not set 1237# CONFIG_DRM is not set
1226# CONFIG_VGASTATE is not set 1238# CONFIG_VGASTATE is not set
1227# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1239# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1372,6 +1384,7 @@ CONFIG_USB_SERIAL_ARK3116=m
1372# CONFIG_USB_SERIAL_NAVMAN is not set 1384# CONFIG_USB_SERIAL_NAVMAN is not set
1373CONFIG_USB_SERIAL_PL2303=m 1385CONFIG_USB_SERIAL_PL2303=m
1374# CONFIG_USB_SERIAL_OTI6858 is not set 1386# CONFIG_USB_SERIAL_OTI6858 is not set
1387# CONFIG_USB_SERIAL_QCAUX is not set
1375# CONFIG_USB_SERIAL_QUALCOMM is not set 1388# CONFIG_USB_SERIAL_QUALCOMM is not set
1376# CONFIG_USB_SERIAL_SPCP8X5 is not set 1389# CONFIG_USB_SERIAL_SPCP8X5 is not set
1377# CONFIG_USB_SERIAL_HP4X is not set 1390# CONFIG_USB_SERIAL_HP4X is not set
@@ -1385,6 +1398,7 @@ CONFIG_USB_SERIAL_PL2303=m
1385# CONFIG_USB_SERIAL_OPTION is not set 1398# CONFIG_USB_SERIAL_OPTION is not set
1386# CONFIG_USB_SERIAL_OMNINET is not set 1399# CONFIG_USB_SERIAL_OMNINET is not set
1387# CONFIG_USB_SERIAL_OPTICON is not set 1400# CONFIG_USB_SERIAL_OPTICON is not set
1401# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
1388# CONFIG_USB_SERIAL_DEBUG is not set 1402# CONFIG_USB_SERIAL_DEBUG is not set
1389 1403
1390# 1404#
@@ -1397,7 +1411,6 @@ CONFIG_USB_SERIAL_PL2303=m
1397# CONFIG_USB_RIO500 is not set 1411# CONFIG_USB_RIO500 is not set
1398# CONFIG_USB_LEGOTOWER is not set 1412# CONFIG_USB_LEGOTOWER is not set
1399# CONFIG_USB_LCD is not set 1413# CONFIG_USB_LCD is not set
1400# CONFIG_USB_BERRY_CHARGE is not set
1401# CONFIG_USB_LED is not set 1414# CONFIG_USB_LED is not set
1402# CONFIG_USB_CYPRESS_CY7C63 is not set 1415# CONFIG_USB_CYPRESS_CY7C63 is not set
1403# CONFIG_USB_CYTHERM is not set 1416# CONFIG_USB_CYTHERM is not set
@@ -1410,7 +1423,6 @@ CONFIG_USB_SERIAL_PL2303=m
1410# CONFIG_USB_IOWARRIOR is not set 1423# CONFIG_USB_IOWARRIOR is not set
1411# CONFIG_USB_TEST is not set 1424# CONFIG_USB_TEST is not set
1412# CONFIG_USB_ISIGHTFW is not set 1425# CONFIG_USB_ISIGHTFW is not set
1413# CONFIG_USB_VST is not set
1414# CONFIG_USB_GADGET is not set 1426# CONFIG_USB_GADGET is not set
1415 1427
1416# 1428#
@@ -1552,6 +1564,7 @@ CONFIG_MISC_FILESYSTEMS=y
1552# CONFIG_BFS_FS is not set 1564# CONFIG_BFS_FS is not set
1553# CONFIG_EFS_FS is not set 1565# CONFIG_EFS_FS is not set
1554# CONFIG_JFFS2_FS is not set 1566# CONFIG_JFFS2_FS is not set
1567# CONFIG_LOGFS is not set
1555# CONFIG_CRAMFS is not set 1568# CONFIG_CRAMFS is not set
1556# CONFIG_SQUASHFS is not set 1569# CONFIG_SQUASHFS is not set
1557# CONFIG_VXFS_FS is not set 1570# CONFIG_VXFS_FS is not set
@@ -1585,6 +1598,7 @@ CONFIG_SUNRPC=y
1585# CONFIG_RPCSEC_GSS_SPKM3 is not set 1598# CONFIG_RPCSEC_GSS_SPKM3 is not set
1586CONFIG_SMB_FS=m 1599CONFIG_SMB_FS=m
1587# CONFIG_SMB_NLS_DEFAULT is not set 1600# CONFIG_SMB_NLS_DEFAULT is not set
1601# CONFIG_CEPH_FS is not set
1588CONFIG_CIFS=m 1602CONFIG_CIFS=m
1589# CONFIG_CIFS_STATS is not set 1603# CONFIG_CIFS_STATS is not set
1590CONFIG_CIFS_WEAK_PW_HASH=y 1604CONFIG_CIFS_WEAK_PW_HASH=y
@@ -1680,6 +1694,7 @@ CONFIG_SCHED_DEBUG=y
1680# CONFIG_TIMER_STATS is not set 1694# CONFIG_TIMER_STATS is not set
1681# CONFIG_DEBUG_OBJECTS is not set 1695# CONFIG_DEBUG_OBJECTS is not set
1682# CONFIG_DEBUG_SLAB is not set 1696# CONFIG_DEBUG_SLAB is not set
1697# CONFIG_DEBUG_KMEMLEAK is not set
1683# CONFIG_DEBUG_RT_MUTEXES is not set 1698# CONFIG_DEBUG_RT_MUTEXES is not set
1684# CONFIG_RT_MUTEX_TESTER is not set 1699# CONFIG_RT_MUTEX_TESTER is not set
1685# CONFIG_DEBUG_SPINLOCK is not set 1700# CONFIG_DEBUG_SPINLOCK is not set
@@ -1726,6 +1741,7 @@ CONFIG_FTRACE=y
1726CONFIG_BRANCH_PROFILE_NONE=y 1741CONFIG_BRANCH_PROFILE_NONE=y
1727# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1742# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1728# CONFIG_PROFILE_ALL_BRANCHES is not set 1743# CONFIG_PROFILE_ALL_BRANCHES is not set
1744# CONFIG_KSYM_TRACER is not set
1729# CONFIG_STACK_TRACER is not set 1745# CONFIG_STACK_TRACER is not set
1730# CONFIG_KMEMTRACE is not set 1746# CONFIG_KMEMTRACE is not set
1731# CONFIG_WORKQUEUE_TRACER is not set 1747# CONFIG_WORKQUEUE_TRACER is not set
@@ -1853,6 +1869,7 @@ CONFIG_CRYPTO_DEFLATE=y
1853# CONFIG_CRYPTO_ANSI_CPRNG is not set 1869# CONFIG_CRYPTO_ANSI_CPRNG is not set
1854CONFIG_CRYPTO_HW=y 1870CONFIG_CRYPTO_HW=y
1855# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1871# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1872# CONFIG_VIRTUALIZATION is not set
1856# CONFIG_BINARY_PRINTF is not set 1873# CONFIG_BINARY_PRINTF is not set
1857 1874
1858# 1875#
diff --git a/arch/sh/configs/ul2_defconfig b/arch/sh/configs/ul2_defconfig
index 4fa03bf086dd..17b7258dcde5 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 15:18:53 2010 4# Tue May 18 18:10:50 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
33CONFIG_ARCH_HAS_DEFAULT_IDLE=y 33CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -48,9 +49,11 @@ CONFIG_LOCALVERSION_AUTO=y
48CONFIG_HAVE_KERNEL_GZIP=y 49CONFIG_HAVE_KERNEL_GZIP=y
49CONFIG_HAVE_KERNEL_BZIP2=y 50CONFIG_HAVE_KERNEL_BZIP2=y
50CONFIG_HAVE_KERNEL_LZMA=y 51CONFIG_HAVE_KERNEL_LZMA=y
52CONFIG_HAVE_KERNEL_LZO=y
51CONFIG_KERNEL_GZIP=y 53CONFIG_KERNEL_GZIP=y
52# CONFIG_KERNEL_BZIP2 is not set 54# CONFIG_KERNEL_BZIP2 is not set
53# CONFIG_KERNEL_LZMA is not set 55# CONFIG_KERNEL_LZMA is not set
56# CONFIG_KERNEL_LZO is not set
54CONFIG_SWAP=y 57CONFIG_SWAP=y
55CONFIG_SYSVIPC=y 58CONFIG_SYSVIPC=y
56CONFIG_SYSVIPC_SYSCTL=y 59CONFIG_SYSVIPC_SYSCTL=y
@@ -73,7 +76,6 @@ CONFIG_RCU_FANOUT=32
73CONFIG_IKCONFIG=y 76CONFIG_IKCONFIG=y
74CONFIG_IKCONFIG_PROC=y 77CONFIG_IKCONFIG_PROC=y
75CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
76# CONFIG_GROUP_SCHED is not set
77# CONFIG_CGROUPS is not set 79# CONFIG_CGROUPS is not set
78CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
@@ -84,6 +86,7 @@ CONFIG_INITRAMFS_SOURCE=""
84CONFIG_RD_GZIP=y 86CONFIG_RD_GZIP=y
85# CONFIG_RD_BZIP2 is not set 87# CONFIG_RD_BZIP2 is not set
86# CONFIG_RD_LZMA is not set 88# CONFIG_RD_LZMA is not set
89# CONFIG_RD_LZO is not set
87CONFIG_CC_OPTIMIZE_FOR_SIZE=y 90CONFIG_CC_OPTIMIZE_FOR_SIZE=y
88CONFIG_SYSCTL=y 91CONFIG_SYSCTL=y
89CONFIG_ANON_INODES=y 92CONFIG_ANON_INODES=y
@@ -122,13 +125,13 @@ CONFIG_PROFILING=y
122# CONFIG_OPROFILE is not set 125# CONFIG_OPROFILE is not set
123CONFIG_HAVE_OPROFILE=y 126CONFIG_HAVE_OPROFILE=y
124# CONFIG_KPROBES is not set 127# CONFIG_KPROBES is not set
125CONFIG_HAVE_IOREMAP_PROT=y
126CONFIG_HAVE_KPROBES=y 128CONFIG_HAVE_KPROBES=y
127CONFIG_HAVE_KRETPROBES=y 129CONFIG_HAVE_KRETPROBES=y
128CONFIG_HAVE_ARCH_TRACEHOOK=y 130CONFIG_HAVE_ARCH_TRACEHOOK=y
129CONFIG_HAVE_DMA_ATTRS=y 131CONFIG_HAVE_DMA_ATTRS=y
130CONFIG_HAVE_CLK=y 132CONFIG_HAVE_CLK=y
131CONFIG_HAVE_DMA_API_DEBUG=y 133CONFIG_HAVE_DMA_API_DEBUG=y
134CONFIG_HAVE_HW_BREAKPOINT=y
132 135
133# 136#
134# GCOV-based kernel profiling 137# GCOV-based kernel profiling
@@ -244,7 +247,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
244CONFIG_MEMORY_START=0x08000000 247CONFIG_MEMORY_START=0x08000000
245CONFIG_MEMORY_SIZE=0x01f00000 248CONFIG_MEMORY_SIZE=0x01f00000
246CONFIG_29BIT=y 249CONFIG_29BIT=y
247# CONFIG_X2TLB is not set 250CONFIG_X2TLB=y
248CONFIG_VSYSCALL=y 251CONFIG_VSYSCALL=y
249CONFIG_NUMA=y 252CONFIG_NUMA=y
250CONFIG_NODES_SHIFT=1 253CONFIG_NODES_SHIFT=1
@@ -255,6 +258,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
255CONFIG_ARCH_SELECT_MEMORY_MODEL=y 258CONFIG_ARCH_SELECT_MEMORY_MODEL=y
256CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 259CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
257CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 260CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
261CONFIG_IOREMAP_FIXED=y
262CONFIG_UNCACHED_MAPPING=y
258CONFIG_PAGE_SIZE_4KB=y 263CONFIG_PAGE_SIZE_4KB=y
259# CONFIG_PAGE_SIZE_8KB is not set 264# CONFIG_PAGE_SIZE_8KB is not set
260# CONFIG_PAGE_SIZE_16KB is not set 265# CONFIG_PAGE_SIZE_16KB is not set
@@ -278,7 +283,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
278# CONFIG_MIGRATION is not set 283# CONFIG_MIGRATION is not set
279# CONFIG_PHYS_ADDR_T_64BIT is not set 284# CONFIG_PHYS_ADDR_T_64BIT is not set
280CONFIG_ZONE_DMA_FLAG=0 285CONFIG_ZONE_DMA_FLAG=0
281CONFIG_NR_QUICK=2 286CONFIG_NR_QUICK=1
282# CONFIG_KSM is not set 287# CONFIG_KSM is not set
283CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 288CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
284 289
@@ -352,7 +357,7 @@ CONFIG_KEXEC=y
352# CONFIG_PREEMPT_VOLUNTARY is not set 357# CONFIG_PREEMPT_VOLUNTARY is not set
353CONFIG_PREEMPT=y 358CONFIG_PREEMPT=y
354CONFIG_GUSA=y 359CONFIG_GUSA=y
355# CONFIG_SPARSE_IRQ is not set 360# CONFIG_INTC_USERIMASK is not set
356 361
357# 362#
358# Boot options 363# Boot options
@@ -388,6 +393,7 @@ CONFIG_SUSPEND=y
388CONFIG_SUSPEND_FREEZER=y 393CONFIG_SUSPEND_FREEZER=y
389# CONFIG_HIBERNATION is not set 394# CONFIG_HIBERNATION is not set
390CONFIG_PM_RUNTIME=y 395CONFIG_PM_RUNTIME=y
396CONFIG_PM_OPS=y
391# CONFIG_CPU_IDLE is not set 397# CONFIG_CPU_IDLE is not set
392CONFIG_NET=y 398CONFIG_NET=y
393 399
@@ -395,7 +401,6 @@ CONFIG_NET=y
395# Networking options 401# Networking options
396# 402#
397CONFIG_PACKET=y 403CONFIG_PACKET=y
398CONFIG_PACKET_MMAP=y
399CONFIG_UNIX=y 404CONFIG_UNIX=y
400CONFIG_XFRM=y 405CONFIG_XFRM=y
401# CONFIG_XFRM_USER is not set 406# CONFIG_XFRM_USER is not set
@@ -473,7 +478,7 @@ CONFIG_CFG80211=y
473# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set 478# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
474# CONFIG_CFG80211_REG_DEBUG is not set 479# CONFIG_CFG80211_REG_DEBUG is not set
475CONFIG_CFG80211_DEFAULT_PS=y 480CONFIG_CFG80211_DEFAULT_PS=y
476# CONFIG_WIRELESS_OLD_REGULATORY is not set 481# CONFIG_CFG80211_INTERNAL_REGDB is not set
477CONFIG_CFG80211_WEXT=y 482CONFIG_CFG80211_WEXT=y
478CONFIG_WIRELESS_EXT_SYSFS=y 483CONFIG_WIRELESS_EXT_SYSFS=y
479CONFIG_LIB80211=m 484CONFIG_LIB80211=m
@@ -619,6 +624,7 @@ CONFIG_HAVE_IDE=y
619# 624#
620# SCSI device support 625# SCSI device support
621# 626#
627CONFIG_SCSI_MOD=y
622# CONFIG_RAID_ATTRS is not set 628# CONFIG_RAID_ATTRS is not set
623CONFIG_SCSI=y 629CONFIG_SCSI=y
624CONFIG_SCSI_DMA=y 630CONFIG_SCSI_DMA=y
@@ -709,6 +715,7 @@ CONFIG_LIBERTAS=m
709# CONFIG_LIBERTAS_USB is not set 715# CONFIG_LIBERTAS_USB is not set
710CONFIG_LIBERTAS_SDIO=m 716CONFIG_LIBERTAS_SDIO=m
711CONFIG_LIBERTAS_DEBUG=y 717CONFIG_LIBERTAS_DEBUG=y
718# CONFIG_LIBERTAS_MESH is not set
712# CONFIG_P54_COMMON is not set 719# CONFIG_P54_COMMON is not set
713# CONFIG_RT2X00 is not set 720# CONFIG_RT2X00 is not set
714# CONFIG_WL12XX is not set 721# CONFIG_WL12XX is not set
@@ -730,6 +737,7 @@ CONFIG_USB_NET_AX8817X=y
730CONFIG_USB_NET_CDCETHER=y 737CONFIG_USB_NET_CDCETHER=y
731# CONFIG_USB_NET_CDC_EEM is not set 738# CONFIG_USB_NET_CDC_EEM is not set
732# CONFIG_USB_NET_DM9601 is not set 739# CONFIG_USB_NET_DM9601 is not set
740# CONFIG_USB_NET_SMSC75XX is not set
733# CONFIG_USB_NET_SMSC95XX is not set 741# CONFIG_USB_NET_SMSC95XX is not set
734# CONFIG_USB_NET_GL620A is not set 742# CONFIG_USB_NET_GL620A is not set
735# CONFIG_USB_NET_NET1080 is not set 743# CONFIG_USB_NET_NET1080 is not set
@@ -739,6 +747,7 @@ CONFIG_USB_NET_CDCETHER=y
739# CONFIG_USB_NET_CDC_SUBSET is not set 747# CONFIG_USB_NET_CDC_SUBSET is not set
740# CONFIG_USB_NET_ZAURUS is not set 748# CONFIG_USB_NET_ZAURUS is not set
741# CONFIG_USB_NET_INT51X1 is not set 749# CONFIG_USB_NET_INT51X1 is not set
750# CONFIG_USB_IPHETH is not set
742# CONFIG_WAN is not set 751# CONFIG_WAN is not set
743# CONFIG_PPP is not set 752# CONFIG_PPP is not set
744# CONFIG_SLIP is not set 753# CONFIG_SLIP is not set
@@ -800,6 +809,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=1
800CONFIG_SERIAL_SH_SCI_CONSOLE=y 809CONFIG_SERIAL_SH_SCI_CONSOLE=y
801CONFIG_SERIAL_CORE=y 810CONFIG_SERIAL_CORE=y
802CONFIG_SERIAL_CORE_CONSOLE=y 811CONFIG_SERIAL_CORE_CONSOLE=y
812# CONFIG_SERIAL_TIMBERDALE is not set
803# CONFIG_UNIX98_PTYS is not set 813# CONFIG_UNIX98_PTYS is not set
804# CONFIG_LEGACY_PTYS is not set 814# CONFIG_LEGACY_PTYS is not set
805# CONFIG_IPMI_HANDLER is not set 815# CONFIG_IPMI_HANDLER is not set
@@ -952,7 +962,6 @@ CONFIG_USB_STORAGE=y
952# CONFIG_USB_RIO500 is not set 962# CONFIG_USB_RIO500 is not set
953# CONFIG_USB_LEGOTOWER is not set 963# CONFIG_USB_LEGOTOWER is not set
954# CONFIG_USB_LCD is not set 964# CONFIG_USB_LCD is not set
955# CONFIG_USB_BERRY_CHARGE is not set
956# CONFIG_USB_LED is not set 965# CONFIG_USB_LED is not set
957# CONFIG_USB_CYPRESS_CY7C63 is not set 966# CONFIG_USB_CYPRESS_CY7C63 is not set
958# CONFIG_USB_CYTHERM is not set 967# CONFIG_USB_CYTHERM is not set
@@ -964,7 +973,6 @@ CONFIG_USB_STORAGE=y
964# CONFIG_USB_IOWARRIOR is not set 973# CONFIG_USB_IOWARRIOR is not set
965# CONFIG_USB_TEST is not set 974# CONFIG_USB_TEST is not set
966# CONFIG_USB_ISIGHTFW is not set 975# CONFIG_USB_ISIGHTFW is not set
967# CONFIG_USB_VST is not set
968# CONFIG_USB_GADGET is not set 976# CONFIG_USB_GADGET is not set
969 977
970# 978#
@@ -987,9 +995,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y
987# MMC/SD/SDIO Host Controller Drivers 995# MMC/SD/SDIO Host Controller Drivers
988# 996#
989# CONFIG_MMC_SDHCI is not set 997# CONFIG_MMC_SDHCI is not set
990# CONFIG_MMC_AT91 is not set
991# CONFIG_MMC_ATMELMCI is not set
992# CONFIG_MMC_TMIO is not set
993# CONFIG_MEMSTICK is not set 998# CONFIG_MEMSTICK is not set
994# CONFIG_NEW_LEDS is not set 999# CONFIG_NEW_LEDS is not set
995# CONFIG_ACCESSIBILITY is not set 1000# CONFIG_ACCESSIBILITY is not set
@@ -1079,6 +1084,7 @@ CONFIG_MISC_FILESYSTEMS=y
1079# CONFIG_BFS_FS is not set 1084# CONFIG_BFS_FS is not set
1080# CONFIG_EFS_FS is not set 1085# CONFIG_EFS_FS is not set
1081# CONFIG_JFFS2_FS is not set 1086# CONFIG_JFFS2_FS is not set
1087# CONFIG_LOGFS is not set
1082CONFIG_CRAMFS=y 1088CONFIG_CRAMFS=y
1083# CONFIG_SQUASHFS is not set 1089# CONFIG_SQUASHFS is not set
1084# CONFIG_VXFS_FS is not set 1090# CONFIG_VXFS_FS is not set
@@ -1104,6 +1110,7 @@ CONFIG_SUNRPC=y
1104# CONFIG_RPCSEC_GSS_KRB5 is not set 1110# CONFIG_RPCSEC_GSS_KRB5 is not set
1105# CONFIG_RPCSEC_GSS_SPKM3 is not set 1111# CONFIG_RPCSEC_GSS_SPKM3 is not set
1106# CONFIG_SMB_FS is not set 1112# CONFIG_SMB_FS is not set
1113# CONFIG_CEPH_FS is not set
1107# CONFIG_CIFS is not set 1114# CONFIG_CIFS is not set
1108# CONFIG_NCP_FS is not set 1115# CONFIG_NCP_FS is not set
1109# CONFIG_CODA_FS is not set 1116# CONFIG_CODA_FS is not set
@@ -1299,6 +1306,7 @@ CONFIG_CRYPTO_ARC4=y
1299# 1306#
1300# CONFIG_CRYPTO_ANSI_CPRNG is not set 1307# CONFIG_CRYPTO_ANSI_CPRNG is not set
1301CONFIG_CRYPTO_HW=y 1308CONFIG_CRYPTO_HW=y
1309# CONFIG_VIRTUALIZATION is not set
1302# CONFIG_BINARY_PRINTF is not set 1310# CONFIG_BINARY_PRINTF is not set
1303 1311
1304# 1312#
diff --git a/arch/sh/configs/urquell_defconfig b/arch/sh/configs/urquell_defconfig
index 23bda1916f4d..28bb19d2cbe9 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.33-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Jan 4 15:27:53 2010 4# Tue May 18 18:13:10 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_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
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -35,6 +35,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
35CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 35CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
36CONFIG_DMA_COHERENT=y 36CONFIG_DMA_COHERENT=y
37# CONFIG_DMA_NONCOHERENT is not set 37# CONFIG_DMA_NONCOHERENT is not set
38# CONFIG_NEED_DMA_MAP_STATE is not set
38CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 39CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
39CONFIG_CONSTRUCTORS=y 40CONFIG_CONSTRUCTORS=y
40 41
@@ -49,9 +50,11 @@ CONFIG_LOCALVERSION_AUTO=y
49CONFIG_HAVE_KERNEL_GZIP=y 50CONFIG_HAVE_KERNEL_GZIP=y
50CONFIG_HAVE_KERNEL_BZIP2=y 51CONFIG_HAVE_KERNEL_BZIP2=y
51CONFIG_HAVE_KERNEL_LZMA=y 52CONFIG_HAVE_KERNEL_LZMA=y
53CONFIG_HAVE_KERNEL_LZO=y
52CONFIG_KERNEL_GZIP=y 54CONFIG_KERNEL_GZIP=y
53# CONFIG_KERNEL_BZIP2 is not set 55# CONFIG_KERNEL_BZIP2 is not set
54# CONFIG_KERNEL_LZMA is not set 56# CONFIG_KERNEL_LZMA is not set
57# CONFIG_KERNEL_LZO is not set
55CONFIG_SWAP=y 58CONFIG_SWAP=y
56CONFIG_SYSVIPC=y 59CONFIG_SYSVIPC=y
57CONFIG_SYSVIPC_SYSCTL=y 60CONFIG_SYSVIPC_SYSCTL=y
@@ -77,11 +80,6 @@ CONFIG_RCU_FANOUT=32
77CONFIG_IKCONFIG=y 80CONFIG_IKCONFIG=y
78CONFIG_IKCONFIG_PROC=y 81CONFIG_IKCONFIG_PROC=y
79CONFIG_LOG_BUF_SHIFT=14 82CONFIG_LOG_BUF_SHIFT=14
80CONFIG_GROUP_SCHED=y
81CONFIG_FAIR_GROUP_SCHED=y
82CONFIG_RT_GROUP_SCHED=y
83# CONFIG_USER_SCHED is not set
84CONFIG_CGROUP_SCHED=y
85CONFIG_CGROUPS=y 83CONFIG_CGROUPS=y
86CONFIG_CGROUP_DEBUG=y 84CONFIG_CGROUP_DEBUG=y
87CONFIG_CGROUP_NS=y 85CONFIG_CGROUP_NS=y
@@ -93,6 +91,9 @@ CONFIG_CGROUP_CPUACCT=y
93CONFIG_RESOURCE_COUNTERS=y 91CONFIG_RESOURCE_COUNTERS=y
94CONFIG_CGROUP_MEM_RES_CTLR=y 92CONFIG_CGROUP_MEM_RES_CTLR=y
95CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y 93CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
94CONFIG_CGROUP_SCHED=y
95CONFIG_FAIR_GROUP_SCHED=y
96CONFIG_RT_GROUP_SCHED=y
96CONFIG_MM_OWNER=y 97CONFIG_MM_OWNER=y
97# CONFIG_SYSFS_DEPRECATED_V2 is not set 98# CONFIG_SYSFS_DEPRECATED_V2 is not set
98# CONFIG_RELAY is not set 99# CONFIG_RELAY is not set
@@ -102,6 +103,7 @@ CONFIG_INITRAMFS_SOURCE=""
102CONFIG_RD_GZIP=y 103CONFIG_RD_GZIP=y
103# CONFIG_RD_BZIP2 is not set 104# CONFIG_RD_BZIP2 is not set
104# CONFIG_RD_LZMA is not set 105# CONFIG_RD_LZMA is not set
106# CONFIG_RD_LZO is not set
105CONFIG_CC_OPTIMIZE_FOR_SIZE=y 107CONFIG_CC_OPTIMIZE_FOR_SIZE=y
106CONFIG_SYSCTL=y 108CONFIG_SYSCTL=y
107CONFIG_ANON_INODES=y 109CONFIG_ANON_INODES=y
@@ -142,13 +144,13 @@ CONFIG_PROFILING=y
142# CONFIG_OPROFILE is not set 144# CONFIG_OPROFILE is not set
143CONFIG_HAVE_OPROFILE=y 145CONFIG_HAVE_OPROFILE=y
144# CONFIG_KPROBES is not set 146# CONFIG_KPROBES is not set
145CONFIG_HAVE_IOREMAP_PROT=y
146CONFIG_HAVE_KPROBES=y 147CONFIG_HAVE_KPROBES=y
147CONFIG_HAVE_KRETPROBES=y 148CONFIG_HAVE_KRETPROBES=y
148CONFIG_HAVE_ARCH_TRACEHOOK=y 149CONFIG_HAVE_ARCH_TRACEHOOK=y
149CONFIG_HAVE_DMA_ATTRS=y 150CONFIG_HAVE_DMA_ATTRS=y
150CONFIG_HAVE_CLK=y 151CONFIG_HAVE_CLK=y
151CONFIG_HAVE_DMA_API_DEBUG=y 152CONFIG_HAVE_DMA_API_DEBUG=y
153CONFIG_HAVE_HW_BREAKPOINT=y
152 154
153# 155#
154# GCOV-based kernel profiling 156# GCOV-based kernel profiling
@@ -169,7 +171,6 @@ CONFIG_BLOCK=y
169CONFIG_LBDAF=y 171CONFIG_LBDAF=y
170# CONFIG_BLK_DEV_BSG is not set 172# CONFIG_BLK_DEV_BSG is not set
171# CONFIG_BLK_DEV_INTEGRITY is not set 173# CONFIG_BLK_DEV_INTEGRITY is not set
172# CONFIG_BLK_CGROUP is not set
173 174
174# 175#
175# IO Schedulers 176# IO Schedulers
@@ -265,8 +266,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
265CONFIG_MEMORY_START=0x08000000 266CONFIG_MEMORY_START=0x08000000
266CONFIG_MEMORY_SIZE=0x08000000 267CONFIG_MEMORY_SIZE=0x08000000
267CONFIG_29BIT=y 268CONFIG_29BIT=y
268# CONFIG_PMB_ENABLE is not set 269# CONFIG_PMB is not set
269# CONFIG_X2TLB is not set 270CONFIG_X2TLB=y
270CONFIG_VSYSCALL=y 271CONFIG_VSYSCALL=y
271# CONFIG_NUMA is not set 272# CONFIG_NUMA is not set
272CONFIG_ARCH_FLATMEM_ENABLE=y 273CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -277,6 +278,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
277CONFIG_ARCH_SELECT_MEMORY_MODEL=y 278CONFIG_ARCH_SELECT_MEMORY_MODEL=y
278CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 279CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
279CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 280CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
281CONFIG_IOREMAP_FIXED=y
282CONFIG_UNCACHED_MAPPING=y
280CONFIG_PAGE_SIZE_4KB=y 283CONFIG_PAGE_SIZE_4KB=y
281# CONFIG_PAGE_SIZE_8KB is not set 284# CONFIG_PAGE_SIZE_8KB is not set
282# CONFIG_PAGE_SIZE_16KB is not set 285# CONFIG_PAGE_SIZE_16KB is not set
@@ -299,7 +302,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
299CONFIG_MIGRATION=y 302CONFIG_MIGRATION=y
300# CONFIG_PHYS_ADDR_T_64BIT is not set 303# CONFIG_PHYS_ADDR_T_64BIT is not set
301CONFIG_ZONE_DMA_FLAG=0 304CONFIG_ZONE_DMA_FLAG=0
302CONFIG_NR_QUICK=2 305CONFIG_NR_QUICK=1
303# CONFIG_KSM is not set 306# CONFIG_KSM is not set
304CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 307CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
305 308
@@ -317,6 +320,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
317# CONFIG_CPU_BIG_ENDIAN is not set 320# CONFIG_CPU_BIG_ENDIAN is not set
318CONFIG_SH_FPU=y 321CONFIG_SH_FPU=y
319CONFIG_SH_STORE_QUEUES=y 322CONFIG_SH_STORE_QUEUES=y
323# CONFIG_SPECULATIVE_EXECUTION is not set
320CONFIG_CPU_HAS_INTEVT=y 324CONFIG_CPU_HAS_INTEVT=y
321CONFIG_CPU_HAS_SR_RB=y 325CONFIG_CPU_HAS_SR_RB=y
322CONFIG_CPU_HAS_PTEAEX=y 326CONFIG_CPU_HAS_PTEAEX=y
@@ -325,15 +329,14 @@ CONFIG_CPU_HAS_FPU=y
325# 329#
326# Board support 330# Board support
327# 331#
332# CONFIG_SH_SDK7786 is not set
328CONFIG_SH_URQUELL=y 333CONFIG_SH_URQUELL=y
329 334
330# 335#
331# Timer and clock configuration 336# Timer and clock configuration
332# 337#
333CONFIG_SH_TIMER_TMU=y 338CONFIG_SH_TIMER_TMU=y
334CONFIG_SH_PCLK_FREQ=33333333
335CONFIG_SH_CLK_CPG=y 339CONFIG_SH_CLK_CPG=y
336CONFIG_SH_CLK_CPG_LEGACY=y
337CONFIG_TICK_ONESHOT=y 340CONFIG_TICK_ONESHOT=y
338# CONFIG_NO_HZ is not set 341# CONFIG_NO_HZ is not set
339CONFIG_HIGH_RES_TIMERS=y 342CONFIG_HIGH_RES_TIMERS=y
@@ -376,7 +379,7 @@ CONFIG_PREEMPT_NONE=y
376# CONFIG_PREEMPT_VOLUNTARY is not set 379# CONFIG_PREEMPT_VOLUNTARY is not set
377# CONFIG_PREEMPT is not set 380# CONFIG_PREEMPT is not set
378CONFIG_GUSA=y 381CONFIG_GUSA=y
379CONFIG_SPARSE_IRQ=y 382# CONFIG_INTC_USERIMASK is not set
380 383
381# 384#
382# Boot options 385# Boot options
@@ -391,6 +394,7 @@ CONFIG_ENTRY_OFFSET=0x00001000
391# Bus options 394# Bus options
392# 395#
393CONFIG_PCI=y 396CONFIG_PCI=y
397CONFIG_PCI_DOMAINS=y
394CONFIG_PCIEPORTBUS=y 398CONFIG_PCIEPORTBUS=y
395CONFIG_PCIEAER=y 399CONFIG_PCIEAER=y
396# CONFIG_PCIE_ECRC is not set 400# CONFIG_PCIE_ECRC is not set
@@ -398,7 +402,6 @@ CONFIG_PCIEAER=y
398CONFIG_PCIEASPM=y 402CONFIG_PCIEASPM=y
399CONFIG_PCIEASPM_DEBUG=y 403CONFIG_PCIEASPM_DEBUG=y
400# CONFIG_ARCH_SUPPORTS_MSI is not set 404# CONFIG_ARCH_SUPPORTS_MSI is not set
401# CONFIG_PCI_LEGACY is not set
402CONFIG_PCI_DEBUG=y 405CONFIG_PCI_DEBUG=y
403# CONFIG_PCI_STUB is not set 406# CONFIG_PCI_STUB is not set
404# CONFIG_PCI_IOV is not set 407# CONFIG_PCI_IOV is not set
@@ -428,7 +431,6 @@ CONFIG_NET=y
428# Networking options 431# Networking options
429# 432#
430CONFIG_PACKET=y 433CONFIG_PACKET=y
431# CONFIG_PACKET_MMAP is not set
432CONFIG_UNIX=y 434CONFIG_UNIX=y
433CONFIG_XFRM=y 435CONFIG_XFRM=y
434# CONFIG_XFRM_USER is not set 436# CONFIG_XFRM_USER is not set
@@ -639,6 +641,7 @@ CONFIG_HAVE_IDE=y
639# 641#
640# SCSI device support 642# SCSI device support
641# 643#
644CONFIG_SCSI_MOD=y
642# CONFIG_RAID_ATTRS is not set 645# CONFIG_RAID_ATTRS is not set
643CONFIG_SCSI=y 646CONFIG_SCSI=y
644CONFIG_SCSI_DMA=y 647CONFIG_SCSI_DMA=y
@@ -712,6 +715,7 @@ CONFIG_ATA_SFF=y
712# CONFIG_PATA_IT821X is not set 715# CONFIG_PATA_IT821X is not set
713# CONFIG_PATA_IT8213 is not set 716# CONFIG_PATA_IT8213 is not set
714# CONFIG_PATA_JMICRON is not set 717# CONFIG_PATA_JMICRON is not set
718# CONFIG_PATA_LEGACY is not set
715# CONFIG_PATA_TRIFLEX is not set 719# CONFIG_PATA_TRIFLEX is not set
716# CONFIG_PATA_MARVELL is not set 720# CONFIG_PATA_MARVELL is not set
717# CONFIG_PATA_MPIIX is not set 721# CONFIG_PATA_MPIIX is not set
@@ -748,7 +752,7 @@ CONFIG_ATA_SFF=y
748# 752#
749 753
750# 754#
751# See the help texts for more information. 755# The newer stack is recommended.
752# 756#
753# CONFIG_FIREWIRE is not set 757# CONFIG_FIREWIRE is not set
754# CONFIG_IEEE1394 is not set 758# CONFIG_IEEE1394 is not set
@@ -807,6 +811,7 @@ CONFIG_NET_PCI=y
807# CONFIG_PCNET32 is not set 811# CONFIG_PCNET32 is not set
808# CONFIG_AMD8111_ETH is not set 812# CONFIG_AMD8111_ETH is not set
809# CONFIG_ADAPTEC_STARFIRE is not set 813# CONFIG_ADAPTEC_STARFIRE is not set
814# CONFIG_KSZ884X_PCI is not set
810# CONFIG_B44 is not set 815# CONFIG_B44 is not set
811# CONFIG_FORCEDETH is not set 816# CONFIG_FORCEDETH is not set
812# CONFIG_E100 is not set 817# CONFIG_E100 is not set
@@ -871,6 +876,7 @@ CONFIG_WLAN=y
871# CONFIG_USB_PEGASUS is not set 876# CONFIG_USB_PEGASUS is not set
872# CONFIG_USB_RTL8150 is not set 877# CONFIG_USB_RTL8150 is not set
873# CONFIG_USB_USBNET is not set 878# CONFIG_USB_USBNET is not set
879# CONFIG_USB_IPHETH is not set
874# CONFIG_WAN is not set 880# CONFIG_WAN is not set
875# CONFIG_FDDI is not set 881# CONFIG_FDDI is not set
876# CONFIG_HIPPI is not set 882# CONFIG_HIPPI is not set
@@ -958,6 +964,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
958CONFIG_SERIAL_CORE=y 964CONFIG_SERIAL_CORE=y
959CONFIG_SERIAL_CORE_CONSOLE=y 965CONFIG_SERIAL_CORE_CONSOLE=y
960# CONFIG_SERIAL_JSM is not set 966# CONFIG_SERIAL_JSM is not set
967# CONFIG_SERIAL_TIMBERDALE is not set
961CONFIG_UNIX98_PTYS=y 968CONFIG_UNIX98_PTYS=y
962# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 969# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
963CONFIG_LEGACY_PTYS=y 970CONFIG_LEGACY_PTYS=y
@@ -1007,6 +1014,7 @@ CONFIG_I2C_ALGOPCA=y
1007# CONFIG_I2C_OCORES is not set 1014# CONFIG_I2C_OCORES is not set
1008# CONFIG_I2C_SH_MOBILE is not set 1015# CONFIG_I2C_SH_MOBILE is not set
1009# CONFIG_I2C_SIMTEC is not set 1016# CONFIG_I2C_SIMTEC is not set
1017# CONFIG_I2C_XILINX is not set
1010 1018
1011# 1019#
1012# External I2C/SMBus adapter drivers 1020# External I2C/SMBus adapter drivers
@@ -1020,15 +1028,9 @@ CONFIG_I2C_ALGOPCA=y
1020# 1028#
1021CONFIG_I2C_PCA_PLATFORM=y 1029CONFIG_I2C_PCA_PLATFORM=y
1022# CONFIG_I2C_STUB is not set 1030# CONFIG_I2C_STUB is not set
1023
1024#
1025# Miscellaneous I2C Chip support
1026#
1027# CONFIG_SENSORS_TSL2550 is not set
1028# CONFIG_I2C_DEBUG_CORE is not set 1031# CONFIG_I2C_DEBUG_CORE is not set
1029# CONFIG_I2C_DEBUG_ALGO is not set 1032# CONFIG_I2C_DEBUG_ALGO is not set
1030# CONFIG_I2C_DEBUG_BUS is not set 1033# CONFIG_I2C_DEBUG_BUS is not set
1031# CONFIG_I2C_DEBUG_CHIP is not set
1032# CONFIG_SPI is not set 1034# CONFIG_SPI is not set
1033 1035
1034# 1036#
@@ -1043,13 +1045,17 @@ CONFIG_GPIOLIB=y
1043# 1045#
1044# Memory mapped GPIO expanders: 1046# Memory mapped GPIO expanders:
1045# 1047#
1048# CONFIG_GPIO_IT8761E is not set
1049# CONFIG_GPIO_SCH is not set
1046 1050
1047# 1051#
1048# I2C GPIO expanders: 1052# I2C GPIO expanders:
1049# 1053#
1054# CONFIG_GPIO_MAX7300 is not set
1050# CONFIG_GPIO_MAX732X is not set 1055# CONFIG_GPIO_MAX732X is not set
1051# CONFIG_GPIO_PCA953X is not set 1056# CONFIG_GPIO_PCA953X is not set
1052# CONFIG_GPIO_PCF857X is not set 1057# CONFIG_GPIO_PCF857X is not set
1058# CONFIG_GPIO_ADP5588 is not set
1053 1059
1054# 1060#
1055# PCI GPIO expanders: 1061# PCI GPIO expanders:
@@ -1082,10 +1088,11 @@ CONFIG_HWMON=y
1082# CONFIG_SENSORS_ADM1029 is not set 1088# CONFIG_SENSORS_ADM1029 is not set
1083# CONFIG_SENSORS_ADM1031 is not set 1089# CONFIG_SENSORS_ADM1031 is not set
1084# CONFIG_SENSORS_ADM9240 is not set 1090# CONFIG_SENSORS_ADM9240 is not set
1091# CONFIG_SENSORS_ADT7411 is not set
1085# CONFIG_SENSORS_ADT7462 is not set 1092# CONFIG_SENSORS_ADT7462 is not set
1086# CONFIG_SENSORS_ADT7470 is not set 1093# CONFIG_SENSORS_ADT7470 is not set
1087# CONFIG_SENSORS_ADT7473 is not set
1088# CONFIG_SENSORS_ADT7475 is not set 1094# CONFIG_SENSORS_ADT7475 is not set
1095# CONFIG_SENSORS_ASC7621 is not set
1089# CONFIG_SENSORS_ATXP1 is not set 1096# CONFIG_SENSORS_ATXP1 is not set
1090# CONFIG_SENSORS_DS1621 is not set 1097# CONFIG_SENSORS_DS1621 is not set
1091# CONFIG_SENSORS_I5K_AMB is not set 1098# CONFIG_SENSORS_I5K_AMB is not set
@@ -1123,6 +1130,7 @@ CONFIG_HWMON=y
1123# CONFIG_SENSORS_SMSC47M192 is not set 1130# CONFIG_SENSORS_SMSC47M192 is not set
1124# CONFIG_SENSORS_SMSC47B397 is not set 1131# CONFIG_SENSORS_SMSC47B397 is not set
1125# CONFIG_SENSORS_ADS7828 is not set 1132# CONFIG_SENSORS_ADS7828 is not set
1133# CONFIG_SENSORS_AMC6821 is not set
1126# CONFIG_SENSORS_THMC50 is not set 1134# CONFIG_SENSORS_THMC50 is not set
1127# CONFIG_SENSORS_TMP401 is not set 1135# CONFIG_SENSORS_TMP401 is not set
1128# CONFIG_SENSORS_TMP421 is not set 1136# CONFIG_SENSORS_TMP421 is not set
@@ -1151,21 +1159,26 @@ CONFIG_SSB_POSSIBLE=y
1151# Multifunction device drivers 1159# Multifunction device drivers
1152# 1160#
1153# CONFIG_MFD_CORE is not set 1161# CONFIG_MFD_CORE is not set
1162# CONFIG_MFD_88PM860X is not set
1154CONFIG_MFD_SM501=y 1163CONFIG_MFD_SM501=y
1155# CONFIG_MFD_SM501_GPIO is not set 1164# CONFIG_MFD_SM501_GPIO is not set
1156# CONFIG_MFD_SH_MOBILE_SDHI is not set 1165# CONFIG_MFD_SH_MOBILE_SDHI is not set
1157# CONFIG_HTC_PASIC3 is not set 1166# CONFIG_HTC_PASIC3 is not set
1167# CONFIG_HTC_I2CPLD is not set
1158# CONFIG_TPS65010 is not set 1168# CONFIG_TPS65010 is not set
1159# CONFIG_TWL4030_CORE is not set 1169# CONFIG_TWL4030_CORE is not set
1160# CONFIG_MFD_TMIO is not set 1170# CONFIG_MFD_TMIO is not set
1161# CONFIG_PMIC_DA903X is not set 1171# CONFIG_PMIC_DA903X is not set
1162# CONFIG_PMIC_ADP5520 is not set 1172# CONFIG_PMIC_ADP5520 is not set
1173# CONFIG_MFD_MAX8925 is not set
1163# CONFIG_MFD_WM8400 is not set 1174# CONFIG_MFD_WM8400 is not set
1164# CONFIG_MFD_WM831X is not set 1175# CONFIG_MFD_WM831X is not set
1165# CONFIG_MFD_WM8350_I2C is not set 1176# CONFIG_MFD_WM8350_I2C is not set
1177# CONFIG_MFD_WM8994 is not set
1166# CONFIG_MFD_PCF50633 is not set 1178# CONFIG_MFD_PCF50633 is not set
1167# CONFIG_AB3100_CORE is not set 1179# CONFIG_AB3100_CORE is not set
1168# CONFIG_MFD_88PM8607 is not set 1180# CONFIG_MFD_TIMBERDALE is not set
1181# CONFIG_LPC_SCH is not set
1169# CONFIG_REGULATOR is not set 1182# CONFIG_REGULATOR is not set
1170CONFIG_MEDIA_SUPPORT=y 1183CONFIG_MEDIA_SUPPORT=y
1171 1184
@@ -1187,6 +1200,7 @@ CONFIG_VIDEO_IR=y
1187# Graphics support 1200# Graphics support
1188# 1201#
1189CONFIG_VGA_ARB=y 1202CONFIG_VGA_ARB=y
1203CONFIG_VGA_ARB_MAX_GPUS=16
1190# CONFIG_DRM is not set 1204# CONFIG_DRM is not set
1191# CONFIG_VGASTATE is not set 1205# CONFIG_VGASTATE is not set
1192# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1206# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1283,6 +1297,7 @@ CONFIG_USB_HID=y
1283# 1297#
1284# Special HID drivers 1298# Special HID drivers
1285# 1299#
1300# CONFIG_HID_3M_PCT is not set
1286CONFIG_HID_A4TECH=y 1301CONFIG_HID_A4TECH=y
1287CONFIG_HID_APPLE=y 1302CONFIG_HID_APPLE=y
1288CONFIG_HID_BELKIN=y 1303CONFIG_HID_BELKIN=y
@@ -1298,14 +1313,19 @@ CONFIG_HID_GYRATION=y
1298CONFIG_HID_LOGITECH=y 1313CONFIG_HID_LOGITECH=y
1299# CONFIG_LOGITECH_FF is not set 1314# CONFIG_LOGITECH_FF is not set
1300# CONFIG_LOGIRUMBLEPAD2_FF is not set 1315# CONFIG_LOGIRUMBLEPAD2_FF is not set
1316# CONFIG_LOGIG940_FF is not set
1301CONFIG_HID_MICROSOFT=y 1317CONFIG_HID_MICROSOFT=y
1318# CONFIG_HID_MOSART is not set
1302CONFIG_HID_MONTEREY=y 1319CONFIG_HID_MONTEREY=y
1303# CONFIG_HID_NTRIG is not set 1320# CONFIG_HID_NTRIG is not set
1321# CONFIG_HID_ORTEK is not set
1304CONFIG_HID_PANTHERLORD=y 1322CONFIG_HID_PANTHERLORD=y
1305# CONFIG_PANTHERLORD_FF is not set 1323# CONFIG_PANTHERLORD_FF is not set
1306CONFIG_HID_PETALYNX=y 1324CONFIG_HID_PETALYNX=y
1325# CONFIG_HID_QUANTA is not set
1307CONFIG_HID_SAMSUNG=y 1326CONFIG_HID_SAMSUNG=y
1308CONFIG_HID_SONY=y 1327CONFIG_HID_SONY=y
1328# CONFIG_HID_STANTUM is not set
1309CONFIG_HID_SUNPLUS=y 1329CONFIG_HID_SUNPLUS=y
1310# CONFIG_HID_GREENASIA is not set 1330# CONFIG_HID_GREENASIA is not set
1311# CONFIG_HID_SMARTJOYPLUS is not set 1331# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1326,7 +1346,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
1326CONFIG_USB_DEVICEFS=y 1346CONFIG_USB_DEVICEFS=y
1327CONFIG_USB_DEVICE_CLASS=y 1347CONFIG_USB_DEVICE_CLASS=y
1328# CONFIG_USB_DYNAMIC_MINORS is not set 1348# CONFIG_USB_DYNAMIC_MINORS is not set
1329# CONFIG_USB_SUSPEND is not set
1330# CONFIG_USB_OTG is not set 1349# CONFIG_USB_OTG is not set
1331# CONFIG_USB_OTG_WHITELIST is not set 1350# CONFIG_USB_OTG_WHITELIST is not set
1332# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1351# CONFIG_USB_OTG_BLACKLIST_HUB is not set
@@ -1405,7 +1424,6 @@ CONFIG_USB_STORAGE=y
1405# CONFIG_USB_RIO500 is not set 1424# CONFIG_USB_RIO500 is not set
1406# CONFIG_USB_LEGOTOWER is not set 1425# CONFIG_USB_LEGOTOWER is not set
1407# CONFIG_USB_LCD is not set 1426# CONFIG_USB_LCD is not set
1408# CONFIG_USB_BERRY_CHARGE is not set
1409# CONFIG_USB_LED is not set 1427# CONFIG_USB_LED is not set
1410# CONFIG_USB_CYPRESS_CY7C63 is not set 1428# CONFIG_USB_CYPRESS_CY7C63 is not set
1411# CONFIG_USB_CYTHERM is not set 1429# CONFIG_USB_CYTHERM is not set
@@ -1417,7 +1435,6 @@ CONFIG_USB_STORAGE=y
1417# CONFIG_USB_IOWARRIOR is not set 1435# CONFIG_USB_IOWARRIOR is not set
1418# CONFIG_USB_TEST is not set 1436# CONFIG_USB_TEST is not set
1419# CONFIG_USB_ISIGHTFW is not set 1437# CONFIG_USB_ISIGHTFW is not set
1420# CONFIG_USB_VST is not set
1421# CONFIG_USB_GADGET is not set 1438# CONFIG_USB_GADGET is not set
1422 1439
1423# 1440#
@@ -1584,6 +1601,7 @@ CONFIG_MISC_FILESYSTEMS=y
1584# CONFIG_BFS_FS is not set 1601# CONFIG_BFS_FS is not set
1585# CONFIG_EFS_FS is not set 1602# CONFIG_EFS_FS is not set
1586# CONFIG_JFFS2_FS is not set 1603# CONFIG_JFFS2_FS is not set
1604# CONFIG_LOGFS is not set
1587# CONFIG_CRAMFS is not set 1605# CONFIG_CRAMFS is not set
1588# CONFIG_SQUASHFS is not set 1606# CONFIG_SQUASHFS is not set
1589# CONFIG_VXFS_FS is not set 1607# CONFIG_VXFS_FS is not set
@@ -1610,6 +1628,7 @@ CONFIG_SUNRPC_GSS=y
1610CONFIG_RPCSEC_GSS_KRB5=y 1628CONFIG_RPCSEC_GSS_KRB5=y
1611# CONFIG_RPCSEC_GSS_SPKM3 is not set 1629# CONFIG_RPCSEC_GSS_SPKM3 is not set
1612# CONFIG_SMB_FS is not set 1630# CONFIG_SMB_FS is not set
1631# CONFIG_CEPH_FS is not set
1613# CONFIG_CIFS is not set 1632# CONFIG_CIFS is not set
1614# CONFIG_NCP_FS is not set 1633# CONFIG_NCP_FS is not set
1615# CONFIG_CODA_FS is not set 1634# CONFIG_CODA_FS is not set
@@ -1688,6 +1707,7 @@ CONFIG_SCHED_DEBUG=y
1688# CONFIG_TIMER_STATS is not set 1707# CONFIG_TIMER_STATS is not set
1689# CONFIG_DEBUG_OBJECTS is not set 1708# CONFIG_DEBUG_OBJECTS is not set
1690# CONFIG_DEBUG_SLAB is not set 1709# CONFIG_DEBUG_SLAB is not set
1710# CONFIG_DEBUG_KMEMLEAK is not set
1691# CONFIG_DEBUG_RT_MUTEXES is not set 1711# CONFIG_DEBUG_RT_MUTEXES is not set
1692# CONFIG_RT_MUTEX_TESTER is not set 1712# CONFIG_RT_MUTEX_TESTER is not set
1693# CONFIG_DEBUG_SPINLOCK is not set 1713# CONFIG_DEBUG_SPINLOCK is not set
@@ -1713,6 +1733,7 @@ CONFIG_FRAME_POINTER=y
1713# CONFIG_BACKTRACE_SELF_TEST is not set 1733# CONFIG_BACKTRACE_SELF_TEST is not set
1714# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1734# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1715# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1735# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1736# CONFIG_LKDTM is not set
1716# CONFIG_FAULT_INJECTION is not set 1737# CONFIG_FAULT_INJECTION is not set
1717# CONFIG_LATENCYTOP is not set 1738# CONFIG_LATENCYTOP is not set
1718CONFIG_SYSCTL_SYSCALL_CHECK=y 1739CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1846,6 +1867,7 @@ CONFIG_CRYPTO_DES=y
1846# 1867#
1847# CONFIG_CRYPTO_ANSI_CPRNG is not set 1868# CONFIG_CRYPTO_ANSI_CPRNG is not set
1848# CONFIG_CRYPTO_HW is not set 1869# CONFIG_CRYPTO_HW is not set
1870# CONFIG_VIRTUALIZATION is not set
1849# CONFIG_BINARY_PRINTF is not set 1871# CONFIG_BINARY_PRINTF is not set
1850 1872
1851# 1873#
generated by cgit v1.2.2 (git 2.25.0) at 2025-12-02 11:29:17 -0500