Merge branch 'omap-fixes'

[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 3153e779d46a9edbd481249871d2779cf988e432..f6c2e2fcce370adbb533d14dc5017ee28443bc5d 100644 (file)
--- a/drivers/mmc/host/pxamci.h
+++ b/drivers/mmc/host/pxamci.h
@@ -68,7 +68,7 @@
 #define PRG_DONE               (1 << 1)
 #define DATA_TRAN_DONE         (1 << 0)
 
-#ifdef CONFIG_PXA27x
+#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)
 #define MMC_I_MASK_ALL          0x00001fff
 #else
 #define MMC_I_MASK_ALL          0x0000007f
@@ -88,17 +88,3 @@
 #define MMC_RXFIFO     0x0040  /* 8 bit */
 
 #define MMC_TXFIFO     0x0044  /* 8 bit */
-
-/*
- * The base MMC clock rate
- */
-#ifdef CONFIG_PXA27x
-#define CLOCKRATE_MIN  304688
-#define CLOCKRATE_MAX  19500000
-#else
-#define CLOCKRATE_MIN  312500
-#define CLOCKRATE_MAX  20000000
-#endif
-
-#define CLOCKRATE      CLOCKRATE_MAX
-