diff --git a/hipamd/include/hip/amd_detail/amd_channel_descriptor.h b/hipamd/include/hip/amd_detail/amd_channel_descriptor.h
index 26a7fbc499..bf2c337901 100644
--- a/hipamd/include/hip/amd_detail/amd_channel_descriptor.h
+++ b/hipamd/include/hip/amd_detail/amd_channel_descriptor.h
@@ -281,6 +281,8 @@ inline hipChannelFormatDesc hipCreateChannelDesc<float4>() {
     return hipCreateChannelDesc(e, e, e, e, hipChannelFormatKindFloat);
 }
 
+#if !defined(__LP64__)
+
 template <>
 inline hipChannelFormatDesc hipCreateChannelDesc<unsigned long>() {
     int e = (int)sizeof(unsigned long) * 8;
@@ -342,12 +344,13 @@ inline hipChannelFormatDesc hipCreateChannelDesc<long4>() {
     int e = (int)sizeof(signed long) * 8;
     return hipCreateChannelDesc(e, e, e, e, hipChannelFormatKindSigned);
 }
+#endif /* !__LP64__ */
 
 #else
 
 struct hipChannelFormatDesc hipCreateChannelDesc(int x, int y, int z, int w,
                                                  enum hipChannelFormatKind f);
 
-#endif
+#endif /* __cplusplus */
 
-#endif
+#endif /* !HIP_INCLUDE_HIP_AMD_DETAIL_CHANNEL_DESCRIPTOR_H */