[kernel] r22872 - in dists/trunk/linux/debian: . config/i386

[Ben Hutchings]

Author: benh
Date: Wed Jul 29 03:19:30 2015
New Revision: 22872

Log:
[i386/586] Enable KEYBOARD_GPIO_POLLED and LEDS_GPIO as modules, and ALIX, NET5501, GEOS (Closes: #734204)

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/i386/config.586

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Wed Jul 29 03:08:50 2015	(r22871)
+++ dists/trunk/linux/debian/changelog	Wed Jul 29 03:19:30 2015	(r22872)
@@ -11,6 +11,8 @@
   * KEYS: ensure we free the assoc array edit if edit is valid (CVE-2015-1333)
   * [armel,sh4] linux-image: Recommend u-boot-tools rather than the obsolete
     uboot-mkimage package (Closes: #793608)
+  * [i386/586] Enable KEYBOARD_GPIO_POLLED and LEDS_GPIO as modules, and
+    ALIX, NET5501, GEOS (Closes: #734204)
 
   [ Ian Campbell ]
   * [armhf] Set CONFIG_ARM_TEGRA_CPUFREQ as builtin.

Modified: dists/trunk/linux/debian/config/i386/config.586
==============================================================================
--- dists/trunk/linux/debian/config/i386/config.586	Wed Jul 29 03:08:50 2015	(r22871)
+++ dists/trunk/linux/debian/config/i386/config.586	Wed Jul 29 03:19:30 2015	(r22872)
@@ -13,6 +13,9 @@
 CONFIG_OLPC_XO1_RTC=y
 CONFIG_OLPC_XO1_SCI=y
 CONFIG_OLPC_XO15_SCI=y
+CONFIG_ALIX=y
+CONFIG_NET5501=y
+CONFIG_GEOS=y
 
 ##
 ## file: arch/x86/Kconfig.cpu
@@ -46,11 +49,21 @@
 # CONFIG_INTEL_IDLE is not set
 
 ##
+## file: drivers/input/keyboard/Kconfig
+##
+CONFIG_KEYBOARD_GPIO_POLLED=m
+
+##
 ## file: drivers/input/mouse/Kconfig
 ##
 CONFIG_MOUSE_PS2_OLPC=y
 
 ##
+## file: drivers/leds/Kconfig
+##
+CONFIG_LEDS_GPIO=m
+
+##
 ## file: drivers/mtd/chips/Kconfig
 ##
 # CONFIG_MTD_XIP is not set