ARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM restart changes