[kernel] r7808 - in dists/trunk/linux-2.6/debian: . patches/bugfix/arm patches/series

[Martin Michlmayr]

Author: tbm
Date: Thu Nov 16 17:38:00 2006
New Revision: 7808

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/nslu2-disk-leds.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/6
Log:
Swap the disk 1 and disk 2 LED definitions so they're right.


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Nov 16 17:38:00 2006
@@ -30,6 +30,7 @@
   * arm/iop32x: Likewise.
   * arm/s3c2410: Unset CONFIG_PM_LEGACY.
   * arm/versatile: Fix Versatile PCI config byte accesses
+  * arm/ixp4xx: Swap the disk 1 and disk 2 LED definitions so they're right.
 
   [ dann frazier ]
   * Backport various SCTP changesets from 2.6.19, recommended by Vlad Yasevich

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/nslu2-disk-leds.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/nslu2-disk-leds.patch	Thu Nov 16 17:38:00 2006
@@ -0,0 +1,14 @@
+diff -Naur linux-2.6.18.orig/include/asm-arm/arch-ixp4xx/nslu2.h linux-2.6.18/include/asm-arm/arch-ixp4xx/nslu2.h
+--- linux-2.6.18.orig/include/asm-arm/arch-ixp4xx/nslu2.h	2006-09-19 21:42:06.000000000 -0600
++++ linux-2.6.18/include/asm-arm/arch-ixp4xx/nslu2.h	2006-11-16 06:31:35.000000000 -0700
+@@ -84,8 +84,8 @@
+ #define NSLU2_LED_RED_BM	(1L << NSLU2_LED_RED)
+ #define NSLU2_LED_GRN_BM	(1L << NSLU2_LED_GRN)
+ 
+-#define NSLU2_LED_DISK1		NSLU2_GPIO2
+-#define NSLU2_LED_DISK2		NSLU2_GPIO3
++#define NSLU2_LED_DISK1		NSLU2_GPIO3
++#define NSLU2_LED_DISK2		NSLU2_GPIO2
+ 
+ #define NSLU2_LED_DISK1_BM	(1L << NSLU2_GPIO2)
+ #define NSLU2_LED_DISK2_BM	(1L << NSLU2_GPIO3)

Modified: dists/trunk/linux-2.6/debian/patches/series/6
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/6	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/6	Thu Nov 16 17:38:00 2006
@@ -17,3 +17,4 @@
 + bugfix/video-nvidiafb-divide-zero.patch
 + bugfix/scsi-SG_IO-data-direction.patch
 + bugfix/arm/versatile-pci.patch
++ bugfix/arm/nslu2-disk-leds.patch