projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-pxa
/
colibri-pxa300.c
diff --git
a/arch/arm/mach-pxa/colibri-pxa300.c
b/arch/arm/mach-pxa/colibri-pxa300.c
index fddb16d07eb03da5e8574edccd579b17db5a17b8..66dd81cbc8a046bb7b0c94146836e449525b0414 100644
(file)
--- a/
arch/arm/mach-pxa/colibri-pxa300.c
+++ b/
arch/arm/mach-pxa/colibri-pxa300.c
@@
-41,7
+41,7
@@
static mfp_cfg_t colibri_pxa300_evalboard_pin_config[] __initdata = {
GPIO4_MMC1_DAT1,
GPIO5_MMC1_DAT2,
GPIO6_MMC1_DAT3,
- GPIO
39_GPIO, /* SD detect
*/
+ GPIO
13_GPIO, /* GPIO13_COLIBRI_PXA300_SD_DETECT
*/
/* UHC */
GPIO0_2_USBH_PEN,