diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /arch/ppc/kernel | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/ppc/kernel')
| -rw-r--r-- | arch/ppc/kernel/ppc_ksyms.c | 2 | ||||
| -rw-r--r-- | arch/ppc/kernel/setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c index 50c1b4739ca7..d1735401384c 100644 --- a/arch/ppc/kernel/ppc_ksyms.c +++ b/arch/ppc/kernel/ppc_ksyms.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | #include <linux/elfcore.h> | 5 | #include <linux/elfcore.h> |
| 6 | #include <linux/string.h> | 6 | #include <linux/string.h> |
| 7 | #include <linux/interrupt.h> | 7 | #include <linux/interrupt.h> |
| 8 | #include <linux/tty.h> | 8 | #include <linux/screen_info.h> |
| 9 | #include <linux/vt_kern.h> | 9 | #include <linux/vt_kern.h> |
| 10 | #include <linux/nvram.h> | 10 | #include <linux/nvram.h> |
| 11 | #include <linux/console.h> | 11 | #include <linux/console.h> |
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index faf2940300b0..a74f46d9826f 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
| 12 | #include <linux/initrd.h> | 12 | #include <linux/initrd.h> |
| 13 | #include <linux/ide.h> | 13 | #include <linux/ide.h> |
| 14 | #include <linux/tty.h> | 14 | #include <linux/screen_info.h> |
| 15 | #include <linux/bootmem.h> | 15 | #include <linux/bootmem.h> |
| 16 | #include <linux/seq_file.h> | 16 | #include <linux/seq_file.h> |
| 17 | #include <linux/root_dev.h> | 17 | #include <linux/root_dev.h> |