From 616683540e0e0600d0c42553cdc2b09fec40d2ea Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Thu, 18 Oct 2007 03:04:41 -0700 Subject: [PATCH] --- yaml --- r: 71103 b: refs/heads/master c: f242d9196fd1ef4e6bf0e50d2e7f32866fb145c2 h: refs/heads/master i: 71101: d2ca74ee402f7e89d2336bda059b3df746a9d7a9 71099: c49aa027cc3d8dc84fd1b5ad0b9bdd30afb02802 71095: f4695c7f8518a46bf8ac88f35a3c8c3dafb3c63d 71087: ecf9de40a630a36b886c9dd27d1f7d7dfaa8ed09 71071: af8ce6a9d7243d8c2e4a365b6c080dac4359f99a 71039: 0581a9e7f08ba6ad733e626d2ac7fd03185298b4 v: v3 --- [refs] | 2 +- trunk/include/linux/suspend.h | 2 -- trunk/kernel/power/main.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 72856a338968..5f0b647f4704 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6c5eb9541f2197a3ffab90b1c7a3250a9b51bf6 +refs/heads/master: f242d9196fd1ef4e6bf0e50d2e7f32866fb145c2 diff --git a/trunk/include/linux/suspend.h b/trunk/include/linux/suspend.h index 541f0c46d34f..dee416c5477f 100644 --- a/trunk/include/linux/suspend.h +++ b/trunk/include/linux/suspend.h @@ -79,8 +79,6 @@ struct platform_suspend_ops { }; #ifdef CONFIG_SUSPEND -extern struct platform_suspend_ops *suspend_ops; - /** * suspend_set_ops - set platform dependent suspend operations * @ops: The new suspend operations to set. diff --git a/trunk/kernel/power/main.c b/trunk/kernel/power/main.c index 7d09a9894947..fb2412e7a0ce 100644 --- a/trunk/kernel/power/main.c +++ b/trunk/kernel/power/main.c @@ -32,7 +32,7 @@ DEFINE_MUTEX(pm_mutex); /* This is just an arbitrary number */ #define FREE_PAGE_NUMBER (100) -struct platform_suspend_ops *suspend_ops; +static struct platform_suspend_ops *suspend_ops; /** * suspend_set_ops - Set the global suspend method table.