diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/mem.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 79b7201f9..755c3b318 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -280,7 +280,7 @@ static ssize_t write_kmem(struct file * file, const char * buf, return do_write_mem(file, (void*)p, p, buf, count, ppos); } -#if (!defined(__mc68000__) && !defined(__mips__)) || defined(CONFIG_HAVE_IO_PORTS) +#ifdef CONFIG_ISA static ssize_t read_port(struct file * file, char * buf, size_t count, loff_t *ppos) { @@ -509,7 +509,7 @@ static struct file_operations null_fops = { write: write_null, }; -#if (!defined(__mc68000__) && !defined(__mips__)) || defined(CONFIG_HAVE_IO_PORTS) +#ifdef CONFIG_ISA static struct file_operations port_fops = { llseek: memory_lseek, read: read_port, @@ -543,7 +543,7 @@ static int memory_open(struct inode * inode, struct file * filp) case 3: filp->f_op = &null_fops; break; -#if (!defined(__mc68000__) && !defined(__mips__)) || defined(CONFIG_HAVE_IO_PORTS) +#ifdef CONFIG_ISA case 4: filp->f_op = &port_fops; break; @@ -580,8 +580,7 @@ void __init memory_devfs_register (void) {1, "mem", S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops}, {2, "kmem", S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops}, {3, "null", S_IRUGO | S_IWUGO, &null_fops}, -#if (!defined(CONFIG_PPC) && !defined(__mc68000__) && !defined(__mips__)) || \ - defined(CONFIG_HAVE_IO_PORTS) +#ifdef CONFIG_ISA {4, "port", S_IRUSR | S_IWUSR | S_IRGRP, &port_fops}, #endif {5, "zero", S_IRUGO | S_IWUGO, &zero_fops}, |