4 files changed, 19 insertions, 5 deletions

diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c
index 8cc6c0e2d27a..04c6d928189b 100644
--- a/drivers/video/controlfb.c
+++ b/drivers/video/controlfb.c
@@ -415,13 +415,15 @@ static int __init init_control(struct fb_info_control *p)
         full = p->total_vram == 0x400000;
 
         /* Try to pick a video mode out of NVRAM if we have one. */
+#ifdef CONFIG_NVRAM
         if (default_cmode == CMODE_NVRAM){
                 cmode = nvram_read_byte(NV_CMODE);
                 if(cmode < CMODE_8 || cmode > CMODE_32)
                         cmode = CMODE_8;
         } else
+#endif
                 cmode=default_cmode;
-
+#ifdef CONFIG_NVRAM
         if (default_vmode == VMODE_NVRAM) {
                 vmode = nvram_read_byte(NV_VMODE);
                 if (vmode < 1 || vmode > VMODE_MAX ||
@@ -432,7 +434,9 @@ static int __init init_control(struct fb_info_control *p)
                         if (control_mac_modes[vmode - 1].m[full] < cmode)
                                 vmode = VMODE_640_480_60;
                 }
-        } else {
+        } else
+#endif
+        {
                 vmode=default_vmode;
                 if (control_mac_modes[vmode - 1].m[full] < cmode) {
                         if (cmode > CMODE_8)
diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c
index 67f384f86758..e6df492c22a5 100644
--- a/drivers/video/igafb.c
+++ b/drivers/video/igafb.c
@@ -573,3 +573,10 @@ int __init igafb_setup(char *options)
 
 module_init(igafb_init);
 MODULE_LICENSE("GPL");
+static struct pci_device_id igafb_pci_tbl[] __devinitdata = {
+        { PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_1682,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { }
+};
+
+MODULE_DEVICE_TABLE(pci, igafb_pci_tbl);
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index 983be3ec2345..fdb33cd21a27 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -339,11 +339,12 @@ static int __devinit platinum_init_fb(struct fb_info *info)
 
         sense = read_platinum_sense(pinfo);
         printk(KERN_INFO "platinumfb: Monitor sense value = 0x%x, ", sense);
-
         if (default_vmode == VMODE_NVRAM) {
+#ifdef CONFIG_NVRAM
                 default_vmode = nvram_read_byte(NV_VMODE);
                 if (default_vmode <= 0 || default_vmode > VMODE_MAX ||
                     !platinum_reg_init[default_vmode-1])
+#endif
                         default_vmode = VMODE_CHOOSE;
         }
         if (default_vmode == VMODE_CHOOSE) {
@@ -351,8 +352,10 @@ static int __devinit platinum_init_fb(struct fb_info *info)
         }
         if (default_vmode <= 0 || default_vmode > VMODE_MAX)
                 default_vmode = VMODE_640_480_60;
+#ifdef CONFIG_NVRAM
         if (default_cmode == CMODE_NVRAM)
                 default_cmode = nvram_read_byte(NV_CMODE);
+#endif
         if (default_cmode < CMODE_8 || default_cmode > CMODE_32)
                 default_cmode = CMODE_8;
         /*
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
index 47f27924a7d7..06fc19a61192 100644
--- a/drivers/video/valkyriefb.c
+++ b/drivers/video/valkyriefb.c
@@ -284,7 +284,7 @@ static void __init valkyrie_choose_mode(struct fb_info_valkyrie *p)
         printk(KERN_INFO "Monitor sense value = 0x%x\n", p->sense);
 
         /* Try to pick a video mode out of NVRAM if we have one. */
-#ifndef CONFIG_MAC
+#if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM)
         if (default_vmode == VMODE_NVRAM) {
                 default_vmode = nvram_read_byte(NV_VMODE);
                 if (default_vmode <= 0
@@ -297,7 +297,7 @@ static void __init valkyrie_choose_mode(struct fb_info_valkyrie *p)
                 default_vmode = mac_map_monitor_sense(p->sense);
         if (!valkyrie_reg_init[default_vmode - 1])
                 default_vmode = VMODE_640_480_67;
-#ifndef CONFIG_MAC
+#if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM)
         if (default_cmode == CMODE_NVRAM)
                 default_cmode = nvram_read_byte(NV_CMODE);
 #endif