diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/smc911x.c | 2 | ||||
| -rw-r--r-- | drivers/pci/pci.c | 21 | ||||
| -rw-r--r-- | drivers/pcmcia/Makefile | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/i82365.c | 4 |
4 files changed, 9 insertions, 19 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index d22c889..c17dcf4 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -1,7 +1,7 @@ /* * SMSC LAN9[12]1[567] Network driver * - * (c) 2007 Pengutronix, Sascha Hauer <s.hauer <at> pengutronix.de> + * (c) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de> * * See file CREDITS for list of people who contributed to this * project. diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 7944b66..b820d5e 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -221,7 +221,7 @@ pci_dev_t pci_find_device(unsigned int vendor, unsigned int device, int index) */ unsigned long pci_hose_phys_to_bus (struct pci_controller *hose, - unsigned long phys_addr, + phys_addr_t phys_addr, unsigned long flags) { struct pci_region *res; @@ -253,9 +253,9 @@ Done: return 0; } -unsigned long pci_hose_bus_to_phys(struct pci_controller* hose, - unsigned long bus_addr, - unsigned long flags) +phys_addr_t pci_hose_bus_to_phys(struct pci_controller* hose, + unsigned long bus_addr, + unsigned long flags) { struct pci_region *res; int i; @@ -425,9 +425,6 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus) dev < PCI_BDF(bus,PCI_MAX_PCI_DEVICES-1,PCI_MAX_PCI_FUNCTIONS-1); dev += PCI_BDF(0,0,1)) { - - /* Bus 0 is not necessarily PCI bridge. */ -#if defined(CONFIG_PCI_SKIP_HOST_BRIDGE) /* Skip our host bridge */ if ( dev == PCI_BDF(hose->first_busno,0,0) ) { #if defined(CONFIG_PCI_CONFIG_HOST_BRIDGE) /* don't skip host bridge */ @@ -437,11 +434,10 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus) if (getenv("pciconfighost") == NULL) { continue; /* Skip our host bridge */ } -#else /* CONFIG_PCI_CONFIG_HOST_BRIDGE */ +#else continue; /* Skip our host bridge */ -#endif /* CONFIG_PCI_CONFIG_HOST_BRIDGE */ +#endif } -#endif /* CONFIG_PCI_SKIP_HOST_BRIDGE */ if (PCI_FUNC(dev) && !found_multi) continue; @@ -477,11 +473,8 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus) hose->fixup_irq(hose, dev); #ifdef CONFIG_PCI_SCAN_SHOW -#if defined(CONFIG_PCI_SKIP_HOST_BRIDGE) /* Skip our host bridge */ - if ( dev != PCI_BDF(hose->first_busno,0,0) ) -#endif - { + if ( dev != PCI_BDF(hose->first_busno,0,0) ) { unsigned char int_line; pci_hose_read_config_byte(hose, dev, PCI_INTERRUPT_LINE, diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index bba1ab8..53a485d 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -25,6 +25,7 @@ include $(TOPDIR)/config.mk LIB := $(obj)libpcmcia.a +COBJS-$(CONFIG_I82365) += i82365.o COBJS-y += mpc8xx_pcmcia.o COBJS-y += pxa_pcmcia.o COBJS-y += rpx_pcmcia.o diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c index a40fcf4..1e2431e 100644 --- a/drivers/pcmcia/i82365.c +++ b/drivers/pcmcia/i82365.c @@ -31,8 +31,6 @@ #include <common.h> -#ifdef CONFIG_I82365 - #include <command.h> #include <pci.h> #include <pcmcia.h> @@ -1010,5 +1008,3 @@ static void i82365_dump_regions (pci_dev_t dev) ide[4], ide[5], ide[6], ide[7]); } #endif /* DEBUG */ - -#endif /* CONFIG_I82365 */ |