diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-15 18:36:53 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-15 18:36:53 +0300 |
| commit | ef8d00abca1a6de4f2d896a9cdcee4ee5b04373b (patch) | |
| tree | abbcfc6c82d1e387747413c9a18640fcc6855c7d /arch/arm/configs | |
| parent | e355eb0a28c02da54b02b391d513142a0eee2447 (diff) | |
| parent | 90037558d5ed25a63499c3973cc1af25da02f673 (diff) | |
| download | linux-ef8d00abca1a6de4f2d896a9cdcee4ee5b04373b.tar.xz | |
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
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/shmobile_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index b58618e2d13c..9961fbd633f8 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -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 |