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: (120 commits)
  usb: don't update devnum for wusb devices
  wusb: make ep0_reinit available for modules
  wusb: devices dont use a set address
  wusb: teach choose_address() about wireless devices
  wusb: add link wusb-usb device
  wusb: add authenticathed bit to usb_dev
  USB: remove unnecessary type casting of urb->context
  usb serial: more fixes and groundwork for tty changes
  USB: replace remaining __FUNCTION__ occurrences
  USB: usbfs: export the URB_NO_INTERRUPT flag to userspace
  USB: fix compile problems in ehci-hcd
  USB: ehci: qh_completions cleanup and bugfix
  USB: cdc-acm: signedness fix
  USB: add documentation about callbacks
  USB: don't explicitly reenable root-hub status interrupts
  USB: OHCI: turn off RD when remote wakeup is disabled
  USB: HCDs use the do_remote_wakeup flag
  USB: g_file_storage: ignore bulk-out data after invalid CBW
  USB: serial: remove endpoints setting checks from core and header
  USB: serial: remove unneeded number endpoints settings
  ...

1 files changed, 0 insertions, 16 deletions

diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index 74ce8bca3e66..8d6ed0293bfa 100644
--- a/drivers/usb/serial/keyspan.h
+++ b/drivers/usb/serial/keyspan.h
@@ -636,10 +636,6 @@ static struct usb_serial_driver keyspan_pre_device = {
         },
         .description            = "Keyspan - (without firmware)",
         .id_table               = keyspan_pre_ids,
-        .num_interrupt_in       = NUM_DONT_CARE,
-        .num_interrupt_out      = NUM_DONT_CARE,
-        .num_bulk_in            = NUM_DONT_CARE,
-        .num_bulk_out           = NUM_DONT_CARE,
         .num_ports              = 1,
         .attach                 = keyspan_fake_startup,
 };
@@ -651,10 +647,6 @@ static struct usb_serial_driver keyspan_1port_device = {
         },
         .description            = "Keyspan 1 port adapter",
         .id_table               = keyspan_1port_ids,
-        .num_interrupt_in       = NUM_DONT_CARE,
-        .num_interrupt_out      = NUM_DONT_CARE,
-        .num_bulk_in            = NUM_DONT_CARE,
-        .num_bulk_out           = NUM_DONT_CARE,
         .num_ports              = 1,
         .open                   = keyspan_open,
         .close                  = keyspan_close,
@@ -679,10 +671,6 @@ static struct usb_serial_driver keyspan_2port_device = {
         },
         .description            = "Keyspan 2 port adapter",
         .id_table               = keyspan_2port_ids,
-        .num_interrupt_in       = NUM_DONT_CARE,
-        .num_interrupt_out      = NUM_DONT_CARE,
-        .num_bulk_in            = NUM_DONT_CARE,
-        .num_bulk_out           = NUM_DONT_CARE,
         .num_ports              = 2,
         .open                   = keyspan_open,
         .close                  = keyspan_close,
@@ -707,10 +695,6 @@ static struct usb_serial_driver keyspan_4port_device = {
         },
         .description            = "Keyspan 4 port adapter",
         .id_table               = keyspan_4port_ids,
-        .num_interrupt_in       = NUM_DONT_CARE,
-        .num_interrupt_out      = NUM_DONT_CARE,
-        .num_bulk_in            = NUM_DONT_CARE,
-        .num_bulk_out           = NUM_DONT_CARE,
         .num_ports              = 4,
         .open                   = keyspan_open,
         .close                  = keyspan_close,