diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 12:59:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 12:59:57 -0400 |
| commit | fefd26b3b8597a11a422d950c0d4424ff33a70ad (patch) | |
| tree | 6794a36072635e71e5b33aec47c616bafdca65c1 /arch/alpha/kernel/systbls.S | |
| parent | 4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (diff) | |
| parent | 038b0a6d8d32db934bba6a24e74e76e4e327a94f (diff) | |
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 'arch/alpha/kernel/systbls.S')
| -rw-r--r-- | arch/alpha/kernel/systbls.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S index 4342cea1a926..f6cfe8ce3f96 100644 --- a/arch/alpha/kernel/systbls.S +++ b/arch/alpha/kernel/systbls.S | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * The system call table. | 4 | * The system call table. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> /* CONFIG_OSF4_COMPAT */ | ||
| 8 | #include <asm/unistd.h> | 7 | #include <asm/unistd.h> |
| 9 | 8 | ||
| 10 | .data | 9 | .data |