Merge branch 'linux-2.6' into for-2.6.24

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
index 9ddc5b9ce3bd..76effdbea075 100644
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
@@ -8,6 +8,7 @@ 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 \
-         lshrdi3.o ashldi3.o rwsem.o muldi3.o bitext.o
+         lshrdi3.o ashldi3.o rwsem.o muldi3.o bitext.o \
+         cmpdi2.o
 
 obj-y += iomap.o atomic32.o