diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2006-02-24 12:46:23 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-02-27 15:37:41 -0800 |
| commit | ac311ac2b7caca000b1501fd24136bdca30e2a51 (patch) | |
| tree | 0a960ed38d9f007f52ad4f3cbb5ca75aded15103 /arch | |
| parent | 18810d1ebac89232d8f218a318ed9ff7ef198e96 (diff) | |
| download | blackbird-op-linux-ac311ac2b7caca000b1501fd24136bdca30e2a51.tar.gz blackbird-op-linux-ac311ac2b7caca000b1501fd24136bdca30e2a51.zip | |
[IA64] Fix pcibios_setup
pcibios_setup() should return NULL if it handled a parameter. Since ia64
handles no parameters, it should return the string that was passed in,
not NULL. This brings ia64 into line with all other architectures that
handle no parameters.
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 0b30ca006286..9ba32b2d96d0 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -579,7 +579,7 @@ pcibios_align_resource (void *data, struct resource *res, char * __init pcibios_setup (char *str) { - return NULL; + return str; } int |
