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 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx3
/
pcm037.c
diff --git
a/arch/arm/mach-mx3/pcm037.c
b/arch/arm/mach-mx3/pcm037.c
index
a34ae6d
..
df8582a
100644
(file)
--- a/
arch/arm/mach-mx3/pcm037.c
+++ b/
arch/arm/mach-mx3/pcm037.c
@@
-23,15
+23,15
@@
#include <linux/mtd/physmap.h>
#include <linux/memory.h>
#include <linux/mtd/physmap.h>
#include <linux/memory.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
-#include <
asm/ar
ch/common.h>
-#include <
asm/ar
ch/imx-uart.h>
-#include <
asm/ar
ch/iomux-mx3.h>
-#include <
asm/ar
ch/board-pcm037.h>
+#include <
ma
ch/common.h>
+#include <
ma
ch/imx-uart.h>
+#include <
ma
ch/iomux-mx3.h>
+#include <
ma
ch/board-pcm037.h>
static struct physmap_flash_data pcm037_flash_data = {
.width = 2,
static struct physmap_flash_data pcm037_flash_data = {
.width = 2,
@@
-54,7
+54,7
@@
static struct platform_device pcm037_flash = {
};
static struct imxuart_platform_data uart_pdata = {
};
static struct imxuart_platform_data uart_pdata = {
- .flags =
0
,
+ .flags =
IMXUART_HAVE_RTSCTS
,
};
static struct platform_device *devices[] __initdata = {
};
static struct platform_device *devices[] __initdata = {