[PATCH] libertas: remove deprecated pm_register and associated code

Subject says it all.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index ae6f72a..6bc78bb 100644 (file)
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -852,18 +852,6 @@ wlan_private *libertas_sbi_get_priv(void *card)
        return cardp->priv;
 }
 
-#ifdef ENABLE_PM
-int libertas_sbi_suspend(wlan_private * priv)
-{
-       return 0;
-}
-
-int libertas_sbi_resume(wlan_private * priv)
-{
-       return 0;
-}
-#endif
-
 #ifdef CONFIG_PM
 static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
 {

diff --cc drivers/net/wireless/libertas/main.c
Simple merge

diff --cc drivers/net/wireless/libertas/sbi.h
Simple merge