[kernel] r18519 - in dists/trunk/linux-2.6/debian: . config/armel

[Arnaud Patard]

Author: rtp-guest
Date: Fri Jan 13 10:39:54 2012
New Revision: 18519

Log:
- Enable kirkwood boxes from LaCIE.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/armel/config.kirkwood

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Jan 13 03:58:21 2012	(r18518)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Jan 13 10:39:54 2012	(r18519)
@@ -31,6 +31,8 @@
   * [armel] disable tomoyo and apparmor to allow kernel image to fit into flash.
   * [armel] add back ixp4xx gpiolib patch
   * [arm] backport topdown mmap support from rmk's tree
+  * [armel] Enable support from LaCIE kirkwood devices, thanks to Simon Guinot
+    (Closes: #655344)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 02 Jan 2012 02:55:28 +0000
 

Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Fri Jan 13 03:58:21 2012	(r18518)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Fri Jan 13 10:39:54 2012	(r18519)
@@ -63,6 +63,12 @@
 CONFIG_MACH_OPENRD_BASE=y
 CONFIG_MACH_OPENRD_CLIENT=y
 CONFIG_MACH_OPENRD_ULTIMATE=y
+CONFIG_MACH_NETSPACE_V2=y
+CONFIG_MACH_INETSPACE_V2=y
+CONFIG_MACH_NETSPACE_MAX_V2=y
+CONFIG_MACH_D2NET_V2=y
+CONFIG_MACH_NET2BIG_V2=y
+CONFIG_MACH_NET5BIG_V2=y
 CONFIG_MACH_T5325=y
 
 ##
@@ -172,6 +178,11 @@
 # CONFIG_DRM is not set
 
 ##
+## file: drivers/hwmon/Kconfig
+##
+CONFIG_SENSORS_GPIO_FAN=m
+
+##
 ## file: drivers/i2c/Kconfig
 ##
 CONFIG_I2C=y
@@ -244,6 +255,8 @@
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_NS2=m
+CONFIG_LEDS_NETXBIG=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y