diff options
author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-03-16 19:29:10 +0000 |
---|---|---|
committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-03-16 19:29:10 +0000 |
commit | 731da2af7fe1489237633affba26352799dfb50a (patch) | |
tree | a7214ea636a7bf7ca5b6ab68eb8e0d0ca1b34668 | |
parent | 96eca5d72ab2e0b4646df50d73285ed73922dcb7 (diff) |
Move dahdi_config.h to be under include/dahdi/
This makes dahdi_config.h part of the "offcial" interface to external
modules. Practically most of its configuration items are internal to
dahdi-base. But some are intended for other drivers.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6177 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r-- | drivers/dahdi/dahdi-base.c | 2 | ||||
-rw-r--r-- | drivers/dahdi/xpp/Kbuild | 2 | ||||
-rw-r--r-- | include/dahdi/dahdi_config.h (renamed from drivers/dahdi/dahdi_config.h) | 0 | ||||
-rw-r--r-- | include/dahdi/kernel.h | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 01197b8..a1f588d 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -35,8 +35,6 @@ */ -#include "dahdi_config.h" - #include <linux/kernel.h> #include <linux/errno.h> #include <linux/module.h> diff --git a/drivers/dahdi/xpp/Kbuild b/drivers/dahdi/xpp/Kbuild index 3b41e18..5f86245 100644 --- a/drivers/dahdi/xpp/Kbuild +++ b/drivers/dahdi/xpp/Kbuild @@ -6,7 +6,7 @@ EXTRA_CFLAGS = $(XPP_LOCAL_CFLAGS) \ -g # -DOLD_PROC # -WITH_BRISTUFF := $(shell grep -c '^[[:space:]]*\#[[:space:]]*define[[:space:]]\+CONFIG_DAHDI_BRI_DCHANS\>' $(src)/../dahdi_config.h) +WITH_BRISTUFF := $(shell grep -c '^[[:space:]]*\#[[:space:]]*define[[:space:]]\+CONFIG_DAHDI_BRI_DCHANS\>' $(src)/../../../include/dahdi/dahdi_config.h) obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_XPP) += xpp.o obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_XPD_FXS) += xpd_fxs.o diff --git a/drivers/dahdi/dahdi_config.h b/include/dahdi/dahdi_config.h index 68a4517..68a4517 100644 --- a/drivers/dahdi/dahdi_config.h +++ b/include/dahdi/dahdi_config.h diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 8be64ab..f974f52 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -36,7 +36,7 @@ #include <dahdi/user.h> #include <dahdi/fasthdlc.h> -#include "dahdi_config.h" +#include <dahdi/dahdi_config.h> #include <linux/version.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) #include <linux/config.h> |