[PATCH v2 5/5] davinci: delete individual platform header files and use a common header

Sergei,

On Tue, Nov 15, 2011 at 16:24:49, Sergei Shtylyov wrote:

Hello.

On 14-11-2011 19:09, Manjunath Hadli wrote:

quoted

include davinci_common.h file in files using the platform header file 
for dm355, dm365, dm644x and dm646x and delete the individual platform 
header files.

quoted

Signed-off-by: Manjunath Hadli<redacted>

[...]

quoted

diff --git a/drivers/media/video/davinci/vpif.h 

b/drivers/media/video/davinci/vpif.h
index 25036cb..73b00bd 100644

--- a/drivers/media/video/davinci/vpif.h
+++ b/drivers/media/video/davinci/vpif.h

@@ -18,8 +18,7 @@

  #include<linux/io.h>
  #include<linux/videodev2.h>
-#include<mach/hardware.h>

    Why are you removing this?

It currently builds without the hardware.h. Perhaps it is not using any of the defines.

quoted

-#include<mach/dm646x.h>
+#include<mach/davinci_common.h>
  #include<media/davinci/vpif_types.h>

  /* Maximum channel allowed */

diff --git a/drivers/media/video/davinci/vpif_capture.h 

b/drivers/media/video/davinci/vpif_capture.h
index a693d4e..c019d26 100644

--- a/drivers/media/video/davinci/vpif_capture.h
+++ b/drivers/media/video/davinci/vpif_capture.h

@@ -27,6 +27,7 @@
  #include<media/v4l2-device.h>
  #include<media/videobuf-core.h>
  #include<media/videobuf-dma-contig.h>
+#include<mach/davinci_common.h>

    Not clear why are you adding this when no platform header was included before.

There was an inner inclusion of i2c.h. Will correct it for i2c.h only and remove davinci_common.h

WBR, Sergei

Thx,
-Manju