diff options
author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2010-12-20 16:50:12 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-21 22:56:41 -0500 |
commit | e68046b72e9b35d054e3d98d71dc2c69d7e88e1e (patch) | |
tree | fdada04a4b78266482e6794206883d8589cc67ff /drivers/video/sis/sis.h | |
parent | b5b7dda7b5d9126d531ffa212b6a89d72aeac90a (diff) |
sisfb: remove duplicate function declarations
Remove duplicate register I/O function declarations by moving them into
a common header file.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/sis/sis.h')
-rw-r--r-- | drivers/video/sis/sis.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h index 80d89d37c41..a94272d0126 100644 --- a/drivers/video/sis/sis.h +++ b/drivers/video/sis/sis.h | |||
@@ -307,7 +307,20 @@ | |||
307 | #define VB2_LCDOVER1600BRIDGE (VB2_307T | VB2_307LV) | 307 | #define VB2_LCDOVER1600BRIDGE (VB2_307T | VB2_307LV) |
308 | #define VB2_RAMDAC202MHZBRIDGE (VB2_301C | VB2_307T) | 308 | #define VB2_RAMDAC202MHZBRIDGE (VB2_301C | VB2_307T) |
309 | 309 | ||
310 | /* I/O port access macros */ | 310 | /* I/O port access macros and functions */ |
311 | |||
312 | void SiS_SetReg(SISIOADDRESS, unsigned short, unsigned short); | ||
313 | void SiS_SetRegByte(SISIOADDRESS, unsigned short); | ||
314 | void SiS_SetRegShort(SISIOADDRESS, unsigned short); | ||
315 | void SiS_SetRegLong(SISIOADDRESS, unsigned int); | ||
316 | void SiS_SetRegANDOR(SISIOADDRESS, unsigned short, unsigned short, unsigned short); | ||
317 | void SiS_SetRegAND(SISIOADDRESS, unsigned short, unsigned short); | ||
318 | void SiS_SetRegOR(SISIOADDRESS, unsigned short, unsigned short); | ||
319 | unsigned char SiS_GetReg(SISIOADDRESS, unsigned short); | ||
320 | unsigned char SiS_GetRegByte(SISIOADDRESS); | ||
321 | unsigned short SiS_GetRegShort(SISIOADDRESS); | ||
322 | unsigned int SiS_GetRegLong(SISIOADDRESS); | ||
323 | |||
311 | #define inSISREG(base) inb(base) | 324 | #define inSISREG(base) inb(base) |
312 | 325 | ||
313 | #define outSISREG(base,val) outb(val,base) | 326 | #define outSISREG(base,val) outb(val,base) |