From b19efc335a586b3dba4e4cbc828e11beeca9380f Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Tue, 9 Dec 2014 22:20:35 +0000
Subject: [PATCH] [x86] Enable various drivers

svn path=/dists/trunk/linux/; revision=22178
---
 debian/changelog                    |  5 +++++
 debian/config/kernelarch-x86/config | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8a41c666b..a60ac783b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,11 @@ linux (3.18-1~exp1) UNRELEASED; urgency=medium
   * HID: Enable HID_PENMOUNT as module
   * USB,leds: Enable USB_LED_TRIG
   * leds: Disable LEDS_PCA9532, apparently only needed on armel/iop32x
+  * [x86] platform: Enable TOSHIBA_HAPS as module
+  * [x86] serial: Enable SERIAL_8250_FINTEK as module
+  * [x86] Enable MFD_MENF21BMC, LEDS_MENF21BMC, SENSORS_MENF21BMC_HWMON,
+    MENF21BMC_WATCHDOG as modules
+  * [x86] edac: Enable EDAC_IE31200 as module
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 09 Dec 2014 02:08:47 +0000
 
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 6eb3e8fae..f6b669de1 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -377,6 +377,11 @@ CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 
+##
+## file: drivers/crypto/qat/Kconfig
+##
+CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+
 ##
 ## file: drivers/dma/Kconfig
 ##
@@ -398,6 +403,7 @@ CONFIG_EDAC_E7XXX=m
 CONFIG_EDAC_E752X=m
 CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I3000=m
+CONFIG_EDAC_IE31200=m
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_R82600=m
 CONFIG_EDAC_I5000=m
@@ -538,6 +544,7 @@ CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MENF21BMC_HWMON=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM77=m
@@ -718,6 +725,7 @@ CONFIG_ISDN_DIVAS_MAINT=m
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_MENF21BMC=m
 
 ##
 ## file: drivers/media/dvb-frontends/Kconfig
@@ -779,6 +787,7 @@ CONFIG_I2O_PROC=m
 ##
 CONFIG_LPC_ICH=m
 CONFIG_MFD_KEMPLD=m
+CONFIG_MFD_MENF21BMC=m
 
 ##
 ## file: drivers/misc/Kconfig
@@ -1217,6 +1226,7 @@ CONFIG_MSI_WMI=m
 CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
 CONFIG_ACPI_CMPC=m
 CONFIG_INTEL_IPS=m
 CONFIG_IBM_RTL=m
@@ -1390,6 +1400,7 @@ CONFIG_COMEDI_NI_MIO_CS=m
 CONFIG_COMEDI_QUATECH_DAQP_CS=m
 CONFIG_COMEDI_USB_DRIVERS=y
 CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_NI_USB6501=m
 CONFIG_COMEDI_USBDUX=m
 CONFIG_COMEDI_USBDUXFAST=m
 CONFIG_COMEDI_USBDUXSIGMA=m
@@ -1552,6 +1563,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_FINTEK=m
 
 ##
 ## file: drivers/usb/Kconfig
@@ -1668,6 +1680,7 @@ CONFIG_FB_SIMPLE=y
 ##
 ## file: drivers/watchdog/Kconfig
 ##
+CONFIG_MENF21BMC_WATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m