xserver: Branch 'master'

[Greg Kroah-Hartman]

 hw/xfree86/i2c/tda9850.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 29c78321e86956c4ce0c1c899d82557f927e04da (from 9f2793551f335e5fb08990fc8bb9e05e0ffb68d5)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Mon Jun 19 14:36:41 2006 -0700

    fix compiler warning in hw/xfree86/i2c/tda9850.c

diff --git a/hw/xfree86/i2c/tda9850.c b/hw/xfree86/i2c/tda9850.c
index e6afd81..5b0c581 100644
--- a/hw/xfree86/i2c/tda9850.c
+++ b/hw/xfree86/i2c/tda9850.c
@@ -107,6 +107,6 @@ CARD16 tda9850_getstatus(TDA9850Ptr t)
 {
 CARD16 status;
 
-I2C_WriteRead(&(t->d), NULL, 0, &status, 2); 
+I2C_WriteRead(&(t->d), NULL, 0, (I2CByte *)&status, 2); 
 return status;
 }