diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /drivers/watchdog/pc87413_wdt.c | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'drivers/watchdog/pc87413_wdt.c')
| -rw-r--r-- | drivers/watchdog/pc87413_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c index 139d773300c6..b7c139051575 100644 --- a/drivers/watchdog/pc87413_wdt.c +++ b/drivers/watchdog/pc87413_wdt.c | |||
| @@ -49,7 +49,7 @@ | |||
| 49 | #define WDT_DATA_IO_PORT (WDT_INDEX_IO_PORT+1) | 49 | #define WDT_DATA_IO_PORT (WDT_INDEX_IO_PORT+1) |
| 50 | #define SWC_LDN 0x04 | 50 | #define SWC_LDN 0x04 |
| 51 | #define SIOCFG2 0x22 /* Serial IO register */ | 51 | #define SIOCFG2 0x22 /* Serial IO register */ |
| 52 | #define WDCTL 0x10 /* Watchdog-Timer-Controll-Register */ | 52 | #define WDCTL 0x10 /* Watchdog-Timer-Control-Register */ |
| 53 | #define WDTO 0x11 /* Watchdog timeout register */ | 53 | #define WDTO 0x11 /* Watchdog timeout register */ |
| 54 | #define WDCFG 0x12 /* Watchdog config register */ | 54 | #define WDCFG 0x12 /* Watchdog config register */ |
| 55 | 55 | ||