diff options
author | Florian Fainelli <florian@openwrt.org> | 2014-02-28 20:30:08 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2014-02-28 20:30:08 +0000 |
commit | 800930b924c19a56b3a6e94ad351cd0715fb410d (patch) | |
tree | 70158d97f68604d69da8da779507469cf930bf07 /target/linux/brcm2708/patches-3.10/0102-lirc_rpi-Fix-return-from-incompatible-pointer-type-w.patch | |
parent | 68c939ba0b0a0dda84e7a2ae370155be9a5593bc (diff) | |
download | upstream-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/0102-lirc_rpi-Fix-return-from-incompatible-pointer-type-w.patch')
-rw-r--r-- | target/linux/brcm2708/patches-3.10/0102-lirc_rpi-Fix-return-from-incompatible-pointer-type-w.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0102-lirc_rpi-Fix-return-from-incompatible-pointer-type-w.patch b/target/linux/brcm2708/patches-3.10/0102-lirc_rpi-Fix-return-from-incompatible-pointer-type-w.patch new file mode 100644 index 0000000000..1e7b178a28 --- /dev/null +++ b/target/linux/brcm2708/patches-3.10/0102-lirc_rpi-Fix-return-from-incompatible-pointer-type-w.patch @@ -0,0 +1,38 @@ +From 1007843b7b431973897f0059c7025355fa3ff75d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Du=C5=A1an=20Dragi=C4=87?= <dragic.dusan@gmail.com> +Date: Wed, 25 Sep 2013 18:20:09 +0200 +Subject: [PATCH 102/174] lirc_rpi: Fix return from incompatible pointer type + warnings + +--- + drivers/staging/media/lirc/lirc_rpi.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/staging/media/lirc/lirc_rpi.c ++++ b/drivers/staging/media/lirc/lirc_rpi.c +@@ -63,13 +63,13 @@ static int gpio_in_pin = 18; + /* set the default GPIO output pin */ + static int gpio_out_pin = 17; + /* enable debugging messages */ +-static int debug; ++static bool debug; + /* -1 = auto, 0 = active high, 1 = active low */ + static int sense = -1; + /* use softcarrier by default */ +-static int softcarrier = 1; ++static bool softcarrier = 1; + /* 0 = do not invert output, 1 = invert output */ +-static int invert = 0; ++static bool invert = 0; + + struct gpio_chip *gpiochip; + struct irq_chip *irqchip; +@@ -678,7 +678,7 @@ MODULE_PARM_DESC(gpio_in_pin, "GPIO inpu + " Valid pin numbers are: 0, 1, 4, 8, 7, 9, 10, 11, 14, 15," + " 17, 18, 21, 22, 23, 24, 25, default 18"); + +-module_param(sense, bool, S_IRUGO); ++module_param(sense, int, S_IRUGO); + MODULE_PARM_DESC(sense, "Override autodetection of IR receiver circuit" + " (0 = active high, 1 = active low )"); + |