Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs...

[net-next-2.6.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index f1b8afe1ad86bd609f2bb63133ca1f0840aa86d3..97bf05baade7cb4b9db4a5b76cf26255b6a67753 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -326,6 +326,7 @@ EXPORT_SYMBOL_GPL(round_jiffies_up_relative);
 
 /**
  * set_timer_slack - set the allowed slack for a timer
+ * @timer: the timer to be modified
  * @slack_hz: the amount of time (in jiffies) allowed for rounding
  *
  * Set the amount of time, in jiffies, that a certain timer has