usb: fix ehci_hcd build failure when both generic-OF and xilinx is selected
authorGrant Likely <grant.likely@secretlab.ca>
Wed, 2 Jun 2010 19:53:17 +0000 (13:53 -0600)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 4 Jun 2010 20:16:19 +0000 (13:16 -0700)
commit1f23b2d98c11fed43c552a5dbd00c793f81a8736
tree11d233a99aa818b424255a5a6bfd0f9bc06b06f7
parentc2572b78aa0447244a38e555ebb1b3b48a0088a5
usb: fix ehci_hcd build failure when both generic-OF and xilinx is selected

This patch fixes the driver to allow both CONFIG_USB_EHCI_HCD_PPC_OF and
CONFIG_USB_ECHI_HCD_XILINX to be selected.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
CC: John Linn <john.linn@xilinx.com>
CC: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/host/ehci-hcd.c