Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...

[pandora-kernel.git] / drivers / net / tun.c

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index a82b32b..e6bbc63 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -900,7 +900,7 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
                if ((tun->flags & TUN_TYPE_MASK) != TUN_TAP_DEV)
                        return -EINVAL;
                rtnl_lock();
-               ret = update_filter(&tun->txflt, (void *) __user arg);
+               ret = update_filter(&tun->txflt, (void __user *)arg);
                rtnl_unlock();
                return ret;