git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'hotfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[pandora-kernel.git]
/
drivers
/
watchdog
/
hpwdt.c
diff --git
a/drivers/watchdog/hpwdt.c
b/drivers/watchdog/hpwdt.c
index
eaa3f2a
..
ccd6c53
100644
(file)
--- a/
drivers/watchdog/hpwdt.c
+++ b/
drivers/watchdog/hpwdt.c
@@
-420,7
+420,7
@@
static int __devinit detect_cru_service(void)
static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason,
void *data)
{
-
static
unsigned long rom_pl;
+ unsigned long rom_pl;
static int die_nmi_called;
if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI)