diff options
| author |   Olof Johansson <olof@lixom.net> | 2012-04-14 17:50:45 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-04-14 17:50:45 -0700 |
| commit | 961a238c38a2716511dbd8e0f34d49dd46160007 (patch) | |
| tree | 56a9ed1ae579ce0cc6453c9dc1202f99402df3fc /arch/arm/mach-exynos/include/mach/irqs.h | |
| parent | ARM: OMAP: clock: cleanup CPUfreq leftovers, fix build errors (diff) | |
| parent | ARM: EXYNOS: Fix Kconfig dependencies for device tree enabled machine files (diff) | |
| download | linux-dev-961a238c38a2716511dbd8e0f34d49dd46160007.tar.xz linux-dev-961a238c38a2716511dbd8e0f34d49dd46160007.zip | |
Merge branch 'v3.4-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.4-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Fix Kconfig dependencies for device tree enabled machine files
ARM: EXYNOS: Remove broken config values for touchscren for NURI board
ARM: EXYNOS: set fix xusbxti clock for NURI and Universal210 boards
ARM: EXYNOS: fix regulator name for NURI board
ARM: SAMSUNG: make SAMSUNG_PM_DEBUG select DEBUG_LL
ARM: EXYNOS: Add PDMA and MDMA physical base address defines
ARM: S5PV210: Fix compiler warning in dma.c file
ARM: EXYNOS: Fix compile error in exynos5250-cpufreq.c
ARM: EXYNOS: Add missing definition for IRQ_I2S0
ARM: S5PV210: fix unused LDO supply field from wm8994_pdata
Diffstat (limited to 'arch/arm/mach-exynos/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/irqs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/include/mach/irqs.h b/arch/arm/mach-exynos/include/mach/irqs.h index 9bee8535d9e0..591e78521a9f 100644 --- a/arch/arm/mach-exynos/include/mach/irqs.h +++ b/arch/arm/mach-exynos/include/mach/irqs.h @@ -212,6 +212,8 @@ #define IRQ_MFC EXYNOS4_IRQ_MFC #define IRQ_SDO EXYNOS4_IRQ_SDO +#define IRQ_I2S0 EXYNOS4_IRQ_I2S0 + #define IRQ_ADC EXYNOS4_IRQ_ADC0 #define IRQ_TC EXYNOS4_IRQ_PEN0 |