diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-28 15:33:03 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-28 15:33:03 -0700 |
commit | bd8936632475665bfd90c1180c9c1301ee838db8 (patch) | |
tree | aa4b396932957d72300dadb080566df5ce4d14c1 /arch/powerpc/platforms/83xx/usb.c | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (diff) | |
parent | [POWERPC] mpc8349emitx.dts: Setup USB-DR for peripheral mode. (diff) | |
download | linux-dev-bd8936632475665bfd90c1180c9c1301ee838db8.tar.xz linux-dev-bd8936632475665bfd90c1180c9c1301ee838db8.zip |
Merge branch 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
* 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
[POWERPC] mpc8349emitx.dts: Setup USB-DR for peripheral mode.
[POWERPC] Fix mpc834x USB-MPH configuration.
[POWERPC] Fix cpm_uart driver for cpm1 machines
[PPC] Fix cpm_dpram_addr returning phys mem instead of virt mem
[POWERPC] Fix copy'n'paste typo in commproc.c
Diffstat (limited to 'arch/powerpc/platforms/83xx/usb.c')
-rw-r--r-- | arch/powerpc/platforms/83xx/usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/83xx/usb.c b/arch/powerpc/platforms/83xx/usb.c index e7fdf013cd39..eafe7605cdac 100644 --- a/arch/powerpc/platforms/83xx/usb.c +++ b/arch/powerpc/platforms/83xx/usb.c @@ -76,14 +76,14 @@ int mpc834x_usb_cfg(void) if (port0_is_dr) printk(KERN_WARNING "834x USB port0 can't be used by both DR and MPH!\n"); - sicrl |= MPC834X_SICRL_USB0; + sicrl &= ~MPC834X_SICRL_USB0; } prop = of_get_property(np, "port1", NULL); if (prop) { if (port1_is_dr) printk(KERN_WARNING "834x USB port1 can't be used by both DR and MPH!\n"); - sicrl |= MPC834X_SICRL_USB1; + sicrl &= ~MPC834X_SICRL_USB1; } of_node_put(np); } |