diff options
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 1aab5350212e..cc60a6506319 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig | |||
| @@ -289,6 +289,7 @@ CONFIG_MOUSE_ELAN_I2C=y | |||
| 289 | CONFIG_INPUT_TOUCHSCREEN=y | 289 | CONFIG_INPUT_TOUCHSCREEN=y |
| 290 | CONFIG_TOUCHSCREEN_ADC=m | 290 | CONFIG_TOUCHSCREEN_ADC=m |
| 291 | CONFIG_TOUCHSCREEN_ATMEL_MXT=m | 291 | CONFIG_TOUCHSCREEN_ATMEL_MXT=m |
| 292 | CONFIG_TOUCHSCREEN_ELAN=m | ||
| 292 | CONFIG_TOUCHSCREEN_MMS114=m | 293 | CONFIG_TOUCHSCREEN_MMS114=m |
| 293 | CONFIG_TOUCHSCREEN_WM97XX=m | 294 | CONFIG_TOUCHSCREEN_WM97XX=m |
| 294 | CONFIG_TOUCHSCREEN_ST1232=m | 295 | CONFIG_TOUCHSCREEN_ST1232=m |
| @@ -351,6 +352,8 @@ CONFIG_SERIAL_DEV_BUS=y | |||
| 351 | CONFIG_VIRTIO_CONSOLE=y | 352 | CONFIG_VIRTIO_CONSOLE=y |
| 352 | CONFIG_HW_RANDOM=y | 353 | CONFIG_HW_RANDOM=y |
| 353 | CONFIG_HW_RANDOM_ST=y | 354 | CONFIG_HW_RANDOM_ST=y |
| 355 | CONFIG_TCG_TPM=m | ||
| 356 | CONFIG_TCG_TIS_I2C_INFINEON=m | ||
| 354 | CONFIG_I2C_CHARDEV=y | 357 | CONFIG_I2C_CHARDEV=y |
| 355 | CONFIG_I2C_ARB_GPIO_CHALLENGE=m | 358 | CONFIG_I2C_ARB_GPIO_CHALLENGE=m |
| 356 | CONFIG_I2C_MUX_PCA954x=y | 359 | CONFIG_I2C_MUX_PCA954x=y |
| @@ -447,9 +450,11 @@ CONFIG_POWER_RESET_RMOBILE=y | |||
| 447 | CONFIG_BATTERY_ACT8945A=y | 450 | CONFIG_BATTERY_ACT8945A=y |
| 448 | CONFIG_BATTERY_CPCAP=m | 451 | CONFIG_BATTERY_CPCAP=m |
| 449 | CONFIG_BATTERY_SBS=y | 452 | CONFIG_BATTERY_SBS=y |
| 453 | CONFIG_BATTERY_BQ27XXX=m | ||
| 450 | CONFIG_AXP20X_POWER=m | 454 | CONFIG_AXP20X_POWER=m |
| 451 | CONFIG_BATTERY_MAX17040=m | 455 | CONFIG_BATTERY_MAX17040=m |
| 452 | CONFIG_BATTERY_MAX17042=m | 456 | CONFIG_BATTERY_MAX17042=m |
| 457 | CONFIG_CHARGER_GPIO=m | ||
| 453 | CONFIG_CHARGER_CPCAP=m | 458 | CONFIG_CHARGER_CPCAP=m |
| 454 | CONFIG_CHARGER_MAX14577=m | 459 | CONFIG_CHARGER_MAX14577=m |
| 455 | CONFIG_CHARGER_MAX77693=m | 460 | CONFIG_CHARGER_MAX77693=m |
| @@ -507,6 +512,9 @@ CONFIG_MFD_AC100=y | |||
| 507 | CONFIG_MFD_AXP20X_I2C=y | 512 | CONFIG_MFD_AXP20X_I2C=y |
| 508 | CONFIG_MFD_AXP20X_RSB=y | 513 | CONFIG_MFD_AXP20X_RSB=y |
| 509 | CONFIG_MFD_CROS_EC=m | 514 | CONFIG_MFD_CROS_EC=m |
| 515 | CONFIG_CROS_EC_I2C=m | ||
| 516 | CONFIG_CROS_EC_SPI=m | ||
| 517 | CONFIG_MFD_CROS_EC_CHARDEV=m | ||
| 510 | CONFIG_MFD_DA9063=m | 518 | CONFIG_MFD_DA9063=m |
| 511 | CONFIG_MFD_MAX14577=y | 519 | CONFIG_MFD_MAX14577=y |
| 512 | CONFIG_MFD_MAX77686=y | 520 | CONFIG_MFD_MAX77686=y |
| @@ -889,8 +897,6 @@ CONFIG_SERIO_NVEC_PS2=y | |||
| 889 | CONFIG_NVEC_POWER=y | 897 | CONFIG_NVEC_POWER=y |
| 890 | CONFIG_NVEC_PAZ00=y | 898 | CONFIG_NVEC_PAZ00=y |
| 891 | CONFIG_STAGING_BOARD=y | 899 | CONFIG_STAGING_BOARD=y |
| 892 | CONFIG_CROS_EC_I2C=m | ||
| 893 | CONFIG_CROS_EC_SPI=m | ||
| 894 | CONFIG_COMMON_CLK_MAX77686=y | 900 | CONFIG_COMMON_CLK_MAX77686=y |
| 895 | CONFIG_COMMON_CLK_RK808=m | 901 | CONFIG_COMMON_CLK_RK808=m |
| 896 | CONFIG_COMMON_CLK_S2MPS11=m | 902 | CONFIG_COMMON_CLK_S2MPS11=m |
| @@ -953,8 +959,12 @@ CONFIG_VF610_ADC=m | |||
| 953 | CONFIG_XILINX_XADC=y | 959 | CONFIG_XILINX_XADC=y |
| 954 | CONFIG_STM32_LPTIMER_CNT=m | 960 | CONFIG_STM32_LPTIMER_CNT=m |
| 955 | CONFIG_STM32_DAC=m | 961 | CONFIG_STM32_DAC=m |
| 962 | CONFIG_ROCKCHIP_SARADC=m | ||
| 963 | CONFIG_IIO_CROS_EC_SENSORS_CORE=m | ||
| 964 | CONFIG_IIO_CROS_EC_SENSORS=m | ||
| 956 | CONFIG_MPU3050_I2C=y | 965 | CONFIG_MPU3050_I2C=y |
| 957 | CONFIG_CM36651=m | 966 | CONFIG_CM36651=m |
| 967 | CONFIG_IIO_CROS_EC_LIGHT_PROX=m | ||
| 958 | CONFIG_SENSORS_ISL29018=y | 968 | CONFIG_SENSORS_ISL29018=y |
| 959 | CONFIG_SENSORS_ISL29028=y | 969 | CONFIG_SENSORS_ISL29028=y |
| 960 | CONFIG_AK8975=y | 970 | CONFIG_AK8975=y |
| @@ -1001,6 +1011,7 @@ CONFIG_OMAP_USB2=y | |||
| 1001 | CONFIG_TI_PIPE3=y | 1011 | CONFIG_TI_PIPE3=y |
| 1002 | CONFIG_TWL4030_USB=m | 1012 | CONFIG_TWL4030_USB=m |
| 1003 | CONFIG_MESON_MX_EFUSE=m | 1013 | CONFIG_MESON_MX_EFUSE=m |
| 1014 | CONFIG_ROCKCHIP_EFUSE=m | ||
| 1004 | CONFIG_NVMEM_IMX_OCOTP=y | 1015 | CONFIG_NVMEM_IMX_OCOTP=y |
| 1005 | CONFIG_NVMEM_SUNXI_SID=y | 1016 | CONFIG_NVMEM_SUNXI_SID=y |
| 1006 | CONFIG_NVMEM_VF610_OCOTP=y | 1017 | CONFIG_NVMEM_VF610_OCOTP=y |
