From f225911f0c94c3a638800b304f7fc9e6e216a6f1 Mon Sep 17 00:00:00 2001
From: Laura Abbott <labbott@redhat.com>
Date: Tue, 10 Dec 2019 09:16:42 -0500
Subject: Revert "Goodbye CONFIG_AX25"

This reverts commit e3676c312d6ce5efd03da004aef14a0cdb3b6f56.

Turns out I cannot read and this is not the correct option.
---
 configs/fedora/generic/CONFIG_AX25      | 2 +-
 kernel-aarch64-debug-fedora.config      | 3 ++-
 kernel-aarch64-fedora.config            | 3 ++-
 kernel-armv7hl-debug-fedora.config      | 3 ++-
 kernel-armv7hl-fedora.config            | 3 ++-
 kernel-armv7hl-lpae-debug-fedora.config | 3 ++-
 kernel-armv7hl-lpae-fedora.config       | 3 ++-
 kernel-i686-debug-fedora.config         | 2 +-
 kernel-i686-fedora.config               | 2 +-
 kernel-ppc64le-debug-fedora.config      | 2 +-
 kernel-ppc64le-fedora.config            | 2 +-
 kernel-s390x-debug-fedora.config        | 2 +-
 kernel-s390x-fedora.config              | 2 +-
 kernel-x86_64-debug-fedora.config       | 2 +-
 kernel-x86_64-fedora.config             | 2 +-
 15 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/configs/fedora/generic/CONFIG_AX25 b/configs/fedora/generic/CONFIG_AX25
index bc6101574..2838a653a 100644
--- a/configs/fedora/generic/CONFIG_AX25
+++ b/configs/fedora/generic/CONFIG_AX25
@@ -1 +1 @@
-# CONFIG_AX25 is not set
+CONFIG_AX25=m
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 4044702e8..28254cdc7 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -479,7 +479,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-# CONFIG_AX25 is not set
+CONFIG_AX25=m
 CONFIG_AX88796B_PHY=m
 CONFIG_AXI_DMAC=m
 CONFIG_AXP20X_ADC=m
@@ -4842,6 +4842,7 @@ CONFIG_QCOM_L2_PMU=y
 CONFIG_QCOM_L3_PMU=y
 CONFIG_QCOM_LLCC=m
 CONFIG_QCOM_MDT_LOADER=m
+CONFIG_QCOM_OCMEM=m
 CONFIG_QCOM_PDC=y
 CONFIG_QCOM_Q6V5_ADSP=m
 CONFIG_QCOM_Q6V5_MSS=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 661ef6843..8249c6f61 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -479,7 +479,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-# CONFIG_AX25 is not set
+CONFIG_AX25=m
 CONFIG_AX88796B_PHY=m
 CONFIG_AXI_DMAC=m
 CONFIG_AXP20X_ADC=m
@@ -4821,6 +4821,7 @@ CONFIG_QCOM_L2_PMU=y
 CONFIG_QCOM_L3_PMU=y
 CONFIG_QCOM_LLCC=m
 CONFIG_QCOM_MDT_LOADER=m
+CONFIG_QCOM_OCMEM=m
 CONFIG_QCOM_PDC=y
 CONFIG_QCOM_Q6V5_ADSP=m
 CONFIG_QCOM_Q6V5_MSS=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 754209543..cc709585f 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -474,7 +474,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-# CONFIG_AX25 is not set
+CONFIG_AX25=m
 CONFIG_AX88796_93CX6=y
 CONFIG_AX88796B_PHY=m
 CONFIG_AX88796=m
@@ -4929,6 +4929,7 @@ CONFIG_QCOM_HFPLL=m
 # CONFIG_QCOM_HIDMA_MGMT is not set
 CONFIG_QCOM_IOMMU=y
 # CONFIG_QCOM_LLCC is not set
+CONFIG_QCOM_OCMEM=m
 CONFIG_QCOM_PDC=y
 CONFIG_QCOM_PM8XXX_XOADC=m
 CONFIG_QCOM_PM=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 6ac7b14d5..76ce11adf 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -474,7 +474,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-# CONFIG_AX25 is not set
+CONFIG_AX25=m
 CONFIG_AX88796_93CX6=y
 CONFIG_AX88796B_PHY=m
 CONFIG_AX88796=m
@@ -4909,6 +4909,7 @@ CONFIG_QCOM_HFPLL=m
 # CONFIG_QCOM_HIDMA_MGMT is not set
 CONFIG_QCOM_IOMMU=y
 # CONFIG_QCOM_LLCC is not set
+CONFIG_QCOM_OCMEM=m
 CONFIG_QCOM_PDC=y
 CONFIG_QCOM_PM8XXX_XOADC=m
 CONFIG_QCOM_PM=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index f33973b77..afe55162f 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -461,7 +461,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-# CONFIG_AX25 is not set
+CONFIG_AX25=m
 CONFIG_AX88796_93CX6=y
 CONFIG_AX88796B_PHY=m
 CONFIG_AX88796=m
@@ -4737,6 +4737,7 @@ CONFIG_QCOM_HFPLL=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_LLCC is not set
+CONFIG_QCOM_OCMEM=m
 CONFIG_QCOM_PDC=y
 CONFIG_QCOM_PM8XXX_XOADC=m
 CONFIG_QCOM_RMTFS_MEM=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 526ea28a4..884d35185 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -461,7 +461,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-# CONFIG_AX25 is not set
+CONFIG_AX25=m
 CONFIG_AX88796_93CX6=y
 CONFIG_AX88796B_PHY=m
 CONFIG_AX88796=m
@@ -4717,6 +4717,7 @@ CONFIG_QCOM_HFPLL=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_LLCC is not set
+CONFIG_QCOM_OCMEM=m
 CONFIG_QCOM_PDC=y
 CONFIG_QCOM_PM8XXX_XOADC=m
 CONFIG_QCOM_RMTFS_MEM=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 9a5a07a24..2762ea22d 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -344,7 +344,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-# CONFIG_AX25 is not set
+CONFIG_AX25=m
 CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 01da40bdf..78b7577b5 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -343,7 +343,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-# CONFIG_AX25 is not set
+CONFIG_AX25=m
 CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index a01242b5e..ba79b178d 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -284,7 +284,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-# CONFIG_AX25 is not set
+CONFIG_AX25=m
 CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 569dc7eff..d33dfbc25 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -283,7 +283,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-# CONFIG_AX25 is not set
+CONFIG_AX25=m
 CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 1f1cddad0..bc424312b 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -288,7 +288,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 # CONFIG_AUXDISPLAY is not set
 CONFIG_AX25_DAMA_SLAVE=y
-# CONFIG_AX25 is not set
+CONFIG_AX25=m
 CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 3b1d283d7..c192e4f26 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -287,7 +287,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 # CONFIG_AUXDISPLAY is not set
 CONFIG_AX25_DAMA_SLAVE=y
-# CONFIG_AX25 is not set
+CONFIG_AX25=m
 CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 9b6278cef..48b89c3d4 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -347,7 +347,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-# CONFIG_AX25 is not set
+CONFIG_AX25=m
 CONFIG_AX88796B_PHY=m
 # CONFIG_AXP20X_ADC is not set
 # CONFIG_AXP20X_POWER is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index d6f3fbf68..a28baaadc 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -346,7 +346,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
-# CONFIG_AX25 is not set
+CONFIG_AX25=m
 CONFIG_AX88796B_PHY=m
 # CONFIG_AXP20X_ADC is not set
 # CONFIG_AXP20X_POWER is not set
-- 
cgit