Differential D9436 Diff 25008 head/x11-servers/xorg-server/files/patch-config_config.c

Changeset View

Standalone View

	--- config/config.c.orig 2014-04-12 15:29:14 UTC			--- config/config.c.orig 2016-07-19 17:07:29 UTC
	+++ config/config.c			+++ config/config.c
	@@ -64,6 +64,9 @@ config_init(void)			@@ -55,6 +55,9 @@ config_init(void)
	#elif defined(CONFIG_WSCONS)			#elif defined(CONFIG_WSCONS)
	if (!config_wscons_init())			if (!config_wscons_init())
	ErrorF("[config] failed to initialise wscons\n");			ErrorF("[config] failed to initialise wscons\n");
	+#elif defined(CONFIG_DEVD)			+#elif defined(CONFIG_DEVD)
	+ if (!config_devd_init())			+ if (!config_devd_init())
	+ ErrorF("[config] failed to initialise devd\n");			+ ErrorF("[config] failed to initialise devd\n");
	#endif			#endif
	}			}

	@@ -82,6 +85,8 @@ config_fini(void)			@@ -67,6 +70,8 @@ config_fini(void)
	config_dbus_core_fini();			config_hal_fini();
	#elif defined(CONFIG_WSCONS)			#elif defined(CONFIG_WSCONS)
	config_wscons_fini();			config_wscons_fini();
	+#elif defined(CONFIG_DEVD)			+#elif defined(CONFIG_DEVD)
	+ config_devd_fini();			+ config_devd_fini();
	#endif			#endif
	}			}