summaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/nmi.c
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2009-06-12 10:26:21 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2009-06-12 10:27:29 +0200
commit76d4e00a05d06c1d1552adea24fcf6182c9d8999 (patch)
tree932881ed89489a912fc4c3ab15b03290283d60e2 /arch/s390/kernel/nmi.c
parent7aa79f948749da7de3de0c427e9c9ee0ff595243 (diff)
downloadlinux-stable-76d4e00a05d06c1d1552adea24fcf6182c9d8999.tar.gz
linux-stable-76d4e00a05d06c1d1552adea24fcf6182c9d8999.tar.bz2
linux-stable-76d4e00a05d06c1d1552adea24fcf6182c9d8999.zip
[S390] merge cpu.h into cputime.h
All definition in cpu.h have to do with cputime accounting. Move them to cputime.h and remove the header file. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/nmi.c')
-rw-r--r--arch/s390/kernel/nmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c
index 28cf196ba775..015e27da40eb 100644
--- a/arch/s390/kernel/nmi.c
+++ b/arch/s390/kernel/nmi.c
@@ -16,7 +16,7 @@
#include <asm/lowcore.h>
#include <asm/smp.h>
#include <asm/etr.h>
-#include <asm/cpu.h>
+#include <asm/cputime.h>
#include <asm/nmi.h>
#include <asm/crw.h>