diff options
author | Keith Packard <keithp@keithp.com> | 2010-05-19 22:27:53 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2010-05-19 22:27:53 -0700 |
commit | 103507af0c0ce7d7482a67163249864af36a2374 (patch) | |
tree | 3e2e94269b5b022e0c820328d719a7544c707edb /hw/xfree86/common/xf86Configure.c | |
parent | 8bd8d81dc473bf72ea108b1896a55e32defa02e2 (diff) | |
parent | 99fcf655bdc96f7e5b2249b05da51ba4fc9190c7 (diff) |
Merge remote branch 'vignatti/bus-cleanup'
Diffstat (limited to 'hw/xfree86/common/xf86Configure.c')
-rw-r--r-- | hw/xfree86/common/xf86Configure.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 7d4c3410d..301332153 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -821,7 +821,6 @@ DoConfigure(void) } xf86PostProbe(); - xf86EntityInit(); for (j = 0; j < xf86NumScreens; j++) { xf86Screens[j]->scrnIndex = j; @@ -837,7 +836,6 @@ DoConfigure(void) ConfiguredMonitor = NULL; - xf86EnableAccess(xf86Screens[dev2screen[j]]); if ((*xf86Screens[dev2screen[j]]->PreInit)(xf86Screens[dev2screen[j]], PROBE_DETECT) && ConfiguredMonitor) { |