diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2015-03-03 12:55:43 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-07 01:06:30 (GMT) |
commit | 4c1d2dcb64db1d881d1822b5789022a03bc6abe4 (patch) | |
tree | 7b4bdf9fba8453cdba3b0171e164d1879a9534bc /drivers/staging/dgap | |
parent | 08e03c268e3af302649bb85f79fb7c78c9e22ec8 (diff) | |
download | linux-4c1d2dcb64db1d881d1822b5789022a03bc6abe4.tar.xz |
staging: dgap: Avoid name collision
Building for ARM64 leads to the following build warning:
In file included from drivers/staging/dgap/dgap.c:66:0:
drivers/staging/dgap/dgap.h:124:0: warning: "PCI_IO_SIZE" redefined
#define PCI_IO_SIZE 0x00200000
^
In file included from ./arch/arm64/include/asm/page.h:66:0,
from include/linux/mm_types.h:15,
from include/linux/sched.h:27,
from ./arch/arm64/include/asm/compat.h:25,
from ./arch/arm64/include/asm/stat.h:23,
from include/linux/stat.h:5,
from include/linux/module.h:10,
from drivers/staging/dgap/dgap.c:47:
./arch/arm64/include/asm/memory.h:39:0: note: this is the location of the previous definition
#define PCI_IO_SIZE SZ_16M
^
Use PCI_IO_SIZE_DGAP to avoid the name collision.
Reported-by: Olof's autobuilder <build@lixom.net>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/dgap')
-rw-r--r-- | drivers/staging/dgap/dgap.c | 2 | ||||
-rw-r--r-- | drivers/staging/dgap/dgap.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index 914e332..d4d98a7 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -2196,7 +2196,7 @@ static struct board_t *dgap_found_board(struct pci_dev *pdev, int id, * will be mapped into the low 2MB of the 4MB memory space */ brd->port = brd->membase + PCI_IO_OFFSET; - brd->port_end = brd->port + PCI_IO_SIZE; + brd->port_end = brd->port + PCI_IO_SIZE_DGAP; /* * Special initialization for non-PLX boards diff --git a/drivers/staging/dgap/dgap.h b/drivers/staging/dgap/dgap.h index 6840331..a2e5b26 100644 --- a/drivers/staging/dgap/dgap.h +++ b/drivers/staging/dgap/dgap.h @@ -121,7 +121,7 @@ #define PCI_IO_OFFSET 0x00200000 /* Size of IO (2MB) */ -#define PCI_IO_SIZE 0x00200000 +#define PCI_IO_SIZE_DGAP 0x00200000 /* Number of boards we support at once. */ #define MAXBOARDS 32 |