Hi !
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]>
#! /bin/sh -e
. $(dirname $0)/DPATCH
@DPATCH@
diff -urNad linux-source-2.6.12-2.6.11.90/drivers/net/Kconfig
/usr/src/dpatchtemp/dpep.nYRoKc/linux-source-2.6.12-2.6.11.90/drivers/net/Kconfig
--- linux-source-2.6.12-2.6.11.90/drivers/net/Kconfig 2005-04-11
16:13:06.000000000 +0200
+++
/usr/src/dpatchtemp/dpep.nYRoKc/linux-source-2.6.12-2.6.11.90/drivers/net/Kconfig
2005-04-12 08:05:33.535955920 +0200
@@ -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
diff -urNad linux-source-2.6.12-2.6.11.90/drivers/net/mv643xx_eth.c
/usr/src/dpatchtemp/dpep.nYRoKc/linux-source-2.6.12-2.6.11.90/drivers/net/mv643xx_eth.c
--- linux-source-2.6.12-2.6.11.90/drivers/net/mv643xx_eth.c 2005-04-07
14:57:16.000000000 +0200
+++
/usr/src/dpatchtemp/dpep.nYRoKc/linux-source-2.6.12-2.6.11.90/drivers/net/mv643xx_eth.c
2005-04-12 08:07:36.246301112 +0200
@@ -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 linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
