diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-24 08:09:26 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-24 08:09:26 +0200 |
commit | 28afe961a18f77b2249062499bdbf70fd2ec6bba (patch) | |
tree | 71a5cb32924b8c8256bbc0f2f81c6b8c2ac79108 /include/linux/dma-attrs.h | |
parent | 1e01cb0c6ff7e9ddb6547551794c6aa82785a7cb (diff) | |
parent | 338b9bb3adac0d2c5a1e180491d9b001d624c402 (diff) | |
download | linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.gz linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.bz2 linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.zip |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'include/linux/dma-attrs.h')
-rw-r--r-- | include/linux/dma-attrs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/dma-attrs.h b/include/linux/dma-attrs.h index 1677e2bfa00c..71ad34eca6e3 100644 --- a/include/linux/dma-attrs.h +++ b/include/linux/dma-attrs.h @@ -12,6 +12,7 @@ */ enum dma_attr { DMA_ATTR_WRITE_BARRIER, + DMA_ATTR_WEAK_ORDERING, DMA_ATTR_MAX, }; |