Messages in this thread | | | Date | Mon, 23 Nov 2015 10:09:17 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the sunxi tree with the samsung-krzk tree |
| |
Hi Maxime,
Today's linux-next merge of the sunxi tree got a conflict in:
arch/arm/configs/multi_v7_defconfig
between commit:
23a526f0478c ("ARM: multi_v7_defconfig: Build ChromeOS EC drivers as modules")
from the samsung-krzk tree and commit:
83e9e1f84074 ("ARM: multi_v7_defconfig: Enable RSB and AXP20X related drivers as modules")
from the sunxi tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/configs/multi_v7_defconfig index b96bb7c15a74,1a609b10a055..000000000000 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@@ -252,10 -252,8 +252,10 @@@ CONFIG_TOUCHSCREEN_STMPE= CONFIG_TOUCHSCREEN_SUN4I=y CONFIG_TOUCHSCREEN_WM97XX=m CONFIG_INPUT_MISC=y +CONFIG_INPUT_MAX77693_HAPTIC=m +CONFIG_INPUT_MAX8997_HAPTIC=m CONFIG_INPUT_MPU3050=y - CONFIG_INPUT_AXP20X_PEK=y + CONFIG_INPUT_AXP20X_PEK=m CONFIG_INPUT_ADXL34X=m CONFIG_SERIO_AMBAKMI=y CONFIG_SERIAL_8250=y @@@ -367,8 -365,8 +367,9 @@@ CONFIG_BATTERY_MAX17040= CONFIG_BATTERY_MAX17042=m CONFIG_CHARGER_MAX14577=m CONFIG_CHARGER_MAX77693=m +CONFIG_CHARGER_MAX8997=m CONFIG_CHARGER_TPS65090=y + CONFIG_AXP20X_POWER=m CONFIG_POWER_RESET_AS3722=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_GPIO_RESTART=y @@@ -400,9 -398,11 +401,11 @@@ CONFIG_MFD_AS3722= CONFIG_MFD_ATMEL_FLEXCOM=y CONFIG_MFD_BCM590XX=y CONFIG_MFD_AXP20X=y + CONFIG_MFD_AXP20X_I2C=m + CONFIG_MFD_AXP20X_RSB=m -CONFIG_MFD_CROS_EC=y +CONFIG_MFD_CROS_EC=m CONFIG_MFD_CROS_EC_I2C=m -CONFIG_MFD_CROS_EC_SPI=y +CONFIG_MFD_CROS_EC_SPI=m CONFIG_MFD_MAX14577=y CONFIG_MFD_MAX77686=y CONFIG_MFD_MAX77693=y
| |