[GIT PULL] few omap fixups for v3.5 merge window

[Tony Lindgren]

Hi Arnd & Olof,

Here are the fixes needed for the regressions caused by
omap-cleanup-sparse-for-v3.5. I suggest pulling this into
arm-soc/omap/cleanup-sparse where the issues got introduced.

Regards,

Tony


The following changes since commit 09f45b83109cb8e23a06d5efb1096a08a9545974:

  Merge tag 'omap-cleanup-a2-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into cleanup-sparse (2012-04-18 10:09:26 -0700)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap fixes-for-cleanup

for you to fetch changes up to 19b08b33fa4c60d66d4e341d4d1d9a6e86ffc9e6:

  ARM: OMAP: OTG integration: fix compiler warning (2012-05-11 09:56:43 -0700)

----------------------------------------------------------------
Turns out the earlier omap-cleanup-sparse-for-v3.5
up introduced one compile issue and a new warning.

----------------------------------------------------------------
Paul Walmsley (2):
      ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 builds
      ARM: OMAP: OTG integration: fix compiler warning

 arch/arm/mach-omap1/common.h |    4 ++++
 arch/arm/plat-omap/usb.c     |    4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)