diff options
| author |   Richard Purdie <rpurdie@rpsys.net> | 2005-09-19 10:33:57 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-19 10:33:57 +0000 |
| commit | ab841bf389a2b5247240f4d2d70d08cad3bf30da (patch) | |
| tree | 7d2bdb7a61e821ec6505473a0c6f55577faedbe1 /packages/linux | |
| parent | 502c3f77505fed246711e021e4d5e6a87b1e01c8 (diff) | |
| download | openembedded-ab841bf389a2b5247240f4d2d70d08cad3bf30da.tar.gz | |
linux-oz-2.6: Fix a potential conflict with the tosa-bl patch.
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.14-rc1.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/linux/linux-openzaurus_2.6.14-rc1.bb b/packages/linux/linux-openzaurus_2.6.14-rc1.bb index bebc07b69f..28643b8142 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 = "r0" +PR = "r1" # 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 \ @@ -61,7 +61,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${DOSRC}/tosa-udc-r4.patch;patch=1 \ ${DOSRC}/tosa-irda-r3.patch;patch=1 \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ - ${DOSRC}/tosa-bl-r5.patch;patch=1 \ + ${RPSRC}/temp/tosa-bl-r5a.patch;patch=1 \ ${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ |