Merge branch 'drivers/ocp2scp' into next/drivers

* drivers/ocp2scp:
  drivers: bus: omap-ocp2scp: Fix compile error