From: John Crispin Date: Tue, 20 Dec 2016 12:47:57 +0000 (+0100) Subject: brcm2708: unbreak the spidev build X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c21af889bbd34fd62502c9b1fa1dc2fee7b2f2f2;p=openwrt%2Fstaging%2Fwigyori.git brcm2708: unbreak the spidev build a generic patch made this patch fail to apply cleanly leading to aborted builds Signed-off-by: John Crispin --- diff --git a/target/linux/brcm2708/patches-4.4/0081-spidev-Add-spidev-compatible-string-to-silence-warni.patch b/target/linux/brcm2708/patches-4.4/0081-spidev-Add-spidev-compatible-string-to-silence-warni.patch index 7c5481b8f3..b8859524c9 100644 --- a/target/linux/brcm2708/patches-4.4/0081-spidev-Add-spidev-compatible-string-to-silence-warni.patch +++ b/target/linux/brcm2708/patches-4.4/0081-spidev-Add-spidev-compatible-string-to-silence-warni.patch @@ -8,12 +8,14 @@ See: https://github.com/raspberrypi/linux/issues/1054 drivers/spi/spidev.c | 1 + 1 file changed, 1 insertion(+) ---- a/drivers/spi/spidev.c -+++ b/drivers/spi/spidev.c -@@ -695,6 +695,7 @@ static struct class *spidev_class; - static const struct of_device_id spidev_dt_ids[] = { +Index: linux-4.4.39/drivers/spi/spidev.c +=================================================================== +--- linux-4.4.39.orig/drivers/spi/spidev.c 2016-12-20 13:45:27.000000000 +0100 ++++ linux-4.4.39/drivers/spi/spidev.c 2016-12-20 13:46:06.627326840 +0100 +@@ -696,6 +696,7 @@ { .compatible = "rohm,dh2228fv" }, { .compatible = "lineartechnology,ltc2488" }, + { .compatible = "siliconlabs,si3210" }, + { .compatible = "spidev" }, {}, };