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 'fix/hda' into topic/hda
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-davinci/include/mach/system.h
b/arch/arm/mach-davinci/include/mach/system.h
index
8e4f10f
..
5a7d758
100644
(file)
--- a/
arch/arm/mach-davinci/include/mach/system.h
+++ b/
arch/arm/mach-davinci/include/mach/system.h
@@
-11,9
+11,6
@@
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H
-#include <linux/io.h>
-#include <mach/hardware.h>
-
extern void davinci_watchdog_reset(void);
static inline void arch_idle(void)