diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
| commit | bef986502fa398b1785a3979b1aa17cd902d3527 (patch) | |
| tree | b59c1afe7b1dfcc001b86e54863f550d7ddc8c34 /include/net/irda/timer.h | |
| parent | 4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c (diff) | |
| parent | c99767974ebd2a719d849fdeaaa1674456f5283f (diff) | |
| download | kernel-crypto-bef986502fa398b1785a3979b1aa17cd902d3527.tar.gz kernel-crypto-bef986502fa398b1785a3979b1aa17cd902d3527.tar.xz kernel-crypto-bef986502fa398b1785a3979b1aa17cd902d3527.zip | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/hid.h
Diffstat (limited to 'include/net/irda/timer.h')
| -rw-r--r-- | include/net/irda/timer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/irda/timer.h b/include/net/irda/timer.h index 2c5d8864ab7..cb61568547d 100644 --- a/include/net/irda/timer.h +++ b/include/net/irda/timer.h @@ -28,6 +28,7 @@ #define TIMER_H #include <linux/timer.h> +#include <linux/jiffies.h> #include <asm/param.h> /* for HZ */ |