Merge branch 'master' into upstream

[deliverable/linux.git] / drivers / char / sx.c

diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index 45c193aa11db37aeabb51742ef4d49ce12ca75a2..e1cd2bc4b1e4222e5806dab4389169ffa774900b 100644 (file)
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -410,7 +410,7 @@ static struct real_driver sx_real_driver = {
  *
  */
 
-static struct file_operations sx_fw_fops = {
+static const struct file_operations sx_fw_fops = {
        .owner          = THIS_MODULE,
        .ioctl          = sx_fw_ioctl,
 };