diff options
author | Philip Balister <philip@balister.org> | 2007-08-28 11:28:14 +0000 |
---|---|---|
committer | Philip Balister <philip@balister.org> | 2007-08-28 11:28:14 +0000 |
commit | 9dc18f05c344dc37214540d90550f72787265acc (patch) | |
tree | cfbb3616af86969c9dbd10a8d0f7909349c56200 /conf/machine | |
parent | e8b2b2f03520c9602984fe3153559d2576c3f9bc (diff) | |
parent | 364152cb3c7bd6f666a8ca8964e949297412bac2 (diff) |
merge of '4990ba855f0ea2bae626b67500e77e88d48dabca'
and '95e88a1838246f2647083a1824d4136e4b3f2073'
Diffstat (limited to 'conf/machine')
-rw-r--r-- | conf/machine/include/palm.conf | 2 | ||||
-rw-r--r-- | conf/machine/palmtx.conf | 13 |
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" |