[dahdi-commits] dahdi/linux.git branch "master" updated.

[SVN commits to the DAHDI project]

branch "master" has been updated
       via  a34b846f613d4be94cc764ee14b470a450bf65ae (commit)
       via  f09daed735f1be091fe9f177f675d0c87ad65900 (commit)
       via  7714d5d94e3cb6d3ff5e9eceaee5b131a43b0ce8 (commit)
      from  9b0d19c05449071c40827efbb0b0a5b302da435f (commit)

Summary of changes:
 build_tools/make_version   |    2 +-
 drivers/dahdi/Kbuild       |    2 +-
 drivers/dahdi/dahdi-base.c |    2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit a34b846f613d4be94cc764ee14b470a450bf65ae
Author: Russ Meyerriecks <rmeyerriecks at digium.com>
Date:   Wed Mar 13 16:44:42 2013 -0500

    dahdi: Fix unused variable compile warning
    
    An unset conditional compile flag was triggering the unused variable compile
    warning. Added the condition around the variable define.
    
    Signed-off-by: Russ Meyerriecks <rmeyerriecks at digium.com>

diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index 779d135..f73fd01 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -1092,7 +1092,9 @@ static void dahdi_check_conf(int x)
 {
 	unsigned long res;
 	unsigned long flags;
+#ifdef CONFIG_DAHDI_CONFLINK
 	int i;
+#endif
 
 	/* return if no valid conf number */
 	if (x <= 0)

commit f09daed735f1be091fe9f177f675d0c87ad65900
Author: Russ Meyerriecks <rmeyerriecks at digium.com>
Date:   Wed Mar 13 16:26:42 2013 -0500

    Kbuild: Fix OSLEC build error
    
    Fixes up the kbuild to work with compiling OSLEC from the kernel source. See
    HOWTO here: http://forums.digium.com/viewtopic.php?t=67164
    
    Internal-Issue-ID: DAHLIN-317
    Reported-By: Vladimir Mikhelson
    Signed-off-by: Russ Meyerriecks <rmeyerriecks at digium.com>

diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild
index 61b95b8..f9152d7 100644
--- a/drivers/dahdi/Kbuild
+++ b/drivers/dahdi/Kbuild
@@ -38,7 +38,7 @@ obj-m += $(DAHDI_MODULES_EXTRA)
 # well:
 ifneq (,$(wildcard $(src)/../staging/echo/echo.c))
 obj-m += dahdi_echocan_oslec.o
-obj-m += ../staging/echo/
+obj-m += ../staging/echo/echo.o
 endif
 
 CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src)

commit 7714d5d94e3cb6d3ff5e9eceaee5b131a43b0ce8
Author: Shaun Ruffell <sruffell at digium.com>
Date:   Fri Mar 8 11:28:11 2013 -0600

    build_tools/make_version: Only strip 'v' if followed by a digit.
    
    Do not want to accidentally change the tag "very_cool" to "ery_cool".
    
    Signed-off-by: Shaun Ruffell <sruffell at digium.com>

diff --git a/build_tools/make_version b/build_tools/make_version
index f880ad6..8eb2299 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -59,7 +59,7 @@ elif [ -d ${1}/.git ]; then
     MODIFIED=""
     SVN_REV=`git log --pretty=full -1 | grep -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"`
     if [ -z "$SVN_REV" ]; then
-        VERSION=`git describe --tags --dirty=M 2> /dev/null | sed -e "s/^v//"`
+        VERSION=`git describe --tags --dirty=M 2> /dev/null | sed -e "s/^v\([0-9]\)/\1/"`
         if [ $? -ne 0 ]; then
             if [ "`git ls-files -m | wc -l`" != "0" ]; then
                 MODIFIED="M"

-----------------------------------------------------------------------


-- 
dahdi/linux.git