summaryrefslogtreecommitdiffstats
path: root/arch/s390/oprofile
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2011-05-26 09:48:24 +0200
committerHeiko Carstens <heiko.carstens@de.ibm.com>2011-05-26 09:48:24 +0200
commitd7b250e2a2d7f3cd23cf8d8d6689285e6f51a98d (patch)
tree5bfb94fff047818db31613762a8986784241ca8c /arch/s390/oprofile
parent[S390] irq: fix service signal external interrupt handling (diff)
downloadlinux-d7b250e2a2d7f3cd23cf8d8d6689285e6f51a98d.tar.xz
linux-d7b250e2a2d7f3cd23cf8d8d6689285e6f51a98d.zip
[S390] irq: merge irq.c and s390_ext.c
Merge irq.c and s390_ext.c into irq.c. That way all external interrupt related functions are together. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/oprofile')
-rw-r--r--arch/s390/oprofile/hwsampler.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/oprofile/hwsampler.c b/arch/s390/oprofile/hwsampler.c
index 053caa0fd276..4634c9ef9722 100644
--- a/arch/s390/oprofile/hwsampler.c
+++ b/arch/s390/oprofile/hwsampler.c
@@ -19,7 +19,7 @@
#include <linux/oprofile.h>
#include <asm/lowcore.h>
-#include <asm/s390_ext.h>
+#include <asm/irq.h>
#include "hwsampler.h"