Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / arch / m68k / include / asm / io.h

#ifdef __uClinux__
#include "io_no.h"
#else
#include "io_mm.h"
#endif