diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-04-23 14:26:05 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-04-23 14:26:05 +0000 |
| commit | a8551c1c7552d496c7d74a80d833de23d6df1267 (patch) | |
| tree | 43da758b9fd07394288fdc148a5dcda3beabbbcc | |
| parent | 81654790f772904aef4021434d4f97febd4199d0 (diff) | |
| parent | db2ef2407794065450a28df0bafb5c01a9f48302 (diff) | |
merge of '4699a5e1d4242bae2ec7ffb11bfb87bd49e92de6'
and '8b5068649e32f09f7094cee79f900f1394bc9d65'
| -rw-r--r-- | conf/machine/collie.conf | 2 | ||||
| -rw-r--r-- | conf/machine/progear.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index c9cfe7744f..429463cc87 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" -MACHINE_KERNEL_VERSION ?= "2.4" +MACHINE_KERNEL_VERSION ?= "2.6" require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf index 71eac0d6c5..7c293d9ebf 100644 --- a/conf/machine/progear.conf +++ b/conf/machine/progear.conf @@ -13,7 +13,7 @@ OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" -MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen" +MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen touchscreen" IMAGE_FSTYPES = "tar.gz" |