summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/devices.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-01-29 08:57:16 -0800
committerTony Lindgren <tony@atomide.com>2009-01-29 08:57:16 -0800
commit0dffb5c57a1d76532e2f2c7398579bfce81c3e5c (patch)
tree0785b260efb780bba220c25b8bb3fff3d2781972 /arch/arm/plat-omap/devices.c
parent187e688d237a6df11a2d32e8ac480b6d1fbd40b9 (diff)
downloadblackbird-op-linux-0dffb5c57a1d76532e2f2c7398579bfce81c3e5c.tar.gz
blackbird-op-linux-0dffb5c57a1d76532e2f2c7398579bfce81c3e5c.zip
ARM: OMAP: Fix hsmmc init, v2
The naming accidentally broke while changing the name for the driver to not to conflict with the other mmc driver. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/devices.c')
-rw-r--r--arch/arm/plat-omap/devices.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index ac15c23fd5da..208dbb121f47 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -200,14 +200,15 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
/*
* Register MMC devices. Called from mach-omap1 and mach-omap2 device init.
*/
-int __init omap_mmc_add(int id, unsigned long base, unsigned long size,
- unsigned int irq, struct omap_mmc_platform_data *data)
+int __init omap_mmc_add(const char *name, int id, unsigned long base,
+ unsigned long size, unsigned int irq,
+ struct omap_mmc_platform_data *data)
{
struct platform_device *pdev;
struct resource res[OMAP_MMC_NR_RES];
int ret;
- pdev = platform_device_alloc("mmci-omap", id);
+ pdev = platform_device_alloc(name, id);
if (!pdev)
return -ENOMEM;
OpenPOWER on IntegriCloud