Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / arch / sh / drivers / pci / pci-auto.c

diff --git a/arch/sh/drivers/pci/pci-auto.c b/arch/sh/drivers/pci/pci-auto.c
index 224e007736fb5bcf22cdae68a6ab174064dcb3a0..ea404704ace83b03682bd478f63f5f03f5eaac3b 100644 (file)
--- a/arch/sh/drivers/pci/pci-auto.c
+++ b/arch/sh/drivers/pci/pci-auto.c
@@ -516,10 +516,8 @@ pciauto_bus_scan(struct pci_channel *hose, int top_bus, int current_bus)
                                         PCI_COMMAND, cmdstat | PCI_COMMAND_IO |
                                         PCI_COMMAND_MEMORY |
                                         PCI_COMMAND_MASTER);
-#if !defined(CONFIG_SH_HS7751RVOIP) && !defined(CONFIG_SH_RTS7751R2D)
                early_write_config_byte(hose, top_bus, current_bus, pci_devfn,
                                        PCI_LATENCY_TIMER, 0x80);
-#endif
 
                /* Allocate PCI I/O and/or memory space */
                pciauto_setup_bars(hose, top_bus, current_bus, pci_devfn, PCI_BASE_ADDRESS_5);