Merge remote branch 'origin/drm-intel-next' of ../drm-intel into drm-fixes
[linux-2.6] / drivers / staging / phison / Makefile
1 obj-$(CONFIG_IDE_PHISON)        += phison.o