aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2011-01-22 23:10:51 +0000
committerJohn Crispin <john@openwrt.org>2011-01-22 23:10:51 +0000
commit275c33c6f80cbe30adb09d9442b42756762308c1 (patch)
treebf2a03def1c99573ae02f6b6528e9779ba37c443 /target/linux
parentdeb9a1f3e7aecbc0a237df3a432c164affef261f (diff)
downloadupstream-275c33c6f80cbe30adb09d9442b42756762308c1.tar.gz
upstream-275c33c6f80cbe30adb09d9442b42756762308c1.tar.bz2
upstream-275c33c6f80cbe30adb09d9442b42756762308c1.zip
* Make sure that Geos baud-rate defaults correctly Changeset 23414 somehow got reordered. The unconditional default trumps later settings.
contributed by Philip Prindeville SVN-Revision: 25068
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/x86/image/Config.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index 3557e63c2f..958e43e384 100644
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -21,8 +21,8 @@ config X86_GRUB_BAUDRATE
int "Serial port baud rate"
depends X86_GRUB_IMAGES
default 19200 if TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501
- default 38400
default 115200 if TARGET_x86_geos
+ default 38400
config X86_GRUB_BOOTOPTS
string "Extra kernel boot options"