diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/mips/include/asm/mach-excite/rm9k_wdt.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/mips/include/asm/mach-excite/rm9k_wdt.h')
| -rw-r--r-- | arch/mips/include/asm/mach-excite/rm9k_wdt.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mach-excite/rm9k_wdt.h b/arch/mips/include/asm/mach-excite/rm9k_wdt.h new file mode 100644 index 000000000000..3fa3c08d2da7 --- /dev/null +++ b/arch/mips/include/asm/mach-excite/rm9k_wdt.h | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | #ifndef __RM9K_WDT_H__ | ||
| 2 | #define __RM9K_WDT_H__ | ||
| 3 | |||
| 4 | /* Device name */ | ||
| 5 | #define WDT_NAME "wdt_gpi" | ||
| 6 | |||
| 7 | /* Resource names */ | ||
| 8 | #define WDT_RESOURCE_REGS "excite_watchdog_regs" | ||
| 9 | #define WDT_RESOURCE_IRQ "excite_watchdog_irq" | ||
| 10 | #define WDT_RESOURCE_COUNTER "excite_watchdog_counter" | ||
| 11 | |||
| 12 | #endif /* __RM9K_WDT_H__ */ | ||