mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
[PATCH] mem driver: fix conditional on isa i/o support
This change corrects the logic on the preprocessor conditionals that include support for ISA port i/o (/dev/ioports) into the mem character driver. This fixes the following error when building for powerpc platforms with CONFIG_PCI=n. drivers/built-in.o: undefined reference to `pci_io_base' Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Acked-by: Linas Vepstas <lins@austin.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
781b823e09
commit
153dcc54df
1 changed files with 4 additions and 4 deletions
|
@ -551,7 +551,7 @@ static ssize_t write_kmem(struct file * file, const char __user * buf,
|
|||
return virtr + wrote;
|
||||
}
|
||||
|
||||
#if defined(CONFIG_ISA) || !defined(__mc68000__)
|
||||
#if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__)
|
||||
static ssize_t read_port(struct file * file, char __user * buf,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
|
@ -830,7 +830,7 @@ static const struct file_operations null_fops = {
|
|||
.splice_write = splice_write_null,
|
||||
};
|
||||
|
||||
#if defined(CONFIG_ISA) || !defined(__mc68000__)
|
||||
#if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__)
|
||||
static const struct file_operations port_fops = {
|
||||
.llseek = memory_lseek,
|
||||
.read = read_port,
|
||||
|
@ -908,7 +908,7 @@ static int memory_open(struct inode * inode, struct file * filp)
|
|||
case 3:
|
||||
filp->f_op = &null_fops;
|
||||
break;
|
||||
#if defined(CONFIG_ISA) || !defined(__mc68000__)
|
||||
#if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__)
|
||||
case 4:
|
||||
filp->f_op = &port_fops;
|
||||
break;
|
||||
|
@ -955,7 +955,7 @@ static const struct {
|
|||
{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_ISA) || !defined(__mc68000__)
|
||||
#if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__)
|
||||
{4, "port", S_IRUSR | S_IWUSR | S_IRGRP, &port_fops},
|
||||
#endif
|
||||
{5, "zero", S_IRUGO | S_IWUGO, &zero_fops},
|
||||
|
|
Loading…
Reference in a new issue