diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-11 13:55:04 +0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-11 13:55:04 +0400 |
commit | a0f0dd57f4a85310d9936f1770a0424b49fef876 (patch) | |
tree | 2f85b8b67dda13d19b02ca39e0fbef921cb1cf8b /arch/tile/include/hv/iorpc.h | |
parent | 2a552d5e63d7fa602c9a9a0717008737f55625a6 (diff) | |
parent | 846a136881b8f73c1f74250bf6acfaa309cab1f2 (diff) | |
download | linux-a0f0dd57f4a85310d9936f1770a0424b49fef876.tar.xz |
Merge branch 'fixes' into for-linus
Conflicts:
arch/arm/kernel/smp.c
Diffstat (limited to 'arch/tile/include/hv/iorpc.h')
-rw-r--r-- | arch/tile/include/hv/iorpc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/include/hv/iorpc.h b/arch/tile/include/hv/iorpc.h index 89c72a5d9341..ddf1604482b3 100644 --- a/arch/tile/include/hv/iorpc.h +++ b/arch/tile/include/hv/iorpc.h @@ -248,7 +248,7 @@ #if defined(__HV__) #include <hv/hypervisor.h> #elif defined(__KERNEL__) -#include "hypervisor.h" +#include <hv/hypervisor.h> #include <linux/types.h> #else #include <stdint.h> |