commit c4ddca25e0a1b60453c7fe7b4b73a412d4a940eb
author Ramanan Rajeswaran <ramanan@google.com> Mon Feb 27 12:00:45 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 27 12:00:45 2012 -0800
tree b100abc187fb2f3de0679c41470573a5c443e56f
parent c958a7f4988f3dd98135b23619cdf55ec55bd1f6
parent f1ab88c23460a608cd6d6f6492fb2b039405c0f2

am f1ab88c2: am 73c019b3: Add asus vendor id

* commit 'f1ab88c23460a608cd6d6f6492fb2b039405c0f2':
  Add asus vendor id

fastboot/fastboot.c

diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 2d28d59..af61f88 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -161,6 +161,7 @@
        (info->dev_vendor != 0x0955) &&  // Nvidia
        (info->dev_vendor != 0x413c) &&  // DELL
        (info->dev_vendor != 0x2314) &&  // INQ Mobile
+       (info->dev_vendor != 0x0b05) &&  // Asus
        (info->dev_vendor != 0x0bb4))    // HTC
             return -1;
     if(info->ifc_class != 0xff) return -1;