diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /drivers/sbus/char/flash.c | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'drivers/sbus/char/flash.c')
| -rw-r--r-- | drivers/sbus/char/flash.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c index 9aee3418b..2e60789cf 100644 --- a/drivers/sbus/char/flash.c +++ b/drivers/sbus/char/flash.c @@ -1,4 +1,4 @@ -/* $Id: flash.c,v 1.15 1999/12/09 00:44:22 davem Exp $ +/* $Id: flash.c,v 1.17 2000/02/10 02:51:35 davem Exp $ * flash.c: Allow mmap access to the OBP Flash, for OBP updates. * * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) @@ -128,18 +128,14 @@ flash_release(struct inode *inode, struct file *file) } static struct file_operations flash_fops = { - flash_llseek, - flash_read, - NULL, /* no write to the Flash, use mmap - * and play flash dependent tricks. - */ - NULL, /* readdir */ - NULL, /* poll */ - NULL, /* ioctl */ - flash_mmap, - flash_open, - NULL, /* flush */ - flash_release + /* no write to the Flash, use mmap + * and play flash dependent tricks. + */ + llseek: flash_llseek, + read: flash_read, + mmap: flash_mmap, + open: flash_open, + release: flash_release, }; static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &flash_fops }; |