From: Randy Dunlap <randy.dunlap@oracle•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
gregkh@suse•de, Al Cho <acho@novell•com>
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
driverdevel <devel@driverdev•osuosl.org>
Subject: [PATCH -next] staging/keucr: fix build when CONFIG_PM is not enabled
Date: Tue, 14 Sep 2010 15:41:41 -0700 [thread overview]
Message-ID: <20100914154141.9a95d40c.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20100913134302.a77e9a3e.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle•com>
keucr driver has a build error when CONFIG_PM is not enabled, so fix that.
drivers/staging/keucr/usb.c:42: error: 'struct us_data' has no member named 'suspend_resume_hook'
drivers/staging/keucr/usb.c:43: error: 'struct us_data' has no member named 'suspend_resume_hook'
drivers/staging/keucr/usb.c:64: error: 'struct us_data' has no member named 'suspend_resume_hook'
drivers/staging/keucr/usb.c:65: error: 'struct us_data' has no member named 'suspend_resume_hook'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle•com>
Cc: Al Cho <acho@novell•com>
---
drivers/staging/keucr/usb.c | 9 +++++++++
1 file changed, 9 insertions(+)
--- linux-next-20100913.orig/drivers/staging/keucr/usb.c
+++ linux-next-20100913/drivers/staging/keucr/usb.c
@@ -30,6 +30,7 @@ static struct usb_device_id eucr_usb_ids
MODULE_DEVICE_TABLE (usb, eucr_usb_ids);
+#ifdef CONFIG_PM
int eucr_suspend(struct usb_interface *iface, pm_message_t message)
{
@@ -102,6 +103,14 @@ int eucr_reset_resume(struct usb_interfa
}
//EXPORT_SYMBOL_GPL(usb_stor_reset_resume);
+#else
+
+#define eucr_suspend NULL
+#define eucr_resume NULL
+#define eucr_reset_resume NULL
+
+#endif
+
//----- eucr_pre_reset() ---------------------
static int eucr_pre_reset(struct usb_interface *iface)
{
next prev parent reply other threads:[~2010-09-14 22:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-13 3:43 linux-next: Tree for September 13 Stephen Rothwell
2010-09-14 22:39 ` [PATCH -next] staging/bcm: fix build for CONFIG_PM not enabled Randy Dunlap
2010-09-14 22:39 ` [PATCH -next] staging/bcm: fix printk format warnings Randy Dunlap
2010-09-14 22:41 ` Randy Dunlap [this message]
2010-09-14 22:41 ` [PATCH -next] staging/keucr: update TODO list and ask question about it Randy Dunlap
2010-09-16 19:28 ` Greg KH
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=20100914154141.9a95d40c.randy.dunlap@oracle.com \
--to=randy.dunlap@oracle$(echo .)com \
--cc=acho@novell$(echo .)com \
--cc=devel@driverdev$(echo .)osuosl.org \
--cc=gregkh@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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