Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-01-14 11:58:00 +0100
committerPetr Tesarik <ptesarik@suse.cz>2019-01-14 11:58:00 +0100
commit1e9ae5120500f21935eb75b399bd3115eca44fcb (patch)
treef9554f6fb9060e476f1cb9d9b1c3357e61dc54ae
parent1a99b3bdfeaf7fcc1ec30dc844c1f25865d2a3e6 (diff)
parent7950d7eb7aa134b72d057e05d6b1d17ae485b3b3 (diff)
Merge branch 'SLE15-SP1' into openSUSE-15.1
-rw-r--r--drivers/usb/typec/tcpm/Kconfig8
-rw-r--r--drivers/usb/typec/tcpm/Makefile1
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/usb/typec/tcpm/Kconfig b/drivers/usb/typec/tcpm/Kconfig
index f03ea8a61768..604cf13667a4 100644
--- a/drivers/usb/typec/tcpm/Kconfig
+++ b/drivers/usb/typec/tcpm/Kconfig
@@ -27,14 +27,6 @@ config TYPEC_RT1711H
endif # TYPEC_TCPCI
-config TYPEC_FUSB302
- tristate "Fairchild FUSB302 Type-C chip driver"
- depends on I2C
- help
- The Fairchild FUSB302 Type-C chip driver that works with
- Type-C Port Controller Manager to provide USB PD and USB
- Type-C functionalities.
-
config TYPEC_WCOVE
tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver"
depends on ACPI
diff --git a/drivers/usb/typec/tcpm/Makefile b/drivers/usb/typec/tcpm/Makefile
index a5ff6c8eb892..30e328381f39 100644
--- a/drivers/usb/typec/tcpm/Makefile
+++ b/drivers/usb/typec/tcpm/Makefile
@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_TYPEC_TCPM) += tcpm.o
-obj-$(CONFIG_TYPEC_FUSB302) += fusb302.o
obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o
typec_wcove-y := wcove.o
obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o