diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-16 20:06:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-16 20:06:47 -0700 |
| commit | d3f0fcec2d50a18a84c4f3dd7683206ed37ca009 (patch) | |
| tree | 6e56e97c81b5b8c4d556ffd90349e73a885a20dc /drivers/net/ibm_emac/ibm_emac_core.c | |
| parent | 8711a1b902e691c9b3bbd0d0624f836abe9641ca (diff) | |
| parent | c8920ba041c8934b29370f5d62ab9ea8f147966b (diff) | |
Automatic merge of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
Diffstat (limited to 'drivers/net/ibm_emac/ibm_emac_core.c')
| -rw-r--r-- | drivers/net/ibm_emac/ibm_emac_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c index ab44358ddbf..6482d994d48 100644 --- a/drivers/net/ibm_emac/ibm_emac_core.c +++ b/drivers/net/ibm_emac/ibm_emac_core.c @@ -1595,7 +1595,7 @@ static struct ethtool_ops emac_ethtool_ops = { static int emac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { struct ocp_enet_private *fep = dev->priv; - uint *data = (uint *) & rq->ifr_ifru; + uint16_t *data = (uint16_t *) & rq->ifr_ifru; switch (cmd) { case SIOCGMIIPHY: |