[linux] 05/06: [s390x] Combine and rename kconfig files to the default per-arch filename

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 9198664479c7f4c53f923d138be9c3b3a3f4a50c
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed May 18 04:25:29 2016 +0100

    [s390x] Combine and rename kconfig files to the default per-arch filename
    
    Since we no longer build any kernel packages for s390, there is no
    reason to keep these files under kernelarch-s390, or to keep them
    separate from each other.
---
 debian/config/kernelarch-s390/config-arch-64    | 17 -----------------
 debian/config/{kernelarch-s390 => s390x}/config | 13 +++++++++++++
 debian/config/s390x/defines                     |  5 -----
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/debian/config/kernelarch-s390/config-arch-64 b/debian/config/kernelarch-s390/config-arch-64
deleted file mode 100644
index 08d1109..0000000
--- a/debian/config/kernelarch-s390/config-arch-64
+++ /dev/null
@@ -1,17 +0,0 @@
-##
-## file: arch/s390/Kconfig
-##
-## choice: Processor type
-CONFIG_MARCH_Z900=y
-# CONFIG_MARCH_Z990 is not set
-# CONFIG_MARCH_Z9_109 is not set
-# CONFIG_MARCH_Z10 is not set
-## end choice
-CONFIG_PCI=y
-
-##
-## file: drivers/pci/hotplug/Kconfig
-##
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_S390=y
-
diff --git a/debian/config/kernelarch-s390/config b/debian/config/s390x/config
similarity index 92%
rename from debian/config/kernelarch-s390/config
rename to debian/config/s390x/config
index 89108dc..f11fada 100644
--- a/debian/config/kernelarch-s390/config
+++ b/debian/config/s390x/config
@@ -1,6 +1,12 @@
 ##
 ## file: arch/s390/Kconfig
 ##
+## choice: Processor type
+CONFIG_MARCH_Z900=y
+# CONFIG_MARCH_Z990 is not set
+# CONFIG_MARCH_Z9_109 is not set
+# CONFIG_MARCH_Z10 is not set
+## end choice
 CONFIG_COMPAT=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=32
@@ -9,6 +15,7 @@ CONFIG_SCHED_TOPOLOGY=y
 CONFIG_PACK_STACK=y
 # CONFIG_CHECK_STACK is not set
 CONFIG_QDIO=y
+CONFIG_PCI=y
 CONFIG_PCI_NR_FUNCTIONS=64
 CONFIG_PCI_NR_MSI=256
 CONFIG_CHSC_SCH=m
@@ -91,6 +98,12 @@ CONFIG_S390_PRNG=m
 # CONFIG_WAN is not set
 
 ##
+## file: drivers/pci/hotplug/Kconfig
+##
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_S390=y
+
+##
 ## file: drivers/s390/block/Kconfig
 ##
 CONFIG_BLK_DEV_XPRAM=m
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
index 517ed75..7131bd0 100644
--- a/debian/config/s390x/defines
+++ b/debian/config/s390x/defines
@@ -9,7 +9,6 @@ vdso: true
 
 [image]
 bootloaders: s390-tools
-configs:
 install-stem: vmlinuz
 
 [relations]
@@ -20,7 +19,3 @@ debug-info: true
 
 [s390x_description]
 hardware: IBM zSeries
-
-[s390x_image]
-configs: kernelarch-s390/config-arch-64
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git