| Message ID | 1500001674-24553-2-git-send-email-acelan.kao@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, 2017-07-14 at 11:07 +0800, AceLan Kao wrote: > From below commit, st-nci.h has been removed > 61a0410 NFC: st-nci: Get rid of platform data > And we don't need st-nci-spi.patch, either. The patch is included in > upstream kernel source. > Both applied, but it'd have been nicer to split the second patch into two since it's two very different things. johannes -- To unsubscribe from this list: send the line "unsubscribe backports" in
diff --git a/copy-list b/copy-list index 52df0ea..5f6bf42 100644 --- a/copy-list +++ b/copy-list @@ -116,7 +116,6 @@ include/uapi/linux/nfc.h drivers/nfc/ include/linux/platform_data/nfcmrvl.h include/linux/platform_data/nxp-nci.h -include/linux/platform_data/st-nci.h # MPLS labels, checked on skb->protocol on the # respective 802 family, only ethernet seems to use diff --git a/patches/0013-fix-makefile-includes/st-nci-spi.patch b/patches/0013-fix-makefile-includes/st-nci-spi.patch deleted file mode 100644 index 1ecd161..0000000 --- a/patches/0013-fix-makefile-includes/st-nci-spi.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/drivers/nfc/st-nci/spi.c -+++ b/drivers/nfc/st-nci/spi.c -@@ -21,6 +21,7 @@ - #include <linux/spi/spi.h> - #include <linux/gpio.h> - #include <linux/gpio/consumer.h> -+#include <linux/of.h> - #include <linux/of_irq.h> - #include <linux/of_gpio.h> - #include <linux/acpi.h>
From below commit, st-nci.h has been removed 61a0410 NFC: st-nci: Get rid of platform data And we don't need st-nci-spi.patch, either. The patch is included in upstream kernel source. Signed-off-by: AceLan Kao <acelan.kao@canonical.com> --- copy-list | 1 - patches/0013-fix-makefile-includes/st-nci-spi.patch | 10 ---------- 2 files changed, 11 deletions(-) delete mode 100644 patches/0013-fix-makefile-includes/st-nci-spi.patch