diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2019-07-29 18:51:48 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2019-07-29 18:51:48 +0300 |
| commit | ed32f8d42cee118b075e4372a55c7739a11094b2 (patch) | |
| tree | 5a806c5168d4177e0536b98b6bda30ec4bdbac43 /arch/um/configs/i386_defconfig | |
| parent | 60a4233a4952729089e4df152e730f8f4d0e82ce (diff) | |
| parent | 5f9e832c137075045d15cd6899ab0505cfb2ca4b (diff) | |
| download | linux-ed32f8d42cee118b075e4372a55c7739a11094b2.tar.xz | |
Merge drm/drm-next into drm-intel-next-queued
Catching up with 5.3-rc*
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'arch/um/configs/i386_defconfig')
| -rw-r--r-- | arch/um/configs/i386_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/configs/i386_defconfig b/arch/um/configs/i386_defconfig index 8f114e3b0a7a..73e98bb57bf5 100644 --- a/arch/um/configs/i386_defconfig +++ b/arch/um/configs/i386_defconfig @@ -36,7 +36,6 @@ CONFIG_XTERM_CHAN=y CONFIG_CON_CHAN="pts" CONFIG_SSL_CHAN="pts" CONFIG_UML_SOUND=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_BLK_DEV_UBD=y |