diff options
| author | Linus Torvalds | 2019-07-17 09:34:10 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2019-07-17 09:34:10 -0700 |
| commit | 415bfd9cdb175cf870fb173ae9d3958862de2c97 (patch) | |
| tree | 1a240acba43e2abbc7fc45ca038f57908fbb71e1 /arch/sh/configs/titan_defconfig | |
| parent | 57a8ec387e1441ea5e1232bc0749fb99a8cba7e7 (diff) | |
| parent | d3023897b4370bbf7f289806667a2380576d13dd (diff) | |
Merge tag 'for-linus-20190617' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux
Pull SH updates from Yoshinori Sato.
kprobe fix, defconfig updates and a SH Kconfig fix.
* tag 'for-linus-20190617' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux:
arch/sh: Check for kprobe trap number before trying to handle a kprobe trap
sh: configs: Remove useless UEVENT_HELPER_PATH
Fix allyesconfig output.
Diffstat (limited to 'arch/sh/configs/titan_defconfig')
| -rw-r--r-- | arch/sh/configs/titan_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig index 171ab05ce4fc..4ec961ace688 100644 --- a/arch/sh/configs/titan_defconfig +++ b/arch/sh/configs/titan_defconfig @@ -142,7 +142,6 @@ CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_PEDIT=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_FW_LOADER=m CONFIG_CONNECTOR=m CONFIG_MTD=m |