summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/ChangeLog4
-rw-r--r--c/src/libchip/serial/ns16550.c14
2 files changed, 10 insertions, 8 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index 9864e49a74..f8ffea8d84 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-18 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * libchip/serial/ns16550.c: Fix warning.
+
2008-08-18 Ralf Corsepius <ralf.corsepius@rtems.org>
* aclocal/prog-cc.m4: Add -Wnested-externs.
diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c
index 829b3ef262..ed4876c697 100644
--- a/c/src/libchip/serial/ns16550.c
+++ b/c/src/libchip/serial/ns16550.c
@@ -593,26 +593,24 @@ NS16550_STATIC void ns16550_initialize_interrupts(int minor)
}
#else
-static void null_fun(){}
-
NS16550_STATIC void ns16550_initialize_interrupts(int minor)
{
#ifdef BSP_SHARED_HANDLER_SUPPORT
rtems_irq_connect_data IrqData = {0,
ns16550_isr,
&Console_Port_Data[minor],
- (rtems_irq_enable)null_fun,
- (rtems_irq_disable)null_fun,
- (rtems_irq_is_enabled)null_fun,
+ NULL,
+ NULL,
+ NULL,
NULL
};
#else
rtems_irq_connect_data IrqData = {0,
ns16550_isr,
&Console_Port_Data[minor],
- (rtems_irq_enable)null_fun,
- (rtems_irq_disable)null_fun,
- (rtems_irq_is_enabled)null_fun
+ NULL,
+ NULL,
+ NULL
};
#endif