Edits to allow kernel to be built with Mahdi-Rom source