[PATCH] USB: allow multiple types of EHCI controllers to be built as modules

In some systems we may have both a platform EHCI controller and PCI EHCI
controller.  Previously we couldn't build the EHCI support as a module due
to conflicting module_init() calls in the code.

Signed-off-by: Kumar Gala <[email protected]>
Signed-off-by: David Brownell <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Kumar Gala 2006-04-11 10:07:16 -05:00 • committed by Greg Kroah-Hartman
commit 01cced2507
6 changed files with 78 additions and 116 deletions

View file

@ -186,7 +186,7 @@ struct platform_device ppc_sys_platform_devices[] = {
},
},
[MPC83xx_USB2_DR] = {
.name = "fsl-usb2-dr",
.name = "fsl-ehci",
.id = 1,
.num_resources = 2,
.resource = (struct resource[]) {
@ -203,8 +203,8 @@ struct platform_device ppc_sys_platform_devices[] = {
},
},
[MPC83xx_USB2_MPH] = {
.name = "fsl-usb2-mph",
.id = 1,
.name = "fsl-ehci",
.id = 2,
.num_resources = 2,
.resource = (struct resource[]) {
{