compat-2.6: Fix admin-update.sh creating spurious unaligned/unaligned/ directory

I noticed that if compat-wireless-2.6's admin-update.sh is run twice in
a row without cleaning, it erroneously copies the
include/linux/unaligned/* files into an
include/linux/unaligned/unaligned/ directory.

Patch below making trivial changes to the script to avoid this.

If admin-update.sh was run twice without an admin-clean.sh, a spurious
additional /unaligned/ path component was created.

Signed-off-by: Max Bowsher <maxb@f2s.com>

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index 8eeef892ff9f9900cdd41407521f9066f44aca64..b40a5d6d9dbcbd462b1ad8344401029a24999db0 100755 (executable)
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -67,6 +67,7 @@ DRIVER_FILES="$DRIVER_FILES mac80211_hwsim.c"
 DRIVER_FILES="$DRIVER_FILES at76c50x-usb.c at76c50x-usb.h"
 
 mkdir -p include/linux/ include/net/ include/linux/usb \
+       include/linux/unaligned \
        net/mac80211/ net/wireless/ \
        drivers/ssb/ \
        drivers/net/usb/ \
@@ -139,7 +140,7 @@ cp $GIT_TREE/$DIR/Makefile $DIR
 
 DIR="include/linux/unaligned"
 echo "Copying $GIT_TREE/$DIR/*"
-cp -a $GIT_TREE/$DIR $DIR
+cp $GIT_TREE/$DIR/* $DIR
 
 
 # Compat stuff