diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /drivers/gpio/twl4030-gpio.c | |
| parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
| parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'drivers/gpio/twl4030-gpio.c')
| -rw-r--r-- | drivers/gpio/twl4030-gpio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpio/twl4030-gpio.c b/drivers/gpio/twl4030-gpio.c index afad14792141..49384a7c5492 100644 --- a/drivers/gpio/twl4030-gpio.c +++ b/drivers/gpio/twl4030-gpio.c | |||
| @@ -460,7 +460,8 @@ no_irqs: | |||
| 460 | return ret; | 460 | return ret; |
| 461 | } | 461 | } |
| 462 | 462 | ||
| 463 | static int __devexit gpio_twl4030_remove(struct platform_device *pdev) | 463 | /* Cannot use __devexit as gpio_twl4030_probe() calls us */ |
| 464 | static int gpio_twl4030_remove(struct platform_device *pdev) | ||
| 464 | { | 465 | { |
| 465 | struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data; | 466 | struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data; |
| 466 | int status; | 467 | int status; |
| @@ -493,7 +494,7 @@ static struct platform_driver gpio_twl4030_driver = { | |||
| 493 | .driver.name = "twl4030_gpio", | 494 | .driver.name = "twl4030_gpio", |
| 494 | .driver.owner = THIS_MODULE, | 495 | .driver.owner = THIS_MODULE, |
| 495 | .probe = gpio_twl4030_probe, | 496 | .probe = gpio_twl4030_probe, |
| 496 | .remove = __devexit_p(gpio_twl4030_remove), | 497 | .remove = gpio_twl4030_remove, |
| 497 | }; | 498 | }; |
| 498 | 499 | ||
| 499 | static int __init gpio_twl4030_init(void) | 500 | static int __init gpio_twl4030_init(void) |