diff --git a/[refs] b/[refs] index 46ab80848cdf..457d5b1ee49d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbed6c6e0f7a52859fd0207ef3ffcf4bfffdbf95 +refs/heads/master: 47a460d5a307e639d6c9cdf9bb4857e2f5f3cb76 diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c index d09da0895174..859a8e59773a 100644 --- a/trunk/kernel/power/disk.c +++ b/trunk/kernel/power/disk.c @@ -26,7 +26,7 @@ static int noresume = 0; -char resume_file[256] = CONFIG_PM_STD_PARTITION; +static char resume_file[256] = CONFIG_PM_STD_PARTITION; dev_t swsusp_resume_device; sector_t swsusp_resume_block; @@ -185,7 +185,7 @@ static void platform_restore_cleanup(int platform_mode) * reappears in this routine after a restore. */ -int create_image(int platform_mode) +static int create_image(int platform_mode) { int error;