Skip to content

Commit

Permalink
sh: pci-sh7780: Fix up for PCI_DISABLE_MWI changes.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mundt committed May 26, 2009
1 parent 464c9e1 commit 5582b06
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions arch/sh/drivers/pci/pci-sh7780.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
#include <linux/delay.h>
#include "pci-sh4.h"

extern u8 pci_cache_line_size;

static struct resource sh7785_io_resource = {
.name = "SH7785_IO",
.start = SH7780_PCI_IO_BASE,
Expand All @@ -37,6 +35,7 @@ static struct pci_channel sh7780_pci_controller = {
.mem_offset = 0x00000000,
.io_resource = &sh7785_io_resource,
.io_offset = 0x00000000,
.io_map_base = SH7780_PCI_IO_BASE,
};

static struct sh4_pci_address_map sh7780_pci_map = {
Expand Down Expand Up @@ -99,8 +98,6 @@ static int __init sh7780_pci_init(void)
__raw_writeb(PCI_CLASS_BRIDGE_HOST & 0xff,
chan->reg_base + SH7780_PCISUB);

pci_cache_line_size = pci_read_reg(chan, SH7780_PCICLS) / 4;

/*
* Set IO and Mem windows to local address
* Make PCI and local address the same for easy 1 to 1 mapping
Expand Down Expand Up @@ -142,8 +139,6 @@ static int __init sh7780_pci_init(void)
word = SH4_PCICR_PREFIX | SH4_PCICR_CFIN | SH4_PCICR_FTO;
pci_write_reg(chan, word, SH4_PCICR);

__set_io_port_base(SH7780_PCI_IO_BASE);

register_pci_controller(chan);

return 0;
Expand Down

0 comments on commit 5582b06

Please sign in to comment.