Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=aa0ac36518be648dda3a32f0b37a8b2b546e1b24
Commit:     aa0ac36518be648dda3a32f0b37a8b2b546e1b24
Parent:     cb510b8172602a66467f3551b4be1911f5a7c8c2
Author:     Alexey Dobriyan <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 15 23:40:39 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Jul 16 09:05:45 2007 -0700

    Remove capability.h from mm.h
    
    I forgot to remove capability.h from mm.h while removing sched.h!  This
    patch remedies that, because the only inline function which was using
    CAP_something was made out of line.
    
    Cross-compile tested without regressions on:
    
        all powerpc defconfigs
        all mips defconfigs
        all m68k defconfigs
        all arm defconfigs
        all ia64 defconfigs
    
        alpha alpha-allnoconfig alpha-defconfig alpha-up
        arm
        i386 i386-allnoconfig i386-defconfig i386-up
        ia64 ia64-allnoconfig ia64-defconfig ia64-up
        m68k
        mips
        parisc parisc-allnoconfig parisc-defconfig parisc-up
        powerpc powerpc-up
        s390 s390-allnoconfig s390-defconfig s390-up
        sparc sparc-allnoconfig sparc-defconfig sparc-up
        sparc64 sparc64-allnoconfig sparc64-defconfig sparc64-up
        um-x86_64
        x86_64 x86_64-allnoconfig x86_64-defconfig x86_64-up
    
    as well as my two usual configs.
    
    Signed-off-by: Alexey Dobriyan <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/pci/pci-sysfs.c |    2 +-
 drivers/pci/proc.c      |    2 +-
 fs/gfs2/eaops.c         |    1 +
 include/linux/mm.h      |    1 -
 kernel/time/ntp.c       |    2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 10dbdec..1b7b281 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -20,7 +20,7 @@
 #include <linux/stat.h>
 #include <linux/topology.h>
 #include <linux/mm.h>
-
+#include <linux/capability.h>
 #include "pci.h"
 
 static int sysfs_initialized;  /* = 0 */
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index cfa0dfe..90adc62 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -11,7 +11,7 @@
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-
+#include <linux/capability.h>
 #include <asm/uaccess.h>
 #include <asm/byteorder.h>
 #include "pci.h"
diff --git a/fs/gfs2/eaops.c b/fs/gfs2/eaops.c
index c1f4400..1ab3e9d 100644
--- a/fs/gfs2/eaops.c
+++ b/fs/gfs2/eaops.c
@@ -11,6 +11,7 @@
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
+#include <linux/capability.h>
 #include <linux/xattr.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/lm_interface.h>
diff --git a/include/linux/mm.h b/include/linux/mm.h
index d4ab4e5..97d0cdd 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2,7 +2,6 @@
 #define _LINUX_MM_H
 
 #include <linux/errno.h>
-#include <linux/capability.h>
 
 #ifdef __KERNEL__
 
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index cf53bb5..438c6b7 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -13,7 +13,7 @@
 #include <linux/timex.h>
 #include <linux/jiffies.h>
 #include <linux/hrtimer.h>
-
+#include <linux/capability.h>
 #include <asm/div64.h>
 #include <asm/timex.h>
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to