Merge branch 'linus' into tracing/core

[mv-sheeva.git] / arch / um / kernel / asm-offsets.c

diff --git a/arch/um/kernel/asm-offsets.c b/arch/um/kernel/asm-offsets.c
index c13a64a288f6927b681f4e27e98134bed766348f..91ea538e1612b5d75e6c645436936ad2820460d0 100644 (file)
--- a/arch/um/kernel/asm-offsets.c
+++ b/arch/um/kernel/asm-offsets.c
@@ -1 +1 @@
-/* Dummy file to make kbuild happy - unused! */
+#include "sysdep/kernel-offsets.h"