Merging debian version 4.19.269-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 14 insertions, 16 deletions

diff --git a/debian/config/powerpc/config.powerpc b/debian/config/powerpc/config.powerpc
index 63a07fb2e..b48d37302 100644
--- a/debian/config/powerpc/config.powerpc
+++ b/debian/config/powerpc/config.powerpc
@@ -5,6 +5,20 @@ CONFIG_HIGHMEM=y
 # CONFIG_ISA is not set
 
 ##
+## file: arch/powerpc/platforms/Kconfig.cputype
+##
+# CONFIG_PPC64 is not set
+## choice: Processor Type
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+## end choice
+CONFIG_ALTIVEC=y
+# CONFIG_SMP is not set
+
+##
 ## file: arch/powerpc/platforms/512x/Kconfig
 ##
 # CONFIG_MPC5121_ADS is not set
@@ -24,20 +38,6 @@ CONFIG_PPC_MPC5200_BUGFIX=y
 CONFIG_PPC_CHRP=y
 
 ##
-## file: arch/powerpc/platforms/Kconfig.cputype
-##
-# CONFIG_PPC64 is not set
-## choice: Processor Type
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-## end choice
-CONFIG_ALTIVEC=y
-# CONFIG_SMP is not set
-
-##
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_PATA_MPC52xx=m
@@ -110,4 +110,3 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 ## end choice
-
diff --git a/debian/config/powerpc/config.powerpc-smp b/debian/config/powerpc/config.powerpc-smp
index dfbaaf6d2..c49683792 100644
--- a/debian/config/powerpc/config.powerpc-smp
+++ b/debian/config/powerpc/config.powerpc-smp
@@ -3,4 +3,3 @@
 ##
 CONFIG_SMP=y
 CONFIG_NR_CPUS=4
-