git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[sfrench/cifs-2.6.git]
/
include
/
linux
/
dmaengine.h
diff --git
a/include/linux/dmaengine.h
b/include/linux/dmaengine.h
index 68130f5f599e1146e56b3f7fe4ef376443a8ca79..004736b6a9c8de50a51493e006568cff9426e1c4 100644
(file)
--- a/
include/linux/dmaengine.h
+++ b/
include/linux/dmaengine.h
@@
-745,6
+745,8
@@
enum dmaengine_alignment {
DMAENGINE_ALIGN_16_BYTES = 4,
DMAENGINE_ALIGN_32_BYTES = 5,
DMAENGINE_ALIGN_64_BYTES = 6,
+ DMAENGINE_ALIGN_128_BYTES = 7,
+ DMAENGINE_ALIGN_256_BYTES = 8,
};
/**