summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-05-16 15:44:37 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-07-12 14:27:56 +0100
commit7a2b94bc39915041304578188441f0f21aa5532a (patch)
tree50937d7cb453dab5c1b0de6e96031f219fc8c1cc /drivers/mmc
parentf4b6a0a401f2cec5e6199e805ed42f30d8c04e94 (diff)
downloadlinux-3.10-7a2b94bc39915041304578188441f0f21aa5532a.tar.gz
linux-3.10-7a2b94bc39915041304578188441f0f21aa5532a.tar.bz2
linux-3.10-7a2b94bc39915041304578188441f0f21aa5532a.zip
[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.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/mmc/host/pxamci.h b/drivers/mmc/host/pxamci.h
index 1b163220df2..df17c281278 100644
--- 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)