• Olof Johansson's avatar
    Merge tag 'omap-cleanup-renames-for-v3.5' of... · 5056c073
    Olof Johansson authored
    Merge tag 'omap-cleanup-renames-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup2
    
    Simplify some SoC config options before things get too unreadable.
    
    Note that this depends on a fix in omap-fixes-non-critical-for-v3.5,
    so it's based on that.
    
    By Kevin Hilman (3) and others
    via Tony Lindgren
    * tag 'omap-cleanup-renames-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
      ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX
      ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX
      ARM: OMAP: igep0020: Specify the VPLL2 regulator unconditionally
      ARM: OMAP2+: INTC: fix Kconfig option for TI81XX
      ARM: OMAP2+: remove incorrect irq_chip ack field
      ARM: OMAP4: Adding ID for OMAP4460 ES1.1
      ARM: OMAP4: panda: add statics to remove warnings
      ARM: OMAP2+: Incorrect Register Offsets in OMAP Mailbox
      ARM: OMAP: fix trivial warnings for dspbridge
      ARM: OMAP4: hsmmc: check for null pointer
      ARM: OMAP1: fix compilation issue in board-sx1.c
    5056c073
id.c 11.8 KB