aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/zylonite.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-09-25 12:15:15 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-09-25 12:15:15 +0900
commitc373ba999103fa794f041eab5bd490714d2dee88 (patch)
tree8f2b445b1e0af2491c83527967dbcda76054a486 /arch/arm/mach-pxa/zylonite.c
parentsh: enable onenand support in kfr2r09 defconfig. (diff)
parentMerge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev (diff)
downloadlinux-dev-c373ba999103fa794f041eab5bd490714d2dee88.tar.xz
linux-dev-c373ba999103fa794f041eab5bd490714d2dee88.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/zylonite.c')
-rw-r--r--arch/arm/mach-pxa/zylonite.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c
index 218d2001f1df..09784d3954e4 100644
--- a/arch/arm/mach-pxa/zylonite.c
+++ b/arch/arm/mach-pxa/zylonite.c
@@ -290,6 +290,9 @@ static struct pxamci_platform_data zylonite_mci_platform_data = {
.init = zylonite_mci_init,
.exit = zylonite_mci_exit,
.get_ro = zylonite_mci_ro,
+ .gpio_card_detect = -1,
+ .gpio_card_ro = -1,
+ .gpio_power = -1,
};
static struct pxamci_platform_data zylonite_mci2_platform_data = {