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 master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91rm9200
/
devices.c
diff --git
a/arch/arm/mach-at91rm9200/devices.c
b/arch/arm/mach-at91rm9200/devices.c
index
bf753e3
..
1cf85d2
100644
(file)
--- a/
arch/arm/mach-at91rm9200/devices.c
+++ b/
arch/arm/mach-at91rm9200/devices.c
@@
-16,7
+16,7
@@
#include <linux/config.h>
#include <linux/platform_device.h>
-#include <asm/
arch/
hardware.h>
+#include <asm/hardware.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>