From: Christoph Hellwig mach_enable_irq/mach_disable_irq are never actually set, so let's remove them. Btw, is it really intentional that enable_irq/disable_irq are no-ops on m68knommu? Signed-off-by: Christoph Hellwig Cc: Greg Ungerer Signed-off-by: Andrew Morton --- arch/m68knommu/kernel/m68k_ksyms.c | 2 -- arch/m68knommu/kernel/setup.c | 2 -- include/asm-m68knommu/irq.h | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff -puN arch/m68knommu/kernel/m68k_ksyms.c~m68knommu-enable_irq-disable_irq arch/m68knommu/kernel/m68k_ksyms.c --- 25/arch/m68knommu/kernel/m68k_ksyms.c~m68knommu-enable_irq-disable_irq Mon Nov 14 14:08:11 2005 +++ 25-akpm/arch/m68knommu/kernel/m68k_ksyms.c Mon Nov 14 14:08:11 2005 @@ -38,8 +38,6 @@ EXPORT_SYMBOL(strncmp); EXPORT_SYMBOL(ip_fast_csum); -EXPORT_SYMBOL(mach_enable_irq); -EXPORT_SYMBOL(mach_disable_irq); EXPORT_SYMBOL(kernel_thread); /* Networking helper routines. */ diff -puN arch/m68knommu/kernel/setup.c~m68knommu-enable_irq-disable_irq arch/m68knommu/kernel/setup.c --- 25/arch/m68knommu/kernel/setup.c~m68knommu-enable_irq-disable_irq Mon Nov 14 14:08:11 2005 +++ 25-akpm/arch/m68knommu/kernel/setup.c Mon Nov 14 14:08:11 2005 @@ -65,8 +65,6 @@ void (*mach_kbd_leds) (unsigned int) = N /* machine dependent irq functions */ void (*mach_init_IRQ) (void) = NULL; irqreturn_t (*(*mach_default_handler)[]) (int, void *, struct pt_regs *) = NULL; -void (*mach_enable_irq) (unsigned int) = NULL; -void (*mach_disable_irq) (unsigned int) = NULL; int (*mach_get_irq_list) (struct seq_file *, void *) = NULL; void (*mach_process_int) (int irq, struct pt_regs *fp) = NULL; void (*mach_trap_init) (void); diff -puN include/asm-m68knommu/irq.h~m68knommu-enable_irq-disable_irq include/asm-m68knommu/irq.h --- 25/include/asm-m68knommu/irq.h~m68knommu-enable_irq-disable_irq Mon Nov 14 14:08:11 2005 +++ 25-akpm/include/asm-m68knommu/irq.h Mon Nov 14 14:08:11 2005 @@ -84,8 +84,8 @@ extern void (*mach_disable_irq)(unsigned /* * Some drivers want these entry points */ -#define enable_irq(x) (mach_enable_irq ? (*mach_enable_irq)(x) : 0) -#define disable_irq(x) (mach_disable_irq ? (*mach_disable_irq)(x) : 0) +#define enable_irq(x) 0 +#define disable_irq(x) do { } while (0) #define enable_irq_nosync(x) enable_irq(x) #define disable_irq_nosync(x) disable_irq(x) _