xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86Events.c         |   17 -----------------
 hw/xfree86/os-support/linux/lnx_init.c |    1 -
 hw/xfree86/os-support/xf86_OSproc.h    |    1 -
 3 files changed, 19 deletions(-)

New commits:
commit 7d94414cf4b16501ce4c4291846498f393f150a4
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Apr 1 09:42:06 2009 -0400

    input: Remove xf86ReloadInputDevs hack
    
    We have input hotplug now, no need to fake it.

diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 9ed2884..4f84a4c 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -771,23 +771,6 @@ xf86EnableVTSwitch(Bool new)
 }
 
 void
-xf86ReloadInputDevs(int sig)
-{
-  InputInfoPtr pInfo;
-
-  signal(sig, (void(*)(int))xf86ReloadInputDevs);
-
-  pInfo = xf86InputDevs;
-  while (pInfo) {
-    DisableDevice(pInfo->dev);
-    EnableDevice(pInfo->dev);
-    pInfo = pInfo->next;
-  }
-
-  return;
-}
-
-void
 DDXRingBell(int volume, int pitch, int duration) {
     xf86OSRingBell(volume, pitch, duration);
 }
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
index 152fae1..a49086b 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -286,7 +286,6 @@ xf86OpenConsole(void)
         } else { /* ShareVTs */
             close(xf86Info.consoleFd);
         }
-	signal(SIGUSR2, xf86ReloadInputDevs);
     } else { 	/* serverGeneration != 1 */
         if (!ShareVTs && VTSwitch)
         {
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index 5760888..507db18 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -212,7 +212,6 @@ extern _X_EXPORT Bool xf86VTSwitchTo(void);
 extern _X_EXPORT void xf86VTRequest(int sig);
 extern _X_EXPORT int xf86ProcessArgument(int, char **, int);
 extern _X_EXPORT void xf86UseMsg(void);
-extern _X_EXPORT void xf86ReloadInputDevs(int sig);
 extern _X_EXPORT PMClose xf86OSPMOpen(void);
 
 #ifdef NEED_OS_RAC_PROTOS