• Olof Johansson's avatar
    Merge branch 'orion/cleanup' into orion/dt · 52cfa7e5
    Olof Johansson authored
    Merge in the cleanups that should have been used as the base of the DT
    branch instead of letting the conflicts be exposed all the way up to
    the toplevel merges.
    
    All of these are caused by cleanups being done both in the cleanup branch
    and the dt branch, resulting in remove/remove conflicts of header files.
    
    By Andrew Lunn (3) and others
    via Jason Cooper
    * orion/cleanup:
      ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
      ARM: Kirkwood: checkpatch cleanups
      ARM: Kirkwood: Fix sparse warnings.
      ARM: Kirkwood: Remove unused includes
      ARM: kirkwood: cleanup lsxl board includes
    
    Remove/remove conflicts in:
    	arch/arm/mach-kirkwood/board-dockstar.c
    	arch/arm/mach-kirkwood/board-goflexnet.c
    	arch/arm/mach-kirkwood/board-lsxl.c
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    52cfa7e5
board-dockstar.c 840 Bytes