Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (141 commits)
  USB: mct_u232: fix broken close
  USB: gadget: amd5536udc.c: fix error path
  USB: imx21-hcd - fix off by one resource size calculation
  usb: gadget: fix Kconfig warning
  usb: r8a66597-udc: Add processing when USB was removed.
  mxc_udc: add workaround for ENGcm09152 for i.MX35
  USB: ftdi_sio: add device ids for ScienceScope
  USB: musb: AM35x: Workaround for fifo read issue
  USB: musb: add musb support for AM35x
  USB: AM35x: Add musb support
  usb: Fix linker errors with CONFIG_PM=n
  USB: ohci-sh - use resource_size instead of defining its own resource_len macro
  USB: isp1362-hcd - use resource_size instead of defining its own resource_len macro
  USB: isp116x-hcd - use resource_size instead of defining its own resource_len macro
  USB: xhci: Fix compile error when CONFIG_PM=n
  USB: accept some invalid ep0-maxpacket values
  USB: xHCI: PCI power management implementation
  USB: xHCI: bus power management implementation
  USB: xHCI: port remote wakeup implementation
  USB: xHCI: port power management implementation
  ...

Manually fix up (non-data) conflict: the SCSI merge gad renamed the
'hw_sector_size' member to 'physical_block_size', and the USB tree
brought a new use of it.

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index 64ec073e89de..00418995d8e9 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -642,7 +642,7 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
          * unless the operation involved a data-in transfer.  Devices
          * can signal most data-in errors by stalling the bulk-in pipe.
          */
-        if ((us->protocol == US_PR_CB || us->protocol == US_PR_DPCM_USB) &&
+        if ((us->protocol == USB_PR_CB || us->protocol == USB_PR_DPCM_USB) &&
                         srb->sc_data_direction != DMA_FROM_DEVICE) {
                 US_DEBUGP("-- CB transport device requiring auto-sense\n");
                 need_auto_sense = 1;
@@ -701,8 +701,8 @@ Retry_Sense:
                 scsi_eh_prep_cmnd(srb, &ses, NULL, 0, sense_size);
 
                 /* FIXME: we must do the protocol translation here */
-                if (us->subclass == US_SC_RBC || us->subclass == US_SC_SCSI ||
-                                us->subclass == US_SC_CYP_ATACB)
+                if (us->subclass == USB_SC_RBC || us->subclass == USB_SC_SCSI ||
+                                us->subclass == USB_SC_CYP_ATACB)
                         srb->cmd_len = 6;
                 else
                         srb->cmd_len = 12;
@@ -926,7 +926,7 @@ int usb_stor_CB_transport(struct scsi_cmnd *srb, struct us_data *us)
         /* NOTE: CB does not have a status stage.  Silly, I know.  So
          * we have to catch this at a higher level.
          */
-        if (us->protocol != US_PR_CBI)
+        if (us->protocol != USB_PR_CBI)
                 return USB_STOR_TRANSPORT_GOOD;
 
         result = usb_stor_intr_transfer(us, us->iobuf, 2);
@@ -942,7 +942,7 @@ int usb_stor_CB_transport(struct scsi_cmnd *srb, struct us_data *us)
          * that this means we could be ignoring a real error on these
          * commands, but that can't be helped.
          */
-        if (us->subclass == US_SC_UFI) {
+        if (us->subclass == USB_SC_UFI) {
                 if (srb->cmnd[0] == REQUEST_SENSE ||
                     srb->cmnd[0] == INQUIRY)
                         return USB_STOR_TRANSPORT_GOOD;