diff options
author | sruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-04-03 21:37:11 +0000 |
---|---|---|
committer | sruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-04-03 21:37:11 +0000 |
commit | 58853d266e3a76137b4f0da3d91c627ef6b7c94e (patch) | |
tree | 6e1b5837ef7a8bd6a9666fb5f0225d96f7d5d22b /wcte12xp/Kbuild | |
parent | b88dcb40c9342fa0307e9c8d020db3fbba699c62 (diff) |
svn merge -c4096 https://origsvn.digium.com/svn/zaptel/branches/1.4/kernel/wctdm24xxp wctdm24xxp
svn merge -c4096 https://origsvn.digium.com/svn/zaptel/branches/1.4/kernel/wcte12xp wcte12xp
svn cp https://origsvn.digium.com/svn/zaptel/branches/1.4/kernel/voicebus.c .
svn cp https://origsvn.digium.com/svn/zaptel/branches/1.4/kernel/voicebus.h .
svn cp https://origsvn.digium.com/svn/zaptel/branches/1.4/kernel/fxo_modes.h .
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@4129 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wcte12xp/Kbuild')
-rw-r--r-- | wcte12xp/Kbuild | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wcte12xp/Kbuild b/wcte12xp/Kbuild index 15530ce..cd03c35 100644 --- a/wcte12xp/Kbuild +++ b/wcte12xp/Kbuild @@ -6,7 +6,7 @@ ifeq ($(HOTPLUG_FIRMWARE),yes) EXTRA_CFLAGS += -DHOTPLUG_FIRMWARE endif -wcte12xp-objs := base.o vpmadt032.o GpakApi.o +wcte12xp-objs := base.o vpmadt032.o GpakApi.o ../voicebus.o ifneq ($(HOTPLUG_FIRMWARE),yes) wcte12xp-objs += firmware_vpmadt032.o |