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

This commit is contained in:
Linus Torvalds 2005-09-14 15:27:39 -07:00
commit b75cdf388e
2 changed files with 18 additions and 0 deletions

View File

@ -30,6 +30,8 @@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/device.h>
#include <asm/hardware/arm_twd.h>
#include <asm/uaccess.h>
struct mpcore_wdt {

View File

@ -0,0 +1,16 @@
#ifndef __ASM_HARDWARE_TWD_H
#define __ASM_HARDWARE_TWD_H
#define TWD_TIMER_LOAD 0x00
#define TWD_TIMER_COUNTER 0x04
#define TWD_TIMER_CONTROL 0x08
#define TWD_TIMER_INTSTAT 0x0C
#define TWD_WDOG_LOAD 0x20
#define TWD_WDOG_COUNTER 0x24
#define TWD_WDOG_CONTROL 0x28
#define TWD_WDOG_INTSTAT 0x2C
#define TWD_WDOG_RESETSTAT 0x30
#define TWD_WDOG_DISABLE 0x34
#endif