V4L/DVB (8574): gspca: Bad bytesperlines of pixelformat in spca505/506/508 and vc023x.

[safe/jmp/linux-2.6] / drivers / media / video / zoran_device.c

diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c
index 05b16a2..88d3697 100644 (file)
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran_device.c
@@ -31,7 +31,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/vmalloc.h>
-#include <linux/byteorder/generic.h>
 
 #include <linux/interrupt.h>
 #include <linux/proc_fs.h>
@@ -47,6 +46,7 @@
 #include <linux/delay.h>
 #include <linux/wait.h>
 
+#include <asm/byteorder.h>
 #include <asm/io.h>
 
 #include "videocodec.h"
@@ -928,11 +928,6 @@ count_reset_interrupt (struct zoran *zr)
        return isr;
 }
 
-/* hack */
-extern void zr36016_write (struct videocodec *codec,
-                          u16                reg,
-                          u32                val);
-
 void
 jpeg_start (struct zoran *zr)
 {
@@ -1325,7 +1320,7 @@ error_handler (struct zoran *zr,
                        if (i) {
                                /* Rotate stat_comm entries to make current entry first */
                                int j;
-                               u32 bus_addr[BUZ_NUM_STAT_COM];
+                               __le32 bus_addr[BUZ_NUM_STAT_COM];
 
                                /* Here we are copying the stat_com array, which
                                 * is already in little endian format, so