diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-16 21:45:16 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-16 21:45:16 +0100 |
commit | 4722cd7741c6404f967f7a7b8b666540b6c1663e (patch) | |
tree | 877b7d8efe1e4e4ce48416186b4f45da3a5fccac /arch/arm/mach-exynos4/include/mach/irqs.h | |
parent | 1db3706b05b11abcf2673ffbed5ad43b4c90ed11 (diff) | |
parent | 4fb0d2ea397ab207fdecbd88ad0e37b36ce68a62 (diff) |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
Conflicts:
arch/arm/mach-imx/mach-cpuimx27.c
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 934d2a493982..f8952f8f3757 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) |