diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-08-26 19:08:19 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-08-26 19:08:19 +0400 |
| commit | 4a3f4233c56d2e6ce8e432ff9aaaaad5108d7ab8 (patch) | |
| tree | 354ba30d39673f25345f3fb5de64ec7c244fa6d1 /arch/arm/mach-exynos4/include/mach/irqs.h | |
| parent | fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c (diff) | |
| parent | 5d747c6f2c9e1615685866251416268a0f648ffc (diff) | |
| download | linux-4a3f4233c56d2e6ce8e432ff9aaaaad5108d7ab8.tar.xz | |
Merge branch 'samsung/fixes' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into fixes
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) |