From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 24 Nov 2011 02:04:07 +0000 (+1100)
Subject: Merge remote-tracking branch 'v4l-dvb/master'
X-Git-Tag: next-20111124~55
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f13d24502922dec227156b4a6be3c6360f423cdd;p=karo-tx-linux.git

Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
	drivers/staging/media/as102/as102_drv.h
---

f13d24502922dec227156b4a6be3c6360f423cdd
diff --cc drivers/staging/media/as102/as102_drv.h
index fd33f5a12dcc,0ecef9e1a696..957f0ed0d81a
--- a/drivers/staging/media/as102/as102_drv.h
+++ b/drivers/staging/media/as102/as102_drv.h
@@@ -37,8 -27,9 +27,10 @@@
  #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;
  
  #define dprintk(debug, args...) \
  	do { if (debug) {	\