diff --git a/[refs] b/[refs] index 7db69004e2e7..ea2817d2d22c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 282c454cd3a7041f59a37112bb2f82263bc38f6c +refs/heads/master: be524fb96081e9e511d993ebf39b05a32b19476e diff --git a/trunk/arch/x86/mm/pat.c b/trunk/arch/x86/mm/pat.c index 183fdd36d3bd..06b7a1c90fb8 100644 --- a/trunk/arch/x86/mm/pat.c +++ b/trunk/arch/x86/mm/pat.c @@ -34,7 +34,7 @@ void __cpuinit pat_disable(char *reason) printk(KERN_INFO "%s\n", reason); } -static int nopat(char *str) +static int __init nopat(char *str) { pat_disable("PAT support disabled."); return 0;