|
@@ -52,7 +52,7 @@ module_param_named(trap_pagefaults, drm_psb_trap_pagefaults, int, 0600);
|
|
|
static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
|
|
|
{ 0x8086, 0x8108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops },
|
|
|
{ 0x8086, 0x8109, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops },
|
|
|
-#if defined(CONFIG_DRM_PSB_MRST)
|
|
|
+#if defined(CONFIG_DRM_PSB_MRST)
|
|
|
{ 0x8086, 0x4100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mrst_chip_ops},
|
|
|
{ 0x8086, 0x4101, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mrst_chip_ops},
|
|
|
{ 0x8086, 0x4102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mrst_chip_ops},
|
|
@@ -72,7 +72,7 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
|
|
|
{ 0x8086, 0x0136, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
|
|
|
{ 0x8086, 0x0137, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
|
|
|
#endif
|
|
|
-#if defined(CONFIG_DRM_PSB_CDV)
|
|
|
+#if defined(CONFIG_DRM_PSB_CDV)
|
|
|
{ 0x8086, 0x0be0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
|
|
|
{ 0x8086, 0x0be1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
|
|
|
{ 0x8086, 0x0be2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
|
|
@@ -81,7 +81,7 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
|
|
|
{ 0x8086, 0x0be5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
|
|
|
{ 0x8086, 0x0be6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
|
|
|
{ 0x8086, 0x0be7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
|
|
|
-#endif
|
|
|
+#endif
|
|
|
{ 0, 0, 0}
|
|
|
};
|
|
|
MODULE_DEVICE_TABLE(pci, pciidlist);
|
|
@@ -409,7 +409,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
|
|
|
#ifdef CONFIG_MDFLD_DSI_DPU
|
|
|
/*init dpu info*/
|
|
|
mdfld_dbi_dpu_init(dev);
|
|
|
-#else
|
|
|
+#else
|
|
|
mdfld_dbi_dsr_init(dev);
|
|
|
#endif /*CONFIG_MDFLD_DSI_DPU*/
|
|
|
/* INIT_WORK(&dev_priv->te_work, mdfld_te_handler_work);*/
|