diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2021-05-08 13:12:55 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2021-05-08 13:12:55 +0200 |
| commit | f96271cefe6dfd1cb04195b76f4a33e185cd7f92 (patch) | |
| tree | f290b3e7aa9c12fdc4853ce97c150c4f9abd90a3 /arch/sh/configs/sh7785lcr_32bit_defconfig | |
| parent | KVM: PPC: Book3S HV: Fix conversion to gfn-based MMU notifier callbacks (diff) | |
| parent | Merge tag 'tag-chrome-platform-for-v5.13' of git://git.kernel.org/pub/scm/lin... (diff) | |
| download | linux-f96271cefe6dfd1cb04195b76f4a33e185cd7f92.tar.xz linux-f96271cefe6dfd1cb04195b76f4a33e185cd7f92.zip | |
Merge branch 'master' into next
Merge master back into next, this allows us to resolve some conflicts in
arch/powerpc/Kconfig, and also re-sort the symbols under config PPC so
that they are in alphabetical order again.
Diffstat (limited to 'arch/sh/configs/sh7785lcr_32bit_defconfig')
| -rw-r--r-- | arch/sh/configs/sh7785lcr_32bit_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/configs/sh7785lcr_32bit_defconfig b/arch/sh/configs/sh7785lcr_32bit_defconfig index 9b885c14c400..5c725c75fcef 100644 --- a/arch/sh/configs/sh7785lcr_32bit_defconfig +++ b/arch/sh/configs/sh7785lcr_32bit_defconfig @@ -66,7 +66,6 @@ CONFIG_INPUT_FF_MEMLESS=m CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVBUG=m CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_DEVKMEM is not set CONFIG_SERIAL_SH_SCI=y CONFIG_SERIAL_SH_SCI_NR_UARTS=6 CONFIG_SERIAL_SH_SCI_CONSOLE=y |