Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef8d00ab authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-defconfig-for-v4.2' of... 

Merge tag 'renesas-defconfig-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig

Merge "Renesas ARM Based SoC Defconfig Updates for v4.2" from Simon Horman:

* Replace legacy-only USB_RCAR_GEN2_PHY with DT-only PHY_RCAR_GEN2

* tag 'renesas-defconfig-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: defconfig: Replace USB_RCAR_GEN2_PHY by PHY_RCAR_GEN2
parents e355eb0a 90037558

arch/arm/configs/shmobile_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ CONFIG_WATCHDOG=y 
CONFIG_DA9063_WATCHDOG=y

CONFIG_MFD_AS3711=y

CONFIG_MFD_DA9063=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_AS3711=y

CONFIG_REGULATOR_DA9210=y

CONFIG_REGULATOR_GPIO=y
@@ -160,7 +159,6 @@ CONFIG_USB_OHCI_HCD=y 
CONFIG_USB_R8A66597_HCD=y

CONFIG_USB_RENESAS_USBHS=y

CONFIG_USB_RCAR_PHY=y

CONFIG_USB_RCAR_GEN2_PHY=y

CONFIG_USB_GADGET=y

CONFIG_USB_RENESAS_USBHS_UDC=y

CONFIG_USB_ETH=y
@@ -182,6 +180,8 @@ CONFIG_IIO=y 
CONFIG_AK8975=y

CONFIG_PWM=y

CONFIG_PWM_RENESAS_TPU=y

CONFIG_GENERIC_PHY=y

CONFIG_PHY_RCAR_GEN2=y

# CONFIG_DNOTIFY is not set

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y