resolved simple conflict with dc9cf66

yoannsculo · Jan 22, 2010 · 20f410a · 20f410a
2 parents 114e398 + dc9cf66
commit 20f410a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
@@ -151,6 +151,7 @@ int match_fastboot(usb_ifc_info *info)
        (info->dev_vendor != 0x0451) &&
        (info->dev_vendor != 0x22b8) &&  // Motorola
        (info->dev_vendor != 0x0502) &&
+       (info->dev_vendor != 0x413c) &&  // DELL
        (info->dev_vendor != 0x0bb4))    // HTC
             return -1;
     if(info->ifc_class != 0xff) return -1;