diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-11 11:07:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-21 18:04:09 -0400 |
commit | 01cced250722d22d99c2342979490f93ca886521 (patch) | |
tree | b29b395305836a0f3690a69173e1df2a2f0ecf4f /arch/ppc/syslib | |
parent | df47e5330b0f5decb0a5736e9a81fff49d46d151 (diff) |
[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 <galak@kernel.crashing.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/ppc/syslib')
-rw-r--r-- | arch/ppc/syslib/mpc83xx_devices.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ppc/syslib/mpc83xx_devices.c b/arch/ppc/syslib/mpc83xx_devices.c index 1af2c000fcfa..5c4932ca8e9b 100644 --- a/arch/ppc/syslib/mpc83xx_devices.c +++ b/arch/ppc/syslib/mpc83xx_devices.c | |||
@@ -186,7 +186,7 @@ struct platform_device ppc_sys_platform_devices[] = { | |||
186 | }, | 186 | }, |
187 | }, | 187 | }, |
188 | [MPC83xx_USB2_DR] = { | 188 | [MPC83xx_USB2_DR] = { |
189 | .name = "fsl-usb2-dr", | 189 | .name = "fsl-ehci", |
190 | .id = 1, | 190 | .id = 1, |
191 | .num_resources = 2, | 191 | .num_resources = 2, |
192 | .resource = (struct resource[]) { | 192 | .resource = (struct resource[]) { |
@@ -203,8 +203,8 @@ struct platform_device ppc_sys_platform_devices[] = { | |||
203 | }, | 203 | }, |
204 | }, | 204 | }, |
205 | [MPC83xx_USB2_MPH] = { | 205 | [MPC83xx_USB2_MPH] = { |
206 | .name = "fsl-usb2-mph", | 206 | .name = "fsl-ehci", |
207 | .id = 1, | 207 | .id = 2, |
208 | .num_resources = 2, | 208 | .num_resources = 2, |
209 | .resource = (struct resource[]) { | 209 | .resource = (struct resource[]) { |
210 | { | 210 | { |