summaryrefslogtreecommitdiff
path: root/v4l_experimental/pvrusb2/pvrusb2-sysfs.c
diff options
context:
space:
mode:
authorMike Isely <devnull@localhost>2006-01-22 03:51:19 +0000
committerMike Isely <devnull@localhost>2006-01-22 03:51:19 +0000
commite9b2a80a0b77053b342d767697d029baf8438914 (patch)
treece5699bb53a098fadc2e87beacd67bb624a975de /v4l_experimental/pvrusb2/pvrusb2-sysfs.c
parentf7dc519c44e0bf5144047d10be443c4ac73bf475 (diff)
downloadmediapointer-dvb-s2-e9b2a80a0b77053b342d767697d029baf8438914.tar.gz
mediapointer-dvb-s2-e9b2a80a0b77053b342d767697d029baf8438914.tar.bz2
Various fixes to permit pvrusb2 compilation w/ kernel 2.6.16
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'v4l_experimental/pvrusb2/pvrusb2-sysfs.c')
-rw-r--r--v4l_experimental/pvrusb2/pvrusb2-sysfs.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/v4l_experimental/pvrusb2/pvrusb2-sysfs.c b/v4l_experimental/pvrusb2/pvrusb2-sysfs.c
index 42e012d96..7d17ee749 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-sysfs.c
+++ b/v4l_experimental/pvrusb2/pvrusb2-sysfs.c
@@ -1,6 +1,6 @@
/*
*
- * $Id: pvrusb2-sysfs.c,v 1.1 2005/11/14 13:31:24 mchehab Exp $
+ * $Id: pvrusb2-sysfs.c,v 1.2 2006/01/22 03:51:19 mcisely Exp $
*
* Copyright (C) 2005 Mike Isely <isely@pobox.com>
*
@@ -22,6 +22,7 @@
#include <linux/string.h>
#include <linux/slab.h>
#include <asm/semaphore.h>
+#include "compat.h"
#include "pvrusb2-sysfs.h"
#include "pvrusb2-hdw.h"
#include "pvrusb2-debug.h"
@@ -739,7 +740,11 @@ struct pvr2_sysfs_class *pvr2_sysfs_class_create(void)
clp->class.name = "pvrusb2";
clp->class.class_release = pvr2_sysfs_class_release;
clp->class.release = pvr2_sysfs_release;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
clp->class.hotplug = pvr2_sysfs_hotplug;
+#else
+ clp->class.uevent = pvr2_sysfs_hotplug;
+#endif
if (class_register(&clp->class)) {
pvr2_sysfs_trace(
"Registration failed for pvr2_sysfs_class id=%p",clp);