diff options
| author |   Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
| commit | 3fd04f71ad25d5df59c636986f741b9a36ce6501 (patch) | |
| tree | 995f4a15764d4196a92ecd966150e38d910d57d1 /recipes/linux/linux-kirkwood_2.6.33-rc1.bb | |
| parent | b5b3d83a6f3b1c04a4ebe09f636683ef22495d09 (diff) | |
| parent | e426517ed76c7532434f0687f88fca1295530000 (diff) | |
| download | openembedded-3fd04f71ad25d5df59c636986f741b9a36ce6501.tar.gz | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/linux/linux-kirkwood_2.6.33-rc1.bb
Diffstat (limited to 'recipes/linux/linux-kirkwood_2.6.33-rc1.bb')
| -rw-r--r-- | recipes/linux/linux-kirkwood_2.6.33-rc1.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes/linux/linux-kirkwood_2.6.33-rc1.bb b/recipes/linux/linux-kirkwood_2.6.33-rc1.bb index 1c1f340682..c138351ba7 100644 --- a/recipes/linux/linux-kirkwood_2.6.33-rc1.bb +++ b/recipes/linux/linux-kirkwood_2.6.33-rc1.bb @@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "openrd-base|openrd-client|sheevaplug" require linux.inc # Change MACHINE_KERNEL_PR in conf/machine/include/kirkwood.inc -PV = "2.6.33-rc1" +PV = "2.6.32+2.6.33-rc1" SRCREV = "58c19e3ea75a629c3d38a4490f96a65cf2f36a11" @@ -19,8 +19,8 @@ SRC_URI_append_openrd-base += \ file://0004-ARM-Kirkwood-OpenRD-SD-UART1-selection.patch;patch=1 \ " -SRC_URI_append_openrd-client += \ - "file://0001-OpenRD-Client-PCIe-Initialize-PCI-express-and-i2c.patch;patch=1 \ +SRC_URI_append_openrd-client += " \ + file://0001-OpenRD-Client-PCIe-Initialize-PCI-express-and-i2c.patch;patch=1 \ file://0002-OpenRD-Client-Volari-Z11-driver-added.patch;patch=1 \ file://0003-ARM-Kirkwood-Sound-Sound-driver-added.patch;patch=1 \ file://0004-ARM-Kirkwood-OpenRD-SD-UART1-selection.patch;patch=1 \ |