~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/arm/mach-mxs/icoll.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
74
74
        mxs_reset_block(icoll_base + HW_ICOLL_CTRL);
75
75
 
76
76
        for (i = 0; i < MXS_INTERNAL_IRQS; i++) {
77
 
                set_irq_chip(i, &mxs_icoll_chip);
78
 
                set_irq_handler(i, handle_level_irq);
 
77
                irq_set_chip_and_handler(i, &mxs_icoll_chip, handle_level_irq);
79
78
                set_irq_flags(i, IRQF_VALID);
80
79
        }
81
80
}