1 files changed, 16 insertions, 5 deletions

diff --git a/arch/ia64/pci/fixup.c b/arch/ia64/pci/fixup.c
index fc505d58f078..41caa99add51 100644
--- a/arch/ia64/pci/fixup.c
+++ b/arch/ia64/pci/fixup.c
@@ -17,14 +17,14 @@
  *
  * The standard boot ROM sequence for an x86 machine uses the BIOS
  * to select an initial video card for boot display. This boot video
- * card will have it's BIOS copied to C0000 in system RAM.
+ * card will have its BIOS copied to 0xC0000 in system RAM.
  * IORESOURCE_ROM_SHADOW is used to associate the boot video
  * card with this copy. On laptops this copy has to be used since
  * the main ROM may be compressed or combined with another image.
  * See pci_map_rom() for use of this flag. Before marking the device
  * with IORESOURCE_ROM_SHADOW check if a vga_default_device is already set
- * by either arch cde or vga-arbitration, if so only apply the fixup to this
- * already determined primary video card.
+ * by either arch code or vga-arbitration; if so only apply the fixup to this
+ * already-determined primary video card.
  */
 
 static void pci_fixup_video(struct pci_dev *pdev)
@@ -32,6 +32,7 @@ static void pci_fixup_video(struct pci_dev *pdev)
         struct pci_dev *bridge;
         struct pci_bus *bus;
         u16 config;
+        struct resource *res;
 
         if ((strcmp(ia64_platform_name, "dig") != 0)
             && (strcmp(ia64_platform_name, "hpzx1")  != 0))
@@ -61,8 +62,18 @@ static void pci_fixup_video(struct pci_dev *pdev)
         if (!vga_default_device() || pdev == vga_default_device()) {
                 pci_read_config_word(pdev, PCI_COMMAND, &config);
                 if (config & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) {
-                        pdev->resource[PCI_ROM_RESOURCE].flags |= IORESOURCE_ROM_SHADOW;
-                        dev_printk(KERN_DEBUG, &pdev->dev, "Video device with shadowed ROM\n");
+                        res = &pdev->resource[PCI_ROM_RESOURCE];
+
+                        pci_disable_rom(pdev);
+                        if (res->parent)
+                                release_resource(res);
+
+                        res->start = 0xC0000;
+                        res->end = res->start + 0x20000 - 1;
+                        res->flags = IORESOURCE_MEM | IORESOURCE_ROM_SHADOW |
+                                     IORESOURCE_PCI_FIXED;
+                        dev_info(&pdev->dev, "Video device with shadowed ROM at %pR\n",
+                                 res);
                 }
         }
 }