diff options
Diffstat (limited to 'drivers')
-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 74d57865a819..68242bda4b9c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2044,7 +2044,7 @@ config GFAR_NAPI | |||
2044 | 2044 | ||
2045 | config MV643XX_ETH | 2045 | config MV643XX_ETH |
2046 | tristate "MV-643XX Ethernet support" | 2046 | tristate "MV-643XX Ethernet support" |
2047 | depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 | 2047 | depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || PPC_MULTIPLATFORM |
2048 | help | 2048 | help |
2049 | This driver supports the gigabit Ethernet on the Marvell MV643XX | 2049 | This driver supports the gigabit Ethernet on the Marvell MV643XX |
2050 | chipset which is used in the Momenco Ocelot C and Jaguar ATX and | 2050 | 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 d6de213720f4..7e94d455533c 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) | |||
668 | spin_lock_irq(&mp->lock); | 668 | spin_lock_irq(&mp->lock); |
669 | 669 | ||
670 | err = request_irq(dev->irq, mv643xx_eth_int_handler, | 670 | err = request_irq(dev->irq, mv643xx_eth_int_handler, |
671 | SA_INTERRUPT | SA_SAMPLE_RANDOM, dev->name, dev); | 671 | SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev); |
672 | 672 | ||
673 | if (err) { | 673 | if (err) { |
674 | printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n", | 674 | printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n", |