From 9d90337a5d03ced22e45a06e7648f55fcfb3eaa2 Mon Sep 17 00:00:00 2001
From: Michael Krufky <devnull@localhost>
Date: Thu, 8 Dec 2005 16:06:52 +0000
Subject: Revert my changes from this morning.  I was wrong :-(

        - Revert my changes from this morning.  I was wrong :-(
	  Thanks to Laurent Pinchart <laurent.pinchart@skynet.be>
          for pointing out my error.

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
---
 v4l/compat.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'v4l/compat.h')

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
 
-- 
cgit v1.2.3