summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2007-08-28 10:11:17 +0000
committerFlorian Boor <florian.boor@kernelconcepts.de>2007-08-28 10:11:17 +0000
commit5ead06a435519c30c09f3df1d3c050399590c353 (patch)
tree40998815f2b2e3c23524d73df79105799bf732c4 /conf
parentf2cae3409080e9494bc4ac6731beb0b6b5c5a72c (diff)
parent6a86a1ac15b776ed9ef0c593be2567443626ce1a (diff)
merge of '2bc8a3eb9ed9de9cc86448fe66997525637bb09d'
and '4dafb02cdb0534d362beafb2ee3a1a6e136bc5c2'
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/palm.conf2
-rw-r--r--conf/machine/palmtx.conf13
2 files changed, 13 insertions, 2 deletions
diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.conf
index 821ebc4c03..5371016ea9 100644
--- a/conf/machine/include/palm.conf
+++ b/conf/machine/include/palm.conf
@@ -57,7 +57,7 @@ module_autoload_snd-timer = "snd-timer"
module_autoload_soundcore = "soundcore"
module_autoload_wm97xx-ts = "wm97xx-ts"
module_autoload_pxa27x-keyboard = "pxa27x-keyboard"
-module_autoload_palmtx-battery = "palmtx-battery"
+module_autoload_palmtx_battery = "palmtx_battery"
module_autoload_palmz72_battery = "palmz72_battery"
module_autoload_i2c-dev = "i2c-dev"
module_autoload_i2c-pxa = "i2c-pxa"
diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf
index 9f1f079cdc..e0db5f246b 100644
--- a/conf/machine/palmtx.conf
+++ b/conf/machine/palmtx.conf
@@ -15,4 +15,15 @@ SERIAL_CONSOLE = "115200 ttyS0"
MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
kernel-module-wm97xx-ts \
- kernel-module-palmtx-battery"
+ kernel-module-palmtx-battery \
+ kernel-module-palmtx-border \
+ kernel-module-bcm2035-uart \
+ kernel-module-palmtx-pcmcia \
+ kernel-module-pcmcia-core \
+ kernel-module-pda-power \
+ kernel-module-pxa2xx-core \
+ kernel-module-snd-pxa2xx-ac97 \
+ kernel-module-snd-pxa2xx-pcm"
+
+
+module_autoload_g_ether = "g_ether"