Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

[linux-2.6] / net / core / ethtool.c

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 289c1b5a8e4a0bf4c497f999d35d5c4f9ea797e4..404b761e82ce8d712412717b58fb139478ed4b37 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -695,7 +695,7 @@ static int ethtool_get_stats(struct net_device *dev, void __user *useraddr)
        return ret;
 }
 
-static int ethtool_get_perm_addr(struct net_device *dev, void *useraddr)
+static int ethtool_get_perm_addr(struct net_device *dev, void __user *useraddr)
 {
        struct ethtool_perm_addr epaddr;
        u8 *data;