diff --git a/[refs] b/[refs] index 3bb955968cb6..fffd3c2e5346 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8100d2b186b804305608c22cc77b0deeb1d9821 +refs/heads/master: 72ed116fe68a2adb45234fcffffeec04d789071b diff --git a/trunk/drivers/staging/sm7xx/smtcfb.h b/trunk/drivers/staging/sm7xx/smtcfb.h index c5e6989e65ab..ab95af2b9c07 100644 --- a/trunk/drivers/staging/sm7xx/smtcfb.h +++ b/trunk/drivers/staging/sm7xx/smtcfb.h @@ -38,7 +38,7 @@ #define dac_reg (0x3c8) #define dac_val (0x3c9) -extern char *smtc_RegBaseAddress; +extern char __iomem *smtc_RegBaseAddress; #define smtc_mmiowb(dat, reg) writeb(dat, smtc_RegBaseAddress + reg) #define smtc_mmioww(dat, reg) writew(dat, smtc_RegBaseAddress + reg) #define smtc_mmiowl(dat, reg) writel(dat, smtc_RegBaseAddress + reg)