drop i2c-omap-enable-for-arch_k3.patch from 4.14

diff --git a/queue-4.14/i2c-omap-enable-for-arch_k3.patch b/queue-4.14/i2c-omap-enable-for-arch_k3.patch
deleted file mode 100644 (file)
index 04e19f2..0000000
--- a/queue-4.14/i2c-omap-enable-for-arch_k3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f3418cdc9e387a6aa6f4ddb16bd2c74d533a5139 Mon Sep 17 00:00:00 2001
-From: Vignesh R <vigneshr@ti.com>
-Date: Fri, 9 Nov 2018 16:44:11 +0530
-Subject: i2c: omap: Enable for ARCH_K3
-
-[ Upstream commit 5b277402deac0691226a947df71c581686bd4020 ]
-
-Allow I2C_OMAP to be built for K3 platforms.
-
-Signed-off-by: Vignesh R <vigneshr@ti.com>
-Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
-Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
----
- drivers/i2c/busses/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
-index 45a3f3ca29b38..75ea367ffd833 100644
---- a/drivers/i2c/busses/Kconfig
-+++ b/drivers/i2c/busses/Kconfig
-@@ -759,7 +759,7 @@ config I2C_OCORES
- 
- config I2C_OMAP
-       tristate "OMAP I2C adapter"
--      depends on ARCH_OMAP
-+      depends on ARCH_OMAP || ARCH_K3
-       default y if MACH_OMAP_H3 || MACH_OMAP_OSK
-       help
-         If you say yes to this option, support will be included for the
--- 
-2.20.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 51551535488dab0cb4143c06c74969d946439955..f45b81d6e623953242781c231d6c29b9c18fc390 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -50,7 +50,6 @@ media-cec-integrate-cec_validate_phys_addr-in-cec-ap.patch
 media-adv7604-when-the-edid-is-cleared-unconfigure-c.patch
 media-adv7842-when-the-edid-is-cleared-unconfigure-c.patch
 fuse-fix-possibly-missed-wake-up-after-abort.patch
-i2c-omap-enable-for-arch_k3.patch
 drm-i915-disable-lp3-watermarks-on-all-snb-machines.patch
 media-ov5640-fix-wrong-binning-value-in-exposure-cal.patch
 media-ov5640-fix-auto-controls-values-when-switching.patch