diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-12 01:56:19 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-12 01:56:19 +0300 |
| commit | e3329cba82248a5141f330b2526bd409c8993c4b (patch) | |
| tree | 43d49d474032673062d1c9d40695d6698bffe7af /arch/arm/mach-pxa/include/mach/colibri.h | |
| parent | 66e1cfe6d52c69d317e9df76ebc8538a34af0d51 (diff) | |
| parent | 285ca2ee31a5999e6498e6b2466f346bb5f0047c (diff) | |
| download | linux-e3329cba82248a5141f330b2526bd409c8993c4b.tar.xz | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/colibri.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/colibri.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/colibri.h b/arch/arm/mach-pxa/include/mach/colibri.h index 388a96f1ef93..cb4236e98a0f 100644 --- a/arch/arm/mach-pxa/include/mach/colibri.h +++ b/arch/arm/mach-pxa/include/mach/colibri.h @@ -60,7 +60,7 @@ static inline void colibri_pxa3xx_init_nand(void) {} #define GPIO113_COLIBRI_PXA270_TS_IRQ 113 /* GPIO definitions for Colibri PXA300/310 */ -#define GPIO39_COLIBRI_PXA300_SD_DETECT 39 +#define GPIO13_COLIBRI_PXA300_SD_DETECT 13 /* GPIO definitions for Colibri PXA320 */ #define GPIO28_COLIBRI_PXA320_SD_DETECT 28 |