diff options
author | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-11-18 09:48:40 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-11-18 09:48:40 +0000 |
commit | c916c07dc3e6597f63dc5486daaab03f6cb2b49a (patch) | |
tree | fdcc2968d89eb8460ee7ee1e314de9e3e5303fb8 /conf | |
parent | e661da73478c651edde4f8a043ab61b2b43857eb (diff) | |
parent | f9fa013a67614490729c3a4a514637ec54bf4430 (diff) |
merge of '764fab90ce78632168aaaa389123bbc7beacc0af'
and '9ef42c4cea604726d2f11a3693579baae9320074'
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/debianslug.conf | 5 | ||||
-rw-r--r-- | conf/distro/openslug.conf | 5 | ||||
-rw-r--r-- | conf/machine/nokia770.conf | 4 |
3 files changed, 2 insertions, 12 deletions
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf index e86ffa028c..c570d7c18f 100644 --- a/conf/distro/debianslug.conf +++ b/conf/distro/debianslug.conf @@ -77,7 +77,6 @@ DEBIANSLUG_STANDARD_RDEPENDS += "\ kernel-module-ext2 \ kernel-module-jbd \ kernel-module-ext3 \ -kernel-module-nfs \ kernel-module-vfat \ kernel-module-ntfs \ kernel-module-isofs \ @@ -86,10 +85,6 @@ kernel-module-reiserfs \ kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ " -# Add modules required for firmware loading -DEBIANSLUG_STANDARD_RDEPENDS += "\ -kernel-module-firmware-class \ -" # Add module to create i2c chardev DEBIANSLUG_STANDARD_RDEPENDS += "\ diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index c24001f3f4..4277888bfa 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -77,7 +77,6 @@ OPENSLUG_STANDARD_RDEPENDS += "\ kernel-module-ext2 \ kernel-module-jbd \ kernel-module-ext3 \ -kernel-module-nfs \ kernel-module-vfat \ kernel-module-ntfs \ kernel-module-isofs \ @@ -86,10 +85,6 @@ kernel-module-reiserfs \ kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ " -# Add modules required for firmware loading -OPENSLUG_STANDARD_RDEPENDS += "\ -kernel-module-firmware-class \ -" # Add module to create i2c chardev OPENSLUG_STANDARD_RDEPENDS += "\ diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 7069639330..aa57bb4563 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -2,7 +2,7 @@ #@NAME: Nokia 770 internet tablet #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4 armv5te" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" PREFERRED_PROVIDER_virtual/bootloader = "" @@ -33,4 +33,4 @@ ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost" MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init" -MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file +MACHINE_TASK_PROVIDER = "task-base" |