Make the intel_acpi.c code non-modular and make it compile. I think we'll end

up nuking this code anyway, as keithp (and I, as well) disagree about how ACPI
should be handled, but the goal is to compile at the moment.

1 files changed, 1 insertions, 13 deletions

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 8671e5ae..ca76a68c 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2110,22 +2110,10 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int flags)
    if (pScrn->numEntities != 1)
       return FALSE;
 
-   if (!xf86LoadSubModule(pScrn, "intel_acpi"))
-      return FALSE;
-
    /* try to load the video kernel module now */
    xf86LoadKernelModule("video");
 
-   if (xf86LoaderCheckSymbol("I830ACPIOpen")) {
-      void (*acpiOpen)(void) = NULL;
-
-      acpiOpen = LoaderSymbol("I830ACPIOpen");
-
-      if (acpiOpen) {
-         ErrorF("Opening ACPI\n");
-         (*acpiOpen)();
-      }
-   }
+   I830ACPIOpen();
 
    /* Load int10 module */
    if (!xf86LoadSubModule(pScrn, "int10"))