aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlaf Hering <olh@suse.de>2005-09-09 16:10:06 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 17:03:41 -0400
commit3b4abffbadf728996fb9243b4af1df48dd771e86 (patch)
treeb9748b90cd24b4b523b82f860c3a8f982b7479d0
parent63edceac69889e48b1b39f40ca0a4c00fdc3bbb0 (diff)
[PATCH] quiet non-x86 option ROM warnings
Quiet an incorrect warning in aty128fb and radeonfb about the PCI ROM content. Macs work just find without that signature. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/video/aty/aty128fb.c4
-rw-r--r--drivers/video/aty/radeon_base.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index b0eba3ac6420..e380ee8b0247 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -806,8 +806,8 @@ static void __iomem * __init aty128_map_ROM(const struct aty128fb_par *par, stru
806 806
807 /* Very simple test to make sure it appeared */ 807 /* Very simple test to make sure it appeared */
808 if (BIOS_IN16(0) != 0xaa55) { 808 if (BIOS_IN16(0) != 0xaa55) {
809 printk(KERN_ERR "aty128fb: Invalid ROM signature %x should be 0xaa55\n", 809 printk(KERN_DEBUG "aty128fb: Invalid ROM signature %x should "
810 BIOS_IN16(0)); 810 " be 0xaa55\n", BIOS_IN16(0));
811 goto failed; 811 goto failed;
812 } 812 }
813 813
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 8a7c04c35a75..046b47860266 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -329,8 +329,9 @@ static int __devinit radeon_map_ROM(struct radeonfb_info *rinfo, struct pci_dev
329 329
330 /* Very simple test to make sure it appeared */ 330 /* Very simple test to make sure it appeared */
331 if (BIOS_IN16(0) != 0xaa55) { 331 if (BIOS_IN16(0) != 0xaa55) {
332 printk(KERN_ERR "radeonfb (%s): Invalid ROM signature %x should be" 332 printk(KERN_DEBUG "radeonfb (%s): Invalid ROM signature %x "
333 "0xaa55\n", pci_name(rinfo->pdev), BIOS_IN16(0)); 333 "should be 0xaa55\n",
334 pci_name(rinfo->pdev), BIOS_IN16(0));
334 goto failed; 335 goto failed;
335 } 336 }
336 /* Look for the PCI data to check the ROM type */ 337 /* Look for the PCI data to check the ROM type */