summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2006-08-22 11:08:33 +0000
committerPhilipp Zabel <philipp.zabel@gmail.com>2006-08-22 11:08:33 +0000
commitac916651b26667327d7f78e33801cbd4e6bff8ed (patch)
tree13a8a3811b18d44ccdf8e638aed2d05471d227e6
parent5da68c2ea813c62978286f7f0df58a927448ff35 (diff)
parent14ef0be15b166f8fcce1c6e54ce9d6dedbecf442 (diff)
merge of '45bac0f69c12d8a3598b9178c26d8ed103e60bc7'
and 'bb05117c7225627eddadd5005388bf209a7d68d8'
-rw-r--r--packages/base-files/base-files/tosa/usbd6
-rw-r--r--packages/base-files/base-files_3.0.14.bb2
-rw-r--r--packages/netbase/netbase_4.21.bb2
-rw-r--r--packages/zaurus-updater/zaurus-updater.bb2
4 files changed, 8 insertions, 4 deletions
diff --git a/packages/base-files/base-files/tosa/usbd b/packages/base-files/base-files/tosa/usbd
index 40931ee8e9..8c80044167 100644
--- a/packages/base-files/base-files/tosa/usbd
+++ b/packages/base-files/base-files/tosa/usbd
@@ -1 +1,5 @@
-usbdmodule=pxa_bi
+# I know that this was created for usb-client stuff
+# but tosa/2.6 need (un)loading USB Host module
+# on suspend/resume and this way is simplest one ;)
+
+usbdmodule=ohci-hcd
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 85c0e84d6e..d4c03bdefe 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Miscellaneous files for the base system."
SECTION = "base"
PRIORITY = "required"
-PR = "r53"
+PR = "r54"
LICENSE = "GPL"
SRC_URI = " \
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index d79dbc2a26..8c0652daec 100644
--- a/packages/netbase/netbase_4.21.bb
+++ b/packages/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \
infrastructure for basic TCP/IP based networking."
SECTION = "base"
LICENSE = "GPL"
-PR = "r11"
+PR = "r12"
inherit update-rc.d
diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index 26cf1e5453..3a45a2bf74 100644
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -28,4 +28,4 @@ do_deploy() {
esac
}
-addtask deploy before do_build after do_compile
+addtask deploy before do_package after do_compile