diff --git a/[refs] b/[refs]
index 5bc8ddb10113..5d3fb0f4e4e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 068c4579fe5c21e84c7cb2ba89db80899e25104e
+refs/heads/master: bb98ad77d8451a3ccf9478738ffe7ec63394fcdf
diff --git a/trunk/include/linux/atmdev.h b/trunk/include/linux/atmdev.h
index 41788a31c438..2096e5c72827 100644
--- a/trunk/include/linux/atmdev.h
+++ b/trunk/include/linux/atmdev.h
@@ -7,7 +7,6 @@
 #define LINUX_ATMDEV_H
 
 
-#include <linux/device.h>
 #include <linux/atmapi.h>
 #include <linux/atm.h>
 #include <linux/atmioc.h>
@@ -210,6 +209,7 @@ struct atm_cirange {
 
 #ifdef __KERNEL__
 
+#include <linux/device.h>
 #include <linux/wait.h> /* wait_queue_head_t */
 #include <linux/time.h> /* struct timeval */
 #include <linux/net.h>