From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/mmc/omap.c | 6 ------ include/linux/mmc/mmc.h | 4 ---- 2 files changed, 10 deletions(-) diff -puN drivers/mmc/omap.c~git-mmc-fixup drivers/mmc/omap.c --- a/drivers/mmc/omap.c~git-mmc-fixup +++ a/drivers/mmc/omap.c @@ -203,18 +203,12 @@ mmc_omap_start_command(struct mmc_omap_h cmdtype = 0; /* Our hardware needs to know exact type */ -<<<<<<< HEAD/drivers/mmc/omap.c switch (mmc_resp_type(cmd)) { case MMC_RSP_NONE: break; case MMC_RSP_R1: case MMC_RSP_R1B: /* resp 1, 1b, 6, 7 */ -======= - switch (RSP_TYPE(mmc_resp_type(cmd))) { - case RSP_TYPE(MMC_RSP_R1): - /* resp 1, 1b, 6, 7 */ ->>>>>>> /drivers/mmc/omap.c resptype = 1; break; case MMC_RSP_R2: diff -puN include/linux/mmc/mmc.h~git-mmc-fixup include/linux/mmc/mmc.h --- a/include/linux/mmc/mmc.h~git-mmc-fixup +++ a/include/linux/mmc/mmc.h @@ -42,12 +42,8 @@ struct mmc_command { #define MMC_RSP_R1B (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY) #define MMC_RSP_R2 (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC) #define MMC_RSP_R3 (MMC_RSP_PRESENT) -<<<<<<< HEAD/include/linux/mmc/mmc.h -#define MMC_RSP_R6 (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE) -======= #define MMC_RSP_R6 (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE) #define MMC_RSP_R7 (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE) ->>>>>>> /include/linux/mmc/mmc.h #define mmc_resp_type(cmd) ((cmd)->flags & (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE)) _