kernel: refresh patches

[openwrt/svn-archive/archive.git] / target / linux / ixp4xx / patches-3.14 / 030-gpio_line_config.patch

diff --git a/target/linux/ixp4xx/patches-3.14/030-gpio_line_config.patch b/target/linux/ixp4xx/patches-3.14/030-gpio_line_config.patch
index de9197c9f8755ff23773c69c8c981573f865a61a..0477b3863d901619c6f7765382ef979204dce5fc 100644 (file)
--- a/target/linux/ixp4xx/patches-3.14/030-gpio_line_config.patch
+++ b/target/linux/ixp4xx/patches-3.14/030-gpio_line_config.patch
@@ -1,8 +1,6 @@
-Index: linux-3.14.25/arch/arm/mach-ixp4xx/common.c
-===================================================================
---- linux-3.14.25.orig/arch/arm/mach-ixp4xx/common.c   2014-11-21 18:23:44.000000000 +0100
-+++ linux-3.14.25/arch/arm/mach-ixp4xx/common.c        2014-12-01 07:16:02.172180453 +0100
-@@ -84,22 +84,7 @@
+--- a/arch/arm/mach-ixp4xx/common.c
++++ b/arch/arm/mach-ixp4xx/common.c
+@@ -84,22 +84,7 @@ void __init ixp4xx_map_io(void)
  /*
   * GPIO-functions
   */
@@ -26,7 +24,7 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/common.c
  {
        if (direction == IXP4XX_GPIO_IN)
                *IXP4XX_GPIO_GPOER |= (1 << line);
-@@ -107,12 +92,12 @@
+@@ -107,12 +92,12 @@ static void gpio_line_config(u8 line, u3
                *IXP4XX_GPIO_GPOER &= ~(1 << line);
  }
  
@@ -41,11 +39,9 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/common.c
  {
        if (value == IXP4XX_GPIO_HIGH)
            *IXP4XX_GPIO_GPOUTR |= (1 << line);
-Index: linux-3.14.25/arch/arm/mach-ixp4xx/include/mach/platform.h
-===================================================================
---- linux-3.14.25.orig/arch/arm/mach-ixp4xx/include/mach/platform.h    2014-11-30 15:26:43.020130937 +0100
-+++ linux-3.14.25/arch/arm/mach-ixp4xx/include/mach/platform.h 2014-12-01 07:16:22.024919689 +0100
-@@ -142,5 +142,21 @@
+--- a/arch/arm/mach-ixp4xx/include/mach/platform.h
++++ b/arch/arm/mach-ixp4xx/include/mach/platform.h
+@@ -131,5 +131,21 @@ struct pci_sys_data;
  extern int ixp4xx_setup(int nr, struct pci_sys_data *sys);
  extern struct pci_ops ixp4xx_ops;