summaryrefslogtreecommitdiff
path: root/arch/arm/mach-kirkwood/rd88f6281-setup.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-15 20:27:12 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-15 20:27:12 +0400
commitcd2d95d97c8d1b66467507400c63d707ddb1deba (patch)
tree7ad5223ba88110ca6735637c9eef327515e9bb96 /arch/arm/mach-kirkwood/rd88f6281-setup.c
parent88dd75af0e49e1dabef6f7c7f7f4fa0234b9b988 (diff)
parent41ef2d5678d83af030125550329b6ae8b74618fa (diff)
downloadlinux-cd2d95d97c8d1b66467507400c63d707ddb1deba.tar.xz
Merge tag 'v3.9-rc7' into regulator-fix-core
Linux 3.9-rc7 Trivial context overlap conflicts: MAINTAINERS
Diffstat (limited to 'arch/arm/mach-kirkwood/rd88f6281-setup.c')
-rw-r--r--arch/arm/mach-kirkwood/rd88f6281-setup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
index c7d93b48926b..d24223166e06 100644
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@ -69,6 +69,7 @@ static struct mv_sata_platform_data rd88f6281_sata_data = {
static struct mvsdio_platform_data rd88f6281_mvsdio_data = {
.gpio_card_detect = 28,
+ .gpio_write_protect = -1,
};
static unsigned int rd88f6281_mpp_config[] __initdata = {