I've collected all the changes recently discussed in a whole patchset. If you are just reading this for the first time please take a look at: [1] http://www.spinics.net/lists/linux-omap/msg110965.html [2] http://www.spinics.net/lists/linux-omap/msg110958.html As requested by Roger, the omap_elm is a 'bool' driver now. The plan is to merge it inside omap2_nand, but my queue is really filled, so if anyone feels like doing, please be my guest. Although I'm hoping this to be the last round, feedback and testing is welcome. Brian: I wonder if it's too late for v3.18? Thanks! Ezequiel Garcia (5): nand: omap2: Remove horrible ifdefs to fix module probe nand: omap2: Replace pr_err with dev_err mtd: nand: Move ELM driver and rename as omap_elm mtd: nand: Rename OMAP NAND driver mtd: nand: Constrain omap_elm to built-in drivers/mtd/devices/Makefile | 1 - drivers/mtd/nand/Kconfig | 2 +- drivers/mtd/nand/Makefile | 3 +- drivers/mtd/nand/{omap2.c => omap2_nand.c} | 160 ++++++++++++++----------- drivers/mtd/{devices/elm.c => nand/omap_elm.c} | 0 include/linux/platform_data/elm.h | 16 +++ 6 files changed, 107 insertions(+), 75 deletions(-) rename drivers/mtd/nand/{omap2.c => omap2_nand.c} (95%) rename drivers/mtd/{devices/elm.c => nand/omap_elm.c} (100%) -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html