]> err.no Git - linux-2.6/commitdiff
Remove struct input_device_id from public view in linux/input.h
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>
Sat, 29 Apr 2006 00:48:16 +0000 (01:48 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Sat, 29 Apr 2006 00:48:16 +0000 (01:48 +0100)
It uses kernel_ulong_t but can't be wrapped in __KERNEL__ because it's
used from scripts/mod/file2alias.c -- but we _can_ hide it inside
header manually too (and it doesn't generally exist for userspace).

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
include/linux/input.h

index b0e612dda0cf2887e364f95010f136d87be2fdcd..f7ac97d834f611014c7527ec9a0d3203c8fb525c 100644 (file)
@@ -805,6 +805,9 @@ struct ff_effect {
 
 #define FF_MAX         0x7f
 
+#ifdef LINUX_MOD_DEVICETABLE_H
+/* We only want this if mod_devicetable.h has been included -- that's
+   either in kernel space, or in scripts/mod/file2alias.c */
 struct input_device_id {
 
        kernel_ulong_t flags;
@@ -823,6 +826,7 @@ struct input_device_id {
 
        kernel_ulong_t driver_info;
 };
+#endif 
 
 /*
  * Structure for hotplug & device<->driver matching.