From fd551c1fa7526aca631a07f0fd3134433c9fa5fe Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Tue, 1 Feb 2011 14:32:25 +0000
Subject: * rename voice package * sync with lantiqs release * make it work on
 lantiq kernel

SVN-Revision: 25275
---
 package/ltq-ifxos/patches/100-portability.patch    | 37 ++++++++++++++++++++++
 .../ltq-ifxos/patches/110-fix-2.6.32-wakeup.patch  | 12 +++++++
 2 files changed, 49 insertions(+)
 create mode 100644 package/ltq-ifxos/patches/100-portability.patch
 create mode 100644 package/ltq-ifxos/patches/110-fix-2.6.32-wakeup.patch

(limited to 'package/ltq-ifxos/patches')

diff --git a/package/ltq-ifxos/patches/100-portability.patch b/package/ltq-ifxos/patches/100-portability.patch
new file mode 100644
index 0000000..1316888
--- /dev/null
+++ b/package/ltq-ifxos/patches/100-portability.patch
@@ -0,0 +1,37 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -639,7 +639,7 @@ if KERNEL_2_6
+ drv_ifxos_OBJS = "$(subst .c,.o,$(filter %.c,$(drv_ifxos_SOURCES)))"
+ 
+ drv_ifxos.ko: $(drv_ifxos_SOURCES)
+-	@echo -e "drv_ifxos: Making Linux 2.6.x kernel object"
++	@echo "drv_ifxos: Making Linux 2.6.x kernel object"
+ 	if test ! -e common/ifxos_debug.c ; then \
+ 		echo "copy source files (as links only!)"; \
+ 		for f in $(filter %.c,$(drv_ifxos_SOURCES)); do \
+@@ -647,10 +647,10 @@ drv_ifxos.ko: $(drv_ifxos_SOURCES)
+ 			cp -s $(addprefix @abs_srcdir@/,$$f) $(PWD)/`dirname $$f`/ ; \
+ 		done \
+ 	fi
+-	@echo -e "# drv_ifxos: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild
+-	@echo -e "obj-m := $(subst .ko,.o,$@)"			>> $(PWD)/Kbuild
+-	@echo -e "$(subst .ko,,$@)-y := $(drv_ifxos_OBJS)"	>> $(PWD)/Kbuild
+-	@echo -e "EXTRA_CFLAGS := $(CFLAGS) -DHAVE_CONFIG_H $(drv_ifxos_CFLAGS) $(DSL_DRIVER_INCL_PATH) -I@abs_srcdir@/include -I$(PWD)/include"	>> $(PWD)/Kbuild
++	@echo "# drv_ifxos: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild
++	@echo "obj-m := $(subst .ko,.o,$@)"			>> $(PWD)/Kbuild
++	@echo "$(subst .ko,,$@)-y := $(drv_ifxos_OBJS)"	>> $(PWD)/Kbuild
++	@echo "EXTRA_CFLAGS := $(CFLAGS) -DHAVE_CONFIG_H $(drv_ifxos_CFLAGS) $(DSL_DRIVER_INCL_PATH) -I@abs_srcdir@/include -I$(PWD)/include"	>> $(PWD)/Kbuild
+ 	$(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules
+ 
+ clean-generic:
+--- a/configure.in
++++ b/configure.in
+@@ -64,7 +64,7 @@ dnl Set kernel build path
+ AC_ARG_ENABLE(kernelbuild,
+ 	AS_HELP_STRING(--enable-kernelbuild=x,Set the target kernel build path (only for kernel 2.6.x)),
+ 	[
+-		if test -e $enableval/include/linux/autoconf.h; then
++		if test -e $enableval/include/linux/autoconf.h -o -e $enableval/include/generated/autoconf.h; then
+ 			AC_SUBST([KERNEL_BUILD_PATH],[$enableval])
+ 		else
+ 			AC_MSG_ERROR([The kernel build directory is not valid or not configured!])
diff --git a/package/ltq-ifxos/patches/110-fix-2.6.32-wakeup.patch b/package/ltq-ifxos/patches/110-fix-2.6.32-wakeup.patch
new file mode 100644
index 0000000..da0bbd3
--- /dev/null
+++ b/package/ltq-ifxos/patches/110-fix-2.6.32-wakeup.patch
@@ -0,0 +1,12 @@
+Index: lib_ifxos-1.5.12/src/linux/ifxos_linux_select_drv.c
+===================================================================
+--- lib_ifxos-1.5.12.orig/src/linux/ifxos_linux_select_drv.c	2010-04-24 11:33:55.000000000 +0200
++++ lib_ifxos-1.5.12/src/linux/ifxos_linux_select_drv.c	2010-04-24 11:34:21.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include <linux/fs.h>
+ #include <linux/wait.h>
+ #include <linux/poll.h>
++#include <linux/sched.h>
+ 
+ #include "ifx_types.h"
+ #include "ifxos_rt_if_check.h"
-- 
cgit v1.1