aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2009-06-13 15:34:22 +0200
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2009-06-13 15:34:22 +0200
commitfbe0b8d5822a88e2e769a318eaf3134da5881769 (patch)
tree20a55ca2e2e1b7cdd6a60435984c0bd8ae32902f /include
parentc878b7d60418a45c36d99c2dc876ebb76035d404 (diff)
parent4024533e60787a5507818b0c0fdb44ddb522cdf5 (diff)
Merge branch 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
Diffstat (limited to 'include')
-rw-r--r--include/linux/atmel-mci.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/atmel-mci.h b/include/linux/atmel-mci.h
index 2f1f95737ac..57b1846a3c8 100644
--- a/include/linux/atmel-mci.h
+++ b/include/linux/atmel-mci.h
@@ -10,6 +10,7 @@
* @bus_width: Number of data lines wired up the slot
* @detect_pin: GPIO pin wired to the card detect switch
* @wp_pin: GPIO pin wired to the write protect sensor
+ * @detect_is_active_high: The state of the detect pin when it is active
*
* If a given slot is not present on the board, @bus_width should be
* set to 0. The other fields are ignored in this case.
@@ -24,6 +25,7 @@ struct mci_slot_pdata {
unsigned int bus_width;
int detect_pin;
int wp_pin;
+ bool detect_is_active_high;
};
/**