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

Commit 0cf0adb0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  staging: tidspbridge: fix compilation on dsp clock functions
  staging: octeon-ethernet: Add missing #includes.
  Staging: zcache: signedness bug in tmem_get()
  staging: zcache: fix crash on high memory swap
  staging: brcm80211: SPARC build error fix
  staging: brcm80211: fix compile error on non-x86 archs since 3.0 kernel
parents 96d185c7 1b965f18

drivers/staging/brcm80211/brcmsmac/otp.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include <linux/io.h>

#include <linux/errno.h>

#include <linux/string.h>



#include <brcm_hw_ids.h>

#include <chipcommon.h>

drivers/staging/brcm80211/brcmsmac/types.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define _BRCM_TYPES_H_



#include <linux/types.h>

#include <linux/io.h>



/* Bus types */

#define	SI_BUS			0	/* SOC Interconnect */

drivers/staging/octeon/ethernet-rgmii.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
**********************************************************************/

#include <linux/kernel.h>

#include <linux/netdevice.h>

#include <linux/interrupt.h>

#include <linux/phy.h>

#include <linux/ratelimit.h>

#include <net/dst.h>

drivers/staging/octeon/ethernet-spi.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
**********************************************************************/

#include <linux/kernel.h>

#include <linux/netdevice.h>

#include <linux/interrupt.h>

#include <net/dst.h>



#include <asm/octeon/octeon.h>

drivers/staging/tidspbridge/core/dsp-clock.c

+0 −1
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@ int dsp_clk_enable(enum dsp_clk_id clk_id) 
		break;

#ifdef CONFIG_OMAP_MCBSP

	case MCBSP_CLK:

		omap_mcbsp_set_io_type(MCBSP_ID(clk_id), OMAP_MCBSP_POLL_IO);

		omap_mcbsp_request(MCBSP_ID(clk_id));

		omap2_mcbsp_set_clks_src(MCBSP_ID(clk_id), MCBSP_CLKS_PAD_SRC);

		break;