Merge tag 'samsung-defconfig-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel...

Samsung defconfig update for v4.8, part 2:
1. Enable Virtual Video Test Driver on nulti_v7 and exynos defconfigs.
   Useful for testing.

* tag 'samsung-defconfig-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: multi_v7_defconfig: Enable vivid driver as a module
  ARM: exynos_defconfig: Enable vivid driver as a module

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/configs/multi_v7_defconfig
index b95e1f6,95e1157..9b7cf96
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -36,7 -36,6 +36,7 @@@ CONFIG_ARCH_BCM_21664=
  CONFIG_ARCH_BCM_281XX=y
  CONFIG_ARCH_BCM_5301X=y
  CONFIG_ARCH_BCM2835=y
 +CONFIG_ARCH_BCM_63XX=y
  CONFIG_ARCH_BRCMSTB=y
  CONFIG_ARCH_BERLIN=y
  CONFIG_MACH_BERLIN_BG2=y
@@@ -158,8 -157,6 +158,8 @@@ CONFIG_INET6_IPCOMP=
  CONFIG_IPV6_MIP6=m
  CONFIG_IPV6_TUNNEL=m
  CONFIG_IPV6_MULTIPLE_TABLES=y
 +CONFIG_NET_DSA=m
 +CONFIG_NET_SWITCHDEV=y
  CONFIG_CAN=y
  CONFIG_CAN_RAW=y
  CONFIG_CAN_BCM=y
@@@ -168,7 -165,6 +168,7 @@@ CONFIG_CAN_AT91=
  CONFIG_CAN_RCAR=m
  CONFIG_CAN_XILINXCAN=y
  CONFIG_CAN_MCP251X=y
 +CONFIG_NET_DSA_BCM_SF2=m
  CONFIG_CAN_SUN4I=y
  CONFIG_BT=m
  CONFIG_BT_MRVL=m
@@@ -217,7 -213,6 +217,7 @@@ CONFIG_SCSI_MULTI_LUN=
  CONFIG_ATA=y
  CONFIG_SATA_AHCI=y
  CONFIG_SATA_AHCI_PLATFORM=y
 +CONFIG_AHCI_BRCM=y
  CONFIG_AHCI_ST=y
  CONFIG_AHCI_SUNXI=y
  CONFIG_AHCI_TEGRA=y
@@@ -229,8 -224,6 +229,8 @@@ CONFIG_VIRTIO_NET=
  CONFIG_HIX5HD2_GMAC=y
  CONFIG_SUN4I_EMAC=y
  CONFIG_MACB=y
 +CONFIG_BCMGENET=m
 +CONFIG_SYSTEMPORT=m
  CONFIG_NET_CALXEDA_XGMAC=y
  CONFIG_GIANFAR=y
  CONFIG_IGB=y
@@@ -299,8 -292,6 +299,8 @@@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=
  CONFIG_SERIAL_ATMEL=y
  CONFIG_SERIAL_ATMEL_CONSOLE=y
  CONFIG_SERIAL_ATMEL_TTYAT=y
 +CONFIG_SERIAL_BCM63XX=y
 +CONFIG_SERIAL_BCM63XX_CONSOLE=y
  CONFIG_SERIAL_MESON=y
  CONFIG_SERIAL_MESON_CONSOLE=y
  CONFIG_SERIAL_SAMSUNG=y
@@@ -460,8 -451,6 +460,8 @@@ CONFIG_MESON_WATCHDOG=
  CONFIG_DW_WATCHDOG=y
  CONFIG_DIGICOLOR_WATCHDOG=y
  CONFIG_BCM2835_WDT=y
 +CONFIG_BCM7038_WDT=m
 +CONFIG_BCM_KONA_WDT=y
  CONFIG_MFD_AS3711=y
  CONFIG_MFD_AS3722=y
  CONFIG_MFD_ATMEL_FLEXCOM=y
@@@ -553,6 -542,7 +553,7 @@@ CONFIG_VIDEO_SAMSUNG_S5P_JPEG=
  CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
  CONFIG_VIDEO_RENESAS_JPU=m
  CONFIG_VIDEO_RENESAS_VSP1=m
+ CONFIG_V4L_TEST_DRIVERS=y
  # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
  CONFIG_VIDEO_ADV7180=m
  CONFIG_VIDEO_ML86V7667=m
@@@ -836,7 -826,6 +837,7 @@@ CONFIG_PWM_VT8500=
  CONFIG_PHY_HIX5HD2_SATA=y
  CONFIG_PWM_STI=y
  CONFIG_PWM_BCM2835=y
 +CONFIG_PWM_BRCMSTB=m
  CONFIG_OMAP_USB2=y
  CONFIG_TI_PIPE3=y
  CONFIG_PHY_BERLIN_USB=y
@@@ -853,7 -842,6 +854,7 @@@ CONFIG_PHY_SUN4I_USB=
  CONFIG_PHY_SUN9I_USB=y
  CONFIG_PHY_SAMSUNG_USB2=m
  CONFIG_PHY_TEGRA_XUSB=y
 +CONFIG_PHY_BRCM_SATA=y
  CONFIG_NVMEM=y
  CONFIG_NVMEM_SUNXI_SID=y
  CONFIG_BCM2835_MBOX=y
@@@ -903,6 -891,7 +904,7 @@@ CONFIG_CRYPTO_GHASH_ARM_CE=
  CONFIG_CRYPTO_DEV_ATMEL_AES=m
  CONFIG_CRYPTO_DEV_ATMEL_TDES=m
  CONFIG_CRYPTO_DEV_ATMEL_SHA=m
+ CONFIG_VIDEO_VIVID=m
  CONFIG_VIRTIO=y
  CONFIG_VIRTIO_PCI=y
  CONFIG_VIRTIO_PCI_LEGACY=y