diff options
author | Randy.Dunlap <rdunlap@xenotime.net> | 2006-01-11 15:17:46 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 21:42:13 -0500 |
commit | c59ede7b78db329949d9cdcd7064e22d357560ef (patch) | |
tree | f9dc9d464fdad5bfd464d983e77c1af031389dda /block | |
parent | e16885c5ad624a6efe1b1bf764e075d75f65a788 (diff) |
[PATCH] move capable() to capability.h
- Move capable() from sched.h to capability.h;
- Use <linux/capability.h> where capable() is used
(in include/, block/, ipc/, kernel/, a few drivers/,
mm/, security/, & sound/;
many more drivers/ to go)
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'block')
-rw-r--r-- | block/ioctl.c | 2 | ||||
-rw-r--r-- | block/scsi_ioctl.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/block/ioctl.c b/block/ioctl.c index 82030e1dfd6..e1109491c23 100644 --- a/block/ioctl.c +++ b/block/ioctl.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #include <linux/sched.h> /* for capable() */ | 1 | #include <linux/capability.h> |
2 | #include <linux/blkdev.h> | 2 | #include <linux/blkdev.h> |
3 | #include <linux/blkpg.h> | 3 | #include <linux/blkpg.h> |
4 | #include <linux/hdreg.h> | 4 | #include <linux/hdreg.h> |
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 18de84c8ccd..cc72210687e 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/string.h> | 21 | #include <linux/string.h> |
22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
23 | #include <linux/blkdev.h> | 23 | #include <linux/blkdev.h> |
24 | #include <linux/capability.h> | ||
24 | #include <linux/completion.h> | 25 | #include <linux/completion.h> |
25 | #include <linux/cdrom.h> | 26 | #include <linux/cdrom.h> |
26 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |