Merge remote-tracking branch 'origin/master'

1 files changed, 17 insertions, 1 deletions

diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 2676815f9..9dd07675c 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -200,6 +200,7 @@ CONFIG_ALI_FIR=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
 # CONFIG_ALTERA_MBOX is not set
+CONFIG_ALTERA_MSGDMA=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALX=m
@@ -1250,6 +1251,7 @@ CONFIG_DVB_BUDGET_PATCH=m
 CONFIG_DVB_CORE=m
 # CONFIG_DVB_CXD2099 is not set
 CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
 # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
 CONFIG_DVB_DM1105=m
 CONFIG_DVB_DYNAMIC_MINORS=y
@@ -1641,6 +1643,7 @@ CONFIG_GIRBIL_DONGLE=m
 # CONFIG_GPIO_AMD8111 is not set
 # CONFIG_GPIO_AMDPT is not set
 # CONFIG_GPIO_AXP209 is not set
+CONFIG_GPIO_BD9571MWV=m
 # CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_CRYSTAL_COVE=y
 # CONFIG_GPIO_CS5535 is not set
@@ -1675,6 +1678,7 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
 # CONFIG_GPIO_TPIC2810 is not set
+CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
 CONFIG_GPIO_VIPERBOARD=m
@@ -2164,6 +2168,7 @@ CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_POWERMATE=m
 # CONFIG_INPUT_PWM_BEEPER is not set
 CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_RK805_PWRKEY=m
 CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 CONFIG_INPUT_SPARSEKMAP=m
 CONFIG_INPUT_TABLET=y
@@ -2389,6 +2394,7 @@ CONFIG_IRDA=m
 CONFIG_IR_ENE=m
 CONFIG_IR_FINTEK=m
 CONFIG_IR_GPIO_CIR=m
+CONFIG_IR_GPIO_TX=m
 CONFIG_IR_HIX5HD2=m
 CONFIG_IR_IGORPLUGUSB=m
 CONFIG_IR_IGUANA=m
@@ -2403,6 +2409,7 @@ CONFIG_IR_MCEUSB=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IRNET=m
 CONFIG_IR_NUVOTON=m
+CONFIG_IR_PWM_TX=m
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_IRQ_REMAP=y
 # CONFIG_IRQSOFF_TRACER is not set
@@ -2634,6 +2641,7 @@ CONFIG_LCD_PLATFORM=m
 # CONFIG_LDM_DEBUG is not set
 CONFIG_LDM_PARTITION=y
 # CONFIG_LEDS_AAT1290 is not set
+CONFIG_LEDS_AS3645A=m
 # CONFIG_LEDS_BCM6328 is not set
 # CONFIG_LEDS_BCM6358 is not set
 # CONFIG_LEDS_BD2802 is not set
@@ -2906,6 +2914,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_AXP20X=y
 # CONFIG_MFD_BCM590XX is not set
+CONFIG_MFD_BD9571MWV=m
 CONFIG_MFD_CORE=y
 # CONFIG_MFD_CPCAP is not set
 # CONFIG_MFD_CROS_EC is not set
@@ -2973,6 +2982,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_TPS65912_I2C is not set
 # CONFIG_MFD_TPS65912 is not set
 # CONFIG_MFD_TPS65912_SPI is not set
+CONFIG_MFD_TPS68470=y
 # CONFIG_MFD_TPS80031 is not set
 CONFIG_MFD_VIPERBOARD=m
 CONFIG_MFD_VX855=m
@@ -3957,6 +3967,7 @@ CONFIG_PINCTRL_DENVERTON=m
 # CONFIG_PINCTRL_IPQ8074 is not set
 CONFIG_PINCTRL_LEWISBURG=m
 # CONFIG_PINCTRL_MCP23S08 is not set
+CONFIG_PINCTRL_RK805=m
 # CONFIG_PINCTRL_SPRD is not set
 # CONFIG_PINCTRL_SPRD_SC9860 is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
@@ -4019,7 +4030,6 @@ CONFIG_PPS_CLIENT_GPIO=m
 CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PPS_CLIENT_PARPORT=m
 # CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
 CONFIG_PPS=m
 CONFIG_PPTP=m
 # CONFIG_PREEMPT is not set
@@ -4167,6 +4177,7 @@ CONFIG_REALTEK_PHY=m
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP=y
+CONFIG_REGULATOR_BD9571MWV=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
 # CONFIG_REGULATOR_TPS65132 is not set
@@ -4181,6 +4192,7 @@ CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
+CONFIG_RESET_ATTACK_MITIGATION=y
 # CONFIG_RESET_TI_SYSCON is not set
 # CONFIG_RFD_FTL is not set
 CONFIG_RFKILL_GPIO=m
@@ -4751,6 +4763,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
+CONFIG_SERIO_GPIO_PS2=m
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -4987,6 +5000,7 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
+CONFIG_SND_SOC_CS43130=m
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
 CONFIG_SND_SOC_DIO2125=m
@@ -5074,6 +5088,7 @@ CONFIG_SND_SOC_SSM4567=m
 CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_WM8510 is not set
 # CONFIG_SND_SOC_WM8523 is not set
+CONFIG_SND_SOC_WM8524=m
 # CONFIG_SND_SOC_WM8580 is not set
 # CONFIG_SND_SOC_WM8711 is not set
 # CONFIG_SND_SOC_WM8728 is not set
@@ -6180,6 +6195,7 @@ CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_PCIDEV_BACKEND=m
 CONFIG_XEN_PCIDEV_FRONTEND=m
+# CONFIG_XEN_PVCALLS_BACKEND is not set
 CONFIG_XEN_PVHVM=y
 CONFIG_XEN_PVH=y
 CONFIG_XEN_PV=y