Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (105 commits)
  sonypi: use mutex instead of semaphore
  sony-laptop: remove user visible camera controls as platform attributes
  meye: make meye use sony-laptop instead of sonypi
  sony-laptop: add a meye-usable include file for camera ops
  sony-laptop: complete the motion eye camera support in sony-laptop
  sonypi: try to detect if sony-laptop has already taken one of the known ioports
  sonypi: suggest sonypi users to try sony-laptop instead
  sony-laptop: add edge modem support (also called WWAN)
  sony-laptop: add locking on accesses to the ioport and global vars
  sony-laptop: add camera enable/disable parameter, better handle possible infinite loop
  thinkpad-acpi: make drivers/misc/thinkpad_acpi:fan_mutex static
  ACPI: thinkpad-acpi: add sysfs support to wan and bluetooth subdrivers
  ACPI: thinkpad-acpi: add sysfs support to hotkey subdriver
  ACPI: thinkpad-acpi: improve dock subdriver initialization
  ACPI: thinkpad-acpi: improve debugging for acpi helpers
  ACPI: thinkpad-acpi: improve fan control documentation
  ACPI: thinkpad-acpi: map ENXIO to EINVAL for fan sysfs
  ACPI: thinkpad-acpi: fix a fan watchdog invocation
  ACPI: thinkpad-acpi: do not arm fan watchdog if it would not work
  ACPI: thinkpad-acpi: add a fan-control feature master toggle
  ...

1 files changed, 34 insertions, 0 deletions

diff --git a/include/linux/sony-laptop.h b/include/linux/sony-laptop.h
new file mode 100644
index 000000000000..e2e036d94e4a
--- /dev/null
+++ b/include/linux/sony-laptop.h
@@ -0,0 +1,34 @@
+#ifndef _SONYLAPTOP_H_
+#define _SONYLAPTOP_H_
+
+#include <linux/types.h>
+
+#ifdef __KERNEL__
+
+/* used only for communication between v4l and sony-laptop */
+
+#define SONY_PIC_COMMAND_GETCAMERA               1      /* obsolete */
+#define SONY_PIC_COMMAND_SETCAMERA               2
+#define SONY_PIC_COMMAND_GETCAMERABRIGHTNESS     3      /* obsolete */
+#define SONY_PIC_COMMAND_SETCAMERABRIGHTNESS     4
+#define SONY_PIC_COMMAND_GETCAMERACONTRAST       5      /* obsolete */
+#define SONY_PIC_COMMAND_SETCAMERACONTRAST       6
+#define SONY_PIC_COMMAND_GETCAMERAHUE            7      /* obsolete */
+#define SONY_PIC_COMMAND_SETCAMERAHUE            8
+#define SONY_PIC_COMMAND_GETCAMERACOLOR          9      /* obsolete */
+#define SONY_PIC_COMMAND_SETCAMERACOLOR         10
+#define SONY_PIC_COMMAND_GETCAMERASHARPNESS     11      /* obsolete */
+#define SONY_PIC_COMMAND_SETCAMERASHARPNESS     12
+#define SONY_PIC_COMMAND_GETCAMERAPICTURE       13      /* obsolete */
+#define SONY_PIC_COMMAND_SETCAMERAPICTURE       14
+#define SONY_PIC_COMMAND_GETCAMERAAGC           15      /* obsolete */
+#define SONY_PIC_COMMAND_SETCAMERAAGC           16
+#define SONY_PIC_COMMAND_GETCAMERADIRECTION     17      /* obsolete */
+#define SONY_PIC_COMMAND_GETCAMERAROMVERSION    18      /* obsolete */
+#define SONY_PIC_COMMAND_GETCAMERAREVISION      19      /* obsolete */
+
+int sony_pic_camera_command(int command, u8 value);
+
+#endif  /* __KERNEL__ */
+
+#endif /* _SONYLAPTOP_H_ */