Input: i8042 - add Dell Vostro 1320, 1520 and 1720 to the reset list

[safe/jmp/linux-2.6] / scripts / extract-ikconfig

diff --git a/scripts/extract-ikconfig b/scripts/extract-ikconfig
index 72997c3..de233ff 100755 (executable)
--- a/scripts/extract-ikconfig
+++ b/scripts/extract-ikconfig
@@ -17,6 +17,10 @@ dump_config() {
        return
     fi
     end=`$binoffset $file $IKCFG_ED 2>/dev/null`
+    [ "$?" != "0" ] && end="-1"
+    if [ "$end" -eq "-1" ]; then
+       return
+    fi
 
     start=`expr $start + 8`
     size=`expr $end - $start`
@@ -55,6 +59,8 @@ dump_config "$image"
 GZHDR1="0x1f 0x8b 0x08 0x00"
 GZHDR2="0x1f 0x8b 0x08 0x08"
 
+ELFHDR="0x7f 0x45 0x4c 0x46"
+
 # vmlinux.gz: Check for a compressed images
 off=`$binoffset "$image" $GZHDR1 2>/dev/null`
 [ "$?" != "0" ] && off="-1"
@@ -69,6 +75,14 @@ elif [ "$off" -ne "-1" ]; then
        (dd ibs="$off" skip=1 count=0 && dd bs=512k) <"$image" 2>/dev/null | \
                zcat >"$TMPFILE"
        dump_config "$TMPFILE"
+
+# check if this is simply an ELF file
+else
+       off=`$binoffset "$image" $ELFHDR 2>/dev/null`
+       [ "$?" != "0" ] && off="-1"
+       if [ "$off" -eq "0" ]; then
+               dump_config "$image"
+       fi
 fi
 
 echo "ERROR: Unable to extract kernel configuration information."