[GIT PULL] omap fixes for v2.6.38-rc2

[Tony Lindgren]

Hi Linus,

Please pull some omap fixes from:

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

This is mostly to fix few compiler warning that sneaked in during the
merge window. Also included is one trivial omap1 related cleanup patch
to keep the code consistent with omap2+, and one PTR_ERR fix.

Regards,

Tony


The following changes since commit 6fb1b304255efc5c4c93874ac8c066272e257e28:

  Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (2011-01-26 16:31:44 +1000)

are available in the git repository at:

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

Felipe Balbi (1):
      arm: omap2: mux: fix compile warning

Julia Lawall (1):
      arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR

Russell King (1):
      omap2+: Fix unused variable warning for omap_irq_base

Tony Lindgren (1):
      omap1: Simplify use of omap_irq_flags

 arch/arm/mach-omap1/include/mach/entry-macro.S |   13 -------------
 arch/arm/mach-omap1/irq.c                      |    2 +-
 arch/arm/mach-omap2/dma.c                      |    2 +-
 arch/arm/mach-omap2/include/mach/entry-macro.S |   14 --------------
 arch/arm/mach-omap2/io.c                       |    6 ++----
 arch/arm/mach-omap2/mux.c                      |    2 +-
 6 files changed, 5 insertions(+), 34 deletions(-)