Merge branch 'master' into upstream

Conflicts:

	drivers/scsi/libata-core.c
	drivers/scsi/libata-scsi.c
	include/linux/pci_ids.h

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index 9846defbddb4..1de1b12043bf 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -329,7 +329,7 @@ static int agp_uninorth_suspend(struct pci_dev *pdev)
         /* turn off AGP on the bridge */
         agp = pci_find_capability(pdev, PCI_CAP_ID_AGP);
         pci_read_config_dword(pdev, agp + PCI_AGP_COMMAND, &cmd);
-        bridge->dev_private_data = (void *)cmd;
+        bridge->dev_private_data = (void *)(long)cmd;
         if (cmd & PCI_AGP_COMMAND_AGP) {
                 printk("uninorth-agp: disabling AGP on bridge %s\n",
                                 pci_name(pdev));
@@ -351,7 +351,7 @@ static int agp_uninorth_resume(struct pci_dev *pdev)
         if (bridge == NULL)
                 return -ENODEV;
 
-        command = (u32)bridge->dev_private_data;
+        command = (long)bridge->dev_private_data;
         bridge->dev_private_data = NULL;
         if (!(command & PCI_AGP_COMMAND_AGP))
                 return 0;