Index: kernel/generic/include/ddi/ddi.h
===================================================================
--- kernel/generic/include/ddi/ddi.h	(revision fe8dfa6849229e829003d0fb83de58148a0aa45d)
+++ kernel/generic/include/ddi/ddi.h	(revision 77429d3ddfaa914b6e45b20d0e839aa7b9d4d505)
@@ -54,5 +54,4 @@
 extern sysarg_t sys_physmem_map(sysarg_t, sysarg_t, sysarg_t, sysarg_t);
 extern sysarg_t sys_iospace_enable(ddi_ioarg_t *);
-extern sysarg_t sys_interrupt_enable(int irq, int enable);
 
 /*
Index: kernel/generic/include/syscall/syscall.h
===================================================================
--- kernel/generic/include/syscall/syscall.h	(revision fe8dfa6849229e829003d0fb83de58148a0aa45d)
+++ kernel/generic/include/syscall/syscall.h	(revision 77429d3ddfaa914b6e45b20d0e839aa7b9d4d505)
@@ -82,5 +82,4 @@
 	SYS_PHYSMEM_MAP,
 	SYS_IOSPACE_ENABLE,
-	SYS_INTERRUPT_ENABLE,
 	
 	SYS_SYSINFO_GET_TAG,
Index: kernel/generic/src/ddi/ddi.c
===================================================================
--- kernel/generic/src/ddi/ddi.c	(revision fe8dfa6849229e829003d0fb83de58148a0aa45d)
+++ kernel/generic/src/ddi/ddi.c	(revision 77429d3ddfaa914b6e45b20d0e839aa7b9d4d505)
@@ -258,34 +258,4 @@
 }
 
-/** Disable or enable specified interrupts.
- * 
- * @param irq the interrupt to be enabled/disabled.
- * @param enable if true enable the interrupt, disable otherwise.
- * 
- * @retutn Zero on success, error code otherwise.
- */
-sysarg_t sys_interrupt_enable(int irq, int enable)
-{
-/* FIXME: this needs to be generic code, or better not be in kernel at all. */
-#if 0
-	cap_t task_cap = cap_get(TASK);
-	if (!(task_cap & CAP_IRQ_REG))
-		return EPERM;
-		
-	if (irq < 0 || irq > 16) {
-		return EINVAL;
-	}
-	
-	uint16_t irq_mask = (uint16_t)(1 << irq);
-	if (enable) {
-		trap_virtual_enable_irqs(irq_mask);
-	} else {
-		trap_virtual_disable_irqs(irq_mask);
-	}
-	
-#endif
-	return 0;
-}
-
 /** @}
  */
Index: kernel/generic/src/syscall/syscall.c
===================================================================
--- kernel/generic/src/syscall/syscall.c	(revision fe8dfa6849229e829003d0fb83de58148a0aa45d)
+++ kernel/generic/src/syscall/syscall.c	(revision 77429d3ddfaa914b6e45b20d0e839aa7b9d4d505)
@@ -171,5 +171,4 @@
 	(syshandler_t) sys_physmem_map,
 	(syshandler_t) sys_iospace_enable,
-	(syshandler_t) sys_interrupt_enable,
 	
 	/* Sysinfo syscalls */
Index: uspace/app/trace/syscalls.c
===================================================================
--- uspace/app/trace/syscalls.c	(revision fe8dfa6849229e829003d0fb83de58148a0aa45d)
+++ uspace/app/trace/syscalls.c	(revision 77429d3ddfaa914b6e45b20d0e839aa7b9d4d505)
@@ -73,5 +73,4 @@
     [SYS_PHYSMEM_MAP] = { "physmem_map",		4,	V_ERRNO },
     [SYS_IOSPACE_ENABLE] = { "iospace_enable",		1,	V_ERRNO },
-    [SYS_INTERRUPT_ENABLE] = { "interrupt_enable",	2,	V_ERRNO },
 
     [SYS_SYSINFO_GET_TAG] = { "sysinfo_get_tag",		2,	V_INTEGER },
Index: uspace/drv/ns8250/ns8250.c
===================================================================
--- uspace/drv/ns8250/ns8250.c	(revision fe8dfa6849229e829003d0fb83de58148a0aa45d)
+++ uspace/drv/ns8250/ns8250.c	(revision 77429d3ddfaa914b6e45b20d0e839aa7b9d4d505)
@@ -431,10 +431,4 @@
 {
 	ns8250_dev_data_t *data = (ns8250_dev_data_t *) dev->driver_data;
-	int res;
-	
-	/* Enable interrupt globally. */
-	res = interrupt_enable(data->irq);
-	if (res != EOK)
-		return res;
 	
 	/* Enable interrupt on the serial port. */
Index: uspace/lib/c/generic/ddi.c
===================================================================
--- uspace/lib/c/generic/ddi.c	(revision fe8dfa6849229e829003d0fb83de58148a0aa45d)
+++ uspace/lib/c/generic/ddi.c	(revision 77429d3ddfaa914b6e45b20d0e839aa7b9d4d505)
@@ -96,26 +96,4 @@
 }
 
-/** Enable an interrupt.
- * 
- * @param irq the interrupt.
- * 
- * @return Zero on success, negative error code otherwise. 
- */
-int interrupt_enable(int irq) 
-{
-	return __SYSCALL2(SYS_INTERRUPT_ENABLE, (sysarg_t) irq, 1);
-}
-
-/** Disable an interrupt.
- * 
- * @param irq the interrupt.
- * 
- * @return Zero on success, negative error code otherwise. 
- */
-int interrupt_disable(int irq) 
-{
-	return __SYSCALL2(SYS_INTERRUPT_ENABLE, (sysarg_t) irq, 0);
-}
-
 /** Enable PIO for specified I/O range.
  *
Index: uspace/lib/c/include/ddi.h
===================================================================
--- uspace/lib/c/include/ddi.h	(revision fe8dfa6849229e829003d0fb83de58148a0aa45d)
+++ uspace/lib/c/include/ddi.h	(revision 77429d3ddfaa914b6e45b20d0e839aa7b9d4d505)
@@ -42,6 +42,4 @@
 extern int iospace_enable(task_id_t, void *, unsigned long);
 extern int pio_enable(void *, size_t, void **);
-extern int interrupt_enable(int);
-extern int interrupt_disable(int);
 
 #endif