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 a conflict in
drivers/Kconfig drivers/Makefile between commit de55d8716ac5 ("Extcon
(external connector): import Android's switch class and modify") from the
driver-core tree and commits a980e046098b ("IIO: Move the core files to
drivers/iio") and db3b9e990e75 ("Staging: VME: move VME drivers out of
staging") 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/Kconfig
index 0233ad9,e245779..0000000
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -140,6 -140,8 +140,10 @@@ source "drivers/virt/Kconfig
  
  source "drivers/devfreq/Kconfig"
  
 +source "drivers/extcon/Kconfig"
 +
+ source "drivers/iio/Kconfig"
+ 
+ source "drivers/vme/Kconfig"
+ 
  endmenu
diff --cc drivers/Makefile
index c41dfa9,08b78e0..0000000
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -134,4 -134,5 +134,6 @@@ obj-$(CONFIG_VIRT_DRIVERS)	+= virt
  obj-$(CONFIG_HYPERV)		+= hv/
  
  obj-$(CONFIG_PM_DEVFREQ)	+= devfreq/
 +obj-$(CONFIG_EXTCON)		+= extcon/
+ obj-$(CONFIG_IIO)		+= iio/
+ obj-$(CONFIG_VME_BUS)		+= vme/

Attachment: pgp00000.pgp
Description: PGP signature