[PATCH] getting rid of all casts of k[cmz]alloc() calls

[mv-sheeva.git] / drivers / media / video / zoran_device.c

diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c
index c690b2ee880a4fe8f44f6496177d345703962329..168e431d7c716e56b5cd924047032901cff31e64 100644 (file)
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran_device.c
@@ -27,7 +27,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -536,7 +535,7 @@ zr36057_overlay (struct zoran *zr,
                 * All error messages are internal driver checking only! */
 
                /* video display top and bottom registers */
-               reg = (u32) zr->buffer.base +
+               reg = (long) zr->buffer.base +
                    zr->overlay_settings.x *
                    ((zr->overlay_settings.format->depth + 7) / 8) +
                    zr->overlay_settings.y *
@@ -1409,15 +1408,14 @@ error_handler (struct zoran *zr,
 
 irqreturn_t
 zoran_irq (int             irq,
-          void           *dev_id,
-          struct pt_regs *regs)
+          void           *dev_id)
 {
        u32 stat, astat;
        int count;
        struct zoran *zr;
        unsigned long flags;
 
-       zr = (struct zoran *) dev_id;
+       zr = dev_id;
        count = 0;
 
        if (zr->testing) {