Home Home > GIT Browse
summaryrefslogtreecommitdiff
authorJeff Mahoney <jeffm@suse.com>2012-05-02 14:40:55 (GMT)
committer Jeff Mahoney <jeffm@suse.com>2012-05-02 14:51:36 (GMT)
commit4d1394acf06bc03f70528b7f3b01a351dc50ec18 (patch) (unidiff)
treeca78ade1ce2dc3384ef985dc6980f8c8ae0c00e0
parent3cd703ff254e4e98c7ea502ca0535ce1536a9fa1 (diff)
omap-usb-host: include <plat/cpu.h>.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--patches.fixes/omap-usb-host-include-plat-cpu-h23
-rw-r--r--series.conf1
2 files changed, 24 insertions, 0 deletions
diff --git a/patches.fixes/omap-usb-host-include-plat-cpu-h b/patches.fixes/omap-usb-host-include-plat-cpu-h
new file mode 100644
index 0000000..102f8bb
--- a/dev/null
+++ b/patches.fixes/omap-usb-host-include-plat-cpu-h
@@ -0,0 +1,23 @@
1From: Jeff Mahoney <jeffm@suse.com>
2Subject: omap-usb-host: include <plat/cpu.h>
3Patch-mainline: Submitted 2 May 2012
4
5omap-usb-host calls cpu_is_omap3430, which is defined in plat/cpu.h.
6
7Reported-by: Guillaume GARDET <guillaume.gardet@opensuse.org>
8Signed-off-by: Jeff Mahoney <jeffm@suse.com>
9---
10 drivers/mfd/omap-usb-host.c | 1 +
11 1 file changed, 1 insertion(+)
12
13--- a/drivers/mfd/omap-usb-host.c
14+++ b/drivers/mfd/omap-usb-host.c
15@@ -26,6 +26,7 @@
16 #include <linux/dma-mapping.h>
17 #include <linux/spinlock.h>
18 #include <plat/usb.h>
19+#include <plat/cpu.h>
20 #include <linux/pm_runtime.h>
21
22 #define USBHS_DRIVER_NAME"usbhs_omap"
23
diff --git a/series.conf b/series.conf
index d61cc88..9987f47 100644
--- a/series.conf
+++ b/series.conf
@@ -149,12 +149,13 @@
149 ######################################################## 149 ########################################################
150 150
151 ######################################################## 151 ########################################################
152 # ARM 152 # ARM
153 ######################################################## 153 ########################################################
154 patches.arch/arm-phys-offset.patch 154 patches.arch/arm-phys-offset.patch
155 patches.fixes/omap-usb-host-include-plat-cpu-h
155 156
156 ######################################################## 157 ########################################################
157 # S/390 158 # S/390
158 ######################################################## 159 ########################################################
159 patches.arch/s390-message-catalog.diff 160 patches.arch/s390-message-catalog.diff
160 patches.arch/s390-message-catalog-fix.diff 161 patches.arch/s390-message-catalog-fix.diff