diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-15 07:42:46 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-15 07:42:46 -0400 |
| commit | 8b6120789598d55f6aa2b4e9ac7e70a205d857da (patch) | |
| tree | 25704a4479b7b98b2ef566afe247a6442f9f3d05 /arch/arm/mach-mx3/mx31moboard-marxbot.c | |
| parent | dde5828f56cb2c1aa70365c476e6830482127258 (diff) | |
| parent | 563abb4be1a79e7b64784d43beb9d0cacb1bad6f (diff) | |
Merge branch 'for-rmk-rc' of git://git.pengutronix.de/git/imx/linux-2.6
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 641c3d6153ae..901fb0166c0e 100644 --- a/arch/arm/mach-mx3/mx31moboard-marxbot.c +++ b/arch/arm/mach-mx3/mx31moboard-marxbot.c | |||
| @@ -67,7 +67,7 @@ static unsigned int marxbot_pins[] = { | |||
| 67 | 67 | ||
| 68 | static int marxbot_sdhc2_get_ro(struct device *dev) | 68 | static int marxbot_sdhc2_get_ro(struct device *dev) |
| 69 | { | 69 | { |
| 70 | return gpio_get_value(SDHC2_WP); | 70 | return !gpio_get_value(SDHC2_WP); |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | static int marxbot_sdhc2_init(struct device *dev, irq_handler_t detect_irq, | 73 | static int marxbot_sdhc2_init(struct device *dev, irq_handler_t detect_irq, |