From: Grant Likely <grant.likely@secretlab.ca>
Date: Wed, 2 Jun 2010 19:53:17 +0000 (-0600)
Subject: usb: fix ehci_hcd build failure when both generic-OF and xilinx is selected
X-Git-Tag: v2.6.35-rc2~17^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f23b2d98c11fed43c552a5dbd00c793f81a8736;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed