diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:11:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:11:42 -0400 |
| commit | f34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d (patch) | |
| tree | 0816c565d26ae24854616faa0d497be365c2fe8b /arch/powerpc/kernel/ppc_ksyms.c | |
| parent | ee4311adf105f4d740f52e3948acc1d81598afcc (diff) | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
Merge branch 'linus' into tracing/ftrace
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 4300db52662a..a8d02506468a 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> |
| @@ -165,7 +164,6 @@ EXPORT_SYMBOL(screen_info); | |||
| 165 | EXPORT_SYMBOL(timer_interrupt); | 164 | EXPORT_SYMBOL(timer_interrupt); |
| 166 | EXPORT_SYMBOL(irq_desc); | 165 | EXPORT_SYMBOL(irq_desc); |
| 167 | EXPORT_SYMBOL(tb_ticks_per_jiffy); | 166 | EXPORT_SYMBOL(tb_ticks_per_jiffy); |
| 168 | EXPORT_SYMBOL(console_drivers); | ||
| 169 | EXPORT_SYMBOL(cacheable_memcpy); | 167 | EXPORT_SYMBOL(cacheable_memcpy); |
| 170 | #endif | 168 | #endif |
| 171 | 169 | ||