Merge branch 'linus' into core/urgent
[linux-2.6] / arch / x86 / video / Makefile
1 obj-$(CONFIG_FB)               += fbdev.o