[PATCH 1/2] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM

[PATCH 1/2] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM

[Dale Farnsworth]

From: Dale Farnsworth <dale@farnsworth.org>

No 64-bit PPC_MULTIPLATFORM platforms use the mv643xx_eth driver,
so build it only on PPC32.

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Acked-by: Sven Luther <sl@bplan-gmbh.de>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a2bd811..2154ae2 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2262,7 +2262,7 @@ config UGETH_HAS_GIGA
 
 config MV643XX_ETH
 	tristate "MV-643XX Ethernet support"
-	depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || PPC_MULTIPLATFORM
+	depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32)
 	select MII
 	help
 	  This driver supports the gigabit Ethernet on the Marvell MV643XX

[PATCH 2/2] mv643xx_eth: Fix typo: RX_SKB_SIZE ==> ETH_RX_SKB_SIZE

[Dale Farnsworth]

From: Dale Farnsworth <dale@farnsworth.org>

Bug was introduced in commit 71d28725548be203e8b8f6ad63b1f64fd7f02d4d.
How embarrassing.  It wasn't caught because dma_umap_single()
is defined away on arch/ppc and 32-bit arch/powerpc.

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>

---

Arggh.  (And that's not pirate talk.)

This isn't urgent since dma_unmap_single() is defined away for ppc32
both in arch/ppc and arch/powerpc.  It was caught on ppc64 arch/powerpc,
but isn't needed by any ppc64 platforms.

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index eeab1df..59de3e7 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -385,7 +385,7 @@ static int mv643xx_eth_receive_queue(str
 	struct pkt_info pkt_info;
 
 	while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) {
-		dma_unmap_single(NULL, pkt_info.buf_ptr, RX_SKB_SIZE,
+		dma_unmap_single(NULL, pkt_info.buf_ptr, ETH_RX_SKB_SIZE,
 							DMA_FROM_DEVICE);
 		mp->rx_desc_count--;
 		received_packets++;