Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6] / drivers / w1 / w1_family.c

diff --git a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c
index 88c517a4c178fa7ed9f884aed5dd55d465c401e3..9e293e139a0e8e05737ebf4d555116aef745c684 100644 (file)
--- a/drivers/w1/w1_family.c
+++ b/drivers/w1/w1_family.c
@@ -21,6 +21,7 @@
 
 #include <linux/spinlock.h>
 #include <linux/list.h>
+#include <linux/sched.h>       /* schedule_timeout() */
 #include <linux/delay.h>
 
 #include "w1_family.h"