aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-04-27 01:06:26 -0400
committerPaul Mundt <lethal@linux-sh.org>2009-04-27 01:06:26 -0400
commitfc4967b8c6a1540ebce9ac48e44b8d44e7fac971 (patch)
treea40b3c06e74ca16e29a6bd66c6f09ce7d579bbc6 /arch
parent339b042bb408877dcb734d896cdb52dd20600aab (diff)
sh: update defconfigs for PCI changes.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/configs/ap325rxa_defconfig37
-rw-r--r--arch/sh/configs/cayman_defconfig71
-rw-r--r--arch/sh/configs/dreamcast_defconfig39
-rw-r--r--arch/sh/configs/edosk7705_defconfig29
-rw-r--r--arch/sh/configs/edosk7760_defconfig32
-rw-r--r--arch/sh/configs/espt_defconfig39
-rw-r--r--arch/sh/configs/hp6xx_defconfig35
-rw-r--r--arch/sh/configs/landisk_defconfig48
-rw-r--r--arch/sh/configs/lboxre2_defconfig44
-rw-r--r--arch/sh/configs/magicpanelr2_defconfig30
-rw-r--r--arch/sh/configs/microdev_defconfig36
-rw-r--r--arch/sh/configs/migor_defconfig36
-rw-r--r--arch/sh/configs/polaris_defconfig30
-rw-r--r--arch/sh/configs/r7780mp_defconfig36
-rw-r--r--arch/sh/configs/r7785rp_defconfig36
-rw-r--r--arch/sh/configs/rsk7201_defconfig37
-rw-r--r--arch/sh/configs/rsk7203_defconfig40
-rw-r--r--arch/sh/configs/rts7751r2d1_defconfig43
-rw-r--r--arch/sh/configs/rts7751r2dplus_defconfig43
-rw-r--r--arch/sh/configs/sdk7780_defconfig38
-rw-r--r--arch/sh/configs/se7206_defconfig35
-rw-r--r--arch/sh/configs/se7343_defconfig42
-rw-r--r--arch/sh/configs/se7619_defconfig35
-rw-r--r--arch/sh/configs/se7705_defconfig34
-rw-r--r--arch/sh/configs/se7712_defconfig30
-rw-r--r--arch/sh/configs/se7721_defconfig33
-rw-r--r--arch/sh/configs/se7722_defconfig38
-rw-r--r--arch/sh/configs/se7750_defconfig34
-rw-r--r--arch/sh/configs/se7751_defconfig34
-rw-r--r--arch/sh/configs/se7780_defconfig38
-rw-r--r--arch/sh/configs/sh03_defconfig43
-rw-r--r--arch/sh/configs/sh7710voipgw_defconfig35
-rw-r--r--arch/sh/configs/sh7724_generic_defconfig4
-rw-r--r--arch/sh/configs/sh7763rdp_defconfig35
-rw-r--r--arch/sh/configs/sh7785lcr_32bit_defconfig37
-rw-r--r--arch/sh/configs/sh7785lcr_defconfig6
-rw-r--r--arch/sh/configs/shmin_defconfig31
-rw-r--r--arch/sh/configs/shx3_defconfig32
-rw-r--r--arch/sh/configs/snapgear_defconfig40
-rw-r--r--arch/sh/configs/systemh_defconfig39
-rw-r--r--arch/sh/configs/titan_defconfig40
-rw-r--r--arch/sh/configs/ul2_defconfig37
-rw-r--r--arch/sh/configs/urquell_defconfig39
43 files changed, 1247 insertions, 303 deletions
diff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig
index c8d982a8a2e6..022f70e0ea03 100644
--- a/arch/sh/configs/ap325rxa_defconfig
+++ b/arch/sh/configs/ap325rxa_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 17:46:53 2009 4# Mon Apr 27 12:42:06 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -74,6 +75,7 @@ CONFIG_EMBEDDED=y
74CONFIG_UID16=y 75CONFIG_UID16=y
75CONFIG_SYSCTL_SYSCALL=y 76CONFIG_SYSCTL_SYSCALL=y
76# CONFIG_KALLSYMS is not set 77# CONFIG_KALLSYMS is not set
78# CONFIG_STRIP_ASM_SYMS is not set
77CONFIG_HOTPLUG=y 79CONFIG_HOTPLUG=y
78CONFIG_PRINTK=y 80CONFIG_PRINTK=y
79CONFIG_BUG=y 81CONFIG_BUG=y
@@ -92,12 +94,15 @@ CONFIG_SLAB=y
92# CONFIG_SLUB is not set 94# CONFIG_SLUB is not set
93# CONFIG_SLOB is not set 95# CONFIG_SLOB is not set
94# CONFIG_PROFILING is not set 96# CONFIG_PROFILING is not set
97# CONFIG_MARKERS is not set
95CONFIG_HAVE_OPROFILE=y 98CONFIG_HAVE_OPROFILE=y
96CONFIG_HAVE_IOREMAP_PROT=y 99CONFIG_HAVE_IOREMAP_PROT=y
97CONFIG_HAVE_KPROBES=y 100CONFIG_HAVE_KPROBES=y
98CONFIG_HAVE_KRETPROBES=y 101CONFIG_HAVE_KRETPROBES=y
99CONFIG_HAVE_ARCH_TRACEHOOK=y 102CONFIG_HAVE_ARCH_TRACEHOOK=y
100CONFIG_HAVE_CLK=y 103CONFIG_HAVE_CLK=y
104CONFIG_HAVE_DMA_API_DEBUG=y
105# CONFIG_SLOW_WORK is not set
101CONFIG_HAVE_GENERIC_DMA_COHERENT=y 106CONFIG_HAVE_GENERIC_DMA_COHERENT=y
102CONFIG_SLABINFO=y 107CONFIG_SLABINFO=y
103CONFIG_RT_MUTEXES=y 108CONFIG_RT_MUTEXES=y
@@ -110,7 +115,6 @@ CONFIG_MODULE_UNLOAD=y
110# CONFIG_MODULE_SRCVERSION_ALL is not set 115# CONFIG_MODULE_SRCVERSION_ALL is not set
111CONFIG_BLOCK=y 116CONFIG_BLOCK=y
112# CONFIG_LBD is not set 117# CONFIG_LBD is not set
113# CONFIG_BLK_DEV_IO_TRACE is not set
114# CONFIG_BLK_DEV_BSG is not set 118# CONFIG_BLK_DEV_BSG is not set
115# CONFIG_BLK_DEV_INTEGRITY is not set 119# CONFIG_BLK_DEV_INTEGRITY is not set
116 120
@@ -159,6 +163,7 @@ CONFIG_ARCH_SHMOBILE=y
159# CONFIG_CPU_SUBTYPE_SH7760 is not set 163# CONFIG_CPU_SUBTYPE_SH7760 is not set
160# CONFIG_CPU_SUBTYPE_SH4_202 is not set 164# CONFIG_CPU_SUBTYPE_SH4_202 is not set
161CONFIG_CPU_SUBTYPE_SH7723=y 165CONFIG_CPU_SUBTYPE_SH7723=y
166# CONFIG_CPU_SUBTYPE_SH7724 is not set
162# CONFIG_CPU_SUBTYPE_SH7763 is not set 167# CONFIG_CPU_SUBTYPE_SH7763 is not set
163# CONFIG_CPU_SUBTYPE_SH7770 is not set 168# CONFIG_CPU_SUBTYPE_SH7770 is not set
164# CONFIG_CPU_SUBTYPE_SH7780 is not set 169# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -168,8 +173,6 @@ CONFIG_CPU_SUBTYPE_SH7723=y
168# CONFIG_CPU_SUBTYPE_SH7343 is not set 173# CONFIG_CPU_SUBTYPE_SH7343 is not set
169# CONFIG_CPU_SUBTYPE_SH7722 is not set 174# CONFIG_CPU_SUBTYPE_SH7722 is not set
170# CONFIG_CPU_SUBTYPE_SH7366 is not set 175# CONFIG_CPU_SUBTYPE_SH7366 is not set
171# CONFIG_CPU_SUBTYPE_SH5_101 is not set
172# CONFIG_CPU_SUBTYPE_SH5_103 is not set
173 176
174# 177#
175# Memory management options 178# Memory management options
@@ -573,6 +576,7 @@ CONFIG_SCSI_WAIT_SCAN=m
573CONFIG_SCSI_LOWLEVEL=y 576CONFIG_SCSI_LOWLEVEL=y
574# CONFIG_ISCSI_TCP is not set 577# CONFIG_ISCSI_TCP is not set
575# CONFIG_LIBFC is not set 578# CONFIG_LIBFC is not set
579# CONFIG_LIBFCOE is not set
576# CONFIG_SCSI_DEBUG is not set 580# CONFIG_SCSI_DEBUG is not set
577# CONFIG_SCSI_DH is not set 581# CONFIG_SCSI_DH is not set
578# CONFIG_SCSI_OSD_INITIATOR is not set 582# CONFIG_SCSI_OSD_INITIATOR is not set
@@ -695,6 +699,7 @@ CONFIG_DEVKMEM=y
695# 699#
696# Non-8250 serial port support 700# Non-8250 serial port support
697# 701#
702# CONFIG_SERIAL_MAX3100 is not set
698CONFIG_SERIAL_SH_SCI=y 703CONFIG_SERIAL_SH_SCI=y
699CONFIG_SERIAL_SH_SCI_NR_UARTS=6 704CONFIG_SERIAL_SH_SCI_NR_UARTS=6
700CONFIG_SERIAL_SH_SCI_CONSOLE=y 705CONFIG_SERIAL_SH_SCI_CONSOLE=y
@@ -1030,6 +1035,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y
1030CONFIG_EXT2_FS_SECURITY=y 1035CONFIG_EXT2_FS_SECURITY=y
1031# CONFIG_EXT2_FS_XIP is not set 1036# CONFIG_EXT2_FS_XIP is not set
1032CONFIG_EXT3_FS=y 1037CONFIG_EXT3_FS=y
1038# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1033CONFIG_EXT3_FS_XATTR=y 1039CONFIG_EXT3_FS_XATTR=y
1034CONFIG_EXT3_FS_POSIX_ACL=y 1040CONFIG_EXT3_FS_POSIX_ACL=y
1035CONFIG_EXT3_FS_SECURITY=y 1041CONFIG_EXT3_FS_SECURITY=y
@@ -1052,6 +1058,11 @@ CONFIG_INOTIFY_USER=y
1052# CONFIG_FUSE_FS is not set 1058# CONFIG_FUSE_FS is not set
1053 1059
1054# 1060#
1061# Caches
1062#
1063# CONFIG_FSCACHE is not set
1064
1065#
1055# CD-ROM/DVD Filesystems 1066# CD-ROM/DVD Filesystems
1056# 1067#
1057# CONFIG_ISO9660_FS is not set 1068# CONFIG_ISO9660_FS is not set
@@ -1100,6 +1111,7 @@ CONFIG_MISC_FILESYSTEMS=y
1100# CONFIG_ROMFS_FS is not set 1111# CONFIG_ROMFS_FS is not set
1101# CONFIG_SYSV_FS is not set 1112# CONFIG_SYSV_FS is not set
1102# CONFIG_UFS_FS is not set 1113# CONFIG_UFS_FS is not set
1114# CONFIG_NILFS2_FS is not set
1103CONFIG_NETWORK_FILESYSTEMS=y 1115CONFIG_NETWORK_FILESYSTEMS=y
1104CONFIG_NFS_FS=y 1116CONFIG_NFS_FS=y
1105CONFIG_NFS_V3=y 1117CONFIG_NFS_V3=y
@@ -1191,10 +1203,24 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
1191CONFIG_HAVE_FUNCTION_TRACER=y 1203CONFIG_HAVE_FUNCTION_TRACER=y
1192CONFIG_HAVE_DYNAMIC_FTRACE=y 1204CONFIG_HAVE_DYNAMIC_FTRACE=y
1193CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1205CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1206CONFIG_TRACING_SUPPORT=y
1194 1207
1195# 1208#
1196# Tracers 1209# Tracers
1197# 1210#
1211# CONFIG_FUNCTION_TRACER is not set
1212# CONFIG_IRQSOFF_TRACER is not set
1213# CONFIG_PREEMPT_TRACER is not set
1214# CONFIG_SCHED_TRACER is not set
1215# CONFIG_CONTEXT_SWITCH_TRACER is not set
1216# CONFIG_EVENT_TRACER is not set
1217# CONFIG_BOOT_TRACER is not set
1218# CONFIG_TRACE_BRANCH_PROFILING is not set
1219# CONFIG_STACK_TRACER is not set
1220# CONFIG_KMEMTRACE is not set
1221# CONFIG_WORKQUEUE_TRACER is not set
1222# CONFIG_BLK_DEV_IO_TRACE is not set
1223# CONFIG_DMA_API_DEBUG is not set
1198# CONFIG_SAMPLES is not set 1224# CONFIG_SAMPLES is not set
1199CONFIG_HAVE_ARCH_KGDB=y 1225CONFIG_HAVE_ARCH_KGDB=y
1200# CONFIG_SH_STANDARD_BIOS is not set 1226# CONFIG_SH_STANDARD_BIOS is not set
@@ -1303,6 +1329,7 @@ CONFIG_CRYPTO_CBC=y
1303# 1329#
1304# CONFIG_CRYPTO_ANSI_CPRNG is not set 1330# CONFIG_CRYPTO_ANSI_CPRNG is not set
1305CONFIG_CRYPTO_HW=y 1331CONFIG_CRYPTO_HW=y
1332# CONFIG_BINARY_PRINTF is not set
1306 1333
1307# 1334#
1308# Library routines 1335# Library routines
diff --git a/arch/sh/configs/cayman_defconfig b/arch/sh/configs/cayman_defconfig
index fa5fc1e1e980..40301f86a45c 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.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 17:49:14 2009 4# Mon Apr 27 13:42:53 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7# CONFIG_SUPERH32 is not set 7# CONFIG_SUPERH32 is not set
@@ -40,6 +40,7 @@ CONFIG_LOCALVERSION_AUTO=y
40CONFIG_SWAP=y 40CONFIG_SWAP=y
41# CONFIG_SYSVIPC is not set 41# CONFIG_SYSVIPC is not set
42CONFIG_POSIX_MQUEUE=y 42CONFIG_POSIX_MQUEUE=y
43CONFIG_POSIX_MQUEUE_SYSCTL=y
43# CONFIG_BSD_PROCESS_ACCT is not set 44# CONFIG_BSD_PROCESS_ACCT is not set
44# CONFIG_TASKSTATS is not set 45# CONFIG_TASKSTATS is not set
45# CONFIG_AUDIT is not set 46# CONFIG_AUDIT is not set
@@ -70,6 +71,7 @@ CONFIG_SYSCTL_SYSCALL=y
70CONFIG_KALLSYMS=y 71CONFIG_KALLSYMS=y
71# CONFIG_KALLSYMS_ALL is not set 72# CONFIG_KALLSYMS_ALL is not set
72# CONFIG_KALLSYMS_EXTRA_PASS is not set 73# CONFIG_KALLSYMS_EXTRA_PASS is not set
74# CONFIG_STRIP_ASM_SYMS is not set
73CONFIG_HOTPLUG=y 75CONFIG_HOTPLUG=y
74CONFIG_PRINTK=y 76CONFIG_PRINTK=y
75CONFIG_BUG=y 77CONFIG_BUG=y
@@ -89,10 +91,13 @@ CONFIG_SLAB=y
89# CONFIG_SLUB is not set 91# CONFIG_SLUB is not set
90# CONFIG_SLOB is not set 92# CONFIG_SLOB is not set
91# CONFIG_PROFILING is not set 93# CONFIG_PROFILING is not set
94# CONFIG_MARKERS is not set
92CONFIG_HAVE_OPROFILE=y 95CONFIG_HAVE_OPROFILE=y
93CONFIG_HAVE_IOREMAP_PROT=y 96CONFIG_HAVE_IOREMAP_PROT=y
94CONFIG_HAVE_ARCH_TRACEHOOK=y 97CONFIG_HAVE_ARCH_TRACEHOOK=y
95CONFIG_HAVE_CLK=y 98CONFIG_HAVE_CLK=y
99CONFIG_HAVE_DMA_API_DEBUG=y
100# CONFIG_SLOW_WORK is not set
96CONFIG_HAVE_GENERIC_DMA_COHERENT=y 101CONFIG_HAVE_GENERIC_DMA_COHERENT=y
97CONFIG_SLABINFO=y 102CONFIG_SLABINFO=y
98CONFIG_RT_MUTEXES=y 103CONFIG_RT_MUTEXES=y
@@ -105,7 +110,6 @@ CONFIG_MODULE_UNLOAD=y
105# CONFIG_MODULE_SRCVERSION_ALL is not set 110# CONFIG_MODULE_SRCVERSION_ALL is not set
106CONFIG_BLOCK=y 111CONFIG_BLOCK=y
107# CONFIG_LBD is not set 112# CONFIG_LBD is not set
108# CONFIG_BLK_DEV_IO_TRACE is not set
109# CONFIG_BLK_DEV_BSG is not set 113# CONFIG_BLK_DEV_BSG is not set
110# CONFIG_BLK_DEV_INTEGRITY is not set 114# CONFIG_BLK_DEV_INTEGRITY is not set
111 115
@@ -127,39 +131,6 @@ CONFIG_DEFAULT_IOSCHED="cfq"
127# System type 131# System type
128# 132#
129CONFIG_CPU_SH5=y 133CONFIG_CPU_SH5=y
130# CONFIG_CPU_SUBTYPE_SH7619 is not set
131# CONFIG_CPU_SUBTYPE_SH7201 is not set
132# CONFIG_CPU_SUBTYPE_SH7203 is not set
133# CONFIG_CPU_SUBTYPE_SH7206 is not set
134# CONFIG_CPU_SUBTYPE_SH7263 is not set
135# CONFIG_CPU_SUBTYPE_MXG is not set
136# CONFIG_CPU_SUBTYPE_SH7705 is not set
137# CONFIG_CPU_SUBTYPE_SH7706 is not set
138# CONFIG_CPU_SUBTYPE_SH7707 is not set
139# CONFIG_CPU_SUBTYPE_SH7708 is not set
140# CONFIG_CPU_SUBTYPE_SH7709 is not set
141# CONFIG_CPU_SUBTYPE_SH7710 is not set
142# CONFIG_CPU_SUBTYPE_SH7712 is not set
143# CONFIG_CPU_SUBTYPE_SH7720 is not set
144# CONFIG_CPU_SUBTYPE_SH7721 is not set
145# CONFIG_CPU_SUBTYPE_SH7750 is not set
146# CONFIG_CPU_SUBTYPE_SH7091 is not set
147# CONFIG_CPU_SUBTYPE_SH7750R is not set
148# CONFIG_CPU_SUBTYPE_SH7750S is not set
149# CONFIG_CPU_SUBTYPE_SH7751 is not set
150# CONFIG_CPU_SUBTYPE_SH7751R is not set
151# CONFIG_CPU_SUBTYPE_SH7760 is not set
152# CONFIG_CPU_SUBTYPE_SH4_202 is not set
153# CONFIG_CPU_SUBTYPE_SH7723 is not set
154# CONFIG_CPU_SUBTYPE_SH7763 is not set
155# CONFIG_CPU_SUBTYPE_SH7770 is not set
156# CONFIG_CPU_SUBTYPE_SH7780 is not set
157# CONFIG_CPU_SUBTYPE_SH7785 is not set
158# CONFIG_CPU_SUBTYPE_SH7786 is not set
159# CONFIG_CPU_SUBTYPE_SHX3 is not set
160# CONFIG_CPU_SUBTYPE_SH7343 is not set
161# CONFIG_CPU_SUBTYPE_SH7722 is not set
162# CONFIG_CPU_SUBTYPE_SH7366 is not set
163CONFIG_CPU_SUBTYPE_SH5_101=y 134CONFIG_CPU_SUBTYPE_SH5_101=y
164# CONFIG_CPU_SUBTYPE_SH5_103 is not set 135# CONFIG_CPU_SUBTYPE_SH5_103 is not set
165 136
@@ -279,8 +250,6 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000
279# 250#
280CONFIG_PCI=y 251CONFIG_PCI=y
281CONFIG_SH_PCIDMA_NONCOHERENT=y 252CONFIG_SH_PCIDMA_NONCOHERENT=y
282CONFIG_PCI_AUTO=y
283CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
284# CONFIG_PCIEPORTBUS is not set 253# CONFIG_PCIEPORTBUS is not set
285# CONFIG_ARCH_SUPPORTS_MSI is not set 254# CONFIG_ARCH_SUPPORTS_MSI is not set
286CONFIG_PCI_LEGACY=y 255CONFIG_PCI_LEGACY=y
@@ -492,6 +461,7 @@ CONFIG_SCSI_LOWLEVEL=y
492# CONFIG_SCSI_MPT2SAS is not set 461# CONFIG_SCSI_MPT2SAS is not set
493# CONFIG_SCSI_HPTIOP is not set 462# CONFIG_SCSI_HPTIOP is not set
494# CONFIG_LIBFC is not set 463# CONFIG_LIBFC is not set
464# CONFIG_LIBFCOE is not set
495# CONFIG_FCOE is not set 465# CONFIG_FCOE is not set
496# CONFIG_SCSI_DMX3191D is not set 466# CONFIG_SCSI_DMX3191D is not set
497# CONFIG_SCSI_FUTURE_DOMAIN is not set 467# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -568,6 +538,7 @@ CONFIG_NETDEV_1000=y
568# CONFIG_E1000E is not set 538# CONFIG_E1000E is not set
569# CONFIG_IP1000 is not set 539# CONFIG_IP1000 is not set
570# CONFIG_IGB is not set 540# CONFIG_IGB is not set
541# CONFIG_IGBVF is not set
571# CONFIG_NS83820 is not set 542# CONFIG_NS83820 is not set
572# CONFIG_HAMACHI is not set 543# CONFIG_HAMACHI is not set
573# CONFIG_YELLOWFIN is not set 544# CONFIG_YELLOWFIN is not set
@@ -591,6 +562,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
591# CONFIG_IXGBE is not set 562# CONFIG_IXGBE is not set
592# CONFIG_IXGB is not set 563# CONFIG_IXGB is not set
593# CONFIG_S2IO is not set 564# CONFIG_S2IO is not set
565# CONFIG_VXGE is not set
594# CONFIG_MYRI10GE is not set 566# CONFIG_MYRI10GE is not set
595# CONFIG_NETXEN_NIC is not set 567# CONFIG_NETXEN_NIC is not set
596# CONFIG_NIU is not set 568# CONFIG_NIU is not set
@@ -779,6 +751,7 @@ CONFIG_HWMON=y
779# CONFIG_SENSORS_F71805F is not set 751# CONFIG_SENSORS_F71805F is not set
780# CONFIG_SENSORS_F71882FG is not set 752# CONFIG_SENSORS_F71882FG is not set
781# CONFIG_SENSORS_F75375S is not set 753# CONFIG_SENSORS_F75375S is not set
754# CONFIG_SENSORS_G760A is not set
782# CONFIG_SENSORS_GL518SM is not set 755# CONFIG_SENSORS_GL518SM is not set
783# CONFIG_SENSORS_GL520SM is not set 756# CONFIG_SENSORS_GL520SM is not set
784# CONFIG_SENSORS_IT87 is not set 757# CONFIG_SENSORS_IT87 is not set
@@ -1042,7 +1015,6 @@ CONFIG_HID=y
1042# 1015#
1043# Special HID drivers 1016# Special HID drivers
1044# 1017#
1045CONFIG_HID_COMPAT=y
1046CONFIG_USB_SUPPORT=y 1018CONFIG_USB_SUPPORT=y
1047CONFIG_USB_ARCH_HAS_HCD=y 1019CONFIG_USB_ARCH_HAS_HCD=y
1048CONFIG_USB_ARCH_HAS_OHCI=y 1020CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1082,6 +1054,7 @@ CONFIG_EXT2_FS=y
1082# CONFIG_EXT2_FS_XATTR is not set 1054# CONFIG_EXT2_FS_XATTR is not set
1083# CONFIG_EXT2_FS_XIP is not set 1055# CONFIG_EXT2_FS_XIP is not set
1084CONFIG_EXT3_FS=y 1056CONFIG_EXT3_FS=y
1057# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1085CONFIG_EXT3_FS_XATTR=y 1058CONFIG_EXT3_FS_XATTR=y
1086# CONFIG_EXT3_FS_POSIX_ACL is not set 1059# CONFIG_EXT3_FS_POSIX_ACL is not set
1087# CONFIG_EXT3_FS_SECURITY is not set 1060# CONFIG_EXT3_FS_SECURITY is not set
@@ -1105,6 +1078,11 @@ CONFIG_INOTIFY_USER=y
1105# CONFIG_FUSE_FS is not set 1078# CONFIG_FUSE_FS is not set
1106 1079
1107# 1080#
1081# Caches
1082#
1083# CONFIG_FSCACHE is not set
1084
1085#
1108# CD-ROM/DVD Filesystems 1086# CD-ROM/DVD Filesystems
1109# 1087#
1110# CONFIG_ISO9660_FS is not set 1088# CONFIG_ISO9660_FS is not set
@@ -1146,8 +1124,13 @@ CONFIG_MINIX_FS=y
1146# CONFIG_HPFS_FS is not set 1124# CONFIG_HPFS_FS is not set
1147# CONFIG_QNX4FS_FS is not set 1125# CONFIG_QNX4FS_FS is not set
1148CONFIG_ROMFS_FS=y 1126CONFIG_ROMFS_FS=y
1127CONFIG_ROMFS_BACKED_BY_BLOCK=y
1128# CONFIG_ROMFS_BACKED_BY_MTD is not set
1129# CONFIG_ROMFS_BACKED_BY_BOTH is not set
1130CONFIG_ROMFS_ON_BLOCK=y
1149# CONFIG_SYSV_FS is not set 1131# CONFIG_SYSV_FS is not set
1150# CONFIG_UFS_FS is not set 1132# CONFIG_UFS_FS is not set
1133# CONFIG_NILFS2_FS is not set
1151CONFIG_NETWORK_FILESYSTEMS=y 1134CONFIG_NETWORK_FILESYSTEMS=y
1152CONFIG_NFS_FS=y 1135CONFIG_NFS_FS=y
1153CONFIG_NFS_V3=y 1136CONFIG_NFS_V3=y
@@ -1208,6 +1191,9 @@ CONFIG_DEBUG_KERNEL=y
1208CONFIG_DETECT_SOFTLOCKUP=y 1191CONFIG_DETECT_SOFTLOCKUP=y
1209# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1192# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1210CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1193CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1194CONFIG_DETECT_HUNG_TASK=y
1195# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1196CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1211CONFIG_SCHED_DEBUG=y 1197CONFIG_SCHED_DEBUG=y
1212CONFIG_SCHEDSTATS=y 1198CONFIG_SCHEDSTATS=y
1213# CONFIG_TIMER_STATS is not set 1199# CONFIG_TIMER_STATS is not set
@@ -1241,15 +1227,21 @@ CONFIG_FRAME_POINTER=y
1241# CONFIG_LATENCYTOP is not set 1227# CONFIG_LATENCYTOP is not set
1242# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1228# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1243# CONFIG_PAGE_POISONING is not set 1229# CONFIG_PAGE_POISONING is not set
1230CONFIG_TRACING_SUPPORT=y
1244 1231
1245# 1232#
1246# Tracers 1233# Tracers
1247# 1234#
1248# CONFIG_SCHED_TRACER is not set 1235# CONFIG_SCHED_TRACER is not set
1249# CONFIG_CONTEXT_SWITCH_TRACER is not set 1236# CONFIG_CONTEXT_SWITCH_TRACER is not set
1237# CONFIG_EVENT_TRACER is not set
1250# CONFIG_BOOT_TRACER is not set 1238# CONFIG_BOOT_TRACER is not set
1251# CONFIG_TRACE_BRANCH_PROFILING is not set 1239# CONFIG_TRACE_BRANCH_PROFILING is not set
1240# CONFIG_KMEMTRACE is not set
1241# CONFIG_WORKQUEUE_TRACER is not set
1242# CONFIG_BLK_DEV_IO_TRACE is not set
1252# CONFIG_DYNAMIC_DEBUG is not set 1243# CONFIG_DYNAMIC_DEBUG is not set
1244# CONFIG_DMA_API_DEBUG is not set
1253# CONFIG_SAMPLES is not set 1245# CONFIG_SAMPLES is not set
1254# CONFIG_EARLY_SCIF_CONSOLE is not set 1246# CONFIG_EARLY_SCIF_CONSOLE is not set
1255# CONFIG_DEBUG_BOOTMEM is not set 1247# CONFIG_DEBUG_BOOTMEM is not set
@@ -1354,6 +1346,7 @@ CONFIG_CRYPTO=y
1354# CONFIG_CRYPTO_ANSI_CPRNG is not set 1346# CONFIG_CRYPTO_ANSI_CPRNG is not set
1355CONFIG_CRYPTO_HW=y 1347CONFIG_CRYPTO_HW=y
1356# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1348# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1349# CONFIG_BINARY_PRINTF is not set
1357 1350
1358# 1351#
1359# Library routines 1352# Library routines
diff --git a/arch/sh/configs/dreamcast_defconfig b/arch/sh/configs/dreamcast_defconfig
index 5c1123640142..1f3cc98330bf 100644
--- a/arch/sh/configs/dreamcast_defconfig
+++ b/arch/sh/configs/dreamcast_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 17:51:48 2009 4# Mon Apr 27 12:44:27 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -71,6 +72,7 @@ CONFIG_UID16=y
71# CONFIG_SYSCTL_SYSCALL is not set 72# CONFIG_SYSCTL_SYSCALL is not set
72CONFIG_KALLSYMS=y 73CONFIG_KALLSYMS=y
73# CONFIG_KALLSYMS_EXTRA_PASS is not set 74# CONFIG_KALLSYMS_EXTRA_PASS is not set
75# CONFIG_STRIP_ASM_SYMS is not set
74CONFIG_HOTPLUG=y 76CONFIG_HOTPLUG=y
75CONFIG_PRINTK=y 77CONFIG_PRINTK=y
76CONFIG_BUG=y 78CONFIG_BUG=y
@@ -90,6 +92,7 @@ CONFIG_SLAB=y
90# CONFIG_SLUB is not set 92# CONFIG_SLUB is not set
91# CONFIG_SLOB is not set 93# CONFIG_SLOB is not set
92CONFIG_PROFILING=y 94CONFIG_PROFILING=y
95# CONFIG_MARKERS is not set
93# CONFIG_OPROFILE is not set 96# CONFIG_OPROFILE is not set
94CONFIG_HAVE_OPROFILE=y 97CONFIG_HAVE_OPROFILE=y
95# CONFIG_KPROBES is not set 98# CONFIG_KPROBES is not set
@@ -98,6 +101,8 @@ CONFIG_HAVE_KPROBES=y
98CONFIG_HAVE_KRETPROBES=y 101CONFIG_HAVE_KRETPROBES=y
99CONFIG_HAVE_ARCH_TRACEHOOK=y 102CONFIG_HAVE_ARCH_TRACEHOOK=y
100CONFIG_HAVE_CLK=y 103CONFIG_HAVE_CLK=y
104CONFIG_HAVE_DMA_API_DEBUG=y
105# CONFIG_SLOW_WORK is not set
101CONFIG_HAVE_GENERIC_DMA_COHERENT=y 106CONFIG_HAVE_GENERIC_DMA_COHERENT=y
102CONFIG_SLABINFO=y 107CONFIG_SLABINFO=y
103CONFIG_RT_MUTEXES=y 108CONFIG_RT_MUTEXES=y
@@ -110,7 +115,6 @@ CONFIG_MODULE_UNLOAD=y
110# CONFIG_MODULE_SRCVERSION_ALL is not set 115# CONFIG_MODULE_SRCVERSION_ALL is not set
111CONFIG_BLOCK=y 116CONFIG_BLOCK=y
112# CONFIG_LBD is not set 117# CONFIG_LBD is not set
113# CONFIG_BLK_DEV_IO_TRACE is not set
114# CONFIG_BLK_DEV_BSG is not set 118# CONFIG_BLK_DEV_BSG is not set
115# CONFIG_BLK_DEV_INTEGRITY is not set 119# CONFIG_BLK_DEV_INTEGRITY is not set
116 120
@@ -156,6 +160,7 @@ CONFIG_CPU_SUBTYPE_SH7091=y
156# CONFIG_CPU_SUBTYPE_SH7760 is not set 160# CONFIG_CPU_SUBTYPE_SH7760 is not set
157# CONFIG_CPU_SUBTYPE_SH4_202 is not set 161# CONFIG_CPU_SUBTYPE_SH4_202 is not set
158# CONFIG_CPU_SUBTYPE_SH7723 is not set 162# CONFIG_CPU_SUBTYPE_SH7723 is not set
163# CONFIG_CPU_SUBTYPE_SH7724 is not set
159# CONFIG_CPU_SUBTYPE_SH7763 is not set 164# CONFIG_CPU_SUBTYPE_SH7763 is not set
160# CONFIG_CPU_SUBTYPE_SH7770 is not set 165# CONFIG_CPU_SUBTYPE_SH7770 is not set
161# CONFIG_CPU_SUBTYPE_SH7780 is not set 166# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -165,8 +170,6 @@ CONFIG_CPU_SUBTYPE_SH7091=y
165# CONFIG_CPU_SUBTYPE_SH7343 is not set 170# CONFIG_CPU_SUBTYPE_SH7343 is not set
166# CONFIG_CPU_SUBTYPE_SH7722 is not set 171# CONFIG_CPU_SUBTYPE_SH7722 is not set
167# CONFIG_CPU_SUBTYPE_SH7366 is not set 172# CONFIG_CPU_SUBTYPE_SH7366 is not set
168# CONFIG_CPU_SUBTYPE_SH5_101 is not set
169# CONFIG_CPU_SUBTYPE_SH5_103 is not set
170 173
171# 174#
172# Memory management options 175# Memory management options
@@ -271,7 +274,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
271CONFIG_SH_DMA_API=y 274CONFIG_SH_DMA_API=y
272CONFIG_SH_DMA=y 275CONFIG_SH_DMA=y
273CONFIG_SH_DMA_IRQ_MULTI=y 276CONFIG_SH_DMA_IRQ_MULTI=y
274CONFIG_NR_ONCHIP_DMA_CHANNELS=6 277CONFIG_NR_ONCHIP_DMA_CHANNELS=4
275CONFIG_NR_DMA_CHANNELS_BOOL=y 278CONFIG_NR_DMA_CHANNELS_BOOL=y
276CONFIG_NR_DMA_CHANNELS=9 279CONFIG_NR_DMA_CHANNELS=9
277# CONFIG_PVR2_DMA is not set 280# CONFIG_PVR2_DMA is not set
@@ -320,7 +323,6 @@ CONFIG_CMDLINE="console=ttySC1,115200 panic=3"
320CONFIG_MAPLE=y 323CONFIG_MAPLE=y
321CONFIG_PCI=y 324CONFIG_PCI=y
322CONFIG_SH_PCIDMA_NONCOHERENT=y 325CONFIG_SH_PCIDMA_NONCOHERENT=y
323CONFIG_PCI_AUTO=y
324# CONFIG_PCIEPORTBUS is not set 326# CONFIG_PCIEPORTBUS is not set
325# CONFIG_ARCH_SUPPORTS_MSI is not set 327# CONFIG_ARCH_SUPPORTS_MSI is not set
326CONFIG_PCI_LEGACY=y 328CONFIG_PCI_LEGACY=y
@@ -602,6 +604,7 @@ CONFIG_INPUT_MOUSE=y
602# CONFIG_MOUSE_APPLETOUCH is not set 604# CONFIG_MOUSE_APPLETOUCH is not set
603# CONFIG_MOUSE_BCM5974 is not set 605# CONFIG_MOUSE_BCM5974 is not set
604# CONFIG_MOUSE_VSXXXAA is not set 606# CONFIG_MOUSE_VSXXXAA is not set
607# CONFIG_MOUSE_MAPLE is not set
605# CONFIG_INPUT_JOYSTICK is not set 608# CONFIG_INPUT_JOYSTICK is not set
606# CONFIG_INPUT_TABLET is not set 609# CONFIG_INPUT_TABLET is not set
607# CONFIG_INPUT_TOUCHSCREEN is not set 610# CONFIG_INPUT_TOUCHSCREEN is not set
@@ -812,7 +815,6 @@ CONFIG_HID=y
812# 815#
813# Special HID drivers 816# Special HID drivers
814# 817#
815CONFIG_HID_COMPAT=y
816CONFIG_USB_SUPPORT=y 818CONFIG_USB_SUPPORT=y
817CONFIG_USB_ARCH_HAS_HCD=y 819CONFIG_USB_ARCH_HAS_HCD=y
818CONFIG_USB_ARCH_HAS_OHCI=y 820CONFIG_USB_ARCH_HAS_OHCI=y
@@ -867,6 +869,11 @@ CONFIG_INOTIFY_USER=y
867# CONFIG_FUSE_FS is not set 869# CONFIG_FUSE_FS is not set
868 870
869# 871#
872# Caches
873#
874# CONFIG_FSCACHE is not set
875
876#
870# CD-ROM/DVD Filesystems 877# CD-ROM/DVD Filesystems
871# 878#
872# CONFIG_ISO9660_FS is not set 879# CONFIG_ISO9660_FS is not set
@@ -910,6 +917,7 @@ CONFIG_MISC_FILESYSTEMS=y
910# CONFIG_ROMFS_FS is not set 917# CONFIG_ROMFS_FS is not set
911# CONFIG_SYSV_FS is not set 918# CONFIG_SYSV_FS is not set
912# CONFIG_UFS_FS is not set 919# CONFIG_UFS_FS is not set
920# CONFIG_NILFS2_FS is not set
913CONFIG_NETWORK_FILESYSTEMS=y 921CONFIG_NETWORK_FILESYSTEMS=y
914# CONFIG_NFS_FS is not set 922# CONFIG_NFS_FS is not set
915# CONFIG_NFSD is not set 923# CONFIG_NFSD is not set
@@ -947,10 +955,24 @@ CONFIG_FRAME_WARN=1024
947CONFIG_HAVE_FUNCTION_TRACER=y 955CONFIG_HAVE_FUNCTION_TRACER=y
948CONFIG_HAVE_DYNAMIC_FTRACE=y 956CONFIG_HAVE_DYNAMIC_FTRACE=y
949CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 957CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
958CONFIG_TRACING_SUPPORT=y
950 959
951# 960#
952# Tracers 961# Tracers
953# 962#
963# CONFIG_FUNCTION_TRACER is not set
964# CONFIG_IRQSOFF_TRACER is not set
965# CONFIG_PREEMPT_TRACER is not set
966# CONFIG_SCHED_TRACER is not set
967# CONFIG_CONTEXT_SWITCH_TRACER is not set
968# CONFIG_EVENT_TRACER is not set
969# CONFIG_BOOT_TRACER is not set
970# CONFIG_TRACE_BRANCH_PROFILING is not set
971# CONFIG_STACK_TRACER is not set
972# CONFIG_KMEMTRACE is not set
973# CONFIG_WORKQUEUE_TRACER is not set
974# CONFIG_BLK_DEV_IO_TRACE is not set
975# CONFIG_DMA_API_DEBUG is not set
954# CONFIG_SAMPLES is not set 976# CONFIG_SAMPLES is not set
955CONFIG_HAVE_ARCH_KGDB=y 977CONFIG_HAVE_ARCH_KGDB=y
956# CONFIG_SH_STANDARD_BIOS is not set 978# CONFIG_SH_STANDARD_BIOS is not set
@@ -1051,6 +1073,7 @@ CONFIG_CRYPTO=y
1051# CONFIG_CRYPTO_ANSI_CPRNG is not set 1073# CONFIG_CRYPTO_ANSI_CPRNG is not set
1052CONFIG_CRYPTO_HW=y 1074CONFIG_CRYPTO_HW=y
1053# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1075# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1076# CONFIG_BINARY_PRINTF is not set
1054 1077
1055# 1078#
1056# Library routines 1079# Library routines
diff --git a/arch/sh/configs/edosk7705_defconfig b/arch/sh/configs/edosk7705_defconfig
index f4c34b039312..d7092457ddc7 100644
--- a/arch/sh/configs/edosk7705_defconfig
+++ b/arch/sh/configs/edosk7705_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 17:54:02 2009 4# Mon Apr 27 12:45:04 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_FIND_NEXT_BIT=y 11CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -56,6 +57,7 @@ CONFIG_EMBEDDED=y
56# CONFIG_UID16 is not set 57# CONFIG_UID16 is not set
57# CONFIG_SYSCTL_SYSCALL is not set 58# CONFIG_SYSCTL_SYSCALL is not set
58# CONFIG_KALLSYMS is not set 59# CONFIG_KALLSYMS is not set
60# CONFIG_STRIP_ASM_SYMS is not set
59# CONFIG_HOTPLUG is not set 61# CONFIG_HOTPLUG is not set
60# CONFIG_PRINTK is not set 62# CONFIG_PRINTK is not set
61# CONFIG_BUG is not set 63# CONFIG_BUG is not set
@@ -74,12 +76,15 @@ CONFIG_SHMEM=y
74CONFIG_SLUB=y 76CONFIG_SLUB=y
75# CONFIG_SLOB is not set 77# CONFIG_SLOB is not set
76# CONFIG_PROFILING is not set 78# CONFIG_PROFILING is not set
79# CONFIG_MARKERS is not set
77CONFIG_HAVE_OPROFILE=y 80CONFIG_HAVE_OPROFILE=y
78CONFIG_HAVE_IOREMAP_PROT=y 81CONFIG_HAVE_IOREMAP_PROT=y
79CONFIG_HAVE_KPROBES=y 82CONFIG_HAVE_KPROBES=y
80CONFIG_HAVE_KRETPROBES=y 83CONFIG_HAVE_KRETPROBES=y
81CONFIG_HAVE_ARCH_TRACEHOOK=y 84CONFIG_HAVE_ARCH_TRACEHOOK=y
82CONFIG_HAVE_CLK=y 85CONFIG_HAVE_CLK=y
86CONFIG_HAVE_DMA_API_DEBUG=y
87# CONFIG_SLOW_WORK is not set
83CONFIG_HAVE_GENERIC_DMA_COHERENT=y 88CONFIG_HAVE_GENERIC_DMA_COHERENT=y
84CONFIG_BASE_SMALL=1 89CONFIG_BASE_SMALL=1
85# CONFIG_MODULES is not set 90# CONFIG_MODULES is not set
@@ -114,6 +119,7 @@ CONFIG_CPU_SUBTYPE_SH7705=y
114# CONFIG_CPU_SUBTYPE_SH7760 is not set 119# CONFIG_CPU_SUBTYPE_SH7760 is not set
115# CONFIG_CPU_SUBTYPE_SH4_202 is not set 120# CONFIG_CPU_SUBTYPE_SH4_202 is not set
116# CONFIG_CPU_SUBTYPE_SH7723 is not set 121# CONFIG_CPU_SUBTYPE_SH7723 is not set
122# CONFIG_CPU_SUBTYPE_SH7724 is not set
117# CONFIG_CPU_SUBTYPE_SH7763 is not set 123# CONFIG_CPU_SUBTYPE_SH7763 is not set
118# CONFIG_CPU_SUBTYPE_SH7770 is not set 124# CONFIG_CPU_SUBTYPE_SH7770 is not set
119# CONFIG_CPU_SUBTYPE_SH7780 is not set 125# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -123,8 +129,6 @@ CONFIG_CPU_SUBTYPE_SH7705=y
123# CONFIG_CPU_SUBTYPE_SH7343 is not set 129# CONFIG_CPU_SUBTYPE_SH7343 is not set
124# CONFIG_CPU_SUBTYPE_SH7722 is not set 130# CONFIG_CPU_SUBTYPE_SH7722 is not set
125# CONFIG_CPU_SUBTYPE_SH7366 is not set 131# CONFIG_CPU_SUBTYPE_SH7366 is not set
126# CONFIG_CPU_SUBTYPE_SH5_101 is not set
127# CONFIG_CPU_SUBTYPE_SH5_103 is not set
128 132
129# 133#
130# Memory management options 134# Memory management options
@@ -382,6 +386,10 @@ CONFIG_SSB_POSSIBLE=y
382# CONFIG_FUSE_FS is not set 386# CONFIG_FUSE_FS is not set
383 387
384# 388#
389# Caches
390#
391
392#
385# Pseudo filesystems 393# Pseudo filesystems
386# 394#
387# CONFIG_PROC_FS is not set 395# CONFIG_PROC_FS is not set
@@ -409,10 +417,22 @@ CONFIG_FRAME_WARN=1024
409CONFIG_HAVE_FUNCTION_TRACER=y 417CONFIG_HAVE_FUNCTION_TRACER=y
410CONFIG_HAVE_DYNAMIC_FTRACE=y 418CONFIG_HAVE_DYNAMIC_FTRACE=y
411CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 419CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
420CONFIG_TRACING_SUPPORT=y
412 421
413# 422#
414# Tracers 423# Tracers
415# 424#
425# CONFIG_FUNCTION_TRACER is not set
426# CONFIG_IRQSOFF_TRACER is not set
427# CONFIG_SCHED_TRACER is not set
428# CONFIG_CONTEXT_SWITCH_TRACER is not set
429# CONFIG_EVENT_TRACER is not set
430# CONFIG_BOOT_TRACER is not set
431# CONFIG_TRACE_BRANCH_PROFILING is not set
432# CONFIG_STACK_TRACER is not set
433# CONFIG_KMEMTRACE is not set
434# CONFIG_WORKQUEUE_TRACER is not set
435# CONFIG_DMA_API_DEBUG is not set
416# CONFIG_SAMPLES is not set 436# CONFIG_SAMPLES is not set
417CONFIG_HAVE_ARCH_KGDB=y 437CONFIG_HAVE_ARCH_KGDB=y
418# CONFIG_SH_STANDARD_BIOS is not set 438# CONFIG_SH_STANDARD_BIOS is not set
@@ -426,6 +446,7 @@ CONFIG_HAVE_ARCH_KGDB=y
426# CONFIG_SECURITYFS is not set 446# CONFIG_SECURITYFS is not set
427# CONFIG_SECURITY_FILE_CAPABILITIES is not set 447# CONFIG_SECURITY_FILE_CAPABILITIES is not set
428# CONFIG_CRYPTO is not set 448# CONFIG_CRYPTO is not set
449# CONFIG_BINARY_PRINTF is not set
429 450
430# 451#
431# Library routines 452# Library routines
diff --git a/arch/sh/configs/edosk7760_defconfig b/arch/sh/configs/edosk7760_defconfig
index 7825c2699f18..a822b1d8c116 100644
--- a/arch/sh/configs/edosk7760_defconfig
+++ b/arch/sh/configs/edosk7760_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 17:54:57 2009 4# Mon Apr 27 12:45:25 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -40,6 +41,7 @@ CONFIG_SWAP=y
40CONFIG_SYSVIPC=y 41CONFIG_SYSVIPC=y
41CONFIG_SYSVIPC_SYSCTL=y 42CONFIG_SYSVIPC_SYSCTL=y
42CONFIG_POSIX_MQUEUE=y 43CONFIG_POSIX_MQUEUE=y
44CONFIG_POSIX_MQUEUE_SYSCTL=y
43CONFIG_BSD_PROCESS_ACCT=y 45CONFIG_BSD_PROCESS_ACCT=y
44# CONFIG_BSD_PROCESS_ACCT_V3 is not set 46# CONFIG_BSD_PROCESS_ACCT_V3 is not set
45# CONFIG_TASKSTATS is not set 47# CONFIG_TASKSTATS is not set
@@ -67,7 +69,6 @@ CONFIG_INITRAMFS_SOURCE=""
67CONFIG_RD_GZIP=y 69CONFIG_RD_GZIP=y
68# CONFIG_RD_BZIP2 is not set 70# CONFIG_RD_BZIP2 is not set
69# CONFIG_RD_LZMA is not set 71# CONFIG_RD_LZMA is not set
70CONFIG_INITRAMFS_COMPRESSION_NONE=y
71CONFIG_CC_OPTIMIZE_FOR_SIZE=y 72CONFIG_CC_OPTIMIZE_FOR_SIZE=y
72CONFIG_SYSCTL=y 73CONFIG_SYSCTL=y
73CONFIG_ANON_INODES=y 74CONFIG_ANON_INODES=y
@@ -77,6 +78,7 @@ CONFIG_SYSCTL_SYSCALL=y
77CONFIG_KALLSYMS=y 78CONFIG_KALLSYMS=y
78CONFIG_KALLSYMS_ALL=y 79CONFIG_KALLSYMS_ALL=y
79# CONFIG_KALLSYMS_EXTRA_PASS is not set 80# CONFIG_KALLSYMS_EXTRA_PASS is not set
81# CONFIG_STRIP_ASM_SYMS is not set
80CONFIG_HOTPLUG=y 82CONFIG_HOTPLUG=y
81CONFIG_PRINTK=y 83CONFIG_PRINTK=y
82CONFIG_BUG=y 84CONFIG_BUG=y
@@ -96,6 +98,7 @@ CONFIG_COMPAT_BRK=y
96CONFIG_SLUB=y 98CONFIG_SLUB=y
97# CONFIG_SLOB is not set 99# CONFIG_SLOB is not set
98# CONFIG_PROFILING is not set 100# CONFIG_PROFILING is not set
101# CONFIG_MARKERS is not set
99CONFIG_HAVE_OPROFILE=y 102CONFIG_HAVE_OPROFILE=y
100# CONFIG_KPROBES is not set 103# CONFIG_KPROBES is not set
101CONFIG_HAVE_IOREMAP_PROT=y 104CONFIG_HAVE_IOREMAP_PROT=y
@@ -103,6 +106,8 @@ CONFIG_HAVE_KPROBES=y
103CONFIG_HAVE_KRETPROBES=y 106CONFIG_HAVE_KRETPROBES=y
104CONFIG_HAVE_ARCH_TRACEHOOK=y 107CONFIG_HAVE_ARCH_TRACEHOOK=y
105CONFIG_HAVE_CLK=y 108CONFIG_HAVE_CLK=y
109CONFIG_HAVE_DMA_API_DEBUG=y
110# CONFIG_SLOW_WORK is not set
106CONFIG_HAVE_GENERIC_DMA_COHERENT=y 111CONFIG_HAVE_GENERIC_DMA_COHERENT=y
107CONFIG_SLABINFO=y 112CONFIG_SLABINFO=y
108CONFIG_RT_MUTEXES=y 113CONFIG_RT_MUTEXES=y
@@ -115,7 +120,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
115# CONFIG_MODULE_SRCVERSION_ALL is not set 120# CONFIG_MODULE_SRCVERSION_ALL is not set
116CONFIG_BLOCK=y 121CONFIG_BLOCK=y
117# CONFIG_LBD is not set 122# CONFIG_LBD is not set
118# CONFIG_BLK_DEV_IO_TRACE is not set
119# CONFIG_BLK_DEV_BSG is not set 123# CONFIG_BLK_DEV_BSG is not set
120# CONFIG_BLK_DEV_INTEGRITY is not set 124# CONFIG_BLK_DEV_INTEGRITY is not set
121 125
@@ -161,6 +165,7 @@ CONFIG_CPU_SH4=y
161CONFIG_CPU_SUBTYPE_SH7760=y 165CONFIG_CPU_SUBTYPE_SH7760=y
162# CONFIG_CPU_SUBTYPE_SH4_202 is not set 166# CONFIG_CPU_SUBTYPE_SH4_202 is not set
163# CONFIG_CPU_SUBTYPE_SH7723 is not set 167# CONFIG_CPU_SUBTYPE_SH7723 is not set
168# CONFIG_CPU_SUBTYPE_SH7724 is not set
164# CONFIG_CPU_SUBTYPE_SH7763 is not set 169# CONFIG_CPU_SUBTYPE_SH7763 is not set
165# CONFIG_CPU_SUBTYPE_SH7770 is not set 170# CONFIG_CPU_SUBTYPE_SH7770 is not set
166# CONFIG_CPU_SUBTYPE_SH7780 is not set 171# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -170,8 +175,6 @@ CONFIG_CPU_SUBTYPE_SH7760=y
170# CONFIG_CPU_SUBTYPE_SH7343 is not set 175# CONFIG_CPU_SUBTYPE_SH7343 is not set
171# CONFIG_CPU_SUBTYPE_SH7722 is not set 176# CONFIG_CPU_SUBTYPE_SH7722 is not set
172# CONFIG_CPU_SUBTYPE_SH7366 is not set 177# CONFIG_CPU_SUBTYPE_SH7366 is not set
173# CONFIG_CPU_SUBTYPE_SH5_101 is not set
174# CONFIG_CPU_SUBTYPE_SH5_103 is not set
175 178
176# 179#
177# Memory management options 180# Memory management options
@@ -815,6 +818,7 @@ CONFIG_EXT2_FS_XATTR=y
815# CONFIG_EXT2_FS_SECURITY is not set 818# CONFIG_EXT2_FS_SECURITY is not set
816CONFIG_EXT2_FS_XIP=y 819CONFIG_EXT2_FS_XIP=y
817CONFIG_EXT3_FS=y 820CONFIG_EXT3_FS=y
821# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
818CONFIG_EXT3_FS_XATTR=y 822CONFIG_EXT3_FS_XATTR=y
819# CONFIG_EXT3_FS_POSIX_ACL is not set 823# CONFIG_EXT3_FS_POSIX_ACL is not set
820# CONFIG_EXT3_FS_SECURITY is not set 824# CONFIG_EXT3_FS_SECURITY is not set
@@ -839,6 +843,11 @@ CONFIG_INOTIFY_USER=y
839CONFIG_GENERIC_ACL=y 843CONFIG_GENERIC_ACL=y
840 844
841# 845#
846# Caches
847#
848# CONFIG_FSCACHE is not set
849
850#
842# CD-ROM/DVD Filesystems 851# CD-ROM/DVD Filesystems
843# 852#
844# CONFIG_ISO9660_FS is not set 853# CONFIG_ISO9660_FS is not set
@@ -883,6 +892,7 @@ CONFIG_MISC_FILESYSTEMS=y
883# CONFIG_ROMFS_FS is not set 892# CONFIG_ROMFS_FS is not set
884# CONFIG_SYSV_FS is not set 893# CONFIG_SYSV_FS is not set
885# CONFIG_UFS_FS is not set 894# CONFIG_UFS_FS is not set
895# CONFIG_NILFS2_FS is not set
886CONFIG_NETWORK_FILESYSTEMS=y 896CONFIG_NETWORK_FILESYSTEMS=y
887CONFIG_NFS_FS=y 897CONFIG_NFS_FS=y
888# CONFIG_NFS_V3 is not set 898# CONFIG_NFS_V3 is not set
@@ -964,6 +974,9 @@ CONFIG_DEBUG_SHIRQ=y
964CONFIG_DETECT_SOFTLOCKUP=y 974CONFIG_DETECT_SOFTLOCKUP=y
965# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 975# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
966CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 976CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
977CONFIG_DETECT_HUNG_TASK=y
978# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
979CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
967# CONFIG_SCHED_DEBUG is not set 980# CONFIG_SCHED_DEBUG is not set
968# CONFIG_SCHEDSTATS is not set 981# CONFIG_SCHEDSTATS is not set
969CONFIG_TIMER_STATS=y 982CONFIG_TIMER_STATS=y
@@ -1001,6 +1014,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
1001CONFIG_HAVE_FUNCTION_TRACER=y 1014CONFIG_HAVE_FUNCTION_TRACER=y
1002CONFIG_HAVE_DYNAMIC_FTRACE=y 1015CONFIG_HAVE_DYNAMIC_FTRACE=y
1003CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1016CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1017CONFIG_TRACING_SUPPORT=y
1004 1018
1005# 1019#
1006# Tracers 1020# Tracers
@@ -1010,9 +1024,14 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1010# CONFIG_PREEMPT_TRACER is not set 1024# CONFIG_PREEMPT_TRACER is not set
1011# CONFIG_SCHED_TRACER is not set 1025# CONFIG_SCHED_TRACER is not set
1012# CONFIG_CONTEXT_SWITCH_TRACER is not set 1026# CONFIG_CONTEXT_SWITCH_TRACER is not set
1027# CONFIG_EVENT_TRACER is not set
1013# CONFIG_BOOT_TRACER is not set 1028# CONFIG_BOOT_TRACER is not set
1014# CONFIG_TRACE_BRANCH_PROFILING is not set 1029# CONFIG_TRACE_BRANCH_PROFILING is not set
1015# CONFIG_STACK_TRACER is not set 1030# CONFIG_STACK_TRACER is not set
1031# CONFIG_KMEMTRACE is not set
1032# CONFIG_WORKQUEUE_TRACER is not set
1033# CONFIG_BLK_DEV_IO_TRACE is not set
1034# CONFIG_DMA_API_DEBUG is not set
1016# CONFIG_SAMPLES is not set 1035# CONFIG_SAMPLES is not set
1017CONFIG_HAVE_ARCH_KGDB=y 1036CONFIG_HAVE_ARCH_KGDB=y
1018# CONFIG_KGDB is not set 1037# CONFIG_KGDB is not set
@@ -1126,6 +1145,7 @@ CONFIG_CRYPTO_DES=y
1126# 1145#
1127# CONFIG_CRYPTO_ANSI_CPRNG is not set 1146# CONFIG_CRYPTO_ANSI_CPRNG is not set
1128CONFIG_CRYPTO_HW=y 1147CONFIG_CRYPTO_HW=y
1148# CONFIG_BINARY_PRINTF is not set
1129 1149
1130# 1150#
1131# Library routines 1151# Library routines
diff --git a/arch/sh/configs/espt_defconfig b/arch/sh/configs/espt_defconfig
index ebb4c37abaa6..c5b50077913d 100644
--- a/arch/sh/configs/espt_defconfig
+++ b/arch/sh/configs/espt_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 17:58:18 2009 4# Mon Apr 27 12:46:26 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -78,6 +79,7 @@ CONFIG_UID16=y
78# CONFIG_SYSCTL_SYSCALL is not set 79# CONFIG_SYSCTL_SYSCALL is not set
79CONFIG_KALLSYMS=y 80CONFIG_KALLSYMS=y
80# CONFIG_KALLSYMS_EXTRA_PASS is not set 81# CONFIG_KALLSYMS_EXTRA_PASS is not set
82# CONFIG_STRIP_ASM_SYMS is not set
81CONFIG_HOTPLUG=y 83CONFIG_HOTPLUG=y
82CONFIG_PRINTK=y 84CONFIG_PRINTK=y
83CONFIG_BUG=y 85CONFIG_BUG=y
@@ -106,6 +108,8 @@ CONFIG_HAVE_KPROBES=y
106CONFIG_HAVE_KRETPROBES=y 108CONFIG_HAVE_KRETPROBES=y
107CONFIG_HAVE_ARCH_TRACEHOOK=y 109CONFIG_HAVE_ARCH_TRACEHOOK=y
108CONFIG_HAVE_CLK=y 110CONFIG_HAVE_CLK=y
111CONFIG_HAVE_DMA_API_DEBUG=y
112# CONFIG_SLOW_WORK is not set
109CONFIG_HAVE_GENERIC_DMA_COHERENT=y 113CONFIG_HAVE_GENERIC_DMA_COHERENT=y
110CONFIG_SLABINFO=y 114CONFIG_SLABINFO=y
111CONFIG_RT_MUTEXES=y 115CONFIG_RT_MUTEXES=y
@@ -117,7 +121,6 @@ CONFIG_MODULES=y
117# CONFIG_MODULE_SRCVERSION_ALL is not set 121# CONFIG_MODULE_SRCVERSION_ALL is not set
118CONFIG_BLOCK=y 122CONFIG_BLOCK=y
119# CONFIG_LBD is not set 123# CONFIG_LBD is not set
120# CONFIG_BLK_DEV_IO_TRACE is not set
121# CONFIG_BLK_DEV_BSG is not set 124# CONFIG_BLK_DEV_BSG is not set
122# CONFIG_BLK_DEV_INTEGRITY is not set 125# CONFIG_BLK_DEV_INTEGRITY is not set
123 126
@@ -164,6 +167,7 @@ CONFIG_CPU_SH4A=y
164# CONFIG_CPU_SUBTYPE_SH7760 is not set 167# CONFIG_CPU_SUBTYPE_SH7760 is not set
165# CONFIG_CPU_SUBTYPE_SH4_202 is not set 168# CONFIG_CPU_SUBTYPE_SH4_202 is not set
166# CONFIG_CPU_SUBTYPE_SH7723 is not set 169# CONFIG_CPU_SUBTYPE_SH7723 is not set
170# CONFIG_CPU_SUBTYPE_SH7724 is not set
167CONFIG_CPU_SUBTYPE_SH7763=y 171CONFIG_CPU_SUBTYPE_SH7763=y
168# CONFIG_CPU_SUBTYPE_SH7770 is not set 172# CONFIG_CPU_SUBTYPE_SH7770 is not set
169# CONFIG_CPU_SUBTYPE_SH7780 is not set 173# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -173,8 +177,6 @@ CONFIG_CPU_SUBTYPE_SH7763=y
173# CONFIG_CPU_SUBTYPE_SH7343 is not set 177# CONFIG_CPU_SUBTYPE_SH7343 is not set
174# CONFIG_CPU_SUBTYPE_SH7722 is not set 178# CONFIG_CPU_SUBTYPE_SH7722 is not set
175# CONFIG_CPU_SUBTYPE_SH7366 is not set 179# CONFIG_CPU_SUBTYPE_SH7366 is not set
176# CONFIG_CPU_SUBTYPE_SH5_101 is not set
177# CONFIG_CPU_SUBTYPE_SH5_103 is not set
178 180
179# 181#
180# Memory management options 182# Memory management options
@@ -548,6 +550,7 @@ CONFIG_SCSI_WAIT_SCAN=m
548CONFIG_SCSI_LOWLEVEL=y 550CONFIG_SCSI_LOWLEVEL=y
549# CONFIG_ISCSI_TCP is not set 551# CONFIG_ISCSI_TCP is not set
550# CONFIG_LIBFC is not set 552# CONFIG_LIBFC is not set
553# CONFIG_LIBFCOE is not set
551# CONFIG_SCSI_DEBUG is not set 554# CONFIG_SCSI_DEBUG is not set
552# CONFIG_SCSI_DH is not set 555# CONFIG_SCSI_DH is not set
553# CONFIG_SCSI_OSD_INITIATOR is not set 556# CONFIG_SCSI_OSD_INITIATOR is not set
@@ -919,6 +922,7 @@ CONFIG_EXT2_FS=y
919# CONFIG_EXT2_FS_XATTR is not set 922# CONFIG_EXT2_FS_XATTR is not set
920# CONFIG_EXT2_FS_XIP is not set 923# CONFIG_EXT2_FS_XIP is not set
921CONFIG_EXT3_FS=y 924CONFIG_EXT3_FS=y
925# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
922CONFIG_EXT3_FS_XATTR=y 926CONFIG_EXT3_FS_XATTR=y
923# CONFIG_EXT3_FS_POSIX_ACL is not set 927# CONFIG_EXT3_FS_POSIX_ACL is not set
924# CONFIG_EXT3_FS_SECURITY is not set 928# CONFIG_EXT3_FS_SECURITY is not set
@@ -943,6 +947,11 @@ CONFIG_AUTOFS4_FS=y
943CONFIG_GENERIC_ACL=y 947CONFIG_GENERIC_ACL=y
944 948
945# 949#
950# Caches
951#
952# CONFIG_FSCACHE is not set
953
954#
946# CD-ROM/DVD Filesystems 955# CD-ROM/DVD Filesystems
947# 956#
948# CONFIG_ISO9660_FS is not set 957# CONFIG_ISO9660_FS is not set
@@ -985,8 +994,13 @@ CONFIG_CRAMFS=y
985# CONFIG_HPFS_FS is not set 994# CONFIG_HPFS_FS is not set
986# CONFIG_QNX4FS_FS is not set 995# CONFIG_QNX4FS_FS is not set
987CONFIG_ROMFS_FS=y 996CONFIG_ROMFS_FS=y
997CONFIG_ROMFS_BACKED_BY_BLOCK=y
998# CONFIG_ROMFS_BACKED_BY_MTD is not set
999# CONFIG_ROMFS_BACKED_BY_BOTH is not set
1000CONFIG_ROMFS_ON_BLOCK=y
988# CONFIG_SYSV_FS is not set 1001# CONFIG_SYSV_FS is not set
989# CONFIG_UFS_FS is not set 1002# CONFIG_UFS_FS is not set
1003# CONFIG_NILFS2_FS is not set
990CONFIG_NETWORK_FILESYSTEMS=y 1004CONFIG_NETWORK_FILESYSTEMS=y
991CONFIG_NFS_FS=y 1005CONFIG_NFS_FS=y
992# CONFIG_NFS_V3 is not set 1006# CONFIG_NFS_V3 is not set
@@ -1075,11 +1089,25 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1075CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1089CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1076CONFIG_RING_BUFFER=y 1090CONFIG_RING_BUFFER=y
1077CONFIG_TRACING=y 1091CONFIG_TRACING=y
1092CONFIG_TRACING_SUPPORT=y
1078 1093
1079# 1094#
1080# Tracers 1095# Tracers
1081# 1096#
1097# CONFIG_FUNCTION_TRACER is not set
1098# CONFIG_IRQSOFF_TRACER is not set
1099# CONFIG_SCHED_TRACER is not set
1100# CONFIG_CONTEXT_SWITCH_TRACER is not set
1101# CONFIG_EVENT_TRACER is not set
1102# CONFIG_BOOT_TRACER is not set
1103# CONFIG_TRACE_BRANCH_PROFILING is not set
1104# CONFIG_STACK_TRACER is not set
1105# CONFIG_KMEMTRACE is not set
1106# CONFIG_WORKQUEUE_TRACER is not set
1107# CONFIG_BLK_DEV_IO_TRACE is not set
1108# CONFIG_FTRACE_STARTUP_TEST is not set
1082# CONFIG_DYNAMIC_DEBUG is not set 1109# CONFIG_DYNAMIC_DEBUG is not set
1110# CONFIG_DMA_API_DEBUG is not set
1083# CONFIG_SAMPLES is not set 1111# CONFIG_SAMPLES is not set
1084CONFIG_HAVE_ARCH_KGDB=y 1112CONFIG_HAVE_ARCH_KGDB=y
1085# CONFIG_SH_STANDARD_BIOS is not set 1113# CONFIG_SH_STANDARD_BIOS is not set
@@ -1179,6 +1207,7 @@ CONFIG_CRYPTO=y
1179# 1207#
1180# CONFIG_CRYPTO_ANSI_CPRNG is not set 1208# CONFIG_CRYPTO_ANSI_CPRNG is not set
1181CONFIG_CRYPTO_HW=y 1209CONFIG_CRYPTO_HW=y
1210CONFIG_BINARY_PRINTF=y
1182 1211
1183# 1212#
1184# Library routines 1213# Library routines
diff --git a/arch/sh/configs/hp6xx_defconfig b/arch/sh/configs/hp6xx_defconfig
index 82b113af08d3..8e13027eecc3 100644
--- a/arch/sh/configs/hp6xx_defconfig
+++ b/arch/sh/configs/hp6xx_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:01:05 2009 4# Mon Apr 27 12:47:15 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -67,6 +68,7 @@ CONFIG_UID16=y
67# CONFIG_SYSCTL_SYSCALL is not set 68# CONFIG_SYSCTL_SYSCALL is not set
68CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
69# CONFIG_KALLSYMS_EXTRA_PASS is not set 70# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
70CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
71CONFIG_PRINTK=y 73CONFIG_PRINTK=y
72CONFIG_BUG=y 74CONFIG_BUG=y
@@ -85,12 +87,15 @@ CONFIG_SLAB=y
85# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
86# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
87# CONFIG_PROFILING is not set 89# CONFIG_PROFILING is not set
90# CONFIG_MARKERS is not set
88CONFIG_HAVE_OPROFILE=y 91CONFIG_HAVE_OPROFILE=y
89CONFIG_HAVE_IOREMAP_PROT=y 92CONFIG_HAVE_IOREMAP_PROT=y
90CONFIG_HAVE_KPROBES=y 93CONFIG_HAVE_KPROBES=y
91CONFIG_HAVE_KRETPROBES=y 94CONFIG_HAVE_KRETPROBES=y
92CONFIG_HAVE_ARCH_TRACEHOOK=y 95CONFIG_HAVE_ARCH_TRACEHOOK=y
93CONFIG_HAVE_CLK=y 96CONFIG_HAVE_CLK=y
97CONFIG_HAVE_DMA_API_DEBUG=y
98# CONFIG_SLOW_WORK is not set
94CONFIG_HAVE_GENERIC_DMA_COHERENT=y 99CONFIG_HAVE_GENERIC_DMA_COHERENT=y
95CONFIG_SLABINFO=y 100CONFIG_SLABINFO=y
96CONFIG_RT_MUTEXES=y 101CONFIG_RT_MUTEXES=y
@@ -98,7 +103,6 @@ CONFIG_BASE_SMALL=0
98# CONFIG_MODULES is not set 103# CONFIG_MODULES is not set
99CONFIG_BLOCK=y 104CONFIG_BLOCK=y
100# CONFIG_LBD is not set 105# CONFIG_LBD is not set
101# CONFIG_BLK_DEV_IO_TRACE is not set
102# CONFIG_BLK_DEV_BSG is not set 106# CONFIG_BLK_DEV_BSG is not set
103# CONFIG_BLK_DEV_INTEGRITY is not set 107# CONFIG_BLK_DEV_INTEGRITY is not set
104 108
@@ -144,6 +148,7 @@ CONFIG_CPU_SUBTYPE_SH7709=y
144# CONFIG_CPU_SUBTYPE_SH7760 is not set 148# CONFIG_CPU_SUBTYPE_SH7760 is not set
145# CONFIG_CPU_SUBTYPE_SH4_202 is not set 149# CONFIG_CPU_SUBTYPE_SH4_202 is not set
146# CONFIG_CPU_SUBTYPE_SH7723 is not set 150# CONFIG_CPU_SUBTYPE_SH7723 is not set
151# CONFIG_CPU_SUBTYPE_SH7724 is not set
147# CONFIG_CPU_SUBTYPE_SH7763 is not set 152# CONFIG_CPU_SUBTYPE_SH7763 is not set
148# CONFIG_CPU_SUBTYPE_SH7770 is not set 153# CONFIG_CPU_SUBTYPE_SH7770 is not set
149# CONFIG_CPU_SUBTYPE_SH7780 is not set 154# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -153,8 +158,6 @@ CONFIG_CPU_SUBTYPE_SH7709=y
153# CONFIG_CPU_SUBTYPE_SH7343 is not set 158# CONFIG_CPU_SUBTYPE_SH7343 is not set
154# CONFIG_CPU_SUBTYPE_SH7722 is not set 159# CONFIG_CPU_SUBTYPE_SH7722 is not set
155# CONFIG_CPU_SUBTYPE_SH7366 is not set 160# CONFIG_CPU_SUBTYPE_SH7366 is not set
156# CONFIG_CPU_SUBTYPE_SH5_101 is not set
157# CONFIG_CPU_SUBTYPE_SH5_103 is not set
158 161
159# 162#
160# Memory management options 163# Memory management options
@@ -385,6 +388,7 @@ CONFIG_BLK_DEV_SD=y
385# CONFIG_SCSI_SRP_ATTRS is not set 388# CONFIG_SCSI_SRP_ATTRS is not set
386CONFIG_SCSI_LOWLEVEL=y 389CONFIG_SCSI_LOWLEVEL=y
387# CONFIG_LIBFC is not set 390# CONFIG_LIBFC is not set
391# CONFIG_LIBFCOE is not set
388# CONFIG_SCSI_DEBUG is not set 392# CONFIG_SCSI_DEBUG is not set
389# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 393# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
390# CONFIG_SCSI_DH is not set 394# CONFIG_SCSI_DH is not set
@@ -431,6 +435,7 @@ CONFIG_KEYBOARD_HP6XX=y
431# CONFIG_INPUT_JOYSTICK is not set 435# CONFIG_INPUT_JOYSTICK is not set
432# CONFIG_INPUT_TABLET is not set 436# CONFIG_INPUT_TABLET is not set
433CONFIG_INPUT_TOUCHSCREEN=y 437CONFIG_INPUT_TOUCHSCREEN=y
438# CONFIG_TOUCHSCREEN_AD7879 is not set
434# CONFIG_TOUCHSCREEN_FUJITSU is not set 439# CONFIG_TOUCHSCREEN_FUJITSU is not set
435# CONFIG_TOUCHSCREEN_GUNZE is not set 440# CONFIG_TOUCHSCREEN_GUNZE is not set
436# CONFIG_TOUCHSCREEN_ELO is not set 441# CONFIG_TOUCHSCREEN_ELO is not set
@@ -674,6 +679,11 @@ CONFIG_INOTIFY_USER=y
674# CONFIG_FUSE_FS is not set 679# CONFIG_FUSE_FS is not set
675 680
676# 681#
682# Caches
683#
684# CONFIG_FSCACHE is not set
685
686#
677# CD-ROM/DVD Filesystems 687# CD-ROM/DVD Filesystems
678# 688#
679# CONFIG_ISO9660_FS is not set 689# CONFIG_ISO9660_FS is not set
@@ -719,6 +729,7 @@ CONFIG_MISC_FILESYSTEMS=y
719# CONFIG_ROMFS_FS is not set 729# CONFIG_ROMFS_FS is not set
720# CONFIG_SYSV_FS is not set 730# CONFIG_SYSV_FS is not set
721# CONFIG_UFS_FS is not set 731# CONFIG_UFS_FS is not set
732# CONFIG_NILFS2_FS is not set
722 733
723# 734#
724# Partition Types 735# Partition Types
@@ -786,10 +797,23 @@ CONFIG_FRAME_WARN=1024
786CONFIG_HAVE_FUNCTION_TRACER=y 797CONFIG_HAVE_FUNCTION_TRACER=y
787CONFIG_HAVE_DYNAMIC_FTRACE=y 798CONFIG_HAVE_DYNAMIC_FTRACE=y
788CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 799CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
800CONFIG_TRACING_SUPPORT=y
789 801
790# 802#
791# Tracers 803# Tracers
792# 804#
805# CONFIG_FUNCTION_TRACER is not set
806# CONFIG_IRQSOFF_TRACER is not set
807# CONFIG_SCHED_TRACER is not set
808# CONFIG_CONTEXT_SWITCH_TRACER is not set
809# CONFIG_EVENT_TRACER is not set
810# CONFIG_BOOT_TRACER is not set
811# CONFIG_TRACE_BRANCH_PROFILING is not set
812# CONFIG_STACK_TRACER is not set
813# CONFIG_KMEMTRACE is not set
814# CONFIG_WORKQUEUE_TRACER is not set
815# CONFIG_BLK_DEV_IO_TRACE is not set
816# CONFIG_DMA_API_DEBUG is not set
793# CONFIG_SAMPLES is not set 817# CONFIG_SAMPLES is not set
794CONFIG_HAVE_ARCH_KGDB=y 818CONFIG_HAVE_ARCH_KGDB=y
795# CONFIG_SH_STANDARD_BIOS is not set 819# CONFIG_SH_STANDARD_BIOS is not set
@@ -898,6 +922,7 @@ CONFIG_CRYPTO_MD5=y
898# 922#
899# CONFIG_CRYPTO_ANSI_CPRNG is not set 923# CONFIG_CRYPTO_ANSI_CPRNG is not set
900# CONFIG_CRYPTO_HW is not set 924# CONFIG_CRYPTO_HW is not set
925# CONFIG_BINARY_PRINTF is not set
901 926
902# 927#
903# Library routines 928# Library routines
diff --git a/arch/sh/configs/landisk_defconfig b/arch/sh/configs/landisk_defconfig
index b6fa4a7599d0..7f549aef0dfd 100644
--- a/arch/sh/configs/landisk_defconfig
+++ b/arch/sh/configs/landisk_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:02:54 2009 4# Mon Apr 27 12:47:48 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -69,6 +70,7 @@ CONFIG_UID16=y
69# CONFIG_SYSCTL_SYSCALL is not set 70# CONFIG_SYSCTL_SYSCALL is not set
70CONFIG_KALLSYMS=y 71CONFIG_KALLSYMS=y
71CONFIG_KALLSYMS_EXTRA_PASS=y 72CONFIG_KALLSYMS_EXTRA_PASS=y
73# CONFIG_STRIP_ASM_SYMS is not set
72CONFIG_HOTPLUG=y 74CONFIG_HOTPLUG=y
73CONFIG_PRINTK=y 75CONFIG_PRINTK=y
74CONFIG_BUG=y 76CONFIG_BUG=y
@@ -88,6 +90,7 @@ CONFIG_SLAB=y
88# CONFIG_SLUB is not set 90# CONFIG_SLUB is not set
89# CONFIG_SLOB is not set 91# CONFIG_SLOB is not set
90# CONFIG_PROFILING is not set 92# CONFIG_PROFILING is not set
93# CONFIG_MARKERS is not set
91CONFIG_HAVE_OPROFILE=y 94CONFIG_HAVE_OPROFILE=y
92# CONFIG_KPROBES is not set 95# CONFIG_KPROBES is not set
93CONFIG_HAVE_IOREMAP_PROT=y 96CONFIG_HAVE_IOREMAP_PROT=y
@@ -95,6 +98,8 @@ CONFIG_HAVE_KPROBES=y
95CONFIG_HAVE_KRETPROBES=y 98CONFIG_HAVE_KRETPROBES=y
96CONFIG_HAVE_ARCH_TRACEHOOK=y 99CONFIG_HAVE_ARCH_TRACEHOOK=y
97CONFIG_HAVE_CLK=y 100CONFIG_HAVE_CLK=y
101CONFIG_HAVE_DMA_API_DEBUG=y
102# CONFIG_SLOW_WORK is not set
98CONFIG_HAVE_GENERIC_DMA_COHERENT=y 103CONFIG_HAVE_GENERIC_DMA_COHERENT=y
99CONFIG_SLABINFO=y 104CONFIG_SLABINFO=y
100CONFIG_RT_MUTEXES=y 105CONFIG_RT_MUTEXES=y
@@ -107,7 +112,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
107# CONFIG_MODULE_SRCVERSION_ALL is not set 112# CONFIG_MODULE_SRCVERSION_ALL is not set
108CONFIG_BLOCK=y 113CONFIG_BLOCK=y
109# CONFIG_LBD is not set 114# CONFIG_LBD is not set
110# CONFIG_BLK_DEV_IO_TRACE is not set
111# CONFIG_BLK_DEV_BSG is not set 115# CONFIG_BLK_DEV_BSG is not set
112# CONFIG_BLK_DEV_INTEGRITY is not set 116# CONFIG_BLK_DEV_INTEGRITY is not set
113 117
@@ -153,6 +157,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
153# CONFIG_CPU_SUBTYPE_SH7760 is not set 157# CONFIG_CPU_SUBTYPE_SH7760 is not set
154# CONFIG_CPU_SUBTYPE_SH4_202 is not set 158# CONFIG_CPU_SUBTYPE_SH4_202 is not set
155# CONFIG_CPU_SUBTYPE_SH7723 is not set 159# CONFIG_CPU_SUBTYPE_SH7723 is not set
160# CONFIG_CPU_SUBTYPE_SH7724 is not set
156# CONFIG_CPU_SUBTYPE_SH7763 is not set 161# CONFIG_CPU_SUBTYPE_SH7763 is not set
157# CONFIG_CPU_SUBTYPE_SH7770 is not set 162# CONFIG_CPU_SUBTYPE_SH7770 is not set
158# CONFIG_CPU_SUBTYPE_SH7780 is not set 163# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -162,8 +167,6 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
162# CONFIG_CPU_SUBTYPE_SH7343 is not set 167# CONFIG_CPU_SUBTYPE_SH7343 is not set
163# CONFIG_CPU_SUBTYPE_SH7722 is not set 168# CONFIG_CPU_SUBTYPE_SH7722 is not set
164# CONFIG_CPU_SUBTYPE_SH7366 is not set 169# CONFIG_CPU_SUBTYPE_SH7366 is not set
165# CONFIG_CPU_SUBTYPE_SH5_101 is not set
166# CONFIG_CPU_SUBTYPE_SH5_103 is not set
167 170
168# 171#
169# Memory management options 172# Memory management options
@@ -292,8 +295,6 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000
292# 295#
293CONFIG_PCI=y 296CONFIG_PCI=y
294CONFIG_SH_PCIDMA_NONCOHERENT=y 297CONFIG_SH_PCIDMA_NONCOHERENT=y
295CONFIG_PCI_AUTO=y
296CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
297# CONFIG_PCIEPORTBUS is not set 298# CONFIG_PCIEPORTBUS is not set
298# CONFIG_ARCH_SUPPORTS_MSI is not set 299# CONFIG_ARCH_SUPPORTS_MSI is not set
299CONFIG_PCI_LEGACY=y 300CONFIG_PCI_LEGACY=y
@@ -602,6 +603,7 @@ CONFIG_SCSI_LOWLEVEL=y
602# CONFIG_SCSI_MPT2SAS is not set 603# CONFIG_SCSI_MPT2SAS is not set
603# CONFIG_SCSI_HPTIOP is not set 604# CONFIG_SCSI_HPTIOP is not set
604# CONFIG_LIBFC is not set 605# CONFIG_LIBFC is not set
606# CONFIG_LIBFCOE is not set
605# CONFIG_FCOE is not set 607# CONFIG_FCOE is not set
606# CONFIG_SCSI_DMX3191D is not set 608# CONFIG_SCSI_DMX3191D is not set
607# CONFIG_SCSI_FUTURE_DOMAIN is not set 609# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -706,6 +708,7 @@ CONFIG_NETDEV_1000=y
706# CONFIG_E1000E is not set 708# CONFIG_E1000E is not set
707# CONFIG_IP1000 is not set 709# CONFIG_IP1000 is not set
708# CONFIG_IGB is not set 710# CONFIG_IGB is not set
711# CONFIG_IGBVF is not set
709# CONFIG_NS83820 is not set 712# CONFIG_NS83820 is not set
710# CONFIG_HAMACHI is not set 713# CONFIG_HAMACHI is not set
711# CONFIG_YELLOWFIN is not set 714# CONFIG_YELLOWFIN is not set
@@ -729,6 +732,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
729# CONFIG_IXGBE is not set 732# CONFIG_IXGBE is not set
730# CONFIG_IXGB is not set 733# CONFIG_IXGB is not set
731# CONFIG_S2IO is not set 734# CONFIG_S2IO is not set
735# CONFIG_VXGE is not set
732# CONFIG_MYRI10GE is not set 736# CONFIG_MYRI10GE is not set
733# CONFIG_NETXEN_NIC is not set 737# CONFIG_NETXEN_NIC is not set
734# CONFIG_NIU is not set 738# CONFIG_NIU is not set
@@ -922,6 +926,7 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
922# CONFIG_SOC_CAMERA is not set 926# CONFIG_SOC_CAMERA is not set
923CONFIG_V4L_USB_DRIVERS=y 927CONFIG_V4L_USB_DRIVERS=y
924# CONFIG_USB_VIDEO_CLASS is not set 928# CONFIG_USB_VIDEO_CLASS is not set
929CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
925# CONFIG_USB_GSPCA is not set 930# CONFIG_USB_GSPCA is not set
926# CONFIG_VIDEO_HDPVR is not set 931# CONFIG_VIDEO_HDPVR is not set
927CONFIG_VIDEO_USBVIDEO=m 932CONFIG_VIDEO_USBVIDEO=m
@@ -994,15 +999,17 @@ CONFIG_USB_HID=m
994# 999#
995# Special HID drivers 1000# Special HID drivers
996# 1001#
997CONFIG_HID_COMPAT=y
998CONFIG_HID_A4TECH=m 1002CONFIG_HID_A4TECH=m
999CONFIG_HID_APPLE=m 1003CONFIG_HID_APPLE=m
1000CONFIG_HID_BELKIN=m 1004CONFIG_HID_BELKIN=m
1001CONFIG_HID_CHERRY=m 1005CONFIG_HID_CHERRY=m
1002CONFIG_HID_CHICONY=m 1006CONFIG_HID_CHICONY=m
1003CONFIG_HID_CYPRESS=m 1007CONFIG_HID_CYPRESS=m
1008# CONFIG_DRAGONRISE_FF is not set
1004CONFIG_HID_EZKEY=m 1009CONFIG_HID_EZKEY=m
1010# CONFIG_HID_KYE is not set
1005CONFIG_HID_GYRATION=m 1011CONFIG_HID_GYRATION=m
1012# CONFIG_HID_KENSINGTON is not set
1006CONFIG_HID_LOGITECH=m 1013CONFIG_HID_LOGITECH=m
1007# CONFIG_LOGITECH_FF is not set 1014# CONFIG_LOGITECH_FF is not set
1008# CONFIG_LOGIRUMBLEPAD2_FF is not set 1015# CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -1197,6 +1204,7 @@ CONFIG_EXT2_FS=y
1197# CONFIG_EXT2_FS_XATTR is not set 1204# CONFIG_EXT2_FS_XATTR is not set
1198# CONFIG_EXT2_FS_XIP is not set 1205# CONFIG_EXT2_FS_XIP is not set
1199CONFIG_EXT3_FS=y 1206CONFIG_EXT3_FS=y
1207# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1200CONFIG_EXT3_FS_XATTR=y 1208CONFIG_EXT3_FS_XATTR=y
1201# CONFIG_EXT3_FS_POSIX_ACL is not set 1209# CONFIG_EXT3_FS_POSIX_ACL is not set
1202# CONFIG_EXT3_FS_SECURITY is not set 1210# CONFIG_EXT3_FS_SECURITY is not set
@@ -1222,6 +1230,11 @@ CONFIG_INOTIFY_USER=y
1222# CONFIG_FUSE_FS is not set 1230# CONFIG_FUSE_FS is not set
1223 1231
1224# 1232#
1233# Caches
1234#
1235# CONFIG_FSCACHE is not set
1236
1237#
1225# CD-ROM/DVD Filesystems 1238# CD-ROM/DVD Filesystems
1226# 1239#
1227CONFIG_ISO9660_FS=m 1240CONFIG_ISO9660_FS=m
@@ -1270,10 +1283,15 @@ CONFIG_MISC_FILESYSTEMS=y
1270# CONFIG_HPFS_FS is not set 1283# CONFIG_HPFS_FS is not set
1271# CONFIG_QNX4FS_FS is not set 1284# CONFIG_QNX4FS_FS is not set
1272CONFIG_ROMFS_FS=y 1285CONFIG_ROMFS_FS=y
1286CONFIG_ROMFS_BACKED_BY_BLOCK=y
1287# CONFIG_ROMFS_BACKED_BY_MTD is not set
1288# CONFIG_ROMFS_BACKED_BY_BOTH is not set
1289CONFIG_ROMFS_ON_BLOCK=y
1273# CONFIG_SYSV_FS is not set 1290# CONFIG_SYSV_FS is not set
1274CONFIG_UFS_FS=m 1291CONFIG_UFS_FS=m
1275# CONFIG_UFS_FS_WRITE is not set 1292# CONFIG_UFS_FS_WRITE is not set
1276# CONFIG_UFS_DEBUG is not set 1293# CONFIG_UFS_DEBUG is not set
1294# CONFIG_NILFS2_FS is not set
1277CONFIG_NETWORK_FILESYSTEMS=y 1295CONFIG_NETWORK_FILESYSTEMS=y
1278CONFIG_NFS_FS=m 1296CONFIG_NFS_FS=m
1279CONFIG_NFS_V3=y 1297CONFIG_NFS_V3=y
@@ -1364,10 +1382,23 @@ CONFIG_FRAME_WARN=1024
1364CONFIG_HAVE_FUNCTION_TRACER=y 1382CONFIG_HAVE_FUNCTION_TRACER=y
1365CONFIG_HAVE_DYNAMIC_FTRACE=y 1383CONFIG_HAVE_DYNAMIC_FTRACE=y
1366CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1384CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1385CONFIG_TRACING_SUPPORT=y
1367 1386
1368# 1387#
1369# Tracers 1388# Tracers
1370# 1389#
1390# CONFIG_FUNCTION_TRACER is not set
1391# CONFIG_IRQSOFF_TRACER is not set
1392# CONFIG_SCHED_TRACER is not set
1393# CONFIG_CONTEXT_SWITCH_TRACER is not set
1394# CONFIG_EVENT_TRACER is not set
1395# CONFIG_BOOT_TRACER is not set
1396# CONFIG_TRACE_BRANCH_PROFILING is not set
1397# CONFIG_STACK_TRACER is not set
1398# CONFIG_KMEMTRACE is not set
1399# CONFIG_WORKQUEUE_TRACER is not set
1400# CONFIG_BLK_DEV_IO_TRACE is not set
1401# CONFIG_DMA_API_DEBUG is not set
1371# CONFIG_SAMPLES is not set 1402# CONFIG_SAMPLES is not set
1372CONFIG_HAVE_ARCH_KGDB=y 1403CONFIG_HAVE_ARCH_KGDB=y
1373CONFIG_SH_STANDARD_BIOS=y 1404CONFIG_SH_STANDARD_BIOS=y
@@ -1469,6 +1500,7 @@ CONFIG_CRYPTO=y
1469# CONFIG_CRYPTO_ANSI_CPRNG is not set 1500# CONFIG_CRYPTO_ANSI_CPRNG is not set
1470CONFIG_CRYPTO_HW=y 1501CONFIG_CRYPTO_HW=y
1471# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1502# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1503# CONFIG_BINARY_PRINTF is not set
1472 1504
1473# 1505#
1474# Library routines 1506# Library routines
diff --git a/arch/sh/configs/lboxre2_defconfig b/arch/sh/configs/lboxre2_defconfig
index 92c515c4199f..a7db539f2800 100644
--- a/arch/sh/configs/lboxre2_defconfig
+++ b/arch/sh/configs/lboxre2_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:06:51 2009 4# Mon Apr 27 12:48:54 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -69,6 +70,7 @@ CONFIG_UID16=y
69# CONFIG_SYSCTL_SYSCALL is not set 70# CONFIG_SYSCTL_SYSCALL is not set
70CONFIG_KALLSYMS=y 71CONFIG_KALLSYMS=y
71CONFIG_KALLSYMS_EXTRA_PASS=y 72CONFIG_KALLSYMS_EXTRA_PASS=y
73# CONFIG_STRIP_ASM_SYMS is not set
72CONFIG_HOTPLUG=y 74CONFIG_HOTPLUG=y
73CONFIG_PRINTK=y 75CONFIG_PRINTK=y
74CONFIG_BUG=y 76CONFIG_BUG=y
@@ -88,6 +90,7 @@ CONFIG_SLAB=y
88# CONFIG_SLUB is not set 90# CONFIG_SLUB is not set
89# CONFIG_SLOB is not set 91# CONFIG_SLOB is not set
90# CONFIG_PROFILING is not set 92# CONFIG_PROFILING is not set
93# CONFIG_MARKERS is not set
91CONFIG_HAVE_OPROFILE=y 94CONFIG_HAVE_OPROFILE=y
92# CONFIG_KPROBES is not set 95# CONFIG_KPROBES is not set
93CONFIG_HAVE_IOREMAP_PROT=y 96CONFIG_HAVE_IOREMAP_PROT=y
@@ -95,6 +98,8 @@ CONFIG_HAVE_KPROBES=y
95CONFIG_HAVE_KRETPROBES=y 98CONFIG_HAVE_KRETPROBES=y
96CONFIG_HAVE_ARCH_TRACEHOOK=y 99CONFIG_HAVE_ARCH_TRACEHOOK=y
97CONFIG_HAVE_CLK=y 100CONFIG_HAVE_CLK=y
101CONFIG_HAVE_DMA_API_DEBUG=y
102# CONFIG_SLOW_WORK is not set
98CONFIG_HAVE_GENERIC_DMA_COHERENT=y 103CONFIG_HAVE_GENERIC_DMA_COHERENT=y
99CONFIG_SLABINFO=y 104CONFIG_SLABINFO=y
100CONFIG_RT_MUTEXES=y 105CONFIG_RT_MUTEXES=y
@@ -107,7 +112,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
107# CONFIG_MODULE_SRCVERSION_ALL is not set 112# CONFIG_MODULE_SRCVERSION_ALL is not set
108CONFIG_BLOCK=y 113CONFIG_BLOCK=y
109# CONFIG_LBD is not set 114# CONFIG_LBD is not set
110# CONFIG_BLK_DEV_IO_TRACE is not set
111# CONFIG_BLK_DEV_BSG is not set 115# CONFIG_BLK_DEV_BSG is not set
112# CONFIG_BLK_DEV_INTEGRITY is not set 116# CONFIG_BLK_DEV_INTEGRITY is not set
113 117
@@ -153,6 +157,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
153# CONFIG_CPU_SUBTYPE_SH7760 is not set 157# CONFIG_CPU_SUBTYPE_SH7760 is not set
154# CONFIG_CPU_SUBTYPE_SH4_202 is not set 158# CONFIG_CPU_SUBTYPE_SH4_202 is not set
155# CONFIG_CPU_SUBTYPE_SH7723 is not set 159# CONFIG_CPU_SUBTYPE_SH7723 is not set
160# CONFIG_CPU_SUBTYPE_SH7724 is not set
156# CONFIG_CPU_SUBTYPE_SH7763 is not set 161# CONFIG_CPU_SUBTYPE_SH7763 is not set
157# CONFIG_CPU_SUBTYPE_SH7770 is not set 162# CONFIG_CPU_SUBTYPE_SH7770 is not set
158# CONFIG_CPU_SUBTYPE_SH7780 is not set 163# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -162,8 +167,6 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
162# CONFIG_CPU_SUBTYPE_SH7343 is not set 167# CONFIG_CPU_SUBTYPE_SH7343 is not set
163# CONFIG_CPU_SUBTYPE_SH7722 is not set 168# CONFIG_CPU_SUBTYPE_SH7722 is not set
164# CONFIG_CPU_SUBTYPE_SH7366 is not set 169# CONFIG_CPU_SUBTYPE_SH7366 is not set
165# CONFIG_CPU_SUBTYPE_SH5_101 is not set
166# CONFIG_CPU_SUBTYPE_SH5_103 is not set
167 170
168# 171#
169# Memory management options 172# Memory management options
@@ -293,8 +296,6 @@ CONFIG_CMDLINE="console=ttySC1,115200 root=/dev/sda1"
293# 296#
294CONFIG_PCI=y 297CONFIG_PCI=y
295CONFIG_SH_PCIDMA_NONCOHERENT=y 298CONFIG_SH_PCIDMA_NONCOHERENT=y
296CONFIG_PCI_AUTO=y
297CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
298# CONFIG_PCIEPORTBUS is not set 299# CONFIG_PCIEPORTBUS is not set
299# CONFIG_ARCH_SUPPORTS_MSI is not set 300# CONFIG_ARCH_SUPPORTS_MSI is not set
300CONFIG_PCI_LEGACY=y 301CONFIG_PCI_LEGACY=y
@@ -542,6 +543,7 @@ CONFIG_SCSI_LOWLEVEL=y
542# CONFIG_SCSI_MPT2SAS is not set 543# CONFIG_SCSI_MPT2SAS is not set
543# CONFIG_SCSI_HPTIOP is not set 544# CONFIG_SCSI_HPTIOP is not set
544# CONFIG_LIBFC is not set 545# CONFIG_LIBFC is not set
546# CONFIG_LIBFCOE is not set
545# CONFIG_FCOE is not set 547# CONFIG_FCOE is not set
546# CONFIG_SCSI_DMX3191D is not set 548# CONFIG_SCSI_DMX3191D is not set
547# CONFIG_SCSI_FUTURE_DOMAIN is not set 549# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -702,6 +704,7 @@ CONFIG_NETDEV_1000=y
702# CONFIG_E1000E is not set 704# CONFIG_E1000E is not set
703# CONFIG_IP1000 is not set 705# CONFIG_IP1000 is not set
704# CONFIG_IGB is not set 706# CONFIG_IGB is not set
707# CONFIG_IGBVF is not set
705# CONFIG_NS83820 is not set 708# CONFIG_NS83820 is not set
706# CONFIG_HAMACHI is not set 709# CONFIG_HAMACHI is not set
707# CONFIG_YELLOWFIN is not set 710# CONFIG_YELLOWFIN is not set
@@ -725,6 +728,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
725# CONFIG_IXGBE is not set 728# CONFIG_IXGBE is not set
726# CONFIG_IXGB is not set 729# CONFIG_IXGB is not set
727# CONFIG_S2IO is not set 730# CONFIG_S2IO is not set
731# CONFIG_VXGE is not set
728# CONFIG_MYRI10GE is not set 732# CONFIG_MYRI10GE is not set
729# CONFIG_NETXEN_NIC is not set 733# CONFIG_NETXEN_NIC is not set
730# CONFIG_NIU is not set 734# CONFIG_NIU is not set
@@ -931,7 +935,6 @@ CONFIG_HID=y
931# 935#
932# Special HID drivers 936# Special HID drivers
933# 937#
934CONFIG_HID_COMPAT=y
935CONFIG_USB_SUPPORT=y 938CONFIG_USB_SUPPORT=y
936CONFIG_USB_ARCH_HAS_HCD=y 939CONFIG_USB_ARCH_HAS_HCD=y
937CONFIG_USB_ARCH_HAS_OHCI=y 940CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1007,6 +1010,7 @@ CONFIG_EXT2_FS=y
1007# CONFIG_EXT2_FS_XATTR is not set 1010# CONFIG_EXT2_FS_XATTR is not set
1008# CONFIG_EXT2_FS_XIP is not set 1011# CONFIG_EXT2_FS_XIP is not set
1009CONFIG_EXT3_FS=y 1012CONFIG_EXT3_FS=y
1013# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1010CONFIG_EXT3_FS_XATTR=y 1014CONFIG_EXT3_FS_XATTR=y
1011# CONFIG_EXT3_FS_POSIX_ACL is not set 1015# CONFIG_EXT3_FS_POSIX_ACL is not set
1012# CONFIG_EXT3_FS_SECURITY is not set 1016# CONFIG_EXT3_FS_SECURITY is not set
@@ -1029,6 +1033,11 @@ CONFIG_INOTIFY_USER=y
1029# CONFIG_FUSE_FS is not set 1033# CONFIG_FUSE_FS is not set
1030 1034
1031# 1035#
1036# Caches
1037#
1038# CONFIG_FSCACHE is not set
1039
1040#
1032# CD-ROM/DVD Filesystems 1041# CD-ROM/DVD Filesystems
1033# 1042#
1034# CONFIG_ISO9660_FS is not set 1043# CONFIG_ISO9660_FS is not set
@@ -1073,8 +1082,13 @@ CONFIG_MISC_FILESYSTEMS=y
1073# CONFIG_HPFS_FS is not set 1082# CONFIG_HPFS_FS is not set
1074# CONFIG_QNX4FS_FS is not set 1083# CONFIG_QNX4FS_FS is not set
1075CONFIG_ROMFS_FS=y 1084CONFIG_ROMFS_FS=y
1085CONFIG_ROMFS_BACKED_BY_BLOCK=y
1086# CONFIG_ROMFS_BACKED_BY_MTD is not set
1087# CONFIG_ROMFS_BACKED_BY_BOTH is not set
1088CONFIG_ROMFS_ON_BLOCK=y
1076# CONFIG_SYSV_FS is not set 1089# CONFIG_SYSV_FS is not set
1077# CONFIG_UFS_FS is not set 1090# CONFIG_UFS_FS is not set
1091# CONFIG_NILFS2_FS is not set
1078CONFIG_NETWORK_FILESYSTEMS=y 1092CONFIG_NETWORK_FILESYSTEMS=y
1079# CONFIG_NFS_FS is not set 1093# CONFIG_NFS_FS is not set
1080# CONFIG_NFSD is not set 1094# CONFIG_NFSD is not set
@@ -1151,10 +1165,23 @@ CONFIG_FRAME_WARN=1024
1151CONFIG_HAVE_FUNCTION_TRACER=y 1165CONFIG_HAVE_FUNCTION_TRACER=y
1152CONFIG_HAVE_DYNAMIC_FTRACE=y 1166CONFIG_HAVE_DYNAMIC_FTRACE=y
1153CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1167CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1168CONFIG_TRACING_SUPPORT=y
1154 1169
1155# 1170#
1156# Tracers 1171# Tracers
1157# 1172#
1173# CONFIG_FUNCTION_TRACER is not set
1174# CONFIG_IRQSOFF_TRACER is not set
1175# CONFIG_SCHED_TRACER is not set
1176# CONFIG_CONTEXT_SWITCH_TRACER is not set
1177# CONFIG_EVENT_TRACER is not set
1178# CONFIG_BOOT_TRACER is not set
1179# CONFIG_TRACE_BRANCH_PROFILING is not set
1180# CONFIG_STACK_TRACER is not set
1181# CONFIG_KMEMTRACE is not set
1182# CONFIG_WORKQUEUE_TRACER is not set
1183# CONFIG_BLK_DEV_IO_TRACE is not set
1184# CONFIG_DMA_API_DEBUG is not set
1158# CONFIG_SAMPLES is not set 1185# CONFIG_SAMPLES is not set
1159CONFIG_HAVE_ARCH_KGDB=y 1186CONFIG_HAVE_ARCH_KGDB=y
1160CONFIG_SH_STANDARD_BIOS=y 1187CONFIG_SH_STANDARD_BIOS=y
@@ -1256,6 +1283,7 @@ CONFIG_CRYPTO=y
1256# CONFIG_CRYPTO_ANSI_CPRNG is not set 1283# CONFIG_CRYPTO_ANSI_CPRNG is not set
1257CONFIG_CRYPTO_HW=y 1284CONFIG_CRYPTO_HW=y
1258# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1285# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1286# CONFIG_BINARY_PRINTF is not set
1259 1287
1260# 1288#
1261# Library routines 1289# Library routines
diff --git a/arch/sh/configs/magicpanelr2_defconfig b/arch/sh/configs/magicpanelr2_defconfig
index 26586c2d64ca..58bec61506fa 100644
--- a/arch/sh/configs/magicpanelr2_defconfig
+++ b/arch/sh/configs/magicpanelr2_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:07:39 2009 4# Mon Apr 27 12:49:32 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -39,6 +40,7 @@ CONFIG_SWAP=y
39CONFIG_SYSVIPC=y 40CONFIG_SYSVIPC=y
40CONFIG_SYSVIPC_SYSCTL=y 41CONFIG_SYSVIPC_SYSCTL=y
41CONFIG_POSIX_MQUEUE=y 42CONFIG_POSIX_MQUEUE=y
43CONFIG_POSIX_MQUEUE_SYSCTL=y
42CONFIG_BSD_PROCESS_ACCT=y 44CONFIG_BSD_PROCESS_ACCT=y
43CONFIG_BSD_PROCESS_ACCT_V3=y 45CONFIG_BSD_PROCESS_ACCT_V3=y
44# CONFIG_TASKSTATS is not set 46# CONFIG_TASKSTATS is not set
@@ -66,7 +68,6 @@ CONFIG_INITRAMFS_SOURCE=""
66CONFIG_RD_GZIP=y 68CONFIG_RD_GZIP=y
67# CONFIG_RD_BZIP2 is not set 69# CONFIG_RD_BZIP2 is not set
68# CONFIG_RD_LZMA is not set 70# CONFIG_RD_LZMA is not set
69CONFIG_INITRAMFS_COMPRESSION_NONE=y
70# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 71# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
71CONFIG_SYSCTL=y 72CONFIG_SYSCTL=y
72CONFIG_ANON_INODES=y 73CONFIG_ANON_INODES=y
@@ -76,6 +77,7 @@ CONFIG_SYSCTL_SYSCALL=y
76CONFIG_KALLSYMS=y 77CONFIG_KALLSYMS=y
77CONFIG_KALLSYMS_ALL=y 78CONFIG_KALLSYMS_ALL=y
78# CONFIG_KALLSYMS_EXTRA_PASS is not set 79# CONFIG_KALLSYMS_EXTRA_PASS is not set
80# CONFIG_STRIP_ASM_SYMS is not set
79CONFIG_HOTPLUG=y 81CONFIG_HOTPLUG=y
80CONFIG_PRINTK=y 82CONFIG_PRINTK=y
81CONFIG_BUG=y 83CONFIG_BUG=y
@@ -94,6 +96,7 @@ CONFIG_SLAB=y
94# CONFIG_SLUB is not set 96# CONFIG_SLUB is not set
95# CONFIG_SLOB is not set 97# CONFIG_SLOB is not set
96# CONFIG_PROFILING is not set 98# CONFIG_PROFILING is not set
99# CONFIG_MARKERS is not set
97CONFIG_HAVE_OPROFILE=y 100CONFIG_HAVE_OPROFILE=y
98# CONFIG_KPROBES is not set 101# CONFIG_KPROBES is not set
99CONFIG_HAVE_IOREMAP_PROT=y 102CONFIG_HAVE_IOREMAP_PROT=y
@@ -101,6 +104,8 @@ CONFIG_HAVE_KPROBES=y
101CONFIG_HAVE_KRETPROBES=y 104CONFIG_HAVE_KRETPROBES=y
102CONFIG_HAVE_ARCH_TRACEHOOK=y 105CONFIG_HAVE_ARCH_TRACEHOOK=y
103CONFIG_HAVE_CLK=y 106CONFIG_HAVE_CLK=y
107CONFIG_HAVE_DMA_API_DEBUG=y
108# CONFIG_SLOW_WORK is not set
104CONFIG_HAVE_GENERIC_DMA_COHERENT=y 109CONFIG_HAVE_GENERIC_DMA_COHERENT=y
105CONFIG_SLABINFO=y 110CONFIG_SLABINFO=y
106CONFIG_RT_MUTEXES=y 111CONFIG_RT_MUTEXES=y
@@ -113,7 +118,6 @@ CONFIG_MODVERSIONS=y
113CONFIG_MODULE_SRCVERSION_ALL=y 118CONFIG_MODULE_SRCVERSION_ALL=y
114CONFIG_BLOCK=y 119CONFIG_BLOCK=y
115# CONFIG_LBD is not set 120# CONFIG_LBD is not set
116# CONFIG_BLK_DEV_IO_TRACE is not set
117# CONFIG_BLK_DEV_BSG is not set 121# CONFIG_BLK_DEV_BSG is not set
118# CONFIG_BLK_DEV_INTEGRITY is not set 122# CONFIG_BLK_DEV_INTEGRITY is not set
119 123
@@ -159,6 +163,7 @@ CONFIG_CPU_SUBTYPE_SH7720=y
159# CONFIG_CPU_SUBTYPE_SH7760 is not set 163# CONFIG_CPU_SUBTYPE_SH7760 is not set
160# CONFIG_CPU_SUBTYPE_SH4_202 is not set 164# CONFIG_CPU_SUBTYPE_SH4_202 is not set
161# CONFIG_CPU_SUBTYPE_SH7723 is not set 165# CONFIG_CPU_SUBTYPE_SH7723 is not set
166# CONFIG_CPU_SUBTYPE_SH7724 is not set
162# CONFIG_CPU_SUBTYPE_SH7763 is not set 167# CONFIG_CPU_SUBTYPE_SH7763 is not set
163# CONFIG_CPU_SUBTYPE_SH7770 is not set 168# CONFIG_CPU_SUBTYPE_SH7770 is not set
164# CONFIG_CPU_SUBTYPE_SH7780 is not set 169# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -168,8 +173,6 @@ CONFIG_CPU_SUBTYPE_SH7720=y
168# CONFIG_CPU_SUBTYPE_SH7343 is not set 173# CONFIG_CPU_SUBTYPE_SH7343 is not set
169# CONFIG_CPU_SUBTYPE_SH7722 is not set 174# CONFIG_CPU_SUBTYPE_SH7722 is not set
170# CONFIG_CPU_SUBTYPE_SH7366 is not set 175# CONFIG_CPU_SUBTYPE_SH7366 is not set
171# CONFIG_CPU_SUBTYPE_SH5_101 is not set
172# CONFIG_CPU_SUBTYPE_SH5_103 is not set
173 176
174# 177#
175# Memory management options 178# Memory management options
@@ -813,6 +816,7 @@ CONFIG_EXT2_FS=y
813# CONFIG_EXT2_FS_XATTR is not set 816# CONFIG_EXT2_FS_XATTR is not set
814# CONFIG_EXT2_FS_XIP is not set 817# CONFIG_EXT2_FS_XIP is not set
815CONFIG_EXT3_FS=y 818CONFIG_EXT3_FS=y
819# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
816# CONFIG_EXT3_FS_XATTR is not set 820# CONFIG_EXT3_FS_XATTR is not set
817# CONFIG_EXT4_FS is not set 821# CONFIG_EXT4_FS is not set
818CONFIG_JBD=y 822CONFIG_JBD=y
@@ -831,6 +835,11 @@ CONFIG_FILE_LOCKING=y
831# CONFIG_FUSE_FS is not set 835# CONFIG_FUSE_FS is not set
832 836
833# 837#
838# Caches
839#
840# CONFIG_FSCACHE is not set
841
842#
834# CD-ROM/DVD Filesystems 843# CD-ROM/DVD Filesystems
835# 844#
836# CONFIG_ISO9660_FS is not set 845# CONFIG_ISO9660_FS is not set
@@ -884,6 +893,7 @@ CONFIG_JFFS2_RTIME=y
884# CONFIG_ROMFS_FS is not set 893# CONFIG_ROMFS_FS is not set
885# CONFIG_SYSV_FS is not set 894# CONFIG_SYSV_FS is not set
886# CONFIG_UFS_FS is not set 895# CONFIG_UFS_FS is not set
896# CONFIG_NILFS2_FS is not set
887CONFIG_NETWORK_FILESYSTEMS=y 897CONFIG_NETWORK_FILESYSTEMS=y
888CONFIG_NFS_FS=y 898CONFIG_NFS_FS=y
889CONFIG_NFS_V3=y 899CONFIG_NFS_V3=y
@@ -965,6 +975,7 @@ CONFIG_MAGIC_SYSRQ=y
965CONFIG_DEBUG_KERNEL=y 975CONFIG_DEBUG_KERNEL=y
966# CONFIG_DEBUG_SHIRQ is not set 976# CONFIG_DEBUG_SHIRQ is not set
967# CONFIG_DETECT_SOFTLOCKUP is not set 977# CONFIG_DETECT_SOFTLOCKUP is not set
978# CONFIG_DETECT_HUNG_TASK is not set
968# CONFIG_SCHED_DEBUG is not set 979# CONFIG_SCHED_DEBUG is not set
969# CONFIG_SCHEDSTATS is not set 980# CONFIG_SCHEDSTATS is not set
970# CONFIG_TIMER_STATS is not set 981# CONFIG_TIMER_STATS is not set
@@ -1000,6 +1011,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
1000CONFIG_HAVE_FUNCTION_TRACER=y 1011CONFIG_HAVE_FUNCTION_TRACER=y
1001CONFIG_HAVE_DYNAMIC_FTRACE=y 1012CONFIG_HAVE_DYNAMIC_FTRACE=y
1002CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1013CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1014CONFIG_TRACING_SUPPORT=y
1003 1015
1004# 1016#
1005# Tracers 1017# Tracers
@@ -1008,9 +1020,14 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1008# CONFIG_IRQSOFF_TRACER is not set 1020# CONFIG_IRQSOFF_TRACER is not set
1009# CONFIG_SCHED_TRACER is not set 1021# CONFIG_SCHED_TRACER is not set
1010# CONFIG_CONTEXT_SWITCH_TRACER is not set 1022# CONFIG_CONTEXT_SWITCH_TRACER is not set
1023# CONFIG_EVENT_TRACER is not set
1011# CONFIG_BOOT_TRACER is not set 1024# CONFIG_BOOT_TRACER is not set
1012# CONFIG_TRACE_BRANCH_PROFILING is not set 1025# CONFIG_TRACE_BRANCH_PROFILING is not set
1013# CONFIG_STACK_TRACER is not set 1026# CONFIG_STACK_TRACER is not set
1027# CONFIG_KMEMTRACE is not set
1028# CONFIG_WORKQUEUE_TRACER is not set
1029# CONFIG_BLK_DEV_IO_TRACE is not set
1030# CONFIG_DMA_API_DEBUG is not set
1014# CONFIG_SAMPLES is not set 1031# CONFIG_SAMPLES is not set
1015CONFIG_HAVE_ARCH_KGDB=y 1032CONFIG_HAVE_ARCH_KGDB=y
1016# CONFIG_KGDB is not set 1033# CONFIG_KGDB is not set
@@ -1035,6 +1052,7 @@ CONFIG_DUMP_CODE=y
1035# CONFIG_SECURITYFS is not set 1052# CONFIG_SECURITYFS is not set
1036# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1053# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1037# CONFIG_CRYPTO is not set 1054# CONFIG_CRYPTO is not set
1055# CONFIG_BINARY_PRINTF is not set
1038 1056
1039# 1057#
1040# Library routines 1058# Library routines
diff --git a/arch/sh/configs/microdev_defconfig b/arch/sh/configs/microdev_defconfig
index 75178355d69a..2886fc84bc1c 100644
--- a/arch/sh/configs/microdev_defconfig
+++ b/arch/sh/configs/microdev_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:11:13 2009 4# Mon Apr 27 12:50:51 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -65,7 +66,6 @@ CONFIG_INITRAMFS_SOURCE=""
65CONFIG_RD_GZIP=y 66CONFIG_RD_GZIP=y
66# CONFIG_RD_BZIP2 is not set 67# CONFIG_RD_BZIP2 is not set
67# CONFIG_RD_LZMA is not set 68# CONFIG_RD_LZMA is not set
68CONFIG_INITRAMFS_COMPRESSION_NONE=y
69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
70CONFIG_SYSCTL=y 70CONFIG_SYSCTL=y
71CONFIG_ANON_INODES=y 71CONFIG_ANON_INODES=y
@@ -74,6 +74,7 @@ CONFIG_UID16=y
74# CONFIG_SYSCTL_SYSCALL is not set 74# CONFIG_SYSCTL_SYSCALL is not set
75CONFIG_KALLSYMS=y 75CONFIG_KALLSYMS=y
76# CONFIG_KALLSYMS_EXTRA_PASS is not set 76# CONFIG_KALLSYMS_EXTRA_PASS is not set
77# CONFIG_STRIP_ASM_SYMS is not set
77CONFIG_HOTPLUG=y 78CONFIG_HOTPLUG=y
78CONFIG_PRINTK=y 79CONFIG_PRINTK=y
79CONFIG_BUG=y 80CONFIG_BUG=y
@@ -92,12 +93,15 @@ CONFIG_SLAB=y
92# CONFIG_SLUB is not set 93# CONFIG_SLUB is not set
93# CONFIG_SLOB is not set 94# CONFIG_SLOB is not set
94# CONFIG_PROFILING is not set 95# CONFIG_PROFILING is not set
96# CONFIG_MARKERS is not set
95CONFIG_HAVE_OPROFILE=y 97CONFIG_HAVE_OPROFILE=y
96CONFIG_HAVE_IOREMAP_PROT=y 98CONFIG_HAVE_IOREMAP_PROT=y
97CONFIG_HAVE_KPROBES=y 99CONFIG_HAVE_KPROBES=y
98CONFIG_HAVE_KRETPROBES=y 100CONFIG_HAVE_KRETPROBES=y
99CONFIG_HAVE_ARCH_TRACEHOOK=y 101CONFIG_HAVE_ARCH_TRACEHOOK=y
100CONFIG_HAVE_CLK=y 102CONFIG_HAVE_CLK=y
103CONFIG_HAVE_DMA_API_DEBUG=y
104# CONFIG_SLOW_WORK is not set
101CONFIG_HAVE_GENERIC_DMA_COHERENT=y 105CONFIG_HAVE_GENERIC_DMA_COHERENT=y
102CONFIG_SLABINFO=y 106CONFIG_SLABINFO=y
103CONFIG_RT_MUTEXES=y 107CONFIG_RT_MUTEXES=y
@@ -105,7 +109,6 @@ CONFIG_BASE_SMALL=0
105# CONFIG_MODULES is not set 109# CONFIG_MODULES is not set
106CONFIG_BLOCK=y 110CONFIG_BLOCK=y
107# CONFIG_LBD is not set 111# CONFIG_LBD is not set
108# CONFIG_BLK_DEV_IO_TRACE is not set
109# CONFIG_BLK_DEV_BSG is not set 112# CONFIG_BLK_DEV_BSG is not set
110# CONFIG_BLK_DEV_INTEGRITY is not set 113# CONFIG_BLK_DEV_INTEGRITY is not set
111 114
@@ -151,6 +154,7 @@ CONFIG_CPU_SH4=y
151# CONFIG_CPU_SUBTYPE_SH7760 is not set 154# CONFIG_CPU_SUBTYPE_SH7760 is not set
152CONFIG_CPU_SUBTYPE_SH4_202=y 155CONFIG_CPU_SUBTYPE_SH4_202=y
153# CONFIG_CPU_SUBTYPE_SH7723 is not set 156# CONFIG_CPU_SUBTYPE_SH7723 is not set
157# CONFIG_CPU_SUBTYPE_SH7724 is not set
154# CONFIG_CPU_SUBTYPE_SH7763 is not set 158# CONFIG_CPU_SUBTYPE_SH7763 is not set
155# CONFIG_CPU_SUBTYPE_SH7770 is not set 159# CONFIG_CPU_SUBTYPE_SH7770 is not set
156# CONFIG_CPU_SUBTYPE_SH7780 is not set 160# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -160,8 +164,6 @@ CONFIG_CPU_SUBTYPE_SH4_202=y
160# CONFIG_CPU_SUBTYPE_SH7343 is not set 164# CONFIG_CPU_SUBTYPE_SH7343 is not set
161# CONFIG_CPU_SUBTYPE_SH7722 is not set 165# CONFIG_CPU_SUBTYPE_SH7722 is not set
162# CONFIG_CPU_SUBTYPE_SH7366 is not set 166# CONFIG_CPU_SUBTYPE_SH7366 is not set
163# CONFIG_CPU_SUBTYPE_SH5_101 is not set
164# CONFIG_CPU_SUBTYPE_SH5_103 is not set
165 167
166# 168#
167# Memory management options 169# Memory management options
@@ -647,6 +649,7 @@ CONFIG_EXT2_FS=y
647# CONFIG_EXT2_FS_XATTR is not set 649# CONFIG_EXT2_FS_XATTR is not set
648# CONFIG_EXT2_FS_XIP is not set 650# CONFIG_EXT2_FS_XIP is not set
649CONFIG_EXT3_FS=y 651CONFIG_EXT3_FS=y
652# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
650CONFIG_EXT3_FS_XATTR=y 653CONFIG_EXT3_FS_XATTR=y
651# CONFIG_EXT3_FS_POSIX_ACL is not set 654# CONFIG_EXT3_FS_POSIX_ACL is not set
652# CONFIG_EXT3_FS_SECURITY is not set 655# CONFIG_EXT3_FS_SECURITY is not set
@@ -669,6 +672,11 @@ CONFIG_INOTIFY_USER=y
669# CONFIG_FUSE_FS is not set 672# CONFIG_FUSE_FS is not set
670 673
671# 674#
675# Caches
676#
677# CONFIG_FSCACHE is not set
678
679#
672# CD-ROM/DVD Filesystems 680# CD-ROM/DVD Filesystems
673# 681#
674# CONFIG_ISO9660_FS is not set 682# CONFIG_ISO9660_FS is not set
@@ -715,6 +723,7 @@ CONFIG_MISC_FILESYSTEMS=y
715# CONFIG_ROMFS_FS is not set 723# CONFIG_ROMFS_FS is not set
716# CONFIG_SYSV_FS is not set 724# CONFIG_SYSV_FS is not set
717# CONFIG_UFS_FS is not set 725# CONFIG_UFS_FS is not set
726# CONFIG_NILFS2_FS is not set
718CONFIG_NETWORK_FILESYSTEMS=y 727CONFIG_NETWORK_FILESYSTEMS=y
719CONFIG_NFS_FS=y 728CONFIG_NFS_FS=y
720CONFIG_NFS_V3=y 729CONFIG_NFS_V3=y
@@ -802,10 +811,24 @@ CONFIG_FRAME_WARN=1024
802CONFIG_HAVE_FUNCTION_TRACER=y 811CONFIG_HAVE_FUNCTION_TRACER=y
803CONFIG_HAVE_DYNAMIC_FTRACE=y 812CONFIG_HAVE_DYNAMIC_FTRACE=y
804CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 813CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
814CONFIG_TRACING_SUPPORT=y
805 815
806# 816#
807# Tracers 817# Tracers
808# 818#
819# CONFIG_FUNCTION_TRACER is not set
820# CONFIG_IRQSOFF_TRACER is not set
821# CONFIG_PREEMPT_TRACER is not set
822# CONFIG_SCHED_TRACER is not set
823# CONFIG_CONTEXT_SWITCH_TRACER is not set
824# CONFIG_EVENT_TRACER is not set
825# CONFIG_BOOT_TRACER is not set
826# CONFIG_TRACE_BRANCH_PROFILING is not set
827# CONFIG_STACK_TRACER is not set
828# CONFIG_KMEMTRACE is not set
829# CONFIG_WORKQUEUE_TRACER is not set
830# CONFIG_BLK_DEV_IO_TRACE is not set
831# CONFIG_DMA_API_DEBUG is not set
809# CONFIG_SAMPLES is not set 832# CONFIG_SAMPLES is not set
810CONFIG_HAVE_ARCH_KGDB=y 833CONFIG_HAVE_ARCH_KGDB=y
811# CONFIG_SH_STANDARD_BIOS is not set 834# CONFIG_SH_STANDARD_BIOS is not set
@@ -914,6 +937,7 @@ CONFIG_CRYPTO_DES=y
914# 937#
915# CONFIG_CRYPTO_ANSI_CPRNG is not set 938# CONFIG_CRYPTO_ANSI_CPRNG is not set
916CONFIG_CRYPTO_HW=y 939CONFIG_CRYPTO_HW=y
940# CONFIG_BINARY_PRINTF is not set
917 941
918# 942#
919# Library routines 943# Library routines
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig
index a8720f9c6047..8ecceb4bf27e 100644
--- a/arch/sh/configs/migor_defconfig
+++ b/arch/sh/configs/migor_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:14:03 2009 4# Mon Apr 27 12:51:34 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -67,7 +68,6 @@ CONFIG_INITRAMFS_SOURCE=""
67CONFIG_RD_GZIP=y 68CONFIG_RD_GZIP=y
68# CONFIG_RD_BZIP2 is not set 69# CONFIG_RD_BZIP2 is not set
69# CONFIG_RD_LZMA is not set 70# CONFIG_RD_LZMA is not set
70CONFIG_INITRAMFS_COMPRESSION_NONE=y
71# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 71# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
72CONFIG_SYSCTL=y 72CONFIG_SYSCTL=y
73CONFIG_ANON_INODES=y 73CONFIG_ANON_INODES=y
@@ -76,6 +76,7 @@ CONFIG_UID16=y
76# CONFIG_SYSCTL_SYSCALL is not set 76# CONFIG_SYSCTL_SYSCALL is not set
77CONFIG_KALLSYMS=y 77CONFIG_KALLSYMS=y
78# CONFIG_KALLSYMS_EXTRA_PASS is not set 78# CONFIG_KALLSYMS_EXTRA_PASS is not set
79# CONFIG_STRIP_ASM_SYMS is not set
79CONFIG_HOTPLUG=y 80CONFIG_HOTPLUG=y
80CONFIG_PRINTK=y 81CONFIG_PRINTK=y
81CONFIG_BUG=y 82CONFIG_BUG=y
@@ -104,6 +105,8 @@ CONFIG_HAVE_KPROBES=y
104CONFIG_HAVE_KRETPROBES=y 105CONFIG_HAVE_KRETPROBES=y
105CONFIG_HAVE_ARCH_TRACEHOOK=y 106CONFIG_HAVE_ARCH_TRACEHOOK=y
106CONFIG_HAVE_CLK=y 107CONFIG_HAVE_CLK=y
108CONFIG_HAVE_DMA_API_DEBUG=y
109# CONFIG_SLOW_WORK is not set
107CONFIG_HAVE_GENERIC_DMA_COHERENT=y 110CONFIG_HAVE_GENERIC_DMA_COHERENT=y
108CONFIG_SLABINFO=y 111CONFIG_SLABINFO=y
109CONFIG_RT_MUTEXES=y 112CONFIG_RT_MUTEXES=y
@@ -115,7 +118,6 @@ CONFIG_MODULES=y
115# CONFIG_MODULE_SRCVERSION_ALL is not set 118# CONFIG_MODULE_SRCVERSION_ALL is not set
116CONFIG_BLOCK=y 119CONFIG_BLOCK=y
117# CONFIG_LBD is not set 120# CONFIG_LBD is not set
118# CONFIG_BLK_DEV_IO_TRACE is not set
119# CONFIG_BLK_DEV_BSG is not set 121# CONFIG_BLK_DEV_BSG is not set
120# CONFIG_BLK_DEV_INTEGRITY is not set 122# CONFIG_BLK_DEV_INTEGRITY is not set
121 123
@@ -165,6 +167,7 @@ CONFIG_ARCH_SHMOBILE=y
165# CONFIG_CPU_SUBTYPE_SH7760 is not set 167# CONFIG_CPU_SUBTYPE_SH7760 is not set
166# CONFIG_CPU_SUBTYPE_SH4_202 is not set 168# CONFIG_CPU_SUBTYPE_SH4_202 is not set
167# CONFIG_CPU_SUBTYPE_SH7723 is not set 169# CONFIG_CPU_SUBTYPE_SH7723 is not set
170# CONFIG_CPU_SUBTYPE_SH7724 is not set
168# CONFIG_CPU_SUBTYPE_SH7763 is not set 171# CONFIG_CPU_SUBTYPE_SH7763 is not set
169# CONFIG_CPU_SUBTYPE_SH7770 is not set 172# CONFIG_CPU_SUBTYPE_SH7770 is not set
170# CONFIG_CPU_SUBTYPE_SH7780 is not set 173# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -174,8 +177,6 @@ CONFIG_ARCH_SHMOBILE=y
174# CONFIG_CPU_SUBTYPE_SH7343 is not set 177# CONFIG_CPU_SUBTYPE_SH7343 is not set
175CONFIG_CPU_SUBTYPE_SH7722=y 178CONFIG_CPU_SUBTYPE_SH7722=y
176# CONFIG_CPU_SUBTYPE_SH7366 is not set 179# CONFIG_CPU_SUBTYPE_SH7366 is not set
177# CONFIG_CPU_SUBTYPE_SH5_101 is not set
178# CONFIG_CPU_SUBTYPE_SH5_103 is not set
179 180
180# 181#
181# Memory management options 182# Memory management options
@@ -577,6 +578,7 @@ CONFIG_SCSI_WAIT_SCAN=m
577CONFIG_SCSI_LOWLEVEL=y 578CONFIG_SCSI_LOWLEVEL=y
578# CONFIG_ISCSI_TCP is not set 579# CONFIG_ISCSI_TCP is not set
579# CONFIG_LIBFC is not set 580# CONFIG_LIBFC is not set
581# CONFIG_LIBFCOE is not set
580# CONFIG_SCSI_DEBUG is not set 582# CONFIG_SCSI_DEBUG is not set
581# CONFIG_SCSI_DH is not set 583# CONFIG_SCSI_DH is not set
582# CONFIG_SCSI_OSD_INITIATOR is not set 584# CONFIG_SCSI_OSD_INITIATOR is not set
@@ -873,7 +875,6 @@ CONFIG_HID=y
873# 875#
874# Special HID drivers 876# Special HID drivers
875# 877#
876CONFIG_HID_COMPAT=y
877CONFIG_USB_SUPPORT=y 878CONFIG_USB_SUPPORT=y
878CONFIG_USB_ARCH_HAS_HCD=y 879CONFIG_USB_ARCH_HAS_HCD=y
879# CONFIG_USB_ARCH_HAS_OHCI is not set 880# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -1012,6 +1013,11 @@ CONFIG_FILE_LOCKING=y
1012# CONFIG_FUSE_FS is not set 1013# CONFIG_FUSE_FS is not set
1013 1014
1014# 1015#
1016# Caches
1017#
1018# CONFIG_FSCACHE is not set
1019
1020#
1015# CD-ROM/DVD Filesystems 1021# CD-ROM/DVD Filesystems
1016# 1022#
1017# CONFIG_ISO9660_FS is not set 1023# CONFIG_ISO9660_FS is not set
@@ -1056,6 +1062,7 @@ CONFIG_MISC_FILESYSTEMS=y
1056# CONFIG_ROMFS_FS is not set 1062# CONFIG_ROMFS_FS is not set
1057# CONFIG_SYSV_FS is not set 1063# CONFIG_SYSV_FS is not set
1058# CONFIG_UFS_FS is not set 1064# CONFIG_UFS_FS is not set
1065# CONFIG_NILFS2_FS is not set
1059CONFIG_NETWORK_FILESYSTEMS=y 1066CONFIG_NETWORK_FILESYSTEMS=y
1060CONFIG_NFS_FS=y 1067CONFIG_NFS_FS=y
1061# CONFIG_NFS_V3 is not set 1068# CONFIG_NFS_V3 is not set
@@ -1105,11 +1112,25 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1105CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1112CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1106CONFIG_RING_BUFFER=y 1113CONFIG_RING_BUFFER=y
1107CONFIG_TRACING=y 1114CONFIG_TRACING=y
1115CONFIG_TRACING_SUPPORT=y
1108 1116
1109# 1117#
1110# Tracers 1118# Tracers
1111# 1119#
1120# CONFIG_FUNCTION_TRACER is not set
1121# CONFIG_IRQSOFF_TRACER is not set
1122# CONFIG_SCHED_TRACER is not set
1123# CONFIG_CONTEXT_SWITCH_TRACER is not set
1124# CONFIG_EVENT_TRACER is not set
1125# CONFIG_BOOT_TRACER is not set
1126# CONFIG_TRACE_BRANCH_PROFILING is not set
1127# CONFIG_STACK_TRACER is not set
1128# CONFIG_KMEMTRACE is not set
1129# CONFIG_WORKQUEUE_TRACER is not set
1130# CONFIG_BLK_DEV_IO_TRACE is not set
1131# CONFIG_FTRACE_STARTUP_TEST is not set
1112# CONFIG_DYNAMIC_DEBUG is not set 1132# CONFIG_DYNAMIC_DEBUG is not set
1133# CONFIG_DMA_API_DEBUG is not set
1113# CONFIG_SAMPLES is not set 1134# CONFIG_SAMPLES is not set
1114CONFIG_HAVE_ARCH_KGDB=y 1135CONFIG_HAVE_ARCH_KGDB=y
1115# CONFIG_SH_STANDARD_BIOS is not set 1136# CONFIG_SH_STANDARD_BIOS is not set
@@ -1218,6 +1239,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
1218# 1239#
1219# CONFIG_CRYPTO_ANSI_CPRNG is not set 1240# CONFIG_CRYPTO_ANSI_CPRNG is not set
1220# CONFIG_CRYPTO_HW is not set 1241# CONFIG_CRYPTO_HW is not set
1242CONFIG_BINARY_PRINTF=y
1221 1243
1222# 1244#
1223# Library routines 1245# Library routines
diff --git a/arch/sh/configs/polaris_defconfig b/arch/sh/configs/polaris_defconfig
index df2d177d5346..2b9507286182 100644
--- a/arch/sh/configs/polaris_defconfig
+++ b/arch/sh/configs/polaris_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:16:48 2009 4# Mon Apr 27 12:52:19 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -40,6 +41,7 @@ CONFIG_LOCALVERSION=""
40CONFIG_SYSVIPC=y 41CONFIG_SYSVIPC=y
41CONFIG_SYSVIPC_SYSCTL=y 42CONFIG_SYSVIPC_SYSCTL=y
42CONFIG_POSIX_MQUEUE=y 43CONFIG_POSIX_MQUEUE=y
44CONFIG_POSIX_MQUEUE_SYSCTL=y
43CONFIG_BSD_PROCESS_ACCT=y 45CONFIG_BSD_PROCESS_ACCT=y
44CONFIG_BSD_PROCESS_ACCT_V3=y 46CONFIG_BSD_PROCESS_ACCT_V3=y
45# CONFIG_TASKSTATS is not set 47# CONFIG_TASKSTATS is not set
@@ -76,6 +78,7 @@ CONFIG_SYSCTL_SYSCALL=y
76CONFIG_KALLSYMS=y 78CONFIG_KALLSYMS=y
77CONFIG_KALLSYMS_ALL=y 79CONFIG_KALLSYMS_ALL=y
78# CONFIG_KALLSYMS_EXTRA_PASS is not set 80# CONFIG_KALLSYMS_EXTRA_PASS is not set
81# CONFIG_STRIP_ASM_SYMS is not set
79CONFIG_HOTPLUG=y 82CONFIG_HOTPLUG=y
80CONFIG_PRINTK=y 83CONFIG_PRINTK=y
81CONFIG_BUG=y 84CONFIG_BUG=y
@@ -94,6 +97,7 @@ CONFIG_SLAB=y
94# CONFIG_SLUB is not set 97# CONFIG_SLUB is not set
95# CONFIG_SLOB is not set 98# CONFIG_SLOB is not set
96# CONFIG_PROFILING is not set 99# CONFIG_PROFILING is not set
100# CONFIG_MARKERS is not set
97CONFIG_HAVE_OPROFILE=y 101CONFIG_HAVE_OPROFILE=y
98# CONFIG_KPROBES is not set 102# CONFIG_KPROBES is not set
99CONFIG_HAVE_IOREMAP_PROT=y 103CONFIG_HAVE_IOREMAP_PROT=y
@@ -101,6 +105,8 @@ CONFIG_HAVE_KPROBES=y
101CONFIG_HAVE_KRETPROBES=y 105CONFIG_HAVE_KRETPROBES=y
102CONFIG_HAVE_ARCH_TRACEHOOK=y 106CONFIG_HAVE_ARCH_TRACEHOOK=y
103CONFIG_HAVE_CLK=y 107CONFIG_HAVE_CLK=y
108CONFIG_HAVE_DMA_API_DEBUG=y
109# CONFIG_SLOW_WORK is not set
104CONFIG_HAVE_GENERIC_DMA_COHERENT=y 110CONFIG_HAVE_GENERIC_DMA_COHERENT=y
105CONFIG_SLABINFO=y 111CONFIG_SLABINFO=y
106CONFIG_RT_MUTEXES=y 112CONFIG_RT_MUTEXES=y
@@ -113,7 +119,6 @@ CONFIG_MODVERSIONS=y
113# CONFIG_MODULE_SRCVERSION_ALL is not set 119# CONFIG_MODULE_SRCVERSION_ALL is not set
114CONFIG_BLOCK=y 120CONFIG_BLOCK=y
115# CONFIG_LBD is not set 121# CONFIG_LBD is not set
116# CONFIG_BLK_DEV_IO_TRACE is not set
117# CONFIG_BLK_DEV_BSG is not set 122# CONFIG_BLK_DEV_BSG is not set
118# CONFIG_BLK_DEV_INTEGRITY is not set 123# CONFIG_BLK_DEV_INTEGRITY is not set
119 124
@@ -159,6 +164,7 @@ CONFIG_CPU_SUBTYPE_SH7709=y
159# CONFIG_CPU_SUBTYPE_SH7760 is not set 164# CONFIG_CPU_SUBTYPE_SH7760 is not set
160# CONFIG_CPU_SUBTYPE_SH4_202 is not set 165# CONFIG_CPU_SUBTYPE_SH4_202 is not set
161# CONFIG_CPU_SUBTYPE_SH7723 is not set 166# CONFIG_CPU_SUBTYPE_SH7723 is not set
167# CONFIG_CPU_SUBTYPE_SH7724 is not set
162# CONFIG_CPU_SUBTYPE_SH7763 is not set 168# CONFIG_CPU_SUBTYPE_SH7763 is not set
163# CONFIG_CPU_SUBTYPE_SH7770 is not set 169# CONFIG_CPU_SUBTYPE_SH7770 is not set
164# CONFIG_CPU_SUBTYPE_SH7780 is not set 170# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -168,8 +174,6 @@ CONFIG_CPU_SUBTYPE_SH7709=y
168# CONFIG_CPU_SUBTYPE_SH7343 is not set 174# CONFIG_CPU_SUBTYPE_SH7343 is not set
169# CONFIG_CPU_SUBTYPE_SH7722 is not set 175# CONFIG_CPU_SUBTYPE_SH7722 is not set
170# CONFIG_CPU_SUBTYPE_SH7366 is not set 176# CONFIG_CPU_SUBTYPE_SH7366 is not set
171# CONFIG_CPU_SUBTYPE_SH5_101 is not set
172# CONFIG_CPU_SUBTYPE_SH5_103 is not set
173 177
174# 178#
175# Memory management options 179# Memory management options
@@ -778,6 +782,11 @@ CONFIG_FILE_LOCKING=y
778# CONFIG_FUSE_FS is not set 782# CONFIG_FUSE_FS is not set
779 783
780# 784#
785# Caches
786#
787# CONFIG_FSCACHE is not set
788
789#
781# CD-ROM/DVD Filesystems 790# CD-ROM/DVD Filesystems
782# 791#
783# CONFIG_ISO9660_FS is not set 792# CONFIG_ISO9660_FS is not set
@@ -831,6 +840,7 @@ CONFIG_JFFS2_RTIME=y
831# CONFIG_ROMFS_FS is not set 840# CONFIG_ROMFS_FS is not set
832# CONFIG_SYSV_FS is not set 841# CONFIG_SYSV_FS is not set
833# CONFIG_UFS_FS is not set 842# CONFIG_UFS_FS is not set
843# CONFIG_NILFS2_FS is not set
834CONFIG_NETWORK_FILESYSTEMS=y 844CONFIG_NETWORK_FILESYSTEMS=y
835CONFIG_NFS_FS=y 845CONFIG_NFS_FS=y
836CONFIG_NFS_V3=y 846CONFIG_NFS_V3=y
@@ -874,6 +884,9 @@ CONFIG_DEBUG_SHIRQ=y
874CONFIG_DETECT_SOFTLOCKUP=y 884CONFIG_DETECT_SOFTLOCKUP=y
875# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 885# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
876CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 886CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
887CONFIG_DETECT_HUNG_TASK=y
888# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
889CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
877# CONFIG_SCHED_DEBUG is not set 890# CONFIG_SCHED_DEBUG is not set
878# CONFIG_SCHEDSTATS is not set 891# CONFIG_SCHEDSTATS is not set
879# CONFIG_TIMER_STATS is not set 892# CONFIG_TIMER_STATS is not set
@@ -914,6 +927,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
914CONFIG_HAVE_FUNCTION_TRACER=y 927CONFIG_HAVE_FUNCTION_TRACER=y
915CONFIG_HAVE_DYNAMIC_FTRACE=y 928CONFIG_HAVE_DYNAMIC_FTRACE=y
916CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 929CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
930CONFIG_TRACING_SUPPORT=y
917 931
918# 932#
919# Tracers 933# Tracers
@@ -923,9 +937,14 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
923# CONFIG_PREEMPT_TRACER is not set 937# CONFIG_PREEMPT_TRACER is not set
924# CONFIG_SCHED_TRACER is not set 938# CONFIG_SCHED_TRACER is not set
925# CONFIG_CONTEXT_SWITCH_TRACER is not set 939# CONFIG_CONTEXT_SWITCH_TRACER is not set
940# CONFIG_EVENT_TRACER is not set
926# CONFIG_BOOT_TRACER is not set 941# CONFIG_BOOT_TRACER is not set
927# CONFIG_TRACE_BRANCH_PROFILING is not set 942# CONFIG_TRACE_BRANCH_PROFILING is not set
928# CONFIG_STACK_TRACER is not set 943# CONFIG_STACK_TRACER is not set
944# CONFIG_KMEMTRACE is not set
945# CONFIG_WORKQUEUE_TRACER is not set
946# CONFIG_BLK_DEV_IO_TRACE is not set
947# CONFIG_DMA_API_DEBUG is not set
929# CONFIG_SAMPLES is not set 948# CONFIG_SAMPLES is not set
930CONFIG_HAVE_ARCH_KGDB=y 949CONFIG_HAVE_ARCH_KGDB=y
931# CONFIG_KGDB is not set 950# CONFIG_KGDB is not set
@@ -950,6 +969,7 @@ CONFIG_DUMP_CODE=y
950# CONFIG_SECURITYFS is not set 969# CONFIG_SECURITYFS is not set
951# CONFIG_SECURITY_FILE_CAPABILITIES is not set 970# CONFIG_SECURITY_FILE_CAPABILITIES is not set
952# CONFIG_CRYPTO is not set 971# CONFIG_CRYPTO is not set
972# CONFIG_BINARY_PRINTF is not set
953 973
954# 974#
955# Library routines 975# Library routines
diff --git a/arch/sh/configs/r7780mp_defconfig b/arch/sh/configs/r7780mp_defconfig
index 7def4df46ddb..68e5eff5d7fe 100644
--- a/arch/sh/configs/r7780mp_defconfig
+++ b/arch/sh/configs/r7780mp_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:20:17 2009 4# Mon Apr 27 12:53:28 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -78,6 +79,7 @@ CONFIG_UID16=y
78CONFIG_KALLSYMS=y 79CONFIG_KALLSYMS=y
79# CONFIG_KALLSYMS_ALL is not set 80# CONFIG_KALLSYMS_ALL is not set
80# CONFIG_KALLSYMS_EXTRA_PASS is not set 81# CONFIG_KALLSYMS_EXTRA_PASS is not set
82# CONFIG_STRIP_ASM_SYMS is not set
81CONFIG_HOTPLUG=y 83CONFIG_HOTPLUG=y
82CONFIG_PRINTK=y 84CONFIG_PRINTK=y
83CONFIG_BUG=y 85CONFIG_BUG=y
@@ -107,6 +109,8 @@ CONFIG_HAVE_KPROBES=y
107CONFIG_HAVE_KRETPROBES=y 109CONFIG_HAVE_KRETPROBES=y
108CONFIG_HAVE_ARCH_TRACEHOOK=y 110CONFIG_HAVE_ARCH_TRACEHOOK=y
109CONFIG_HAVE_CLK=y 111CONFIG_HAVE_CLK=y
112CONFIG_HAVE_DMA_API_DEBUG=y
113# CONFIG_SLOW_WORK is not set
110CONFIG_HAVE_GENERIC_DMA_COHERENT=y 114CONFIG_HAVE_GENERIC_DMA_COHERENT=y
111CONFIG_SLABINFO=y 115CONFIG_SLABINFO=y
112CONFIG_BASE_SMALL=0 116CONFIG_BASE_SMALL=0
@@ -118,7 +122,6 @@ CONFIG_MODULE_UNLOAD=y
118# CONFIG_MODULE_SRCVERSION_ALL is not set 122# CONFIG_MODULE_SRCVERSION_ALL is not set
119CONFIG_BLOCK=y 123CONFIG_BLOCK=y
120# CONFIG_LBD is not set 124# CONFIG_LBD is not set
121# CONFIG_BLK_DEV_IO_TRACE is not set
122# CONFIG_BLK_DEV_BSG is not set 125# CONFIG_BLK_DEV_BSG is not set
123# CONFIG_BLK_DEV_INTEGRITY is not set 126# CONFIG_BLK_DEV_INTEGRITY is not set
124 127
@@ -165,6 +168,7 @@ CONFIG_CPU_SH4A=y
165# CONFIG_CPU_SUBTYPE_SH7760 is not set 168# CONFIG_CPU_SUBTYPE_SH7760 is not set
166# CONFIG_CPU_SUBTYPE_SH4_202 is not set 169# CONFIG_CPU_SUBTYPE_SH4_202 is not set
167# CONFIG_CPU_SUBTYPE_SH7723 is not set 170# CONFIG_CPU_SUBTYPE_SH7723 is not set
171# CONFIG_CPU_SUBTYPE_SH7724 is not set
168# CONFIG_CPU_SUBTYPE_SH7763 is not set 172# CONFIG_CPU_SUBTYPE_SH7763 is not set
169# CONFIG_CPU_SUBTYPE_SH7770 is not set 173# CONFIG_CPU_SUBTYPE_SH7770 is not set
170CONFIG_CPU_SUBTYPE_SH7780=y 174CONFIG_CPU_SUBTYPE_SH7780=y
@@ -174,8 +178,6 @@ CONFIG_CPU_SUBTYPE_SH7780=y
174# CONFIG_CPU_SUBTYPE_SH7343 is not set 178# CONFIG_CPU_SUBTYPE_SH7343 is not set
175# CONFIG_CPU_SUBTYPE_SH7722 is not set 179# CONFIG_CPU_SUBTYPE_SH7722 is not set
176# CONFIG_CPU_SUBTYPE_SH7366 is not set 180# CONFIG_CPU_SUBTYPE_SH7366 is not set
177# CONFIG_CPU_SUBTYPE_SH5_101 is not set
178# CONFIG_CPU_SUBTYPE_SH5_103 is not set
179 181
180# 182#
181# Memory management options 183# Memory management options
@@ -313,8 +315,6 @@ CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
313# 315#
314CONFIG_PCI=y 316CONFIG_PCI=y
315CONFIG_SH_PCIDMA_NONCOHERENT=y 317CONFIG_SH_PCIDMA_NONCOHERENT=y
316CONFIG_PCI_AUTO=y
317CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
318# CONFIG_PCIEPORTBUS is not set 318# CONFIG_PCIEPORTBUS is not set
319# CONFIG_ARCH_SUPPORTS_MSI is not set 319# CONFIG_ARCH_SUPPORTS_MSI is not set
320CONFIG_PCI_LEGACY=y 320CONFIG_PCI_LEGACY=y
@@ -536,6 +536,7 @@ CONFIG_SCSI_LOWLEVEL=y
536# CONFIG_SCSI_MPT2SAS is not set 536# CONFIG_SCSI_MPT2SAS is not set
537# CONFIG_SCSI_HPTIOP is not set 537# CONFIG_SCSI_HPTIOP is not set
538# CONFIG_LIBFC is not set 538# CONFIG_LIBFC is not set
539# CONFIG_LIBFCOE is not set
539# CONFIG_FCOE is not set 540# CONFIG_FCOE is not set
540# CONFIG_SCSI_DMX3191D is not set 541# CONFIG_SCSI_DMX3191D is not set
541# CONFIG_SCSI_FUTURE_DOMAIN is not set 542# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -696,6 +697,7 @@ CONFIG_E1000=m
696# CONFIG_E1000E is not set 697# CONFIG_E1000E is not set
697# CONFIG_IP1000 is not set 698# CONFIG_IP1000 is not set
698# CONFIG_IGB is not set 699# CONFIG_IGB is not set
700# CONFIG_IGBVF is not set
699# CONFIG_NS83820 is not set 701# CONFIG_NS83820 is not set
700# CONFIG_HAMACHI is not set 702# CONFIG_HAMACHI is not set
701# CONFIG_YELLOWFIN is not set 703# CONFIG_YELLOWFIN is not set
@@ -719,6 +721,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
719# CONFIG_IXGBE is not set 721# CONFIG_IXGBE is not set
720# CONFIG_IXGB is not set 722# CONFIG_IXGB is not set
721# CONFIG_S2IO is not set 723# CONFIG_S2IO is not set
724# CONFIG_VXGE is not set
722# CONFIG_MYRI10GE is not set 725# CONFIG_MYRI10GE is not set
723# CONFIG_NETXEN_NIC is not set 726# CONFIG_NETXEN_NIC is not set
724# CONFIG_NIU is not set 727# CONFIG_NIU is not set
@@ -920,6 +923,7 @@ CONFIG_HWMON=y
920# CONFIG_SENSORS_F71805F is not set 923# CONFIG_SENSORS_F71805F is not set
921# CONFIG_SENSORS_F71882FG is not set 924# CONFIG_SENSORS_F71882FG is not set
922# CONFIG_SENSORS_F75375S is not set 925# CONFIG_SENSORS_F75375S is not set
926# CONFIG_SENSORS_G760A is not set
923# CONFIG_SENSORS_GL518SM is not set 927# CONFIG_SENSORS_GL518SM is not set
924# CONFIG_SENSORS_GL520SM is not set 928# CONFIG_SENSORS_GL520SM is not set
925# CONFIG_SENSORS_IT87 is not set 929# CONFIG_SENSORS_IT87 is not set
@@ -1027,7 +1031,6 @@ CONFIG_HID=y
1027# 1031#
1028# Special HID drivers 1032# Special HID drivers
1029# 1033#
1030CONFIG_HID_COMPAT=y
1031CONFIG_USB_SUPPORT=y 1034CONFIG_USB_SUPPORT=y
1032CONFIG_USB_ARCH_HAS_HCD=y 1035CONFIG_USB_ARCH_HAS_HCD=y
1033CONFIG_USB_ARCH_HAS_OHCI=y 1036CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1120,6 +1123,7 @@ CONFIG_EXT2_FS=y
1120# CONFIG_EXT2_FS_XATTR is not set 1123# CONFIG_EXT2_FS_XATTR is not set
1121# CONFIG_EXT2_FS_XIP is not set 1124# CONFIG_EXT2_FS_XIP is not set
1122CONFIG_EXT3_FS=y 1125CONFIG_EXT3_FS=y
1126# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1123CONFIG_EXT3_FS_XATTR=y 1127CONFIG_EXT3_FS_XATTR=y
1124# CONFIG_EXT3_FS_POSIX_ACL is not set 1128# CONFIG_EXT3_FS_POSIX_ACL is not set
1125# CONFIG_EXT3_FS_SECURITY is not set 1129# CONFIG_EXT3_FS_SECURITY is not set
@@ -1143,6 +1147,11 @@ CONFIG_INOTIFY_USER=y
1143CONFIG_FUSE_FS=m 1147CONFIG_FUSE_FS=m
1144 1148
1145# 1149#
1150# Caches
1151#
1152# CONFIG_FSCACHE is not set
1153
1154#
1146# CD-ROM/DVD Filesystems 1155# CD-ROM/DVD Filesystems
1147# 1156#
1148# CONFIG_ISO9660_FS is not set 1157# CONFIG_ISO9660_FS is not set
@@ -1191,6 +1200,7 @@ CONFIG_MINIX_FS=y
1191# CONFIG_ROMFS_FS is not set 1200# CONFIG_ROMFS_FS is not set
1192# CONFIG_SYSV_FS is not set 1201# CONFIG_SYSV_FS is not set
1193# CONFIG_UFS_FS is not set 1202# CONFIG_UFS_FS is not set
1203# CONFIG_NILFS2_FS is not set
1194CONFIG_NETWORK_FILESYSTEMS=y 1204CONFIG_NETWORK_FILESYSTEMS=y
1195CONFIG_NFS_FS=y 1205CONFIG_NFS_FS=y
1196CONFIG_NFS_V3=y 1206CONFIG_NFS_V3=y
@@ -1279,6 +1289,9 @@ CONFIG_DEBUG_KERNEL=y
1279CONFIG_DETECT_SOFTLOCKUP=y 1289CONFIG_DETECT_SOFTLOCKUP=y
1280# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1290# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1281CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1291CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1292CONFIG_DETECT_HUNG_TASK=y
1293# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1294CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1282CONFIG_SCHED_DEBUG=y 1295CONFIG_SCHED_DEBUG=y
1283# CONFIG_SCHEDSTATS is not set 1296# CONFIG_SCHEDSTATS is not set
1284# CONFIG_TIMER_STATS is not set 1297# CONFIG_TIMER_STATS is not set
@@ -1316,6 +1329,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1316CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1329CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1317CONFIG_RING_BUFFER=y 1330CONFIG_RING_BUFFER=y
1318CONFIG_TRACING=y 1331CONFIG_TRACING=y
1332CONFIG_TRACING_SUPPORT=y
1319 1333
1320# 1334#
1321# Tracers 1335# Tracers
@@ -1325,11 +1339,16 @@ CONFIG_TRACING=y
1325# CONFIG_PREEMPT_TRACER is not set 1339# CONFIG_PREEMPT_TRACER is not set
1326# CONFIG_SCHED_TRACER is not set 1340# CONFIG_SCHED_TRACER is not set
1327# CONFIG_CONTEXT_SWITCH_TRACER is not set 1341# CONFIG_CONTEXT_SWITCH_TRACER is not set
1342# CONFIG_EVENT_TRACER is not set
1328# CONFIG_BOOT_TRACER is not set 1343# CONFIG_BOOT_TRACER is not set
1329# CONFIG_TRACE_BRANCH_PROFILING is not set 1344# CONFIG_TRACE_BRANCH_PROFILING is not set
1330# CONFIG_STACK_TRACER is not set 1345# CONFIG_STACK_TRACER is not set
1346# CONFIG_KMEMTRACE is not set
1347# CONFIG_WORKQUEUE_TRACER is not set
1348# CONFIG_BLK_DEV_IO_TRACE is not set
1331# CONFIG_FTRACE_STARTUP_TEST is not set 1349# CONFIG_FTRACE_STARTUP_TEST is not set
1332# CONFIG_DYNAMIC_DEBUG is not set 1350# CONFIG_DYNAMIC_DEBUG is not set
1351# CONFIG_DMA_API_DEBUG is not set
1333# CONFIG_SAMPLES is not set 1352# CONFIG_SAMPLES is not set
1334CONFIG_HAVE_ARCH_KGDB=y 1353CONFIG_HAVE_ARCH_KGDB=y
1335# CONFIG_KGDB is not set 1354# CONFIG_KGDB is not set
@@ -1449,6 +1468,7 @@ CONFIG_CRYPTO_DES=y
1449# CONFIG_CRYPTO_ANSI_CPRNG is not set 1468# CONFIG_CRYPTO_ANSI_CPRNG is not set
1450CONFIG_CRYPTO_HW=y 1469CONFIG_CRYPTO_HW=y
1451# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1470# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1471CONFIG_BINARY_PRINTF=y
1452 1472
1453# 1473#
1454# Library routines 1474# Library routines
diff --git a/arch/sh/configs/r7785rp_defconfig b/arch/sh/configs/r7785rp_defconfig
index cb134ffc2118..890fe3cc9142 100644
--- a/arch/sh/configs/r7785rp_defconfig
+++ b/arch/sh/configs/r7785rp_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:24:35 2009 4# Mon Apr 27 12:55:10 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -43,6 +44,7 @@ CONFIG_SWAP=y
43CONFIG_SYSVIPC=y 44CONFIG_SYSVIPC=y
44CONFIG_SYSVIPC_SYSCTL=y 45CONFIG_SYSVIPC_SYSCTL=y
45CONFIG_POSIX_MQUEUE=y 46CONFIG_POSIX_MQUEUE=y
47CONFIG_POSIX_MQUEUE_SYSCTL=y
46CONFIG_BSD_PROCESS_ACCT=y 48CONFIG_BSD_PROCESS_ACCT=y
47# CONFIG_BSD_PROCESS_ACCT_V3 is not set 49# CONFIG_BSD_PROCESS_ACCT_V3 is not set
48# CONFIG_TASKSTATS is not set 50# CONFIG_TASKSTATS is not set
@@ -78,6 +80,7 @@ CONFIG_UID16=y
78CONFIG_KALLSYMS=y 80CONFIG_KALLSYMS=y
79CONFIG_KALLSYMS_ALL=y 81CONFIG_KALLSYMS_ALL=y
80# CONFIG_KALLSYMS_EXTRA_PASS is not set 82# CONFIG_KALLSYMS_EXTRA_PASS is not set
83# CONFIG_STRIP_ASM_SYMS is not set
81CONFIG_HOTPLUG=y 84CONFIG_HOTPLUG=y
82CONFIG_PRINTK=y 85CONFIG_PRINTK=y
83CONFIG_BUG=y 86CONFIG_BUG=y
@@ -108,6 +111,8 @@ CONFIG_HAVE_KPROBES=y
108CONFIG_HAVE_KRETPROBES=y 111CONFIG_HAVE_KRETPROBES=y
109CONFIG_HAVE_ARCH_TRACEHOOK=y 112CONFIG_HAVE_ARCH_TRACEHOOK=y
110CONFIG_HAVE_CLK=y 113CONFIG_HAVE_CLK=y
114CONFIG_HAVE_DMA_API_DEBUG=y
115# CONFIG_SLOW_WORK is not set
111CONFIG_HAVE_GENERIC_DMA_COHERENT=y 116CONFIG_HAVE_GENERIC_DMA_COHERENT=y
112CONFIG_SLABINFO=y 117CONFIG_SLABINFO=y
113CONFIG_RT_MUTEXES=y 118CONFIG_RT_MUTEXES=y
@@ -120,7 +125,6 @@ CONFIG_MODULE_UNLOAD=y
120# CONFIG_MODULE_SRCVERSION_ALL is not set 125# CONFIG_MODULE_SRCVERSION_ALL is not set
121CONFIG_BLOCK=y 126CONFIG_BLOCK=y
122# CONFIG_LBD is not set 127# CONFIG_LBD is not set
123# CONFIG_BLK_DEV_IO_TRACE is not set
124# CONFIG_BLK_DEV_BSG is not set 128# CONFIG_BLK_DEV_BSG is not set
125# CONFIG_BLK_DEV_INTEGRITY is not set 129# CONFIG_BLK_DEV_INTEGRITY is not set
126 130
@@ -168,6 +172,7 @@ CONFIG_CPU_SHX2=y
168# CONFIG_CPU_SUBTYPE_SH7760 is not set 172# CONFIG_CPU_SUBTYPE_SH7760 is not set
169# CONFIG_CPU_SUBTYPE_SH4_202 is not set 173# CONFIG_CPU_SUBTYPE_SH4_202 is not set
170# CONFIG_CPU_SUBTYPE_SH7723 is not set 174# CONFIG_CPU_SUBTYPE_SH7723 is not set
175# CONFIG_CPU_SUBTYPE_SH7724 is not set
171# CONFIG_CPU_SUBTYPE_SH7763 is not set 176# CONFIG_CPU_SUBTYPE_SH7763 is not set
172# CONFIG_CPU_SUBTYPE_SH7770 is not set 177# CONFIG_CPU_SUBTYPE_SH7770 is not set
173# CONFIG_CPU_SUBTYPE_SH7780 is not set 178# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -177,8 +182,6 @@ CONFIG_CPU_SUBTYPE_SH7785=y
177# CONFIG_CPU_SUBTYPE_SH7343 is not set 182# CONFIG_CPU_SUBTYPE_SH7343 is not set
178# CONFIG_CPU_SUBTYPE_SH7722 is not set 183# CONFIG_CPU_SUBTYPE_SH7722 is not set
179# CONFIG_CPU_SUBTYPE_SH7366 is not set 184# CONFIG_CPU_SUBTYPE_SH7366 is not set
180# CONFIG_CPU_SUBTYPE_SH5_101 is not set
181# CONFIG_CPU_SUBTYPE_SH5_103 is not set
182 185
183# 186#
184# Memory management options 187# Memory management options
@@ -337,8 +340,6 @@ CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
337# 340#
338CONFIG_PCI=y 341CONFIG_PCI=y
339CONFIG_SH_PCIDMA_NONCOHERENT=y 342CONFIG_SH_PCIDMA_NONCOHERENT=y
340CONFIG_PCI_AUTO=y
341CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
342# CONFIG_PCIEPORTBUS is not set 343# CONFIG_PCIEPORTBUS is not set
343# CONFIG_ARCH_SUPPORTS_MSI is not set 344# CONFIG_ARCH_SUPPORTS_MSI is not set
344# CONFIG_PCI_LEGACY is not set 345# CONFIG_PCI_LEGACY is not set
@@ -561,6 +562,7 @@ CONFIG_SCSI_LOWLEVEL=y
561# CONFIG_SCSI_MPT2SAS is not set 562# CONFIG_SCSI_MPT2SAS is not set
562# CONFIG_SCSI_HPTIOP is not set 563# CONFIG_SCSI_HPTIOP is not set
563# CONFIG_LIBFC is not set 564# CONFIG_LIBFC is not set
565# CONFIG_LIBFCOE is not set
564# CONFIG_FCOE is not set 566# CONFIG_FCOE is not set
565# CONFIG_SCSI_DMX3191D is not set 567# CONFIG_SCSI_DMX3191D is not set
566# CONFIG_SCSI_FUTURE_DOMAIN is not set 568# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -698,6 +700,7 @@ CONFIG_NETDEV_1000=y
698# CONFIG_E1000E is not set 700# CONFIG_E1000E is not set
699# CONFIG_IP1000 is not set 701# CONFIG_IP1000 is not set
700# CONFIG_IGB is not set 702# CONFIG_IGB is not set
703# CONFIG_IGBVF is not set
701# CONFIG_NS83820 is not set 704# CONFIG_NS83820 is not set
702# CONFIG_HAMACHI is not set 705# CONFIG_HAMACHI is not set
703# CONFIG_YELLOWFIN is not set 706# CONFIG_YELLOWFIN is not set
@@ -721,6 +724,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
721# CONFIG_IXGBE is not set 724# CONFIG_IXGBE is not set
722# CONFIG_IXGB is not set 725# CONFIG_IXGB is not set
723# CONFIG_S2IO is not set 726# CONFIG_S2IO is not set
727# CONFIG_VXGE is not set
724# CONFIG_MYRI10GE is not set 728# CONFIG_MYRI10GE is not set
725# CONFIG_NETXEN_NIC is not set 729# CONFIG_NETXEN_NIC is not set
726# CONFIG_NIU is not set 730# CONFIG_NIU is not set
@@ -948,6 +952,7 @@ CONFIG_HWMON=y
948# CONFIG_SENSORS_F71805F is not set 952# CONFIG_SENSORS_F71805F is not set
949# CONFIG_SENSORS_F71882FG is not set 953# CONFIG_SENSORS_F71882FG is not set
950# CONFIG_SENSORS_F75375S is not set 954# CONFIG_SENSORS_F75375S is not set
955# CONFIG_SENSORS_G760A is not set
951# CONFIG_SENSORS_GL518SM is not set 956# CONFIG_SENSORS_GL518SM is not set
952# CONFIG_SENSORS_GL520SM is not set 957# CONFIG_SENSORS_GL520SM is not set
953# CONFIG_SENSORS_IT87 is not set 958# CONFIG_SENSORS_IT87 is not set
@@ -970,6 +975,7 @@ CONFIG_HWMON=y
970# CONFIG_SENSORS_PC87360 is not set 975# CONFIG_SENSORS_PC87360 is not set
971# CONFIG_SENSORS_PC87427 is not set 976# CONFIG_SENSORS_PC87427 is not set
972# CONFIG_SENSORS_PCF8591 is not set 977# CONFIG_SENSORS_PCF8591 is not set
978# CONFIG_SENSORS_SHT15 is not set
973# CONFIG_SENSORS_SIS5595 is not set 979# CONFIG_SENSORS_SIS5595 is not set
974# CONFIG_SENSORS_DME1737 is not set 980# CONFIG_SENSORS_DME1737 is not set
975# CONFIG_SENSORS_SMSC47M1 is not set 981# CONFIG_SENSORS_SMSC47M1 is not set
@@ -1109,7 +1115,6 @@ CONFIG_HID=y
1109# 1115#
1110# Special HID drivers 1116# Special HID drivers
1111# 1117#
1112CONFIG_HID_COMPAT=y
1113CONFIG_USB_SUPPORT=y 1118CONFIG_USB_SUPPORT=y
1114CONFIG_USB_ARCH_HAS_HCD=y 1119CONFIG_USB_ARCH_HAS_HCD=y
1115CONFIG_USB_ARCH_HAS_OHCI=y 1120CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1202,6 +1207,7 @@ CONFIG_EXT2_FS=y
1202# CONFIG_EXT2_FS_XATTR is not set 1207# CONFIG_EXT2_FS_XATTR is not set
1203# CONFIG_EXT2_FS_XIP is not set 1208# CONFIG_EXT2_FS_XIP is not set
1204CONFIG_EXT3_FS=y 1209CONFIG_EXT3_FS=y
1210# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1205CONFIG_EXT3_FS_XATTR=y 1211CONFIG_EXT3_FS_XATTR=y
1206# CONFIG_EXT3_FS_POSIX_ACL is not set 1212# CONFIG_EXT3_FS_POSIX_ACL is not set
1207# CONFIG_EXT3_FS_SECURITY is not set 1213# CONFIG_EXT3_FS_SECURITY is not set
@@ -1225,6 +1231,11 @@ CONFIG_INOTIFY_USER=y
1225CONFIG_FUSE_FS=m 1231CONFIG_FUSE_FS=m
1226 1232
1227# 1233#
1234# Caches
1235#
1236# CONFIG_FSCACHE is not set
1237
1238#
1228# CD-ROM/DVD Filesystems 1239# CD-ROM/DVD Filesystems
1229# 1240#
1230# CONFIG_ISO9660_FS is not set 1241# CONFIG_ISO9660_FS is not set
@@ -1273,6 +1284,7 @@ CONFIG_MINIX_FS=y
1273# CONFIG_ROMFS_FS is not set 1284# CONFIG_ROMFS_FS is not set
1274# CONFIG_SYSV_FS is not set 1285# CONFIG_SYSV_FS is not set
1275# CONFIG_UFS_FS is not set 1286# CONFIG_UFS_FS is not set
1287# CONFIG_NILFS2_FS is not set
1276CONFIG_NETWORK_FILESYSTEMS=y 1288CONFIG_NETWORK_FILESYSTEMS=y
1277CONFIG_NFS_FS=y 1289CONFIG_NFS_FS=y
1278CONFIG_NFS_V3=y 1290CONFIG_NFS_V3=y
@@ -1359,6 +1371,7 @@ CONFIG_DEBUG_FS=y
1359CONFIG_DEBUG_KERNEL=y 1371CONFIG_DEBUG_KERNEL=y
1360# CONFIG_DEBUG_SHIRQ is not set 1372# CONFIG_DEBUG_SHIRQ is not set
1361# CONFIG_DETECT_SOFTLOCKUP is not set 1373# CONFIG_DETECT_SOFTLOCKUP is not set
1374# CONFIG_DETECT_HUNG_TASK is not set
1362CONFIG_SCHED_DEBUG=y 1375CONFIG_SCHED_DEBUG=y
1363# CONFIG_SCHEDSTATS is not set 1376# CONFIG_SCHEDSTATS is not set
1364# CONFIG_TIMER_STATS is not set 1377# CONFIG_TIMER_STATS is not set
@@ -1401,6 +1414,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1401CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1414CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1402CONFIG_RING_BUFFER=y 1415CONFIG_RING_BUFFER=y
1403CONFIG_TRACING=y 1416CONFIG_TRACING=y
1417CONFIG_TRACING_SUPPORT=y
1404 1418
1405# 1419#
1406# Tracers 1420# Tracers
@@ -1410,11 +1424,16 @@ CONFIG_TRACING=y
1410# CONFIG_PREEMPT_TRACER is not set 1424# CONFIG_PREEMPT_TRACER is not set
1411# CONFIG_SCHED_TRACER is not set 1425# CONFIG_SCHED_TRACER is not set
1412# CONFIG_CONTEXT_SWITCH_TRACER is not set 1426# CONFIG_CONTEXT_SWITCH_TRACER is not set
1427# CONFIG_EVENT_TRACER is not set
1413# CONFIG_BOOT_TRACER is not set 1428# CONFIG_BOOT_TRACER is not set
1414# CONFIG_TRACE_BRANCH_PROFILING is not set 1429# CONFIG_TRACE_BRANCH_PROFILING is not set
1415# CONFIG_STACK_TRACER is not set 1430# CONFIG_STACK_TRACER is not set
1431# CONFIG_KMEMTRACE is not set
1432# CONFIG_WORKQUEUE_TRACER is not set
1433# CONFIG_BLK_DEV_IO_TRACE is not set
1416# CONFIG_FTRACE_STARTUP_TEST is not set 1434# CONFIG_FTRACE_STARTUP_TEST is not set
1417# CONFIG_DYNAMIC_DEBUG is not set 1435# CONFIG_DYNAMIC_DEBUG is not set
1436# CONFIG_DMA_API_DEBUG is not set
1418# CONFIG_SAMPLES is not set 1437# CONFIG_SAMPLES is not set
1419CONFIG_HAVE_ARCH_KGDB=y 1438CONFIG_HAVE_ARCH_KGDB=y
1420# CONFIG_KGDB is not set 1439# CONFIG_KGDB is not set
@@ -1534,6 +1553,7 @@ CONFIG_CRYPTO_DES=y
1534# CONFIG_CRYPTO_ANSI_CPRNG is not set 1553# CONFIG_CRYPTO_ANSI_CPRNG is not set
1535CONFIG_CRYPTO_HW=y 1554CONFIG_CRYPTO_HW=y
1536# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1555# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1556CONFIG_BINARY_PRINTF=y
1537 1557
1538# 1558#
1539# Library routines 1559# Library routines
diff --git a/arch/sh/configs/rsk7201_defconfig b/arch/sh/configs/rsk7201_defconfig
index a037c744b798..fa4395768d19 100644
--- a/arch/sh/configs/rsk7201_defconfig
+++ b/arch/sh/configs/rsk7201_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:29:08 2009 4# Mon Apr 27 12:56:29 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -65,7 +66,6 @@ CONFIG_INITRAMFS_SOURCE=""
65CONFIG_RD_GZIP=y 66CONFIG_RD_GZIP=y
66# CONFIG_RD_BZIP2 is not set 67# CONFIG_RD_BZIP2 is not set
67# CONFIG_RD_LZMA is not set 68# CONFIG_RD_LZMA is not set
68CONFIG_INITRAMFS_COMPRESSION_NONE=y
69CONFIG_CC_OPTIMIZE_FOR_SIZE=y 69CONFIG_CC_OPTIMIZE_FOR_SIZE=y
70CONFIG_SYSCTL=y 70CONFIG_SYSCTL=y
71CONFIG_ANON_INODES=y 71CONFIG_ANON_INODES=y
@@ -74,6 +74,7 @@ CONFIG_UID16=y
74CONFIG_SYSCTL_SYSCALL=y 74CONFIG_SYSCTL_SYSCALL=y
75CONFIG_KALLSYMS=y 75CONFIG_KALLSYMS=y
76# CONFIG_KALLSYMS_EXTRA_PASS is not set 76# CONFIG_KALLSYMS_EXTRA_PASS is not set
77# CONFIG_STRIP_ASM_SYMS is not set
77CONFIG_HOTPLUG=y 78CONFIG_HOTPLUG=y
78CONFIG_PRINTK=y 79CONFIG_PRINTK=y
79CONFIG_BUG=y 80CONFIG_BUG=y
@@ -100,6 +101,8 @@ CONFIG_HAVE_KPROBES=y
100CONFIG_HAVE_KRETPROBES=y 101CONFIG_HAVE_KRETPROBES=y
101CONFIG_HAVE_ARCH_TRACEHOOK=y 102CONFIG_HAVE_ARCH_TRACEHOOK=y
102CONFIG_HAVE_CLK=y 103CONFIG_HAVE_CLK=y
104CONFIG_HAVE_DMA_API_DEBUG=y
105# CONFIG_SLOW_WORK is not set
103CONFIG_HAVE_GENERIC_DMA_COHERENT=y 106CONFIG_HAVE_GENERIC_DMA_COHERENT=y
104CONFIG_RT_MUTEXES=y 107CONFIG_RT_MUTEXES=y
105CONFIG_BASE_SMALL=0 108CONFIG_BASE_SMALL=0
@@ -110,7 +113,6 @@ CONFIG_MODULES=y
110# CONFIG_MODULE_SRCVERSION_ALL is not set 113# CONFIG_MODULE_SRCVERSION_ALL is not set
111CONFIG_BLOCK=y 114CONFIG_BLOCK=y
112# CONFIG_LBD is not set 115# CONFIG_LBD is not set
113# CONFIG_BLK_DEV_IO_TRACE is not set
114# CONFIG_BLK_DEV_BSG is not set 116# CONFIG_BLK_DEV_BSG is not set
115# CONFIG_BLK_DEV_INTEGRITY is not set 117# CONFIG_BLK_DEV_INTEGRITY is not set
116 118
@@ -157,6 +159,7 @@ CONFIG_CPU_SUBTYPE_SH7201=y
157# CONFIG_CPU_SUBTYPE_SH7760 is not set 159# CONFIG_CPU_SUBTYPE_SH7760 is not set
158# CONFIG_CPU_SUBTYPE_SH4_202 is not set 160# CONFIG_CPU_SUBTYPE_SH4_202 is not set
159# CONFIG_CPU_SUBTYPE_SH7723 is not set 161# CONFIG_CPU_SUBTYPE_SH7723 is not set
162# CONFIG_CPU_SUBTYPE_SH7724 is not set
160# CONFIG_CPU_SUBTYPE_SH7763 is not set 163# CONFIG_CPU_SUBTYPE_SH7763 is not set
161# CONFIG_CPU_SUBTYPE_SH7770 is not set 164# CONFIG_CPU_SUBTYPE_SH7770 is not set
162# CONFIG_CPU_SUBTYPE_SH7780 is not set 165# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -166,8 +169,6 @@ CONFIG_CPU_SUBTYPE_SH7201=y
166# CONFIG_CPU_SUBTYPE_SH7343 is not set 169# CONFIG_CPU_SUBTYPE_SH7343 is not set
167# CONFIG_CPU_SUBTYPE_SH7722 is not set 170# CONFIG_CPU_SUBTYPE_SH7722 is not set
168# CONFIG_CPU_SUBTYPE_SH7366 is not set 171# CONFIG_CPU_SUBTYPE_SH7366 is not set
169# CONFIG_CPU_SUBTYPE_SH5_101 is not set
170# CONFIG_CPU_SUBTYPE_SH5_103 is not set
171 172
172# 173#
173# Memory management options 174# Memory management options
@@ -603,6 +604,11 @@ CONFIG_EXT2_FS=y
603# CONFIG_FUSE_FS is not set 604# CONFIG_FUSE_FS is not set
604 605
605# 606#
607# Caches
608#
609# CONFIG_FSCACHE is not set
610
611#
606# CD-ROM/DVD Filesystems 612# CD-ROM/DVD Filesystems
607# 613#
608# CONFIG_ISO9660_FS is not set 614# CONFIG_ISO9660_FS is not set
@@ -651,8 +657,13 @@ CONFIG_JFFS2_RTIME=y
651# CONFIG_HPFS_FS is not set 657# CONFIG_HPFS_FS is not set
652# CONFIG_QNX4FS_FS is not set 658# CONFIG_QNX4FS_FS is not set
653CONFIG_ROMFS_FS=y 659CONFIG_ROMFS_FS=y
660CONFIG_ROMFS_BACKED_BY_BLOCK=y
661# CONFIG_ROMFS_BACKED_BY_MTD is not set
662# CONFIG_ROMFS_BACKED_BY_BOTH is not set
663CONFIG_ROMFS_ON_BLOCK=y
654# CONFIG_SYSV_FS is not set 664# CONFIG_SYSV_FS is not set
655# CONFIG_UFS_FS is not set 665# CONFIG_UFS_FS is not set
666# CONFIG_NILFS2_FS is not set
656 667
657# 668#
658# Partition Types 669# Partition Types
@@ -686,11 +697,24 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
686CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 697CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
687CONFIG_RING_BUFFER=y 698CONFIG_RING_BUFFER=y
688CONFIG_TRACING=y 699CONFIG_TRACING=y
700CONFIG_TRACING_SUPPORT=y
689 701
690# 702#
691# Tracers 703# Tracers
692# 704#
705# CONFIG_FUNCTION_TRACER is not set
706# CONFIG_SCHED_TRACER is not set
707# CONFIG_CONTEXT_SWITCH_TRACER is not set
708# CONFIG_EVENT_TRACER is not set
709# CONFIG_BOOT_TRACER is not set
710# CONFIG_TRACE_BRANCH_PROFILING is not set
711# CONFIG_STACK_TRACER is not set
712# CONFIG_KMEMTRACE is not set
713# CONFIG_WORKQUEUE_TRACER is not set
714# CONFIG_BLK_DEV_IO_TRACE is not set
715# CONFIG_FTRACE_STARTUP_TEST is not set
693# CONFIG_DYNAMIC_DEBUG is not set 716# CONFIG_DYNAMIC_DEBUG is not set
717# CONFIG_DMA_API_DEBUG is not set
694# CONFIG_SAMPLES is not set 718# CONFIG_SAMPLES is not set
695CONFIG_HAVE_ARCH_KGDB=y 719CONFIG_HAVE_ARCH_KGDB=y
696# CONFIG_SH_STANDARD_BIOS is not set 720# CONFIG_SH_STANDARD_BIOS is not set
@@ -705,6 +729,7 @@ CONFIG_HAVE_ARCH_KGDB=y
705# CONFIG_SECURITYFS is not set 729# CONFIG_SECURITYFS is not set
706# CONFIG_SECURITY_FILE_CAPABILITIES is not set 730# CONFIG_SECURITY_FILE_CAPABILITIES is not set
707# CONFIG_CRYPTO is not set 731# CONFIG_CRYPTO is not set
732CONFIG_BINARY_PRINTF=y
708 733
709# 734#
710# Library routines 735# Library routines
diff --git a/arch/sh/configs/rsk7203_defconfig b/arch/sh/configs/rsk7203_defconfig
index 9ae28e88426c..e3a65f819f0a 100644
--- a/arch/sh/configs/rsk7203_defconfig
+++ b/arch/sh/configs/rsk7203_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:30:34 2009 4# Mon Apr 27 12:57:06 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -39,6 +40,7 @@ CONFIG_LOCALVERSION=""
39CONFIG_SYSVIPC=y 40CONFIG_SYSVIPC=y
40CONFIG_SYSVIPC_SYSCTL=y 41CONFIG_SYSVIPC_SYSCTL=y
41CONFIG_POSIX_MQUEUE=y 42CONFIG_POSIX_MQUEUE=y
43CONFIG_POSIX_MQUEUE_SYSCTL=y
42CONFIG_BSD_PROCESS_ACCT=y 44CONFIG_BSD_PROCESS_ACCT=y
43# CONFIG_BSD_PROCESS_ACCT_V3 is not set 45# CONFIG_BSD_PROCESS_ACCT_V3 is not set
44# CONFIG_TASKSTATS is not set 46# CONFIG_TASKSTATS is not set
@@ -70,7 +72,6 @@ CONFIG_INITRAMFS_SOURCE=""
70CONFIG_RD_GZIP=y 72CONFIG_RD_GZIP=y
71# CONFIG_RD_BZIP2 is not set 73# CONFIG_RD_BZIP2 is not set
72# CONFIG_RD_LZMA is not set 74# CONFIG_RD_LZMA is not set
73CONFIG_INITRAMFS_COMPRESSION_NONE=y
74CONFIG_CC_OPTIMIZE_FOR_SIZE=y 75CONFIG_CC_OPTIMIZE_FOR_SIZE=y
75CONFIG_SYSCTL=y 76CONFIG_SYSCTL=y
76CONFIG_ANON_INODES=y 77CONFIG_ANON_INODES=y
@@ -80,6 +81,7 @@ CONFIG_SYSCTL_SYSCALL=y
80CONFIG_KALLSYMS=y 81CONFIG_KALLSYMS=y
81CONFIG_KALLSYMS_ALL=y 82CONFIG_KALLSYMS_ALL=y
82# CONFIG_KALLSYMS_EXTRA_PASS is not set 83# CONFIG_KALLSYMS_EXTRA_PASS is not set
84# CONFIG_STRIP_ASM_SYMS is not set
83CONFIG_HOTPLUG=y 85CONFIG_HOTPLUG=y
84CONFIG_PRINTK=y 86CONFIG_PRINTK=y
85CONFIG_BUG=y 87CONFIG_BUG=y
@@ -106,6 +108,8 @@ CONFIG_HAVE_KPROBES=y
106CONFIG_HAVE_KRETPROBES=y 108CONFIG_HAVE_KRETPROBES=y
107CONFIG_HAVE_ARCH_TRACEHOOK=y 109CONFIG_HAVE_ARCH_TRACEHOOK=y
108CONFIG_HAVE_CLK=y 110CONFIG_HAVE_CLK=y
111CONFIG_HAVE_DMA_API_DEBUG=y
112# CONFIG_SLOW_WORK is not set
109CONFIG_HAVE_GENERIC_DMA_COHERENT=y 113CONFIG_HAVE_GENERIC_DMA_COHERENT=y
110CONFIG_RT_MUTEXES=y 114CONFIG_RT_MUTEXES=y
111CONFIG_BASE_SMALL=0 115CONFIG_BASE_SMALL=0
@@ -116,7 +120,6 @@ CONFIG_MODULES=y
116# CONFIG_MODULE_SRCVERSION_ALL is not set 120# CONFIG_MODULE_SRCVERSION_ALL is not set
117CONFIG_BLOCK=y 121CONFIG_BLOCK=y
118# CONFIG_LBD is not set 122# CONFIG_LBD is not set
119# CONFIG_BLK_DEV_IO_TRACE is not set
120# CONFIG_BLK_DEV_BSG is not set 123# CONFIG_BLK_DEV_BSG is not set
121# CONFIG_BLK_DEV_INTEGRITY is not set 124# CONFIG_BLK_DEV_INTEGRITY is not set
122 125
@@ -163,6 +166,7 @@ CONFIG_CPU_SUBTYPE_SH7203=y
163# CONFIG_CPU_SUBTYPE_SH7760 is not set 166# CONFIG_CPU_SUBTYPE_SH7760 is not set
164# CONFIG_CPU_SUBTYPE_SH4_202 is not set 167# CONFIG_CPU_SUBTYPE_SH4_202 is not set
165# CONFIG_CPU_SUBTYPE_SH7723 is not set 168# CONFIG_CPU_SUBTYPE_SH7723 is not set
169# CONFIG_CPU_SUBTYPE_SH7724 is not set
166# CONFIG_CPU_SUBTYPE_SH7763 is not set 170# CONFIG_CPU_SUBTYPE_SH7763 is not set
167# CONFIG_CPU_SUBTYPE_SH7770 is not set 171# CONFIG_CPU_SUBTYPE_SH7770 is not set
168# CONFIG_CPU_SUBTYPE_SH7780 is not set 172# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -172,8 +176,6 @@ CONFIG_CPU_SUBTYPE_SH7203=y
172# CONFIG_CPU_SUBTYPE_SH7343 is not set 176# CONFIG_CPU_SUBTYPE_SH7343 is not set
173# CONFIG_CPU_SUBTYPE_SH7722 is not set 177# CONFIG_CPU_SUBTYPE_SH7722 is not set
174# CONFIG_CPU_SUBTYPE_SH7366 is not set 178# CONFIG_CPU_SUBTYPE_SH7366 is not set
175# CONFIG_CPU_SUBTYPE_SH5_101 is not set
176# CONFIG_CPU_SUBTYPE_SH5_103 is not set
177 179
178# 180#
179# Memory management options 181# Memory management options
@@ -750,15 +752,17 @@ CONFIG_USB_HID=y
750# 752#
751# Special HID drivers 753# Special HID drivers
752# 754#
753CONFIG_HID_COMPAT=y
754CONFIG_HID_A4TECH=y 755CONFIG_HID_A4TECH=y
755CONFIG_HID_APPLE=y 756CONFIG_HID_APPLE=y
756CONFIG_HID_BELKIN=y 757CONFIG_HID_BELKIN=y
757CONFIG_HID_CHERRY=y 758CONFIG_HID_CHERRY=y
758CONFIG_HID_CHICONY=y 759CONFIG_HID_CHICONY=y
759CONFIG_HID_CYPRESS=y 760CONFIG_HID_CYPRESS=y
761# CONFIG_DRAGONRISE_FF is not set
760CONFIG_HID_EZKEY=y 762CONFIG_HID_EZKEY=y
763# CONFIG_HID_KYE is not set
761CONFIG_HID_GYRATION=y 764CONFIG_HID_GYRATION=y
765# CONFIG_HID_KENSINGTON is not set
762CONFIG_HID_LOGITECH=y 766CONFIG_HID_LOGITECH=y
763# CONFIG_LOGITECH_FF is not set 767# CONFIG_LOGITECH_FF is not set
764# CONFIG_LOGIRUMBLEPAD2_FF is not set 768# CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -874,6 +878,7 @@ CONFIG_LEDS_CLASS=y
874# LED drivers 878# LED drivers
875# 879#
876CONFIG_LEDS_GPIO=y 880CONFIG_LEDS_GPIO=y
881CONFIG_LEDS_GPIO_PLATFORM=y
877 882
878# 883#
879# LED Triggers 884# LED Triggers
@@ -882,6 +887,7 @@ CONFIG_LEDS_TRIGGERS=y
882CONFIG_LEDS_TRIGGER_TIMER=y 887CONFIG_LEDS_TRIGGER_TIMER=y
883CONFIG_LEDS_TRIGGER_HEARTBEAT=y 888CONFIG_LEDS_TRIGGER_HEARTBEAT=y
884CONFIG_LEDS_TRIGGER_BACKLIGHT=y 889CONFIG_LEDS_TRIGGER_BACKLIGHT=y
890# CONFIG_LEDS_TRIGGER_GPIO is not set
885CONFIG_LEDS_TRIGGER_DEFAULT_ON=y 891CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
886 892
887# 893#
@@ -951,6 +957,11 @@ CONFIG_FILE_LOCKING=y
951# CONFIG_FUSE_FS is not set 957# CONFIG_FUSE_FS is not set
952 958
953# 959#
960# Caches
961#
962# CONFIG_FSCACHE is not set
963
964#
954# CD-ROM/DVD Filesystems 965# CD-ROM/DVD Filesystems
955# 966#
956# CONFIG_ISO9660_FS is not set 967# CONFIG_ISO9660_FS is not set
@@ -989,8 +1000,13 @@ CONFIG_MISC_FILESYSTEMS=y
989# CONFIG_HPFS_FS is not set 1000# CONFIG_HPFS_FS is not set
990# CONFIG_QNX4FS_FS is not set 1001# CONFIG_QNX4FS_FS is not set
991CONFIG_ROMFS_FS=y 1002CONFIG_ROMFS_FS=y
1003CONFIG_ROMFS_BACKED_BY_BLOCK=y
1004# CONFIG_ROMFS_BACKED_BY_MTD is not set
1005# CONFIG_ROMFS_BACKED_BY_BOTH is not set
1006CONFIG_ROMFS_ON_BLOCK=y
992# CONFIG_SYSV_FS is not set 1007# CONFIG_SYSV_FS is not set
993# CONFIG_UFS_FS is not set 1008# CONFIG_UFS_FS is not set
1009# CONFIG_NILFS2_FS is not set
994CONFIG_NETWORK_FILESYSTEMS=y 1010CONFIG_NETWORK_FILESYSTEMS=y
995CONFIG_NFS_FS=y 1011CONFIG_NFS_FS=y
996# CONFIG_NFS_V3 is not set 1012# CONFIG_NFS_V3 is not set
@@ -1033,6 +1049,9 @@ CONFIG_DEBUG_SHIRQ=y
1033CONFIG_DETECT_SOFTLOCKUP=y 1049CONFIG_DETECT_SOFTLOCKUP=y
1034# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1050# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1035CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1051CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1052CONFIG_DETECT_HUNG_TASK=y
1053# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1054CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1036CONFIG_SCHED_DEBUG=y 1055CONFIG_SCHED_DEBUG=y
1037# CONFIG_SCHEDSTATS is not set 1056# CONFIG_SCHEDSTATS is not set
1038# CONFIG_TIMER_STATS is not set 1057# CONFIG_TIMER_STATS is not set
@@ -1076,6 +1095,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1076CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1095CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1077CONFIG_RING_BUFFER=y 1096CONFIG_RING_BUFFER=y
1078CONFIG_TRACING=y 1097CONFIG_TRACING=y
1098CONFIG_TRACING_SUPPORT=y
1079 1099
1080# 1100#
1081# Tracers 1101# Tracers
@@ -1083,11 +1103,16 @@ CONFIG_TRACING=y
1083# CONFIG_FUNCTION_TRACER is not set 1103# CONFIG_FUNCTION_TRACER is not set
1084# CONFIG_SCHED_TRACER is not set 1104# CONFIG_SCHED_TRACER is not set
1085# CONFIG_CONTEXT_SWITCH_TRACER is not set 1105# CONFIG_CONTEXT_SWITCH_TRACER is not set
1106# CONFIG_EVENT_TRACER is not set
1086# CONFIG_BOOT_TRACER is not set 1107# CONFIG_BOOT_TRACER is not set
1087# CONFIG_TRACE_BRANCH_PROFILING is not set 1108# CONFIG_TRACE_BRANCH_PROFILING is not set
1088# CONFIG_STACK_TRACER is not set 1109# CONFIG_STACK_TRACER is not set
1110# CONFIG_KMEMTRACE is not set
1111# CONFIG_WORKQUEUE_TRACER is not set
1112# CONFIG_BLK_DEV_IO_TRACE is not set
1089# CONFIG_FTRACE_STARTUP_TEST is not set 1113# CONFIG_FTRACE_STARTUP_TEST is not set
1090# CONFIG_DYNAMIC_DEBUG is not set 1114# CONFIG_DYNAMIC_DEBUG is not set
1115# CONFIG_DMA_API_DEBUG is not set
1091# CONFIG_SAMPLES is not set 1116# CONFIG_SAMPLES is not set
1092CONFIG_HAVE_ARCH_KGDB=y 1117CONFIG_HAVE_ARCH_KGDB=y
1093# CONFIG_KGDB is not set 1118# CONFIG_KGDB is not set
@@ -1111,6 +1136,7 @@ CONFIG_DUMP_CODE=y
1111# CONFIG_SECURITYFS is not set 1136# CONFIG_SECURITYFS is not set
1112# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1137# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1113# CONFIG_CRYPTO is not set 1138# CONFIG_CRYPTO is not set
1139CONFIG_BINARY_PRINTF=y
1114 1140
1115# 1141#
1116# Library routines 1142# Library routines
diff --git a/arch/sh/configs/rts7751r2d1_defconfig b/arch/sh/configs/rts7751r2d1_defconfig
index c0f741af6da8..a4a59f6205ab 100644
--- a/arch/sh/configs/rts7751r2d1_defconfig
+++ b/arch/sh/configs/rts7751r2d1_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:33:25 2009 4# Mon Apr 27 12:58:13 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -70,6 +71,7 @@ CONFIG_UID16=y
70# CONFIG_SYSCTL_SYSCALL is not set 71# CONFIG_SYSCTL_SYSCALL is not set
71CONFIG_KALLSYMS=y 72CONFIG_KALLSYMS=y
72# CONFIG_KALLSYMS_EXTRA_PASS is not set 73# CONFIG_KALLSYMS_EXTRA_PASS is not set
74# CONFIG_STRIP_ASM_SYMS is not set
73CONFIG_HOTPLUG=y 75CONFIG_HOTPLUG=y
74CONFIG_PRINTK=y 76CONFIG_PRINTK=y
75CONFIG_BUG=y 77CONFIG_BUG=y
@@ -99,6 +101,8 @@ CONFIG_HAVE_KPROBES=y
99CONFIG_HAVE_KRETPROBES=y 101CONFIG_HAVE_KRETPROBES=y
100CONFIG_HAVE_ARCH_TRACEHOOK=y 102CONFIG_HAVE_ARCH_TRACEHOOK=y
101CONFIG_HAVE_CLK=y 103CONFIG_HAVE_CLK=y
104CONFIG_HAVE_DMA_API_DEBUG=y
105# CONFIG_SLOW_WORK is not set
102CONFIG_HAVE_GENERIC_DMA_COHERENT=y 106CONFIG_HAVE_GENERIC_DMA_COHERENT=y
103CONFIG_SLABINFO=y 107CONFIG_SLABINFO=y
104CONFIG_RT_MUTEXES=y 108CONFIG_RT_MUTEXES=y
@@ -110,7 +114,6 @@ CONFIG_MODULES=y
110# CONFIG_MODULE_SRCVERSION_ALL is not set 114# CONFIG_MODULE_SRCVERSION_ALL is not set
111CONFIG_BLOCK=y 115CONFIG_BLOCK=y
112# CONFIG_LBD is not set 116# CONFIG_LBD is not set
113# CONFIG_BLK_DEV_IO_TRACE is not set
114# CONFIG_BLK_DEV_BSG is not set 117# CONFIG_BLK_DEV_BSG is not set
115# CONFIG_BLK_DEV_INTEGRITY is not set 118# CONFIG_BLK_DEV_INTEGRITY is not set
116 119
@@ -156,6 +159,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
156# CONFIG_CPU_SUBTYPE_SH7760 is not set 159# CONFIG_CPU_SUBTYPE_SH7760 is not set
157# CONFIG_CPU_SUBTYPE_SH4_202 is not set 160# CONFIG_CPU_SUBTYPE_SH4_202 is not set
158# CONFIG_CPU_SUBTYPE_SH7723 is not set 161# CONFIG_CPU_SUBTYPE_SH7723 is not set
162# CONFIG_CPU_SUBTYPE_SH7724 is not set
159# CONFIG_CPU_SUBTYPE_SH7763 is not set 163# CONFIG_CPU_SUBTYPE_SH7763 is not set
160# CONFIG_CPU_SUBTYPE_SH7770 is not set 164# CONFIG_CPU_SUBTYPE_SH7770 is not set
161# CONFIG_CPU_SUBTYPE_SH7780 is not set 165# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -165,8 +169,6 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
165# CONFIG_CPU_SUBTYPE_SH7343 is not set 169# CONFIG_CPU_SUBTYPE_SH7343 is not set
166# CONFIG_CPU_SUBTYPE_SH7722 is not set 170# CONFIG_CPU_SUBTYPE_SH7722 is not set
167# CONFIG_CPU_SUBTYPE_SH7366 is not set 171# CONFIG_CPU_SUBTYPE_SH7366 is not set
168# CONFIG_CPU_SUBTYPE_SH5_101 is not set
169# CONFIG_CPU_SUBTYPE_SH5_103 is not set
170 172
171# 173#
172# Memory management options 174# Memory management options
@@ -302,8 +304,6 @@ CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=se
302# 304#
303CONFIG_PCI=y 305CONFIG_PCI=y
304CONFIG_SH_PCIDMA_NONCOHERENT=y 306CONFIG_SH_PCIDMA_NONCOHERENT=y
305CONFIG_PCI_AUTO=y
306CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
307# CONFIG_PCIEPORTBUS is not set 307# CONFIG_PCIEPORTBUS is not set
308# CONFIG_ARCH_SUPPORTS_MSI is not set 308# CONFIG_ARCH_SUPPORTS_MSI is not set
309CONFIG_PCI_LEGACY=y 309CONFIG_PCI_LEGACY=y
@@ -513,6 +513,7 @@ CONFIG_SCSI_LOWLEVEL=y
513# CONFIG_SCSI_MPT2SAS is not set 513# CONFIG_SCSI_MPT2SAS is not set
514# CONFIG_SCSI_HPTIOP is not set 514# CONFIG_SCSI_HPTIOP is not set
515# CONFIG_LIBFC is not set 515# CONFIG_LIBFC is not set
516# CONFIG_LIBFCOE is not set
516# CONFIG_FCOE is not set 517# CONFIG_FCOE is not set
517# CONFIG_SCSI_DMX3191D is not set 518# CONFIG_SCSI_DMX3191D is not set
518# CONFIG_SCSI_FUTURE_DOMAIN is not set 519# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -672,6 +673,7 @@ CONFIG_NETDEV_1000=y
672# CONFIG_E1000E is not set 673# CONFIG_E1000E is not set
673# CONFIG_IP1000 is not set 674# CONFIG_IP1000 is not set
674# CONFIG_IGB is not set 675# CONFIG_IGB is not set
676# CONFIG_IGBVF is not set
675# CONFIG_NS83820 is not set 677# CONFIG_NS83820 is not set
676# CONFIG_HAMACHI is not set 678# CONFIG_HAMACHI is not set
677# CONFIG_YELLOWFIN is not set 679# CONFIG_YELLOWFIN is not set
@@ -695,6 +697,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
695# CONFIG_IXGBE is not set 697# CONFIG_IXGBE is not set
696# CONFIG_IXGB is not set 698# CONFIG_IXGB is not set
697# CONFIG_S2IO is not set 699# CONFIG_S2IO is not set
700# CONFIG_VXGE is not set
698# CONFIG_MYRI10GE is not set 701# CONFIG_MYRI10GE is not set
699# CONFIG_NETXEN_NIC is not set 702# CONFIG_NETXEN_NIC is not set
700# CONFIG_NIU is not set 703# CONFIG_NIU is not set
@@ -793,6 +796,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
793# 796#
794# Non-8250 serial port support 797# Non-8250 serial port support
795# 798#
799# CONFIG_SERIAL_MAX3100 is not set
796CONFIG_SERIAL_SH_SCI=y 800CONFIG_SERIAL_SH_SCI=y
797CONFIG_SERIAL_SH_SCI_NR_UARTS=1 801CONFIG_SERIAL_SH_SCI_NR_UARTS=1
798CONFIG_SERIAL_SH_SCI_CONSOLE=y 802CONFIG_SERIAL_SH_SCI_CONSOLE=y
@@ -1079,15 +1083,17 @@ CONFIG_USB_HID=y
1079# 1083#
1080# Special HID drivers 1084# Special HID drivers
1081# 1085#
1082CONFIG_HID_COMPAT=y
1083CONFIG_HID_A4TECH=y 1086CONFIG_HID_A4TECH=y
1084CONFIG_HID_APPLE=y 1087CONFIG_HID_APPLE=y
1085CONFIG_HID_BELKIN=y 1088CONFIG_HID_BELKIN=y
1086CONFIG_HID_CHERRY=y 1089CONFIG_HID_CHERRY=y
1087CONFIG_HID_CHICONY=y 1090CONFIG_HID_CHICONY=y
1088CONFIG_HID_CYPRESS=y 1091CONFIG_HID_CYPRESS=y
1092# CONFIG_DRAGONRISE_FF is not set
1089CONFIG_HID_EZKEY=y 1093CONFIG_HID_EZKEY=y
1094# CONFIG_HID_KYE is not set
1090CONFIG_HID_GYRATION=y 1095CONFIG_HID_GYRATION=y
1096# CONFIG_HID_KENSINGTON is not set
1091CONFIG_HID_LOGITECH=y 1097CONFIG_HID_LOGITECH=y
1092# CONFIG_LOGITECH_FF is not set 1098# CONFIG_LOGITECH_FF is not set
1093# CONFIG_LOGIRUMBLEPAD2_FF is not set 1099# CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -1291,6 +1297,11 @@ CONFIG_INOTIFY_USER=y
1291# CONFIG_FUSE_FS is not set 1297# CONFIG_FUSE_FS is not set
1292 1298
1293# 1299#
1300# Caches
1301#
1302# CONFIG_FSCACHE is not set
1303
1304#
1294# CD-ROM/DVD Filesystems 1305# CD-ROM/DVD Filesystems
1295# 1306#
1296# CONFIG_ISO9660_FS is not set 1307# CONFIG_ISO9660_FS is not set
@@ -1337,6 +1348,7 @@ CONFIG_MINIX_FS=y
1337# CONFIG_ROMFS_FS is not set 1348# CONFIG_ROMFS_FS is not set
1338# CONFIG_SYSV_FS is not set 1349# CONFIG_SYSV_FS is not set
1339# CONFIG_UFS_FS is not set 1350# CONFIG_UFS_FS is not set
1351# CONFIG_NILFS2_FS is not set
1340CONFIG_NETWORK_FILESYSTEMS=y 1352CONFIG_NETWORK_FILESYSTEMS=y
1341# CONFIG_NFS_FS is not set 1353# CONFIG_NFS_FS is not set
1342# CONFIG_NFSD is not set 1354# CONFIG_NFSD is not set
@@ -1417,11 +1429,25 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1417CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1429CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1418CONFIG_RING_BUFFER=y 1430CONFIG_RING_BUFFER=y
1419CONFIG_TRACING=y 1431CONFIG_TRACING=y
1432CONFIG_TRACING_SUPPORT=y
1420 1433
1421# 1434#
1422# Tracers 1435# Tracers
1423# 1436#
1437# CONFIG_FUNCTION_TRACER is not set
1438# CONFIG_IRQSOFF_TRACER is not set
1439# CONFIG_SCHED_TRACER is not set
1440# CONFIG_CONTEXT_SWITCH_TRACER is not set
1441# CONFIG_EVENT_TRACER is not set
1442# CONFIG_BOOT_TRACER is not set
1443# CONFIG_TRACE_BRANCH_PROFILING is not set
1444# CONFIG_STACK_TRACER is not set
1445# CONFIG_KMEMTRACE is not set
1446# CONFIG_WORKQUEUE_TRACER is not set
1447# CONFIG_BLK_DEV_IO_TRACE is not set
1448# CONFIG_FTRACE_STARTUP_TEST is not set
1424# CONFIG_DYNAMIC_DEBUG is not set 1449# CONFIG_DYNAMIC_DEBUG is not set
1450# CONFIG_DMA_API_DEBUG is not set
1425# CONFIG_SAMPLES is not set 1451# CONFIG_SAMPLES is not set
1426CONFIG_HAVE_ARCH_KGDB=y 1452CONFIG_HAVE_ARCH_KGDB=y
1427# CONFIG_SH_STANDARD_BIOS is not set 1453# CONFIG_SH_STANDARD_BIOS is not set
@@ -1524,6 +1550,7 @@ CONFIG_CRYPTO=y
1524# CONFIG_CRYPTO_ANSI_CPRNG is not set 1550# CONFIG_CRYPTO_ANSI_CPRNG is not set
1525CONFIG_CRYPTO_HW=y 1551CONFIG_CRYPTO_HW=y
1526# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1552# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1553CONFIG_BINARY_PRINTF=y
1527 1554
1528# 1555#
1529# Library routines 1556# Library routines
diff --git a/arch/sh/configs/rts7751r2dplus_defconfig b/arch/sh/configs/rts7751r2dplus_defconfig
index 8feef629e49c..2bc1c97d346a 100644
--- a/arch/sh/configs/rts7751r2dplus_defconfig
+++ b/arch/sh/configs/rts7751r2dplus_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:34:12 2009 4# Mon Apr 27 12:59:01 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -70,6 +71,7 @@ CONFIG_UID16=y
70# CONFIG_SYSCTL_SYSCALL is not set 71# CONFIG_SYSCTL_SYSCALL is not set
71CONFIG_KALLSYMS=y 72CONFIG_KALLSYMS=y
72# CONFIG_KALLSYMS_EXTRA_PASS is not set 73# CONFIG_KALLSYMS_EXTRA_PASS is not set
74# CONFIG_STRIP_ASM_SYMS is not set
73CONFIG_HOTPLUG=y 75CONFIG_HOTPLUG=y
74CONFIG_PRINTK=y 76CONFIG_PRINTK=y
75CONFIG_BUG=y 77CONFIG_BUG=y
@@ -99,6 +101,8 @@ CONFIG_HAVE_KPROBES=y
99CONFIG_HAVE_KRETPROBES=y 101CONFIG_HAVE_KRETPROBES=y
100CONFIG_HAVE_ARCH_TRACEHOOK=y 102CONFIG_HAVE_ARCH_TRACEHOOK=y
101CONFIG_HAVE_CLK=y 103CONFIG_HAVE_CLK=y
104CONFIG_HAVE_DMA_API_DEBUG=y
105# CONFIG_SLOW_WORK is not set
102CONFIG_HAVE_GENERIC_DMA_COHERENT=y 106CONFIG_HAVE_GENERIC_DMA_COHERENT=y
103CONFIG_SLABINFO=y 107CONFIG_SLABINFO=y
104CONFIG_RT_MUTEXES=y 108CONFIG_RT_MUTEXES=y
@@ -110,7 +114,6 @@ CONFIG_MODULES=y
110# CONFIG_MODULE_SRCVERSION_ALL is not set 114# CONFIG_MODULE_SRCVERSION_ALL is not set
111CONFIG_BLOCK=y 115CONFIG_BLOCK=y
112# CONFIG_LBD is not set 116# CONFIG_LBD is not set
113# CONFIG_BLK_DEV_IO_TRACE is not set
114# CONFIG_BLK_DEV_BSG is not set 117# CONFIG_BLK_DEV_BSG is not set
115# CONFIG_BLK_DEV_INTEGRITY is not set 118# CONFIG_BLK_DEV_INTEGRITY is not set
116 119
@@ -156,6 +159,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
156# CONFIG_CPU_SUBTYPE_SH7760 is not set 159# CONFIG_CPU_SUBTYPE_SH7760 is not set
157# CONFIG_CPU_SUBTYPE_SH4_202 is not set 160# CONFIG_CPU_SUBTYPE_SH4_202 is not set
158# CONFIG_CPU_SUBTYPE_SH7723 is not set 161# CONFIG_CPU_SUBTYPE_SH7723 is not set
162# CONFIG_CPU_SUBTYPE_SH7724 is not set
159# CONFIG_CPU_SUBTYPE_SH7763 is not set 163# CONFIG_CPU_SUBTYPE_SH7763 is not set
160# CONFIG_CPU_SUBTYPE_SH7770 is not set 164# CONFIG_CPU_SUBTYPE_SH7770 is not set
161# CONFIG_CPU_SUBTYPE_SH7780 is not set 165# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -165,8 +169,6 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
165# CONFIG_CPU_SUBTYPE_SH7343 is not set 169# CONFIG_CPU_SUBTYPE_SH7343 is not set
166# CONFIG_CPU_SUBTYPE_SH7722 is not set 170# CONFIG_CPU_SUBTYPE_SH7722 is not set
167# CONFIG_CPU_SUBTYPE_SH7366 is not set 171# CONFIG_CPU_SUBTYPE_SH7366 is not set
168# CONFIG_CPU_SUBTYPE_SH5_101 is not set
169# CONFIG_CPU_SUBTYPE_SH5_103 is not set
170 172
171# 173#
172# Memory management options 174# Memory management options
@@ -302,8 +304,6 @@ CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=se
302# 304#
303CONFIG_PCI=y 305CONFIG_PCI=y
304CONFIG_SH_PCIDMA_NONCOHERENT=y 306CONFIG_SH_PCIDMA_NONCOHERENT=y
305CONFIG_PCI_AUTO=y
306CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
307# CONFIG_PCIEPORTBUS is not set 307# CONFIG_PCIEPORTBUS is not set
308# CONFIG_ARCH_SUPPORTS_MSI is not set 308# CONFIG_ARCH_SUPPORTS_MSI is not set
309CONFIG_PCI_LEGACY=y 309CONFIG_PCI_LEGACY=y
@@ -513,6 +513,7 @@ CONFIG_SCSI_LOWLEVEL=y
513# CONFIG_SCSI_MPT2SAS is not set 513# CONFIG_SCSI_MPT2SAS is not set
514# CONFIG_SCSI_HPTIOP is not set 514# CONFIG_SCSI_HPTIOP is not set
515# CONFIG_LIBFC is not set 515# CONFIG_LIBFC is not set
516# CONFIG_LIBFCOE is not set
516# CONFIG_FCOE is not set 517# CONFIG_FCOE is not set
517# CONFIG_SCSI_DMX3191D is not set 518# CONFIG_SCSI_DMX3191D is not set
518# CONFIG_SCSI_FUTURE_DOMAIN is not set 519# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -672,6 +673,7 @@ CONFIG_NETDEV_1000=y
672# CONFIG_E1000E is not set 673# CONFIG_E1000E is not set
673# CONFIG_IP1000 is not set 674# CONFIG_IP1000 is not set
674# CONFIG_IGB is not set 675# CONFIG_IGB is not set
676# CONFIG_IGBVF is not set
675# CONFIG_NS83820 is not set 677# CONFIG_NS83820 is not set
676# CONFIG_HAMACHI is not set 678# CONFIG_HAMACHI is not set
677# CONFIG_YELLOWFIN is not set 679# CONFIG_YELLOWFIN is not set
@@ -695,6 +697,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
695# CONFIG_IXGBE is not set 697# CONFIG_IXGBE is not set
696# CONFIG_IXGB is not set 698# CONFIG_IXGB is not set
697# CONFIG_S2IO is not set 699# CONFIG_S2IO is not set
700# CONFIG_VXGE is not set
698# CONFIG_MYRI10GE is not set 701# CONFIG_MYRI10GE is not set
699# CONFIG_NETXEN_NIC is not set 702# CONFIG_NETXEN_NIC is not set
700# CONFIG_NIU is not set 703# CONFIG_NIU is not set
@@ -793,6 +796,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
793# 796#
794# Non-8250 serial port support 797# Non-8250 serial port support
795# 798#
799# CONFIG_SERIAL_MAX3100 is not set
796CONFIG_SERIAL_SH_SCI=y 800CONFIG_SERIAL_SH_SCI=y
797CONFIG_SERIAL_SH_SCI_NR_UARTS=1 801CONFIG_SERIAL_SH_SCI_NR_UARTS=1
798CONFIG_SERIAL_SH_SCI_CONSOLE=y 802CONFIG_SERIAL_SH_SCI_CONSOLE=y
@@ -1079,15 +1083,17 @@ CONFIG_USB_HID=y
1079# 1083#
1080# Special HID drivers 1084# Special HID drivers
1081# 1085#
1082CONFIG_HID_COMPAT=y
1083CONFIG_HID_A4TECH=y 1086CONFIG_HID_A4TECH=y
1084CONFIG_HID_APPLE=y 1087CONFIG_HID_APPLE=y
1085CONFIG_HID_BELKIN=y 1088CONFIG_HID_BELKIN=y
1086CONFIG_HID_CHERRY=y 1089CONFIG_HID_CHERRY=y
1087CONFIG_HID_CHICONY=y 1090CONFIG_HID_CHICONY=y
1088CONFIG_HID_CYPRESS=y 1091CONFIG_HID_CYPRESS=y
1092# CONFIG_DRAGONRISE_FF is not set
1089CONFIG_HID_EZKEY=y 1093CONFIG_HID_EZKEY=y
1094# CONFIG_HID_KYE is not set
1090CONFIG_HID_GYRATION=y 1095CONFIG_HID_GYRATION=y
1096# CONFIG_HID_KENSINGTON is not set
1091CONFIG_HID_LOGITECH=y 1097CONFIG_HID_LOGITECH=y
1092# CONFIG_LOGITECH_FF is not set 1098# CONFIG_LOGITECH_FF is not set
1093# CONFIG_LOGIRUMBLEPAD2_FF is not set 1099# CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -1291,6 +1297,11 @@ CONFIG_INOTIFY_USER=y
1291# CONFIG_FUSE_FS is not set 1297# CONFIG_FUSE_FS is not set
1292 1298
1293# 1299#
1300# Caches
1301#
1302# CONFIG_FSCACHE is not set
1303
1304#
1294# CD-ROM/DVD Filesystems 1305# CD-ROM/DVD Filesystems
1295# 1306#
1296# CONFIG_ISO9660_FS is not set 1307# CONFIG_ISO9660_FS is not set
@@ -1337,6 +1348,7 @@ CONFIG_MINIX_FS=y
1337# CONFIG_ROMFS_FS is not set 1348# CONFIG_ROMFS_FS is not set
1338# CONFIG_SYSV_FS is not set 1349# CONFIG_SYSV_FS is not set
1339# CONFIG_UFS_FS is not set 1350# CONFIG_UFS_FS is not set
1351# CONFIG_NILFS2_FS is not set
1340CONFIG_NETWORK_FILESYSTEMS=y 1352CONFIG_NETWORK_FILESYSTEMS=y
1341# CONFIG_NFS_FS is not set 1353# CONFIG_NFS_FS is not set
1342# CONFIG_NFSD is not set 1354# CONFIG_NFSD is not set
@@ -1417,11 +1429,25 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1417CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1429CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1418CONFIG_RING_BUFFER=y 1430CONFIG_RING_BUFFER=y
1419CONFIG_TRACING=y 1431CONFIG_TRACING=y
1432CONFIG_TRACING_SUPPORT=y
1420 1433
1421# 1434#
1422# Tracers 1435# Tracers
1423# 1436#
1437# CONFIG_FUNCTION_TRACER is not set
1438# CONFIG_IRQSOFF_TRACER is not set
1439# CONFIG_SCHED_TRACER is not set
1440# CONFIG_CONTEXT_SWITCH_TRACER is not set
1441# CONFIG_EVENT_TRACER is not set
1442# CONFIG_BOOT_TRACER is not set
1443# CONFIG_TRACE_BRANCH_PROFILING is not set
1444# CONFIG_STACK_TRACER is not set
1445# CONFIG_KMEMTRACE is not set
1446# CONFIG_WORKQUEUE_TRACER is not set
1447# CONFIG_BLK_DEV_IO_TRACE is not set
1448# CONFIG_FTRACE_STARTUP_TEST is not set
1424# CONFIG_DYNAMIC_DEBUG is not set 1449# CONFIG_DYNAMIC_DEBUG is not set
1450# CONFIG_DMA_API_DEBUG is not set
1425# CONFIG_SAMPLES is not set 1451# CONFIG_SAMPLES is not set
1426CONFIG_HAVE_ARCH_KGDB=y 1452CONFIG_HAVE_ARCH_KGDB=y
1427# CONFIG_SH_STANDARD_BIOS is not set 1453# CONFIG_SH_STANDARD_BIOS is not set
@@ -1524,6 +1550,7 @@ CONFIG_CRYPTO=y
1524# CONFIG_CRYPTO_ANSI_CPRNG is not set 1550# CONFIG_CRYPTO_ANSI_CPRNG is not set
1525CONFIG_CRYPTO_HW=y 1551CONFIG_CRYPTO_HW=y
1526# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1552# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1553CONFIG_BINARY_PRINTF=y
1527 1554
1528# 1555#
1529# Library routines 1556# Library routines
diff --git a/arch/sh/configs/sdk7780_defconfig b/arch/sh/configs/sdk7780_defconfig
index 739e2299ae80..a629b79a1844 100644
--- a/arch/sh/configs/sdk7780_defconfig
+++ b/arch/sh/configs/sdk7780_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:34:43 2009 4# Mon Apr 27 12:59:32 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -41,6 +42,7 @@ CONFIG_SWAP=y
41CONFIG_SYSVIPC=y 42CONFIG_SYSVIPC=y
42CONFIG_SYSVIPC_SYSCTL=y 43CONFIG_SYSVIPC_SYSCTL=y
43CONFIG_POSIX_MQUEUE=y 44CONFIG_POSIX_MQUEUE=y
45CONFIG_POSIX_MQUEUE_SYSCTL=y
44CONFIG_BSD_PROCESS_ACCT=y 46CONFIG_BSD_PROCESS_ACCT=y
45# CONFIG_BSD_PROCESS_ACCT_V3 is not set 47# CONFIG_BSD_PROCESS_ACCT_V3 is not set
46# CONFIG_TASKSTATS is not set 48# CONFIG_TASKSTATS is not set
@@ -73,6 +75,7 @@ CONFIG_SYSCTL_SYSCALL=y
73CONFIG_KALLSYMS=y 75CONFIG_KALLSYMS=y
74CONFIG_KALLSYMS_ALL=y 76CONFIG_KALLSYMS_ALL=y
75# CONFIG_KALLSYMS_EXTRA_PASS is not set 77# CONFIG_KALLSYMS_EXTRA_PASS is not set
78# CONFIG_STRIP_ASM_SYMS is not set
76CONFIG_HOTPLUG=y 79CONFIG_HOTPLUG=y
77CONFIG_PRINTK=y 80CONFIG_PRINTK=y
78CONFIG_BUG=y 81CONFIG_BUG=y
@@ -93,6 +96,7 @@ CONFIG_COMPAT_BRK=y
93CONFIG_SLUB=y 96CONFIG_SLUB=y
94# CONFIG_SLOB is not set 97# CONFIG_SLOB is not set
95# CONFIG_PROFILING is not set 98# CONFIG_PROFILING is not set
99# CONFIG_MARKERS is not set
96CONFIG_HAVE_OPROFILE=y 100CONFIG_HAVE_OPROFILE=y
97# CONFIG_KPROBES is not set 101# CONFIG_KPROBES is not set
98CONFIG_HAVE_IOREMAP_PROT=y 102CONFIG_HAVE_IOREMAP_PROT=y
@@ -100,6 +104,8 @@ CONFIG_HAVE_KPROBES=y
100CONFIG_HAVE_KRETPROBES=y 104CONFIG_HAVE_KRETPROBES=y
101CONFIG_HAVE_ARCH_TRACEHOOK=y 105CONFIG_HAVE_ARCH_TRACEHOOK=y
102CONFIG_HAVE_CLK=y 106CONFIG_HAVE_CLK=y
107CONFIG_HAVE_DMA_API_DEBUG=y
108# CONFIG_SLOW_WORK is not set
103CONFIG_HAVE_GENERIC_DMA_COHERENT=y 109CONFIG_HAVE_GENERIC_DMA_COHERENT=y
104CONFIG_SLABINFO=y 110CONFIG_SLABINFO=y
105CONFIG_RT_MUTEXES=y 111CONFIG_RT_MUTEXES=y
@@ -112,7 +118,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
112# CONFIG_MODULE_SRCVERSION_ALL is not set 118# CONFIG_MODULE_SRCVERSION_ALL is not set
113CONFIG_BLOCK=y 119CONFIG_BLOCK=y
114CONFIG_LBD=y 120CONFIG_LBD=y
115# CONFIG_BLK_DEV_IO_TRACE is not set
116# CONFIG_BLK_DEV_BSG is not set 121# CONFIG_BLK_DEV_BSG is not set
117# CONFIG_BLK_DEV_INTEGRITY is not set 122# CONFIG_BLK_DEV_INTEGRITY is not set
118 123
@@ -159,6 +164,7 @@ CONFIG_CPU_SH4A=y
159# CONFIG_CPU_SUBTYPE_SH7760 is not set 164# CONFIG_CPU_SUBTYPE_SH7760 is not set
160# CONFIG_CPU_SUBTYPE_SH4_202 is not set 165# CONFIG_CPU_SUBTYPE_SH4_202 is not set
161# CONFIG_CPU_SUBTYPE_SH7723 is not set 166# CONFIG_CPU_SUBTYPE_SH7723 is not set
167# CONFIG_CPU_SUBTYPE_SH7724 is not set
162# CONFIG_CPU_SUBTYPE_SH7763 is not set 168# CONFIG_CPU_SUBTYPE_SH7763 is not set
163# CONFIG_CPU_SUBTYPE_SH7770 is not set 169# CONFIG_CPU_SUBTYPE_SH7770 is not set
164CONFIG_CPU_SUBTYPE_SH7780=y 170CONFIG_CPU_SUBTYPE_SH7780=y
@@ -168,8 +174,6 @@ CONFIG_CPU_SUBTYPE_SH7780=y
168# CONFIG_CPU_SUBTYPE_SH7343 is not set 174# CONFIG_CPU_SUBTYPE_SH7343 is not set
169# CONFIG_CPU_SUBTYPE_SH7722 is not set 175# CONFIG_CPU_SUBTYPE_SH7722 is not set
170# CONFIG_CPU_SUBTYPE_SH7366 is not set 176# CONFIG_CPU_SUBTYPE_SH7366 is not set
171# CONFIG_CPU_SUBTYPE_SH5_101 is not set
172# CONFIG_CPU_SUBTYPE_SH5_103 is not set
173 177
174# 178#
175# Memory management options 179# Memory management options
@@ -310,8 +314,6 @@ CONFIG_CMDLINE="mem=128M console=tty0 console=ttySC0,115200 ip=bootp root=/dev/n
310# 314#
311CONFIG_PCI=y 315CONFIG_PCI=y
312CONFIG_SH_PCIDMA_NONCOHERENT=y 316CONFIG_SH_PCIDMA_NONCOHERENT=y
313CONFIG_PCI_AUTO=y
314CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
315# CONFIG_PCIEPORTBUS is not set 317# CONFIG_PCIEPORTBUS is not set
316# CONFIG_ARCH_SUPPORTS_MSI is not set 318# CONFIG_ARCH_SUPPORTS_MSI is not set
317# CONFIG_PCI_LEGACY is not set 319# CONFIG_PCI_LEGACY is not set
@@ -646,6 +648,7 @@ CONFIG_SCSI_LOWLEVEL=y
646# CONFIG_SCSI_MPT2SAS is not set 648# CONFIG_SCSI_MPT2SAS is not set
647# CONFIG_SCSI_HPTIOP is not set 649# CONFIG_SCSI_HPTIOP is not set
648# CONFIG_LIBFC is not set 650# CONFIG_LIBFC is not set
651# CONFIG_LIBFCOE is not set
649# CONFIG_FCOE is not set 652# CONFIG_FCOE is not set
650# CONFIG_SCSI_DMX3191D is not set 653# CONFIG_SCSI_DMX3191D is not set
651# CONFIG_SCSI_FUTURE_DOMAIN is not set 654# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -1091,15 +1094,17 @@ CONFIG_USB_HID=y
1091# 1094#
1092# Special HID drivers 1095# Special HID drivers
1093# 1096#
1094CONFIG_HID_COMPAT=y
1095CONFIG_HID_A4TECH=y 1097CONFIG_HID_A4TECH=y
1096CONFIG_HID_APPLE=y 1098CONFIG_HID_APPLE=y
1097CONFIG_HID_BELKIN=y 1099CONFIG_HID_BELKIN=y
1098CONFIG_HID_CHERRY=y 1100CONFIG_HID_CHERRY=y
1099CONFIG_HID_CHICONY=y 1101CONFIG_HID_CHICONY=y
1100CONFIG_HID_CYPRESS=y 1102CONFIG_HID_CYPRESS=y
1103# CONFIG_DRAGONRISE_FF is not set
1101CONFIG_HID_EZKEY=y 1104CONFIG_HID_EZKEY=y
1105# CONFIG_HID_KYE is not set
1102CONFIG_HID_GYRATION=y 1106CONFIG_HID_GYRATION=y
1107# CONFIG_HID_KENSINGTON is not set
1103CONFIG_HID_LOGITECH=y 1108CONFIG_HID_LOGITECH=y
1104# CONFIG_LOGITECH_FF is not set 1109# CONFIG_LOGITECH_FF is not set
1105# CONFIG_LOGIRUMBLEPAD2_FF is not set 1110# CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -1257,6 +1262,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y
1257# CONFIG_EXT2_FS_SECURITY is not set 1262# CONFIG_EXT2_FS_SECURITY is not set
1258# CONFIG_EXT2_FS_XIP is not set 1263# CONFIG_EXT2_FS_XIP is not set
1259CONFIG_EXT3_FS=y 1264CONFIG_EXT3_FS=y
1265# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1260CONFIG_EXT3_FS_XATTR=y 1266CONFIG_EXT3_FS_XATTR=y
1261CONFIG_EXT3_FS_POSIX_ACL=y 1267CONFIG_EXT3_FS_POSIX_ACL=y
1262# CONFIG_EXT3_FS_SECURITY is not set 1268# CONFIG_EXT3_FS_SECURITY is not set
@@ -1281,6 +1287,11 @@ CONFIG_AUTOFS4_FS=y
1281CONFIG_GENERIC_ACL=y 1287CONFIG_GENERIC_ACL=y
1282 1288
1283# 1289#
1290# Caches
1291#
1292# CONFIG_FSCACHE is not set
1293
1294#
1284# CD-ROM/DVD Filesystems 1295# CD-ROM/DVD Filesystems
1285# 1296#
1286CONFIG_ISO9660_FS=y 1297CONFIG_ISO9660_FS=y
@@ -1331,6 +1342,7 @@ CONFIG_MINIX_FS=y
1331# CONFIG_ROMFS_FS is not set 1342# CONFIG_ROMFS_FS is not set
1332# CONFIG_SYSV_FS is not set 1343# CONFIG_SYSV_FS is not set
1333# CONFIG_UFS_FS is not set 1344# CONFIG_UFS_FS is not set
1345# CONFIG_NILFS2_FS is not set
1334CONFIG_NETWORK_FILESYSTEMS=y 1346CONFIG_NETWORK_FILESYSTEMS=y
1335CONFIG_NFS_FS=y 1347CONFIG_NFS_FS=y
1336CONFIG_NFS_V3=y 1348CONFIG_NFS_V3=y
@@ -1418,6 +1430,9 @@ CONFIG_DEBUG_KERNEL=y
1418CONFIG_DETECT_SOFTLOCKUP=y 1430CONFIG_DETECT_SOFTLOCKUP=y
1419# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1431# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1420CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1432CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1433CONFIG_DETECT_HUNG_TASK=y
1434# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1435CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1421# CONFIG_SCHED_DEBUG is not set 1436# CONFIG_SCHED_DEBUG is not set
1422# CONFIG_SCHEDSTATS is not set 1437# CONFIG_SCHEDSTATS is not set
1423CONFIG_TIMER_STATS=y 1438CONFIG_TIMER_STATS=y
@@ -1455,6 +1470,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
1455CONFIG_HAVE_FUNCTION_TRACER=y 1470CONFIG_HAVE_FUNCTION_TRACER=y
1456CONFIG_HAVE_DYNAMIC_FTRACE=y 1471CONFIG_HAVE_DYNAMIC_FTRACE=y
1457CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1472CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1473CONFIG_TRACING_SUPPORT=y
1458 1474
1459# 1475#
1460# Tracers 1476# Tracers
@@ -1464,9 +1480,14 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1464# CONFIG_PREEMPT_TRACER is not set 1480# CONFIG_PREEMPT_TRACER is not set
1465# CONFIG_SCHED_TRACER is not set 1481# CONFIG_SCHED_TRACER is not set
1466# CONFIG_CONTEXT_SWITCH_TRACER is not set 1482# CONFIG_CONTEXT_SWITCH_TRACER is not set
1483# CONFIG_EVENT_TRACER is not set
1467# CONFIG_BOOT_TRACER is not set 1484# CONFIG_BOOT_TRACER is not set
1468# CONFIG_TRACE_BRANCH_PROFILING is not set 1485# CONFIG_TRACE_BRANCH_PROFILING is not set
1469# CONFIG_STACK_TRACER is not set 1486# CONFIG_STACK_TRACER is not set
1487# CONFIG_KMEMTRACE is not set
1488# CONFIG_WORKQUEUE_TRACER is not set
1489# CONFIG_BLK_DEV_IO_TRACE is not set
1490# CONFIG_DMA_API_DEBUG is not set
1470# CONFIG_SAMPLES is not set 1491# CONFIG_SAMPLES is not set
1471CONFIG_HAVE_ARCH_KGDB=y 1492CONFIG_HAVE_ARCH_KGDB=y
1472# CONFIG_KGDB is not set 1493# CONFIG_KGDB is not set
@@ -1580,6 +1601,7 @@ CONFIG_CRYPTO_DES=y
1580# CONFIG_CRYPTO_ANSI_CPRNG is not set 1601# CONFIG_CRYPTO_ANSI_CPRNG is not set
1581CONFIG_CRYPTO_HW=y 1602CONFIG_CRYPTO_HW=y
1582# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1603# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1604# CONFIG_BINARY_PRINTF is not set
1583 1605
1584# 1606#
1585# Library routines 1607# Library routines
diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig
index d30e0a7ad9f1..5caf85a3312d 100644
--- a/arch/sh/configs/se7206_defconfig
+++ b/arch/sh/configs/se7206_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:39:37 2009 4# Mon Apr 27 13:01:02 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -40,6 +41,7 @@ CONFIG_LOCALVERSION_AUTO=y
40CONFIG_SYSVIPC=y 41CONFIG_SYSVIPC=y
41CONFIG_SYSVIPC_SYSCTL=y 42CONFIG_SYSVIPC_SYSCTL=y
42CONFIG_POSIX_MQUEUE=y 43CONFIG_POSIX_MQUEUE=y
44CONFIG_POSIX_MQUEUE_SYSCTL=y
43CONFIG_BSD_PROCESS_ACCT=y 45CONFIG_BSD_PROCESS_ACCT=y
44# CONFIG_BSD_PROCESS_ACCT_V3 is not set 46# CONFIG_BSD_PROCESS_ACCT_V3 is not set
45# CONFIG_TASKSTATS is not set 47# CONFIG_TASKSTATS is not set
@@ -63,6 +65,7 @@ CONFIG_CGROUP_DEBUG=y
63CONFIG_CGROUP_NS=y 65CONFIG_CGROUP_NS=y
64# CONFIG_CGROUP_FREEZER is not set 66# CONFIG_CGROUP_FREEZER is not set
65CONFIG_CGROUP_DEVICE=y 67CONFIG_CGROUP_DEVICE=y
68# CONFIG_CPUSETS is not set
66CONFIG_CGROUP_CPUACCT=y 69CONFIG_CGROUP_CPUACCT=y
67CONFIG_RESOURCE_COUNTERS=y 70CONFIG_RESOURCE_COUNTERS=y
68CONFIG_CGROUP_MEM_RES_CTLR=y 71CONFIG_CGROUP_MEM_RES_CTLR=y
@@ -80,7 +83,6 @@ CONFIG_INITRAMFS_SOURCE=""
80CONFIG_RD_GZIP=y 83CONFIG_RD_GZIP=y
81# CONFIG_RD_BZIP2 is not set 84# CONFIG_RD_BZIP2 is not set
82# CONFIG_RD_LZMA is not set 85# CONFIG_RD_LZMA is not set
83CONFIG_INITRAMFS_COMPRESSION_NONE=y
84CONFIG_CC_OPTIMIZE_FOR_SIZE=y 86CONFIG_CC_OPTIMIZE_FOR_SIZE=y
85CONFIG_SYSCTL=y 87CONFIG_SYSCTL=y
86CONFIG_ANON_INODES=y 88CONFIG_ANON_INODES=y
@@ -90,6 +92,7 @@ CONFIG_EMBEDDED=y
90CONFIG_KALLSYMS=y 92CONFIG_KALLSYMS=y
91CONFIG_KALLSYMS_ALL=y 93CONFIG_KALLSYMS_ALL=y
92# CONFIG_KALLSYMS_EXTRA_PASS is not set 94# CONFIG_KALLSYMS_EXTRA_PASS is not set
95# CONFIG_STRIP_ASM_SYMS is not set
93CONFIG_HOTPLUG=y 96CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y 97CONFIG_PRINTK=y
95CONFIG_BUG=y 98CONFIG_BUG=y
@@ -116,6 +119,8 @@ CONFIG_HAVE_KPROBES=y
116CONFIG_HAVE_KRETPROBES=y 119CONFIG_HAVE_KRETPROBES=y
117CONFIG_HAVE_ARCH_TRACEHOOK=y 120CONFIG_HAVE_ARCH_TRACEHOOK=y
118CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
122CONFIG_HAVE_DMA_API_DEBUG=y
123# CONFIG_SLOW_WORK is not set
119CONFIG_HAVE_GENERIC_DMA_COHERENT=y 124CONFIG_HAVE_GENERIC_DMA_COHERENT=y
120CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
121CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
@@ -127,7 +132,6 @@ CONFIG_MODULE_UNLOAD=y
127# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
128CONFIG_BLOCK=y 133CONFIG_BLOCK=y
129# CONFIG_LBD is not set 134# CONFIG_LBD is not set
130# CONFIG_BLK_DEV_IO_TRACE is not set
131# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
132# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
133 137
@@ -174,6 +178,7 @@ CONFIG_CPU_SUBTYPE_SH7206=y
174# CONFIG_CPU_SUBTYPE_SH7760 is not set 178# CONFIG_CPU_SUBTYPE_SH7760 is not set
175# CONFIG_CPU_SUBTYPE_SH4_202 is not set 179# CONFIG_CPU_SUBTYPE_SH4_202 is not set
176# CONFIG_CPU_SUBTYPE_SH7723 is not set 180# CONFIG_CPU_SUBTYPE_SH7723 is not set
181# CONFIG_CPU_SUBTYPE_SH7724 is not set
177# CONFIG_CPU_SUBTYPE_SH7763 is not set 182# CONFIG_CPU_SUBTYPE_SH7763 is not set
178# CONFIG_CPU_SUBTYPE_SH7770 is not set 183# CONFIG_CPU_SUBTYPE_SH7770 is not set
179# CONFIG_CPU_SUBTYPE_SH7780 is not set 184# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -183,8 +188,6 @@ CONFIG_CPU_SUBTYPE_SH7206=y
183# CONFIG_CPU_SUBTYPE_SH7343 is not set 188# CONFIG_CPU_SUBTYPE_SH7343 is not set
184# CONFIG_CPU_SUBTYPE_SH7722 is not set 189# CONFIG_CPU_SUBTYPE_SH7722 is not set
185# CONFIG_CPU_SUBTYPE_SH7366 is not set 190# CONFIG_CPU_SUBTYPE_SH7366 is not set
186# CONFIG_CPU_SUBTYPE_SH5_101 is not set
187# CONFIG_CPU_SUBTYPE_SH5_103 is not set
188 191
189# 192#
190# Memory management options 193# Memory management options
@@ -746,6 +749,11 @@ CONFIG_FILE_LOCKING=y
746# CONFIG_FUSE_FS is not set 749# CONFIG_FUSE_FS is not set
747 750
748# 751#
752# Caches
753#
754# CONFIG_FSCACHE is not set
755
756#
749# CD-ROM/DVD Filesystems 757# CD-ROM/DVD Filesystems
750# 758#
751# CONFIG_ISO9660_FS is not set 759# CONFIG_ISO9660_FS is not set
@@ -785,8 +793,13 @@ CONFIG_CRAMFS=y
785# CONFIG_HPFS_FS is not set 793# CONFIG_HPFS_FS is not set
786# CONFIG_QNX4FS_FS is not set 794# CONFIG_QNX4FS_FS is not set
787CONFIG_ROMFS_FS=y 795CONFIG_ROMFS_FS=y
796CONFIG_ROMFS_BACKED_BY_BLOCK=y
797# CONFIG_ROMFS_BACKED_BY_MTD is not set
798# CONFIG_ROMFS_BACKED_BY_BOTH is not set
799CONFIG_ROMFS_ON_BLOCK=y
788# CONFIG_SYSV_FS is not set 800# CONFIG_SYSV_FS is not set
789# CONFIG_UFS_FS is not set 801# CONFIG_UFS_FS is not set
802# CONFIG_NILFS2_FS is not set
790CONFIG_NETWORK_FILESYSTEMS=y 803CONFIG_NETWORK_FILESYSTEMS=y
791CONFIG_NFS_FS=y 804CONFIG_NFS_FS=y
792CONFIG_NFS_V3=y 805CONFIG_NFS_V3=y
@@ -831,6 +844,9 @@ CONFIG_DEBUG_KERNEL=y
831CONFIG_DETECT_SOFTLOCKUP=y 844CONFIG_DETECT_SOFTLOCKUP=y
832# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 845# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
833CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 846CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
847CONFIG_DETECT_HUNG_TASK=y
848# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
849CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
834CONFIG_SCHED_DEBUG=y 850CONFIG_SCHED_DEBUG=y
835# CONFIG_SCHEDSTATS is not set 851# CONFIG_SCHEDSTATS is not set
836# CONFIG_TIMER_STATS is not set 852# CONFIG_TIMER_STATS is not set
@@ -869,6 +885,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
869CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 885CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
870CONFIG_RING_BUFFER=y 886CONFIG_RING_BUFFER=y
871CONFIG_TRACING=y 887CONFIG_TRACING=y
888CONFIG_TRACING_SUPPORT=y
872 889
873# 890#
874# Tracers 891# Tracers
@@ -876,11 +893,16 @@ CONFIG_TRACING=y
876# CONFIG_FUNCTION_TRACER is not set 893# CONFIG_FUNCTION_TRACER is not set
877# CONFIG_SCHED_TRACER is not set 894# CONFIG_SCHED_TRACER is not set
878# CONFIG_CONTEXT_SWITCH_TRACER is not set 895# CONFIG_CONTEXT_SWITCH_TRACER is not set
896# CONFIG_EVENT_TRACER is not set
879# CONFIG_BOOT_TRACER is not set 897# CONFIG_BOOT_TRACER is not set
880# CONFIG_TRACE_BRANCH_PROFILING is not set 898# CONFIG_TRACE_BRANCH_PROFILING is not set
881# CONFIG_STACK_TRACER is not set 899# CONFIG_STACK_TRACER is not set
900# CONFIG_KMEMTRACE is not set
901# CONFIG_WORKQUEUE_TRACER is not set
902# CONFIG_BLK_DEV_IO_TRACE is not set
882# CONFIG_FTRACE_STARTUP_TEST is not set 903# CONFIG_FTRACE_STARTUP_TEST is not set
883# CONFIG_DYNAMIC_DEBUG is not set 904# CONFIG_DYNAMIC_DEBUG is not set
905# CONFIG_DMA_API_DEBUG is not set
884# CONFIG_SAMPLES is not set 906# CONFIG_SAMPLES is not set
885CONFIG_HAVE_ARCH_KGDB=y 907CONFIG_HAVE_ARCH_KGDB=y
886# CONFIG_KGDB is not set 908# CONFIG_KGDB is not set
@@ -991,6 +1013,7 @@ CONFIG_CRYPTO_LZO=y
991# 1013#
992# CONFIG_CRYPTO_ANSI_CPRNG is not set 1014# CONFIG_CRYPTO_ANSI_CPRNG is not set
993# CONFIG_CRYPTO_HW is not set 1015# CONFIG_CRYPTO_HW is not set
1016CONFIG_BINARY_PRINTF=y
994 1017
995# 1018#
996# Library routines 1019# Library routines
diff --git a/arch/sh/configs/se7343_defconfig b/arch/sh/configs/se7343_defconfig
index fbb72d029e68..004d531716dc 100644
--- a/arch/sh/configs/se7343_defconfig
+++ b/arch/sh/configs/se7343_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:42:00 2009 4# Mon Apr 27 13:01:44 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -40,6 +41,7 @@ CONFIG_LOCALVERSION_AUTO=y
40CONFIG_SYSVIPC=y 41CONFIG_SYSVIPC=y
41CONFIG_SYSVIPC_SYSCTL=y 42CONFIG_SYSVIPC_SYSCTL=y
42CONFIG_POSIX_MQUEUE=y 43CONFIG_POSIX_MQUEUE=y
44CONFIG_POSIX_MQUEUE_SYSCTL=y
43# CONFIG_BSD_PROCESS_ACCT is not set 45# CONFIG_BSD_PROCESS_ACCT is not set
44# CONFIG_TASKSTATS is not set 46# CONFIG_TASKSTATS is not set
45# CONFIG_AUDIT is not set 47# CONFIG_AUDIT is not set
@@ -73,6 +75,7 @@ CONFIG_UID16=y
73# CONFIG_SYSCTL_SYSCALL is not set 75# CONFIG_SYSCTL_SYSCALL is not set
74CONFIG_KALLSYMS=y 76CONFIG_KALLSYMS=y
75# CONFIG_KALLSYMS_EXTRA_PASS is not set 77# CONFIG_KALLSYMS_EXTRA_PASS is not set
78# CONFIG_STRIP_ASM_SYMS is not set
76CONFIG_HOTPLUG=y 79CONFIG_HOTPLUG=y
77CONFIG_PRINTK=y 80CONFIG_PRINTK=y
78CONFIG_BUG=y 81CONFIG_BUG=y
@@ -91,6 +94,7 @@ CONFIG_SLAB=y
91# CONFIG_SLUB is not set 94# CONFIG_SLUB is not set
92# CONFIG_SLOB is not set 95# CONFIG_SLOB is not set
93# CONFIG_PROFILING is not set 96# CONFIG_PROFILING is not set
97# CONFIG_MARKERS is not set
94CONFIG_HAVE_OPROFILE=y 98CONFIG_HAVE_OPROFILE=y
95# CONFIG_KPROBES is not set 99# CONFIG_KPROBES is not set
96CONFIG_HAVE_IOREMAP_PROT=y 100CONFIG_HAVE_IOREMAP_PROT=y
@@ -98,6 +102,8 @@ CONFIG_HAVE_KPROBES=y
98CONFIG_HAVE_KRETPROBES=y 102CONFIG_HAVE_KRETPROBES=y
99CONFIG_HAVE_ARCH_TRACEHOOK=y 103CONFIG_HAVE_ARCH_TRACEHOOK=y
100CONFIG_HAVE_CLK=y 104CONFIG_HAVE_CLK=y
105CONFIG_HAVE_DMA_API_DEBUG=y
106# CONFIG_SLOW_WORK is not set
101CONFIG_HAVE_GENERIC_DMA_COHERENT=y 107CONFIG_HAVE_GENERIC_DMA_COHERENT=y
102CONFIG_SLABINFO=y 108CONFIG_SLABINFO=y
103CONFIG_BASE_SMALL=0 109CONFIG_BASE_SMALL=0
@@ -109,7 +115,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
109# CONFIG_MODULE_SRCVERSION_ALL is not set 115# CONFIG_MODULE_SRCVERSION_ALL is not set
110CONFIG_BLOCK=y 116CONFIG_BLOCK=y
111# CONFIG_LBD is not set 117# CONFIG_LBD is not set
112# CONFIG_BLK_DEV_IO_TRACE is not set
113# CONFIG_BLK_DEV_BSG is not set 118# CONFIG_BLK_DEV_BSG is not set
114# CONFIG_BLK_DEV_INTEGRITY is not set 119# CONFIG_BLK_DEV_INTEGRITY is not set
115 120
@@ -158,6 +163,7 @@ CONFIG_ARCH_SHMOBILE=y
158# CONFIG_CPU_SUBTYPE_SH7760 is not set 163# CONFIG_CPU_SUBTYPE_SH7760 is not set
159# CONFIG_CPU_SUBTYPE_SH4_202 is not set 164# CONFIG_CPU_SUBTYPE_SH4_202 is not set
160# CONFIG_CPU_SUBTYPE_SH7723 is not set 165# CONFIG_CPU_SUBTYPE_SH7723 is not set
166# CONFIG_CPU_SUBTYPE_SH7724 is not set
161# CONFIG_CPU_SUBTYPE_SH7763 is not set 167# CONFIG_CPU_SUBTYPE_SH7763 is not set
162# CONFIG_CPU_SUBTYPE_SH7770 is not set 168# CONFIG_CPU_SUBTYPE_SH7770 is not set
163# CONFIG_CPU_SUBTYPE_SH7780 is not set 169# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -167,8 +173,6 @@ CONFIG_ARCH_SHMOBILE=y
167CONFIG_CPU_SUBTYPE_SH7343=y 173CONFIG_CPU_SUBTYPE_SH7343=y
168# CONFIG_CPU_SUBTYPE_SH7722 is not set 174# CONFIG_CPU_SUBTYPE_SH7722 is not set
169# CONFIG_CPU_SUBTYPE_SH7366 is not set 175# CONFIG_CPU_SUBTYPE_SH7366 is not set
170# CONFIG_CPU_SUBTYPE_SH5_101 is not set
171# CONFIG_CPU_SUBTYPE_SH5_103 is not set
172 176
173# 177#
174# Memory management options 178# Memory management options
@@ -769,6 +773,7 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
769# CONFIG_SOC_CAMERA is not set 773# CONFIG_SOC_CAMERA is not set
770CONFIG_V4L_USB_DRIVERS=y 774CONFIG_V4L_USB_DRIVERS=y
771# CONFIG_USB_VIDEO_CLASS is not set 775# CONFIG_USB_VIDEO_CLASS is not set
776CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
772CONFIG_USB_GSPCA=m 777CONFIG_USB_GSPCA=m
773# CONFIG_USB_M5602 is not set 778# CONFIG_USB_M5602 is not set
774# CONFIG_USB_STV06XX is not set 779# CONFIG_USB_STV06XX is not set
@@ -800,6 +805,7 @@ CONFIG_USB_GSPCA=m
800# CONFIG_VIDEO_PVRUSB2 is not set 805# CONFIG_VIDEO_PVRUSB2 is not set
801# CONFIG_VIDEO_HDPVR is not set 806# CONFIG_VIDEO_HDPVR is not set
802# CONFIG_VIDEO_EM28XX is not set 807# CONFIG_VIDEO_EM28XX is not set
808# CONFIG_VIDEO_CX231XX is not set
803# CONFIG_VIDEO_USBVISION is not set 809# CONFIG_VIDEO_USBVISION is not set
804# CONFIG_USB_VICAM is not set 810# CONFIG_USB_VICAM is not set
805# CONFIG_USB_IBMCAM is not set 811# CONFIG_USB_IBMCAM is not set
@@ -813,6 +819,7 @@ CONFIG_USB_GSPCA=m
813# CONFIG_USB_STV680 is not set 819# CONFIG_USB_STV680 is not set
814# CONFIG_USB_ZC0301 is not set 820# CONFIG_USB_ZC0301 is not set
815# CONFIG_USB_PWC is not set 821# CONFIG_USB_PWC is not set
822CONFIG_USB_PWC_INPUT_EVDEV=y
816# CONFIG_USB_ZR364XX is not set 823# CONFIG_USB_ZR364XX is not set
817# CONFIG_USB_STKWEBCAM is not set 824# CONFIG_USB_STKWEBCAM is not set
818# CONFIG_USB_S2255 is not set 825# CONFIG_USB_S2255 is not set
@@ -914,15 +921,17 @@ CONFIG_USB_HID=y
914# 921#
915# Special HID drivers 922# Special HID drivers
916# 923#
917CONFIG_HID_COMPAT=y
918CONFIG_HID_A4TECH=y 924CONFIG_HID_A4TECH=y
919CONFIG_HID_APPLE=y 925CONFIG_HID_APPLE=y
920CONFIG_HID_BELKIN=y 926CONFIG_HID_BELKIN=y
921CONFIG_HID_CHERRY=y 927CONFIG_HID_CHERRY=y
922CONFIG_HID_CHICONY=y 928CONFIG_HID_CHICONY=y
923CONFIG_HID_CYPRESS=y 929CONFIG_HID_CYPRESS=y
930# CONFIG_DRAGONRISE_FF is not set
924CONFIG_HID_EZKEY=y 931CONFIG_HID_EZKEY=y
932# CONFIG_HID_KYE is not set
925CONFIG_HID_GYRATION=y 933CONFIG_HID_GYRATION=y
934# CONFIG_HID_KENSINGTON is not set
926CONFIG_HID_LOGITECH=y 935CONFIG_HID_LOGITECH=y
927# CONFIG_LOGITECH_FF is not set 936# CONFIG_LOGITECH_FF is not set
928# CONFIG_LOGIRUMBLEPAD2_FF is not set 937# CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -1050,6 +1059,7 @@ CONFIG_EXT2_FS=y
1050# CONFIG_EXT2_FS_XATTR is not set 1059# CONFIG_EXT2_FS_XATTR is not set
1051# CONFIG_EXT2_FS_XIP is not set 1060# CONFIG_EXT2_FS_XIP is not set
1052CONFIG_EXT3_FS=y 1061CONFIG_EXT3_FS=y
1062# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1053CONFIG_EXT3_FS_XATTR=y 1063CONFIG_EXT3_FS_XATTR=y
1054# CONFIG_EXT3_FS_POSIX_ACL is not set 1064# CONFIG_EXT3_FS_POSIX_ACL is not set
1055# CONFIG_EXT3_FS_SECURITY is not set 1065# CONFIG_EXT3_FS_SECURITY is not set
@@ -1071,6 +1081,11 @@ CONFIG_FILE_LOCKING=y
1071# CONFIG_FUSE_FS is not set 1081# CONFIG_FUSE_FS is not set
1072 1082
1073# 1083#
1084# Caches
1085#
1086# CONFIG_FSCACHE is not set
1087
1088#
1074# CD-ROM/DVD Filesystems 1089# CD-ROM/DVD Filesystems
1075# 1090#
1076# CONFIG_ISO9660_FS is not set 1091# CONFIG_ISO9660_FS is not set
@@ -1125,6 +1140,7 @@ CONFIG_CRAMFS=y
1125# CONFIG_ROMFS_FS is not set 1140# CONFIG_ROMFS_FS is not set
1126# CONFIG_SYSV_FS is not set 1141# CONFIG_SYSV_FS is not set
1127# CONFIG_UFS_FS is not set 1142# CONFIG_UFS_FS is not set
1143# CONFIG_NILFS2_FS is not set
1128CONFIG_NETWORK_FILESYSTEMS=y 1144CONFIG_NETWORK_FILESYSTEMS=y
1129CONFIG_NFS_FS=y 1145CONFIG_NFS_FS=y
1130CONFIG_NFS_V3=y 1146CONFIG_NFS_V3=y
@@ -1174,10 +1190,23 @@ CONFIG_FRAME_WARN=1024
1174CONFIG_HAVE_FUNCTION_TRACER=y 1190CONFIG_HAVE_FUNCTION_TRACER=y
1175CONFIG_HAVE_DYNAMIC_FTRACE=y 1191CONFIG_HAVE_DYNAMIC_FTRACE=y
1176CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1192CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1193CONFIG_TRACING_SUPPORT=y
1177 1194
1178# 1195#
1179# Tracers 1196# Tracers
1180# 1197#
1198# CONFIG_FUNCTION_TRACER is not set
1199# CONFIG_IRQSOFF_TRACER is not set
1200# CONFIG_SCHED_TRACER is not set
1201# CONFIG_CONTEXT_SWITCH_TRACER is not set
1202# CONFIG_EVENT_TRACER is not set
1203# CONFIG_BOOT_TRACER is not set
1204# CONFIG_TRACE_BRANCH_PROFILING is not set
1205# CONFIG_STACK_TRACER is not set
1206# CONFIG_KMEMTRACE is not set
1207# CONFIG_WORKQUEUE_TRACER is not set
1208# CONFIG_BLK_DEV_IO_TRACE is not set
1209# CONFIG_DMA_API_DEBUG is not set
1181# CONFIG_SAMPLES is not set 1210# CONFIG_SAMPLES is not set
1182CONFIG_HAVE_ARCH_KGDB=y 1211CONFIG_HAVE_ARCH_KGDB=y
1183# CONFIG_SH_STANDARD_BIOS is not set 1212# CONFIG_SH_STANDARD_BIOS is not set
@@ -1279,6 +1308,7 @@ CONFIG_CRYPTO=y
1279# 1308#
1280# CONFIG_CRYPTO_ANSI_CPRNG is not set 1309# CONFIG_CRYPTO_ANSI_CPRNG is not set
1281CONFIG_CRYPTO_HW=y 1310CONFIG_CRYPTO_HW=y
1311# CONFIG_BINARY_PRINTF is not set
1282 1312
1283# 1313#
1284# Library routines 1314# Library routines
diff --git a/arch/sh/configs/se7619_defconfig b/arch/sh/configs/se7619_defconfig
index 125304e80f57..edbece52afc1 100644
--- a/arch/sh/configs/se7619_defconfig
+++ b/arch/sh/configs/se7619_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:44:53 2009 4# Mon Apr 27 13:02:32 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -61,6 +62,7 @@ CONFIG_EMBEDDED=y
61# CONFIG_UID16 is not set 62# CONFIG_UID16 is not set
62# CONFIG_SYSCTL_SYSCALL is not set 63# CONFIG_SYSCTL_SYSCALL is not set
63# CONFIG_KALLSYMS is not set 64# CONFIG_KALLSYMS is not set
65# CONFIG_STRIP_ASM_SYMS is not set
64# CONFIG_HOTPLUG is not set 66# CONFIG_HOTPLUG is not set
65CONFIG_PRINTK=y 67CONFIG_PRINTK=y
66CONFIG_BUG=y 68CONFIG_BUG=y
@@ -78,11 +80,14 @@ CONFIG_SLAB=y
78# CONFIG_SLUB is not set 80# CONFIG_SLUB is not set
79# CONFIG_SLOB is not set 81# CONFIG_SLOB is not set
80# CONFIG_PROFILING is not set 82# CONFIG_PROFILING is not set
83# CONFIG_MARKERS is not set
81CONFIG_HAVE_OPROFILE=y 84CONFIG_HAVE_OPROFILE=y
82CONFIG_HAVE_KPROBES=y 85CONFIG_HAVE_KPROBES=y
83CONFIG_HAVE_KRETPROBES=y 86CONFIG_HAVE_KRETPROBES=y
84CONFIG_HAVE_ARCH_TRACEHOOK=y 87CONFIG_HAVE_ARCH_TRACEHOOK=y
85CONFIG_HAVE_CLK=y 88CONFIG_HAVE_CLK=y
89CONFIG_HAVE_DMA_API_DEBUG=y
90# CONFIG_SLOW_WORK is not set
86CONFIG_HAVE_GENERIC_DMA_COHERENT=y 91CONFIG_HAVE_GENERIC_DMA_COHERENT=y
87CONFIG_SLABINFO=y 92CONFIG_SLABINFO=y
88CONFIG_BASE_SMALL=1 93CONFIG_BASE_SMALL=1
@@ -134,6 +139,7 @@ CONFIG_CPU_SUBTYPE_SH7619=y
134# CONFIG_CPU_SUBTYPE_SH7760 is not set 139# CONFIG_CPU_SUBTYPE_SH7760 is not set
135# CONFIG_CPU_SUBTYPE_SH4_202 is not set 140# CONFIG_CPU_SUBTYPE_SH4_202 is not set
136# CONFIG_CPU_SUBTYPE_SH7723 is not set 141# CONFIG_CPU_SUBTYPE_SH7723 is not set
142# CONFIG_CPU_SUBTYPE_SH7724 is not set
137# CONFIG_CPU_SUBTYPE_SH7763 is not set 143# CONFIG_CPU_SUBTYPE_SH7763 is not set
138# CONFIG_CPU_SUBTYPE_SH7770 is not set 144# CONFIG_CPU_SUBTYPE_SH7770 is not set
139# CONFIG_CPU_SUBTYPE_SH7780 is not set 145# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -143,8 +149,6 @@ CONFIG_CPU_SUBTYPE_SH7619=y
143# CONFIG_CPU_SUBTYPE_SH7343 is not set 149# CONFIG_CPU_SUBTYPE_SH7343 is not set
144# CONFIG_CPU_SUBTYPE_SH7722 is not set 150# CONFIG_CPU_SUBTYPE_SH7722 is not set
145# CONFIG_CPU_SUBTYPE_SH7366 is not set 151# CONFIG_CPU_SUBTYPE_SH7366 is not set
146# CONFIG_CPU_SUBTYPE_SH5_101 is not set
147# CONFIG_CPU_SUBTYPE_SH5_103 is not set
148 152
149# 153#
150# Memory management options 154# Memory management options
@@ -513,7 +517,6 @@ CONFIG_HID=y
513# 517#
514# Special HID drivers 518# Special HID drivers
515# 519#
516CONFIG_HID_COMPAT=y
517CONFIG_USB_SUPPORT=y 520CONFIG_USB_SUPPORT=y
518CONFIG_USB_ARCH_HAS_HCD=y 521CONFIG_USB_ARCH_HAS_HCD=y
519# CONFIG_USB_ARCH_HAS_OHCI is not set 522# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -564,6 +567,11 @@ CONFIG_FILE_LOCKING=y
564# CONFIG_FUSE_FS is not set 567# CONFIG_FUSE_FS is not set
565 568
566# 569#
570# Caches
571#
572# CONFIG_FSCACHE is not set
573
574#
567# CD-ROM/DVD Filesystems 575# CD-ROM/DVD Filesystems
568# 576#
569# CONFIG_ISO9660_FS is not set 577# CONFIG_ISO9660_FS is not set
@@ -601,8 +609,13 @@ CONFIG_MISC_FILESYSTEMS=y
601# CONFIG_HPFS_FS is not set 609# CONFIG_HPFS_FS is not set
602# CONFIG_QNX4FS_FS is not set 610# CONFIG_QNX4FS_FS is not set
603CONFIG_ROMFS_FS=y 611CONFIG_ROMFS_FS=y
612CONFIG_ROMFS_BACKED_BY_BLOCK=y
613# CONFIG_ROMFS_BACKED_BY_MTD is not set
614# CONFIG_ROMFS_BACKED_BY_BOTH is not set
615CONFIG_ROMFS_ON_BLOCK=y
604# CONFIG_SYSV_FS is not set 616# CONFIG_SYSV_FS is not set
605# CONFIG_UFS_FS is not set 617# CONFIG_UFS_FS is not set
618# CONFIG_NILFS2_FS is not set
606 619
607# 620#
608# Partition Types 621# Partition Types
@@ -630,10 +643,21 @@ CONFIG_FRAME_WARN=1024
630CONFIG_HAVE_FUNCTION_TRACER=y 643CONFIG_HAVE_FUNCTION_TRACER=y
631CONFIG_HAVE_DYNAMIC_FTRACE=y 644CONFIG_HAVE_DYNAMIC_FTRACE=y
632CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 645CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
646CONFIG_TRACING_SUPPORT=y
633 647
634# 648#
635# Tracers 649# Tracers
636# 650#
651# CONFIG_FUNCTION_TRACER is not set
652# CONFIG_SCHED_TRACER is not set
653# CONFIG_CONTEXT_SWITCH_TRACER is not set
654# CONFIG_EVENT_TRACER is not set
655# CONFIG_BOOT_TRACER is not set
656# CONFIG_TRACE_BRANCH_PROFILING is not set
657# CONFIG_STACK_TRACER is not set
658# CONFIG_KMEMTRACE is not set
659# CONFIG_WORKQUEUE_TRACER is not set
660# CONFIG_DMA_API_DEBUG is not set
637# CONFIG_SAMPLES is not set 661# CONFIG_SAMPLES is not set
638CONFIG_HAVE_ARCH_KGDB=y 662CONFIG_HAVE_ARCH_KGDB=y
639# CONFIG_SH_STANDARD_BIOS is not set 663# CONFIG_SH_STANDARD_BIOS is not set
@@ -647,6 +671,7 @@ CONFIG_HAVE_ARCH_KGDB=y
647# CONFIG_SECURITYFS is not set 671# CONFIG_SECURITYFS is not set
648# CONFIG_SECURITY_FILE_CAPABILITIES is not set 672# CONFIG_SECURITY_FILE_CAPABILITIES is not set
649# CONFIG_CRYPTO is not set 673# CONFIG_CRYPTO is not set
674# CONFIG_BINARY_PRINTF is not set
650 675
651# 676#
652# Library routines 677# Library routines
diff --git a/arch/sh/configs/se7705_defconfig b/arch/sh/configs/se7705_defconfig
index 0308abf52384..bae161c66835 100644
--- a/arch/sh/configs/se7705_defconfig
+++ b/arch/sh/configs/se7705_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:45:56 2009 4# Mon Apr 27 13:02:52 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -62,7 +63,6 @@ CONFIG_INITRAMFS_SOURCE=""
62CONFIG_RD_GZIP=y 63CONFIG_RD_GZIP=y
63# CONFIG_RD_BZIP2 is not set 64# CONFIG_RD_BZIP2 is not set
64# CONFIG_RD_LZMA is not set 65# CONFIG_RD_LZMA is not set
65CONFIG_INITRAMFS_COMPRESSION_NONE=y
66# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 66# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
67CONFIG_SYSCTL=y 67CONFIG_SYSCTL=y
68CONFIG_ANON_INODES=y 68CONFIG_ANON_INODES=y
@@ -70,6 +70,7 @@ CONFIG_EMBEDDED=y
70CONFIG_UID16=y 70CONFIG_UID16=y
71# CONFIG_SYSCTL_SYSCALL is not set 71# CONFIG_SYSCTL_SYSCALL is not set
72# CONFIG_KALLSYMS is not set 72# CONFIG_KALLSYMS is not set
73# CONFIG_STRIP_ASM_SYMS is not set
73# CONFIG_HOTPLUG is not set 74# CONFIG_HOTPLUG is not set
74CONFIG_PRINTK=y 75CONFIG_PRINTK=y
75CONFIG_BUG=y 76CONFIG_BUG=y
@@ -88,12 +89,15 @@ CONFIG_SLAB=y
88# CONFIG_SLUB is not set 89# CONFIG_SLUB is not set
89# CONFIG_SLOB is not set 90# CONFIG_SLOB is not set
90# CONFIG_PROFILING is not set 91# CONFIG_PROFILING is not set
92# CONFIG_MARKERS is not set
91CONFIG_HAVE_OPROFILE=y 93CONFIG_HAVE_OPROFILE=y
92CONFIG_HAVE_IOREMAP_PROT=y 94CONFIG_HAVE_IOREMAP_PROT=y
93CONFIG_HAVE_KPROBES=y 95CONFIG_HAVE_KPROBES=y
94CONFIG_HAVE_KRETPROBES=y 96CONFIG_HAVE_KRETPROBES=y
95CONFIG_HAVE_ARCH_TRACEHOOK=y 97CONFIG_HAVE_ARCH_TRACEHOOK=y
96CONFIG_HAVE_CLK=y 98CONFIG_HAVE_CLK=y
99CONFIG_HAVE_DMA_API_DEBUG=y
100# CONFIG_SLOW_WORK is not set
97CONFIG_HAVE_GENERIC_DMA_COHERENT=y 101CONFIG_HAVE_GENERIC_DMA_COHERENT=y
98CONFIG_SLABINFO=y 102CONFIG_SLABINFO=y
99CONFIG_RT_MUTEXES=y 103CONFIG_RT_MUTEXES=y
@@ -150,6 +154,7 @@ CONFIG_CPU_SUBTYPE_SH7705=y
150# CONFIG_CPU_SUBTYPE_SH7760 is not set 154# CONFIG_CPU_SUBTYPE_SH7760 is not set
151# CONFIG_CPU_SUBTYPE_SH4_202 is not set 155# CONFIG_CPU_SUBTYPE_SH4_202 is not set
152# CONFIG_CPU_SUBTYPE_SH7723 is not set 156# CONFIG_CPU_SUBTYPE_SH7723 is not set
157# CONFIG_CPU_SUBTYPE_SH7724 is not set
153# CONFIG_CPU_SUBTYPE_SH7763 is not set 158# CONFIG_CPU_SUBTYPE_SH7763 is not set
154# CONFIG_CPU_SUBTYPE_SH7770 is not set 159# CONFIG_CPU_SUBTYPE_SH7770 is not set
155# CONFIG_CPU_SUBTYPE_SH7780 is not set 160# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -159,8 +164,6 @@ CONFIG_CPU_SUBTYPE_SH7705=y
159# CONFIG_CPU_SUBTYPE_SH7343 is not set 164# CONFIG_CPU_SUBTYPE_SH7343 is not set
160# CONFIG_CPU_SUBTYPE_SH7722 is not set 165# CONFIG_CPU_SUBTYPE_SH7722 is not set
161# CONFIG_CPU_SUBTYPE_SH7366 is not set 166# CONFIG_CPU_SUBTYPE_SH7366 is not set
162# CONFIG_CPU_SUBTYPE_SH5_101 is not set
163# CONFIG_CPU_SUBTYPE_SH5_103 is not set
164 167
165# 168#
166# Memory management options 169# Memory management options
@@ -698,7 +701,6 @@ CONFIG_HID=y
698# 701#
699# Special HID drivers 702# Special HID drivers
700# 703#
701CONFIG_HID_COMPAT=y
702CONFIG_USB_SUPPORT=y 704CONFIG_USB_SUPPORT=y
703CONFIG_USB_ARCH_HAS_HCD=y 705CONFIG_USB_ARCH_HAS_HCD=y
704# CONFIG_USB_ARCH_HAS_OHCI is not set 706# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -752,6 +754,11 @@ CONFIG_INOTIFY_USER=y
752# CONFIG_FUSE_FS is not set 754# CONFIG_FUSE_FS is not set
753 755
754# 756#
757# Caches
758#
759# CONFIG_FSCACHE is not set
760
761#
755# CD-ROM/DVD Filesystems 762# CD-ROM/DVD Filesystems
756# 763#
757# CONFIG_ISO9660_FS is not set 764# CONFIG_ISO9660_FS is not set
@@ -804,6 +811,7 @@ CONFIG_JFFS2_RTIME=y
804# CONFIG_ROMFS_FS is not set 811# CONFIG_ROMFS_FS is not set
805# CONFIG_SYSV_FS is not set 812# CONFIG_SYSV_FS is not set
806# CONFIG_UFS_FS is not set 813# CONFIG_UFS_FS is not set
814# CONFIG_NILFS2_FS is not set
807CONFIG_NETWORK_FILESYSTEMS=y 815CONFIG_NETWORK_FILESYSTEMS=y
808CONFIG_NFS_FS=y 816CONFIG_NFS_FS=y
809# CONFIG_NFS_V3 is not set 817# CONFIG_NFS_V3 is not set
@@ -847,10 +855,23 @@ CONFIG_FRAME_WARN=1024
847CONFIG_HAVE_FUNCTION_TRACER=y 855CONFIG_HAVE_FUNCTION_TRACER=y
848CONFIG_HAVE_DYNAMIC_FTRACE=y 856CONFIG_HAVE_DYNAMIC_FTRACE=y
849CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 857CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
858CONFIG_TRACING_SUPPORT=y
850 859
851# 860#
852# Tracers 861# Tracers
853# 862#
863# CONFIG_FUNCTION_TRACER is not set
864# CONFIG_IRQSOFF_TRACER is not set
865# CONFIG_PREEMPT_TRACER is not set
866# CONFIG_SCHED_TRACER is not set
867# CONFIG_CONTEXT_SWITCH_TRACER is not set
868# CONFIG_EVENT_TRACER is not set
869# CONFIG_BOOT_TRACER is not set
870# CONFIG_TRACE_BRANCH_PROFILING is not set
871# CONFIG_STACK_TRACER is not set
872# CONFIG_KMEMTRACE is not set
873# CONFIG_WORKQUEUE_TRACER is not set
874# CONFIG_DMA_API_DEBUG is not set
854# CONFIG_SAMPLES is not set 875# CONFIG_SAMPLES is not set
855CONFIG_HAVE_ARCH_KGDB=y 876CONFIG_HAVE_ARCH_KGDB=y
856# CONFIG_SH_STANDARD_BIOS is not set 877# CONFIG_SH_STANDARD_BIOS is not set
@@ -949,6 +970,7 @@ CONFIG_CRYPTO=y
949# 970#
950# CONFIG_CRYPTO_ANSI_CPRNG is not set 971# CONFIG_CRYPTO_ANSI_CPRNG is not set
951CONFIG_CRYPTO_HW=y 972CONFIG_CRYPTO_HW=y
973# CONFIG_BINARY_PRINTF is not set
952 974
953# 975#
954# Library routines 976# Library routines
diff --git a/arch/sh/configs/se7712_defconfig b/arch/sh/configs/se7712_defconfig
index a8c24b703489..330043f3c316 100644
--- a/arch/sh/configs/se7712_defconfig
+++ b/arch/sh/configs/se7712_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:48:18 2009 4# Mon Apr 27 13:03:27 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_FIND_NEXT_BIT=y 11CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -38,6 +39,7 @@ CONFIG_LOCALVERSION=""
38CONFIG_SYSVIPC=y 39CONFIG_SYSVIPC=y
39CONFIG_SYSVIPC_SYSCTL=y 40CONFIG_SYSVIPC_SYSCTL=y
40CONFIG_POSIX_MQUEUE=y 41CONFIG_POSIX_MQUEUE=y
42CONFIG_POSIX_MQUEUE_SYSCTL=y
41CONFIG_BSD_PROCESS_ACCT=y 43CONFIG_BSD_PROCESS_ACCT=y
42# CONFIG_BSD_PROCESS_ACCT_V3 is not set 44# CONFIG_BSD_PROCESS_ACCT_V3 is not set
43# CONFIG_TASKSTATS is not set 45# CONFIG_TASKSTATS is not set
@@ -69,6 +71,7 @@ CONFIG_SYSCTL_SYSCALL=y
69CONFIG_KALLSYMS=y 71CONFIG_KALLSYMS=y
70CONFIG_KALLSYMS_ALL=y 72CONFIG_KALLSYMS_ALL=y
71# CONFIG_KALLSYMS_EXTRA_PASS is not set 73# CONFIG_KALLSYMS_EXTRA_PASS is not set
74# CONFIG_STRIP_ASM_SYMS is not set
72CONFIG_HOTPLUG=y 75CONFIG_HOTPLUG=y
73CONFIG_PRINTK=y 76CONFIG_PRINTK=y
74# CONFIG_BUG is not set 77# CONFIG_BUG is not set
@@ -87,6 +90,7 @@ CONFIG_SLAB=y
87# CONFIG_SLUB is not set 90# CONFIG_SLUB is not set
88# CONFIG_SLOB is not set 91# CONFIG_SLOB is not set
89# CONFIG_PROFILING is not set 92# CONFIG_PROFILING is not set
93# CONFIG_MARKERS is not set
90CONFIG_HAVE_OPROFILE=y 94CONFIG_HAVE_OPROFILE=y
91# CONFIG_KPROBES is not set 95# CONFIG_KPROBES is not set
92CONFIG_HAVE_IOREMAP_PROT=y 96CONFIG_HAVE_IOREMAP_PROT=y
@@ -94,6 +98,8 @@ CONFIG_HAVE_KPROBES=y
94CONFIG_HAVE_KRETPROBES=y 98CONFIG_HAVE_KRETPROBES=y
95CONFIG_HAVE_ARCH_TRACEHOOK=y 99CONFIG_HAVE_ARCH_TRACEHOOK=y
96CONFIG_HAVE_CLK=y 100CONFIG_HAVE_CLK=y
101CONFIG_HAVE_DMA_API_DEBUG=y
102# CONFIG_SLOW_WORK is not set
97CONFIG_HAVE_GENERIC_DMA_COHERENT=y 103CONFIG_HAVE_GENERIC_DMA_COHERENT=y
98CONFIG_SLABINFO=y 104CONFIG_SLABINFO=y
99CONFIG_RT_MUTEXES=y 105CONFIG_RT_MUTEXES=y
@@ -105,7 +111,6 @@ CONFIG_MODULES=y
105# CONFIG_MODULE_SRCVERSION_ALL is not set 111# CONFIG_MODULE_SRCVERSION_ALL is not set
106CONFIG_BLOCK=y 112CONFIG_BLOCK=y
107# CONFIG_LBD is not set 113# CONFIG_LBD is not set
108# CONFIG_BLK_DEV_IO_TRACE is not set
109# CONFIG_BLK_DEV_BSG is not set 114# CONFIG_BLK_DEV_BSG is not set
110# CONFIG_BLK_DEV_INTEGRITY is not set 115# CONFIG_BLK_DEV_INTEGRITY is not set
111 116
@@ -151,6 +156,7 @@ CONFIG_CPU_SUBTYPE_SH7712=y
151# CONFIG_CPU_SUBTYPE_SH7760 is not set 156# CONFIG_CPU_SUBTYPE_SH7760 is not set
152# CONFIG_CPU_SUBTYPE_SH4_202 is not set 157# CONFIG_CPU_SUBTYPE_SH4_202 is not set
153# CONFIG_CPU_SUBTYPE_SH7723 is not set 158# CONFIG_CPU_SUBTYPE_SH7723 is not set
159# CONFIG_CPU_SUBTYPE_SH7724 is not set
154# CONFIG_CPU_SUBTYPE_SH7763 is not set 160# CONFIG_CPU_SUBTYPE_SH7763 is not set
155# CONFIG_CPU_SUBTYPE_SH7770 is not set 161# CONFIG_CPU_SUBTYPE_SH7770 is not set
156# CONFIG_CPU_SUBTYPE_SH7780 is not set 162# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -160,8 +166,6 @@ CONFIG_CPU_SUBTYPE_SH7712=y
160# CONFIG_CPU_SUBTYPE_SH7343 is not set 166# CONFIG_CPU_SUBTYPE_SH7343 is not set
161# CONFIG_CPU_SUBTYPE_SH7722 is not set 167# CONFIG_CPU_SUBTYPE_SH7722 is not set
162# CONFIG_CPU_SUBTYPE_SH7366 is not set 168# CONFIG_CPU_SUBTYPE_SH7366 is not set
163# CONFIG_CPU_SUBTYPE_SH5_101 is not set
164# CONFIG_CPU_SUBTYPE_SH5_103 is not set
165 169
166# 170#
167# Memory management options 171# Memory management options
@@ -585,6 +589,7 @@ CONFIG_SCSI_WAIT_SCAN=m
585CONFIG_SCSI_LOWLEVEL=y 589CONFIG_SCSI_LOWLEVEL=y
586# CONFIG_ISCSI_TCP is not set 590# CONFIG_ISCSI_TCP is not set
587# CONFIG_LIBFC is not set 591# CONFIG_LIBFC is not set
592# CONFIG_LIBFCOE is not set
588# CONFIG_SCSI_DEBUG is not set 593# CONFIG_SCSI_DEBUG is not set
589# CONFIG_SCSI_DH is not set 594# CONFIG_SCSI_DH is not set
590# CONFIG_SCSI_OSD_INITIATOR is not set 595# CONFIG_SCSI_OSD_INITIATOR is not set
@@ -812,6 +817,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y
812CONFIG_EXT2_FS_SECURITY=y 817CONFIG_EXT2_FS_SECURITY=y
813# CONFIG_EXT2_FS_XIP is not set 818# CONFIG_EXT2_FS_XIP is not set
814CONFIG_EXT3_FS=y 819CONFIG_EXT3_FS=y
820# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
815CONFIG_EXT3_FS_XATTR=y 821CONFIG_EXT3_FS_XATTR=y
816# CONFIG_EXT3_FS_POSIX_ACL is not set 822# CONFIG_EXT3_FS_POSIX_ACL is not set
817# CONFIG_EXT3_FS_SECURITY is not set 823# CONFIG_EXT3_FS_SECURITY is not set
@@ -833,6 +839,11 @@ CONFIG_FILE_LOCKING=y
833# CONFIG_FUSE_FS is not set 839# CONFIG_FUSE_FS is not set
834 840
835# 841#
842# Caches
843#
844# CONFIG_FSCACHE is not set
845
846#
836# CD-ROM/DVD Filesystems 847# CD-ROM/DVD Filesystems
837# 848#
838# CONFIG_ISO9660_FS is not set 849# CONFIG_ISO9660_FS is not set
@@ -887,6 +898,7 @@ CONFIG_CRAMFS=y
887# CONFIG_ROMFS_FS is not set 898# CONFIG_ROMFS_FS is not set
888# CONFIG_SYSV_FS is not set 899# CONFIG_SYSV_FS is not set
889# CONFIG_UFS_FS is not set 900# CONFIG_UFS_FS is not set
901# CONFIG_NILFS2_FS is not set
890CONFIG_NETWORK_FILESYSTEMS=y 902CONFIG_NETWORK_FILESYSTEMS=y
891CONFIG_NFS_FS=y 903CONFIG_NFS_FS=y
892# CONFIG_NFS_V3 is not set 904# CONFIG_NFS_V3 is not set
@@ -927,6 +939,7 @@ CONFIG_FRAME_WARN=1024
927CONFIG_DEBUG_KERNEL=y 939CONFIG_DEBUG_KERNEL=y
928# CONFIG_DEBUG_SHIRQ is not set 940# CONFIG_DEBUG_SHIRQ is not set
929# CONFIG_DETECT_SOFTLOCKUP is not set 941# CONFIG_DETECT_SOFTLOCKUP is not set
942# CONFIG_DETECT_HUNG_TASK is not set
930CONFIG_SCHED_DEBUG=y 943CONFIG_SCHED_DEBUG=y
931# CONFIG_SCHEDSTATS is not set 944# CONFIG_SCHEDSTATS is not set
932# CONFIG_TIMER_STATS is not set 945# CONFIG_TIMER_STATS is not set
@@ -961,6 +974,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
961CONFIG_HAVE_FUNCTION_TRACER=y 974CONFIG_HAVE_FUNCTION_TRACER=y
962CONFIG_HAVE_DYNAMIC_FTRACE=y 975CONFIG_HAVE_DYNAMIC_FTRACE=y
963CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 976CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
977CONFIG_TRACING_SUPPORT=y
964 978
965# 979#
966# Tracers 980# Tracers
@@ -969,9 +983,14 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
969# CONFIG_IRQSOFF_TRACER is not set 983# CONFIG_IRQSOFF_TRACER is not set
970# CONFIG_SCHED_TRACER is not set 984# CONFIG_SCHED_TRACER is not set
971# CONFIG_CONTEXT_SWITCH_TRACER is not set 985# CONFIG_CONTEXT_SWITCH_TRACER is not set
986# CONFIG_EVENT_TRACER is not set
972# CONFIG_BOOT_TRACER is not set 987# CONFIG_BOOT_TRACER is not set
973# CONFIG_TRACE_BRANCH_PROFILING is not set 988# CONFIG_TRACE_BRANCH_PROFILING is not set
974# CONFIG_STACK_TRACER is not set 989# CONFIG_STACK_TRACER is not set
990# CONFIG_KMEMTRACE is not set
991# CONFIG_WORKQUEUE_TRACER is not set
992# CONFIG_BLK_DEV_IO_TRACE is not set
993# CONFIG_DMA_API_DEBUG is not set
975# CONFIG_SAMPLES is not set 994# CONFIG_SAMPLES is not set
976CONFIG_HAVE_ARCH_KGDB=y 995CONFIG_HAVE_ARCH_KGDB=y
977# CONFIG_KGDB is not set 996# CONFIG_KGDB is not set
@@ -1090,6 +1109,7 @@ CONFIG_CRYPTO_DEFLATE=y
1090# 1109#
1091# CONFIG_CRYPTO_ANSI_CPRNG is not set 1110# CONFIG_CRYPTO_ANSI_CPRNG is not set
1092CONFIG_CRYPTO_HW=y 1111CONFIG_CRYPTO_HW=y
1112# CONFIG_BINARY_PRINTF is not set
1093 1113
1094# 1114#
1095# Library routines 1115# Library routines
diff --git a/arch/sh/configs/se7721_defconfig b/arch/sh/configs/se7721_defconfig
index 4b79c2567dc8..56478918440d 100644
--- a/arch/sh/configs/se7721_defconfig
+++ b/arch/sh/configs/se7721_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:51:44 2009 4# Mon Apr 27 13:04:19 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_FIND_NEXT_BIT=y 11CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -38,6 +39,7 @@ CONFIG_LOCALVERSION=""
38CONFIG_SYSVIPC=y 39CONFIG_SYSVIPC=y
39CONFIG_SYSVIPC_SYSCTL=y 40CONFIG_SYSVIPC_SYSCTL=y
40CONFIG_POSIX_MQUEUE=y 41CONFIG_POSIX_MQUEUE=y
42CONFIG_POSIX_MQUEUE_SYSCTL=y
41CONFIG_BSD_PROCESS_ACCT=y 43CONFIG_BSD_PROCESS_ACCT=y
42# CONFIG_BSD_PROCESS_ACCT_V3 is not set 44# CONFIG_BSD_PROCESS_ACCT_V3 is not set
43# CONFIG_TASKSTATS is not set 45# CONFIG_TASKSTATS is not set
@@ -73,6 +75,7 @@ CONFIG_SYSCTL_SYSCALL=y
73CONFIG_KALLSYMS=y 75CONFIG_KALLSYMS=y
74CONFIG_KALLSYMS_ALL=y 76CONFIG_KALLSYMS_ALL=y
75# CONFIG_KALLSYMS_EXTRA_PASS is not set 77# CONFIG_KALLSYMS_EXTRA_PASS is not set
78# CONFIG_STRIP_ASM_SYMS is not set
76CONFIG_HOTPLUG=y 79CONFIG_HOTPLUG=y
77CONFIG_PRINTK=y 80CONFIG_PRINTK=y
78# CONFIG_BUG is not set 81# CONFIG_BUG is not set
@@ -91,6 +94,7 @@ CONFIG_SLAB=y
91# CONFIG_SLUB is not set 94# CONFIG_SLUB is not set
92# CONFIG_SLOB is not set 95# CONFIG_SLOB is not set
93# CONFIG_PROFILING is not set 96# CONFIG_PROFILING is not set
97# CONFIG_MARKERS is not set
94CONFIG_HAVE_OPROFILE=y 98CONFIG_HAVE_OPROFILE=y
95# CONFIG_KPROBES is not set 99# CONFIG_KPROBES is not set
96CONFIG_HAVE_IOREMAP_PROT=y 100CONFIG_HAVE_IOREMAP_PROT=y
@@ -98,6 +102,8 @@ CONFIG_HAVE_KPROBES=y
98CONFIG_HAVE_KRETPROBES=y 102CONFIG_HAVE_KRETPROBES=y
99CONFIG_HAVE_ARCH_TRACEHOOK=y 103CONFIG_HAVE_ARCH_TRACEHOOK=y
100CONFIG_HAVE_CLK=y 104CONFIG_HAVE_CLK=y
105CONFIG_HAVE_DMA_API_DEBUG=y
106# CONFIG_SLOW_WORK is not set
101CONFIG_HAVE_GENERIC_DMA_COHERENT=y 107CONFIG_HAVE_GENERIC_DMA_COHERENT=y
102CONFIG_SLABINFO=y 108CONFIG_SLABINFO=y
103CONFIG_RT_MUTEXES=y 109CONFIG_RT_MUTEXES=y
@@ -109,7 +115,6 @@ CONFIG_MODULES=y
109# CONFIG_MODULE_SRCVERSION_ALL is not set 115# CONFIG_MODULE_SRCVERSION_ALL is not set
110CONFIG_BLOCK=y 116CONFIG_BLOCK=y
111# CONFIG_LBD is not set 117# CONFIG_LBD is not set
112# CONFIG_BLK_DEV_IO_TRACE is not set
113# CONFIG_BLK_DEV_BSG is not set 118# CONFIG_BLK_DEV_BSG is not set
114# CONFIG_BLK_DEV_INTEGRITY is not set 119# CONFIG_BLK_DEV_INTEGRITY is not set
115 120
@@ -155,6 +160,7 @@ CONFIG_CPU_SUBTYPE_SH7721=y
155# CONFIG_CPU_SUBTYPE_SH7760 is not set 160# CONFIG_CPU_SUBTYPE_SH7760 is not set
156# CONFIG_CPU_SUBTYPE_SH4_202 is not set 161# CONFIG_CPU_SUBTYPE_SH4_202 is not set
157# CONFIG_CPU_SUBTYPE_SH7723 is not set 162# CONFIG_CPU_SUBTYPE_SH7723 is not set
163# CONFIG_CPU_SUBTYPE_SH7724 is not set
158# CONFIG_CPU_SUBTYPE_SH7763 is not set 164# CONFIG_CPU_SUBTYPE_SH7763 is not set
159# CONFIG_CPU_SUBTYPE_SH7770 is not set 165# CONFIG_CPU_SUBTYPE_SH7770 is not set
160# CONFIG_CPU_SUBTYPE_SH7780 is not set 166# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -164,8 +170,6 @@ CONFIG_CPU_SUBTYPE_SH7721=y
164# CONFIG_CPU_SUBTYPE_SH7343 is not set 170# CONFIG_CPU_SUBTYPE_SH7343 is not set
165# CONFIG_CPU_SUBTYPE_SH7722 is not set 171# CONFIG_CPU_SUBTYPE_SH7722 is not set
166# CONFIG_CPU_SUBTYPE_SH7366 is not set 172# CONFIG_CPU_SUBTYPE_SH7366 is not set
167# CONFIG_CPU_SUBTYPE_SH5_101 is not set
168# CONFIG_CPU_SUBTYPE_SH5_103 is not set
169 173
170# 174#
171# Memory management options 175# Memory management options
@@ -776,15 +780,17 @@ CONFIG_USB_HID=y
776# 780#
777# Special HID drivers 781# Special HID drivers
778# 782#
779CONFIG_HID_COMPAT=y
780CONFIG_HID_A4TECH=y 783CONFIG_HID_A4TECH=y
781CONFIG_HID_APPLE=y 784CONFIG_HID_APPLE=y
782CONFIG_HID_BELKIN=y 785CONFIG_HID_BELKIN=y
783CONFIG_HID_CHERRY=y 786CONFIG_HID_CHERRY=y
784CONFIG_HID_CHICONY=y 787CONFIG_HID_CHICONY=y
785CONFIG_HID_CYPRESS=y 788CONFIG_HID_CYPRESS=y
789# CONFIG_DRAGONRISE_FF is not set
786CONFIG_HID_EZKEY=y 790CONFIG_HID_EZKEY=y
791# CONFIG_HID_KYE is not set
787CONFIG_HID_GYRATION=y 792CONFIG_HID_GYRATION=y
793# CONFIG_HID_KENSINGTON is not set
788CONFIG_HID_LOGITECH=y 794CONFIG_HID_LOGITECH=y
789# CONFIG_LOGITECH_FF is not set 795# CONFIG_LOGITECH_FF is not set
790# CONFIG_LOGIRUMBLEPAD2_FF is not set 796# CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -943,6 +949,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y
943CONFIG_EXT2_FS_SECURITY=y 949CONFIG_EXT2_FS_SECURITY=y
944# CONFIG_EXT2_FS_XIP is not set 950# CONFIG_EXT2_FS_XIP is not set
945CONFIG_EXT3_FS=y 951CONFIG_EXT3_FS=y
952# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
946CONFIG_EXT3_FS_XATTR=y 953CONFIG_EXT3_FS_XATTR=y
947# CONFIG_EXT3_FS_POSIX_ACL is not set 954# CONFIG_EXT3_FS_POSIX_ACL is not set
948# CONFIG_EXT3_FS_SECURITY is not set 955# CONFIG_EXT3_FS_SECURITY is not set
@@ -964,6 +971,11 @@ CONFIG_FILE_LOCKING=y
964# CONFIG_FUSE_FS is not set 971# CONFIG_FUSE_FS is not set
965 972
966# 973#
974# Caches
975#
976# CONFIG_FSCACHE is not set
977
978#
967# CD-ROM/DVD Filesystems 979# CD-ROM/DVD Filesystems
968# 980#
969# CONFIG_ISO9660_FS is not set 981# CONFIG_ISO9660_FS is not set
@@ -1021,6 +1033,7 @@ CONFIG_CRAMFS=y
1021# CONFIG_ROMFS_FS is not set 1033# CONFIG_ROMFS_FS is not set
1022# CONFIG_SYSV_FS is not set 1034# CONFIG_SYSV_FS is not set
1023# CONFIG_UFS_FS is not set 1035# CONFIG_UFS_FS is not set
1036# CONFIG_NILFS2_FS is not set
1024# CONFIG_NETWORK_FILESYSTEMS is not set 1037# CONFIG_NETWORK_FILESYSTEMS is not set
1025 1038
1026# 1039#
@@ -1085,6 +1098,7 @@ CONFIG_FRAME_WARN=1024
1085CONFIG_DEBUG_KERNEL=y 1098CONFIG_DEBUG_KERNEL=y
1086# CONFIG_DEBUG_SHIRQ is not set 1099# CONFIG_DEBUG_SHIRQ is not set
1087# CONFIG_DETECT_SOFTLOCKUP is not set 1100# CONFIG_DETECT_SOFTLOCKUP is not set
1101# CONFIG_DETECT_HUNG_TASK is not set
1088CONFIG_SCHED_DEBUG=y 1102CONFIG_SCHED_DEBUG=y
1089# CONFIG_SCHEDSTATS is not set 1103# CONFIG_SCHEDSTATS is not set
1090# CONFIG_TIMER_STATS is not set 1104# CONFIG_TIMER_STATS is not set
@@ -1119,6 +1133,7 @@ CONFIG_FRAME_POINTER=y
1119CONFIG_HAVE_FUNCTION_TRACER=y 1133CONFIG_HAVE_FUNCTION_TRACER=y
1120CONFIG_HAVE_DYNAMIC_FTRACE=y 1134CONFIG_HAVE_DYNAMIC_FTRACE=y
1121CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1135CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1136CONFIG_TRACING_SUPPORT=y
1122 1137
1123# 1138#
1124# Tracers 1139# Tracers
@@ -1127,9 +1142,14 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1127# CONFIG_IRQSOFF_TRACER is not set 1142# CONFIG_IRQSOFF_TRACER is not set
1128# CONFIG_SCHED_TRACER is not set 1143# CONFIG_SCHED_TRACER is not set
1129# CONFIG_CONTEXT_SWITCH_TRACER is not set 1144# CONFIG_CONTEXT_SWITCH_TRACER is not set
1145# CONFIG_EVENT_TRACER is not set
1130# CONFIG_BOOT_TRACER is not set 1146# CONFIG_BOOT_TRACER is not set
1131# CONFIG_TRACE_BRANCH_PROFILING is not set 1147# CONFIG_TRACE_BRANCH_PROFILING is not set
1132# CONFIG_STACK_TRACER is not set 1148# CONFIG_STACK_TRACER is not set
1149# CONFIG_KMEMTRACE is not set
1150# CONFIG_WORKQUEUE_TRACER is not set
1151# CONFIG_BLK_DEV_IO_TRACE is not set
1152# CONFIG_DMA_API_DEBUG is not set
1133# CONFIG_SAMPLES is not set 1153# CONFIG_SAMPLES is not set
1134CONFIG_HAVE_ARCH_KGDB=y 1154CONFIG_HAVE_ARCH_KGDB=y
1135# CONFIG_KGDB is not set 1155# CONFIG_KGDB is not set
@@ -1248,6 +1268,7 @@ CONFIG_CRYPTO_DEFLATE=y
1248# 1268#
1249# CONFIG_CRYPTO_ANSI_CPRNG is not set 1269# CONFIG_CRYPTO_ANSI_CPRNG is not set
1250CONFIG_CRYPTO_HW=y 1270CONFIG_CRYPTO_HW=y
1271# CONFIG_BINARY_PRINTF is not set
1251 1272
1252# 1273#
1253# Library routines 1274# Library routines
diff --git a/arch/sh/configs/se7722_defconfig b/arch/sh/configs/se7722_defconfig
index 82bdaac45fb5..726fdbdb2807 100644
--- a/arch/sh/configs/se7722_defconfig
+++ b/arch/sh/configs/se7722_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:55:10 2009 4# Mon Apr 27 13:05:29 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -69,7 +70,6 @@ CONFIG_INITRAMFS_SOURCE=""
69CONFIG_RD_GZIP=y 70CONFIG_RD_GZIP=y
70# CONFIG_RD_BZIP2 is not set 71# CONFIG_RD_BZIP2 is not set
71# CONFIG_RD_LZMA is not set 72# CONFIG_RD_LZMA is not set
72CONFIG_INITRAMFS_COMPRESSION_NONE=y
73CONFIG_CC_OPTIMIZE_FOR_SIZE=y 73CONFIG_CC_OPTIMIZE_FOR_SIZE=y
74CONFIG_SYSCTL=y 74CONFIG_SYSCTL=y
75CONFIG_ANON_INODES=y 75CONFIG_ANON_INODES=y
@@ -78,6 +78,7 @@ CONFIG_UID16=y
78CONFIG_SYSCTL_SYSCALL=y 78CONFIG_SYSCTL_SYSCALL=y
79CONFIG_KALLSYMS=y 79CONFIG_KALLSYMS=y
80# CONFIG_KALLSYMS_EXTRA_PASS is not set 80# CONFIG_KALLSYMS_EXTRA_PASS is not set
81# CONFIG_STRIP_ASM_SYMS is not set
81CONFIG_HOTPLUG=y 82CONFIG_HOTPLUG=y
82CONFIG_PRINTK=y 83CONFIG_PRINTK=y
83CONFIG_BUG=y 84CONFIG_BUG=y
@@ -97,6 +98,7 @@ CONFIG_COMPAT_BRK=y
97CONFIG_SLUB=y 98CONFIG_SLUB=y
98# CONFIG_SLOB is not set 99# CONFIG_SLOB is not set
99CONFIG_PROFILING=y 100CONFIG_PROFILING=y
101# CONFIG_MARKERS is not set
100# CONFIG_OPROFILE is not set 102# CONFIG_OPROFILE is not set
101CONFIG_HAVE_OPROFILE=y 103CONFIG_HAVE_OPROFILE=y
102# CONFIG_KPROBES is not set 104# CONFIG_KPROBES is not set
@@ -105,6 +107,8 @@ CONFIG_HAVE_KPROBES=y
105CONFIG_HAVE_KRETPROBES=y 107CONFIG_HAVE_KRETPROBES=y
106CONFIG_HAVE_ARCH_TRACEHOOK=y 108CONFIG_HAVE_ARCH_TRACEHOOK=y
107CONFIG_HAVE_CLK=y 109CONFIG_HAVE_CLK=y
110CONFIG_HAVE_DMA_API_DEBUG=y
111# CONFIG_SLOW_WORK is not set
108CONFIG_HAVE_GENERIC_DMA_COHERENT=y 112CONFIG_HAVE_GENERIC_DMA_COHERENT=y
109CONFIG_SLABINFO=y 113CONFIG_SLABINFO=y
110CONFIG_RT_MUTEXES=y 114CONFIG_RT_MUTEXES=y
@@ -117,7 +121,6 @@ CONFIG_MODULE_UNLOAD=y
117# CONFIG_MODULE_SRCVERSION_ALL is not set 121# CONFIG_MODULE_SRCVERSION_ALL is not set
118CONFIG_BLOCK=y 122CONFIG_BLOCK=y
119# CONFIG_LBD is not set 123# CONFIG_LBD is not set
120# CONFIG_BLK_DEV_IO_TRACE is not set
121# CONFIG_BLK_DEV_BSG is not set 124# CONFIG_BLK_DEV_BSG is not set
122# CONFIG_BLK_DEV_INTEGRITY is not set 125# CONFIG_BLK_DEV_INTEGRITY is not set
123 126
@@ -167,6 +170,7 @@ CONFIG_ARCH_SHMOBILE=y
167# CONFIG_CPU_SUBTYPE_SH7760 is not set 170# CONFIG_CPU_SUBTYPE_SH7760 is not set
168# CONFIG_CPU_SUBTYPE_SH4_202 is not set 171# CONFIG_CPU_SUBTYPE_SH4_202 is not set
169# CONFIG_CPU_SUBTYPE_SH7723 is not set 172# CONFIG_CPU_SUBTYPE_SH7723 is not set
173# CONFIG_CPU_SUBTYPE_SH7724 is not set
170# CONFIG_CPU_SUBTYPE_SH7763 is not set 174# CONFIG_CPU_SUBTYPE_SH7763 is not set
171# CONFIG_CPU_SUBTYPE_SH7770 is not set 175# CONFIG_CPU_SUBTYPE_SH7770 is not set
172# CONFIG_CPU_SUBTYPE_SH7780 is not set 176# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -176,8 +180,6 @@ CONFIG_ARCH_SHMOBILE=y
176# CONFIG_CPU_SUBTYPE_SH7343 is not set 180# CONFIG_CPU_SUBTYPE_SH7343 is not set
177CONFIG_CPU_SUBTYPE_SH7722=y 181CONFIG_CPU_SUBTYPE_SH7722=y
178# CONFIG_CPU_SUBTYPE_SH7366 is not set 182# CONFIG_CPU_SUBTYPE_SH7366 is not set
179# CONFIG_CPU_SUBTYPE_SH5_101 is not set
180# CONFIG_CPU_SUBTYPE_SH5_103 is not set
181 183
182# 184#
183# Memory management options 185# Memory management options
@@ -486,6 +488,7 @@ CONFIG_SCSI_WAIT_SCAN=m
486CONFIG_SCSI_LOWLEVEL=y 488CONFIG_SCSI_LOWLEVEL=y
487# CONFIG_ISCSI_TCP is not set 489# CONFIG_ISCSI_TCP is not set
488# CONFIG_LIBFC is not set 490# CONFIG_LIBFC is not set
491# CONFIG_LIBFCOE is not set
489# CONFIG_SCSI_DEBUG is not set 492# CONFIG_SCSI_DEBUG is not set
490# CONFIG_SCSI_DH is not set 493# CONFIG_SCSI_DH is not set
491# CONFIG_SCSI_OSD_INITIATOR is not set 494# CONFIG_SCSI_OSD_INITIATOR is not set
@@ -692,7 +695,6 @@ CONFIG_HID=y
692# 695#
693# Special HID drivers 696# Special HID drivers
694# 697#
695CONFIG_HID_COMPAT=y
696CONFIG_USB_SUPPORT=y 698CONFIG_USB_SUPPORT=y
697CONFIG_USB_ARCH_HAS_HCD=y 699CONFIG_USB_ARCH_HAS_HCD=y
698# CONFIG_USB_ARCH_HAS_OHCI is not set 700# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -766,6 +768,7 @@ CONFIG_EXT2_FS=y
766# CONFIG_EXT2_FS_XATTR is not set 768# CONFIG_EXT2_FS_XATTR is not set
767# CONFIG_EXT2_FS_XIP is not set 769# CONFIG_EXT2_FS_XIP is not set
768CONFIG_EXT3_FS=y 770CONFIG_EXT3_FS=y
771# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
769CONFIG_EXT3_FS_XATTR=y 772CONFIG_EXT3_FS_XATTR=y
770# CONFIG_EXT3_FS_POSIX_ACL is not set 773# CONFIG_EXT3_FS_POSIX_ACL is not set
771# CONFIG_EXT3_FS_SECURITY is not set 774# CONFIG_EXT3_FS_SECURITY is not set
@@ -789,6 +792,11 @@ CONFIG_INOTIFY_USER=y
789# CONFIG_FUSE_FS is not set 792# CONFIG_FUSE_FS is not set
790 793
791# 794#
795# Caches
796#
797# CONFIG_FSCACHE is not set
798
799#
792# CD-ROM/DVD Filesystems 800# CD-ROM/DVD Filesystems
793# 801#
794# CONFIG_ISO9660_FS is not set 802# CONFIG_ISO9660_FS is not set
@@ -832,6 +840,7 @@ CONFIG_MISC_FILESYSTEMS=y
832# CONFIG_ROMFS_FS is not set 840# CONFIG_ROMFS_FS is not set
833# CONFIG_SYSV_FS is not set 841# CONFIG_SYSV_FS is not set
834# CONFIG_UFS_FS is not set 842# CONFIG_UFS_FS is not set
843# CONFIG_NILFS2_FS is not set
835CONFIG_NETWORK_FILESYSTEMS=y 844CONFIG_NETWORK_FILESYSTEMS=y
836# CONFIG_NFS_FS is not set 845# CONFIG_NFS_FS is not set
837# CONFIG_NFSD is not set 846# CONFIG_NFSD is not set
@@ -872,11 +881,25 @@ CONFIG_DEBUG_FS=y
872CONFIG_HAVE_FUNCTION_TRACER=y 881CONFIG_HAVE_FUNCTION_TRACER=y
873CONFIG_HAVE_DYNAMIC_FTRACE=y 882CONFIG_HAVE_DYNAMIC_FTRACE=y
874CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 883CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
884CONFIG_TRACING_SUPPORT=y
875 885
876# 886#
877# Tracers 887# Tracers
878# 888#
889# CONFIG_FUNCTION_TRACER is not set
890# CONFIG_IRQSOFF_TRACER is not set
891# CONFIG_PREEMPT_TRACER is not set
892# CONFIG_SCHED_TRACER is not set
893# CONFIG_CONTEXT_SWITCH_TRACER is not set
894# CONFIG_EVENT_TRACER is not set
895# CONFIG_BOOT_TRACER is not set
896# CONFIG_TRACE_BRANCH_PROFILING is not set
897# CONFIG_STACK_TRACER is not set
898# CONFIG_KMEMTRACE is not set
899# CONFIG_WORKQUEUE_TRACER is not set
900# CONFIG_BLK_DEV_IO_TRACE is not set
879# CONFIG_DYNAMIC_DEBUG is not set 901# CONFIG_DYNAMIC_DEBUG is not set
902# CONFIG_DMA_API_DEBUG is not set
880# CONFIG_SAMPLES is not set 903# CONFIG_SAMPLES is not set
881CONFIG_HAVE_ARCH_KGDB=y 904CONFIG_HAVE_ARCH_KGDB=y
882CONFIG_SH_STANDARD_BIOS=y 905CONFIG_SH_STANDARD_BIOS=y
@@ -977,6 +1000,7 @@ CONFIG_CRYPTO=y
977# 1000#
978# CONFIG_CRYPTO_ANSI_CPRNG is not set 1001# CONFIG_CRYPTO_ANSI_CPRNG is not set
979CONFIG_CRYPTO_HW=y 1002CONFIG_CRYPTO_HW=y
1003# CONFIG_BINARY_PRINTF is not set
980 1004
981# 1005#
982# Library routines 1006# Library routines
diff --git a/arch/sh/configs/se7750_defconfig b/arch/sh/configs/se7750_defconfig
index ceef6d9138ee..ed1a1230f636 100644
--- a/arch/sh/configs/se7750_defconfig
+++ b/arch/sh/configs/se7750_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:57:31 2009 4# Mon Apr 27 13:06:02 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -70,6 +71,7 @@ CONFIG_UID16=y
70# CONFIG_SYSCTL_SYSCALL is not set 71# CONFIG_SYSCTL_SYSCALL is not set
71CONFIG_KALLSYMS=y 72CONFIG_KALLSYMS=y
72# CONFIG_KALLSYMS_EXTRA_PASS is not set 73# CONFIG_KALLSYMS_EXTRA_PASS is not set
74# CONFIG_STRIP_ASM_SYMS is not set
73# CONFIG_HOTPLUG is not set 75# CONFIG_HOTPLUG is not set
74CONFIG_PRINTK=y 76CONFIG_PRINTK=y
75CONFIG_BUG=y 77CONFIG_BUG=y
@@ -88,6 +90,7 @@ CONFIG_SLAB=y
88# CONFIG_SLUB is not set 90# CONFIG_SLUB is not set
89# CONFIG_SLOB is not set 91# CONFIG_SLOB is not set
90# CONFIG_PROFILING is not set 92# CONFIG_PROFILING is not set
93# CONFIG_MARKERS is not set
91CONFIG_HAVE_OPROFILE=y 94CONFIG_HAVE_OPROFILE=y
92# CONFIG_KPROBES is not set 95# CONFIG_KPROBES is not set
93CONFIG_HAVE_IOREMAP_PROT=y 96CONFIG_HAVE_IOREMAP_PROT=y
@@ -95,6 +98,8 @@ CONFIG_HAVE_KPROBES=y
95CONFIG_HAVE_KRETPROBES=y 98CONFIG_HAVE_KRETPROBES=y
96CONFIG_HAVE_ARCH_TRACEHOOK=y 99CONFIG_HAVE_ARCH_TRACEHOOK=y
97CONFIG_HAVE_CLK=y 100CONFIG_HAVE_CLK=y
101CONFIG_HAVE_DMA_API_DEBUG=y
102# CONFIG_SLOW_WORK is not set
98CONFIG_HAVE_GENERIC_DMA_COHERENT=y 103CONFIG_HAVE_GENERIC_DMA_COHERENT=y
99CONFIG_SLABINFO=y 104CONFIG_SLABINFO=y
100CONFIG_RT_MUTEXES=y 105CONFIG_RT_MUTEXES=y
@@ -106,7 +111,6 @@ CONFIG_MODULES=y
106# CONFIG_MODULE_SRCVERSION_ALL is not set 111# CONFIG_MODULE_SRCVERSION_ALL is not set
107CONFIG_BLOCK=y 112CONFIG_BLOCK=y
108# CONFIG_LBD is not set 113# CONFIG_LBD is not set
109# CONFIG_BLK_DEV_IO_TRACE is not set
110# CONFIG_BLK_DEV_BSG is not set 114# CONFIG_BLK_DEV_BSG is not set
111# CONFIG_BLK_DEV_INTEGRITY is not set 115# CONFIG_BLK_DEV_INTEGRITY is not set
112 116
@@ -152,6 +156,7 @@ CONFIG_CPU_SUBTYPE_SH7750=y
152# CONFIG_CPU_SUBTYPE_SH7760 is not set 156# CONFIG_CPU_SUBTYPE_SH7760 is not set
153# CONFIG_CPU_SUBTYPE_SH4_202 is not set 157# CONFIG_CPU_SUBTYPE_SH4_202 is not set
154# CONFIG_CPU_SUBTYPE_SH7723 is not set 158# CONFIG_CPU_SUBTYPE_SH7723 is not set
159# CONFIG_CPU_SUBTYPE_SH7724 is not set
155# CONFIG_CPU_SUBTYPE_SH7763 is not set 160# CONFIG_CPU_SUBTYPE_SH7763 is not set
156# CONFIG_CPU_SUBTYPE_SH7770 is not set 161# CONFIG_CPU_SUBTYPE_SH7770 is not set
157# CONFIG_CPU_SUBTYPE_SH7780 is not set 162# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -161,8 +166,6 @@ CONFIG_CPU_SUBTYPE_SH7750=y
161# CONFIG_CPU_SUBTYPE_SH7343 is not set 166# CONFIG_CPU_SUBTYPE_SH7343 is not set
162# CONFIG_CPU_SUBTYPE_SH7722 is not set 167# CONFIG_CPU_SUBTYPE_SH7722 is not set
163# CONFIG_CPU_SUBTYPE_SH7366 is not set 168# CONFIG_CPU_SUBTYPE_SH7366 is not set
164# CONFIG_CPU_SUBTYPE_SH5_101 is not set
165# CONFIG_CPU_SUBTYPE_SH5_103 is not set
166 169
167# 170#
168# Memory management options 171# Memory management options
@@ -553,6 +556,7 @@ CONFIG_SCSI_WAIT_SCAN=m
553CONFIG_SCSI_LOWLEVEL=y 556CONFIG_SCSI_LOWLEVEL=y
554# CONFIG_ISCSI_TCP is not set 557# CONFIG_ISCSI_TCP is not set
555# CONFIG_LIBFC is not set 558# CONFIG_LIBFC is not set
559# CONFIG_LIBFCOE is not set
556# CONFIG_SCSI_DEBUG is not set 560# CONFIG_SCSI_DEBUG is not set
557# CONFIG_SCSI_DH is not set 561# CONFIG_SCSI_DH is not set
558# CONFIG_SCSI_OSD_INITIATOR is not set 562# CONFIG_SCSI_OSD_INITIATOR is not set
@@ -775,6 +779,11 @@ CONFIG_INOTIFY_USER=y
775# CONFIG_FUSE_FS is not set 779# CONFIG_FUSE_FS is not set
776 780
777# 781#
782# Caches
783#
784# CONFIG_FSCACHE is not set
785
786#
778# CD-ROM/DVD Filesystems 787# CD-ROM/DVD Filesystems
779# 788#
780# CONFIG_ISO9660_FS is not set 789# CONFIG_ISO9660_FS is not set
@@ -829,6 +838,7 @@ CONFIG_JFFS2_RTIME=y
829# CONFIG_ROMFS_FS is not set 838# CONFIG_ROMFS_FS is not set
830# CONFIG_SYSV_FS is not set 839# CONFIG_SYSV_FS is not set
831# CONFIG_UFS_FS is not set 840# CONFIG_UFS_FS is not set
841# CONFIG_NILFS2_FS is not set
832CONFIG_NETWORK_FILESYSTEMS=y 842CONFIG_NETWORK_FILESYSTEMS=y
833CONFIG_NFS_FS=y 843CONFIG_NFS_FS=y
834# CONFIG_NFS_V3 is not set 844# CONFIG_NFS_V3 is not set
@@ -886,10 +896,23 @@ CONFIG_FRAME_WARN=1024
886CONFIG_HAVE_FUNCTION_TRACER=y 896CONFIG_HAVE_FUNCTION_TRACER=y
887CONFIG_HAVE_DYNAMIC_FTRACE=y 897CONFIG_HAVE_DYNAMIC_FTRACE=y
888CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 898CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
899CONFIG_TRACING_SUPPORT=y
889 900
890# 901#
891# Tracers 902# Tracers
892# 903#
904# CONFIG_FUNCTION_TRACER is not set
905# CONFIG_IRQSOFF_TRACER is not set
906# CONFIG_SCHED_TRACER is not set
907# CONFIG_CONTEXT_SWITCH_TRACER is not set
908# CONFIG_EVENT_TRACER is not set
909# CONFIG_BOOT_TRACER is not set
910# CONFIG_TRACE_BRANCH_PROFILING is not set
911# CONFIG_STACK_TRACER is not set
912# CONFIG_KMEMTRACE is not set
913# CONFIG_WORKQUEUE_TRACER is not set
914# CONFIG_BLK_DEV_IO_TRACE is not set
915# CONFIG_DMA_API_DEBUG is not set
893# CONFIG_SAMPLES is not set 916# CONFIG_SAMPLES is not set
894CONFIG_HAVE_ARCH_KGDB=y 917CONFIG_HAVE_ARCH_KGDB=y
895# CONFIG_SH_STANDARD_BIOS is not set 918# CONFIG_SH_STANDARD_BIOS is not set
@@ -989,6 +1012,7 @@ CONFIG_CRYPTO=y
989# 1012#
990# CONFIG_CRYPTO_ANSI_CPRNG is not set 1013# CONFIG_CRYPTO_ANSI_CPRNG is not set
991CONFIG_CRYPTO_HW=y 1014CONFIG_CRYPTO_HW=y
1015# CONFIG_BINARY_PRINTF is not set
992 1016
993# 1017#
994# Library routines 1018# Library routines
diff --git a/arch/sh/configs/se7751_defconfig b/arch/sh/configs/se7751_defconfig
index 67fc26b3a7d0..55f3b788e0cb 100644
--- a/arch/sh/configs/se7751_defconfig
+++ b/arch/sh/configs/se7751_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 18:59:59 2009 4# Mon Apr 27 13:06:44 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -65,7 +66,6 @@ CONFIG_INITRAMFS_SOURCE=""
65CONFIG_RD_GZIP=y 66CONFIG_RD_GZIP=y
66# CONFIG_RD_BZIP2 is not set 67# CONFIG_RD_BZIP2 is not set
67# CONFIG_RD_LZMA is not set 68# CONFIG_RD_LZMA is not set
68CONFIG_INITRAMFS_COMPRESSION_NONE=y
69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
70CONFIG_SYSCTL=y 70CONFIG_SYSCTL=y
71CONFIG_ANON_INODES=y 71CONFIG_ANON_INODES=y
@@ -74,6 +74,7 @@ CONFIG_UID16=y
74# CONFIG_SYSCTL_SYSCALL is not set 74# CONFIG_SYSCTL_SYSCALL is not set
75CONFIG_KALLSYMS=y 75CONFIG_KALLSYMS=y
76# CONFIG_KALLSYMS_EXTRA_PASS is not set 76# CONFIG_KALLSYMS_EXTRA_PASS is not set
77# CONFIG_STRIP_ASM_SYMS is not set
77# CONFIG_HOTPLUG is not set 78# CONFIG_HOTPLUG is not set
78CONFIG_PRINTK=y 79CONFIG_PRINTK=y
79CONFIG_BUG=y 80CONFIG_BUG=y
@@ -92,6 +93,7 @@ CONFIG_SLAB=y
92# CONFIG_SLUB is not set 93# CONFIG_SLUB is not set
93# CONFIG_SLOB is not set 94# CONFIG_SLOB is not set
94# CONFIG_PROFILING is not set 95# CONFIG_PROFILING is not set
96# CONFIG_MARKERS is not set
95CONFIG_HAVE_OPROFILE=y 97CONFIG_HAVE_OPROFILE=y
96# CONFIG_KPROBES is not set 98# CONFIG_KPROBES is not set
97CONFIG_HAVE_IOREMAP_PROT=y 99CONFIG_HAVE_IOREMAP_PROT=y
@@ -99,6 +101,8 @@ CONFIG_HAVE_KPROBES=y
99CONFIG_HAVE_KRETPROBES=y 101CONFIG_HAVE_KRETPROBES=y
100CONFIG_HAVE_ARCH_TRACEHOOK=y 102CONFIG_HAVE_ARCH_TRACEHOOK=y
101CONFIG_HAVE_CLK=y 103CONFIG_HAVE_CLK=y
104CONFIG_HAVE_DMA_API_DEBUG=y
105# CONFIG_SLOW_WORK is not set
102CONFIG_HAVE_GENERIC_DMA_COHERENT=y 106CONFIG_HAVE_GENERIC_DMA_COHERENT=y
103CONFIG_SLABINFO=y 107CONFIG_SLABINFO=y
104CONFIG_RT_MUTEXES=y 108CONFIG_RT_MUTEXES=y
@@ -110,7 +114,6 @@ CONFIG_MODULES=y
110# CONFIG_MODULE_SRCVERSION_ALL is not set 114# CONFIG_MODULE_SRCVERSION_ALL is not set
111CONFIG_BLOCK=y 115CONFIG_BLOCK=y
112# CONFIG_LBD is not set 116# CONFIG_LBD is not set
113# CONFIG_BLK_DEV_IO_TRACE is not set
114# CONFIG_BLK_DEV_BSG is not set 117# CONFIG_BLK_DEV_BSG is not set
115# CONFIG_BLK_DEV_INTEGRITY is not set 118# CONFIG_BLK_DEV_INTEGRITY is not set
116 119
@@ -156,6 +159,7 @@ CONFIG_CPU_SUBTYPE_SH7751=y
156# CONFIG_CPU_SUBTYPE_SH7760 is not set 159# CONFIG_CPU_SUBTYPE_SH7760 is not set
157# CONFIG_CPU_SUBTYPE_SH4_202 is not set 160# CONFIG_CPU_SUBTYPE_SH4_202 is not set
158# CONFIG_CPU_SUBTYPE_SH7723 is not set 161# CONFIG_CPU_SUBTYPE_SH7723 is not set
162# CONFIG_CPU_SUBTYPE_SH7724 is not set
159# CONFIG_CPU_SUBTYPE_SH7763 is not set 163# CONFIG_CPU_SUBTYPE_SH7763 is not set
160# CONFIG_CPU_SUBTYPE_SH7770 is not set 164# CONFIG_CPU_SUBTYPE_SH7770 is not set
161# CONFIG_CPU_SUBTYPE_SH7780 is not set 165# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -165,8 +169,6 @@ CONFIG_CPU_SUBTYPE_SH7751=y
165# CONFIG_CPU_SUBTYPE_SH7343 is not set 169# CONFIG_CPU_SUBTYPE_SH7343 is not set
166# CONFIG_CPU_SUBTYPE_SH7722 is not set 170# CONFIG_CPU_SUBTYPE_SH7722 is not set
167# CONFIG_CPU_SUBTYPE_SH7366 is not set 171# CONFIG_CPU_SUBTYPE_SH7366 is not set
168# CONFIG_CPU_SUBTYPE_SH5_101 is not set
169# CONFIG_CPU_SUBTYPE_SH5_103 is not set
170 172
171# 173#
172# Memory management options 174# Memory management options
@@ -742,6 +744,11 @@ CONFIG_INOTIFY_USER=y
742# CONFIG_FUSE_FS is not set 744# CONFIG_FUSE_FS is not set
743 745
744# 746#
747# Caches
748#
749# CONFIG_FSCACHE is not set
750
751#
745# CD-ROM/DVD Filesystems 752# CD-ROM/DVD Filesystems
746# 753#
747# CONFIG_ISO9660_FS is not set 754# CONFIG_ISO9660_FS is not set
@@ -796,6 +803,7 @@ CONFIG_JFFS2_RTIME=y
796# CONFIG_ROMFS_FS is not set 803# CONFIG_ROMFS_FS is not set
797# CONFIG_SYSV_FS is not set 804# CONFIG_SYSV_FS is not set
798# CONFIG_UFS_FS is not set 805# CONFIG_UFS_FS is not set
806# CONFIG_NILFS2_FS is not set
799CONFIG_NETWORK_FILESYSTEMS=y 807CONFIG_NETWORK_FILESYSTEMS=y
800# CONFIG_NFS_FS is not set 808# CONFIG_NFS_FS is not set
801# CONFIG_NFSD is not set 809# CONFIG_NFSD is not set
@@ -833,10 +841,23 @@ CONFIG_FRAME_WARN=1024
833CONFIG_HAVE_FUNCTION_TRACER=y 841CONFIG_HAVE_FUNCTION_TRACER=y
834CONFIG_HAVE_DYNAMIC_FTRACE=y 842CONFIG_HAVE_DYNAMIC_FTRACE=y
835CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 843CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
844CONFIG_TRACING_SUPPORT=y
836 845
837# 846#
838# Tracers 847# Tracers
839# 848#
849# CONFIG_FUNCTION_TRACER is not set
850# CONFIG_IRQSOFF_TRACER is not set
851# CONFIG_SCHED_TRACER is not set
852# CONFIG_CONTEXT_SWITCH_TRACER is not set
853# CONFIG_EVENT_TRACER is not set
854# CONFIG_BOOT_TRACER is not set
855# CONFIG_TRACE_BRANCH_PROFILING is not set
856# CONFIG_STACK_TRACER is not set
857# CONFIG_KMEMTRACE is not set
858# CONFIG_WORKQUEUE_TRACER is not set
859# CONFIG_BLK_DEV_IO_TRACE is not set
860# CONFIG_DMA_API_DEBUG is not set
840# CONFIG_SAMPLES is not set 861# CONFIG_SAMPLES is not set
841CONFIG_HAVE_ARCH_KGDB=y 862CONFIG_HAVE_ARCH_KGDB=y
842# CONFIG_SH_STANDARD_BIOS is not set 863# CONFIG_SH_STANDARD_BIOS is not set
@@ -936,6 +957,7 @@ CONFIG_CRYPTO=y
936# 957#
937# CONFIG_CRYPTO_ANSI_CPRNG is not set 958# CONFIG_CRYPTO_ANSI_CPRNG is not set
938CONFIG_CRYPTO_HW=y 959CONFIG_CRYPTO_HW=y
960# CONFIG_BINARY_PRINTF is not set
939 961
940# 962#
941# Library routines 963# Library routines
diff --git a/arch/sh/configs/se7780_defconfig b/arch/sh/configs/se7780_defconfig
index ebce23cc2ad8..c4f0af32efa9 100644
--- a/arch/sh/configs/se7780_defconfig
+++ b/arch/sh/configs/se7780_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 19:02:05 2009 4# Mon Apr 27 13:07:14 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -67,6 +68,7 @@ CONFIG_EMBEDDED=y
67CONFIG_UID16=y 68CONFIG_UID16=y
68CONFIG_SYSCTL_SYSCALL=y 69CONFIG_SYSCTL_SYSCALL=y
69# CONFIG_KALLSYMS is not set 70# CONFIG_KALLSYMS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
70# CONFIG_HOTPLUG is not set 72# CONFIG_HOTPLUG is not set
71CONFIG_PRINTK=y 73CONFIG_PRINTK=y
72CONFIG_BUG=y 74CONFIG_BUG=y
@@ -86,12 +88,15 @@ CONFIG_SLAB=y
86# CONFIG_SLUB is not set 88# CONFIG_SLUB is not set
87# CONFIG_SLOB is not set 89# CONFIG_SLOB is not set
88# CONFIG_PROFILING is not set 90# CONFIG_PROFILING is not set
91# CONFIG_MARKERS is not set
89CONFIG_HAVE_OPROFILE=y 92CONFIG_HAVE_OPROFILE=y
90CONFIG_HAVE_IOREMAP_PROT=y 93CONFIG_HAVE_IOREMAP_PROT=y
91CONFIG_HAVE_KPROBES=y 94CONFIG_HAVE_KPROBES=y
92CONFIG_HAVE_KRETPROBES=y 95CONFIG_HAVE_KRETPROBES=y
93CONFIG_HAVE_ARCH_TRACEHOOK=y 96CONFIG_HAVE_ARCH_TRACEHOOK=y
94CONFIG_HAVE_CLK=y 97CONFIG_HAVE_CLK=y
98CONFIG_HAVE_DMA_API_DEBUG=y
99# CONFIG_SLOW_WORK is not set
95CONFIG_HAVE_GENERIC_DMA_COHERENT=y 100CONFIG_HAVE_GENERIC_DMA_COHERENT=y
96CONFIG_SLABINFO=y 101CONFIG_SLABINFO=y
97CONFIG_RT_MUTEXES=y 102CONFIG_RT_MUTEXES=y
@@ -103,7 +108,6 @@ CONFIG_MODULE_UNLOAD=y
103# CONFIG_MODULE_SRCVERSION_ALL is not set 108# CONFIG_MODULE_SRCVERSION_ALL is not set
104CONFIG_BLOCK=y 109CONFIG_BLOCK=y
105# CONFIG_LBD is not set 110# CONFIG_LBD is not set
106# CONFIG_BLK_DEV_IO_TRACE is not set
107# CONFIG_BLK_DEV_INTEGRITY is not set 111# CONFIG_BLK_DEV_INTEGRITY is not set
108 112
109# 113#
@@ -149,6 +153,7 @@ CONFIG_CPU_SH4A=y
149# CONFIG_CPU_SUBTYPE_SH7760 is not set 153# CONFIG_CPU_SUBTYPE_SH7760 is not set
150# CONFIG_CPU_SUBTYPE_SH4_202 is not set 154# CONFIG_CPU_SUBTYPE_SH4_202 is not set
151# CONFIG_CPU_SUBTYPE_SH7723 is not set 155# CONFIG_CPU_SUBTYPE_SH7723 is not set
156# CONFIG_CPU_SUBTYPE_SH7724 is not set
152# CONFIG_CPU_SUBTYPE_SH7763 is not set 157# CONFIG_CPU_SUBTYPE_SH7763 is not set
153# CONFIG_CPU_SUBTYPE_SH7770 is not set 158# CONFIG_CPU_SUBTYPE_SH7770 is not set
154CONFIG_CPU_SUBTYPE_SH7780=y 159CONFIG_CPU_SUBTYPE_SH7780=y
@@ -158,8 +163,6 @@ CONFIG_CPU_SUBTYPE_SH7780=y
158# CONFIG_CPU_SUBTYPE_SH7343 is not set 163# CONFIG_CPU_SUBTYPE_SH7343 is not set
159# CONFIG_CPU_SUBTYPE_SH7722 is not set 164# CONFIG_CPU_SUBTYPE_SH7722 is not set
160# CONFIG_CPU_SUBTYPE_SH7366 is not set 165# CONFIG_CPU_SUBTYPE_SH7366 is not set
161# CONFIG_CPU_SUBTYPE_SH5_101 is not set
162# CONFIG_CPU_SUBTYPE_SH5_103 is not set
163 166
164# 167#
165# Memory management options 168# Memory management options
@@ -285,8 +288,6 @@ CONFIG_CMDLINE="console=ttySC0.115200 root=/dev/sda1"
285# 288#
286CONFIG_PCI=y 289CONFIG_PCI=y
287CONFIG_SH_PCIDMA_NONCOHERENT=y 290CONFIG_SH_PCIDMA_NONCOHERENT=y
288CONFIG_PCI_AUTO=y
289CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
290# CONFIG_PCIEPORTBUS is not set 291# CONFIG_PCIEPORTBUS is not set
291# CONFIG_ARCH_SUPPORTS_MSI is not set 292# CONFIG_ARCH_SUPPORTS_MSI is not set
292CONFIG_PCI_LEGACY=y 293CONFIG_PCI_LEGACY=y
@@ -558,6 +559,7 @@ CONFIG_SCSI_LOWLEVEL=y
558# CONFIG_SCSI_MPT2SAS is not set 559# CONFIG_SCSI_MPT2SAS is not set
559# CONFIG_SCSI_HPTIOP is not set 560# CONFIG_SCSI_HPTIOP is not set
560# CONFIG_LIBFC is not set 561# CONFIG_LIBFC is not set
562# CONFIG_LIBFCOE is not set
561# CONFIG_FCOE is not set 563# CONFIG_FCOE is not set
562# CONFIG_SCSI_DMX3191D is not set 564# CONFIG_SCSI_DMX3191D is not set
563# CONFIG_SCSI_FUTURE_DOMAIN is not set 565# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -957,15 +959,17 @@ CONFIG_USB_HID=y
957# 959#
958# Special HID drivers 960# Special HID drivers
959# 961#
960CONFIG_HID_COMPAT=y
961CONFIG_HID_A4TECH=y 962CONFIG_HID_A4TECH=y
962CONFIG_HID_APPLE=y 963CONFIG_HID_APPLE=y
963CONFIG_HID_BELKIN=y 964CONFIG_HID_BELKIN=y
964CONFIG_HID_CHERRY=y 965CONFIG_HID_CHERRY=y
965CONFIG_HID_CHICONY=y 966CONFIG_HID_CHICONY=y
966CONFIG_HID_CYPRESS=y 967CONFIG_HID_CYPRESS=y
968# CONFIG_DRAGONRISE_FF is not set
967CONFIG_HID_EZKEY=y 969CONFIG_HID_EZKEY=y
970# CONFIG_HID_KYE is not set
968CONFIG_HID_GYRATION=y 971CONFIG_HID_GYRATION=y
972# CONFIG_HID_KENSINGTON is not set
969CONFIG_HID_LOGITECH=y 973CONFIG_HID_LOGITECH=y
970# CONFIG_LOGITECH_FF is not set 974# CONFIG_LOGITECH_FF is not set
971# CONFIG_LOGIRUMBLEPAD2_FF is not set 975# CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -1122,6 +1126,10 @@ CONFIG_INOTIFY_USER=y
1122# CONFIG_FUSE_FS is not set 1126# CONFIG_FUSE_FS is not set
1123 1127
1124# 1128#
1129# Caches
1130#
1131
1132#
1125# CD-ROM/DVD Filesystems 1133# CD-ROM/DVD Filesystems
1126# 1134#
1127# CONFIG_ISO9660_FS is not set 1135# CONFIG_ISO9660_FS is not set
@@ -1245,11 +1253,24 @@ CONFIG_DEBUG_FS=y
1245CONFIG_HAVE_FUNCTION_TRACER=y 1253CONFIG_HAVE_FUNCTION_TRACER=y
1246CONFIG_HAVE_DYNAMIC_FTRACE=y 1254CONFIG_HAVE_DYNAMIC_FTRACE=y
1247CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1255CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1256CONFIG_TRACING_SUPPORT=y
1248 1257
1249# 1258#
1250# Tracers 1259# Tracers
1251# 1260#
1261# CONFIG_FUNCTION_TRACER is not set
1262# CONFIG_IRQSOFF_TRACER is not set
1263# CONFIG_SCHED_TRACER is not set
1264# CONFIG_CONTEXT_SWITCH_TRACER is not set
1265# CONFIG_EVENT_TRACER is not set
1266# CONFIG_BOOT_TRACER is not set
1267# CONFIG_TRACE_BRANCH_PROFILING is not set
1268# CONFIG_STACK_TRACER is not set
1269# CONFIG_KMEMTRACE is not set
1270# CONFIG_WORKQUEUE_TRACER is not set
1271# CONFIG_BLK_DEV_IO_TRACE is not set
1252# CONFIG_DYNAMIC_DEBUG is not set 1272# CONFIG_DYNAMIC_DEBUG is not set
1273# CONFIG_DMA_API_DEBUG is not set
1253# CONFIG_SAMPLES is not set 1274# CONFIG_SAMPLES is not set
1254CONFIG_HAVE_ARCH_KGDB=y 1275CONFIG_HAVE_ARCH_KGDB=y
1255# CONFIG_SH_STANDARD_BIOS is not set 1276# CONFIG_SH_STANDARD_BIOS is not set
@@ -1345,6 +1366,7 @@ CONFIG_CRYPTO=y
1345# CONFIG_CRYPTO_ANSI_CPRNG is not set 1366# CONFIG_CRYPTO_ANSI_CPRNG is not set
1346CONFIG_CRYPTO_HW=y 1367CONFIG_CRYPTO_HW=y
1347# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1368# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1369# CONFIG_BINARY_PRINTF is not set
1348 1370
1349# 1371#
1350# Library routines 1372# Library routines
diff --git a/arch/sh/configs/sh03_defconfig b/arch/sh/configs/sh03_defconfig
index 6fcdb090cf32..f9c6e51dc0b0 100644
--- a/arch/sh/configs/sh03_defconfig
+++ b/arch/sh/configs/sh03_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 19:04:59 2009 4# Mon Apr 27 13:07:56 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -41,6 +42,7 @@ CONFIG_SWAP=y
41CONFIG_SYSVIPC=y 42CONFIG_SYSVIPC=y
42CONFIG_SYSVIPC_SYSCTL=y 43CONFIG_SYSVIPC_SYSCTL=y
43CONFIG_POSIX_MQUEUE=y 44CONFIG_POSIX_MQUEUE=y
45CONFIG_POSIX_MQUEUE_SYSCTL=y
44CONFIG_BSD_PROCESS_ACCT=y 46CONFIG_BSD_PROCESS_ACCT=y
45# CONFIG_BSD_PROCESS_ACCT_V3 is not set 47# CONFIG_BSD_PROCESS_ACCT_V3 is not set
46# CONFIG_TASKSTATS is not set 48# CONFIG_TASKSTATS is not set
@@ -67,7 +69,6 @@ CONFIG_INITRAMFS_SOURCE=""
67CONFIG_RD_GZIP=y 69CONFIG_RD_GZIP=y
68# CONFIG_RD_BZIP2 is not set 70# CONFIG_RD_BZIP2 is not set
69# CONFIG_RD_LZMA is not set 71# CONFIG_RD_LZMA is not set
70CONFIG_INITRAMFS_COMPRESSION_NONE=y
71CONFIG_CC_OPTIMIZE_FOR_SIZE=y 72CONFIG_CC_OPTIMIZE_FOR_SIZE=y
72CONFIG_SYSCTL=y 73CONFIG_SYSCTL=y
73CONFIG_ANON_INODES=y 74CONFIG_ANON_INODES=y
@@ -76,6 +77,7 @@ CONFIG_UID16=y
76# CONFIG_SYSCTL_SYSCALL is not set 77# CONFIG_SYSCTL_SYSCALL is not set
77CONFIG_KALLSYMS=y 78CONFIG_KALLSYMS=y
78# CONFIG_KALLSYMS_EXTRA_PASS is not set 79# CONFIG_KALLSYMS_EXTRA_PASS is not set
80# CONFIG_STRIP_ASM_SYMS is not set
79CONFIG_HOTPLUG=y 81CONFIG_HOTPLUG=y
80CONFIG_PRINTK=y 82CONFIG_PRINTK=y
81CONFIG_BUG=y 83CONFIG_BUG=y
@@ -105,6 +107,8 @@ CONFIG_HAVE_KPROBES=y
105CONFIG_HAVE_KRETPROBES=y 107CONFIG_HAVE_KRETPROBES=y
106CONFIG_HAVE_ARCH_TRACEHOOK=y 108CONFIG_HAVE_ARCH_TRACEHOOK=y
107CONFIG_HAVE_CLK=y 109CONFIG_HAVE_CLK=y
110CONFIG_HAVE_DMA_API_DEBUG=y
111# CONFIG_SLOW_WORK is not set
108CONFIG_HAVE_GENERIC_DMA_COHERENT=y 112CONFIG_HAVE_GENERIC_DMA_COHERENT=y
109CONFIG_SLABINFO=y 113CONFIG_SLABINFO=y
110CONFIG_RT_MUTEXES=y 114CONFIG_RT_MUTEXES=y
@@ -117,7 +121,6 @@ CONFIG_MODVERSIONS=y
117# CONFIG_MODULE_SRCVERSION_ALL is not set 121# CONFIG_MODULE_SRCVERSION_ALL is not set
118CONFIG_BLOCK=y 122CONFIG_BLOCK=y
119# CONFIG_LBD is not set 123# CONFIG_LBD is not set
120# CONFIG_BLK_DEV_IO_TRACE is not set
121# CONFIG_BLK_DEV_BSG is not set 124# CONFIG_BLK_DEV_BSG is not set
122# CONFIG_BLK_DEV_INTEGRITY is not set 125# CONFIG_BLK_DEV_INTEGRITY is not set
123 126
@@ -163,6 +166,7 @@ CONFIG_CPU_SUBTYPE_SH7751=y
163# CONFIG_CPU_SUBTYPE_SH7760 is not set 166# CONFIG_CPU_SUBTYPE_SH7760 is not set
164# CONFIG_CPU_SUBTYPE_SH4_202 is not set 167# CONFIG_CPU_SUBTYPE_SH4_202 is not set
165# CONFIG_CPU_SUBTYPE_SH7723 is not set 168# CONFIG_CPU_SUBTYPE_SH7723 is not set
169# CONFIG_CPU_SUBTYPE_SH7724 is not set
166# CONFIG_CPU_SUBTYPE_SH7763 is not set 170# CONFIG_CPU_SUBTYPE_SH7763 is not set
167# CONFIG_CPU_SUBTYPE_SH7770 is not set 171# CONFIG_CPU_SUBTYPE_SH7770 is not set
168# CONFIG_CPU_SUBTYPE_SH7780 is not set 172# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -172,8 +176,6 @@ CONFIG_CPU_SUBTYPE_SH7751=y
172# CONFIG_CPU_SUBTYPE_SH7343 is not set 176# CONFIG_CPU_SUBTYPE_SH7343 is not set
173# CONFIG_CPU_SUBTYPE_SH7722 is not set 177# CONFIG_CPU_SUBTYPE_SH7722 is not set
174# CONFIG_CPU_SUBTYPE_SH7366 is not set 178# CONFIG_CPU_SUBTYPE_SH7366 is not set
175# CONFIG_CPU_SUBTYPE_SH5_101 is not set
176# CONFIG_CPU_SUBTYPE_SH5_103 is not set
177 179
178# 180#
179# Memory management options 181# Memory management options
@@ -300,8 +302,6 @@ CONFIG_CMDLINE="console=ttySC1,115200 mem=64M root=/dev/nfs"
300# 302#
301CONFIG_PCI=y 303CONFIG_PCI=y
302CONFIG_SH_PCIDMA_NONCOHERENT=y 304CONFIG_SH_PCIDMA_NONCOHERENT=y
303CONFIG_PCI_AUTO=y
304CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
305# CONFIG_PCIEPORTBUS is not set 305# CONFIG_PCIEPORTBUS is not set
306# CONFIG_ARCH_SUPPORTS_MSI is not set 306# CONFIG_ARCH_SUPPORTS_MSI is not set
307CONFIG_PCI_LEGACY=y 307CONFIG_PCI_LEGACY=y
@@ -562,6 +562,7 @@ CONFIG_SCSI_LOWLEVEL=y
562# CONFIG_SCSI_MPT2SAS is not set 562# CONFIG_SCSI_MPT2SAS is not set
563# CONFIG_SCSI_HPTIOP is not set 563# CONFIG_SCSI_HPTIOP is not set
564# CONFIG_LIBFC is not set 564# CONFIG_LIBFC is not set
565# CONFIG_LIBFCOE is not set
565# CONFIG_FCOE is not set 566# CONFIG_FCOE is not set
566# CONFIG_SCSI_DMX3191D is not set 567# CONFIG_SCSI_DMX3191D is not set
567# CONFIG_SCSI_FUTURE_DOMAIN is not set 568# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -656,6 +657,7 @@ CONFIG_NETDEV_1000=y
656# CONFIG_E1000E is not set 657# CONFIG_E1000E is not set
657# CONFIG_IP1000 is not set 658# CONFIG_IP1000 is not set
658# CONFIG_IGB is not set 659# CONFIG_IGB is not set
660# CONFIG_IGBVF is not set
659# CONFIG_NS83820 is not set 661# CONFIG_NS83820 is not set
660# CONFIG_HAMACHI is not set 662# CONFIG_HAMACHI is not set
661# CONFIG_YELLOWFIN is not set 663# CONFIG_YELLOWFIN is not set
@@ -679,6 +681,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
679# CONFIG_IXGBE is not set 681# CONFIG_IXGBE is not set
680# CONFIG_IXGB is not set 682# CONFIG_IXGB is not set
681# CONFIG_S2IO is not set 683# CONFIG_S2IO is not set
684# CONFIG_VXGE is not set
682# CONFIG_MYRI10GE is not set 685# CONFIG_MYRI10GE is not set
683# CONFIG_NETXEN_NIC is not set 686# CONFIG_NETXEN_NIC is not set
684# CONFIG_NIU is not set 687# CONFIG_NIU is not set
@@ -887,7 +890,6 @@ CONFIG_HID=y
887# 890#
888# Special HID drivers 891# Special HID drivers
889# 892#
890CONFIG_HID_COMPAT=y
891CONFIG_USB_SUPPORT=y 893CONFIG_USB_SUPPORT=y
892CONFIG_USB_ARCH_HAS_HCD=y 894CONFIG_USB_ARCH_HAS_HCD=y
893CONFIG_USB_ARCH_HAS_OHCI=y 895CONFIG_USB_ARCH_HAS_OHCI=y
@@ -929,6 +931,7 @@ CONFIG_EXT2_FS_XATTR=y
929# CONFIG_EXT2_FS_SECURITY is not set 931# CONFIG_EXT2_FS_SECURITY is not set
930# CONFIG_EXT2_FS_XIP is not set 932# CONFIG_EXT2_FS_XIP is not set
931CONFIG_EXT3_FS=y 933CONFIG_EXT3_FS=y
934# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
932CONFIG_EXT3_FS_XATTR=y 935CONFIG_EXT3_FS_XATTR=y
933CONFIG_EXT3_FS_POSIX_ACL=y 936CONFIG_EXT3_FS_POSIX_ACL=y
934# CONFIG_EXT3_FS_SECURITY is not set 937# CONFIG_EXT3_FS_SECURITY is not set
@@ -952,6 +955,11 @@ CONFIG_AUTOFS4_FS=y
952# CONFIG_FUSE_FS is not set 955# CONFIG_FUSE_FS is not set
953 956
954# 957#
958# Caches
959#
960# CONFIG_FSCACHE is not set
961
962#
955# CD-ROM/DVD Filesystems 963# CD-ROM/DVD Filesystems
956# 964#
957CONFIG_ISO9660_FS=m 965CONFIG_ISO9660_FS=m
@@ -1001,6 +1009,7 @@ CONFIG_MISC_FILESYSTEMS=y
1001# CONFIG_ROMFS_FS is not set 1009# CONFIG_ROMFS_FS is not set
1002# CONFIG_SYSV_FS is not set 1010# CONFIG_SYSV_FS is not set
1003# CONFIG_UFS_FS is not set 1011# CONFIG_UFS_FS is not set
1012# CONFIG_NILFS2_FS is not set
1004CONFIG_NETWORK_FILESYSTEMS=y 1013CONFIG_NETWORK_FILESYSTEMS=y
1005CONFIG_NFS_FS=y 1014CONFIG_NFS_FS=y
1006CONFIG_NFS_V3=y 1015CONFIG_NFS_V3=y
@@ -1112,11 +1121,26 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1112CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1121CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1113CONFIG_RING_BUFFER=y 1122CONFIG_RING_BUFFER=y
1114CONFIG_TRACING=y 1123CONFIG_TRACING=y
1124CONFIG_TRACING_SUPPORT=y
1115 1125
1116# 1126#
1117# Tracers 1127# Tracers
1118# 1128#
1129# CONFIG_FUNCTION_TRACER is not set
1130# CONFIG_IRQSOFF_TRACER is not set
1131# CONFIG_PREEMPT_TRACER is not set
1132# CONFIG_SCHED_TRACER is not set
1133# CONFIG_CONTEXT_SWITCH_TRACER is not set
1134# CONFIG_EVENT_TRACER is not set
1135# CONFIG_BOOT_TRACER is not set
1136# CONFIG_TRACE_BRANCH_PROFILING is not set
1137# CONFIG_STACK_TRACER is not set
1138# CONFIG_KMEMTRACE is not set
1139# CONFIG_WORKQUEUE_TRACER is not set
1140# CONFIG_BLK_DEV_IO_TRACE is not set
1141# CONFIG_FTRACE_STARTUP_TEST is not set
1119# CONFIG_DYNAMIC_DEBUG is not set 1142# CONFIG_DYNAMIC_DEBUG is not set
1143# CONFIG_DMA_API_DEBUG is not set
1120# CONFIG_SAMPLES is not set 1144# CONFIG_SAMPLES is not set
1121CONFIG_HAVE_ARCH_KGDB=y 1145CONFIG_HAVE_ARCH_KGDB=y
1122CONFIG_SH_STANDARD_BIOS=y 1146CONFIG_SH_STANDARD_BIOS=y
@@ -1228,6 +1252,7 @@ CONFIG_CRYPTO_DEFLATE=y
1228# CONFIG_CRYPTO_ANSI_CPRNG is not set 1252# CONFIG_CRYPTO_ANSI_CPRNG is not set
1229CONFIG_CRYPTO_HW=y 1253CONFIG_CRYPTO_HW=y
1230# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1254# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1255CONFIG_BINARY_PRINTF=y
1231 1256
1232# 1257#
1233# Library routines 1258# Library routines
diff --git a/arch/sh/configs/sh7710voipgw_defconfig b/arch/sh/configs/sh7710voipgw_defconfig
index 1ab37c01da6e..48b58098cf84 100644
--- a/arch/sh/configs/sh7710voipgw_defconfig
+++ b/arch/sh/configs/sh7710voipgw_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 19:09:01 2009 4# Mon Apr 27 13:09:16 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -39,6 +40,7 @@ CONFIG_LOCALVERSION_AUTO=y
39CONFIG_SYSVIPC=y 40CONFIG_SYSVIPC=y
40CONFIG_SYSVIPC_SYSCTL=y 41CONFIG_SYSVIPC_SYSCTL=y
41CONFIG_POSIX_MQUEUE=y 42CONFIG_POSIX_MQUEUE=y
43CONFIG_POSIX_MQUEUE_SYSCTL=y
42# CONFIG_BSD_PROCESS_ACCT is not set 44# CONFIG_BSD_PROCESS_ACCT is not set
43# CONFIG_TASKSTATS is not set 45# CONFIG_TASKSTATS is not set
44# CONFIG_AUDIT is not set 46# CONFIG_AUDIT is not set
@@ -72,6 +74,7 @@ CONFIG_UID16=y
72# CONFIG_SYSCTL_SYSCALL is not set 74# CONFIG_SYSCTL_SYSCALL is not set
73CONFIG_KALLSYMS=y 75CONFIG_KALLSYMS=y
74# CONFIG_KALLSYMS_EXTRA_PASS is not set 76# CONFIG_KALLSYMS_EXTRA_PASS is not set
77# CONFIG_STRIP_ASM_SYMS is not set
75CONFIG_HOTPLUG=y 78CONFIG_HOTPLUG=y
76CONFIG_PRINTK=y 79CONFIG_PRINTK=y
77CONFIG_BUG=y 80CONFIG_BUG=y
@@ -90,6 +93,7 @@ CONFIG_SLAB=y
90# CONFIG_SLUB is not set 93# CONFIG_SLUB is not set
91# CONFIG_SLOB is not set 94# CONFIG_SLOB is not set
92# CONFIG_PROFILING is not set 95# CONFIG_PROFILING is not set
96# CONFIG_MARKERS is not set
93CONFIG_HAVE_OPROFILE=y 97CONFIG_HAVE_OPROFILE=y
94# CONFIG_KPROBES is not set 98# CONFIG_KPROBES is not set
95CONFIG_HAVE_IOREMAP_PROT=y 99CONFIG_HAVE_IOREMAP_PROT=y
@@ -97,6 +101,8 @@ CONFIG_HAVE_KPROBES=y
97CONFIG_HAVE_KRETPROBES=y 101CONFIG_HAVE_KRETPROBES=y
98CONFIG_HAVE_ARCH_TRACEHOOK=y 102CONFIG_HAVE_ARCH_TRACEHOOK=y
99CONFIG_HAVE_CLK=y 103CONFIG_HAVE_CLK=y
104CONFIG_HAVE_DMA_API_DEBUG=y
105# CONFIG_SLOW_WORK is not set
100CONFIG_HAVE_GENERIC_DMA_COHERENT=y 106CONFIG_HAVE_GENERIC_DMA_COHERENT=y
101CONFIG_SLABINFO=y 107CONFIG_SLABINFO=y
102CONFIG_BASE_SMALL=0 108CONFIG_BASE_SMALL=0
@@ -108,7 +114,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
108# CONFIG_MODULE_SRCVERSION_ALL is not set 114# CONFIG_MODULE_SRCVERSION_ALL is not set
109CONFIG_BLOCK=y 115CONFIG_BLOCK=y
110# CONFIG_LBD is not set 116# CONFIG_LBD is not set
111# CONFIG_BLK_DEV_IO_TRACE is not set
112# CONFIG_BLK_DEV_BSG is not set 117# CONFIG_BLK_DEV_BSG is not set
113# CONFIG_BLK_DEV_INTEGRITY is not set 118# CONFIG_BLK_DEV_INTEGRITY is not set
114 119
@@ -154,6 +159,7 @@ CONFIG_CPU_SUBTYPE_SH7710=y
154# CONFIG_CPU_SUBTYPE_SH7760 is not set 159# CONFIG_CPU_SUBTYPE_SH7760 is not set
155# CONFIG_CPU_SUBTYPE_SH4_202 is not set 160# CONFIG_CPU_SUBTYPE_SH4_202 is not set
156# CONFIG_CPU_SUBTYPE_SH7723 is not set 161# CONFIG_CPU_SUBTYPE_SH7723 is not set
162# CONFIG_CPU_SUBTYPE_SH7724 is not set
157# CONFIG_CPU_SUBTYPE_SH7763 is not set 163# CONFIG_CPU_SUBTYPE_SH7763 is not set
158# CONFIG_CPU_SUBTYPE_SH7770 is not set 164# CONFIG_CPU_SUBTYPE_SH7770 is not set
159# CONFIG_CPU_SUBTYPE_SH7780 is not set 165# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -163,8 +169,6 @@ CONFIG_CPU_SUBTYPE_SH7710=y
163# CONFIG_CPU_SUBTYPE_SH7343 is not set 169# CONFIG_CPU_SUBTYPE_SH7343 is not set
164# CONFIG_CPU_SUBTYPE_SH7722 is not set 170# CONFIG_CPU_SUBTYPE_SH7722 is not set
165# CONFIG_CPU_SUBTYPE_SH7366 is not set 171# CONFIG_CPU_SUBTYPE_SH7366 is not set
166# CONFIG_CPU_SUBTYPE_SH5_101 is not set
167# CONFIG_CPU_SUBTYPE_SH5_103 is not set
168 172
169# 173#
170# Memory management options 174# Memory management options
@@ -728,7 +732,6 @@ CONFIG_HID=y
728# 732#
729# Special HID drivers 733# Special HID drivers
730# 734#
731CONFIG_HID_COMPAT=y
732CONFIG_USB_SUPPORT=y 735CONFIG_USB_SUPPORT=y
733CONFIG_USB_ARCH_HAS_HCD=y 736CONFIG_USB_ARCH_HAS_HCD=y
734# CONFIG_USB_ARCH_HAS_OHCI is not set 737# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -780,6 +783,11 @@ CONFIG_FILE_LOCKING=y
780# CONFIG_FUSE_FS is not set 783# CONFIG_FUSE_FS is not set
781 784
782# 785#
786# Caches
787#
788# CONFIG_FSCACHE is not set
789
790#
783# CD-ROM/DVD Filesystems 791# CD-ROM/DVD Filesystems
784# 792#
785# CONFIG_ISO9660_FS is not set 793# CONFIG_ISO9660_FS is not set
@@ -834,6 +842,7 @@ CONFIG_JFFS2_RTIME=y
834# CONFIG_ROMFS_FS is not set 842# CONFIG_ROMFS_FS is not set
835# CONFIG_SYSV_FS is not set 843# CONFIG_SYSV_FS is not set
836# CONFIG_UFS_FS is not set 844# CONFIG_UFS_FS is not set
845# CONFIG_NILFS2_FS is not set
837CONFIG_NETWORK_FILESYSTEMS=y 846CONFIG_NETWORK_FILESYSTEMS=y
838# CONFIG_NFS_FS is not set 847# CONFIG_NFS_FS is not set
839# CONFIG_NFSD is not set 848# CONFIG_NFSD is not set
@@ -871,11 +880,24 @@ CONFIG_DEBUG_FS=y
871CONFIG_HAVE_FUNCTION_TRACER=y 880CONFIG_HAVE_FUNCTION_TRACER=y
872CONFIG_HAVE_DYNAMIC_FTRACE=y 881CONFIG_HAVE_DYNAMIC_FTRACE=y
873CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 882CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
883CONFIG_TRACING_SUPPORT=y
874 884
875# 885#
876# Tracers 886# Tracers
877# 887#
888# CONFIG_FUNCTION_TRACER is not set
889# CONFIG_IRQSOFF_TRACER is not set
890# CONFIG_SCHED_TRACER is not set
891# CONFIG_CONTEXT_SWITCH_TRACER is not set
892# CONFIG_EVENT_TRACER is not set
893# CONFIG_BOOT_TRACER is not set
894# CONFIG_TRACE_BRANCH_PROFILING is not set
895# CONFIG_STACK_TRACER is not set
896# CONFIG_KMEMTRACE is not set
897# CONFIG_WORKQUEUE_TRACER is not set
898# CONFIG_BLK_DEV_IO_TRACE is not set
878# CONFIG_DYNAMIC_DEBUG is not set 899# CONFIG_DYNAMIC_DEBUG is not set
900# CONFIG_DMA_API_DEBUG is not set
879# CONFIG_SAMPLES is not set 901# CONFIG_SAMPLES is not set
880CONFIG_HAVE_ARCH_KGDB=y 902CONFIG_HAVE_ARCH_KGDB=y
881# CONFIG_SH_STANDARD_BIOS is not set 903# CONFIG_SH_STANDARD_BIOS is not set
@@ -975,6 +997,7 @@ CONFIG_CRYPTO=y
975# 997#
976# CONFIG_CRYPTO_ANSI_CPRNG is not set 998# CONFIG_CRYPTO_ANSI_CPRNG is not set
977CONFIG_CRYPTO_HW=y 999CONFIG_CRYPTO_HW=y
1000# CONFIG_BINARY_PRINTF is not set
978 1001
979# 1002#
980# Library routines 1003# Library routines
diff --git a/arch/sh/configs/sh7724_generic_defconfig b/arch/sh/configs/sh7724_generic_defconfig
index 268d04ed8cdd..ec8f18c7684c 100644
--- a/arch/sh/configs/sh7724_generic_defconfig
+++ b/arch/sh/configs/sh7724_generic_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc2 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 16 15:42:20 2009 4# Mon Apr 27 13:09:47 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
diff --git a/arch/sh/configs/sh7763rdp_defconfig b/arch/sh/configs/sh7763rdp_defconfig
index c79bb84ec305..f77bc7998d2f 100644
--- a/arch/sh/configs/sh7763rdp_defconfig
+++ b/arch/sh/configs/sh7763rdp_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 19:10:57 2009 4# Mon Apr 27 13:10:12 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -78,6 +79,7 @@ CONFIG_UID16=y
78# CONFIG_SYSCTL_SYSCALL is not set 79# CONFIG_SYSCTL_SYSCALL is not set
79CONFIG_KALLSYMS=y 80CONFIG_KALLSYMS=y
80# CONFIG_KALLSYMS_EXTRA_PASS is not set 81# CONFIG_KALLSYMS_EXTRA_PASS is not set
82# CONFIG_STRIP_ASM_SYMS is not set
81CONFIG_HOTPLUG=y 83CONFIG_HOTPLUG=y
82CONFIG_PRINTK=y 84CONFIG_PRINTK=y
83CONFIG_BUG=y 85CONFIG_BUG=y
@@ -106,6 +108,8 @@ CONFIG_HAVE_KPROBES=y
106CONFIG_HAVE_KRETPROBES=y 108CONFIG_HAVE_KRETPROBES=y
107CONFIG_HAVE_ARCH_TRACEHOOK=y 109CONFIG_HAVE_ARCH_TRACEHOOK=y
108CONFIG_HAVE_CLK=y 110CONFIG_HAVE_CLK=y
111CONFIG_HAVE_DMA_API_DEBUG=y
112# CONFIG_SLOW_WORK is not set
109CONFIG_HAVE_GENERIC_DMA_COHERENT=y 113CONFIG_HAVE_GENERIC_DMA_COHERENT=y
110CONFIG_SLABINFO=y 114CONFIG_SLABINFO=y
111CONFIG_RT_MUTEXES=y 115CONFIG_RT_MUTEXES=y
@@ -117,7 +121,6 @@ CONFIG_MODULES=y
117# CONFIG_MODULE_SRCVERSION_ALL is not set 121# CONFIG_MODULE_SRCVERSION_ALL is not set
118CONFIG_BLOCK=y 122CONFIG_BLOCK=y
119# CONFIG_LBD is not set 123# CONFIG_LBD is not set
120# CONFIG_BLK_DEV_IO_TRACE is not set
121# CONFIG_BLK_DEV_BSG is not set 124# CONFIG_BLK_DEV_BSG is not set
122# CONFIG_BLK_DEV_INTEGRITY is not set 125# CONFIG_BLK_DEV_INTEGRITY is not set
123 126
@@ -164,6 +167,7 @@ CONFIG_CPU_SH4A=y
164# CONFIG_CPU_SUBTYPE_SH7760 is not set 167# CONFIG_CPU_SUBTYPE_SH7760 is not set
165# CONFIG_CPU_SUBTYPE_SH4_202 is not set 168# CONFIG_CPU_SUBTYPE_SH4_202 is not set
166# CONFIG_CPU_SUBTYPE_SH7723 is not set 169# CONFIG_CPU_SUBTYPE_SH7723 is not set
170# CONFIG_CPU_SUBTYPE_SH7724 is not set
167CONFIG_CPU_SUBTYPE_SH7763=y 171CONFIG_CPU_SUBTYPE_SH7763=y
168# CONFIG_CPU_SUBTYPE_SH7770 is not set 172# CONFIG_CPU_SUBTYPE_SH7770 is not set
169# CONFIG_CPU_SUBTYPE_SH7780 is not set 173# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -173,8 +177,6 @@ CONFIG_CPU_SUBTYPE_SH7763=y
173# CONFIG_CPU_SUBTYPE_SH7343 is not set 177# CONFIG_CPU_SUBTYPE_SH7343 is not set
174# CONFIG_CPU_SUBTYPE_SH7722 is not set 178# CONFIG_CPU_SUBTYPE_SH7722 is not set
175# CONFIG_CPU_SUBTYPE_SH7366 is not set 179# CONFIG_CPU_SUBTYPE_SH7366 is not set
176# CONFIG_CPU_SUBTYPE_SH5_101 is not set
177# CONFIG_CPU_SUBTYPE_SH5_103 is not set
178 180
179# 181#
180# Memory management options 182# Memory management options
@@ -555,6 +557,7 @@ CONFIG_SCSI_WAIT_SCAN=m
555CONFIG_SCSI_LOWLEVEL=y 557CONFIG_SCSI_LOWLEVEL=y
556# CONFIG_ISCSI_TCP is not set 558# CONFIG_ISCSI_TCP is not set
557# CONFIG_LIBFC is not set 559# CONFIG_LIBFC is not set
560# CONFIG_LIBFCOE is not set
558# CONFIG_SCSI_DEBUG is not set 561# CONFIG_SCSI_DEBUG is not set
559# CONFIG_SCSI_DH is not set 562# CONFIG_SCSI_DH is not set
560# CONFIG_SCSI_OSD_INITIATOR is not set 563# CONFIG_SCSI_OSD_INITIATOR is not set
@@ -941,6 +944,7 @@ CONFIG_EXT2_FS=y
941# CONFIG_EXT2_FS_XATTR is not set 944# CONFIG_EXT2_FS_XATTR is not set
942# CONFIG_EXT2_FS_XIP is not set 945# CONFIG_EXT2_FS_XIP is not set
943CONFIG_EXT3_FS=y 946CONFIG_EXT3_FS=y
947# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
944CONFIG_EXT3_FS_XATTR=y 948CONFIG_EXT3_FS_XATTR=y
945# CONFIG_EXT3_FS_POSIX_ACL is not set 949# CONFIG_EXT3_FS_POSIX_ACL is not set
946# CONFIG_EXT3_FS_SECURITY is not set 950# CONFIG_EXT3_FS_SECURITY is not set
@@ -965,6 +969,11 @@ CONFIG_AUTOFS4_FS=y
965CONFIG_GENERIC_ACL=y 969CONFIG_GENERIC_ACL=y
966 970
967# 971#
972# Caches
973#
974# CONFIG_FSCACHE is not set
975
976#
968# CD-ROM/DVD Filesystems 977# CD-ROM/DVD Filesystems
969# 978#
970# CONFIG_ISO9660_FS is not set 979# CONFIG_ISO9660_FS is not set
@@ -1012,6 +1021,7 @@ CONFIG_MISC_FILESYSTEMS=y
1012# CONFIG_ROMFS_FS is not set 1021# CONFIG_ROMFS_FS is not set
1013# CONFIG_SYSV_FS is not set 1022# CONFIG_SYSV_FS is not set
1014# CONFIG_UFS_FS is not set 1023# CONFIG_UFS_FS is not set
1024# CONFIG_NILFS2_FS is not set
1015CONFIG_NETWORK_FILESYSTEMS=y 1025CONFIG_NETWORK_FILESYSTEMS=y
1016CONFIG_NFS_FS=y 1026CONFIG_NFS_FS=y
1017# CONFIG_NFS_V3 is not set 1027# CONFIG_NFS_V3 is not set
@@ -1100,11 +1110,25 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1100CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1110CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1101CONFIG_RING_BUFFER=y 1111CONFIG_RING_BUFFER=y
1102CONFIG_TRACING=y 1112CONFIG_TRACING=y
1113CONFIG_TRACING_SUPPORT=y
1103 1114
1104# 1115#
1105# Tracers 1116# Tracers
1106# 1117#
1118# CONFIG_FUNCTION_TRACER is not set
1119# CONFIG_IRQSOFF_TRACER is not set
1120# CONFIG_SCHED_TRACER is not set
1121# CONFIG_CONTEXT_SWITCH_TRACER is not set
1122# CONFIG_EVENT_TRACER is not set
1123# CONFIG_BOOT_TRACER is not set
1124# CONFIG_TRACE_BRANCH_PROFILING is not set
1125# CONFIG_STACK_TRACER is not set
1126# CONFIG_KMEMTRACE is not set
1127# CONFIG_WORKQUEUE_TRACER is not set
1128# CONFIG_BLK_DEV_IO_TRACE is not set
1129# CONFIG_FTRACE_STARTUP_TEST is not set
1107# CONFIG_DYNAMIC_DEBUG is not set 1130# CONFIG_DYNAMIC_DEBUG is not set
1131# CONFIG_DMA_API_DEBUG is not set
1108# CONFIG_SAMPLES is not set 1132# CONFIG_SAMPLES is not set
1109CONFIG_HAVE_ARCH_KGDB=y 1133CONFIG_HAVE_ARCH_KGDB=y
1110# CONFIG_SH_STANDARD_BIOS is not set 1134# CONFIG_SH_STANDARD_BIOS is not set
@@ -1204,6 +1228,7 @@ CONFIG_CRYPTO=y
1204# 1228#
1205# CONFIG_CRYPTO_ANSI_CPRNG is not set 1229# CONFIG_CRYPTO_ANSI_CPRNG is not set
1206CONFIG_CRYPTO_HW=y 1230CONFIG_CRYPTO_HW=y
1231CONFIG_BINARY_PRINTF=y
1207 1232
1208# 1233#
1209# Library routines 1234# Library routines
diff --git a/arch/sh/configs/sh7785lcr_32bit_defconfig b/arch/sh/configs/sh7785lcr_32bit_defconfig
index a6cf4505741c..1c55b800d124 100644
--- a/arch/sh/configs/sh7785lcr_32bit_defconfig
+++ b/arch/sh/configs/sh7785lcr_32bit_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 19:12:18 2009 4# Mon Apr 27 13:10:53 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -79,6 +80,7 @@ CONFIG_SYSCTL_SYSCALL=y
79CONFIG_KALLSYMS=y 80CONFIG_KALLSYMS=y
80# CONFIG_KALLSYMS_ALL is not set 81# CONFIG_KALLSYMS_ALL is not set
81# CONFIG_KALLSYMS_EXTRA_PASS is not set 82# CONFIG_KALLSYMS_EXTRA_PASS is not set
83# CONFIG_STRIP_ASM_SYMS is not set
82CONFIG_HOTPLUG=y 84CONFIG_HOTPLUG=y
83CONFIG_PRINTK=y 85CONFIG_PRINTK=y
84CONFIG_BUG=y 86CONFIG_BUG=y
@@ -98,6 +100,7 @@ CONFIG_SLAB=y
98# CONFIG_SLUB is not set 100# CONFIG_SLUB is not set
99# CONFIG_SLOB is not set 101# CONFIG_SLOB is not set
100CONFIG_PROFILING=y 102CONFIG_PROFILING=y
103# CONFIG_MARKERS is not set
101# CONFIG_OPROFILE is not set 104# CONFIG_OPROFILE is not set
102CONFIG_HAVE_OPROFILE=y 105CONFIG_HAVE_OPROFILE=y
103# CONFIG_KPROBES is not set 106# CONFIG_KPROBES is not set
@@ -106,6 +109,8 @@ CONFIG_HAVE_KPROBES=y
106CONFIG_HAVE_KRETPROBES=y 109CONFIG_HAVE_KRETPROBES=y
107CONFIG_HAVE_ARCH_TRACEHOOK=y 110CONFIG_HAVE_ARCH_TRACEHOOK=y
108CONFIG_HAVE_CLK=y 111CONFIG_HAVE_CLK=y
112CONFIG_HAVE_DMA_API_DEBUG=y
113# CONFIG_SLOW_WORK is not set
109CONFIG_HAVE_GENERIC_DMA_COHERENT=y 114CONFIG_HAVE_GENERIC_DMA_COHERENT=y
110CONFIG_SLABINFO=y 115CONFIG_SLABINFO=y
111CONFIG_RT_MUTEXES=y 116CONFIG_RT_MUTEXES=y
@@ -118,7 +123,6 @@ CONFIG_MODULE_UNLOAD=y
118# CONFIG_MODULE_SRCVERSION_ALL is not set 123# CONFIG_MODULE_SRCVERSION_ALL is not set
119CONFIG_BLOCK=y 124CONFIG_BLOCK=y
120# CONFIG_LBD is not set 125# CONFIG_LBD is not set
121# CONFIG_BLK_DEV_IO_TRACE is not set
122# CONFIG_BLK_DEV_BSG is not set 126# CONFIG_BLK_DEV_BSG is not set
123# CONFIG_BLK_DEV_INTEGRITY is not set 127# CONFIG_BLK_DEV_INTEGRITY is not set
124 128
@@ -166,6 +170,7 @@ CONFIG_CPU_SHX2=y
166# CONFIG_CPU_SUBTYPE_SH7760 is not set 170# CONFIG_CPU_SUBTYPE_SH7760 is not set
167# CONFIG_CPU_SUBTYPE_SH4_202 is not set 171# CONFIG_CPU_SUBTYPE_SH4_202 is not set
168# CONFIG_CPU_SUBTYPE_SH7723 is not set 172# CONFIG_CPU_SUBTYPE_SH7723 is not set
173# CONFIG_CPU_SUBTYPE_SH7724 is not set
169# CONFIG_CPU_SUBTYPE_SH7763 is not set 174# CONFIG_CPU_SUBTYPE_SH7763 is not set
170# CONFIG_CPU_SUBTYPE_SH7770 is not set 175# CONFIG_CPU_SUBTYPE_SH7770 is not set
171# CONFIG_CPU_SUBTYPE_SH7780 is not set 176# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -175,8 +180,6 @@ CONFIG_CPU_SUBTYPE_SH7785=y
175# CONFIG_CPU_SUBTYPE_SH7343 is not set 180# CONFIG_CPU_SUBTYPE_SH7343 is not set
176# CONFIG_CPU_SUBTYPE_SH7722 is not set 181# CONFIG_CPU_SUBTYPE_SH7722 is not set
177# CONFIG_CPU_SUBTYPE_SH7366 is not set 182# CONFIG_CPU_SUBTYPE_SH7366 is not set
178# CONFIG_CPU_SUBTYPE_SH5_101 is not set
179# CONFIG_CPU_SUBTYPE_SH5_103 is not set
180 183
181# 184#
182# Memory management options 185# Memory management options
@@ -310,8 +313,6 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000
310# 313#
311CONFIG_PCI=y 314CONFIG_PCI=y
312CONFIG_SH_PCIDMA_NONCOHERENT=y 315CONFIG_SH_PCIDMA_NONCOHERENT=y
313CONFIG_PCI_AUTO=y
314CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
315# CONFIG_PCIEPORTBUS is not set 316# CONFIG_PCIEPORTBUS is not set
316# CONFIG_ARCH_SUPPORTS_MSI is not set 317# CONFIG_ARCH_SUPPORTS_MSI is not set
317CONFIG_PCI_LEGACY=y 318CONFIG_PCI_LEGACY=y
@@ -672,6 +673,7 @@ CONFIG_NETDEV_1000=y
672# CONFIG_E1000E is not set 673# CONFIG_E1000E is not set
673# CONFIG_IP1000 is not set 674# CONFIG_IP1000 is not set
674# CONFIG_IGB is not set 675# CONFIG_IGB is not set
676# CONFIG_IGBVF is not set
675# CONFIG_NS83820 is not set 677# CONFIG_NS83820 is not set
676# CONFIG_HAMACHI is not set 678# CONFIG_HAMACHI is not set
677# CONFIG_YELLOWFIN is not set 679# CONFIG_YELLOWFIN is not set
@@ -1009,15 +1011,17 @@ CONFIG_USB_HID=y
1009# 1011#
1010# Special HID drivers 1012# Special HID drivers
1011# 1013#
1012CONFIG_HID_COMPAT=y
1013CONFIG_HID_A4TECH=y 1014CONFIG_HID_A4TECH=y
1014CONFIG_HID_APPLE=y 1015CONFIG_HID_APPLE=y
1015CONFIG_HID_BELKIN=y 1016CONFIG_HID_BELKIN=y
1016CONFIG_HID_CHERRY=y 1017CONFIG_HID_CHERRY=y
1017CONFIG_HID_CHICONY=y 1018CONFIG_HID_CHICONY=y
1018CONFIG_HID_CYPRESS=y 1019CONFIG_HID_CYPRESS=y
1020# CONFIG_DRAGONRISE_FF is not set
1019CONFIG_HID_EZKEY=y 1021CONFIG_HID_EZKEY=y
1022# CONFIG_HID_KYE is not set
1020CONFIG_HID_GYRATION=y 1023CONFIG_HID_GYRATION=y
1024# CONFIG_HID_KENSINGTON is not set
1021CONFIG_HID_LOGITECH=y 1025CONFIG_HID_LOGITECH=y
1022# CONFIG_LOGITECH_FF is not set 1026# CONFIG_LOGITECH_FF is not set
1023# CONFIG_LOGIRUMBLEPAD2_FF is not set 1027# CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -1218,6 +1222,7 @@ CONFIG_EXT2_FS=y
1218# CONFIG_EXT2_FS_XATTR is not set 1222# CONFIG_EXT2_FS_XATTR is not set
1219# CONFIG_EXT2_FS_XIP is not set 1223# CONFIG_EXT2_FS_XIP is not set
1220CONFIG_EXT3_FS=y 1224CONFIG_EXT3_FS=y
1225# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1221CONFIG_EXT3_FS_XATTR=y 1226CONFIG_EXT3_FS_XATTR=y
1222# CONFIG_EXT3_FS_POSIX_ACL is not set 1227# CONFIG_EXT3_FS_POSIX_ACL is not set
1223# CONFIG_EXT3_FS_SECURITY is not set 1228# CONFIG_EXT3_FS_SECURITY is not set
@@ -1240,6 +1245,11 @@ CONFIG_INOTIFY_USER=y
1240# CONFIG_FUSE_FS is not set 1245# CONFIG_FUSE_FS is not set
1241 1246
1242# 1247#
1248# Caches
1249#
1250# CONFIG_FSCACHE is not set
1251
1252#
1243# CD-ROM/DVD Filesystems 1253# CD-ROM/DVD Filesystems
1244# 1254#
1245# CONFIG_ISO9660_FS is not set 1255# CONFIG_ISO9660_FS is not set
@@ -1289,6 +1299,7 @@ CONFIG_MINIX_FS=y
1289# CONFIG_ROMFS_FS is not set 1299# CONFIG_ROMFS_FS is not set
1290# CONFIG_SYSV_FS is not set 1300# CONFIG_SYSV_FS is not set
1291# CONFIG_UFS_FS is not set 1301# CONFIG_UFS_FS is not set
1302# CONFIG_NILFS2_FS is not set
1292CONFIG_NETWORK_FILESYSTEMS=y 1303CONFIG_NETWORK_FILESYSTEMS=y
1293CONFIG_NFS_FS=y 1304CONFIG_NFS_FS=y
1294CONFIG_NFS_V3=y 1305CONFIG_NFS_V3=y
@@ -1377,6 +1388,9 @@ CONFIG_DEBUG_KERNEL=y
1377CONFIG_DETECT_SOFTLOCKUP=y 1388CONFIG_DETECT_SOFTLOCKUP=y
1378# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1389# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1379CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1390CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1391CONFIG_DETECT_HUNG_TASK=y
1392# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1393CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1380CONFIG_SCHED_DEBUG=y 1394CONFIG_SCHED_DEBUG=y
1381# CONFIG_SCHEDSTATS is not set 1395# CONFIG_SCHEDSTATS is not set
1382# CONFIG_TIMER_STATS is not set 1396# CONFIG_TIMER_STATS is not set
@@ -1413,6 +1427,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
1413CONFIG_HAVE_FUNCTION_TRACER=y 1427CONFIG_HAVE_FUNCTION_TRACER=y
1414CONFIG_HAVE_DYNAMIC_FTRACE=y 1428CONFIG_HAVE_DYNAMIC_FTRACE=y
1415CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1429CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1430CONFIG_TRACING_SUPPORT=y
1416 1431
1417# 1432#
1418# Tracers 1433# Tracers
@@ -1422,9 +1437,14 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1422# CONFIG_PREEMPT_TRACER is not set 1437# CONFIG_PREEMPT_TRACER is not set
1423# CONFIG_SCHED_TRACER is not set 1438# CONFIG_SCHED_TRACER is not set
1424# CONFIG_CONTEXT_SWITCH_TRACER is not set 1439# CONFIG_CONTEXT_SWITCH_TRACER is not set
1440# CONFIG_EVENT_TRACER is not set
1425# CONFIG_BOOT_TRACER is not set 1441# CONFIG_BOOT_TRACER is not set
1426# CONFIG_TRACE_BRANCH_PROFILING is not set 1442# CONFIG_TRACE_BRANCH_PROFILING is not set
1427# CONFIG_STACK_TRACER is not set 1443# CONFIG_STACK_TRACER is not set
1444# CONFIG_KMEMTRACE is not set
1445# CONFIG_WORKQUEUE_TRACER is not set
1446# CONFIG_BLK_DEV_IO_TRACE is not set
1447# CONFIG_DMA_API_DEBUG is not set
1428# CONFIG_SAMPLES is not set 1448# CONFIG_SAMPLES is not set
1429CONFIG_HAVE_ARCH_KGDB=y 1449CONFIG_HAVE_ARCH_KGDB=y
1430# CONFIG_KGDB is not set 1450# CONFIG_KGDB is not set
@@ -1542,6 +1562,7 @@ CONFIG_CRYPTO_DES=y
1542# 1562#
1543# CONFIG_CRYPTO_ANSI_CPRNG is not set 1563# CONFIG_CRYPTO_ANSI_CPRNG is not set
1544# CONFIG_CRYPTO_HW is not set 1564# CONFIG_CRYPTO_HW is not set
1565# CONFIG_BINARY_PRINTF is not set
1545 1566
1546# 1567#
1547# Library routines 1568# Library routines
diff --git a/arch/sh/configs/sh7785lcr_defconfig b/arch/sh/configs/sh7785lcr_defconfig
index e4fac2efc055..4385fe97a780 100644
--- a/arch/sh/configs/sh7785lcr_defconfig
+++ b/arch/sh/configs/sh7785lcr_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc2 3# Linux kernel version: 2.6.30-rc3
4# Wed Apr 22 19:17:56 2009 4# Mon Apr 27 13:11:48 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -307,8 +307,6 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000
307# 307#
308CONFIG_PCI=y 308CONFIG_PCI=y
309CONFIG_SH_PCIDMA_NONCOHERENT=y 309CONFIG_SH_PCIDMA_NONCOHERENT=y
310CONFIG_PCI_AUTO=y
311CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
312# CONFIG_PCIEPORTBUS is not set 310# CONFIG_PCIEPORTBUS is not set
313# CONFIG_ARCH_SUPPORTS_MSI is not set 311# CONFIG_ARCH_SUPPORTS_MSI is not set
314CONFIG_PCI_LEGACY=y 312CONFIG_PCI_LEGACY=y
diff --git a/arch/sh/configs/shmin_defconfig b/arch/sh/configs/shmin_defconfig
index d695e9061874..4e120256ec63 100644
--- a/arch/sh/configs/shmin_defconfig
+++ b/arch/sh/configs/shmin_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 19:19:03 2009 4# Mon Apr 27 13:12:41 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_FIND_NEXT_BIT=y 11CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -63,6 +64,7 @@ CONFIG_EMBEDDED=y
63# CONFIG_UID16 is not set 64# CONFIG_UID16 is not set
64# CONFIG_SYSCTL_SYSCALL is not set 65# CONFIG_SYSCTL_SYSCALL is not set
65# CONFIG_KALLSYMS is not set 66# CONFIG_KALLSYMS is not set
67# CONFIG_STRIP_ASM_SYMS is not set
66# CONFIG_HOTPLUG is not set 68# CONFIG_HOTPLUG is not set
67CONFIG_PRINTK=y 69CONFIG_PRINTK=y
68# CONFIG_BUG is not set 70# CONFIG_BUG is not set
@@ -81,12 +83,15 @@ CONFIG_COMPAT_BRK=y
81# CONFIG_SLUB is not set 83# CONFIG_SLUB is not set
82CONFIG_SLOB=y 84CONFIG_SLOB=y
83# CONFIG_PROFILING is not set 85# CONFIG_PROFILING is not set
86# CONFIG_MARKERS is not set
84CONFIG_HAVE_OPROFILE=y 87CONFIG_HAVE_OPROFILE=y
85CONFIG_HAVE_IOREMAP_PROT=y 88CONFIG_HAVE_IOREMAP_PROT=y
86CONFIG_HAVE_KPROBES=y 89CONFIG_HAVE_KPROBES=y
87CONFIG_HAVE_KRETPROBES=y 90CONFIG_HAVE_KRETPROBES=y
88CONFIG_HAVE_ARCH_TRACEHOOK=y 91CONFIG_HAVE_ARCH_TRACEHOOK=y
89CONFIG_HAVE_CLK=y 92CONFIG_HAVE_CLK=y
93CONFIG_HAVE_DMA_API_DEBUG=y
94# CONFIG_SLOW_WORK is not set
90CONFIG_HAVE_GENERIC_DMA_COHERENT=y 95CONFIG_HAVE_GENERIC_DMA_COHERENT=y
91CONFIG_BASE_SMALL=1 96CONFIG_BASE_SMALL=1
92# CONFIG_MODULES is not set 97# CONFIG_MODULES is not set
@@ -137,6 +142,7 @@ CONFIG_CPU_SUBTYPE_SH7706=y
137# CONFIG_CPU_SUBTYPE_SH7760 is not set 142# CONFIG_CPU_SUBTYPE_SH7760 is not set
138# CONFIG_CPU_SUBTYPE_SH4_202 is not set 143# CONFIG_CPU_SUBTYPE_SH4_202 is not set
139# CONFIG_CPU_SUBTYPE_SH7723 is not set 144# CONFIG_CPU_SUBTYPE_SH7723 is not set
145# CONFIG_CPU_SUBTYPE_SH7724 is not set
140# CONFIG_CPU_SUBTYPE_SH7763 is not set 146# CONFIG_CPU_SUBTYPE_SH7763 is not set
141# CONFIG_CPU_SUBTYPE_SH7770 is not set 147# CONFIG_CPU_SUBTYPE_SH7770 is not set
142# CONFIG_CPU_SUBTYPE_SH7780 is not set 148# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -146,8 +152,6 @@ CONFIG_CPU_SUBTYPE_SH7706=y
146# CONFIG_CPU_SUBTYPE_SH7343 is not set 152# CONFIG_CPU_SUBTYPE_SH7343 is not set
147# CONFIG_CPU_SUBTYPE_SH7722 is not set 153# CONFIG_CPU_SUBTYPE_SH7722 is not set
148# CONFIG_CPU_SUBTYPE_SH7366 is not set 154# CONFIG_CPU_SUBTYPE_SH7366 is not set
149# CONFIG_CPU_SUBTYPE_SH5_101 is not set
150# CONFIG_CPU_SUBTYPE_SH5_103 is not set
151 155
152# 156#
153# Memory management options 157# Memory management options
@@ -675,6 +679,11 @@ CONFIG_FILE_LOCKING=y
675# CONFIG_FUSE_FS is not set 679# CONFIG_FUSE_FS is not set
676 680
677# 681#
682# Caches
683#
684# CONFIG_FSCACHE is not set
685
686#
678# CD-ROM/DVD Filesystems 687# CD-ROM/DVD Filesystems
679# 688#
680# CONFIG_ISO9660_FS is not set 689# CONFIG_ISO9660_FS is not set
@@ -718,6 +727,7 @@ CONFIG_CRAMFS=y
718# CONFIG_ROMFS_FS is not set 727# CONFIG_ROMFS_FS is not set
719# CONFIG_SYSV_FS is not set 728# CONFIG_SYSV_FS is not set
720# CONFIG_UFS_FS is not set 729# CONFIG_UFS_FS is not set
730# CONFIG_NILFS2_FS is not set
721CONFIG_NETWORK_FILESYSTEMS=y 731CONFIG_NETWORK_FILESYSTEMS=y
722CONFIG_NFS_FS=y 732CONFIG_NFS_FS=y
723CONFIG_NFS_V3=y 733CONFIG_NFS_V3=y
@@ -762,10 +772,22 @@ CONFIG_FRAME_WARN=1024
762CONFIG_HAVE_FUNCTION_TRACER=y 772CONFIG_HAVE_FUNCTION_TRACER=y
763CONFIG_HAVE_DYNAMIC_FTRACE=y 773CONFIG_HAVE_DYNAMIC_FTRACE=y
764CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 774CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
775CONFIG_TRACING_SUPPORT=y
765 776
766# 777#
767# Tracers 778# Tracers
768# 779#
780# CONFIG_FUNCTION_TRACER is not set
781# CONFIG_IRQSOFF_TRACER is not set
782# CONFIG_SCHED_TRACER is not set
783# CONFIG_CONTEXT_SWITCH_TRACER is not set
784# CONFIG_EVENT_TRACER is not set
785# CONFIG_BOOT_TRACER is not set
786# CONFIG_TRACE_BRANCH_PROFILING is not set
787# CONFIG_STACK_TRACER is not set
788# CONFIG_KMEMTRACE is not set
789# CONFIG_WORKQUEUE_TRACER is not set
790# CONFIG_DMA_API_DEBUG is not set
769# CONFIG_SAMPLES is not set 791# CONFIG_SAMPLES is not set
770CONFIG_HAVE_ARCH_KGDB=y 792CONFIG_HAVE_ARCH_KGDB=y
771CONFIG_SH_STANDARD_BIOS=y 793CONFIG_SH_STANDARD_BIOS=y
@@ -864,6 +886,7 @@ CONFIG_CRYPTO=y
864# 886#
865# CONFIG_CRYPTO_ANSI_CPRNG is not set 887# CONFIG_CRYPTO_ANSI_CPRNG is not set
866CONFIG_CRYPTO_HW=y 888CONFIG_CRYPTO_HW=y
889# CONFIG_BINARY_PRINTF is not set
867 890
868# 891#
869# Library routines 892# Library routines
diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig
index e3651f574399..c088144925fa 100644
--- a/arch/sh/configs/shx3_defconfig
+++ b/arch/sh/configs/shx3_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 19:20:54 2009 4# Mon Apr 27 13:13:12 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -42,6 +43,7 @@ CONFIG_SWAP=y
42CONFIG_SYSVIPC=y 43CONFIG_SYSVIPC=y
43CONFIG_SYSVIPC_SYSCTL=y 44CONFIG_SYSVIPC_SYSCTL=y
44CONFIG_POSIX_MQUEUE=y 45CONFIG_POSIX_MQUEUE=y
46CONFIG_POSIX_MQUEUE_SYSCTL=y
45CONFIG_BSD_PROCESS_ACCT=y 47CONFIG_BSD_PROCESS_ACCT=y
46# CONFIG_BSD_PROCESS_ACCT_V3 is not set 48# CONFIG_BSD_PROCESS_ACCT_V3 is not set
47# CONFIG_TASKSTATS is not set 49# CONFIG_TASKSTATS is not set
@@ -96,6 +98,7 @@ CONFIG_SYSCTL_SYSCALL=y
96CONFIG_KALLSYMS=y 98CONFIG_KALLSYMS=y
97CONFIG_KALLSYMS_ALL=y 99CONFIG_KALLSYMS_ALL=y
98# CONFIG_KALLSYMS_EXTRA_PASS is not set 100# CONFIG_KALLSYMS_EXTRA_PASS is not set
101# CONFIG_STRIP_ASM_SYMS is not set
99CONFIG_HOTPLUG=y 102CONFIG_HOTPLUG=y
100CONFIG_PRINTK=y 103CONFIG_PRINTK=y
101CONFIG_BUG=y 104CONFIG_BUG=y
@@ -126,6 +129,8 @@ CONFIG_HAVE_KRETPROBES=y
126CONFIG_HAVE_ARCH_TRACEHOOK=y 129CONFIG_HAVE_ARCH_TRACEHOOK=y
127CONFIG_USE_GENERIC_SMP_HELPERS=y 130CONFIG_USE_GENERIC_SMP_HELPERS=y
128CONFIG_HAVE_CLK=y 131CONFIG_HAVE_CLK=y
132CONFIG_HAVE_DMA_API_DEBUG=y
133# CONFIG_SLOW_WORK is not set
129CONFIG_HAVE_GENERIC_DMA_COHERENT=y 134CONFIG_HAVE_GENERIC_DMA_COHERENT=y
130CONFIG_RT_MUTEXES=y 135CONFIG_RT_MUTEXES=y
131CONFIG_BASE_SMALL=0 136CONFIG_BASE_SMALL=0
@@ -138,7 +143,6 @@ CONFIG_MODULE_UNLOAD=y
138CONFIG_STOP_MACHINE=y 143CONFIG_STOP_MACHINE=y
139CONFIG_BLOCK=y 144CONFIG_BLOCK=y
140# CONFIG_LBD is not set 145# CONFIG_LBD is not set
141# CONFIG_BLK_DEV_IO_TRACE is not set
142# CONFIG_BLK_DEV_BSG is not set 146# CONFIG_BLK_DEV_BSG is not set
143# CONFIG_BLK_DEV_INTEGRITY is not set 147# CONFIG_BLK_DEV_INTEGRITY is not set
144 148
@@ -186,6 +190,7 @@ CONFIG_CPU_SHX3=y
186# CONFIG_CPU_SUBTYPE_SH7760 is not set 190# CONFIG_CPU_SUBTYPE_SH7760 is not set
187# CONFIG_CPU_SUBTYPE_SH4_202 is not set 191# CONFIG_CPU_SUBTYPE_SH4_202 is not set
188# CONFIG_CPU_SUBTYPE_SH7723 is not set 192# CONFIG_CPU_SUBTYPE_SH7723 is not set
193# CONFIG_CPU_SUBTYPE_SH7724 is not set
189# CONFIG_CPU_SUBTYPE_SH7763 is not set 194# CONFIG_CPU_SUBTYPE_SH7763 is not set
190# CONFIG_CPU_SUBTYPE_SH7770 is not set 195# CONFIG_CPU_SUBTYPE_SH7770 is not set
191# CONFIG_CPU_SUBTYPE_SH7780 is not set 196# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -195,8 +200,6 @@ CONFIG_CPU_SUBTYPE_SHX3=y
195# CONFIG_CPU_SUBTYPE_SH7343 is not set 200# CONFIG_CPU_SUBTYPE_SH7343 is not set
196# CONFIG_CPU_SUBTYPE_SH7722 is not set 201# CONFIG_CPU_SUBTYPE_SH7722 is not set
197# CONFIG_CPU_SUBTYPE_SH7366 is not set 202# CONFIG_CPU_SUBTYPE_SH7366 is not set
198# CONFIG_CPU_SUBTYPE_SH5_101 is not set
199# CONFIG_CPU_SUBTYPE_SH5_103 is not set
200 203
201# 204#
202# Memory management options 205# Memory management options
@@ -553,6 +556,7 @@ CONFIG_SCSI_WAIT_SCAN=m
553CONFIG_SCSI_LOWLEVEL=y 556CONFIG_SCSI_LOWLEVEL=y
554# CONFIG_ISCSI_TCP is not set 557# CONFIG_ISCSI_TCP is not set
555# CONFIG_LIBFC is not set 558# CONFIG_LIBFC is not set
559# CONFIG_LIBFCOE is not set
556# CONFIG_SCSI_DEBUG is not set 560# CONFIG_SCSI_DEBUG is not set
557# CONFIG_SCSI_DH is not set 561# CONFIG_SCSI_DH is not set
558# CONFIG_SCSI_OSD_INITIATOR is not set 562# CONFIG_SCSI_OSD_INITIATOR is not set
@@ -646,6 +650,7 @@ CONFIG_DEVKMEM=y
646# 650#
647# Non-8250 serial port support 651# Non-8250 serial port support
648# 652#
653# CONFIG_SERIAL_MAX3100 is not set
649CONFIG_SERIAL_SH_SCI=y 654CONFIG_SERIAL_SH_SCI=y
650CONFIG_SERIAL_SH_SCI_NR_UARTS=2 655CONFIG_SERIAL_SH_SCI_NR_UARTS=2
651CONFIG_SERIAL_SH_SCI_CONSOLE=y 656CONFIG_SERIAL_SH_SCI_CONSOLE=y
@@ -985,6 +990,7 @@ CONFIG_EXT2_FS=y
985# CONFIG_EXT2_FS_XATTR is not set 990# CONFIG_EXT2_FS_XATTR is not set
986# CONFIG_EXT2_FS_XIP is not set 991# CONFIG_EXT2_FS_XIP is not set
987CONFIG_EXT3_FS=y 992CONFIG_EXT3_FS=y
993# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
988CONFIG_EXT3_FS_XATTR=y 994CONFIG_EXT3_FS_XATTR=y
989# CONFIG_EXT3_FS_POSIX_ACL is not set 995# CONFIG_EXT3_FS_POSIX_ACL is not set
990# CONFIG_EXT3_FS_SECURITY is not set 996# CONFIG_EXT3_FS_SECURITY is not set
@@ -1008,6 +1014,11 @@ CONFIG_INOTIFY_USER=y
1008# CONFIG_FUSE_FS is not set 1014# CONFIG_FUSE_FS is not set
1009 1015
1010# 1016#
1017# Caches
1018#
1019# CONFIG_FSCACHE is not set
1020
1021#
1011# CD-ROM/DVD Filesystems 1022# CD-ROM/DVD Filesystems
1012# 1023#
1013# CONFIG_ISO9660_FS is not set 1024# CONFIG_ISO9660_FS is not set
@@ -1051,6 +1062,7 @@ CONFIG_MISC_FILESYSTEMS=y
1051# CONFIG_ROMFS_FS is not set 1062# CONFIG_ROMFS_FS is not set
1052# CONFIG_SYSV_FS is not set 1063# CONFIG_SYSV_FS is not set
1053# CONFIG_UFS_FS is not set 1064# CONFIG_UFS_FS is not set
1065# CONFIG_NILFS2_FS is not set
1054CONFIG_NETWORK_FILESYSTEMS=y 1066CONFIG_NETWORK_FILESYSTEMS=y
1055# CONFIG_NFS_FS is not set 1067# CONFIG_NFS_FS is not set
1056# CONFIG_NFSD is not set 1068# CONFIG_NFSD is not set
@@ -1085,6 +1097,9 @@ CONFIG_DEBUG_SHIRQ=y
1085CONFIG_DETECT_SOFTLOCKUP=y 1097CONFIG_DETECT_SOFTLOCKUP=y
1086# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1098# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1087CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1099CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1100CONFIG_DETECT_HUNG_TASK=y
1101# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1102CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1088CONFIG_SCHED_DEBUG=y 1103CONFIG_SCHED_DEBUG=y
1089# CONFIG_SCHEDSTATS is not set 1104# CONFIG_SCHEDSTATS is not set
1090# CONFIG_TIMER_STATS is not set 1105# CONFIG_TIMER_STATS is not set
@@ -1124,6 +1139,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1124CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1139CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1125CONFIG_RING_BUFFER=y 1140CONFIG_RING_BUFFER=y
1126CONFIG_TRACING=y 1141CONFIG_TRACING=y
1142CONFIG_TRACING_SUPPORT=y
1127 1143
1128# 1144#
1129# Tracers 1145# Tracers
@@ -1133,11 +1149,16 @@ CONFIG_TRACING=y
1133# CONFIG_PREEMPT_TRACER is not set 1149# CONFIG_PREEMPT_TRACER is not set
1134# CONFIG_SCHED_TRACER is not set 1150# CONFIG_SCHED_TRACER is not set
1135# CONFIG_CONTEXT_SWITCH_TRACER is not set 1151# CONFIG_CONTEXT_SWITCH_TRACER is not set
1152# CONFIG_EVENT_TRACER is not set
1136# CONFIG_BOOT_TRACER is not set 1153# CONFIG_BOOT_TRACER is not set
1137# CONFIG_TRACE_BRANCH_PROFILING is not set 1154# CONFIG_TRACE_BRANCH_PROFILING is not set
1138# CONFIG_STACK_TRACER is not set 1155# CONFIG_STACK_TRACER is not set
1156# CONFIG_KMEMTRACE is not set
1157# CONFIG_WORKQUEUE_TRACER is not set
1158# CONFIG_BLK_DEV_IO_TRACE is not set
1139# CONFIG_FTRACE_STARTUP_TEST is not set 1159# CONFIG_FTRACE_STARTUP_TEST is not set
1140# CONFIG_DYNAMIC_DEBUG is not set 1160# CONFIG_DYNAMIC_DEBUG is not set
1161# CONFIG_DMA_API_DEBUG is not set
1141# CONFIG_SAMPLES is not set 1162# CONFIG_SAMPLES is not set
1142CONFIG_HAVE_ARCH_KGDB=y 1163CONFIG_HAVE_ARCH_KGDB=y
1143# CONFIG_KGDB is not set 1164# CONFIG_KGDB is not set
@@ -1245,6 +1266,7 @@ CONFIG_CRYPTO=y
1245# 1266#
1246# CONFIG_CRYPTO_ANSI_CPRNG is not set 1267# CONFIG_CRYPTO_ANSI_CPRNG is not set
1247CONFIG_CRYPTO_HW=y 1268CONFIG_CRYPTO_HW=y
1269CONFIG_BINARY_PRINTF=y
1248 1270
1249# 1271#
1250# Library routines 1272# Library routines
diff --git a/arch/sh/configs/snapgear_defconfig b/arch/sh/configs/snapgear_defconfig
index 6960f60bf52e..54a7a3c41f34 100644
--- a/arch/sh/configs/snapgear_defconfig
+++ b/arch/sh/configs/snapgear_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 19:21:39 2009 4# Mon Apr 27 13:14:00 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -64,7 +65,6 @@ CONFIG_INITRAMFS_SOURCE=""
64CONFIG_RD_GZIP=y 65CONFIG_RD_GZIP=y
65# CONFIG_RD_BZIP2 is not set 66# CONFIG_RD_BZIP2 is not set
66# CONFIG_RD_LZMA is not set 67# CONFIG_RD_LZMA is not set
67CONFIG_INITRAMFS_COMPRESSION_NONE=y
68CONFIG_CC_OPTIMIZE_FOR_SIZE=y 68CONFIG_CC_OPTIMIZE_FOR_SIZE=y
69CONFIG_SYSCTL=y 69CONFIG_SYSCTL=y
70CONFIG_ANON_INODES=y 70CONFIG_ANON_INODES=y
@@ -73,6 +73,7 @@ CONFIG_UID16=y
73# CONFIG_SYSCTL_SYSCALL is not set 73# CONFIG_SYSCTL_SYSCALL is not set
74CONFIG_KALLSYMS=y 74CONFIG_KALLSYMS=y
75# CONFIG_KALLSYMS_EXTRA_PASS is not set 75# CONFIG_KALLSYMS_EXTRA_PASS is not set
76# CONFIG_STRIP_ASM_SYMS is not set
76# CONFIG_HOTPLUG is not set 77# CONFIG_HOTPLUG is not set
77CONFIG_PRINTK=y 78CONFIG_PRINTK=y
78CONFIG_BUG=y 79CONFIG_BUG=y
@@ -92,12 +93,15 @@ CONFIG_SLAB=y
92# CONFIG_SLUB is not set 93# CONFIG_SLUB is not set
93# CONFIG_SLOB is not set 94# CONFIG_SLOB is not set
94# CONFIG_PROFILING is not set 95# CONFIG_PROFILING is not set
96# CONFIG_MARKERS is not set
95CONFIG_HAVE_OPROFILE=y 97CONFIG_HAVE_OPROFILE=y
96CONFIG_HAVE_IOREMAP_PROT=y 98CONFIG_HAVE_IOREMAP_PROT=y
97CONFIG_HAVE_KPROBES=y 99CONFIG_HAVE_KPROBES=y
98CONFIG_HAVE_KRETPROBES=y 100CONFIG_HAVE_KRETPROBES=y
99CONFIG_HAVE_ARCH_TRACEHOOK=y 101CONFIG_HAVE_ARCH_TRACEHOOK=y
100CONFIG_HAVE_CLK=y 102CONFIG_HAVE_CLK=y
103CONFIG_HAVE_DMA_API_DEBUG=y
104# CONFIG_SLOW_WORK is not set
101CONFIG_HAVE_GENERIC_DMA_COHERENT=y 105CONFIG_HAVE_GENERIC_DMA_COHERENT=y
102CONFIG_SLABINFO=y 106CONFIG_SLABINFO=y
103CONFIG_RT_MUTEXES=y 107CONFIG_RT_MUTEXES=y
@@ -105,7 +109,6 @@ CONFIG_BASE_SMALL=0
105# CONFIG_MODULES is not set 109# CONFIG_MODULES is not set
106CONFIG_BLOCK=y 110CONFIG_BLOCK=y
107# CONFIG_LBD is not set 111# CONFIG_LBD is not set
108# CONFIG_BLK_DEV_IO_TRACE is not set
109# CONFIG_BLK_DEV_BSG is not set 112# CONFIG_BLK_DEV_BSG is not set
110# CONFIG_BLK_DEV_INTEGRITY is not set 113# CONFIG_BLK_DEV_INTEGRITY is not set
111 114
@@ -151,6 +154,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
151# CONFIG_CPU_SUBTYPE_SH7760 is not set 154# CONFIG_CPU_SUBTYPE_SH7760 is not set
152# CONFIG_CPU_SUBTYPE_SH4_202 is not set 155# CONFIG_CPU_SUBTYPE_SH4_202 is not set
153# CONFIG_CPU_SUBTYPE_SH7723 is not set 156# CONFIG_CPU_SUBTYPE_SH7723 is not set
157# CONFIG_CPU_SUBTYPE_SH7724 is not set
154# CONFIG_CPU_SUBTYPE_SH7763 is not set 158# CONFIG_CPU_SUBTYPE_SH7763 is not set
155# CONFIG_CPU_SUBTYPE_SH7770 is not set 159# CONFIG_CPU_SUBTYPE_SH7770 is not set
156# CONFIG_CPU_SUBTYPE_SH7780 is not set 160# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -160,8 +164,6 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
160# CONFIG_CPU_SUBTYPE_SH7343 is not set 164# CONFIG_CPU_SUBTYPE_SH7343 is not set
161# CONFIG_CPU_SUBTYPE_SH7722 is not set 165# CONFIG_CPU_SUBTYPE_SH7722 is not set
162# CONFIG_CPU_SUBTYPE_SH7366 is not set 166# CONFIG_CPU_SUBTYPE_SH7366 is not set
163# CONFIG_CPU_SUBTYPE_SH5_101 is not set
164# CONFIG_CPU_SUBTYPE_SH5_103 is not set
165 167
166# 168#
167# Memory management options 169# Memory management options
@@ -295,8 +297,6 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000
295# 297#
296CONFIG_PCI=y 298CONFIG_PCI=y
297CONFIG_SH_PCIDMA_NONCOHERENT=y 299CONFIG_SH_PCIDMA_NONCOHERENT=y
298CONFIG_PCI_AUTO=y
299CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
300# CONFIG_PCIEPORTBUS is not set 300# CONFIG_PCIEPORTBUS is not set
301# CONFIG_ARCH_SUPPORTS_MSI is not set 301# CONFIG_ARCH_SUPPORTS_MSI is not set
302CONFIG_PCI_LEGACY=y 302CONFIG_PCI_LEGACY=y
@@ -763,6 +763,11 @@ CONFIG_FILE_LOCKING=y
763# CONFIG_FUSE_FS is not set 763# CONFIG_FUSE_FS is not set
764 764
765# 765#
766# Caches
767#
768# CONFIG_FSCACHE is not set
769
770#
766# CD-ROM/DVD Filesystems 771# CD-ROM/DVD Filesystems
767# 772#
768# CONFIG_ISO9660_FS is not set 773# CONFIG_ISO9660_FS is not set
@@ -805,8 +810,13 @@ CONFIG_CRAMFS=y
805# CONFIG_HPFS_FS is not set 810# CONFIG_HPFS_FS is not set
806# CONFIG_QNX4FS_FS is not set 811# CONFIG_QNX4FS_FS is not set
807CONFIG_ROMFS_FS=y 812CONFIG_ROMFS_FS=y
813CONFIG_ROMFS_BACKED_BY_BLOCK=y
814# CONFIG_ROMFS_BACKED_BY_MTD is not set
815# CONFIG_ROMFS_BACKED_BY_BOTH is not set
816CONFIG_ROMFS_ON_BLOCK=y
808# CONFIG_SYSV_FS is not set 817# CONFIG_SYSV_FS is not set
809# CONFIG_UFS_FS is not set 818# CONFIG_UFS_FS is not set
819# CONFIG_NILFS2_FS is not set
810CONFIG_NETWORK_FILESYSTEMS=y 820CONFIG_NETWORK_FILESYSTEMS=y
811# CONFIG_NFS_FS is not set 821# CONFIG_NFS_FS is not set
812# CONFIG_NFSD is not set 822# CONFIG_NFSD is not set
@@ -844,10 +854,23 @@ CONFIG_FRAME_WARN=1024
844CONFIG_HAVE_FUNCTION_TRACER=y 854CONFIG_HAVE_FUNCTION_TRACER=y
845CONFIG_HAVE_DYNAMIC_FTRACE=y 855CONFIG_HAVE_DYNAMIC_FTRACE=y
846CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 856CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
857CONFIG_TRACING_SUPPORT=y
847 858
848# 859#
849# Tracers 860# Tracers
850# 861#
862# CONFIG_FUNCTION_TRACER is not set
863# CONFIG_IRQSOFF_TRACER is not set
864# CONFIG_SCHED_TRACER is not set
865# CONFIG_CONTEXT_SWITCH_TRACER is not set
866# CONFIG_EVENT_TRACER is not set
867# CONFIG_BOOT_TRACER is not set
868# CONFIG_TRACE_BRANCH_PROFILING is not set
869# CONFIG_STACK_TRACER is not set
870# CONFIG_KMEMTRACE is not set
871# CONFIG_WORKQUEUE_TRACER is not set
872# CONFIG_BLK_DEV_IO_TRACE is not set
873# CONFIG_DMA_API_DEBUG is not set
851# CONFIG_SAMPLES is not set 874# CONFIG_SAMPLES is not set
852CONFIG_HAVE_ARCH_KGDB=y 875CONFIG_HAVE_ARCH_KGDB=y
853# CONFIG_SH_STANDARD_BIOS is not set 876# CONFIG_SH_STANDARD_BIOS is not set
@@ -862,6 +885,7 @@ CONFIG_HAVE_ARCH_KGDB=y
862# CONFIG_SECURITYFS is not set 885# CONFIG_SECURITYFS is not set
863# CONFIG_SECURITY_FILE_CAPABILITIES is not set 886# CONFIG_SECURITY_FILE_CAPABILITIES is not set
864# CONFIG_CRYPTO is not set 887# CONFIG_CRYPTO is not set
888# CONFIG_BINARY_PRINTF is not set
865 889
866# 890#
867# Library routines 891# Library routines
diff --git a/arch/sh/configs/systemh_defconfig b/arch/sh/configs/systemh_defconfig
index 7ea639bc5936..dbe7e546f0bb 100644
--- a/arch/sh/configs/systemh_defconfig
+++ b/arch/sh/configs/systemh_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 19:23:31 2009 4# Mon Apr 27 13:14:33 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -61,7 +62,6 @@ CONFIG_INITRAMFS_SOURCE=""
61CONFIG_RD_GZIP=y 62CONFIG_RD_GZIP=y
62# CONFIG_RD_BZIP2 is not set 63# CONFIG_RD_BZIP2 is not set
63# CONFIG_RD_LZMA is not set 64# CONFIG_RD_LZMA is not set
64CONFIG_INITRAMFS_COMPRESSION_NONE=y
65# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 65# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
66CONFIG_SYSCTL=y 66CONFIG_SYSCTL=y
67CONFIG_ANON_INODES=y 67CONFIG_ANON_INODES=y
@@ -70,6 +70,7 @@ CONFIG_UID16=y
70# CONFIG_SYSCTL_SYSCALL is not set 70# CONFIG_SYSCTL_SYSCALL is not set
71CONFIG_KALLSYMS=y 71CONFIG_KALLSYMS=y
72# CONFIG_KALLSYMS_EXTRA_PASS is not set 72# CONFIG_KALLSYMS_EXTRA_PASS is not set
73# CONFIG_STRIP_ASM_SYMS is not set
73# CONFIG_HOTPLUG is not set 74# CONFIG_HOTPLUG is not set
74CONFIG_PRINTK=y 75CONFIG_PRINTK=y
75CONFIG_BUG=y 76CONFIG_BUG=y
@@ -88,6 +89,7 @@ CONFIG_SLAB=y
88# CONFIG_SLUB is not set 89# CONFIG_SLUB is not set
89# CONFIG_SLOB is not set 90# CONFIG_SLOB is not set
90# CONFIG_PROFILING is not set 91# CONFIG_PROFILING is not set
92# CONFIG_MARKERS is not set
91CONFIG_HAVE_OPROFILE=y 93CONFIG_HAVE_OPROFILE=y
92# CONFIG_KPROBES is not set 94# CONFIG_KPROBES is not set
93CONFIG_HAVE_IOREMAP_PROT=y 95CONFIG_HAVE_IOREMAP_PROT=y
@@ -95,6 +97,8 @@ CONFIG_HAVE_KPROBES=y
95CONFIG_HAVE_KRETPROBES=y 97CONFIG_HAVE_KRETPROBES=y
96CONFIG_HAVE_ARCH_TRACEHOOK=y 98CONFIG_HAVE_ARCH_TRACEHOOK=y
97CONFIG_HAVE_CLK=y 99CONFIG_HAVE_CLK=y
100CONFIG_HAVE_DMA_API_DEBUG=y
101# CONFIG_SLOW_WORK is not set
98CONFIG_HAVE_GENERIC_DMA_COHERENT=y 102CONFIG_HAVE_GENERIC_DMA_COHERENT=y
99CONFIG_SLABINFO=y 103CONFIG_SLABINFO=y
100CONFIG_RT_MUTEXES=y 104CONFIG_RT_MUTEXES=y
@@ -107,7 +111,6 @@ CONFIG_MODULE_UNLOAD=y
107# CONFIG_MODULE_SRCVERSION_ALL is not set 111# CONFIG_MODULE_SRCVERSION_ALL is not set
108CONFIG_BLOCK=y 112CONFIG_BLOCK=y
109# CONFIG_LBD is not set 113# CONFIG_LBD is not set
110# CONFIG_BLK_DEV_IO_TRACE is not set
111# CONFIG_BLK_DEV_BSG is not set 114# CONFIG_BLK_DEV_BSG is not set
112# CONFIG_BLK_DEV_INTEGRITY is not set 115# CONFIG_BLK_DEV_INTEGRITY is not set
113 116
@@ -153,6 +156,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
153# CONFIG_CPU_SUBTYPE_SH7760 is not set 156# CONFIG_CPU_SUBTYPE_SH7760 is not set
154# CONFIG_CPU_SUBTYPE_SH4_202 is not set 157# CONFIG_CPU_SUBTYPE_SH4_202 is not set
155# CONFIG_CPU_SUBTYPE_SH7723 is not set 158# CONFIG_CPU_SUBTYPE_SH7723 is not set
159# CONFIG_CPU_SUBTYPE_SH7724 is not set
156# CONFIG_CPU_SUBTYPE_SH7763 is not set 160# CONFIG_CPU_SUBTYPE_SH7763 is not set
157# CONFIG_CPU_SUBTYPE_SH7770 is not set 161# CONFIG_CPU_SUBTYPE_SH7770 is not set
158# CONFIG_CPU_SUBTYPE_SH7780 is not set 162# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -162,8 +166,6 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
162# CONFIG_CPU_SUBTYPE_SH7343 is not set 166# CONFIG_CPU_SUBTYPE_SH7343 is not set
163# CONFIG_CPU_SUBTYPE_SH7722 is not set 167# CONFIG_CPU_SUBTYPE_SH7722 is not set
164# CONFIG_CPU_SUBTYPE_SH7366 is not set 168# CONFIG_CPU_SUBTYPE_SH7366 is not set
165# CONFIG_CPU_SUBTYPE_SH5_101 is not set
166# CONFIG_CPU_SUBTYPE_SH5_103 is not set
167 169
168# 170#
169# Memory management options 171# Memory management options
@@ -506,6 +508,11 @@ CONFIG_INOTIFY_USER=y
506# CONFIG_FUSE_FS is not set 508# CONFIG_FUSE_FS is not set
507 509
508# 510#
511# Caches
512#
513# CONFIG_FSCACHE is not set
514
515#
509# CD-ROM/DVD Filesystems 516# CD-ROM/DVD Filesystems
510# 517#
511# CONFIG_ISO9660_FS is not set 518# CONFIG_ISO9660_FS is not set
@@ -547,8 +554,13 @@ CONFIG_CRAMFS=y
547# CONFIG_HPFS_FS is not set 554# CONFIG_HPFS_FS is not set
548# CONFIG_QNX4FS_FS is not set 555# CONFIG_QNX4FS_FS is not set
549CONFIG_ROMFS_FS=y 556CONFIG_ROMFS_FS=y
557CONFIG_ROMFS_BACKED_BY_BLOCK=y
558# CONFIG_ROMFS_BACKED_BY_MTD is not set
559# CONFIG_ROMFS_BACKED_BY_BOTH is not set
560CONFIG_ROMFS_ON_BLOCK=y
550# CONFIG_SYSV_FS is not set 561# CONFIG_SYSV_FS is not set
551# CONFIG_UFS_FS is not set 562# CONFIG_UFS_FS is not set
563# CONFIG_NILFS2_FS is not set
552 564
553# 565#
554# Partition Types 566# Partition Types
@@ -577,10 +589,24 @@ CONFIG_FRAME_WARN=1024
577CONFIG_HAVE_FUNCTION_TRACER=y 589CONFIG_HAVE_FUNCTION_TRACER=y
578CONFIG_HAVE_DYNAMIC_FTRACE=y 590CONFIG_HAVE_DYNAMIC_FTRACE=y
579CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 591CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
592CONFIG_TRACING_SUPPORT=y
580 593
581# 594#
582# Tracers 595# Tracers
583# 596#
597# CONFIG_FUNCTION_TRACER is not set
598# CONFIG_IRQSOFF_TRACER is not set
599# CONFIG_PREEMPT_TRACER is not set
600# CONFIG_SCHED_TRACER is not set
601# CONFIG_CONTEXT_SWITCH_TRACER is not set
602# CONFIG_EVENT_TRACER is not set
603# CONFIG_BOOT_TRACER is not set
604# CONFIG_TRACE_BRANCH_PROFILING is not set
605# CONFIG_STACK_TRACER is not set
606# CONFIG_KMEMTRACE is not set
607# CONFIG_WORKQUEUE_TRACER is not set
608# CONFIG_BLK_DEV_IO_TRACE is not set
609# CONFIG_DMA_API_DEBUG is not set
584# CONFIG_SAMPLES is not set 610# CONFIG_SAMPLES is not set
585CONFIG_HAVE_ARCH_KGDB=y 611CONFIG_HAVE_ARCH_KGDB=y
586# CONFIG_SH_STANDARD_BIOS is not set 612# CONFIG_SH_STANDARD_BIOS is not set
@@ -595,6 +621,7 @@ CONFIG_HAVE_ARCH_KGDB=y
595# CONFIG_SECURITYFS is not set 621# CONFIG_SECURITYFS is not set
596# CONFIG_SECURITY_FILE_CAPABILITIES is not set 622# CONFIG_SECURITY_FILE_CAPABILITIES is not set
597# CONFIG_CRYPTO is not set 623# CONFIG_CRYPTO is not set
624# CONFIG_BINARY_PRINTF is not set
598 625
599# 626#
600# Library routines 627# Library routines
diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig
index bbeb4c6ebb95..8ca94ef74278 100644
--- a/arch/sh/configs/titan_defconfig
+++ b/arch/sh/configs/titan_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 19:24:55 2009 4# Mon Apr 27 13:14:55 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -40,6 +41,7 @@ CONFIG_SWAP=y
40CONFIG_SYSVIPC=y 41CONFIG_SYSVIPC=y
41CONFIG_SYSVIPC_SYSCTL=y 42CONFIG_SYSVIPC_SYSCTL=y
42CONFIG_POSIX_MQUEUE=y 43CONFIG_POSIX_MQUEUE=y
44CONFIG_POSIX_MQUEUE_SYSCTL=y
43# CONFIG_BSD_PROCESS_ACCT is not set 45# CONFIG_BSD_PROCESS_ACCT is not set
44# CONFIG_TASKSTATS is not set 46# CONFIG_TASKSTATS is not set
45# CONFIG_AUDIT is not set 47# CONFIG_AUDIT is not set
@@ -66,7 +68,6 @@ CONFIG_INITRAMFS_SOURCE=""
66CONFIG_RD_GZIP=y 68CONFIG_RD_GZIP=y
67# CONFIG_RD_BZIP2 is not set 69# CONFIG_RD_BZIP2 is not set
68# CONFIG_RD_LZMA is not set 70# CONFIG_RD_LZMA is not set
69CONFIG_INITRAMFS_COMPRESSION_NONE=y
70# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 71# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
71CONFIG_SYSCTL=y 72CONFIG_SYSCTL=y
72CONFIG_ANON_INODES=y 73CONFIG_ANON_INODES=y
@@ -76,6 +77,7 @@ CONFIG_UID16=y
76CONFIG_KALLSYMS=y 77CONFIG_KALLSYMS=y
77# CONFIG_KALLSYMS_ALL is not set 78# CONFIG_KALLSYMS_ALL is not set
78# CONFIG_KALLSYMS_EXTRA_PASS is not set 79# CONFIG_KALLSYMS_EXTRA_PASS is not set
80# CONFIG_STRIP_ASM_SYMS is not set
79CONFIG_HOTPLUG=y 81CONFIG_HOTPLUG=y
80CONFIG_PRINTK=y 82CONFIG_PRINTK=y
81CONFIG_BUG=y 83CONFIG_BUG=y
@@ -95,6 +97,7 @@ CONFIG_SLAB=y
95# CONFIG_SLUB is not set 97# CONFIG_SLUB is not set
96# CONFIG_SLOB is not set 98# CONFIG_SLOB is not set
97# CONFIG_PROFILING is not set 99# CONFIG_PROFILING is not set
100# CONFIG_MARKERS is not set
98CONFIG_HAVE_OPROFILE=y 101CONFIG_HAVE_OPROFILE=y
99# CONFIG_KPROBES is not set 102# CONFIG_KPROBES is not set
100CONFIG_HAVE_IOREMAP_PROT=y 103CONFIG_HAVE_IOREMAP_PROT=y
@@ -102,6 +105,8 @@ CONFIG_HAVE_KPROBES=y
102CONFIG_HAVE_KRETPROBES=y 105CONFIG_HAVE_KRETPROBES=y
103CONFIG_HAVE_ARCH_TRACEHOOK=y 106CONFIG_HAVE_ARCH_TRACEHOOK=y
104CONFIG_HAVE_CLK=y 107CONFIG_HAVE_CLK=y
108CONFIG_HAVE_DMA_API_DEBUG=y
109# CONFIG_SLOW_WORK is not set
105CONFIG_HAVE_GENERIC_DMA_COHERENT=y 110CONFIG_HAVE_GENERIC_DMA_COHERENT=y
106CONFIG_SLABINFO=y 111CONFIG_SLABINFO=y
107CONFIG_RT_MUTEXES=y 112CONFIG_RT_MUTEXES=y
@@ -114,7 +119,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
114# CONFIG_MODULE_SRCVERSION_ALL is not set 119# CONFIG_MODULE_SRCVERSION_ALL is not set
115CONFIG_BLOCK=y 120CONFIG_BLOCK=y
116# CONFIG_LBD is not set 121# CONFIG_LBD is not set
117# CONFIG_BLK_DEV_IO_TRACE is not set
118# CONFIG_BLK_DEV_BSG is not set 122# CONFIG_BLK_DEV_BSG is not set
119# CONFIG_BLK_DEV_INTEGRITY is not set 123# CONFIG_BLK_DEV_INTEGRITY is not set
120 124
@@ -160,6 +164,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
160# CONFIG_CPU_SUBTYPE_SH7760 is not set 164# CONFIG_CPU_SUBTYPE_SH7760 is not set
161# CONFIG_CPU_SUBTYPE_SH4_202 is not set 165# CONFIG_CPU_SUBTYPE_SH4_202 is not set
162# CONFIG_CPU_SUBTYPE_SH7723 is not set 166# CONFIG_CPU_SUBTYPE_SH7723 is not set
167# CONFIG_CPU_SUBTYPE_SH7724 is not set
163# CONFIG_CPU_SUBTYPE_SH7763 is not set 168# CONFIG_CPU_SUBTYPE_SH7763 is not set
164# CONFIG_CPU_SUBTYPE_SH7770 is not set 169# CONFIG_CPU_SUBTYPE_SH7770 is not set
165# CONFIG_CPU_SUBTYPE_SH7780 is not set 170# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -169,8 +174,6 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
169# CONFIG_CPU_SUBTYPE_SH7343 is not set 174# CONFIG_CPU_SUBTYPE_SH7343 is not set
170# CONFIG_CPU_SUBTYPE_SH7722 is not set 175# CONFIG_CPU_SUBTYPE_SH7722 is not set
171# CONFIG_CPU_SUBTYPE_SH7366 is not set 176# CONFIG_CPU_SUBTYPE_SH7366 is not set
172# CONFIG_CPU_SUBTYPE_SH5_101 is not set
173# CONFIG_CPU_SUBTYPE_SH5_103 is not set
174 177
175# 178#
176# Memory management options 179# Memory management options
@@ -305,8 +308,6 @@ CONFIG_CMDLINE="console=ttySC1,38400N81 root=/dev/nfs ip=:::::eth1:autoconf rw"
305# 308#
306CONFIG_PCI=y 309CONFIG_PCI=y
307CONFIG_SH_PCIDMA_NONCOHERENT=y 310CONFIG_SH_PCIDMA_NONCOHERENT=y
308CONFIG_PCI_AUTO=y
309CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
310# CONFIG_PCIEPORTBUS is not set 311# CONFIG_PCIEPORTBUS is not set
311# CONFIG_ARCH_SUPPORTS_MSI is not set 312# CONFIG_ARCH_SUPPORTS_MSI is not set
312CONFIG_PCI_LEGACY=y 313CONFIG_PCI_LEGACY=y
@@ -789,6 +790,7 @@ CONFIG_SCSI_LOWLEVEL=y
789# CONFIG_SCSI_MPT2SAS is not set 790# CONFIG_SCSI_MPT2SAS is not set
790# CONFIG_SCSI_HPTIOP is not set 791# CONFIG_SCSI_HPTIOP is not set
791# CONFIG_LIBFC is not set 792# CONFIG_LIBFC is not set
793# CONFIG_LIBFCOE is not set
792# CONFIG_FCOE is not set 794# CONFIG_FCOE is not set
793# CONFIG_SCSI_DMX3191D is not set 795# CONFIG_SCSI_DMX3191D is not set
794# CONFIG_SCSI_FUTURE_DOMAIN is not set 796# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -906,6 +908,7 @@ CONFIG_NETDEV_1000=y
906# CONFIG_E1000E is not set 908# CONFIG_E1000E is not set
907# CONFIG_IP1000 is not set 909# CONFIG_IP1000 is not set
908# CONFIG_IGB is not set 910# CONFIG_IGB is not set
911# CONFIG_IGBVF is not set
909# CONFIG_NS83820 is not set 912# CONFIG_NS83820 is not set
910# CONFIG_HAMACHI is not set 913# CONFIG_HAMACHI is not set
911# CONFIG_YELLOWFIN is not set 914# CONFIG_YELLOWFIN is not set
@@ -929,6 +932,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
929# CONFIG_IXGBE is not set 932# CONFIG_IXGBE is not set
930# CONFIG_IXGB is not set 933# CONFIG_IXGB is not set
931# CONFIG_S2IO is not set 934# CONFIG_S2IO is not set
935# CONFIG_VXGE is not set
932# CONFIG_MYRI10GE is not set 936# CONFIG_MYRI10GE is not set
933# CONFIG_NETXEN_NIC is not set 937# CONFIG_NETXEN_NIC is not set
934# CONFIG_NIU is not set 938# CONFIG_NIU is not set
@@ -1182,7 +1186,6 @@ CONFIG_HID=y
1182# 1186#
1183# Special HID drivers 1187# Special HID drivers
1184# 1188#
1185CONFIG_HID_COMPAT=y
1186CONFIG_USB_SUPPORT=y 1189CONFIG_USB_SUPPORT=y
1187CONFIG_USB_ARCH_HAS_HCD=y 1190CONFIG_USB_ARCH_HAS_HCD=y
1188CONFIG_USB_ARCH_HAS_OHCI=y 1191CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1393,6 +1396,7 @@ CONFIG_EXT2_FS=y
1393# CONFIG_EXT2_FS_XATTR is not set 1396# CONFIG_EXT2_FS_XATTR is not set
1394# CONFIG_EXT2_FS_XIP is not set 1397# CONFIG_EXT2_FS_XIP is not set
1395CONFIG_EXT3_FS=y 1398CONFIG_EXT3_FS=y
1399# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1396# CONFIG_EXT3_FS_XATTR is not set 1400# CONFIG_EXT3_FS_XATTR is not set
1397# CONFIG_EXT4_FS is not set 1401# CONFIG_EXT4_FS is not set
1398CONFIG_JBD=y 1402CONFIG_JBD=y
@@ -1419,6 +1423,11 @@ CONFIG_INOTIFY_USER=y
1419CONFIG_FUSE_FS=m 1423CONFIG_FUSE_FS=m
1420 1424
1421# 1425#
1426# Caches
1427#
1428# CONFIG_FSCACHE is not set
1429
1430#
1422# CD-ROM/DVD Filesystems 1431# CD-ROM/DVD Filesystems
1423# 1432#
1424CONFIG_ISO9660_FS=m 1433CONFIG_ISO9660_FS=m
@@ -1467,8 +1476,13 @@ CONFIG_MISC_FILESYSTEMS=y
1467# CONFIG_HPFS_FS is not set 1476# CONFIG_HPFS_FS is not set
1468# CONFIG_QNX4FS_FS is not set 1477# CONFIG_QNX4FS_FS is not set
1469CONFIG_ROMFS_FS=y 1478CONFIG_ROMFS_FS=y
1479CONFIG_ROMFS_BACKED_BY_BLOCK=y
1480# CONFIG_ROMFS_BACKED_BY_MTD is not set
1481# CONFIG_ROMFS_BACKED_BY_BOTH is not set
1482CONFIG_ROMFS_ON_BLOCK=y
1470# CONFIG_SYSV_FS is not set 1483# CONFIG_SYSV_FS is not set
1471# CONFIG_UFS_FS is not set 1484# CONFIG_UFS_FS is not set
1485# CONFIG_NILFS2_FS is not set
1472CONFIG_NETWORK_FILESYSTEMS=y 1486CONFIG_NETWORK_FILESYSTEMS=y
1473CONFIG_NFS_FS=y 1487CONFIG_NFS_FS=y
1474CONFIG_NFS_V3=y 1488CONFIG_NFS_V3=y
@@ -1576,6 +1590,7 @@ CONFIG_MAGIC_SYSRQ=y
1576CONFIG_DEBUG_KERNEL=y 1590CONFIG_DEBUG_KERNEL=y
1577# CONFIG_DEBUG_SHIRQ is not set 1591# CONFIG_DEBUG_SHIRQ is not set
1578# CONFIG_DETECT_SOFTLOCKUP is not set 1592# CONFIG_DETECT_SOFTLOCKUP is not set
1593# CONFIG_DETECT_HUNG_TASK is not set
1579CONFIG_SCHED_DEBUG=y 1594CONFIG_SCHED_DEBUG=y
1580# CONFIG_SCHEDSTATS is not set 1595# CONFIG_SCHEDSTATS is not set
1581# CONFIG_TIMER_STATS is not set 1596# CONFIG_TIMER_STATS is not set
@@ -1610,6 +1625,7 @@ CONFIG_SCHED_DEBUG=y
1610CONFIG_HAVE_FUNCTION_TRACER=y 1625CONFIG_HAVE_FUNCTION_TRACER=y
1611CONFIG_HAVE_DYNAMIC_FTRACE=y 1626CONFIG_HAVE_DYNAMIC_FTRACE=y
1612CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1627CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1628CONFIG_TRACING_SUPPORT=y
1613 1629
1614# 1630#
1615# Tracers 1631# Tracers
@@ -1618,9 +1634,14 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1618# CONFIG_IRQSOFF_TRACER is not set 1634# CONFIG_IRQSOFF_TRACER is not set
1619# CONFIG_SCHED_TRACER is not set 1635# CONFIG_SCHED_TRACER is not set
1620# CONFIG_CONTEXT_SWITCH_TRACER is not set 1636# CONFIG_CONTEXT_SWITCH_TRACER is not set
1637# CONFIG_EVENT_TRACER is not set
1621# CONFIG_BOOT_TRACER is not set 1638# CONFIG_BOOT_TRACER is not set
1622# CONFIG_TRACE_BRANCH_PROFILING is not set 1639# CONFIG_TRACE_BRANCH_PROFILING is not set
1623# CONFIG_STACK_TRACER is not set 1640# CONFIG_STACK_TRACER is not set
1641# CONFIG_KMEMTRACE is not set
1642# CONFIG_WORKQUEUE_TRACER is not set
1643# CONFIG_BLK_DEV_IO_TRACE is not set
1644# CONFIG_DMA_API_DEBUG is not set
1624# CONFIG_SAMPLES is not set 1645# CONFIG_SAMPLES is not set
1625CONFIG_HAVE_ARCH_KGDB=y 1646CONFIG_HAVE_ARCH_KGDB=y
1626# CONFIG_KGDB is not set 1647# CONFIG_KGDB is not set
@@ -1741,6 +1762,7 @@ CONFIG_CRYPTO_DEFLATE=y
1741# CONFIG_CRYPTO_ANSI_CPRNG is not set 1762# CONFIG_CRYPTO_ANSI_CPRNG is not set
1742CONFIG_CRYPTO_HW=y 1763CONFIG_CRYPTO_HW=y
1743# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1764# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1765# CONFIG_BINARY_PRINTF is not set
1744 1766
1745# 1767#
1746# Library routines 1768# Library routines
diff --git a/arch/sh/configs/ul2_defconfig b/arch/sh/configs/ul2_defconfig
index 34f5192a3241..bfb4d9806892 100644
--- a/arch/sh/configs/ul2_defconfig
+++ b/arch/sh/configs/ul2_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 19:30:27 2009 4# Mon Apr 27 13:17:05 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -69,7 +70,6 @@ CONFIG_INITRAMFS_SOURCE=""
69CONFIG_RD_GZIP=y 70CONFIG_RD_GZIP=y
70# CONFIG_RD_BZIP2 is not set 71# CONFIG_RD_BZIP2 is not set
71# CONFIG_RD_LZMA is not set 72# CONFIG_RD_LZMA is not set
72CONFIG_INITRAMFS_COMPRESSION_NONE=y
73CONFIG_CC_OPTIMIZE_FOR_SIZE=y 73CONFIG_CC_OPTIMIZE_FOR_SIZE=y
74CONFIG_SYSCTL=y 74CONFIG_SYSCTL=y
75CONFIG_ANON_INODES=y 75CONFIG_ANON_INODES=y
@@ -78,6 +78,7 @@ CONFIG_UID16=y
78CONFIG_SYSCTL_SYSCALL=y 78CONFIG_SYSCTL_SYSCALL=y
79CONFIG_KALLSYMS=y 79CONFIG_KALLSYMS=y
80# CONFIG_KALLSYMS_EXTRA_PASS is not set 80# CONFIG_KALLSYMS_EXTRA_PASS is not set
81# CONFIG_STRIP_ASM_SYMS is not set
81CONFIG_HOTPLUG=y 82CONFIG_HOTPLUG=y
82CONFIG_PRINTK=y 83CONFIG_PRINTK=y
83CONFIG_BUG=y 84CONFIG_BUG=y
@@ -97,6 +98,7 @@ CONFIG_COMPAT_BRK=y
97CONFIG_SLUB=y 98CONFIG_SLUB=y
98# CONFIG_SLOB is not set 99# CONFIG_SLOB is not set
99CONFIG_PROFILING=y 100CONFIG_PROFILING=y
101# CONFIG_MARKERS is not set
100# CONFIG_OPROFILE is not set 102# CONFIG_OPROFILE is not set
101CONFIG_HAVE_OPROFILE=y 103CONFIG_HAVE_OPROFILE=y
102# CONFIG_KPROBES is not set 104# CONFIG_KPROBES is not set
@@ -105,6 +107,8 @@ CONFIG_HAVE_KPROBES=y
105CONFIG_HAVE_KRETPROBES=y 107CONFIG_HAVE_KRETPROBES=y
106CONFIG_HAVE_ARCH_TRACEHOOK=y 108CONFIG_HAVE_ARCH_TRACEHOOK=y
107CONFIG_HAVE_CLK=y 109CONFIG_HAVE_CLK=y
110CONFIG_HAVE_DMA_API_DEBUG=y
111# CONFIG_SLOW_WORK is not set
108CONFIG_HAVE_GENERIC_DMA_COHERENT=y 112CONFIG_HAVE_GENERIC_DMA_COHERENT=y
109CONFIG_SLABINFO=y 113CONFIG_SLABINFO=y
110CONFIG_RT_MUTEXES=y 114CONFIG_RT_MUTEXES=y
@@ -117,7 +121,6 @@ CONFIG_MODULE_UNLOAD=y
117# CONFIG_MODULE_SRCVERSION_ALL is not set 121# CONFIG_MODULE_SRCVERSION_ALL is not set
118CONFIG_BLOCK=y 122CONFIG_BLOCK=y
119# CONFIG_LBD is not set 123# CONFIG_LBD is not set
120# CONFIG_BLK_DEV_IO_TRACE is not set
121# CONFIG_BLK_DEV_BSG is not set 124# CONFIG_BLK_DEV_BSG is not set
122# CONFIG_BLK_DEV_INTEGRITY is not set 125# CONFIG_BLK_DEV_INTEGRITY is not set
123 126
@@ -167,6 +170,7 @@ CONFIG_ARCH_SHMOBILE=y
167# CONFIG_CPU_SUBTYPE_SH7760 is not set 170# CONFIG_CPU_SUBTYPE_SH7760 is not set
168# CONFIG_CPU_SUBTYPE_SH4_202 is not set 171# CONFIG_CPU_SUBTYPE_SH4_202 is not set
169# CONFIG_CPU_SUBTYPE_SH7723 is not set 172# CONFIG_CPU_SUBTYPE_SH7723 is not set
173# CONFIG_CPU_SUBTYPE_SH7724 is not set
170# CONFIG_CPU_SUBTYPE_SH7763 is not set 174# CONFIG_CPU_SUBTYPE_SH7763 is not set
171# CONFIG_CPU_SUBTYPE_SH7770 is not set 175# CONFIG_CPU_SUBTYPE_SH7770 is not set
172# CONFIG_CPU_SUBTYPE_SH7780 is not set 176# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -176,8 +180,6 @@ CONFIG_ARCH_SHMOBILE=y
176# CONFIG_CPU_SUBTYPE_SH7343 is not set 180# CONFIG_CPU_SUBTYPE_SH7343 is not set
177# CONFIG_CPU_SUBTYPE_SH7722 is not set 181# CONFIG_CPU_SUBTYPE_SH7722 is not set
178CONFIG_CPU_SUBTYPE_SH7366=y 182CONFIG_CPU_SUBTYPE_SH7366=y
179# CONFIG_CPU_SUBTYPE_SH5_101 is not set
180# CONFIG_CPU_SUBTYPE_SH5_103 is not set
181 183
182# 184#
183# Memory management options 185# Memory management options
@@ -584,6 +586,7 @@ CONFIG_SCSI_WAIT_SCAN=m
584CONFIG_SCSI_LOWLEVEL=y 586CONFIG_SCSI_LOWLEVEL=y
585# CONFIG_ISCSI_TCP is not set 587# CONFIG_ISCSI_TCP is not set
586# CONFIG_LIBFC is not set 588# CONFIG_LIBFC is not set
589# CONFIG_LIBFCOE is not set
587# CONFIG_SCSI_DEBUG is not set 590# CONFIG_SCSI_DEBUG is not set
588# CONFIG_SCSI_DH is not set 591# CONFIG_SCSI_DH is not set
589# CONFIG_SCSI_OSD_INITIATOR is not set 592# CONFIG_SCSI_OSD_INITIATOR is not set
@@ -936,6 +939,7 @@ CONFIG_EXT2_FS=y
936# CONFIG_EXT2_FS_XATTR is not set 939# CONFIG_EXT2_FS_XATTR is not set
937# CONFIG_EXT2_FS_XIP is not set 940# CONFIG_EXT2_FS_XIP is not set
938CONFIG_EXT3_FS=y 941CONFIG_EXT3_FS=y
942# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
939CONFIG_EXT3_FS_XATTR=y 943CONFIG_EXT3_FS_XATTR=y
940# CONFIG_EXT3_FS_POSIX_ACL is not set 944# CONFIG_EXT3_FS_POSIX_ACL is not set
941# CONFIG_EXT3_FS_SECURITY is not set 945# CONFIG_EXT3_FS_SECURITY is not set
@@ -958,6 +962,11 @@ CONFIG_INOTIFY_USER=y
958# CONFIG_FUSE_FS is not set 962# CONFIG_FUSE_FS is not set
959 963
960# 964#
965# Caches
966#
967# CONFIG_FSCACHE is not set
968
969#
961# CD-ROM/DVD Filesystems 970# CD-ROM/DVD Filesystems
962# 971#
963# CONFIG_ISO9660_FS is not set 972# CONFIG_ISO9660_FS is not set
@@ -1005,6 +1014,7 @@ CONFIG_CRAMFS=y
1005# CONFIG_ROMFS_FS is not set 1014# CONFIG_ROMFS_FS is not set
1006# CONFIG_SYSV_FS is not set 1015# CONFIG_SYSV_FS is not set
1007# CONFIG_UFS_FS is not set 1016# CONFIG_UFS_FS is not set
1017# CONFIG_NILFS2_FS is not set
1008CONFIG_NETWORK_FILESYSTEMS=y 1018CONFIG_NETWORK_FILESYSTEMS=y
1009CONFIG_NFS_FS=y 1019CONFIG_NFS_FS=y
1010# CONFIG_NFS_V3 is not set 1020# CONFIG_NFS_V3 is not set
@@ -1095,10 +1105,24 @@ CONFIG_FRAME_WARN=1024
1095CONFIG_HAVE_FUNCTION_TRACER=y 1105CONFIG_HAVE_FUNCTION_TRACER=y
1096CONFIG_HAVE_DYNAMIC_FTRACE=y 1106CONFIG_HAVE_DYNAMIC_FTRACE=y
1097CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1107CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1108CONFIG_TRACING_SUPPORT=y
1098 1109
1099# 1110#
1100# Tracers 1111# Tracers
1101# 1112#
1113# CONFIG_FUNCTION_TRACER is not set
1114# CONFIG_IRQSOFF_TRACER is not set
1115# CONFIG_PREEMPT_TRACER is not set
1116# CONFIG_SCHED_TRACER is not set
1117# CONFIG_CONTEXT_SWITCH_TRACER is not set
1118# CONFIG_EVENT_TRACER is not set
1119# CONFIG_BOOT_TRACER is not set
1120# CONFIG_TRACE_BRANCH_PROFILING is not set
1121# CONFIG_STACK_TRACER is not set
1122# CONFIG_KMEMTRACE is not set
1123# CONFIG_WORKQUEUE_TRACER is not set
1124# CONFIG_BLK_DEV_IO_TRACE is not set
1125# CONFIG_DMA_API_DEBUG is not set
1102# CONFIG_SAMPLES is not set 1126# CONFIG_SAMPLES is not set
1103CONFIG_HAVE_ARCH_KGDB=y 1127CONFIG_HAVE_ARCH_KGDB=y
1104# CONFIG_SH_STANDARD_BIOS is not set 1128# CONFIG_SH_STANDARD_BIOS is not set
@@ -1208,6 +1232,7 @@ CONFIG_CRYPTO_ARC4=y
1208# 1232#
1209# CONFIG_CRYPTO_ANSI_CPRNG is not set 1233# CONFIG_CRYPTO_ANSI_CPRNG is not set
1210CONFIG_CRYPTO_HW=y 1234CONFIG_CRYPTO_HW=y
1235# CONFIG_BINARY_PRINTF is not set
1211 1236
1212# 1237#
1213# Library routines 1238# Library routines
diff --git a/arch/sh/configs/urquell_defconfig b/arch/sh/configs/urquell_defconfig
index d174b1a4d802..512664fed66c 100644
--- a/arch/sh/configs/urquell_defconfig
+++ b/arch/sh/configs/urquell_defconfig
@@ -1,10 +1,11 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29 3# Linux kernel version: 2.6.30-rc3
4# Thu Apr 2 19:33:39 2009 4# Mon Apr 27 14:02:55 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
8# CONFIG_SUPERH64 is not set
8CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/shx3_defconfig"
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_BUG=y 11CONFIG_GENERIC_BUG=y
@@ -76,6 +77,7 @@ CONFIG_UID16=y
76CONFIG_SYSCTL_SYSCALL=y 77CONFIG_SYSCTL_SYSCALL=y
77CONFIG_KALLSYMS=y 78CONFIG_KALLSYMS=y
78# CONFIG_KALLSYMS_EXTRA_PASS is not set 79# CONFIG_KALLSYMS_EXTRA_PASS is not set
80# CONFIG_STRIP_ASM_SYMS is not set
79CONFIG_HOTPLUG=y 81CONFIG_HOTPLUG=y
80CONFIG_PRINTK=y 82CONFIG_PRINTK=y
81CONFIG_BUG=y 83CONFIG_BUG=y
@@ -94,6 +96,7 @@ CONFIG_SLAB=y
94# CONFIG_SLUB is not set 96# CONFIG_SLUB is not set
95# CONFIG_SLOB is not set 97# CONFIG_SLOB is not set
96CONFIG_PROFILING=y 98CONFIG_PROFILING=y
99# CONFIG_MARKERS is not set
97# CONFIG_OPROFILE is not set 100# CONFIG_OPROFILE is not set
98CONFIG_HAVE_OPROFILE=y 101CONFIG_HAVE_OPROFILE=y
99# CONFIG_KPROBES is not set 102# CONFIG_KPROBES is not set
@@ -102,6 +105,8 @@ CONFIG_HAVE_KPROBES=y
102CONFIG_HAVE_KRETPROBES=y 105CONFIG_HAVE_KRETPROBES=y
103CONFIG_HAVE_ARCH_TRACEHOOK=y 106CONFIG_HAVE_ARCH_TRACEHOOK=y
104CONFIG_HAVE_CLK=y 107CONFIG_HAVE_CLK=y
108CONFIG_HAVE_DMA_API_DEBUG=y
109# CONFIG_SLOW_WORK is not set
105CONFIG_HAVE_GENERIC_DMA_COHERENT=y 110CONFIG_HAVE_GENERIC_DMA_COHERENT=y
106CONFIG_SLABINFO=y 111CONFIG_SLABINFO=y
107CONFIG_RT_MUTEXES=y 112CONFIG_RT_MUTEXES=y
@@ -114,7 +119,6 @@ CONFIG_MODULE_UNLOAD=y
114# CONFIG_MODULE_SRCVERSION_ALL is not set 119# CONFIG_MODULE_SRCVERSION_ALL is not set
115CONFIG_BLOCK=y 120CONFIG_BLOCK=y
116# CONFIG_LBD is not set 121# CONFIG_LBD is not set
117# CONFIG_BLK_DEV_IO_TRACE is not set
118# CONFIG_BLK_DEV_BSG is not set 122# CONFIG_BLK_DEV_BSG is not set
119# CONFIG_BLK_DEV_INTEGRITY is not set 123# CONFIG_BLK_DEV_INTEGRITY is not set
120 124
@@ -162,6 +166,7 @@ CONFIG_CPU_SHX3=y
162# CONFIG_CPU_SUBTYPE_SH7760 is not set 166# CONFIG_CPU_SUBTYPE_SH7760 is not set
163# CONFIG_CPU_SUBTYPE_SH4_202 is not set 167# CONFIG_CPU_SUBTYPE_SH4_202 is not set
164# CONFIG_CPU_SUBTYPE_SH7723 is not set 168# CONFIG_CPU_SUBTYPE_SH7723 is not set
169# CONFIG_CPU_SUBTYPE_SH7724 is not set
165# CONFIG_CPU_SUBTYPE_SH7763 is not set 170# CONFIG_CPU_SUBTYPE_SH7763 is not set
166# CONFIG_CPU_SUBTYPE_SH7770 is not set 171# CONFIG_CPU_SUBTYPE_SH7770 is not set
167# CONFIG_CPU_SUBTYPE_SH7780 is not set 172# CONFIG_CPU_SUBTYPE_SH7780 is not set
@@ -171,8 +176,6 @@ CONFIG_CPU_SUBTYPE_SH7786=y
171# CONFIG_CPU_SUBTYPE_SH7343 is not set 176# CONFIG_CPU_SUBTYPE_SH7343 is not set
172# CONFIG_CPU_SUBTYPE_SH7722 is not set 177# CONFIG_CPU_SUBTYPE_SH7722 is not set
173# CONFIG_CPU_SUBTYPE_SH7366 is not set 178# CONFIG_CPU_SUBTYPE_SH7366 is not set
174# CONFIG_CPU_SUBTYPE_SH5_101 is not set
175# CONFIG_CPU_SUBTYPE_SH5_103 is not set
176 179
177# 180#
178# Memory management options 181# Memory management options
@@ -900,15 +903,17 @@ CONFIG_USB_HID=y
900# 903#
901# Special HID drivers 904# Special HID drivers
902# 905#
903CONFIG_HID_COMPAT=y
904CONFIG_HID_A4TECH=y 906CONFIG_HID_A4TECH=y
905CONFIG_HID_APPLE=y 907CONFIG_HID_APPLE=y
906CONFIG_HID_BELKIN=y 908CONFIG_HID_BELKIN=y
907CONFIG_HID_CHERRY=y 909CONFIG_HID_CHERRY=y
908CONFIG_HID_CHICONY=y 910CONFIG_HID_CHICONY=y
909CONFIG_HID_CYPRESS=y 911CONFIG_HID_CYPRESS=y
912# CONFIG_DRAGONRISE_FF is not set
910CONFIG_HID_EZKEY=y 913CONFIG_HID_EZKEY=y
914# CONFIG_HID_KYE is not set
911CONFIG_HID_GYRATION=y 915CONFIG_HID_GYRATION=y
916# CONFIG_HID_KENSINGTON is not set
912CONFIG_HID_LOGITECH=y 917CONFIG_HID_LOGITECH=y
913# CONFIG_LOGITECH_FF is not set 918# CONFIG_LOGITECH_FF is not set
914# CONFIG_LOGIRUMBLEPAD2_FF is not set 919# CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -1046,6 +1051,7 @@ CONFIG_EXT2_FS=y
1046# CONFIG_EXT2_FS_XATTR is not set 1051# CONFIG_EXT2_FS_XATTR is not set
1047# CONFIG_EXT2_FS_XIP is not set 1052# CONFIG_EXT2_FS_XIP is not set
1048CONFIG_EXT3_FS=y 1053CONFIG_EXT3_FS=y
1054# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1049CONFIG_EXT3_FS_XATTR=y 1055CONFIG_EXT3_FS_XATTR=y
1050# CONFIG_EXT3_FS_POSIX_ACL is not set 1056# CONFIG_EXT3_FS_POSIX_ACL is not set
1051# CONFIG_EXT3_FS_SECURITY is not set 1057# CONFIG_EXT3_FS_SECURITY is not set
@@ -1068,6 +1074,11 @@ CONFIG_INOTIFY_USER=y
1068# CONFIG_FUSE_FS is not set 1074# CONFIG_FUSE_FS is not set
1069 1075
1070# 1076#
1077# Caches
1078#
1079# CONFIG_FSCACHE is not set
1080
1081#
1071# CD-ROM/DVD Filesystems 1082# CD-ROM/DVD Filesystems
1072# 1083#
1073# CONFIG_ISO9660_FS is not set 1084# CONFIG_ISO9660_FS is not set
@@ -1117,6 +1128,7 @@ CONFIG_MINIX_FS=y
1117# CONFIG_ROMFS_FS is not set 1128# CONFIG_ROMFS_FS is not set
1118# CONFIG_SYSV_FS is not set 1129# CONFIG_SYSV_FS is not set
1119# CONFIG_UFS_FS is not set 1130# CONFIG_UFS_FS is not set
1131# CONFIG_NILFS2_FS is not set
1120CONFIG_NETWORK_FILESYSTEMS=y 1132CONFIG_NETWORK_FILESYSTEMS=y
1121CONFIG_NFS_FS=y 1133CONFIG_NFS_FS=y
1122CONFIG_NFS_V3=y 1134CONFIG_NFS_V3=y
@@ -1209,10 +1221,24 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
1209CONFIG_HAVE_FUNCTION_TRACER=y 1221CONFIG_HAVE_FUNCTION_TRACER=y
1210CONFIG_HAVE_DYNAMIC_FTRACE=y 1222CONFIG_HAVE_DYNAMIC_FTRACE=y
1211CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1223CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1224CONFIG_TRACING_SUPPORT=y
1212 1225
1213# 1226#
1214# Tracers 1227# Tracers
1215# 1228#
1229# CONFIG_FUNCTION_TRACER is not set
1230# CONFIG_IRQSOFF_TRACER is not set
1231# CONFIG_PREEMPT_TRACER is not set
1232# CONFIG_SCHED_TRACER is not set
1233# CONFIG_CONTEXT_SWITCH_TRACER is not set
1234# CONFIG_EVENT_TRACER is not set
1235# CONFIG_BOOT_TRACER is not set
1236# CONFIG_TRACE_BRANCH_PROFILING is not set
1237# CONFIG_STACK_TRACER is not set
1238# CONFIG_KMEMTRACE is not set
1239# CONFIG_WORKQUEUE_TRACER is not set
1240# CONFIG_BLK_DEV_IO_TRACE is not set
1241# CONFIG_DMA_API_DEBUG is not set
1216# CONFIG_SAMPLES is not set 1242# CONFIG_SAMPLES is not set
1217CONFIG_HAVE_ARCH_KGDB=y 1243CONFIG_HAVE_ARCH_KGDB=y
1218# CONFIG_SH_STANDARD_BIOS is not set 1244# CONFIG_SH_STANDARD_BIOS is not set
@@ -1322,6 +1348,7 @@ CONFIG_CRYPTO_DES=y
1322# 1348#
1323# CONFIG_CRYPTO_ANSI_CPRNG is not set 1349# CONFIG_CRYPTO_ANSI_CPRNG is not set
1324# CONFIG_CRYPTO_HW is not set 1350# CONFIG_CRYPTO_HW is not set
1351# CONFIG_BINARY_PRINTF is not set
1325 1352
1326# 1353#
1327# Library routines 1354# Library routines