From: Mark Einon <mark.einon@gmail.com>
To: rdunlap@xenotime.net
Cc: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, torvalds@linux-foundation.org,
gregkh@suse.de, Mark Einon <mark.einon@gmail.com>
Subject: [PATCH] linux-next: et131x: Fix build error when CONFIG_PM_SLEEP not enabled
Date: Fri, 4 Nov 2011 17:58:02 +0000 [thread overview]
Message-ID: <1320429482-2332-1-git-send-email-mark.einon@gmail.com> (raw)
In-Reply-To: <4EB30C0B.8080200@xenotime.net>
Randy Dunlap reports that the ex131x driver doesn't build when CONFIG_PM_SLEEP is not enabled.
This bug was introduced when moving code around to remove some forward declarations earlier, the #endif part of #ifdef CONFIG_PM_SLEEP was not moved at the same time. Now fixed by moving it to its proper place.
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Mark Einon <mark.einon@gmail.com>
---
drivers/staging/et131x/et131x.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index f5f44a0..0c1c6ca 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -4469,6 +4469,12 @@ static int et131x_resume(struct device *dev)
return 0;
}
+static SIMPLE_DEV_PM_OPS(et131x_pm_ops, et131x_suspend, et131x_resume);
+#define ET131X_PM_OPS (&et131x_pm_ops)
+#else
+#define ET131X_PM_OPS NULL
+#endif
+
/* ISR functions */
/**
@@ -5470,12 +5476,6 @@ err_out:
return result;
}
-static SIMPLE_DEV_PM_OPS(et131x_pm_ops, et131x_suspend, et131x_resume);
-#define ET131X_PM_OPS (&et131x_pm_ops)
-#else
-#define ET131X_PM_OPS NULL
-#endif
-
static DEFINE_PCI_DEVICE_TABLE(et131x_pci_table) = {
{ PCI_VDEVICE(ATT, ET131X_PCI_DEVICE_ID_GIG), 0UL},
{ PCI_VDEVICE(ATT, ET131X_PCI_DEVICE_ID_FAST), 0UL},
--
1.7.6.4
next prev parent reply other threads:[~2011-11-04 17:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-03 6:20 linux-next: Tree for Nov 3 Stephen Rothwell
2011-11-03 7:29 ` Sedat Dilek
2011-11-03 11:41 ` Stephen Rothwell
2011-11-03 21:47 ` linux-next: Tree for Nov 3 (staging/et131x) Randy Dunlap
2011-11-04 10:27 ` Mark Einon
2011-11-04 15:53 ` Randy Dunlap
2011-11-04 17:58 ` Mark Einon [this message]
2011-11-04 18:19 ` [PATCH] linux-next: et131x: Fix build error when CONFIG_PM_SLEEP not enabled Randy Dunlap
2011-11-04 0:43 ` linux-next: Tree for Nov 3 (KVMTOOL_TEST_ENABLE) Randy Dunlap
2011-11-04 16:59 ` Randy Dunlap
2011-11-04 20:03 ` Pekka Enberg
2011-11-07 17:34 ` Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320429482-2332-1-git-send-email-mark.einon@gmail.com \
--to=mark.einon@gmail.com \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rdunlap@xenotime.net \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).