diff options
| author | Philip Balister <philip@balister.org> | 2007-08-27 21:17:49 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2007-08-27 21:17:49 +0000 |
| commit | 5522ece8da310438a9c65aeaa50b86f161540f46 (patch) | |
| tree | e8ea8fa4174003fef1f1f15a5bc001cef7f87e5c /conf/distro/angstrom-2007.1.conf | |
| parent | f75321ab96544448059ecb2a5910db00ce3f7e74 (diff) | |
| parent | 19d1ceccd6b74ae0a084b8bb41da040d3dc5b2bf (diff) | |
merge of '610425fd34abfbbedaf9b3792ed2d884bdda9fd3'
and '9b318dc0ed758bbc0cbe978a0ff4471831b1df53'
Diffstat (limited to 'conf/distro/angstrom-2007.1.conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index d0e732bcc9..6d5d84a794 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -220,8 +220,6 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh12" RDEPENDS_kernel-base_hx4700 = "" RDEPENDS_kernel-base_htcuniversal = "" -PREFERRED_VERSION_linux_at91sam9263ek ?= "2.6.20" - # Needed for crappy ipaqs with broken hostap in the kernel PREFERRED_VERSION_hostap-modules ?= "0.4.7" PREFERRED_VERSION_hostap-utils ?= "0.4.7" @@ -249,6 +247,8 @@ PREFERRED_VERSION_osb-jscore = "0.5.2+svn${SRCDATE}" PREFERRED_VERSION_osb-nrcit = "0.5.2+svn${SRCDATE}" PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}" +PREFERRED_PROVIDER_avahi = "avahi" + #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" |