• Linus Torvalds's avatar
    Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · ac9e7ab3
    Linus Torvalds authored
    Pull ARM soc cleanups, part 2 from Olof Johansson:
     "A shorter cleanup branch submitted separately due to dependencies with
      some of the previous topics.
    
      Major thing here is that the Broadcom bcmring platform is removed.
      It's an SoC that's used on some stationary VoIP platforms, and is in
      desperate need of some cleanup.  Broadcom came back and suggested that
      we just deprecate the platform for now, since they aren't going to
      spend the resources needed on cleaning it up, and there are no users
      of the platform directly from mainline."
    
    Fix some conflicts due to BCM2835 getting added next to the removed
    BCMRING, and removal of tegra files that had been converted to
    devicetree.
    
    * tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: Orion5x: ts78xx: Add IOMEM for virtual addresses.
      ARM: ux500: use __iomem pointers for MMIO
      ARM: Remove mach-bcmring
      ARM: clps711x: Remove board support for CEIVA
      ARM: clps711x: Fix register definitions
      ARM: clps711x: Fix lowlevel debug-macro
      ARM: clps711x: Added simple clock framework
      pinctrl: tegra: move pinconf-tegra.h content into drivers/pinctrl
      ARM: tegra: delete unused headers
      ARM: tegra: remove useless includes of <mach/*.h>
      ARM: tegra: remove dead code
    ac9e7ab3
Makefile 11.2 KB