Merge branch 'linux-2.6'

[linux-2.6] / arch / arm / mach-iop13xx / iq81340sc.c

diff --git a/arch/arm/mach-iop13xx/iq81340sc.c b/arch/arm/mach-iop13xx/iq81340sc.c
index 0f8801406f23eb271a0ee1e1bfd6c9b9973ae123..e8522b3b81634cccb91707ccc9c7f49f927336b2 100644 (file)
--- a/arch/arm/mach-iop13xx/iq81340sc.c
+++ b/arch/arm/mach-iop13xx/iq81340sc.c
@@ -77,12 +77,13 @@ static void __init iq81340sc_init(void)
 {
        iop13xx_platform_init();
        iq81340sc_pci_init();
+       iop13xx_add_tpmi_devices();
 }
 
 static void __init iq81340sc_timer_init(void)
 {
        unsigned long bus_freq = iop13xx_core_freq() / iop13xx_xsi_bus_ratio();
-       printk(KERN_DEBUG "%s: bus frequency: %lu\n", __FUNCTION__, bus_freq);
+       printk(KERN_DEBUG "%s: bus frequency: %lu\n", __func__, bus_freq);
        iop_init_time(bus_freq);
 }