From: Olof Johansson Date: Fri, 3 Jun 2016 19:15:00 +0000 (-0700) Subject: Merge tag 'samsung-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk... X-Git-Tag: v4.7-rc4~3^2~13 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=c3d66602e0bb93c8070a02a901cc80963b5482b9 Merge tag 'samsung-fixes-4.7' of git://git./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 --- c3d66602e0bb93c8070a02a901cc80963b5482b9