diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-01-27 23:59:57 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-01-27 23:59:57 +0100 |
| commit | 11ce1c84e98a594caf7b501d8428c06a42c8e3c7 (patch) | |
| tree | b1c105ac5ce3a8657b5e5c2fa46a40f24a7bd49b /packages/kexecboot/linux-kexecboot_2.6.24.bb | |
| parent | b4ce41c571c04d324e5bf67a1647277c467f5b99 (diff) | |
| parent | ffee230ed0b6c49ef4a0b23bc850b843c429f19a (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/kexecboot/linux-kexecboot_2.6.24.bb')
| -rw-r--r-- | packages/kexecboot/linux-kexecboot_2.6.24.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/kexecboot/linux-kexecboot_2.6.24.bb b/packages/kexecboot/linux-kexecboot_2.6.24.bb index f68c770a85..a0540fe189 100644 --- a/packages/kexecboot/linux-kexecboot_2.6.24.bb +++ b/packages/kexecboot/linux-kexecboot_2.6.24.bb @@ -1,6 +1,6 @@ require linux-kexecboot.inc -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "-1" @@ -53,7 +53,7 @@ SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ file://sharpsl-rc-r1.patch;patch=1 \ file://sharpsl-rc-r2.patch;patch=1 \ file://squashfs3.3.patch;patch=1;status=external \ - ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable \ +# ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ file://hostap-monitor-mode.patch;patch=1;status=unmergable \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1;status=unmergable \ |