diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 14:18:36 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 14:18:36 +0000 |
| commit | af72617279f6d56163328802cf6545b95a538345 (patch) | |
| tree | 205d947b4b32257d8f6a0e4a248b5212ea1f1dba /arch/arm/mach-mxs/include | |
| parent | 58a394b3fae8b08e3efb04b740cb85aa4fe98d29 (diff) | |
| parent | 7d8b894ca135a896f32934f7d096714d5bc687e6 (diff) | |
| download | op-kernel-dev-af72617279f6d56163328802cf6545b95a538345.zip op-kernel-dev-af72617279f6d56163328802cf6545b95a538345.tar.gz | |
Merge branch 'mxs/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-mxs/include')
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/mx28.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/mxs.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-mxs/include/mach/mx28.h b/arch/arm/mach-mxs/include/mach/mx28.h index 75d8611..30c7990 100644 --- a/arch/arm/mach-mxs/include/mach/mx28.h +++ b/arch/arm/mach-mxs/include/mach/mx28.h @@ -104,8 +104,8 @@ #define MX28_INT_CAN1 9 #define MX28_INT_LRADC_TOUCH 10 #define MX28_INT_HSADC 13 -#define MX28_INT_IRADC_THRESH0 14 -#define MX28_INT_IRADC_THRESH1 15 +#define MX28_INT_LRADC_THRESH0 14 +#define MX28_INT_LRADC_THRESH1 15 #define MX28_INT_LRADC_CH0 16 #define MX28_INT_LRADC_CH1 17 #define MX28_INT_LRADC_CH2 18 diff --git a/arch/arm/mach-mxs/include/mach/mxs.h b/arch/arm/mach-mxs/include/mach/mxs.h index 0d2d2b4..bde5f66 100644 --- a/arch/arm/mach-mxs/include/mach/mxs.h +++ b/arch/arm/mach-mxs/include/mach/mxs.h @@ -30,6 +30,7 @@ */ #define cpu_is_mx23() ( \ machine_is_mx23evk() || \ + machine_is_stmp378x() || \ 0) #define cpu_is_mx28() ( \ machine_is_mx28evk() || \ |
