diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-06-11 11:56:57 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-06-11 11:56:57 +0200 |
| commit | 5da9a1a7871aeabf916b1b2d0176732a682ab5d5 (patch) | |
| tree | 0895e41a0990a97ddee2d8d677ab788342ccbf96 /config-arm-generic | |
| parent | 20499dcef9eacf0025870ddf83edcf30f4b7f988 (diff) | |
| parent | 015d26a2a39e37cc7732e4fd96da10fd23f194ad (diff) | |
| download | kernel-4.7.0-0.rc2.git3.1.vanilla.knurd.1.fc24.tar.gz kernel-4.7.0-0.rc2.git3.1.vanilla.knurd.1.fc24.tar.xz kernel-4.7.0-0.rc2.git3.1.vanilla.knurd.1.fc24.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc2.git3.1.vanilla.knurd.1.fc25kernel-4.7.0-0.rc2.git3.1.vanilla.knurd.1.fc24kernel-4.7.0-0.rc2.git3.1.vanilla.knurd.1.fc23kernel-4.7.0-0.rc2.git3.1.vanilla.knurd.1.fc22
Diffstat (limited to 'config-arm-generic')
| -rw-r--r-- | config-arm-generic | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config-arm-generic b/config-arm-generic index eae9b5087..8e8c8d8f8 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -131,8 +131,9 @@ CONFIG_ROCKCHIP_THERMAL=m CONFIG_DRM_ROCKCHIP=m CONFIG_ROCKCHIP_ANALOGIX_DP=m CONFIG_ROCKCHIP_DW_HDMI=m -CONFIG_ROCKCHIP_DW_MIPI_DSI=y +CONFIG_ROCKCHIP_DW_MIPI_DSI=m CONFIG_ROCKCHIP_INNO_HDMI=m +CONFIG_DRM_ANALOGIX_DP=m CONFIG_PHY_ROCKCHIP_USB=m CONFIG_DWMAC_ROCKCHIP=m CONFIG_SND_SOC_ROCKCHIP=m @@ -428,6 +429,10 @@ CONFIG_PINCTRL=y CONFIG_GENERIC_PINCONF=y CONFIG_PINCTRL_SINGLE=y +# gpio +CONFIG_GPIO_PCA953X=y +CONFIG_GPIO_PCA953X_IRQ=y + #i2c CONFIG_I2C_ARB_GPIO_CHALLENGE=m CONFIG_I2C_BOARDINFO=y |