[kernel] r7250 - in dists/sid/linux-2.6/debian: arch/arm

[Martin Michlmayr]

Author: tbm
Date: Sun Aug 27 18:49:24 2006
New Revision: 7250

Modified:
   dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/sid/linux-2.6/debian/changelog

Log:
arm/ixp4xx: Enable CONFIG_W1.


Modified: dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx	Sun Aug 27 18:49:24 2006
@@ -1127,7 +1127,22 @@
 #
 # Dallas's 1-wire bus
 #
-# CONFIG_W1 is not set
+CONFIG_W1=m
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS9490=m
+CONFIG_W1_MASTER_DS9490_BRIDGE=m
+CONFIG_W1_MASTER_DS2482=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2433=m
 
 #
 # Hardware Monitoring support

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sun Aug 27 18:49:24 2006
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.17-8) UNRELEASED; urgency=low
+
+  [ Martin Michlmayr ]
+  * arm/ixp4xx: Enable CONFIG_W1.
+
+ -- Martin Michlmayr <tbm at cyrius.com>  Sun, 27 Aug 2006 20:48:53 +0200
+
 linux-2.6 (2.6.17-7) unstable; urgency=low
 
   [ Martin Michlmayr ]