From e75cbf9c5b7e439b3fb60b27473ba0dc4abb6636 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@redhat.com>
Date: Mon, 19 May 2008 14:05:46 +0100
Subject: [PATCH] --- yaml --- r: 107807 b: refs/heads/master c:
 6513e2a03887c6c9bd0b30593827a01ce3f7b542 h: refs/heads/master i:   107805:
 c4d78fbb0f5e8f010c2b6a2544d0c5f5ccceb4ce   107803:
 a5872166cbea9d5f25cbd917beca576c3d004d4c   107799:
 1b139d7614fa37dce5d0c5069577be518b020e86   107791:
 b29805b8b642c3962b1ff5b223c57b8c921f555c   107775:
 b9fe7c2e79a59bae2f469e676f831c2fa73275cb v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/watchdog/hpwdt.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 652947bfed97..8002c1391d02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89ea2429873e69201173f3606ab04d751f737cc4
+refs/heads/master: 6513e2a03887c6c9bd0b30593827a01ce3f7b542
diff --git a/trunk/drivers/watchdog/hpwdt.c b/trunk/drivers/watchdog/hpwdt.c
index 6a63535fc04d..45bf66c72457 100644
--- a/trunk/drivers/watchdog/hpwdt.c
+++ b/trunk/drivers/watchdog/hpwdt.c
@@ -39,9 +39,9 @@
 #include <linux/string.h>
 #include <linux/bootmem.h>
 #include <linux/slab.h>
-#include <asm/dmi.h>
+#include <linux/dmi.h>
 #include <asm/desc.h>
-#include <asm/kdebug.h>
+#include <linux/kdebug.h>
 
 #define PCI_BIOS32_SD_VALUE		0x5F32335F	/* "_32_" */
 #define CRU_BIOS_SIGNATURE_VALUE	0x55524324