The patch titled
smc91x: fix build breakage from the SMC_GET_MAC_ADDR API upgrade
has been removed from the -mm tree. Its filename was
smc91x-fix-build-breakage-from-the-smc_get_mac_addr-api-upgrade.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: smc91x: fix build breakage from the SMC_GET_MAC_ADDR API upgrade
From: Bryan Wu <cooloney@xxxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Cc: Deepak Saxena <dsaxena@xxxxxxxxxxx>
Cc: Nicolas Pitre <nico@xxxxxxx>
Cc: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/smc91x.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff -puN drivers/net/smc91x.h~smc91x-fix-build-breakage-from-the-smc_get_mac_addr-api-upgrade drivers/net/smc91x.h
--- a/drivers/net/smc91x.h~smc91x-fix-build-breakage-from-the-smc_get_mac_addr-api-upgrade
+++ a/drivers/net/smc91x.h
@@ -93,14 +93,14 @@
#define SMC_insw(a, r, p, l) insw ((unsigned long *)((a) + (r)), p, l)
# endif
/* check if the mac in reg is valid */
-#define SMC_GET_MAC_ADDR(addr) \
+#define SMC_GET_MAC_ADDR(lp, addr) \
do { \
unsigned int __v; \
- __v = SMC_inw(ioaddr, ADDR0_REG); \
+ __v = SMC_inw(ioaddr, ADDR0_REG(lp)); \
addr[0] = __v; addr[1] = __v >> 8; \
- __v = SMC_inw(ioaddr, ADDR1_REG); \
+ __v = SMC_inw(ioaddr, ADDR1_REG(lp)); \
addr[2] = __v; addr[3] = __v >> 8; \
- __v = SMC_inw(ioaddr, ADDR2_REG); \
+ __v = SMC_inw(ioaddr, ADDR2_REG(lp)); \
addr[4] = __v; addr[5] = __v >> 8; \
if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) { \
random_ether_addr(addr); \
_
Patches currently in -mm which might be from cooloney@xxxxxxxxxx are
origin.patch
blackfin-video-driver-update-the-bf52x-ezkit-video-framebuffer-driver-according-to-lkml-review.patch
blackfin-video-driver-update-the-bf52x-ezkit-video-framebuffer-driver-according-to-lkml-review-fix.patch
blackfin-video-driver-fix-bug-when-opening-reading-mmaping-bf54x-and-bf52x-framebuffer-simultaneously.patch
git-watchdog.patch
smc91x-driver-fix-bug-print-warning-only-in-interrupt-mode.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
