aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-06-13 12:20:42 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-06-13 12:20:42 +0000
commit08450811e3cec6af3b88a819204a7f3e3896e2f1 (patch)
tree2a520eb8cc2347af07e2d3421e9ae9897a9e7c0e /target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch
parente8c46b8a2a5d092452203b7a2c73c8383da87f59 (diff)
downloadupstream-08450811e3cec6af3b88a819204a7f3e3896e2f1.tar.gz
upstream-08450811e3cec6af3b88a819204a7f3e3896e2f1.tar.bz2
upstream-08450811e3cec6af3b88a819204a7f3e3896e2f1.zip
refresh 2.6.32 patches
SVN-Revision: 21783
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch b/target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch
index 5931d29e8b..f48c58052f 100644
--- a/target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch
@@ -350,7 +350,7 @@
/* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
#define SPEX16(_outvar, _offset, _mask, _shift) \
out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))
-@@ -253,7 +254,7 @@ static int sprom_do_read(struct ssb_bus
+@@ -253,7 +254,7 @@ static int sprom_do_read(struct ssb_bus
int i;
for (i = 0; i < bus->sprom_size; i++)
@@ -404,10 +404,7 @@
+static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev,
+ tuple_t *tuple,
+ void *priv)
- {
-- tuple_t tuple;
-- int res;
-- unsigned char buf[32];
++{
+ struct ssb_sprom *sprom = priv;
+
+ if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID)
@@ -423,7 +420,10 @@
+static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
+ tuple_t *tuple,
+ void *priv)
-+{
+ {
+- tuple_t tuple;
+- int res;
+- unsigned char buf[32];
+ struct ssb_init_invariants *iv = priv;
struct ssb_sprom *sprom = &iv->sprom;
struct ssb_boardinfo *bi = &iv->boardinfo;