Merge bk://openembedded@openembedded.bkbits.net/packages

into olddog.home.treke.net:/home/ggilbert/oe/packages

2004/08/28 20:34:35-07:00 treke.net!ggilbert
defconfig-husky:
  Working around the long stall caused by pcmcia. CONFIG_SERIAL_CONSOLE is interacting poorly with another option we use in OE.

BKrev: 41314eedaiMXJCf9ktSh4J0ntBcNpw

diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky
index fa57d57..6504a78 100644 (file)
--- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky
+++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky
@@ -1053,7 +1053,7 @@ CONFIG_BLK_DEV_IDECS=y
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_SERIAL=y
-CONFIG_SERIAL_CONSOLE=y
+# CONFIG_SERIAL_CONSOLE is not set
 CONFIG_SERIAL_SL_SERIES=y
 # CONFIG_SL_TS_PRESSURE is not set
 CONFIG_SL7X0_POWER_KEY_OFF=y