On Fri, 2008-08-01 at 11:44 -0500, Kumar Gala wrote:

Now that arch/ppc is gone we don't need CONFIG_PPC_MERGE anymore
remove the dead code associated with !CONFIG_PPC_MERGE.

The mtd maps should be using the OF based mechanism.

Signed-off-by: Kumar Gala <redacted>

Acked-by: Josh Boyer <redacted>