diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-16 10:44:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-12 09:27:56 -0400 |
| commit | 7a2b94bc39915041304578188441f0f21aa5532a (patch) | |
| tree | 50937d7cb453dab5c1b0de6e96031f219fc8c1cc /drivers/mmc | |
| parent | f4b6a0a401f2cec5e6199e805ed42f30d8c04e94 (diff) | |
[ARM] pxa: remove MMC register defines from pxa-regs.h
pxamci.h redefines the MMC registers differently so they can be used
with ioremap. Remove the incompatible definitions from pxa-regs.h.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/pxamci.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/mmc/host/pxamci.h b/drivers/mmc/host/pxamci.h index 1b163220df2b..df17c281278a 100644 --- a/drivers/mmc/host/pxamci.h +++ b/drivers/mmc/host/pxamci.h | |||
| @@ -1,25 +1,3 @@ | |||
| 1 | #undef MMC_STRPCL | ||
| 2 | #undef MMC_STAT | ||
| 3 | #undef MMC_CLKRT | ||
| 4 | #undef MMC_SPI | ||
| 5 | #undef MMC_CMDAT | ||
| 6 | #undef MMC_RESTO | ||
| 7 | #undef MMC_RDTO | ||
| 8 | #undef MMC_BLKLEN | ||
| 9 | #undef MMC_NOB | ||
| 10 | #undef MMC_PRTBUF | ||
| 11 | #undef MMC_I_MASK | ||
| 12 | #undef END_CMD_RES | ||
| 13 | #undef PRG_DONE | ||
| 14 | #undef DATA_TRAN_DONE | ||
| 15 | #undef MMC_I_REG | ||
| 16 | #undef MMC_CMD | ||
| 17 | #undef MMC_ARGH | ||
| 18 | #undef MMC_ARGL | ||
| 19 | #undef MMC_RES | ||
| 20 | #undef MMC_RXFIFO | ||
| 21 | #undef MMC_TXFIFO | ||
| 22 | |||
| 23 | #define MMC_STRPCL 0x0000 | 1 | #define MMC_STRPCL 0x0000 |
| 24 | #define STOP_CLOCK (1 << 0) | 2 | #define STOP_CLOCK (1 << 0) |
| 25 | #define START_CLOCK (2 << 0) | 3 | #define START_CLOCK (2 << 0) |