diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2010-04-26 16:08:27 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 16:08:27 +0900 |
| commit | e19553427c2e8fdb04fdd98e407164bb59a840ba (patch) | |
| tree | 5332234b2dad07c03c27e4608afb16f297f41e61 /fs/exofs/inode.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mfleming/sh-2.6 (diff) | |
| parent | SH: fix error paths in DMA driver (diff) | |
| download | linux-dev-e19553427c2e8fdb04fdd98e407164bb59a840ba.tar.xz linux-dev-e19553427c2e8fdb04fdd98e407164bb59a840ba.zip | |
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/exofs/inode.c')
| -rw-r--r-- | fs/exofs/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c index a17e4b733e35..76d2a79ef93e 100644 --- a/fs/exofs/inode.c +++ b/fs/exofs/inode.c @@ -31,6 +31,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <linux/slab.h> #include <linux/writeback.h> #include <linux/buffer_head.h> #include <scsi/scsi_device.h> |