diff options
| -rw-r--r-- | drivers/staging/sm7xxfb/sm7xx.h | 2 | ||||
| -rw-r--r-- | drivers/staging/sm7xxfb/sm7xxfb.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/sm7xxfb/sm7xx.h b/drivers/staging/sm7xxfb/sm7xx.h index 333f33c3dc66..85998615b801 100644 --- a/drivers/staging/sm7xxfb/sm7xx.h +++ b/drivers/staging/sm7xxfb/sm7xx.h @@ -29,7 +29,7 @@ #define dac_reg (0x3c8) #define dac_val (0x3c9) -extern char __iomem *smtc_RegBaseAddress; +extern void __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) diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c index 5ad52b9204b0..3fa55a8186ed 100644 --- a/drivers/staging/sm7xxfb/sm7xxfb.c +++ b/drivers/staging/sm7xxfb/sm7xxfb.c @@ -43,11 +43,11 @@ struct smtcfb_info { u16 chip_id; u8 chip_rev_id; - unsigned char __iomem *m_pMMIO; - char __iomem *m_pLFB; - char *m_pDPR; - char *m_pVPR; - char *m_pCPR; + void __iomem *m_pMMIO; + void __iomem *m_pLFB; + void __iomem *m_pDPR; + void __iomem *m_pVPR; + void __iomem *m_pCPR; u_int width; u_int height; @@ -56,8 +56,8 @@ struct smtcfb_info { u32 colreg[17]; }; -char __iomem *smtc_RegBaseAddress; /* Memory Map IO starting address */ -char __iomem *smtc_VRAMBaseAddress; /* video memory starting address */ +void __iomem *smtc_RegBaseAddress; /* Memory Map IO starting address */ +void __iomem *smtc_VRAMBaseAddress; /* video memory starting address */ static struct fb_var_screeninfo smtcfb_var = { .xres = 1024, |
