These are changes that have been sitting in linux-omap
and were never sent upstream.

Hopefully, it'll never happen again at least for this
driver.
Signed-off-by: NFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: NWim Van Sebroeck <wim@iguana.be>