diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-10 22:03:51 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-10 22:03:51 +0400 |
| commit | 1f4d4a7e8f5a46929a987ec17987dbbdd73029d4 (patch) | |
| tree | 7925980f6295e6f3aba704f08837b03bf3578838 /drivers/message | |
| parent | 938473b24636d77dc5e9c3f41090d071b6cf4389 (diff) | |
| parent | 46b304934de417a2238d659ef6459a74cb3f5e6b (diff) | |
| download | linux-1f4d4a7e8f5a46929a987ec17987dbbdd73029d4.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Avoid JBUS errors on some Niagara systems.
[FUSION]: Fix mptspi.c build with CONFIG_PM not set.
[TG3]: Handle Sun onboard tg3 chips more correctly.
[SPARC64]: Dump local cpu registers in sun4v_log_error()
Diffstat (limited to 'drivers/message')
| -rw-r--r-- | drivers/message/fusion/mptspi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c index f2a4d382ea19..3201de053943 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c @@ -831,6 +831,7 @@ mptspi_ioc_reset(MPT_ADAPTER *ioc, int reset_phase) return rc; } +#ifdef CONFIG_PM /* * spi module resume handler */ @@ -846,6 +847,7 @@ mptspi_resume(struct pci_dev *pdev) return rc; } +#endif /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |