diff options
| author | Eric Miao <eric.miao@marvell.com> | 2009-03-22 21:55:09 -0400 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-03-22 21:55:14 -0400 |
| commit | fa12868e59f5f49bc42b8befd94c531bb07ec120 (patch) | |
| tree | 25984e5d3941f37a72a5cd4ef8a6bafcaccc86a3 /arch/arm/mach-pxa/include | |
| parent | cefdb2a4436ec83b4c8b349aa30f976d30c22e25 (diff) | |
| parent | 1efb71809fd47bc19b3ce05080e1d5085a8dfab1 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git into devel
Diffstat (limited to 'arch/arm/mach-pxa/include')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/mfp-pxa300.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/mfp-pxa320.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa300.h b/arch/arm/mach-pxa/include/mach/mfp-pxa300.h index bc1fb33a6e70..928fbef9cbf3 100644 --- a/arch/arm/mach-pxa/include/mach/mfp-pxa300.h +++ b/arch/arm/mach-pxa/include/mach/mfp-pxa300.h | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #endif | 41 | #endif |
| 42 | 42 | ||
| 43 | /* Chip Select */ | 43 | /* Chip Select */ |
| 44 | #define GPIO1_nCS2 MFP_CFG(GPIO1, AF1) | ||
| 44 | #define GPIO2_nCS3 MFP_CFG(GPIO2, AF1) | 45 | #define GPIO2_nCS3 MFP_CFG(GPIO2, AF1) |
| 45 | 46 | ||
| 46 | /* AC97 */ | 47 | /* AC97 */ |
diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa320.h b/arch/arm/mach-pxa/include/mach/mfp-pxa320.h index 67f8385ea548..80a0da9e092d 100644 --- a/arch/arm/mach-pxa/include/mach/mfp-pxa320.h +++ b/arch/arm/mach-pxa/include/mach/mfp-pxa320.h | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #define GPIO17_2_GPIO MFP_CFG(GPIO17_2, AF0) | 38 | #define GPIO17_2_GPIO MFP_CFG(GPIO17_2, AF0) |
| 39 | 39 | ||
| 40 | /* Chip Select */ | 40 | /* Chip Select */ |
| 41 | #define GPIO3_nCS2 MFP_CFG(GPIO3, AF1) | ||
| 41 | #define GPIO4_nCS3 MFP_CFG(GPIO4, AF1) | 42 | #define GPIO4_nCS3 MFP_CFG(GPIO4, AF1) |
| 42 | 43 | ||
| 43 | /* AC97 */ | 44 | /* AC97 */ |