git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
idp.c
diff --git
a/arch/arm/mach-pxa/idp.c
b/arch/arm/mach-pxa/idp.c
index 88e0068f92a81c8c1f637809e0af16a493be0c35..7bfc246a1d75201d070ea907a291d69a005f70c0 100644
(file)
--- a/
arch/arm/mach-pxa/idp.c
+++ b/
arch/arm/mach-pxa/idp.c
@@
-160,9
+160,6
@@
static struct pxafb_mach_info sharp_lm8v31 = {
static struct pxamci_platform_data idp_mci_platform_data = {
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
- .gpio_card_detect = -1,
- .gpio_card_ro = -1,
- .gpio_power = -1,
};
static void __init idp_init(void)