From d52be55be2699588db790a1a3279e06cc2e9dba4 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sat, 10 Jul 2010 19:25:50 -0700
Subject: [PATCH] --- yaml --- r: 203447 b: refs/heads/master c:
 1ebed71ae23b0b3c68d2a03e8e1b421efb7f35b0 h: refs/heads/master i:   203445:
 00e1d2afde3cc6a2e03f852c539b14586c58922e   203443:
 fe38f32b6171a0dabbe2ca872f0966d0a5644bcd   203439:
 d808295b90563670cca0f7fb4a0ecffbcc7c1ae3 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/macvtap.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;