diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-04-26 09:11:29 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-04-26 09:11:29 +0000 |
| commit | 421d9d967bf81a56eaef9d51ba875fe32ec03454 (patch) | |
| tree | 5d9b97d31ca0deb07a6e575e9c33b217609d1dcc /conf | |
| parent | 24139e94255b11de7287325c955af25be165eae9 (diff) | |
| parent | 0c0263c009bf9be6ffe9192d3e3c468a081e6382 (diff) | |
merge of '558f128d4627bb3e20bb42388a205dc5c37c3f70'
and 'b72cc6057e9627154aecce088453bf8b23314ccc'
Diffstat (limited to 'conf')
| -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" |