diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /drivers/macintosh/via-pmu68k.c | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'drivers/macintosh/via-pmu68k.c')
| -rw-r--r-- | drivers/macintosh/via-pmu68k.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c index 93e6ef9233f9..4f5b6fa196c5 100644 --- a/drivers/macintosh/via-pmu68k.c +++ b/drivers/macintosh/via-pmu68k.c | |||
| @@ -1040,7 +1040,7 @@ static int pmu_ioctl(struct inode * inode, struct file *filp, | |||
| 1040 | return -EINVAL; | 1040 | return -EINVAL; |
| 1041 | } | 1041 | } |
| 1042 | 1042 | ||
| 1043 | static struct file_operations pmu_device_fops = { | 1043 | static const struct file_operations pmu_device_fops = { |
| 1044 | .read = pmu_read, | 1044 | .read = pmu_read, |
| 1045 | .write = pmu_write, | 1045 | .write = pmu_write, |
| 1046 | .ioctl = pmu_ioctl, | 1046 | .ioctl = pmu_ioctl, |