Merge /home/v4l/v4l/for_upstream

[karo-tx-linux.git] / drivers / staging / media / as102 / as102_drv.h

diff --git a/drivers/staging/media/as102/as102_drv.h b/drivers/staging/media/as102/as102_drv.h
index 0ecef9e1a6961ad31acc90f39eda8957aefb9a81..957f0ed0d81aae7c8d587dbca4b853cf862b3814 100644 (file)
--- a/drivers/staging/media/as102/as102_drv.h
+++ b/drivers/staging/media/as102/as102_drv.h
@@ -27,7 +27,8 @@
 #define DRIVER_FULL_NAME "Abilis Systems as10x usb driver"
 #define DRIVER_NAME "as10x_usb"
 
-extern int debug;
+extern int as102_debug;
+#define debug  as102_debug
 extern struct usb_driver as102_usb_driver;
 extern int elna_enable;