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: (220 commits)
  USB: backlight, appledisplay: fix incomplete registration failure handling
  USB: pl2303: remove unnecessary reset of usb_device in urbs
  USB: ftdi_sio: remove obsolete check in unthrottle
  USB: ftdi_sio: remove unused tx_bytes counter
  USB: qcaux: driver for auxiliary serial ports on Qualcomm devices
  USB: pl2303: initial TIOCGSERIAL support
  USB: option: add Longcheer/Longsung vendor ID
  USB: fix I2C API usage in ohci-pnx4008.
  USB: usbmon: mask seconds properly in text API
  USB: sisusbvga: no unnecessary GFP_ATOMIC
  USB: storage: onetouch: unnecessary GFP_ATOMIC
  USB: serial: ftdi: add CONTEC vendor and product id
  USB: remove references to port->port.count from the serial drivers
  USB: tty: Prune uses of tty_request_room in the USB layer
  USB: tty: Add a function to insert a string of characters with the same flag
  USB: don't read past config->interface[] if usb_control_msg() fails in usb_reset_configuration()
  USB: tty: kill request_room for USB ACM class
  USB: tty: sort out the request_room handling for whiteheat
  USB: storage: fix misplaced parenthesis
  USB: vstusb.c: removal of driver for Vernier Software & Technology, Inc., devices and spectrometers
  ...

1 files changed, 13 insertions, 10 deletions

diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
index 5dc2f227a0f1..7acef0234c0e 100644
--- a/include/linux/usb/musb.h
+++ b/include/linux/usb/musb.h
@@ -30,26 +30,26 @@ struct musb_hdrc_eps_bits {
 struct musb_hdrc_config {
         /* MUSB configuration-specific details */
         unsigned        multipoint:1;   /* multipoint device */
-        unsigned        dyn_fifo:1;     /* supports dynamic fifo sizing */
-        unsigned        soft_con:1;     /* soft connect required */
-        unsigned        utm_16:1;       /* utm data witdh is 16 bits */
+        unsigned        dyn_fifo:1 __deprecated; /* supports dynamic fifo sizing */
+        unsigned        soft_con:1 __deprecated; /* soft connect required */
+        unsigned        utm_16:1 __deprecated; /* utm data witdh is 16 bits */
         unsigned        big_endian:1;   /* true if CPU uses big-endian */
         unsigned        mult_bulk_tx:1; /* Tx ep required for multbulk pkts */
         unsigned        mult_bulk_rx:1; /* Rx ep required for multbulk pkts */
         unsigned        high_iso_tx:1;  /* Tx ep required for HB iso */
         unsigned        high_iso_rx:1;  /* Rx ep required for HD iso */
-        unsigned        dma:1;          /* supports DMA */
-        unsigned        vendor_req:1;   /* vendor registers required */
+        unsigned        dma:1 __deprecated; /* supports DMA */
+        unsigned        vendor_req:1 __deprecated; /* vendor registers required */
 
         u8              num_eps;        /* number of endpoints _with_ ep0 */
-        u8              dma_channels;   /* number of dma channels */
+        u8              dma_channels __deprecated; /* number of dma channels */
         u8              dyn_fifo_size;  /* dynamic size in bytes */
-        u8              vendor_ctrl;    /* vendor control reg width */
-        u8              vendor_stat;    /* vendor status reg witdh */
-        u8              dma_req_chan;   /* bitmask for required dma channels */
+        u8              vendor_ctrl __deprecated; /* vendor control reg width */
+        u8              vendor_stat __deprecated; /* vendor status reg witdh */
+        u8              dma_req_chan __deprecated; /* bitmask for required dma channels */
         u8              ram_bits;       /* ram address size */
 
-        struct musb_hdrc_eps_bits *eps_bits;
+        struct musb_hdrc_eps_bits *eps_bits __deprecated;
 #ifdef CONFIG_BLACKFIN
         /* A GPIO controlling VRSEL in Blackfin */
         unsigned int    gpio_vrsel;
@@ -76,6 +76,9 @@ struct musb_hdrc_platform_data {
         /* (HOST or OTG) msec/2 after VBUS on till power good */
         u8              potpgt;
 
+        /* (HOST or OTG) program PHY for external Vbus */
+        unsigned        extvbus:1;
+
         /* Power the device on or off */
         int             (*set_power)(int state);