diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2011-12-27 21:56:31 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 21:56:31 +0000 |
| commit | 3e61aa207f81525fb43996d60549d713d0c373ae (patch) | |
| tree | 8965b4bfd88e8c052c94295e30cce8b409819c96 /arch/arm/plat-omap/include/plat/irqs.h | |
| parent | Merge branch 'ux500/devel' into next/devel (diff) | |
| parent | Merge branch 'hwmod' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/hwmod (diff) | |
| download | linux-dev-3e61aa207f81525fb43996d60549d713d0c373ae.tar.xz linux-dev-3e61aa207f81525fb43996d60549d713d0c373ae.zip | |
Merge branch 'omap/hwmod' into next/devel
* omap/hwmod:
ARM: OMAP3+: hwmod data: Add the default clockactivity for I2C
ARM: OMAP3: hwmod data: disable multiblock reads on MMC1/2 on OMAP34xx/35xx <= ES2.1
ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP4
ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP3
ARM: OMAP: hwmod data: Add support for AM35xx UART4/ttyO3
ARM: OMAP: hwmod data: fix the panic on Nokia RM-680 during boot
ARM: OMAP: hwmod data: fix iva and mailbox hwmods for OMAP 3
ARM: OMAP: rx51: fix USB
ARM: OMAP: mcbsp: Fix possible memory corruption
Diffstat (limited to 'arch/arm/plat-omap/include/plat/irqs.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/irqs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h index ebda7382c65b..2efd6454bce0 100644 --- a/arch/arm/plat-omap/include/plat/irqs.h +++ b/arch/arm/plat-omap/include/plat/irqs.h @@ -357,7 +357,7 @@ #define INT_35XX_EMAC_C0_TX_PULSE_IRQ 69 #define INT_35XX_EMAC_C0_MISC_PULSE_IRQ 70 #define INT_35XX_USBOTG_IRQ 71 -#define INT_35XX_UART4 84 +#define INT_35XX_UART4_IRQ 84 #define INT_35XX_CCDC_VD0_IRQ 88 #define INT_35XX_CCDC_VD1_IRQ 92 #define INT_35XX_CCDC_VD2_IRQ 93 |