Merge branch 'modesetting' into crestline

This works for analog, but SDVO output appears to not work yet.

Conflicts:

	src/i830_driver.c

1 files changed, 10 insertions, 2 deletions

diff --git a/src/i810_driver.c b/src/i810_driver.c
index a31e4cf8..63a24d7c 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -347,6 +347,14 @@ const char *I810shadowSymbols[] = {
     "shadowInit",
     "shadowSetup",
     "shadowAdd",
+    "shadowRemove",
+    "shadowUpdateRotatePacked",
+    NULL
+};
+
+const char *I810i2cSymbols[] = {
+    "xf86CreateI2CBusRec",
+    "xf86I2CBusInit",
     NULL
 };
 
@@ -486,11 +494,11 @@ I810AvailableOptions(int chipid, int busid)
 #ifndef I830_ONLY
    const OptionInfoRec *pOptions;
 
-   if ((pOptions = I830BIOSAvailableOptions(chipid, busid)))
+   if ((pOptions = I830AvailableOptions(chipid, busid)))
       return pOptions;
    return I810Options;
 #else
-   return I830BIOSAvailableOptions(chipid, busid);
+   return I830AvailableOptions(chipid, busid);
 #endif
 }