aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/siginfo_no.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-28 23:34:14 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-28 23:34:14 +0100
commit38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4 (patch)
treea83d5e4e86edf6cb2de22db6f2ff2274753a2bab /arch/m68k/include/asm/siginfo_no.h
parentprintk: correct the behavior of printk_timed_ratelimit() (diff)
parentMerge branch 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff)
downloadlinux-dev-38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4.tar.xz
linux-dev-38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4.zip
Merge branch 'linus' into core/printk
Diffstat (limited to 'arch/m68k/include/asm/siginfo_no.h')
-rw-r--r--arch/m68k/include/asm/siginfo_no.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/m68k/include/asm/siginfo_no.h b/arch/m68k/include/asm/siginfo_no.h
deleted file mode 100644
index b18e5f4064ae..000000000000
--- a/arch/m68k/include/asm/siginfo_no.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _M68KNOMMU_SIGINFO_H
-#define _M68KNOMMU_SIGINFO_H
-
-#include <asm-generic/siginfo.h>
-
-#endif