tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

smc91x: fix build error from the SMC_GET_MAC_ADDR API change

Cc: Jeff Garzik <jeff@garzik.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Bryan Wu and committed by
Linus Torvalds 7427d8b8 28ffb5d3

+4 -4
+4 -4
drivers/net/smc91x.h
··· 93 93 #define SMC_insw(a, r, p, l) insw ((unsigned long *)((a) + (r)), p, l) 94 94 # endif 95 95 /* check if the mac in reg is valid */ 96 - #define SMC_GET_MAC_ADDR(addr) \ 96 + #define SMC_GET_MAC_ADDR(lp, addr) \ 97 97 do { \ 98 98 unsigned int __v; \ 99 - __v = SMC_inw(ioaddr, ADDR0_REG); \ 99 + __v = SMC_inw(ioaddr, ADDR0_REG(lp)); \ 100 100 addr[0] = __v; addr[1] = __v >> 8; \ 101 - __v = SMC_inw(ioaddr, ADDR1_REG); \ 101 + __v = SMC_inw(ioaddr, ADDR1_REG(lp)); \ 102 102 addr[2] = __v; addr[3] = __v >> 8; \ 103 - __v = SMC_inw(ioaddr, ADDR2_REG); \ 103 + __v = SMC_inw(ioaddr, ADDR2_REG(lp)); \ 104 104 addr[4] = __v; addr[5] = __v >> 8; \ 105 105 if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) { \ 106 106 random_ether_addr(addr); \