diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-12-16 20:33:52 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-12-16 20:33:52 -0600 |
| commit | 75e2d5300fc98dccb3b99031daf1081a8952a738 (patch) | |
| tree | df130108bbac39067b9ad1cbda2f4fd4116da59e /linaro/configs/vexpress64.conf | |
| parent | fe7e08f8621d68222f1c65599d8c8d10f0cf5164 (diff) | |
| parent | 6844488aaa6b23d45106c9c3c3ba2f2ee4a612f9 (diff) | |
Merge tag 'lsk-v4.1-15.11' of http://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lng-v4.1linux-lng-4.1.13-2015.12
LSK 15.11 v4.1
Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
Conflicts:
linaro/configs/preempt-rt.conf
linaro/configs/vexpress64.conf
Diffstat (limited to 'linaro/configs/vexpress64.conf')
| -rw-r--r-- | linaro/configs/vexpress64.conf | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf index d71287f2b447..f88ca4ac062c 100644 --- a/linaro/configs/vexpress64.conf +++ b/linaro/configs/vexpress64.conf @@ -32,15 +32,10 @@ CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_MMIO=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_CMA=y -CONFIG_DMA_CMA=y -CONFIG_COMMON_CLK_SCPI=y # CONFIG_DEBUG_PREEMPT is not set CONFIG_SMSC911X=y CONFIG_I2C=y CONFIG_I2C_DESIGNWARE_PLATFORM=y -CONFIG_ARM_MHU_MBOX=y -CONFIG_ARM_SCPI_PROTOCOL=y CONFIG_USB_HIDDEV=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y @@ -48,15 +43,21 @@ CONFIG_USB_STORAGE=y CONFIG_USB=y CONFIG_USB_ULPI=y CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_HCD_SYNOPSYS=y CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_NOP_USB_XCEIV=y CONFIG_USB_OHCI_HCD=y -CONFIG_USB_PHY=y -CONFIG_USB_ISP1301=y -CONFIG_PM_OPP=y -CONFIG_GENERIC_CPUFREQ_CPU0=y -CONFIG_ARM_BIG_LITTLE_CPUFREQ=y -CONFIG_ARM_DT_BL_CPUFREQ=y -CONFIG_ARM64_CPUIDLE=y -CONFIG_ARM64_CRYPTO=y +CONFIG_PCI=y +CONFIG_PCI_MSI=y +CONFIG_PCI_REALLOC_ENABLE_AUTO=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +CONFIG_PCI_HOST_GENERIC=y +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_PCIE=y +CONFIG_PCIEAER=y +CONFIG_PCIE_ECRC=y +CONFIG_CONNECTOR=y +CONFIG_ATA=y +CONFIG_SATA_SIL24=y +CONFIG_SKY2=y |