summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2009-01-26 15:45:10 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-26 16:04:46 +0100
commit0ee2ad84d36760c8e36a6a6729998dc7a4eacf38 (patch)
tree4be8d070b41b7bbf82853c002c2706ff6ba838ba
parentcpumask: modifiy oprofile initialization (diff)
downloadlinux-0ee2ad84d36760c8e36a6a6729998dc7a4eacf38.tar.xz
linux-0ee2ad84d36760c8e36a6a6729998dc7a4eacf38.zip
sysrq: include interrupt.h instead of irq.h
Impact: fix compile error on s390. With "cpumask: update irq_desc to use cpumask_var_t" in linux-next we get this compile bug on s390: CC drivers/char/sysrq.o In file included from drivers/char/sysrq.c:38: include/linux/irq.h: In function 'init_alloc_desc_masks': include/linux/irq.h:442: error: dereferencing pointer to incomplete type Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Mike Travis <travis@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--drivers/char/sysrq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index d41b9f6f7903..59214dba206d 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -35,7 +35,7 @@
#include <linux/vt_kern.h>
#include <linux/workqueue.h>
#include <linux/kexec.h>
-#include <linux/irq.h>
+#include <linux/interrupt.h>
#include <linux/hrtimer.h>
#include <linux/oom.h>