public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* Staging: Comedi: Add missing <linux/sched.h> includes
@ 2009-10-14 17:11 Roland Dreier
  2009-10-14 17:16 ` Greg KH
  0 siblings, 1 reply; 4+ messages in thread
From: Roland Dreier @ 2009-10-14 17:11 UTC (permalink / raw)
  To: torvalds, Bill Pemberton, Greg Kroah-Hartman; +Cc: linux-kernel

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

Signed-off-by: Roland Dreier <rolandd@cisco.com>
---
 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"

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: Staging: Comedi: Add missing <linux/sched.h> includes
  2009-10-14 17:11 Staging: Comedi: Add missing <linux/sched.h> includes Roland Dreier
@ 2009-10-14 17:16 ` Greg KH
  2009-10-14 17:45   ` Roland Dreier
  0 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2009-10-14 17:16 UTC (permalink / raw)
  To: Roland Dreier; +Cc: torvalds, Bill Pemberton, linux-kernel

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 <rolandd@cisco.com>

Already in my tree :(

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: Staging: Comedi: Add missing <linux/sched.h> includes
  2009-10-14 17:16 ` Greg KH
@ 2009-10-14 17:45   ` Roland Dreier
  2009-10-14 17:48     ` Greg KH
  0 siblings, 1 reply; 4+ messages in thread
From: Roland Dreier @ 2009-10-14 17:45 UTC (permalink / raw)
  To: Greg KH; +Cc: torvalds, Bill Pemberton, linux-kernel


 > 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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: Staging: Comedi: Add missing <linux/sched.h> includes
  2009-10-14 17:45   ` Roland Dreier
@ 2009-10-14 17:48     ` Greg KH
  0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2009-10-14 17:48 UTC (permalink / raw)
  To: Roland Dreier; +Cc: torvalds, Bill Pemberton, linux-kernel

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2009-10-14 17:52 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-14 17:11 Staging: Comedi: Add missing <linux/sched.h> includes Roland Dreier
2009-10-14 17:16 ` Greg KH
2009-10-14 17:45   ` Roland Dreier
2009-10-14 17:48     ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox