xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WATCHDOG] Merge code clean-up's from Alan Cox.

Browse Source 
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>
This commit is contained in:
Wim Van Sebroeck
2008-08-06 11:58:26 +00:00
parent 0967d61ea0 7c4be5aa8d
commit 96e2e6fafa
57 changed files with 2964 additions and 2931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/watchdog/hpwdt.c
View File

@@ -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