From bf6860d0a8cf277b0e78cb72ac2f95f729d4863b Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 30 May 2012 00:39:41 +0200 Subject: [PATCH] compat-wireless: add bluetooth to sdio suspend remove patch Signed-off-by: Hauke Mehrtens Signed-off-by: Luis R. Rodriguez --- patches/29-sdio_no_suspend.patch | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch index 4d4986c38c08..2a47d377f8a5 100644 --- a/patches/29-sdio_no_suspend.patch +++ b/patches/29-sdio_no_suspend.patch @@ -169,3 +169,31 @@ suspend and resume that are not backported. .drv = { .pm = &brcmf_sdio_pm_ops, }, +--- a/drivers/bluetooth/btmrvl_sdio.c ++++ b/drivers/bluetooth/btmrvl_sdio.c +@@ -1049,6 +1049,7 @@ static void btmrvl_sdio_remove(struct sd + } + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + static int btmrvl_sdio_suspend(struct device *dev) + { + struct sdio_func *func = dev_to_sdio_func(dev); +@@ -1144,6 +1145,7 @@ static const struct dev_pm_ops btmrvl_sd + .suspend = btmrvl_sdio_suspend, + .resume = btmrvl_sdio_resume, + }; ++#endif + + static struct sdio_driver bt_mrvl_sdio = { + .name = "btmrvl_sdio", +@@ -1152,7 +1154,9 @@ static struct sdio_driver bt_mrvl_sdio = + .remove = btmrvl_sdio_remove, + .drv = { + .owner = THIS_MODULE, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + .pm = &btmrvl_sdio_pm_ops, ++#endif + } + }; + -- 2.30.2