summaryrefslogtreecommitdiff
path: root/v4l/compat.h
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/compat.h')
-rw-r--r--v4l/compat.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/v4l/compat.h b/v4l/compat.h
index e248de834..85f179da3 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -1,5 +1,5 @@
/*
- * $Id: compat.h,v 1.40 2005/12/08 12:58:34 mkrufky Exp $
+ * $Id: compat.h,v 1.41 2005/12/08 16:06:52 mkrufky Exp $
*/
#ifndef _COMPAT_H
@@ -11,7 +11,6 @@
#include <linux/utsname.h>
#include <linux/sched.h>
#include <linux/device.h>
-#include <linux/input.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18)
# define minor(x) MINOR(x)
@@ -263,10 +262,8 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr)
#endif
#endif
-#ifndef input_allocate_device
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
# define input_allocate_device() kzalloc(sizeof(struct input_dev),GFP_KERNEL);
-#endif
-#ifndef input_free_device
# define input_free_device(input_dev) kfree(input_dev)
#endif