diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:20:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:20:28 +0200 |
| commit | faeca31d068090285b77c39574d2bda14b079c50 (patch) | |
| tree | 789841a7f0d336b24a74f2191542a2eb8177c8fa /arch/x86/mm/pat.c | |
| parent | x86: rename pat_wc_enabled to pat_enabled (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | linux-faeca31d068090285b77c39574d2bda14b079c50.tar.xz linux-faeca31d068090285b77c39574d2bda14b079c50.zip | |
Merge branch 'linus' into x86/pat
Diffstat (limited to 'arch/x86/mm/pat.c')
| -rw-r--r-- | arch/x86/mm/pat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index 4beccea0897f..7c21572bbdda 100644 --- a/arch/x86/mm/pat.c +++ b/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; |