summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-05-26 21:45:24 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-05-26 21:45:24 +0000
commit62d6f9d4a14aa04a9ef3c8f32658aac1ca3a3242 (patch)
treee7a2c1442379ab6ab968c7e9b126a54a6abbf693 /linux
parentd1ab9a58cfaf74ee20fce96b1ca9a39fc12da931 (diff)
disable CONFIG_PCMCIA_PROBE for collie
BKrev: 40b50ff4Jnot0aUkcn-SOTF8xNOhkA
Diffstat (limited to 'linux')
-rw-r--r--linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
index 40255c51a0..7634456e97 100644
--- a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
+++ b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
@@ -174,7 +174,7 @@ CONFIG_HOTPLUG=y
# PCMCIA/CardBus support
#
CONFIG_PCMCIA=y
-CONFIG_PCMCIA_PROBE=y
+# CONFIG_PCMCIA_PROBE is not set
# CONFIG_I82092 is not set
# CONFIG_I82365 is not set
# CONFIG_TCIC is not set
@@ -199,7 +199,7 @@ CONFIG_APM_CPU_IDLE=y
CONFIG_APM_DISPLAY_BLANK=y
CONFIG_APM_RTC_IS_GMT=y
# CONFIG_ARTHUR is not set
-CONFIG_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 jffs2_orphaned_inodes=delete console=null mem=16M probe_io=0"
+CONFIG_CMDLINE="See OE File"
# CONFIG_SHARPSL_BOOTLDR_PARAMS is not set
# CONFIG_LEDS is not set
CONFIG_ALIGNMENT_TRAP=y