Module Name: src
Committed By: marty
Date: Tue Apr 14 06:33:23 UTC 2009
Modified Files:
src/sys/arch/arm/omap: omap_intr.h
Log Message:
Work around the circular dependency between sys/device.h and omap_intr.h
introduced when sys/device.h included sys/mutex.h
This workaround should be removed once the circular dependency is fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/omap/omap_intr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/omap/omap_intr.h
diff -u src/sys/arch/arm/omap/omap_intr.h:1.5 src/sys/arch/arm/omap/omap_intr.h:1.6
--- src/sys/arch/arm/omap/omap_intr.h:1.5 Fri Nov 21 17:13:07 2008
+++ src/sys/arch/arm/omap/omap_intr.h Tue Apr 14 06:33:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: omap_intr.h,v 1.5 2008/11/21 17:13:07 matt Exp $ */
+/* $NetBSD: omap_intr.h,v 1.6 2009/04/14 06:33:23 marty Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
@@ -184,7 +184,12 @@
void omap_irq_handler(void *);
void *omap_intr_establish(int, int, const char *, int (*)(void *), void *);
void omap_intr_disestablish(void *);
-int omapintc_match(device_t, cfdata_t, void *);
+/* XXX MARTY -- This is a hack to work around the circular dependency
+ * between sys/device.h and omap_intr.h It should be removed when
+ * the circular dependency is fixed and the declaration repaired.
+ */
+struct cfdata;
+int omapintc_match(device_t, struct cfdata *, void *);
void omapintc_attach(device_t, device_t, void *);
#endif /* ! _LOCORE */
