diff options
| author |   Koen Kooi <koen@openembedded.org> | 2009-03-09 19:29:32 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-03-09 19:29:32 +0100 |
| commit | 287743d8719196a160187ebd005d4ae67d41f057 (patch) | |
| tree | 06de68e175d175ce5b4ca9799a67ab15a6a04c28 /packages/linux/linux_2.6.24.bb | |
| parent | 370379133d9b90b5061113a4a30945dd5f607932 (diff) | |
| parent | 9924dde8ff17d8021a7d4b219ad4212f99f377bb (diff) | |
| download | openembedded-287743d8719196a160187ebd005d4ae67d41f057.tar.gz | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/linux/linux_2.6.24.bb')
| -rw-r--r-- | packages/linux/linux_2.6.24.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb index 338e62cc67..be88eab7b1 100644 --- a/packages/linux/linux_2.6.24.bb +++ b/packages/linux/linux_2.6.24.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_ts72xx = "1" DEFAULT_PREFERENCE_oxnas = "1" DEFAULT_PREFERENCE_cs-e9302 = "1" -PR = "r23" +PR = "r24" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \ @@ -87,6 +87,7 @@ SRC_URI_append_ts72xx = "\ SRC_URI_append_oxnas = " \ file://oxnas.diff;patch=1 \ file://oxnas-uart.patch;patch=1 \ + file://oxnas-pci-config-delay.patch;patch=1 \ " CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2" |