diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-13 00:47:52 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-13 00:47:52 -0400 |
| commit | ff8a19c2e6fff95ace32f2ae536c38493ef9cad1 (patch) | |
| tree | 628f4dbfce87a3b92b07065f3647d9b8cf1c7a45 | |
| parent | 109528b2be2c0c893dcb07abdb34a1f01f6ad665 (diff) | |
| parent | 8cbf869a0a278c4d39e50daa4f4101b394a72a93 (diff) | |
Merge tag 'renesas-defconfig3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
Merge "Third Round of Renesas ARM Based SoC Defconfig Updates for v3.17" from
Simon Horman:
- Enable R-Car Gen 2 PCIe in shmobile_defconfig
* tag 'renesas-defconfig3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Enable R-Car Gen 2 PCIe in shmobile_defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/configs/shmobile_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 5f05e98eb762..6bc85a5539f1 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig | |||
| @@ -24,6 +24,7 @@ CONFIG_PL310_ERRATA_588369=y | |||
| 24 | CONFIG_ARM_ERRATA_754322=y | 24 | CONFIG_ARM_ERRATA_754322=y |
| 25 | CONFIG_PCI=y | 25 | CONFIG_PCI=y |
| 26 | CONFIG_PCI_RCAR_GEN2=y | 26 | CONFIG_PCI_RCAR_GEN2=y |
| 27 | CONFIG_PCI_RCAR_GEN2_PCIE=y | ||
| 27 | CONFIG_SMP=y | 28 | CONFIG_SMP=y |
| 28 | CONFIG_SCHED_MC=y | 29 | CONFIG_SCHED_MC=y |
| 29 | CONFIG_HAVE_ARM_ARCH_TIMER=y | 30 | CONFIG_HAVE_ARM_ARCH_TIMER=y |