diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-04-16 15:24:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:24:30 -0700 |
| commit | 16b817579fb61050f1abcc0e81089974328a9c27 (patch) | |
| tree | 7e1a511bfdab8965fb5b3502f47f7018c03861d8 /drivers/net | |
| parent | d8f6098d5b0e9755c79d05e30b185a6e964fd3fa (diff) | |
| download | op-kernel-dev-16b817579fb61050f1abcc0e81089974328a9c27.zip op-kernel-dev-16b817579fb61050f1abcc0e81089974328a9c27.tar.gz | |
[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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/mv643xx_eth.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 74d5786..68242bd 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 d6de213..7e94d45 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", |
