From 6cd2734ad350d67f9d6e57749c81930fd730426c Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 3 Nov 2010 19:06:39 +0000 Subject: [ifxmips] * make dsl driver work with new kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23837 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../ifxmips-dsl-api/patches/100-dsl_compat.patch | 27 ++++++++++++++++++++-- .../ifxmips-dsl-api/patches/500-portability.patch | 22 ++++++++++-------- 2 files changed, 38 insertions(+), 11 deletions(-) (limited to 'package/ifxmips-dsl-api/patches') diff --git a/package/ifxmips-dsl-api/patches/100-dsl_compat.patch b/package/ifxmips-dsl-api/patches/100-dsl_compat.patch index a3020d4c9a..30e4374b79 100644 --- a/package/ifxmips-dsl-api/patches/100-dsl_compat.patch +++ b/package/ifxmips-dsl-api/patches/100-dsl_compat.patch @@ -39,7 +39,15 @@ --- a/src/include/drv_dsl_cpe_os_linux.h +++ b/src/include/drv_dsl_cpe_os_linux.h -@@ -24,7 +24,7 @@ +@@ -17,17 +17,17 @@ + #endif + + #include +-#include ++#include + #include + #include + #include #include #include #include @@ -47,4 +55,19 @@ +#include #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17)) - #include +- #include ++ #include + #endif + + #include +--- a/src/mei/ifxmips_mei.c ++++ b/src/mei/ifxmips_mei.c +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff --git a/package/ifxmips-dsl-api/patches/500-portability.patch b/package/ifxmips-dsl-api/patches/500-portability.patch index 8af2646660..849d1286f6 100644 --- a/package/ifxmips-dsl-api/patches/500-portability.patch +++ b/package/ifxmips-dsl-api/patches/500-portability.patch @@ -1,6 +1,8 @@ ---- a/configure.in -+++ b/configure.in -@@ -310,7 +310,7 @@ dnl Set kernel build path +Index: drv_dsl_cpe_api-3.24.4.4/configure.in +=================================================================== +--- drv_dsl_cpe_api-3.24.4.4.orig/configure.in 2009-08-13 13:39:21.000000000 +0200 ++++ drv_dsl_cpe_api-3.24.4.4/configure.in 2010-11-01 12:58:37.000000000 +0100 +@@ -310,7 +310,7 @@ AC_ARG_ENABLE(kernelbuild, AC_HELP_STRING(--enable-kernel-build=x,Set the target kernel build path), [ @@ -9,7 +11,7 @@ AC_SUBST([KERNEL_BUILD_PATH],[$enableval]) else AC_MSG_ERROR([The kernel build directory is not valid or not configured!]) -@@ -333,12 +333,12 @@ AC_ARG_ENABLE(ifxos-include, +@@ -333,12 +333,12 @@ echo Set the lib_ifxos include path $enableval AC_SUBST([IFXOS_INCLUDE_PATH],[$enableval]) else @@ -24,7 +26,7 @@ AC_SUBST([IFXOS_INCLUDE_PATH],[$DEFAULT_IFXOS_INCLUDE_PATH]) ] ) -@@ -1702,73 +1702,73 @@ dnl Set the configure params for dist ch +@@ -1702,73 +1702,73 @@ AC_SUBST([DISTCHECK_CONFIGURE_PARAMS],[$CONFIGURE_OPTIONS]) AC_CONFIG_COMMANDS_PRE([ @@ -165,9 +167,11 @@ ]) AC_CONFIG_FILES([Makefile src/Makefile]) ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -303,7 +303,7 @@ if KERNEL_2_6 +Index: drv_dsl_cpe_api-3.24.4.4/src/Makefile.am +=================================================================== +--- drv_dsl_cpe_api-3.24.4.4.orig/src/Makefile.am 2009-07-03 14:06:34.000000000 +0200 ++++ drv_dsl_cpe_api-3.24.4.4/src/Makefile.am 2010-11-01 12:58:37.000000000 +0100 +@@ -303,7 +303,7 @@ drv_dsl_cpe_api_OBJS = "$(subst .c,.o,$(filter %.c,$(drv_dsl_cpe_api_SOURCES)))" drv_dsl_cpe_api.ko: $(drv_dsl_cpe_api_SOURCES) @@ -176,7 +180,7 @@ if test ! -e common/drv_dsl_cpe_api.c ; then \ echo "copy source files (as links only!)"; \ for f in $(filter %.c,$(drv_dsl_cpe_api_SOURCES)); do \ -@@ -311,10 +311,10 @@ drv_dsl_cpe_api.ko: $(drv_dsl_cpe_api_SO +@@ -311,10 +311,10 @@ cp -s $(addprefix @abs_srcdir@/,$$f) $(PWD)/`dirname $$f`/ ; \ done \ fi -- cgit v1.2.3