summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorRandy.Dunlap <rdunlap@xenotime.net>2006-01-11 12:17:46 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 18:42:13 -0800
commitc59ede7b78db329949d9cdcd7064e22d357560ef (patch)
treef9dc9d464fdad5bfd464d983e77c1af031389dda /block
parente16885c5ad624a6efe1b1bf764e075d75f65a788 (diff)
downloadop-kernel-dev-c59ede7b78db329949d9cdcd7064e22d357560ef.zip
op-kernel-dev-c59ede7b78db329949d9cdcd7064e22d357560ef.tar.gz
[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.c2
-rw-r--r--block/scsi_ioctl.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/block/ioctl.c b/block/ioctl.c
index 82030e1..e110949 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -1,4 +1,4 @@
-#include <linux/sched.h> /* for capable() */
+#include <linux/capability.h>
#include <linux/blkdev.h>
#include <linux/blkpg.h>
#include <linux/hdreg.h>
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 18de84c..cc72210 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -21,6 +21,7 @@
#include <linux/string.h>
#include <linux/module.h>
#include <linux/blkdev.h>
+#include <linux/capability.h>
#include <linux/completion.h>
#include <linux/cdrom.h>
#include <linux/slab.h>
OpenPOWER on IntegriCloud