projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[cascardo/linux.git]
/
drivers
/
watchdog
/
machzwd.c
diff --git
a/drivers/watchdog/machzwd.c
b/drivers/watchdog/machzwd.c
index
9280350
..
1332b83
100644
(file)
--- a/
drivers/watchdog/machzwd.c
+++ b/
drivers/watchdog/machzwd.c
@@
-54,7
+54,7
@@
/* indexes */ /* size */
#define ZFL_VERSION 0x02 /* 16 */
-#define CONTROL 0x10 /* 16 */
+#define CONTROL
0x10 /* 16 */
#define STATUS 0x12 /* 8 */
#define COUNTER_1 0x0C /* 16 */
#define COUNTER_2 0x0E /* 8 */