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 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[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
8ced9bc
..
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"
@@
-368,7
+368,7
@@
void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}
* NAND / SmartMedia
* -------------------------------------------------------------------- */
* NAND / SmartMedia
* -------------------------------------------------------------------- */
-#if defined(CONFIG_MTD_NAND_AT
91) || defined(CONFIG_MTD_NAND_AT91
_MODULE)
+#if defined(CONFIG_MTD_NAND_AT
MEL) || defined(CONFIG_MTD_NAND_ATMEL
_MODULE)
static struct atmel_nand_data nand_data;
#define NAND_BASE AT91_CHIPSELECT_3
static struct atmel_nand_data nand_data;
#define NAND_BASE AT91_CHIPSELECT_3