Octeon build broken on 3.1.0-rc2 (linux-next)

I pulled a tree today from linux-next.git, and found that the octeon-mips build is broken; it fails to build arch/mips/cavium-octeon/flash_setup.c due to this patch:

http://patchwork.ozlabs.org/patch/101616/

The function parse_mtd_partitions() isn't exported from <linux/mtd/partition.h> any longer. Is this a known issue?

Thanks,

Jason