Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / mmc / host / mmci.h

diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index 4ae887fc01892e3a844b064ce6dd72c3a8773aa9..c1df7b82d36cc63f5f420ac71ff68cdc120ccee5 100644 (file)
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -137,7 +137,12 @@
 #define MCI_IRQENABLE  \
        (MCI_CMDCRCFAILMASK|MCI_DATACRCFAILMASK|MCI_CMDTIMEOUTMASK|     \
        MCI_DATATIMEOUTMASK|MCI_TXUNDERRUNMASK|MCI_RXOVERRUNMASK|       \
-       MCI_CMDRESPENDMASK|MCI_CMDSENTMASK|MCI_DATABLOCKENDMASK)
+       MCI_CMDRESPENDMASK|MCI_CMDSENTMASK)
+
+/* These interrupts are directed to IRQ1 when two IRQ lines are available */
+#define MCI_IRQ1MASK \
+       (MCI_RXFIFOHALFFULLMASK | MCI_RXDATAAVLBLMASK | \
+        MCI_TXFIFOHALFEMPTYMASK)
 
 #define NR_SG          16
 
@@ -154,6 +159,7 @@ struct mmci_host {
        int                     gpio_cd;
        int                     gpio_wp;
        int                     gpio_cd_irq;
+       bool                    singleirq;
 
        unsigned int            data_xfered;