arc: plat-hsdk: fix kconfig dependency warning when !RESET_CONTROLLER

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9350506..3b33837 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6608,13 +6608,6 @@ L:       iommu@lists.linux-foundation.org
 S:     Maintained
 F:     drivers/iommu/exynos-iommu.c
 
-EZchip NPS platform support
-M:     Vineet Gupta <vgupta@synopsys.com>
-M:     Ofer Levi <oferle@nvidia.com>
-S:     Supported
-F:     arch/arc/boot/dts/eznps.dts
-F:     arch/arc/plat-eznps
-
 F2FS FILE SYSTEM
 M:     Jaegeuk Kim <jaegeuk@kernel.org>
 M:     Chao Yu <yuchao0@huawei.com>
@@ -13182,6 +13175,7 @@ F:      drivers/firmware/pcdp.*
 
 PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
 M:     Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+M:     Pali Rohár <pali@kernel.org>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -16154,7 +16148,7 @@ M:      Leon Luo <leonl@leopardimaging.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/devicetree/bindings/media/i2c/imx274.txt
+F:     Documentation/devicetree/bindings/media/i2c/sony,imx274.yaml
 F:     drivers/media/i2c/imx274.c
 
 SONY IMX290 SENSOR DRIVER