Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / include / linux / hidraw.h

diff --git a/include/linux/hidraw.h b/include/linux/hidraw.h
index 6676cd5..dd8d692 100644 (file)
--- a/include/linux/hidraw.h
+++ b/include/linux/hidraw.h
@@ -15,9 +15,12 @@
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <linux/hid.h>
+#include <linux/types.h>
+
 struct hidraw_report_descriptor {
        __u32 size;
-       __u8 *value;
+       __u8 value[HID_MAX_DESCRIPTOR_SIZE];
 };
 
 struct hidraw_devinfo {
@@ -30,6 +33,8 @@ struct hidraw_devinfo {
 #define HIDIOCGRDESCSIZE       _IOR('H', 0x01, int)
 #define HIDIOCGRDESC           _IOR('H', 0x02, struct hidraw_report_descriptor)
 #define HIDIOCGRAWINFO         _IOR('H', 0x03, struct hidraw_devinfo)
+#define HIDIOCGRAWNAME(len)     _IOC(_IOC_READ, 'H', 0x04, len)
+#define HIDIOCGRAWPHYS(len)     _IOC(_IOC_READ, 'H', 0x05, len)
 
 #define HIDRAW_FIRST_MINOR 0
 #define HIDRAW_MAX_DEVICES 64
@@ -40,8 +45,6 @@ struct hidraw_devinfo {
 /* kernel-only API declarations */
 #ifdef __KERNEL__
 
-#include <linux/hid.h>
-
 struct hidraw {
        unsigned int minor;
        int exist;