Merge branch 'i2c/for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 1a73c20bc400c9b3c1efec2bf4d39b58c7286e34..8f10834124a94fa4134aeef157702e681a9a3e9d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1626,6 +1626,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/boot/dts/uniphier*
 F:     arch/arm/mach-uniphier/
+F:     drivers/i2c/busses/i2c-uniphier*
 F:     drivers/pinctrl/uniphier/
 F:     drivers/tty/serial/8250/8250_uniphier.c
 N:     uniphier
@@ -5163,6 +5164,7 @@ S:        Maintained
 F:     Documentation/devicetree/bindings/i2c/
 F:     Documentation/i2c/
 F:     drivers/i2c/
+F:     drivers/i2c/*/
 F:     include/linux/i2c.h
 F:     include/linux/i2c-*.h
 F:     include/uapi/linux/i2c.h
@@ -8418,12 +8420,6 @@ M:       "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 S:     Maintained
 F:     drivers/pnp/
 
-PNXxxxx I2C DRIVER
-M:     Vitaly Wool <vitalywool@gmail.com>
-L:     linux-i2c@vger.kernel.org
-S:     Maintained
-F:     drivers/i2c/busses/i2c-pnx.c
-
 PPP PROTOCOL DRIVERS AND COMPRESSORS
 M:     Paul Mackerras <paulus@samba.org>
 L:     linux-ppp@vger.kernel.org