diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 16:22:31 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 16:22:46 -0500 |
| commit | 1fc3eb81100c3f3cd44e706e54390151b0f1ce74 (patch) | |
| tree | 922f64310caa55a3b417958a1c256a96f47c4b66 /drivers/usb/renesas_usbhs/mod.c | |
| parent | e006d6563bca989aeae1bc5ebc03dacdf5e15b32 (diff) | |
| parent | ee9ba0f2fd5819e377cdec974a2022a7af02a385 (diff) | |
Merge branch 'imx/board' into next/boards
* imx/board: (4 commits)
Enable 32 bit flash support for iMX21ADS board
ARM: mx31pdk: Add MC13783 RTC support
iomux-mx25: configuration to support CSPI3 on CSI pins
MX1:apf9328: Add i2c support
Updated to v3.2-rc6, conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'drivers/usb/renesas_usbhs/mod.c')
| -rw-r--r-- | drivers/usb/renesas_usbhs/mod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/renesas_usbhs/mod.c b/drivers/usb/renesas_usbhs/mod.c index 053f86d70009..ad96a3896729 100644 --- a/drivers/usb/renesas_usbhs/mod.c +++ b/drivers/usb/renesas_usbhs/mod.c | |||
| @@ -349,7 +349,7 @@ void usbhs_irq_callback_update(struct usbhs_priv *priv, struct usbhs_mod *mod) | |||
| 349 | if (mod->irq_attch) | 349 | if (mod->irq_attch) |
| 350 | intenb1 |= ATTCHE; | 350 | intenb1 |= ATTCHE; |
| 351 | 351 | ||
| 352 | if (mod->irq_attch) | 352 | if (mod->irq_dtch) |
| 353 | intenb1 |= DTCHE; | 353 | intenb1 |= DTCHE; |
| 354 | 354 | ||
| 355 | if (mod->irq_sign) | 355 | if (mod->irq_sign) |