From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 03:28:33 +0000 (+1100)
Subject: Merge remote-tracking branch 'v4l-dvb/master'
X-Git-Tag: next-20111103~45
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=43180fa3ab295f935c1e3a7dfa19de6063801c33;p=karo-tx-linux.git

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

Conflicts:
	drivers/staging/Makefile
---

43180fa3ab295f935c1e3a7dfa19de6063801c33
diff --cc drivers/staging/Makefile
index 936b7c22e18e,c1a60ef31596..a25f3f26c7ff
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -3,13 -3,9 +3,10 @@@
  # fix for build system bug...
  obj-$(CONFIG_STAGING)		+= staging.o
  
 +obj-y				+= serial/
+ obj-y				+= media/
  obj-$(CONFIG_ET131X)		+= et131x/
  obj-$(CONFIG_SLICOSS)		+= slicoss/
- obj-$(CONFIG_VIDEO_GO7007)	+= go7007/
- obj-$(CONFIG_VIDEO_CX25821)	+= cx25821/
- obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
- obj-$(CONFIG_LIRC_STAGING)	+= lirc/
  obj-$(CONFIG_USBIP_CORE)	+= usbip/
  obj-$(CONFIG_W35UND)		+= winbond/
  obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/