diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-04 15:11:11 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-04 15:11:38 +0200 |
commit | 45c200b2a66c3c63e7ed6f31f22958810263e2fd (patch) | |
tree | d1b9cc41048a1e06881b4d1b7f38e001970d4bd8 /package/xf86-video-cirrus/patches/patch-src_cir_driver_c | |
parent | 3344c4b85b3ec13f9c88478f5f3a98f2d1a3efd0 (diff) |
update to latest upstream version
Diffstat (limited to 'package/xf86-video-cirrus/patches/patch-src_cir_driver_c')
-rw-r--r-- | package/xf86-video-cirrus/patches/patch-src_cir_driver_c | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/package/xf86-video-cirrus/patches/patch-src_cir_driver_c b/package/xf86-video-cirrus/patches/patch-src_cir_driver_c deleted file mode 100644 index 9fe658863..000000000 --- a/package/xf86-video-cirrus/patches/patch-src_cir_driver_c +++ /dev/null @@ -1,48 +0,0 @@ ---- xf86-video-cirrus-1.4.0.orig/src/cir_driver.c 2012-03-24 02:48:17.000000000 +0100 -+++ xf86-video-cirrus-1.4.0/src/cir_driver.c 2013-11-14 14:22:54.000000000 +0100 -@@ -206,25 +206,6 @@ CIRProbe(DriverPtr drv, int flags) - ErrorF("CirProbe\n"); - #endif - -- /* -- * For PROBE_DETECT, make sure both sub-modules are loaded before -- * calling xf86MatchPciInstances(), because the AvailableOptions() -- * functions may be called before xf86MatchPciInstances() returns. -- */ -- -- if (flags & PROBE_DETECT) { -- if (!lg_loaded) { -- if (xf86LoadDrvSubModule(drv, "cirrus_laguna")) { -- lg_loaded = TRUE; -- } -- } -- if (!alp_loaded) { -- if (xf86LoadDrvSubModule(drv, "cirrus_alpine")) { -- alp_loaded = TRUE; -- } -- } -- } -- - if ((numDevSections = xf86MatchDevice(CIR_DRIVER_NAME, - &devSections)) <= 0) { - return FALSE; -@@ -261,19 +242,8 @@ CIRProbe(DriverPtr drv, int flags) - PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5464 || - PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5464BD || - PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5465)) { -- -- if (!lg_loaded) { -- if (!xf86LoadDrvSubModule(drv, "cirrus_laguna")) -- continue; -- lg_loaded = TRUE; -- } - pScrn = LgProbe(usedChips[i]); - } else { -- if (!alp_loaded) { -- if (!xf86LoadDrvSubModule(drv, "cirrus_alpine")) -- continue; -- alp_loaded = TRUE; -- } - pScrn = AlpProbe(usedChips[i]); - } - |