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 'topic/hda' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-loki
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-loki/include/mach/system.h
b/arch/arm/mach-loki/include/mach/system.h
index
c1de36f
..
7189519
100644
(file)
--- a/
arch/arm/mach-loki/include/mach/system.h
+++ b/
arch/arm/mach-loki/include/mach/system.h
@@
-9,8
+9,7
@@
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H
-#include <mach/hardware.h>
-#include <mach/loki.h>
+#include <mach/bridge-regs.h>
static inline void arch_idle(void)
{