From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 23 Feb 2020 12:20:11 +0000 (+0100)
Subject: kernel: Sort generic configuration
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=27358ec8fdc87890073e720d6e5e336793c3e7ec;p=oweals%2Fopenwrt.git

kernel: Sort generic configuration

This was done by executing these commands:

$ ./scripts/kconfig.pl '+' target/linux/generic/config-4.19 /dev/null > target/linux/generic/config-4.19-new
$ mv target/linux/generic/config-4.14-new target/linux/generic/config-4.14

$ ./scripts/kconfig.pl '+' target/linux/generic/config-4.14 /dev/null > target/linux/generic/config-4.14-new
$ mv target/linux/generic/config-4.19-new target/linux/generic/config-4.19

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14
index d1ce30d2f7..e42139744a 100644
--- a/target/linux/generic/config-4.14
+++ b/target/linux/generic/config-4.14
@@ -731,9 +731,9 @@ CONFIG_CC_STACKPROTECTOR_NONE=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_CEPH_FS is not set
 # CONFIG_CEPH_LIB is not set
-# CONFIG_CFQ_GROUP_IOSCHED is not set
 # CONFIG_CFG80211 is not set
 # CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+# CONFIG_CFQ_GROUP_IOSCHED is not set
 # CONFIG_CGROUPS is not set
 # CONFIG_CGROUP_BPF is not set
 # CONFIG_CGROUP_DEBUG is not set
diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19
index d78ab02a6d..c98991611d 100644
--- a/target/linux/generic/config-4.19
+++ b/target/linux/generic/config-4.19
@@ -506,10 +506,10 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BITREVERSE=y
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
 # CONFIG_BLK_CMDLINE_PARSER is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CGROUP_IOLATENCY is not set
 # CONFIG_BLK_DEBUG_FS is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -3687,7 +3687,6 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PCIE_KIRIN is not set
 # CONFIG_PCIE_PTM is not set
 # CONFIG_PCIE_XILINX is not set
-# CONFIG_PCI_V3_SEMI is not set
 # CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_PCI_ATMEL is not set
 # CONFIG_PCI_CNB20LE_QUIRK is not set
@@ -3712,6 +3711,7 @@ CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCI_SW_SWITCHTEC is not set
 CONFIG_PCI_SYSCALL=y
+# CONFIG_PCI_V3_SEMI is not set
 # CONFIG_PCI_XGENE is not set
 # CONFIG_PCMCIA is not set
 # CONFIG_PCMCIA_3C574 is not set
@@ -3838,11 +3838,11 @@ CONFIG_PPP_MULTILINK=y
 # CONFIG_PPS_DEBUG is not set
 # CONFIG_PPTP is not set
 # CONFIG_PREEMPT is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_PREEMPTIRQ_EVENTS is not set
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_TRACER is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPTIRQ_EVENTS is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_PRINTK=y
 CONFIG_PRINTK_NMI=y