package/ar7-atm: refresh patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31612 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 17 insertions, 27 deletions

diff --git a/package/ar7-atm/patches-D7.04.03.00/100-compile_fix.patch b/package/ar7-atm/patches-D7.04.03.00/100-compile_fix.patch
index 83271ca484..df5fe53967 100644
--- a/package/ar7-atm/patches-D7.04.03.00/100-compile_fix.patch
+++ b/package/ar7-atm/patches-D7.04.03.00/100-compile_fix.patch
@@ -400,7 +400,7 @@
  
    /*
     * AV: Clean-up. Moved all the definitions to the data structure.
-@@ -2479,7 +2425,5 @@ static int tn7atm_proc_qos_write(struct 
+@@ -2479,7 +2425,5 @@ static int tn7atm_proc_qos_write(struct
      return count;
  }
  
diff --git a/package/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch b/package/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch
index 64c92b574c..9f1f0fdae4 100644
--- a/package/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch
+++ b/package/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch
@@ -1,5 +1,5 @@
---- a/tn7dsl.c	2009-08-02 14:36:17.000000000 +0200
-+++ b/tn7dsl.c	2009-08-02 14:35:49.000000000 +0200
+--- a/tn7dsl.c
++++ b/tn7dsl.c
 @@ -109,6 +109,7 @@
  #include <linux/vmalloc.h>
  #include <linux/file.h>
@@ -8,7 +8,7 @@
  
  #include <asm/io.h>
  #include <asm/ar7/ar7.h>
-@@ -446,7 +447,9 @@
+@@ -446,7 +447,9 @@ static void avsar_release(struct device
  }
  
  static struct device avsar = {
@@ -18,10 +18,7 @@
  	.release   = avsar_release,
  };
  
-diff -urN sangam_atm-D7.04.03.00/tn7dsl.c sangam_atm-D7.04.03.00.new/tn7dsl.c
---- sangam_atm-D7.04.03.00/tn7dsl.c	2009-08-08 21:41:11.000000000 +0200
-+++ sangam_atm-D7.04.03.00.new/tn7dsl.c	2009-08-08 21:41:40.000000000 +0200
-@@ -458,6 +458,9 @@
+@@ -455,6 +458,9 @@ int shim_osLoadFWImage(unsigned char *pt
  	const struct firmware *fw_entry;
  	size_t size;
  
diff --git a/package/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch b/package/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch
index a6f7107a7f..6bd8f48760 100644
--- a/package/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch
+++ b/package/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch
@@ -1,6 +1,5 @@
-diff -urN sangam_atm-D7.04.03.00/tn7atm.c sangam_atm-D7.04.03.00.new/tn7atm.c
---- sangam_atm-D7.04.03.00/tn7atm.c	2009-08-11 19:15:07.000000000 +0200
-+++ sangam_atm-D7.04.03.00.new/tn7atm.c	2009-08-11 19:16:41.000000000 +0200
+--- a/tn7atm.c
++++ b/tn7atm.c
 @@ -71,10 +71,16 @@
  #include <linux/proc_fs.h>
  #include <linux/string.h>
@@ -18,9 +17,8 @@ diff -urN sangam_atm-D7.04.03.00/tn7atm.c sangam_atm-D7.04.03.00.new/tn7atm.c
  
  #include "dsl_hal_api.h"
  #include "tn7atm.h"
-diff -urN sangam_atm-D7.04.03.00/tn7dsl.c sangam_atm-D7.04.03.00.new/tn7dsl.c
---- sangam_atm-D7.04.03.00/tn7dsl.c	2009-08-11 19:15:07.000000000 +0200
-+++ sangam_atm-D7.04.03.00.new/tn7dsl.c	2009-08-11 19:17:20.000000000 +0200
+--- a/tn7dsl.c
++++ b/tn7dsl.c
 @@ -112,8 +112,13 @@
  #include <linux/version.h>
  
@@ -35,9 +33,8 @@ diff -urN sangam_atm-D7.04.03.00/tn7dsl.c sangam_atm-D7.04.03.00.new/tn7dsl.c
  
  /* Modules specific header files */
  #include "tn7atm.h"
-diff -urN sangam_atm-D7.04.03.00/tn7sar.c sangam_atm-D7.04.03.00.new/tn7sar.c
---- sangam_atm-D7.04.03.00/tn7sar.c	2009-08-11 19:15:07.000000000 +0200
-+++ sangam_atm-D7.04.03.00.new/tn7sar.c	2009-08-11 19:18:04.000000000 +0200
+--- a/tn7sar.c
++++ b/tn7sar.c
 @@ -52,10 +52,16 @@
  #include <linux/proc_fs.h>
  #include <linux/string.h>
diff --git a/package/ar7-atm/patches-D7.04.03.00/200-2.6.37_args.patch b/package/ar7-atm/patches-D7.04.03.00/200-2.6.37_args.patch
index 04422156a9..59c1d58d15 100644
--- a/package/ar7-atm/patches-D7.04.03.00/200-2.6.37_args.patch
+++ b/package/ar7-atm/patches-D7.04.03.00/200-2.6.37_args.patch
@@ -1,8 +1,6 @@
-Index: sangam_atm-D7.04.03.00/tn7atm.c
-===================================================================
---- sangam_atm-D7.04.03.00.orig/tn7atm.c	2011-02-18 13:36:12.000000000 +0100
-+++ sangam_atm-D7.04.03.00/tn7atm.c	2011-02-18 13:36:21.268956988 +0100
-@@ -1867,7 +1867,11 @@
+--- a/tn7atm.c
++++ b/tn7atm.c
+@@ -1867,7 +1867,11 @@ static int __init tn7atm_register (Tn7At
  
    dgprintf (4, "device %s being registered\n", priv->name);
  
@@ -14,11 +12,9 @@ Index: sangam_atm-D7.04.03.00/tn7atm.c
  
    if (mydev == NULL)
    {
-Index: sangam_atm-D7.04.03.00/tn7dsl.c
-===================================================================
---- sangam_atm-D7.04.03.00.orig/tn7dsl.c	2011-02-18 13:36:12.000000000 +0100
-+++ sangam_atm-D7.04.03.00/tn7dsl.c	2011-02-18 13:37:41.678957013 +0100
-@@ -466,14 +466,17 @@
+--- a/tn7dsl.c
++++ b/tn7dsl.c
+@@ -466,14 +466,17 @@ int shim_osLoadFWImage(unsigned char *pt
  {
  	const struct firmware *fw_entry;
  	size_t size;