diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 18:34:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 18:34:10 +0200 |
| commit | 415bfd9cdb175cf870fb173ae9d3958862de2c97 (patch) | |
| tree | 1a240acba43e2abbc7fc45ca038f57908fbb71e1 /arch/sh/configs/hp6xx_defconfig | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | arch/sh: Check for kprobe trap number before trying to handle a kprobe trap (diff) | |
| download | linux-415bfd9cdb175cf870fb173ae9d3958862de2c97.tar.xz linux-415bfd9cdb175cf870fb173ae9d3958862de2c97.zip | |
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/hp6xx_defconfig')
| -rw-r--r-- | arch/sh/configs/hp6xx_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/configs/hp6xx_defconfig b/arch/sh/configs/hp6xx_defconfig index 91d43e2bffea..a92db6694ce2 100644 --- a/arch/sh/configs/hp6xx_defconfig +++ b/arch/sh/configs/hp6xx_defconfig @@ -18,7 +18,6 @@ CONFIG_HD64461_ENABLER=y CONFIG_PCCARD=y CONFIG_PM=y CONFIG_APM_EMULATION=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_STANDALONE is not set CONFIG_BLK_DEV_SD=y CONFIG_ATA=y |