7 files changed, 16 insertions, 13 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index f457315579db..bbf0553bdb2e 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -204,7 +204,7 @@ config MTD_ESB2ROM
 
 config MTD_CK804XROM
         tristate "BIOS flash chip on Nvidia CK804"
-        depends on X86 && MTD_JEDECPROBE
+        depends on X86 && MTD_JEDECPROBE && PCI
         help
           Support for treating the BIOS flash chip on nvidia motherboards
           as an MTD device - with this you can reprogram your BIOS.
diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c
index 78b671172bb2..728aed6ad722 100644
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
@@ -205,8 +205,8 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
                         (((unsigned long)(window->virt)) + offset);
                 map->map.size = 0xffffffffUL - map_top + 1UL;
                 /* Set the name of the map to the address I am trying */
-                sprintf(map->map_name, "%s @%08lx",
-                        MOD_NAME, map->map.phys);
+                sprintf(map->map_name, "%s @%08Lx",
+                        MOD_NAME, (unsigned long long)map->map.phys);
 
                 /* There is no generic VPP support */
                 for(map->map.bankwidth = 32; map->map.bankwidth;
diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c
index 238d42e88ec5..3d4a4d8ac789 100644
--- a/drivers/mtd/maps/ck804xrom.c
+++ b/drivers/mtd/maps/ck804xrom.c
@@ -207,8 +207,8 @@ static int __devinit ck804xrom_init_one (struct pci_dev *pdev,
                         (((unsigned long)(window->virt)) + offset);
                 map->map.size = 0xffffffffUL - map_top + 1UL;
                 /* Set the name of the map to the address I am trying */
-                sprintf(map->map_name, "%s @%08lx",
-                        MOD_NAME, map->map.phys);
+                sprintf(map->map_name, "%s @%08Lx",
+                        MOD_NAME, (unsigned long long)map->map.phys);
 
                 /* There is no generic VPP support */
                 for(map->map.bankwidth = 32; map->map.bankwidth;
@@ -327,7 +327,7 @@ static int __init init_ck804xrom(void)
         pdev = NULL;
 
         for(id = ck804xrom_pci_tbl; id->vendor; id++) {
-                pdev = pci_find_device(id->vendor, id->device, NULL);
+                pdev = pci_get_device(id->vendor, id->device, NULL);
                 if (pdev)
                         break;
         }
diff --git a/drivers/mtd/maps/esb2rom.c b/drivers/mtd/maps/esb2rom.c
index a9d808a617c9..0bc013fd66a3 100644
--- a/drivers/mtd/maps/esb2rom.c
+++ b/drivers/mtd/maps/esb2rom.c
@@ -289,8 +289,8 @@ static int __devinit esb2rom_init_one(struct pci_dev *pdev,
                         (((unsigned long)(window->virt)) + offset);
                 map->map.size = 0xffffffffUL - map_top + 1UL;
                 /* Set the name of the map to the address I am trying */
-                sprintf(map->map_name, "%s @%08lx",
-                        MOD_NAME, map->map.phys);
+                sprintf(map->map_name, "%s @%08Lx",
+                        MOD_NAME, (unsigned long long)map->map.phys);
 
                 /* Firmware hubs only use vpp when being programmed
                  * in a factory setting.  So in-place programming
diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c
index 2bb3e63606e5..2c884c49e84a 100644
--- a/drivers/mtd/maps/ichxrom.c
+++ b/drivers/mtd/maps/ichxrom.c
@@ -227,8 +227,8 @@ static int __devinit ichxrom_init_one (struct pci_dev *pdev,
                         (((unsigned long)(window->virt)) + offset);
                 map->map.size = 0xffffffffUL - map_top + 1UL;
                 /* Set the name of the map to the address I am trying */
-                sprintf(map->map_name, "%s @%08lx",
-                        MOD_NAME, map->map.phys);
+                sprintf(map->map_name, "%s @%08Lx",
+                        MOD_NAME, (unsigned long long)map->map.phys);
 
                 /* Firmware hubs only use vpp when being programmed
                  * in a factory setting.  So in-place programming
diff --git a/drivers/mtd/maps/netsc520.c b/drivers/mtd/maps/netsc520.c
index ed215470158b..95dcab2146ad 100644
--- a/drivers/mtd/maps/netsc520.c
+++ b/drivers/mtd/maps/netsc520.c
@@ -94,7 +94,9 @@ static struct mtd_info *mymtd;
 
 static int __init init_netsc520(void)
 {
-        printk(KERN_NOTICE "NetSc520 flash device: 0x%lx at 0x%lx\n", netsc520_map.size, netsc520_map.phys);
+        printk(KERN_NOTICE "NetSc520 flash device: 0x%Lx at 0x%Lx\n",
+                        (unsigned long long)netsc520_map.size,
+                        (unsigned long long)netsc520_map.phys);
         netsc520_map.virt = ioremap_nocache(netsc520_map.phys, netsc520_map.size);
 
         if (!netsc520_map.virt) {
diff --git a/drivers/mtd/maps/sc520cdp.c b/drivers/mtd/maps/sc520cdp.c
index 9b50cfc355b1..4045e372b90d 100644
--- a/drivers/mtd/maps/sc520cdp.c
+++ b/drivers/mtd/maps/sc520cdp.c
@@ -237,8 +237,9 @@ static int __init init_sc520cdp(void)
 #endif
 
         for (i = 0; i < NUM_FLASH_BANKS; i++) {
-                printk(KERN_NOTICE "SC520 CDP flash device: 0x%lx at 0x%lx\n",
-                       sc520cdp_map[i].size, sc520cdp_map[i].phys);
+                printk(KERN_NOTICE "SC520 CDP flash device: 0x%Lx at 0x%Lx\n",
+                        (unsigned long long)sc520cdp_map[i].size,
+                        (unsigned long long)sc520cdp_map[i].phys);
 
                 sc520cdp_map[i].virt = ioremap_nocache(sc520cdp_map[i].phys, sc520cdp_map[i].size);