aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Michlmayr <tbm@cyrius.com>2006-03-26 21:58:01 +0000
committerMartin Michlmayr <tbm@cyrius.com>2006-03-26 21:58:01 +0000
commiteaebb209294952c226028397ac2a39e332002f48 (patch)
tree6079b039738e4f8d04c8e55b7dd356834da77e9d
parentb209666078f250f55b6e6930dc91e0c4414c4d65 (diff)
downloadkernel_replicant_linux-eaebb209294952c226028397ac2a39e332002f48.tar.gz
kernel_replicant_linux-eaebb209294952c226028397ac2a39e332002f48.tar.bz2
kernel_replicant_linux-eaebb209294952c226028397ac2a39e332002f48.zip
[mips/sb1*] Use ttyS rather than duart as the name for the serial console
since the latter causes problems with debian-installer. svn path=/dists/sid/linux-2.6/; revision=6293
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/mips-sb1-duart.patch4
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 98c0182d1766..0eb61ceb816f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ linux-2.6 (2.6.16-3) UNRELEASED; urgency=low
[ Martin Michlmayr ]
* [arm/armeb] Enable CONFIG_NFSD on NSLU2 again. Closes: #358709.
* [arm/footbridge] CONFIG_NE2K_PCI should be a module, not built-in.
+ * [mips/sb1*] Use ttyS rather than duart as the name for the serial
+ console since the latter causes problems with debian-installer.
[ Bastian Blank ]
* Update vserver patch to 2.0.2-rc14.
diff --git a/debian/patches/mips-sb1-duart.patch b/debian/patches/mips-sb1-duart.patch
index 00cba6f0e1ec..20932678f68a 100644
--- a/debian/patches/mips-sb1-duart.patch
+++ b/debian/patches/mips-sb1-duart.patch
@@ -812,8 +812,8 @@ diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
+ return -ENOMEM;
+
+ sb1250_duart_driver->owner = THIS_MODULE;
-+ sb1250_duart_driver->name = "duart";
-+ sb1250_duart_driver->devfs_name = "duart/";
++ sb1250_duart_driver->name = "ttyS";
++ sb1250_duart_driver->devfs_name = "tts/";
+ sb1250_duart_driver->major = TTY_MAJOR;
+ sb1250_duart_driver->minor_start = SB1250_DUART_MINOR_BASE;
+ sb1250_duart_driver->type = TTY_DRIVER_TYPE_SERIAL;