diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 | 
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 | 
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /common/cmd_pci.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
	drivers/usb/usb_ohci.c
Diffstat (limited to 'common/cmd_pci.c')
| -rw-r--r-- | common/cmd_pci.c | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/common/cmd_pci.c b/common/cmd_pci.c index b2aa833ab..67ff2fbc3 100644 --- a/common/cmd_pci.c +++ b/common/cmd_pci.c @@ -48,7 +48,7 @@ void pci_header_show_brief(pci_dev_t dev);   * Subroutine:  pciinfo   *   * Description: Show information about devices on PCI bus. - *				Depending on the define CFG_SHORT_PCI_LISTING + *				Depending on the define CONFIG_SYS_SHORT_PCI_LISTING   *				the output will be more or less exhaustive.   *   * Inputs:	bus_no		the number of the bus to be scanned. |