From 20e5919f0a804b1aa600d61f19322b63910b87ac Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Sat, 16 Apr 2005 15:24:30 -0700 Subject: [PATCH] --- yaml --- r: 45 b: refs/heads/master c: 16b817579fb61050f1abcc0e81089974328a9c27 h: refs/heads/master i: 43: 392d769df70e7e644a1c079edff14f686775c0e5 v: v3 --- [refs] | 2 +- trunk/drivers/net/Kconfig | 2 +- trunk/drivers/net/mv643xx_eth.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e956cb74c81f..ae9150685ab4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8f6098d5b0e9755c79d05e30b185a6e964fd3fa +refs/heads/master: 16b817579fb61050f1abcc0e81089974328a9c27 diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 74d57865a819..68242bda4b9c 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/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/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c index d6de213720f4..7e94d455533c 100644 --- a/trunk/drivers/net/mv643xx_eth.c +++ b/trunk/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",