[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>
This commit is contained in:
Родитель
d8f6098d5b
Коммит
16b817579f
|
@ -2044,7 +2044,7 @@ config GFAR_NAPI
|
||||||
|
|
||||||
config MV643XX_ETH
|
config MV643XX_ETH
|
||||||
tristate "MV-643XX Ethernet support"
|
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
|
help
|
||||||
This driver supports the gigabit Ethernet on the Marvell MV643XX
|
This driver supports the gigabit Ethernet on the Marvell MV643XX
|
||||||
chipset which is used in the Momenco Ocelot C and Jaguar ATX and
|
chipset which is used in the Momenco Ocelot C and Jaguar ATX and
|
||||||
|
|
|
@ -668,7 +668,7 @@ static int mv643xx_eth_open(struct net_device *dev)
|
||||||
spin_lock_irq(&mp->lock);
|
spin_lock_irq(&mp->lock);
|
||||||
|
|
||||||
err = request_irq(dev->irq, mv643xx_eth_int_handler,
|
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) {
|
if (err) {
|
||||||
printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
|
printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
|
||||||
|
|
Загрузка…
Ссылка в новой задаче