diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 08:54:28 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 08:54:28 -0700 |
commit | 6ebfc0e20b409f13e62bbb84ce70102b49945cfd (patch) | |
tree | 67fea9b9c039ba47f96c7d51d8b2959b35543edf /include/asm-sh/sfp-machine.h | |
parent | 1e9abb5b1dc90cfcf0e6f1e10f7aaf34d0f33b6b (diff) | |
parent | fac99d97469e7f91102f97101bea620e5f073196 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fixup __raw_read_trylock().
sh: Kill off remaining config.h references.
sh: Initial gitignore list
sh: build fixes for defconfigs.
sh: Kill off more dead headers.
sh: Set pclk default for SH7705.
sh: defconfig updates.
Diffstat (limited to 'include/asm-sh/sfp-machine.h')
-rw-r--r-- | include/asm-sh/sfp-machine.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-sh/sfp-machine.h b/include/asm-sh/sfp-machine.h index 8a6399a8cfe..d3c548443f2 100644 --- a/include/asm-sh/sfp-machine.h +++ b/include/asm-sh/sfp-machine.h @@ -25,8 +25,6 @@ #ifndef _SFP_MACHINE_H #define _SFP_MACHINE_H -#include <linux/config.h> - #define _FP_W_TYPE_SIZE 32 #define _FP_W_TYPE unsigned long #define _FP_WS_TYPE signed long |