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 branches 'imx/pata' and 'imx/sata' into next/driver
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
devices-common.h
diff --git
a/arch/arm/plat-mxc/include/mach/devices-common.h
b/arch/arm/plat-mxc/include/mach/devices-common.h
index
f04e063
..
117a381
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/devices-common.h
+++ b/
arch/arm/plat-mxc/include/mach/devices-common.h
@@
-251,6
+251,14
@@
struct platform_device *__init imx_add_mxc_nand(
const struct imx_mxc_nand_data *data,
const struct mxc_nand_platform_data *pdata);
const struct imx_mxc_nand_data *data,
const struct mxc_nand_platform_data *pdata);
+struct imx_pata_imx_data {
+ resource_size_t iobase;
+ resource_size_t iosize;
+ resource_size_t irq;
+};
+struct platform_device *__init imx_add_pata_imx(
+ const struct imx_pata_imx_data *data);
+
struct imx_mxc_pwm_data {
int id;
resource_size_t iobase;
struct imx_mxc_pwm_data {
int id;
resource_size_t iobase;