summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2010-11-19 21:58:44 +0000
committerPaul Mundt <lethal@linux-sh.org>2010-11-24 16:02:40 +0900
commitf3fff7359415f3e6331fa727ab27e9a1556ee7e7 (patch)
tree5d3f3ec5bd1bba47d9b66f8fb85dcb6e4c41df8b /drivers/video
parent8807236b1895b3aca022180cb9906022965344ad (diff)
downloadlinux-3.10-f3fff7359415f3e6331fa727ab27e9a1556ee7e7.tar.gz
linux-3.10-f3fff7359415f3e6331fa727ab27e9a1556ee7e7.tar.bz2
linux-3.10-f3fff7359415f3e6331fa727ab27e9a1556ee7e7.zip
sisfb: delete fallback code for pci_map_rom()
If pci_map_rom() fails, there is some fallback code that basically duplicates pci_map_rom() on non-x86 platforms. No point in that. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Cc: Thomas Winischhofer <thomas@winischhofer.net> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/sis/sis_main.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 1073b70dd85..7feb6992c7c 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -4147,23 +4147,6 @@ sisfb_find_rom(struct pci_dev *pdev)
}
-#else
-
- pci_read_config_dword(pdev, PCI_ROM_ADDRESS, &temp);
- pci_write_config_dword(pdev, PCI_ROM_ADDRESS,
- (ivideo->video_base & PCI_ROM_ADDRESS_MASK) | PCI_ROM_ADDRESS_ENABLE);
-
- rom_base = ioremap(ivideo->video_base, 65536);
- if(rom_base) {
- if(sisfb_check_rom(rom_base, ivideo)) {
- if((myrombase = vmalloc(65536)))
- memcpy_fromio(myrombase, rom_base, 65536);
- }
- iounmap(rom_base);
- }
-
- pci_write_config_dword(pdev, PCI_ROM_ADDRESS, temp);
-
#endif
return myrombase;