summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-02-07 19:51:14 +0000
committerKoen Kooi <koen@openembedded.org>2007-02-07 19:51:14 +0000
commit2d5b708058f50922ab9af2735b3d21281f3d2d73 (patch)
tree62f8ae825dc02ed4dbea21a6675bdda871742edb /conf/machine
parent61507ca7d6b3b629c6eb3ede1a9a01a08407f2cb (diff)
parent92f1049b080402154265defeddc869bb726cb0cc (diff)
merge of '400e309c08a8818180ce9e6440f4695a898cdf83'
and '918e51dad50cec492dd6963b204ad643f9ec7f35'
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/palmz72.conf1
-rw-r--r--conf/machine/progear.conf1
2 files changed, 2 insertions, 0 deletions
diff --git a/conf/machine/palmz72.conf b/conf/machine/palmz72.conf
index 85bce509b1..ae3e74bee4 100644
--- a/conf/machine/palmz72.conf
+++ b/conf/machine/palmz72.conf
@@ -22,3 +22,4 @@ require conf/machine/include/tune-xscale.conf
require conf/machine/include/tune-thumb.conf
module_autoload_sa1100-rtc = "sa1100-rtc"
+module_autoload_palmz72-battery = "palmz72-battery"
diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf
index 4cad129a9d..71eac0d6c5 100644
--- a/conf/machine/progear.conf
+++ b/conf/machine/progear.conf
@@ -7,6 +7,7 @@ TARGET_ARCH = "i686"
PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
OLDEST_KERNEL = "2.6.17"
GLIBC_ADDONS = "nptl"