]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[IA64] Fix pcibios_setup
authorMatthew Wilcox <matthew@wil.cx>
Fri, 24 Feb 2006 19:46:23 +0000 (12:46 -0700)
committerTony Luck <tony.luck@intel.com>
Mon, 27 Feb 2006 23:37:41 +0000 (15:37 -0800)
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>
arch/ia64/pci/pci.c

index 0b30ca006286429448e418e7358cbfa4e1ab3dae..9ba32b2d96d08ff616f10e1d5abd9220dddced4d 100644 (file)
@@ -579,7 +579,7 @@ pcibios_align_resource (void *data, struct resource *res,
 char * __init
 pcibios_setup (char *str)
 {
-       return NULL;
+       return str;
 }
 
 int