summaryrefslogtreecommitdiff
path: root/drivers/dahdi/wctdm24xxp
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2008-06-17 20:22:36 +0000
committerKevin P. Fleming <kpfleming@digium.com>2008-06-17 20:22:36 +0000
commitbbc307b2b0b37108190de6ba4743a5d712cc6fc4 (patch)
tree557fa8042cf113919ba6e0e626f3d7f9da099db2 /drivers/dahdi/wctdm24xxp
parent5b937d8b8c168e124442874b56a593a587160427 (diff)
commit a bunch of stuff, primarily basic support for allowing drivers/dahdi and include/dahdi to be 'dropped in' to a Linux kernel tree and be part of the buildsystem
also includes a bunch of minor Makefile improvements, and relocating the firmware directory to the directory where the modules live, since that is the only place it is needed still left to do: handle version.h creation when in native-kernel-tree mode, fix up lots of problems left with firmware file handling git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4377 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wctdm24xxp')
-rw-r--r--drivers/dahdi/wctdm24xxp/Kbuild2
-rw-r--r--drivers/dahdi/wctdm24xxp/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dahdi/wctdm24xxp/Kbuild b/drivers/dahdi/wctdm24xxp/Kbuild
index 2176346..4a88de7 100644
--- a/drivers/dahdi/wctdm24xxp/Kbuild
+++ b/drivers/dahdi/wctdm24xxp/Kbuild
@@ -1,4 +1,4 @@
-obj-m += wctdm24xxp.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTDM24XXP) += wctdm24xxp.o
FIRM_DIR := ../../firmware
diff --git a/drivers/dahdi/wctdm24xxp/Makefile b/drivers/dahdi/wctdm24xxp/Makefile
index 56453cb..aed8dfc 100644
--- a/drivers/dahdi/wctdm24xxp/Makefile
+++ b/drivers/dahdi/wctdm24xxp/Makefile
@@ -1,4 +1,4 @@
-ifneq ($(KBUILD_EXTMOD),)
+ifdef KBUILD_EXTMOD
# We only get here on kernels 2.6.0-2.6.9 .
# For newer kernels, Kbuild will be included directly by the kernel
# build system.