diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-01-25 23:59:37 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-01-25 23:59:37 +0000 |
| commit | 860c46060672ec32918b3ea305c2d3a795bb6ae7 (patch) | |
| tree | 9aa987489d6775df2b010af0897110be89bd4d44 /wctc4xxp | |
| parent | d8e4f2d9d55628bdc758ffcdcf4321883770a721 (diff) | |
get this branch to build against 2.6.24 kernel build system (similar to r3706 from tzafrir for branch-1.4)
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3741 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wctc4xxp')
| -rw-r--r-- | wctc4xxp/Kbuild (renamed from wctc4xxp/Makefile.kernel26) | 4 | ||||
| -rw-r--r-- | wctc4xxp/Makefile | 9 | ||||
| -rw-r--r-- | wctc4xxp/base.c | 6 |
3 files changed, 9 insertions, 10 deletions
diff --git a/wctc4xxp/Makefile.kernel26 b/wctc4xxp/Kbuild index b034819..f7dd663 100644 --- a/wctc4xxp/Makefile.kernel26 +++ b/wctc4xxp/Kbuild @@ -2,6 +2,10 @@ obj-m += wctc4xxp.o EXTRA_CFLAGS := -I$(src)/.. -Wno-undef +ifeq ($(HOTPLUG_FIRMWARE),yes) + EXTRA_CFLAGS += -DHOTPLUG_FIRMWARE +endif + wctc4xxp-objs := base.o ifneq ($(HOTPLUG_FIRMWARE),yes) diff --git a/wctc4xxp/Makefile b/wctc4xxp/Makefile index cad6216..da06c03 100644 --- a/wctc4xxp/Makefile +++ b/wctc4xxp/Makefile @@ -1,8 +1,7 @@ -ifneq ($(KBUILD_EXTMOD),) - -include $(obj)/Makefile.kernel26 - -endif +# We only get here on kernels 2.6.0-2.6.8 . +# For newer kernels, Kbuild will be included directly by the kernel +# build system. +-include $(src)/Kbuild tests: codec_test diff --git a/wctc4xxp/base.c b/wctc4xxp/base.c index dc5be8a..7765df5 100644 --- a/wctc4xxp/base.c +++ b/wctc4xxp/base.c @@ -46,12 +46,8 @@ #ifdef CONFIG_DEVFS_FS #include <linux/devfs_fs_kernel.h> #endif -#ifdef STANDALONE_ZAPATA -#include "zaptel.h" -#else -#include <linux/zaptel.h> -#endif +#include "zaptel.h" /* #define USE_TEST_HW */ #define USE_TDM_CONFIG |