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-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-apf9328.c
diff --git
a/arch/arm/mach-imx/mach-apf9328.c
b/arch/arm/mach-imx/mach-apf9328.c
index
59d2a3b
..
a404c89
100644
(file)
--- a/
arch/arm/mach-imx/mach-apf9328.c
+++ b/
arch/arm/mach-imx/mach-apf9328.c
@@
-99,11
+99,6
@@
static struct platform_device dm9000x_device = {
}
};
}
};
-/* --- SERIAL RESSOURCE --- */
-static const struct imxuart_platform_data uart0_pdata __initconst = {
- .flags = 0,
-};
-
static const struct imxuart_platform_data uart1_pdata __initconst = {
.flags = IMXUART_HAVE_RTSCTS,
};
static const struct imxuart_platform_data uart1_pdata __initconst = {
.flags = IMXUART_HAVE_RTSCTS,
};
@@
-121,7
+116,7
@@
static void __init apf9328_init(void)
ARRAY_SIZE(apf9328_pins),
"APF9328");
ARRAY_SIZE(apf9328_pins),
"APF9328");
- imx1_add_imx_uart0(
&uart0_pdata
);
+ imx1_add_imx_uart0(
NULL
);
imx1_add_imx_uart1(&uart1_pdata);
platform_add_devices(devices, ARRAY_SIZE(devices));
imx1_add_imx_uart1(&uart1_pdata);
platform_add_devices(devices, ARRAY_SIZE(devices));