Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b25eaebc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: rt2860sta: prevent a panic when disabling when associated
  staging: more sched.h fixes
  Staging: et131x: Fix the add_10bit macro
  Staging: et131x: Correct WRAP bit handling
  staging: Complete sched.h removal from interrupt.h
  Staging: vme: fix sched.h build breakage
  Staging: poch: fix sched.h build breakage
  Staging: b3dfg: fix sched.h build breakage
  Staging: comedi: fix sched.h build breakage
  Staging: iio: Fix missing include <linux/sched.h>
parents c3da3148 0af49167

drivers/staging/b3dfg/b3dfg.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

drivers/staging/comedi/drivers/me_daq.c

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ from http://www.comedi.org 
*/



#include <linux/interrupt.h>

#include <linux/sched.h>

#include "../comedidev.h"



#include "comedi_pci.h"

drivers/staging/comedi/drivers/ni_mio_common.c

+1 −0
Original line number Diff line number Diff line
@@ -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"

drivers/staging/comedi/drivers/ni_pcidio.c

+1 −0
Original line number Diff line number Diff line
@@ -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"

drivers/staging/et131x/et1310_address_map.h

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ typedef union _TXDMA_PR_NUM_DES_t { 


extern inline void add_10bit(u32 *v, int n)

{

	*v = INDEX10(*v + n);

	*v = INDEX10(*v + n) | (*v & ET_DMA10_WRAP);

}



/*