[MTD] m25p80: fix merge error

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=2830dbac4dc9b5c671d25dce999edc8df76ac344
Commit:     2830dbac4dc9b5c671d25dce999edc8df76ac344
Parent:     e7cda75bc62c547b5c88c2d1a5ed68531520dfa5
Author:     David Woodhouse <David.Woodhouse at intel.com>
AuthorDate: Fri Jan 9 16:53:09 2009 +0000
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Fri Jan 9 16:53:09 2009 +0000

    [MTD] m25p80: fix merge error
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/devices/m25p80.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index da03fb6..4259880 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -235,15 +235,12 @@ static int m25p80_erase(struct mtd_info *mtd, struct erase_info *instr)
 	u32 addr,len;
 	uint32_t rem;
 
-<<<<<<< HEAD:drivers/mtd/devices/m25p80.c
 	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%llx, len %lld\n",
 	      dev_name(&flash->spi->dev), __func__, "at",
 	      (long long)instr->addr, (long long)instr->len);
-=======
 	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %d\n",
 			dev_name(&flash->spi->dev), __func__, "at",
 			(u32)instr->addr, instr->len);
->>>>>>> 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f:drivers/mtd/devices/m25p80.c
 
 	/* sanity checks */
 	if (instr->addr + instr->len > flash->mtd.size)