summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorGreg Gilbert <greg@treke.net>2004-08-29 03:35:09 +0000
committerGreg Gilbert <greg@treke.net>2004-08-29 03:35:09 +0000
commit96966adc50915e736af88c3d1635d9a2591ad8a1 (patch)
treec247b89d51568f03440e43b317de04e80664f422 /linux
parentab98cd1e47d4524844a792ee115fa39274871134 (diff)
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
Diffstat (limited to 'linux')
-rw-r--r--linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky2
1 files changed, 1 insertions, 1 deletions
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 fa57d577b7..6504a782b8 100644
--- 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