[kernel] r17997 - in dists/trunk/linux-2.6/debian: . config/i386/none

[Ben Hutchings]

Author: benh
Date: Thu Aug 25 01:00:52 2011
New Revision: 17997

Log:
[i386/486] Enable OLPC_XO1_PM, OLPC_XO1_RTC, OLPC_XO1_SCI, OLPC_XO15_SCI

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/i386/none/config.486

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed Aug 24 23:02:04 2011	(r17996)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Aug 25 01:00:52 2011	(r17997)
@@ -17,7 +17,8 @@
   * hwmon: Enable SENSORS_EMC2103, SENSORS_LM95245, SENSORS_MAX1668,
     SENSORS_NTC_THERMISTOR, SENSORS_SMM665 as modules
   * [i386] Enable GPIO_CS5535, MFD_CS5535, CS5535_MFGPT,
-    CS5535_CLOCK_EVENT_SRC, GPIO_VX855, MFD_VX855 as modules
+    CS5535_CLOCK_EVENT_SRC, GPIO_VX855, MFD_VX855 as modules;
+    [i386/486] Enable OLPC_XO1_PM, OLPC_XO1_RTC, OLPC_XO1_SCI, OLPC_XO15_SCI
     (Closes: #639113)
   * media/dvb: Enable DVB_NET
   * media/rc: Enable IR_MCE_KBD_DECODER as module

Modified: dists/trunk/linux-2.6/debian/config/i386/none/config.486
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/none/config.486	Wed Aug 24 23:02:04 2011	(r17996)
+++ dists/trunk/linux-2.6/debian/config/i386/none/config.486	Thu Aug 25 01:00:52 2011	(r17997)
@@ -10,6 +10,10 @@
 CONFIG_EISA=y
 CONFIG_MCA=y
 CONFIG_OLPC=y
+CONFIG_OLPC_XO1_PM=y
+CONFIG_OLPC_XO1_RTC=y
+CONFIG_OLPC_XO1_SCI=y
+CONFIG_OLPC_XO15_SCI=y
 
 ##
 ## file: arch/x86/Kconfig.cpu