get rid of some ifdefs in the IRQ code