diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-15 12:39:04 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-15 12:39:04 +0000 |
| commit | 073154459b80a43f7e4f088b11c93c8e9cb07f14 (patch) | |
| tree | c81603910b742fbb0e4129034e5011364a9c7418 /arch/arm/mach-mmp/include/mach/mfp-mmp2.h | |
| parent | c76d292db9869ae73fd401e9a3fc728ed5caf0a7 (diff) | |
| parent | ea0c4f3ca8a55e7e3138c2c4b3e9f7fe34d3ecab (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mmp/include/mach/mfp-mmp2.h')
| -rw-r--r-- | arch/arm/mach-mmp/include/mach/mfp-mmp2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/include/mach/mfp-mmp2.h b/arch/arm/mach-mmp/include/mach/mfp-mmp2.h index 117e3036608..4ad38629c3f 100644 --- a/arch/arm/mach-mmp/include/mach/mfp-mmp2.h +++ b/arch/arm/mach-mmp/include/mach/mfp-mmp2.h @@ -6,7 +6,7 @@ #define MFP_DRIVE_VERY_SLOW (0x0 << 13) #define MFP_DRIVE_SLOW (0x2 << 13) #define MFP_DRIVE_MEDIUM (0x4 << 13) -#define MFP_DRIVE_FAST (0x8 << 13) +#define MFP_DRIVE_FAST (0x6 << 13) /* GPIO */ #define GPIO0_GPIO MFP_CFG(GPIO0, AF0) |