Merge branch 'master' into upstream

[mv-sheeva.git] / net / atm / addr.c

diff --git a/net/atm/addr.c b/net/atm/addr.c
index 3060fd0ba4b9fb51ca79a8079f22365433cc4470..6afa77d63bb534ac53e954515da36e3256b0af82 100644 (file)
--- a/net/atm/addr.c
+++ b/net/atm/addr.c
@@ -4,7 +4,6 @@
 
 #include <linux/atm.h>
 #include <linux/atmdev.h>
-#include <linux/sched.h>
 #include <asm/uaccess.h>
 
 #include "signaling.h"