Merge branch 'for-linus' into for-next

[linux-2.6-block.git] / fs / sysfs / file.c

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 51398457fe00e8874d81468be72c260470186cb9..130fc6fbcc038b8e429cffd6f34859dac4d99ea4 100644 (file)
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -17,7 +17,6 @@
 #include <linux/seq_file.h>
 
 #include "sysfs.h"
-#include "../kernfs/kernfs-internal.h"
 
 /*
  * Determine ktype->sysfs_ops for the given kernfs_node.  This function
@@ -497,6 +496,7 @@ bool sysfs_remove_file_self(struct kobject *kobj, const struct attribute *attr)
 void sysfs_remove_files(struct kobject *kobj, const struct attribute * const *ptr)
 {
        int i;
+
        for (i = 0; ptr[i]; i++)
                sysfs_remove_file(kobj, ptr[i]);
 }