diff --git a/[refs] b/[refs] index b8922c268681..cdf8714043b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a7d91d651f25005c4f507aebf9eab17e508889c +refs/heads/master: b76f98761acc909c20c1e65c8af11dc1decae935 diff --git a/trunk/arch/blackfin/mm/init.c b/trunk/arch/blackfin/mm/init.c index 68459cc052a1..e97ea8fc8dc4 100644 --- a/trunk/arch/blackfin/mm/init.c +++ b/trunk/arch/blackfin/mm/init.c @@ -53,7 +53,7 @@ static unsigned long empty_bad_page; unsigned long empty_zero_page; -void __init show_mem(void) +void show_mem(void) { unsigned long i; int free = 0, total = 0, reserved = 0, shared = 0;