From: Richard Purdie <rpurdie@rpsys.net>
Date: Tue, 19 Apr 2005 11:54:31 +0000 (+0000)
Subject: resolve merge
X-Git-Tag: Release-2010-05/1~14380
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6ae7f14947dc1e5411c8c87dfea40e034a5ada2;p=openembedded.git

resolve merge

BKrev: 4264f177FoEYCahksw4DzluXFRqQDw
---

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 \