Philippe De Muyter wrote:
On Thu, Jun 03, 2010 at 09:43:33AM -0400, Jate Sujjavanich wrote:
Here's a resubmission.
----------------------------
The arch/m68k/include/asm/ide.h produces errors when the IDE driver is compiled
for my 523x uClinux system under kernel. The header makes some redefines of
operators not defined in the arch/m68k/include/asm/io_no.h header. There are no
separate mmio and iospace defines.
This solution follows the convention used for other mmu/nommu headers in the
m68k arch.
This is not really a convention. It is a temporary situation resulting
from the merge of arch/m68k/include and arch/m68knommu/include.
So please do not gratuitly create new unneeded files. One ide.h is enough.
I totally agree with Philippe on this one. I have worked hard to
reduce the _mm/_no separation :-)
One well placed "#ifdef CONFIG_MMU" is the best solution.
(Note the use of CONFIG_MMU for non-exported headers.)
Regards
Greg
Signed-off-by: Jate Sujjavanich <jsujjavan...@syntech-fuelmaster.com>
diff --git a/arch/m68k/include/asm/ide.h b/arch/m68k/include/asm/ide.h
index 3958726..ed40426 100644
--- a/arch/m68k/include/asm/ide.h
+++ b/arch/m68k/include/asm/ide.h
[...]
+#ifdef __uClinux__
+#include "ide_no.h"
+#else
+#include "ide_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/ide_mm.h b/arch/m68k/include/asm/ide_mm.h
new file mode 100644
index 0000000..11c2ee6
--- /dev/null
+++ b/arch/m68k/include/asm/ide_mm.h
[...]
diff --git a/arch/m68k/include/asm/ide_no.h b/arch/m68k/include/asm/ide_no.h
new file mode 100644
index 0000000..d32919c
--- /dev/null
+++ b/arch/m68k/include/asm/ide_no.h
--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: g...@snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
_______________________________________________
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
