projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usb: host: xhci-omap: Remove redundant board_usb_init and board_usb_cleanup functions
[oweals/u-boot.git]
/
drivers
/
mmc
/
sh_mmcif.c
diff --git
a/drivers/mmc/sh_mmcif.c
b/drivers/mmc/sh_mmcif.c
index bc4b3448119a1e6d3b4f0d7f5b5a68bb7f7e7237..1ff59f06d576b77dbfe1fc92ba7f44f5a9d0e006 100644
(file)
--- a/
drivers/mmc/sh_mmcif.c
+++ b/
drivers/mmc/sh_mmcif.c
@@
-12,7
+12,7
@@
#include <command.h>
#include <mmc.h>
#include <malloc.h>
#include <command.h>
#include <mmc.h>
#include <malloc.h>
-#include <
asm
/errno.h>
+#include <
linux
/errno.h>
#include <asm/io.h>
#include "sh_mmcif.h"
#include <asm/io.h>
#include "sh_mmcif.h"
@@
-539,7
+539,7
@@
static int sh_mmcif_request(struct mmc *mmc, struct mmc_cmd *cmd,
return ret;
}
return ret;
}
-static
void
sh_mmcif_set_ios(struct mmc *mmc)
+static
int
sh_mmcif_set_ios(struct mmc *mmc)
{
struct sh_mmcif_host *host = mmc->priv;
{
struct sh_mmcif_host *host = mmc->priv;
@@
-554,6
+554,8
@@
static void sh_mmcif_set_ios(struct mmc *mmc)
host->bus_width = MMC_BUS_WIDTH_1;
debug("clock = %d, buswidth = %d\n", mmc->clock, mmc->bus_width);
host->bus_width = MMC_BUS_WIDTH_1;
debug("clock = %d, buswidth = %d\n", mmc->clock, mmc->bus_width);
+
+ return 0;
}
static int sh_mmcif_init(struct mmc *mmc)
}
static int sh_mmcif_init(struct mmc *mmc)