diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /arch/mips/math-emu/ieee754d.c | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'arch/mips/math-emu/ieee754d.c')
| -rw-r--r-- | arch/mips/math-emu/ieee754d.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/math-emu/ieee754d.c b/arch/mips/math-emu/ieee754d.c index 7e900f30987e..a0325337b76c 100644 --- a/arch/mips/math-emu/ieee754d.c +++ b/arch/mips/math-emu/ieee754d.c | |||
| @@ -135,4 +135,3 @@ ieee754sp ieee754sp_dump(char *m, ieee754sp x) | |||
| 135 | printk("\n"); | 135 | printk("\n"); |
| 136 | return x; | 136 | return x; |
| 137 | } | 137 | } |
| 138 | |||