diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-03 02:38:13 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-03 02:38:13 -0500 |
| commit | 467832032cc07626880363efa8625719c16c04eb (patch) | |
| tree | ee9a62c04f0b3106e412bc1b2dd1cea5566d5ca7 /arch/arm/plat-pxa/include/plat/mfp.h | |
| parent | 66d2a5952eab875f1286e04f738ef029afdaf013 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge commit 'v2.6.32' into next
Diffstat (limited to 'arch/arm/plat-pxa/include/plat/mfp.h')
| -rw-r--r-- | arch/arm/plat-pxa/include/plat/mfp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-pxa/include/plat/mfp.h b/arch/arm/plat-pxa/include/plat/mfp.h index 22086e696e8e..857a6839071c 100644 --- a/arch/arm/plat-pxa/include/plat/mfp.h +++ b/arch/arm/plat-pxa/include/plat/mfp.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #ifndef __ASM_PLAT_MFP_H | 16 | #ifndef __ASM_PLAT_MFP_H |
| 17 | #define __ASM_PLAT_MFP_H | 17 | #define __ASM_PLAT_MFP_H |
| 18 | 18 | ||
| 19 | #define mfp_to_gpio(m) ((m) % 128) | 19 | #define mfp_to_gpio(m) ((m) % 256) |
| 20 | 20 | ||
| 21 | /* list of all the configurable MFP pins */ | 21 | /* list of all the configurable MFP pins */ |
| 22 | enum { | 22 | enum { |