Some modifications to make the kernel build.
thank you chrisdiamand/fredvj
Change-Id: Id1b0b9d32d17f48d9fdd094aa830b62ec3965e2c