summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-08-06 19:13:19 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-08-06 19:13:19 +0200
commit500b9fc922cbec572f4fd1436533bfaed5011262 (patch)
treeaac4b7de0871e66740aeaf3510f7a59280026592 /drivers/net
parentMerge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/... (diff)
parentARM: mach-shmobile: Fix up ap4evb build for LCDC merge damage. (diff)
downloadlinux-500b9fc922cbec572f4fd1436533bfaed5011262.tar.xz
linux-500b9fc922cbec572f4fd1436533bfaed5011262.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts: drivers/net/irda/sh_irda.c
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/irda/sh_irda.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/irda/sh_irda.c b/drivers/net/irda/sh_irda.c
index edd5666f0ffb..9e3f4f54281d 100644
--- a/drivers/net/irda/sh_irda.c
+++ b/drivers/net/irda/sh_irda.c
@@ -748,7 +748,6 @@ static int __devinit sh_irda_probe(struct platform_device *pdev)
struct net_device *ndev;
struct sh_irda_self *self;
struct resource *res;
- char clk_name[8];
int irq;
int err = -ENOMEM;
@@ -775,10 +774,9 @@ static int __devinit sh_irda_probe(struct platform_device *pdev)
if (err)
goto err_mem_2;
- snprintf(clk_name, sizeof(clk_name), "irda%d", pdev->id);
- self->clk = clk_get(&pdev->dev, clk_name);
+ self->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(self->clk)) {
- dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
+ dev_err(&pdev->dev, "cannot get irda clock\n");
goto err_mem_3;
}