aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2016-12-20 13:47:57 +0100
committerJohn Crispin <john@phrozen.org>2016-12-20 13:47:57 +0100
commitc21af889bbd34fd62502c9b1fa1dc2fee7b2f2f2 (patch)
treea12f6ef5616c6cbf525f3933ab6f860c79d5b14c /target/linux
parent87522a7bf2414a2c3c63297ff8dc9d22d3cb5e2b (diff)
downloadupstream-c21af889bbd34fd62502c9b1fa1dc2fee7b2f2f2.tar.gz
upstream-c21af889bbd34fd62502c9b1fa1dc2fee7b2f2f2.tar.bz2
upstream-c21af889bbd34fd62502c9b1fa1dc2fee7b2f2f2.zip
brcm2708: unbreak the spidev build
a generic patch made this patch fail to apply cleanly leading to aborted builds Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm2708/patches-4.4/0081-spidev-Add-spidev-compatible-string-to-silence-warni.patch10
1 files changed, 6 insertions, 4 deletions
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" },
{},
};