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 /wct4xxp | |
| 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 'wct4xxp')
| -rw-r--r-- | wct4xxp/Kbuild (renamed from wct4xxp/Makefile.kernel26) | 4 | ||||
| -rw-r--r-- | wct4xxp/Makefile | 5 | ||||
| -rw-r--r-- | wct4xxp/base.c | 7 | ||||
| -rw-r--r-- | wct4xxp/vpm450m.h | 7 |
4 files changed, 10 insertions, 13 deletions
diff --git a/wct4xxp/Makefile.kernel26 b/wct4xxp/Kbuild index ea6148b..da4ed97 100644 --- a/wct4xxp/Makefile.kernel26 +++ b/wct4xxp/Kbuild @@ -2,6 +2,10 @@ obj-m += wct4xxp.o EXTRA_CFLAGS := -I$(src)/.. $(shell $(src)/../oct612x/octasic-helper cflags $(src)/../oct612x) -Wno-undef +ifeq ($(HOTPLUG_FIRMWARE),yes) + EXTRA_CFLAGS += -DHOTPLUG_FIRMWARE +endif + wct4xxp-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x) ifneq ($(HOTPLUG_FIRMWARE),yes) diff --git a/wct4xxp/Makefile b/wct4xxp/Makefile index a5faf45..6d7faf0 100644 --- a/wct4xxp/Makefile +++ b/wct4xxp/Makefile @@ -1,6 +1,9 @@ ifneq ($(KBUILD_EXTMOD),) -include $(src)/Makefile.kernel26 +# 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 else diff --git a/wct4xxp/base.c b/wct4xxp/base.c index f48bc6e..4f8decc 100644 --- a/wct4xxp/base.c +++ b/wct4xxp/base.c @@ -33,15 +33,12 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/interrupt.h> -#ifdef STANDALONE_ZAPATA -#include "zaptel.h" -#else -#include <linux/zaptel.h> -#endif #ifdef LINUX26 #include <linux/moduleparam.h> #endif +#include "zaptel.h" + #include "wct4xxp.h" #include "vpm450m.h" diff --git a/wct4xxp/vpm450m.h b/wct4xxp/vpm450m.h index bce3a93..41d7c60 100644 --- a/wct4xxp/vpm450m.h +++ b/wct4xxp/vpm450m.h @@ -24,14 +24,7 @@ #ifndef _VPM450M_H #define _VPM450M_H -#ifdef LINUX26 #include <linux/firmware.h> -#else -struct firmware { - size_t size; - u8 *data; -}; -#endif struct vpm450m; |