Merge ../linus

[pandora-kernel.git] / drivers / char / agp / ati-agp.c

diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 34bbd41..f244c66 100644 (file)
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -248,14 +248,14 @@ static int ati_configure(void)
 static int agp_ati_suspend(struct pci_dev *dev, pm_message_t state)
 {
        pci_save_state(dev);
-       pci_set_power_state (pdev, 3);
+       pci_set_power_state(dev, 3);
 
        return 0;
 }
 
 static int agp_ati_resume(struct pci_dev *dev)
 {
-       pci_set_power_state (pdev, 0);
+       pci_set_power_state(dev, 0);
        pci_restore_state(dev);
 
        return ati_configure();
@@ -263,7 +263,7 @@ static int agp_ati_resume(struct pci_dev *dev)
 #endif
 
 /*
- *Since we don't need contigious memory we just try
+ *Since we don't need contiguous memory we just try
  * to get the gatt table once
  */