diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2005-09-22 14:08:21 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-22 14:08:21 +0000 |
| commit | 89dd14a2a673ab49867fa1e815a9238b9ea183eb (patch) | |
| tree | 69fb61ccc6029696336b95b5f6705ba133f2f5ef /packages/linux | |
| parent | 58c854e12629358f21447f5a031acc6e41086537 (diff) | |
| parent | 879f9f39cbb2d061ac85ad8a7ebce71b0aa6760b (diff) | |
merge of 42b169fabe3df723d70a1502561f5848f1287a98
and a7038c05fef716879570b18652c839a87a2a65f8
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.14-rc1-mm1.bb | 5 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.14-rc1.bb | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/packages/linux/linux-openzaurus_2.6.14-rc1-mm1.bb b/packages/linux/linux-openzaurus_2.6.14-rc1-mm1.bb index a11db4d307..c266d8bf03 100644 --- a/packages/linux/linux-openzaurus_2.6.14-rc1-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.14-rc1-mm1.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" @@ -38,6 +38,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${RPSRC}/pxa_ohci_platform-r1.patch;patch=1 \ ${RPSRC}/pxa_ohci_suspend-r0.patch;patch=1 \ ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \ + ${RPSRC}/ide_not_removable-r0.patch;patch=1 \ ${RPSRC}/corgi_pm-r3.patch;patch=1 \ ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \ ${RPSRC}/spitz_pm-r3.patch;patch=1 \ @@ -71,7 +72,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${DOSRC}/tosa-irda-r3.patch;patch=1 \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r7.patch;patch=1 \ - ${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \ + ${RPSRC}/pcmcia_dev_ids-r2.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ diff --git a/packages/linux/linux-openzaurus_2.6.14-rc1.bb b/packages/linux/linux-openzaurus_2.6.14-rc1.bb index 28643b8142..3b374340cc 100644 --- a/packages/linux/linux-openzaurus_2.6.14-rc1.bb +++ b/packages/linux/linux-openzaurus_2.6.14-rc1.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r1" +PR = "r2" # Handy URLs # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \ @@ -27,6 +27,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${RPSRC}/poodle_cleanup-r0.patch;patch=1 \ ${RPSRC}/poodle_mmc-r0.patch;patch=1 \ ${RPSRC}/poodle_irda-r0.patch;patch=1 \ + ${RPSRC}/ide_not_removable-r0.patch;patch=1 \ ${RPSRC}/scoop_collie_fix-r0.patch;patch=1 \ ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \ ${RPSRC}/corgi_pm-r3.patch;patch=1 \ @@ -62,7 +63,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${DOSRC}/tosa-irda-r3.patch;patch=1 \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5a.patch;patch=1 \ - ${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \ + ${RPSRC}/pcmcia_dev_ids-r2.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ |