ARM: 7956/1: mmci: rename some extended flags

These four (so far unused) flags are only found in the ST Micro
versions of MMCI, so infix them properly with the _ST_ infix.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index 168bc72f7a94a9b662d7c0a97775c781d4d769aa..84c0e59b792acce9e0508fe038e05d204dd2b2d8 100644 (file)
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -38,10 +38,11 @@
 #define MCI_CPSM_INTERRUPT     (1 << 8)
 #define MCI_CPSM_PENDING       (1 << 9)
 #define MCI_CPSM_ENABLE                (1 << 10)
-#define MCI_SDIO_SUSP          (1 << 11)
-#define MCI_ENCMD_COMPL                (1 << 12)
-#define MCI_NIEN               (1 << 13)
-#define MCI_CE_ATACMD          (1 << 14)
+/* Argument flag extenstions in the ST Micro versions */
+#define MCI_ST_SDIO_SUSP       (1 << 11)
+#define MCI_ST_ENCMD_COMPL     (1 << 12)
+#define MCI_ST_NIEN            (1 << 13)
+#define MCI_ST_CE_ATACMD       (1 << 14)
 
 #define MMCIRESPCMD            0x010
 #define MMCIRESPONSE0          0x014