diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-08-26 09:13:38 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-08-26 09:13:38 +0000 |
| commit | be75f533094d3f3bf982fd51215b426e46bb4217 (patch) | |
| tree | e4fbd52e1185ba19c66a7a486fb22dde59f5fbc5 /package/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch | |
| parent | 51f5cde5563fad4fdc2c46e338343f7c67335c94 (diff) | |
| download | upstream-be75f533094d3f3bf982fd51215b426e46bb4217.tar.gz upstream-be75f533094d3f3bf982fd51215b426e46bb4217.tar.bz2 upstream-be75f533094d3f3bf982fd51215b426e46bb4217.zip | |
[ar7] add compile fixes for ar7-atm
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22811 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch')
| -rw-r--r-- | package/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/package/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch b/package/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch index 42e89c3180..4dcebc3d12 100644 --- a/package/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch +++ b/package/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch @@ -1,8 +1,20 @@ Index: sangam_atm-D7.04.03.00/tn7dsl.c =================================================================== ---- sangam_atm-D7.04.03.00.orig/tn7dsl.c 2010-02-01 22:30:45.000000000 +0100 -+++ sangam_atm-D7.04.03.00/tn7dsl.c 2010-02-01 22:32:41.000000000 +0100 -@@ -3431,8 +3431,11 @@ +--- sangam_atm-D7.04.03.00.orig/tn7dsl.c 2010-08-26 09:36:54.000000000 +0200 ++++ sangam_atm-D7.04.03.00/tn7dsl.c 2010-08-26 10:18:47.000000000 +0200 +@@ -203,7 +203,11 @@ + static struct led_funcs ledreg[2]; + #endif + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33) + #define DEV_DSLMOD CTL_UNNUMBERED ++#else ++#define DEV_DSLMOD 0 ++#endif + #define MAX_STR_SIZE 256 + #define DSL_MOD_SIZE 256 + +@@ -3431,9 +3435,16 @@ */ if(write) { @@ -12,10 +24,15 @@ Index: sangam_atm-D7.04.03.00/tn7dsl.c +#else + ret = proc_dostring(ctl, write, buffer, lenp, 0); +#endif ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33) switch (ctl->ctl_name) ++#else ++ switch ((long)ctl->extra2) ++#endif { case DEV_DSLMOD: -@@ -3517,7 +3520,11 @@ + ptr = strpbrk(info, " \t"); +@@ -3517,14 +3528,22 @@ else { len += sprintf(info+len, mod_req); @@ -27,3 +44,14 @@ Index: sangam_atm-D7.04.03.00/tn7dsl.c } return ret; } + + + 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 ++ {"dslmod", info, DSL_MOD_SIZE, 0644, NULL, NULL, &dslmod_sysctl, NULL, (void *)DEV_DSLMOD} ++#endif + , + {0} + }; |