diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-02-01 17:53:26 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-01 17:53:26 +0000 |
| commit | de8696203e64f19ea26f8e096ac8a796e78216b3 (patch) | |
| tree | d932f2f04d6c81c75c5104ae86b1e5d47e6591e3 /arch/arm/plat-omap/include/mach/mmc.h | |
| parent | 807a96cd0e5f5311e7f7a1030b43aab624cd7d9f (diff) | |
| parent | 0dc23d704874e892c3fb5f2c0e4dfbef3c9c6edf (diff) | |
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch/arm/plat-omap/include/mach/mmc.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/mmc.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/include/mach/mmc.h b/arch/arm/plat-omap/include/mach/mmc.h index 031250f0280..73a9e15031b 100644 --- a/arch/arm/plat-omap/include/mach/mmc.h +++ b/arch/arm/plat-omap/include/mach/mmc.h @@ -115,8 +115,9 @@ void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, int nr_controllers); void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, int nr_controllers); -int omap_mmc_add(int id, unsigned long base, unsigned long size, - unsigned int irq, struct omap_mmc_platform_data *data); +int omap_mmc_add(const char *name, int id, unsigned long base, + unsigned long size, unsigned int irq, + struct omap_mmc_platform_data *data); #else static inline void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, int nr_controllers) @@ -126,8 +127,9 @@ static inline void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, int nr_controllers) { } -static inline int omap_mmc_add(int id, unsigned long base, unsigned long size, - unsigned int irq, struct omap_mmc_platform_data *data) +static inline int omap_mmc_add(const char *name, int id, unsigned long base, + unsigned long size, unsigned int irq, + struct omap_mmc_platform_data *data) { return 0; } |