From: Tony Lindgren <tony@atomide.com>
Date: Tue, 9 Dec 2008 19:57:05 +0000 (-0800)
Subject: Merge branch 'omap_hsmmc'
X-Git-Tag: v2.6.28-omap1~76
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=694653afe8eb75191734cd4e6477c3182cf880b7;p=linux-2.6-omap-h63xx.git

Merge branch 'omap_hsmmc'
---

694653afe8eb75191734cd4e6477c3182cf880b7
diff --cc drivers/mmc/host/omap_hsmmc.c
index 4ab132546eb,78c5c18d5b9..1fcc5443cf0
--- a/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