Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

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

diff --git a/include/linux/sonypi.h b/include/linux/sonypi.h
index 768cbba617d02533388270a1a0e1795752d15cb6..40c7b5d993b932f83864f04255e1853acd099dc5 100644 (file)
--- a/include/linux/sonypi.h
+++ b/include/linux/sonypi.h
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2005 Narayanan R S <nars@kadamba.org>
 
- * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
+ * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
  *
  * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au>
  *
@@ -99,6 +99,8 @@
 #define SONYPI_EVENT_BATTERY_INSERT            57
 #define SONYPI_EVENT_BATTERY_REMOVE            58
 #define SONYPI_EVENT_FNKEY_RELEASED            59
+#define SONYPI_EVENT_WIRELESS_ON               60
+#define SONYPI_EVENT_WIRELESS_OFF              61
 
 /* get/set brightness */
 #define SONYPI_IOCGBRT         _IOR('v', 0, __u8)
@@ -151,8 +153,6 @@
 #define SONYPI_COMMAND_GETCAMERAROMVERSION     18      /* obsolete */
 #define SONYPI_COMMAND_GETCAMERAREVISION       19      /* obsolete */
 
-int sonypi_camera_command(int command, u8 value);
-
 #endif                         /* __KERNEL__ */
 
 #endif                         /* _SONYPI_H_ */