update to 2.6.26-rc6

refresh conflicting dfsg computone patch, just mark the ip2 thing b0rked.
nuke git snapshot patch.

svn path=/dists/trunk/linux-2.6/; revision=11627
This commit is contained in:
Maximilian Attems 2008-06-13 09:45:51 +00:00
parent 990dbfde88
commit edfd2e9b5d
4 changed files with 12 additions and 7482 deletions

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
linux-2.6 (2.6.26~rc5-1~experimental.1) UNRELEASED; urgency=low
linux-2.6 (2.6.26~rc6-1~experimental.1) UNRELEASED; urgency=low
* New upstream release
- UDF 2.50 support. (closes: #480910)

File diff suppressed because it is too large Load Diff

View File

@ -1,21 +1,15 @@
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 2d854bb..7d3f39e 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -100,15 +99,0 @@
-config COMPUTONE
- tristate "Computone IntelliPort Plus serial support"
- depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
- ---help---
- This driver supports the entire family of Intelliport II/Plus
- controllers with the exception of the MicroChannel controllers and
- products previous to the Intelliport II. These are multiport cards,
- which give you many serial ports. You would need something like this
- to connect more than two modems to your Linux box, for instance in
- order to become a dial-in server. If you have a card like that, say
- Y here and read <file:Documentation/computone.txt>.
-
- To compile this driver as modules, choose M here: the
- modules will be called ip2 and ip2main.
-
@@ -108,6 +108,7 @@ config SERIAL_NONSTANDARD
config COMPUTONE
tristate "Computone IntelliPort Plus serial support"
+ depends on BROKEN
depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
---help---
This driver supports the entire family of Intelliport II/Plus
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -36 +35,0 @@

View File

@ -1,4 +1,4 @@
+ bugfix/all/patch-2.6.26-rc5-git3
#+ bugfix/all/patch-2.6.26-rc5-git3
+ debian/version.patch
+ debian/kernelvariables.patch
+ debian/doc-build-parallel.patch