Pull video into test branch

[linux-2.6-omap-h63xx.git] / sound / oss / trident.c

diff --git a/sound/oss/trident.c b/sound/oss/trident.c
index ce79cd82478afac2d1eaa746a2b115e649afbcb1..6b1f8c9cdcf870419924dad10156dcf395df4e9f 100644 (file)
--- a/sound/oss/trident.c
+++ b/sound/oss/trident.c
@@ -216,6 +216,7 @@
 #include <linux/gameport.h>
 #include <linux/kernel.h>
 #include <linux/mutex.h>
+#include <linux/mm.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -1811,7 +1812,7 @@ cyber_address_interrupt(struct trident_card *card)
 }
 
 static irqreturn_t
-trident_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+trident_interrupt(int irq, void *dev_id)
 {
        struct trident_card *card = (struct trident_card *) dev_id;
        u32 event;
@@ -1862,7 +1863,7 @@ trident_read(struct file *file, char __user *buffer, size_t count, loff_t * ppos
        unsigned swptr;
        int cnt;
 
-       pr_debug("trident: trident_read called, count = %d\n", count);
+       pr_debug("trident: trident_read called, count = %zd\n", count);
 
        VALIDATE_STATE(state);
 
@@ -1978,7 +1979,7 @@ trident_write(struct file *file, const char __user *buffer, size_t count, loff_t
        unsigned int copy_count;
        int lret; /* for lock_set_fmt */
 
-       pr_debug("trident: trident_write called, count = %d\n", count);
+       pr_debug("trident: trident_write called, count = %zd\n", count);
 
        VALIDATE_STATE(state);