diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 07:18:36 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 07:18:36 -0400 |
| commit | db3c94a7edc6b29f8d52ba5884dec6a15feeadad (patch) | |
| tree | ac9207a44cecafb9104ca4e1f46aecb9fe01383d /arch/arm/mach-exynos4/include/mach/irqs.h | |
| parent | c9477f38cba225870862fd9e08868ae3d4abdfe0 (diff) | |
| parent | 568f0e278c6dd33dc11bd19c4ad781d1f8d86800 (diff) | |
Merge branch 'next-samsung-devel' into next-samsung-devel-2
Conflicts:
arch/arm/mach-exynos4/clock.c
arch/arm/mach-s3c2412/gpio.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5p64x0/gpiolib.c
Diffstat (limited to 'arch/arm/mach-exynos4/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-exynos4/include/mach/irqs.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/include/mach/irqs.h b/arch/arm/mach-exynos4/include/mach/irqs.h index f8952f8f375..62093b9339d 100644 --- a/arch/arm/mach-exynos4/include/mach/irqs.h +++ b/arch/arm/mach-exynos4/include/mach/irqs.h | |||
| @@ -93,7 +93,11 @@ | |||
| 93 | #define IRQ_2D IRQ_SPI(89) | 93 | #define IRQ_2D IRQ_SPI(89) |
| 94 | #define IRQ_PCIE IRQ_SPI(90) | 94 | #define IRQ_PCIE IRQ_SPI(90) |
| 95 | 95 | ||
| 96 | #define IRQ_MIXER IRQ_SPI(91) | ||
| 97 | #define IRQ_HDMI IRQ_SPI(92) | ||
| 98 | #define IRQ_IIC_HDMIPHY IRQ_SPI(93) | ||
| 96 | #define IRQ_MFC IRQ_SPI(94) | 99 | #define IRQ_MFC IRQ_SPI(94) |
| 100 | #define IRQ_SDO IRQ_SPI(95) | ||
| 97 | 101 | ||
| 98 | #define IRQ_AUDIO_SS IRQ_SPI(96) | 102 | #define IRQ_AUDIO_SS IRQ_SPI(96) |
| 99 | #define IRQ_I2S0 IRQ_SPI(97) | 103 | #define IRQ_I2S0 IRQ_SPI(97) |