Commit 461df4de 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: iio: max517: Fix iio_info changes
  Staging: mei: fix debug code
  Staging: cx23885: fix include of altera.h
  staging: iio: error case memory leak fix
  staging: ath6kl: Fix a kernel panic during suspend/resume
  staging: gma500: get control from firmware framebuffer if conflicts
  staging: gma500: Skip bogus LVDS VBT mode and check for LVDS before adding backlight
  staging: usbip: bugfix prevent driver unbind
  staging: iio: industrialio-trigger: set iio_poll_func private_data
  staging: rts_pstor: use bitwise operator instead of logical one
  staging: fix ath6kl build when CFG80211 is not enabled
  staging: brcm80211: fix for 'multiple definition of wl_msg_level' build err
  staging: fix olpc_dcon build, needs BACKLIGHT_CLASS_DEVICE
  Staging: remove STAGING_EXCLUDE_BUILD option
  Staging: altera: move .h file to proper place
parents 361932bf 8aa460e9

drivers/media/video/cx23885/cx23885-cards.c

+1 −1
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
#include <linux/delay.h>

#include <media/cx25840.h>

#include <linux/firmware.h>

#include <staging/altera.h>



#include "../../../staging/altera-stapl/altera.h"

#include "cx23885.h"

#include "tuner-xc2028.h"

#include "netup-init.h"

drivers/staging/Kconfig

+0 −18
Original line number Diff line number Diff line
@@ -24,23 +24,6 @@ menuconfig STAGING 


if STAGING



config STAGING_EXCLUDE_BUILD

	bool "Exclude Staging drivers from being built" if STAGING

	default y

	---help---

	  Are you sure you really want to build the staging drivers?

	  They taint your kernel, don't live up to the normal Linux

	  kernel quality standards, are a bit crufty around the edges,

	  and might go off and kick your dog when you aren't paying

	  attention.



	  Say N here to be able to select and build the Staging drivers.

	  This option is primarily here to prevent them from being built

	  when selecting 'make allyesconfg' and 'make allmodconfig' so

	  don't be all that put off, your dog will be just fine.



if !STAGING_EXCLUDE_BUILD



source "drivers/staging/tty/Kconfig"



source "drivers/staging/generic_serial/Kconfig"
@@ -177,5 +160,4 @@ source "drivers/staging/mei/Kconfig" 


source "drivers/staging/nvec/Kconfig"



endif # !STAGING_EXCLUDE_BUILD

endif # STAGING

drivers/staging/altera-stapl/altera-jtag.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <linux/delay.h>

#include <linux/firmware.h>

#include <linux/slab.h>

#include <staging/altera.h>

#include "altera.h"

#include "altera-exprt.h"

#include "altera-jtag.h"

drivers/staging/altera-stapl/altera.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/string.h>

#include <linux/firmware.h>

#include <linux/slab.h>

#include <staging/altera.h>

#include "altera.h"

#include "altera-exprt.h"

#include "altera-jtag.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE