Merge branch 'upstream' into for-linus
[pandora-kernel.git] / drivers / staging / udlfb / Makefile
1 obj-$(CONFIG_FB_UDL)            += udlfb.o