The following commit has been merged in the linux branch: commit 4377a026500a3f59e9c41c23d03e55ff2e712379 Author: Greg Kroah-Hartman gregkh@suse.de Date: Mon Oct 12 14:58:16 2009 -0700
Staging: comedi: fix sched.h build breakage
commit d43c36dc removed sched.h from interrupt.h. This broke some of the comedi drivers. This patch fixes this.
Signed-off-by: Greg Kroah-Hartman gregkh@suse.de
diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c index 2cda7ad..80e192d 100644 --- a/drivers/staging/comedi/drivers/me_daq.c +++ b/drivers/staging/comedi/drivers/me_daq.c @@ -51,6 +51,7 @@ from http://www.comedi.org */
#include <linux/interrupt.h> +#include <linux/sched.h> #include "../comedidev.h"
#include "comedi_pci.h" diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index e3ffb06..753ee05 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -62,6 +62,7 @@ /* #define DEBUG_STATUS_B */
#include <linux/interrupt.h> +#include <linux/sched.h> #include "8255.h" #include "mite.h" #include "comedi_fc.h" diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c index 52b2eca..d544698 100644 --- a/drivers/staging/comedi/drivers/ni_pcidio.c +++ b/drivers/staging/comedi/drivers/ni_pcidio.c @@ -70,6 +70,7 @@ comedi_nonfree_firmware tarball available from http://www.comedi.org /* #define DEBUG_FLAGS */
#include <linux/interrupt.h> +#include <linux/sched.h> #include "../comedidev.h"
#include "mite.h"