[PATCH] ppc32: MV643XX ethernet is an option for Pegasos

This patch allows Kconfig to build the MV643xx ethernet driver on Pegasos
(CONFIG_PPC_MULTIPLATFORM) and adds what I think is a missing fix from
Dale's batch, that is remove SA_INTERRUPT and add SA_SHIRQ in there as the
interrupt is shared if I understand things correctly.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Fabio Massimo Di Nitto <fabbione@ubuntu.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 74d57865a819f46cf2b1ba1ffdc362b684884d65..68242bda4b9cd2dabd292dc393078b7fc615d7bf 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2044,7 +2044,7 @@ config GFAR_NAPI
 
 config MV643XX_ETH
        tristate "MV-643XX Ethernet support"
-       depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3
+       depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || PPC_MULTIPLATFORM
        help
          This driver supports the gigabit Ethernet on the Marvell MV643XX
          chipset which is used in the Momenco Ocelot C and Jaguar ATX and

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index d6de213720f417f2543ca58694dd6644dad5b14b..7e94d455533c678d80334d30562ceadde3b4e5d0 100644 (file)
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -668,7 +668,7 @@ static int mv643xx_eth_open(struct net_device *dev)
        spin_lock_irq(&mp->lock);
 
        err = request_irq(dev->irq, mv643xx_eth_int_handler,
-                       SA_INTERRUPT | SA_SAMPLE_RANDOM, dev->name, dev);
+                       SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
 
        if (err) {
                printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",