diff options
| author | Dale Farnsworth <dale@farnsworth.org> | 2007-07-24 20:07:38 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-07-24 20:56:35 +0200 |
| commit | 422db8d229affd429b5a7389600877aa7dea2704 (patch) | |
| tree | 2cdd7aaf3519379036dafa930bcfe31488cc91db /include | |
| parent | [WATCHDOG] ensure mouse and keyboard ignored in w83627hf_wdt (diff) | |
| download | linux-422db8d229affd429b5a7389600877aa7dea2704.tar.xz linux-422db8d229affd429b5a7389600877aa7dea2704.zip | |
[WATCHDOG] mv64x60_wdt: set up platform_device in platform code
The driver previously registered its platform device data in its own
init function--that's bogus. Move that code to platform-specific
code in arch/ppc. This is being done so that the platform code can
decide at runtime whether to initialize this driver or not.
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/mv64x60.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/mv64x60.h b/include/asm-ppc/mv64x60.h index db3776f18198..fa6230fb641a 100644 --- a/include/asm-ppc/mv64x60.h +++ b/include/asm-ppc/mv64x60.h @@ -121,7 +121,7 @@ extern spinlock_t mv64x60_lock; #define MV64x60_64BIT_WIN_COUNT 24 /* Watchdog Platform Device, Driver Data */ -#define MV64x60_WDT_NAME "wdt" +#define MV64x60_WDT_NAME "mv64x60_wdt" struct mv64x60_wdt_pdata { int timeout; /* watchdog expiry in seconds, default 10 */ |