aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.32/975-ssb_update.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-08-31 14:08:30 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-08-31 14:08:30 +0000
commit26bcc4b2bfd82252da4b57c72a2d85b2315776d6 (patch)
tree0c79856c3fe3f55ea97dbd1d0c4300cd3ba5b7ee /target/linux/generic/patches-2.6.32/975-ssb_update.patch
parent2ef5ba18136e4ec0956f7dc42168024f2a3f867c (diff)
downloadupstream-26bcc4b2bfd82252da4b57c72a2d85b2315776d6.tar.gz
upstream-26bcc4b2bfd82252da4b57c72a2d85b2315776d6.tar.bz2
upstream-26bcc4b2bfd82252da4b57c72a2d85b2315776d6.zip
[kernel] refresh 2.6.32 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22848 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.32/975-ssb_update.patch')
-rw-r--r--target/linux/generic/patches-2.6.32/975-ssb_update.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-2.6.32/975-ssb_update.patch b/target/linux/generic/patches-2.6.32/975-ssb_update.patch
index 373df1a62d..0cb8483021 100644
--- a/target/linux/generic/patches-2.6.32/975-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.32/975-ssb_update.patch
@@ -343,10 +343,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)
@@ -362,7 +359,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;