|
@@ -1470,15 +1470,13 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
unsigned long addr, size;
|
|
|
struct imstt_par *par;
|
|
|
struct fb_info *info;
|
|
|
-#ifdef CONFIG_PPC_OF
|
|
|
struct device_node *dp;
|
|
|
|
|
|
dp = pci_device_to_OF_node(pdev);
|
|
|
if(dp)
|
|
|
printk(KERN_INFO "%s: OF name %s\n",__func__, dp->name);
|
|
|
- else
|
|
|
+ else if (IS_ENABLED(CONFIG_OF))
|
|
|
printk(KERN_ERR "imsttfb: no OF node for pci device\n");
|
|
|
-#endif /* CONFIG_PPC_OF */
|
|
|
|
|
|
info = framebuffer_alloc(sizeof(struct imstt_par), &pdev->dev);
|
|
|
|
|
@@ -1501,11 +1499,9 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
switch (pdev->device) {
|
|
|
case PCI_DEVICE_ID_IMS_TT128: /* IMS,tt128mbA */
|
|
|
par->ramdac = IBM;
|
|
|
-#ifdef CONFIG_PPC_OF
|
|
|
if (dp && ((strcmp(dp->name, "IMS,tt128mb8") == 0) ||
|
|
|
(strcmp(dp->name, "IMS,tt128mb8A") == 0)))
|
|
|
par->ramdac = TVP;
|
|
|
-#endif /* CONFIG_PPC_OF */
|
|
|
break;
|
|
|
case PCI_DEVICE_ID_IMS_TT3D: /* IMS,tt3d */
|
|
|
par->ramdac = TVP;
|