diff --git a/libs/surfaceflinger/BufferAllocator.cpp b/libs/surfaceflinger/BufferAllocator.cpp
index 28fe810..fec7c87 100644
--- a/libs/surfaceflinger/BufferAllocator.cpp
+++ b/libs/surfaceflinger/BufferAllocator.cpp
@@ -34,8 +34,7 @@
 namespace android {
 // ---------------------------------------------------------------------------
 
-template<class BufferAllocator> Mutex Singleton<BufferAllocator>::sLock; 
-template<> BufferAllocator* Singleton<BufferAllocator>::sInstance(0); 
+ANDROID_SINGLETON_STATIC_INSTANCE( BufferAllocator )
 
 Mutex BufferAllocator::sLock;
 KeyedVector<buffer_handle_t, BufferAllocator::alloc_rec_t> BufferAllocator::sAllocList;