Merge branch 'omap_hsmmc'

diff --cc drivers/mmc/host/omap_hsmmc.c
index 4ab132546eb18b5ae756ae03c07b109f41b7488e,78c5c18d5b95ee36d874113a38ed2a83a26d8d80..1fcc5443cf0dd1d9398e6ea0e20d72833a99145d
--- 1/drivers/mmc/host/omap_hsmmc.c
--- 2/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@@ -98,12 -98,9 +98,9 @@@
  #define OMAP_MMC1_DEVID               0
  #define OMAP_MMC2_DEVID               1
  
- #define OMAP_MMC_DATADIR_NONE 0
- #define OMAP_MMC_DATADIR_READ 1
- #define OMAP_MMC_DATADIR_WRITE        2
  #define MMC_TIMEOUT_MS                20
  #define OMAP_MMC_MASTER_CLOCK 96000000
 -#define DRIVER_NAME           "mmci-omap"
 +#define DRIVER_NAME           "mmci-omap-hs"
  
  /*
   * One controller can have multiple slots, like on some omap boards using