Grant Likely 1f23b2d98c 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>		2010-06-04 13:16:19 -07:00
..
accessibility	…
acpi	Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6	2010-05-28 16:14:17 -07:00
amba	…
ata	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2010-06-03 15:48:15 -07:00
atm	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
auxdisplay	auxdisplay: section cleanup in cfag12864bfb driver	2010-05-25 08:07:09 -07:00
base	topology: convert cpu notifier to return encapsulate errno value	2010-05-27 09:12:48 -07:00
block	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-06-03 15:46:37 -07:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
cdrom	…
char	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-06-03 15:46:37 -07:00
clocksource	…
connector	…
cpufreq	…
cpuidle	Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6	2010-05-28 16:14:17 -07:00
crypto	crypto: crypto4xx - Fix build breakage	2010-06-03 16:57:24 +10:00
dca	…
dio	…
dma	of/dma: fix build breakage in ppc4xx adma driver	2010-06-02 21:02:39 -06:00
edac	of/edac: fix build breakage in drivers	2010-06-02 21:02:41 -06:00
eisa	…
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2010-05-27 10:22:06 -07:00
firmware	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
gpio	gpio: Fix inverted rdc321x gpio data out registers	2010-05-28 01:37:59 +02:00
gpu	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-06-03 07:19:45 -07:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-05-27 09:19:55 -07:00
hwmon	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
i2c	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
ide	powerpc/macio: Fix probing of macio devices by using the right of match table	2010-06-02 17:50:38 +10:00
idle	intel_idle: native hardware cpuidle driver for latest Intel processors	2010-05-28 14:26:20 -04:00
ieee1394	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2010-05-27 10:22:06 -07:00
ieee802154	…
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2010-05-30 09:12:16 -07:00
input	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
isdn	drivers/isdn/hardware/mISDN: Use GFP_ATOMIC when a lock is held	2010-06-01 00:26:06 -07:00
leds	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
lguest	…
macintosh	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-06-03 15:46:37 -07:00
mca	…
md	md: convert cpu notifier to return encapsulate errno value	2010-05-27 09:12:48 -07:00
media	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
memstick	…
message	drivers/message/i2o/i2o_config.c: use memdup_user	2010-05-27 09:12:41 -07:00
mfd	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
misc	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
mmc	drivers/mmc/host: use ERR_CAST	2010-05-27 09:12:40 -07:00
mtd	Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2010-06-03 15:44:43 -07:00
net	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-06-03 15:46:37 -07:00
nubus	…
of	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
oprofile	…
parisc	…
parport	m68k: amiga - Parallel port platform device conversion	2010-05-26 19:51:09 +02:00
pci	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-05-28 14:42:18 -07:00
pcmcia	of/pcmcia: m8xx_pcmcia.c: Fix build failures	2010-06-02 21:02:38 -06:00
platform	intel_scu_ipc: Length fix	2010-06-01 08:40:47 -07:00
pnp	…
power	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
pps	…
ps3	…
rapidio	rapidio: fix new kernel-doc warnings	2010-05-30 09:02:47 -07:00
regulator	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
rtc	Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2010-06-03 15:44:43 -07:00
s390	[S390] dasd: unit check handling during internal cio I/O	2010-05-26 23:27:09 +02:00
sbus	Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing	2010-05-24 08:01:10 -07:00
scsi	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2010-06-03 15:48:15 -07:00
serial	powerpc/macio: Fix probing of macio devices by using the right of match table	2010-06-02 17:50:38 +10:00
sfi	SFI: add sysfs interface for SFI tables.	2010-05-27 12:46:20 -04:00
sh	…
sn	…
spi	of/spi: mpc512x_psc_spi.c: Fix build failures	2010-06-02 13:45:06 -06:00
ssb	ssb: fix NULL ptr deref when pcihost_wrapper is used	2010-05-28 13:57:01 -04:00
staging	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
tc	…
telephony	drivers/telephony/ixj.c: use memdup_user	2010-05-27 09:12:42 -07:00
thermal	…
uio	…
usb	usb: fix ehci_hcd build failure when both generic-OF and xilinx is selected	2010-06-04 13:16:19 -07:00
uwb	…
vhost	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-28 10:18:40 -07:00
video	Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2010-06-03 15:44:43 -07:00
virtio	Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	2010-05-21 17:22:52 -07:00
vlynq	…
w1	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
watchdog	of/watchdog: gef_wdt.c: fix build breakage	2010-06-02 21:02:41 -06:00
xen	xen: avoid allocation causing potential swap activity on the resume path	2010-06-03 09:34:45 +01:00
zorro	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
Kconfig	…
Makefile	intel_idle: native hardware cpuidle driver for latest Intel processors	2010-05-28 14:26:20 -04:00