Merge branch 'locks' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / drivers / mmc / host / pxamci.h

diff --git a/drivers/mmc/host/pxamci.h b/drivers/mmc/host/pxamci.h
index 1b163220df2bad67727bf242ab982333dd6b5e54..3153e779d46a9edbd481249871d2779cf988e432 100644 (file)
--- a/drivers/mmc/host/pxamci.h
+++ b/drivers/mmc/host/pxamci.h
@@ -1,25 +1,3 @@
-#undef MMC_STRPCL
-#undef MMC_STAT
-#undef MMC_CLKRT
-#undef MMC_SPI
-#undef MMC_CMDAT
-#undef MMC_RESTO
-#undef MMC_RDTO
-#undef MMC_BLKLEN
-#undef MMC_NOB
-#undef MMC_PRTBUF
-#undef MMC_I_MASK
-#undef END_CMD_RES
-#undef PRG_DONE
-#undef DATA_TRAN_DONE
-#undef MMC_I_REG
-#undef MMC_CMD
-#undef MMC_ARGH
-#undef MMC_ARGL
-#undef MMC_RES
-#undef MMC_RXFIFO
-#undef MMC_TXFIFO
-
 #define MMC_STRPCL     0x0000
 #define STOP_CLOCK             (1 << 0)
 #define START_CLOCK            (2 << 0)
@@ -47,6 +25,8 @@
 #define SPI_EN                 (1 << 0)
 
 #define MMC_CMDAT      0x0010
+#define CMDAT_SDIO_INT_EN      (1 << 11)
+#define CMDAT_SD_4DAT          (1 << 8)
 #define CMDAT_DMAEN            (1 << 7)
 #define CMDAT_INIT             (1 << 6)
 #define CMDAT_BUSY             (1 << 5)