Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-evdev

Conflicts:

	src/evdev.h

2 files changed, 11 insertions, 53 deletions

diff --git a/src/evdev.c b/src/evdev.c
index 3b91e53..970135c 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1,5 +1,6 @@
 /*
  * Copyright © 2006 Zephaniah E. Hull
+ * Copyright © 2004 Red Hat, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Soft-
@@ -26,31 +27,9 @@
  * other dealings in this Software without prior written authorization of
  * the copyright holder.
  *
- * Author:  Zephaniah E. Hull (warp@aehallh.com)
- */
-/*
- * Copyright © 2004 Red Hat, Inc.
- *
- * 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.
- *
- * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL RED HAT 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.
- *
- * Author:  Kristian Høgsberg (krh@redhat.com)
+ * Authors:
+ *   Zephaniah E. Hull (warp@aehallh.com),
+ *   Kristian Høgsberg (krh@redhat.com)
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/evdev.h b/src/evdev.h
index 517840d..290e5ae 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -1,5 +1,6 @@
 /*
  * Copyright © 2006 Zephaniah E. Hull
+ * Copyright © 2004 Red Hat, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Soft-
@@ -26,35 +27,13 @@
  * other dealings in this Software without prior written authorization of
  * the copyright holder.
  *
- * Author:  Zephaniah E. Hull (warp@aehallh.com)
- */
-/*
- * Copyright © 2004 Red Hat, Inc.
- *
- * 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.
- *
- * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL RED HAT 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.
- *
- * Author:  Kristian Høgsberg (krh@redhat.com)
+ * Authors:
+ *   Zephaniah E. Hull (warp@aehallh.com)
+ *   Kristian Høgsberg (krh@redhat.com)
  */
 
-#ifndef EVDEV_BRAIN_H_
-#define EVDEV_BRAIN_H_
+#ifndef __EVDEV_H
+#define __EVDEV_H
 
 #define _XF86_ANSIC_H
 #define XF86_LIBC_H
@@ -286,4 +265,4 @@ typedef struct {
 
 extern evdev_map_parsers_t evdev_map_parsers[];
 
-#endif	/* LNX_EVDEV_H_ */
+#endif	/* __EVDEV_H */