---

yaml --- r: 45 b: refs/heads/master c: 16b8175 h: refs/heads/master i: 43: 392d769 v: v3
git-mirror · Apr 16, 2005 · 20e5919 · 20e5919
1 parent 7c84d83
commit 20e5919
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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",