diff options
| author |   Kay Sievers <kay.sievers@vrfy.org> | 2008-05-30 17:42:11 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 21:55:03 -0700 |
| commit | 3f9787046ea37a26170dc4439efa21f8d23a9978 (patch) | |
| tree | 7daa536e4231f683f9ed95ea1e007dd9d09f846c /arch/arm/common/scoop.c | |
| parent | sparc64: fix up bus_id changes in sparc core code (diff) | |
| download | linux-dev-3f9787046ea37a26170dc4439efa21f8d23a9978.tar.xz linux-dev-3f9787046ea37a26170dc4439efa21f8d23a9978.zip | |
arm: bus_id -> dev_name() and dev_set_name() conversions
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/common/scoop.c')
| -rw-r--r-- | arch/arm/common/scoop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index bc299b07a6fa..ae39553589dd 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c @@ -247,7 +247,7 @@ static int __devinit scoop_probe(struct platform_device *pdev) devptr->gpio.base = -1; if (inf->gpio_base != 0) { - devptr->gpio.label = pdev->dev.bus_id; + devptr->gpio.label = dev_name(&pdev->dev); devptr->gpio.base = inf->gpio_base; devptr->gpio.ngpio = 12; /* PA11 = 0, PA12 = 1, etc. up to PA22 = 11 */ devptr->gpio.set = scoop_gpio_set; |