aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64/compat_signal.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 09:59:57 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 09:59:57 -0700
commitfefd26b3b8597a11a422d950c0d4424ff33a70ad (patch)
tree6794a36072635e71e5b33aec47c616bafdca65c1 /include/asm-sparc64/compat_signal.h
parent4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (diff)
parent038b0a6d8d32db934bba6a24e74e76e4e327a94f (diff)
downloadlinux-fefd26b3b8597a11a422d950c0d4424ff33a70ad.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
* master.kernel.org:/pub/scm/linux/kernel/git/davej/configh: Remove all inclusions of <linux/config.h> Manually resolved trivial path conflicts due to removed files in the sound/oss/ subdirectory.
Diffstat (limited to 'include/asm-sparc64/compat_signal.h')
-rw-r--r--include/asm-sparc64/compat_signal.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc64/compat_signal.h b/include/asm-sparc64/compat_signal.h
index 7aefa301321e8..b759eab9b51c1 100644
--- a/include/asm-sparc64/compat_signal.h
+++ b/include/asm-sparc64/compat_signal.h
@@ -1,7 +1,6 @@
#ifndef _COMPAT_SIGNAL_H
#define _COMPAT_SIGNAL_H
-#include <linux/config.h>
#include <linux/compat.h>
#include <asm/signal.h>