Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218515
b: refs/heads/master
c: f0a2f35
h: refs/heads/master
i:
  218513: dd5ae95
  218511: b73cac9
v: v3
  • Loading branch information
Ondrej Zary authored and Linus Torvalds committed Oct 28, 2010
1 parent 59e4469 commit f5283af
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 09b599ddd467911ad6b43f3abe3c533446662417
refs/heads/master: f0a2f357d46a51f8066eb47b3dba40f87a680804
9 changes: 9 additions & 0 deletions trunk/drivers/video/savage/savagefb-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,15 @@ void savagefb_create_i2c_busses(struct fb_info *info)
par->chan.algo.getscl = prosavage_gpio_getscl;
break;
case FB_ACCEL_SAVAGE4:
par->chan.reg = CR_SERIAL1;
if (par->pcidev->revision > 1 && !(VGArCR(0xa6, par) & 0x40))
par->chan.reg = CR_SERIAL2;
par->chan.ioaddr = par->mmio.vbase;
par->chan.algo.setsda = prosavage_gpio_setsda;
par->chan.algo.setscl = prosavage_gpio_setscl;
par->chan.algo.getsda = prosavage_gpio_getsda;
par->chan.algo.getscl = prosavage_gpio_getscl;
break;
case FB_ACCEL_SAVAGE2000:
par->chan.reg = 0xff20;
par->chan.ioaddr = par->mmio.vbase;
Expand Down

0 comments on commit f5283af

Please sign in to comment.