diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/video/intelfb/intelfbdrv.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/video/intelfb/intelfbdrv.c')
| -rw-r--r-- | drivers/video/intelfb/intelfbdrv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index 0cafd642fbc0..5ba399991050 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c | |||
| @@ -874,6 +874,9 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev, | |||
| 874 | if (bailearly == 18) | 874 | if (bailearly == 18) |
| 875 | bailout(dinfo); | 875 | bailout(dinfo); |
| 876 | 876 | ||
| 877 | /* read active pipe */ | ||
| 878 | dinfo->pipe = intelfbhw_active_pipe(&dinfo->save_state); | ||
| 879 | |||
| 877 | /* Cursor initialisation */ | 880 | /* Cursor initialisation */ |
| 878 | if (dinfo->hwcursor) { | 881 | if (dinfo->hwcursor) { |
| 879 | intelfbhw_cursor_init(dinfo); | 882 | intelfbhw_cursor_init(dinfo); |