git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.40' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
time.c
diff --git
a/arch/s390/kernel/time.c
b/arch/s390/kernel/time.c
index
a59557f
..
dff9330
100644
(file)
--- a/
arch/s390/kernel/time.c
+++ b/
arch/s390/kernel/time.c
@@
-41,7
+41,6
@@
#include <linux/kprobes.h>
#include <asm/uaccess.h>
#include <asm/delay.h>
-#include <asm/s390_ext.h>
#include <asm/div64.h>
#include <asm/vdso.h>
#include <asm/irq.h>