Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 85be7d60595b4803731cec158b0023bc050fdd14

Authored by Alexey Dobriyan
Committed by Dave Jones
1 parent 71565619af
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[AGPGART] CONFIG_PM=n slim: drivers/char/agp/intel-agp.c 

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Dave Jones <davej@redhat.com>

Showing 1 changed file with 4 additions and 0 deletions Side-by-side Diff

drivers/char/agp/intel-agp.c
Diff comments   View file @ 85be7d6
... ... @@ -1766,6 +1766,7 @@
1766 1766 agp_put_bridge(bridge);
1767 1767 }
1768 1768  
  1769 +#ifdef CONFIG_PM
1769 1770 static int agp_intel_resume(struct pci_dev *pdev)
1770 1771 {
1771 1772 struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
... ... @@ -1789,6 +1790,7 @@
1789 1790  
1790 1791 return 0;
1791 1792 }
  1793 +#endif
1792 1794  
1793 1795 static struct pci_device_id agp_intel_pci_table[] = {
1794 1796 #define ID(x) \
1795 1797  
... ... @@ -1835,7 +1837,9 @@
1835 1837 .id_table = agp_intel_pci_table,
1836 1838 .probe = agp_intel_probe,
1837 1839 .remove = __devexit_p(agp_intel_remove),
  1840 +#ifdef CONFIG_PM
1838 1841 .resume = agp_intel_resume,
  1842 +#endif
1839 1843 };
1840 1844  
1841 1845 static int __init agp_intel_init(void)