aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/watchdog/hpwdt.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index e18f6b9f7947..77ca72c0c6d5 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -133,7 +133,7 @@ static struct cmn_registers cmn_regs;
133extern asmlinkage void asminline_call(struct cmn_registers *pi86Regs, 133extern asmlinkage void asminline_call(struct cmn_registers *pi86Regs,
134 unsigned long *pRomEntry); 134 unsigned long *pRomEntry);
135 135
136#ifndef CONFIG_X86_64 136#ifdef CONFIG_X86_32
137/* --32 Bit Bios------------------------------------------------------------ */ 137/* --32 Bit Bios------------------------------------------------------------ */
138 138
139#define HPWDT_ARCH 32 139#define HPWDT_ARCH 32
@@ -322,8 +322,9 @@ static int __devinit detect_cru_service(void)
322 iounmap(p); 322 iounmap(p);
323 return rc; 323 return rc;
324} 324}
325 325/* ------------------------------------------------------------------------- */
326#else 326#endif /* CONFIG_X86_32 */
327#ifdef CONFIG_X86_64
327/* --64 Bit Bios------------------------------------------------------------ */ 328/* --64 Bit Bios------------------------------------------------------------ */
328 329
329#define HPWDT_ARCH 64 330#define HPWDT_ARCH 64
@@ -401,10 +402,8 @@ static int __devinit detect_cru_service(void)
401 /* if cru_rom_addr has been set then we found a CRU service */ 402 /* if cru_rom_addr has been set then we found a CRU service */
402 return ((cru_rom_addr != NULL) ? 0 : -ENODEV); 403 return ((cru_rom_addr != NULL) ? 0 : -ENODEV);
403} 404}
404
405/* ------------------------------------------------------------------------- */ 405/* ------------------------------------------------------------------------- */
406 406#endif /* CONFIG_X86_64 */
407#endif
408 407
409/* 408/*
410 * Watchdog operations 409 * Watchdog operations