[kernel] r8912 - in dists/trunk/linux-2.6/debian/patches: features/arm series

[Gordon Farquharson]

Author: gordon-guest
Date: Wed Jun  6 03:49:17 2007
New Revision: 8912

Log:
Update nslu2-eth-mac.patch for 2.6.22-rc4.


Modified:
   dists/trunk/linux-2.6/debian/patches/features/arm/nslu2-eth-mac.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/patches/features/arm/nslu2-eth-mac.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/arm/nslu2-eth-mac.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/nslu2-eth-mac.patch	Wed Jun  6 03:49:17 2007
@@ -1,5 +1,6 @@
---- a/arch/arm/mach-ixp4xx/nslu2-setup.c	2006-10-31 15:39:50.000000000 +0100
-+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c	2006-10-31 15:43:35.000000000 +0100
+diff -Naurp linux-2.6.22-rc4.orig/arch/arm/mach-ixp4xx/nslu2-setup.c linux-2.6.22-rc4/arch/arm/mach-ixp4xx/nslu2-setup.c
+--- linux-2.6.22-rc4.orig/arch/arm/mach-ixp4xx/nslu2-setup.c	2007-06-05 20:37:07.000000000 -0600
++++ linux-2.6.22-rc4/arch/arm/mach-ixp4xx/nslu2-setup.c	2007-06-05 21:12:36.000000000 -0600
 @@ -17,6 +17,7 @@
  #include <linux/kernel.h>
  #include <linux/serial.h>
@@ -8,9 +9,9 @@
  #include <linux/leds.h>
  
  #include <asm/mach-types.h>
-@@ -180,10 +181,46 @@
- 	gpio_line_set(NSLU2_PO_GPIO, IXP4XX_GPIO_HIGH);
- }
+@@ -171,8 +172,44 @@ static struct sys_timer nslu2_timer = {
+     .init   = nslu2_timer_init,
+ };
  
 +/*
 + * When the RedBoot partition is added the MAC address is read from
@@ -45,8 +46,6 @@
 +
  static void __init nslu2_init(void)
  {
- 	ixp4xx_timer_freq = NSLU2_FREQ;
- 
 +	/* The flash has an ethernet MAC embedded in it which we need,
 +	 * that is all this notifier does.
 +	 */

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Wed Jun  6 03:49:17 2007
@@ -20,7 +20,7 @@
 + features/mips/qemu-vga.patch
 + features/mips/sb1-duart.patch
 + features/arm/nslu2-setup-mac.patch
-#+ features/arm/nslu2-eth-mac.patch
++ features/arm/nslu2-eth-mac.patch
 + features/arm/nas100d-setup-mac.patch
 + features/arm/nas100d-eth-mac.patch
 + features/arm/ixp4xx-npe-driver-0.3.1.patch