diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-05-09 18:13:49 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-05-09 18:13:49 +0000 |
| commit | 4eecca22d4818b44bec3b56d3b3080a63313ebb7 (patch) | |
| tree | 4fd37cdd749b1bf9cefec548676a698f0a143e62 /target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch | |
| parent | d3486f7942351628d3522cdae8b9aef89cdd872d (diff) | |
| download | upstream-4eecca22d4818b44bec3b56d3b3080a63313ebb7.tar.gz upstream-4eecca22d4818b44bec3b56d3b3080a63313ebb7.tar.bz2 upstream-4eecca22d4818b44bec3b56d3b3080a63313ebb7.zip | |
refresh 2.6.32 patches
SVN-Revision: 21411
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.patch | 12 |
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 f48c58052f..5931d29e8b 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,7 +404,10 @@ +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) @@ -420,10 +423,7 @@ +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; |