From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 Oct 2012 23:07:56 +0000 (+1100)
Subject: Merge remote-tracking branch 'v4l-dvb/master'
X-Git-Tag: next-20121011~50
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=71003e6622d9524ef1e54777a560672dfff284f8;p=karo-tx-linux.git

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

Conflicts:
	arch/arm/mach-davinci/include/mach/da8xx.h
---

71003e6622d9524ef1e54777a560672dfff284f8
diff --cc arch/arm/mach-davinci/include/mach/da8xx.h
index c9ee723c56f3,13d229575757..aaccdc4528fc
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@@ -16,7 -16,7 +16,8 @@@
  #include <linux/platform_device.h>
  #include <linux/davinci_emac.h>
  #include <linux/spi/spi.h>
 +#include <linux/platform_data/davinci_asp.h>
+ #include <linux/videodev2.h>
  
  #include <mach/serial.h>
  #include <mach/edma.h>