Merge branches 'master', 'omap1-upstream' and 'orion' into devel
[linux-2.6] / include / asm-m68knommu / resource.h
1 #include <asm-m68k/resource.h>