Merge branch 'x86/cpufeature' into irq/numa
[sfrench/cifs-2.6.git] / arch / x86 / video / Makefile
1 obj-$(CONFIG_FB)               += fbdev.o