Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 

Conflicts:

	module/zfs/fletcher.c
This commit is contained in:
Brian Behlendorf 2009-07-02 17:07:06 -07:00
parent 091947219a a06a428e15
commit c66757e332
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/zfs/fletcher.c
View File

@ -124,7 +124,6 @@
* For both cached and uncached data, both fletcher checksums are much faster * For both cached and uncached data, both fletcher checksums are much faster
* than sha-256, and slower than 'off', which doesn't touch the data at all. * than sha-256, and slower than 'off', which doesn't touch the data at all.
*/ */
>>>>>>> gcc-c90:module/zfs/fletcher.c
#include <sys/types.h> #include <sys/types.h>
#include <sys/sysmacros.h> #include <sys/sysmacros.h>