From ab841bf389a2b5247240f4d2d70d08cad3bf30da Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 19 Sep 2005 10:33:57 +0000 Subject: linux-oz-2.6: Fix a potential conflict with the tosa-bl patch. --- packages/linux/linux-openzaurus_2.6.14-rc1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') 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 \ -- cgit v1.2.3