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

Commit 1f3a8e09 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: (970 commits)
  staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_
  staging:iio: Trivial kconfig reorganization and uniformity improvements.
  staging:iio:documenation partial update.
  staging:iio: use pollfunc allocation helpers in remaining drivers.
  staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify event code spitting out.
  staging:iio: implement an iio_info structure to take some of the constant elements out of iio_dev.
  staging:iio:meter:ade7758: Use private data space from iio_allocate_device
  staging:iio:accel:lis3l02dq make write_reg_8 take value not a pointer to value.
  staging:iio: ring core cleanups + check if read_last available in lis3l02dq
  staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to handle creation of event interface name.
  staging:iio: poll func allocation clean up.
  staging:iio:ad7780 trivial unused header cleanup.
  staging:iio:adc: AD7780: Use private data space from iio_allocate_device + trivial fixes
  staging:iio:adc:AD7780: Convert to new channel registration method
  staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv()
  staging:iio:adc: AD7606: Consitently use indio_dev
  staging:iio: Rip out helper for software rings.
  staging:iio:adc:AD7298: Use private data space from iio_allocate_device
  staging:iio: rationalization of different buffer implementation hooks.
  staging:iio:imu:adis16400 avoid allocating rx, tx, and state separately from iio_dev.
  ...

Fix up trivial conflicts in
 - drivers/staging/intel_sst/intelmid.c: patches applied in both branches
 - drivers/staging/rt2860/common/cmm_data_{pci,usb}.c: removed vs spelling
 - drivers/staging/usbip/vhci_sysfs.c: trivial header file inclusion
parents c44dead7 1a4b6f66

drivers/staging/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -67,10 +67,6 @@ source "drivers/staging/echo/Kconfig" 


source "drivers/staging/brcm80211/Kconfig"



source "drivers/staging/rt2860/Kconfig"



source "drivers/staging/rt2870/Kconfig"



source "drivers/staging/comedi/Kconfig"



source "drivers/staging/olpc_dcon/Kconfig"
@@ -177,5 +173,9 @@ source "drivers/staging/gma500/Kconfig" 


source "drivers/staging/altera-stapl/Kconfig"



source "drivers/staging/mei/Kconfig"



source "drivers/staging/nvec/Kconfig"



endif # !STAGING_EXCLUDE_BUILD

endif # STAGING

drivers/staging/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -12,13 +12,12 @@ obj-$(CONFIG_VIDEO_CX25821) += cx25821/ 
obj-$(CONFIG_VIDEO_TM6000)	+= tm6000/

obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/

obj-$(CONFIG_LIRC_STAGING)	+= lirc/

obj-$(CONFIG_USB_IP_COMMON)	+= usbip/

obj-$(CONFIG_USBIP_CORE)	+= usbip/

obj-$(CONFIG_W35UND)		+= winbond/

obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/

obj-$(CONFIG_ECHO)		+= echo/

obj-$(CONFIG_BRCM80211)		+= brcm80211/

obj-$(CONFIG_RT2860)		+= rt2860/

obj-$(CONFIG_RT2870)		+= rt2870/

obj-$(CONFIG_BRCMSMAC)		+= brcm80211/

obj-$(CONFIG_BRCMFMAC)		+= brcm80211/

obj-$(CONFIG_COMEDI)		+= comedi/

obj-$(CONFIG_FB_OLPC_DCON)	+= olpc_dcon/

obj-$(CONFIG_ASUS_OLED)		+= asus_oled/
@@ -70,3 +69,5 @@ obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ 
obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)	+= cptm1217/

obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)	+= ste_rmi4/

obj-$(CONFIG_DRM_PSB)		+= gma500/

obj-$(CONFIG_INTEL_MEI)		+= mei/

obj-$(CONFIG_MFD_NVEC)		+= nvec/

drivers/staging/ath6kl/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -100,12 +100,6 @@ config AR600x_BT_RESET_PIN 
	help

	WLAN GPIO to be used for resetting BT



config ATH6KL_CFG80211

	bool "CFG80211 support"

	depends on ATH6K_LEGACY && CFG80211

	help

	Enables support for CFG80211 APIs. The default option is to use WEXT. Even with this option enabled, WEXT is not explicitly disabled and the onus of not exercising WEXT lies on the application(s) running in the user space.



config ATH6KL_HTC_RAW_INTERFACE

	bool "RAW HTC support"

	depends on ATH6K_LEGACY

drivers/staging/ath6kl/Makefile

+1 −38
Original line number Diff line number Diff line
@@ -29,26 +29,6 @@ ccflags-y += -I$(obj)/os 
ccflags-y += -I$(obj)/bmi/include

ccflags-y += -I$(obj)/include/common/AR6002/hw4.0



ifeq ($(CONFIG_AR600x_SD31_XXX),y)

ccflags-y += -DAR600x_SD31_XXX

endif



ifeq ($(CONFIG_AR600x_WB31_XXX),y)

ccflags-y += -DAR600x_WB31_XXX

endif



ifeq ($(CONFIG_AR600x_SD32_XXX),y)

ccflags-y += -DAR600x_SD32_XXX

endif



ifeq ($(CONFIG_AR600x_CUSTOM_XXX),y)

ccflags-y += -DAR600x_CUSTOM_XXX

endif



ifeq ($(CONFIG_ATH6KL_ENABLE_COEXISTENCE),y)

ccflags-y += -DENABLE_COEXISTENCE

endif



ifeq ($(CONFIG_AR600x_DUAL_ANTENNA),y)

ccflags-y += -DAR600x_DUAL_ANTENNA

endif
@@ -85,11 +65,6 @@ ifeq ($(CONFIG_ATH6KL_CONFIG_GPIO_BT_RESET),y) 
ccflags-y += -DATH6KL_CONFIG_GPIO_BT_RESET

endif



ifeq ($(CONFIG_ATH6KL_CFG80211),y)

ccflags-y += -DATH6K_CONFIG_CFG80211

ath6kl-y += os/linux/cfg80211.o

endif



ifeq ($(CONFIG_ATH6KL_HTC_RAW_INTERFACE),y)

ccflags-y += -DHTC_RAW_INTERFACE

endif
@@ -115,18 +90,8 @@ ifeq ($(CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK),y) 
ccflags-y += -DATH6KL_SKIP_ABI_VERSION_CHECK

endif



ccflags-y += -DLINUX -DKERNEL_2_6

ccflags-y += -DTCMD

ccflags-y += -DSEND_EVENT_TO_APP

ccflags-y += -DUSER_KEYS

ccflags-y += -DNO_SYNC_FLUSH

ccflags-y += -DHTC_EP_STAT_PROFILING

ccflags-y += -DATH_AR6K_11N_SUPPORT

ccflags-y += -DWAPI_ENABLE

ccflags-y += -DCHECKSUM_OFFLOAD

ccflags-y += -DWLAN_HEADERS

ccflags-y += -DINIT_MODE_DRV_ENABLED

ccflags-y += -DBMIENABLE_SET



obj-$(CONFIG_ATH6K_LEGACY) := ath6kl.o

ath6kl-y += htc2/AR6000/ar6k.o
@@ -136,14 +101,12 @@ ath6kl-y += htc2/htc_recv.o 
ath6kl-y += htc2/htc_services.o

ath6kl-y += htc2/htc.o

ath6kl-y += bmi/src/bmi.o

ath6kl-y += os/linux/cfg80211.o

ath6kl-y += os/linux/ar6000_drv.o

ath6kl-y += os/linux/ar6000_raw_if.o

ath6kl-y += os/linux/ar6000_pm.o

ath6kl-y += os/linux/netbuf.o

ath6kl-y += os/linux/wireless_ext.o

ath6kl-y += os/linux/ioctl.o

ath6kl-y += os/linux/hci_bridge.o

ath6kl-y += os/linux/ar6k_pal.o

ath6kl-y += miscdrv/common_drv.o

ath6kl-y += miscdrv/credit_dist.o

ath6kl-y += wmi/wmi.o

drivers/staging/ath6kl/bmi/include/bmi_internal.h

+1 −2
Original line number Diff line number Diff line
@@ -26,11 +26,10 @@ 


#include "a_config.h"

#include "athdefs.h"

#include "a_types.h"

#include "a_osapi.h"

#define ATH_MODULE_NAME bmi

#include "a_debug.h"

#include "AR6002/hw2.0/hw/mbox_host_reg.h"

#include "hw/mbox_host_reg.h"

#include "bmi_msg.h"



#define ATH_DEBUG_BMI  ATH_DEBUG_MAKE_MODULE_MASK(0)