diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-02 15:42:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-02 15:42:59 -0400 |
| commit | f76bd108e5031202bb40849306f98c4afebe4ef6 (patch) | |
| tree | 455e14a23642a82513eebd4e4f7d3b76842869cd /arch/arm/mach-mx3/mx31moboard-devboard.c | |
| parent | cd6feeeafddbef6abfe4d90fb26e42fd844d34ed (diff) | |
| parent | eced1dfcfcf6b0a35e925d73916a9d8e36ab5457 (diff) | |
Merge branch 'perfcounters/urgent' into perfcounters/core
Merge reason: We are going to modify a place modified by
perfcounters/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 4704405165a..b48581e7ded 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, |