The patch titled
Remove powerpc specific parts of 3c509 driver
has been added to the -mm tree. Its filename is
remove-powerpc-specific-parts-of-3c509-driver.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Remove powerpc specific parts of 3c509 driver
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
On powerpc and ppc, insl_ns and insl are identical as are outsl_ns and
outsl, so remove the conditional use of insl_ns and outsl_ns.
This is in anticipation of removing the insl_ns and outsl_ns definitions
which are powerpc specific patches.
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/3c509.c | 9 ---------
1 files changed, 9 deletions(-)
diff -puN drivers/net/3c509.c~remove-powerpc-specific-parts-of-3c509-driver drivers/net/3c509.c
--- a/drivers/net/3c509.c~remove-powerpc-specific-parts-of-3c509-driver
+++ a/drivers/net/3c509.c
@@ -879,11 +879,7 @@ el3_start_xmit(struct sk_buff *skb, stru
outw(skb->len, ioaddr + TX_FIFO);
outw(0x00, ioaddr + TX_FIFO);
/* ... and the packet rounded to a doubleword. */
-#ifdef __powerpc__
- outsl_ns(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2);
-#else
outsl(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2);
-#endif
dev->trans_start = jiffies;
if (inw(ioaddr + TX_FREE) > 1536)
@@ -1103,13 +1099,8 @@ el3_rx(struct net_device *dev)
skb_reserve(skb, 2); /* Align IP on 16 byte */
/* 'skb->data' points to the start of sk_buff data area. */
-#ifdef __powerpc__
- insl_ns(ioaddr+RX_FIFO, skb_put(skb,pkt_len),
- (pkt_len + 3) >> 2);
-#else
insl(ioaddr + RX_FIFO, skb_put(skb,pkt_len),
(pkt_len + 3) >> 2);
-#endif
outw(RxDiscard, ioaddr + EL3_CMD); /* Pop top Rx packet. */
skb->protocol = eth_type_trans(skb,dev);
_
Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are
remove-powerpc-specific-parts-of-3c509-driver.patch
git-powerpc.patch
apm-clean-up-module-initalization.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
