summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2006-04-29 01:48:16 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-04-29 01:48:16 +0100
commitc7afb48eb5147be9eb9789b4161462d246451ac2 (patch)
tree1313cde51b5bfe91464bd944e3512a6d83cd7d3a
parent778382e08cce51b6268ca49449e5bd70c8413799 (diff)
downloadop-kernel-dev-c7afb48eb5147be9eb9789b4161462d246451ac2.zip
op-kernel-dev-c7afb48eb5147be9eb9789b4161462d246451ac2.tar.gz
Remove struct input_device_id from public view in linux/input.h
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>
-rw-r--r--include/linux/input.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h
index b0e612d..f7ac97d 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -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.
OpenPOWER on IntegriCloud