diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 03:08:27 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 03:08:27 -0400 |
| commit | e19553427c2e8fdb04fdd98e407164bb59a840ba (patch) | |
| tree | 5332234b2dad07c03c27e4608afb16f297f41e61 /fs/ocfs2/heartbeat.c | |
| parent | 35f6cd4a06432034665a1499ca4b022437423aac (diff) | |
| parent | 83515bc7df812555e20cda48614674e2f346f9f5 (diff) | |
Merge branch 'sh/stable-updates'
Conflicts:
arch/sh/kernel/dwarf.c
drivers/dma/shdma.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'fs/ocfs2/heartbeat.c')
| -rw-r--r-- | fs/ocfs2/heartbeat.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ocfs2/heartbeat.c b/fs/ocfs2/heartbeat.c index c6e7213db868..1aa863dd901f 100644 --- a/fs/ocfs2/heartbeat.c +++ b/fs/ocfs2/heartbeat.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/fs.h> | 27 | #include <linux/fs.h> |
| 28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 29 | #include <linux/slab.h> | ||
| 30 | #include <linux/highmem.h> | 29 | #include <linux/highmem.h> |
| 31 | 30 | ||
| 32 | #define MLOG_MASK_PREFIX ML_SUPER | 31 | #define MLOG_MASK_PREFIX ML_SUPER |