Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / arch / i386 / kernel / vsyscall-sigreturn.S

diff --git a/arch/i386/kernel/vsyscall-sigreturn.S b/arch/i386/kernel/vsyscall-sigreturn.S
index 68afa50dd7cf79bf0d5eb021115c59e03fee692f..fadb5bc3c37431cfda60e19d7f4e477e0126958a 100644 (file)
--- a/arch/i386/kernel/vsyscall-sigreturn.S
+++ b/arch/i386/kernel/vsyscall-sigreturn.S
@@ -7,7 +7,7 @@
  */
 
 #include <asm/unistd.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 
 
 /* XXX