summaryrefslogtreecommitdiffstats
path: root/arch/m68k/atari
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-05 06:47:02 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-05 06:47:02 +0000
commit99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch)
tree3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /arch/m68k/atari
parente73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff)
Merge with Linux 2.3.38.
Diffstat (limited to 'arch/m68k/atari')
-rw-r--r--arch/m68k/atari/stram.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c
index 471e9a85f..81dc17103 100644
--- a/arch/m68k/atari/stram.c
+++ b/arch/m68k/atari/stram.c
@@ -1230,18 +1230,9 @@ static int stram_release( struct inode *inode, struct file *filp )
}
-static struct file_operations stram_fops = {
- NULL, /* lseek - default */
- block_read, /* read - general block-dev read */
- block_write, /* write - general block-dev write */
- NULL, /* readdir - bad */
- NULL, /* select */
- NULL, /* ioctl */
- NULL, /* mmap */
- stram_open, /* open */
- NULL, /* flush */
- stram_release, /* release */
- block_fsync /* fsync */
+static struct block_device_operations stram_fops = {
+ open: stram_open,
+ release: stram_release,
};
int __init stram_device_init(void)