diff --git a/[refs] b/[refs]
index 85bf0871fbdd..1f5b7a422c85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7a19787195fcc90aabc3a71f29647ba9a443efe
+refs/heads/master: 54489cd46a3a268ed981c681726c6d690883f076
diff --git a/trunk/arch/arm/mach-s3c6400/include/mach/dma.h b/trunk/arch/arm/mach-s3c6400/include/mach/dma.h
index 004edab23954..1067619f0ba0 100644
--- a/trunk/arch/arm/mach-s3c6400/include/mach/dma.h
+++ b/trunk/arch/arm/mach-s3c6400/include/mach/dma.h
@@ -68,11 +68,6 @@ static __inline__ int s3c_dma_has_circular(void)
 
 #define S3C2410_DMAF_CIRCULAR		(1 << 0)
 
-static inline bool s3c_dma_has_circular(void)
-{
-	return false;
-}
-
 #include <plat/dma.h>
 
 #endif /* __ASM_ARCH_IRQ_H */