2009-10-14 17:11:53

by Roland Dreier

Subject: Staging: Comedi: Add missing <linux/sched.h> includes

Fix fallout of removal of sched.h from interrupt.h. This fixes build
breakage in staging drivers.

Signed-off-by: Roland Dreier <[email protected]>
---
drivers/staging/comedi/drivers/me_daq.c | 1 +
drivers/staging/comedi/drivers/ni_mio_common.c | 1 +
drivers/staging/comedi/drivers/ni_pcidio.c | 1 +
3 files changed, 3 insertions(+), 0 deletions(-)

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"

2009-10-14 17:19:43

by Greg KH

Subject: Re: Staging: Comedi: Add missing <linux/sched.h> includes

On Wed, Oct 14, 2009 at 10:11:08AM -0700, Roland Dreier wrote:
> Fix fallout of removal of sched.h from interrupt.h. This fixes build
> breakage in staging drivers.
>
> Signed-off-by: Roland Dreier <[email protected]>

Already in my tree :(

thanks,

greg k-h

2009-10-14 17:45:43

by Roland Dreier

Subject: Re: Staging: Comedi: Add missing <linux/sched.h> includes

> Already in my tree :(

Any plans to get it upstream? As far as I can tell, these drivers
haven't built since before -rc4, so 4 or 5 days at least.

- R.

2009-10-14 17:52:16

by Greg KH

Subject: Re: Staging: Comedi: Add missing <linux/sched.h> includes

On Wed, Oct 14, 2009 at 10:45:04AM -0700, Roland Dreier wrote:
>
> > Already in my tree :(
>
> Any plans to get it upstream? As far as I can tell, these drivers
> haven't built since before -rc4, so 4 or 5 days at least.

They should go to Linus in a few hours, patience :)

The patches were also posted to lkml yesterday.

thanks,

greg k-h