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

[linux-2.6-omap-h63xx.git] / include / asm-s390 / hardirq.h

diff --git a/include/asm-s390/hardirq.h b/include/asm-s390/hardirq.h
index 6792c559a124022c2e4d71a3fb1ed0428d770771..31beb18cb3d1ecab270f4f4cb66e1211cbca0080 100644 (file)
--- a/include/asm-s390/hardirq.h
+++ b/include/asm-s390/hardirq.h
@@ -12,7 +12,6 @@
 #ifndef __ASM_HARDIRQ_H
 #define __ASM_HARDIRQ_H
 
-#include <linux/config.h>
 #include <linux/threads.h>
 #include <linux/sched.h>
 #include <linux/cache.h>
@@ -33,6 +32,6 @@ typedef struct {
 
 #define HARDIRQ_BITS   8
 
-extern void account_ticks(struct pt_regs *);
+extern void account_ticks(u64 time);
 
 #endif /* __ASM_HARDIRQ_H */