summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2018-06-15 13:24:56 +0100
committerPeter Robinson <pbrobinson@gmail.com>2018-06-15 13:24:56 +0100
commit1f4f66833b3559f8689c6ff002c505e761ec364d (patch)
treee86a23f42faf73cbb2a8740b5dd3457152d82e3a /kernel-s390x.config
parentc36cd75159e9c50ca034029d0e33f83adcc366c8 (diff)
downloadkernel-1f4f66833b3559f8689c6ff002c505e761ec364d.tar.gz
kernel-1f4f66833b3559f8689c6ff002c505e761ec364d.tar.xz
kernel-1f4f66833b3559f8689c6ff002c505e761ec364d.zip
Disable zoron driver, moved to staging for removal upstream
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config9
1 files changed, 1 insertions, 8 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 818a8fe2c..31feba7c9 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -5919,14 +5919,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_VIVID is not set
# CONFIG_VIDEO_VIVI is not set
# CONFIG_VIDEO_XILINX is not set
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
+# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y