aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.32/975-ssb_update.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2011-03-13 17:12:20 +0000
committerHauke Mehrtens <hauke@openwrt.org>2011-03-13 17:12:20 +0000
commit1968a3c5fd3a54aa60e98752b1439199b12fba3d (patch)
tree0cab5dc0ba19ab8002641c006e711bdceab671d3 /target/linux/generic/patches-2.6.32/975-ssb_update.patch
parentf564424e07d7f1b2f59ea9303b80e5cc45958921 (diff)
downloadupstream-1968a3c5fd3a54aa60e98752b1439199b12fba3d.tar.gz
upstream-1968a3c5fd3a54aa60e98752b1439199b12fba3d.tar.bz2
upstream-1968a3c5fd3a54aa60e98752b1439199b12fba3d.zip
kernel: update to kernel version 2.6.32.32
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26124 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 0cb8483021..373df1a62d 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,7 +343,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)
@@ -359,10 +362,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;