projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'kvm-arm-for-4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
ia64
/
kernel
/
cyclone.c
diff --git
a/arch/ia64/kernel/cyclone.c
b/arch/ia64/kernel/cyclone.c
index 4826ff957a3d18f6e0266f55dd7519b190ac198e..5fa3848ba22497c34d68e4f0e3f4069f79c73d09 100644
(file)
--- a/
arch/ia64/kernel/cyclone.c
+++ b/
arch/ia64/kernel/cyclone.c
@@
-4,7
+4,7
@@
#include <linux/errno.h>
#include <linux/timex.h>
#include <linux/clocksource.h>
-#include <
asm
/io.h>
+#include <
linux
/io.h>
/* IBM Summit (EXA) Cyclone counter code*/
#define CYCLONE_CBAR_ADDR 0xFEB00CD0