From 78c3549a9f520aeaee0aad13d7da31d0b99d2209 Mon Sep 17 00:00:00 2001
From: kmacy <kmacy@FreeBSD.org>
Date: Sat, 9 May 2009 05:39:35 +0000
Subject: atomic.S has been renamed opensolaris_atomic.S to avoid collisions

---
 cddl/lib/libzpool/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cddl')

diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index 54ab6c0..fec99d9 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -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
-- 
cgit v1.1