Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / include / video / Kbuild
1 unifdef-y += sisfb.h uvesafb.h
2 unifdef-y += edid.h