svn commit: r191933 - head/cddl/lib/libzpool

[Kip Macy]

Author: kmacy
Date: Sat May  9 05:39:35 2009
New Revision: 191933
URL: http://svn.freebsd.org/changeset/base/191933

Log:
  atomic.S has been renamed opensolaris_atomic.S to avoid collisions

Modified:
  head/cddl/lib/libzpool/Makefile

Modified: head/cddl/lib/libzpool/Makefile
==============================================================================
--- head/cddl/lib/libzpool/Makefile	Sat May  9 05:07:36 2009	(r191932)
+++ head/cddl/lib/libzpool/Makefile	Sat May  9 05:39:35 2009	(r191933)
@@ -13,7 +13,7 @@
 # ATOMIC_SRCS
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
-ATOMIC_SRCS=	atomic.S
+ATOMIC_SRCS=	opensolaris_atomic.S
 .else
 .PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern
 ATOMIC_SRCS=	opensolaris_atomic.c