lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: pci-sh7780: Fix up for PCI_DISABLE_MWI changes.

Browse Source 
This fixes a build error where references to pci_cache_line_size are
undefined, as this ceases to be exported when PCI_DISABLE_MWI is enabled,
as is now the default.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt
2009-05-27 00:12:58 +09:00
parent 464c9e1037
commit 5582b0648d
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/sh/drivers/pci/pci-sh7780.c
View File

@@ -15,8 +15,6 @@
#include <linux/delay.h> #include <linux/delay.h>
#include "pci-sh4.h" #include "pci-sh4.h"
extern u8 pci_cache_line_size;
static struct resource sh7785_io_resource = { static struct resource sh7785_io_resource = {
.name = "SH7785_IO", .name = "SH7785_IO",
.start = SH7780_PCI_IO_BASE, .start = SH7780_PCI_IO_BASE,
@@ -37,6 +35,7 @@ static struct pci_channel sh7780_pci_controller = {
.mem_offset = 0x00000000, .mem_offset = 0x00000000,
.io_resource = &sh7785_io_resource, .io_resource = &sh7785_io_resource,
.io_offset = 0x00000000, .io_offset = 0x00000000,
.io_map_base = SH7780_PCI_IO_BASE,
}; };
static struct sh4_pci_address_map sh7780_pci_map = { static struct sh4_pci_address_map sh7780_pci_map = {
@@ -99,8 +98,6 @@ static int __init sh7780_pci_init(void)
__raw_writeb(PCI_CLASS_BRIDGE_HOST & 0xff, __raw_writeb(PCI_CLASS_BRIDGE_HOST & 0xff,
chan->reg_base + SH7780_PCISUB); chan->reg_base + SH7780_PCISUB);
pci_cache_line_size = pci_read_reg(chan, SH7780_PCICLS) / 4;
/* /*
* Set IO and Mem windows to local address * Set IO and Mem windows to local address
* Make PCI and local address the same for easy 1 to 1 mapping * Make PCI and local address the same for easy 1 to 1 mapping
@@ -142,8 +139,6 @@ static int __init sh7780_pci_init(void)
word = SH4_PCICR_PREFIX | SH4_PCICR_CFIN | SH4_PCICR_FTO; word = SH4_PCICR_PREFIX | SH4_PCICR_CFIN | SH4_PCICR_FTO;
pci_write_reg(chan, word, SH4_PCICR); pci_write_reg(chan, word, SH4_PCICR);
__set_io_port_base(SH7780_PCI_IO_BASE);
register_pci_controller(chan); register_pci_controller(chan);
return 0; return 0;