diff --git a/src/add-ons/accelerants/radeon_hd/atombios/Jamfile b/src/add-ons/accelerants/radeon_hd/atombios/Jamfile
index 2ce95805b2..f00f602980 100644
--- a/src/add-ons/accelerants/radeon_hd/atombios/Jamfile
+++ b/src/add-ons/accelerants/radeon_hd/atombios/Jamfile
@@ -12,7 +12,10 @@ DEFINES += ENABLE_ALL_SERVICE_FUNCTIONS ;
 # To avoid changing AMD vendor sources
 TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)
 	: -Wall -Wmissing-prototypes -Wcast-align ] ;
-TARGET_WARNING_CCFLAGS += -Wno-pointer-to-int-cast ;
+
+if $(HAIKU_GCC_VERSION[1]) = 4 {
+	TARGET_WARNING_CCFLAGS += -Wno-pointer-to-int-cast ;
+}
 
 StaticLibrary atombios.a :
 	Decoder.c
diff --git a/src/add-ons/accelerants/radeon_hd/mode.cpp b/src/add-ons/accelerants/radeon_hd/mode.cpp
index 3bb9516981..209426c8c0 100644
--- a/src/add-ons/accelerants/radeon_hd/mode.cpp
+++ b/src/add-ons/accelerants/radeon_hd/mode.cpp
@@ -189,7 +189,7 @@ CardFBSet(display_mode *mode)
 	uint64_t fbAddress = gInfo->shared_info->frame_buffer_phys;
 
 	// Tell GPU which frame buffer address to draw from
-	if (gInfo->shared_info->device_chipset >= (RADEON_R700 & 0x70)) {
+	if (gInfo->shared_info->device_chipset >= (uint16)RADEON_R700 & 0x70) {
 		write32(gRegister->grphPrimarySurfaceAddrHigh,
 			(fbAddress >> 32) & 0xf);
 		write32(gRegister->grphSecondarySurfaceAddrHigh,