From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 1 Mar 2009 20:09:04 +0000 (+0000)
Subject: [kernel] refresh patches for kernel 2.6.28
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=82c7a01d96fe74827548b02e2ebb3d3fe4e3c7ef;ds=sidebyside

[kernel] refresh patches for kernel 2.6.28


SVN-Revision: 14720
---

diff --git a/target/linux/generic-2.6/patches-2.6.28/151-netfilter_imq_2.6.28.patch b/target/linux/generic-2.6/patches-2.6.28/151-netfilter_imq_2.6.28.patch
index c531042444..d4ed15129d 100644
--- a/target/linux/generic-2.6/patches-2.6.28/151-netfilter_imq_2.6.28.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/151-netfilter_imq_2.6.28.patch
@@ -56,7 +56,7 @@
  
  	if (skb2)
  		kfree_skb(ret ? entry->skb : skb2);
-@@ -248,11 +253,13 @@ static void qdisc_run_tasklet(unsigned l
+@@ -248,11 +251,13 @@ static void qdisc_run_tasklet(unsigned l
  {
  	struct net_device *dev = (struct net_device *)arg;
  	struct imq_private *priv = netdev_priv(dev);
diff --git a/target/linux/generic-2.6/patches-2.6.28/975-ssb-fallback-sprom.patch b/target/linux/generic-2.6/patches-2.6.28/975-ssb-fallback-sprom.patch
index 815c37d067..23d1af7279 100644
--- a/target/linux/generic-2.6/patches-2.6.28/975-ssb-fallback-sprom.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/975-ssb-fallback-sprom.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.28.7/drivers/ssb/pci.c
-===================================================================
---- linux-2.6.28.7.orig/drivers/ssb/pci.c	2009-02-26 20:37:02.000000000 +0100
-+++ linux-2.6.28.7/drivers/ssb/pci.c	2009-02-26 20:41:44.000000000 +0100
+--- a/drivers/ssb/pci.c
++++ b/drivers/ssb/pci.c
 @@ -514,6 +514,7 @@ unsupported:
  static int ssb_pci_sprom_get(struct ssb_bus *bus,
  			     struct ssb_sprom *sprom)
@@ -35,10 +33,8 @@ Index: linux-2.6.28.7/drivers/ssb/pci.c
  	kfree(buf);
  out:
  	return err;
-Index: linux-2.6.28.7/drivers/ssb/sprom.c
-===================================================================
---- linux-2.6.28.7.orig/drivers/ssb/sprom.c	2009-02-26 20:33:21.000000000 +0100
-+++ linux-2.6.28.7/drivers/ssb/sprom.c	2009-02-26 20:52:35.000000000 +0100
+--- a/drivers/ssb/sprom.c
++++ b/drivers/ssb/sprom.c
 @@ -14,6 +14,9 @@
  #include "ssb_private.h"
  
@@ -86,10 +82,8 @@ Index: linux-2.6.28.7/drivers/ssb/sprom.c
 +{
 +	return fallback_sprom;
 +}
-Index: linux-2.6.28.7/drivers/ssb/ssb_private.h
-===================================================================
---- linux-2.6.28.7.orig/drivers/ssb/ssb_private.h	2009-02-26 20:36:33.000000000 +0100
-+++ linux-2.6.28.7/drivers/ssb/ssb_private.h	2009-02-26 20:36:56.000000000 +0100
+--- a/drivers/ssb/ssb_private.h
++++ b/drivers/ssb/ssb_private.h
 @@ -131,6 +131,7 @@ ssize_t ssb_attr_sprom_store(struct ssb_
  			     const char *buf, size_t count,
  			     int (*sprom_check_crc)(const u16 *sprom, size_t size),
@@ -98,10 +92,8 @@ Index: linux-2.6.28.7/drivers/ssb/ssb_private.h
  
  
  /* core.c */
-Index: linux-2.6.28.7/include/linux/ssb/ssb.h
-===================================================================
---- linux-2.6.28.7.orig/include/linux/ssb/ssb.h	2009-02-26 20:26:34.000000000 +0100
-+++ linux-2.6.28.7/include/linux/ssb/ssb.h	2009-02-26 20:32:30.000000000 +0100
+--- a/include/linux/ssb/ssb.h
++++ b/include/linux/ssb/ssb.h
 @@ -339,6 +339,10 @@ extern int ssb_bus_pcmciabus_register(st
  
  extern void ssb_bus_unregister(struct ssb_bus *bus);