aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/configs
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzk@kernel.org>2019-06-04 03:56:20 -0400
committerYoshinori Sato <ysato@users.sourceforge.jp>2019-06-10 02:49:20 -0400
commit7c04efc8d2efa6476cc4fc1228c1e20bdc4129ad (patch)
tree86307ad0ef7fa1c1306cf04106ce85dd73503b3f /arch/sh/configs
parent860dbce3d8dd90cb9e909c58fa79808766243651 (diff)
sh: configs: Remove useless UEVENT_HELPER_PATH
Remove the CONFIG_UEVENT_HELPER_PATH because: 1. It is disabled since commit 1be01d4a5714 ("driver: base: Disable CONFIG_UEVENT_HELPER by default") as its dependency (UEVENT_HELPER) was made default to 'n', 2. It is not recommended (help message: "This should not be used today [...] creates a high system load") and was kept only for ancient userland, 3. Certain userland specifically requests it to be disabled (systemd README: "Legacy hotplug slows down the system and confuses udev"). Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Diffstat (limited to 'arch/sh/configs')
-rw-r--r--arch/sh/configs/ap325rxa_defconfig1
-rw-r--r--arch/sh/configs/apsh4a3a_defconfig1
-rw-r--r--arch/sh/configs/apsh4ad0a_defconfig1
-rw-r--r--arch/sh/configs/cayman_defconfig1
-rw-r--r--arch/sh/configs/dreamcast_defconfig1
-rw-r--r--arch/sh/configs/ecovec24-romimage_defconfig1
-rw-r--r--arch/sh/configs/ecovec24_defconfig1
-rw-r--r--arch/sh/configs/edosk7760_defconfig1
-rw-r--r--arch/sh/configs/espt_defconfig1
-rw-r--r--arch/sh/configs/hp6xx_defconfig1
-rw-r--r--arch/sh/configs/kfr2r09-romimage_defconfig1
-rw-r--r--arch/sh/configs/kfr2r09_defconfig1
-rw-r--r--arch/sh/configs/landisk_defconfig1
-rw-r--r--arch/sh/configs/lboxre2_defconfig1
-rw-r--r--arch/sh/configs/magicpanelr2_defconfig1
-rw-r--r--arch/sh/configs/microdev_defconfig1
-rw-r--r--arch/sh/configs/migor_defconfig1
-rw-r--r--arch/sh/configs/polaris_defconfig1
-rw-r--r--arch/sh/configs/r7780mp_defconfig1
-rw-r--r--arch/sh/configs/r7785rp_defconfig1
-rw-r--r--arch/sh/configs/rsk7201_defconfig1
-rw-r--r--arch/sh/configs/rsk7203_defconfig1
-rw-r--r--arch/sh/configs/rsk7264_defconfig1
-rw-r--r--arch/sh/configs/rsk7269_defconfig1
-rw-r--r--arch/sh/configs/rts7751r2d1_defconfig1
-rw-r--r--arch/sh/configs/rts7751r2dplus_defconfig1
-rw-r--r--arch/sh/configs/sdk7780_defconfig1
-rw-r--r--arch/sh/configs/sdk7786_defconfig1
-rw-r--r--arch/sh/configs/se7206_defconfig1
-rw-r--r--arch/sh/configs/se7343_defconfig1
-rw-r--r--arch/sh/configs/se7712_defconfig1
-rw-r--r--arch/sh/configs/se7721_defconfig1
-rw-r--r--arch/sh/configs/se7722_defconfig1
-rw-r--r--arch/sh/configs/se7724_defconfig1
-rw-r--r--arch/sh/configs/sh03_defconfig1
-rw-r--r--arch/sh/configs/sh2007_defconfig1
-rw-r--r--arch/sh/configs/sh7710voipgw_defconfig1
-rw-r--r--arch/sh/configs/sh7724_generic_defconfig1
-rw-r--r--arch/sh/configs/sh7757lcr_defconfig1
-rw-r--r--arch/sh/configs/sh7763rdp_defconfig1
-rw-r--r--arch/sh/configs/sh7770_generic_defconfig1
-rw-r--r--arch/sh/configs/sh7785lcr_32bit_defconfig1
-rw-r--r--arch/sh/configs/sh7785lcr_defconfig1
-rw-r--r--arch/sh/configs/shx3_defconfig1
-rw-r--r--arch/sh/configs/titan_defconfig1
-rw-r--r--arch/sh/configs/ul2_defconfig1
-rw-r--r--arch/sh/configs/urquell_defconfig1
47 files changed, 0 insertions, 47 deletions
diff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig
index 0ef3f1f9de5c..cc6e4ce53dac 100644
--- a/arch/sh/configs/ap325rxa_defconfig
+++ b/arch/sh/configs/ap325rxa_defconfig
@@ -28,7 +28,6 @@ CONFIG_IP_PNP_DHCP=y
28# CONFIG_INET_XFRM_MODE_TUNNEL is not set 28# CONFIG_INET_XFRM_MODE_TUNNEL is not set
29# CONFIG_INET_XFRM_MODE_BEET is not set 29# CONFIG_INET_XFRM_MODE_BEET is not set
30# CONFIG_IPV6 is not set 30# CONFIG_IPV6 is not set
31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32CONFIG_MTD=y 31CONFIG_MTD=y
33CONFIG_MTD_CMDLINE_PARTS=y 32CONFIG_MTD_CMDLINE_PARTS=y
34CONFIG_MTD_BLOCK=y 33CONFIG_MTD_BLOCK=y
diff --git a/arch/sh/configs/apsh4a3a_defconfig b/arch/sh/configs/apsh4a3a_defconfig
index 6c7cdc3beb28..530498f18990 100644
--- a/arch/sh/configs/apsh4a3a_defconfig
+++ b/arch/sh/configs/apsh4a3a_defconfig
@@ -29,7 +29,6 @@ CONFIG_IP_PNP=y
29CONFIG_IP_PNP_DHCP=y 29CONFIG_IP_PNP_DHCP=y
30# CONFIG_IPV6 is not set 30# CONFIG_IPV6 is not set
31# CONFIG_WIRELESS is not set 31# CONFIG_WIRELESS is not set
32CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
33# CONFIG_FW_LOADER is not set 32# CONFIG_FW_LOADER is not set
34CONFIG_MTD=y 33CONFIG_MTD=y
35CONFIG_MTD_BLOCK=y 34CONFIG_MTD_BLOCK=y
diff --git a/arch/sh/configs/apsh4ad0a_defconfig b/arch/sh/configs/apsh4ad0a_defconfig
index d0d9ebc7165b..6dd0da73ca5a 100644
--- a/arch/sh/configs/apsh4ad0a_defconfig
+++ b/arch/sh/configs/apsh4ad0a_defconfig
@@ -53,7 +53,6 @@ CONFIG_NET_KEY=y
53CONFIG_INET=y 53CONFIG_INET=y
54# CONFIG_IPV6 is not set 54# CONFIG_IPV6 is not set
55# CONFIG_WIRELESS is not set 55# CONFIG_WIRELESS is not set
56CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
57# CONFIG_FW_LOADER is not set 56# CONFIG_FW_LOADER is not set
58CONFIG_MTD=y 57CONFIG_MTD=y
59CONFIG_MTD_CFI=y 58CONFIG_MTD_CFI=y
diff --git a/arch/sh/configs/cayman_defconfig b/arch/sh/configs/cayman_defconfig
index 5a90e24aa8a6..911437c163c7 100644
--- a/arch/sh/configs/cayman_defconfig
+++ b/arch/sh/configs/cayman_defconfig
@@ -19,7 +19,6 @@ CONFIG_UNIX=y
19CONFIG_INET=y 19CONFIG_INET=y
20CONFIG_IP_PNP=y 20CONFIG_IP_PNP=y
21# CONFIG_IPV6 is not set 21# CONFIG_IPV6 is not set
22CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
23# CONFIG_FW_LOADER is not set 22# CONFIG_FW_LOADER is not set
24CONFIG_BLK_DEV_LOOP=y 23CONFIG_BLK_DEV_LOOP=y
25CONFIG_BLK_DEV_RAM=y 24CONFIG_BLK_DEV_RAM=y
diff --git a/arch/sh/configs/dreamcast_defconfig b/arch/sh/configs/dreamcast_defconfig
index 1d27666c029f..ae067e0b15e3 100644
--- a/arch/sh/configs/dreamcast_defconfig
+++ b/arch/sh/configs/dreamcast_defconfig
@@ -32,7 +32,6 @@ CONFIG_PACKET=y
32CONFIG_UNIX=y 32CONFIG_UNIX=y
33CONFIG_INET=y 33CONFIG_INET=y
34# CONFIG_IPV6 is not set 34# CONFIG_IPV6 is not set
35CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
36# CONFIG_STANDALONE is not set 35# CONFIG_STANDALONE is not set
37# CONFIG_FW_LOADER is not set 36# CONFIG_FW_LOADER is not set
38CONFIG_GDROM=y 37CONFIG_GDROM=y
diff --git a/arch/sh/configs/ecovec24-romimage_defconfig b/arch/sh/configs/ecovec24-romimage_defconfig
index bdb61d1d0127..5c60e71d839e 100644
--- a/arch/sh/configs/ecovec24-romimage_defconfig
+++ b/arch/sh/configs/ecovec24-romimage_defconfig
@@ -26,7 +26,6 @@ CONFIG_INET=y
26# CONFIG_INET_XFRM_MODE_BEET is not set 26# CONFIG_INET_XFRM_MODE_BEET is not set
27# CONFIG_INET_DIAG is not set 27# CONFIG_INET_DIAG is not set
28# CONFIG_IPV6 is not set 28# CONFIG_IPV6 is not set
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_SCSI=y 29CONFIG_SCSI=y
31CONFIG_BLK_DEV_SD=y 30CONFIG_BLK_DEV_SD=y
32# CONFIG_SCSI_LOWLEVEL is not set 31# CONFIG_SCSI_LOWLEVEL is not set
diff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_defconfig
index ba67e3752938..2fb7db4957ce 100644
--- a/arch/sh/configs/ecovec24_defconfig
+++ b/arch/sh/configs/ecovec24_defconfig
@@ -31,7 +31,6 @@ CONFIG_IP_PNP_DHCP=y
31# CONFIG_IPV6 is not set 31# CONFIG_IPV6 is not set
32CONFIG_IRDA=y 32CONFIG_IRDA=y
33CONFIG_SH_SIR=y 33CONFIG_SH_SIR=y
34CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
35CONFIG_MTD=y 34CONFIG_MTD=y
36CONFIG_MTD_CMDLINE_PARTS=y 35CONFIG_MTD_CMDLINE_PARTS=y
37CONFIG_MTD_BLOCK=y 36CONFIG_MTD_BLOCK=y
diff --git a/arch/sh/configs/edosk7760_defconfig b/arch/sh/configs/edosk7760_defconfig
index aab4ff1e247c..02ba62298576 100644
--- a/arch/sh/configs/edosk7760_defconfig
+++ b/arch/sh/configs/edosk7760_defconfig
@@ -31,7 +31,6 @@ CONFIG_IP_PNP_BOOTP=y
31# CONFIG_INET_XFRM_MODE_TUNNEL is not set 31# CONFIG_INET_XFRM_MODE_TUNNEL is not set
32# CONFIG_INET_XFRM_MODE_BEET is not set 32# CONFIG_INET_XFRM_MODE_BEET is not set
33# CONFIG_IPV6 is not set 33# CONFIG_IPV6 is not set
34CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
35# CONFIG_FW_LOADER is not set 34# CONFIG_FW_LOADER is not set
36CONFIG_DEBUG_DRIVER=y 35CONFIG_DEBUG_DRIVER=y
37CONFIG_DEBUG_DEVRES=y 36CONFIG_DEBUG_DEVRES=y
diff --git a/arch/sh/configs/espt_defconfig b/arch/sh/configs/espt_defconfig
index 444d75947e70..a5b865a75d22 100644
--- a/arch/sh/configs/espt_defconfig
+++ b/arch/sh/configs/espt_defconfig
@@ -26,7 +26,6 @@ CONFIG_IP_PNP=y
26CONFIG_IP_PNP_DHCP=y 26CONFIG_IP_PNP_DHCP=y
27CONFIG_IP_PNP_BOOTP=y 27CONFIG_IP_PNP_BOOTP=y
28# CONFIG_IPV6 is not set 28# CONFIG_IPV6 is not set
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_MTD=y 29CONFIG_MTD=y
31CONFIG_MTD_CMDLINE_PARTS=y 30CONFIG_MTD_CMDLINE_PARTS=y
32CONFIG_MTD_BLOCK=y 31CONFIG_MTD_BLOCK=y
diff --git a/arch/sh/configs/hp6xx_defconfig b/arch/sh/configs/hp6xx_defconfig
index 4dcf7f552582..f947a8f3fd0b 100644
--- a/arch/sh/configs/hp6xx_defconfig
+++ b/arch/sh/configs/hp6xx_defconfig
@@ -18,7 +18,6 @@ CONFIG_HD64461_ENABLER=y
18CONFIG_PCCARD=y 18CONFIG_PCCARD=y
19CONFIG_PM=y 19CONFIG_PM=y
20CONFIG_APM_EMULATION=y 20CONFIG_APM_EMULATION=y
21CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
22# CONFIG_STANDALONE is not set 21# CONFIG_STANDALONE is not set
23CONFIG_BLK_DEV_SD=y 22CONFIG_BLK_DEV_SD=y
24CONFIG_ATA=y 23CONFIG_ATA=y
diff --git a/arch/sh/configs/kfr2r09-romimage_defconfig b/arch/sh/configs/kfr2r09-romimage_defconfig
index 9cc37f29e3b4..04436b4fbd76 100644
--- a/arch/sh/configs/kfr2r09-romimage_defconfig
+++ b/arch/sh/configs/kfr2r09-romimage_defconfig
@@ -28,7 +28,6 @@ CONFIG_INET=y
28# CONFIG_INET_DIAG is not set 28# CONFIG_INET_DIAG is not set
29# CONFIG_IPV6 is not set 29# CONFIG_IPV6 is not set
30# CONFIG_WIRELESS is not set 30# CONFIG_WIRELESS is not set
31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32# CONFIG_INPUT_MOUSEDEV is not set 31# CONFIG_INPUT_MOUSEDEV is not set
33# CONFIG_INPUT_KEYBOARD is not set 32# CONFIG_INPUT_KEYBOARD is not set
34# CONFIG_INPUT_MOUSE is not set 33# CONFIG_INPUT_MOUSE is not set
diff --git a/arch/sh/configs/kfr2r09_defconfig b/arch/sh/configs/kfr2r09_defconfig
index 46693d033644..1dc3f670c481 100644
--- a/arch/sh/configs/kfr2r09_defconfig
+++ b/arch/sh/configs/kfr2r09_defconfig
@@ -35,7 +35,6 @@ CONFIG_INET=y
35# CONFIG_INET_DIAG is not set 35# CONFIG_INET_DIAG is not set
36# CONFIG_IPV6 is not set 36# CONFIG_IPV6 is not set
37# CONFIG_WIRELESS is not set 37# CONFIG_WIRELESS is not set
38CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
39CONFIG_MTD=y 38CONFIG_MTD=y
40CONFIG_MTD_CMDLINE_PARTS=y 39CONFIG_MTD_CMDLINE_PARTS=y
41CONFIG_MTD_BLOCK=y 40CONFIG_MTD_BLOCK=y
diff --git a/arch/sh/configs/landisk_defconfig b/arch/sh/configs/landisk_defconfig
index 467f4d2d8e87..567af752b1bb 100644
--- a/arch/sh/configs/landisk_defconfig
+++ b/arch/sh/configs/landisk_defconfig
@@ -26,7 +26,6 @@ CONFIG_IP_PNP=y
26# CONFIG_IPV6 is not set 26# CONFIG_IPV6 is not set
27CONFIG_NETFILTER=y 27CONFIG_NETFILTER=y
28CONFIG_ATALK=m 28CONFIG_ATALK=m
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_BLK_DEV_LOOP=y 29CONFIG_BLK_DEV_LOOP=y
31CONFIG_BLK_DEV_RAM=y 30CONFIG_BLK_DEV_RAM=y
32CONFIG_IDE=y 31CONFIG_IDE=y
diff --git a/arch/sh/configs/lboxre2_defconfig b/arch/sh/configs/lboxre2_defconfig
index 9e3edfdf9b2e..10f6d371ce2c 100644
--- a/arch/sh/configs/lboxre2_defconfig
+++ b/arch/sh/configs/lboxre2_defconfig
@@ -29,7 +29,6 @@ CONFIG_IP_ADVANCED_ROUTER=y
29CONFIG_IP_PNP=y 29CONFIG_IP_PNP=y
30# CONFIG_IPV6 is not set 30# CONFIG_IPV6 is not set
31CONFIG_NETFILTER=y 31CONFIG_NETFILTER=y
32CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
33CONFIG_BLK_DEV_LOOP=y 32CONFIG_BLK_DEV_LOOP=y
34CONFIG_BLK_DEV_RAM=y 33CONFIG_BLK_DEV_RAM=y
35CONFIG_BLK_DEV_SD=y 34CONFIG_BLK_DEV_SD=y
diff --git a/arch/sh/configs/magicpanelr2_defconfig b/arch/sh/configs/magicpanelr2_defconfig
index fb7415dbc102..664c4dee6e6a 100644
--- a/arch/sh/configs/magicpanelr2_defconfig
+++ b/arch/sh/configs/magicpanelr2_defconfig
@@ -35,7 +35,6 @@ CONFIG_IP_PNP_DHCP=y
35# CONFIG_INET_XFRM_MODE_TUNNEL is not set 35# CONFIG_INET_XFRM_MODE_TUNNEL is not set
36# CONFIG_INET_XFRM_MODE_BEET is not set 36# CONFIG_INET_XFRM_MODE_BEET is not set
37# CONFIG_IPV6 is not set 37# CONFIG_IPV6 is not set
38CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
39# CONFIG_STANDALONE is not set 38# CONFIG_STANDALONE is not set
40# CONFIG_PREVENT_FIRMWARE_BUILD is not set 39# CONFIG_PREVENT_FIRMWARE_BUILD is not set
41CONFIG_MTD=y 40CONFIG_MTD=y
diff --git a/arch/sh/configs/microdev_defconfig b/arch/sh/configs/microdev_defconfig
index c3f7d5899922..ed84d1303acf 100644
--- a/arch/sh/configs/microdev_defconfig
+++ b/arch/sh/configs/microdev_defconfig
@@ -19,7 +19,6 @@ CONFIG_NET=y
19CONFIG_INET=y 19CONFIG_INET=y
20CONFIG_IP_PNP=y 20CONFIG_IP_PNP=y
21# CONFIG_IPV6 is not set 21# CONFIG_IPV6 is not set
22CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
23# CONFIG_FW_LOADER is not set 22# CONFIG_FW_LOADER is not set
24CONFIG_BLK_DEV_RAM=y 23CONFIG_BLK_DEV_RAM=y
25CONFIG_IDE=y 24CONFIG_IDE=y
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig
index 121a75d65fb4..494a1675c226 100644
--- a/arch/sh/configs/migor_defconfig
+++ b/arch/sh/configs/migor_defconfig
@@ -26,7 +26,6 @@ CONFIG_INET=y
26CONFIG_IP_PNP=y 26CONFIG_IP_PNP=y
27CONFIG_IP_PNP_DHCP=y 27CONFIG_IP_PNP_DHCP=y
28# CONFIG_IPV6 is not set 28# CONFIG_IPV6 is not set
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_FW_LOADER=m 29CONFIG_FW_LOADER=m
31CONFIG_MTD=y 30CONFIG_MTD=y
32CONFIG_MTD_CMDLINE_PARTS=y 31CONFIG_MTD_CMDLINE_PARTS=y
diff --git a/arch/sh/configs/polaris_defconfig b/arch/sh/configs/polaris_defconfig
index 87641b7d6c4e..e3a1d3d2694a 100644
--- a/arch/sh/configs/polaris_defconfig
+++ b/arch/sh/configs/polaris_defconfig
@@ -37,7 +37,6 @@ CONFIG_IP_MULTICAST=y
37# CONFIG_INET_XFRM_MODE_TUNNEL is not set 37# CONFIG_INET_XFRM_MODE_TUNNEL is not set
38# CONFIG_INET_XFRM_MODE_BEET is not set 38# CONFIG_INET_XFRM_MODE_BEET is not set
39# CONFIG_IPV6 is not set 39# CONFIG_IPV6 is not set
40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
41CONFIG_MTD=y 40CONFIG_MTD=y
42CONFIG_MTD_CMDLINE_PARTS=y 41CONFIG_MTD_CMDLINE_PARTS=y
43CONFIG_MTD_BLOCK=y 42CONFIG_MTD_BLOCK=y
diff --git a/arch/sh/configs/r7780mp_defconfig b/arch/sh/configs/r7780mp_defconfig
index 435bcd66c667..0a18f8011c55 100644
--- a/arch/sh/configs/r7780mp_defconfig
+++ b/arch/sh/configs/r7780mp_defconfig
@@ -36,7 +36,6 @@ CONFIG_IP_PNP=y
36CONFIG_IP_PNP_DHCP=y 36CONFIG_IP_PNP_DHCP=y
37# CONFIG_IPV6 is not set 37# CONFIG_IPV6 is not set
38CONFIG_BRIDGE=m 38CONFIG_BRIDGE=m
39CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
40CONFIG_FW_LOADER=m 39CONFIG_FW_LOADER=m
41CONFIG_MTD=y 40CONFIG_MTD=y
42CONFIG_MTD_CFI=y 41CONFIG_MTD_CFI=y
diff --git a/arch/sh/configs/r7785rp_defconfig b/arch/sh/configs/r7785rp_defconfig
index 5877e6d1f285..7226ac5a1d44 100644
--- a/arch/sh/configs/r7785rp_defconfig
+++ b/arch/sh/configs/r7785rp_defconfig
@@ -43,7 +43,6 @@ CONFIG_IP_PNP=y
43CONFIG_IP_PNP_DHCP=y 43CONFIG_IP_PNP_DHCP=y
44# CONFIG_IPV6 is not set 44# CONFIG_IPV6 is not set
45CONFIG_BRIDGE=m 45CONFIG_BRIDGE=m
46CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
47CONFIG_FW_LOADER=m 46CONFIG_FW_LOADER=m
48CONFIG_BLK_DEV_RAM=y 47CONFIG_BLK_DEV_RAM=y
49CONFIG_BLK_DEV_SD=y 48CONFIG_BLK_DEV_SD=y
diff --git a/arch/sh/configs/rsk7201_defconfig b/arch/sh/configs/rsk7201_defconfig
index b195bc01e406..9f4f474705b7 100644
--- a/arch/sh/configs/rsk7201_defconfig
+++ b/arch/sh/configs/rsk7201_defconfig
@@ -31,7 +31,6 @@ CONFIG_BINFMT_ZFLAT=y
31CONFIG_BINFMT_SHARED_FLAT=y 31CONFIG_BINFMT_SHARED_FLAT=y
32CONFIG_PM=y 32CONFIG_PM=y
33CONFIG_CPU_IDLE=y 33CONFIG_CPU_IDLE=y
34CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
35# CONFIG_STANDALONE is not set 34# CONFIG_STANDALONE is not set
36# CONFIG_PREVENT_FIRMWARE_BUILD is not set 35# CONFIG_PREVENT_FIRMWARE_BUILD is not set
37# CONFIG_FW_LOADER is not set 36# CONFIG_FW_LOADER is not set
diff --git a/arch/sh/configs/rsk7203_defconfig b/arch/sh/configs/rsk7203_defconfig
index 8c471959bbc7..10a32bd4cf66 100644
--- a/arch/sh/configs/rsk7203_defconfig
+++ b/arch/sh/configs/rsk7203_defconfig
@@ -45,7 +45,6 @@ CONFIG_IP_PNP_DHCP=y
45# CONFIG_INET_XFRM_MODE_BEET is not set 45# CONFIG_INET_XFRM_MODE_BEET is not set
46# CONFIG_INET_DIAG is not set 46# CONFIG_INET_DIAG is not set
47# CONFIG_IPV6 is not set 47# CONFIG_IPV6 is not set
48CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
49# CONFIG_STANDALONE is not set 48# CONFIG_STANDALONE is not set
50# CONFIG_PREVENT_FIRMWARE_BUILD is not set 49# CONFIG_PREVENT_FIRMWARE_BUILD is not set
51# CONFIG_FW_LOADER is not set 50# CONFIG_FW_LOADER is not set
diff --git a/arch/sh/configs/rsk7264_defconfig b/arch/sh/configs/rsk7264_defconfig
index ad003ee469ea..2b0572b497c1 100644
--- a/arch/sh/configs/rsk7264_defconfig
+++ b/arch/sh/configs/rsk7264_defconfig
@@ -36,7 +36,6 @@ CONFIG_IP_PNP_DHCP=y
36# CONFIG_INET_XFRM_MODE_BEET is not set 36# CONFIG_INET_XFRM_MODE_BEET is not set
37# CONFIG_INET_DIAG is not set 37# CONFIG_INET_DIAG is not set
38# CONFIG_IPV6 is not set 38# CONFIG_IPV6 is not set
39CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
40# CONFIG_PREVENT_FIRMWARE_BUILD is not set 39# CONFIG_PREVENT_FIRMWARE_BUILD is not set
41# CONFIG_FW_LOADER is not set 40# CONFIG_FW_LOADER is not set
42CONFIG_BLK_DEV_LOOP=y 41CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/sh/configs/rsk7269_defconfig b/arch/sh/configs/rsk7269_defconfig
index 27fc01d58cf8..fb9fa7faf635 100644
--- a/arch/sh/configs/rsk7269_defconfig
+++ b/arch/sh/configs/rsk7269_defconfig
@@ -25,7 +25,6 @@ CONFIG_IP_PNP_DHCP=y
25# CONFIG_INET_XFRM_MODE_BEET is not set 25# CONFIG_INET_XFRM_MODE_BEET is not set
26# CONFIG_INET_DIAG is not set 26# CONFIG_INET_DIAG is not set
27# CONFIG_IPV6 is not set 27# CONFIG_IPV6 is not set
28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
29# CONFIG_FW_LOADER is not set 28# CONFIG_FW_LOADER is not set
30CONFIG_SCSI=y 29CONFIG_SCSI=y
31CONFIG_BLK_DEV_SD=y 30CONFIG_BLK_DEV_SD=y
diff --git a/arch/sh/configs/rts7751r2d1_defconfig b/arch/sh/configs/rts7751r2d1_defconfig
index 379d673f5ce8..6a3cfe08295f 100644
--- a/arch/sh/configs/rts7751r2d1_defconfig
+++ b/arch/sh/configs/rts7751r2d1_defconfig
@@ -22,7 +22,6 @@ CONFIG_PACKET=y
22CONFIG_UNIX=y 22CONFIG_UNIX=y
23CONFIG_INET=y 23CONFIG_INET=y
24# CONFIG_IPV6 is not set 24# CONFIG_IPV6 is not set
25CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
26CONFIG_FW_LOADER=m 25CONFIG_FW_LOADER=m
27CONFIG_BLK_DEV_RAM=y 26CONFIG_BLK_DEV_RAM=y
28CONFIG_BLK_DEV_SD=y 27CONFIG_BLK_DEV_SD=y
diff --git a/arch/sh/configs/rts7751r2dplus_defconfig b/arch/sh/configs/rts7751r2dplus_defconfig
index 11177bceda83..2b3d7d280672 100644
--- a/arch/sh/configs/rts7751r2dplus_defconfig
+++ b/arch/sh/configs/rts7751r2dplus_defconfig
@@ -22,7 +22,6 @@ CONFIG_PACKET=y
22CONFIG_UNIX=y 22CONFIG_UNIX=y
23CONFIG_INET=y 23CONFIG_INET=y
24# CONFIG_IPV6 is not set 24# CONFIG_IPV6 is not set
25CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
26CONFIG_FW_LOADER=m 25CONFIG_FW_LOADER=m
27CONFIG_MTD=y 26CONFIG_MTD=y
28CONFIG_MTD_CMDLINE_PARTS=y 27CONFIG_MTD_CMDLINE_PARTS=y
diff --git a/arch/sh/configs/sdk7780_defconfig b/arch/sh/configs/sdk7780_defconfig
index 95e5208b8260..d10a0414123a 100644
--- a/arch/sh/configs/sdk7780_defconfig
+++ b/arch/sh/configs/sdk7780_defconfig
@@ -41,7 +41,6 @@ CONFIG_IP_PNP_BOOTP=y
41CONFIG_IPV6=y 41CONFIG_IPV6=y
42# CONFIG_INET6_XFRM_MODE_BEET is not set 42# CONFIG_INET6_XFRM_MODE_BEET is not set
43CONFIG_NET_SCHED=y 43CONFIG_NET_SCHED=y
44CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45CONFIG_PARPORT=y 44CONFIG_PARPORT=y
46CONFIG_BLK_DEV_LOOP=y 45CONFIG_BLK_DEV_LOOP=y
47CONFIG_BLK_DEV_RAM=y 46CONFIG_BLK_DEV_RAM=y
diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig
index 5209889765ad..f7cfd7c3f237 100644
--- a/arch/sh/configs/sdk7786_defconfig
+++ b/arch/sh/configs/sdk7786_defconfig
@@ -91,7 +91,6 @@ CONFIG_IP_PNP=y
91CONFIG_IP_PNP_DHCP=y 91CONFIG_IP_PNP_DHCP=y
92# CONFIG_IPV6 is not set 92# CONFIG_IPV6 is not set
93# CONFIG_WIRELESS is not set 93# CONFIG_WIRELESS is not set
94CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
95# CONFIG_FW_LOADER is not set 94# CONFIG_FW_LOADER is not set
96CONFIG_MTD=y 95CONFIG_MTD=y
97CONFIG_MTD_CMDLINE_PARTS=y 96CONFIG_MTD_CMDLINE_PARTS=y
diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig
index 3553acd5edb1..a93402b3a319 100644
--- a/arch/sh/configs/se7206_defconfig
+++ b/arch/sh/configs/se7206_defconfig
@@ -58,7 +58,6 @@ CONFIG_IP_PNP_DHCP=y
58# CONFIG_INET_XFRM_MODE_BEET is not set 58# CONFIG_INET_XFRM_MODE_BEET is not set
59# CONFIG_INET_DIAG is not set 59# CONFIG_INET_DIAG is not set
60# CONFIG_IPV6 is not set 60# CONFIG_IPV6 is not set
61CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
62# CONFIG_STANDALONE is not set 61# CONFIG_STANDALONE is not set
63# CONFIG_PREVENT_FIRMWARE_BUILD is not set 62# CONFIG_PREVENT_FIRMWARE_BUILD is not set
64# CONFIG_FW_LOADER is not set 63# CONFIG_FW_LOADER is not set
diff --git a/arch/sh/configs/se7343_defconfig b/arch/sh/configs/se7343_defconfig
index fc77a67b16e7..06d067c842cd 100644
--- a/arch/sh/configs/se7343_defconfig
+++ b/arch/sh/configs/se7343_defconfig
@@ -28,7 +28,6 @@ CONFIG_INET=y
28CONFIG_SYN_COOKIES=y 28CONFIG_SYN_COOKIES=y
29# CONFIG_INET_DIAG is not set 29# CONFIG_INET_DIAG is not set
30# CONFIG_IPV6 is not set 30# CONFIG_IPV6 is not set
31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32CONFIG_MTD=y 31CONFIG_MTD=y
33CONFIG_MTD_BLOCK=y 32CONFIG_MTD_BLOCK=y
34CONFIG_MTD_CFI=y 33CONFIG_MTD_CFI=y
diff --git a/arch/sh/configs/se7712_defconfig b/arch/sh/configs/se7712_defconfig
index 5a1097641247..6ac7d362e106 100644
--- a/arch/sh/configs/se7712_defconfig
+++ b/arch/sh/configs/se7712_defconfig
@@ -64,7 +64,6 @@ CONFIG_NET_CLS_TCINDEX=y
64CONFIG_NET_CLS_ROUTE4=y 64CONFIG_NET_CLS_ROUTE4=y
65CONFIG_NET_CLS_FW=y 65CONFIG_NET_CLS_FW=y
66CONFIG_NET_CLS_IND=y 66CONFIG_NET_CLS_IND=y
67CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
68CONFIG_MTD=y 67CONFIG_MTD=y
69CONFIG_MTD_BLOCK=y 68CONFIG_MTD_BLOCK=y
70CONFIG_MTD_CFI=y 69CONFIG_MTD_CFI=y
diff --git a/arch/sh/configs/se7721_defconfig b/arch/sh/configs/se7721_defconfig
index 9c0ef13bee10..ffd15acc2a04 100644
--- a/arch/sh/configs/se7721_defconfig
+++ b/arch/sh/configs/se7721_defconfig
@@ -63,7 +63,6 @@ CONFIG_NET_CLS_TCINDEX=y
63CONFIG_NET_CLS_ROUTE4=y 63CONFIG_NET_CLS_ROUTE4=y
64CONFIG_NET_CLS_FW=y 64CONFIG_NET_CLS_FW=y
65CONFIG_NET_CLS_IND=y 65CONFIG_NET_CLS_IND=y
66CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
67CONFIG_MTD=y 66CONFIG_MTD=y
68CONFIG_MTD_BLOCK=y 67CONFIG_MTD_BLOCK=y
69CONFIG_MTD_CFI=y 68CONFIG_MTD_CFI=y
diff --git a/arch/sh/configs/se7722_defconfig b/arch/sh/configs/se7722_defconfig
index ccc7fc423fde..88bf9e849008 100644
--- a/arch/sh/configs/se7722_defconfig
+++ b/arch/sh/configs/se7722_defconfig
@@ -26,7 +26,6 @@ CONFIG_PACKET=y
26CONFIG_UNIX=y 26CONFIG_UNIX=y
27CONFIG_INET=y 27CONFIG_INET=y
28# CONFIG_IPV6 is not set 28# CONFIG_IPV6 is not set
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30# CONFIG_FW_LOADER is not set 29# CONFIG_FW_LOADER is not set
31CONFIG_BLK_DEV_RAM=y 30CONFIG_BLK_DEV_RAM=y
32CONFIG_BLK_DEV_SD=y 31CONFIG_BLK_DEV_SD=y
diff --git a/arch/sh/configs/se7724_defconfig b/arch/sh/configs/se7724_defconfig
index 9f6d46d58554..0e8d5cc1e107 100644
--- a/arch/sh/configs/se7724_defconfig
+++ b/arch/sh/configs/se7724_defconfig
@@ -30,7 +30,6 @@ CONFIG_IP_PNP_DHCP=y
30# CONFIG_INET_XFRM_MODE_TUNNEL is not set 30# CONFIG_INET_XFRM_MODE_TUNNEL is not set
31# CONFIG_INET_XFRM_MODE_BEET is not set 31# CONFIG_INET_XFRM_MODE_BEET is not set
32# CONFIG_IPV6 is not set 32# CONFIG_IPV6 is not set
33CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
34CONFIG_MTD=y 33CONFIG_MTD=y
35CONFIG_MTD_CMDLINE_PARTS=y 34CONFIG_MTD_CMDLINE_PARTS=y
36CONFIG_MTD_BLOCK=y 35CONFIG_MTD_BLOCK=y
diff --git a/arch/sh/configs/sh03_defconfig b/arch/sh/configs/sh03_defconfig
index 489ffdfb1517..e5beb625ab88 100644
--- a/arch/sh/configs/sh03_defconfig
+++ b/arch/sh/configs/sh03_defconfig
@@ -34,7 +34,6 @@ CONFIG_IP_PNP_DHCP=y
34CONFIG_IP_PNP_BOOTP=y 34CONFIG_IP_PNP_BOOTP=y
35CONFIG_IP_PNP_RARP=y 35CONFIG_IP_PNP_RARP=y
36# CONFIG_IPV6 is not set 36# CONFIG_IPV6 is not set
37CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
38# CONFIG_STANDALONE is not set 37# CONFIG_STANDALONE is not set
39# CONFIG_PREVENT_FIRMWARE_BUILD is not set 38# CONFIG_PREVENT_FIRMWARE_BUILD is not set
40# CONFIG_FW_LOADER is not set 39# CONFIG_FW_LOADER is not set
diff --git a/arch/sh/configs/sh2007_defconfig b/arch/sh/configs/sh2007_defconfig
index a1cf6447dbb1..ee880efd0d5b 100644
--- a/arch/sh/configs/sh2007_defconfig
+++ b/arch/sh/configs/sh2007_defconfig
@@ -44,7 +44,6 @@ CONFIG_NET_IPIP=y
44# CONFIG_IPV6 is not set 44# CONFIG_IPV6 is not set
45CONFIG_NETWORK_SECMARK=y 45CONFIG_NETWORK_SECMARK=y
46CONFIG_NET_PKTGEN=y 46CONFIG_NET_PKTGEN=y
47CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
48CONFIG_BLK_DEV_LOOP=y 47CONFIG_BLK_DEV_LOOP=y
49CONFIG_BLK_DEV_RAM=y 48CONFIG_BLK_DEV_RAM=y
50CONFIG_CDROM_PKTCDVD=y 49CONFIG_CDROM_PKTCDVD=y
diff --git a/arch/sh/configs/sh7710voipgw_defconfig b/arch/sh/configs/sh7710voipgw_defconfig
index 65a1aad899c8..c86f28442a80 100644
--- a/arch/sh/configs/sh7710voipgw_defconfig
+++ b/arch/sh/configs/sh7710voipgw_defconfig
@@ -32,7 +32,6 @@ CONFIG_NET_CLS_BASIC=y
32CONFIG_NET_CLS_TCINDEX=y 32CONFIG_NET_CLS_TCINDEX=y
33CONFIG_NET_CLS_ROUTE4=y 33CONFIG_NET_CLS_ROUTE4=y
34CONFIG_NET_CLS_U32=y 34CONFIG_NET_CLS_U32=y
35CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
36CONFIG_MTD=y 35CONFIG_MTD=y
37CONFIG_MTD_BLOCK=y 36CONFIG_MTD_BLOCK=y
38CONFIG_MTD_CFI=y 37CONFIG_MTD_CFI=y
diff --git a/arch/sh/configs/sh7724_generic_defconfig b/arch/sh/configs/sh7724_generic_defconfig
index d04bc27aa816..9adee9010319 100644
--- a/arch/sh/configs/sh7724_generic_defconfig
+++ b/arch/sh/configs/sh7724_generic_defconfig
@@ -15,7 +15,6 @@ CONFIG_KEXEC=y
15CONFIG_KEXEC_JUMP=y 15CONFIG_KEXEC_JUMP=y
16CONFIG_HIBERNATION=y 16CONFIG_HIBERNATION=y
17CONFIG_CPU_IDLE=y 17CONFIG_CPU_IDLE=y
18CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
19# CONFIG_PREVENT_FIRMWARE_BUILD is not set 18# CONFIG_PREVENT_FIRMWARE_BUILD is not set
20# CONFIG_INPUT is not set 19# CONFIG_INPUT is not set
21# CONFIG_SERIO is not set 20# CONFIG_SERIO is not set
diff --git a/arch/sh/configs/sh7757lcr_defconfig b/arch/sh/configs/sh7757lcr_defconfig
index b0c4bc830fb8..9f2aed0b3bca 100644
--- a/arch/sh/configs/sh7757lcr_defconfig
+++ b/arch/sh/configs/sh7757lcr_defconfig
@@ -33,7 +33,6 @@ CONFIG_IP_PNP=y
33CONFIG_IP_PNP_DHCP=y 33CONFIG_IP_PNP_DHCP=y
34CONFIG_IPV6=y 34CONFIG_IPV6=y
35# CONFIG_WIRELESS is not set 35# CONFIG_WIRELESS is not set
36CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
37# CONFIG_FW_LOADER is not set 36# CONFIG_FW_LOADER is not set
38CONFIG_MTD=y 37CONFIG_MTD=y
39CONFIG_MTD_BLOCK=y 38CONFIG_MTD_BLOCK=y
diff --git a/arch/sh/configs/sh7763rdp_defconfig b/arch/sh/configs/sh7763rdp_defconfig
index 405bf62d22d0..d0a0aa74cecf 100644
--- a/arch/sh/configs/sh7763rdp_defconfig
+++ b/arch/sh/configs/sh7763rdp_defconfig
@@ -26,7 +26,6 @@ CONFIG_IP_PNP=y
26CONFIG_IP_PNP_DHCP=y 26CONFIG_IP_PNP_DHCP=y
27CONFIG_IP_PNP_BOOTP=y 27CONFIG_IP_PNP_BOOTP=y
28# CONFIG_IPV6 is not set 28# CONFIG_IPV6 is not set
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_MTD=y 29CONFIG_MTD=y
31CONFIG_MTD_CMDLINE_PARTS=y 30CONFIG_MTD_CMDLINE_PARTS=y
32CONFIG_MTD_BLKDEVS=y 31CONFIG_MTD_BLKDEVS=y
diff --git a/arch/sh/configs/sh7770_generic_defconfig b/arch/sh/configs/sh7770_generic_defconfig
index e5b733c2d988..c17590f0df67 100644
--- a/arch/sh/configs/sh7770_generic_defconfig
+++ b/arch/sh/configs/sh7770_generic_defconfig
@@ -17,7 +17,6 @@ CONFIG_KEXEC_JUMP=y
17CONFIG_PM=y 17CONFIG_PM=y
18CONFIG_HIBERNATION=y 18CONFIG_HIBERNATION=y
19CONFIG_CPU_IDLE=y 19CONFIG_CPU_IDLE=y
20CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
21# CONFIG_PREVENT_FIRMWARE_BUILD is not set 20# CONFIG_PREVENT_FIRMWARE_BUILD is not set
22# CONFIG_INPUT is not set 21# CONFIG_INPUT is not set
23# CONFIG_SERIO is not set 22# CONFIG_SERIO is not set
diff --git a/arch/sh/configs/sh7785lcr_32bit_defconfig b/arch/sh/configs/sh7785lcr_32bit_defconfig
index a89ccc15af23..9b885c14c400 100644
--- a/arch/sh/configs/sh7785lcr_32bit_defconfig
+++ b/arch/sh/configs/sh7785lcr_32bit_defconfig
@@ -43,7 +43,6 @@ CONFIG_IP_ADVANCED_ROUTER=y
43CONFIG_IP_PNP=y 43CONFIG_IP_PNP=y
44CONFIG_IP_PNP_DHCP=y 44CONFIG_IP_PNP_DHCP=y
45# CONFIG_IPV6 is not set 45# CONFIG_IPV6 is not set
46CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
47CONFIG_MTD=y 46CONFIG_MTD=y
48CONFIG_MTD_BLOCK=y 47CONFIG_MTD_BLOCK=y
49CONFIG_MTD_CFI=y 48CONFIG_MTD_CFI=y
diff --git a/arch/sh/configs/sh7785lcr_defconfig b/arch/sh/configs/sh7785lcr_defconfig
index 5201bb78c6f9..1b88929083f7 100644
--- a/arch/sh/configs/sh7785lcr_defconfig
+++ b/arch/sh/configs/sh7785lcr_defconfig
@@ -26,7 +26,6 @@ CONFIG_IP_ADVANCED_ROUTER=y
26CONFIG_IP_PNP=y 26CONFIG_IP_PNP=y
27CONFIG_IP_PNP_DHCP=y 27CONFIG_IP_PNP_DHCP=y
28# CONFIG_IPV6 is not set 28# CONFIG_IPV6 is not set
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30# CONFIG_FW_LOADER is not set 29# CONFIG_FW_LOADER is not set
31CONFIG_MTD=y 30CONFIG_MTD=y
32CONFIG_MTD_BLOCK=y 31CONFIG_MTD_BLOCK=y
diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig
index 755c4f73c718..dc2be2514b62 100644
--- a/arch/sh/configs/shx3_defconfig
+++ b/arch/sh/configs/shx3_defconfig
@@ -59,7 +59,6 @@ CONFIG_CAN=m
59CONFIG_CAN_RAW=m 59CONFIG_CAN_RAW=m
60CONFIG_CAN_BCM=m 60CONFIG_CAN_BCM=m
61CONFIG_CAN_VCAN=m 61CONFIG_CAN_VCAN=m
62CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
63# CONFIG_FW_LOADER is not set 62# CONFIG_FW_LOADER is not set
64CONFIG_BLK_DEV_RAM=y 63CONFIG_BLK_DEV_RAM=y
65CONFIG_BLK_DEV_SD=y 64CONFIG_BLK_DEV_SD=y
diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig
index 822fa9e96f74..1c1c78e74fbb 100644
--- a/arch/sh/configs/titan_defconfig
+++ b/arch/sh/configs/titan_defconfig
@@ -143,7 +143,6 @@ CONFIG_NET_ACT_MIRRED=m
143CONFIG_NET_ACT_IPT=m 143CONFIG_NET_ACT_IPT=m
144CONFIG_NET_ACT_PEDIT=m 144CONFIG_NET_ACT_PEDIT=m
145CONFIG_NET_CLS_IND=y 145CONFIG_NET_CLS_IND=y
146CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
147CONFIG_FW_LOADER=m 146CONFIG_FW_LOADER=m
148CONFIG_CONNECTOR=m 147CONFIG_CONNECTOR=m
149CONFIG_MTD=m 148CONFIG_MTD=m
diff --git a/arch/sh/configs/ul2_defconfig b/arch/sh/configs/ul2_defconfig
index 1b7412df12e0..dc2e3061130f 100644
--- a/arch/sh/configs/ul2_defconfig
+++ b/arch/sh/configs/ul2_defconfig
@@ -33,7 +33,6 @@ CONFIG_CFG80211=y
33CONFIG_MAC80211=y 33CONFIG_MAC80211=y
34CONFIG_MAC80211_RC_PID=y 34CONFIG_MAC80211_RC_PID=y
35# CONFIG_MAC80211_RC_MINSTREL is not set 35# CONFIG_MAC80211_RC_MINSTREL is not set
36CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
37CONFIG_MTD=y 36CONFIG_MTD=y
38CONFIG_MTD_BLOCK=y 37CONFIG_MTD_BLOCK=y
39CONFIG_MTD_CFI=y 38CONFIG_MTD_CFI=y
diff --git a/arch/sh/configs/urquell_defconfig b/arch/sh/configs/urquell_defconfig
index f891045e633a..cb2f56468fe0 100644
--- a/arch/sh/configs/urquell_defconfig
+++ b/arch/sh/configs/urquell_defconfig
@@ -46,7 +46,6 @@ CONFIG_IP_ADVANCED_ROUTER=y
46CONFIG_IP_PNP=y 46CONFIG_IP_PNP=y
47CONFIG_IP_PNP_DHCP=y 47CONFIG_IP_PNP_DHCP=y
48# CONFIG_IPV6 is not set 48# CONFIG_IPV6 is not set
49CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
50# CONFIG_FW_LOADER is not set 49# CONFIG_FW_LOADER is not set
51CONFIG_MTD=y 50CONFIG_MTD=y
52CONFIG_MTD_BLOCK=y 51CONFIG_MTD_BLOCK=y