This reverts commit d9c3f5df53, which should not have been merged via mmc-next. It's in arm-soc instead now.
d9c3f5df53