diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2008-03-07 17:51:54 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2008-03-07 17:51:54 +0000 |
| commit | 89c29837788a5ded6c71ce3f834fe3f8e7a9cba0 (patch) | |
| tree | ddc32a0a28706621c8a21923297036b909b8cece | |
| parent | 01699d54e835aca39c96dc2edf8bdc6ca4afadcb (diff) | |
| parent | 4245e6a3732548a37bc3497fd55045744f054e48 (diff) | |
merge of '24bae19acc08cfef78544f0893bc16d124a3f204'
and 'a3b18a00a09e716f4b3d5bfced86fea0439953a0'
| -rw-r--r-- | conf/machine/h2200.conf | 1 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index cad7d0393c..4c7e413fa0 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -41,6 +41,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-h2200-audio = "snd-h2200-audio" +module_autoload_g_ether = "g_ether" 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 066c17faed..672d038619 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 = "r14" +PR = "r15" DEFAULT_PREFERENCE = "-1" |