linux/arch
Linus Torvalds 6aba74f279 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 eead4d5c63 ("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 d4db35e8dc ("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.
2011-03-30 09:35:52 -07:00
..
alpha genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
arm Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-03-30 09:35:52 -07:00
avr32 avr32: Fix missing irq namespace conversion 2011-03-30 15:38:03 +02:00
blackfin Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-03-30 09:35:52 -07:00
cris genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
frv genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
h8300 genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
ia64 ia64: Remove redundant declaration of irq_desc[] 2011-03-29 14:48:05 +02:00
m32r genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
m68k genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
microblaze genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
mips mips: vr41xx: Use irdq_irq_disabled() 2011-03-29 14:48:07 +02:00
mn10300 genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
parisc genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
powerpc Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-03-30 09:35:52 -07:00
s390 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 2011-03-25 17:47:04 -07:00
score genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
sh genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
sparc genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
tile genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
um genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
unicore32 genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
x86 x86: apb_timer: Fixup genirq fallout 2011-03-30 00:13:30 +02:00
xtensa genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
.gitignore
Kconfig oprofile, s390: Cleanups 2011-03-16 14:30:40 +01:00