diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-09-22 16:38:39 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-09-22 16:38:39 -0700 |
| commit | 7a04c4cbf73953f1995a141534b7fe0c35828057 (patch) | |
| tree | 8b83a813600605510bd54cadb81f296d342e1b6b /arch/arm/mach-exynos4/include/mach/irqs.h | |
| parent | f8cf8e47fb87e3b27e63d36fc8d61b11273f37bc (diff) | |
| parent | fbe01f51a8260c1f0a66e8730c4fd2c5160ecb91 (diff) | |
Merge branch 'for_3.2/omap_device' of git://gitorious.org/khilman/linux-omap-pm into cleanup
Diffstat (limited to 'arch/arm/mach-exynos4/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-exynos4/include/mach/irqs.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-exynos4/include/mach/irqs.h b/arch/arm/mach-exynos4/include/mach/irqs.h index 934d2a49398..f8952f8f375 100644 --- a/arch/arm/mach-exynos4/include/mach/irqs.h +++ b/arch/arm/mach-exynos4/include/mach/irqs.h @@ -80,9 +80,8 @@ #define IRQ_HSMMC3 IRQ_SPI(76) #define IRQ_DWMCI IRQ_SPI(77) -#define IRQ_MIPICSI0 IRQ_SPI(78) - -#define IRQ_MIPICSI1 IRQ_SPI(80) +#define IRQ_MIPI_CSIS0 IRQ_SPI(78) +#define IRQ_MIPI_CSIS1 IRQ_SPI(80) #define IRQ_ONENAND_AUDI IRQ_SPI(82) #define IRQ_ROTATOR IRQ_SPI(83) |