summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2005-04-19 11:54:31 +0000
committerRichard Purdie <rpurdie@rpsys.net>2005-04-19 11:54:31 +0000
commita6ae7f14947dc1e5411c8c87dfea40e034a5ada2 (patch)
tree08b02fd67e2b2cad217978feabebde45e99d6c8f /packages/linux
parent0c7bd9ba4da5dbf31c5b2b704c135dcb385a6bd3 (diff)
resolve merge
BKrev: 4264f177FoEYCahksw4DzluXFRqQDw
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-openzaurus_2.6.11.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb
index daf82dcc7e..ea436d34ad 100644
--- a/packages/linux/linux-openzaurus_2.6.11.bb
+++ b/packages/linux/linux-openzaurus_2.6.11.bb
@@ -28,6 +28,7 @@ JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files/"
# Patches submitted upstream are towards top of this list
SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
+ http://www.kernel.org/pub/linux/kernel/people/rml/inotify/v2.6/0.22/inotify-0.22-rml-2.6.11-1.patch;patch=1 \
${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 \
${RPSRC}/rndis_fix-r0.patch;patch=1 \
${RPSRC}/w100_malloc-r2.patch;patch=1 \