diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/video/savage/savagefb_driver.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/video/savage/savagefb_driver.c')
| -rw-r--r-- | drivers/video/savage/savagefb_driver.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c index f4633d1891f1..117ad42f120d 100644 --- a/drivers/video/savage/savagefb_driver.c +++ b/drivers/video/savage/savagefb_driver.c | |||
| @@ -2110,7 +2110,6 @@ static int savagefb_suspend (struct pci_dev* dev, pm_message_t state) | |||
| 2110 | struct savagefb_par *par = (struct savagefb_par *)info->par; | 2110 | struct savagefb_par *par = (struct savagefb_par *)info->par; |
| 2111 | 2111 | ||
| 2112 | DBG("savagefb_suspend"); | 2112 | DBG("savagefb_suspend"); |
| 2113 | printk(KERN_DEBUG "state: %u\n", state); | ||
| 2114 | 2113 | ||
| 2115 | acquire_console_sem(); | 2114 | acquire_console_sem(); |
| 2116 | fb_set_suspend(info, pci_choose_state(dev, state)); | 2115 | fb_set_suspend(info, pci_choose_state(dev, state)); |