From: [EMAIL PROTECTED] Date: Mon, 24 Sep 2007 15:33:54 -0700 > Subject: git-net: fix pasemi_mac > From: Kamalesh Babulal <[EMAIL PROTECTED]> > > drivers/net/pasemi_mac.c: In function $,1rx(Bpasemi_mac_probe$,1ry(B: > drivers/net/pasemi_mac.c:1153: error: conflicting types for > $,1rx(Bmac$,1ry(B > drivers/net/pasemi_mac.c:1151: error: previous declaration of > $,1rx(Bmac$,1ry(B was here > drivers/net/pasemi_mac.c:1170: error: incompatible types in assignment > drivers/net/pasemi_mac.c:1172: error: request for member > $,1rx(Bpdev$,1ry(B in > something not a structure or union > > In the function > static int __devinit > pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > { > <snip> > struct pasemi_mac *mac; > int err; > DECLARE_MAC_BUF(mac); > > introduction of mac as var [18] triggers the build failure, so in the below > patch renaming mac as mac_buf is done, because it is used to print the mac > address using the newly introduced print_mac function. > > Signed-off-by: Kamalesh Babulal <[EMAIL PROTECTED]> > Cc: "David S. Miller" <[EMAIL PROTECTED]> > Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Applied to net-2.6.24, thanks! - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/