diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
commit | 9f9f3e6e8548a596697778337110a423c384b6f3 (patch) | |
tree | 5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /drivers/macintosh | |
parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) |
Merge with Linux 2.3.49.
Diffstat (limited to 'drivers/macintosh')
-rw-r--r-- | drivers/macintosh/via-pmu68k.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c index 0c14baed5..473700fa8 100644 --- a/drivers/macintosh/via-pmu68k.c +++ b/drivers/macintosh/via-pmu68k.c @@ -1038,16 +1038,10 @@ static int /*__openfirmware*/ pmu_ioctl(struct inode * inode, struct file *filp, } static struct file_operations pmu_device_fops = { - NULL, /* no seek */ - pmu_read, - pmu_write, - NULL, /* no readdir */ - NULL, /* no poll yet */ - pmu_ioctl, - NULL, /* no mmap */ - pmu_open, - NULL, /* flush */ - NULL /* no release */ + read: pmu_read, + write: pmu_write, + ioctl: pmu_ioctl, + open: pmu_open, }; static struct miscdevice pmu_device = { |