diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-05-08 01:27:46 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-05-08 01:27:46 +0200 |
| commit | 9b3539e0e545e4c2f338acfc1ce52033a6f5e7f7 (patch) | |
| tree | 5c56e4a208dbe7e985e59911e1a421a7c1ee024c /arch/arm/mach-kirkwood/openrd-setup.c | |
| parent | MIPS: Remove redundant instructions from arch_spin_{,try}lock. (diff) | |
| parent | MIPS: BCM63XX: add missing clocks for BCM6328 and BCM6362 (diff) | |
| download | linux-9b3539e0e545e4c2f338acfc1ce52033a6f5e7f7.tar.xz linux-9b3539e0e545e4c2f338acfc1ce52033a6f5e7f7.zip | |
Merge branch 'mips-next-3.10' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next
Diffstat (limited to 'arch/arm/mach-kirkwood/openrd-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/openrd-setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c index 8ddd69fdc937..6a6eb548307d 100644 --- a/arch/arm/mach-kirkwood/openrd-setup.c +++ b/arch/arm/mach-kirkwood/openrd-setup.c @@ -55,6 +55,7 @@ static struct mv_sata_platform_data openrd_sata_data = { static struct mvsdio_platform_data openrd_mvsdio_data = { .gpio_card_detect = 29, /* MPP29 used as SD card detect */ + .gpio_write_protect = -1, }; static unsigned int openrd_mpp_config[] __initdata = { |