summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/comedi_compat32.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-07-17 15:11:59 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2009-07-17 15:11:59 +1000
commit20d33e3fc805abbcb91b56635bfdef4cf0b3c825 (patch)
tree20c88f614952260d98d58b4dedd0e3d919d0c846 /drivers/staging/comedi/comedi_compat32.h
parent829107595357a4311d188524df7b991f9b35ba92 (diff)
parent0b382ad56e48ee9d06aaba92257a6823a9bf6d89 (diff)
Merge branch 'quilt/staging'
Diffstat (limited to 'drivers/staging/comedi/comedi_compat32.h')
-rw-r--r--drivers/staging/comedi/comedi_compat32.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/comedi/comedi_compat32.h b/drivers/staging/comedi/comedi_compat32.h
index 0ca01642c165..fd0f8a3125a1 100644
--- a/drivers/staging/comedi/comedi_compat32.h
+++ b/drivers/staging/comedi/comedi_compat32.h
@@ -28,14 +28,14 @@
#define _COMEDI_COMPAT32_H
#include <linux/compat.h>
-#include <linux/fs.h> /* For HAVE_COMPAT_IOCTL and HAVE_UNLOCKED_IOCTL */
+#include <linux/fs.h> /* For HAVE_COMPAT_IOCTL and HAVE_UNLOCKED_IOCTL */
#ifdef CONFIG_COMPAT
#ifdef HAVE_COMPAT_IOCTL
extern long comedi_compat_ioctl(struct file *file, unsigned int cmd,
- unsigned long arg);
+ unsigned long arg);
#define comedi_register_ioctl32() do {} while (0)
#define comedi_unregister_ioctl32() do {} while (0)