usb: remove code associated with !CONFIG_PPC_MERGE
authorKumar Gala <galak@kernel.crashing.org>
Mon, 22 Sep 2008 22:00:07 +0000 (15:00 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 17 Oct 2008 21:40:57 +0000 (14:40 -0700)
commitcede969fe21adece300300a455580635590deb47
treea64ccf0720b7fc7be743f9b07c676b9b7fd058c2
parentbb4e3b5ac81a9601775e62649038934acafa78e2
usb: remove code associated with !CONFIG_PPC_MERGE

Now that arch/ppc is gone we don't need CONFIG_PPC_MERGE anymore remove
the dead code associated with !CONFIG_PPC_MERGE.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-ppc-soc.c [deleted file]
drivers/usb/host/ehci.h
drivers/usb/host/ohci.h