From: Christoph Hellwig <hch@lst.de>
Date: Tue, 24 Jul 2007 01:43:53 +0000 (-0700)
Subject: spusched: fix mismerge in spufs.h
X-Git-Tag: v2.6.23-rc2~307
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2c863bd2daa2b2e36d66db58bc1e18f37151829;p=pandora-kernel.git

spusched: fix mismerge in spufs.h

spufs.h now has two enums for the sched_flags leading to identical
values for SPU_SCHED_WAS_ACTIVE and SPU_SCHED_NOTIFY_ACTIVE.  Merge
them into a single enum as they were in the IBM development tree.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

Reading git-diff-tree failed