summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/cx88/cx88-input.c4
-rw-r--r--v4l/versions.txt2
2 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c
index a585245df..6a3687a88 100644
--- a/linux/drivers/media/video/cx88/cx88-input.c
+++ b/linux/drivers/media/video/cx88/cx88-input.c
@@ -23,10 +23,10 @@
*/
#include <linux/init.h>
+#include <linux/hrtimer.h>
#include <linux/input.h>
#include <linux/pci.h>
#include <linux/module.h>
-#include <linux/hrtimer.h>
#include "compat.h"
#include "cx88.h"
@@ -145,7 +145,7 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
}
}
-enum hrtimer_restart cx88_ir_work(struct hrtimer *timer)
+static enum hrtimer_restart cx88_ir_work(struct hrtimer *timer)
{
unsigned long missed;
struct cx88_IR *ir = container_of(timer, struct cx88_IR, timer);
diff --git a/v4l/versions.txt b/v4l/versions.txt
index 9e23e500c..4ce31f852 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -45,6 +45,8 @@ DVB_DRX397XD
DVB_DM1105
# This driver needs print_hex_dump
DVB_FIREDTV
+# This driver needs hrtimer API
+VIDEO_CX88
[2.6.20]
#This driver requires HID_REQ_GET_REPORT