summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-12-22 17:45:39 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-12-22 17:45:39 +0000
commitf28ee88811a977c1e59d06a30f7cfb2ce380659f (patch)
treed8b38fa91f2853ecc25cfee9f4de3c9e75f87246
parentd100d1ab103e98a8778e74372ca20441c3cda9c4 (diff)
parentfe7ea931e48423fca6fc61d795a0089adefedc6c (diff)
merge of '447b400a2b8caf7591734fb1f909d36eda572edc'
and 'b781317fba3fb746b1b5c4ba5bab647df2775330'
-rw-r--r--conf/machine/h2200.conf2
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index b54859b913..cad7d0393c 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -40,7 +40,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
#
module_autoload_snd-pcm-oss = "snd-pcm-oss"
module_autoload_snd-mixer-oss = "snd-mixer-oss"
-module_autoload_snd-h2000-audio = "snd-h2000-audio"
+module_autoload_snd-h2200-audio = "snd-h2200-audio"
SERIAL_CONSOLE = "115200 ttyS0 vt100"
USE_VT = "0"
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
index cb6e7efc13..52e72bbd8d 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"