diff options
author | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 10:48:30 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 10:48:30 +0100 |
commit | 617677295b53a40d0e54aac4cbbc216ffbc755dd (patch) | |
tree | 51b9e87213243ed5efff252c8e8d8fec4eebc588 /drivers/gpio/gpio-langwell.c | |
parent | time: x86: report_lost_ticks doesn't exist any more (diff) | |
parent | Merge tag 'regulator-3.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator (diff) | |
download | linux-dev-617677295b53a40d0e54aac4cbbc216ffbc755dd.tar.xz linux-dev-617677295b53a40d0e54aac4cbbc216ffbc755dd.zip |
Merge branch 'master' into for-next
Conflicts:
drivers/devfreq/exynos4_bus.c
Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
Diffstat (limited to 'drivers/gpio/gpio-langwell.c')
-rw-r--r-- | drivers/gpio/gpio-langwell.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-langwell.c b/drivers/gpio/gpio-langwell.c index 202a99207b7d..e77b2b3e94af 100644 --- a/drivers/gpio/gpio-langwell.c +++ b/drivers/gpio/gpio-langwell.c @@ -332,7 +332,7 @@ static const struct dev_pm_ops lnw_gpio_pm_ops = { .runtime_idle = lnw_gpio_runtime_idle, }; -static int __devinit lnw_gpio_probe(struct pci_dev *pdev, +static int lnw_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id) { void *base; @@ -435,7 +435,7 @@ static struct pci_driver lnw_gpio_driver = { }; -static int __devinit wp_gpio_probe(struct platform_device *pdev) +static int wp_gpio_probe(struct platform_device *pdev) { struct lnw_gpio *lnw; struct gpio_chip *gc; @@ -484,7 +484,7 @@ err_kmalloc: return retval; } -static int __devexit wp_gpio_remove(struct platform_device *pdev) +static int wp_gpio_remove(struct platform_device *pdev) { struct lnw_gpio *lnw = platform_get_drvdata(pdev); int err; @@ -499,7 +499,7 @@ static int __devexit wp_gpio_remove(struct platform_device *pdev) static struct platform_driver wp_gpio_driver = { .probe = wp_gpio_probe, - .remove = __devexit_p(wp_gpio_remove), + .remove = wp_gpio_remove, .driver = { .name = "wp_gpio", .owner = THIS_MODULE, |