diff options
author | Len Brown <len.brown@intel.com> | 2006-12-20 08:53:13 +0100 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-12-20 08:53:13 +0100 |
commit | 9774f3384125912eb491ca77f77907324db3ed05 (patch) | |
tree | 0bdc7486e911dd9e955b41283ee19ac74521f7bd /arch/sparc/lib/Makefile | |
parent | Pull bugfix into test branch (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
download | linux-9774f3384125912eb491ca77f77907324db3ed05.tar.xz linux-9774f3384125912eb491ca77f77907324db3ed05.zip |
merge linus into test branch
Diffstat (limited to 'arch/sparc/lib/Makefile')
-rw-r--r-- | arch/sparc/lib/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile index 5db7e1d85385..9ddc5b9ce3bd 100644 --- a/arch/sparc/lib/Makefile +++ b/arch/sparc/lib/Makefile @@ -7,7 +7,7 @@ EXTRA_AFLAGS := -ansi -DST_DIV0=0x02 lib-y := mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o memcpy.o memset.o \ strlen.o checksum.o blockops.o memscan.o memcmp.o strncmp.o \ strncpy_from_user.o divdi3.o udivdi3.o strlen_user.o \ - copy_user.o locks.o atomic.o atomic32.o bitops.o \ + copy_user.o locks.o atomic.o \ lshrdi3.o ashldi3.o rwsem.o muldi3.o bitext.o -obj-y += iomap.o +obj-y += iomap.o atomic32.o |