Merge branch 'drivers/ocp2scp' into next/drivers

* drivers/ocp2scp:
  drivers: bus: omap-ocp2scp: Fix compile error
This commit is contained in:
Olof Johansson 2012-09-04 17:02:46 -07:00
commit 7405a749ae