summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2009-12-06 20:27:06 +0100
committerPeter Hutterer <peter.hutterer@who-t.net>2009-12-11 11:37:36 +1000
commit3fad969a90ccab604359ec4de05e745bb4b909e1 (patch)
tree815b410f3bb814f6d2bd9cad3533fa1b994df5f5 /dix
parent886140787852c660978a9bb3abc7cc2702cbaed1 (diff)
Move config_init() after CreateWellKnownSockets() and InitCoreDevices()
config_init() can now add devices directly instead of scheduling a timer. Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix')
-rw-r--r--dix/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/main.c b/dix/main.c
index f96245a4b..2117a1ee7 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -168,7 +168,6 @@ int main(int argc, char *argv[], char *envp[])
InitBlockAndWakeupHandlers();
/* Perform any operating system dependent initializations you'd like */
OsInit();
- config_init();
if(serverGeneration == 1)
{
CreateWellKnownSockets();
@@ -254,6 +253,7 @@ int main(int argc, char *argv[], char *envp[])
InitRootWindow(WindowTable[i]);
InitCoreDevices();
+ config_init();
InitInput(argc, argv);
InitAndStartDevices();