summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2010-12-06 00:12:44 +0000
committerPaul Mundt <lethal@linux-sh.org>2010-12-08 16:24:21 +0900
commit9f843706bb87837b823228467f4f83973fd110e9 (patch)
tree8072b05668ce169120f74733f3a9cdda1e24ee80
parent22efa0fee32d9e7f6f6fbc396a872b5708d86048 (diff)
downloadlinux-stable-9f843706bb87837b823228467f4f83973fd110e9.tar.gz
linux-stable-9f843706bb87837b823228467f4f83973fd110e9.tar.bz2
linux-stable-9f843706bb87837b823228467f4f83973fd110e9.zip
mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h
Allow MMCIF_PROGRESS_* to be shared. Cc: Magnus Damm <magnus.damm@gmail.com> Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/boot/romimage/mmcif-sh7724.c3
-rw-r--r--include/linux/mmc/sh_mmcif.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/boot/romimage/mmcif-sh7724.c b/arch/sh/boot/romimage/mmcif-sh7724.c
index 14863d7292cb..16b9c6fa7ded 100644
--- a/arch/sh/boot/romimage/mmcif-sh7724.c
+++ b/arch/sh/boot/romimage/mmcif-sh7724.c
@@ -21,9 +21,6 @@
#define HIZCRC 0xa405015c
#define DRVCRA 0xa405018a
-enum { MMCIF_PROGRESS_ENTER, MMCIF_PROGRESS_INIT,
- MMCIF_PROGRESS_LOAD, MMCIF_PROGRESS_DONE };
-
/* SH7724 specific MMCIF loader
*
* loads the romImage from an MMC card starting from block 512
diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h
index ffabf8c0a531..6a98e97c49f8 100644
--- a/include/linux/mmc/sh_mmcif.h
+++ b/include/linux/mmc/sh_mmcif.h
@@ -97,6 +97,9 @@ static inline void sh_mmcif_writel(void __iomem *addr, int reg, u32 val)
#define SH_MMCIF_BBS 512 /* boot block size */
+enum { MMCIF_PROGRESS_ENTER, MMCIF_PROGRESS_INIT,
+ MMCIF_PROGRESS_LOAD, MMCIF_PROGRESS_DONE };
+
static inline void sh_mmcif_boot_cmd_send(void __iomem *base,
unsigned long cmd, unsigned long arg)
{