projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'x86/mce' and 'x86/urgent' into perf/mce
[cascardo/linux.git]
/
drivers
/
staging
/
et131x
/
et1310_address_map.h
diff --git
a/drivers/staging/et131x/et1310_address_map.h
b/drivers/staging/et131x/et1310_address_map.h
index
6294d38
..
2c3d65a
100644
(file)
--- a/
drivers/staging/et131x/et1310_address_map.h
+++ b/
drivers/staging/et131x/et1310_address_map.h
@@
-223,7
+223,7
@@
typedef union _TXDMA_PR_NUM_DES_t {
extern inline void add_10bit(u32 *v, int n)
{
- *v = INDEX10(*v + n);
+ *v = INDEX10(*v + n)
| (*v & ET_DMA10_WRAP)
;
}
/*