Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / media / video / omap / omap16xxcam.c

diff --git a/drivers/media/video/omap/omap16xxcam.c b/drivers/media/video/omap/omap16xxcam.c
index 82c006b4c0264dc300080ac388c43387b9e89f38..1615fb7ecebf57d27615340ae14d8133a37bccc9 100644 (file)
--- a/drivers/media/video/omap/omap16xxcam.c
+++ b/drivers/media/video/omap/omap16xxcam.c
@@ -28,9 +28,9 @@
 #include <linux/interrupt.h>
 #include <linux/clk.h>
 
-#include <asm/arch/irqs.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/hardware.h>
+#include <mach/irqs.h>
+#include <mach/dma.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/scatterlist.h>
 #include <asm/mach-types.h>