Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid

[linux-2.6] / include / asm-s390 / timer.h

diff --git a/include/asm-s390/timer.h b/include/asm-s390/timer.h
index fcd6c256a2d194aa4b1269f89cfc25fabb8c96a6..30e5cbe570f2db3d29f73e282a6ef10bd57b4063 100644 (file)
--- a/include/asm-s390/timer.h
+++ b/include/asm-s390/timer.h
@@ -26,7 +26,7 @@ struct vtimer_list {
        spinlock_t lock;
        unsigned long magic;
 
-       void (*function)(unsigned long, struct pt_regs*);
+       void (*function)(unsigned long);
        unsigned long data;
 };