diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-25 11:57:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-25 11:57:32 -0400 |
| commit | bbe5d235ee201705530a7153b57e141cd77d818b (patch) | |
| tree | e98c31b4cb2ced6357a87a02596f9ecdbd6dbb26 /include/linux/timer.h | |
| parent | 189acaaef81b1d71aedd0d28810de24160c2e781 (diff) | |
| parent | dfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/linux/timer.h')
| -rw-r--r-- | include/linux/timer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index 0a485beba9f5..c982304dbafd 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _LINUX_TIMER_H | 1 | #ifndef _LINUX_TIMER_H |
| 2 | #define _LINUX_TIMER_H | 2 | #define _LINUX_TIMER_H |
| 3 | 3 | ||
| 4 | #include <linux/config.h> | ||
| 5 | #include <linux/list.h> | 4 | #include <linux/list.h> |
| 6 | #include <linux/spinlock.h> | 5 | #include <linux/spinlock.h> |
| 7 | #include <linux/stddef.h> | 6 | #include <linux/stddef.h> |