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

Commit b91867f2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'staging-3.3-rc3' into staging-next 



This was done to resolve some merge issues with the following files that
had changed in both branches:
	drivers/staging/rtl8712/rtl871x_sta_mgt.c
	drivers/staging/tidspbridge/rmgr/drv_interface.c
	drivers/staging/zcache/zcache-main.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents b05ee6bf 9196dc11

drivers/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ source "drivers/net/Kconfig" 


source "drivers/isdn/Kconfig"



source "drivers/telephony/Kconfig"



# input before char - char/joystick depends on it. As does USB.



source "drivers/input/Kconfig"

drivers/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ obj-$(CONFIG_POWER_SUPPLY) += power/ 
obj-$(CONFIG_HWMON)		+= hwmon/

obj-$(CONFIG_THERMAL)		+= thermal/

obj-$(CONFIG_WATCHDOG)		+= watchdog/

obj-$(CONFIG_PHONE)		+= telephony/

obj-$(CONFIG_MD)		+= md/

obj-$(CONFIG_BT)		+= bluetooth/

obj-$(CONFIG_ACCESSIBILITY)	+= accessibility/

drivers/staging/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ source "drivers/staging/zram/Kconfig" 


source "drivers/staging/zcache/Kconfig"



source "drivers/staging/zsmalloc/Kconfig"



source "drivers/staging/wlags49_h2/Kconfig"



source "drivers/staging/wlags49_h25/Kconfig"
@@ -128,4 +130,6 @@ source "drivers/staging/omapdrm/Kconfig" 


source "drivers/staging/android/Kconfig"



source "drivers/staging/telephony/Kconfig"



endif # STAGING

drivers/staging/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ obj-$(CONFIG_VME_BUS) += vme/ 
obj-$(CONFIG_DX_SEP)            += sep/

obj-$(CONFIG_IIO)		+= iio/

obj-$(CONFIG_ZRAM)		+= zram/

obj-$(CONFIG_XVMALLOC)		+= zram/

obj-$(CONFIG_ZCACHE)		+= zcache/

obj-$(CONFIG_ZSMALLOC)		+= zsmalloc/

obj-$(CONFIG_WLAGS49_H2)	+= wlags49_h2/

obj-$(CONFIG_WLAGS49_H25)	+= wlags49_h25/

obj-$(CONFIG_FB_SM7XX)		+= sm7xx/
@@ -55,3 +55,4 @@ obj-$(CONFIG_INTEL_MEI) += mei/ 
obj-$(CONFIG_MFD_NVEC)		+= nvec/

obj-$(CONFIG_DRM_OMAP)		+= omapdrm/

obj-$(CONFIG_ANDROID)		+= android/

obj-$(CONFIG_PHONE)		+= telephony/

drivers/staging/android/Kconfig

+26 −0
Original line number Diff line number Diff line
@@ -102,6 +102,32 @@ config ANDROID_LOW_MEMORY_KILLER 


source "drivers/staging/android/switch/Kconfig"



config ANDROID_INTF_ALARM

	bool "Android alarm driver"

	depends on RTC_CLASS

	default n

	help

	  Provides non-wakeup and rtc backed wakeup alarms based on rtc or

	  elapsed realtime, and a non-wakeup alarm on the monotonic clock.

	  Also provides an interface to set the wall time which must be used

	  for elapsed realtime to work.



config ANDROID_INTF_ALARM_DEV

	bool "Android alarm device"

	depends on ANDROID_INTF_ALARM

	default y

	help

	  Exports the alarm interface to user-space.



config ANDROID_ALARM_OLDDRV_COMPAT

	bool "Android Alarm compatability with old drivers"

	depends on ANDROID_INTF_ALARM

	default n

	help

	  Provides preprocessor alias to aid compatability with

	  older out-of-tree drivers that use the Android Alarm

	  in-kernel API. This will be removed eventually.



endif # if ANDROID



endmenu