diff --git a/[refs] b/[refs] index 78016bed6ffe..84f3ce9a669e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d463d34e7b336ae3645ac331adccb578ae5a4285 +refs/heads/master: d5afabcea215a828eb00df992b429486aae14c2f diff --git a/trunk/drivers/video/intelfb/intelfb.h b/trunk/drivers/video/intelfb/intelfb.h index abdadc2a1b47..80b94c19a9fa 100644 --- a/trunk/drivers/video/intelfb/intelfb.h +++ b/trunk/drivers/video/intelfb/intelfb.h @@ -278,7 +278,7 @@ struct intelfb_info { u8 fbmem_gart; /* mtrr support */ - u32 mtrr_reg; + int mtrr_reg; u32 has_mtrr; /* heap data */