aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-3.10/0150-Cleanup-include-for-files-under-include-linux.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2014-02-28 20:30:08 +0000
committerFlorian Fainelli <florian@openwrt.org>2014-02-28 20:30:08 +0000
commit800930b924c19a56b3a6e94ad351cd0715fb410d (patch)
tree70158d97f68604d69da8da779507469cf930bf07 /target/linux/brcm2708/patches-3.10/0150-Cleanup-include-for-files-under-include-linux.patch
parent68c939ba0b0a0dda84e7a2ae370155be9a5593bc (diff)
downloadupstream-800930b924c19a56b3a6e94ad351cd0715fb410d.tar.gz
upstream-800930b924c19a56b3a6e94ad351cd0715fb410d.tar.bz2
upstream-800930b924c19a56b3a6e94ad351cd0715fb410d.zip
brcm2708: update against latest rpi-3.10.y branch
Update our copies of the brcm2708 patches to the latest rpi-3.10-y rebased against linux-3.10.y stable (3.10.32). This should hopefully make it easier for us in the future to leverage the raspberry/rpi-* branches. Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39770 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0150-Cleanup-include-for-files-under-include-linux.patch')
-rw-r--r--target/linux/brcm2708/patches-3.10/0150-Cleanup-include-for-files-under-include-linux.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0150-Cleanup-include-for-files-under-include-linux.patch b/target/linux/brcm2708/patches-3.10/0150-Cleanup-include-for-files-under-include-linux.patch
new file mode 100644
index 0000000000..499634af48
--- /dev/null
+++ b/target/linux/brcm2708/patches-3.10/0150-Cleanup-include-for-files-under-include-linux.patch
@@ -0,0 +1,32 @@
+From d8088f3740de018fd6ae975f290db057194fe243 Mon Sep 17 00:00:00 2001
+From: Daniel Santos <daniel.santos@pobox.com>
+Date: Fri, 3 Jan 2014 17:24:46 -0600
+Subject: [PATCH 150/174] Cleanup include for files under include/linux
+
+Adding include/linux/anything is bad form. This fixes this prior to
+other changes that touches this Makefile.
+---
+ drivers/char/broadcom/vc_cma/Makefile | 1 -
+ drivers/char/broadcom/vc_cma/vc_cma.c | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/char/broadcom/vc_cma/Makefile
++++ b/drivers/char/broadcom/vc_cma/Makefile
+@@ -1,6 +1,5 @@
+ EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs
+ EXTRA_CFLAGS += -Werror
+-EXTRA_CFLAGS += -I"include/linux/broadcom"
+ EXTRA_CFLAGS += -I"drivers/misc/vc04_services"
+ EXTRA_CFLAGS += -I"drivers/misc/vc04_services/interface/vchi"
+ EXTRA_CFLAGS += -I"drivers/misc/vc04_services/interface/vchiq_arm"
+--- a/drivers/char/broadcom/vc_cma/vc_cma.c
++++ b/drivers/char/broadcom/vc_cma/vc_cma.c
+@@ -46,7 +46,7 @@
+ #include <linux/uaccess.h>
+ #include <asm/cacheflush.h>
+
+-#include "vc_cma.h"
++#include <linux/broadcom/vc_cma.h>
+
+ #include "vchiq_util.h"
+ #include "vchiq_connected.h"