From: Benjamin Herrenschmidt Date: Sat, 16 Apr 2005 22:24:30 +0000 (-0700) Subject: [PATCH] ppc32: MV643XX ethernet is an option for Pegasos X-Git-Tag: v2.6.12-rc3~201 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=16b817579fb61050f1abcc0e81089974328a9c27;p=~emulex%2Finfiniband.git [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 Signed-off-by: Fabio Massimo Di Nitto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 74d57865a81..68242bda4b9 100644 --- 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 d6de213720f..7e94d455533 100644 --- 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",