brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014

[openwrt/staging/lynxis/omap.git] / target / linux / brcm2708 / patches-3.10 / 0102-lirc_rpi-Fix-return-from-incompatible-pointer-type-w.patch

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
index 1e7b178a283b6ea8fc520a01f81af049d07cede2..d1ff6e3ea8e2197fb5b0df23d5ccd246fbbfa43b 100644 (file)
--- 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
@@ -1,13 +1,15 @@
-From 1007843b7b431973897f0059c7025355fa3ff75d Mon Sep 17 00:00:00 2001
+From b80da4978ba9731cabeb3ab81fb15feca71a657d 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
+Subject: [PATCH 102/196] lirc_rpi: Fix return from incompatible pointer type
  warnings
 
 ---
  drivers/staging/media/lirc/lirc_rpi.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
+diff --git a/drivers/staging/media/lirc/lirc_rpi.c b/drivers/staging/media/lirc/lirc_rpi.c
+index 5bb0dfe..cb32042 100644
 --- 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;
@@ -27,7 +29,7 @@ Subject: [PATCH 102/174] lirc_rpi: Fix return from incompatible pointer type
  
  struct gpio_chip *gpiochip;
  struct irq_chip *irqchip;
-@@ -678,7 +678,7 @@ MODULE_PARM_DESC(gpio_in_pin, "GPIO inpu
+@@ -678,7 +678,7 @@ MODULE_PARM_DESC(gpio_in_pin, "GPIO input pin number of the BCM processor."
                 " Valid pin numbers are: 0, 1, 4, 8, 7, 9, 10, 11, 14, 15,"
                 " 17, 18, 21, 22, 23, 24, 25, default 18");
  
@@ -36,3 +38,6 @@ Subject: [PATCH 102/174] lirc_rpi: Fix return from incompatible pointer type
  MODULE_PARM_DESC(sense, "Override autodetection of IR receiver circuit"
                 " (0 = active high, 1 = active low )");
  
+-- 
+1.9.1
+