Merge branch 'master' into radar

Conflicts:
	autogen.sh

diff --git a/autogen.sh b/autogen.sh
index a5896559b3ff79c0dfe8d5be206c7ba69fdff3a2..bb52416a2566a1c9bb7e7d27da16b24534ccee4d 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -27,10 +27,6 @@ case "$1" in
                make
 
                echo -n "Installing firmware..."
-               if [ "$CONFIG_CARL9170FW_BUILD_TOOLS" = "y" ]; then
-
-
-
                if [ "$CONFIG_CARL9170FW_BUILD_TOOLS" = "y" ]; then
                        echo -n "Prepare firmware image..."
                        tools/src/fwprepare carlfw/carl9170.fw