Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
---
src/Makefile.am | 2 +-
src/alpscomm.c | 2 +-
src/alpscomm.h | 33 ---------------------------------
3 files changed, 2 insertions(+), 35 deletions(-)
delete mode 100644 src/alpscomm.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 980ab5e..0637445 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS = $(XORG_CFLAGS)
@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c synapticsstr.h \
- alpscomm.c alpscomm.h \
+ alpscomm.c \
ps2comm.c ps2comm.h \
synproto.h \
properties.c
diff --git a/src/alpscomm.c b/src/alpscomm.c
index c5af681..56f74ac 100644
--- a/src/alpscomm.c
+++ b/src/alpscomm.c
@@ -33,7 +33,7 @@
#endif
#include <xorg-server.h>
-#include "alpscomm.h"
+#include "ps2comm.h"
#include "synproto.h"
#include "synaptics.h"
#include "synapticsstr.h"
diff --git a/src/alpscomm.h b/src/alpscomm.h
deleted file mode 100644
index 547cf72..0000000
--- a/src/alpscomm.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright © 2004 Peter Osterlund
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Red Hat
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission. Red
- * Hat makes no representations about the suitability of this software
- * for any purpose. It is provided "as is" without express or implied
- * warranty.
- *
- * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Authors:
- * Peter Osterlund (pete...@telia.com)
- */
-
-#ifndef _ALPSCOMM_H_
-#define _ALPSCOMM_H_
-
-#include "ps2comm.h"
-
-
-#endif /* _ALPSCOMM_H_ */
--
1.7.3.5
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
