brcm2708: update against latest rpi-3.10.y branch
[openwrt/svn-archive/archive.git] / target / linux / brcm2708 / patches-3.10 / 0102-lirc_rpi-Fix-return-from-incompatible-pointer-type-w.patch
1 From 1007843b7b431973897f0059c7025355fa3ff75d Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Du=C5=A1an=20Dragi=C4=87?= <dragic.dusan@gmail.com>
3 Date: Wed, 25 Sep 2013 18:20:09 +0200
4 Subject: [PATCH 102/174] lirc_rpi: Fix return from incompatible pointer type
5 warnings
6
7 ---
8 drivers/staging/media/lirc/lirc_rpi.c | 8 ++++----
9 1 file changed, 4 insertions(+), 4 deletions(-)
10
11 --- a/drivers/staging/media/lirc/lirc_rpi.c
12 +++ b/drivers/staging/media/lirc/lirc_rpi.c
13 @@ -63,13 +63,13 @@ static int gpio_in_pin = 18;
14 /* set the default GPIO output pin */
15 static int gpio_out_pin = 17;
16 /* enable debugging messages */
17 -static int debug;
18 +static bool debug;
19 /* -1 = auto, 0 = active high, 1 = active low */
20 static int sense = -1;
21 /* use softcarrier by default */
22 -static int softcarrier = 1;
23 +static bool softcarrier = 1;
24 /* 0 = do not invert output, 1 = invert output */
25 -static int invert = 0;
26 +static bool invert = 0;
27
28 struct gpio_chip *gpiochip;
29 struct irq_chip *irqchip;
30 @@ -678,7 +678,7 @@ MODULE_PARM_DESC(gpio_in_pin, "GPIO inpu
31 " Valid pin numbers are: 0, 1, 4, 8, 7, 9, 10, 11, 14, 15,"
32 " 17, 18, 21, 22, 23, 24, 25, default 18");
33
34 -module_param(sense, bool, S_IRUGO);
35 +module_param(sense, int, S_IRUGO);
36 MODULE_PARM_DESC(sense, "Override autodetection of IR receiver circuit"
37 " (0 = active high, 1 = active low )");
38