tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp

Linus Torvalds b75cdf38 881787a7

+18
unified split
+2
drivers/char/watchdog/mpcore_wdt.c
··· 30 30 #include <linux/init.h> 31 31 #include <linux/interrupt.h> 32 32 #include <linux/device.h> 33 + 34 + #include <asm/hardware/arm_twd.h> 33 35 #include <asm/uaccess.h> 34 36 35 37 struct mpcore_wdt {
+16
include/asm-arm/hardware/arm_twd.h
··· 1 + #ifndef __ASM_HARDWARE_TWD_H 2 + #define __ASM_HARDWARE_TWD_H 3 + 4 + #define TWD_TIMER_LOAD 0x00 5 + #define TWD_TIMER_COUNTER 0x04 6 + #define TWD_TIMER_CONTROL 0x08 7 + #define TWD_TIMER_INTSTAT 0x0C 8 + 9 + #define TWD_WDOG_LOAD 0x20 10 + #define TWD_WDOG_COUNTER 0x24 11 + #define TWD_WDOG_CONTROL 0x28 12 + #define TWD_WDOG_INTSTAT 0x2C 13 + #define TWD_WDOG_RESETSTAT 0x30 14 + #define TWD_WDOG_DISABLE 0x34 15 + 16 + #endif