Merge branch 'topic/cs423x-merge' into for-linus
[sfrench/cifs-2.6.git] / arch / m68k / include / asm / fb.h
1 #ifdef __uClinux__
2 #include "fb_no.h"
3 #else
4 #include "fb_mm.h"
5 #endif