From: Len Brown <len.brown@intel.com>
Date: Sat, 4 Apr 2009 07:33:45 +0000 (-0400)
Subject: video: build fix
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c07c9a78a95cab0a9bf0b253d0c52e7798af38c5;p=linux-2.6-omap-h63xx.git

video: build fix

acpi_video_device_write_state() and friends now return ssize_t,
while the constify patch assumed it was still int.

Signed-off-by: Len Brown <len.brown@intel.com>
---

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 52779549d36..0e7e689634a 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -217,7 +217,7 @@ static const struct file_operations acpi_video_bus_POST_info_fops = {
 };
 
 static int acpi_video_bus_POST_open_fs(struct inode *inode, struct file *file);
-static int acpi_video_bus_write_POST(struct file *file,
+static ssize_t acpi_video_bus_write_POST(struct file *file,
 	const char __user *buffer, size_t count, loff_t *data);
 static const struct file_operations acpi_video_bus_POST_fops = {
 	.owner = THIS_MODULE,
@@ -229,7 +229,7 @@ static const struct file_operations acpi_video_bus_POST_fops = {
 };
 
 static int acpi_video_bus_DOS_open_fs(struct inode *inode, struct file *file);
-static int acpi_video_bus_write_DOS(struct file *file,
+static ssize_t acpi_video_bus_write_DOS(struct file *file,
 	const char __user *buffer, size_t count, loff_t *data);
 static const struct file_operations acpi_video_bus_DOS_fops = {
 	.owner = THIS_MODULE,
@@ -253,7 +253,7 @@ static const struct file_operations acpi_video_device_info_fops = {
 
 static int acpi_video_device_state_open_fs(struct inode *inode,
 					   struct file *file);
-static int acpi_video_device_write_state(struct file *file,
+static ssize_t acpi_video_device_write_state(struct file *file,
 	const char __user *buffer, size_t count, loff_t *data);
 static const struct file_operations acpi_video_device_state_fops = {
 	.owner = THIS_MODULE,
@@ -266,7 +266,7 @@ static const struct file_operations acpi_video_device_state_fops = {
 
 static int acpi_video_device_brightness_open_fs(struct inode *inode,
 						struct file *file);
-static int acpi_video_device_write_brightness(struct file *file,
+static ssize_t acpi_video_device_write_brightness(struct file *file,
 	const char __user *buffer, size_t count, loff_t *data);
 static struct file_operations acpi_video_device_brightness_fops = {
 	.owner = THIS_MODULE,