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/parisc | |
| 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/parisc')
| -rw-r--r-- | arch/parisc/kernel/head.S | 2 | ||||
| -rw-r--r-- | arch/parisc/kernel/syscall.S | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S index 3e79e62f7b0b..eaad2328fea1 100644 --- a/arch/parisc/kernel/head.S +++ b/arch/parisc/kernel/head.S | |||
| @@ -12,8 +12,6 @@ | |||
| 12 | * Initial Version 04-23-1999 by Helge Deller <deller@gmx.de> | 12 | * Initial Version 04-23-1999 by Helge Deller <deller@gmx.de> |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/config.h> /* for CONFIG_SMP */ | ||
| 16 | |||
| 17 | #include <asm/asm-offsets.h> | 15 | #include <asm/asm-offsets.h> |
| 18 | #include <asm/psw.h> | 16 | #include <asm/psw.h> |
| 19 | #include <asm/pdc.h> | 17 | #include <asm/pdc.h> |
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S index 9670a89c77fe..a05800429304 100644 --- a/arch/parisc/kernel/syscall.S +++ b/arch/parisc/kernel/syscall.S | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | * thanks to Philipp Rumpf, Mike Shaver and various others | 6 | * thanks to Philipp Rumpf, Mike Shaver and various others |
| 7 | * sorry about the wall, puffin.. | 7 | * sorry about the wall, puffin.. |
| 8 | */ | 8 | */ |
| 9 | #include <linux/config.h> /* for CONFIG_SMP */ | ||
| 10 | 9 | ||
| 11 | #include <asm/asm-offsets.h> | 10 | #include <asm/asm-offsets.h> |
| 12 | #include <asm/unistd.h> | 11 | #include <asm/unistd.h> |