diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:16:51 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:16:51 -0400 |
commit | d02859ecb321c8c0f74cb9bbe3f51a59e58822b0 (patch) | |
tree | 05dd5bdc55081c0a90bf0afc35c07d0d6e25d015 /arch/powerpc/kernel/ppc_ksyms.c | |
parent | a987b16cc6123af2c9414032701bab5f73c54c89 (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge commit 'v2.6.26-rc8' into x86/xen
Conflicts:
arch/x86/xen/enlighten.c
arch/x86/xen/mmu.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/kernel/ppc_ksyms.c')
-rw-r--r-- | arch/powerpc/kernel/ppc_ksyms.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index cf6b5a7d8b3f..d3ac631cbd26 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <linux/screen_info.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> | ||
12 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
13 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
@@ -160,7 +159,6 @@ EXPORT_SYMBOL(screen_info); | |||
160 | EXPORT_SYMBOL(timer_interrupt); | 159 | EXPORT_SYMBOL(timer_interrupt); |
161 | EXPORT_SYMBOL(irq_desc); | 160 | EXPORT_SYMBOL(irq_desc); |
162 | EXPORT_SYMBOL(tb_ticks_per_jiffy); | 161 | EXPORT_SYMBOL(tb_ticks_per_jiffy); |
163 | EXPORT_SYMBOL(console_drivers); | ||
164 | EXPORT_SYMBOL(cacheable_memcpy); | 162 | EXPORT_SYMBOL(cacheable_memcpy); |
165 | #endif | 163 | #endif |
166 | 164 | ||