summaryrefslogtreecommitdiff
path: root/v4l/compat.h
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-12-08 12:49:20 +0000
committerMichael Krufky <devnull@localhost>2005-12-08 12:49:20 +0000
commit18cbeb5c0218e6ec2f9f64b3270bcd8c2b26df20 (patch)
treeaa15030d78ca6894a75b36f3399d677285d19e31 /v4l/compat.h
parent8f7f600bfe1894c7566187270b37efc04a536454 (diff)
downloadmediapointer-dvb-s2-18cbeb5c0218e6ec2f9f64b3270bcd8c2b26df20.tar.gz
mediapointer-dvb-s2-18cbeb5c0218e6ec2f9f64b3270bcd8c2b26df20.tar.bz2
Restore 2.6.15 check in compat.h for inputdev changes
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l/compat.h')
-rw-r--r--v4l/compat.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/v4l/compat.h b/v4l/compat.h
index b8204f7dc..ca0f9f5c2 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -1,5 +1,5 @@
/*
- * $Id: compat.h,v 1.38 2005/12/08 12:38:00 mkrufky Exp $
+ * $Id: compat.h,v 1.39 2005/12/08 12:49:20 mkrufky Exp $
*/
#ifndef _COMPAT_H
@@ -262,12 +262,14 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr)
#endif
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
#ifndef input_allocate_device
# 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
+#endif
#endif
/*