projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
drivers
/
char
/
agp
/
nvidia-agp.c
diff --git
a/drivers/char/agp/nvidia-agp.c
b/drivers/char/agp/nvidia-agp.c
index
b3a53e7
..
df7f37b
100644
(file)
--- a/
drivers/char/agp/nvidia-agp.c
+++ b/
drivers/char/agp/nvidia-agp.c
@@
-387,8
+387,6
@@
static int agp_nvidia_suspend(struct pci_dev *pdev, pm_message_t state)
static int agp_nvidia_resume(struct pci_dev *pdev)
{
- struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
-
/* set power state 0 and restore PCI space */
pci_set_power_state (pdev, 0);
pci_restore_state(pdev);