diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-11 19:50:00 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-11 19:50:00 +0100 |
| commit | 971c8e8aa28a0248d641328b15cda37195982e9c (patch) | |
| tree | 63aa8c4796dd9fd023ad3e2dd21108d29cf43eb3 | |
| parent | dd0ebf5e2e2cb11683e35f21414791051d1d5d46 (diff) | |
| parent | d41964993d2e0dd10a8a6b2fc9a240c1551c317c (diff) | |
| download | kernel-971c8e8aa28a0248d641328b15cda37195982e9c.tar.gz kernel-971c8e8aa28a0248d641328b15cda37195982e9c.tar.xz kernel-971c8e8aa28a0248d641328b15cda37195982e9c.zip | |
Merge remote-tracking branch 'origin/f27' into f27-user-thl-vanilla-fedora
| -rw-r--r-- | baseconfig/arm/CONFIG_SATA_SIL24 | 1 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-aarch64.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 2 |
7 files changed, 6 insertions, 7 deletions
diff --git a/baseconfig/arm/CONFIG_SATA_SIL24 b/baseconfig/arm/CONFIG_SATA_SIL24 deleted file mode 100644 index 7526a06a0..000000000 --- a/baseconfig/arm/CONFIG_SATA_SIL24 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SATA_SIL24 is not set diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index f33f78763..ff396d72a 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -4672,7 +4672,7 @@ CONFIG_SATA_MV=m CONFIG_SATA_PMP=y # CONFIG_SATA_PROMISE is not set # CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_SIL24 is not set +CONFIG_SATA_SIL24=m # CONFIG_SATA_SIL is not set # CONFIG_SATA_SIS is not set # CONFIG_SATA_SVW is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 29aae4ef4..37f6d0b9b 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -4650,7 +4650,7 @@ CONFIG_SATA_MV=m CONFIG_SATA_PMP=y # CONFIG_SATA_PROMISE is not set # CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_SIL24 is not set +CONFIG_SATA_SIL24=m # CONFIG_SATA_SIL is not set # CONFIG_SATA_SIS is not set # CONFIG_SATA_SVW is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index a86c609b4..f17ed6237 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -5027,7 +5027,7 @@ CONFIG_SATA_MV=m CONFIG_SATA_PMP=y # CONFIG_SATA_PROMISE is not set # CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_SIL24 is not set +CONFIG_SATA_SIL24=m # CONFIG_SATA_SIL is not set # CONFIG_SATA_SIS is not set # CONFIG_SATA_SVW is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 7a951727f..b48420708 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4720,7 +4720,7 @@ CONFIG_SATA_MV=m CONFIG_SATA_PMP=y # CONFIG_SATA_PROMISE is not set # CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_SIL24 is not set +CONFIG_SATA_SIL24=m # CONFIG_SATA_SIL is not set # CONFIG_SATA_SIS is not set # CONFIG_SATA_SVW is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index b1af61f64..5b66f23c0 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4698,7 +4698,7 @@ CONFIG_SATA_MV=m CONFIG_SATA_PMP=y # CONFIG_SATA_PROMISE is not set # CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_SIL24 is not set +CONFIG_SATA_SIL24=m # CONFIG_SATA_SIL is not set # CONFIG_SATA_SIS is not set # CONFIG_SATA_SVW is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 388b3c2ef..617ac9def 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -5005,7 +5005,7 @@ CONFIG_SATA_MV=m CONFIG_SATA_PMP=y # CONFIG_SATA_PROMISE is not set # CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_SIL24 is not set +CONFIG_SATA_SIL24=m # CONFIG_SATA_SIL is not set # CONFIG_SATA_SIS is not set # CONFIG_SATA_SVW is not set |