From ffc12a2a0ff8962c080a3e679ab779727e19ff30 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Sun, 2 Oct 2005 17:15:33 -0700
Subject: [PATCH] --- yaml --- r: 10783 b: refs/heads/master c:
 521daed8db4443a1574a98fc3abae8e230f09eaa h: refs/heads/master i:   10781:
 773cdba5486589a0a43e419fe5f959a6be0dfa71   10779:
 25e0ef33ee5a92263a7092d0bdd3991c7adc33aa   10775:
 568e99b2f679cb2cd21fbd0ea4a21751b5d4d7e2   10767:
 d53ed5689a316f08bcb0368572566b15f64a3020   10751:
 f249adead9eb16ac585881c40b2b15c710b5ccdf v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/usb/serial/safe_serial.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ba159fa51c00..0c5628f6cdc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddcad752f206be7a0091a041403c3188f2febd16
+refs/heads/master: 521daed8db4443a1574a98fc3abae8e230f09eaa
diff --git a/trunk/drivers/usb/serial/safe_serial.c b/trunk/drivers/usb/serial/safe_serial.c
index 96a17568cbf1..88bf14abfa7a 100644
--- a/trunk/drivers/usb/serial/safe_serial.c
+++ b/trunk/drivers/usb/serial/safe_serial.c
@@ -92,7 +92,7 @@ MODULE_DESCRIPTION (DRIVER_DESC);
 MODULE_LICENSE("GPL");
 
 #if defined(CONFIG_USBD_SAFE_SERIAL_VENDOR) && !defined(CONFIG_USBD_SAFE_SERIAL_PRODUCT)
-#abort "SAFE_SERIAL_VENDOR defined without SAFE_SERIAL_PRODUCT"
+#error "SAFE_SERIAL_VENDOR defined without SAFE_SERIAL_PRODUCT"
 #endif
 
 #if ! defined(CONFIG_USBD_SAFE_SERIAL_VENDOR)