Commit 75af437d authored by Tom Rini's avatar Tom Rini

Merge kernel.crashing.org:/home/trini/work/kernel/pristine/linux-2.5

into kernel.crashing.org:/home/trini/work/kernel/pristine/linux-2.5-misc
parents 2b009dcf 8e4745e9
......@@ -923,6 +923,8 @@ initial_mmu:
ori r3,r3,KERNELBASE@l
tophys(r4,r3) /* Load the kernel physical address */
iccci r0,r3 /* Invalidate the i-cache before use */
/* Load the kernel PID.
*/
li r0,0
......
......@@ -180,6 +180,7 @@ EXPORT_SYMBOL(pci_bus_to_phys);
EXPORT_SYMBOL(consistent_alloc);
EXPORT_SYMBOL(consistent_free);
EXPORT_SYMBOL(consistent_sync);
EXPORT_SYMBOL(flush_dcache_all);
#endif
EXPORT_SYMBOL(open);
......@@ -329,10 +330,12 @@ EXPORT_SYMBOL(debugger_fault_handler);
#endif
#ifdef CONFIG_8xx
EXPORT_SYMBOL(__res);
EXPORT_SYMBOL(cpm_install_handler);
EXPORT_SYMBOL(cpm_free_handler);
#endif /* CONFIG_8xx */
#if defined(CONFIG_8xx) || defined(CONFIG_4xx)
EXPORT_SYMBOL(__res);
#endif
#if defined(CONFIG_8xx) || defined(CONFIG_8260)
EXPORT_SYMBOL(request_8xxirq);
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment