tree 4bbbf3c06493b5e0c8241d402e76657ac7f78b47
parent 9bc915e47c31cfc8785f2d321a5f076bf1ef4736
author Benjamin Herrenschmidt <[EMAIL PROTECTED]> Tue Apr 12 08:25:03 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:25:03 2005
[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]>
Kconfig | 2 +-
mv643xx_eth.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: drivers/net/Kconfig
===================================================================
--- 3c0397d2534ccb5d57bcc1b13aa504454e145a4e/drivers/net/Kconfig (mode:100644
sha1:02e58ee7c546e12161009a1a4c209246072fd465)
+++ 4bbbf3c06493b5e0c8241d402e76657ac7f78b47/drivers/net/Kconfig (mode:100644
sha1:3f7ee9042a9553da0037762f608b073e95a91c47)
@@ -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
===================================================================
--- 3c0397d2534ccb5d57bcc1b13aa504454e145a4e/drivers/net/mv643xx_eth.c
(mode:100644 sha1:2e9cd1ae1948dd81203e112e925383c5d7369fba)
+++ 4bbbf3c06493b5e0c8241d402e76657ac7f78b47/drivers/net/mv643xx_eth.c
(mode:100644 sha1:785834a7454e8cab1852f988ea30c36e0ede2ff2)
@@ -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
