diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-17 12:14:21 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-17 12:14:21 -0400 |
| commit | 32535bd5637d3152f944f124bcc82d498892ba1b (patch) | |
| tree | 99d33b58cfec44f4cf95fad5efa75aea0dd7d60b /arch/arm/mach-exynos/include/mach/irqs.h | |
| parent | 0b623f871d7c993fac8ad7aaaa8f5f3cdb8ed480 (diff) | |
| parent | 3a36dd068f4308461661d28e8e14e11e426eba6b (diff) | |
Merge branch 'v3.5-for-usb' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into usb-next
Diffstat (limited to 'arch/arm/mach-exynos/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/irqs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/include/mach/irqs.h b/arch/arm/mach-exynos/include/mach/irqs.h index 591e78521a9f..c02dae7bf4a3 100644 --- a/arch/arm/mach-exynos/include/mach/irqs.h +++ b/arch/arm/mach-exynos/include/mach/irqs.h | |||
| @@ -189,6 +189,7 @@ | |||
| 189 | #define IRQ_IIC7 EXYNOS4_IRQ_IIC7 | 189 | #define IRQ_IIC7 EXYNOS4_IRQ_IIC7 |
| 190 | 190 | ||
| 191 | #define IRQ_USB_HOST EXYNOS4_IRQ_USB_HOST | 191 | #define IRQ_USB_HOST EXYNOS4_IRQ_USB_HOST |
| 192 | #define IRQ_OTG EXYNOS4_IRQ_USB_HSOTG | ||
| 192 | 193 | ||
| 193 | #define IRQ_HSMMC0 EXYNOS4_IRQ_HSMMC0 | 194 | #define IRQ_HSMMC0 EXYNOS4_IRQ_HSMMC0 |
| 194 | #define IRQ_HSMMC1 EXYNOS4_IRQ_HSMMC1 | 195 | #define IRQ_HSMMC1 EXYNOS4_IRQ_HSMMC1 |