diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-09-28 07:18:28 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-09-28 07:18:28 +1000 |
| commit | 4e6d816e51728d5006c53e78e079ac62b902f8aa (patch) | |
| tree | d388c87dabc063c08c52d17610738d2f49b3855c /drivers/net | |
| parent | d86d9b8cab45adf64e2ea8fe975bec3282b5de81 (diff) | |
| parent | 611a15afcdaacec6efba984c7eb089b853564bdf (diff) | |
| download | op-kernel-dev-4e6d816e51728d5006c53e78e079ac62b902f8aa.zip op-kernel-dev-4e6d816e51728d5006c53e78e079ac62b902f8aa.tar.gz | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux-2.6-PQ
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index 34412bc..d018706 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c @@ -944,12 +944,13 @@ extern int fs_mii_connect(struct net_device *dev); extern void fs_mii_disconnect(struct net_device *dev); static struct net_device *fs_init_instance(struct device *dev, - const struct fs_platform_info *fpi) + struct fs_platform_info *fpi) { struct net_device *ndev = NULL; struct fs_enet_private *fep = NULL; int privsize, i, r, err = 0, registered = 0; + fpi->fs_no = fs_get_id(fpi); /* guard */ if ((unsigned int)fpi->fs_no >= FS_MAX_INDEX) return ERR_PTR(-EINVAL); @@ -971,7 +972,7 @@ static struct net_device *fs_init_instance(struct device *dev, dev_set_drvdata(dev, ndev); fep->fpi = fpi; if (fpi->init_ioports) - fpi->init_ioports(); + fpi->init_ioports((struct fs_platform_info *)fpi); #ifdef CONFIG_FS_ENET_HAS_FEC if (fs_get_fec_index(fpi->fs_no) >= 0) |
