• Olof Johansson's avatar
    Merge tag 'renesas-defconfig-for-v4.5' of... · 4f3ab841
    Olof Johansson authored
    Merge tag 'renesas-defconfig-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
    
    Renesas ARM Based SoC Defconfig Updates for v4.5
    
    * multi_v7_defconfig and shmobile_defconfig:
      - Enable frame buffer console for armadillo800eva
      - Enable missing Renesas ARM support based on DTSes
      - Drop useless CONFIG_USB_RCAR_PHY=y
    * shmobile_defconfig only:
      - Enable CONFIG_PRINTK_TIME
    
    * tag 'renesas-defconfig-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
      ARM: multi_v7_defconfig: Enable frame buffer console for armadillo800eva
      ARM: multi_v7_defconfig: Enable missing Renesas ARM support based on DTSes
      ARM: multi_v7_defconfig: Drop useless CONFIG_USB_RCAR_PHY=y
      ARM: shmobile: defconfig: Enable frame buffer console for armadillo800eva
      ARM: shmobile: defconfig: Enable missing support based on DTSes
      ARM: shmobile: defconfig: Drop useless CONFIG_USB_RCAR_PHY=y
      ARM: shmobile: defconfig: Enable CONFIG_PRINTK_TIME
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    
    Conflicts:
    	arch/arm/configs/multi_v7_defconfig
    4f3ab841
multi_v7_defconfig 18 KB