Hi Pierre,

Here's a fix to make omap.c compile again because of a name conflict
introduced by 3efcdd76c4906236f9043c8b34837818177b291d.

Regards,

Tony