Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
ata
/
Kconfig
diff --git
a/kernel/drivers/ata/Kconfig
b/kernel/drivers/ata/Kconfig
index
9dca4b9
..
6aaa3f8
100644
(file)
--- a/
kernel/drivers/ata/Kconfig
+++ b/
kernel/drivers/ata/Kconfig
@@
-48,7
+48,7
@@
config ATA_VERBOSE_ERROR
config ATA_ACPI
bool "ATA ACPI Support"
config ATA_ACPI
bool "ATA ACPI Support"
- depends on ACPI
&& PCI
+ depends on ACPI
default y
help
This option adds support for ATA-related ACPI objects.
default y
help
This option adds support for ATA-related ACPI objects.
@@
-98,6
+98,15
@@
config SATA_AHCI_PLATFORM
If unsure, say N.
If unsure, say N.
+config AHCI_BRCMSTB
+ tristate "Broadcom STB AHCI SATA support"
+ depends on ARCH_BRCMSTB
+ help
+ This option enables support for the AHCI SATA3 controller found on
+ STB SoC's.
+
+ If unsure, say N.
+
config AHCI_DA850
tristate "DaVinci DA850 AHCI SATA support"
depends on ARCH_DAVINCI_DA850
config AHCI_DA850
tristate "DaVinci DA850 AHCI SATA support"
depends on ARCH_DAVINCI_DA850
@@
-124,6
+133,15
@@
config AHCI_IMX
If unsure, say N.
If unsure, say N.
+config AHCI_CEVA
+ tristate "CEVA AHCI SATA support"
+ depends on OF
+ help
+ This option enables support for the CEVA AHCI SATA.
+ It can be found on the Xilinx Zynq UltraScale+ MPSoC.
+
+ If unsure, say N.
+
config AHCI_MVEBU
tristate "Marvell EBU AHCI SATA support"
depends on ARCH_MVEBU
config AHCI_MVEBU
tristate "Marvell EBU AHCI SATA support"
depends on ARCH_MVEBU
@@
-157,6
+175,15
@@
config AHCI_XGENE
help
This option enables support for APM X-Gene SoC SATA host controller.
help
This option enables support for APM X-Gene SoC SATA host controller.
+config AHCI_QORIQ
+ tristate "Freescale QorIQ AHCI SATA support"
+ depends on OF
+ help
+ This option enables support for the Freescale QorIQ AHCI SoC's
+ onboard AHCI SATA.
+
+ If unsure, say N.
+
config SATA_FSL
tristate "Freescale 3.0Gbps SATA support"
depends on FSL_SOC
config SATA_FSL
tristate "Freescale 3.0Gbps SATA support"
depends on FSL_SOC
@@
-827,7
+854,6
@@
config PATA_AT32
config PATA_AT91
tristate "PATA support for AT91SAM9260"
depends on ARM && SOC_AT91SAM9
config PATA_AT91
tristate "PATA support for AT91SAM9260"
depends on ARM && SOC_AT91SAM9
- depends on !ARCH_MULTIPLATFORM
help
This option enables support for IDE devices on the Atmel AT91SAM9260 SoC.
help
This option enables support for IDE devices on the Atmel AT91SAM9260 SoC.