git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'ioat' into dmaengine
[pandora-kernel.git]
/
drivers
/
dma
/
ioat
/
dma.h
diff --git
a/drivers/dma/ioat/dma.h
b/drivers/dma/ioat/dma.h
index
26f48ef
..
6d3a73b
100644
(file)
--- a/
drivers/dma/ioat/dma.h
+++ b/
drivers/dma/ioat/dma.h
@@
-96,6
+96,7
@@
struct ioat_chan_common {
#define IOAT_COMPLETION_ACK 1
#define IOAT_RESET_PENDING 2
#define IOAT_KOBJ_INIT_FAIL 3
+ #define IOAT_RESHAPE_PENDING 4
struct timer_list timer;
#define COMPLETION_TIMEOUT msecs_to_jiffies(100)
#define IDLE_TIMEOUT msecs_to_jiffies(2000)