diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
| commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
| tree | 869d633803eb7c429624d3bd16a6117816849763 /arch/arm/mach-mx3/mx31moboard-marxbot.c | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'arch/arm/mach-mx3/mx31moboard-marxbot.c')
| -rw-r--r-- | arch/arm/mach-mx3/mx31moboard-marxbot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard-marxbot.c b/arch/arm/mach-mx3/mx31moboard-marxbot.c index 3e2b73051b94..2bfaffb344f0 100644 --- a/arch/arm/mach-mx3/mx31moboard-marxbot.c +++ b/arch/arm/mach-mx3/mx31moboard-marxbot.c | |||
| @@ -56,7 +56,7 @@ static unsigned int marxbot_pins[] = { | |||
| 56 | 56 | ||
| 57 | static int marxbot_sdhc2_get_ro(struct device *dev) | 57 | static int marxbot_sdhc2_get_ro(struct device *dev) |
| 58 | { | 58 | { |
| 59 | return gpio_get_value(SDHC2_WP); | 59 | return !gpio_get_value(SDHC2_WP); |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | static int marxbot_sdhc2_init(struct device *dev, irq_handler_t detect_irq, | 62 | static int marxbot_sdhc2_init(struct device *dev, irq_handler_t detect_irq, |