diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:34:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:34:57 -0500 |
| commit | 52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (patch) | |
| tree | d956016f7aefff1030ca0f7885ac6a6f890a9e94 /arch | |
| parent | 1cb9e8e01d2c73184e2074f37cd155b3c4fdaae6 (diff) | |
| parent | 48d727a9f93e617d6d443507acf7d1b849c63366 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm26/nwfpe/fpmodule.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm26/nwfpe/fpmodule.c b/arch/arm26/nwfpe/fpmodule.c index 528fa710aa34..5258c6096fb9 100644 --- a/arch/arm26/nwfpe/fpmodule.c +++ b/arch/arm26/nwfpe/fpmodule.c | |||
| @@ -46,10 +46,9 @@ typedef struct task_struct* PTASK; | |||
| 46 | 46 | ||
| 47 | #ifdef MODULE | 47 | #ifdef MODULE |
| 48 | void fp_send_sig(unsigned long sig, PTASK p, int priv); | 48 | void fp_send_sig(unsigned long sig, PTASK p, int priv); |
| 49 | #if LINUX_VERSION_CODE > 0x20115 | 49 | |
| 50 | MODULE_AUTHOR("Scott Bambrough <scottb@rebel.com>"); | 50 | MODULE_AUTHOR("Scott Bambrough <scottb@rebel.com>"); |
| 51 | MODULE_DESCRIPTION("NWFPE floating point emulator"); | 51 | MODULE_DESCRIPTION("NWFPE floating point emulator"); |
| 52 | #endif | ||
| 53 | 52 | ||
| 54 | #else | 53 | #else |
| 55 | #define fp_send_sig send_sig | 54 | #define fp_send_sig send_sig |