diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2008-08-06 11:58:26 +0000 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2008-08-06 11:58:26 +0000 |
| commit | 96e2e6fafaedd83bd899f682907e14d1eec17390 (patch) | |
| tree | 62371e739210426c1a6341b0afc5b2d933ef23ce /drivers/watchdog/hpwdt.c | |
| parent | 0967d61ea0d8e8a7826bd8949cd93dd1e829ac55 (diff) | |
| parent | 7c4be5aa8dce9ba37fdd971d5560490d9e30c270 (diff) | |
| download | op-kernel-dev-96e2e6fafaedd83bd899f682907e14d1eec17390.zip op-kernel-dev-96e2e6fafaedd83bd899f682907e14d1eec17390.tar.gz | |
[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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index ccd6c53..d20f591 100644 --- a/drivers/watchdog/hpwdt.c +++ b/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 |
