diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:37:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:37:40 -0800 |
| commit | 85fe20bfd415af0a2e93bd1166533d4a6eb591ea (patch) | |
| tree | 10b0e485712859327f0c800491fb787a1859f0b6 /arch/x86/lib/Makefile | |
| parent | 58f02db466900003b801bdfdeddc4d96ce42b7d5 (diff) | |
| parent | 1c5b9069e12e20d2fe883076ae0bf73966492108 (diff) | |
| download | blackbird-op-linux-85fe20bfd415af0a2e93bd1166533d4a6eb591ea.tar.gz blackbird-op-linux-85fe20bfd415af0a2e93bd1166533d4a6eb591ea.zip | |
Merge branch 'x86-io-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-io-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Merge io.h
x86: Simplify flush_write_buffers()
x86: Clean up mem*io functions.
x86-64: Use BUILDIO in io_64.h
x86-64: Reorganize io_64.h
x86-32: Remove _local variants of in/out from io_32.h
x86-32: Move XQUAD definitions to numaq.h
Diffstat (limited to 'arch/x86/lib/Makefile')
| -rw-r--r-- | arch/x86/lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index d85e0e438b58..710cc1405866 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -34,7 +34,7 @@ ifneq ($(CONFIG_X86_CMPXCHG64),y) endif lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o else - obj-y += io_64.o iomap_copy_64.o + obj-y += iomap_copy_64.o lib-y += csum-partial_64.o csum-copy_64.o csum-wrappers_64.o lib-y += thunk_64.o clear_page_64.o copy_page_64.o lib-y += memmove_64.o memset_64.o |
