drivers: bus: omap_l3: fixup merge conflict resolution