diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-15 08:48:28 -0800 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-15 08:48:28 -0800 |
| commit | 6f157c1d268d5888ca44c589dccd01729c4172f6 (patch) | |
| tree | e439df35a39c06df3665ec30b406406f08e82177 /arch/sh/drivers/dma/dma-api.c | |
| parent | c5974932c1e8514d3478573bb52beebeb2c786dd (diff) | |
| parent | 4ee29f6a52158cea526b16a44ae38643946103ec (diff) | |
| download | op-kernel-dev-6f157c1d268d5888ca44c589dccd01729c4172f6.zip op-kernel-dev-6f157c1d268d5888ca44c589dccd01729c4172f6.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sh/drivers/dma/dma-api.c')
| -rw-r--r-- | arch/sh/drivers/dma/dma-api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/drivers/dma/dma-api.c b/arch/sh/drivers/dma/dma-api.c index 76ed816..727126e 100644 --- a/arch/sh/drivers/dma/dma-api.c +++ b/arch/sh/drivers/dma/dma-api.c @@ -350,7 +350,7 @@ int register_dmac(struct dma_info *info) BUG_ON((info->flags & DMAC_CHANNELS_CONFIGURED) && !info->channels); - info->pdev = platform_device_register_simple((char *)info->name, -1, + info->pdev = platform_device_register_simple(info->name, -1, NULL, 0); if (IS_ERR(info->pdev)) return PTR_ERR(info->pdev); |
