summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-04-04 03:33:45 -0400
committerLen Brown <len.brown@intel.com>2009-04-04 03:33:45 -0400
commitc07c9a78a95cab0a9bf0b253d0c52e7798af38c5 (patch)
treebe08d32490791a9ff6c982a7a98630d60a331ab2 /drivers
parentb7171ae74b1741245835444bd98a7217958cf929 (diff)
downloadlinux-c07c9a78a95cab0a9bf0b253d0c52e7798af38c5.tar.bz2
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/video.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 52779549d367..0e7e689634a7 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,