Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[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 e84b7ef54aac614d968883ca8c8c459b8f67c8ed..4b7cb964ff353f35dd5e7bf87c6803ec57363d02 100644 (file)
--- a/include/asm-s390/hardirq.h
+++ b/include/asm-s390/hardirq.h
@@ -32,6 +32,6 @@ typedef struct {
 
 #define HARDIRQ_BITS   8
 
-extern void account_ticks(struct pt_regs *);
+void clock_comparator_work(void);
 
 #endif /* __ASM_HARDIRQ_H */