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
[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
bf93820
..
524538a
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/devices-common.h
+++ b/
arch/arm/plat-mxc/include/mach/devices-common.h
@@
-30,6
+30,7
@@
static inline struct platform_device *imx_add_platform_device(
#include <linux/fec.h>
struct imx_fec_data {
#include <linux/fec.h>
struct imx_fec_data {
+ const char *devid;
resource_size_t iobase;
resource_size_t irq;
};
resource_size_t iobase;
resource_size_t irq;
};
@@
-276,6
+277,7
@@
struct platform_device *__init imx_add_mxc_w1(
#include <mach/esdhc.h>
struct imx_sdhci_esdhc_imx_data {
#include <mach/esdhc.h>
struct imx_sdhci_esdhc_imx_data {
+ const char *devid;
int id;
resource_size_t iobase;
resource_size_t irq;
int id;
resource_size_t iobase;
resource_size_t irq;
@@
-297,5
+299,5
@@
struct platform_device *__init imx_add_spi_imx(
const struct spi_imx_master *pdata);
struct platform_device *imx_add_imx_dma(void);
const struct spi_imx_master *pdata);
struct platform_device *imx_add_imx_dma(void);
-struct platform_device *imx_add_imx_sdma(
+struct platform_device *imx_add_imx_sdma(
char *name,
resource_size_t iobase, int irq, struct sdma_platform_data *pdata);
resource_size_t iobase, int irq, struct sdma_platform_data *pdata);