From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Sat, 2 Dec 2006 00:41:58 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
X-Git-Tag: v2.6.20-rc2~6^2~13^2~477
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9641219825a54249d77d7aa1afa7d874a05c7f90;p=linux-2.6-omap-h63xx.git

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

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (103 commits)
  usbcore: remove unused argument in autosuspend
  USB: keep count of unsuspended children
  USB hub: simplify remote-wakeup handling
  USB: struct usb_device: change flag to bitflag
  OHCI: make autostop conditional on CONFIG_PM
  USB: Add autosuspend support to the hub driver
  EHCI: Fix root-hub and port suspend/resume problems
  USB: create a new thread for every USB device found during the probe sequence
  USB: add driver for the USB debug devices
  USB: added dynamic major number for USB endpoints
  USB: pegasus error path not resetting task's state
  USB: endianness fix for asix.c
  USB: build the appledisplay driver
  USB serial: replace kmalloc+memset with kzalloc
  USB: hid-core: canonical defines for Apple USB device IDs
  USB: idmouse cleanup
  USB: make drivers/usb/core/driver.c:usb_device_match() static
  USB: lh7a40x_udc remove double declaration
  USB: pxa2xx_udc recognizes ixp425 rev b0 chip
  usbtouchscreen: add support for DMC TSC-10/25 devices
  ...
---

9641219825a54249d77d7aa1afa7d874a05c7f90
diff --cc drivers/usb/host/u132-hcd.c
index a00d1595656,87106085a98..ef54e310bfc
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@@ -205,13 -205,9 +205,9 @@@ struct u132 
          struct u132_port port[MAX_U132_PORTS];
          struct u132_endp *endp[MAX_U132_ENDPS];
  };
- int usb_ftdi_elan_read_reg(struct platform_device *pdev, u32 *data);
- int usb_ftdi_elan_read_pcimem(struct platform_device *pdev, u8 addressofs,
-         u8 width, u32 *data);
- int usb_ftdi_elan_write_pcimem(struct platform_device *pdev, u8 addressofs,
-         u8 width, u32 data);
+ 
  /*
 -* these can not be inlines because we need the structure offset!!
 +* these cannot be inlines because we need the structure offset!!
  * Does anyone have a better way?????
  */
  #define u132_read_pcimem(u132, member, data) \