summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-11-19 05:10:07 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-11-19 05:10:07 +0100
commit95389432beaceaea2feadf77009ec530b45f37e0 (patch)
treeddaf3ae1f3afdf821db13e67ae7f2e04ae1f6e45 /configs
parent30837c8b9257534e97ed8b34d3c1cbfbb5ce71f6 (diff)
parentc1ab92cfa5f277e77d3d9cabcb8320d2efab35fd (diff)
downloadkernel-95389432beaceaea2feadf77009ec530b45f37e0.tar.gz
kernel-95389432beaceaea2feadf77009ec530b45f37e0.tar.xz
kernel-95389432beaceaea2feadf77009ec530b45f37e0.zip
Merge remote-tracking branch 'origin/f33' into f33-user-thl-vanilla-fedora
Diffstat (limited to 'configs')
-rw-r--r--configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE2
-rw-r--r--configs/fedora/generic/CONFIG_ATH11K2
-rw-r--r--configs/fedora/generic/CONFIG_ATH11K_DEBUG1
-rw-r--r--configs/fedora/generic/CONFIG_ATH11K_DEBUGFS1
-rw-r--r--configs/fedora/generic/CONFIG_ATH11K_SPECTRAL1
-rw-r--r--configs/fedora/generic/CONFIG_ATH11K_TRACING1
-rw-r--r--configs/fedora/generic/CONFIG_MTD_NAND_NANDSIM2
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND_NANDSIM1
8 files changed, 7 insertions, 4 deletions
diff --git a/configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE b/configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE
index 3ac21bf3a..276233fba 100644
--- a/configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE
+++ b/configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE
@@ -1 +1 @@
-# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_TABLE_UPGRADE=y
diff --git a/configs/fedora/generic/CONFIG_ATH11K b/configs/fedora/generic/CONFIG_ATH11K
index 584c5e3f1..7927e05a0 100644
--- a/configs/fedora/generic/CONFIG_ATH11K
+++ b/configs/fedora/generic/CONFIG_ATH11K
@@ -1 +1 @@
-# CONFIG_ATH11K is not set
+CONFIG_ATH11K=m
diff --git a/configs/fedora/generic/CONFIG_ATH11K_DEBUG b/configs/fedora/generic/CONFIG_ATH11K_DEBUG
new file mode 100644
index 000000000..8c3c7f975
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_ATH11K_DEBUG
@@ -0,0 +1 @@
+# CONFIG_ATH11K_DEBUG is not set
diff --git a/configs/fedora/generic/CONFIG_ATH11K_DEBUGFS b/configs/fedora/generic/CONFIG_ATH11K_DEBUGFS
new file mode 100644
index 000000000..d4a25f6c3
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_ATH11K_DEBUGFS
@@ -0,0 +1 @@
+CONFIG_ATH11K_DEBUGFS=y
diff --git a/configs/fedora/generic/CONFIG_ATH11K_SPECTRAL b/configs/fedora/generic/CONFIG_ATH11K_SPECTRAL
new file mode 100644
index 000000000..92bb5d3e5
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_ATH11K_SPECTRAL
@@ -0,0 +1 @@
+# CONFIG_ATH11K_SPECTRAL is not set
diff --git a/configs/fedora/generic/CONFIG_ATH11K_TRACING b/configs/fedora/generic/CONFIG_ATH11K_TRACING
new file mode 100644
index 000000000..0ba056e8a
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_ATH11K_TRACING
@@ -0,0 +1 @@
+# CONFIG_ATH11K_TRACING is not set
diff --git a/configs/fedora/generic/CONFIG_MTD_NAND_NANDSIM b/configs/fedora/generic/CONFIG_MTD_NAND_NANDSIM
index 2a4811528..500e1e796 100644
--- a/configs/fedora/generic/CONFIG_MTD_NAND_NANDSIM
+++ b/configs/fedora/generic/CONFIG_MTD_NAND_NANDSIM
@@ -1 +1 @@
-# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_NANDSIM=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND_NANDSIM b/configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND_NANDSIM
deleted file mode 100644
index 500e1e796..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND_NANDSIM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_NAND_NANDSIM=m