summaryrefslogtreecommitdiffstats
path: root/debian/config
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-07 02:25:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-07 02:29:41 +0000
commit9571ba558dd1c8d85f256458a38f157f05c6b166 (patch)
treeb46789c0d1d9afb1140fd51c5942cfdfe1789e9b /debian/config
parentMerging upstream version 6.1.90. (diff)
downloadlinux-9571ba558dd1c8d85f256458a38f157f05c6b166.tar.xz
linux-9571ba558dd1c8d85f256458a38f157f05c6b166.zip
Merging debian version 6.1.90-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/config')
-rw-r--r--debian/config/config2
-rw-r--r--debian/config/config.cloud1
-rw-r--r--debian/config/defines2
-rw-r--r--debian/config/m68k/config1
4 files changed, 2 insertions, 4 deletions
diff --git a/debian/config/config b/debian/config/config
index c08682ae6..146d8ac0b 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5205,7 +5205,7 @@ CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set
CONFIG_MOXA_SMARTIO=m
CONFIG_SYNCLINK_GT=m
-CONFIG_N_GSM=m
+# CONFIG_N_GSM is not set
CONFIG_NOZOMI=m
##
diff --git a/debian/config/config.cloud b/debian/config/config.cloud
index 915ccf4ad..51e8d085c 100644
--- a/debian/config/config.cloud
+++ b/debian/config/config.cloud
@@ -1245,7 +1245,6 @@ CONFIG_HYPERV_STORAGE=m
##
# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_N_HDLC is not set
-# CONFIG_N_GSM is not set
# CONFIG_NOZOMI is not set
##
diff --git a/debian/config/defines b/debian/config/defines
index b3f340c71..2b6c4a43b 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -1,5 +1,5 @@
[abi]
-abiname: 20progress6.99u1
+abiname: 21
ignore-changes:
__cpuhp_*
__udp_gso_segment
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index d1c23c2f6..abfbbb61b 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -519,7 +519,6 @@ CONFIG_BVME6000_SCSI=m
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_N_GSM is not set
##
## file: drivers/tty/serial/Kconfig