aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/xgifb/vb_util.h
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2011-03-13 12:26:25 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-14 11:52:33 -0700
commitec9e5d3e73d675915ac572631ef0d5dcc03d2b6c (patch)
tree7f28d2a729137a66bc7e09f1175b8f5dc1b28979 /drivers/staging/xgifb/vb_util.h
parentstaging: xgifb: rename XGINew_SetRegOR() to xgifb_reg_or() (diff)
downloadlinux-dev-ec9e5d3e73d675915ac572631ef0d5dcc03d2b6c.tar.xz
linux-dev-ec9e5d3e73d675915ac572631ef0d5dcc03d2b6c.zip
staging: xgifb: rename XGINew_SetRegANDOR() to xgifb_reg_and_or()
Rename XGINew_SetRegANDOR() to xgifb_reg_and_or(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb/vb_util.h')
-rw-r--r--drivers/staging/xgifb/vb_util.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/xgifb/vb_util.h b/drivers/staging/xgifb/vb_util.h
index 6bcdca84032f..e8e36a261b06 100644
--- a/drivers/staging/xgifb/vb_util.h
+++ b/drivers/staging/xgifb/vb_util.h
@@ -4,6 +4,6 @@ extern void xgifb_reg_set(unsigned long, unsigned short, unsigned short);
extern unsigned char xgifb_reg_get(unsigned long, unsigned short);
extern void xgifb_reg_or(unsigned long, unsigned short, unsigned short);
extern void XGINew_SetRegAND(unsigned long Port,unsigned short Index,unsigned short DataAND);
-extern void XGINew_SetRegANDOR(unsigned long Port,unsigned short Index,unsigned short DataAND,unsigned short DataOR);
+extern void xgifb_reg_and_or(unsigned long, unsigned short, unsigned short, unsigned short);
#endif