diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-04-08 10:45:54 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-04-08 10:45:54 -0700 |
| commit | 698cb5d58f5498273e71d4797c8b3353535c8de6 (patch) | |
| tree | 20f459c3e673a04c82ba2d529fc14efd28c1dcb5 /arch/arm/mach-kirkwood/openrd-setup.c | |
| parent | 97c64b5e2132e104a8c25026319b239fce7463f4 (diff) | |
| parent | 31880c37c11e28cb81c70757e38392b42e695dc6 (diff) | |
Merge remote-tracking branch 'linus/master' into linaro-android-3.9-experimentaltracking-linaro-android-3.9-llct-20130408.0
Update to 3.9-rc6
Conflicts:
arch/arm/mm/cache-l2x0.c
drivers/hid/hid-magicmouse.c
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 = { |