diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 13:48:30 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 13:48:30 +0400 |
| commit | 617677295b53a40d0e54aac4cbbc216ffbc755dd (patch) | |
| tree | 51b9e87213243ed5efff252c8e8d8fec4eebc588 /drivers/watchdog/ie6xx_wdt.c | |
| parent | 5c8d1b68e01a144813e38795fe6dbe7ebb506131 (diff) | |
| parent | 6abb7c25775b7fb2225ad0508236d63ca710e65f (diff) | |
| download | linux-617677295b53a40d0e54aac4cbbc216ffbc755dd.tar.xz | |
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/watchdog/ie6xx_wdt.c')
| -rw-r--r-- | drivers/watchdog/ie6xx_wdt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/watchdog/ie6xx_wdt.c b/drivers/watchdog/ie6xx_wdt.c index 8f541b940053..e24ef6a6e064 100644 --- a/drivers/watchdog/ie6xx_wdt.c +++ b/drivers/watchdog/ie6xx_wdt.c @@ -225,7 +225,7 @@ static const struct file_operations ie6xx_wdt_dbg_operations = { .release = single_release, }; -static void __devinit ie6xx_wdt_debugfs_init(void) +static void ie6xx_wdt_debugfs_init(void) { /* /sys/kernel/debug/ie6xx_wdt */ ie6xx_wdt_data.debugfs = debugfs_create_file("ie6xx_wdt", @@ -238,7 +238,7 @@ static void ie6xx_wdt_debugfs_exit(void) } #else -static void __devinit ie6xx_wdt_debugfs_init(void) +static void ie6xx_wdt_debugfs_init(void) { } @@ -247,7 +247,7 @@ static void ie6xx_wdt_debugfs_exit(void) } #endif -static int __devinit ie6xx_wdt_probe(struct platform_device *pdev) +static int ie6xx_wdt_probe(struct platform_device *pdev) { struct resource *res; u8 wdtlr; @@ -295,7 +295,7 @@ misc_register_error: return ret; } -static int __devexit ie6xx_wdt_remove(struct platform_device *pdev) +static int ie6xx_wdt_remove(struct platform_device *pdev) { struct resource *res; @@ -311,7 +311,7 @@ static int __devexit ie6xx_wdt_remove(struct platform_device *pdev) static struct platform_driver ie6xx_wdt_driver = { .probe = ie6xx_wdt_probe, - .remove = __devexit_p(ie6xx_wdt_remove), + .remove = ie6xx_wdt_remove, .driver = { .name = DRIVER_NAME, .owner = THIS_MODULE, |