Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh

[pandora-kernel.git] / arch / i386 / oprofile / nmi_int.c

diff --git a/arch/i386/oprofile/nmi_int.c b/arch/i386/oprofile/nmi_int.c
index b361018..3700eef 100644 (file)
--- a/arch/i386/oprofile/nmi_int.c
+++ b/arch/i386/oprofile/nmi_int.c
@@ -83,8 +83,8 @@ static void exit_driverfs(void)
 #define exit_driverfs() do { } while (0)
 #endif /* CONFIG_PM */
 
-int profile_exceptions_notify(struct notifier_block *self,
-                               unsigned long val, void *data)
+static int profile_exceptions_notify(struct notifier_block *self,
+                                    unsigned long val, void *data)
 {
        struct die_args *args = (struct die_args *)data;
        int ret = NOTIFY_DONE;