Hi David,
Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/p54/p54common.c between commit
f2c2e25554991f9c17bcd24028db5e1c50ecb0ad ("p54: fix build warnings") from
the net-current tree and commit e174961ca1a0b28f7abf0be47973ad57cb74e5f0
("net: convert print_mac to %pM") from the net tree.
Just context changes. I fixed it up (see below) and can carry the fix
(hopefully only until net-current is merged into Linus' tree).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/net/wireless/p54/p54common.c
index 827ca03,72859de..0000000
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@@ -319,8 -319,7 +319,7 @@@ static int p54_parse_eeprom(struct ieee
void *tmp;
int err;
u8 *end = (u8 *)eeprom + len;
- u16 synth;
+ u16 synth = 0;
- DECLARE_MAC_BUF(mac);
wrap = (struct eeprom_pda_wrap *) eeprom;
entry = (void *)wrap->data + le16_to_cpu(wrap->len);
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
