diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-16 11:33:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-16 11:33:41 +0100 |
| commit | fe705ab1526bc2c8b7756f3a855f040ab2060af2 (patch) | |
| tree | c4444d19983c5578f9ef2bddc1fa01b6e42f91a3 /arch/x86/lib/Makefile | |
| parent | 7d1794e81b5f202c73d7e3e65f0ee7aae4928038 (diff) | |
| parent | ad1cd745060ae2f24026b3b3d09da3426df6ab36 (diff) | |
Merge branch 'topic/beep-rename' into topic/hda
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 9e609206fac..3e549b8ec8c 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -15,7 +15,7 @@ ifeq ($(CONFIG_X86_32),y) obj-y += atomic64_32.o lib-y += checksum_32.o lib-y += strstr_32.o - lib-y += semaphore_32.o string_32.o + lib-y += semaphore_32.o string_32.o cmpxchg8b_emu.o lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o else |