Merge branch 'linus' into core/iommu

[linux-2.6-omap-h63xx.git] / drivers / gpio / bt8xxgpio.c

diff --git a/drivers/gpio/bt8xxgpio.c b/drivers/gpio/bt8xxgpio.c
index 7a1168249dd56b761b15e70c81745a750fe4507c..984b587f0f96eb796c6b8971d1e5564973a6ae05 100644 (file)
--- a/drivers/gpio/bt8xxgpio.c
+++ b/drivers/gpio/bt8xxgpio.c
@@ -160,7 +160,7 @@ static void bt8xxgpio_gpio_setup(struct bt8xxgpio *bg)
 {
        struct gpio_chip *c = &bg->gpio;
 
-       c->label = bg->pdev->dev.bus_id;
+       c->label = dev_name(&bg->pdev->dev);
        c->owner = THIS_MODULE;
        c->direction_input = bt8xxgpio_gpio_direction_input;
        c->get = bt8xxgpio_gpio_get;