Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

[mv-sheeva.git] / drivers / usb / input / usbhid.h

diff --git a/drivers/usb/input/usbhid.h b/drivers/usb/input/usbhid.h
index 830107e5251f7b5ce7ee9268c323258b1ea7a955..0023f96d4294f1d3e6acc05627e4133d899b8b85 100644 (file)
--- a/drivers/usb/input/usbhid.h
+++ b/drivers/usb/input/usbhid.h
@@ -80,5 +80,8 @@ struct usbhid_device {
 
 };
 
+#define        hid_to_usb_dev(hid_dev) \
+       container_of(hid_dev->dev->parent, struct usb_device, dev)
+
 #endif