[kernel] fix build failure on vmlinux.lds with 2.6.31 (#6052)

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.27 / 976-ssb_fallback_sprom.patch

diff --git a/target/linux/generic-2.6/patches-2.6.27/976-ssb_fallback_sprom.patch b/target/linux/generic-2.6/patches-2.6.27/976-ssb_fallback_sprom.patch
index 815c37d..295d00e 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.27/976-ssb_fallback_sprom.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/976-ssb_fallback_sprom.patch
@@ -1,8 +1,6 @@
-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
-@@ -514,6 +514,7 @@ unsupported:
+--- a/drivers/ssb/pci.c
++++ b/drivers/ssb/pci.c
+@@ -500,6 +500,7 @@ unsupported:
  static int ssb_pci_sprom_get(struct ssb_bus *bus,
                             struct ssb_sprom *sprom)
  {
@@ -10,7 +8,7 @@ Index: linux-2.6.28.7/drivers/ssb/pci.c
        int err = -ENOMEM;
        u16 *buf;
  
-@@ -533,12 +534,23 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -519,12 +520,23 @@ static int ssb_pci_sprom_get(struct ssb_
                bus->sprom_size = SSB_SPROMSIZE_WORDS_R4;
                sprom_do_read(bus, buf);
                err = sprom_check_crc(buf, bus->sprom_size);
@@ -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);