diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-06-07 08:49:38 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-06-07 08:49:38 -0500 |
| commit | 72ed528a948b151e7be5ce03ed3d2b88a229dd0a (patch) | |
| tree | 0f90590c0faf6fcc85f26f92facc653112be53e0 /cpu/mpc8260 | |
| parent | 9f37dc8cabc94aed27aec8b4c69a390c8603fd28 (diff) | |
| parent | e461a24113c66747510b07930a83b0d84171a559 (diff) | |
| download | u-boot-imx-72ed528a948b151e7be5ce03ed3d2b88a229dd0a.zip u-boot-imx-72ed528a948b151e7be5ce03ed3d2b88a229dd0a.tar.gz u-boot-imx-72ed528a948b151e7be5ce03ed3d2b88a229dd0a.tar.bz2 | |
Merge branch 'master' of http://www.denx.de/git/u-boot
Diffstat (limited to 'cpu/mpc8260')
| -rw-r--r-- | cpu/mpc8260/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc8260/pci.c b/cpu/mpc8260/pci.c index ea5514f..b14fc15 100644 --- a/cpu/mpc8260/pci.c +++ b/cpu/mpc8260/pci.c @@ -34,7 +34,7 @@ #include <asm/m8260_pci.h> #include <asm/io.h> -#if defined CONFIG_MPC8266ADS || defined CONFIG_MPC8272 +#if defined CONFIG_MPC8266ADS || defined CONFIG_MPC8272 || defined CONFIG_PM826 DECLARE_GLOBAL_DATA_PTR; #endif @@ -401,7 +401,7 @@ void pci_mpc8250_init (struct pci_controller *hose) hose->last_busno = 0xff; /* System memory space */ -#if defined CONFIG_MPC8266ADS || defined CONFIG_MPC8272 +#if defined CONFIG_MPC8266ADS || defined CONFIG_MPC8272 || defined CONFIG_PM826 pci_set_region (hose->regions + 0, PCI_SLV_MEM_BUS, PCI_SLV_MEM_LOCAL, |