Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b75cdf38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 881787a7 f6af5da3

drivers/char/watchdog/mpcore_wdt.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include <linux/init.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/device.h>

#include <linux/device.h>



#include <asm/hardware/arm_twd.h>

#include <asm/uaccess.h>

#include <asm/uaccess.h>





struct mpcore_wdt {

struct mpcore_wdt {

include/asm-arm/hardware/arm_twd.h

0 → 100644
+16 −0
Original line number Original line Diff line number Diff line 
#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