The following commit has been merged in the linux branch: commit db8fd2887c80ef7d2c8d98d2b9e626ded5e43444 Author: Greg Kroah-Hartman gregkh@suse.de Date: Mon Oct 12 14:59:33 2009 -0700

Staging: b3dfg: fix sched.h build breakage

commit d43c36dc removed sched.h from interrupt.h. This broke the b3dfg driver. This patch fixes this.

Signed-off-by: Greg Kroah-Hartman gregkh@suse.de

diff --git a/drivers/staging/b3dfg/b3dfg.c b/drivers/staging/b3dfg/b3dfg.c index 94c5d27..cda26bb 100644 --- a/drivers/staging/b3dfg/b3dfg.c +++ b/drivers/staging/b3dfg/b3dfg.c @@ -36,6 +36,7 @@ #include <linux/wait.h> #include <linux/mm.h> #include <linux/uaccess.h> +#include <linux/sched.h>

static unsigned int b3dfg_nbuf = 2;