diff --git a/[refs] b/[refs] index 33e7977385ca..cf32734654df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4aa3179c07fef5671ea87112b617a553634b841c +refs/heads/master: f0e0c09b88b23ec418c065739096e198e8d6be22 diff --git a/trunk/drivers/mtd/Kconfig b/trunk/drivers/mtd/Kconfig index 1be621841400..58c6020d4182 100644 --- a/trunk/drivers/mtd/Kconfig +++ b/trunk/drivers/mtd/Kconfig @@ -304,9 +304,6 @@ config MTD_OOPS buffer in a flash partition where it can be read back at some later point. - To use, add console=ttyMTDx to the kernel command line, - where x is the MTD device number to use. - config MTD_SWAP tristate "Swap on MTD device support" depends on MTD && SWAP