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/davem/net-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
at91rm9200_devices.c
diff --git
a/arch/arm/mach-at91/at91rm9200_devices.c
b/arch/arm/mach-at91/at91rm9200_devices.c
index
d2c5c84
..
9338825
100644
(file)
--- a/
arch/arm/mach-at91/at91rm9200_devices.c
+++ b/
arch/arm/mach-at91/at91rm9200_devices.c
@@
-17,10
+17,10
@@
#include <linux/platform_device.h>
#include <linux/i2c-gpio.h>
#include <linux/platform_device.h>
#include <linux/i2c-gpio.h>
-#include <
asm/ar
ch/board.h>
-#include <
asm/ar
ch/gpio.h>
-#include <
asm/ar
ch/at91rm9200.h>
-#include <
asm/ar
ch/at91rm9200_mc.h>
+#include <
ma
ch/board.h>
+#include <
ma
ch/gpio.h>
+#include <
ma
ch/at91rm9200.h>
+#include <
ma
ch/at91rm9200_mc.h>
#include "generic.h"
#include "generic.h"