rm dup s390 patch

svn path=/dists/trunk/linux-2.6/; revision=6219
This commit is contained in:
maximilian attems 2006-03-20 08:51:48 +00:00
parent 9b54669a7e
commit 8c01a12a4b
3 changed files with 2 additions and 17 deletions

4
debian/changelog vendored
View File

@ -26,9 +26,9 @@ linux-2.6 (2.6.16-1) UNRELEASED; urgency=low
* New upstream release 2.6.16.
* Add myself to the Uploaders.
* Remove merged patches: mips-sb1-irq-hazard.patch, mips-gettimeofday.patch,
mips-io-bad-code.patch.
mips-io-bad-code.patch, s390-drivers-subchannel-fix.patch.
-- maximilian attems <maks@sternwelten.at> Mon, 20 Mar 2006 09:41:52 +0100
-- maximilian attems <maks@sternwelten.at> Mon, 20 Mar 2006 09:46:22 +0100
linux-2.6 (2.6.15+2.6.16-rc5-0experimental.1) experimental; urgency=low

View File

@ -1,14 +0,0 @@
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 1bbf231..3c77d65 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -409,6 +409,9 @@ __init_channel_subsystem(struct subchann
/* -ENXIO: no more subchannels. */
case -ENXIO:
return ret;
+ /* -EIO: this subchannel set not supported. */
+ case -EIO:
+ return ret;
default:
return 0;
}

View File

@ -24,4 +24,3 @@
+ video-vino-64-bit-fix-kernel.diff
+ s390-drivers-ccw-uevent-modalias.patch
+ s390-drivers-ccw-uevent-cleanup.patch
+ s390-drivers-subchannel-fix.patch