From: David Woodhouse <dwmw2@shinybook.infradead.org>
Date: Sat, 29 Apr 2006 00:48:16 +0000 (+0100)
Subject: Remove struct input_device_id from public view in linux/input.h
X-Git-Tag: v2.6.18-rc1~1103^2~30
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7afb48eb5147be9eb9789b4161462d246451ac2;p=linux-2.6

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>
---

diff --git a/include/linux/input.h b/include/linux/input.h
index b0e612dda0..f7ac97d834 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.