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.c | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'arch/arm/mach-mx3/mx31moboard.c')
| -rw-r--r-- | arch/arm/mach-mx3/mx31moboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard.c b/arch/arm/mach-mx3/mx31moboard.c index d3c6bb26271f..9243de54041a 100644 --- a/arch/arm/mach-mx3/mx31moboard.c +++ b/arch/arm/mach-mx3/mx31moboard.c | |||
| @@ -118,7 +118,7 @@ static struct imxi2c_platform_data moboard_i2c1_pdata = { | |||
| 118 | 118 | ||
| 119 | static int moboard_sdhc1_get_ro(struct device *dev) | 119 | static int moboard_sdhc1_get_ro(struct device *dev) |
| 120 | { | 120 | { |
| 121 | return gpio_get_value(SDHC1_WP); | 121 | return !gpio_get_value(SDHC1_WP); |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | static int moboard_sdhc1_init(struct device *dev, irq_handler_t detect_irq, | 124 | static int moboard_sdhc1_init(struct device *dev, irq_handler_t detect_irq, |