diff options
author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-13 01:16:06 +0000 |
---|---|---|
committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-13 01:16:06 +0000 |
commit | 57c9f3c40bc5feb31cc556ac96417458aff39348 (patch) | |
tree | 253eabda2469e0b9021d33339f259565c8880ab2 /conf | |
parent | ed120166740e2f1066e8ad3b6fab06e91c62dc56 (diff) | |
parent | 276b53c2bedc6975e9f7ef604b935638b9a375b7 (diff) |
merge of 'a3a912588e8a0d53b719b8da37d8e761d8cc2322'
and 'ac6a41120afb27a259a67613e3af6db33205c01b'
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/h4000.conf | 4 | ||||
-rw-r--r-- | conf/machine/htcuniversal.conf | 4 | ||||
-rw-r--r-- | conf/machine/hx4700.conf | 1 | ||||
-rw-r--r-- | conf/machine/rx3000.conf | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index 61d473929a..cd6a6dd6a1 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -24,7 +24,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \ - kernel-module-i2c-pxa" + kernel-module-i2c-pxa \ + kernel-module-acx \ + " # # Modules autoload and other boot properties diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 980fc0e2eb..dbf7b76e32 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -35,10 +35,6 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \ kernel-module-htcuniversal-acx \ kernel-module-acx \ kernel-module-i2c-algo-bit \ - kernel-module-rtc-sa1100 \ - kernel-module-rtc-dev \ - kernel-module-rtc-proc \ - kernel-module-rtc-sysfs \ " # diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 52eb09b933..5483a3337f 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -37,6 +37,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ kernel-module-i2c-pxa \ kernel-module-pxa27x-voltage \ kernel-module-pxa27x-voltage-max158xx \ + kernel-module-acx \ kernel-module-hx4700-acx \ kernel-module-hx4700-bt \ kernel-module-snd-hx4700-audio" diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf index 190b5f54dd..cc544ef7b1 100644 --- a/conf/machine/rx3000.conf +++ b/conf/machine/rx3000.conf @@ -24,6 +24,10 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.18-hh2" PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" +MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-acx \ + " + # # Modules autoload and other boot properties # |