tree 7e1a511bfdab8965fb5b3502f47f7018c03861d8
parent d8f6098d5b0e9755c79d05e30b185a6e964fd3fa
author Benjamin Herrenschmidt <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:30
-0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:30 -0700
[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 <[EMAIL PROTECTED]>
Signed-off-by: Fabio Massimo Di Nitto <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
net/Kconfig | 2 +-
net/mv643xx_eth.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: drivers/net/Kconfig
===================================================================
--- 8869a8eb584713088b1e882e8fcd1b7772fd8709/drivers/net/Kconfig (mode:100644
sha1:74d57865a819f46cf2b1ba1ffdc362b684884d65)
+++ 7e1a511bfdab8965fb5b3502f47f7018c03861d8/drivers/net/Kconfig (mode:100644
sha1:68242bda4b9cd2dabd292dc393078b7fc615d7bf)
@@ -2044,7 +2044,7 @@
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
Index: drivers/net/mv643xx_eth.c
===================================================================
--- 8869a8eb584713088b1e882e8fcd1b7772fd8709/drivers/net/mv643xx_eth.c
(mode:100644 sha1:d6de213720f417f2543ca58694dd6644dad5b14b)
+++ 7e1a511bfdab8965fb5b3502f47f7018c03861d8/drivers/net/mv643xx_eth.c
(mode:100644 sha1:7e94d455533c678d80334d30562ceadde3b4e5d0)
@@ -668,7 +668,7 @@
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",
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
