diff options
| author | James Morris <james.morris@microsoft.com> | 2019-01-22 14:33:10 -0800 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-01-22 14:33:10 -0800 |
| commit | 9624d5c9c7ff6836bbf9f9b230fd1fcf3d56f91a (patch) | |
| tree | e9c1e5d2400ad20c5a9cd633b52a42a00d1d98cb /drivers/ata/Kconfig | |
| parent | 3e8c73671244af16f1a6042f1c10d13b75cd1156 (diff) | |
| parent | 49a57857aeea06ca831043acbb0fa5e0f50602fd (diff) | |
| download | linux-9624d5c9c7ff6836bbf9f9b230fd1fcf3d56f91a.tar.bz2 | |
Merge tag 'v5.0-rc3' into next-general
Sync to Linux 5.0-rc3 to pull in the VFS changes which impacted a lot
of the LSM code.
Diffstat (limited to 'drivers/ata/Kconfig')
| -rw-r--r-- | drivers/ata/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 4ca7a6b4eaae..8218db17ebdb 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -1091,7 +1091,7 @@ comment "Generic fallback / legacy drivers" config PATA_ACPI tristate "ACPI firmware driver for PATA" - depends on ATA_ACPI && ATA_BMDMA + depends on ATA_ACPI && ATA_BMDMA && PCI help This option enables an ACPI method driver which drives motherboard PATA controller interfaces through the ACPI |