From: Kamalesh Babulal drivers/net/pasemi_mac.c: In function ‘pasemi_mac_probe’: drivers/net/pasemi_mac.c:1153: error: conflicting types for ‘mac’ drivers/net/pasemi_mac.c:1151: error: previous declaration of ‘mac’ was here drivers/net/pasemi_mac.c:1170: error: incompatible types in assignment drivers/net/pasemi_mac.c:1172: error: request for member ‘pdev’ 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) { 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 Cc: "David S. Miller" Signed-off-by: Andrew Morton --- drivers/net/pasemi_mac.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/net/pasemi_mac.c~git-net-fix-pasemi_mac drivers/net/pasemi_mac.c --- a/drivers/net/pasemi_mac.c~git-net-fix-pasemi_mac +++ a/drivers/net/pasemi_mac.c @@ -1150,7 +1150,7 @@ pasemi_mac_probe(struct pci_dev *pdev, c struct net_device *dev; struct pasemi_mac *mac; int err; - DECLARE_MAC_BUF(mac); + DECLARE_MAC_BUF(mac_buf); err = pci_enable_device(pdev); if (err) @@ -1236,7 +1236,7 @@ pasemi_mac_probe(struct pci_dev *pdev, c "hw addr %s\n", dev->name, mac->type == MAC_TYPE_GMAC ? "GMAC" : "XAUI", mac->dma_if, mac->dma_txch, mac->dma_rxch, - print_mac(mac, dev->dev_addr)); + print_mac(mac_buf, dev->dev_addr)); return err; _