Commit c9daeae6 authored by Adam Kropelin's avatar Adam Kropelin Committed by Linus Torvalds

[PATCH] input: Eliminate hiddev.h dependency on hid.h

hiddev.h needs hid.h but doesn't include it.  Since hid.h is private anyway
just eliminate the need for it it in the first place.
Signed-off-by: default avatarAdam Kropelin <akropel1@rochester.rr.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 38a3d44d
...@@ -128,10 +128,11 @@ struct hiddev_usage_ref { ...@@ -128,10 +128,11 @@ struct hiddev_usage_ref {
/* hiddev_usage_ref_multi is used for sending multiple bytes to a control. /* hiddev_usage_ref_multi is used for sending multiple bytes to a control.
* It really manifests itself as setting the value of consecutive usages */ * It really manifests itself as setting the value of consecutive usages */
#define HID_MAX_MULTI_USAGES 1024
struct hiddev_usage_ref_multi { struct hiddev_usage_ref_multi {
struct hiddev_usage_ref uref; struct hiddev_usage_ref uref;
__u32 num_values; __u32 num_values;
__s32 values[HID_MAX_USAGES]; __s32 values[HID_MAX_MULTI_USAGES];
}; };
/* FIELD_INDEX_NONE is returned in read() data from the kernel when flags /* FIELD_INDEX_NONE is returned in read() data from the kernel when flags
...@@ -212,6 +213,11 @@ struct hiddev_usage_ref_multi { ...@@ -212,6 +213,11 @@ struct hiddev_usage_ref_multi {
* In-kernel definitions. * In-kernel definitions.
*/ */
struct hid_device;
struct hid_usage;
struct hid_field;
struct hid_report;
#ifdef CONFIG_USB_HIDDEV #ifdef CONFIG_USB_HIDDEV
int hiddev_connect(struct hid_device *); int hiddev_connect(struct hid_device *);
void hiddev_disconnect(struct hid_device *); void hiddev_disconnect(struct hid_device *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment