RE: [PATCH] Build mptspi.c on architectures where CONFIG_PM is unset

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Saturday, June 03, 2006 8:37 AM,  Tom Callaway wrote:

> When trying to build mpt* for sparc64 (my T2000 needs mptsas and
> friends), I noticed that mptspi.o was not building:
> 
>   CC [M]  drivers/message/fusion/mptspi.o
> drivers/message/fusion/mptspi.c: In function `mptspi_resume':
> drivers/message/fusion/mptspi.c:844: error: implicit declaration of
> function `mptscsih_resume'
> drivers/message/fusion/mptspi.c: At top level:
> drivers/message/fusion/mptspi.c:839: warning: 'mptspi_resume' defined
> but not used
> make[3]: *** [drivers/message/fusion/mptspi.o] Error 1
> make[2]: *** [drivers/message/fusion] Error 2
> make[1]: *** [drivers/message] Error 2
> 
> sparc64 does not have CONFIG_PM defined, and mptscsih_resume 
> is wrapped
> in an #ifdef CONFIG_PM in mptscsih.h. mptscsih_resume is only used in
> the mptspi_resume function in mptspi.c, and its only call is in the
> pci_driver struct (and that call is also #ifdef CONFIG_PM). 
> In order to
> get the code to compile, I just needed to wrap the actual function in
> #ifdef CONFIG_PM, which is what this patch does. I can confirm that it
> gets the module building again without errors.
> 
> Signed-off-by: Tom "spot" Callaway <tcallawa@xxxxxxxxxx>
> 
> --- linux-2.6.16-sparc64/drivers/message/fusion/mptspi.c.BAD
> +++ linux-2.6.16-sparc64/drivers/message/fusion/mptspi.c
> @@ -831,6 +831,7 @@
>  	return rc;
>  }
>  
> +#ifdef CONFIG_PM
>  /*
>   * spi module resume handler
>   */
> @@ -846,6 +847,7 @@
>  
>  	return rc;
>  }
> +#endif
>  

ACK, James pls apply to your scsi-misc tree.   


Eric Moore
LSI Logic
-
: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [SCSI Target Devel]     [Linux SCSI Target Infrastructure]     [Kernel Newbies]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Linux IIO]     [Samba]     [Device Mapper]
  Powered by Linux