aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/ar7-atm/patches-D7.05.01.00
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-07-12 11:57:40 +0000
committerJonas Gorski <jogo@openwrt.org>2015-07-12 11:57:40 +0000
commit6f2fe75834e9f5baad00264f51f0672c922027d3 (patch)
tree6d3c60bc76f709a3f4a51cd312718aa8996f6487 /package/kernel/ar7-atm/patches-D7.05.01.00
parent7c7695ab41427e391a5026effebd42ae81567de3 (diff)
downloadupstream-6f2fe75834e9f5baad00264f51f0672c922027d3.tar.gz
upstream-6f2fe75834e9f5baad00264f51f0672c922027d3.tar.bz2
upstream-6f2fe75834e9f5baad00264f51f0672c922027d3.zip
ar7-atm: fix compilation for 4.1
Add the required changes to make it compile for 4.1 again. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46306
Diffstat (limited to 'package/kernel/ar7-atm/patches-D7.05.01.00')
-rw-r--r--package/kernel/ar7-atm/patches-D7.05.01.00/240-3.18_fixes.patch38
-rw-r--r--package/kernel/ar7-atm/patches-D7.05.01.00/250-4.1_fixes.patch20
2 files changed, 58 insertions, 0 deletions
diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/240-3.18_fixes.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/240-3.18_fixes.patch
new file mode 100644
index 0000000000..a29bae80a4
--- /dev/null
+++ b/package/kernel/ar7-atm/patches-D7.05.01.00/240-3.18_fixes.patch
@@ -0,0 +1,38 @@
+--- a/tn7dsl.c
++++ b/tn7dsl.c
+@@ -363,7 +363,7 @@ static void tn7dsl_chng_modulation(void*
+ static unsigned int tn7dsl_set_modulation(void* data, int flag);
+ static void tn7dsl_ctrl_fineGain(int value);
+ static void tn7dsl_set_fineGainValue(int value);
+-static int dslmod_sysctl (ctl_table * ctl, int write, struct file *filp,
++static int dslmod_sysctl (struct ctl_table * ctl, int write, struct file *filp,
+ void *buffer, size_t * lenp);
+ static void tn7dsl_register_dslss_led(void);
+ void tn7dsl_dslmod_sysctl_register(void);
+@@ -3505,7 +3505,7 @@ unsigned int tn7dsl_get_memory(unsigned
+
+
+
+-static int dslmod_sysctl(ctl_table *ctl, int write, struct file * filp,
++static int dslmod_sysctl(struct ctl_table *ctl, int write, struct file * filp,
+ void *buffer, size_t *lenp)
+ {
+ char *ptr;
+@@ -3631,7 +3631,7 @@ static int dslmod_sysctl(ctl_table *ctl,
+ }
+
+
+-ctl_table dslmod_table[] = {
++struct ctl_table dslmod_table[] = {
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
+ {DEV_DSLMOD, "dslmod", info, DSL_MOD_SIZE, 0644, NULL, NULL, &dslmod_sysctl, &sysctl_string}
+ #else
+@@ -3649,7 +3649,7 @@ ctl_table dslmod_table[] = {
+ };
+
+ /* Make sure that /proc/sys/dev is there */
+-ctl_table dslmod_root_table[] = {
++struct ctl_table dslmod_root_table[] = {
+ #ifdef CONFIG_PROC_FS
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
+ {CTL_DEV, "dev", NULL, 0, 0555, dslmod_table}
diff --git a/package/kernel/ar7-atm/patches-D7.05.01.00/250-4.1_fixes.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/250-4.1_fixes.patch
new file mode 100644
index 0000000000..bc913a78a8
--- /dev/null
+++ b/package/kernel/ar7-atm/patches-D7.05.01.00/250-4.1_fixes.patch
@@ -0,0 +1,20 @@
+--- a/tn7atm.c
++++ b/tn7atm.c
+@@ -856,7 +856,7 @@ static int __init tn7atm_irq_request (st
+
+ priv->sar_irq = LNXINTNUM (ATM_SAR_INT); /* Interrupt line # */
+
+- if (request_irq (priv->sar_irq, tn7atm_sar_irq, IRQF_DISABLED, "SAR ", dev))
++ if (request_irq (priv->sar_irq, tn7atm_sar_irq, 0, "SAR ", dev))
+ printk ("Could not register tn7atm_sar_irq\n");
+
+ /*
+@@ -880,7 +880,7 @@ static int __init tn7atm_irq_request (st
+ * Reigster Receive interrupt A
+ */
+ priv->dsl_irq = LNXINTNUM (ATM_DSL_INT); /* Interrupt line # */
+- if (request_irq (priv->dsl_irq, tn7atm_dsl_irq, IRQF_DISABLED, "DSL ", dev))
++ if (request_irq (priv->dsl_irq, tn7atm_dsl_irq, 0, "DSL ", dev))
+ printk ("Could not register tn7atm_dsl_irq\n");
+
+ /***** VRB Tasklet Mode ****/