summaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm/tpm_tis.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-07-05 14:27:42 +0200
committerSteven Whitehouse <swhiteho@redhat.com>2006-07-05 14:27:42 +0200
commitcf57a308436653f3094590202c77459aab250ff3 (patch)
tree8a9e7096e494141911147a1f24865c3d79d583c1 /drivers/char/tpm/tpm_tis.c
parent[GFS2] Fix locking for Direct I/O reads (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq (diff)
downloadlinux-cf57a308436653f3094590202c77459aab250ff3.tar.xz
linux-cf57a308436653f3094590202c77459aab250ff3.zip
Merge branch 'master'
Diffstat (limited to 'drivers/char/tpm/tpm_tis.c')
-rw-r--r--drivers/char/tpm/tpm_tis.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index abb0f2aeae66..3232b1932597 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -330,7 +330,7 @@ out_err:
return rc;
}
-static struct file_operations tis_ops = {
+static const struct file_operations tis_ops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.open = tpm_open,