The patch titled rivafb: Fix I2C getscl callback function has been added to the -mm tree. Its filename is rivafb-fix-i2c-getscl-callback-function.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: rivafb: Fix I2C getscl callback function From: Jean Delvare <khali@xxxxxxxxxxxx> Fix rivafb's I2C getscl callback function, as was done in nvidiafb recently. Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx> Signed-off-by: Antonino Daplas <adaplas@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/riva/rivafb-i2c.c | 2 -- 1 file changed, 2 deletions(-) diff -puN drivers/video/riva/rivafb-i2c.c~rivafb-fix-i2c-getscl-callback-function drivers/video/riva/rivafb-i2c.c --- a/drivers/video/riva/rivafb-i2c.c~rivafb-fix-i2c-getscl-callback-function +++ a/drivers/video/riva/rivafb-i2c.c @@ -70,8 +70,6 @@ static int riva_gpio_getscl(void* data) if (VGA_RD08(par->riva.PCIO, 0x3d5) & 0x04) val = 1; - val = VGA_RD08(par->riva.PCIO, 0x3d5); - return val; } _ Patches currently in -mm which might be from khali@xxxxxxxxxxxx are origin.patch fix-i2c-pxa-build.patch git-alsa.patch git-dvb.patch fix-jdelvare-i2c-i2c-at91-support-new-style-binding.patch rivafb-fix-i2c-getscl-callback-function.patch nvidiafb-enable-debugging-messages-a-kconfig-option.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html