diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2017-07-10 15:28:19 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2017-07-27 16:06:22 +0200 |
| commit | e4c4bdbacdfe8e6d6b7b3fcc58fdd2141915b915 (patch) | |
| tree | 926f5e0d2c0f5a540fac1a4522a455e29361bbd4 /arch/arm/configs/shmobile_defconfig | |
| parent | 01b274b46468d56a036a024f9f04d709bcddd8f5 (diff) | |
ARM: shmobile: defconfig: Refresh
- Several options were moved,
- INPUT_MOUSEDEV_PSAUX is no longer enabled by default since commit
73d8ef76006b649f ("Input: mousedev - stop offering PS/2 to userspace
by default").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/configs/shmobile_defconfig')
| -rw-r--r-- | arch/arm/configs/shmobile_defconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index e9cc8a557e80..18886c53424a 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -90,9 +90,8 @@ CONFIG_SMSC911X=y # CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_WIZNET is not set -CONFIG_SMSC_PHY=y CONFIG_MICREL_PHY=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_SMSC_PHY=y CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_GPIO=y # CONFIG_INPUT_MOUSE is not set @@ -124,9 +123,9 @@ CONFIG_SPI_SH_HSPI=y CONFIG_GPIO_EM=y CONFIG_GPIO_RCAR=y CONFIG_GPIO_PCF857X=y -CONFIG_POWER_SUPPLY=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_RMOBILE=y +CONFIG_POWER_SUPPLY=y # CONFIG_HWMON is not set CONFIG_THERMAL=y CONFIG_CPU_THERMAL=y |