From 615773a7a660266610b26ca7cc30e0a2cba7d4fb Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 27 May 2009 00:12:58 +0900 Subject: [PATCH] --- yaml --- r: 146843 b: refs/heads/master c: 5582b0648de6248c67c0b47fa170e5fb15ab4bf1 h: refs/heads/master i: 146841: b89860d65817c625f53089fcaa12e7713d19b821 146839: c0c0a14f292c9b3960bb32a861127cb442fae2db v: v3 --- [refs] | 2 +- trunk/arch/sh/drivers/pci/pci-sh7780.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 34753b805ca6..684cb8abb80e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 464c9e10376b24f04402fa8ef72b66257561bffa +refs/heads/master: 5582b0648de6248c67c0b47fa170e5fb15ab4bf1 diff --git a/trunk/arch/sh/drivers/pci/pci-sh7780.c b/trunk/arch/sh/drivers/pci/pci-sh7780.c index ae13ff925c61..323b92d565fe 100644 --- a/trunk/arch/sh/drivers/pci/pci-sh7780.c +++ b/trunk/arch/sh/drivers/pci/pci-sh7780.c @@ -15,8 +15,6 @@ #include #include "pci-sh4.h" -extern u8 pci_cache_line_size; - static struct resource sh7785_io_resource = { .name = "SH7785_IO", .start = SH7780_PCI_IO_BASE, @@ -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 = { @@ -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 @@ -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;