diff options
author | Joel Becker <joel.becker@oracle.com> | 2010-04-30 22:37:29 +0200 |
---|---|---|
committer | Joel Becker <joel.becker@oracle.com> | 2010-04-30 22:37:29 +0200 |
commit | f9221fd80343285514568da6c5dbda0f87109de8 (patch) | |
tree | 3a2f0077ebea9d094bdeedb319c97cb591d51c51 /drivers/ide/ide.c | |
parent | ocfs2_dlmfs: Fix math error when reading LVB. (diff) | |
parent | ocfs2: Add directory entry later in ocfs2_symlink() and ocfs2_mknod() (diff) | |
download | linux-f9221fd80343285514568da6c5dbda0f87109de8.tar.xz linux-f9221fd80343285514568da6c5dbda0f87109de8.zip |
Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2-mark into ocfs2-fixes
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r-- | drivers/ide/ide.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 16d056939f9f..3cb9c4e056ff 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -52,7 +52,6 @@ #include <linux/major.h> #include <linux/errno.h> #include <linux/genhd.h> -#include <linux/slab.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/ide.h> |