diff options
| -rw-r--r-- | drivers/dahdi/Kbuild | 2 | ||||
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 4 | ||||
| -rw-r--r-- | include/dahdi/dahdi_config.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild index b8719ec..9335be8 100644 --- a/drivers/dahdi/Kbuild +++ b/drivers/dahdi/Kbuild @@ -1,5 +1,5 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI) += dahdi.o -obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DUMMY) += dahdi_dummy.o +#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DUMMY) += dahdi_dummy.o obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC) += dahdi_dynamic.o obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC_LOC) += dahdi_dynamic_loc.o obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC_ETH) += dahdi_dynamic_eth.o diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 8f3aed3..0fe4130 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -8404,6 +8404,10 @@ int dahdi_receive(struct dahdi_span *span) MODULE_AUTHOR("Mark Spencer <markster@digium.com>"); MODULE_DESCRIPTION("DAHDI Telephony Interface"); MODULE_LICENSE("GPL v2"); +/* DAHDI now provides timing. If anybody wants dahdi_dummy it's probably + * for that. So make dahdi provide it for now. This alias may be removed + * in the future, and users are encoruged to to rely on it. */ +MODULE_ALIAS("dahdi_dummy"); MODULE_VERSION(DAHDI_VERSION); module_param(debug, int, 0644); diff --git a/include/dahdi/dahdi_config.h b/include/dahdi/dahdi_config.h index e5ac826..a487e4f 100644 --- a/include/dahdi/dahdi_config.h +++ b/include/dahdi/dahdi_config.h @@ -117,7 +117,7 @@ * Define CONFIG_DAHDI_CORE_TIMER if you would like dahdi to always provide a * timing source regardless of which spans / drivers are configured. */ -/* #define CONFIG_DAHDI_CORE_TIMER */ +#define CONFIG_DAHDI_CORE_TIMER /* * Uncomment if you happen have an early TDM400P Rev H which |