diff options
| author | Keith Packard <keithp@gamba.jf.intel.com> | 2007-03-03 21:02:17 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@gamba.jf.intel.com> | 2007-03-03 21:02:17 -0800 |
| commit | 0fa3d4f51b5ee0dba3882fd74b6ac4e7da708f8f (patch) | |
| tree | 7c309acf14e8fb78dc5f3337672f42cf93904ee1 /src/i810_driver.c | |
| parent | 10655c4674cdac8a231c50dd9afc5d43fe43b4bd (diff) | |
| parent | fd52d635603b7093c5a2b7fa9c987cf59f9be27c (diff) | |
Merge branch 'modesetting' into crestline
Diffstat (limited to 'src/i810_driver.c')
| -rw-r--r-- | src/i810_driver.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/i810_driver.c b/src/i810_driver.c index ab3a2008..b32e07c2 100644 --- a/src/i810_driver.c +++ b/src/i810_driver.c @@ -386,6 +386,21 @@ int I830EntityIndex = -1; static MODULESETUPPROTO(i810Setup); +static XF86ModuleVersionInfo intelVersRec = { + "intel", + MODULEVENDORSTRING, + MODINFOSTRING1, + MODINFOSTRING2, + XORG_VERSION_CURRENT, + INTEL_VERSION_MAJOR, INTEL_VERSION_MINOR, INTEL_VERSION_PATCH, + ABI_CLASS_VIDEODRV, + ABI_VIDEODRV_VERSION, + MOD_CLASS_VIDEODRV, + {0, 0, 0, 0} +}; + +_X_EXPORT XF86ModuleData intelModuleData = { &intelVersRec, i810Setup, NULL }; + static XF86ModuleVersionInfo i810VersRec = { "i810", MODULEVENDORSTRING, @@ -523,7 +538,9 @@ I810Probe(DriverPtr drv, int flags) * driver, and return if there are none. */ if ((numDevSections = - xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0) { + xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 && + (numDevSections = + xf86MatchDevice(I810_LEGACY_DRIVER_NAME, &devSections)) <= 0) { return FALSE; } |