rpms/kernel/devel kernel.spec, 1.1705, 1.1706 linux-2.6-bluetooth-autosuspend.diff, 1.1, 1.2
Kyle McMartin
kyle at fedoraproject.org
Mon Aug 10 04:13:28 UTC 2009
- Previous message (by thread): [pkgdb] llvm had acl change status
- Next message (by thread): rpms/spamassassin/devel .cvsignore, 1.45, 1.46 sources, 1.44, 1.45 spamassassin.spec, 1.115, 1.116 Mail-SpamAssassin-3.3.0-missing-pre.patch, 1.1, NONE Mail-SpamAssassin-3.3.0-perl-bug-taint.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22855
Modified Files:
kernel.spec linux-2.6-bluetooth-autosuspend.diff
Log Message:
* Sun Aug 09 2009 Kyle McMartin <kyle at redhat.com>
- btusb autosuspend: fix build on !CONFIG_PM by stubbing out
suspend/resume methods.
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1705
retrieving revision 1.1706
diff -u -p -r1.1705 -r1.1706
--- kernel.spec 8 Aug 2009 19:36:06 -0000 1.1705
+++ kernel.spec 10 Aug 2009 04:13:28 -0000 1.1706
@@ -1966,6 +1966,10 @@ fi
# and build.
%changelog
+* Sun Aug 09 2009 Kyle McMartin <kyle at redhat.com>
+- btusb autosuspend: fix build on !CONFIG_PM by stubbing out
+ suspend/resume methods.
+
* Sat Aug 08 2009 Dennis Gilmore <dennis at ausil.us> 2.6.31-0.141.rc5.git3
- disable kgdb on sparc64 uni-processor kernel
- set max cpus to 256 on sparc64
linux-2.6-bluetooth-autosuspend.diff:
btusb.c | 189 +++++++++++++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 147 insertions(+), 42 deletions(-)
Index: linux-2.6-bluetooth-autosuspend.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-bluetooth-autosuspend.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-bluetooth-autosuspend.diff 18 Jul 2009 22:50:13 -0000 1.1
+++ linux-2.6-bluetooth-autosuspend.diff 10 Aug 2009 04:13:28 -0000 1.2
@@ -1,11 +1,5 @@
-commit 7ed6456e2717d641a287bf6a83c1bf80395d312c
-Author: Matthew Garrett <mjg at redhat.com>
-Date: Sat Jul 18 23:19:10 2009 +0100
-
- Add support for bluetooth autosuspend
-
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index e70c57e..2f4b4c6 100644
+index e70c57e..ac94f91 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -145,6 +145,7 @@ static struct usb_device_id blacklist_table[] = {
@@ -251,7 +245,12 @@ index e70c57e..2f4b4c6 100644
return 0;
}
-@@ -947,60 +1007,100 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)
+@@ -943,73 +1003,118 @@ static void btusb_disconnect(struct usb_interface *intf)
+ hci_free_dev(hdev);
+ }
+
++#ifdef CONFIG_PM
+ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)
{
struct btusb_data *data = usb_get_intfdata(intf);
@@ -378,12 +377,17 @@ index e70c57e..2f4b4c6 100644
+ schedule_work(&data->work);
return 0;
}
++#endif
-@@ -1011,6 +1111,7 @@ static struct usb_driver btusb_driver = {
+ static struct usb_driver btusb_driver = {
+ .name = "btusb",
+ .probe = btusb_probe,
+ .disconnect = btusb_disconnect,
++#ifdef CONFIG_PM
.suspend = btusb_suspend,
.resume = btusb_resume,
- .id_table = btusb_table,
+ .supports_autosuspend = 1,
++#endif
+ .id_table = btusb_table,
};
- static int __init btusb_init(void)
- Previous message (by thread): [pkgdb] llvm had acl change status
- Next message (by thread): rpms/spamassassin/devel .cvsignore, 1.45, 1.46 sources, 1.44, 1.45 spamassassin.spec, 1.115, 1.116 Mail-SpamAssassin-3.3.0-missing-pre.patch, 1.1, NONE Mail-SpamAssassin-3.3.0-perl-bug-taint.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list