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 git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-mv78xx0
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-mv78xx0/include/mach/system.h
b/arch/arm/mach-mv78xx0/include/mach/system.h
index
1d6350b
..
66e7ce4
100644
(file)
--- a/
arch/arm/mach-mv78xx0/include/mach/system.h
+++ b/
arch/arm/mach-mv78xx0/include/mach/system.h
@@
-9,8
+9,7
@@
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H
-#include <mach/hardware.h>
-#include <mach/mv78xx0.h>
+#include <mach/bridge-regs.h>
static inline void arch_idle(void)
{