Disable zoron driver, moved to staging for removal upstream

28 files changed, 16 insertions, 149 deletions

diff --git a/configs/fedora/generic/CONFIG_VIDEO_ZORAN b/configs/fedora/generic/CONFIG_VIDEO_ZORAN
index cda3bcc19..e6a8d5656 100644
--- a/configs/fedora/generic/CONFIG_VIDEO_ZORAN
+++ b/configs/fedora/generic/CONFIG_VIDEO_ZORAN
@@ -1 +1 @@
-CONFIG_VIDEO_ZORAN=m
+# CONFIG_VIDEO_ZORAN is not set
diff --git a/configs/fedora/generic/CONFIG_VIDEO_ZORAN_AVS6EYES b/configs/fedora/generic/CONFIG_VIDEO_ZORAN_AVS6EYES
deleted file mode 100644
index b51611520..000000000
--- a/configs/fedora/generic/CONFIG_VIDEO_ZORAN_AVS6EYES
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
diff --git a/configs/fedora/generic/CONFIG_VIDEO_ZORAN_BUZ b/configs/fedora/generic/CONFIG_VIDEO_ZORAN_BUZ
deleted file mode 100644
index 29e4bf146..000000000
--- a/configs/fedora/generic/CONFIG_VIDEO_ZORAN_BUZ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_ZORAN_BUZ=m
diff --git a/configs/fedora/generic/CONFIG_VIDEO_ZORAN_DC10 b/configs/fedora/generic/CONFIG_VIDEO_ZORAN_DC10
deleted file mode 100644
index d2acc130f..000000000
--- a/configs/fedora/generic/CONFIG_VIDEO_ZORAN_DC10
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_ZORAN_DC10=m
diff --git a/configs/fedora/generic/CONFIG_VIDEO_ZORAN_DC30 b/configs/fedora/generic/CONFIG_VIDEO_ZORAN_DC30
deleted file mode 100644
index c7483f263..000000000
--- a/configs/fedora/generic/CONFIG_VIDEO_ZORAN_DC30
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_ZORAN_DC30=m
diff --git a/configs/fedora/generic/CONFIG_VIDEO_ZORAN_LML33 b/configs/fedora/generic/CONFIG_VIDEO_ZORAN_LML33
deleted file mode 100644
index 207ec6fc6..000000000
--- a/configs/fedora/generic/CONFIG_VIDEO_ZORAN_LML33
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_ZORAN_LML33=m
diff --git a/configs/fedora/generic/CONFIG_VIDEO_ZORAN_LML33R10 b/configs/fedora/generic/CONFIG_VIDEO_ZORAN_LML33R10
deleted file mode 100644
index 14ed0dedd..000000000
--- a/configs/fedora/generic/CONFIG_VIDEO_ZORAN_LML33R10
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_ZORAN_LML33R10=m
diff --git a/configs/fedora/generic/CONFIG_VIDEO_ZORAN_ZR36060 b/configs/fedora/generic/CONFIG_VIDEO_ZORAN_ZR36060
deleted file mode 100644
index dbec9b9d7..000000000
--- a/configs/fedora/generic/CONFIG_VIDEO_ZORAN_ZR36060
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_ZORAN_ZR36060=m
diff --git a/configs/fedora/generic/powerpc/CONFIG_VIDEO_ZORAN b/configs/fedora/generic/powerpc/CONFIG_VIDEO_ZORAN
deleted file mode 100644
index e6a8d5656..000000000
--- a/configs/fedora/generic/powerpc/CONFIG_VIDEO_ZORAN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_VIDEO_ZORAN is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index dcdd9fbbf..af7c0cf9b 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -6824,14 +6824,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
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index ce978fef9..20f01a4ae 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -6800,14 +6800,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
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index b4eab83ab..5870c84d6 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -7338,14 +7338,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
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 036e54700..20e995be1 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -6886,14 +6886,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
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 9e496d6a4..8b97b5846 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -6862,14 +6862,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
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 4ae134bb6..d1ce647c6 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -7314,14 +7314,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
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index d44ccdce7..f3dd6d7d3 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -6350,14 +6350,7 @@ CONFIG_VIDEO_VIA_CAMERA=m
 # 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
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 50d2b32d7..84896b076 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -6375,14 +6375,7 @@ CONFIG_VIDEO_VIA_CAMERA=m
 # 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
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 436047af0..496dc095d 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -6375,14 +6375,7 @@ CONFIG_VIDEO_VIA_CAMERA=m
 # 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
diff --git a/kernel-i686.config b/kernel-i686.config
index 8c53104d7..c13b9e470 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -6350,14 +6350,7 @@ CONFIG_VIDEO_VIA_CAMERA=m
 # 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
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index d804e4627..e8d570e12 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -6130,14 +6130,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 is not set
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIPERBOARD_ADC is not set
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 64727d031..32759ea6f 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -6103,14 +6103,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 is not set
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIPERBOARD_ADC is not set
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 065c5c666..d490a5199 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -6057,14 +6057,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 is not set
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIPERBOARD_ADC is not set
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 59584f93e..1a7d4169c 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -6030,14 +6030,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 is not set
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIPERBOARD_ADC is not set
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 1e31a1372..0a6abd672 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -5946,14 +5946,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
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
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 0137e7079..a1acfb20f 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -6462,14 +6462,7 @@ CONFIG_VIDEO_VIA_CAMERA=m
 # 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=y
 CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index a7faf83ba..5bfe5c7a2 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -6437,14 +6437,7 @@ CONFIG_VIDEO_VIA_CAMERA=m
 # 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=y
 CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
diff --git a/kernel.spec b/kernel.spec
index f78ffc788..6261cb8c4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1841,6 +1841,7 @@ fi
 %changelog
 * Fri Jun 15 2018 Peter Robinson <pbrobinson@fedoraproject.org>
 - ARM updates for 4.18, cleanup some dropped config options
+- Disable zoron driver, moved to staging for removal upstream
 
 * Thu Jun 14 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc0.git9.1
 - Linux v4.17-11928-g2837461dbe6f