Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[sfrench/cifs-2.6.git] / include / linux / pkt_sched.h

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index b2648e8e4987549d1b9be26f5f2feab01be3cb24..d51a2b3e221e76a6146fddf8050b2891f809dbb4 100644 (file)
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -515,7 +515,7 @@ enum
 
 struct tc_drr_stats
 {
-       u32     deficit;
+       __u32   deficit;
 };
 
 #endif