diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-01-19 09:17:18 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-03-25 17:57:58 +0100 |
| commit | 0f6f1407e3e4a2cc4f602806d3c174473850f4da (patch) | |
| tree | 540b031bcb6bfc3e10d43b924ec1a5260aff39ae /drivers/hid | |
| parent | 0361a28d3f9a4315a100c7b37ba0b55cfe15fe07 (diff) | |
| download | talos-obmc-linux-0f6f1407e3e4a2cc4f602806d3c174473850f4da.tar.gz talos-obmc-linux-0f6f1407e3e4a2cc4f602806d3c174473850f4da.zip | |
HID: do not try to compile PM code with CONFIG_PM unset
Fixes this build breakage in case when CONFIG_PM is not set
drivers/hid/usbhid/hid-core.c: In function 'hid_suspend':
drivers/hid/usbhid/hid-core.c:1220: error: 'struct usb_device' has no member named 'auto_pm'
drivers/hid/usbhid/hid-core.c:1245: error: 'struct usb_device' has no member named 'auto_pm'
drivers/hid/usbhid/hid-core.c:1258: error: 'struct usb_device' has no member named 'auto_pm'
by throwing both the hid_suspend() and hid_resume() away completely
in such case, as they won't be used anyway.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/usbhid/hid-core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index 625e7e8eb373..d8799a18a422 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -1210,6 +1210,7 @@ static void hid_cease_io(struct usbhid_device *usbhid) flush_scheduled_work(); } +#ifdef CONFIG_PM static int hid_suspend(struct usb_interface *intf, pm_message_t message) { struct hid_device *hid = usb_get_intfdata(intf); @@ -1292,6 +1293,8 @@ static int hid_resume(struct usb_interface *intf) return 0; } +#endif /* CONFIG_PM */ + /* Treat USB reset pretty much the same as suspend/resume */ static int hid_pre_reset(struct usb_interface *intf) { @@ -1353,9 +1356,11 @@ static struct usb_driver hid_driver = { .name = "usbhid", .probe = hid_probe, .disconnect = hid_disconnect, +#ifdef CONFIG_PM .suspend = hid_suspend, .resume = hid_resume, .reset_resume = hid_post_reset, +#endif .pre_reset = hid_pre_reset, .post_reset = hid_post_reset, .id_table = hid_usb_ids, |
