diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-07-22 09:22:05 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-09-01 15:26:47 +1000 |
| commit | 4cd54d9ed9e87074734789a9a7708c2218f87f1e (patch) | |
| tree | b1c8daadf3fa2adc0ff37d955dbdd041c5e95c3c | |
| parent | 31c71425ac13a7f554316356691a79175ea82a67 (diff) | |
xfree86: make xf86ActivateDevice static.
No-one but the joystick driver uses it and that one should be using NIDR
instead.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | hw/xfree86/common/xf86InPriv.h | 3 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.h | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/hw/xfree86/common/xf86InPriv.h b/hw/xfree86/common/xf86InPriv.h index 3838d6940..1b9b502f5 100644 --- a/hw/xfree86/common/xf86InPriv.h +++ b/hw/xfree86/common/xf86InPriv.h @@ -37,9 +37,6 @@ extern InputDriverPtr *xf86InputDriverList; extern int xf86NumInputDrivers; -/* xf86Xinput.c */ -int xf86ActivateDevice(InputInfoPtr pInfo); - /* xf86Helper.c */ InputDriverPtr xf86LookupInputDriver(const char *name); diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 8fd35e66e..dcfbcde39 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -324,7 +324,7 @@ xf86ProcessCommonOptions(LocalDevicePtr local, * Returns TRUE on success, or FALSE otherwise. *********************************************************************** */ -int +static int xf86ActivateDevice(LocalDevicePtr local) { DeviceIntPtr dev; diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h index 6789df6fe..3c1a14778 100644 --- a/hw/xfree86/common/xf86Xinput.h +++ b/hw/xfree86/common/xf86Xinput.h @@ -184,7 +184,6 @@ extern _X_EXPORT void xf86PostKeyEventP(DeviceIntPtr device, unsigned int key_co int *valuators); extern _X_EXPORT void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code, int is_down); -extern _X_EXPORT int xf86ActivateDevice(LocalDevicePtr local); extern _X_EXPORT LocalDevicePtr xf86FirstLocalDevice(void); extern _X_EXPORT int xf86ScaleAxis(int Cx, int Sxhigh, int Sxlow, int Rxhigh, int Rxlow); extern _X_EXPORT void xf86XInputSetScreen(LocalDevicePtr local, int screen_number, int x, int y); |