From 3ae3cf6154a6d4e929396f2694b68714a9ce237b Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 23 Sep 2018 19:45:27 +0200 Subject: backports: Remove NFC support I am not aware of any user of the NFC coded in backports, at least I haven't seen any patches regarding this. Remove this code to reduce the efforts needed in the backports project. Signed-off-by: Hauke Mehrtens Signed-off-by: Johannes Berg --- backport/Kconfig.sources | 2 -- backport/Makefile.kernel | 2 -- backport/defconfigs/nfc | 20 -------------------- 3 files changed, 24 deletions(-) delete mode 100644 backport/defconfigs/nfc (limited to 'backport') diff --git a/backport/Kconfig.sources b/backport/Kconfig.sources index 3fc674e5..347f1c56 100644 --- a/backport/Kconfig.sources +++ b/backport/Kconfig.sources @@ -7,8 +7,6 @@ source "$BACKPORT_DIR/net/mac80211/Kconfig" source "$BACKPORT_DIR/drivers/net/wireless/Kconfig" source "$BACKPORT_DIR/drivers/net/usb/Kconfig" -source "$BACKPORT_DIR/net/nfc/Kconfig" - source "$BACKPORT_DIR/drivers/usb/class/Kconfig" source "$BACKPORT_DIR/drivers/staging/Kconfig" diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel index a09d5230..23b26882 100644 --- a/backport/Makefile.kernel +++ b/backport/Makefile.kernel @@ -41,8 +41,6 @@ obj-$(CPTCFG_CFG80211) += net/wireless/ obj-$(CPTCFG_MAC80211) += net/mac80211/ obj-$(CPTCFG_WLAN) += drivers/net/wireless/ obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/ -obj-$(CPTCFG_NFC) += net/nfc/ -obj-$(CPTCFG_NFC) += drivers/nfc/ obj-$(CPTCFG_USB_WDM) += drivers/usb/class/ obj-$(CPTCFG_USB_USBNET) += drivers/net/usb/ diff --git a/backport/defconfigs/nfc b/backport/defconfigs/nfc deleted file mode 100644 index c00f10fd..00000000 --- a/backport/defconfigs/nfc +++ /dev/null @@ -1,20 +0,0 @@ -CPTCFG_NFC=m -CPTCFG_NFC_DIGITAL=m -CPTCFG_NFC_HCI=m -CPTCFG_NFC_MEI_PHY=m -CPTCFG_NFC_MICROREAD=m -CPTCFG_NFC_MICROREAD_I2C=m -CPTCFG_NFC_MICROREAD_MEI=m -CPTCFG_NFC_MRVL=m -CPTCFG_NFC_MRVL_USB=m -CPTCFG_NFC_NCI=m -CPTCFG_NFC_NCI_SPI=y -CPTCFG_NFC_PN533=m -CPTCFG_NFC_PN544=m -CPTCFG_NFC_PN544_I2C=m -CPTCFG_NFC_PN544_MEI=m -CPTCFG_NFC_PORT100=m -CPTCFG_NFC_SHDLC=y -CPTCFG_NFC_SIM=m -CPTCFG_NFC_TRF7970A=m -CPTCFG_NFC_WILINK=m -- cgit v1.2.3