diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 12:36:24 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 12:36:24 +1100 |
| commit | 6dbd2a3dcddd950220f60caff396a6328a52abba (patch) | |
| tree | e04305cf2dbb9d3be4132cad8d8e3e82612f0e35 /kernel | |
| parent | c811bac807fccf16aa325031ed43e310334eca67 (diff) | |
| parent | 197e1cc97d0e57753d990e13283f64664f02eef1 (diff) | |
Merge remote branch 'kbuild/master'
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/bounds.c | 2 | ||||
| -rw-r--r-- | kernel/kexec.c | 2 | ||||
| -rw-r--r-- | kernel/trace/trace.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kernel/bounds.c b/kernel/bounds.c index 3c5301381837..98a51f26c136 100644 --- a/kernel/bounds.c +++ b/kernel/bounds.c @@ -12,7 +12,7 @@ void foo(void) { - /* The enum constants to put into include/linux/bounds.h */ + /* The enum constants to put into include/generated/bounds.h */ DEFINE(NR_PAGEFLAGS, __NR_PAGEFLAGS); DEFINE(MAX_NR_ZONES, __MAX_NR_ZONES); /* End of constants */ diff --git a/kernel/kexec.c b/kernel/kexec.c index f336e2107f98..83f54e2a6eed 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -21,7 +21,7 @@ #include <linux/hardirq.h> #include <linux/elf.h> #include <linux/elfcore.h> -#include <linux/utsrelease.h> +#include <generated/utsrelease.h> #include <linux/utsname.h> #include <linux/numa.h> #include <linux/suspend.h> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index b20d3ec75de9..7b49b6751790 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -12,7 +12,7 @@ * Copyright (C) 2004 William Lee Irwin III */ #include <linux/ring_buffer.h> -#include <linux/utsrelease.h> +#include <generated/utsrelease.h> #include <linux/stacktrace.h> #include <linux/writeback.h> #include <linux/kallsyms.h> |