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