Merge remote-tracking branch 'airlied/drm-prime-vmap' into drm-intel-next-queued

[~andy/linux] / fs / ext3 / xattr_user.c

diff --git a/fs/ext3/xattr_user.c b/fs/ext3/xattr_user.c
index b32e473a1e33c0850352d1f55dd3bb17e7d4618d..5612af3567e0c942a389b455ed36eed91a886e89 100644 (file)
--- a/fs/ext3/xattr_user.c
+++ b/fs/ext3/xattr_user.c
@@ -5,10 +5,7 @@
  * Copyright (C) 2001 by Andreas Gruenbacher, <a.gruenbacher@computer.org>
  */
 
-#include <linux/string.h>
-#include <linux/fs.h>
-#include <linux/ext3_jbd.h>
-#include <linux/ext3_fs.h>
+#include "ext3.h"
 #include "xattr.h"
 
 static size_t