diff --git a/[refs] b/[refs]
index 95cfd547cbdf..dece8ed50a93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 132ff00a0fdea43708639d84ab3b42bb106410d7
+refs/heads/master: 1ebed71ae23b0b3c68d2a03e8e1b421efb7f35b0
diff --git a/trunk/drivers/net/macvtap.c b/trunk/drivers/net/macvtap.c
index a8a94e2f6ddc..2b4d59b58b2c 100644
--- a/trunk/drivers/net/macvtap.c
+++ b/trunk/drivers/net/macvtap.c
@@ -58,7 +58,7 @@ static struct proto macvtap_proto = {
  * only has one tap, the interface numbers assure that the
  * device nodes are unique.
  */
-static unsigned int macvtap_major;
+static dev_t macvtap_major;
 #define MACVTAP_NUM_DEVS 65536
 static struct class *macvtap_class;
 static struct cdev macvtap_cdev;