diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2007-02-01 22:48:44 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2007-02-01 22:48:44 -0800 |
| commit | 785a59ead0e8d1d681b2cb6827ee58ad2c51f8c6 (patch) | |
| tree | d9bcd7dc81d2065f2434deb97d5c50bab79ea057 /src/i810_driver.c | |
| parent | 1dde7a15a3a42b881c57ece95feceffadf412cff (diff) | |
Rename driver from i810 to intel. Permit old name for compatibility.modesetting-rotation
Driver installs as intel_drv.so with symlink to i810_drv.so to ensure
existing configurations continue to work. Updated manual page to reflect
name change and add attributions for recent work.
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 e7c85071..04166b78 100644 --- a/src/i810_driver.c +++ b/src/i810_driver.c @@ -384,6 +384,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, @@ -521,7 +536,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; } |