summaryrefslogtreecommitdiffstats
path: root/drivers/edac/x38_edac.c
diff options
context:
space:
mode:
authorJoel Becker <joel.becker@oracle.com>2010-04-30 22:37:29 +0200
committerJoel Becker <joel.becker@oracle.com>2010-04-30 22:37:29 +0200
commitf9221fd80343285514568da6c5dbda0f87109de8 (patch)
tree3a2f0077ebea9d094bdeedb319c97cb591d51c51 /drivers/edac/x38_edac.c
parentocfs2_dlmfs: Fix math error when reading LVB. (diff)
parentocfs2: Add directory entry later in ocfs2_symlink() and ocfs2_mknod() (diff)
downloadlinux-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/edac/x38_edac.c')
-rw-r--r--drivers/edac/x38_edac.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
index d4ec60593176..b6f47de152f3 100644
--- a/drivers/edac/x38_edac.c
+++ b/drivers/edac/x38_edac.c
@@ -13,7 +13,6 @@
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/pci_ids.h>
-#include <linux/slab.h>
#include <linux/edac.h>
#include "edac_core.h"