Reorganise s390 config files

s390x/config is shared with s390, so move it to kernelarch-s390/config
where it will be automatically used for both of them.

s390x/config.s390x is also shared, so move it to
kernelarch-s390/config-arch-64.


svn path=/dists/trunk/linux/; revision=21266

4 files changed, 7 insertions, 2 deletions

diff --git a/debian/config/s390x/config b/debian/config/kernelarch-s390/config
index cdea30355a0f..cdea30355a0f 100644
--- a/debian/config/s390x/config
+++ b/debian/config/kernelarch-s390/config
diff --git a/debian/config/s390x/config.s390x b/debian/config/kernelarch-s390/config-arch-64
index 3b6fb2a26104..3b6fb2a26104 100644
--- a/debian/config/s390x/config.s390x
+++ b/debian/config/kernelarch-s390/config-arch-64
diff --git a/debian/config/s390/defines b/debian/config/s390/defines
index 2b3e7f4c69c1..21cca5435954 100644
--- a/debian/config/s390/defines
+++ b/debian/config/s390/defines
@@ -8,7 +8,7 @@ image-file: arch/s390/boot/image
 
 [image]
 bootloaders: s390-tools
-configs: s390x/config
+configs:
 install-stem: vmlinuz
 
 [relations]
@@ -21,5 +21,5 @@ debug-info: true
 hardware: IBM zSeries
 
 [s390x_image]
-configs: s390x/config.s390x
+configs: kernelarch-s390/config-arch-64
 
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
index 558a03b86f5c..21cca5435954 100644
--- a/debian/config/s390x/defines
+++ b/debian/config/s390x/defines
@@ -8,6 +8,7 @@ image-file: arch/s390/boot/image
 
 [image]
 bootloaders: s390-tools
+configs:
 install-stem: vmlinuz
 
 [relations]
@@ -18,3 +19,7 @@ debug-info: true
 
 [s390x_description]
 hardware: IBM zSeries
+
+[s390x_image]
+configs: kernelarch-s390/config-arch-64
+