From 06aca8da1d67dc5b01c7b53d33bc0cf6e0e4dea7 Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Wed, 16 Feb 2011 13:48:38 +0000
Subject: [PATCH] 2.6.38 has support for Buffalo LS-CHL (Closes: #590105).

svn path=/dists/trunk/linux-2.6/; revision=16899
---
 debian/changelog                   | 1 +
 debian/config/armel/config.orion5x | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5bb2666ab..3002f14c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ linux-2.6 (2.6.38~rc5-1~experimental.1) UNRELEASED; urgency=low
     - [sparc] Fix misaligned tracing information which the module loader
       does not support (Closes: #609371)
     - [sh4] Export cpu_core_map to fix build failure with CONFIG_SFC=m.
+    - [armel] Support for Buffalo LS-CHL (Closes: #590105).
 
   [ Ben Hutchings ]
   * [arm] ixp4xx: Revert build fix, now applied upstream which resulted
diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x
index 455f53f74..b650334bc 100644
--- a/debian/config/armel/config.orion5x
+++ b/debian/config/armel/config.orion5x
@@ -55,6 +55,7 @@ CONFIG_VFP=y
 CONFIG_MACH_KUROBOX_PRO=y
 CONFIG_MACH_DNS323=y
 CONFIG_MACH_TS209=y
+CONFIG_MACH_LINKSTATION_LSCHL=y
 CONFIG_MACH_LINKSTATION_PRO=y
 CONFIG_MACH_TS409=y
 CONFIG_MACH_MV2120=y
@@ -165,6 +166,7 @@ CONFIG_GPIO_SYSFS=y
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GPIO_FAN=m
 CONFIG_SENSORS_LM75=m
 
 ##