The following commit has been merged in the linux branch: commit 5f267996eb4501b45beecdfe7c9a9af714fc083f Author: Jeff Mahoney jeffm@suse.com Date: Mon Oct 12 20:28:11 2009 -0400

staging: more sched.h fixes

This patch contains more sched.h additions for drivers that built fine under x86_64 but not i386 for some reason.

Signed-off-by: Jeff Mahoney jeffm@suse.com Signed-off-by: Greg Kroah-Hartman gregkh@suse.de

diff --git a/drivers/staging/rt2860/common/cmm_info.c b/drivers/staging/rt2860/common/cmm_info.c index 9d589c2..019cc44 100644 --- a/drivers/staging/rt2860/common/cmm_info.c +++ b/drivers/staging/rt2860/common/cmm_info.c @@ -25,6 +25,7 @@ ************************************************************************* */

+#include <linux/sched.h> #include "../rt_config.h"

INT Show_SSID_Proc( diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c index b396a9b..ed27b85 100644 --- a/drivers/staging/rt2860/rt_linux.c +++ b/drivers/staging/rt2860/rt_linux.c @@ -25,6 +25,7 @@ ************************************************************************* */

+#include <linux/sched.h> #include "rt_config.h"

ULONG RTDebugLevel = RT_DEBUG_ERROR; diff --git a/drivers/staging/rt3090/common/cmm_info.c b/drivers/staging/rt3090/common/cmm_info.c index 5be0714..3e51e98 100644 --- a/drivers/staging/rt3090/common/cmm_info.c +++ b/drivers/staging/rt3090/common/cmm_info.c @@ -34,6 +34,7 @@ --------- ---------- ---------------------------------------------- */

+#include <linux/sched.h> #include "../rt_config.h"

diff --git a/drivers/staging/rt3090/rt_linux.c b/drivers/staging/rt3090/rt_linux.c index d2241ec..9b94aa6 100644 --- a/drivers/staging/rt3090/rt_linux.c +++ b/drivers/staging/rt3090/rt_linux.c @@ -25,6 +25,7 @@ ************************************************************************* */

+#include <linux/sched.h> #include "rt_config.h"

ULONG RTDebugLevel = RT_DEBUG_ERROR;