diff options
| author | Olof Johansson <olof@lixom.net> | 2016-06-03 22:15:00 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-06-03 22:15:00 +0300 |
| commit | c3d66602e0bb93c8070a02a901cc80963b5482b9 (patch) | |
| tree | 09f02c7de834207a36b29ca940303300074dd7a1 /arch/arm/mach-exynos | |
| parent | 15b7cc78f0951e418c940d8b3b6a7a3b962b7748 (diff) | |
| parent | 8a6f71ccb6c39ca5ae442d1478d3a076e2b1361e (diff) | |
| download | linux-c3d66602e0bb93c8070a02a901cc80963b5482b9.tar.xz | |
Merge tag 'samsung-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into fixes
Two fixes for v4.7 cycle for build issues:
1. Fix samsung-keypad build error if INPUT is selected as module.
The error though depends on some uncommon build settings so it
is not as easy to trigger.
2. Get rid of 'samsung_device_dma_mask' defined but not used warning.
* tag 'samsung-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: exynos: don't select keyboard driver
ARM: samsung: improve static dma_mask definition
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-exynos')
| -rw-r--r-- | arch/arm/mach-exynos/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index e65aa7d11b20..20dcf6e904b2 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -61,7 +61,6 @@ config ARCH_EXYNOS4 select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 select CPU_EXYNOS4210 select GIC_NON_BANKED - select KEYBOARD_SAMSUNG if INPUT_KEYBOARD select MIGHT_HAVE_CACHE_L2X0 help Samsung EXYNOS4 (Cortex-A9) SoC based systems |