linux-next: manual merge of the staging tree with the driver-coretree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got conflicts in
drivers/staging/android/Kconfig and drivers/staging/android/Makefile
between commit 449a2bf5e881 ("Remove "switch" class in
drivers/staging/android/switch") from the driver-core tree and commit
ef2353d26bdc ("android-alarm: Remove unused android alarm in-kernel
interfaces") from the staging tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/staging/android/Kconfig
index c706635,84ac619..0000000
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@@ -53,7 -52,9 +53,7 @@@ config ANDROID_LOW_MEMORY_KILLE
  	---help---
  	  Register processes to be killed when memory is low
  
- config ANDROID_INTF_ALARM
 -source "drivers/staging/android/switch/Kconfig"
 -
+ config ANDROID_INTF_ALARM_DEV
  	bool "Android alarm driver"
  	depends on RTC_CLASS
  	default n
diff --cc drivers/staging/android/Makefile
index 045d17b,b4be69f..0000000
--- a/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@@ -6,5 -6,5 +6,4 @@@ obj-$(CONFIG_ANDROID_RAM_CONSOLE)	+= ra
  obj-$(CONFIG_ANDROID_TIMED_OUTPUT)	+= timed_output.o
  obj-$(CONFIG_ANDROID_TIMED_GPIO)	+= timed_gpio.o
  obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)	+= lowmemorykiller.o
- obj-$(CONFIG_ANDROID_INTF_ALARM)	+= alarm.o
 -obj-$(CONFIG_ANDROID_SWITCH)		+= switch/
  obj-$(CONFIG_ANDROID_INTF_ALARM_DEV)	+= alarm-dev.o

Attachment: pgp00000.pgp
Description: PGP signature