From 6fe62157918f4aac93819945873469d273e233a7 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Thu, 16 Nov 2006 16:38:00 +0000 Subject: [PATCH] Swap the disk 1 and disk 2 LED definitions so they're right. svn path=/dists/trunk/linux-2.6/; revision=7808 --- debian/changelog | 1 + debian/patches/bugfix/arm/nslu2-disk-leds.patch | 14 ++++++++++++++ debian/patches/series/6 | 1 + 3 files changed, 16 insertions(+) create mode 100644 debian/patches/bugfix/arm/nslu2-disk-leds.patch diff --git a/debian/changelog b/debian/changelog index 0408846ca..d2ec7e071 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ linux-2.6 (2.6.18-6) UNRELEASED; urgency=low * 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 diff --git a/debian/patches/bugfix/arm/nslu2-disk-leds.patch b/debian/patches/bugfix/arm/nslu2-disk-leds.patch new file mode 100644 index 000000000..c76f46d55 --- /dev/null +++ b/debian/patches/bugfix/arm/nslu2-disk-leds.patch @@ -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) diff --git a/debian/patches/series/6 b/debian/patches/series/6 index 90097e36b..86c7a62c2 100644 --- a/debian/patches/series/6 +++ b/debian/patches/series/6 @@ -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