aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/hpwdt.c
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2008-08-06 07:58:26 -0400
committerWim Van Sebroeck <wim@iguana.be>2008-08-06 07:58:26 -0400
commit96e2e6fafaedd83bd899f682907e14d1eec17390 (patch)
tree62371e739210426c1a6341b0afc5b2d933ef23ce /drivers/watchdog/hpwdt.c
parent0967d61ea0d8e8a7826bd8949cd93dd1e829ac55 (diff)
parent7c4be5aa8dce9ba37fdd971d5560490d9e30c270 (diff)
[WATCHDOG] Merge code clean-up's from Alan Cox.
Merge branch 'alan' of ../linux-2.6-watchdog-mm Fixed Conflicts in the following files: drivers/watchdog/booke_wdt.c drivers/watchdog/mpc5200_wdt.c drivers/watchdog/sc1200wdt.c Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/hpwdt.c')
-rw-r--r--drivers/watchdog/hpwdt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index ccd6c530782d..d20f591e3fd7 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -39,9 +39,9 @@
39#include <linux/string.h> 39#include <linux/string.h>
40#include <linux/bootmem.h> 40#include <linux/bootmem.h>
41#include <linux/slab.h> 41#include <linux/slab.h>
42#include <asm/dmi.h> 42#include <linux/dmi.h>
43#include <asm/desc.h> 43#include <asm/desc.h>
44#include <asm/kdebug.h> 44#include <linux/kdebug.h>
45 45
46#define PCI_BIOS32_SD_VALUE 0x5F32335F /* "_32_" */ 46#define PCI_BIOS32_SD_VALUE 0x5F32335F /* "_32_" */
47#define CRU_BIOS_SIGNATURE_VALUE 0x55524324 47#define CRU_BIOS_SIGNATURE_VALUE 0x55524324