1. 31 3月, 2011 1 次提交
    • L
      Merge branch 'irq-fixes-for-linus' of... · 6aba74f2
      Linus Torvalds 提交于
      Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        avr32: Fix missing irq namespace conversion
        powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip
        genirq: Remove the now obsolete config options and select statements
        arm: versatile : Fix typo introduced in irq namespace cleanup
        sound: Fixup the last user of the old irq functions
        genirq: Remove obsolete comment
        genirq: Remove now obsolete set_irq_wake()
        sh: Fix irq cleanup fallout
        x86: apb_timer: Fixup genirq fallout
        genirq: Fix misnamed label in handle_edge_eoi_irq
      
      Fix up crazy conflict in arch/powerpc/include/asm/qe_ic.h:
      
       - commit eead4d5c ("powerpc: qe_ic: Rename get_irq_desc_data and
         get_irq_desc_chip") made the helper functions use
         irq_desc_get_handler_data() instead of the legacy (and no longer
         existing) get_irq_desc_data.
      
       - commit d4db35e8 ("powerpc/qe_ic: Fix another breakage from the
         irq_data conversion") used irq_desc_get_chip_data() instead.
      
      According to Thomas, the former is the correct direct conversion, but it
      does look like both should work (arch/powerpc/sysdev/qe_lib/qe_ic.c
      seems to initialize both to the same thing), and the chip data in some
      ways is the more logical.  Somebody should really decide on one of the
      other.
      
      This merge picks irq_desc_get_handler_data() as the straightforward pure
      conversion to new names, as per Thomas.
      6aba74f2
  2. 30 3月, 2011 39 次提交