projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[cascardo/linux.git]
/
include
/
linux
/
security.h
diff --git
a/include/linux/security.h
b/include/linux/security.h
index
233d20b
..
3158dd9
100644
(file)
--- a/
include/linux/security.h
+++ b/
include/linux/security.h
@@
-33,7
+33,7
@@
#include <linux/sched.h>
#include <linux/key.h>
#include <linux/xfrm.h>
-#include <linux/
gfp
.h>
+#include <linux/
slab
.h>
#include <net/flow.h>
/* Maximum number of letters for an LSM name string */