aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/ar7-atm/patches-D7.04.03.00/230-compile_fixes.patch
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
commit4ee80f3800377c3438f60538a7ed73d125a50cde (patch)
treeb2990f490fd829ad1a769c5b5070c38ee59e7c1e /package/kernel/ar7-atm/patches-D7.04.03.00/230-compile_fixes.patch
parentf6ae0c86e209837d0d1ed5cbeb6d109de6a38813 (diff)
downloadmaster-187ad058-4ee80f3800377c3438f60538a7ed73d125a50cde.tar.gz
master-187ad058-4ee80f3800377c3438f60538a7ed73d125a50cde.tar.bz2
master-187ad058-4ee80f3800377c3438f60538a7ed73d125a50cde.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46306 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/ar7-atm/patches-D7.04.03.00/230-compile_fixes.patch')
-rw-r--r--package/kernel/ar7-atm/patches-D7.04.03.00/230-compile_fixes.patch32
1 files changed, 12 insertions, 20 deletions
diff --git a/package/kernel/ar7-atm/patches-D7.04.03.00/230-compile_fixes.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/230-compile_fixes.patch
index fbc49a3f86..c7d9127012 100644
--- a/package/kernel/ar7-atm/patches-D7.04.03.00/230-compile_fixes.patch
+++ b/package/kernel/ar7-atm/patches-D7.04.03.00/230-compile_fixes.patch
@@ -1,38 +1,30 @@
-Index: sangam_atm-D7.04.03.00/cp_sar_reg.h
-===================================================================
---- sangam_atm-D7.04.03.00.orig/cp_sar_reg.h 2004-04-20 08:23:30.000000000 +0200
-+++ sangam_atm-D7.04.03.00/cp_sar_reg.h 2014-12-01 14:28:58.586447237 +0100
+--- a/cp_sar_reg.h
++++ b/cp_sar_reg.h
@@ -214,4 +214,4 @@
/* END OF FILE */
-#endif _INC_SAR_REG
+#endif
-Index: sangam_atm-D7.04.03.00/tn7api.h
-===================================================================
---- sangam_atm-D7.04.03.00.orig/tn7api.h 2014-12-01 14:28:58.574446794 +0100
-+++ sangam_atm-D7.04.03.00/tn7api.h 2014-12-01 14:28:58.586447237 +0100
-@@ -172,4 +172,4 @@
+--- a/tn7api.h
++++ b/tn7api.h
+@@ -172,4 +172,4 @@ void tn7sar_get_sar_firmware_version(uns
extern struct file_operations tn7sar_proc_oam_ping_fops;
extern struct file_operations tn7sar_proc_pvc_table_fops;
int tn7sar_tx_flush(void *privContext, int chan, int queue, int skip);
-#endif __SGAPI_H
+#endif
-Index: sangam_atm-D7.04.03.00/tn7atm.h
-===================================================================
---- sangam_atm-D7.04.03.00.orig/tn7atm.h 2014-12-01 14:28:58.442441921 +0100
-+++ sangam_atm-D7.04.03.00/tn7atm.h 2014-12-01 14:28:58.586447237 +0100
-@@ -276,4 +276,4 @@
+--- a/tn7atm.h
++++ b/tn7atm.h
+@@ -276,4 +276,4 @@ typedef struct
#define PHYS_TO_K1(X) (PHYS_ADDR(X)|K1BASE)
#endif
-#endif __TN7ATM_H
+#endif
-Index: sangam_atm-D7.04.03.00/dsl_hal_api.h
-===================================================================
---- sangam_atm-D7.04.03.00.orig/dsl_hal_api.h 2007-03-07 14:40:26.000000000 +0100
-+++ sangam_atm-D7.04.03.00/dsl_hal_api.h 2014-12-01 14:30:10.509102453 +0100
-@@ -2448,7 +2448,7 @@
+--- a/dsl_hal_api.h
++++ b/dsl_hal_api.h
+@@ -2448,7 +2448,7 @@ unsigned int dslhal_api_getHLINpsds(tids
*
********************************************************************************************/
@@ -41,7 +33,7 @@ Index: sangam_atm-D7.04.03.00/dsl_hal_api.h
/********************************************************************************************
* FUNCTION NAME: void dslhal_api_setHighPrecision
-@@ -2459,7 +2459,7 @@
+@@ -2459,7 +2459,7 @@ unsigned int dslhal_api_getHighPrecision
* Return: None
********************************************************************************************/