ar7-atm: drop LINUX_VERSION tests

[openwrt/staging/mkresin.git] / package / kernel / ar7-atm / patches-D7.05.01.00 / 180-git_headers_include.patch

diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/180-git_headers_include.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/180-git_headers_include.patch
index feb6ea8605ded84fd55dba5658a5cb8abdc77fdf..69b433b2b9c0d508527168f0d5fb2df632212cf8 100644 (file)
--- a/package/kernel/ar7-atm/patches-D7.05.01.00/180-git_headers_include.patch
+++ b/package/kernel/ar7-atm/patches-D7.05.01.00/180-git_headers_include.patch
@@ -1,54 +1,39 @@
 --- a/tn7atm.c
 +++ b/tn7atm.c
-@@ -76,10 +76,16 @@
- #include <linux/proc_fs.h>
- #include <linux/string.h>
+@@ -78,8 +78,8 @@
  #include <linux/ctype.h>
-+#include <linux/version.h>
  
  #include <asm/io.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
- #include <asm/ar7/ar7.h>
- #include <asm/ar7/prom.h>
-+#else
+-#include <asm/ar7/ar7.h>
+-#include <asm/ar7/prom.h>
 +#include <asm/mach-ar7/ar7.h>
 +#include <asm/mach-ar7/prom.h>
-+#endif
  
  #include "dsl_hal_api.h"
  #ifdef AR7_EFM
 --- a/tn7dsl.c
 +++ b/tn7dsl.c
-@@ -120,8 +120,13 @@
- #include <linux/version.h>
+@@ -119,8 +119,8 @@
+ #include <linux/firmware.h>
  
  #include <asm/io.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
- #include <asm/ar7/ar7.h>
- #include <asm/ar7/prom.h>
-+#else
+-#include <asm/ar7/ar7.h>
+-#include <asm/ar7/prom.h>
 +#include <asm/mach-ar7/ar7.h>
 +#include <asm/mach-ar7/prom.h>
-+#endif
  
  /* Modules specific header files */
  #ifdef AR7_EFM
 --- a/tn7sar.c
 +++ b/tn7sar.c
-@@ -53,10 +53,16 @@
- #include <linux/proc_fs.h>
- #include <linux/string.h>
+@@ -55,8 +55,8 @@
  #include <linux/ctype.h>
-+#include <linux/version.h>
  
  #include <asm/io.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
- #include <asm/ar7/ar7.h>
- #include <asm/ar7/prom.h>
-+#else
+-#include <asm/ar7/ar7.h>
+-#include <asm/ar7/prom.h>
 +#include <asm/mach-ar7/ar7.h>
 +#include <asm/mach-ar7/prom.h>
-+#endif
  
  #define _CPHAL_AAL5
  #define _CPHAL_SAR