diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-06-23 15:37:33 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-06-23 15:37:33 +0200 |
| commit | 9623c158f6a5150a21c25026bfba79e7ff7912f5 (patch) | |
| tree | 2c4d4209a34baa810a6f3fb409e1f8e494f01b31 /drivers/pci/pci.c | |
| parent | 2ad6e27dcdbd694de8e3823d2b52b250b1a59219 (diff) | |
| parent | 1ed63c549892bc3a4ce1a43f09a6a92a00054f3d (diff) | |
| download | u-boot-imx-9623c158f6a5150a21c25026bfba79e7ff7912f5.zip u-boot-imx-9623c158f6a5150a21c25026bfba79e7ff7912f5.tar.gz u-boot-imx-9623c158f6a5150a21c25026bfba79e7ff7912f5.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
* 'master' of git://git.denx.de/u-boot-arm:
run arm_pci_init after relocation
IXP42x PCI rewrite
update/fix PDNB3 board
update/fix IXDP425 / IXDPG425 boards
add dvlhost (dLAN 200 AV Wireless G) board
IXP NPE: add support for fixed-speed MII ports
update/fix AcTux4 board
update/fix AcTux3 board
update/fix AcTux2 board
update/fix AcTux1 board
use -ffunction-sections / --gc-sections on IXP42x
support CONFIG_SYS_LDSCRIPT on ARM
fix "depend" target in npe directory
Fix IXP code to work after relocation was added
trigger hardware watchdog in IXP42x serial driver
add support for IXP42x Rev. B1 and newer
add XScale sub architecture (IXP/PXA) to maintainer list
Conflicts:
arch/arm/lib/board.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index cdfc4fb..1a0b14c 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -50,7 +50,6 @@ PCI_HOSE_OP(write, byte, u8) PCI_HOSE_OP(write, word, u16) PCI_HOSE_OP(write, dword, u32) -#ifndef CONFIG_IXP425 #define PCI_OP(rw, size, type, error_code) \ int pci_##rw##_config_##size(pci_dev_t dev, int offset, type value) \ { \ @@ -71,7 +70,6 @@ PCI_OP(read, dword, u32 *, *value = 0xffffffff) PCI_OP(write, byte, u8, ) PCI_OP(write, word, u16, ) PCI_OP(write, dword, u32, ) -#endif /* CONFIG_IXP425 */ #define PCI_READ_VIA_DWORD_OP(size, type, off_mask) \ int pci_hose_read_config_##size##_via_dword(struct pci_controller *hose,\ @@ -190,7 +188,6 @@ int pci_last_busno(void) return hose->last_busno; } -#ifndef CONFIG_IXP425 pci_dev_t pci_find_devices(struct pci_device_id *ids, int index) { struct pci_controller * hose; @@ -246,7 +243,6 @@ pci_dev_t pci_find_devices(struct pci_device_id *ids, int index) return (-1); } -#endif /* CONFIG_IXP425 */ pci_dev_t pci_find_device(unsigned int vendor, unsigned int device, int index) { |