From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 4 Nov 2015 23:20:17 +0000 (+1100)
Subject: Merge remote-tracking branch 'samsung/for-next'
X-Git-Tag: KARO-TXUL-2015-12-04~143
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=d0c922f553d6f5b6b7981878fd63a86b63de8e70

Merge remote-tracking branch 'samsung/for-next'
---

d0c922f553d6f5b6b7981878fd63a86b63de8e70
diff --cc drivers/soc/Kconfig
index 4e853ed2c82b,69107c9e2c9f..332c19f1b724
--- a/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@@ -1,9 -1,8 +1,10 @@@
  menu "SOC (System On Chip) specific Drivers"
  
 +source "drivers/soc/brcmstb/Kconfig"
  source "drivers/soc/mediatek/Kconfig"
  source "drivers/soc/qcom/Kconfig"
 +source "drivers/soc/rockchip/Kconfig"
+ source "drivers/soc/samsung/Kconfig"
  source "drivers/soc/sunxi/Kconfig"
  source "drivers/soc/ti/Kconfig"
  source "drivers/soc/versatile/Kconfig"
diff --cc drivers/soc/Makefile
index f2ba2e932ae1,a6236163597d..757711972261
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@@ -6,7 -5,7 +6,8 @@@ obj-$(CONFIG_SOC_BRCMSTB)	+= brcmstb
  obj-$(CONFIG_MACH_DOVE)		+= dove/
  obj-$(CONFIG_ARCH_MEDIATEK)	+= mediatek/
  obj-$(CONFIG_ARCH_QCOM)		+= qcom/
+ obj-$(CONFIG_SOC_SAMSUNG)	+= samsung/
 +obj-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip/
  obj-$(CONFIG_ARCH_SUNXI)	+= sunxi/
  obj-$(CONFIG_ARCH_TEGRA)	+= tegra/
  obj-$(CONFIG_SOC_TI)		+= ti/