diff options
| author | Alex Elder <elder@ieee.org> | 2009-09-10 15:33:56 -0400 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2009-09-10 15:33:56 -0400 |
| commit | a4872d5b6ad69a49975c0268828b5bb2317ea5a0 (patch) | |
| tree | f79577c2731753efb621ef62774949c1e0acdaad /arch/arm/mach-mx3/mx31moboard-devboard.c | |
| parent | 4734d401d43c6469d568caf223d37aa0fc1bf4dc (diff) | |
| parent | 74fca6a42863ffacaf7ba6f1936a9f228950f657 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-mx3/mx31moboard-devboard.c')
| -rw-r--r-- | arch/arm/mach-mx3/mx31moboard-devboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard-devboard.c b/arch/arm/mach-mx3/mx31moboard-devboard.c index 4704405165a1..b48581e7dedd 100644 --- a/arch/arm/mach-mx3/mx31moboard-devboard.c +++ b/arch/arm/mach-mx3/mx31moboard-devboard.c | |||
| @@ -63,7 +63,7 @@ static struct imxuart_platform_data uart_pdata = { | |||
| 63 | 63 | ||
| 64 | static int devboard_sdhc2_get_ro(struct device *dev) | 64 | static int devboard_sdhc2_get_ro(struct device *dev) |
| 65 | { | 65 | { |
| 66 | return gpio_get_value(SDHC2_WP); | 66 | return !gpio_get_value(SDHC2_WP); |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | static int devboard_sdhc2_init(struct device *dev, irq_handler_t detect_irq, | 69 | static int devboard_sdhc2_init(struct device *dev, irq_handler_t detect_irq, |