Merge branch 'hp-wmi' into release

[linux-2.6.git] / drivers / platform / x86 / hp-wmi.c

diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 804cfdb882865e6de7dbbb5ae0e279bd20a4c7ef..63c3e658a884e3f0d46b3f076e91862b3471b8b6 100644 (file)
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -100,7 +100,7 @@ static struct rfkill *wifi_rfkill;
 static struct rfkill *bluetooth_rfkill;
 static struct rfkill *wwan_rfkill;
 
 static struct rfkill *bluetooth_rfkill;
 static struct rfkill *wwan_rfkill;
 

-static struct dev_pm_ops hp_wmi_pm_ops = {
+static const struct dev_pm_ops hp_wmi_pm_ops = {

        .resume  = hp_wmi_resume_handler,
        .restore  = hp_wmi_resume_handler,
 };
        .resume  = hp_wmi_resume_handler,
        .restore  = hp_wmi_resume_handler,
 };