diff options
| author | Chris Zankel | 2013-09-06 02:12:08 +0200 |
|---|---|---|
| committer | Chris Zankel | 2013-09-06 02:12:08 +0200 |
| commit | 0bc2ba94a65d2cd2ad01004d2d3f94f31c6064bd (patch) | |
| tree | fc0354e4da0ff5ab8b8eb65d60d9a8359d02634d /arch/arm/mach-imx/mx27.h | |
| parent | Linux 3.11-rc2 (diff) | |
| parent | Linux 3.11 (diff) | |
| download | kernel-qcow2-linux-0bc2ba94a65d2cd2ad01004d2d3f94f31c6064bd.tar.gz kernel-qcow2-linux-0bc2ba94a65d2cd2ad01004d2d3f94f31c6064bd.tar.xz kernel-qcow2-linux-0bc2ba94a65d2cd2ad01004d2d3f94f31c6064bd.zip | |
Merge tag 'v3.11' into for_next
Update Xtensa tree to Linux 3.11 (merging)
Diffstat (limited to 'arch/arm/mach-imx/mx27.h')
| -rw-r--r-- | arch/arm/mach-imx/mx27.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mx27.h b/arch/arm/mach-imx/mx27.h index e074616d54ca..8a65f192e7f3 100644 --- a/arch/arm/mach-imx/mx27.h +++ b/arch/arm/mach-imx/mx27.h @@ -135,7 +135,7 @@ #define MX27_INT_GPT4 (NR_IRQS_LEGACY + 4) #define MX27_INT_RTIC (NR_IRQS_LEGACY + 5) #define MX27_INT_CSPI3 (NR_IRQS_LEGACY + 6) -#define MX27_INT_SDHC (NR_IRQS_LEGACY + 7) +#define MX27_INT_MSHC (NR_IRQS_LEGACY + 7) #define MX27_INT_GPIO (NR_IRQS_LEGACY + 8) #define MX27_INT_SDHC3 (NR_IRQS_LEGACY + 9) #define MX27_INT_SDHC2 (NR_IRQS_LEGACY + 10) |