diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-06 20:48:31 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-06 20:48:31 +0400 |
| commit | c87985a3ce723995fc7b25e598238d67154108a1 (patch) | |
| tree | e60def1b77c25c1d74180f62e8a5603f9826f209 /drivers/watchdog/ie6xx_wdt.c | |
| parent | d155255a344c417acad74156654295a2964e6b81 (diff) | |
| parent | 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff) | |
| download | linux-c87985a3ce723995fc7b25e598238d67154108a1.tar.xz | |
Merge tty-next into 3.6-rc1
This handles the merge issue in:
arch/um/drivers/line.c
arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/watchdog/ie6xx_wdt.c')
| -rw-r--r-- | drivers/watchdog/ie6xx_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/ie6xx_wdt.c b/drivers/watchdog/ie6xx_wdt.c index 5f0d776f902c..8f541b940053 100644 --- a/drivers/watchdog/ie6xx_wdt.c +++ b/drivers/watchdog/ie6xx_wdt.c @@ -232,7 +232,7 @@ static void __devinit ie6xx_wdt_debugfs_init(void) S_IFREG | S_IRUGO, NULL, NULL, &ie6xx_wdt_dbg_operations); } -static void __devexit ie6xx_wdt_debugfs_exit(void) +static void ie6xx_wdt_debugfs_exit(void) { debugfs_remove(ie6xx_wdt_data.debugfs); } @@ -242,7 +242,7 @@ static void __devinit ie6xx_wdt_debugfs_init(void) { } -static void __devexit ie6xx_wdt_debugfs_exit(void) +static void ie6xx_wdt_debugfs_exit(void) { } #endif |