linux-next: manual merge of the v4l-dvb tree with the tree

[Stephen Rothwell]

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/staging/media/as102/as102_drv.h between commit d29387e8de8b
("media/staging: fix allyesconfig build error") from Linus' tree and
commit 82aae98df488 ("[media] staging: as102: Remove leftovers of the SPI
bus driver") from the v4l-dvb tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/staging/media/as102/as102_drv.h
index fd33f5a,0ecef9e..0000000
--- 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) {	\

Attachment: pgp00000.pgp
Description: PGP signature