[GIT PULL] two trivial omap build error fixes for v3.8 merge window

On Wed, Dec 19, 2012 at 09:18:28AM -0800, Tony Lindgren wrote:

Hi Arnd & Olof,

Here's few more trivial build fixes caused by the merge
conflicts.

Tony


The following changes since commit 5031a2a7c12b837a0913c4139ebeb6bbff5e1aa5:

  Merge tag 'for-v3.8-part2' of git://git.infradead.org/battery-2.6 (2012-12-19 08:14:08 -0800)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/fixes-for-merge-window-part2-signed

Thanks, pulled.

-Olof