diff options
| author | Lennert Buytenhek | 2008-04-24 01:27:02 +0200 |
|---|---|---|
| committer | Dale Farnsworth | 2008-04-29 06:17:07 +0200 |
| commit | fa3959f457109cc7d082b86ea6daae927982815b (patch) | |
| tree | 0e1f7aae6f3340d915f61e1489615972c629621d /arch/powerpc/sysdev/mv64x60_dev.c | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| download | kernel-qcow2-linux-fa3959f457109cc7d082b86ea6daae927982815b.tar.gz kernel-qcow2-linux-fa3959f457109cc7d082b86ea6daae927982815b.tar.xz kernel-qcow2-linux-fa3959f457109cc7d082b86ea6daae927982815b.zip | |
mv643xx_eth: get rid of static variables, allow multiple instances
Move mv643xx_eth's static state (ethernet register block base address
and MII management interface spinlock) into a struct hanging off the
shared platform device. This is necessary to support chips that
contain multiple mv643xx_eth silicon blocks.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Acked-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Diffstat (limited to 'arch/powerpc/sysdev/mv64x60_dev.c')
| -rw-r--r-- | arch/powerpc/sysdev/mv64x60_dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c index 41af1223e2a0..a132e0de8ca5 100644 --- a/arch/powerpc/sysdev/mv64x60_dev.c +++ b/arch/powerpc/sysdev/mv64x60_dev.c @@ -239,6 +239,8 @@ static int __init mv64x60_eth_device_setup(struct device_node *np, int id, memset(&pdata, 0, sizeof(pdata)); + pdata.shared = shared_pdev; + prop = of_get_property(np, "reg", NULL); if (!prop) return -ENODEV; |