This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / linux / sonypi.h

diff --git a/include/linux/sonypi.h b/include/linux/sonypi.h
index 388d573..1ad9711 100644 (file)
--- a/include/linux/sonypi.h
+++ b/include/linux/sonypi.h
@@ -1,7 +1,7 @@
-/*
+/* 
  * Sony Programmable I/O Control Device driver for VAIO
  *
- * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net>
+ * Copyright (C) 2001-2003 Stelian Pop <stelian@popies.net>
  *
  * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
  *
@@ -14,24 +14,24 @@
  * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com>
  *
  * Earlier work by Werner Almesberger, Paul `Rusty' Russell and Paul Mackerras.
- *
+ * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
-#ifndef _SONYPI_H_
+#ifndef _SONYPI_H_ 
 #define _SONYPI_H_
 
 #include <linux/types.h>
@@ -96,7 +96,6 @@
 #define SONYPI_EVENT_ANYBUTTON_RELEASED                56
 #define SONYPI_EVENT_BATTERY_INSERT            57
 #define SONYPI_EVENT_BATTERY_REMOVE            58
-#define SONYPI_EVENT_FNKEY_RELEASED            59
 
 /* get/set brightness */
 #define SONYPI_IOCGBRT         _IOR('v', 0, __u8)
@@ -122,28 +121,28 @@
 
 /* used only for communication between v4l and sonypi */
 
-#define SONYPI_COMMAND_GETCAMERA                1      /* obsolete */
+#define SONYPI_COMMAND_GETCAMERA                1
 #define SONYPI_COMMAND_SETCAMERA                2
-#define SONYPI_COMMAND_GETCAMERABRIGHTNESS      3      /* obsolete */
+#define SONYPI_COMMAND_GETCAMERABRIGHTNESS      3
 #define SONYPI_COMMAND_SETCAMERABRIGHTNESS      4
-#define SONYPI_COMMAND_GETCAMERACONTRAST        5      /* obsolete */
+#define SONYPI_COMMAND_GETCAMERACONTRAST        5
 #define SONYPI_COMMAND_SETCAMERACONTRAST        6
-#define SONYPI_COMMAND_GETCAMERAHUE             7      /* obsolete */
+#define SONYPI_COMMAND_GETCAMERAHUE             7
 #define SONYPI_COMMAND_SETCAMERAHUE             8
-#define SONYPI_COMMAND_GETCAMERACOLOR           9      /* obsolete */
+#define SONYPI_COMMAND_GETCAMERACOLOR           9
 #define SONYPI_COMMAND_SETCAMERACOLOR          10
-#define SONYPI_COMMAND_GETCAMERASHARPNESS      11      /* obsolete */
+#define SONYPI_COMMAND_GETCAMERASHARPNESS      11
 #define SONYPI_COMMAND_SETCAMERASHARPNESS      12
-#define SONYPI_COMMAND_GETCAMERAPICTURE                13      /* obsolete */
+#define SONYPI_COMMAND_GETCAMERAPICTURE                13
 #define SONYPI_COMMAND_SETCAMERAPICTURE                14
-#define SONYPI_COMMAND_GETCAMERAAGC            15      /* obsolete */
+#define SONYPI_COMMAND_GETCAMERAAGC            15
 #define SONYPI_COMMAND_SETCAMERAAGC            16
-#define SONYPI_COMMAND_GETCAMERADIRECTION      17      /* obsolete */
-#define SONYPI_COMMAND_GETCAMERAROMVERSION     18      /* obsolete */
-#define SONYPI_COMMAND_GETCAMERAREVISION       19      /* obsolete */
+#define SONYPI_COMMAND_GETCAMERADIRECTION      17
+#define SONYPI_COMMAND_GETCAMERAROMVERSION     18
+#define SONYPI_COMMAND_GETCAMERAREVISION       19
 
-int sonypi_camera_command(int command, u8 value);
+u8 sonypi_camera_command(int command, u8 value);
 
-#endif                         /* __KERNEL__ */
+#endif /* __KERNEL__ */
 
-#endif                         /* _SONYPI_H_ */
+#endif /* _SONYPI_H_ */