Commit e5959d66 authored by Linus Torvalds's avatar Linus Torvalds

Automerge

parents 0ae7b366 3e0726b8
......@@ -19,7 +19,6 @@
#include <linux/fs.h>
#include <linux/locks.h>
#include <linux/slab.h>
#include "jfs_incore.h"
#include "jfs_filsys.h"
#include "jfs_imap.h"
......
......@@ -30,7 +30,6 @@
*/
#include <linux/fs.h>
#include <linux/slab.h>
#include "jfs_incore.h"
#include "jfs_dmap.h"
#include "jfs_imap.h"
......
......@@ -104,7 +104,6 @@
*/
#include <linux/fs.h>
#include <linux/slab.h>
#include <linux/locks.h>
#include "jfs_incore.h"
#include "jfs_superblock.h"
......
......@@ -50,7 +50,6 @@
*/
#include <linux/fs.h>
#include <linux/slab.h>
#include <linux/locks.h>
#include "jfs_incore.h"
#include "jfs_filsys.h"
......
......@@ -62,7 +62,6 @@
#include <linux/fs.h>
#include <linux/locks.h>
#include <linux/slab.h>
#include <linux/blkdev.h>
#include <linux/interrupt.h>
#include <linux/smp_lock.h>
......
......@@ -26,6 +26,7 @@
*/
#include <linux/fs.h>
#include <linux/locks.h>
#include "jfs_incore.h"
#include "jfs_inode.h"
#include "jfs_dinode.h"
......@@ -33,8 +34,6 @@
#include "jfs_unicode.h"
#include "jfs_metapage.h"
#include "jfs_debug.h"
#include <linux/locks.h>
#include <linux/slab.h>
extern struct inode_operations jfs_file_inode_operations;
extern struct inode_operations jfs_symlink_inode_operations;
......
......@@ -21,7 +21,6 @@
#include <linux/locks.h>
#include <linux/config.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/completion.h>
#include <asm/uaccess.h>
#include "jfs_incore.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment