projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cb27680) | patch
spusched: fix mismerge in spufs.h
authorChristoph Hellwig <hch@lst.de>
Tue, 24 Jul 2007 01:43:53 +0000 (18:43 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 24 Jul 2007 19:24:58 +0000 (12:24 -0700)
commitb2c863bd2daa2b2e36d66db58bc1e18f37151829
treea1d2a8bdfa5c5dd19ed54ac5da683e8b8398fad5tree | snapshot
parentcb276805803b8e0616159d80a441ab26a931ada4commit | diff
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>
arch/powerpc/platforms/cell/spufs/spufs.h diff | blob | history
John Crispins staging tree