summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-07-12 21:25:22 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-07-12 21:25:22 +0000
commitc20aac68281e6494217920186ef69db63e4f9dd8 (patch)
treebb0f7e76702efa9199fd03a2e303593250bba950 /conf
parentd832f2f1a4a547f70b3d3efd3b75fa7dfe72d5f1 (diff)
h4000.conf, htcblueangel.conf: Blacklist acx from autoloading while PCMCIA support is buggy yet.
* P.S. This doesn't really work as OE's module handling is broken.
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/h4000.conf1
-rw-r--r--conf/machine/htcblueangel.conf2
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index 5aeab899b3..f48f560d0f 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -35,6 +35,7 @@ module_autoload_snd-pcm-oss = "snd-pcm-oss"
module_autoload_snd-mixer-oss = "snd-mixer-oss"
module_autoload_snd-h4000_audio = "snd-h4000_audio"
module_autoload_g_ether = "g_ether"
+module_conf_acx = "blacklist acx"
SERIAL_CONSOLE = "115200 ttyS0 vt100"
USE_VT = "0"
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index 5f2814844d..261ebb8916 100644
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -49,7 +49,7 @@ module_autoload_blueangel_audio = "blueangel_audio"
module_autoload_bluenagel_leds = "bleangel_leds"
module_autoload_hci_uart = "hci_uart"
module_autoload_snd-mixer-oss = "snd-mixer-oss"
-
+module_conf_acx = "blacklist acx"
SERIAL_CONSOLE = "115200 ttyS0 vt100"
USE_VT = "0"