diff options
| author | Eiichiro Oiwa <eiichiro.oiwa.nm@hitachi.com> | 2006-10-23 15:14:07 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-10-27 11:20:33 -0700 |
| commit | 6b5c76b8e2ff204fa8d7201acce461188873bf2b (patch) | |
| tree | 6e3864c98fdcca8aa5609ad799349513d9372a10 /drivers/pci/rom.c | |
| parent | 35ae61a0f43ebbabc3cb4345136ca529fc4d6700 (diff) | |
| download | linux-6b5c76b8e2ff204fa8d7201acce461188873bf2b.tar.gz | |
PCI: fix pci_fixup_video as it blows up on sparc64
This reverts much of the original pci_fixup_video change and makes it
work for all arches that need it.
fixed, and tested on x86, x86_64 and IA64 dig.
Signed-off-by: Eiichiro Oiwa <eiichiro.oiwa.nm@hitachi.com>
Acked-by: David Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/rom.c')
| -rw-r--r-- | drivers/pci/rom.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c index 43e4a49f2cc4..e1dcefc69bb4 100644 --- a/drivers/pci/rom.c +++ b/drivers/pci/rom.c @@ -72,8 +72,9 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size) int last_image; /* - * IORESOURCE_ROM_SHADOW set if the VGA enable bit of the Bridge Control - * register is set for embedded VGA. + * IORESOURCE_ROM_SHADOW set on x86, x86_64 and IA64 supports legacy + * memory map if the VGA enable bit of the Bridge Control register is + * set for embedded VGA. */ if (res->flags & IORESOURCE_ROM_SHADOW) { /* primary video rom always starts here */ |