aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/ar7-atm/patches-D7.05.01.00/200-2.6.37_args.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.05.01.00/200-2.6.37_args.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.05.01.00/200-2.6.37_args.patch')
-rw-r--r--package/kernel/ar7-atm/patches-D7.05.01.00/200-2.6.37_args.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/200-2.6.37_args.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/200-2.6.37_args.patch
index f6dba4be9f..75de5a33e7 100644
--- a/package/kernel/ar7-atm/patches-D7.05.01.00/200-2.6.37_args.patch
+++ b/package/kernel/ar7-atm/patches-D7.05.01.00/200-2.6.37_args.patch
@@ -1,28 +1,24 @@
--- a/tn7atm.c
+++ b/tn7atm.c
-@@ -2009,7 +2009,11 @@ static int __init tn7atm_register (Tn7At
+@@ -2003,7 +2003,7 @@ static int __init tn7atm_register (Tn7At
dgprintf (4, "device %s being registered\n", priv->name);
-+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
- mydev = atm_dev_register (priv->proc_name, &tn7atm_ops, -1, NULL);
-+ #else
+- mydev = atm_dev_register (priv->proc_name, &tn7atm_ops, -1, NULL);
+ mydev = atm_dev_register (priv->proc_name, NULL, &tn7atm_ops, -1, NULL);
-+ #endif
if (mydev == NULL)
{
--- a/tn7dsl.c
+++ b/tn7dsl.c
-@@ -512,14 +512,17 @@ int shim_osLoadFWImage(unsigned char *pt
+@@ -499,13 +499,16 @@ int shim_osLoadFWImage(unsigned char *pt
{
const struct firmware *fw_entry;
size_t size;
+ int ret;
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
dev_set_name(&avsar, "avsar");
- #endif
+
printk("requesting firmware image \"ar0700xx.bin\"\n");
- if(device_register(&avsar) < 0) {
+ dev_set_name(&avsar, "avsar");