Rename common infrastructure to the intel namespace.

After splitting out the i810 driver into its own legacy directory, we
can identify the common routines not as i830 but as intel. This
clarifies the code which *is* i830 specific.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

1 files changed, 11 insertions, 11 deletions

diff --git a/src/intel_module.c b/src/intel_module.c
index 1624d06d..42350d43 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -33,7 +33,7 @@
 #include "xf86cmap.h"
 
 #include "common.h"
-#include "i830.h"
+#include "intel.h"
 #include "intel_driver.h"
 #include "legacy/legacy.h"
 
@@ -390,18 +390,18 @@ static const OptionInfoRec *
 intel_available_options(int chipid, int busid)
 {
 #if KMS_ONLY
-	return i830_available_options(chipid, busid);
+	return intel_uxa_available_options(chipid, busid);
 #else
-    switch (chipid) {
-    case PCI_CHIP_I810:
-    case PCI_CHIP_I810_DC100:
-    case PCI_CHIP_I810_E:
-    case PCI_CHIP_I815:
-	    return lg_i810_available_options(chipid, busid);
+	switch (chipid) {
+	case PCI_CHIP_I810:
+	case PCI_CHIP_I810_DC100:
+	case PCI_CHIP_I810_E:
+	case PCI_CHIP_I815:
+		return lg_i810_available_options(chipid, busid);
 
-    default:
-	    return i830_available_options(chipid, busid);
-    }
+	default:
+		return intel_uxa_available_options(chipid, busid);
+	}
 #endif
 }