diff --git a/[refs] b/[refs] index 6b06202fe79a..76b95b8f3126 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53c3fa206415d8a3f8b2a4f77689ea044c4a9c65 +refs/heads/master: 00c7d9202a19091d1873954ba158375d2efd5a64 diff --git a/trunk/drivers/net/phy/phy.c b/trunk/drivers/net/phy/phy.c index 5130db8f5c4e..1bb16cb79433 100644 --- a/trunk/drivers/net/phy/phy.c +++ b/trunk/drivers/net/phy/phy.c @@ -301,7 +301,7 @@ EXPORT_SYMBOL(phy_ethtool_gset); /** * phy_mii_ioctl - generic PHY MII ioctl interface * @phydev: the phy_device struct - * @mii_data: MII ioctl data + * @ifr: &struct ifreq for socket ioctl's * @cmd: ioctl cmd to execute * * Note that this function is currently incompatible with the