Merge branch 'acpica-validate-address-regression' into next

[karo-tx-linux.git] / drivers / video / nvidia / nv_hw.c

diff --git a/drivers/video/nvidia/nv_hw.c b/drivers/video/nvidia/nv_hw.c
index d1a10549f5434fc16a963d023dca5ad6fea45c70..ed20a9871b33a9b1c1c63a95cc1fcb6948a79cdb 100644 (file)
--- a/drivers/video/nvidia/nv_hw.c
+++ b/drivers/video/nvidia/nv_hw.c
@@ -129,7 +129,7 @@ typedef struct {
        int nvclk_khz;
        char mem_page_miss;
        char mem_latency;
-       int memory_type;
+       u32 memory_type;
        int memory_width;
        char enable_video;
        char gr_during_vid;
@@ -719,7 +719,7 @@ static void nForceUpdateArbitrationSettings(unsigned VClk,
        memctrl >>= 16;
 
        if ((memctrl == 0x1A9) || (memctrl == 0x1AB) || (memctrl == 0x1ED)) {
-               int dimm[3];
+               u32 dimm[3];
 
                dev = pci_get_bus_and_slot(0, 2);
                pci_read_config_dword(dev, 0x40, &dimm[0]);