diff --git a/[refs] b/[refs] index 96c1225b2076..5c78e766b123 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49033c81845f1bd2a69e53485f20d55a0e7bace5 +refs/heads/master: 4cf303487d5dddaace2daca8437c555f3f0bc1aa diff --git a/trunk/arch/sh/kernel/sh_ksyms.c b/trunk/arch/sh/kernel/sh_ksyms.c index c706f3bfd897..ceee79143401 100644 --- a/trunk/arch/sh/kernel/sh_ksyms.c +++ b/trunk/arch/sh/kernel/sh_ksyms.c @@ -99,10 +99,6 @@ EXPORT_SYMBOL(__down_trylock); EXPORT_SYMBOL(synchronize_irq); #endif -#ifdef CONFIG_PM -EXPORT_SYMBOL(pm_suspend); -#endif - EXPORT_SYMBOL(csum_partial); #ifdef CONFIG_IPV6 EXPORT_SYMBOL(csum_ipv6_magic); diff --git a/trunk/kernel/power/main.c b/trunk/kernel/power/main.c index 751157b7897e..500eb87f643d 100644 --- a/trunk/kernel/power/main.c +++ b/trunk/kernel/power/main.c @@ -8,6 +8,7 @@ * */ +#include #include #include #include @@ -230,7 +231,7 @@ int pm_suspend(suspend_state_t state) return -EINVAL; } - +EXPORT_SYMBOL(pm_suspend); decl_subsys(power,NULL,NULL);