Index: linux-omap-2.6-dev/include/linux/usb.h
===================================================================
--- linux-omap-2.6-dev.orig/include/linux/usb.h	2006-10-31 14:16:01.000000000 -0400
+++ linux-omap-2.6-dev/include/linux/usb.h	2006-10-31 15:48:43.000000000 -0400
@@ -381,13 +381,13 @@ struct usb_device {
 	struct usb_device *children[USB_MAXCHILDREN];
 
 	int pm_usage_cnt;		/* usage counter for autosuspend */
-#ifdef CONFIG_PM
+/* #ifdef CONFIG_PM */
 	struct work_struct autosuspend;	/* for delayed autosuspends */
 	struct mutex pm_mutex;		/* protects PM operations */
 
 	unsigned auto_pm:1;		/* autosuspend/resume in progress */
 	unsigned do_remote_wakeup:1;	/* remote wakeup should be enabled */
-#endif
+/* #endif */
 };
 #define	to_usb_device(d) container_of(d, struct usb_device, dev)