diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-05-23 13:17:32 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-05-23 13:17:32 +0000 |
| commit | 3e4f6af8a5cf99e178706b4490a3ab96cdc34362 (patch) | |
| tree | 9280fa304484f75dbc9faf4e52b99f9e52ef3608 /target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch | |
| parent | b18a1d217ba9a6516c195339e9f4dde3e0a7f3ce (diff) | |
| download | upstream-3e4f6af8a5cf99e178706b4490a3ab96cdc34362.tar.gz upstream-3e4f6af8a5cf99e178706b4490a3ab96cdc34362.tar.bz2 upstream-3e4f6af8a5cf99e178706b4490a3ab96cdc34362.zip | |
generic-2.6: refresh patches
SVN-Revision: 21542
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 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; |