diff options
| author | Stefan Roese <sr@denx.de> | 2007-06-20 08:23:42 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-06-20 08:23:42 +0200 |
| commit | 6b44466cdeabd54f9dabcd2f00d3a232a4b854a9 (patch) | |
| tree | 35e536aa1eb7e781b78fff82da76e16a5e3a00f7 /cpu | |
| parent | b3f9ec86e388207fd03dcdf7b145b9ed080bf024 (diff) | |
| parent | 5ffa76a032279bc6d3230b703eda32d13305ba13 (diff) | |
| download | blackbird-obmc-uboot-6b44466cdeabd54f9dabcd2f00d3a232a4b854a9.tar.gz blackbird-obmc-uboot-6b44466cdeabd54f9dabcd2f00d3a232a4b854a9.zip | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/ppc4xx/405gp_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/ppc4xx/405gp_pci.c b/cpu/ppc4xx/405gp_pci.c index 7134355635..8bf03e1b2f 100644 --- a/cpu/ppc4xx/405gp_pci.c +++ b/cpu/ppc4xx/405gp_pci.c @@ -380,7 +380,7 @@ void pci_405gp_setup_vga(struct pci_controller *hose, pci_dev_t dev, pci_hose_write_config_dword(hose, dev, PCI_COMMAND, cmdstat); } -#if !(defined(CONFIG_PIP405) || defined (CONFIG_MIP405)) && !(defined (CONFIG_SOLIDCARD3)) +#if !(defined(CONFIG_PIP405) || defined (CONFIG_MIP405)) && !(defined (CONFIG_SC3)) /* *As is these functs get called out of flash Not a horrible |
