From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 20 Nov 2011 23:50:59 +0000 (+1100)
Subject: Merge remote-tracking branch 'v4l-dvb/master'
X-Git-Tag: next-20111121~50
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=25e03a592497f3d89be53d6b8c96eaf598b38669;p=karo-tx-linux.git

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

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

25e03a592497f3d89be53d6b8c96eaf598b38669
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) {	\