diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-17 09:10:20 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 09:10:20 -0700 |
| commit | d0dac8082cbc2b234917ec53eb591b1ddbec80bb (patch) | |
| tree | 105651af2db033de4803b91cc029381a1b9b39d2 /drivers/net/ibm_emac/ibm_emac_core.c | |
| parent | bfd68594082d8384781c242aa72a7950b5cf51aa (diff) | |
| parent | ff96b3d4b840e8aa126e0a60fd743417ffdee178 (diff) | |
Merge with linus
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: |