git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-sh
/
watchdog.h
diff --git
a/include/asm-sh/watchdog.h
b/include/asm-sh/watchdog.h
index
ff05517
..
d19ea62
100644
(file)
--- a/
include/asm-sh/watchdog.h
+++ b/
include/asm-sh/watchdog.h
@@
-10,9
+10,9
@@
*/
#ifndef __ASM_SH_WATCHDOG_H
#define __ASM_SH_WATCHDOG_H
*/
#ifndef __ASM_SH_WATCHDOG_H
#define __ASM_SH_WATCHDOG_H
+#ifdef __KERNEL__
#include <linux/types.h>
#include <linux/types.h>
-#include <linux/config.h>
#include <asm/cpu/watchdog.h>
#include <asm/io.h>
#include <asm/cpu/watchdog.h>
#include <asm/io.h>
@@
-62,7
+62,6
@@
/**
* sh_wdt_read_cnt - Read from Counter
/**
* sh_wdt_read_cnt - Read from Counter
- *
* Reads back the WTCNT value.
*/
static inline __u8 sh_wdt_read_cnt(void)
* Reads back the WTCNT value.
*/
static inline __u8 sh_wdt_read_cnt(void)
@@
-72,7
+71,6
@@
static inline __u8 sh_wdt_read_cnt(void)
/**
* sh_wdt_write_cnt - Write to Counter
/**
* sh_wdt_write_cnt - Write to Counter
- *
* @val: Value to write
*
* Writes the given value @val to the lower byte of the timer counter.
* @val: Value to write
*
* Writes the given value @val to the lower byte of the timer counter.
@@
-95,7
+93,6
@@
static inline __u8 sh_wdt_read_csr(void)
/**
* sh_wdt_write_csr - Write to Control/Status Register
/**
* sh_wdt_write_csr - Write to Control/Status Register
- *
* @val: Value to write
*
* Writes the given value @val to the lower byte of the control/status
* @val: Value to write
*
* Writes the given value @val to the lower byte of the control/status
@@
-106,5
+103,5
@@
static inline void sh_wdt_write_csr(__u8 val)
ctrl_outw((WTCSR_HIGH << 8) | (__u16)val, WTCSR);
}
ctrl_outw((WTCSR_HIGH << 8) | (__u16)val, WTCSR);
}
+#endif /* __KERNEL__ */
#endif /* __ASM_SH_WATCHDOG_H */
#endif /* __ASM_SH_WATCHDOG_H */
-