Commit 949f6711 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits)
  staging: speakup: fix failure handling
  staging: usbip: remove double giveback of URB
  Staging: batman-adv: Remove batman-adv from staging
  Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize
  staging: hv: remove unneeded osd_schedule_callback
  staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
  staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
  staging: brcm80211: Fix WL_<type> logging macros
  Staging: IIO: DDS: AD9833 / AD9834 driver
  Staging: IIO: dds.h convenience macros
  Staging: IIO: Direct digital synthesis abi documentation
  staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
  staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
  staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
  staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
  staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
  staging: brcm80211: Remove unused ether_<foo> #defines and struct
  staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
  staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
  Staging: comedi: Fix checkpatch.pl issues in file s526.c
  ...

Fix up trivial conflict in drivers/video/udlfb.c
parents 443e6221 7959d556

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -1423,7 +1423,9 @@ F: drivers/net/tg3.* 
BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER

M:	Brett Rudley <brudley@broadcom.com>

M:	Henry Ptasinski <henryp@broadcom.com>

M:	Nohee Ko <noheek@broadcom.com>

M:	Dowan Kim <dowan@broadcom.com>

M:	Roland Vossen <rvossen@broadcom.com>

M:	Arend van Spriel <arend@broadcom.com>

L:	linux-wireless@vger.kernel.org

S:	Supported

F:	drivers/staging/brcm80211/

drivers/staging/Kconfig

+6 −4
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ source "drivers/staging/vme/Kconfig" 


source "drivers/staging/memrar/Kconfig"



source "drivers/staging/sep/Kconfig"



source "drivers/staging/iio/Kconfig"



source "drivers/staging/zram/Kconfig"
@@ -127,8 +129,6 @@ source "drivers/staging/wlags49_h2/Kconfig" 


source "drivers/staging/wlags49_h25/Kconfig"



source "drivers/staging/batman-adv/Kconfig"



source "drivers/staging/samsung-laptop/Kconfig"



source "drivers/staging/sm7xx/Kconfig"
@@ -141,8 +141,6 @@ source "drivers/staging/cxt1e1/Kconfig" 


source "drivers/staging/ti-st/Kconfig"



source "drivers/staging/adis16255/Kconfig"



source "drivers/staging/xgifb/Kconfig"



source "drivers/staging/msm/Kconfig"
@@ -175,5 +173,9 @@ source "drivers/staging/intel_sst/Kconfig" 


source "drivers/staging/speakup/Kconfig"



source "drivers/staging/cptm1217/Kconfig"



source "drivers/staging/ste_rmi4/Kconfig"



endif # !STAGING_EXCLUDE_BUILD

endif # STAGING

drivers/staging/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -42,18 +42,17 @@ obj-$(CONFIG_VT6656) += vt6656/ 
obj-$(CONFIG_HYPERV)		+= hv/

obj-$(CONFIG_VME_BUS)		+= vme/

obj-$(CONFIG_MRST_RAR_HANDLER)	+= memrar/

obj-$(CONFIG_DX_SEP)            += sep/

obj-$(CONFIG_IIO)		+= iio/

obj-$(CONFIG_ZRAM)		+= zram/

obj-$(CONFIG_WLAGS49_H2)	+= wlags49_h2/

obj-$(CONFIG_WLAGS49_H25)	+= wlags49_h25/

obj-$(CONFIG_BATMAN_ADV)	+= batman-adv/

obj-$(CONFIG_SAMSUNG_LAPTOP)	+= samsung-laptop/

obj-$(CONFIG_FB_SM7XX)		+= sm7xx/

obj-$(CONFIG_VIDEO_DT3155)	+= dt3155v4l/

obj-$(CONFIG_CRYSTALHD)		+= crystalhd/

obj-$(CONFIG_CXT1E1)		+= cxt1e1/

obj-$(CONFIG_TI_ST)		+= ti-st/

obj-$(CONFIG_ADIS16255)		+= adis16255/

obj-$(CONFIG_FB_XGI)		+= xgifb/

obj-$(CONFIG_MSM_STAGING)	+= msm/

obj-$(CONFIG_EASYCAP)		+= easycap/
@@ -68,3 +67,5 @@ obj-$(CONFIG_BCM_WIMAX) += bcm/ 
obj-$(CONFIG_FT1000)		+= ft1000/

obj-$(CONFIG_SND_INTEL_SST)		+= intel_sst/

obj-$(CONFIG_SPEAKUP)	+= speakup/

obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)	+= cptm1217/

obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)	+= ste_rmi4/

drivers/staging/adis16255/Kconfig

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
config ADIS16255

	tristate "Analog Devices ADIS16250/16255"

	depends on SPI && SYSFS

	---help---

	If you say yes here you get support for the Analog Devices

	ADIS16250/16255 Low Power Gyroscope. The driver exposes

	orientation and gyroscope value, as well as sample rate

	to the sysfs.



	This driver can also be built as a module. If so, the module

	will be called adis16255.

drivers/staging/adis16255/Makefile

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_ADIS16255)		+= adis16255.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE