Merge branch 'master' into for-next
[linux-2.6/mini2440.git] / include / asm-um / nops.h
blob814e9bf5dea6e1b15c58daf55d0b0ef746ccaaf8
1 #ifndef __UM_NOPS_H
2 #define __UM_NOPS_H
4 #include "asm/arch/nops.h"
6 #endif