1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From b038926e4aa0feeeb20bbcf5bb24765ae40162f5 Mon Sep 17 00:00:00 2001
From: Bas Laarhoven <sjml@xs4all.nl>
Date: Sun, 13 May 2012 18:06:24 +0200
Subject: [PATCH 36/56] Beaglebone: Fixed compiletime warnings.
Signed-off-by: Bas Laarhoven <sjml@xs4all.nl>
---
arch/arm/mach-omap2/board-am335xevm.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
index 8db33b9..b48e0fd 100644
--- a/arch/arm/mach-omap2/board-am335xevm.c
+++ b/arch/arm/mach-omap2/board-am335xevm.c
@@ -41,6 +41,7 @@
#include <linux/opp.h>
#include <linux/w1-gpio.h>
#include <linux/can/platform/mcp251x.h>
+#include <linux/input/ti_tscadc.h>
/* LCD controller is similar to DA850 */
#include <video/da8xx-fb.h>
@@ -300,7 +301,6 @@ struct da8xx_lcdc_platform_data dvi_pdata = {
};
/* TSc controller */
-#include <linux/input/ti_tscadc.h>
#include <linux/lis3lv02d.h>
/* TSc controller */
@@ -2200,13 +2200,13 @@ static void tt3201_init(int evm_id, int profile)
}
static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context)
{
- capecount++;
int ret;
char tmp[32];
char name[32];
char version[4];
char manufacturer[32];
+ capecount++;
/* get cape specific data */
ret = mem_acc->read(mem_acc, (char *)&cape_config, 0, sizeof(cape_config));
if (ret != sizeof(cape_config)) {
--
1.7.7.6
|
