diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 16:20:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 16:20:37 -0700 |
| commit | 42fae7fb1c27d230fbd48aa055a4ae6796fb0039 (patch) | |
| tree | 94836c3535cf7e972cdc2ea65598fa2182b20fa3 /kernel/hrtimer.c | |
| parent | f00546363fff1576ceddc2690d47e5f9c1dd2e05 (diff) | |
| parent | b8b8fd2dc23725fba77f66b3fef11b11f983fc08 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: Fix networking compilation errors
[AF_RXRPC/AFS]: Arch-specific fixes.
[AFS]: Fix VLocation record update wakeup
[NET]: Revert sk_buff walker cleanups.
Diffstat (limited to 'kernel/hrtimer.c')
| -rw-r--r-- | kernel/hrtimer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index f5cfde8c902..1b3033105b4 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -279,6 +279,8 @@ ktime_t ktime_add_ns(const ktime_t kt, u64 nsec) return ktime_add(kt, tmp); } + +EXPORT_SYMBOL_GPL(ktime_add_ns); # endif /* !CONFIG_KTIME_SCALAR */ /* |