x86: merge statfs_32/64.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild
index af183e8..6e3ef07 100644 (file)
--- a/include/asm-x86/Kbuild
+++ b/include/asm-x86/Kbuild
@@ -31,8 +31,6 @@ unifdef-y += sigcontext_32.h
 unifdef-y += sigcontext_64.h
 unifdef-y += signal_32.h
 unifdef-y += signal_64.h
-unifdef-y += statfs_32.h
-unifdef-y += statfs_64.h
 unifdef-y += unistd_32.h
 unifdef-y += unistd_64.h
 unifdef-y += user_32.h

diff --cc include/asm-x86/statfs.h
Simple merge

diff --cc include/asm-x86/statfs_32.h
Simple merge

diff --cc include/asm-x86/statfs_64.h
Simple merge