The patch titled mtd m25p80: fix bug - ATmel spi flash fails to be copied to - fix up has been removed from the -mm tree. Its filename was mtd-m25p80-fix-bug-atmel-spi-flash-fails-to-be-copied-to-fix-up.patch This patch was dropped because it was folded into mtd-m25p80-fix-bug-atmel-spi-flash-fails-to-be-copied-to.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mtd m25p80: fix bug - ATmel spi flash fails to be copied to - fix up From: Michael Hennerich <michael.hennerich@xxxxxxxxxx> remove duplicate code. Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx> Signed-off-by: Bryan Wu <cooloney@xxxxxxxxxx> Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/mtd/devices/m25p80.c | 2 -- 1 file changed, 2 deletions(-) diff -puN drivers/mtd/devices/m25p80.c~mtd-m25p80-fix-bug-atmel-spi-flash-fails-to-be-copied-to-fix-up drivers/mtd/devices/m25p80.c --- a/drivers/mtd/devices/m25p80.c~mtd-m25p80-fix-bug-atmel-spi-flash-fails-to-be-copied-to-fix-up +++ a/drivers/mtd/devices/m25p80.c @@ -122,8 +122,6 @@ static int write_sr(struct m25p *flash, flash->command[0] = OPCODE_WRSR; flash->command[1] = val; - spi_write(flash->spi, flash->command, 2); - return spi_write(flash->spi, flash->command, 2); } _ Patches currently in -mm which might be from michael.hennerich@xxxxxxxxxx are linux-next.patch pcmcia-add-support-the-cf-pcmcia-driver-for-blackfin-try-2.patch input-touchscreen-driver-add-support-ad7877-touchscreen-driver.patch mtd-m25p80-fix-bug-atmel-spi-flash-fails-to-be-copied-to.patch mtd-m25p80-fix-bug-atmel-spi-flash-fails-to-be-copied-to-fix-up.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html