diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 19:39:33 +0300 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 19:39:33 +0300 |
commit | 944d79559d154c12becde0dab327016cf438f46c (patch) | |
tree | 50c101806f4d3b6585222dda060559eb4f3e005a /arch/ppc/syslib/mpc83xx_devices.c | |
parent | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (diff) | |
parent | 0f36b018b2e314d45af86449f1a97facb1fbe300 (diff) | |
download | linux-944d79559d154c12becde0dab327016cf438f46c.tar.xz |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'arch/ppc/syslib/mpc83xx_devices.c')
-rw-r--r-- | arch/ppc/syslib/mpc83xx_devices.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/ppc/syslib/mpc83xx_devices.c b/arch/ppc/syslib/mpc83xx_devices.c index 847df4409982..f9b95de70e23 100644 --- a/arch/ppc/syslib/mpc83xx_devices.c +++ b/arch/ppc/syslib/mpc83xx_devices.c @@ -28,7 +28,6 @@ */ struct gianfar_mdio_data mpc83xx_mdio_pdata = { - .paddr = 0x24520, }; static struct gianfar_platform_data mpc83xx_tsec1_pdata = { @@ -226,7 +225,14 @@ struct platform_device ppc_sys_platform_devices[] = { .name = "fsl-gianfar_mdio", .id = 0, .dev.platform_data = &mpc83xx_mdio_pdata, - .num_resources = 0, + .num_resources = 1, + .resource = (struct resource[]) { + { + .start = 0x24520, + .end = 0x2453f, + .flags = IORESOURCE_MEM, + }, + }, }, }; |