From: Matthew Wilcox Date: Fri, 24 Feb 2006 19:46:23 +0000 (-0700) Subject: [IA64] Fix pcibios_setup X-Git-Tag: v2.6.16-rc6~141^2~5 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ac311ac2b7caca000b1501fd24136bdca30e2a51;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Tony Luck --- diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 0b30ca00628..9ba32b2d96d 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