aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2017-10-13 11:32:31 +0200
committerJonas Gorski <jonas.gorski@gmail.com>2017-10-29 23:41:00 +0100
commit889b21f95414dcff942cb5f72d764d876b68ace2 (patch)
tree3d89902692a5f3e7ec227a36ac96a01ce5e54fd9 /package/kernel/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch
parentb00cf0e58e701821a1117afbad76718d898ea21d (diff)
downloadupstream-889b21f95414dcff942cb5f72d764d876b68ace2.tar.gz
upstream-889b21f95414dcff942cb5f72d764d876b68ace2.tar.bz2
upstream-889b21f95414dcff942cb5f72d764d876b68ace2.zip
ar7-atm: drop LINUX_VERSION tests
Minimum supported kernel is 3.18, so we don't need to test for anything older. In addition, the API hasn't changed since then, so we don't need to check for any kernel version at all. This helps to keeps the amount of changes more managable. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Diffstat (limited to 'package/kernel/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch')
-rw-r--r--package/kernel/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch35
1 files changed, 10 insertions, 25 deletions
diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch
index 6bd8f48760..6d72b00544 100644
--- a/package/kernel/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch
+++ b/package/kernel/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch
@@ -1,54 +1,39 @@
--- a/tn7atm.c
+++ b/tn7atm.c
-@@ -71,10 +71,16 @@
- #include <linux/proc_fs.h>
- #include <linux/string.h>
+@@ -73,8 +73,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"
#include "tn7atm.h"
--- a/tn7dsl.c
+++ b/tn7dsl.c
-@@ -112,8 +112,13 @@
- #include <linux/version.h>
+@@ -111,8 +111,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 */
#include "tn7atm.h"
--- a/tn7sar.c
+++ b/tn7sar.c
-@@ -52,10 +52,16 @@
- #include <linux/proc_fs.h>
- #include <linux/string.h>
+@@ -54,8 +54,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